traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-38960: DTrace build fix for FreeBSD. (GH-17451) 

DTrace build fix for FreeBSD.

- allowing passing an extra flag as it need to define the arch size.
- casting some probe's arguments.
This commit is contained in:
David Carlier 2020-01-28 12:53:32 +00:00 committed by Petr Viktorin
parent 2cca8efe46
commit aabdeb766b
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2019-12-03-16-41-22.bpo-38960.kvoFM0.rst Normal file
View File

@ -0,0 +1 @@
Fix DTrace build issues on FreeBSD. Patch by David Carlier.

6
Python/ceval.c
View File

@ -5447,7 +5447,7 @@ dtrace_function_entry(PyFrameObject *f)
funcname = PyUnicode_AsUTF8(f->f_code->co_name); funcname = PyUnicode_AsUTF8(f->f_code->co_name);
lineno = PyCode_Addr2Line(f->f_code, f->f_lasti); lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);
PyDTrace_FUNCTION_ENTRY(filename, funcname, lineno); PyDTrace_FUNCTION_ENTRY((char *)filename, (char *)funcname, lineno);
} }
static void static void
@ -5461,7 +5461,7 @@ dtrace_function_return(PyFrameObject *f)
funcname = PyUnicode_AsUTF8(f->f_code->co_name); funcname = PyUnicode_AsUTF8(f->f_code->co_name);
lineno = PyCode_Addr2Line(f->f_code, f->f_lasti); lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);
PyDTrace_FUNCTION_RETURN(filename, funcname, lineno); PyDTrace_FUNCTION_RETURN((char *)filename, (char *)funcname, lineno);
} }
/* DTrace equivalent of maybe_call_line_trace. */ /* DTrace equivalent of maybe_call_line_trace. */
@ -5493,7 +5493,7 @@ maybe_dtrace_line(PyFrameObject *frame,
co_name = PyUnicode_AsUTF8(frame->f_code->co_name); co_name = PyUnicode_AsUTF8(frame->f_code->co_name);
if (!co_name) if (!co_name)
co_name = "?"; co_name = "?";
PyDTrace_LINE(co_filename, co_name, line); PyDTrace_LINE((char *)co_filename, (char *)co_name, line);
} }
*instr_prev = frame->f_lasti; *instr_prev = frame->f_lasti;
} }

4
Python/import.c
View File

@ -1762,14 +1762,14 @@ import_find_and_load(PyThreadState *tstate, PyObject *abs_name)
} }
if (PyDTrace_IMPORT_FIND_LOAD_START_ENABLED()) if (PyDTrace_IMPORT_FIND_LOAD_START_ENABLED())
PyDTrace_IMPORT_FIND_LOAD_START(PyUnicode_AsUTF8(abs_name)); PyDTrace_IMPORT_FIND_LOAD_START((char *)PyUnicode_AsUTF8(abs_name));
mod = _PyObject_CallMethodIdObjArgs(interp->importlib, mod = _PyObject_CallMethodIdObjArgs(interp->importlib,
&PyId__find_and_load, abs_name, &PyId__find_and_load, abs_name,
interp->import_func, NULL); interp->import_func, NULL);
if (PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED()) if (PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED())
PyDTrace_IMPORT_FIND_LOAD_DONE(PyUnicode_AsUTF8(abs_name), PyDTrace_IMPORT_FIND_LOAD_DONE((char *)PyUnicode_AsUTF8(abs_name),
mod != NULL); mod != NULL);
if (import_time) { if (import_time) {

2
Python/sysmodule.c
View File

@ -204,7 +204,7 @@ PySys_Audit(const char *event, const char *argFormat, ...)
/* Dtrace USDT point */ /* Dtrace USDT point */
if (dtrace) { if (dtrace) {
PyDTrace_AUDIT(event, (void *)eventArgs); PyDTrace_AUDIT((char *)event, (void *)eventArgs);
} }
/* Call interpreter hooks */ /* Call interpreter hooks */

3
configure vendored
View File

@ -11386,7 +11386,6 @@ $as_echo "$with_dtrace" >&6; }
DTRACE= DTRACE=
DFLAGS=
DTRACE_HEADERS= DTRACE_HEADERS=
DTRACE_OBJS= DTRACE_OBJS=
@ -11452,7 +11451,7 @@ if ${ac_cv_dtrace_link+:} false; then :
else else
ac_cv_dtrace_link=no ac_cv_dtrace_link=no
echo 'BEGIN{}' > conftest.d echo 'BEGIN{}' > conftest.d
"$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ "$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
ac_cv_dtrace_link=yes ac_cv_dtrace_link=yes
fi fi

3
configure.ac
View File

@ -3500,7 +3500,6 @@ AC_SUBST(DFLAGS)
AC_SUBST(DTRACE_HEADERS) AC_SUBST(DTRACE_HEADERS)
AC_SUBST(DTRACE_OBJS) AC_SUBST(DTRACE_OBJS)
DTRACE= DTRACE=
DFLAGS=
DTRACE_HEADERS= DTRACE_HEADERS=
DTRACE_OBJS= DTRACE_OBJS=
@ -3521,7 +3520,7 @@ then
[ac_cv_dtrace_link], [dnl [ac_cv_dtrace_link], [dnl
ac_cv_dtrace_link=no ac_cv_dtrace_link=no
echo 'BEGIN{}' > conftest.d echo 'BEGIN{}' > conftest.d
"$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ "$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
ac_cv_dtrace_link=yes ac_cv_dtrace_link=yes
]) ])
if test "$ac_cv_dtrace_link" = "yes"; then if test "$ac_cv_dtrace_link" = "yes"; then