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

Comparing libev/ev.c (file contents):
Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC vs.
Revision 1.302 by root, Thu Jul 16 15:08:08 2009 UTC

 #define ev_malloc(size) ev_realloc (0, (size))
 #define ev_free(ptr)    ev_realloc ((ptr), 0)
 /*****************************************************************************/
+/* set in reify when reification needed */
+#define EV_ANFD_REIFY 1
 /* file descriptor info structure */
 typedef struct
 {
   WL head;
   unsigned char events; /* the events watched for */
-  unsigned char reify;  /* flag set when this ANFD needs reification */
+  unsigned char reify;  /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
   unsigned char emask;  /* the epoll backend stores the actual kernel mask in here */
   unsigned char unused;
 #if EV_USE_EPOLL
   unsigned int egen;    /* generation counter to counter epoll bugs */
 #endif
   static int ev_default_loop_ptr;
 #endif
 #if EV_MINIMAL < 2
-# define EV_SUSPEND_CB if (expect_false (suspend_cb)) suspend_cb (EV_A)
-# define EV_RESUME_CB  if (expect_false (resume_cb )) resume_cb  (EV_A)
+# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
+# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
 # define EV_INVOKE_PENDING invoke_cb (EV_A)
 #else
-# define EV_SUSPEND_CB (void)0
-# define EV_RESUME_CB  (void)0
+# 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
 /*****************************************************************************/
 #ifndef EV_HAVE_EV_TIME
 ev_tstamp
       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 */
-      /* somehting not guaranteed by newer posix versions, but guaranteed */
+      /* something not guaranteed by newer posix versions, but guaranteed */
       /* by older ones */
       select (0, 0, 0, 0, &tv);
 #endif
     }
 }
 }
 /*****************************************************************************/
 inline_speed void
-fd_event (EV_P_ int fd, int revents)
+fd_event_nc (EV_P_ int fd, int revents)
 {
   ANFD *anfd = anfds + fd;
   ev_io *w;
   for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
       if (ev)
         ev_feed_event (EV_A_ (W)w, ev);
     }
 }
+/* do not submit kernel events for fds that have reify set */
+/* because that means they changed while we were polling for new events */
+inline_speed void
+fd_event (EV_P_ int fd, int revents)
+{
+  ANFD *anfd = anfds + fd;
+  if (expect_true (!anfd->reify))
+    fd_event_nc (EV_A_ fd, revents);
+}
 void
 ev_feed_fd_event (EV_P_ int fd, int revents)
 {
   if (fd >= 0 && fd < anfdmax)
-    fd_event (EV_A_ fd, revents);
+    fd_event_nc (EV_A_ fd, revents);
 }
 /* make sure the external fd watch events are in-sync */
 /* with the kernel/libev internal state */
 inline_size void
   for (fd = 0; fd < anfdmax; ++fd)
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;
         anfds [fd].emask  = 0;
-        fd_change (EV_A_ fd, EV__IOFDSET | 1);
+        fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
       }
 }
 /*****************************************************************************/
 void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
 {
   invoke_cb = invoke_pending_cb;
 }
-void ev_set_blocking_cb (EV_P_ void (*suspend_cb_)(EV_P), void (*resume_cb_)(EV_P))
+void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
 {
-  suspend_cb = suspend_cb_;
+  release_cb = release;
-  resume_cb  = resume_cb_;
+  acquire_cb = acquire;
 }
 #endif
 /* initialise a loop structure, must be zero-initialised */
 static void noinline
 void
 ev_invoke (EV_P_ void *w, int revents)
 {
   EV_CB_INVOKE ((W)w, revents);
+}
+unsigned int
+ev_pending_count (EV_P)
+{
+  int pri;
+  unsigned int count = 0;
+  for (pri = NUMPRI; pri--; )
+    count += pendingcnt [pri];
+  return count;
 }
 void noinline
 ev_invoke_pending (EV_P)
 {
 {
 #if EV_MINIMAL < 2
   ++loop_depth;
 #endif
+  assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
   loop_done = EVUNLOOP_CANCEL;
   EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
   do
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
           EV_INVOKE_PENDING;
         }
+      if (expect_false (loop_done))
+        break;
       /* we might have forked, so reify kernel state if necessary */
       if (expect_false (postfork))
         loop_fork (EV_A);
       /* update fd-related kernel structures */
           }
 #if EV_MINIMAL < 2
         ++loop_count;
 #endif
+        assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
         backend_poll (EV_A_ waittime);
+        assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
         /* update ev_rt_now, do magic */
         time_update (EV_A_ waittime + sleeptime);
       }
   ev_start (EV_A_ (W)w, 1);
   array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
   wlist_add (&anfds[fd].head, (WL)w);
-  fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
+  fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
   w->events &= ~EV__IOFDSET;
   EV_FREQUENT_CHECK;
 }
     }
   EV_FREQUENT_CHECK;
 }
+ev_tstamp
+ev_timer_remaining (EV_P_ ev_timer *w)
+{
+  return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
+}
 #if EV_PERIODIC_ENABLE
 void noinline
 ev_periodic_start (EV_P_ ev_periodic *w)
 {
   if (expect_false (ev_is_active (w)))
   if (!((WL)w)->next)
     {
 #if _WIN32
       signal (w->signum, ev_sighandler);
 #else
-      struct sigaction sa;
+      struct sigaction sa = { };
       sa.sa_handler = ev_sighandler;
       sigfillset (&sa.sa_mask);
       sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
       sigaction (w->signum, &sa, 0);
 #endif

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC vs. Revision 1.302 by root, Thu Jul 16 15:08:08 2009 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC vs.
Revision 1.302 by root, Thu Jul 16 15:08:08 2009 UTC