[vlc-devel] commit: playlist: Make sure fetcher and preparser won' t miss a vlc_object_kill(). (Pierre d'Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Fri May 30 17:31:43 2008 +0200| [21702e21867f9c7134865397eb6e19e994636149]

playlist: Make sure fetcher and preparser won't miss a vlc_object_kill().

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21702e21867f9c7134865397eb6e19e994636149
---

 src/playlist/engine.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 3f73204..89aa16c 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -483,9 +483,10 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
     input_item_t *p_current;
     int i_activity;
 
-    while( !p_playlist->b_die )
+    vlc_object_lock( p_obj );
+
+    while( vlc_object_alive( p_obj ) )
     {
-        vlc_object_lock( p_obj );
         while( p_obj->i_waiting == 0 )
         {
             if( vlc_object_wait( p_obj ) || p_playlist->b_die )
@@ -556,7 +557,9 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
         vlc_object_unlock( p_obj );
         /* Sleep at least 1ms */
         msleep( (i_activity+1) * 1000 );
+        vlc_object_lock( p_obj );
     }
+    vlc_object_unlock( p_obj );
 }
 
 /**
@@ -572,13 +575,13 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
     input_item_t *p_item;
     int i_activity;
 
-    while( !p_playlist->b_die )
+    vlc_mutex_lock( &p_obj->object_lock );
+
+    while( vlc_object_alive( p_obj ) )
     {
-        vlc_mutex_lock( &p_obj->object_lock );
         while( p_obj->i_waiting == 0 )
         {
-            vlc_cond_wait( &p_obj->object_wait, &p_obj->object_lock );
-            if( p_playlist->b_die )
+            if( vlc_object_wait( p_obj ) || p_playlist->b_die )
             {
                 vlc_mutex_unlock( &p_obj->object_lock );
                 return;
@@ -638,7 +641,9 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
         vlc_object_unlock( p_obj );
         /* Sleep at least 1ms */
         msleep( (i_activity+1) * 1000 );
+        vlc_mutex_lock( &p_obj->object_lock );
     }
+    vlc_mutex_unlock( &p_obj->object_lock );
 }
 
 static void VariablesInit( playlist_t *p_playlist )