Rename macro to PY_HAVE_PERF_TRAMPOLINE

python · miss-islington · Aug 30, 2022 · Aug 7, 2022 · Aug 20, 2022 · Aug 20, 2022
commit 3058cf0ce6d7f709683d734d65f9f7c37b542bff
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
@@ -83,7 +83,7 @@ extern int _PyPerfTrampoline_Init(int activate);
 extern int _PyPerfTrampoline_Fini(void);
 extern int _PyIsPerfTrampolineActive(void);
 extern PyStatus _PyPerfTrampoline_AfterFork_Child(void);
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
 extern _PyPerf_Callbacks _Py_perfmap_callbacks;
 #endif
 

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>
@@ -386,12 +386,12 @@ 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
@@ -404,7 +404,7 @@ _PyPerfTrampoline_GetCallbacks(_PyPerf_Callbacks *callbacks)
     if (callbacks == NULL) {
         return;
     }
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#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;
@@ -418,7 +418,7 @@ _PyPerfTrampoline_SetCallbacks(_PyPerf_Callbacks *callbacks)
     if (callbacks == NULL) {
         return -1;
     }
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
     if (trampoline_api.state) {
         _PyPerfTrampoline_Fini();
     }
@@ -434,7 +434,7 @@ _PyPerfTrampoline_SetCallbacks(_PyPerf_Callbacks *callbacks)
 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) {
@@ -471,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;
@@ -489,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,7 +1151,7 @@ init_interp_main(PyThreadState *tstate)
         }
 
 
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
         if (config->perf_profiling) {
             if (_PyPerfTrampoline_SetCallbacks(&_Py_perfmap_callbacks) < 0 ||
                     _PyPerfTrampoline_Init(config->perf_profiling) < 0) {

@@ -2008,7 +2008,7 @@ sys_activate_stack_trampoline_impl(PyObject *module, const char *backend)
 /*[clinic end generated code: output=5783cdeb51874b43 input=58d7244062b933a8]*/
 {
     if (strcmp(backend, "perf") == 0) {
-#ifdef _PY_HAVE_PERF_TRAMPOLINE
+#ifdef PY_HAVE_PERF_TRAMPOLINE
         _PyPerf_Callbacks cur_cb;
         _PyPerfTrampoline_GetCallbacks(&cur_cb);
         if (cur_cb.init_state != _Py_perfmap_callbacks.init_state) {
@@ -2059,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