X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fconfig%2Fcore.c;h=b84bf922a45a7a3df1d40073ba288420d24b227c;hb=b93670e1dce5ba4bebc66db8d78864d865672b68;hp=9768e7fe1acd394827f50a89e933c9c732b0a31d;hpb=460a78baf1f189de5d4178df31dc229ac1e366ca;p=vlc diff --git a/src/config/core.c b/src/config/core.c index 9768e7fe1a..b84bf922a4 100644 --- a/src/config/core.c +++ b/src/config/core.c @@ -26,9 +26,9 @@ #endif #include -#include "../libvlc.h" -#include "vlc_keys.h" -#include "vlc_charset.h" +#include +#include + #include "vlc_configuration.h" #include @@ -36,6 +36,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; @@ -48,7 +50,7 @@ int IsConfigStringType (int type) { CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, CONFIG_ITEM_MODULE, CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_MODULE_CAT, CONFIG_ITEM_PASSWORD, - CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT + CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT, CONFIG_ITEM_FONT }; /* NOTE: this needs to be changed if we ever get more than 255 types */ @@ -67,14 +69,14 @@ int IsConfigIntegerType (int type) return memchr (config_types, type, sizeof (config_types)) != NULL; } - +#undef config_GetType /***************************************************************************** * config_GetType: get the type of a variable (bool, int, float, string) ***************************************************************************** * This function is used to get the type of a variable from its name. * Beware, this is quite slow. *****************************************************************************/ -int __config_GetType( vlc_object_t *p_this, const char *psz_name ) +int config_GetType( vlc_object_t *p_this, const char *psz_name ) { module_config_t *p_config; int i_type; @@ -133,6 +135,7 @@ int __config_GetType( vlc_object_t *p_this, const char *psz_name ) return i_type; } +#undef config_GetInt /***************************************************************************** * config_GetInt: get the value of an int variable ***************************************************************************** @@ -140,7 +143,7 @@ int __config_GetType( vlc_object_t *p_this, const char *psz_name ) * represented by an integer (CONFIG_ITEM_INTEGER and * CONFIG_ITEM_BOOL). *****************************************************************************/ -int __config_GetInt( vlc_object_t *p_this, const char *psz_name ) +int64_t config_GetInt( vlc_object_t *p_this, const char *psz_name ) { module_config_t *p_config; @@ -159,16 +162,22 @@ int __config_GetInt( vlc_object_t *p_this, const char *psz_name ) return -1; } - return p_config->value.i; + int64_t val; + + vlc_rwlock_rdlock (&config_lock); + val = p_config->value.i; + vlc_rwlock_unlock (&config_lock); + return val; } +#undef config_GetFloat /***************************************************************************** * config_GetFloat: get the value of a float variable ***************************************************************************** * This function is used to get the value of variables which are internally * represented by a float (CONFIG_ITEM_FLOAT). *****************************************************************************/ -float __config_GetFloat( vlc_object_t *p_this, const char *psz_name ) +float config_GetFloat( vlc_object_t *p_this, const char *psz_name ) { module_config_t *p_config; @@ -187,9 +196,15 @@ 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; } +#undef config_GetPsz /***************************************************************************** * config_GetPsz: get the string value of a string variable ***************************************************************************** @@ -201,7 +216,7 @@ float __config_GetFloat( vlc_object_t *p_this, const char *psz_name ) * duplicate of the actual value. It isn't safe to return a pointer to the * actual value as it can be modified at any time. *****************************************************************************/ -char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name ) +char * config_GetPsz( vlc_object_t *p_this, const char *psz_name ) { module_config_t *p_config; @@ -221,13 +236,14 @@ 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; } +#undef config_PutPsz /***************************************************************************** * config_PutPsz: set the string value of a string variable ***************************************************************************** @@ -235,11 +251,11 @@ char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name ) * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, * CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_PASSWORD, and CONFIG_ITEM_MODULE). *****************************************************************************/ -void __config_PutPsz( vlc_object_t *p_this, +void config_PutPsz( vlc_object_t *p_this, const char *psz_name, const char *psz_value ) { module_config_t *p_config; - vlc_value_t oldval, val; + vlc_value_t oldval; p_config = config_FindConfig( p_this, psz_name ); @@ -257,24 +273,25 @@ void __config_PutPsz( vlc_object_t *p_this, return; } - vlc_mutex_lock( p_config->p_lock ); + char *str; + if ((psz_value != NULL) && *psz_value) + str = strdup (psz_value); + else + str = NULL; + vlc_rwlock_wrlock (&config_lock); /* backup old value */ oldval.psz_string = (char *)p_config->value.psz; - if ((psz_value != NULL) && *psz_value) - p_config->value.psz = strdup (psz_value); - else - p_config->value.psz = NULL; - + p_config->value.psz = str; p_config->b_dirty = true; - - 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 ) { + vlc_value_t val; + + val.psz_string = (char *)psz_value; p_config->pf_callback( p_this, psz_name, oldval, val, p_config->p_callback_data ); } @@ -283,6 +300,7 @@ void __config_PutPsz( vlc_object_t *p_this, free( oldval.psz_string ); } +#undef config_PutInt /***************************************************************************** * config_PutInt: set the integer value of an int variable ***************************************************************************** @@ -290,10 +308,11 @@ void __config_PutPsz( vlc_object_t *p_this, * represented by an integer (CONFIG_ITEM_INTEGER and * CONFIG_ITEM_BOOL). *****************************************************************************/ -void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value ) +void config_PutInt( vlc_object_t *p_this, const char *psz_name, + int64_t i_value ) { module_config_t *p_config; - vlc_value_t oldval, val; + vlc_value_t oldval; p_config = config_FindConfig( p_this, psz_name ); @@ -310,49 +329,41 @@ void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value ) return; } + if (i_value < p_config->min.i) + i_value = p_config->min.i; + if (i_value > p_config->max.i) + i_value = p_config->max.i; + + vlc_rwlock_wrlock (&config_lock); /* 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; - } - else if (i_value > p_config->max.i) - { - p_config->value.i = p_config->max.i; - } - else - { - p_config->value.i = i_value; - } - + p_config->value.i = i_value; p_config->b_dirty = true; - - val.i_int = p_config->value.i; + 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 ); } } +#undef config_PutFloat /***************************************************************************** * config_PutFloat: set the value of a float variable ***************************************************************************** * This function is used to set the value of variables which are internally * represented by a float (CONFIG_ITEM_FLOAT). *****************************************************************************/ -void __config_PutFloat( vlc_object_t *p_this, - const char *psz_name, float f_value ) +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 ); @@ -369,80 +380,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. - *****************************************************************************/ -module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name ) +static int confcmp (const void *a, const void *b) { - 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; + + 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; - for (size_t i = 0; (p_parser = list[i]) != NULL; i++) + 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; } /***************************************************************************** @@ -496,73 +550,40 @@ void config_Free( module_t *p_module ) p_module->p_config = NULL; } -/***************************************************************************** - * config_SetCallbacks: sets callback functions in the duplicate p_config. - ***************************************************************************** - * Unfortunatly we cannot work directly with the module's config data as - * this module might be unloaded from memory at any time (remember HideModule). - * This is why we need to duplicate callbacks each time we reload the module. - *****************************************************************************/ -void config_SetCallbacks( module_config_t *p_new, module_config_t *p_orig, - size_t n ) -{ - for (size_t i = 0; i < n; i++) - { - p_new->pf_callback = p_orig->pf_callback; - p_new++; - p_orig++; - } -} - -/***************************************************************************** - * config_UnsetCallbacks: unsets callback functions in the duplicate p_config. - ***************************************************************************** - * We simply undo what we did in config_SetCallbacks. - *****************************************************************************/ -void config_UnsetCallbacks( module_config_t *p_new, size_t n ) -{ - for (size_t i = 0; i < n; i++) - { - p_new->pf_callback = NULL; - p_new++; - } -} - +#undef config_ResetAll /***************************************************************************** * config_ResetAll: reset the configuration data for all the modules. *****************************************************************************/ -void __config_ResetAll( vlc_object_t *p_this ) +void config_ResetAll( vlc_object_t *p_this ) { - libvlc_priv_t *priv = libvlc_priv (p_this->p_libvlc); - int i_index; + VLC_UNUSED(p_this); module_t *p_module; module_t **list = module_list_get (NULL); - /* Acquire config file lock */ - vlc_mutex_lock( &priv->config_lock ); - - + vlc_rwlock_wrlock (&config_lock); for (size_t j = 0; (p_module = list[j]) != NULL; j++) { if( p_module->b_submodule ) continue; for (size_t i = 0; i < p_module->confsize; i++ ) { - if (IsConfigIntegerType (p_module->p_config[i].i_type)) - p_module->p_config[i].value.i = p_module->p_config[i].orig.i; + module_config_t *p_config = p_module->p_config + i; + + if (IsConfigIntegerType (p_config->i_type)) + p_config->value.i = p_config->orig.i; else - if (IsConfigFloatType (p_module->p_config[i].i_type)) - p_module->p_config[i].value.f = p_module->p_config[i].orig.f; + if (IsConfigFloatType (p_config->i_type)) + p_config->value.f = p_config->orig.f; else - if (IsConfigStringType (p_module->p_config[i].i_type)) + if (IsConfigStringType (p_config->i_type)) { - free ((char *)p_module->p_config[i].value.psz); - p_module->p_config[i].value.psz = - strdupnull (p_module->p_config[i].orig.psz); + free ((char *)p_config->value.psz); + p_config->value.psz = + strdupnull (p_config->orig.psz); } } } + vlc_rwlock_unlock (&config_lock); module_list_free (list); - vlc_mutex_unlock( &priv->config_lock ); }