From 71ccfcc09fed24bb3b9115efe3a827b862d366de Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 18 Jul 2016 23:24:26 +0100 Subject: Add python_init_prof() --- src/plugins/python_api.c | 14 ++++++++++++++ src/plugins/python_api.h | 4 +--- src/plugins/python_plugins.c | 11 +---------- 3 files changed, 16 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/plugins/python_api.c b/src/plugins/python_api.c index e0d54c1c..01f7f8bd 100644 --- a/src/plugins/python_api.c +++ b/src/plugins/python_api.c @@ -872,6 +872,20 @@ python_api_init(void) #endif } +void +python_init_prof(void) +{ +#if PY_MAJOR_VERSION >= 3 + PyImport_AppendInittab("prof", python_api_init); + Py_Initialize(); + PyEval_InitThreads(); +#else + Py_Initialize(); + PyEval_InitThreads(); + python_api_init(); +#endif +} + static char* _python_plugin_name(void) { diff --git a/src/plugins/python_api.h b/src/plugins/python_api.h index 339ac06b..79280cc6 100644 --- a/src/plugins/python_api.h +++ b/src/plugins/python_api.h @@ -35,10 +35,8 @@ #ifndef PYTHON_API_H #define PYTHON_API_H -#include - void python_env_init(void); -PyMODINIT_FUNC python_api_init(void); +void python_init_prof(void); void python_shutdown(void); void python_command_callback(PluginCommand *command, gchar **args); diff --git a/src/plugins/python_plugins.c b/src/plugins/python_plugins.c index 670dd46f..15e244e1 100644 --- a/src/plugins/python_plugins.c +++ b/src/plugins/python_plugins.c @@ -68,18 +68,9 @@ _unref_module(PyObject *module) void python_env_init(void) { - loaded_modules = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)_unref_module); -#if PY_MAJOR_VERSION >= 3 - PyImport_AppendInittab("prof", python_api_init); - Py_Initialize(); - PyEval_InitThreads(); -#else - Py_Initialize(); - PyEval_InitThreads(); - python_api_init(); -#endif + python_init_prof(); const char *ver = Py_GetVersion(); cons_show("PYTHON: %s", ver); -- cgit 1.4.1-2-gfad0 dispatch.mu?h=main'>stats

path: root/archive/1.vm/static-dispatch.mu

blob: a0157d133c705f6c1dbb30375d1939ee2a6cd2d1 (plain) (blame)