[ViewVC] Diff of: cvs/libev/ev.h

Comparing libev/ev.h (file contents):
Revision 1.71 by root, Tue Nov 27 09:17:52 2007 UTC vs.
Revision 1.74 by root, Wed Nov 28 11:15:55 2007 UTC

 #ifndef EV_STAT_ENABLE
 # define EV_STAT_ENABLE 1
 #endif
+#ifndef EV_FORK_ENABLE
+# define EV_FORK_ENABLE 1
+#endif
 #ifndef EV_EMBED_ENABLE
 # define EV_EMBED_ENABLE 1
 #endif
 /*****************************************************************************/
+#include <stddef.h> /* for size_t */
 #if EV_STAT_ENABLE
 # include <sys/stat.h>
 #endif
 struct ev_loop;
 # define EV_P struct ev_loop *loop
 # define EV_P_ EV_P,
 # define EV_A loop
 # define EV_A_ EV_A,
-# define EV_DEFAULT_A ev_default_loop (0)
+# define EV_DEFAULT ev_default_loop (0)
-# define EV_DEFAULT_A_ EV_DEFAULT_A,
+# define EV_DEFAULT_ EV_DEFAULT,
 #else
 # define EV_P void
 # define EV_P_
 # define EV_A
 # define EV_A_
+# define EV_DEFAULT
-# define EV_DEFAULT_A
+# define EV_DEFAULT_
-# define EV_DEFAULT_A_
 # undef EV_EMBED_ENABLE
 #endif
 /* eventmask, revents, events... */
 #define EV_READ           0x01L /* ev_io detected read will not block */
 #define EV_WRITE          0x02L /* ev_io detected write will not block */
 #define EV_TIMEOUT  0x00000100L /* timer timed out */
 #define EV_PERIODIC 0x00000200L /* periodic timer timed out */
 #define EV_SIGNAL   0x00000400L /* signal was received */
-#define EV_IDLE     0x00000800L /* event loop is idling */
-#define EV_PREPARE  0x00001000L /* event loop about to poll */
-#define EV_CHECK    0x00002000L /* event loop finished poll */
-#define EV_CHILD    0x00004000L /* child/pid had status change */
+#define EV_CHILD    0x00000800L /* child/pid had status change */
+#define EV_STAT     0x00001000L /* stat data changed */
+#define EV_IDLE     0x00002000L /* event loop is idling */
+#define EV_PREPARE  0x00004000L /* event loop about to poll */
+#define EV_CHECK    0x00008000L /* event loop finished poll */
-#define EV_EMBED    0x00008000L /* embedded event loop needs sweep */
+#define EV_EMBED    0x00010000L /* embedded event loop needs sweep */
-#define EV_STAT     0x00010000L /* stat data changed */
+#define EV_FORK     0x00020000L /* event loop resumed in child */
 #define EV_ERROR    0x80000000L /* sent when an error occurs */
 /* can be used to add custom fields to all watchers, while losing binary compatibility */
 #ifndef EV_COMMON
 # define EV_COMMON void *data;
   int rstatus; /* rw, holds the exit status, use the macros from sys/wait.h */
 } ev_child;
 #if EV_STAT_ENABLE
 /* st_nlink = 0 means missing file or other error */
-#ifdef _WIN32
+# ifdef _WIN32
 typedef struct _stati64 ev_statdata;
-#else
+# else
 typedef struct stat ev_statdata;
-#endif
+# endif
 /* invoked each time the stat data changes for a given path */
 /* revent EV_STAT */
 typedef struct ev_stat
 {
-  EV_WATCHER (ev_stat)
+  EV_WATCHER_LIST (ev_stat)
   ev_timer timer;     /* private */
   ev_tstamp interval; /* ro */
   const char *path;   /* ro */
   ev_statdata prev;   /* ro */
   ev_statdata attr;   /* ro */
+  int wd; /* wd for inotify, fd for kqueue */
 } ev_stat;
 #endif
 /* invoked when the nothing else needs to be done, keeps the process from blocking */
 /* revent EV_IDLE */
 typedef struct ev_check
 {
   EV_WATCHER (ev_check)
 } ev_check;
+#if EV_FORK_ENABLE
+/* the callback gets invoked before check in the child process when a fork was detected */
+typedef struct ev_fork
+{
+  EV_WATCHER (ev_fork)
+} ev_fork;
+#endif
 #if EV_EMBED_ENABLE
 /* used to embed an event loop inside another */
 /* the callback gets invoked when the event loop has handled events, and can be 0 */
 typedef struct ev_embed
 {
   struct ev_watcher_list wl;
   struct ev_io io;
   struct ev_timer timer;
   struct ev_periodic periodic;
+  struct ev_signal signal;
   struct ev_child child;
 #if EV_STAT_ENABLE
   struct ev_stat stat;
 #endif
   struct ev_idle idle;
   struct ev_prepare prepare;
   struct ev_check check;
-  struct ev_signal signal;
+#if EV_FORK_ENABLE
+  struct ev_fork fork;
+#endif
 #if EV_EMBED_ENABLE
   struct ev_embed embed;
 #endif
 };
  * It is used to allocate and free memory.
  * If it returns zero when memory needs to be allocated, the library might abort
  * or take some potentially destructive action.
  * The default is your system realloc function.
  */
-void ev_set_allocator (void *(*cb)(void *ptr, long size));
+void ev_set_allocator (void *(*cb)(void *ptr, size_t size));
 /* set the callback function to call on a
  * retryable syscall error
  * (such as failed select, poll, epoll_wait)
  */
 #define ev_io_set(ev,fd_,events_)           do { (ev)->fd = (fd_); (ev)->events = (events_); } while (0)
 #define ev_timer_set(ev,after_,repeat_)     do { (ev)->at = (after_); (ev)->repeat = (repeat_); } while (0)
 #define ev_periodic_set(ev,at_,ival_,res_)  do { (ev)->at = (at_); (ev)->interval = (ival_); (ev)->reschedule_cb= (res_); } while (0)
 #define ev_signal_set(ev,signum_)           do { (ev)->signum = (signum_); } while (0)
 #define ev_child_set(ev,pid_)               do { (ev)->pid = (pid_); } while (0)
-#define ev_stat_set(ev,path_,interval_)     do { (ev)->path = (path_); (ev)->interval = (interval_); } while (0)
+#define ev_stat_set(ev,path_,interval_)     do { (ev)->path = (path_); (ev)->interval = (interval_); (ev)->wd = -2; } while (0)
 #define ev_idle_set(ev)                     /* nop, yes, this is a serious in-joke */
 #define ev_prepare_set(ev)                  /* nop, yes, this is a serious in-joke */
 #define ev_check_set(ev)                    /* nop, yes, this is a serious in-joke */
 #define ev_embed_set(ev,loop_)              do { (ev)->loop = (loop_); } while (0)
+#define ev_fork_set(ev)                     /* nop, yes, this is a serious in-joke */
 #define ev_io_init(ev,cb,fd,events)         do { ev_init ((ev), (cb)); ev_io_set ((ev),(fd),(events)); } while (0)
 #define ev_timer_init(ev,cb,after,repeat)   do { ev_init ((ev), (cb)); ev_timer_set ((ev),(after),(repeat)); } while (0)
 #define ev_periodic_init(ev,cb,at,ival,res) do { ev_init ((ev), (cb)); ev_periodic_set ((ev),(at),(ival),(res)); } while (0)
 #define ev_signal_init(ev,cb,signum)        do { ev_init ((ev), (cb)); ev_signal_set ((ev), (signum)); } while (0)
 #define ev_stat_init(ev,cb,path,interval)   do { ev_init ((ev), (cb)); ev_path_set ((ev),(path),(interval)); } while (0)
 #define ev_idle_init(ev,cb)                 do { ev_init ((ev), (cb)); ev_idle_set ((ev)); } while (0)
 #define ev_prepare_init(ev,cb)              do { ev_init ((ev), (cb)); ev_prepare_set ((ev)); } while (0)
 #define ev_check_init(ev,cb)                do { ev_init ((ev), (cb)); ev_check_set ((ev)); } while (0)
 #define ev_embed_init(ev,cb,loop)           do { ev_init ((ev), (cb)); ev_embed_set ((ev),(loop)); } while (0)
+#define ev_fork_init(ev,cb)                 do { ev_init ((ev), (cb)); ev_fork_set ((ev)); } while (0)
 #define ev_is_pending(ev)                   (0 + ((ev_watcher *)(void *)(ev))->pending) /* ro, true when watcher is waiting for callback invocation */
 #define ev_is_active(ev)                    (0 + ((ev_watcher *)(void *)(ev))->active) /* ro, true when the watcher has been started */
 #define ev_priority(ev)                     ((ev_watcher *)(void *)(ev))->priority /* rw */
 void ev_prepare_start  (EV_P_ ev_prepare *w);
 void ev_prepare_stop   (EV_P_ ev_prepare *w);
 void ev_check_start    (EV_P_ ev_check *w);
 void ev_check_stop     (EV_P_ ev_check *w);
+# if EV_FORK_ENABLE
+void ev_fork_start     (EV_P_ ev_fork *w);
+void ev_fork_stop      (EV_P_ ev_fork *w);
+# endif
 # if EV_EMBED_ENABLE
 /* only supported when loop to be embedded is in fact embeddable */
 void ev_embed_start    (EV_P_ ev_embed *w);
 void ev_embed_stop     (EV_P_ ev_embed *w);

Diff Legend

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

Comparing libev/ev.h (file contents): Revision 1.71 by root, Tue Nov 27 09:17:52 2007 UTC vs. Revision 1.74 by root, Wed Nov 28 11:15:55 2007 UTC

Diff Legend

Comparing libev/ev.h (file contents):
Revision 1.71 by root, Tue Nov 27 09:17:52 2007 UTC vs.
Revision 1.74 by root, Wed Nov 28 11:15:55 2007 UTC