[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.209 by root, Tue Feb 5 23:56:33 2008 UTC vs.
Revision 1.213 by root, Tue Feb 19 19:13:50 2008 UTC

       fd_intern (evpipe [0]);
       fd_intern (evpipe [1]);
       ev_io_set (&pipeev, evpipe [0], EV_READ);
       ev_io_start (EV_A_ &pipeev);
-      ev_unref (EV_A); /* child watcher should not keep loop alive */
+      ev_unref (EV_A); /* watcher should not keep loop alive */
     }
 }
 void inline_size
 evpipe_write (EV_P_ int sig, int async)
 {
-  if (!(gotasync || gotsig))
+  int sent = gotasync || gotsig;
-    {
-      int old_errno = errno;
-      if (sig)   gotsig   = 1;
+  if (sig)   gotsig   = 1;
-      if (async) gotasync = 1;
+  if (async) gotasync = 1;
+  if (!sent)
+    {
+      int old_errno = errno; /* save errno becaue write might clobber it */
       write (evpipe [1], &old_errno, 1);
       errno = old_errno;
     }
 }
   {
     int dummy;
     read (evpipe [0], &dummy, 1);
   }
-  if (gotsig)
+  if (gotsig && ev_is_default_loop (EV_A))
     {
       int signum;
       gotsig = 0;
       for (signum = signalmax; signum--; )
 #endif
   if (ev_is_active (&pipeev))
     {
       /* this "locks" the handlers against writing to the pipe */
+      /* while we modify the fd vars */
+      gotsig = 1;
+#if EV_ASYNC_ENABLE
-      gotsig = gotasync = 1;
+      gotasync = 1;
+#endif
       ev_ref (EV_A);
       ev_io_stop (EV_A_ &pipeev);
       close (evpipe [0]);
       close (evpipe [1]);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines