fix kqueue c++ support

[software/libev.git] / event.c

diff --git a/event.c b/event.c
index 0fc68507454edd69b024aaabc94b7a56b6d4e5ea..8fed83d75fd1a4552a60aaa932e93ac1c2e2a7ef 100644 (file)
--- a/event.c
+++ b/event.c
@@ -37,8 +37,11 @@
 # include <sys/time.h>
 #endif
 
 # 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
 
 #if EV_MULTIPLICITY
 # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base


@@ -144,7 +147,12 @@ x_cb (struct event *ev, int revents)
 static void
 x_cb_sig (EV_P_ struct ev_signal *w, int revents)
 {
 static void
 x_cb_sig (EV_P_ struct ev_signal *w, int revents)
 {

-  x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
+  struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
+
+  if (revents & EV_ERROR)
+    event_del (ev);
+
+  x_cb (ev, revents);

 }
 
 static void
 }
 
 static void


@@ -152,7 +160,9 @@ x_cb_io (EV_P_ struct ev_io *w, int revents)
 {
   struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
 
 {
   struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
 

-  if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
+  if (revents & EV_ERROR)
+    event_del (ev);
+  else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))

     ev_io_stop (EV_A_ w);
 
   x_cb (ev, revents);
     ev_io_stop (EV_A_ w);
 
   x_cb (ev, revents);


@@ -171,11 +181,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)
 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
   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;
 
   ev->ev_base     = x_cur; /* not threadsafe, but its like libevent works */
   ev->ev_fd       = fd;


@@ -241,6 +251,20 @@ int event_del (struct event *ev)
   return 0;
 }
 
   return 0;
 }
 

+void event_active (struct event *ev, int res, short ncalls)
+{
+  dLOOPev;
+
+  if (res & EV_TIMEOUT)
+    ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
+
+  if (res & EV_SIGNAL)
+    ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
+
+  if (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)
 {
   short revents = 0;
 int event_pending (struct event *ev, short events, struct timeval *tv)
 {
   short revents = 0;


@@ -332,7 +356,7 @@ struct x_once
 static void
 x_once_cb (int revents, void *arg)
 {
 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);
 
   once->cb (once->fd, revents, once->arg);
   free (once);


@@ -340,7 +364,7 @@ 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)
 {
 
 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 = malloc (sizeof (struct x_once));
+  struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));

   dLOOPbase;
 
   if (!once)
   dLOOPbase;
 
   if (!once)