Add some locking.

[vlc] / src / input / vlm.c

diff --git a/src/input/vlm.c b/src/input/vlm.c
index 4c7d35d75b3eb5e90f60f35643056177b947dac7..46e01fbc90d4bb34e413adffcedc17e1a90b844c 100644 (file)
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -105,6 +105,10 @@ 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" ) );
+
+        vlc_mutex_lock( &p_vlm->lock_manage );
+        vlc_cond_signal( &p_vlm->wait_manage );
+        vlc_mutex_unlock( &p_vlm->lock_manage );
     }
     return VLC_SUCCESS;
 }
@@ -112,25 +116,22 @@ static int InputEvent( vlc_object_t *p_this, char const *psz_cmd,
 /*****************************************************************************
  * vlm_New:
  *****************************************************************************/
+static vlc_mutex_t vlm_mutex = VLC_STATIC_MUTEX;
+
 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;
     }
 
@@ -140,11 +141,13 @@ 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_mutex_init( &p_vlm->lock_manage );
+    vlc_cond_init( &p_vlm->wait_manage );
     p_vlm->i_id = 1;
     TAB_INIT( p_vlm->i_media, p_vlm->media );
     TAB_INIT( p_vlm->i_schedule, p_vlm->schedule );
@@ -155,8 +158,11 @@ 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_manage );
+        vlc_mutex_destroy( &p_vlm->lock_manage );
         vlc_mutex_destroy( &p_vlm->lock );
         vlc_object_release( p_vlm );
+        vlc_mutex_unlock( &vlm_mutex );
         return NULL;
     }
 
@@ -183,7 +189,7 @@ vlm_t *__vlm_New ( vlc_object_t *p_this )
     free( psz_vlmconf );
 
     vlc_object_set_destructor( p_vlm, (vlc_destructor_t)vlm_Destructor );
-    vlc_mutex_unlock( lockval.p_address );
+    vlc_mutex_unlock( &vlm_mutex );
 
     return p_vlm;
 }
@@ -193,15 +199,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 );
 }
 
 /*****************************************************************************
@@ -215,10 +218,17 @@ 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_manage );
+    vlc_cond_signal( &p_vlm->wait_manage );
+    vlc_mutex_unlock( &p_vlm->lock_manage );
+
     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_manage );
+    vlc_mutex_destroy( &p_vlm->lock_manage );
     vlc_mutex_destroy( &p_vlm->lock );
 }
 
@@ -353,6 +363,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();
@@ -362,6 +373,13 @@ static void* Manage( void* p_object )
         char **ppsz_scheduled_commands = NULL;
         int    i_scheduled_commands = 0;
 
+        vlc_mutex_lock( &vlm->lock_manage );
+        if( i_nextschedule )
+            vlc_cond_timedwait( &vlm->wait_manage, &vlm->lock_manage, i_nextschedule-mdate() );
+        else
+            vlc_cond_wait( &vlm->wait_manage, &vlm->lock_manage );
+        vlc_mutex_unlock( &vlm->lock_manage );
+
         vlc_mutex_lock( &vlm->lock );
 
         /* destroy the inputs that wants to die, and launch the next input */
@@ -399,6 +417,7 @@ static void* Manage( void* p_object )
 
         /* scheduling */
         i_time = vlm_Date();
+        i_nextschedule = 0;
 
         for( i = 0; i < vlm->i_schedule; i++ )
         {
@@ -426,17 +445,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;
@@ -454,8 +481,6 @@ static void* Manage( void* p_object )
         i_lastcheck = i_time;
 
         vlc_mutex_unlock( &vlm->lock );
-
-        msleep( 100000 );
     }
 
     vlc_restorecancel (canc);
@@ -571,7 +596,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;
@@ -671,7 +696,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;
@@ -732,15 +756,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;
     }
@@ -937,7 +962,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 )
         {