misc

[software/libev.git] / event.c

diff --git a/event.c b/event.c
index ecad9a1bc7e4fe82a73883b02877610347da5976..1666f62f3032bcea25046e63e23e0102552281ed 100644 (file)
--- a/event.c
+++ b/event.c
@@ -108,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
 }


@@ -209,31 +209,36 @@ 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;
+          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;
+          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;
     }
       ev->ev_flags |= EVLIST_TIMEOUT;
     }

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

 
   ev->ev_flags |= EVLIST_ACTIVE;
 
 
   ev->ev_flags |= EVLIST_ACTIVE;
 


@@ -347,7 +352,7 @@ 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)