fix bug

[software/libev.git] / event.c

diff --git a/event.c b/event.c
index 6e26a4863aba962bb6cbc48363277626e98f42fd..8fed83d75fd1a4552a60aaa932e93ac1c2e2a7ef 100644 (file)
--- a/event.c
+++ b/event.c
@@ -31,10 +31,17 @@
 
 #include <stddef.h>
 #include <stdlib.h>
 
 #include <stddef.h>
 #include <stdlib.h>

-#include <sys/time.h>

 #include <assert.h>
 
 #include <assert.h>
 

-#include "event.h"
+#ifndef WIN32
+# include <sys/time.h>
+#endif
+
+#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


@@ -86,11 +93,11 @@ void *event_init (void)
   if (x_cur)
     x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
   else
   if (x_cur)
     x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
   else

-    x_cur = ev_default_loop (EVMETHOD_AUTO);
+    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));
 
 #else
   assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
 

-  x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
+  x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);

 #endif
 
   return x_cur;
 #endif
 
   return x_cur;


@@ -101,7 +108,8 @@ void event_base_free (struct event_base *base)
   dLOOPbase;
 
 #if EV_MULTIPLICITY
   dLOOPbase;
 
 #if EV_MULTIPLICITY

-  ev_loop_delete (loop);
+  if (ev_default_loop (EVMETHOD_AUTO) != loop)
+    ev_loop_destroy (loop);

 #endif
 }
 
 #endif
 }
 


@@ -139,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


@@ -147,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);


@@ -156,22 +171,21 @@ x_cb_io (EV_P_ struct ev_io *w, int revents)
 static void
 x_cb_to (EV_P_ struct ev_timer *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)
 {
 }
 
 void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
 {

-  if (!ev->initialised)
-    {
-      ev->initialised = 1;
-
-      if (events & EV_SIGNAL)
-        ev_watcher_init (&ev->iosig.sig, x_cb_sig);
-      else
-        ev_watcher_init (&ev->iosig.io, x_cb_io);
+  if (events & EV_SIGNAL)
+    ev_init (&ev->iosig.sig, x_cb_sig);
+  else
+    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;


@@ -224,7 +238,7 @@ int event_del (struct event *ev)
       if (ev_is_active (&ev->iosig.sig))
         ev_signal_stop (EV_A_ &ev->iosig.sig);
     }
       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))
     {
       /* io */
       if (ev_is_active (&ev->iosig.io))


@@ -237,26 +251,40 @@ int event_del (struct event *ev)
   return 0;
 }
 
   return 0;
 }
 

-int event_pending (struct event *ev, short events, struct timeval *tv)
+void event_active (struct event *ev, int res, short ncalls)

 {
   dLOOPev;
 
 {
   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;
   short revents = 0;

+  dLOOPev;
+

 
   if (ev->ev_events & EV_SIGNAL)
     {
       /* sig */
 
   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;
     }
         revents |= EV_SIGNAL;
     }

-  else
+  else if (ev->ev_events & (EV_READ | EV_WRITE))

     {
       /* io */
     {
       /* 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);
     }
 
         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;
 
     {
       revents |= EV_TIMEOUT;
 


@@ -310,8 +338,8 @@ x_loopexit_cb (int revents, void *base)
 
 int event_base_loopexit (struct event_base *base, struct timeval *tv)
 {
 
 int event_base_loopexit (struct event_base *base, struct timeval *tv)
 {

-  dLOOPbase;

   ev_tstamp after = tv_get (tv);
   ev_tstamp after = tv_get (tv);

+  dLOOPbase;

 
   ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
 
 
   ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
 


@@ -328,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);


@@ -336,8 +364,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)
 {
 
 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;
   dLOOPbase;

-  struct x_once *once = malloc (sizeof (struct x_once));

 
   if (!once)
     return -1;
 
   if (!once)
     return -1;


@@ -353,7 +381,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)
 {
 
 int event_base_priority_init (struct event_base *base, int npri)
 {

-  dLOOPbase;
+  /*dLOOPbase;*/

 
   return 0;
 }
 
   return 0;
 }