X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/691ff6d0d32c60f66a03079376110c1371614ef2..0a7b0ac074d9987c6fa23ab20be4842e4514c7b9:/event.c

diff --git a/event.c b/event.c
index b374e68..1d30ce5 100644
--- a/event.c
+++ b/event.c
@@ -37,8 +37,11 @@
 # include <sys/time.h>
 #endif
 
-#include "ev.h"
-#include "event.h"
+#ifdef EV_EVENT_H
+# include EV_EVENT_H
+#else
+# include "event.h"
+#endif
 
 #if EV_MULTIPLICITY
 # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
@@ -88,13 +91,13 @@ void *event_init (void)
 {
 #if EV_MULTIPLICITY
   if (x_cur)
-    x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
+    x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
   else
-    x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
+    x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
 #else
   assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
 
-  x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
+  x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
 #endif
 
   return x_cur;
@@ -105,7 +108,7 @@ void event_base_free (struct event_base *base)
   dLOOPbase;
 
 #if EV_MULTIPLICITY
-  if (ev_default_loop (EVMETHOD_AUTO) != loop)
+  if (ev_default_loop (EVFLAG_AUTO) != loop)
     ev_loop_destroy (loop);
 #endif
 }
@@ -138,7 +141,7 @@ x_cb (struct event *ev, int revents)
   revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
 
   ev->ev_res = revents;
-  ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
+  ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
 }
 
 static void
@@ -157,10 +160,8 @@ x_cb_io (EV_P_ struct ev_io *w, int revents)
 {
   struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
 
-  if (revents & EV_ERROR)
+  if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
     event_del (ev);
-  else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
-    ev_io_stop (EV_A_ w);
 
   x_cb (ev, revents);
 }
@@ -178,11 +179,11 @@ x_cb_to (EV_P_ struct ev_timer *w, int revents)
 void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
 {
   if (events & EV_SIGNAL)
-    ev_watcher_init (&ev->iosig.sig, x_cb_sig);
+    ev_init (&ev->iosig.sig, x_cb_sig);
   else
-    ev_watcher_init (&ev->iosig.io, x_cb_io);
+    ev_init (&ev->iosig.io, x_cb_io);
 
-  ev_watcher_init (&ev->to, x_cb_to);
+  ev_init (&ev->to, x_cb_to);
 
   ev->ev_base     = x_cur; /* not threadsafe, but its like libevent works */
   ev->ev_fd       = fd;
@@ -191,6 +192,7 @@ void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, v
   ev->ev_callback = cb;
   ev->ev_arg      = arg;
   ev->ev_res      = 0;
+  ev->ev_flags    = EVLIST_INIT;
 }
 
 int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
@@ -202,26 +204,41 @@ int event_add (struct event *ev, struct timeval *tv)
 {
   dLOOPev;
 
-  /* disable all watchers */
-  event_del (ev);
-
   if (ev->ev_events & EV_SIGNAL)
     {
-      ev_signal_set (&ev->iosig.sig, ev->ev_fd);
-      ev_signal_start (EV_A_ &ev->iosig.sig);
+      if (!ev_is_active (&ev->iosig.sig))
+        {
+          ev_signal_set (&ev->iosig.sig, ev->ev_fd);
+          ev_signal_start (EV_A_ &ev->iosig.sig);
+
+          ev->ev_flags |= EVLIST_SIGNAL;
+        }
     }
   else if (ev->ev_events & (EV_READ | EV_WRITE))
     {
-      ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
-      ev_io_start (EV_A_ &ev->iosig.io);
+      if (!ev_is_active (&ev->iosig.io))
+        {
+          ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
+          ev_io_start (EV_A_ &ev->iosig.io);
+
+          ev->ev_flags |= EVLIST_INSERTED;
+        }
     }
 
   if (tv)
     {
-      ev_timer_set (&ev->to, tv_get (tv), 0.);
-      ev_timer_start (EV_A_ &ev->to);
+      ev->to.repeat = tv_get (tv);
+      ev_timer_again (EV_A_ &ev->to);
+      ev->ev_flags |= EVLIST_TIMEOUT;
+    }
+  else
+    {
+      ev_timer_stop (EV_A_ &ev->to);
+      ev->ev_flags &= ~EVLIST_TIMEOUT;
     }
 
+  ev->ev_flags |= EVLIST_ACTIVE;
+
   return 0;
 }
 
@@ -230,34 +247,30 @@ int event_del (struct event *ev)
   dLOOPev;
 
   if (ev->ev_events & EV_SIGNAL)
-    {
-      /* sig */
-      if (ev_is_active (&ev->iosig.sig))
-        ev_signal_stop (EV_A_ &ev->iosig.sig);
-    }
+    ev_signal_stop (EV_A_ &ev->iosig.sig);
   else if (ev->ev_events & (EV_READ | EV_WRITE))
-    {
-      /* io */
-      if (ev_is_active (&ev->iosig.io))
-        ev_io_stop (EV_A_ &ev->iosig.io);
-    }
+    ev_io_stop (EV_A_ &ev->iosig.io);
 
   if (ev_is_active (&ev->to))
     ev_timer_stop (EV_A_ &ev->to);
 
+  ev->ev_flags = EVLIST_INIT;
+
   return 0;
 }
 
 void event_active (struct event *ev, int res, short ncalls)
 {
+  dLOOPev;
+
   if (res & EV_TIMEOUT)
-    ev_feed_event (&iosig.to, res & EV_TIMEOUT);
+    ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
 
   if (res & EV_SIGNAL)
-    ev_feed_event (&iosig.sig, res & EV_SIGNAL);
+    ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
 
   if (res & (EV_READ | EV_WRITE))
-    ev_feed_event (&iosig.io, res & (EV_READ | EV_WRITE));
+    ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
 }
 
 int event_pending (struct event *ev, short events, struct timeval *tv)
@@ -328,7 +341,7 @@ x_loopexit_cb (int revents, void *base)
 {
   dLOOPbase;
 
-  ev_unloop (EV_A_ EVUNLOOP_ONCE);
+  ev_unloop (EV_A_ EVUNLOOP_ONE);
 }
 
 int event_base_loopexit (struct event_base *base, struct timeval *tv)
@@ -353,7 +366,7 @@ x_once_cb (int revents, void *arg)
 {
   struct x_once *once = (struct x_once *)arg;
 
-  once->cb (once->fd, revents, once->arg);
+  once->cb (once->fd, (short)revents, once->arg);
   free (once);
 }