*** empty log message ***

[software/libev.git] / event.c

diff --git a/event.c b/event.c
index 1c2bc73a1d88ae05452de2f6b1ee71b58b6a8ca8..6e26a4863aba962bb6cbc48363277626e98f42fd 100644 (file)
--- a/event.c
+++ b/event.c
@@ -32,26 +32,25 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/time.h>
+#include <assert.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 +82,27 @@ 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 = 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 *)ev_default_loop (EVMETHOD_AUTO);
+#endif
+
+  return x_cur;
 }
 
 void event_base_free (struct event_base *base)
 {
   dLOOPbase;
 
-  /* nop */
+#if EV_MULTIPLICITY
+  ev_loop_delete (loop);
+#endif
 }
 
 int event_dispatch (void)
@@ -139,7 +148,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);
 }
@@ -152,14 +161,19 @@ 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);
-  else
-    ev_watcher_init (&ev->iosig.io, x_cb_io);
+  if (!ev->initialised)
+    {
+      ev->initialised = 1;
 
-  ev_watcher_init (&ev->to, x_cb_to);
+      if (events & EV_SIGNAL)
+        ev_watcher_init (&ev->iosig.sig, x_cb_sig);
+      else
+        ev_watcher_init (&ev->iosig.io, x_cb_io);
 
-  ev->ev_base     = x_cur;
+      ev_watcher_init (&ev->to, x_cb_to);
+    }
+
+  ev->ev_base     = x_cur; /* not threadsafe, but its like libevent works */
   ev->ev_fd       = fd;
   ev->ev_events   = events;
   ev->ev_pri      = 0;
@@ -287,9 +301,11 @@ 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)