Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* correctly init ref_count on driver settings handles

Browse Source 
* unload settings when ref_count is zero and boot device is available


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27969 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2008-10-11 14:58:12 +00:00
parent 85f9771aec
commit 3c4a3ce31c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/system/libroot/os/driver_settings.c
View File

@ -39,6 +39,7 @@
# include <kdriver_settings.h> # include <kdriver_settings.h>
# include <kernel.h> # include <kernel.h>
# include <boot/kernel_args.h> # include <boot/kernel_args.h>
# include <boot_device.h>
#endif #endif
#ifdef _BOOT_MODE #ifdef _BOOT_MODE
# include <boot/kernel_args.h> # include <boot/kernel_args.h>
@ -405,6 +406,7 @@ new_settings(char *buffer, const char *driverName)
handle->text = buffer; handle->text = buffer;
#ifdef _KERNEL_MODE #ifdef _KERNEL_MODE
handle->ref_count = 1;
strlcpy(handle->name, driverName, sizeof(handle->name)); strlcpy(handle->name, driverName, sizeof(handle->name));
#endif #endif
@ -644,6 +646,8 @@ driver_settings_init(kernel_args *args)
strlcpy(handle->name, settings->name, sizeof(handle->name)); strlcpy(handle->name, settings->name, sizeof(handle->name));
handle->magic = 0; handle->magic = 0;
handle->ref_count = 0;
// this triggers parsing the settings when they are actually used // this triggers parsing the settings when they are actually used
list_add_item(&sHandles, handle); list_add_item(&sHandles, handle);
@ -659,19 +663,18 @@ driver_settings_init(kernel_args *args)
status_t status_t
unload_driver_settings(void *handle) unload_driver_settings(void *_handle)
{ {
settings_handle *handle = (settings_handle *)_handle;
if (!check_handle(handle)) if (!check_handle(handle))
return B_BAD_VALUE; return B_BAD_VALUE;
#ifdef _KERNEL_MODE #ifdef _KERNEL_MODE
mutex_lock(&sLock); mutex_lock(&sLock);
// ToDo: as soon as "/boot" is accessible, we should start throwing away settings if (--handle->ref_count == 0 && gBootDevice > 0) {
#if 0 // don't unload an handle when /boot is not available
if (--handle->ref_count == 0) {
list_remove_link(&handle->link); list_remove_link(&handle->link);
} else } else
#endif
handle = NULL; handle = NULL;
mutex_unlock(&sLock); mutex_unlock(&sLock);
#endif #endif
@ -696,7 +699,10 @@ load_driver_settings(const char *driverName)
// see if we already have these settings loaded // see if we already have these settings loaded
mutex_lock(&sLock); mutex_lock(&sLock);
handle = find_driver_settings(driverName); handle = find_driver_settings(driverName);
if (handle != NULL) { if (handle != NULL && handle->ref_count == 0 && gBootDevice > 0) {
// an handle with a zero ref_count should be unloaded if /boot is available
free_settings(handle);
} else if (handle != NULL) {
handle->ref_count++; handle->ref_count++;
// we got it, now let's see if it already has been parsed // we got it, now let's see if it already has been parsed