X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fcache.c;h=4f3c34f8efa68830007d3df9df3b2425ec75d656;hb=1cfe42c98fe6b715632a447957a733b5f6d0c36f;hp=cc887e9b3499ea6a2d25177219994ae8b69819ba;hpb=8dba805732a431558c1218104dfeb667d9b5df63;p=vlc diff --git a/src/modules/cache.c b/src/modules/cache.c index cc887e9b34..4f3c34f8ef 100644 --- a/src/modules/cache.c +++ b/src/modules/cache.c @@ -28,7 +28,7 @@ # include "config.h" #endif -#include +#include #include "libvlc.h" #include /* free(), strtol() */ @@ -81,11 +81,18 @@ #ifdef HAVE_DYNAMIC_PLUGINS static int CacheLoadConfig ( module_t *, FILE * ); static int CacheSaveConfig ( module_t *, FILE * ); -static char * CacheName ( void ); /* Sub-version number * (only used to avoid breakage in dev version when cache structure changes) */ -#define CACHE_SUBVERSION_NUM 3 +#define CACHE_SUBVERSION_NUM 5 + +/* Format string for the cache filename */ +#define CACHENAME_FORMAT \ + "plugins-%.2zx%.2zx%.2"PRIx8".dat" +/* Magic for the cache filename */ +#define CACHENAME_VALUES \ + sizeof(int), sizeof(void *), *(uint8_t *)&(uint16_t){ 0xbe1e } + /***************************************************************************** * LoadPluginsCache: loads the plugins cache file @@ -95,17 +102,15 @@ static char * CacheName ( void ); * 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; - libvlc_global_data_t *p_libvlc_global = vlc_global(); if( !psz_cachedir ) /* XXX: this should never happen */ { @@ -113,15 +118,15 @@ void CacheLoad( vlc_object_t *p_this ) return; } - i_size = asprintf( &psz_filename, "%s"DIR_SEP"%s", - psz_cachedir, CacheName() ); - free( psz_cachedir ); - if( i_size <= 0 ) + if( asprintf( &psz_filename, "%s"DIR_SEP CACHENAME_FORMAT, + psz_cachedir, CACHENAME_VALUES ) == -1 ) { + free( psz_cachedir ); return; } + free( psz_cachedir ); - if( p_libvlc_global->p_module_bank->b_cache_delete ) + if( b_delete ) { #if !defined( UNDER_CE ) unlink( psz_filename ); @@ -178,23 +183,26 @@ void CacheLoad( vlc_object_t *p_this ) return; } - /* Check Sub-version number */ - i_read = fread( &i_marker, 1, sizeof(i_marker), file ); - if( i_read != sizeof(i_marker) || i_marker != CACHE_SUBVERSION_NUM ) +#ifdef DISTRO_VERSION + /* Check for distribution specific version */ + char p_distrostring[sizeof( DISTRO_VERSION )]; + i_size = sizeof( DISTRO_VERSION ) - 1; + i_read = fread( p_distrostring, 1, i_size, file ); + if( i_read != i_size || + memcmp( p_distrostring, DISTRO_VERSION, i_size ) ) { - msg_Warn( p_this, "This doesn't look like a valid plugins cache " - "(corrupted header)" ); + msg_Warn( p_this, "This doesn't look like a valid plugins cache" ); fclose( file ); return; } +#endif - /* 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 ) ) + /* Check Sub-version number */ + i_read = fread( &i_marker, 1, sizeof(i_marker), file ); + if( i_read != sizeof(i_marker) || i_marker != CACHE_SUBVERSION_NUM ) { msg_Warn( p_this, "This doesn't look like a valid plugins cache " - "(language changed)" ); + "(corrupted header)" ); fclose( file ); return; } @@ -210,7 +218,7 @@ void CacheLoad( vlc_object_t *p_this ) return; } - p_libvlc_global->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 " @@ -220,8 +228,8 @@ void CacheLoad( vlc_object_t *p_this ) } if( i_cache ) - pp_cache = p_libvlc_global->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 @@ -232,7 +240,7 @@ void CacheLoad( vlc_object_t *p_this ) || ( 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; \ @@ -250,8 +258,8 @@ void CacheLoad( vlc_object_t *p_this ) uint16_t i_size; int i_submodules; - pp_cache[i] = malloc( sizeof(module_cache_t) ); - p_libvlc_global->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 ); @@ -317,7 +325,7 @@ void CacheLoad( vlc_object_t *p_this ) msg_Warn( p_this, "plugins cache not loaded (corrupted)" ); /* TODO: cleanup */ - p_libvlc_global->p_module_bank->i_loaded_cache = 0; + p_bank->i_loaded_cache = 0; fclose( file ); return; @@ -343,7 +351,6 @@ static int CacheLoadConfig( module_t *p_module, FILE *file ) if( p_module->p_config == NULL ) { p_module->confsize = 0; - msg_Err( p_module, "config error: can't duplicate p_config" ); return VLC_ENOMEM; } } @@ -379,7 +386,7 @@ static int CacheLoadConfig( module_t *p_module, FILE *file ) p_module->p_config[i].b_dirty = false; - p_module->p_config[i].p_lock = &p_module->object_lock; + p_module->p_config[i].p_lock = &p_module->lock; if( p_module->p_config[i].i_list ) { @@ -387,7 +394,7 @@ static int CacheLoadConfig( module_t *p_module, FILE *file ) { 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++ ) @@ -399,7 +406,7 @@ static int CacheLoadConfig( module_t *p_module, FILE *file ) { 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++ ) @@ -410,7 +417,7 @@ static int CacheLoadConfig( module_t *p_module, FILE *file ) 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++) @@ -422,9 +429,9 @@ static int CacheLoadConfig( module_t *p_module, FILE *file ) 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++) { @@ -443,10 +450,12 @@ static int CacheLoadConfig( module_t *p_module, FILE *file ) 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" @@ -454,12 +463,11 @@ void CacheSave( vlc_object_t *p_this ) "# 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; uint32_t i_file_size = 0; - libvlc_global_data_t *p_libvlc_global = vlc_global(); if( !psz_cachedir ) /* XXX: this should never happen */ { @@ -481,11 +489,15 @@ void CacheSave( vlc_object_t *p_this ) } snprintf( psz_filename, sizeof( psz_filename ), - "%s"DIR_SEP"%s", psz_cachedir, CacheName() ); + "%s"DIR_SEP CACHENAME_FORMAT, psz_cachedir, + CACHENAME_VALUES ); 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; @@ -496,24 +508,24 @@ void CacheSave( vlc_object_t *p_this ) /* Contains version number */ if (fputs ("cache "COPYRIGHT_MESSAGE, file) == EOF) goto error; - +#ifdef DISTRO_VERSION + /* Allow binary maintaner to pass a string to detect new binary version*/ + if (fputs( DISTRO_VERSION, file ) == EOF) + goto error; +#endif /* Sub-version number (to avoid breakage in the dev version when cache * structure changes) */ i_file_size = CACHE_SUBVERSION_NUM; 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_libvlc_global->p_module_bank->i_cache; - pp_cache = p_libvlc_global->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; @@ -563,41 +575,29 @@ void CacheSave( vlc_object_t *p_this ) 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); @@ -608,6 +608,32 @@ error: } } +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->i_cpu ); + SAVE_IMMEDIATE( p_module->b_unloadable ); + SAVE_IMMEDIATE( p_module->b_reentrant ); + return 0; + +error: + return -1; +} + + static int CacheSaveConfig( module_t *p_module, FILE *file ) { uint32_t i_lines = p_module->confsize; @@ -661,38 +687,28 @@ error: return -1; } -/***************************************************************************** - * CacheName: Return the cache file name for this platform. - *****************************************************************************/ -static char *CacheName( void ) -{ - static char psz_cachename[32]; - - /* Code int size, pointer size and endianness in the filename */ - int32_t x = 0xbe00001e; - sprintf( psz_cachename, "plugins-%.2x%.2x%.2x.dat", (int)sizeof(int), - (int)sizeof(void *), (unsigned int)((unsigned char *)&x)[0] ); - return psz_cachename; -} - /***************************************************************************** * CacheMerge: Merge a cache module descriptor with a full module descriptor. *****************************************************************************/ 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; @@ -702,15 +718,14 @@ void CacheMerge( vlc_object_t *p_this, module_t *p_cache, module_t *p_module ) /***************************************************************************** * 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; - libvlc_global_data_t *p_libvlc_global = vlc_global(); - pp_cache = p_libvlc_global->p_module_bank->pp_loaded_cache; - i_cache = p_libvlc_global->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++ ) {