Changeset 476255ccf367929c2bf66ea7805ee8fcbabe1945

Timestamp:

26/03/08 17:36:05 (8 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1206549365 +0100

git-parent:

[8bf64ccc76a40c0ba7c2089ed5e08f58a5f405f3]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1206488809 +0100

Message:

playlist: Properly destroy the preparser and the fetcher objects.

vlc_thread_join() and vlc_object_detach() are correctly run from vlc_object_release() now.

Files:

• src/playlist/thread.c (modified) (8 diffs)

src/playlist/thread.c

@@ -39 +39 @@
-static void RunPreparse( playlist_preparse_t * );
-static void RunFetcher( playlist_fetcher_t * );
+static void PreparseDestructor( vlc_object_t * );
+static void FetcherDestructor( vlc_object_t * );
-
-/*****************************************************************************
@@ -79 +81 @@
-    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",
@@ -84 +88 @@
-    {
-        msg_Err( p_playlist, "cannot spawn preparse thread" );
-        vlc_object_detach( p_playlist->p_preparse );
-        vlc_object_release( p_playlist->p_preparse );
-        return;
@@ -105 +108 @@
-                                                                "album-art" );
-
+    vlc_object_set_destructor( p_playlist->p_fetcher, FetcherDestructor );
+
-    vlc_object_attach( p_playlist->p_fetcher, p_playlist );
-    if( vlc_thread_create( p_playlist->p_fetcher,
@@ -112 +117 @@
-    {
-        msg_Err( p_playlist, "cannot spawn secondary preparse thread" );
-        vlc_object_detach( p_playlist->p_fetcher );
-        vlc_object_release( p_playlist->p_fetcher );
-        return;
@@ -147 +151 @@
-    if( p_playlist->p_preparse )
-    {
-        vlc_object_kill( p_playlist->p_preparse );
-        vlc_thread_join( p_playlist->p_preparse );
-        free( p_playlist->p_preparse->pp_waiting );
-        vlc_object_detach( p_playlist->p_preparse );
-        vlc_object_release( p_playlist->p_preparse );
-    }
@@ -157 +157 @@
-    if( p_playlist->p_fetcher )
-    {
-        vlc_object_kill( p_playlist->p_fetcher );
-        vlc_thread_join( p_playlist->p_fetcher );
-        free( p_playlist->p_fetcher->p_waiting );
-        vlc_object_detach( p_playlist->p_fetcher );
-        vlc_object_release( p_playlist->p_fetcher );
-    }
@@ -222 +218 @@
-    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 );
+}
+
+static void FetcherDestructor( vlc_object_t * p_this )
+{
+    playlist_fetcher_t * p_fetcher = (playlist_fetcher_t *)p_this;
+    free( p_fetcher->p_waiting );
+}