/*****************************************************************************
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.72 2002/07/20 18:01:43 sam Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id$
*
- * Authors: Samuel Hocevar <sam@zoy.org>
+ * Authors: Sam Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
* Hans-Peter Jansen <hpj@urpla.net>
+ * Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <string.h> /* strdup() */
#include <vlc/vlc.h>
+#include <vlc/input.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#elif defined( UNDER_CE )
+# include <windows.h> /* GetFileAttributes() */
+#else
+# include "../extras/dirent.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
-#if defined(HAVE_DLFCN_H) /* Linux, BSD, Hurd */
-# include <dlfcn.h> /* dlopen(), dlsym(), dlclose() */
-# define HAVE_DYNAMIC_PLUGINS
-#elif defined(HAVE_IMAGE_H) /* BeOS */
-# include <image.h>
-# define HAVE_DYNAMIC_PLUGINS
-#elif defined(WIN32)
-# define HAVE_DYNAMIC_PLUGINS
+#define HAVE_DYNAMIC_PLUGINS
+#if 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
#else
# undef HAVE_DYNAMIC_PLUGINS
#endif
+#include "vlc_error.h"
-#include "netutils.h"
-
-#include "interface.h"
-#include "vlc_playlist.h"
+#include "vlc_interface.h"
#include "intf_eject.h"
-#include "stream_control.h"
-#include "input_ext-intf.h"
-#include "input_ext-dec.h"
-#include "input_ext-plugins.h"
+#include "vlc_playlist.h"
-#include "video.h"
+#include "vlc_video.h"
#include "video_output.h"
+#include "vout_synchro.h"
+#include "vlc_spu.h"
#include "audio_output.h"
+#include "aout_internal.h"
+
+#include "stream_output.h"
+#include "osd.h"
+#include "vlc_httpd.h"
#include "iso_lang.h"
+#include "charset.h"
+
+#include "vlc_block.h"
+
+#include "vlc_vlm.h"
#ifdef HAVE_DYNAMIC_PLUGINS
# include "modules_plugin.h"
#endif
-#if !defined( _MSC_VER )
-# include "modules_builtin.h"
-#else
+#if defined( UNDER_CE )
+# include "modules_builtin_evc.h"
+#elif defined( _MSC_VER )
# include "modules_builtin_msvc.h"
+#else
+# include "modules_builtin.h"
#endif
+#include "network.h"
-/*****************************************************************************
- * Static variables
- *****************************************************************************/
-DECLARE_MODULE_CAPABILITY_TABLE;
+#if defined( WIN32) || defined( UNDER_CE )
+ /* Avoid name collisions */
+# define LoadModule(a,b,c) _LoadModule(a,b,c)
+#endif
/*****************************************************************************
* Local prototypes
*****************************************************************************/
#ifdef HAVE_DYNAMIC_PLUGINS
-static void AllocateAllPlugins ( vlc_object_t * );
-static int AllocatePluginModule ( vlc_object_t *, char * );
+static void AllocateAllPlugins ( vlc_object_t * );
+static void AllocatePluginDir ( vlc_object_t *, const char *, int );
+static int AllocatePluginFile ( vlc_object_t *, char *, int64_t, int64_t );
+static module_t * AllocatePlugin( vlc_object_t *, char * );
#endif
-static int AllocateBuiltinModule( vlc_object_t *,
- int ( * ) ( module_t * ),
- int ( * ) ( module_t * ),
- int ( * ) ( module_t * ) );
+static int AllocateBuiltinModule( vlc_object_t *, int ( * ) ( module_t * ) );
static int DeleteModule ( module_t * );
-static int LockModule ( module_t * );
-static int UnlockModule ( module_t * );
#ifdef HAVE_DYNAMIC_PLUGINS
-static int HideModule ( module_t * );
-static int CallSymbol ( module_t *, char * );
+static void DupModule ( module_t * );
+static void UndupModule ( module_t * );
+static int CallEntry ( module_t * );
+static int LoadModule ( vlc_object_t *, char *, module_handle_t * );
+static void CloseModule ( module_handle_t );
+static void * GetSymbol ( module_handle_t, const char * );
+static void CacheLoad ( vlc_object_t * );
+static int CacheLoadConfig ( module_t *, FILE * );
+static void CacheSave ( vlc_object_t * );
+static void CacheSaveConfig ( module_t *, FILE * );
+static void CacheMerge ( vlc_object_t *, module_t *, module_t * );
+static module_cache_t * CacheFind( vlc_object_t *, char *, int64_t, int64_t );
+
+#if defined(HAVE_DL_WINDOWS)
+static char * GetWindowsError ( void );
#endif
-
-#ifdef HAVE_DYNAMIC_PLUGINS
-static module_symbols_t symbols;
#endif
/*****************************************************************************
*****************************************************************************/
void __module_InitBank( vlc_object_t *p_this )
{
- p_this->p_vlc->module_bank.first = NULL;
- p_this->p_vlc->module_bank.i_count = 0;
- vlc_mutex_init( p_this, &p_this->p_vlc->module_bank.lock );
+ module_bank_t *p_bank;
+ vlc_value_t lockval;
+
+ var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ if( p_this->p_libvlc->p_module_bank )
+ {
+ p_this->p_libvlc->p_module_bank->i_usage++;
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+ return;
+ }
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+
+ p_bank = vlc_object_create( p_this, sizeof(module_bank_t) );
+ p_bank->psz_object_name = "module bank";
+ p_bank->i_usage = 1;
+ p_bank->i_cache = p_bank->i_loaded_cache = 0;
+ p_bank->pp_cache = p_bank->pp_loaded_cache = 0;
+ p_bank->b_cache = p_bank->b_cache_dirty =
+ p_bank->b_cache_delete = VLC_FALSE;
/*
* Store the symbols to be exported
*/
#ifdef HAVE_DYNAMIC_PLUGINS
- STORE_SYMBOLS( &symbols );
+ STORE_SYMBOLS( &p_bank->symbols );
#endif
+ /* Everything worked, attach the object */
+ p_this->p_libvlc->p_module_bank = p_bank;
+ vlc_object_attach( p_bank, p_this->p_libvlc );
+
+ module_LoadMain( p_this );
+
return;
}
void __module_EndBank( vlc_object_t *p_this )
{
module_t * p_next;
+ vlc_value_t lockval;
+
+ var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ if( !p_this->p_libvlc->p_module_bank )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+ return;
+ }
+ if( --p_this->p_libvlc->p_module_bank->i_usage )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+ return;
+ }
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
- while( p_this->p_vlc->module_bank.first != NULL )
+#ifdef HAVE_DYNAMIC_PLUGINS
+ if( p_this->p_libvlc->p_module_bank->b_cache ) CacheSave( p_this );
+#endif
+
+ vlc_object_detach( p_this->p_libvlc->p_module_bank );
+
+ while( p_this->p_libvlc->p_module_bank->i_children )
{
- if( DeleteModule( p_this->p_vlc->module_bank.first ) )
+ p_next = (module_t *)p_this->p_libvlc->p_module_bank->pp_children[0];
+
+ if( DeleteModule( p_next ) )
{
/* Module deletion failed */
- msg_Err( p_this, "`%s' can't be removed, trying harder",
- p_this->p_vlc->module_bank.first->psz_object_name );
+ msg_Err( p_this, "module \"%s\" can't be removed, trying harder",
+ p_next->psz_object_name );
/* We just free the module by hand. Niahahahahaha. */
- p_next = p_this->p_vlc->module_bank.first->next;
- free( p_this->p_vlc->module_bank.first );
- p_this->p_vlc->module_bank.first = p_next;
+ vlc_object_detach( p_next );
+ vlc_object_destroy( p_next );
}
}
- /* Destroy the lock */
- vlc_mutex_destroy( &p_this->p_vlc->module_bank.lock );
+ vlc_object_destroy( p_this->p_libvlc->p_module_bank );
return;
}
*****************************************************************************/
void __module_LoadMain( vlc_object_t *p_this )
{
- AllocateBuiltinModule( p_this, InitModule__MODULE_main,
- ActivateModule__MODULE_main,
- DeactivateModule__MODULE_main );
+ AllocateBuiltinModule( p_this, vlc_entry__main );
}
/*****************************************************************************
{
#ifdef HAVE_DYNAMIC_PLUGINS
msg_Dbg( p_this, "checking plugin modules" );
- AllocateAllPlugins( p_this );
-#endif
-}
-
-/*****************************************************************************
- * module_ManageBank: manage the module bank.
- *****************************************************************************
- * This function parses the module bank and hides modules that have been
- * unused for a while.
- *****************************************************************************/
-void __module_ManageBank( vlc_object_t *p_this )
-{
-#ifdef HAVE_DYNAMIC_PLUGINS
- module_t * p_module;
-
- /* We take the global lock */
- vlc_mutex_lock( &p_this->p_vlc->module_bank.lock );
- /* Parse the module list to see if any modules need to be unloaded */
- for( p_module = p_this->p_vlc->module_bank.first ;
- p_module != NULL ;
- p_module = p_module->next )
- {
- /* If the module is unused and if it is a plugin module... */
- if( p_module->i_usage == 0 && !p_module->b_builtin )
- {
- if( p_module->i_unused_delay < MODULE_HIDE_DELAY )
- {
- p_module->i_unused_delay++;
- }
- else
- {
- msg_Dbg( p_this, "hiding unused plugin module `%s'",
- p_module->psz_object_name );
- HideModule( p_module );
-
- /* Break here, so that we only hide one module at a time */
- break;
- }
- }
- }
+ if( config_GetInt( p_this, "plugins-cache" ) )
+ p_this->p_libvlc->p_module_bank->b_cache = VLC_TRUE;
- /* We release the global lock */
- vlc_mutex_unlock( &p_this->p_vlc->module_bank.lock );
-#endif /* HAVE_DYNAMIC_PLUGINS */
+ if( p_this->p_libvlc->p_module_bank->b_cache ||
+ p_this->p_libvlc->p_module_bank->b_cache_delete ) CacheLoad( p_this );
- return;
+ AllocateAllPlugins( p_this );
+#endif
}
/*****************************************************************************
*****************************************************************************
* This function returns the module that best fits the asked capabilities.
*****************************************************************************/
-module_t * __module_Need( vlc_object_t *p_this, int i_capability,
- const char *psz_name, void *p_data )
+module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability,
+ const char *psz_name, vlc_bool_t b_strict )
{
typedef struct module_list_t module_list_t;
{
module_t *p_module;
int i_score;
+ vlc_bool_t b_force;
module_list_t *p_next;
};
module_list_t *p_list, *p_first, *p_tmp;
+ vlc_list_t *p_all;
- int i_ret, i_index = 0;
+ int i_which_module, i_index = 0;
vlc_bool_t b_intf = VLC_FALSE;
module_t *p_module;
int i_shortcuts = 0;
- char *psz_shortcuts = NULL;
+ char *psz_shortcuts = NULL, *psz_var = NULL;
- msg_Dbg( p_this, "looking for %s module",
- MODULE_CAPABILITY( i_capability ) );
+ msg_Dbg( p_this, "looking for %s module", psz_capability );
- /* We take the global lock */
- vlc_mutex_lock( &p_this->p_vlc->module_bank.lock );
+ /* Deal with variables */
+ if( psz_name && psz_name[0] == '$' )
+ {
+ vlc_value_t val;
+ var_Create( p_this, psz_name + 1, VLC_VAR_MODULE | VLC_VAR_DOINHERIT );
+ var_Get( p_this, psz_name + 1, &val );
+ psz_var = val.psz_string;
+ psz_name = psz_var;
+ }
/* Count how many different shortcuts were asked for */
if( psz_name && *psz_name )
{
- char *psz_parser;
+ char *psz_parser, *psz_last_shortcut;
+
+ /* If the user wants none, give him none. */
+ if( !strcmp( psz_name, "none" ) )
+ {
+ if( psz_var ) free( psz_var );
+ return NULL;
+ }
i_shortcuts++;
- psz_shortcuts = strdup( psz_name );
+ psz_shortcuts = psz_last_shortcut = strdup( psz_name );
for( psz_parser = psz_shortcuts; *psz_parser; psz_parser++ )
{
{
*psz_parser = '\0';
i_shortcuts++;
+ psz_last_shortcut = psz_parser + 1;
+ }
+ }
+
+ /* Check if the user wants to override the "strict" mode */
+ if( psz_last_shortcut )
+ {
+ if( !strcmp(psz_last_shortcut, "none") )
+ {
+ b_strict = VLC_TRUE;
+ i_shortcuts--;
+ }
+ else if( !strcmp(psz_last_shortcut, "any") )
+ {
+ b_strict = VLC_FALSE;
+ i_shortcuts--;
}
}
}
/* Sort the modules and test them */
- p_list = malloc( p_this->p_vlc->module_bank.i_count
- * sizeof( module_list_t ) );
+ p_all = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ p_list = malloc( p_all->i_count * sizeof( module_list_t ) );
p_first = NULL;
/* Parse the module list for capabilities and probe each of them */
- for( p_module = p_this->p_vlc->module_bank.first ;
- p_module != NULL ;
- p_module = p_module->next )
+ for( i_which_module = 0; i_which_module < p_all->i_count; i_which_module++ )
{
int i_shortcut_bonus = 0;
- /* Test that this module can do everything we need */
- if( !(p_module->i_capabilities & ( 1 << i_capability )) )
+ p_module = (module_t *)p_all->p_values[i_which_module].p_object;
+
+ /* Test that this module can do what we need */
+ if( strcmp( p_module->psz_capability, psz_capability ) )
{
+ /* Don't recurse through the sub-modules because vlc_list_find()
+ * will list them anyway. */
continue;
}
/* Test if we have the required CPU */
- if( (p_module->i_cpu_capabilities
- & p_this->p_vlc->i_cpu_capabilities)
- != p_module->i_cpu_capabilities )
+ if( (p_module->i_cpu & p_this->p_libvlc->i_cpu) != p_module->i_cpu )
{
continue;
}
/* If we required a shortcut, check this plugin provides it. */
- if( i_shortcuts )
+ if( i_shortcuts > 0 )
{
- vlc_bool_t b_trash = VLC_TRUE;
+ vlc_bool_t b_trash;
int i_dummy, i_short = i_shortcuts;
char *psz_name = psz_shortcuts;
- while( i_short )
+ /* Let's drop modules with a 0 score (unless they are
+ * explicitly requested) */
+ b_trash = !p_module->i_score;
+
+ while( i_short > 0 )
{
- for( i_dummy = 0;
- b_trash && p_module->pp_shortcuts[i_dummy];
- i_dummy++ )
+ for( i_dummy = 0; p_module->pp_shortcuts[i_dummy]; i_dummy++ )
{
- b_trash = strcmp( psz_name,
- p_module->pp_shortcuts[i_dummy] );
+ if( !strcasecmp( psz_name,
+ p_module->pp_shortcuts[i_dummy] ) )
+ {
+ /* Found it */
+ b_trash = VLC_FALSE;
+ i_shortcut_bonus = i_short * 10000;
+ break;
+ }
}
- if( !b_trash )
+ if( i_shortcut_bonus )
{
- i_shortcut_bonus = i_short * 10000;
+ /* We found it... remember ? */
break;
}
+ /* Go to the next shortcut... This is so lame! */
while( *psz_name )
{
psz_name++;
i_short--;
}
+ /* If we are in "strict" mode and we couldn't
+ * find the module in the list of provided shortcuts,
+ * then kick the bastard out of here!!! */
+ if( i_short == 0 && b_strict )
+ {
+ b_trash = VLC_TRUE;
+ }
+
if( b_trash )
{
continue;
}
}
/* If we didn't require a shortcut, trash zero-scored plugins */
- else if( !p_module->pi_score[i_capability] )
+ else if( !p_module->i_score )
{
continue;
}
/* Special case: test if we requested a particular intf plugin */
- if( i_capability == MODULE_CAPABILITY_INTF )
+ if( !i_shortcuts && p_module->psz_program
+ && !strcmp( p_module->psz_program,
+ p_this->p_vlc->psz_object_name ) )
{
- if( p_module->psz_program != NULL
- && !strcmp( p_module->psz_program,
- p_this->p_vlc->psz_object_name ) )
- {
- if( !b_intf )
- {
- /* Remove previous non-matching plugins */
- i_index = 0;
- b_intf = VLC_TRUE;
- }
- }
- else
+ if( !b_intf )
{
- if( b_intf )
- {
- /* This one doesn't match */
- continue;
- }
+ /* Remove previous non-matching plugins */
+ i_index = 0;
+ b_intf = VLC_TRUE;
}
}
+ else if( b_intf )
+ {
+ /* This one doesn't match */
+ continue;
+ }
/* Store this new module */
p_list[ i_index ].p_module = p_module;
- p_list[ i_index ].i_score = p_module->pi_score[i_capability]
- + i_shortcut_bonus;
+ p_list[ i_index ].i_score = p_module->i_score + i_shortcut_bonus;
+ p_list[ i_index ].b_force = !!i_shortcut_bonus;
/* Add it to the modules-to-probe list */
if( i_index == 0 )
i_index++;
}
- /* Lock all selected modules */
+ msg_Dbg( p_this, "probing %i candidate%s",
+ i_index, i_index == 1 ? "" : "s" );
+
+ /* Lock all candidate modules */
p_tmp = p_first;
while( p_tmp != NULL )
{
- LockModule( p_tmp->p_module );
+ vlc_object_yield( p_tmp->p_module );
p_tmp = p_tmp->p_next;
}
- /* We can release the global lock, module refcounts were incremented */
- vlc_mutex_unlock( &p_this->p_vlc->module_bank.lock );
+ /* We can release the list, interesting modules were yielded */
+ vlc_list_release( p_all );
/* Parse the linked list and use the first successful module */
p_tmp = p_first;
while( p_tmp != NULL )
{
- /* Test the requested capability */
- switch( i_capability )
+#ifdef HAVE_DYNAMIC_PLUGINS
+ /* Make sure the module is loaded in mem */
+ module_t *p_module = p_tmp->p_module->b_submodule ?
+ (module_t *)p_tmp->p_module->p_parent : p_tmp->p_module;
+ if( !p_module->b_builtin && !p_module->b_loaded )
{
- case MODULE_CAPABILITY_ACCESS:
- i_ret = p_tmp->p_module->p_functions->access.functions.
- access.pf_open( (input_thread_t *)p_data );
- break;
-
- case MODULE_CAPABILITY_DEMUX:
- i_ret = p_tmp->p_module->p_functions->demux.functions.
- demux.pf_init( (input_thread_t *)p_data );
- break;
-
- case MODULE_CAPABILITY_NETWORK:
- i_ret = p_tmp->p_module->p_functions->network.functions.
- network.pf_open( p_this, (network_socket_t *)p_data );
- break;
-
- case MODULE_CAPABILITY_DECODER:
- i_ret = p_tmp->p_module->p_functions->dec.functions.
- dec.pf_probe( (u8 *)p_data );
- break;
-
- case MODULE_CAPABILITY_INTF:
- i_ret = p_tmp->p_module->p_functions->intf.functions.
- intf.pf_open( (intf_thread_t *)p_data );
- break;
-
- case MODULE_CAPABILITY_AOUT:
- i_ret = p_tmp->p_module->p_functions->aout.functions.
- aout.pf_open( (aout_thread_t *)p_data );
- break;
-
- case MODULE_CAPABILITY_VOUT:
- case MODULE_CAPABILITY_VOUT_FILTER:
- i_ret = p_tmp->p_module->p_functions->vout.functions.
- vout.pf_create( (vout_thread_t *)p_data );
- break;
-
- case MODULE_CAPABILITY_CHROMA:
- i_ret = p_tmp->p_module->p_functions->chroma.functions.
- chroma.pf_init( (vout_thread_t *)p_data );
- break;
-
- case MODULE_CAPABILITY_IDCT:
- case MODULE_CAPABILITY_IMDCT:
- case MODULE_CAPABILITY_MOTION:
- case MODULE_CAPABILITY_DOWNMIX:
- case MODULE_CAPABILITY_MEMCPY:
- /* This one always works */
- i_ret = 0;
- break;
-
- default:
- msg_Err( p_this, "unknown module type %i", i_capability );
- i_ret = -1;
- break;
+ module_t *p_new_module =
+ AllocatePlugin( p_this, p_module->psz_filename );
+ if( p_new_module )
+ {
+ CacheMerge( p_this, p_module, p_new_module );
+ vlc_object_attach( p_new_module, p_module );
+ DeleteModule( p_new_module );
+ }
}
+#endif
- /* If the high score was broken, we have a new champion */
- if( i_ret == 0 )
+ p_this->b_force = p_tmp->b_force;
+ if( p_tmp->p_module->pf_activate
+ && p_tmp->p_module->pf_activate( p_this ) == VLC_SUCCESS )
{
break;
}
- else
- {
- UnlockModule( p_tmp->p_module );
- }
+ vlc_object_release( p_tmp->p_module );
p_tmp = p_tmp->p_next;
}
/* Unlock the remaining modules */
while( p_tmp != NULL )
{
- UnlockModule( p_tmp->p_module );
+ vlc_object_release( p_tmp->p_module );
p_tmp = p_tmp->p_next;
}
free( p_list );
+ p_this->b_force = VLC_FALSE;
if( p_module != NULL )
{
- msg_Info( p_module, "found and locked %s module `%s'",
- MODULE_CAPABILITY( i_capability ),
- p_module->psz_object_name );
+ msg_Dbg( p_module, "using %s module \"%s\"",
+ psz_capability, p_module->psz_object_name );
}
else if( p_first == NULL )
{
- msg_Err( p_this, "no available %s module matched `%s'",
- MODULE_CAPABILITY( i_capability ), psz_name );
+ if( !strcmp( psz_capability, "access_demux" ) )
+ {
+ msg_Warn( p_this, "no %s module matched \"%s\"",
+ psz_capability, (psz_name && *psz_name) ? psz_name : "any" );
+ }
+ else
+ {
+ msg_Err( p_this, "no %s module matched \"%s\"",
+ psz_capability, (psz_name && *psz_name) ? psz_name : "any" );
+ }
}
else if( psz_name != NULL && *psz_name )
{
- msg_Err( p_this, "could not load any %s module matching `%s'",
- MODULE_CAPABILITY( i_capability ), psz_name );
+ msg_Warn( p_this, "no %s module matching \"%s\" could be loaded",
+ psz_capability, (psz_name && *psz_name) ? psz_name : "any" );
}
if( psz_shortcuts )
free( psz_shortcuts );
}
+ if( psz_var )
+ {
+ free( psz_var );
+ }
+
/* Don't forget that the module is still locked */
return p_module;
}
* This function must be called by the thread that called module_Need, to
* decrease the reference count and allow for hiding of modules.
*****************************************************************************/
-void module_Unneed( module_t * p_module )
+void __module_Unneed( vlc_object_t * p_this, module_t * p_module )
{
- /* We take the global lock */
- vlc_mutex_lock( &p_module->p_vlc->module_bank.lock );
-
- /* Just unlock the module - we can't do anything if it fails,
- * so there is no need to check the return value. */
- UnlockModule( p_module );
+ /* Use the close method */
+ if( p_module->pf_deactivate )
+ {
+ p_module->pf_deactivate( p_this );
+ }
- msg_Info( p_module, "unlocking module `%s'", p_module->psz_object_name );
+ msg_Dbg( p_module, "unlocking module \"%s\"", p_module->psz_object_name );
- /* We release the global lock */
- vlc_mutex_unlock( &p_module->p_vlc->module_bank.lock );
+ vlc_object_release( p_module );
return;
}
static void AllocateAllPlugins( vlc_object_t *p_this )
{
/* Yes, there are two NULLs because we replace one with "plugin-path". */
- char * path[] = { "plugins", PLUGIN_PATH, NULL, NULL };
+ char * path[] = { "modules", PLUGIN_PATH, "plugins", NULL,
+ NULL };
char ** ppsz_path = path;
char * psz_fullpath;
- char * psz_file;
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
- char * psz_vlcpath = system_GetProgramPath();
- int i_vlclen = strlen( psz_vlcpath );
- vlc_bool_t b_notinroot;
-#endif
- DIR * dir;
- struct dirent * file;
/* If the user provided a plugin path, we add it to the list */
- path[ sizeof(path)/sizeof(char*) - 2 ] = config_GetPsz( p_this,
- "plugin-path" );
+ path[ sizeof(path)/sizeof(char*) - 2 ] =
+ config_GetPsz( p_this, "plugin-path" );
for( ; *ppsz_path != NULL ; ppsz_path++ )
{
- /* Store strlen(*ppsz_path) for later use. */
- int i_dirlen = strlen( *ppsz_path );
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) \
+ || ( defined( WIN32 ) && !defined( UNDER_CE ) )
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
- b_notinroot = VLC_FALSE;
- /* Under BeOS, we need to add beos_GetProgramPath() to access
- * files under the current directory */
- if( ( i_dirlen > 1 ) && strncmp( *ppsz_path, "/", 1 ) )
+ /* Handle relative as well as absolute paths */
+#ifdef WIN32
+ if( !(*ppsz_path)[0] || (*ppsz_path)[1] != ':' )
+#else
+ if( (*ppsz_path)[0] != '/' )
+#endif
{
- i_dirlen += i_vlclen + 2;
- b_notinroot = VLC_TRUE;
+ int i_dirlen = strlen( *ppsz_path );
+ i_dirlen += strlen( p_this->p_libvlc->psz_vlcpath ) + 2;
psz_fullpath = malloc( i_dirlen );
if( psz_fullpath == NULL )
{
continue;
}
- sprintf( psz_fullpath, "%s/%s", psz_vlcpath, *ppsz_path );
+#ifdef WIN32
+ sprintf( psz_fullpath, "%s\\%s",
+ p_this->p_libvlc->psz_vlcpath, *ppsz_path );
+#else
+ sprintf( psz_fullpath, "%s/%s",
+ p_this->p_libvlc->psz_vlcpath, *ppsz_path );
+#endif
}
else
#endif
{
- psz_fullpath = *ppsz_path;
+ psz_fullpath = strdup( *ppsz_path );
}
- msg_Dbg( p_this, "browsing `%s'", psz_fullpath );
-
- if( (dir = opendir( psz_fullpath )) )
- {
- /* Parse the directory and try to load all files it contains. */
- while( (file = readdir( dir )) )
- {
- int i_filelen = strlen( file->d_name );
-
- /* We only load files ending with ".so" */
- if( i_filelen > 3
- && !strncmp( file->d_name + i_filelen - 3, ".so", 3 ) )
- {
- psz_file = malloc( i_dirlen + i_filelen + 2 );
- if( psz_file == NULL )
- {
- continue;
- }
- sprintf( psz_file, "%s/%s", psz_fullpath, file->d_name );
-
- /* We created a nice filename -- now we just try to load
- * it as a plugin module. */
- AllocatePluginModule( p_this, psz_file );
-
- /* We don't care if the allocation succeeded */
- free( psz_file );
- }
- }
+ msg_Dbg( p_this, "recursively browsing `%s'", psz_fullpath );
- /* Close the directory if successfully opened */
- closedir( dir );
- }
+ /* Don't go deeper than 5 subdirectories */
+ AllocatePluginDir( p_this, psz_fullpath, 5 );
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
- if( b_notinroot )
- {
- free( psz_fullpath );
- }
-#endif
+ free( psz_fullpath );
}
+
+ /* Free plugin-path */
+ if( path[ sizeof(path)/sizeof(char*) - 2 ] )
+ free( path[ sizeof(path)/sizeof(char*) - 2 ] );
+ path[ sizeof(path)/sizeof(char*) - 2 ] = NULL;
}
/*****************************************************************************
- * AllocatePluginModule: load a module into memory and initialize it.
- *****************************************************************************
- * This function loads a dynamically loadable module and allocates a structure
- * for its information data. The module can then be handled by module_Need,
- * module_Unneed and HideModule. It can be removed by DeleteModule.
+ * AllocatePluginDir: recursively parse a directory to look for plugins
*****************************************************************************/
-static int AllocatePluginModule( vlc_object_t * p_this, char * psz_filename )
+static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir,
+ int i_maxdepth )
{
- char **pp_shortcut;
- module_t * p_module, * p_othermodule;
- module_handle_t handle;
+#if defined( UNDER_CE ) || defined( _MSC_VER )
+#ifdef UNDER_CE
+ wchar_t psz_path[MAX_PATH + 256];
+ wchar_t psz_wdir[MAX_PATH];
+#else
+ char psz_path[MAX_PATH + 256];
+#endif
+ WIN32_FIND_DATA finddata;
+ HANDLE handle;
+ unsigned int rc;
+#else
+ int i_dirlen;
+ DIR * dir;
+ struct dirent * file;
+#endif
+ char * psz_file;
- /* Try to dynamically load the module. */
- if( module_load( psz_filename, &handle ) )
+ if( p_this->p_vlc->b_die || i_maxdepth < 0 )
{
- char psz_buffer[256];
-
- /* The plugin module couldn't be opened */
- msg_Warn( p_this, "cannot open %s (%s)",
- psz_filename, module_error( psz_buffer ) );
- return -1;
+ return;
}
- /* Now that we have successfully loaded the module, we can
- * allocate a structure for it */
- p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
- if( p_module == NULL )
+#if defined( UNDER_CE ) || defined( _MSC_VER )
+ MultiByteToWideChar( CP_ACP, 0, psz_dir, -1, psz_wdir, MAX_PATH );
+
+ rc = GetFileAttributes( psz_wdir );
+ if( !(rc & FILE_ATTRIBUTE_DIRECTORY) )
{
- msg_Err( p_this, "out of memory" );
- module_unload( handle );
- return -1;
+ /* Not a directory */
+ return;
}
- /* We need to fill these since they may be needed by CallSymbol() */
- p_module->is.plugin.psz_filename = psz_filename;
- p_module->is.plugin.handle = handle;
- p_module->p_symbols = &symbols;
-
- /* Initialize the module: fill p_module->psz_object_name, default config */
- if( CallSymbol( p_module, "InitModule" MODULE_SUFFIX ) != 0 )
+ /* Parse all files in the directory */
+#ifdef UNDER_CE
+ swprintf( psz_path, L"%s\\*.*", psz_dir );
+#else
+ sprintf( psz_path, "%s\\*.*", psz_dir );
+#endif
+ handle = FindFirstFile( psz_path, &finddata );
+ if( handle == INVALID_HANDLE_VALUE )
{
- /* We couldn't call InitModule() */
- vlc_object_destroy( p_module );
- module_unload( handle );
- return -1;
+ /* Empty directory */
+ return;
}
- /* Check that we don't already have a module with this name */
- for( p_othermodule = p_this->p_vlc->module_bank.first ;
- p_othermodule != NULL ;
- p_othermodule = p_othermodule->next )
+ /* Parse the directory and try to load all files it contains. */
+ do
{
- if( !strcmp( p_othermodule->psz_object_name,
- p_module->psz_object_name ) )
+#ifdef UNDER_CE
+ unsigned int i_len = wcslen( finddata.cFileName );
+ swprintf( psz_path, L"%s\\%s", psz_dir, finddata.cFileName );
+#else
+ unsigned int i_len = strlen( finddata.cFileName );
+ /* Skip ".", ".." and anything starting with "." */
+ if( !*finddata.cFileName || *finddata.cFileName == '.' )
{
- msg_Warn( p_this,
- "cannot load %s, a module named `%s' already exists",
- psz_filename, p_module->psz_object_name );
- config_Free( p_module );
- vlc_object_destroy( p_module );
- module_unload( handle );
- return -1;
+ if( !FindNextFile( handle, &finddata ) ) break;
+ continue;
}
- }
+ sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName );
+#endif
- /* Activate the module : fill the capability structure, etc. */
- if( CallSymbol( p_module, "ActivateModule" MODULE_SUFFIX ) != 0 )
- {
- /* We couldn't call ActivateModule() */
- config_Free( p_module );
- vlc_object_destroy( p_module );
- module_unload( handle );
- return -1;
+ if( GetFileAttributes( psz_path ) & FILE_ATTRIBUTE_DIRECTORY )
+ {
+ AllocatePluginDir( p_this, psz_path, i_maxdepth - 1 );
+ }
+ else if( i_len > strlen( LIBEXT )
+#ifdef UNDER_CE
+ )
+#else
+ /* We only load files ending with LIBEXT */
+ && !strncasecmp( psz_path + strlen( psz_path)
+ - strlen( LIBEXT ),
+ LIBEXT, strlen( LIBEXT ) ) )
+#endif
+ {
+#ifdef UNDER_CE
+ char psz_filename[MAX_PATH];
+ WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_path, -1,
+ psz_filename, MAX_PATH, NULL, NULL );
+ psz_file = psz_filename;
+#else
+ psz_file = psz_path;
+#endif
+
+ AllocatePluginFile( p_this, psz_file, 0, 0 );
+ }
}
+ while( !p_this->p_vlc->b_die && FindNextFile( handle, &finddata ) );
- for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ )
+ /* Close the directory */
+ FindClose( handle );
+
+#else
+ dir = opendir( psz_dir );
+ if( !dir )
{
- *pp_shortcut = strdup( *pp_shortcut );
+ return;
}
- /* We strdup() these entries so that they are still valid when the
- * module is unloaded. */
- p_module->is.plugin.psz_filename =
- strdup( p_module->is.plugin.psz_filename );
- p_module->psz_object_name = strdup( p_module->psz_object_name );
- p_module->psz_longname = strdup( p_module->psz_longname );
+ i_dirlen = strlen( psz_dir );
- if( p_module->is.plugin.psz_filename == NULL
- || p_module->psz_object_name == NULL
- || p_module->psz_longname == NULL )
+ /* Parse the directory and try to load all files it contains. */
+ while( !p_this->p_vlc->b_die && (file = readdir( dir )) )
{
- msg_Err( p_this, "out of memory" );
+ struct stat statbuf;
+ unsigned int i_len;
+ int i_stat;
- free( p_module->is.plugin.psz_filename );
- free( p_module->psz_object_name );
- free( p_module->psz_longname );
- free( p_module->psz_program );
+ /* Skip ".", ".." and anything starting with "." */
+ if( !*file->d_name || *file->d_name == '.' )
+ {
+ continue;
+ }
- config_Free( p_module );
- vlc_object_destroy( p_module );
- module_unload( handle );
- return -1;
- }
+ i_len = strlen( file->d_name );
+ psz_file = malloc( i_dirlen + 1 + i_len + 1 );
+#ifdef WIN32
+ sprintf( psz_file, "%s\\%s", psz_dir, file->d_name );
+#else
+ sprintf( psz_file, "%s/%s", psz_dir, file->d_name );
+#endif
- if( p_module->psz_program != NULL )
- {
- p_module->psz_program = strdup( p_module->psz_program );
- }
+ i_stat = stat( psz_file, &statbuf );
+ if( !i_stat && statbuf.st_mode & S_IFDIR )
+ {
+ AllocatePluginDir( p_this, psz_file, i_maxdepth - 1 );
+ }
+ else if( i_len > strlen( LIBEXT )
+ /* We only load files ending with LIBEXT */
+ && !strncasecmp( file->d_name + i_len - strlen( LIBEXT ),
+ LIBEXT, strlen( LIBEXT ) ) )
+ {
+ int64_t i_time = 0, i_size = 0;
- /* Everything worked fine ! The module is ready to be added to the list. */
- p_module->i_usage = 0;
- p_module->i_unused_delay = 0;
+ if( !i_stat )
+ {
+ i_time = statbuf.st_mtime;
+ i_size = statbuf.st_size;
+ }
- p_module->b_builtin = VLC_FALSE;
+ AllocatePluginFile( p_this, psz_file, i_time, i_size );
+ }
- /* Link module into the linked list */
- if( p_this->p_vlc->module_bank.first != NULL )
- {
- p_this->p_vlc->module_bank.first->prev = p_module;
+ free( psz_file );
}
- p_module->next = p_this->p_vlc->module_bank.first;
- p_module->prev = NULL;
- p_this->p_vlc->module_bank.first = p_module;
- p_this->p_vlc->module_bank.i_count++;
- msg_Dbg( p_this, "plugin `%s', %s",
- p_module->psz_object_name, p_module->psz_longname );
+ /* Close the directory */
+ closedir( dir );
- vlc_object_attach( p_module, p_this );
-
- return 0;
+#endif
}
-#endif /* HAVE_DYNAMIC_PLUGINS */
/*****************************************************************************
- * AllocateBuiltinModule: initialize a builtin module.
+ * AllocatePluginFile: load a module into memory and initialize it.
*****************************************************************************
- * This function registers a builtin module and allocates a structure
- * for its information data. The module can then be handled by module_Need,
- * module_Unneed and HideModule. It can be removed by DeleteModule.
+ * This function loads a dynamically loadable module and allocates a structure
+ * for its information data. The module can then be handled by module_Need
+ * and module_Unneed. It can be removed by DeleteModule.
*****************************************************************************/
-static int AllocateBuiltinModule( vlc_object_t * p_this,
- int ( *pf_init ) ( module_t * ),
- int ( *pf_activate ) ( module_t * ),
- int ( *pf_deactivate ) ( module_t * ) )
+static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file,
+ int64_t i_file_time, int64_t i_file_size )
{
- module_t * p_module, * p_othermodule;
+ module_t * p_module;
+ module_cache_t *p_cache_entry = NULL;
- /* Now that we have successfully loaded the module, we can
- * allocate a structure for it */
- p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
- if( p_module == NULL )
- {
- msg_Err( p_this, "out of memory" );
- return -1;
- }
+ /*
+ * Check our plugins cache first then load plugin if needed
+ */
+ p_cache_entry =
+ CacheFind( p_this, psz_file, i_file_time, i_file_size );
- /* Initialize the module : fill p_module->psz_object_name, etc. */
- if( pf_init( p_module ) != 0 )
+ if( !p_cache_entry )
{
- /* With a well-written module we shouldn't have to print an
- * additional error message here, but just make sure. */
- msg_Err( p_this, "failed calling init in builtin module" );
- vlc_object_destroy( p_module );
- return -1;
+ p_module = AllocatePlugin( p_this, psz_file );
}
-
- /* Check that we don't already have a module with this name */
- for( p_othermodule = p_this->p_vlc->module_bank.first ;
- p_othermodule != NULL ;
- p_othermodule = p_othermodule->next )
+ else
{
- if( !strcmp( p_othermodule->psz_object_name,
- p_module->psz_object_name ) )
+ /* If junk dll, don't try to load it */
+ if( p_cache_entry->b_junk )
{
- msg_Warn( p_this, "cannot load builtin `%s', "
- "a module named `%s' already exists",
- p_module->psz_object_name, p_module->psz_object_name );
- config_Free( p_module );
- vlc_object_destroy( p_module );
- return -1;
+ p_module = NULL;
}
- }
-
- if( pf_activate( p_module ) != 0 )
- {
- /* With a well-written module we shouldn't have to print an
- * additional error message here, but just make sure. */
- msg_Err( p_this, "failed calling activate in builtin module" );
- config_Free( p_module );
- vlc_object_destroy( p_module );
- return -1;
- }
+ else
+ {
+ module_config_t *p_item;
- /* Everything worked fine ! The module is ready to be added to the list. */
- p_module->i_usage = 0;
- p_module->i_unused_delay = 0;
+ p_module = p_cache_entry->p_module;
+ p_module->b_loaded = VLC_FALSE;
- p_module->b_builtin = VLC_TRUE;
- p_module->is.builtin.pf_deactivate = pf_deactivate;
+ /* For now we force loading if the module's config contains
+ * callbacks or actions.
+ * Could be optimized by adding an API call.*/
+ for( p_item = p_module->p_config;
+ p_item->i_type != CONFIG_HINT_END; p_item++ )
+ {
+ if( p_item->pf_callback || p_item->i_action )
+ p_module = AllocatePlugin( p_this, psz_file );
+ }
+ }
+ }
- /* Link module into the linked list */
- if( p_this->p_vlc->module_bank.first != NULL )
+ if( p_module )
{
- p_this->p_vlc->module_bank.first->prev = p_module;
- }
- p_module->next = p_this->p_vlc->module_bank.first;
- p_module->prev = NULL;
- p_this->p_vlc->module_bank.first = p_module;
- p_this->p_vlc->module_bank.i_count++;
+ /* Everything worked fine !
+ * The module is ready to be added to the list. */
+ p_module->b_builtin = VLC_FALSE;
- msg_Dbg( p_this, "builtin `%s', %s",
- p_module->psz_object_name, p_module->psz_longname );
+ /* msg_Dbg( p_this, "plugin \"%s\", %s",
+ p_module->psz_object_name, p_module->psz_longname ); */
- vlc_object_attach( p_module, p_this );
+ vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank );
+ }
- return 0;
+ if( !p_this->p_libvlc->p_module_bank->b_cache ) return 0;
+
+ /* Add entry to cache */
+#define p_bank p_this->p_libvlc->p_module_bank
+ p_bank->pp_cache =
+ realloc( p_bank->pp_cache, (p_bank->i_cache + 1) * sizeof(void *) );
+ p_bank->pp_cache[p_bank->i_cache] = malloc( sizeof(module_cache_t) );
+ p_bank->pp_cache[p_bank->i_cache]->psz_file = strdup( psz_file );
+ p_bank->pp_cache[p_bank->i_cache]->i_time = i_file_time;
+ p_bank->pp_cache[p_bank->i_cache]->i_size = i_file_size;
+ p_bank->pp_cache[p_bank->i_cache]->b_junk = p_module ? 0 : 1;
+ p_bank->pp_cache[p_bank->i_cache]->p_module = p_module;
+ p_bank->i_cache++;
+
+ return p_module ? 0 : -1;
}
/*****************************************************************************
- * DeleteModule: delete a module and its structure.
+ * AllocatePlugin: load a module into memory and initialize it.
*****************************************************************************
- * This function can only be called if i_usage <= 0.
+ * This function loads a dynamically loadable module and allocates a structure
+ * for its information data. The module can then be handled by module_Need
+ * and module_Unneed. It can be removed by DeleteModule.
*****************************************************************************/
-static int DeleteModule( module_t * p_module )
+static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file )
{
- /* If the module is not in use but is still in memory, we first have
- * to hide it and remove it from memory before we can free the
- * data structure. */
- if( p_module->b_builtin )
- {
- if( p_module->i_usage != 0 )
- {
- msg_Err( p_module, "trying to free builtin module `%s' with "
- "usage %i", p_module->psz_object_name, p_module->i_usage );
- return -1;
- }
- else
- {
- /* We deactivate the module now. */
- p_module->is.builtin.pf_deactivate( p_module );
- }
+ module_t * p_module;
+ module_handle_t handle;
+
+ if( LoadModule( p_this, psz_file, &handle ) ) return NULL;
+
+ /* Now that we have successfully loaded the module, we can
+ * allocate a structure for it */
+ p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
+ if( p_module == NULL )
+ {
+ msg_Err( p_this, "out of memory" );
+ CloseModule( handle );
+ return NULL;
}
-#ifdef HAVE_DYNAMIC_PLUGINS
- else
+
+ /* We need to fill these since they may be needed by CallEntry() */
+ p_module->psz_filename = psz_file;
+ p_module->handle = handle;
+ p_module->p_symbols = &p_this->p_libvlc->p_module_bank->symbols;
+ p_module->b_loaded = VLC_TRUE;
+
+ /* Initialize the module: fill p_module, default config */
+ if( CallEntry( p_module ) != 0 )
{
- if( p_module->i_usage >= 1 )
- {
- msg_Err( p_module, "trying to free module `%s' which is "
- "still in use", p_module->psz_object_name );
- return -1;
- }
+ /* We couldn't call module_init() */
+ vlc_object_destroy( p_module );
+ CloseModule( handle );
+ return NULL;
+ }
- /* Two possibilities here: i_usage == -1 and the module is already
- * unloaded, we can continue, or i_usage == 0, and we have to hide
- * the module before going on. */
- if( p_module->i_usage == 0 )
- {
- if( HideModule( p_module ) != 0 )
- {
- return -1;
- }
- }
+ DupModule( p_module );
+ p_module->psz_filename = strdup( p_module->psz_filename );
+ p_module->psz_longname = strdup( p_module->psz_longname );
+
+ /* Everything worked fine ! The module is ready to be added to the list. */
+ p_module->b_builtin = VLC_FALSE;
+
+ return p_module;
+}
+
+/*****************************************************************************
+ * DupModule: make a plugin module standalone.
+ *****************************************************************************
+ * This function duplicates all strings in the module, so that the dynamic
+ * object can be unloaded. It acts recursively on submodules.
+ *****************************************************************************/
+static void DupModule( module_t *p_module )
+{
+ char **pp_shortcut;
+ int i_submodule;
+
+ for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ )
+ {
+ *pp_shortcut = strdup( *pp_shortcut );
}
-#endif
- vlc_object_detach_all( p_module );
+ /* We strdup() these entries so that they are still valid when the
+ * module is unloaded. */
+ p_module->psz_object_name = strdup( p_module->psz_object_name );
+ p_module->psz_capability = strdup( p_module->psz_capability );
- /* Unlink the module from the linked list. */
- if( p_module->prev != NULL )
+ if( p_module->psz_program != NULL )
{
- p_module->prev->next = p_module->next;
+ p_module->psz_program = strdup( p_module->psz_program );
}
- else
+
+ for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ )
{
- p_module->p_vlc->module_bank.first = p_module->next;
+ DupModule( (module_t*)p_module->pp_children[ i_submodule ] );
+ }
+}
+
+/*****************************************************************************
+ * UndupModule: free a duplicated module.
+ *****************************************************************************
+ * This function frees the allocations done in DupModule().
+ *****************************************************************************/
+static void UndupModule( module_t *p_module )
+{
+ char **pp_shortcut;
+ int i_submodule;
+
+ for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ )
+ {
+ UndupModule( (module_t*)p_module->pp_children[ i_submodule ] );
+ }
+
+ for( pp_shortcut = p_module->pp_shortcuts ; *pp_shortcut ; pp_shortcut++ )
+ {
+ free( *pp_shortcut );
+ }
+
+ free( p_module->psz_object_name );
+ free( p_module->psz_capability );
+
+ if( p_module->psz_program != NULL )
+ {
+ free( p_module->psz_program );
+ }
+}
+
+#endif /* HAVE_DYNAMIC_PLUGINS */
+
+/*****************************************************************************
+ * AllocateBuiltinModule: initialize a builtin module.
+ *****************************************************************************
+ * This function registers a builtin module and allocates a structure
+ * for its information data. The module can then be handled by module_Need
+ * and module_Unneed. It can be removed by DeleteModule.
+ *****************************************************************************/
+static int AllocateBuiltinModule( vlc_object_t * p_this,
+ int ( *pf_entry ) ( module_t * ) )
+{
+ module_t * p_module;
+
+ /* Now that we have successfully loaded the module, we can
+ * allocate a structure for it */
+ p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
+ if( p_module == NULL )
+ {
+ msg_Err( p_this, "out of memory" );
+ return -1;
}
- if( p_module->next != NULL )
+ /* Initialize the module : fill p_module->psz_object_name, etc. */
+ if( pf_entry( p_module ) != 0 )
{
- p_module->next->prev = p_module->prev;
+ /* With a well-written module we shouldn't have to print an
+ * additional error message here, but just make sure. */
+ msg_Err( p_this, "failed calling entry point in builtin module" );
+ vlc_object_destroy( p_module );
+ return -1;
}
- p_module->p_vlc->module_bank.i_count--;
+ /* Everything worked fine ! The module is ready to be added to the list. */
+ p_module->b_builtin = VLC_TRUE;
+
+ /* msg_Dbg( p_this, "builtin \"%s\", %s",
+ p_module->psz_object_name, p_module->psz_longname ); */
+
+ vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank );
+
+ return 0;
+}
+
+/*****************************************************************************
+ * DeleteModule: delete a module and its structure.
+ *****************************************************************************
+ * This function can only be called if the module isn't being used.
+ *****************************************************************************/
+static int DeleteModule( module_t * p_module )
+{
+ vlc_object_detach( p_module );
/* We free the structures that we strdup()ed in Allocate*Module(). */
#ifdef HAVE_DYNAMIC_PLUGINS
if( !p_module->b_builtin )
{
- char **pp_shortcut = p_module->pp_shortcuts;
-
- for( ; *pp_shortcut ; pp_shortcut++ )
+ if( p_module->b_loaded && p_module->b_unloadable )
{
- free( *pp_shortcut );
+ CloseModule( p_module->handle );
}
-
- free( p_module->is.plugin.psz_filename );
- free( p_module->psz_object_name );
+ UndupModule( p_module );
+ free( p_module->psz_filename );
free( p_module->psz_longname );
- free( p_module->psz_program );
}
#endif
+ /* Free and detach the object's children */
+ while( p_module->i_children )
+ {
+ vlc_object_t *p_this = p_module->pp_children[0];
+ vlc_object_detach( p_this );
+ vlc_object_destroy( p_this );
+ }
+
config_Free( p_module );
vlc_object_destroy( p_module );
return 0;
}
+#ifdef HAVE_DYNAMIC_PLUGINS
/*****************************************************************************
- * LockModule: increase the usage count of a module and load it if needed.
+ * CallEntry: call an entry point.
*****************************************************************************
- * This function has to be called before a thread starts using a module. If
- * the module is already loaded, we just increase its usage count. If it isn't
- * loaded, we have to dynamically open it and initialize it.
- * If you successfully call LockModule() at any moment, be careful to call
- * UnlockModule() when you don't need it anymore.
+ * This function calls a symbol given its name and a module structure. The
+ * symbol MUST refer to a function returning int and taking a module_t* as
+ * an argument.
*****************************************************************************/
-static int LockModule( module_t * p_module )
+static int CallEntry( module_t * p_module )
{
- if( p_module->i_usage >= 0 )
+ static char *psz_name = "vlc_entry" MODULE_SUFFIX;
+ int (* pf_symbol) ( module_t * p_module );
+
+ /* Try to resolve the symbol */
+ pf_symbol = (int (*)(module_t *)) GetSymbol( p_module->handle, psz_name );
+
+ if( pf_symbol == NULL )
{
- /* This module is already loaded and activated, we can return */
- p_module->i_usage++;
- return 0;
+#if defined(HAVE_DL_DYLD) || defined(HAVE_DL_BEOS)
+ msg_Warn( p_module, "cannot find symbol \"%s\" in file `%s'",
+ psz_name, p_module->psz_filename );
+#elif defined(HAVE_DL_WINDOWS)
+ char *psz_error = GetWindowsError();
+ msg_Warn( p_module, "cannot find symbol \"%s\" in file `%s' (%s)",
+ psz_name, p_module->psz_filename, psz_error );
+ free( psz_error );
+#elif defined(HAVE_DL_DLOPEN)
+ msg_Warn( p_module, "cannot find symbol \"%s\" in file `%s' (%s)",
+ psz_name, p_module->psz_filename, dlerror() );
+#elif defined(HAVE_DL_SHL_LOAD)
+ msg_Warn( p_module, "cannot find symbol \"%s\" in file `%s' (%s)",
+ psz_name, p_module->psz_filename, strerror(errno) );
+#else
+# error "Something is wrong in modules.c"
+#endif
+ return -1;
}
- if( p_module->b_builtin )
+ /* We can now try to call the symbol */
+ if( pf_symbol( p_module ) != 0 )
{
- /* A builtin module should always have a refcount >= 0 ! */
- msg_Err( p_module, "builtin module `%s' has refcount %i",
- p_module->psz_object_name, p_module->i_usage );
+ /* With a well-written module we shouldn't have to print an
+ * additional error message here, but just make sure. */
+ msg_Err( p_module, "failed calling symbol \"%s\" in file `%s'",
+ psz_name, p_module->psz_filename );
return -1;
}
-#ifdef HAVE_DYNAMIC_PLUGINS
- if( p_module->i_usage != -1 )
+ /* Everything worked fine, we can return */
+ return 0;
+}
+
+/*****************************************************************************
+ * LoadModule: loads a dynamic library
+ *****************************************************************************
+ * This function loads a dynamically linked library using a system dependant
+ * method. Will return 0 on success as well as the module handle.
+ *****************************************************************************/
+static int LoadModule( vlc_object_t *p_this, char *psz_file,
+ module_handle_t *p_handle )
+{
+ module_handle_t handle;
+
+#if defined(HAVE_DL_DYLD)
+ NSObjectFileImage image;
+ NSObjectFileImageReturnCode ret;
+
+ ret = NSCreateObjectFileImageFromFile( psz_file, &image );
+
+ if( ret != NSObjectFileImageSuccess )
+ {
+ msg_Warn( p_this, "cannot create image from `%s'", psz_file );
+ return -1;
+ }
+
+ /* Open the dynamic module */
+ handle = NSLinkModule( image, psz_file,
+ NSLINKMODULE_OPTION_RETURN_ON_ERROR );
+
+ if( !handle )
+ {
+ NSLinkEditErrors errors;
+ const char *psz_file, *psz_err;
+ int i_errnum;
+ NSLinkEditError( &errors, &i_errnum, &psz_file, &psz_err );
+ msg_Warn( p_this, "cannot link module `%s' (%s)", psz_file, psz_err );
+ NSDestroyObjectFileImage( image );
+ return -1;
+ }
+
+ /* Destroy our image, we won't need it */
+ NSDestroyObjectFileImage( image );
+
+#elif defined(HAVE_DL_BEOS)
+ handle = load_add_on( psz_file );
+ if( handle < 0 )
{
- /* This shouldn't happen. Ever. We have serious problems here. */
- msg_Err( p_module, "plugin module `%s' has refcount %i",
- p_module->psz_object_name, p_module->i_usage );
+ msg_Warn( p_this, "cannot load module `%s'", psz_file );
return -1;
}
- /* i_usage == -1, which means that the module isn't in memory */
- if( module_load( p_module->is.plugin.psz_filename,
- &p_module->is.plugin.handle ) )
+#elif defined(HAVE_DL_WINDOWS)
+ handle = LoadLibrary( psz_file );
+ if( handle == NULL )
+ {
+ char *psz_err = GetWindowsError();
+ msg_Warn( p_this, "cannot load module `%s' (%s)", psz_file, psz_err );
+ free( psz_err );
+ }
+
+#elif defined(HAVE_DL_DLOPEN) && defined(RTLD_NOW)
+ /* static is OK, we are called atomically */
+ static vlc_bool_t b_kde = VLC_FALSE;
+
+# if defined(SYS_LINUX)
+ /* XXX HACK #1 - we should NOT open modules with RTLD_GLOBAL, or we
+ * are going to get namespace collisions when two modules have common
+ * public symbols, but ALSA is being a pest here. */
+ if( strstr( psz_file, "alsa_plugin" ) )
{
- char psz_buffer[256];
+ handle = dlopen( psz_file, RTLD_NOW | RTLD_GLOBAL );
+ if( handle == NULL )
+ {
+ msg_Warn( p_this, "cannot load module `%s' (%s)",
+ psz_file, dlerror() );
+ return -1;
+ }
+ }
+# endif
+ /* XXX HACK #2 - the ugly KDE workaround. It seems that libkdewhatever
+ * causes dlopen() to segfault if libstdc++ is not loaded in the caller,
+ * so we just load libstdc++. Bwahahaha! ph34r! -- Sam. */
+ /* Update: FYI, this is Debian bug #180505, and seems to be fixed. */
+ if( !b_kde && !strstr( psz_file, "kde" ) )
+ {
+ dlopen( "libstdc++.so.6", RTLD_NOW )
+ || dlopen( "libstdc++.so.5", RTLD_NOW )
+ || dlopen( "libstdc++.so.4", RTLD_NOW )
+ || dlopen( "libstdc++.so.3", RTLD_NOW );
+ b_kde = VLC_TRUE;
+ }
- /* The plugin module couldn't be opened */
- msg_Err( p_module, "cannot open %s (%s)",
- p_module->is.plugin.psz_filename, module_error(psz_buffer) );
+ handle = dlopen( psz_file, RTLD_NOW );
+ if( handle == NULL )
+ {
+ msg_Warn( p_this, "cannot load module `%s' (%s)",
+ psz_file, dlerror() );
return -1;
}
- /* FIXME: what to do if the guy modified the plugin while it was
- * unloaded ? It makes XMMS crash nastily, perhaps we should try
- * to be a bit more clever here. */
+#elif defined(HAVE_DL_DLOPEN)
+# if defined(DL_LAZY)
+ handle = dlopen( psz_file, DL_LAZY );
+# else
+ handle = dlopen( psz_file, 0 );
+# endif
+ if( handle == NULL )
+ {
+ msg_Warn( p_this, "cannot load module `%s' (%s)",
+ psz_file, dlerror() );
+ return -1;
+ }
- /* Activate the module : fill the capability structure, etc. */
- if( CallSymbol( p_module, "ActivateModule" MODULE_SUFFIX ) != 0 )
+#elif defined(HAVE_DL_SHL_LOAD)
+ handle = shl_load( psz_file, BIND_IMMEDIATE | BIND_NONFATAL, NULL );
+ if( handle == NULL )
{
- /* We couldn't call ActivateModule() -- looks nasty, but
- * we can't do much about it. Just try to unload module. */
- module_unload( p_module->is.plugin.handle );
- p_module->i_usage = -1;
+ msg_Warn( p_this, "cannot load module `%s' (%s)",
+ psz_file, strerror(errno) );
return -1;
}
- /* Everything worked fine ! The module is ready to be used */
- p_module->i_usage = 1;
-#endif /* HAVE_DYNAMIC_PLUGINS */
+#else
+# error "Something is wrong in modules.c"
+#endif
+
+ *p_handle = handle;
return 0;
}
/*****************************************************************************
- * UnlockModule: decrease the usage count of a module.
+ * CloseModule: unload a dynamic library
+ *****************************************************************************
+ * This function unloads a previously opened dynamically linked library
+ * using a system dependant method. No return value is taken in consideration,
+ * since some libraries sometimes refuse to close properly.
+ *****************************************************************************/
+static void CloseModule( module_handle_t handle )
+{
+#if defined(HAVE_DL_DYLD)
+ NSUnLinkModule( handle, FALSE );
+
+#elif defined(HAVE_DL_BEOS)
+ unload_add_on( handle );
+
+#elif defined(HAVE_DL_WINDOWS)
+ FreeLibrary( handle );
+
+#elif defined(HAVE_DL_DLOPEN)
+ dlclose( handle );
+
+#elif defined(HAVE_DL_SHL_LOAD)
+ shl_unload( handle );
+
+#endif
+ return;
+}
+
+/*****************************************************************************
+ * GetSymbol: get a symbol from a dynamic library
*****************************************************************************
- * We decrease the usage count of a module so that we know when a module
- * becomes unused and can be hidden.
+ * This function queries a loaded library for a symbol specified in a
+ * string, and returns a pointer to it. We don't check for dlerror() or
+ * similar functions, since we want a non-NULL symbol anyway.
*****************************************************************************/
-static int UnlockModule( module_t * p_module )
+static void * _module_getsymbol( module_handle_t, const char * );
+
+static void * GetSymbol( module_handle_t handle, const char * psz_function )
{
- if( p_module->i_usage <= 0 )
+ void * p_symbol = _module_getsymbol( handle, psz_function );
+
+ /* MacOS X dl library expects symbols to begin with "_". So do
+ * some other operating systems. That's really lame, but hey, what
+ * can we do ? */
+ if( p_symbol == NULL )
{
- /* This shouldn't happen. Ever. We have serious problems here. */
- msg_Err( p_module, "trying to call module_Unneed() on `%s' "
- "which is not in use", p_module->psz_object_name );
- return -1;
+ char *psz_call = malloc( strlen( psz_function ) + 2 );
+
+ strcpy( psz_call + 1, psz_function );
+ psz_call[ 0 ] = '_';
+ p_symbol = _module_getsymbol( handle, psz_call );
+ free( psz_call );
}
- /* This module is still in use, we can return */
- p_module->i_usage--;
- p_module->i_unused_delay = 0;
+ return p_symbol;
+}
- return 0;
+static void * _module_getsymbol( module_handle_t handle,
+ const char * psz_function )
+{
+#if defined(HAVE_DL_DYLD)
+ NSSymbol sym = NSLookupSymbolInModule( handle, psz_function );
+ return NSAddressOfSymbol( sym );
+
+#elif defined(HAVE_DL_BEOS)
+ void * p_symbol;
+ if( B_OK == get_image_symbol( handle, psz_function,
+ B_SYMBOL_TYPE_TEXT, &p_symbol ) )
+ {
+ return p_symbol;
+ }
+ else
+ {
+ return NULL;
+ }
+
+#elif defined(HAVE_DL_WINDOWS) && defined(UNDER_CE)
+ wchar_t psz_real[256];
+ MultiByteToWideChar( CP_ACP, 0, psz_function, -1, psz_real, 256 );
+
+ return (void *)GetProcAddress( handle, psz_real );
+
+#elif defined(HAVE_DL_WINDOWS) && defined(WIN32)
+ return (void *)GetProcAddress( handle, (char *)psz_function );
+
+#elif defined(HAVE_DL_DLOPEN)
+ return dlsym( handle, psz_function );
+
+#elif defined(HAVE_DL_SHL_LOAD)
+ void *p_sym;
+ shl_findsym( &handle, psz_function, TYPE_UNDEFINED, &p_sym );
+ return p_sym;
+
+#endif
}
-#ifdef HAVE_DYNAMIC_PLUGINS
+#if defined(HAVE_DL_WINDOWS)
+static char * GetWindowsError( void )
+{
+#if defined(UNDER_CE)
+ wchar_t psz_tmp[256];
+ char * psz_buffer = malloc( 256 );
+#else
+ char * psz_tmp = malloc( 256 );
+#endif
+ int i = 0, i_error = GetLastError();
+
+ FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, i_error, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR) psz_tmp, 256, NULL );
+
+ /* Go to the end of the string */
+#if defined(UNDER_CE)
+ while( psz_tmp[i] && psz_tmp[i] != L'\r' && psz_tmp[i] != L'\n' )
+#else
+ while( psz_tmp[i] && psz_tmp[i] != '\r' && psz_tmp[i] != '\n' )
+#endif
+ {
+ i++;
+ }
+
+ if( psz_tmp[i] )
+ {
+#if defined(UNDER_CE)
+ swprintf( psz_tmp + i, L" (error %i)", i_error );
+ psz_tmp[ 255 ] = L'\0';
+#else
+ snprintf( psz_tmp + i, 256 - i, " (error %i)", i_error );
+ psz_tmp[ 255 ] = '\0';
+#endif
+ }
+
+#if defined(UNDER_CE)
+ WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_tmp, -1,
+ psz_buffer, 256, NULL, NULL );
+ return psz_buffer;
+#else
+ return psz_tmp;
+#endif
+}
+#endif /* HAVE_DL_WINDOWS */
+
/*****************************************************************************
- * HideModule: remove a module from memory but keep its structure.
+ * LoadPluginsCache: loads the plugins cache file
*****************************************************************************
- * This function can only be called if i_usage == 0. It will make a call
- * to the module's inner DeactivateModule() symbol, and then unload it
- * from memory. A call to module_Need() will automagically load it again.
+ * This function will load the plugin cache if present and valid. This cache
+ * will in turn be queried by AllocateAllPlugins() to see if it needs to
+ * actually load the dynamically loadable module.
+ * This allows us to only fully load plugins when they are actually used.
*****************************************************************************/
-static int HideModule( module_t * p_module )
+static void CacheLoad( vlc_object_t *p_this )
{
- if( p_module->b_builtin )
+ char *psz_filename, *psz_homedir;
+ FILE *file;
+ int i, j, i_size, i_read;
+ char p_cachestring[sizeof(PLUGINSCACHE_FILE COPYRIGHT_MESSAGE)];
+ int i_cache;
+ module_cache_t **pp_cache = 0;
+ int32_t i_file_size;
+
+ psz_homedir = p_this->p_vlc->psz_homedir;
+ if( !psz_homedir )
{
- /* A builtin module should never be hidden. */
- msg_Err( p_module, "trying to hide builtin module `%s'",
- p_module->psz_object_name );
- return -1;
+ msg_Err( p_this, "psz_homedir is null" );
+ return;
}
+ psz_filename =
+ (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_FILE) +
+ strlen(psz_homedir) );
+
+ if( psz_filename )
+ sprintf( psz_filename, "%s/" CONFIG_DIR "/" PLUGINSCACHE_FILE,
+ psz_homedir );
- if( p_module->i_usage >= 1 )
+ if( !psz_filename )
{
- msg_Err( p_module, "trying to hide module `%s' which is still "
- "in use", p_module->psz_object_name );
- return -1;
+ msg_Err( p_this, "out of memory" );
+ return;
}
- if( p_module->i_usage <= -1 )
+ if( p_this->p_libvlc->p_module_bank->b_cache_delete )
{
- msg_Err( p_module, "trying to hide module `%s' which is already "
- "hidden", p_module->psz_object_name );
- return -1;
+ msg_Dbg( p_this, "removing plugins cache file %s", psz_filename );
+ unlink( psz_filename );
+ return;
+ }
+
+ msg_Dbg( p_this, "loading plugins cache file %s", psz_filename );
+
+ file = fopen( psz_filename, "r" );
+ if( !file )
+ {
+ msg_Warn( p_this, "could not open plugins cache file %s for reading",
+ psz_filename );
+ free( psz_filename );
+ return;
}
+ free( psz_filename );
- /* Deactivate the module : free the capability structure, etc. */
- if( CallSymbol( p_module, "DeactivateModule" MODULE_SUFFIX ) != 0 )
+ /* Check the file size */
+ i_read = fread( &i_file_size, sizeof(char), sizeof(i_file_size), file );
+ if( i_read != sizeof(i_file_size) )
{
- /* We couldn't call DeactivateModule() -- looks nasty, but
- * we can't do much about it. Just try to unload module anyway. */
- module_unload( p_module->is.plugin.handle );
- p_module->i_usage = -1;
- return -1;
+ msg_Warn( p_this, "This doesn't look like a valid plugins cache "
+ "(too short)" );
+ fclose( file );
+ return;
+ }
+
+ fseek( file, 0, SEEK_END );
+ if( ftell( file ) != i_file_size )
+ {
+ msg_Warn( p_this, "This doesn't look like a valid plugins cache "
+ "(corrupted size)" );
+ fclose( file );
+ return;
+ }
+ fseek( file, sizeof(i_file_size), SEEK_SET );
+
+ /* Check the file is a plugins cache */
+ i_size = sizeof(PLUGINSCACHE_FILE COPYRIGHT_MESSAGE) - 1;
+ i_read = fread( p_cachestring, sizeof(char), i_size, file );
+ if( i_read != i_size ||
+ memcmp( p_cachestring, PLUGINSCACHE_FILE COPYRIGHT_MESSAGE, i_size ) )
+ {
+ msg_Warn( p_this, "This doesn't look like a valid plugins cache" );
+ fclose( file );
+ return;
}
- /* Everything worked fine, we can safely unload the module. */
- module_unload( p_module->is.plugin.handle );
- p_module->i_usage = -1;
+ p_this->p_libvlc->p_module_bank->i_loaded_cache = 0;
+ fread( &i_cache, sizeof(char), sizeof(i_cache), file );
+ pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache =
+ malloc( i_cache * sizeof(void *) );
+
+#define LOAD_IMMEDIATE(a) \
+ if( fread( &a, sizeof(char), sizeof(a), file ) != sizeof(a) ) goto error
+#define LOAD_STRING(a) \
+ { if( fread( &i_size, sizeof(char), sizeof(i_size), file ) \
+ != sizeof(i_size) ) goto error; \
+ if( i_size ) { \
+ a = malloc( i_size ); \
+ if( fread( a, sizeof(char), i_size, file ) != (size_t)i_size ) \
+ goto error; \
+ } else a = 0; \
+ } while(0)
+
+
+ for( i = 0; i < i_cache; i++ )
+ {
+ int16_t i_size;
+ int i_submodules;
- return 0;
+ pp_cache[i] = malloc( sizeof(module_cache_t) );
+ p_this->p_libvlc->p_module_bank->i_loaded_cache++;
+
+ /* Save 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 );
+
+ if( pp_cache[i]->b_junk ) continue;
+
+ pp_cache[i]->p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
+
+ /* Save additional infos */
+ LOAD_STRING( pp_cache[i]->p_module->psz_object_name );
+ LOAD_STRING( pp_cache[i]->p_module->psz_shortname );
+ LOAD_STRING( pp_cache[i]->p_module->psz_longname );
+ LOAD_STRING( pp_cache[i]->p_module->psz_program );
+ for( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
+ {
+ LOAD_STRING( pp_cache[i]->p_module->pp_shortcuts[j] ); // FIX
+ }
+ 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 */
+ if( CacheLoadConfig( pp_cache[i]->p_module, file ) != VLC_SUCCESS )
+ goto error;
+
+ LOAD_STRING( pp_cache[i]->p_module->psz_filename );
+
+ LOAD_IMMEDIATE( i_submodules );
+
+ while( i_submodules-- )
+ {
+ module_t *p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE);
+ vlc_object_attach( p_module, pp_cache[i]->p_module );
+ p_module->b_submodule = VLC_TRUE;
+
+ LOAD_STRING( p_module->psz_object_name );
+ LOAD_STRING( p_module->psz_shortname );
+ LOAD_STRING( p_module->psz_longname );
+ LOAD_STRING( p_module->psz_program );
+ for( j = 0; j < MODULE_SHORTCUT_MAX; j++ )
+ {
+ LOAD_STRING( p_module->pp_shortcuts[j] ); // FIX
+ }
+ 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 );
+ }
+ }
+
+ fclose( file );
+ return;
+
+ error:
+
+ msg_Warn( p_this, "plugins cache not loaded (corrupted)" );
+
+ /* TODO: cleanup */
+ p_this->p_libvlc->p_module_bank->i_loaded_cache = 0;
+
+ fclose( file );
+ return;
+}
+
+int CacheLoadConfig( module_t *p_module, FILE *file )
+{
+ int i, j, i_lines;
+ int16_t i_size;
+
+ /* Calculate the structure length */
+ LOAD_IMMEDIATE( p_module->i_config_items );
+ LOAD_IMMEDIATE( p_module->i_bool_items );
+
+ LOAD_IMMEDIATE( i_lines );
+
+ /* Allocate memory */
+ p_module->p_config =
+ (module_config_t *)malloc( sizeof(module_config_t) * (i_lines + 1));
+ if( p_module->p_config == NULL )
+ {
+ msg_Err( p_module, "config error: can't duplicate p_config" );
+ return VLC_ENOMEM;
+ }
+
+ /* Do the duplication job */
+ for( i = 0; i < i_lines ; i++ )
+ {
+ LOAD_IMMEDIATE( p_module->p_config[i] );
+
+ LOAD_STRING( p_module->p_config[i].psz_type );
+ LOAD_STRING( p_module->p_config[i].psz_name );
+ LOAD_STRING( p_module->p_config[i].psz_text );
+ LOAD_STRING( p_module->p_config[i].psz_longtext );
+ LOAD_STRING( p_module->p_config[i].psz_value_orig );
+
+ p_module->p_config[i].psz_value =
+ p_module->p_config[i].psz_value_orig ?
+ strdup( p_module->p_config[i].psz_value_orig ) : 0;
+ p_module->p_config[i].i_value = p_module->p_config[i].i_value_orig;
+ p_module->p_config[i].f_value = p_module->p_config[i].f_value_orig;
+
+ p_module->p_config[i].p_lock = &p_module->object_lock;
+
+ if( p_module->p_config[i].i_list )
+ {
+ if( p_module->p_config[i].ppsz_list )
+ {
+ p_module->p_config[i].ppsz_list =
+ malloc( (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++ )
+ LOAD_STRING( p_module->p_config[i].ppsz_list[j] );
+ p_module->p_config[i].ppsz_list[j] = NULL;
+ }
+ }
+ if( p_module->p_config[i].ppsz_list_text )
+ {
+ p_module->p_config[i].ppsz_list_text =
+ malloc( (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++ )
+ LOAD_STRING( p_module->p_config[i].ppsz_list_text[j] );
+ p_module->p_config[i].ppsz_list_text[j] = NULL;
+ }
+ }
+ 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) );
+ if( p_module->p_config[i].pi_list )
+ {
+ for( j = 0; j < p_module->p_config[i].i_list; j++ )
+ LOAD_IMMEDIATE( p_module->p_config[i].pi_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 *) );
+ p_module->p_config[i].ppsz_action_text =
+ malloc( p_module->p_config[i].i_action * sizeof(char *) );
+
+ for( j = 0; j < p_module->p_config[i].i_action; j++ )
+ {
+ p_module->p_config[i].ppf_action[j] = 0;
+ LOAD_STRING( p_module->p_config[i].ppsz_action_text[j] );
+ }
+ }
+
+ LOAD_IMMEDIATE( p_module->p_config[i].pf_callback );
+ }
+
+ p_module->p_config[i].i_type = CONFIG_HINT_END;
+
+ return VLC_SUCCESS;
+
+ error:
+
+ return VLC_EGENERIC;
}
/*****************************************************************************
- * CallSymbol: calls a module symbol.
- *****************************************************************************
- * This function calls a symbol given its name and a module structure. The
- * symbol MUST refer to a function returning int and taking a module_t* as
- * an argument.
+ * SavePluginsCache: saves the plugins cache to a file
*****************************************************************************/
-static int CallSymbol( module_t * p_module, char * psz_name )
+static void CacheSave( vlc_object_t *p_this )
{
- int (* pf_symbol) ( module_t * p_module );
+ char *psz_filename, *psz_homedir;
+ FILE *file;
+ int i, j, i_cache;
+ module_cache_t **pp_cache;
+ int32_t i_file_size = 0;
+
+ psz_homedir = p_this->p_vlc->psz_homedir;
+ if( !psz_homedir )
+ {
+ msg_Err( p_this, "psz_homedir is null" );
+ return;
+ }
+ psz_filename =
+ (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_FILE) +
+ strlen(psz_homedir) );
- /* Try to resolve the symbol */
- pf_symbol = module_getsymbol( p_module->is.plugin.handle, psz_name );
+ if( psz_filename )
+ sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir );
- if( pf_symbol == NULL )
+ if( !psz_filename )
{
- char psz_buffer[256];
+ msg_Err( p_this, "out of memory" );
+ return;
+ }
- /* We couldn't load the symbol */
- msg_Warn( p_module, "cannot find symbol %s in module %s (%s)",
- psz_name, p_module->is.plugin.psz_filename,
- module_error( psz_buffer ) );
- return -1;
+ config_CreateDir( p_this, psz_filename );
+
+ strcat( psz_filename, "/" PLUGINSCACHE_FILE );
+
+ msg_Dbg( p_this, "saving plugins cache file %s", psz_filename );
+
+ file = fopen( psz_filename, "w" );
+ if( !file )
+ {
+ msg_Warn( p_this, "could not open plugins cache file %s for writing",
+ psz_filename );
+ free( psz_filename );
+ return;
}
+ free( psz_filename );
- /* We can now try to call the symbol */
- if( pf_symbol( p_module ) != 0 )
+ /* Empty space for file size */
+ fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file );
+
+ /* Contains version number */
+ fprintf( file, PLUGINSCACHE_FILE COPYRIGHT_MESSAGE );
+
+ i_cache = p_this->p_libvlc->p_module_bank->i_cache;
+ pp_cache = p_this->p_libvlc->p_module_bank->pp_cache;
+
+ fwrite( &i_cache, sizeof(char), sizeof(i_cache), file );
+
+#define SAVE_IMMEDIATE(a) \
+ fwrite( &a, sizeof(char), sizeof(a), file )
+#define SAVE_STRING(a) \
+ { i_size = a ? strlen( a ) + 1 : 0; \
+ fwrite( &i_size, sizeof(char), sizeof(i_size), file ); \
+ if( a ) fwrite( a, sizeof(char), i_size, file ); \
+ } while(0)
+
+ for( i = 0; i < i_cache; i++ )
{
- /* With a well-written module we shouldn't have to print an
- * additional error message here, but just make sure. */
- msg_Err( p_module, "failed calling symbol %s in module %s",
- psz_name, p_module->is.plugin.psz_filename );
- return -1;
+ int16_t i_size;
+ int32_t i_submodule;
+
+ /* Save common info */
+ 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 );
+ 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_program );
+ for( 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 */
+ CacheSaveConfig( pp_cache[i]->p_module, file );
+
+ SAVE_STRING( pp_cache[i]->p_module->psz_filename );
+
+ i_submodule = pp_cache[i]->p_module->i_children;
+ SAVE_IMMEDIATE( i_submodule );
+ for( i_submodule = 0; i_submodule < pp_cache[i]->p_module->i_children;
+ i_submodule++ )
+ {
+ module_t *p_module =
+ (module_t *)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_program );
+ 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 );
+ }
}
- /* Everything worked fine, we can return */
- return 0;
+ /* Fill-up file size */
+ i_file_size = ftell( file );
+ fseek( file, 0, SEEK_SET );
+ fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file );
+
+ fclose( file );
+
+ return;
}
-#endif /* HAVE_DYNAMIC_PLUGINS */
+void CacheSaveConfig( module_t *p_module, FILE *file )
+{
+ int i, j, i_lines = 0;
+ module_config_t *p_item;
+ int16_t i_size;
+
+ SAVE_IMMEDIATE( p_module->i_config_items );
+ SAVE_IMMEDIATE( p_module->i_bool_items );
+
+ for( p_item = p_module->p_config; p_item->i_type != CONFIG_HINT_END;
+ p_item++ ) i_lines++;
+
+ SAVE_IMMEDIATE( i_lines );
+
+ for( i = 0; i < i_lines ; i++ )
+ {
+ SAVE_IMMEDIATE( p_module->p_config[i] );
+
+ SAVE_STRING( p_module->p_config[i].psz_type );
+ SAVE_STRING( p_module->p_config[i].psz_name );
+ SAVE_STRING( p_module->p_config[i].psz_text );
+ SAVE_STRING( p_module->p_config[i].psz_longtext );
+ SAVE_STRING( p_module->p_config[i].psz_value_orig );
+
+ if( p_module->p_config[i].i_list )
+ {
+ if( p_module->p_config[i].ppsz_list )
+ {
+ for( j = 0; j < p_module->p_config[i].i_list; j++ )
+ SAVE_STRING( p_module->p_config[i].ppsz_list[j] );
+ }
+
+ if( p_module->p_config[i].ppsz_list_text )
+ {
+ for( j = 0; j < p_module->p_config[i].i_list; j++ )
+ SAVE_STRING( p_module->p_config[i].ppsz_list_text[j] );
+ }
+ if( p_module->p_config[i].pi_list )
+ {
+ for( j = 0; j < p_module->p_config[i].i_list; j++ )
+ SAVE_IMMEDIATE( p_module->p_config[i].pi_list[j] );
+ }
+ }
+
+ for( 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 );
+ }
+}
+
+/*****************************************************************************
+ * CacheMerge: Merge a cache module descriptor with a full module descriptor.
+ *****************************************************************************/
+static void CacheMerge( vlc_object_t *p_this, module_t *p_cache,
+ module_t *p_module )
+{
+ int i_submodule;
+
+ p_cache->pf_activate = p_module->pf_activate;
+ p_cache->pf_deactivate = p_module->pf_deactivate;
+ p_cache->p_symbols = p_module->p_symbols;
+ p_cache->handle = p_module->handle;
+
+ for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ )
+ {
+ module_t *p_child = (module_t*)p_module->pp_children[i_submodule];
+ module_t *p_cchild = (module_t*)p_cache->pp_children[i_submodule];
+ p_cchild->pf_activate = p_child->pf_activate;
+ p_cchild->pf_deactivate = p_child->pf_deactivate;
+ p_cchild->p_symbols = p_child->p_symbols;
+ }
+
+ p_cache->b_loaded = VLC_TRUE;
+ p_module->b_loaded = VLC_FALSE;
+}
+
+/*****************************************************************************
+ * FindPluginCache: finds the cache entry corresponding to a file
+ *****************************************************************************/
+static module_cache_t *CacheFind( vlc_object_t *p_this, char *psz_file,
+ int64_t i_time, int64_t i_size )
+{
+ module_cache_t **pp_cache;
+ int i_cache, i;
+
+ pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache;
+ i_cache = p_this->p_libvlc->p_module_bank->i_loaded_cache;
+
+ for( i = 0; i < i_cache; i++ )
+ {
+ if( !strcmp( pp_cache[i]->psz_file, psz_file ) &&
+ pp_cache[i]->i_time == i_time &&
+ pp_cache[i]->i_size == i_size ) return pp_cache[i];
+ }
+
+ return NULL;
+}
+
+#endif /* HAVE_DYNAMIC_PLUGINS */
projects / vlc / blobdiff