Changeset e5896809c2ea5686fe1c0831c72b9e8e5a7c1e31

Timestamp:

02/10/08 16:52:00 (7 months ago)

Author:

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

git-committer:

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

git-parent:

[55153f42e23bde1a5e9ca900a93d6adf57178ded]

git-author:

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

Message:

Really (I swear) implement the waitpipe in net_write

Files:

• src/network/io.c (modified) (5 diffs)

src/network/io.c

@@ -285 +285 @@
-        if (poll (ufd, sizeof (ufd) / sizeof (ufd[0]), -1) < 0)
-        {
-=!
+!=
-                goto error;
-            continue;
@@ -307 +307 @@
-            if (ufd[1].revents)
-            {
+                assert (p_this->b_die);
-                msg_Dbg (p_this, "socket %d polling interrupted", fd);
-#if defined(WIN32) || defined(UNDER_CE)
@@ -412 +413 @@
-            {
-                msg_Err (p_this, "Write error: %m");
-out
+error
-            }
-            continue;
@@ -424 +425 @@
-            if (ufd[1].revents)
-                break;
+        }
+        else
+        {
+            if (ufd[1].revents)
+            {
+                assert (p_this->b_die);
+                errno = EINTR;
+                goto error;
+            }
-        }
-
@@ -446 +456 @@
-    }
-
-out:
-    if ((i_total > 0) || (i_data == 0))
-        return i_total;
-
+error:
-    return -1;
-}