Refactor the section-generated code into an evil macro

Signed-off-by: Pablo Galindo <[email protected]>

Author: pablogsal

Include/internal/pycore_runtime.h

@@ -25,6 +25,10 @@ extern "C" {
 #include "pycore_typeobject.h"      // struct _types_runtime_state
 #include "pycore_unicodeobject.h"   // struct _Py_unicode_runtime_state
 
+#if defined(__APPLE__)
+#  include <mach-o/loader.h>
+#endif
+
 struct _getargs_runtime_state {
     struct _PyArg_Parser *static_parsers;
 };
@@ -59,6 +63,37 @@ typedef struct _Py_AuditHookEntry {
     void *userData;
 } _Py_AuditHookEntry;
 
+// Macros to burn global values in custom sections so out-of-process
+// profilers can locate them easily
+
+#define GENERATE_DEBUG_SECTION(name, declaration) \
+    _GENERATE_DEBUG_SECTION_WINDOWS(name)         \
+    _GENERATE_DEBUG_SECTION_APPLE(name)           \
+    declaration                                   \
+    _GENERATE_DEBUG_SECTION_LINUX(name)           
+
+#if defined(MS_WINDOWS)
+#define _GENERATE_DEBUG_SECTION_WINDOWS(name)                       \
+    _Pragma(Py_STRINGIFY(section(Py_STRINGIFY(name), read, write))) \
+    __declspec(allocate(Py_STRINGIFY(name)))
+#else
+#define _GENERATE_DEBUG_SECTION_WINDOWS(name)
+#endif
+
+#if defined(__APPLE__)
+#define _GENERATE_DEBUG_SECTION_APPLE(name) \
+    __attribute__((section(SEG_DATA "," Py_STRINGIFY(name))))
+#else
+#define _GENERATE_DEBUG_SECTION_APPLE(name)
+#endif
+
+#if defined(__linux__) && (defined(__GNUC__) || defined(__clang__))
+#define _GENERATE_DEBUG_SECTION_LINUX(name) \
+    __attribute__((section("." Py_STRINGIFY(name))))
+#else
+#define _GENERATE_DEBUG_SECTION_LINUX(name)
+#endif
+
 typedef struct _Py_DebugOffsets {
     char cookie[8];
     uint64_t version;

Modules/_asynciomodule.c

@@ -16,10 +16,6 @@
 
 #include <stddef.h>               // offsetof()
 
-#if defined(__APPLE__)
-#  include <mach-o/loader.h>
-#endif
-
 /*[clinic input]
 module _asyncio
 [clinic start generated code]*/
@@ -116,21 +112,7 @@ typedef struct _Py_AsyncioModuleDebugOffsets {
   } asyncio_task_object;
 } Py_AsyncioModuleDebugOffsets;
 
-#if defined(MS_WINDOWS)
-
-#pragma section("AsyncioDebug", read, write)
-__declspec(allocate("AsyncioDebug"))
-
-#elif defined(__APPLE__)
-
-__attribute__((section(SEG_DATA ",AsyncioDebug")))
-
-#endif
-
-Py_AsyncioModuleDebugOffsets AsyncioDebug
-#if defined(__linux__) && (defined(__GNUC__) || defined(__clang__))
-    __attribute__((section(".AsyncioDebug")))
-#endif
+GENERATE_DEBUG_SECTION(AsyncioDebug, Py_AsyncioModuleDebugOffsets AsyncioDebug)
     = {.asyncio_task_object = {
            .size = sizeof(TaskObj),
            .task_name = offsetof(TaskObj, task_name),

Python/pylifecycle.c

@@ -43,10 +43,6 @@
 #  include <unistd.h>             // isatty()
 #endif
 
-#if defined(__APPLE__)
-#  include <mach-o/loader.h>
-#endif
-
 #ifdef HAVE_SIGNAL_H
 #  include <signal.h>             // SIG_IGN
 #endif
@@ -87,23 +83,7 @@ static void call_ll_exitfuncs(_PyRuntimeState *runtime);
 _Py_COMP_DIAG_PUSH
 _Py_COMP_DIAG_IGNORE_DEPR_DECLS
 
-#if defined(MS_WINDOWS)
-
-#pragma section("PyRuntime", read, write)
-__declspec(allocate("PyRuntime"))
-
-#elif defined(__APPLE__)
-
-__attribute__((
-    section(SEG_DATA ",PyRuntime")
-))
-
-#endif
-
-_PyRuntimeState _PyRuntime
-#if defined(__linux__) && (defined(__GNUC__) || defined(__clang__))
-__attribute__ ((section (".PyRuntime")))
-#endif
+GENERATE_DEBUG_SECTION(PyRuntime, _PyRuntimeState _PyRuntime)
 = _PyRuntimeState_INIT(_PyRuntime, _Py_Debug_Cookie);
 _Py_COMP_DIAG_POP