qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

mindHog's plugin global symbol handling patch so his python plugin can work

Browse source 
(reloads the plugin with RTLD_GLOBAL if the plugin requests it).
This commit is contained in:
Bill Currie 2003-04-30 02:14:44 +00:00
parent ff299c347b
commit 09f3f1ea26
2 changed files with 52 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/QF/plugin/general.h
View file

@ -44,7 +44,10 @@ typedef struct general_func_s {
P_Shutdown p_Shutdown; P_Shutdown p_Shutdown;
} general_funcs_t; } general_funcs_t;
#define PIF_GLOBAL 1
typedef struct general_data_s { typedef struct general_data_s {
int flag;
} general_data_t; } general_data_t;
#endif // __QF_plugin_general_h_ #endif // __QF_plugin_general_h_

54
libs/util/plugin.c
View file

@ -117,12 +117,17 @@ pi_get_symbol (void *handle, const char *name)
} }
static void * static void *
pi_open_lib (const char *name) pi_open_lib (const char *name, int global_syms)
{ {
void *dlhand; void *dlhand;
int flags = RTLD_NOW;
#if defined(HAVE_DLOPEN) #if defined(HAVE_DLOPEN)
if (!(dlhand = dlopen (name, RTLD_NOW))) { # if defined(RTLD_GLOBAL)
if (global_syms)
flags |= RTLD_GLOBAL;
# endif
if (!(dlhand = dlopen (name, flags))) {
pi_error = dlerror (); pi_error = dlerror ();
return 0; return 0;
} }
@ -185,6 +190,10 @@ PI_Plugin_Load_f (void)
pi = PI_LoadPlugin (type, name); pi = PI_LoadPlugin (type, name);
if (!pi) if (!pi)
Sys_Printf ("Error loading plugin %s %s\n", type, name); Sys_Printf ("Error loading plugin %s %s\n", type, name);
else if (pi->functions && pi->functions->general &&
pi->functions->general->p_Init)
pi->functions->general->p_Init ();
} }
static void static void
@ -284,7 +293,7 @@ PI_LoadPlugin (const char *type, const char *name)
pi_realname (realname, sizeof (realname), type, pi_realname (realname, sizeof (realname), type,
(tmpname ? tmpname + 1 : name)); (tmpname ? tmpname + 1 : name));
if (!(dlhand = pi_open_lib (realname))) { if (!(dlhand = pi_open_lib (realname, 0))) {
// lib not found // lib not found
Sys_Printf ("Could not load plugin \"%s\".\n", realname); Sys_Printf ("Could not load plugin \"%s\".\n", realname);
Sys_DPrintf ("Reason: \"%s\".\n", pi_error); Sys_DPrintf ("Reason: \"%s\".\n", pi_error);
@ -309,9 +318,44 @@ PI_LoadPlugin (const char *type, const char *name)
} }
} }
} }
}
if (!(plugin = plugin_info ())) { // Something went badly wrong // get the plugin data structure
if (!(plugin = plugin_info ())) {
pi_close_lib (dlhand);
Sys_Printf ("Something went badly wrong.\n");
return NULL;
}
#if defined(HAVE_DLOPEN) && defined(RTLD_GLOBAL)
// check if it wants its syms to be global
if (plugin->data->general->flag & PIF_GLOBAL) {
// do the whole thing over again with global syms
pi_close_lib (dlhand);
// try to reopen
if (!(dlhand = pi_open_lib (realname, 1))) {
Sys_Printf ("Error reopening plugin \"%s\".\n", realname);
Sys_DPrintf ("Reason: \"%s\".\n", pi_error);
return NULL;
}
// get the plugin_info func pointer
if (!(plugin_info = pi_get_symbol (dlhand, plugin_info_name))) {
pi_close_lib (dlhand);
Sys_Printf ("Plugin info function missing on reload\n");
return NULL;
}
// get the plugin data structure
if (!(plugin = plugin_info ())) {
pi_close_lib (dlhand);
Sys_Printf ("Something went badly wrong on module reload\n");
return NULL;
}
}
#endif
} else if (!(plugin = plugin_info ())) { // Something went badly wrong
pi_close_lib (dlhand); pi_close_lib (dlhand);
Sys_Printf ("Something went badly wrong.\n"); Sys_Printf ("Something went badly wrong.\n");
return NULL; return NULL;