Changeset fdb990bd55f690131f00a443f187577fc82c8aa6

Timestamp:

01/21/08 21:35:19 (8 months ago)

Author:

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

git-committer:

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

git-parent:

[d9b511137a52356cbf7941abd1e6a46ea078f9bc]

git-author:

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

Message:

Remove potential deadlocks in waitpipe with net_*

Files:

• src/misc/objects.c (modified) (1 diff)
• src/network/io.c (modified) (4 diffs)
• src/network/tcp.c (modified) (4 diffs)

src/misc/objects.c

@@ -556 +556 @@
-        vlc_spin_lock (&internals->spin);
-        signaled = internals->b_signaled;
-(!signaled) && (internals->pipes[0] == -1)
+internals->pipes[0] == -1
-        {
-            internals->pipes[0] = pfd[0];
-            internals->pipes[1] = pfd[1];
-        }
+        else
+            race = VLC_TRUE;
-    }
-    vlc_spin_unlock (&internals->spin);
-
- || signaled
-
+
+   /* Race condition: two threads call pipe() - unlikely */
-        close (pfd[0]);
-        close (pfd[1]);
-
-
-
-
-
-
-
+
+
+
+
+
-
-    return internals->pipes[0];

src/network/io.c

@@ -259 +259 @@
- * Reads from a network socket.
- * If waitall is true, then we repeat until we have read the right amount of
-
+
+
- *****************************************************************************/
-ssize_t
@@ -271 +272 @@
-    };
-
-    vlc_object_lock (p_this);
-    ufd[1].fd = vlc_object_waitpipe (p_this);
-
-    while (i_buflen > 0)
-    {
-        int val;
-
-
-
-
-
-
-
-
-
+
+
+
-        }
-        ufd[0].revents = ufd[1].revents = 0;
-
-        vlc_object_unlock (p_this);
-        val = poll (ufd, sizeof (ufd) / sizeof (ufd[0]), -1);
-        vlc_object_lock (p_this);
-
-        if (val < 0)
@@ -299 +290 @@
-        {
-            msg_Dbg (p_this, "socket %d polling interrupted", fd);
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -379 +377 @@
-    }
-
-    vlc_object_unlock (p_this);
-    return i_total;
-
-error:
-    msg_Err (p_this, "Read error: %m");
-
-    vlc_object_unlock (p_this);
-    return -1;
-}

src/network/tcp.c

@@ -287 +287 @@
-    assert( pi_fd != NULL );
-
-    vlc_object_lock (p_this);
-    evfd = vlc_object_waitpipe (p_this);
-
-while (vlc_object_alive (p_this)
+for (;;
-    {
-        unsigned n = 0;
@@ -304 +303 @@
-            ufd[i].revents = 0;
-        }
-
-
+
+
+
-        switch (poll (ufd, n, timeout))
-        {
@@ -314 +314 @@
-                return -1; /* NOTE: p_this already unlocked */
-        }
-        vlc_object_lock (p_this);
-
-        if (ufd[n].revents)
-        {
-            vlc_object_wait (p_this);
-            errno = EINTR;
-            break;
@@ -339 +337 @@
-            memmove (pi_fd + i, pi_fd + i + 1, n - (i + 1));
-            pi_fd[n - 1] = sfd;
-            vlc_object_unlock (p_this);
-            return fd;
-        }
-    }
-    vlc_object_unlock (p_this);
-    return -1;
-}