i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If B_KEEP_LOADED is specified, it's now guaranteed that B_MODULE_UNINIT is never

Browse Source 
called, and B_MODULE_INIT only once.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12342 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-04-12 08:42:06 +00:00
parent 643d10bb64
commit e6963ff534
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/module.c
+10 -6
View File
@@ -717,6 +717,8 @@ init_module(module *module)
static inline int static inline int
uninit_module(module *module) uninit_module(module *module)
{ {
TRACE(("uninit_module(%s)\n", module->name));
switch (module->state) { switch (module->state) {
case MODULE_QUERIED: case MODULE_QUERIED:
case MODULE_LOADED: case MODULE_LOADED:
@@ -1400,14 +1402,16 @@ put_module(const char *path)
recursive_lock_unlock(&sModulesLock); recursive_lock_unlock(&sModulesLock);
return B_BAD_VALUE; return B_BAD_VALUE;
} }
dec_module_ref_count(module);
if ((module->flags & B_KEEP_LOADED) == 0) {
dec_module_ref_count(module);
// ToDo: not sure if this should ever be called for keep_loaded modules... if (module->ref_count == 0)
if (module->ref_count == 0) uninit_module(module);
uninit_module(module);
if ((module->flags & B_BUILT_IN_MODULE) == 0) if ((module->flags & B_BUILT_IN_MODULE) == 0)
put_module_image(module->module_image); put_module_image(module->module_image);
}
recursive_lock_unlock(&sModulesLock); recursive_lock_unlock(&sModulesLock);
return B_OK; return B_OK;