Changeset 20ad5a20371bd4b028c2fd8d6ae9a928878e5d06

Timestamp:

07/09/08 13:06:14 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1220785574 +0300

git-parent:

[28092982d6ddf47461484664e2ff3fe6eef46faa]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1220785574 +0300

Message:

Podcast: thread safety fixes

Variables callback can be (and usually are) invoked from other threads.
They cannot access the object without locking, and must be unregistered
before the object is destroyed (var_DelCallback() -> free(p_sys)).

Files:

• modules/services_discovery/podcast.c (modified) (8 diffs)

modules/services_discovery/podcast.c

@@ -34 +34 @@
-#include <vlc_playlist.h>
-#include <vlc_network.h>
+#include <assert.h>
-
-#include <errno.h>                                                 /* ENOMEM */
@@ -89 +90 @@
-    int i_urls;
-
+    vlc_mutex_t lock;
+    vlc_cond_t  wait;
-    bool b_update;
-};
@@ -115 +118 @@
-    p_sys->i_input = 0;
-    p_sys->pp_input = NULL;
+    vlc_mutex_init( &p_sys->lock );
+    vlc_cond_init( &p_sys->wait );
-    p_sys->b_update = true;
-
@@ -122 +127 @@
-    /* Give us a name */
-    services_discovery_SetLocalizedName( p_sd, _("Podcasts") );
+
+    /* Launch the callback associated with this variable */
+    var_Create( p_sd, "podcast-urls", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_AddCallback( p_sd, "podcast-urls", UrlsChange, p_sys );
-
-    return VLC_SUCCESS;
@@ -134 +143 @@
-    services_discovery_sys_t *p_sys  = p_sd->p_sys;
-    int i;
+
+    var_DelCallback( p_sd, "podcast-urls", UrlsChange, p_sys );
+    vlc_cond_destroy( &p_sys->wait );
+    vlc_mutex_destroy( &p_sys->lock );
+
-    for( i = 0; i < p_sys->i_input; i++ )
-    {
@@ -156 +170 @@
-    services_discovery_sys_t *p_sys  = p_sd->p_sys;
-
-
-
-
-
+
+
-    for( ;; )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        for( int i = 0; i < p_sd->p_sys->i_input; i++ )
@@ -190 +199 @@
-        vlc_restorecancel (canc);
-    }
+    vlc_cleanup_pop();
+    assert(0); /* dead code */
-}
-
@@ -199 +210 @@
-    VLC_UNUSED(newval);
-    services_discovery_sys_t *p_sys  = (services_discovery_sys_t *)p_data;
+
+    vlc_mutex_lock( &p_sys->lock );
-    p_sys->b_update = true;
+    vlc_cond_signal( &p_sys->wait );
+    vlc_mutex_unlock( &p_sys->lock );
-    return VLC_SUCCESS;
-}