#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
-
-#if !defined(HAVE_DYNAMIC_PLUGINS)
- /* no support for plugins */
-#elif defined(HAVE_DL_DYLD)
-# if defined(HAVE_MACH_O_DYLD_H)
-# include <mach-o/dyld.h>
-# endif
-#elif defined(HAVE_DL_BEOS)
-# if defined(HAVE_IMAGE_H)
-# include <image.h>
-# endif
-#elif defined(HAVE_DL_WINDOWS)
-# include <windows.h>
-#elif defined(HAVE_DL_DLOPEN)
-# if defined(HAVE_DLFCN_H) /* Linux, BSD, Hurd */
-# include <dlfcn.h>
-# endif
-# if defined(HAVE_SYS_DL_H)
-# include <sys/dl.h>
-# endif
-#elif defined(HAVE_DL_SHL_LOAD)
-# if defined(HAVE_DL_H)
-# include <dl.h>
-# endif
-#endif
+#include <assert.h>
#include "config/configuration.h"
*****************************************************************************/
#ifdef HAVE_DYNAMIC_PLUGINS
static int CacheLoadConfig ( module_t *, FILE * );
-static int CacheSaveConfig ( module_t *, FILE * );
/* Sub-version number
* (only used to avoid breakage in dev version when cache structure changes) */
-#define CACHE_SUBVERSION_NUM 4
+#define CACHE_SUBVERSION_NUM 8
/* 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()
/*****************************************************************************
*****************************************************************************/
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;
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) ||
if( i_cache )
pp_cache = p_bank->pp_loaded_cache =
- malloc( i_cache * sizeof(void *) );
+ 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) );
+ pp_cache[i] = xmalloc( sizeof(module_cache_t) );
p_bank->i_loaded_cache++;
/* Load common info */
}
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 );
}
}
}
+/* This function should never be called.
+ * It is only used as a non-NULL vlc_callback_t value for comparison. */
+static int dummy_callback (vlc_object_t *obj, const char *name,
+ vlc_value_t oldval, vlc_value_t newval, void *data)
+{
+ (void) obj; (void)name; (void)oldval; (void)newval; (void)data;
+ assert (0);
+}
+
+
static int CacheLoadConfig( module_t *p_module, FILE *file )
{
uint32_t i_lines;
p_module->p_config[i].b_dirty = false;
- p_module->p_config[i].p_lock = &p_module->lock;
-
if( p_module->p_config[i].i_list )
{
if( p_module->p_config[i].ppsz_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++)
{
- p_module->p_config[i].ppf_action[j] = 0;
+ p_module->p_config[i].ppf_action[j] = NULL;
LOAD_STRING( p_module->p_config[i].ppsz_action_text[j] );
}
}
- LOAD_IMMEDIATE( p_module->p_config[i].pf_callback );
+ bool has_callback;
+ LOAD_IMMEDIATE( has_callback );
+ if (has_callback)
+ p_module->p_config[i].pf_callback = dummy_callback;
}
return VLC_SUCCESS;
return VLC_EGENERIC;
}
-static int CacheSaveSubmodule( FILE *file, module_t *p_module );
+static int CacheSaveBank( FILE *file, module_bank_t *p_bank );
/*****************************************************************************
* SavePluginsCache: saves the plugins cache to a file
*****************************************************************************/
void CacheSave( vlc_object_t *p_this, module_bank_t *p_bank )
{
- static char const psz_tag[] =
- "Signature: 8a477f597d28d172789f06886806bc55\r\n"
- "# This file is a cache directory tag created by VLC.\r\n"
- "# For information about cache directory tags, see:\r\n"
- "# http://www.brynosaurus.com/cachedir/\r\n";
-
- char *psz_cachedir = config_GetCacheDir();
- FILE *file;
- int i, j, i_cache;
- module_cache_t **pp_cache;
- uint32_t i_file_size = 0;
-
+ char *psz_cachedir = config_GetUserDir(VLC_CACHE_DIR);
if( !psz_cachedir ) /* XXX: this should never happen */
{
msg_Err( p_this, "unable to get cache directory" );
char psz_filename[sizeof(DIR_SEP) + 32 + strlen(psz_cachedir)];
config_CreateDir( p_this, psz_cachedir );
- snprintf( psz_filename, sizeof( psz_filename ),
- "%s"DIR_SEP"CACHEDIR.TAG", psz_cachedir );
- file = utf8_fopen( psz_filename, "wb" );
- if (file != NULL)
- {
- if (fwrite (psz_tag, 1, sizeof (psz_tag) - 1, file) != 1)
- clearerr (file); /* what else can we do? */
- fclose( file );
- }
-
snprintf( psz_filename, sizeof( psz_filename ),
"%s"DIR_SEP CACHENAME_FORMAT, psz_cachedir,
CACHENAME_VALUES );
free( psz_cachedir );
- msg_Dbg( p_this, "writing plugins cache %s", psz_filename );
char psz_tmpname[sizeof (psz_filename) + 12];
snprintf (psz_tmpname, sizeof (psz_tmpname), "%s.%"PRIu32, psz_filename,
-#ifdef UNDER_CE
- (uint32_t)GetCurrentProcessId ()
-#else
- (uint32_t)getpid ()
-#endif
- );
- file = utf8_fopen( psz_tmpname, "wb" );
+ (uint32_t)getpid ());
+ FILE *file = utf8_fopen( psz_tmpname, "wb" );
if (file == NULL)
goto error;
+ msg_Dbg (p_this, "writing plugins cache %s", psz_filename);
+ if (CacheSaveBank (file, p_bank))
+ goto error;
+
+#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! */
+
+error:
+ msg_Warn (p_this, "could not write plugins cache %s (%m)",
+ psz_filename);
+ if (file != NULL)
+ {
+ clearerr (file);
+ fclose (file);
+ }
+}
+
+static int CacheSaveConfig (FILE *, module_t *);
+static int CacheSaveSubmodule (FILE *, module_t *);
+
+static int CacheSaveBank (FILE *file, module_bank_t *p_bank)
+{
+ uint32_t i_file_size = 0;
+
/* Empty space for file size */
if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1)
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_bank->i_cache;
- pp_cache = p_bank->pp_cache;
+ module_cache_t **pp_cache = p_bank->pp_cache;
+ uint32_t i_cache = p_bank->i_cache;
if (fwrite( &i_cache, sizeof (i_cache), 1, file) != 1)
goto error;
goto error; \
} while(0)
- for( i = 0; i < i_cache; i++ )
+ for (unsigned i = 0; i < i_cache; i++)
{
uint32_t i_submodule;
SAVE_STRING( pp_cache[i]->p_module->psz_shortname );
SAVE_STRING( pp_cache[i]->p_module->psz_longname );
SAVE_STRING( pp_cache[i]->p_module->psz_help );
- for( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
+ for (unsigned j = 0; j < MODULE_SHORTCUT_MAX; j++)
{
SAVE_STRING( pp_cache[i]->p_module->pp_shortcuts[j] ); // FIX
}
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 */
- if (CacheSaveConfig (pp_cache[i]->p_module, file))
+ if (CacheSaveConfig (file, pp_cache[i]->p_module))
goto error;
SAVE_STRING( pp_cache[i]->p_module->psz_filename );
if (fwrite (&i_file_size, sizeof (i_file_size), 1, file) != 1
|| fflush (file)) /* flush libc buffers */
goto error;
-
-#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! */
+ return 0; /* success! */
error:
- msg_Warn (p_this, "could not write plugins cache %s (%m)",
- psz_filename);
- if (file != NULL)
- {
- clearerr (file);
- fclose (file);
- }
+ return -1;
}
static int CacheSaveSubmodule( FILE *file, module_t *p_module )
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:
}
-static int CacheSaveConfig( module_t *p_module, FILE *file )
+static int CacheSaveConfig (FILE *file, module_t *p_module)
{
uint32_t i_lines = p_module->confsize;
for (int j = 0; j < p_module->p_config[i].i_action; j++)
SAVE_STRING( p_module->p_config[i].ppsz_action_text[j] );
- SAVE_IMMEDIATE( p_module->p_config[i].pf_callback );
+ bool has_callback = p_module->p_config[i].pf_callback != NULL;
+ SAVE_IMMEDIATE( has_callback );
}
return 0;
projects / vlc / blobdiff