X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Finput%2Fvlm.c;h=96197a1ca70f49f0018b01bfa72c11c6e68e94fc;hb=3a4de92b572fe75b489b4e00661648fddbcebcad;hp=9440ac27bcd4b1bb3b012e22fb3a8fd024abef10;hpb=085fe545294c7de477245b68ab6c7fe7a35ace93;p=vlc diff --git a/src/input/vlm.c b/src/input/vlm.c index 9440ac27bc..96197a1ca7 100644 --- a/src/input/vlm.c +++ b/src/input/vlm.c @@ -56,7 +56,6 @@ #include "vlm_internal.h" #include "vlm_event.h" #include -#include #include #include "../stream_output/stream_output.h" #include "../libvlc.h" @@ -90,6 +89,7 @@ static int InputEvent( vlc_object_t *p_this, char const *psz_cmd, VLC_UNUSED(oldval); input_thread_t *p_input = (input_thread_t *)p_this; vlm_t *p_vlm = libvlc_priv( p_input->p_libvlc )->p_vlm; + assert( p_vlm ); vlm_media_sys_t *p_media = p_data; const char *psz_instance_name = NULL; @@ -104,32 +104,44 @@ static int InputEvent( vlc_object_t *p_this, char const *psz_cmd, } } vlm_SendEventMediaInstanceState( p_vlm, p_media->cfg.id, p_media->cfg.psz_name, psz_instance_name, var_GetInteger( p_input, "state" ) ); + + // We have ourselves been triggering the stop event. + // No need to wake up our manage thread, because + // we'll join it just after the Stop(). + vlc_mutex_lock( &p_input->p->lock_control ); + bool abort = p_input->p->b_abort; + vlc_mutex_unlock( &p_input->p->lock_control ); + + if (abort) + return VLC_SUCCESS; + + vlc_mutex_lock( &p_vlm->lock ); + vlc_cond_signal( &p_vlm->wait ); + vlc_mutex_unlock( &p_vlm->lock ); } return VLC_SUCCESS; } +static vlc_mutex_t vlm_mutex = VLC_STATIC_MUTEX; + +#undef vlm_New /***************************************************************************** * vlm_New: *****************************************************************************/ -vlm_t *__vlm_New ( vlc_object_t *p_this ) +vlm_t *vlm_New ( vlc_object_t *p_this ) { - vlc_value_t lockval; vlm_t *p_vlm = NULL, **pp_vlm = &(libvlc_priv (p_this->p_libvlc)->p_vlm); char *psz_vlmconf; static const char vlm_object_name[] = "vlm daemon"; /* Avoid multiple creation */ - if( var_Create( p_this->p_libvlc, "vlm_mutex", VLC_VAR_MUTEX ) || - var_Get( p_this->p_libvlc, "vlm_mutex", &lockval ) ) - return NULL; - - vlc_mutex_lock( lockval.p_address ); + vlc_mutex_lock( &vlm_mutex ); p_vlm = *pp_vlm; if( p_vlm ) { /* VLM already exists */ vlc_object_hold( p_vlm ); - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &vlm_mutex ); return p_vlm; } @@ -139,11 +151,12 @@ vlm_t *__vlm_New ( vlc_object_t *p_this ) vlm_object_name ); if( !p_vlm ) { - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &vlm_mutex ); return NULL; } vlc_mutex_init( &p_vlm->lock ); + vlc_cond_init_daytime( &p_vlm->wait ); p_vlm->i_id = 1; TAB_INIT( p_vlm->i_media, p_vlm->media ); TAB_INIT( p_vlm->i_schedule, p_vlm->schedule ); @@ -154,11 +167,15 @@ vlm_t *__vlm_New ( vlc_object_t *p_this ) if( vlc_clone( &p_vlm->thread, Manage, p_vlm, VLC_THREAD_PRIORITY_LOW ) ) { + vlc_cond_destroy( &p_vlm->wait ); vlc_mutex_destroy( &p_vlm->lock ); vlc_object_release( p_vlm ); + vlc_mutex_unlock( &vlm_mutex ); return NULL; } + *pp_vlm = p_vlm; /* for future reference */ + /* Load our configuration file */ psz_vlmconf = var_CreateGetString( p_vlm, "vlm-conf" ); if( psz_vlmconf && *psz_vlmconf ) @@ -180,8 +197,7 @@ vlm_t *__vlm_New ( vlc_object_t *p_this ) free( psz_vlmconf ); vlc_object_set_destructor( p_vlm, (vlc_destructor_t)vlm_Destructor ); - *pp_vlm = p_vlm; /* for future reference */ - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &vlm_mutex ); return p_vlm; } @@ -191,15 +207,12 @@ vlm_t *__vlm_New ( vlc_object_t *p_this ) *****************************************************************************/ void vlm_Delete( vlm_t *p_vlm ) { - vlc_value_t lockval; - /* vlm_Delete() is serialized against itself, and against vlm_New(). * This way, vlm_Destructor () (called from vlc_objet_release() above) * is serialized against setting libvlc_priv->p_vlm from vlm_New(). */ - var_Get( p_vlm->p_libvlc, "vlm_mutex", &lockval ); - vlc_mutex_lock( lockval.p_address ); + vlc_mutex_lock( &vlm_mutex ); vlc_object_release( p_vlm ); - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( &vlm_mutex ); } /***************************************************************************** @@ -213,10 +226,16 @@ static void vlm_Destructor( vlm_t *p_vlm ) vlm_ControlInternal( p_vlm, VLM_CLEAR_SCHEDULES ); TAB_CLEAN( p_vlm->schedule, p_vlm->schedule ); + vlc_mutex_lock( &p_vlm->lock ); + vlc_cond_signal( &p_vlm->wait ); + vlc_mutex_unlock( &p_vlm->lock ); + libvlc_priv(p_vlm->p_libvlc)->p_vlm = NULL; vlc_object_kill( p_vlm ); /*vlc_cancel( p_vlm->thread ); */ vlc_join( p_vlm->thread, NULL ); + + vlc_cond_destroy( &p_vlm->wait ); vlc_mutex_destroy( &p_vlm->lock ); } @@ -351,6 +370,7 @@ static void* Manage( void* p_object ) int i, j; mtime_t i_lastcheck; mtime_t i_time; + mtime_t i_nextschedule = 0; int canc = vlc_savecancel (); i_lastcheck = vlm_Date(); @@ -361,6 +381,10 @@ static void* Manage( void* p_object ) int i_scheduled_commands = 0; vlc_mutex_lock( &vlm->lock ); + if( i_nextschedule ) + vlc_cond_timedwait( &vlm->wait, &vlm->lock, i_nextschedule ); + else + vlc_cond_wait( &vlm->wait, &vlm->lock ); /* destroy the inputs that wants to die, and launch the next input */ for( i = 0; i < vlm->i_media; i++ ) @@ -397,6 +421,7 @@ static void* Manage( void* p_object ) /* scheduling */ i_time = vlm_Date(); + i_nextschedule = 0; for( i = 0; i < vlm->i_schedule; i++ ) { @@ -424,17 +449,25 @@ static void* Manage( void* p_object ) vlm->schedule[i]->i_period; } - if( i_real_date <= i_time && i_real_date > i_lastcheck ) + if( i_real_date <= i_time ) { - for( j = 0; j < vlm->schedule[i]->i_command; j++ ) + if( i_real_date > i_lastcheck ) { - TAB_APPEND( i_scheduled_commands, - ppsz_scheduled_commands, - strdup(vlm->schedule[i]->command[j] ) ); + for( j = 0; j < vlm->schedule[i]->i_command; j++ ) + { + TAB_APPEND( i_scheduled_commands, + ppsz_scheduled_commands, + strdup(vlm->schedule[i]->command[j] ) ); + } } } + else + { + i_nextschedule = i_real_date; + } } } + while( i_scheduled_commands ) { vlm_message_t *message = NULL; @@ -452,8 +485,6 @@ static void* Manage( void* p_object ) i_lastcheck = i_time; vlc_mutex_unlock( &vlm->lock ); - - msleep( 100000 ); } vlc_restorecancel (canc); @@ -569,7 +600,7 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) if( asprintf( &psz_header, _("Media: %s"), p_cfg->psz_name ) == -1 ) psz_header = NULL; - p_input = input_Create( p_vlm->p_libvlc, p_media->vod.p_item, psz_header, NULL ); + p_input = input_Create( p_vlm->p_vod, p_media->vod.p_item, psz_header, NULL ); if( p_input ) { vlc_sem_t sem_preparse; @@ -585,7 +616,7 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) var_DelCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse ); vlc_sem_destroy( &sem_preparse ); - input_Stop( p_input, false ); + input_Stop( p_input, true ); vlc_thread_join( p_input ); vlc_object_release( p_input ); } @@ -669,7 +700,6 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id if( !p_vlm->p_vod->p_module ) { msg_Err( p_vlm, "cannot find vod server" ); - vlc_object_detach( p_vlm->p_vod ); vlc_object_release( p_vlm->p_vod ); p_vlm->p_vod = NULL; return VLC_EGENERIC; @@ -730,15 +760,16 @@ static int vlm_ControlMediaDel( vlm_t *p_vlm, int64_t id ) vlc_gc_decref( p_media->vod.p_item ); - TAB_REMOVE( p_vlm->i_media, p_vlm->media, p_media ); + if( p_media->vod.p_media ) + p_vlm->p_vod->pf_media_del( p_vlm->p_vod, p_media->vod.p_media ); + TAB_REMOVE( p_vlm->i_media, p_vlm->media, p_media ); free( p_media ); /* Check if we need to unload the VOD server */ if( p_vlm->p_vod && p_vlm->i_vod <= 0 ) { module_unneed( p_vlm->p_vod, p_vlm->p_vod->p_module ); - vlc_object_detach( p_vlm->p_vod ); vlc_object_release( p_vlm->p_vod ); p_vlm->p_vod = NULL; } @@ -843,6 +874,7 @@ static void vlm_MediaInstanceDelete( vlm_t *p_vlm, int64_t id, vlm_media_instanc if( p_instance->p_input_resource ) input_resource_Delete( p_instance->p_input_resource ); + TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance ); vlc_gc_decref( p_instance->p_item ); free( p_instance->psz_name ); free( p_instance ); @@ -913,7 +945,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * return VLC_SUCCESS; } - input_Stop( p_input, !p_input->b_eof && !p_input->b_error ); + input_Stop( p_input, true ); vlc_thread_join( p_input ); p_instance->p_input_resource = input_DetachResource( p_input ); @@ -934,7 +966,10 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * if( asprintf( &psz_log, _("Media: %s"), p_media->cfg.psz_name ) != -1 ) { - p_instance->p_input = input_Create( p_vlm->p_libvlc, p_instance->p_item, + vlc_object_t *p_parent = p_media->cfg.b_vod ? + VLC_OBJECT(p_vlm->p_vod) : + VLC_OBJECT(p_vlm->p_libvlc); + p_instance->p_input = input_Create( p_parent, p_instance->p_item, psz_log, p_instance->p_input_resource ); if( p_instance->p_input ) { @@ -950,7 +985,6 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * if( !p_instance->p_input ) { - TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance ); vlm_MediaInstanceDelete( p_vlm, id, p_instance, p_media ); } else @@ -975,8 +1009,6 @@ static int vlm_ControlMediaInstanceStop( vlm_t *p_vlm, int64_t id, const char *p if( !p_instance ) return VLC_EGENERIC; - TAB_REMOVE( p_media->i_instance, p_media->instance, p_instance ); - vlm_MediaInstanceDelete( p_vlm, id, p_instance, p_media ); return VLC_SUCCESS; @@ -1064,7 +1096,8 @@ static int vlm_ControlMediaInstanceGets( vlm_t *p_vlm, int64_t id, vlm_media_ins p_idsc->d_position = var_GetFloat( p_instance->p_input, "position" ); if( var_GetInteger( p_instance->p_input, "state" ) == PAUSE_S ) p_idsc->b_paused = true; - p_idsc->i_rate = var_GetInteger( p_instance->p_input, "rate" ); + p_idsc->i_rate = INPUT_RATE_DEFAULT + / var_GetFloat( p_instance->p_input, "rate" ); } TAB_APPEND( i_idsc, pp_idsc, p_idsc );