Changeset d9b511137a52356cbf7941abd1e6a46ea078f9bc

Timestamp:

01/21/08 21:22:46 (8 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1200946966 +0000

git-parent:

[8f92249ae4cc44e2eceecfba0610e43174813156]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1200946966 +0000

Message:

Remove the requirement for vlc object to be locked when invoking waitpipe.
This is so that the net_* functions can use it without making pushing locking assumption on their caller.

Files:

• src/libvlc.h (modified) (1 diff)
• src/misc/objects.c (modified) (5 diffs)

src/libvlc.h

@@ -110 +110 @@
-
-    /* Objects thread synchronization */
+    vlc_bool_t      b_signaled;
-    int             pipes[2];
+    vlc_spinlock_t  spin;
-
-    /* Objects management */

src/misc/objects.c

@@ -196 +196 @@
-    vlc_cond_init( p_new, &p_new->object_wait );
-    vlc_mutex_init( p_new, &p_priv->var_lock );
+    vlc_spin_init( &p_priv->spin );
-    p_priv->pipes[0] = p_priv->pipes[1] = -1;
-
@@ -444 +445 @@
-    vlc_mutex_destroy( &p_this->object_lock );
-    vlc_cond_destroy( &p_this->object_wait );
+    vlc_spin_destroy( &p_priv->spin );
-    if( p_priv->pipes[0] != -1 )
-        close( p_priv->pipes[0] );
@@ -533 +535 @@
- * Also note that, as with vlc_object_wait(), there may be spurious wakeups.
- *
- (object lock MUST hold)
+
- * @return a readable pipe descriptor, or -1 on error.
- */
-int __vlc_object_waitpipe( vlc_object_t *obj )
-{
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            return -1;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -563 +589 @@
-vlc_bool_t __vlc_object_wait( vlc_object_t *obj )
-{
+    int fd;
+
-    vlc_assert_locked( &obj->object_lock );
-
-int 
-( fd != -1 
-
-  < 0)
+
+ (fd != -1
+
+)  < 0
-        return obj->b_die;
-    }
-
-    vlc_cond_wait( &obj->object_wait, &obj->object_lock );
+    obj->p_internals->b_signaled = VLC_FALSE;
-    return obj->b_die;
-}
@@ -634 +663 @@
-void __vlc_object_signal_unlocked( vlc_object_t *obj )
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
-    if( fd != -1 )
-        while( write( fd, &(char){ 0 }, 1 ) < 0 );