Address review comments

Include/internal/pycore_ceval.h

@@ -67,6 +67,7 @@ extern PyObject* _PyEval_BuiltinsFromGlobals(
 
 extern int _PyPerfTrampoline_Init(int activate);
 extern int _PyPerfTrampoline_Fini(void);
+extern int _PyIsPerfTrampolineActive(void);
 extern PyStatus _PyPerfTrampoline_AfterFork_Child(void);
 
 static inline PyObject*

Lib/test/test_perf_profiler.py

@@ -3,6 +3,7 @@
 import re
 import sys
 import sysconfig
+import os
 from test.support.script_helper import make_script
 from test.support.os_helper import temp_dir
 from test.support import check_sanitizer
@@ -11,20 +12,13 @@
 def get_perf_version():
     try:
         cmd = ["perf", "--version"]
-        proc = subprocess.Popen(
+        proc = subprocess.run(
             cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True
         )
-        with proc:
-            version, stderr = proc.communicate()
-
-        if proc.returncode:
-            raise Exception(
-                f"Command {' '.join(cmd)!r} failed "
-                f"with exit code {proc.returncode}: "
-                f"stdout={version!r} stderr={stderr!r}"
-            )
-    except OSError:
+    except subprocess.SubprocessError:
         raise unittest.SkipTest("Couldn't find perf on the path")
+
+    version = proc.stdout
 
     match = re.search(r"^perf version\s+(.*)", version)
     if match is None:
@@ -50,32 +44,22 @@ def run_perf(cwd, *args, **env_vars):
         env.update(env_vars)
     else:
         env = None
-    # -nx: Do not execute commands from any .gdbinit initialization files
-    #      (issue #22188)
     output_file = cwd + "/perf_output.perf"
     base_cmd = ("perf", "record", "-g", "--call-graph=fp", "-o", output_file, "--")
-    proc = subprocess.Popen(
+    proc = subprocess.run(
         base_cmd + args,
-        # Redirect stdin to prevent GDB from messing with
-        # the terminal settings
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
         env=env,
     )
-    with proc:
-        out, err = proc.communicate()
     base_cmd = ("perf", "script")
-    proc = subprocess.Popen(
+    proc = subprocess.run(
         ("perf", "script", "-i", output_file),
-        # Redirect stdin to prevent GDB from messing with
-        # the terminal settings
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
         env=env,
     )
-    with proc:
-        out, err = proc.communicate()
-    return out.decode("utf-8", "replace"), err.decode("utf-8", "replace")
+    return proc.stdout.decode("utf-8", "replace"), proc.stderr.decode("utf-8", "replace")
 
 
 class TestPerfProfiler(unittest.TestCase):

Objects/perf_trampoline.c

@@ -41,7 +41,7 @@ new_code_arena(void)
     assert(mem_size % sysconf(_SC_PAGESIZE) == 0);
     char *memory = mmap(NULL,  // address
                         mem_size,
-                        PROT_READ | PROT_WRITE | PROT_EXEC,
+                        PROT_READ | PROT_WRITE,
                         MAP_PRIVATE | MAP_ANONYMOUS,
                         -1,  // fd (not used here)
                         0);  // offset (not used here)
@@ -53,8 +53,8 @@ new_code_arena(void)
     void *end = &_Py_trampoline_func_end;
     size_t code_size = end - start;
 
-    long n_copies = mem_size / code_size;
-    for (int i = 0; i < n_copies; i++) {
+    size_t n_copies = mem_size / code_size;
+    for (size_t i = 0; i < n_copies; i++) {
         memcpy(memory + i * code_size, start, code_size * sizeof(char));
     }
 
@@ -144,7 +144,8 @@ perf_map_write_entry(FILE *method_file, const void *code_addr,
                      unsigned int code_size, const char *entry,
                      const char *file)
 {
-    fprintf(method_file, "%lx %x py::%s:%s\n", (unsigned long)code_addr,
+    assert(entry != NULL && file != NULL);
+    fprintf(method_file, "%p %x py::%s:%s\n", code_addr,
             code_size, entry, file);
     fflush(method_file);
 }
@@ -157,17 +158,17 @@ py_trampoline_evaluator(PyThreadState *ts, _PyInterpreterFrame *frame,
     py_trampoline f = NULL;
     _PyCode_GetExtra((PyObject *)co, extra_code_index, (void **)&f);
     if (f == NULL) {
+        FILE *pfile = perf_map_get_file();
+        if (pfile == NULL) {
+            return NULL;
+        }
         if (extra_code_index == -1) {
             extra_code_index = _PyEval_RequestCodeExtraIndex(NULL);
         }
         py_trampoline new_trampoline = compile_trampoline();
         if (new_trampoline == NULL) {
             return NULL;
         }
-        FILE *pfile = perf_map_get_file();
-        if (pfile == NULL) {
-            return NULL;
-        }
         perf_map_write_entry(pfile, new_trampoline, code_arena->code_size,
                              PyUnicode_AsUTF8(co->co_qualname),
                              PyUnicode_AsUTF8(co->co_filename));
@@ -178,7 +179,19 @@ py_trampoline_evaluator(PyThreadState *ts, _PyInterpreterFrame *frame,
     assert(f != NULL);
     return f(_PyEval_EvalFrameDefault, ts, frame, throw);
 }
+#endif // HAVE_PERF_TRAMPOLINE
+
+int
+_PyIsPerfTrampolineActive(void)
+{
+#ifdef HAVE_PERF_TRAMPOLINE
+    PyThreadState *tstate = _PyThreadState_GET();
+    return tstate->interp->eval_frame == py_trampoline_evaluator;
 #endif
+    return 0;
+}
+
+
 
 int
 _PyPerfTrampoline_Init(int activate)
@@ -214,6 +227,7 @@ _PyPerfTrampoline_AfterFork_Child(void)
 #ifdef HAVE_PERF_TRAMPOLINE
     // close file in child.
     perf_map_close(perf_map_file);
+    perf_map_file = NULL;
 #endif
     return PyStatus_Ok();
 }

Python/initconfig.c

@@ -1803,7 +1803,7 @@ config_read_complex_options(PyConfig *config)
             return status;
         }
     }
-    if (config->tracemalloc < 0) {
+    if (config->perf_profiling < 0) {
         status = config_init_perf_profiling(config);
         if (_PyStatus_EXCEPTION(status)) {
             return status;

Python/sysmodule.c

@@ -1995,14 +1995,14 @@ sys_getandroidapilevel_impl(PyObject *module)
 #endif   /* ANDROID_API_LEVEL */
 
 /*[clinic input]
-sys._activate_perf_trampoline
+sys.activate_perf_trampoline
 
 Activate the perf profiler trampoline.
 [clinic start generated code]*/
 
 static PyObject *
-sys__activate_perf_trampoline_impl(PyObject *module)
-/*[clinic end generated code: output=248f6dc862887fd0 input=67667f43ffabb1e4]*/
+sys_activate_perf_trampoline_impl(PyObject *module)
+/*[clinic end generated code: output=7f97c60d4f580b85 input=666a2d744a97a220]*/
 {
     if  (_PyPerfTrampoline_Init(1) < 0) {
         return NULL;
@@ -2012,21 +2012,39 @@ sys__activate_perf_trampoline_impl(PyObject *module)
 
 
 /*[clinic input]
-sys._deactivate_perf_trampoline
+sys.deactivate_perf_trampoline
 
-Activate the perf profiler trampoline.
+Dectivate the perf profiler trampoline.
 [clinic start generated code]*/
 
 static PyObject *
-sys__deactivate_perf_trampoline_impl(PyObject *module)
-/*[clinic end generated code: output=7dde745eb7ba5e54 input=3d4fbb4aef9ad3d8]*/
+sys_deactivate_perf_trampoline_impl(PyObject *module)
+/*[clinic end generated code: output=5ba2f93711f85b6e input=d85cf6e3cd37d81e]*/
 {
     if  (_PyPerfTrampoline_Init(0) < 0) {
         return NULL;
     }
     Py_RETURN_NONE;
 }
 
+/*[clinic input]
+sys.is_perf_trampoline_active
+
+Returns *True* if the perf profiler trampoline is active.
+[clinic start generated code]*/
+
+static PyObject *
+sys_is_perf_trampoline_active_impl(PyObject *module)
+/*[clinic end generated code: output=7bbf80001165b590 input=59f045e52c228654]*/
+{
+#ifdef HAVE_PERF_TRAMPOLINE
+    if (_PyIsPerfTrampolineActive()) {
+        Py_RETURN_TRUE;
+    }
+#endif
+    Py_RETURN_FALSE;
+}
+
 
 
 
@@ -2083,8 +2101,9 @@ static PyMethodDef sys_methods[] = {
      METH_VARARGS | METH_KEYWORDS, set_asyncgen_hooks_doc},
     SYS_GET_ASYNCGEN_HOOKS_METHODDEF
     SYS_GETANDROIDAPILEVEL_METHODDEF
-    SYS__ACTIVATE_PERF_TRAMPOLINE_METHODDEF
-    SYS__DEACTIVATE_PERF_TRAMPOLINE_METHODDEF
+    SYS_ACTIVATE_PERF_TRAMPOLINE_METHODDEF
+    SYS_IS_PERF_TRAMPOLINE_ACTIVE_METHODDEF
+    SYS_DEACTIVATE_PERF_TRAMPOLINE_METHODDEF
     SYS_UNRAISABLEHOOK_METHODDEF
 #ifdef Py_STATS
     SYS__STATS_ON_METHODDEF