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

Comparing libev/ev.c (file contents):
Revision 1.345 by sf-exg, Sat Jul 31 22:33:26 2010 UTC vs.
Revision 1.353 by root, Thu Oct 21 12:32:47 2010 UTC

 # ifdef __cplusplus
 }
 # endif
 #endif
 /**/
 #if EV_VERIFY >= 3
 # define EV_FREQUENT_CHECK ev_verify (EV_A)
 #else
 #define TIME_EPSILON  0.0001220703125 /* 1/8192 */
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
+#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
+#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
 #if __GNUC__ >= 4
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 # define noinline                   __attribute__ ((noinline))
 #else
 # define expect(expr,value)         (expr)
 # define EV_RELEASE_CB (void)0
 # define EV_ACQUIRE_CB (void)0
 # define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
 #endif
-#define EVUNLOOP_RECURSE 0x80
+#define EVBREAK_RECURSE 0x80
 /*****************************************************************************/
 #ifndef EV_HAVE_EV_TIME
 ev_tstamp
   if (delay > 0.)
     {
 #if EV_USE_NANOSLEEP
       struct timespec ts;
-      ts.tv_sec  = (time_t)delay;
+      EV_TS_SET (ts, delay);
-      ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
       nanosleep (&ts, 0);
 #elif defined(_WIN32)
       Sleep ((unsigned long)(delay * 1e3));
 #else
       struct timeval tv;
-      tv.tv_sec  = (time_t)delay;
-      tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
       /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
       /* something not guaranteed by newer posix versions, but guaranteed */
       /* by older ones */
+      EV_TV_SET (tv, delay);
       select (0, 0, 0, 0, &tv);
 #endif
     }
 }
     {
       int fd = fdchanges [i];
       ANFD *anfd = anfds + fd;
       ev_io *w;
-      unsigned char events = 0;
+      unsigned char o_events = anfd->events;
+      unsigned char o_reify  = anfd->reify;
-      for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
+      anfd->reify  = 0;
-        events |= (unsigned char)w->events;
 #if EV_SELECT_IS_WINSOCKET
-      if (events)
+      if (o_reify & EV__IOFDSET)
         {
           unsigned long arg;
           anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
           assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
         }
 #endif
+      /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
-      {
+        {
-        unsigned char o_events = anfd->events;
-        unsigned char o_reify  = anfd->reify;
-        anfd->reify  = 0;
-        anfd->events = events;
+          anfd->events = 0;
-        if (o_events != events || o_reify & EV__IOFDSET)
+          for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
+            anfd->events |= (unsigned char)w->events;
+          if (o_events != anfd->events)
+            o_reify = EV__IOFDSET; /* actually |= */
+        }
+      if (o_reify & EV__IOFDSET)
-          backend_modify (EV_A_ fd, o_events, events);
+        backend_modify (EV_A_ fd, o_events, anfd->events);
-      }
     }
   fdchangecnt = 0;
 }
           uint64_t counter = 1;
           write (evfd, &counter, sizeof (uint64_t));
         }
       else
 #endif
+        /* win32 people keep sending patches that change this write() to send() */
+        /* and then run away. but send() is wrong, it wants a socket handle on win32 */
+        /* so when you think this write should be a send instead, please find out */
+        /* where your send() is from - it's definitely not the microsoft send, and */
+        /* tell me. thank you. */
         write (evpipe [1], &dummy, 1);
       errno = old_errno;
     }
 }
     }
   else
 #endif
     {
       char dummy;
+      /* see discussion in evpipe_write when you think this read should be recv in win32 */
       read (evpipe [0], &dummy, 1);
     }
   if (sig_pending)
     {
       mn_now = ev_rt_now;
     }
 }
 void
-ev_loop (EV_P_ int flags)
+ev_run (EV_P_ int flags)
 {
 #if EV_FEATURE_API
   ++loop_depth;
 #endif
-  assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
+  assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
-  loop_done = EVUNLOOP_CANCEL;
+  loop_done = EVBREAK_CANCEL;
   EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
   do
     {
       /* calculate blocking time */
       {
         ev_tstamp waittime  = 0.;
         ev_tstamp sleeptime = 0.;
+        /* remember old timestamp for io_blocktime calculation */
+        ev_tstamp prev_mn_now = mn_now;
+        /* update time to cancel out callback processing overhead */
+        time_update (EV_A_ 1e100);
-        if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
+        if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
           {
-            /* remember old timestamp for io_blocktime calculation */
-            ev_tstamp prev_mn_now = mn_now;
-            /* update time to cancel out callback processing overhead */
-            time_update (EV_A_ 1e100);
             waittime = MAX_BLOCKTIME;
             if (timercnt)
               {
                 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
           }
 #if EV_FEATURE_API
         ++loop_count;
 #endif
-        assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
+        assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
         backend_poll (EV_A_ waittime);
-        assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
+        assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
         /* update ev_rt_now, do magic */
         time_update (EV_A_ waittime + sleeptime);
       }
       EV_INVOKE_PENDING;
     }
   while (expect_true (
     activecnt
     && !loop_done
-    && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
+    && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
   ));
-  if (loop_done == EVUNLOOP_ONE)
+  if (loop_done == EVBREAK_ONE)
-    loop_done = EVUNLOOP_CANCEL;
+    loop_done = EVBREAK_CANCEL;
 #if EV_FEATURE_API
   --loop_depth;
 #endif
 }
 void
-ev_unloop (EV_P_ int how)
+ev_break (EV_P_ int how)
 {
   loop_done = how;
 }
 void
   EV_FREQUENT_CHECK;
   wlist_del (&anfds[w->fd].head, (WL)w);
   ev_stop (EV_A_ (W)w);
-  fd_change (EV_A_ w->fd, 1);
+  fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
   EV_FREQUENT_CHECK;
 }
 void noinline
 #if EV_EMBED_ENABLE
 void noinline
 ev_embed_sweep (EV_P_ ev_embed *w)
 {
-  ev_loop (w->other, EVLOOP_NONBLOCK);
+  ev_run (w->other, EVRUN_NOWAIT);
 }
 static void
 embed_io_cb (EV_P_ ev_io *io, int revents)
 {
   ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
   if (ev_cb (w))
     ev_feed_event (EV_A_ (W)w, EV_EMBED);
   else
-    ev_loop (w->other, EVLOOP_NONBLOCK);
+    ev_run (w->other, EVRUN_NOWAIT);
 }
 static void
 embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
 {
     EV_P = w->other;
     while (fdchangecnt)
       {
         fd_reify (EV_A);
-        ev_loop (EV_A_ EVLOOP_NONBLOCK);
+        ev_run (EV_A_ EVRUN_NOWAIT);
       }
   }
 }
 static void
   {
     EV_P = w->other;
     ev_loop_fork (EV_A);
-    ev_loop (EV_A_ EVLOOP_NONBLOCK);
+    ev_run (EV_A_ EVRUN_NOWAIT);
   }
   ev_embed_start (EV_A_ w);
 }
 void
 ev_async_start (EV_P_ ev_async *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
+  w->sent = 0;
   evpipe_init (EV_A);
   EV_FREQUENT_CHECK;

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.345 by sf-exg, Sat Jul 31 22:33:26 2010 UTC vs. Revision 1.353 by root, Thu Oct 21 12:32:47 2010 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.345 by sf-exg, Sat Jul 31 22:33:26 2010 UTC vs.
Revision 1.353 by root, Thu Oct 21 12:32:47 2010 UTC