qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-14 00:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[plugin] Ensure plugins get unloaded during shutdown

Browse source 
This included pre-registered (static) plugins.

Surprisingly, PI_Shutdown was never called.
This commit is contained in:
Bill Currie 2022-05-12 19:52:00 +09:00
parent 4562e1ea6c
commit bc674657cb
3 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/QF/plugin.h
View file

@ -107,7 +107,6 @@ plugin_t *PI_LoadPlugin (const char *, const char *);
qboolean PI_UnloadPlugin (plugin_t *); qboolean PI_UnloadPlugin (plugin_t *);
void PI_RegisterPlugins (plugin_list_t *); void PI_RegisterPlugins (plugin_list_t *);
void PI_Init (void); void PI_Init (void);
void PI_Shutdown (void);
// FIXME: we need a generic function to initialize unused fields // FIXME: we need a generic function to initialize unused fields

44
libs/util/plugin.c
View file

@ -235,27 +235,8 @@ PI_Plugin_Unload_f (void)
PI_UnloadPlugin (pi); PI_UnloadPlugin (pi);
} }
/* static void
PI_Init PI_Shutdown (void *data)
Eventually this function will likely initialize libltdl. It doesn't, yet,
since we aren't using libltdl yet.
*/
VISIBLE void
PI_Init (void)
{
PI_InitCvars ();
registered_plugins = Hash_NewTable (253, plugin_get_key, 0, 0, 0);
loaded_plugins = Hash_NewTable(253, loaded_plugin_get_key,
loaded_plugin_delete, 0, 0);
Cmd_AddCommand("plugin_load", PI_Plugin_Load_f,
"load the plugin of the given type name and name");
Cmd_AddCommand("plugin_unload", PI_Plugin_Unload_f,
"unload the plugin of the given type name and name");
}
void
PI_Shutdown (void)
{ {
void **elems, **cur; void **elems, **cur;
@ -266,7 +247,28 @@ PI_Shutdown (void)
free (elems); free (elems);
Hash_DelTable (loaded_plugins); Hash_DelTable (loaded_plugins);
Hash_DelTable (registered_plugins);
}
/*
PI_Init
Eventually this function will likely initialize libltdl. It doesn't, yet,
since we aren't using libltdl yet.
*/
VISIBLE void
PI_Init (void)
{
Sys_RegisterShutdown (PI_Shutdown, 0);
PI_InitCvars ();
registered_plugins = Hash_NewTable (253, plugin_get_key, 0, 0, 0);
loaded_plugins = Hash_NewTable(253, loaded_plugin_get_key,
loaded_plugin_delete, 0, 0);
Cmd_AddCommand("plugin_load", PI_Plugin_Load_f,
"load the plugin of the given type name and name");
Cmd_AddCommand("plugin_unload", PI_Plugin_Unload_f,
"unload the plugin of the given type name and name");
} }
VISIBLE plugin_t * VISIBLE plugin_t *

4
libs/video/renderer/r_init.c
View file

@ -76,9 +76,7 @@ static U void (*const r_scrapdelete)(rscrap_t *) = R_ScrapDelete;
static void static void
R_shutdown (void *data) R_shutdown (void *data)
{ {
if (vidrendmodule->functions->general->shutdown) { PI_UnloadPlugin (vidrendmodule);
vidrendmodule->functions->general->shutdown ();
}
} }
VISIBLE void VISIBLE void