*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 937f9bd1237515309f8104a7c103c87fe5eafd87..46c8cea08e9a74c312b67e8152e68e0dd4f5556e 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -1,4 +1,6 @@
 /*
 /*

+ * libev event processing core, watcher management
+ *

  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *


@@ -47,9 +49,12 @@
 #include <time.h>
 
 #ifndef EV_USE_MONOTONIC
 #include <time.h>
 
 #ifndef EV_USE_MONOTONIC

-# ifdef CLOCK_MONOTONIC
-#  define EV_USE_MONOTONIC 1
-# endif
+# define EV_USE_MONOTONIC 1
+#endif
+
+#ifndef CLOCK_MONOTONIC
+# undef EV_USE_MONOTONIC
+# define EV_USE_MONOTONIC 0

 #endif
 
 #ifndef EV_USE_SELECT
 #endif
 
 #ifndef EV_USE_SELECT


@@ -363,17 +368,17 @@ static void
 sigcb (struct ev_io *iow, int revents)
 {
   struct ev_signal *w;
 sigcb (struct ev_io *iow, int revents)
 {
   struct ev_signal *w;

-  int sig;
+  int signum;

 
   read (sigpipe [0], &revents, 1);
   gotsig = 0;
 
 
   read (sigpipe [0], &revents, 1);
   gotsig = 0;
 

-  for (sig = signalmax; sig--; )
-    if (signals [sig].gotsig)
+  for (signum = signalmax; signum--; )
+    if (signals [signum].gotsig)

       {
       {

-        signals [sig].gotsig = 0;
+        signals [signum].gotsig = 0;

 
 

-        for (w = signals [sig].head; w; w = w->next)
+        for (w = signals [signum].head; w; w = w->next)

           event ((W)w, EV_SIGNAL);
       }
 }
           event ((W)w, EV_SIGNAL);
       }
 }


@@ -420,7 +425,7 @@ childcb (struct ev_signal *sw, int revents)
 
   while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
     for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
 
   while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
     for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)

-      if (w->pid == pid || w->pid == -1)
+      if (w->pid == pid || !w->pid)

         {
           w->status = status;
           event ((W)w, EV_CHILD);
         {
           w->status = status;
           event ((W)w, EV_CHILD);


@@ -491,19 +496,19 @@ int ev_init (int flags)
 /*****************************************************************************/
 
 void
 /*****************************************************************************/
 
 void

-ev_prefork (void)
+ev_fork_prepare (void)

 {
   /* nop */
 }
 
 void
 {
   /* nop */
 }
 
 void

-ev_postfork_parent (void)
+ev_fork_parent (void)

 {
   /* nop */
 }
 
 void
 {
   /* nop */
 }
 
 void

-ev_postfork_child (void)
+ev_fork_child (void)

 {
 #if EV_USE_EPOLL
   if (ev_method == EVMETHOD_EPOLL)
 {
 #if EV_USE_EPOLL
   if (ev_method == EVMETHOD_EPOLL)


@@ -763,11 +768,11 @@ ev_stop (W w)
 void
 ev_io_start (struct ev_io *w)
 {
 void
 ev_io_start (struct ev_io *w)
 {

+  int fd = w->fd;
+

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  int fd = w->fd;
-

   assert (("ev_io_start called with negative fd", fd >= 0));
 
   ev_start ((W)w, 1);
   assert (("ev_io_start called with negative fd", fd >= 0));
 
   ev_start ((W)w, 1);