Use #if !EV_MULTIPLICITY instead of #ifndef because it should be defined always.

[software/libev.git] / event.c

diff --git a/event.c b/event.c
index ecad9a1bc7e4fe82a73883b02877610347da5976..714f3456daab9e643c21ade84958ab51c95e9404 100644 (file)
--- a/event.c
+++ b/event.c
@@ -4,29 +4,37 @@
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ * 
+ *   1.  Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ * 
+ *   2.  Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
+ * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
+ * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
+ * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.

  *
  *

- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License ("GPL") version 2 or any later version,
+ * in which case the provisions of the GPL are applicable instead of
+ * the above. If you wish to allow the use of your version of this file
+ * only under the terms of the GPL and not to allow others to use your
+ * version of this file under the BSD license, indicate your decision
+ * by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL. If you do not delete the
+ * provisions above, a recipient may use your version of this file under
+ * either the BSD or the GPL.

  */
 
 #include <stddef.h>
  */
 
 #include <stddef.h>


@@ -108,7 +116,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
 }


@@ -160,13 +168,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 (revents & EV_ERROR)
+  if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))

     event_del (ev);
     event_del (ev);

-  else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
-    {
-      ev_io_stop (EV_A_ w);
-      ev->ev_flags &= ~EVLIST_INSERTED;
-    }

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


@@ -209,31 +212,38 @@ 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
+    {
+      ev_timer_stop (EV_A_ &ev->to);
+      ev->ev_flags &= ~EVLIST_TIMEOUT;
+    }

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


@@ -245,17 +255,9 @@ 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);
-    }
+    ev_signal_stop (EV_A_ &ev->iosig.sig);

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

-    {
-      /* io */
-      if (ev_is_active (&ev->iosig.io))
-        ev_io_stop (EV_A_ &ev->iosig.io);
-    }
+    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);


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