X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/36ed1953891a670e15f5e113491596630f21676c..85e9d898522a460b8dcf57f1781f6acc3d2f3ee5:/event.c?ds=sidebyside

diff --git a/event.c b/event.c
index 1c2bc73..783eef1 100644
--- a/event.c
+++ b/event.c
@@ -31,27 +31,30 @@
 
 #include <stddef.h>
 #include <stdlib.h>
-#include <sys/time.h>
+#include <assert.h>
 
+#ifndef WIN32
+# include <sys/time.h>
+#endif
+
+#include "ev.h"
 #include "event.h"
 
-#ifdef EV_MULTIPLICITY
-# define dLOOPev struct ev_loop *loop = ev->ev_base->loop
-# define dLOOPbase struct ev_loop *loop = base->loop
+#if EV_MULTIPLICITY
+# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
+# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
 #else
 # define dLOOPev
 # define dLOOPbase
 #endif
 
+/* never accessed, will always be cast from/to ev_loop */
 struct event_base
 {
-#ifdef EV_MULTIPLICITY
-  struct ev_loop *loop;
-#endif
   int dummy;
 };
 
-static struct event_base x_base, *x_cur;
+static struct event_base *x_cur;
 
 static void
 tv_set (struct timeval *tv, ev_tstamp at)
@@ -83,17 +86,28 @@ const char *event_get_method (void)
 
 void *event_init (void)
 {
-  if (!x_cur && ev_init (0))
-    return x_cur = &x_base;
+#if EV_MULTIPLICITY
+  if (x_cur)
+    x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
+  else
+    x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
+#else
+  assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
 
-  return 0;
+  x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
+#endif
+
+  return x_cur;
 }
 
 void event_base_free (struct event_base *base)
 {
   dLOOPbase;
 
-  /* nop */
+#if EV_MULTIPLICITY
+  if (ev_default_loop (EVMETHOD_AUTO) != loop)
+    ev_loop_destroy (loop);
+#endif
 }
 
 int event_dispatch (void)
@@ -139,7 +153,7 @@ x_cb_io (EV_P_ struct ev_io *w, int revents)
   struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
 
   if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
-    ev_io_stop (w);
+    ev_io_stop (EV_A_ w);
 
   x_cb (ev, revents);
 }
@@ -147,7 +161,11 @@ x_cb_io (EV_P_ struct ev_io *w, int revents)
 static void
 x_cb_to (EV_P_ struct ev_timer *w, int revents)
 {
-  x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
+  struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
+
+  event_del (ev);
+
+  x_cb (ev, revents);
 }
 
 void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
@@ -159,7 +177,7 @@ void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, v
 
   ev_watcher_init (&ev->to, x_cb_to);
 
-  ev->ev_base     = x_cur;
+  ev->ev_base     = x_cur; /* not threadsafe, but its like libevent works */
   ev->ev_fd       = fd;
   ev->ev_events   = events;
   ev->ev_pri      = 0;
@@ -210,7 +228,7 @@ int event_del (struct event *ev)
       if (ev_is_active (&ev->iosig.sig))
         ev_signal_stop (EV_A_ &ev->iosig.sig);
     }
-  else
+  else if (ev->ev_events & (EV_READ | EV_WRITE))
     {
       /* io */
       if (ev_is_active (&ev->iosig.io))
@@ -225,24 +243,24 @@ int event_del (struct event *ev)
 
 int event_pending (struct event *ev, short events, struct timeval *tv)
 {
+  short revents = 0;
   dLOOPev;
 
-  short revents = 0;
 
   if (ev->ev_events & EV_SIGNAL)
     {
       /* sig */
-      if (ev->iosig.sig.pending)
+      if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
         revents |= EV_SIGNAL;
     }
-  else
+  else if (ev->ev_events & (EV_READ | EV_WRITE))
     {
       /* io */
-      if (ev->iosig.io.pending)
+      if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
         revents |= ev->ev_events & (EV_READ | EV_WRITE);
     }
 
-  if (ev->to.pending)
+  if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
     {
       revents |= EV_TIMEOUT;
 
@@ -287,15 +305,17 @@ int event_base_dispatch (struct event_base *base)
 }
 
 static void
-x_loopexit_cb (EV_P_ int revents, void *arg)
+x_loopexit_cb (int revents, void *base)
 {
-  ev_unloop (EV_A_ 2);
+  dLOOPbase;
+
+  ev_unloop (EV_A_ EVUNLOOP_ONCE);
 }
 
 int event_base_loopexit (struct event_base *base, struct timeval *tv)
 {
-  dLOOPbase;
   ev_tstamp after = tv_get (tv);
+  dLOOPbase;
 
   ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
 
@@ -312,7 +332,7 @@ struct x_once
 static void
 x_once_cb (int revents, void *arg)
 {
-  struct x_once *once = arg;
+  struct x_once *once = (struct x_once *)arg;
 
   once->cb (once->fd, revents, once->arg);
   free (once);
@@ -320,8 +340,8 @@ x_once_cb (int revents, void *arg)
 
 int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
 {
+  struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
   dLOOPbase;
-  struct x_once *once = malloc (sizeof (struct x_once));
 
   if (!once)
     return -1;
@@ -337,7 +357,7 @@ int event_base_once (struct event_base *base, int fd, short events, void (*cb)(i
 
 int event_base_priority_init (struct event_base *base, int npri)
 {
-  dLOOPbase;
+  /*dLOOPbase;*/
 
   return 0;
 }