aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Store python modules on load

Browse Source
This commit is contained in:
James Booth 2016-07-09 23:42:09 +01:00
parent 7776c1494a
commit d24a0508f4
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/python_plugins.c
View File

@ -43,7 +43,7 @@
#include "ui/ui.h" #include "ui/ui.h"
static PyThreadState *thread_state; static PyThreadState *thread_state;
static GHashTable *unloaded_modules; static GHashTable *loaded_modules;
void void
allow_python_threads() allow_python_threads()
@ -57,10 +57,16 @@ disable_python_threads()
PyEval_RestoreThread(thread_state); PyEval_RestoreThread(thread_state);
} }
static void
_unref_module(PyObject *module)
{
Py_XDECREF(module);
}
void void
python_env_init(void) python_env_init(void)
{ {
unloaded_modules = g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL); loaded_modules = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)_unref_module);
Py_Initialize(); Py_Initialize();
PyEval_InitThreads(); PyEval_InitThreads();
@ -83,14 +89,15 @@ ProfPlugin*
python_plugin_create(const char *const filename) python_plugin_create(const char *const filename)
{ {
disable_python_threads(); disable_python_threads();
gchar *module_name = g_strndup(filename, strlen(filename) - 3);
PyObject *p_module = g_hash_table_lookup(unloaded_modules, filename); PyObject *p_module = g_hash_table_lookup(loaded_modules, filename);
if (p_module) { if (p_module) {
p_module = PyImport_ReloadModule(p_module); p_module = PyImport_ReloadModule(p_module);
g_hash_table_remove(unloaded_modules, filename);
} else { } else {
gchar *module_name = g_strndup(filename, strlen(filename) - 3);
p_module = PyImport_ImportModule(module_name); p_module = PyImport_ImportModule(module_name);
g_hash_table_insert(loaded_modules, strdup(filename), p_module);
g_free(module_name);
} }
python_check_error(); python_check_error();
@ -128,12 +135,10 @@ python_plugin_create(const char *const filename)
plugin->on_contact_presence = python_on_contact_presence_hook; plugin->on_contact_presence = python_on_contact_presence_hook;
plugin->on_chat_win_focus = python_on_chat_win_focus_hook; plugin->on_chat_win_focus = python_on_chat_win_focus_hook;
plugin->on_room_win_focus = python_on_room_win_focus_hook; plugin->on_room_win_focus = python_on_room_win_focus_hook;
g_free(module_name);
allow_python_threads(); allow_python_threads();
return plugin; return plugin;
} else { } else {
g_free(module_name);
allow_python_threads(); allow_python_threads();
return NULL; return NULL;
} }
@ -921,8 +926,6 @@ python_plugin_destroy(ProfPlugin *plugin)
{ {
disable_python_threads(); disable_python_threads();
callbacks_remove(plugin->name); callbacks_remove(plugin->name);
g_hash_table_insert(unloaded_modules, strdup(plugin->name), plugin->module);
// Py_XDECREF(plugin->module);
free(plugin->name); free(plugin->name);
free(plugin); free(plugin);
allow_python_threads(); allow_python_threads();
@ -932,5 +935,6 @@ void
python_shutdown(void) python_shutdown(void)
{ {
disable_python_threads(); disable_python_threads();
g_hash_table_destroy(loaded_modules);
Py_Finalize(); Py_Finalize();
} }