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

Comparing libev/ev.c (file contents):
Revision 1.13 by root, Wed Oct 31 10:50:05 2007 UTC vs.
Revision 1.17 by root, Wed Oct 31 14:44:15 2007 UTC

+/*
+ * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #include <math.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <assert.h>
 #include <errno.h>
 #define array_needsize(base,cur,cnt,init)		\
   if ((cnt) > cur)					\
     {							\
       int newcnt = cur ? cur << 1 : 16;			\
-      fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\
       base = realloc (base, sizeof (*base) * (newcnt));	\
       init (base + cur, newcnt - cur);			\
       cur = newcnt;					\
     }
 static int pendingmax, pendingcnt;
 static void
 event (W w, int events)
 {
+  if (w->active)
+    {
-  w->pending = ++pendingcnt;
+      w->pending = ++pendingcnt;
-  array_needsize (pendings, pendingmax, pendingcnt, );
+      array_needsize (pendings, pendingmax, pendingcnt, );
-  pendings [pendingcnt - 1].w      = w;
+      pendings [pendingcnt - 1].w      = w;
-  pendings [pendingcnt - 1].events = events;
+      pendings [pendingcnt - 1].events = events;
+    }
 }
 static void
 fd_event (int fd, int events)
 {
 {
   while (timercnt && timers [0]->at <= now)
     {
       struct ev_timer *w = timers [0];
+      event ((W)w, EV_TIMEOUT);
       /* first reschedule or stop timer */
       if (w->repeat)
         {
           w->at = now + w->repeat;
           assert (("timer timeout in the past, negative repeat?", w->at > now));
           downheap ((WT *)timers, timercnt, 0);
         }
       else
         evtimer_stop (w); /* nonrepeating: stop timer */
-      event ((W)w, EV_TIMEOUT);
     }
 }
 static void
 periodics_reify ()
         {
           block = MAX_BLOCKTIME;
           if (timercnt)
             {
-              ev_tstamp to = timers [0]->at - get_clock () + method_fudge;
+              ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;
               if (block > to) block = to;
             }
           if (periodiccnt)
             {
       head = &(*head)->next;
     }
 }
 static void
+ev_clear (W w)
+{
+  if (w->pending)
+    {
+      pendings [w->pending - 1].w = 0;
+      w->pending = 0;
+    }
+}
+static void
 ev_start (W w, int active)
 {
-  w->pending = 0;
   w->active = active;
 }
 static void
 ev_stop (W w)
 {
-  if (w->pending)
-    pendings [w->pending - 1].w = 0;
   w->active = 0;
 }
 /*****************************************************************************/
 }
 void
 evio_stop (struct ev_io *w)
 {
+  ev_clear ((W)w);
   if (!ev_is_active (w))
     return;
   wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
   ev_stop ((W)w);
   ++fdchangecnt;
   array_needsize (fdchanges, fdchangemax, fdchangecnt, );
   fdchanges [fdchangecnt - 1] = w->fd;
 }
 void
 evtimer_start (struct ev_timer *w)
 {
   if (ev_is_active (w))
 }
 void
 evtimer_stop (struct ev_timer *w)
 {
+  ev_clear ((W)w);
   if (!ev_is_active (w))
     return;
   if (w->active < timercnt--)
     {
       timers [w->active - 1] = timers [timercnt];
       downheap ((WT *)timers, timercnt, w->active - 1);
     }
+  w->at = w->repeat;
   ev_stop ((W)w);
+}
+void
+evtimer_again (struct ev_timer *w)
+{
+  if (ev_is_active (w))
+    {
+      if (w->repeat)
+        {
+          w->at = now + w->repeat;
+          downheap ((WT *)timers, timercnt, w->active - 1);
+        }
+      else
+        evtimer_stop (w);
+    }
+  else if (w->repeat)
+    evtimer_start (w);
 }
 void
 evperiodic_start (struct ev_periodic *w)
 {
 }
 void
 evperiodic_stop (struct ev_periodic *w)
 {
+  ev_clear ((W)w);
   if (!ev_is_active (w))
     return;
   if (w->active < periodiccnt--)
     {
 }
 void
 evsignal_stop (struct ev_signal *w)
 {
+  ev_clear ((W)w);
   if (!ev_is_active (w))
     return;
   wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
   ev_stop ((W)w);
   idles [idlecnt - 1] = w;
 }
 void evidle_stop (struct ev_idle *w)
 {
+  ev_clear ((W)w);
+  if (ev_is_active (w))
+    return;
   idles [w->active - 1] = idles [--idlecnt];
   ev_stop ((W)w);
 }
 void evcheck_start (struct ev_check *w)
   checks [checkcnt - 1] = w;
 }
 void evcheck_stop (struct ev_check *w)
 {
+  ev_clear ((W)w);
+  if (ev_is_active (w))
+    return;
   checks [w->active - 1] = checks [--checkcnt];
   ev_stop ((W)w);
+}
+/*****************************************************************************/
+struct ev_once
+{
+  struct ev_io io;
+  struct ev_timer to;
+  void (*cb)(int revents, void *arg);
+  void *arg;
+};
+static void
+once_cb (struct ev_once *once, int revents)
+{
+  void (*cb)(int revents, void *arg) = once->cb;
+  void *arg = once->arg;
+  evio_stop (&once->io);
+  evtimer_stop (&once->to);
+  free (once);
+  cb (revents, arg);
+}
+static void
+once_cb_io (struct ev_io *w, int revents)
+{
+  once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
+}
+static void
+once_cb_to (struct ev_timer *w, int revents)
+{
+  once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
+}
+void
+ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
+{
+  struct ev_once *once = malloc (sizeof (struct ev_once));
+  if (!once)
+    cb (EV_ERROR, arg);
+  else
+    {
+      once->cb  = cb;
+      once->arg = arg;
+      evw_init (&once->io, once_cb_io);
+      if (fd >= 0)
+        {
+          evio_set (&once->io, fd, events);
+          evio_start (&once->io);
+        }
+      evw_init (&once->to, once_cb_to);
+      if (timeout >= 0.)
+        {
+          evtimer_set (&once->to, timeout, 0.);
+          evtimer_start (&once->to);
+        }
+    }
 }
 /*****************************************************************************/
 #if 0

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.13 by root, Wed Oct 31 10:50:05 2007 UTC vs. Revision 1.17 by root, Wed Oct 31 14:44:15 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.13 by root, Wed Oct 31 10:50:05 2007 UTC vs.
Revision 1.17 by root, Wed Oct 31 14:44:15 2007 UTC