empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Module unloading: Small cleanup

Browse source
This commit is contained in:
Ilari Liusvaara 2014-11-17 18:48:13 +02:00
parent 3b2298180a
commit 15c57d7a8c
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/interface/c-interface.cpp
View file

@ -1234,6 +1234,15 @@ no_parameters:
//Do the rest.
initialize_core2(entrypoint, sysregs, regions, types, cores, mod_id);
}
template<typename T> void cleanup_list(std::map<const void*, std::list<T*>>& list, const void* handle)
{
if(!list.count(handle))
return;
for(auto i : list[handle])
delete i;
list.erase(handle);
}
}
void lsnes_register_builtin_core(lsnes_core_func_t fn)
@ -1255,15 +1264,11 @@ void try_init_c_module(const loadlib::module& module)
void try_uninit_c_module(const loadlib::module& module)
{
if(bylib_core.count(&module)) for(auto i : bylib_core[&module]) i->uninstall_handler();
if(bylib_sysregion.count(&module)) for(auto i : bylib_sysregion[&module]) delete i;
if(bylib_region.count(&module)) for(auto i : bylib_region[&module]) delete i;
if(bylib_type.count(&module)) for(auto i : bylib_type[&module]) delete i;
if(bylib_core.count(&module)) for(auto i : bylib_core[&module]) delete i;
cleanup_list(bylib_sysregion, &module);
cleanup_list(bylib_region, &module);
cleanup_list(bylib_type, &module);
cleanup_list(bylib_core, &module);
if(bylib_init.count(&module)) delete bylib_init[&module];
bylib_core.erase(&module);
bylib_type.erase(&module);
bylib_region.erase(&module);
bylib_sysregion.erase(&module);
bylib_init.erase(&module);
}