modules bank: use var_Inherit instead of config_Get

[vlc] / src / modules / cache.c

diff --git a/src/modules/cache.c b/src/modules/cache.c
index 09968d724b094d6d7140eefcaaa8adb15f36ef43..089f4aa842263e5f4751bcce5f70fadc97361c51 100644 (file)
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -35,10 +35,9 @@
 #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
@@ -84,14 +83,14 @@ 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 5
+#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()
 
 
 /*****************************************************************************
@@ -229,7 +228,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
 
     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
@@ -240,7 +239,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
      || ( 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; \
@@ -258,7 +257,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
         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 */
@@ -284,9 +283,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
         }
         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 */
@@ -311,9 +308,7 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
             }
             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 );
         }
     }
 
@@ -394,7 +389,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++ )
@@ -406,7 +401,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++ )
@@ -417,7 +412,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++)
@@ -429,9 +424,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++)
             {
@@ -564,9 +559,7 @@ void CacheSave( vlc_object_t *p_this, module_bank_t *p_bank )
         }
         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 */
@@ -624,9 +617,7 @@ 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: