Initialize the configuration R/W lock statically

The lock is static anyway (and so is the data).

diff --git a/src/config/core.c b/src/config/core.c
index d5750614a15674176e609abd283c662cb661d902..66ba61e013fa1223cc936d1120ea1ee46a55f9bc 100644 (file)
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -36,7 +36,7 @@
 #include "configuration.h"
 #include "modules/modules.h"
 
-vlc_rwlock_t config_lock;
+vlc_rwlock_t config_lock = VLC_STATIC_RWLOCK;
 
 static inline char *strdupnull (const char *src)
 {

diff --git a/src/modules/bank.c b/src/modules/bank.c
index fa5b7f1d50e71675838c1c6b8b80fd0971638554..ece0f8d0d2ac28877b953c523d7868c5d5ca7e16 100644 (file)
--- a/src/modules/bank.c
+++ b/src/modules/bank.c
@@ -92,7 +92,6 @@ void module_InitBank (void)
         if (likely(module != NULL))
             module_StoreBank (module);
 
-        vlc_rwlock_init (&config_lock);
         config_SortConfig ();
     }
     modules.usage++;
@@ -126,7 +125,6 @@ void module_EndBank (bool b_plugins)
     if (--modules.usage == 0)
     {
         config_UnsortConfig ();
-        vlc_rwlock_destroy (&config_lock);
         head = modules.head;
         modules.head = NULL;
     }

diff --git a/src/win32/thread.c b/src/win32/thread.c
index 99e54b53128a3eed4c3c4eeb9aa475940656632f..965db9906e05d3ebbb66ad1ad61515c8dbf095ac 100644 (file)
--- a/src/win32/thread.c
+++ b/src/win32/thread.c
@@ -39,6 +39,7 @@
 #ifdef UNDER_CE
 # include <mmsystem.h>
 #endif
+#include "config/configuration.h"
 
 static vlc_threadvar_t thread_key;
 
@@ -79,9 +80,11 @@ BOOL WINAPI DllMain (HINSTANCE hinstDll, DWORD fdwReason, LPVOID lpvReserved)
                 return FALSE;
             InitializeCriticalSection (&super_mutex);
             vlc_threadvar_create (&thread_key, NULL);
+            vlc_rwlock_init (&config_lock);
             break;
 
         case DLL_PROCESS_DETACH:
+            vlc_rwlock_destroy (&config_lock);
             vlc_threadvar_delete (&thread_key);
             DeleteCriticalSection (&super_mutex);
             CloseHandle (super_cond);