#include <stdio.h> /* sprintf() */
#include <string.h> /* strdup() */
#include <vlc_plugin.h>
+#include <vlc_cpu.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
/* Sub-version number
* (only used to avoid breakage in dev version when cache structure changes) */
-#define CACHE_SUBVERSION_NUM 3
+#define CACHE_SUBVERSION_NUM 7
/* Format string for the cache filename */
#define CACHENAME_FORMAT \
- "plugins-%.2zx%.2zx%.2"PRIx8".dat"
+ "plugins-%.2zx%.2zx%.2"PRIx8"-%x.dat"
/* Magic for the cache filename */
#define CACHENAME_VALUES \
- sizeof(int), sizeof(void *), *(uint8_t *)&(uint16_t){ 0xbe1e }
+ sizeof(int), sizeof(void *), *(uint8_t *)&(uint16_t){ 0xbe1e }, vlc_CPU()
/*****************************************************************************
* 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 )
+void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
{
- char *psz_filename, *psz_cachedir = config_GetCacheDir();
+ char *psz_filename, *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
FILE *file;
int i, j, i_size, i_read;
char p_cachestring[sizeof("cache " COPYRIGHT_MESSAGE)];
- char p_cachelang[6], p_lang[6];
int i_cache;
module_cache_t **pp_cache = 0;
int32_t i_file_size, i_marker;
}
free( psz_cachedir );
- if( p_module_bank->b_cache_delete )
+ if( b_delete )
{
#if !defined( UNDER_CE )
unlink( psz_filename );
return;
}
- /* Check the language hasn't changed */
- sprintf( p_lang, "%5.5s", _("C") ); i_size = 5;
- i_read = fread( p_cachelang, 1, i_size, file );
- if( i_read != i_size || memcmp( p_cachelang, p_lang, i_size ) )
- {
- msg_Warn( p_this, "This doesn't look like a valid plugins cache "
- "(language changed)" );
- fclose( file );
- return;
- }
-
/* Check header marker */
i_read = fread( &i_marker, 1, sizeof(i_marker), file );
if( i_read != sizeof(i_marker) ||
return;
}
- p_module_bank->i_loaded_cache = 0;
+ 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_module_bank->pp_loaded_cache =
- malloc( i_cache * sizeof(void *) );
+ pp_cache = p_bank->pp_loaded_cache =
+ xmalloc( i_cache * sizeof(void *) );
#define LOAD_IMMEDIATE(a) \
if( fread( (void *)&a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error
|| ( i_size > 16384 ) ) \
goto error; \
if( i_size ) { \
- char *psz = malloc( i_size ); \
+ char *psz = xmalloc( i_size ); \
if( fread( psz, i_size, 1, file ) != 1 ) { \
free( psz ); \
goto error; \
uint16_t i_size;
int i_submodules;
- pp_cache[i] = malloc( sizeof(module_cache_t) );
- p_module_bank->i_loaded_cache++;
+ pp_cache[i] = xmalloc( sizeof(module_cache_t) );
+ p_bank->i_loaded_cache++;
/* Load common info */
LOAD_STRING( pp_cache[i]->psz_file );
}
LOAD_STRING( pp_cache[i]->p_module->psz_capability );
LOAD_IMMEDIATE( pp_cache[i]->p_module->i_score );
- LOAD_IMMEDIATE( pp_cache[i]->p_module->i_cpu );
LOAD_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
- LOAD_IMMEDIATE( pp_cache[i]->p_module->b_reentrant );
LOAD_IMMEDIATE( pp_cache[i]->p_module->b_submodule );
/* Config stuff */
}
LOAD_STRING( p_module->psz_capability );
LOAD_IMMEDIATE( p_module->i_score );
- LOAD_IMMEDIATE( p_module->i_cpu );
LOAD_IMMEDIATE( p_module->b_unloadable );
- LOAD_IMMEDIATE( p_module->b_reentrant );
}
}
msg_Warn( p_this, "plugins cache not loaded (corrupted)" );
/* TODO: cleanup */
- p_module_bank->i_loaded_cache = 0;
+ p_bank->i_loaded_cache = 0;
fclose( file );
return;
if( p_module->p_config == NULL )
{
p_module->confsize = 0;
- msg_Err( p_module, "config error: can't duplicate p_config" );
return VLC_ENOMEM;
}
}
p_module->p_config[i].b_dirty = false;
- p_module->p_config[i].p_lock = &(vlc_internals(p_module)->lock);
+ p_module->p_config[i].p_lock = &p_module->lock;
if( p_module->p_config[i].i_list )
{
{
int j;
p_module->p_config[i].ppsz_list =
- malloc( (p_module->p_config[i].i_list+1) * sizeof(char *));
+ xmalloc( (p_module->p_config[i].i_list+1) * sizeof(char *));
if( p_module->p_config[i].ppsz_list )
{
for( j = 0; j < p_module->p_config[i].i_list; j++ )
{
int j;
p_module->p_config[i].ppsz_list_text =
- malloc( (p_module->p_config[i].i_list+1) * sizeof(char *));
+ xmalloc( (p_module->p_config[i].i_list+1) * sizeof(char *));
if( p_module->p_config[i].ppsz_list_text )
{
for( j = 0; j < p_module->p_config[i].i_list; j++ )
if( p_module->p_config[i].pi_list )
{
p_module->p_config[i].pi_list =
- malloc( (p_module->p_config[i].i_list + 1) * sizeof(int) );
+ xmalloc( (p_module->p_config[i].i_list + 1) * sizeof(int) );
if( p_module->p_config[i].pi_list )
{
for (int j = 0; j < p_module->p_config[i].i_list; j++)
if( p_module->p_config[i].i_action )
{
p_module->p_config[i].ppf_action =
- malloc( p_module->p_config[i].i_action * sizeof(void *) );
+ xmalloc( p_module->p_config[i].i_action * sizeof(void *) );
p_module->p_config[i].ppsz_action_text =
- malloc( p_module->p_config[i].i_action * sizeof(char *) );
+ xmalloc( p_module->p_config[i].i_action * sizeof(char *) );
for (int j = 0; j < p_module->p_config[i].i_action; j++)
{
return VLC_EGENERIC;
}
+static int CacheSaveSubmodule( FILE *file, module_t *p_module );
+
/*****************************************************************************
* SavePluginsCache: saves the plugins cache to a file
*****************************************************************************/
-void CacheSave( vlc_object_t *p_this )
+void CacheSave( vlc_object_t *p_this, module_bank_t *p_bank )
{
static char const psz_tag[] =
"Signature: 8a477f597d28d172789f06886806bc55\r\n"
"# For information about cache directory tags, see:\r\n"
"# http://www.brynosaurus.com/cachedir/\r\n";
- char *psz_cachedir = config_GetCacheDir();
+ char *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
FILE *file;
int i, j, i_cache;
module_cache_t **pp_cache;
free( psz_cachedir );
msg_Dbg( p_this, "writing plugins cache %s", psz_filename );
- file = utf8_fopen( psz_filename, "wb" );
+ char psz_tmpname[sizeof (psz_filename) + 12];
+ snprintf (psz_tmpname, sizeof (psz_tmpname), "%s.%"PRIu32, psz_filename,
+ (uint32_t)getpid ());
+ file = utf8_fopen( psz_tmpname, "wb" );
if (file == NULL)
goto error;
if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1 )
goto error;
- /* Language */
- if (fprintf (file, "%5.5s", _("C")) == EOF)
- goto error;
-
/* Header marker */
i_file_size = ftell( file );
if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1)
goto error;
- i_cache = p_module_bank->i_cache;
- pp_cache = p_module_bank->pp_cache;
+ i_cache = p_bank->i_cache;
+ pp_cache = p_bank->pp_cache;
if (fwrite( &i_cache, sizeof (i_cache), 1, file) != 1)
goto error;
}
SAVE_STRING( pp_cache[i]->p_module->psz_capability );
SAVE_IMMEDIATE( pp_cache[i]->p_module->i_score );
- SAVE_IMMEDIATE( pp_cache[i]->p_module->i_cpu );
SAVE_IMMEDIATE( pp_cache[i]->p_module->b_unloadable );
- SAVE_IMMEDIATE( pp_cache[i]->p_module->b_reentrant );
SAVE_IMMEDIATE( pp_cache[i]->p_module->b_submodule );
/* Config stuff */
SAVE_STRING( pp_cache[i]->p_module->psz_filename );
- i_submodule = vlc_internals( pp_cache[i]->p_module )->i_children;
+ i_submodule = pp_cache[i]->p_module->submodule_count;
SAVE_IMMEDIATE( i_submodule );
- for( i_submodule = 0;
- i_submodule < (unsigned)vlc_internals( pp_cache[i]->p_module)->i_children;
- i_submodule++ )
- {
- module_t *p_module =
- (module_t *)vlc_internals( pp_cache[i]->p_module )->pp_children[i_submodule];
-
- SAVE_STRING( p_module->psz_object_name );
- SAVE_STRING( p_module->psz_shortname );
- SAVE_STRING( p_module->psz_longname );
- SAVE_STRING( p_module->psz_help );
- for( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
- {
- SAVE_STRING( p_module->pp_shortcuts[j] ); // FIX
- }
- SAVE_STRING( p_module->psz_capability );
- SAVE_IMMEDIATE( p_module->i_score );
- SAVE_IMMEDIATE( p_module->i_cpu );
- SAVE_IMMEDIATE( p_module->b_unloadable );
- SAVE_IMMEDIATE( p_module->b_reentrant );
- }
+ if( CacheSaveSubmodule( file, pp_cache[i]->p_module->submodule ) )
+ goto error;
}
/* Fill-up file size */
i_file_size = ftell( file );
fseek( file, 0, SEEK_SET );
- if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1)
+ if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1
+ || fflush (file)) /* flush libc buffers */
goto error;
- if (fclose (file) == 0)
- return; /* success! */
+#ifndef WIN32
+ utf8_rename (psz_tmpname, psz_filename); /* atomically replace old cache */
+ fclose (file);
+#else
+ utf8_unlink (psz_filename);
+ fclose (file);
+ utf8_rename (psz_tmpname, psz_filename);
+#endif
+ return; /* success! */
- file = NULL;
error:
msg_Warn (p_this, "could not write plugins cache %s (%m)",
psz_filename);
}
}
+static int CacheSaveSubmodule( FILE *file, module_t *p_module )
+{
+ if( !p_module )
+ return 0;
+ if( CacheSaveSubmodule( file, p_module->next ) )
+ goto error;
+
+ SAVE_STRING( p_module->psz_object_name );
+ SAVE_STRING( p_module->psz_shortname );
+ SAVE_STRING( p_module->psz_longname );
+ SAVE_STRING( p_module->psz_help );
+ for( unsigned j = 0; j < MODULE_SHORTCUT_MAX; j++ )
+ SAVE_STRING( p_module->pp_shortcuts[j] ); // FIXME
+
+ SAVE_STRING( p_module->psz_capability );
+ SAVE_IMMEDIATE( p_module->i_score );
+ SAVE_IMMEDIATE( p_module->b_unloadable );
+ return 0;
+
+error:
+ return -1;
+}
+
+
static int CacheSaveConfig( module_t *p_module, FILE *file )
{
uint32_t i_lines = p_module->confsize;
*****************************************************************************/
void CacheMerge( vlc_object_t *p_this, module_t *p_cache, module_t *p_module )
{
- int i_submodule;
(void)p_this;
p_cache->pf_activate = p_module->pf_activate;
p_cache->pf_deactivate = p_module->pf_deactivate;
p_cache->handle = p_module->handle;
- for( i_submodule = 0; i_submodule < vlc_internals( p_module )->i_children; i_submodule++ )
+ /* FIXME: This looks too simplistic an algorithm to me. What if the module
+ * file was altered such that the number of order of submodules was
+ * altered... after VLC started -- Courmisch, 09/2008 */
+ module_t *p_child = p_module->submodule,
+ *p_cchild = p_cache->submodule;
+ while( p_child && p_cchild )
{
- module_t *p_child = (module_t*)vlc_internals( p_module )->pp_children[i_submodule];
- module_t *p_cchild = (module_t*)vlc_internals( p_cache )->pp_children[i_submodule];
p_cchild->pf_activate = p_child->pf_activate;
p_cchild->pf_deactivate = p_child->pf_deactivate;
+ p_child = p_child->next;
+ p_cchild = p_cchild->next;
}
p_cache->b_loaded = true;
/*****************************************************************************
* CacheFind: finds the cache entry corresponding to a file
*****************************************************************************/
-module_cache_t *CacheFind( const char *psz_file,
+module_cache_t *CacheFind( module_bank_t *p_bank, const char *psz_file,
int64_t i_time, int64_t i_size )
{
module_cache_t **pp_cache;
int i_cache, i;
- pp_cache = p_module_bank->pp_loaded_cache;
- i_cache = p_module_bank->i_loaded_cache;
+ pp_cache = p_bank->pp_loaded_cache;
+ i_cache = p_bank->i_loaded_cache;
for( i = 0; i < i_cache; i++ )
{