/* Sub-version number
* (only used to avoid breakage in dev version when cache structure changes) */
-#define CACHE_SUBVERSION_NUM 8
+#define CACHE_SUBVERSION_NUM 10
/* Format string for the cache filename */
#define CACHENAME_FORMAT \
sizeof(int), sizeof(void *), *(uint8_t *)&(uint16_t){ 0xbe1e }, vlc_CPU()
+void CacheDelete( vlc_object_t *obj, const char *dir )
+{
+ char *path;
+
+ assert( dir != NULL );
+
+ if( asprintf( &path, "%s"DIR_SEP CACHENAME_FORMAT,
+ dir, CACHENAME_VALUES ) == -1 )
+ return;
+ msg_Dbg( obj, "removing plugins cache file %s", path );
+ utf8_unlink( path );
+ free( path );
+}
+
/*****************************************************************************
* LoadPluginsCache: loads the plugins cache file
*****************************************************************************
* actually load the dynamically loadable module.
* This allows us to only fully load plugins when they are actually used.
*****************************************************************************/
-void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
+void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, const char *dir )
{
- char *psz_filename, *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
+ char *psz_filename;
FILE *file;
- int i, j, i_size, i_read;
+ int j, i_size, i_read;
char p_cachestring[sizeof("cache " COPYRIGHT_MESSAGE)];
- int i_cache;
- module_cache_t **pp_cache = 0;
+ unsigned i_cache;
+ module_cache_t **pp_cache = NULL;
int32_t i_file_size, i_marker;
- if( !psz_cachedir ) /* XXX: this should never happen */
- {
- msg_Err( p_this, "Unable to get cache directory" );
- return;
- }
+ assert( dir != NULL );
- if( asprintf( &psz_filename, "%s"DIR_SEP CACHENAME_FORMAT,
- psz_cachedir, CACHENAME_VALUES ) == -1 )
- {
- free( psz_cachedir );
+ if( !p_bank->b_cache )
return;
- }
- free( psz_cachedir );
- if( b_delete )
- {
- msg_Dbg( p_this, "removing plugins cache file %s", psz_filename );
- utf8_unlink( psz_filename );
- free( psz_filename );
+ if( asprintf( &psz_filename, "%s"DIR_SEP CACHENAME_FORMAT,
+ dir, CACHENAME_VALUES ) == -1 )
return;
- }
msg_Dbg( p_this, "loading plugins cache file %s", psz_filename );
file = utf8_fopen( psz_filename, "rb" );
if( !file )
{
- msg_Warn( p_this, "could not open plugins cache file %s for reading",
+ msg_Warn( p_this, "cannot read %s (%m)",
psz_filename );
free( psz_filename );
return;
return;
}
- p_bank->i_loaded_cache = 0;
if (fread( &i_cache, 1, sizeof(i_cache), file ) != sizeof(i_cache) )
{
msg_Warn( p_this, "This doesn't look like a valid plugins cache "
}
if( i_cache )
- pp_cache = p_bank->pp_loaded_cache =
- xmalloc( i_cache * sizeof(void *) );
+ {
+ unsigned i_already = p_bank->i_loaded_cache;
+ pp_cache = realloc( p_bank->pp_loaded_cache,
+ (i_already + i_cache) * sizeof(*pp_cache) );
+ if( unlikely(pp_cache == NULL) )
+ i_cache = 0; /* don't load */
+ else
+ {
+ p_bank->pp_loaded_cache = pp_cache;
+ pp_cache += i_already;
+ }
+ }
#define LOAD_IMMEDIATE(a) \
if( fread( (void *)&a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error
} \
}
- for( i = 0; i < i_cache; i++ )
+ for( unsigned i = 0; i < i_cache; i++ )
{
uint16_t i_size;
int i_submodules;
pp_cache[i] = xmalloc( sizeof(module_cache_t) );
- p_bank->i_loaded_cache++;
/* Load common info */
LOAD_STRING( pp_cache[i]->psz_file );
LOAD_IMMEDIATE( pp_cache[i]->i_time );
LOAD_IMMEDIATE( pp_cache[i]->i_size );
- LOAD_IMMEDIATE( pp_cache[i]->b_junk );
- pp_cache[i]->b_used = false;
-
- if( pp_cache[i]->b_junk ) continue;
pp_cache[i]->p_module = vlc_module_create( p_this );
goto error;
LOAD_STRING( pp_cache[i]->p_module->psz_filename );
+ LOAD_STRING( pp_cache[i]->p_module->domain );
+ if( pp_cache[i]->p_module->domain != NULL )
+ vlc_bindtextdomain( pp_cache[i]->p_module->domain );
LOAD_IMMEDIATE( i_submodules );
LOAD_STRING( p_module->psz_capability );
LOAD_IMMEDIATE( p_module->i_score );
LOAD_IMMEDIATE( p_module->b_unloadable );
+ LOAD_STRING( p_module->domain );
}
}
+ p_bank->i_loaded_cache += i_cache;
fclose( file );
return;
msg_Warn( p_this, "plugins cache not loaded (corrupted)" );
/* TODO: cleanup */
- p_bank->i_loaded_cache = 0;
-
fclose( file );
return;
}
if (file == NULL)
goto error;
- msg_Dbg (p_this, "writing plugins cache %s", psz_filename);
+ msg_Dbg (p_this, "saving plugins cache %s", psz_filename);
if (CacheSaveBank (file, p_bank))
goto error;
}
}
-static int CacheSaveConfig (FILE *, module_t *);
-static int CacheSaveSubmodule (FILE *, module_t *);
+static int CacheSaveConfig (FILE *, const module_t *);
+static int CacheSaveSubmodule (FILE *, const module_t *);
static int CacheSaveBank (FILE *file, module_bank_t *p_bank)
{
SAVE_STRING( pp_cache[i]->psz_file );
SAVE_IMMEDIATE( pp_cache[i]->i_time );
SAVE_IMMEDIATE( pp_cache[i]->i_size );
- SAVE_IMMEDIATE( pp_cache[i]->b_junk );
-
- if( pp_cache[i]->b_junk ) continue;
/* Save additional infos */
SAVE_STRING( pp_cache[i]->p_module->psz_object_name );
goto error;
SAVE_STRING( pp_cache[i]->p_module->psz_filename );
+ SAVE_STRING( pp_cache[i]->p_module->domain );
i_submodule = pp_cache[i]->p_module->submodule_count;
SAVE_IMMEDIATE( i_submodule );
return -1;
}
-static int CacheSaveSubmodule( FILE *file, module_t *p_module )
+static int CacheSaveSubmodule( FILE *file, const module_t *p_module )
{
if( !p_module )
return 0;
SAVE_STRING( p_module->psz_capability );
SAVE_IMMEDIATE( p_module->i_score );
SAVE_IMMEDIATE( p_module->b_unloadable );
+ SAVE_STRING( p_module->domain );
return 0;
error:
}
-static int CacheSaveConfig (FILE *file, module_t *p_module)
+static int CacheSaveConfig (FILE *file, const module_t *p_module)
{
uint32_t i_lines = p_module->confsize;