VLM : add a dedicated mutex for the manage thread. We must not del callback while...

[vlc] / src / input / vlm.c

diff --git a/src/input/vlm.c b/src/input/vlm.c
index 31ac195806dd081ab054e2b2bae2e7ac72fa9968..7956249d28af152d0b418696f5866ea0e3700364 100644 (file)
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -106,6 +106,7 @@ 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 );
+        p_vlm->input_state_changed = true;
         vlc_cond_signal( &p_vlm->wait_manage );
         vlc_mutex_unlock( &p_vlm->lock_manage );
     }
@@ -147,7 +148,8 @@ vlm_t *vlm_New ( vlc_object_t *p_this )
 
     vlc_mutex_init( &p_vlm->lock );
     vlc_mutex_init( &p_vlm->lock_manage );
-    vlc_cond_init( &p_vlm->wait_manage );
+    vlc_cond_init_daytime( &p_vlm->wait_manage );
+    p_vlm->input_state_changed = false;
     p_vlm->i_id = 1;
     TAB_INIT( p_vlm->i_media, p_vlm->media );
     TAB_INIT( p_vlm->i_schedule, p_vlm->schedule );
@@ -159,8 +161,8 @@ 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_mutex_destroy( &p_vlm->lock_manage );
         vlc_object_release( p_vlm );
         vlc_mutex_unlock( &vlm_mutex );
         return NULL;
@@ -212,24 +214,28 @@ void vlm_Delete( vlm_t *p_vlm )
  *****************************************************************************/
 static void vlm_Destructor( vlm_t *p_vlm )
 {
+    vlc_mutex_lock( &p_vlm->lock );
     vlm_ControlInternal( p_vlm, VLM_CLEAR_MEDIAS );
     TAB_CLEAN( p_vlm->i_media, p_vlm->media );
 
     vlm_ControlInternal( p_vlm, VLM_CLEAR_SCHEDULES );
     TAB_CLEAN( p_vlm->schedule, p_vlm->schedule );
+    vlc_mutex_unlock( &p_vlm->lock );
+
+    libvlc_priv(p_vlm->p_libvlc)->p_vlm = NULL;
+    vlc_object_kill( p_vlm );
 
     vlc_mutex_lock( &p_vlm->lock_manage );
+    p_vlm->input_state_changed = true;
     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 );
+    vlc_mutex_destroy( &p_vlm->lock_manage );
 }
 
 /*****************************************************************************
@@ -372,17 +378,20 @@ static void* Manage( void* p_object )
     {
         char **ppsz_scheduled_commands = NULL;
         int    i_scheduled_commands = 0;
+        bool scheduled_command = false;
 
         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 );
+        while( !vlm->input_state_changed && !scheduled_command )
+        {
+            if( i_nextschedule )
+                scheduled_command = vlc_cond_timedwait( &vlm->wait_manage, &vlm->lock_manage, i_nextschedule ) != 0;
+            else
+                vlc_cond_wait( &vlm->wait_manage, &vlm->lock_manage );
+        }
+        vlm->input_state_changed = false;
         vlc_mutex_unlock( &vlm->lock_manage );
-
-        vlc_mutex_lock( &vlm->lock );
-
         /* destroy the inputs that wants to die, and launch the next input */
+        vlc_mutex_lock( &vlm->lock );
         for( i = 0; i < vlm->i_media; i++ )
         {
             vlm_media_sys_t *p_media = vlm->media[i];
@@ -479,8 +488,8 @@ static void* Manage( void* p_object )
         }
 
         i_lastcheck = i_time;
-
         vlc_mutex_unlock( &vlm->lock );
+
     }
 
     vlc_restorecancel (canc);
@@ -612,7 +621,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 );
             }
@@ -941,7 +950,8 @@ 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 );