[ViewVC] Diff of: cvs/libev/event.c

Comparing libev/event.c (file contents):
Revision 1.31 by root, Wed Nov 14 05:30:02 2007 UTC vs.
Revision 1.35 by root, Fri May 2 07:35:47 2008 UTC

  * libevent compatibility layer
  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without modifica-
- * modification, are permitted provided that the following conditions are
+ * tion, are permitted provided that the following conditions are met:
- * 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
+ * Alternatively, the contents of this file may be used under the terms of
- *       notice, this list of conditions and the following disclaimer.
+ * the GNU General Public License ("GPL") version 2 or any later version,
- *
+ * in which case the provisions of the GPL are applicable instead of
- *     * Redistributions in binary form must reproduce the above
+ * the above. If you wish to allow the use of your version of this file
- *       copyright notice, this list of conditions and the following
+ * only under the terms of the GPL and not to allow others to use your
- *       disclaimer in the documentation and/or other materials provided
+ * version of this file under the BSD license, indicate your decision
- *       with the distribution.
+ * by deleting the provisions above and replace them with the notice
- *
+ * and other provisions required by the GPL. If you do not delete the
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * provisions above, a recipient may use your version of this file under
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * either the BSD or the GPL.
- * 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.
  */
 #include <stddef.h>
 #include <stdlib.h>
 #include <assert.h>
 static void
 x_cb_io (EV_P_ struct ev_io *w, int revents)
 {
   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);
-  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);
 }
 static void
       ev->to.repeat = tv_get (tv);
       ev_timer_again (EV_A_ &ev->to);
       ev->ev_flags |= EVLIST_TIMEOUT;
     }
   else
-    if (ev_is_active (&ev->to))
+    {
       ev_timer_stop (EV_A_ &ev->to);
+      ev->ev_flags &= ~EVLIST_TIMEOUT;
+    }
   ev->ev_flags |= EVLIST_ACTIVE;
   return 0;
 }
 int event_del (struct event *ev)
 {
   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))
-    {
-      /* 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);
   ev->ev_flags = EVLIST_INIT;
 int event_pending (struct event *ev, short events, struct timeval *tv)
 {
   short revents = 0;
   dLOOPev;
   if (ev->ev_events & EV_SIGNAL)
     {
       /* sig */
       if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
   ev_tstamp after = tv_get (tv);
   dLOOPbase;
   ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
-  return -1;
+  return 0;
 }
 struct x_once
 {
   int fd;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libev/event.c (file contents): Revision 1.31 by root, Wed Nov 14 05:30:02 2007 UTC vs. Revision 1.35 by root, Fri May 2 07:35:47 2008 UTC

Diff Legend

Comparing libev/event.c (file contents):
Revision 1.31 by root, Wed Nov 14 05:30:02 2007 UTC vs.
Revision 1.35 by root, Fri May 2 07:35:47 2008 UTC