python · miss-islington · Aug 30, 2022 · Aug 7, 2022 · Aug 20, 2022 · Aug 20, 2022
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
@@ -67,28 +67,25 @@ extern PyObject* _PyEval_BuiltinsFromGlobals(
 
 // Trampoline API
 
-typedef void* (*trampoline_state_init)(void);
-typedef void (*trampoline_state_write)(void* state, const void *code_addr,
-                                       unsigned int code_size, PyCodeObject* code);
-typedef int (*trampoline_state_free)(void* state);
-extern int _PyPerfTrampoline_SetCallbacks(
-    trampoline_state_init init_state,
-    trampoline_state_write write_state,
-    trampoline_state_free free_state
-);
-extern void _PyPerfTrampoline_GetCallbacks(
-    trampoline_state_init *init_state,
-    trampoline_state_write *write_state,
-    trampoline_state_free *free_state
-);
+typedef struct {
+    // Callback to initialize the trampoline state
+    void* (*init_state)(void);
+    // Callback to register every trampoline being created
+    void (*write_state)(void* state, const void *code_addr,
+                        unsigned int code_size, PyCodeObject* code);
+    // Callback to free the trampoline state
+    int (*free_state)(void* state);
+} _PyPerf_Callbacks;
+
+extern int _PyPerfTrampoline_SetCallbacks(_PyPerf_Callbacks *);
+extern void _PyPerfTrampoline_GetCallbacks(_PyPerf_Callbacks *);
 extern int _PyPerfTrampoline_Init(int activate);
 extern int _PyPerfTrampoline_Fini(void);
 extern int _PyIsPerfTrampolineActive(void);
 extern PyStatus _PyPerfTrampoline_AfterFork_Child(void);
-
-extern void* _Py_perf_map_get_file(void);
-extern void _Py_perf_map_write_entry(void*, const void*, unsigned int, PyCodeObject*);
-extern int _Py_perf_map_close(void*);
+#ifdef PY_HAVE_PERF_TRAMPOLINE
+extern _PyPerf_Callbacks _Py_perfmap_callbacks;
+#endif
 
 static inline PyObject*
 _PyEval_EvalFrame(PyThreadState *tstate, struct _PyInterpreterFrame *frame, int throwflag)

diff --git a/Lib/test/test_perf_profiler.py b/Lib/test/test_perf_profiler.py
@@ -18,7 +18,7 @@
 
 
 def supports_trampoline_profiling():
-    perf_trampoline = sysconfig.get_config_var("PERF_TRAMPOLINE_SUPPORT")
+    perf_trampoline = sysconfig.get_config_var("PY_HAVE_PERF_TRAMPOLINE")
     if not perf_trampoline:
         return False
     return int(perf_trampoline) == 1

@@ -54,7 +54,6 @@ DTRACE=         @DTRACE@
 DFLAGS=         @DFLAGS@
 DTRACE_HEADERS= @DTRACE_HEADERS@
 DTRACE_OBJS=    @DTRACE_OBJS@
-PERF_TRAMPOLINE_SUPPORT= @PERF_TRAMPOLINE_SUPPORT@
 
 GNULD=		@GNULD@
 

diff --git a/Objects/perf_trampoline.c b/Objects/perf_trampoline.c
@@ -140,7 +140,7 @@ typedef enum {
     PERF_STATUS_OK = 1,       // Perf trampoline is ready to be executed
 } perf_status_t;
 
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
 
 #include <fcntl.h>
 #include <stdio.h>
@@ -176,11 +176,10 @@ struct code_arena_st {
 typedef struct code_arena_st code_arena_t;
 
 struct trampoline_api_st {
-    trampoline_state_init
-        init_state;  // Callback to initialize the trampoline state
-    trampoline_state_write
-        write_state;  // Callback to register every trampoline being created
-    trampoline_state_free free_state;  // Callback to free the trampoline state
+    void* (*init_state)(void);
+    void (*write_state)(void* state, const void *code_addr,
+                        unsigned int code_size, PyCodeObject* code);
+    int (*free_state)(void* state);
     void *state;
 };
 
@@ -192,8 +191,9 @@ static code_arena_t *code_arena;
 static trampoline_api_t trampoline_api;
 
 static FILE *perf_map_file;
-void *
-_Py_perf_map_get_file(void)
+
+static void *
+perf_map_get_file(void)
 {
     if (perf_map_file) {
         return perf_map_file;
@@ -221,8 +221,8 @@ _Py_perf_map_get_file(void)
     return perf_map_file;
 }
 
-int
-_Py_perf_map_close(void *state)
+static int
+perf_map_close(void *state)
 {
     FILE *fp = (FILE *)state;
     int ret = 0;
@@ -234,8 +234,8 @@ _Py_perf_map_close(void *state)
     return ret;
 }
 
-void
-_Py_perf_map_write_entry(void *state, const void *code_addr,
+static void
+perf_map_write_entry(void *state, const void *code_addr,
                          unsigned int code_size, PyCodeObject *co)
 {
     assert(state != NULL);
@@ -257,6 +257,12 @@ _Py_perf_map_write_entry(void *state, const void *code_addr,
     fflush(method_file);
 }
 
+_PyPerf_Callbacks _Py_perfmap_callbacks = {
+    &perf_map_get_file,
+    &perf_map_write_entry,
+    &perf_map_close
+};
+
 static int
 new_code_arena(void)
 {
@@ -380,49 +386,45 @@ py_trampoline_evaluator(PyThreadState *ts, _PyInterpreterFrame *frame,
     // Something failed, fall back to the default evaluator.
     return _PyEval_EvalFrameDefault(ts, frame, throw);
 }
-#endif  // _PY_HAVE_PERF_TRAMPOLINE
+#endif  // PY_HAVE_PERF_TRAMPOLINE
 
 int
 _PyIsPerfTrampolineActive(void)
 {
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
     PyThreadState *tstate = _PyThreadState_GET();
     return tstate->interp->eval_frame == py_trampoline_evaluator;
 #endif
     return 0;
 }
 
 void
-_PyPerfTrampoline_GetCallbacks(trampoline_state_init *init_state,
-                               trampoline_state_write *write_state,
-                               trampoline_state_free *free_state)
+_PyPerfTrampoline_GetCallbacks(_PyPerf_Callbacks *callbacks)
 {
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
-    if (init_state) {
-        *init_state = trampoline_api.init_state;
-    }
-    if (write_state) {
-        *write_state = trampoline_api.write_state;
-    }
-    if (free_state) {
-        *free_state = trampoline_api.free_state;
+    if (callbacks == NULL) {
+        return;
     }
+#ifdef PY_HAVE_PERF_TRAMPOLINE
+    callbacks->init_state = trampoline_api.init_state;
+    callbacks->write_state = trampoline_api.write_state;
+    callbacks->free_state = trampoline_api.free_state;
 #endif
     return;
 }
 
 int
-_PyPerfTrampoline_SetCallbacks(trampoline_state_init init_state,
-                               trampoline_state_write write_state,
-                               trampoline_state_free free_state)
+_PyPerfTrampoline_SetCallbacks(_PyPerf_Callbacks *callbacks)
 {
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+    if (callbacks == NULL) {
+        return -1;
+    }
+#ifdef PY_HAVE_PERF_TRAMPOLINE
     if (trampoline_api.state) {
         _PyPerfTrampoline_Fini();
     }
-    trampoline_api.init_state = init_state;
-    trampoline_api.write_state = write_state;
-    trampoline_api.free_state = free_state;
+    trampoline_api.init_state = callbacks->init_state;
+    trampoline_api.write_state = callbacks->write_state;
+    trampoline_api.free_state = callbacks->free_state;
     trampoline_api.state = NULL;
     perf_status = PERF_STATUS_OK;
 #endif
@@ -432,7 +434,7 @@ _PyPerfTrampoline_SetCallbacks(trampoline_state_init init_state,
 int
 _PyPerfTrampoline_Init(int activate)
 {
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
     PyThreadState *tstate = _PyThreadState_GET();
     if (tstate->interp->eval_frame &&
         tstate->interp->eval_frame != py_trampoline_evaluator) {
@@ -469,7 +471,7 @@ _PyPerfTrampoline_Init(int activate)
 int
 _PyPerfTrampoline_Fini(void)
 {
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
     PyThreadState *tstate = _PyThreadState_GET();
     if (tstate->interp->eval_frame == py_trampoline_evaluator) {
         tstate->interp->eval_frame = NULL;
@@ -487,7 +489,7 @@ _PyPerfTrampoline_Fini(void)
 PyStatus
 _PyPerfTrampoline_AfterFork_Child(void)
 {
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
     // Restart trampoline in file in child.
     int was_active = _PyIsPerfTrampolineActive();
     _PyPerfTrampoline_Fini();

@@ -1151,11 +1151,10 @@ init_interp_main(PyThreadState *tstate)
         }
 
 
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
         if (config->perf_profiling) {
-            if (_PyPerfTrampoline_SetCallbacks(
-                    _Py_perf_map_get_file, _Py_perf_map_write_entry, _Py_perf_map_close
-                ) < 0 || _PyPerfTrampoline_Init(config->perf_profiling) < 0) {
+            if (_PyPerfTrampoline_SetCallbacks(&_Py_perfmap_callbacks) < 0 ||
+                    _PyPerfTrampoline_Init(config->perf_profiling) < 0) {
                 return _PyStatus_ERR("can't initialize the perf trampoline");
             }
         }

@@ -2008,15 +2008,11 @@ sys_activate_stack_trampoline_impl(PyObject *module, const char *backend)
 /*[clinic end generated code: output=5783cdeb51874b43 input=b09020e3a17c78c5]*/
 {
     if (strcmp(backend, "perf") == 0) {
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
-        trampoline_state_init init_callback = NULL; 
-        _PyPerfTrampoline_GetCallbacks(&init_callback, NULL, NULL);
-        if (init_callback != _Py_perf_map_get_file) {
-            if ( _PyPerfTrampoline_SetCallbacks(
-                    _Py_perf_map_get_file,
-                    _Py_perf_map_write_entry,
-                    _Py_perf_map_close
-                ) < 0 ) {
+#ifdef PY_HAVE_PERF_TRAMPOLINE
+        _PyPerf_Callbacks cur_cb;
+        _PyPerfTrampoline_GetCallbacks(&cur_cb);
+        if (cur_cb.init_state != _Py_perfmap_callbacks.init_state) {
+            if (_PyPerfTrampoline_SetCallbacks(&_Py_perfmap_callbacks) < 0 ) {
                 PyErr_SetString(PyExc_ValueError, "can't activate perf trampoline");
                 return NULL;
             }
@@ -2063,7 +2059,7 @@ static PyObject *
 sys_is_stack_trampoline_active_impl(PyObject *module)
 /*[clinic end generated code: output=ab2746de0ad9d293 input=061fa5776ac9dd59]*/
 {
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
     if (_PyIsPerfTrampolineActive()) {
         Py_RETURN_TRUE;
     }

@@ -3435,12 +3435,9 @@ AS_CASE([$PLATFORM_TRIPLET],
 )
 AC_MSG_RESULT([$perf_trampoline])
 
-AC_SUBST(PERF_TRAMPOLINE_SUPPORT)
-PERF_TRAMPOLINE_SUPPORT=
 AS_VAR_IF([perf_trampoline], [yes], [
-  AC_DEFINE([_PY_HAVE_PERF_TRAMPOLINE], [1], [Define to 1 if you have the perf trampoline.])
+  AC_DEFINE([PY_HAVE_PERF_TRAMPOLINE], [1], [Define to 1 if you have the perf trampoline.])
   PERF_TRAMPOLINE_OBJ=Objects/asm_trampoline.o
-  PERF_TRAMPOLINE_SUPPORT=1
 
   dnl perf needs frame pointers for unwinding, include compiler option in debug builds
   AS_VAR_IF([Py_DEBUG], [true], [

diff --git a/pyconfig.h.in b/pyconfig.h.in
@@ -1568,6 +1568,9 @@
 /* Define if you want to coerce the C locale to a UTF-8 based locale */
 #undef PY_COERCE_C_LOCALE
 
+/* Define to 1 if you have the perf trampoline. */
+#undef PY_HAVE_PERF_TRAMPOLINE
+
 /* Define to 1 to build the sqlite module with loadable extensions support. */
 #undef PY_SQLITE_ENABLE_LOAD_EXTENSION
 
@@ -1799,9 +1802,6 @@
 /* framework name */
 #undef _PYTHONFRAMEWORK
 
-/* Define to 1 if you have the perf trampoline. */
-#undef _PY_HAVE_PERF_TRAMPOLINE
-
 /* Define to force use of thread-safe errno, h_errno, and other functions */
 #undef _REENTRANT