Fix typo.

[software/libev.git] / event.c

diff --git a/event.c b/event.c
index 98260d6db72028a4386484fd21b43162f90c18ac..1d30ce53d60840c1e7a03485ef8f6cc44c590710 100644 (file)
--- a/event.c
+++ b/event.c
@@ -31,11 +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 "ev.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


@@ -85,13 +91,13 @@ void *event_init (void)
 {
 #if EV_MULTIPLICITY
   if (x_cur)
 {
 #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
   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));
 
 #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 (EVFLAG_AUTO);

 #endif
 
   return x_cur;
 #endif
 
   return x_cur;


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

-  if (ev_default_loop (EVMETHOD_AUTO) != loop)
+  if (ev_default_loop (EVFLAG_AUTO) != loop)

     ev_loop_destroy (loop);
 #endif
 }
     ev_loop_destroy (loop);
 #endif
 }


@@ -135,13 +141,18 @@ x_cb (struct event *ev, int revents)
   revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
 
   ev->ev_res = 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
 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


@@ -149,8 +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));
 
 {
   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 (EV_A_ w);
+  if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
+    event_del (ev);

 
   x_cb (ev, revents);
 }
 
   x_cb (ev, revents);
 }


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


@@ -181,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_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)
 }
 
 int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)


@@ -192,25 +204,40 @@ int event_add (struct event *ev, struct timeval *tv)
 {
   dLOOPev;
 
 {
   dLOOPev;
 

-  /* disable all watchers */
-  event_del (ev);
-

   if (ev->ev_events & EV_SIGNAL)
     {
   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))
     {
     }
   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)
     {
     }
 
   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;
 }
 
   return 0;
 }


@@ -220,29 +247,37 @@ int event_del (struct event *ev)
   dLOOPev;
 
   if (ev->ev_events & EV_SIGNAL)
   dLOOPev;
 
   if (ev->ev_events & EV_SIGNAL)

-    {
-      /* sig */
-      if (ev_is_active (&ev->iosig.sig))
-        ev_signal_stop (EV_A_ &ev->iosig.sig);
-    }
-  else
-    {
-      /* io */
-      if (ev_is_active (&ev->iosig.io))
-        ev_io_stop (EV_A_ &ev->iosig.io);
-    }
+    ev_signal_stop (EV_A_ &ev->iosig.sig);
+  else if (ev->ev_events & (EV_READ | EV_WRITE))
+    ev_io_stop (EV_A_ &ev->iosig.io);

 
   if (ev_is_active (&ev->to))
     ev_timer_stop (EV_A_ &ev->to);
 
 
   if (ev_is_active (&ev->to))
     ev_timer_stop (EV_A_ &ev->to);
 

+  ev->ev_flags = EVLIST_INIT;
+

   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)
     {
 
   if (ev->ev_events & EV_SIGNAL)
     {


@@ -250,7 +285,7 @@ int event_pending (struct event *ev, short events, struct timeval *tv)
       if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
         revents |= EV_SIGNAL;
     }
       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_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
     {
       /* io */
       if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))


@@ -306,13 +341,13 @@ x_loopexit_cb (int revents, void *base)
 {
   dLOOPbase;
 
 {
   dLOOPbase;
 

-  ev_unloop (EV_A_ EVUNLOOP_ONCE);
+  ev_unloop (EV_A_ EVUNLOOP_ONE);

 }
 
 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);
 


@@ -329,16 +364,16 @@ 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);
+  once->cb (once->fd, (short)revents, once->arg);

   free (once);
 }
 
 int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
 {
   free (once);
 }
 
 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;