X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=f2974204dd1a2a34beccb179f788d4791c17ff61;hb=44c553033ab829d090e0f5561e40685a5853a9e4;hp=2f2390de6f9df5a1c55ec48504192f2711c9eaac;hpb=6d914307e532cb7fa4efd37dfaa87cb9b4292064;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index 2f2390de6f..f2974204dd 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -82,8 +82,6 @@ #include #include "audio_output/aout_internal.h" -#include -#include #include #include "libvlc.h" @@ -101,7 +99,6 @@ /***************************************************************************** * The evil global variables. We handle them with care, don't worry. *****************************************************************************/ -static libvlc_int_t * p_static_vlc = NULL; static unsigned i_instances = 0; #ifndef WIN32 @@ -148,18 +145,19 @@ void *vlc_hold (gc_object_t * p_gc) { uintptr_t refs; assert( p_gc ); + assert ((((uintptr_t)&p_gc->refs) & (sizeof (void *) - 1)) == 0); /* alignment */ #if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) refs = __sync_add_and_fetch (&p_gc->refs, 1); -#elif defined (WIN32) && defined (__GNUC__) - refs = __builtin_choose_expr (sizeof (uintptr_t) == 4, - InterlockedIncrement (&p_gc->refs), - InterlockedIncrement64 (&p_gc->refs)); +#elif defined (WIN64) + refs = InterlockedIncrement64 (&p_gc->refs); +#elif defined (WIN32) + refs = InterlockedIncrement (&p_gc->refs); #elif defined(__APPLE__) refs = OSAtomicIncrement32Barrier((int*)&p_gc->refs); #else vlc_spin_lock (&p_gc->spin); - refs = p_gc->refs++; + refs = ++p_gc->refs; vlc_spin_unlock (&p_gc->spin); #endif assert (refs != 1); /* there had to be a reference already */ @@ -175,18 +173,19 @@ void vlc_release (gc_object_t *p_gc) unsigned refs; assert( p_gc ); + assert ((((uintptr_t)&p_gc->refs) & (sizeof (void *) - 1)) == 0); /* alignment */ #if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) refs = __sync_sub_and_fetch (&p_gc->refs, 1); -#elif defined (WIN32) && defined (__GNUC__) - refs = __builtin_choose_expr (sizeof (uintptr_t) == 4, - InterlockedDecrement (&p_gc->refs), - InterlockedDecrement64 (&p_gc->refs)); +#elif defined (WIN64) + refs = InterlockedDecrement64 (&p_gc->refs); +#elif defined (WIN32) + refs = InterlockedDecrement (&p_gc->refs); #elif defined(__APPLE__) refs = OSAtomicDecrement32Barrier((int*)&p_gc->refs); #else vlc_spin_lock (&p_gc->spin); - refs = p_gc->refs--; + refs = --p_gc->refs; vlc_spin_unlock (&p_gc->spin); #endif @@ -228,6 +227,8 @@ static int VerboseCallback( vlc_object_t *, char const *, static void InitDeviceValues( libvlc_int_t * ); +static vlc_mutex_t global_lock = VLC_STATIC_MUTEX; + /** * Allocate a libvlc instance, initialize global data if needed * It also initializes the threading system @@ -238,28 +239,22 @@ libvlc_int_t * libvlc_InternalCreate( void ) libvlc_priv_t *priv; char *psz_env = NULL; - /* vlc_threads_init *must* be the first internal call! No other call is - * allowed before the thread system has been initialized. */ - if (vlc_threads_init ()) - return NULL; - /* Now that the thread system is initialized, we don't have much, but * at least we have variables */ - vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); + vlc_mutex_lock( &global_lock ); if( i_instances == 0 ) { /* Guess what CPU we have */ cpu_flags = CPUCapabilities(); /* The module bank will be initialized later */ - p_module_bank = NULL; } /* Allocate a libvlc instance object */ p_libvlc = __vlc_custom_create( NULL, sizeof (*priv), - VLC_OBJECT_LIBVLC, "libvlc" ); + VLC_OBJECT_GENERIC, "libvlc" ); if( p_libvlc != NULL ) i_instances++; - vlc_mutex_unlock( lock ); + vlc_mutex_unlock( &global_lock ); if( p_libvlc == NULL ) return NULL; @@ -285,16 +280,10 @@ libvlc_int_t * libvlc_InternalCreate( void ) priv->b_color = false; #endif - /* Announce who we are - Do it only for first instance ? */ - msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE ); - msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); - /* Initialize mutexes */ vlc_mutex_init( &priv->timer_lock ); vlc_mutex_init( &priv->config_lock ); - - /* Store data for the non-reentrant API */ - p_static_vlc = p_libvlc; + vlc_cond_init( &priv->exiting ); return p_libvlc; } @@ -335,9 +324,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, */ LoadMessages (); - /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ - msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); - /* Initialize the module bank and load the configuration of the * main module. We need to do this at this stage to be able to display * a short help if required by the user. (short help == main module @@ -350,6 +336,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, return VLC_EGENERIC; } + priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); + /* Announce who we are - Do it only for first instance ? */ + msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE ); + msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE ); + /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */ + msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") ); + /* Check for short help option */ if( config_GetInt( p_libvlc, "help" ) > 0 ) { @@ -369,13 +362,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, priv->psz_configfile = config_GetCustomConfigFile( p_libvlc ); /* Check for plugins cache options */ - if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 ) - { - p_module_bank->b_cache_delete = true; - } - - /* Will be re-done properly later on */ - priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); + bool b_cache_delete = config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0; /* Check for daemon mode */ #ifndef WIN32 @@ -444,6 +431,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( b_exit ) { + free( priv->psz_configfile ); module_EndBank( p_libvlc ); return i_ret; } @@ -463,8 +451,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, psz_language = config_GetPsz( p_libvlc, "language" ); if( psz_language && *psz_language && strcmp( psz_language, "auto" ) ) { - bool b_cache_delete = p_module_bank->b_cache_delete; - /* Reset the default domain */ SetLanguage( psz_language ); @@ -476,7 +462,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( !config_GetInt( p_libvlc, "ignore-config" ) ) config_LoadConfigFile( p_libvlc, "main" ); config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true ); - p_module_bank->b_cache_delete = b_cache_delete; } free( psz_language ); # endif @@ -489,7 +474,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * default values. */ module_LoadBuiltins( p_libvlc ); - module_LoadPlugins( p_libvlc ); + module_LoadPlugins( p_libvlc, b_cache_delete ); if( p_libvlc->b_die ) { b_exit = true; @@ -498,7 +483,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, size_t module_count; module_t **list = module_list_get( &module_count ); module_list_free( list ); - msg_Dbg( p_libvlc, "module bank initialized (%u modules)", module_count ); + msg_Dbg( p_libvlc, "module bank initialized (%zu modules)", module_count ); /* Check for help on modules */ if( (p_tmp = config_GetPsz( p_libvlc, "module" )) ) @@ -557,6 +542,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( b_exit ) { + free( priv->psz_configfile ); module_EndBank( p_libvlc ); return i_ret; } @@ -584,6 +570,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, "that they are valid.\n" ); PauseConsole(); #endif + free( priv->psz_configfile ); module_EndBank( p_libvlc ); return VLC_EGENERIC; } @@ -736,6 +723,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, "-dontprintthatone\n" "(keyword 'all' to applies to all objects)\n"); free( psz_verbose_objects ); + /* FIXME: leaks!!!! */ return VLC_EGENERIC; } } @@ -749,16 +737,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, var_Set( p_libvlc, "verbose", val ); } var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL ); - var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL ); + var_TriggerCallback( p_libvlc, "verbose" ); if( priv->b_color ) priv->b_color = config_GetInt( p_libvlc, "color" ) > 0; - /* - * Output messages that may still be in the queue - */ - msg_Flush( p_libvlc ); - if( !config_GetInt( p_libvlc, "fpu" ) ) cpu_flags &= ~CPU_CAPABILITY_FPU; @@ -803,7 +786,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Choose the best memcpy module */ - priv->p_memcpy_module = module_need( p_libvlc, "memcpy", "$memcpy", 0 ); + priv->p_memcpy_module = module_need( p_libvlc, "memcpy", "$memcpy", false ); priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0; priv->i_timers = 0; @@ -814,11 +797,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( !p_libvlc->p_stats ) { vlc_object_release( p_libvlc ); - return VLC_ENOMEM; + return VLC_ENOMEM; /* FIXME: leaks */ } vlc_mutex_init( &p_libvlc->p_stats->lock ); priv->p_stats_computer = NULL; + priv->i_last_input_id = 0; /* Not very safe, should be removed */ + /* * Initialize hotkey handling */ @@ -834,8 +819,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, priv->p_interaction = interaction_Init( p_libvlc ); /* Initialize playlist and get commandline files */ - playlist_ThreadCreate( p_libvlc ); - if( !priv->p_playlist ) + p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) ); + if( !p_playlist ) { msg_Err( p_libvlc, "playlist initialization failed" ); if( priv->p_memcpy_module != NULL ) @@ -843,15 +828,19 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, module_unneed( p_libvlc, priv->p_memcpy_module ); } module_EndBank( p_libvlc ); + free( priv->psz_configfile ); return VLC_EGENERIC; } - p_playlist = priv->p_playlist; + playlist_Activate( p_playlist ); + vlc_object_attach( p_playlist, p_libvlc ); + /* Add service discovery modules */ psz_modules = config_GetPsz( p_playlist, "services-discovery" ); if( psz_modules && *psz_modules ) { - /* Add service discovery modules */ - playlist_ServicesDiscoveryAdd( p_playlist, psz_modules ); + char *p = psz_modules, *m; + while( ( m = strsep( &p, " :," ) ) != NULL ) + playlist_ServicesDiscoveryAdd( p_playlist, m ); } free( psz_modules ); @@ -875,9 +864,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, if( psz_modules && *psz_modules && psz_control && *psz_control ) { - psz_modules = (char *)realloc( psz_modules, strlen( psz_modules ) + - strlen( psz_control ) + 1 ); - sprintf( psz_modules, "%s:%s", psz_modules, psz_control ); + char* psz_tmp; + if( asprintf( &psz_tmp, "%s:%s", psz_modules, psz_control ) != -1 ) + { + free( psz_modules ); + psz_modules = psz_tmp; + } } else if( psz_control && *psz_control ) { @@ -896,10 +888,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, *psz_parser = '\0'; psz_parser++; } - psz_temp = (char *)malloc( strlen(psz_module) + sizeof(",none") ); - if( psz_temp ) + if( asprintf( &psz_temp, "%s,none", psz_module ) != -1) { - sprintf( psz_temp, "%s,none", psz_module ); libvlc_InternalAddIntf( p_libvlc, psz_temp ); free( psz_temp ); } @@ -911,6 +901,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * Always load the hotkeys interface if it exists */ libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" ); + if( module_exists( "globalhotkeys" ) ) + libvlc_InternalAddIntf( p_libvlc, "globalhotkeys,none" ); #ifdef HAVE_DBUS /* loads dbus control interface if in one-instance mode @@ -937,7 +929,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } #endif - if( config_GetInt( p_libvlc, "file-logging" ) > 0 ) + if( (config_GetInt( p_libvlc, "file-logging" ) > 0) && + !config_GetInt( p_libvlc, "syslog" ) ) { libvlc_InternalAddIntf( p_libvlc, "logger,none" ); } @@ -1023,7 +1016,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, { playlist_t *p_playlist = pl_Hold( p_libvlc ); playlist_AddExt( p_playlist, val.psz_string, NULL, PLAYLIST_INSERT, 0, - -1, NULL, 0, true, pl_Unlocked ); + -1, 0, NULL, 0, true, pl_Unlocked ); pl_Release( p_libvlc ); } free( val.psz_string ); @@ -1035,13 +1028,22 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * Cleanup a libvlc instance. The instance is not completely deallocated * \param p_libvlc the instance to clean */ -int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) +void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) { - intf_thread_t * p_intf = NULL; - libvlc_priv_t *priv = libvlc_priv (p_libvlc); + libvlc_priv_t *priv = libvlc_priv (p_libvlc); + playlist_t *p_playlist = priv->p_playlist; + + /* Deactivate the playlist */ + msg_Dbg( p_libvlc, "deactivating the playlist" ); + playlist_Deactivate( p_playlist ); + + /* Remove all services discovery */ + msg_Dbg( p_libvlc, "removing all services discovery tasks" ); + playlist_ServicesDiscoveryKillAll( p_playlist ); /* Ask the interfaces to stop and destroy them */ msg_Dbg( p_libvlc, "removing all interfaces" ); + intf_thread_t *p_intf; while( (p_intf = vlc_object_find( p_libvlc, VLC_OBJECT_INTF, FIND_CHILD )) ) { intf_StopThread( p_intf ); @@ -1058,30 +1060,19 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) } #endif - playlist_t *p_playlist = priv->p_playlist; - /* Remove all services discovery */ - msg_Dbg( p_libvlc, "removing all services discovery tasks" ); - playlist_ServicesDiscoveryKillAll( p_playlist ); - /* Free playlist */ /* Any thread still running must not assume pl_Hold() succeeds. */ msg_Dbg( p_libvlc, "removing playlist" ); - priv->p_playlist = NULL; - vlc_object_kill( p_playlist ); /* <-- memory barrier for pl_Hold() */ - vlc_thread_join( p_playlist ); + + libvlc_priv(p_playlist->p_libvlc)->p_playlist = NULL; + barrier(); /* FIXME is that correct ? */ + vlc_object_release( p_playlist ); /* Free interaction */ msg_Dbg( p_libvlc, "removing interaction" ); interaction_Destroy( priv->p_interaction ); - /* Free video outputs */ - msg_Dbg( p_libvlc, "removing all video outputs" ); - vlc_list_t *list = vlc_list_find (p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD); - for (int i = 0; i < list->i_count; i++) - vlc_object_release (list->p_values[i].p_object); - vlc_list_release (list); - stats_TimersDumpAll( p_libvlc ); stats_TimersCleanAll( p_libvlc ); @@ -1089,23 +1080,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) vlc_mutex_destroy( &p_libvlc->p_stats->lock ); FREENULL( p_libvlc->p_stats ); - return VLC_SUCCESS; -} - -/** - * Destroy everything. - * This function requests the running threads to finish, waits for their - * termination, and destroys their structure. - * It stops the thread systems: no instance can run after this has run - * \param p_libvlc the instance to destroy - */ -int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) -{ - if( !p_libvlc ) - return VLC_EGENERIC; - - libvlc_priv_t *priv = libvlc_priv (p_libvlc); - #ifndef WIN32 char* psz_pidfile = NULL; @@ -1138,8 +1112,20 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action, p_libvlc->p_hotkeys ); FREENULL( p_libvlc->p_hotkeys ); +} - vlc_mutex_t *lock = var_AcquireMutex( "libvlc" ); +/** + * Destroy everything. + * This function requests the running threads to finish, waits for their + * termination, and destroys their structure. + * It stops the thread systems: no instance can run after this has run + * \param p_libvlc the instance to destroy + */ +void libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) +{ + libvlc_priv_t *priv = libvlc_priv( p_libvlc ); + + vlc_mutex_lock( &global_lock ); i_instances--; if( i_instances == 0 ) @@ -1147,24 +1133,16 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) /* System specific cleaning code */ system_End( p_libvlc ); } - vlc_mutex_unlock( lock ); + vlc_mutex_unlock( &global_lock ); - msg_Flush( p_libvlc ); msg_Destroy( p_libvlc ); /* Destroy mutexes */ + vlc_cond_destroy( &priv->exiting ); vlc_mutex_destroy( &priv->config_lock ); vlc_mutex_destroy( &priv->timer_lock ); vlc_object_release( p_libvlc ); - p_libvlc = NULL; - - /* Stop thread system: last one out please shut the door! - * The number of initializations of the thread system is counted, we - * can call this each time */ - vlc_threads_end (); - - return VLC_SUCCESS; } /** @@ -1216,6 +1194,33 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) return VLC_SUCCESS; }; +/** + * Waits until the LibVLC instance gets an exit signal. Normally, this happens + * when the user "exits" an interface plugin. + */ +void libvlc_InternalWait( libvlc_int_t *p_libvlc ) +{ + libvlc_priv_t *priv = libvlc_priv( p_libvlc ); + vlc_object_internals_t *internals = vlc_internals( p_libvlc ); + + vlc_object_lock( p_libvlc ); + while( vlc_object_alive( p_libvlc ) ) + vlc_cond_wait( &priv->exiting, &internals->lock ); + vlc_object_unlock( p_libvlc ); +} + +/** + * Posts an exit signal to LibVLC instance. This will normally initiate the + * cleanup and destroy process. It should only be called on behalf of the user. + */ +void libvlc_Quit( libvlc_int_t *p_libvlc ) +{ + libvlc_priv_t *priv = libvlc_priv( p_libvlc ); + + vlc_object_kill( p_libvlc ); + vlc_cond_signal( &priv->exiting ); /* OK, kill took care of the lock */ +} + #if defined( ENABLE_NLS ) && (defined (__APPLE__) || defined (WIN32)) && \ ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) /***************************************************************************** @@ -1319,8 +1324,9 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[ playlist_t *p_playlist = pl_Hold( p_vlc ); playlist_AddExt( p_playlist, ppsz_argv[i_opt], NULL, PLAYLIST_INSERT, - 0, -1, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ), - i_options, true, pl_Unlocked ); + 0, -1, + i_options, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ), VLC_INPUT_OPTION_TRUSTED, + true, pl_Unlocked ); pl_Release( p_vlc ); } @@ -2058,7 +2064,7 @@ static int ConsoleWidth( void ) i_width = 80; pclose( file ); } -#else +#elif !defined (UNDER_CE) CONSOLE_SCREEN_BUFFER_INFO buf; if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &buf))