[vlc-commits] commit: Load the whole config file all the time ( Rémi Denis-Courmont )
git at videolan.org
git at videolan.org
Wed Nov 17 18:17:35 CET 2010
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Nov 17 18:34:33 2010 +0200| [3b7f8b1f2ac12af6f62a61a4fa8e75cd9db8efa7] | committer: Rémi Denis-Courmont
Load the whole config file all the time
This avoids iterating through all config items of each modules. On my
system, this cuts the vlcrc load time in half, and is also far simpler.
The loader is essentially ignoring the config section, which reflects
the architectural "limitation" of the VLC configuration.
This also avoids loosing settings during VLC upgrades if an option moves
from one module to another one (which did happen in the past).
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b7f8b1f2ac12af6f62a61a4fa8e75cd9db8efa7
---
src/config/configuration.h | 4 +-
src/config/file.c | 140 ++++++++++++++------------------------------
src/libvlc.c | 4 +-
3 files changed, 48 insertions(+), 100 deletions(-)
diff --git a/src/config/configuration.h b/src/config/configuration.h
index eb7fba7..ef2080b 100644
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -33,9 +33,9 @@ int config_AutoSaveConfigFile( vlc_object_t * );
void config_Free( module_t * );
int config_LoadCmdLine ( vlc_object_t *, int, const char *[], int * );
-int config_LoadConfigFile( vlc_object_t *, const char * );
+int config_LoadConfigFile( vlc_object_t * );
#define config_LoadCmdLine(a,b,c,d) config_LoadCmdLine(VLC_OBJECT(a),b,c,d)
-#define config_LoadConfigFile(a,b) config_LoadConfigFile(VLC_OBJECT(a),b)
+#define config_LoadConfigFile(a) config_LoadConfigFile(VLC_OBJECT(a))
int config_SortConfig (void);
void config_UnsortConfig (void);
diff --git a/src/config/file.c b/src/config/file.c
index 5d1f66b..d5c3a00 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -164,7 +164,7 @@ static int64_t strtoi (const char *str)
* This function is called to load the config options stored in the config
* file.
*****************************************************************************/
-int config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
+int config_LoadConfigFile( vlc_object_t *p_this )
{
FILE *file;
@@ -172,9 +172,6 @@ int config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
if (file == NULL)
return VLC_EGENERIC;
- /* Look for the selected module, if NULL then save everything */
- module_t **list = module_list_get (NULL);
-
/* Look for UTF-8 Byte Order Mark */
char * (*convert) (const char *) = strdupnull;
char bom[3];
@@ -186,9 +183,7 @@ int config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
rewind (file); /* no BOM, rewind */
}
- module_t *module = NULL;
- char line[1024], section[1022];
- section[0] = '\0';
+ char line[1024];
/* Ensure consistent number formatting... */
locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
@@ -201,48 +196,12 @@ int config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
switch (line[0])
{
case '#':
+ case '[':
case '\n':
case '\0':
continue;
}
- if (line[0] == '[')
- {
- char *ptr = strchr (line, ']');
- if (ptr == NULL)
- continue; /* syntax error; */
- *ptr = '\0';
-
- /* New section ( = a given module) */
- strcpy (section, line + 1);
- module = NULL;
-
- if ((psz_module_name == NULL)
- || (strcmp (psz_module_name, section) == 0))
- {
- for (int i = 0; list[i]; i++)
- {
- module_t *m = list[i];
-
- if ((strcmp (section, m->psz_object_name) == 0)
- && (m->i_config_items > 0)) /* ignore config-less modules */
- {
- module = m;
- if (psz_module_name != NULL)
- msg_Dbg (p_this,
- "loading config for module \"%s\"",
- section);
- break;
- }
- }
- }
-
- continue;
- }
-
- if (module == NULL)
- continue; /* no need to parse if there is no matching module */
-
char *ptr = strchr (line, '\n');
if (ptr != NULL)
*ptr = '\0';
@@ -253,62 +212,52 @@ int config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
ptr = strchr (line, '=');
if (ptr == NULL)
continue; /* syntax error */
-
*ptr = '\0';
- const char *psz_option_value = ptr + 1;
- /* try to match this option with one of the module's options */
- for (size_t i = 0; i < module->confsize; i++)
- {
- module_config_t *p_item = module->p_config + i;
-
- if ((p_item->i_type & CONFIG_HINT)
- || strcmp (p_item->psz_name, psz_option_name))
- continue;
-
- /* We found it */
- errno = 0;
+ module_config_t *item = config_FindConfig (p_this, psz_option_name);
+ if (item == NULL)
+ continue;
- switch( p_item->i_type )
+ const char *psz_option_value = ptr + 1;
+ switch (item->i_type)
+ {
+ case CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_INTEGER:
{
- case CONFIG_ITEM_BOOL:
- case CONFIG_ITEM_INTEGER:
- {
- int64_t l = strtoi (psz_option_value);
- if ((l > p_item->max.i) || (l < p_item->min.i))
- errno = ERANGE;
- if (errno)
- msg_Warn (p_this, "Integer value (%s) for %s: %m",
- psz_option_value, psz_option_name);
- else
- p_item->saved.i = p_item->value.i = l;
- break;
- }
-
- case CONFIG_ITEM_FLOAT:
- if( !*psz_option_value )
- break; /* ignore empty option */
- p_item->value.f = (float)atof (psz_option_value);
- p_item->saved.f = p_item->value.f;
- break;
-
- case CONFIG_ITEM_KEY:
- if( !*psz_option_value )
- break; /* ignore empty option */
- p_item->value.i = ConfigStringToKey(psz_option_value);
- p_item->saved.i = p_item->value.i;
- break;
-
- default:
- /* free old string */
- free( (char*) p_item->value.psz );
- free( (char*) p_item->saved.psz );
-
- p_item->value.psz = convert (psz_option_value);
- p_item->saved.psz = strdupnull (p_item->value.psz);
- break;
+ int64_t l;
+
+ errno = 0;
+ l = strtoi (psz_option_value);
+ if ((l > item->max.i) || (l < item->min.i))
+ errno = ERANGE;
+ if (errno)
+ msg_Warn (p_this, "Integer value (%s) for %s: %m",
+ psz_option_value, psz_option_name);
+ else
+ item->saved.i = item->value.i = l;
+ break;
}
- break;
+
+ case CONFIG_ITEM_FLOAT:
+ if (!*psz_option_value)
+ break; /* ignore empty option */
+ item->value.f = (float)atof (psz_option_value);
+ item->saved.f = item->value.f;
+ break;
+
+ case CONFIG_ITEM_KEY:
+ if (!*psz_option_value)
+ break; /* ignore empty option */
+ item->value.i = ConfigStringToKey(psz_option_value);
+ item->saved.i = item->value.i;
+ break;
+
+ default:
+ free ((char *)item->value.psz);
+ free ((char *)item->saved.psz);
+ item->value.psz = convert (psz_option_value);
+ item->saved.psz = strdupnull (item->value.psz);
+ break;
}
}
vlc_rwlock_unlock (&config_lock);
@@ -320,7 +269,6 @@ int config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
}
fclose (file);
- module_list_free (list);
if (loc != (locale_t)0)
{
uselocale (baseloc);
diff --git a/src/libvlc.c b/src/libvlc.c
index 7a6cce3..f3043f6 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -387,7 +387,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
# if defined (WIN32) || defined (__APPLE__)
if( !var_InheritBool( p_libvlc, "ignore-config" ) )
- config_LoadConfigFile( p_libvlc, "main" );
+ config_LoadConfigFile( p_libvlc );
priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
/* Check if the user specified a custom language */
@@ -489,7 +489,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
* Override default configuration with config file settings
*/
if( !var_InheritBool( p_libvlc, "ignore-config" ) )
- config_LoadConfigFile( p_libvlc, NULL );
+ config_LoadConfigFile( p_libvlc );
/*
* Override configuration with command line settings
More information about the vlc-commits
mailing list