Changeset e7f887862f7d4b942d014d97b9bfe58aac298728

Timestamp:

30/09/07 21:31:08 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[7b4638dd18df095dbdb7e37a628f3f27cd10f587]

git-author:

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

Message:

Partial unfinished pipes conditional fallback for condition variables.
This would be necessary to rid the networking code of arbitrary timers (but it does not work yet).

Files:

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

src/libvlc.h

@@ -112 +112 @@
-    vlc_bool_t      b_thread;
-
+    /* Objects thread synchronization */
+    int             pipes[2];
+
-    /* Objects management */
-    unsigned        i_refcount;

src/misc/objects.c

@@ -189 +189 @@
-    vlc_cond_init( p_new, &p_new->object_wait );
-    vlc_mutex_init( p_new, &p_priv->var_lock );
+    p_priv->pipes[0] = p_priv->pipes[1] = -1;
-
-    if( i_type == VLC_OBJECT_GLOBAL )
@@ -436 +437 @@
-    vlc_mutex_destroy( &p_this->object_lock );
-    vlc_cond_destroy( &p_this->object_wait );
+    if( p_priv->pipes[0] != -1 )
+        close( p_priv->pipes[0] );
+    if( p_priv->pipes[1] != -1 )
+        close( p_priv->pipes[1] );
-
-    /* global is not dynamically allocated by vlc_object_create */
@@ -466 +471 @@
-{
-    vlc_assert_locked( &obj->object_lock );
+
+    int fd = obj->p_internals->pipes[0];
+    if( ( fd != -1 )
+     && ( read( fd, &(char){ 0 }, 1 ) == 0 ) )
+    {
+        close( fd );
+        obj->p_internals->pipes[1] = -1;
+    }   
+
-    vlc_cond_wait( &obj->object_wait, &obj->object_lock );
-    return obj->b_die;
@@ -499 +513 @@
-{
-    vlc_assert_locked( &obj->object_lock );
+
+    int fd = obj->p_internals->pipes[1];
+    if( fd != -1 )
+        while( write( fd, &(char){ 0 }, 1 ) < 0 );
+
-    vlc_cond_signal( &obj->object_wait );
-}
@@ -516 +535 @@
-
-    p_this->b_die = VLC_TRUE;
+
+    int fd = p_this->p_internals->pipes[1];
+    if( fd != -1 )
+    {
+        close( fd );
+        p_this->p_internals->pipes[1] = -1;
+    }
+
-    vlc_object_signal_unlocked( p_this );
-    vlc_mutex_unlock( &p_this->object_lock );