X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fconfig%2Fcore.c;h=73b904e64c881dcae832d16659155816a82f4ce0;hb=e93ae0b79711a1412e8df9d08fa76ce92d21d1a1;hp=97fd1e106b55d1dd40eb3dc0e4fec4eb68934e2a;hpb=abd557df02046acb2f4d7bbb66c851bc282c2eae;p=vlc

diff --git a/src/config/core.c b/src/config/core.c
index 97fd1e106b..73b904e64c 100644
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -35,6 +35,8 @@
 #include "configuration.h"
 #include "modules/modules.h"
 
+vlc_rwlock_t config_lock;
+
 static inline char *strdupnull (const char *src)
 {
     return src ? strdup (src) : NULL;
@@ -158,7 +160,12 @@ int __config_GetInt( vlc_object_t *p_this, const char *psz_name )
         return -1;
     }
 
-    return p_config->value.i;
+    int val;
+
+    vlc_rwlock_rdlock (&config_lock);
+    val = p_config->value.i;
+    vlc_rwlock_unlock (&config_lock);
+    return val;
 }
 
 /*****************************************************************************
@@ -186,7 +193,12 @@ float __config_GetFloat( vlc_object_t *p_this, const char *psz_name )
         return -1;
     }
 
-    return p_config->value.f;
+    float val;
+
+    vlc_rwlock_rdlock (&config_lock);
+    val = p_config->value.f;
+    vlc_rwlock_unlock (&config_lock);
+    return val;
 }
 
 /*****************************************************************************
@@ -220,9 +232,9 @@ char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name )
     }
 
     /* return a copy of the string */
-    vlc_mutex_lock( p_config->p_lock );
+    vlc_rwlock_rdlock (&config_lock);
     char *psz_value = strdupnull (p_config->value.psz);
-    vlc_mutex_unlock( p_config->p_lock );
+    vlc_rwlock_unlock (&config_lock);
 
     return psz_value;
 }
@@ -256,7 +268,7 @@ void __config_PutPsz( vlc_object_t *p_this,
         return;
     }
 
-    vlc_mutex_lock( p_config->p_lock );
+    vlc_rwlock_wrlock (&config_lock);
 
     /* backup old value */
     oldval.psz_string = (char *)p_config->value.psz;
@@ -270,7 +282,7 @@ void __config_PutPsz( vlc_object_t *p_this,
 
     val.psz_string = (char *)p_config->value.psz;
 
-    vlc_mutex_unlock( p_config->p_lock );
+    vlc_rwlock_unlock (&config_lock);
 
     if( p_config->pf_callback )
     {
@@ -292,7 +304,7 @@ void __config_PutPsz( vlc_object_t *p_this,
 void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value )
 {
     module_config_t *p_config;
-    vlc_value_t oldval, val;
+    vlc_value_t oldval;
 
     p_config = config_FindConfig( p_this, psz_name );
 
@@ -309,33 +321,27 @@ void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value )
         return;
     }
 
-    /* backup old value */
-    oldval.i_int = p_config->value.i;
-
     /* if i_min == i_max == 0, then do not use them */
     if ((p_config->min.i == 0) && (p_config->max.i == 0))
-    {
-        p_config->value.i = i_value;
-    }
+        ;
     else if (i_value < p_config->min.i)
-    {
-        p_config->value.i = p_config->min.i;
-    }
+        i_value = p_config->min.i;
     else if (i_value > p_config->max.i)
-    {
-        p_config->value.i = p_config->max.i;
-    }
-    else
-    {
-        p_config->value.i = i_value;
-    }
+        i_value = p_config->max.i;
 
-    p_config->b_dirty = true;
+    vlc_rwlock_wrlock (&config_lock);
+    /* backup old value */
+    oldval.i_int = p_config->value.i;
 
-    val.i_int = p_config->value.i;
+    p_config->value.i = i_value;
+    p_config->b_dirty = true;
+    vlc_rwlock_unlock (&config_lock);
 
     if( p_config->pf_callback )
     {
+        vlc_value_t val;
+
+        val.i_int = i_value;
         p_config->pf_callback( p_this, psz_name, oldval, val,
                                p_config->p_callback_data );
     }
@@ -351,7 +357,7 @@ void __config_PutFloat( vlc_object_t *p_this,
                         const char *psz_name, float f_value )
 {
     module_config_t *p_config;
-    vlc_value_t oldval, val;
+    vlc_value_t oldval;
 
     p_config = config_FindConfig( p_this, psz_name );
 
@@ -368,82 +374,123 @@ void __config_PutFloat( vlc_object_t *p_this,
         return;
     }
 
-    /* backup old value */
-    oldval.f_float = p_config->value.f;
-
     /* if f_min == f_max == 0, then do not use them */
     if ((p_config->min.f == 0) && (p_config->max.f == 0))
-    {
-        p_config->value.f = f_value;
-    }
+        ;
     else if (f_value < p_config->min.f)
-    {
-        p_config->value.f = p_config->min.f;
-    }
+        f_value = p_config->min.f;
     else if (f_value > p_config->max.f)
-    {
-        p_config->value.f = p_config->max.f;
-    }
-    else
-    {
-        p_config->value.f = f_value;
-    }
+        f_value = p_config->max.f;
 
-    p_config->b_dirty = true;
+    vlc_rwlock_wrlock (&config_lock);
+    /* backup old value */
+    oldval.f_float = p_config->value.f;
 
-    val.f_float = p_config->value.f;
+    p_config->value.f = f_value;
+    p_config->b_dirty = true;
+    vlc_rwlock_unlock (&config_lock);
 
     if( p_config->pf_callback )
     {
+        vlc_value_t val;
+
+        val.f_float = f_value;
         p_config->pf_callback( p_this, psz_name, oldval, val,
                                p_config->p_callback_data );
     }
 }
 
-/*****************************************************************************
- * config_FindConfig: find the config structure associated with an option.
- *****************************************************************************
- * FIXME: This function really needs to be optimized.
- * FIXME: And now even more.
- * FIXME: remove p_this pointer parameter (or use it)
- *****************************************************************************/
-module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name )
+static int confcmp (const void *a, const void *b)
 {
-    VLC_UNUSED(p_this);
-    module_t *p_parser;
+    const module_config_t *const *ca = a, *const *cb = b;
 
-    if( !psz_name ) return NULL;
+    return strcmp ((*ca)->psz_name, (*cb)->psz_name);
+}
 
-    module_t **list = module_list_get (NULL);
-    if (list == NULL)
-        return NULL;
+static int confnamecmp (const void *key, const void *elem)
+{
+    const module_config_t *const *conf = elem;
 
-    for (size_t i = 0; (p_parser = list[i]) != NULL; i++)
+    return strcmp (key, (*conf)->psz_name);
+}
+
+static struct
+{
+    module_config_t **list;
+    size_t count;
+} config = { NULL, 0 };
+
+/**
+ * Index the configuration items by name for faster lookups.
+ */
+int config_SortConfig (void)
+{
+    size_t nmod;
+    module_t **mlist = module_list_get (&nmod);
+    if (unlikely(mlist == NULL))
+        return VLC_ENOMEM;
+
+    size_t nconf = 0;
+    for (size_t i = 0; i < nmod; i++)
+         nconf  += mlist[i]->confsize;
+
+    module_config_t **clist = malloc (sizeof (*clist) * nconf);
+    if (unlikely(clist == NULL))
     {
-        module_config_t *p_item, *p_end;
+        module_list_free (mlist);
+        return VLC_ENOMEM;
+    }
 
-        if( !p_parser->i_config_items )
-            continue;
+    nconf = 0;
+    for (size_t i = 0; i < nmod; i++)
+    {
+        module_t *parser = mlist[i];
+        module_config_t *item, *end;
 
-        for( p_item = p_parser->p_config, p_end = p_item + p_parser->confsize;
-             p_item < p_end;
-             p_item++ )
+        for (item = parser->p_config, end = item + parser->confsize;
+             item < end;
+             item++)
         {
-            if( p_item->i_type & CONFIG_HINT )
-                /* ignore hints */
-                continue;
-            if( !strcmp( psz_name, p_item->psz_name )
-             || ( p_item->psz_oldname
-              && !strcmp( psz_name, p_item->psz_oldname ) ) )
-            {
-                module_list_free (list);
-                return p_item;
-            }
+            if (item->i_type & CONFIG_HINT)
+                continue; /* ignore hints */
+            clist[nconf++] = item;
         }
     }
+    module_list_free (mlist);
 
-    module_list_free (list);
-    return NULL;
+    qsort (clist, nconf, sizeof (*clist), confcmp);
+
+    config.list = clist;
+    config.count = nconf;
+    return VLC_SUCCESS;
+}
+
+void config_UnsortConfig (void)
+{
+    module_config_t **clist;
+
+    clist = config.list;
+    config.list = NULL;
+    config.count = 0;
+
+    free (clist);
+}
+
+/*****************************************************************************
+ * config_FindConfig: find the config structure associated with an option.
+ *****************************************************************************
+ * FIXME: remove p_this pointer parameter (or use it)
+ *****************************************************************************/
+module_config_t *config_FindConfig (vlc_object_t *p_this, const char *name)
+{
+    VLC_UNUSED(p_this);
+
+    if (unlikely(name == NULL))
+        return NULL;
+
+    module_config_t *const *p;
+    p = bsearch (name, config.list, config.count, sizeof (*p), confnamecmp);
+    return p ? *p : NULL;
 }
 
 /*****************************************************************************
@@ -506,6 +553,7 @@ void __config_ResetAll( vlc_object_t *p_this )
     module_t *p_module;
     module_t **list = module_list_get (NULL);
 
+    vlc_rwlock_wrlock (&config_lock);
     for (size_t j = 0; (p_module = list[j]) != NULL; j++)
     {
         if( p_module->b_submodule ) continue;
@@ -514,7 +562,6 @@ void __config_ResetAll( vlc_object_t *p_this )
         {
             module_config_t *p_config = p_module->p_config + i;
 
-            vlc_mutex_lock (p_config->p_lock);
             if (IsConfigIntegerType (p_config->i_type))
                 p_config->value.i = p_config->orig.i;
             else
@@ -527,9 +574,9 @@ void __config_ResetAll( vlc_object_t *p_this )
                 p_config->value.psz =
                         strdupnull (p_config->orig.psz);
             }
-            vlc_mutex_unlock (p_config->p_lock);
         }
     }
+    vlc_rwlock_unlock (&config_lock);
 
     module_list_free (list);
 }