Preparser: use normal thread API

[vlc] / src / playlist / thread.c

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 2e1b70d3bd9009fd16843b4a35cb834b4075f8f8..b6be2b96a41987972d9bc8b714cc56c7ed299ee7 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -35,11 +35,9 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static void RunControlThread ( playlist_t * );
-static void RunPreparse( playlist_preparse_t * );
-static void RunFetcher( playlist_fetcher_t * );
-static void PreparseDestructor( vlc_object_t * );
-static void FetcherDestructor( vlc_object_t * );
+static void* RunControlThread   ( vlc_object_t * );
+static void* RunFetcher         ( vlc_object_t * );
+static void FetcherDestructor   ( vlc_object_t * );
 
 /*****************************************************************************
  * Main functions for the global thread
@@ -59,64 +57,53 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
     if( !p_playlist ) return;
 
     // Preparse
-    static const char ppname[] = "preparser";
-    p_playlist->p_preparse =
-        vlc_custom_create( p_playlist, sizeof( playlist_preparse_t ),
-                           VLC_OBJECT_GENERIC, ppname );
-    if( !p_playlist->p_preparse )
-    {
-        msg_Err( p_playlist, "unable to create preparser" );
-        vlc_object_release( p_playlist );
-        return;
-    }
-    p_playlist->p_preparse->psz_object_name = strdup( "preparser" );
-    p_playlist->p_preparse->i_waiting = 0;
-    p_playlist->p_preparse->pp_waiting = NULL;
-
-    vlc_object_set_destructor( p_playlist->p_preparse, PreparseDestructor );
-
-    vlc_object_attach( p_playlist->p_preparse, p_playlist );
-    if( vlc_thread_create( p_playlist->p_preparse, "preparser",
-                           RunPreparse, VLC_THREAD_PRIORITY_LOW, true ) )
+    playlist_preparse_t *p_preparse = &p_playlist->p->preparse;
+    vlc_mutex_init (&p_preparse->lock);
+    vlc_cond_init (&p_preparse->wait);
+    p_preparse->i_waiting = 0;
+    p_preparse->pp_waiting = NULL;
+
+    if( vlc_clone( &p_preparse->thread, playlist_PreparseLoop, p_preparse,
+                   VLC_THREAD_PRIORITY_LOW ) )
     {
         msg_Err( p_playlist, "cannot spawn preparse thread" );
-        vlc_object_release( p_playlist->p_preparse );
+        p_preparse->up = false;
         return;
     }
+    p_preparse->up = true;
 
     // Secondary Preparse
     static const char fname[] = "fetcher";
-    p_playlist->p_fetcher =
+    p_playlist->p->p_fetcher =
         vlc_custom_create( p_playlist, sizeof( playlist_fetcher_t ),
                            VLC_OBJECT_GENERIC, fname );
-    if( !p_playlist->p_fetcher )
+    if( !p_playlist->p->p_fetcher )
     {
         msg_Err( p_playlist, "unable to create secondary preparser" );
         vlc_object_release( p_playlist );
         return;
     }
-    p_playlist->p_fetcher->psz_object_name = strdup( "fetcher" );
-    p_playlist->p_fetcher->i_waiting = 0;
-    p_playlist->p_fetcher->pp_waiting = NULL;
-    p_playlist->p_fetcher->i_art_policy = var_CreateGetInteger( p_playlist,
+    p_playlist->p->p_fetcher->i_waiting = 0;
+    p_playlist->p->p_fetcher->pp_waiting = NULL;
+    p_playlist->p->p_fetcher->i_art_policy = var_CreateGetInteger( p_playlist,
                                                                 "album-art" );
 
-    vlc_object_set_destructor( p_playlist->p_fetcher, FetcherDestructor );
+    vlc_object_set_destructor( p_playlist->p->p_fetcher, FetcherDestructor );
 
-    vlc_object_attach( p_playlist->p_fetcher, p_playlist );
-    if( vlc_thread_create( p_playlist->p_fetcher,
+    vlc_object_attach( p_playlist->p->p_fetcher, p_playlist );
+    if( vlc_thread_create( p_playlist->p->p_fetcher,
                            "fetcher",
                            RunFetcher,
-                           VLC_THREAD_PRIORITY_LOW, true ) )
+                           VLC_THREAD_PRIORITY_LOW, false ) )
     {
         msg_Err( p_playlist, "cannot spawn secondary preparse thread" );
-        vlc_object_release( p_playlist->p_fetcher );
+        vlc_object_release( p_playlist->p->p_fetcher );
         return;
     }
 
     // Start the thread
     if( vlc_thread_create( p_playlist, "playlist", RunControlThread,
-                           VLC_THREAD_PRIORITY_LOW, true ) )
+                           VLC_THREAD_PRIORITY_LOW, false ) )
     {
         msg_Err( p_playlist, "cannot spawn playlist thread" );
         vlc_object_release( p_playlist );
@@ -132,17 +119,15 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
 /**
  * Run the main control thread itself
  */
-static void RunControlThread ( playlist_t *p_playlist )
+static void* RunControlThread ( vlc_object_t *p_this )
 {
-    /* Tell above that we're ready */
-    vlc_thread_ready( p_playlist );
+    playlist_t *p_playlist = (playlist_t*)p_this;
 
+    int canc = vlc_savecancel ();
     vlc_object_lock( p_playlist );
     while( vlc_object_alive( p_playlist ) )
     {
-        PL_UNLOCK;
         playlist_MainLoop( p_playlist );
-        PL_LOCK;
 
         /* The playlist lock has been unlocked, so we can't tell if
          * someone has killed us in the meantime. Check now. */
@@ -152,9 +137,11 @@ static void RunControlThread ( playlist_t *p_playlist )
         if( p_playlist->b_cant_sleep )
         {
             /* 100 ms is an acceptable delay for playlist operations */
-            PL_UNLOCK;
+            vlc_object_unlock( p_playlist );
+
             msleep( INTF_IDLE_SLEEP*2 );
-            PL_LOCK;
+
+            vlc_object_lock( p_playlist );
         }
         else
         {
@@ -164,30 +151,17 @@ static void RunControlThread ( playlist_t *p_playlist )
     vlc_object_unlock( p_playlist );
 
     playlist_LastLoop( p_playlist );
+    vlc_restorecancel (canc);
+    return NULL;
 }
 
-/*****************************************************************************
- * Preparse-specific functions
- *****************************************************************************/
-static void RunPreparse ( playlist_preparse_t *p_obj )
-{
-    /* Tell above that we're ready */
-    vlc_thread_ready( p_obj );
-    playlist_PreparseLoop( p_obj );
-}
-
-static void RunFetcher( playlist_fetcher_t *p_obj )
+static void* RunFetcher( vlc_object_t *p_this )
 {
-    /* Tell above that we're ready */
-    vlc_thread_ready( p_obj );
+    playlist_fetcher_t *p_obj = (playlist_fetcher_t *)p_this;
+    int canc = vlc_savecancel ();
     playlist_FetcherLoop( p_obj );
-}
-
-static void PreparseDestructor( vlc_object_t * p_this )
-{
-    playlist_preparse_t * p_preparse = (playlist_preparse_t *)p_this;
-    free( p_preparse->pp_waiting );
-    msg_Dbg( p_this, "Destroyed" );
+    vlc_restorecancel (canc);
+    return NULL;
 }
 
 static void FetcherDestructor( vlc_object_t * p_this )