X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fconfig%2Fcore.c;h=8f4cdc7df5100b6c24ef28669bbd749ba9b70acd;hb=8c390d9ba7b2915d2f32fa28efe0e4a267717825;hp=a8ffd53082968ff45ca3aea52ce37b2fa40789ce;hpb=114bcc9ed7588b8dbcc78909e4c9c8c18fc043b4;p=vlc diff --git a/src/config/core.c b/src/config/core.c index a8ffd53082..8f4cdc7df5 100644 --- a/src/config/core.c +++ b/src/config/core.c @@ -27,7 +27,6 @@ #include #include "vlc_keys.h" -#include "vlc_charset.h" #include "vlc_configuration.h" #include @@ -68,14 +67,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; @@ -134,6 +133,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 ***************************************************************************** @@ -141,7 +141,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 ) +int config_GetInt( vlc_object_t *p_this, const char *psz_name ) { module_config_t *p_config; @@ -168,13 +168,14 @@ int __config_GetInt( vlc_object_t *p_this, const char *psz_name ) 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; @@ -201,6 +202,7 @@ float __config_GetFloat( vlc_object_t *p_this, const char *psz_name ) return val; } +#undef config_GetPsz /***************************************************************************** * config_GetPsz: get the string value of a string variable ***************************************************************************** @@ -212,7 +214,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; @@ -239,6 +241,7 @@ char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name ) return psz_value; } +#undef config_PutPsz /***************************************************************************** * config_PutPsz: set the string value of a string variable ***************************************************************************** @@ -246,7 +249,7 @@ 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; @@ -294,6 +297,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 ***************************************************************************** @@ -301,7 +305,7 @@ 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, int i_value ) { module_config_t *p_config; vlc_value_t oldval; @@ -347,14 +351,15 @@ void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value ) } } +#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; @@ -400,50 +405,97 @@ void __config_PutFloat( vlc_object_t *p_this, } } -/***************************************************************************** - * 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; + + 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; } /***************************************************************************** @@ -497,10 +549,11 @@ void config_Free( module_t *p_module ) p_module->p_config = NULL; } +#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 ) { VLC_UNUSED(p_this); module_t *p_module;