*** empty log message ***

[software/libev.git] / ev.h

diff --git a/ev.h b/ev.h
index ad9bb8eca11ddd890219f8775b1f6bae2f1319a3..c4b843e2e93d01146e389af8400550a869ea6950 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -56,6 +56,10 @@ typedef double ev_tstamp;
 # define EV_STAT_ENABLE 1
 #endif
 
 # define EV_STAT_ENABLE 1
 #endif
 

+#ifndef EV_IDLE_ENABLE
+# define EV_IDLE_ENABLE 1
+#endif
+

 #ifndef EV_FORK_ENABLE
 # define EV_FORK_ENABLE 1
 #endif
 #ifndef EV_FORK_ENABLE
 # define EV_FORK_ENABLE 1
 #endif


@@ -115,8 +119,8 @@ struct ev_loop;
 # define EV_PROTOTYPES 1
 #endif
 
 # define EV_PROTOTYPES 1
 #endif
 

-#define EV_VERSION_MAJOR 1
-#define EV_VERSION_MINOR 1
+#define EV_VERSION_MAJOR 2
+#define EV_VERSION_MINOR 0

 
 #ifndef EV_CB_DECLARE
 # define EV_CB_DECLARE(type) void (*cb)(EV_P_ struct type *w, int revents);
 
 #ifndef EV_CB_DECLARE
 # define EV_CB_DECLARE(type) void (*cb)(EV_P_ struct type *w, int revents);


@@ -191,6 +195,7 @@ typedef struct ev_periodic
 {
   EV_WATCHER_TIME (ev_periodic)
 
 {
   EV_WATCHER_TIME (ev_periodic)
 

+  ev_tstamp offset; /* rw */

   ev_tstamp interval; /* rw */
   ev_tstamp (*reschedule_cb)(struct ev_periodic *w, ev_tstamp now); /* rw */
 } ev_periodic;
   ev_tstamp interval; /* rw */
   ev_tstamp (*reschedule_cb)(struct ev_periodic *w, ev_tstamp now); /* rw */
 } ev_periodic;


@@ -240,12 +245,14 @@ typedef struct ev_stat
 } ev_stat;
 #endif
 
 } ev_stat;
 #endif
 

+#if EV_IDLE_ENABLE

 /* invoked when the nothing else needs to be done, keeps the process from blocking */
 /* revent EV_IDLE */
 typedef struct ev_idle
 {
   EV_WATCHER (ev_idle)
 } ev_idle;
 /* invoked when the nothing else needs to be done, keeps the process from blocking */
 /* revent EV_IDLE */
 typedef struct ev_idle
 {
   EV_WATCHER (ev_idle)
 } ev_idle;

+#endif

 
 /* invoked for each run of the mainloop, just before the blocking call */
 /* you can still change events in any way you like */
 
 /* invoked for each run of the mainloop, just before the blocking call */
 /* you can still change events in any way you like */


@@ -296,7 +303,9 @@ union ev_any_watcher
 #if EV_STAT_ENABLE
   struct ev_stat stat;
 #endif
 #if EV_STAT_ENABLE
   struct ev_stat stat;
 #endif

+#if EV_IDLE_ENABLE

   struct ev_idle idle;
   struct ev_idle idle;

+#endif

   struct ev_prepare prepare;
   struct ev_check check;
 #if EV_FORK_ENABLE
   struct ev_prepare prepare;
   struct ev_check check;
 #if EV_FORK_ENABLE


@@ -388,6 +397,7 @@ void ev_default_destroy (void); /* destroy the default loop */
 void ev_default_fork (void);
 
 unsigned int ev_backend (EV_P);
 void ev_default_fork (void);
 
 unsigned int ev_backend (EV_P);

+unsigned int ev_loop_count (EV_P);

 #endif
 
 #define EVLOOP_NONBLOCK        1 /* do not block/wait */
 #endif
 
 #define EVLOOP_NONBLOCK        1 /* do not block/wait */


@@ -415,16 +425,16 @@ void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revent
 
 /* these may evaluate ev multiple times, and the other arguments at most once */
 /* either use ev_init + ev_TYPE_set, or the ev_TYPE_init macro, below, to first initialise a watcher */
 
 /* these may evaluate ev multiple times, and the other arguments at most once */
 /* either use ev_init + ev_TYPE_set, or the ev_TYPE_init macro, below, to first initialise a watcher */

-#define ev_init(ev,cb_) do {                           \
+#define ev_init(ev,cb_) do {                   \

   ((ev_watcher *)(void *)(ev))->active   =     \
   ((ev_watcher *)(void *)(ev))->pending  =     \
   ((ev_watcher *)(void *)(ev))->priority = 0;  \
   ((ev_watcher *)(void *)(ev))->active   =     \
   ((ev_watcher *)(void *)(ev))->pending  =     \
   ((ev_watcher *)(void *)(ev))->priority = 0;  \

-  ev_set_cb ((ev), cb_);                                       \
+  ev_set_cb ((ev), cb_);                       \

 } while (0)
 
 #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)
 } while (0)
 
 #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_periodic_set(ev,ofs_,ival_,res_) do { (ev)->offset = (ofs_); (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_); (ev)->wd = -2; } 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_); (ev)->wd = -2; } while (0)


@@ -449,9 +459,9 @@ void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revent
 #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_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 */
+#define ev_priority(ev)                     ((((ev_watcher *)(void *)(ev))->priority) + 0)

 #define ev_cb(ev)                           (ev)->cb /* rw */
 #define ev_cb(ev)                           (ev)->cb /* rw */

-#define ev_set_priority(ev,pri)             ev_priority (ev) = (pri)
+#define ev_set_priority(ev,pri)             ((ev_watcher *)(void *)(ev))->priority = (pri)

 
 #ifndef ev_set_cb
 # define ev_set_cb(ev,cb_)                  ev_cb (ev) = (cb_)
 
 #ifndef ev_set_cb
 # define ev_set_cb(ev,cb_)                  ev_cb (ev) = (cb_)


@@ -466,6 +476,8 @@ void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revent
 void ev_feed_event     (EV_P_ void *w, int revents);
 void ev_feed_fd_event  (EV_P_ int fd, int revents);
 void ev_feed_signal_event (EV_P_ int signum);
 void ev_feed_event     (EV_P_ void *w, int revents);
 void ev_feed_fd_event  (EV_P_ int fd, int revents);
 void ev_feed_signal_event (EV_P_ int signum);

+void ev_invoke         (EV_P_ void *w, int revents);
+int  ev_clear_pending  (EV_P_ void *w);

 
 void ev_io_start       (EV_P_ ev_io *w);
 void ev_io_stop        (EV_P_ ev_io *w);
 
 void ev_io_start       (EV_P_ ev_io *w);
 void ev_io_stop        (EV_P_ ev_io *w);


@@ -495,8 +507,10 @@ void ev_stat_stop      (EV_P_ ev_stat *w);
 void ev_stat_stat      (EV_P_ ev_stat *w);
 # endif
 
 void ev_stat_stat      (EV_P_ ev_stat *w);
 # endif
 

+# if EV_IDLE_ENABLE

 void ev_idle_start     (EV_P_ ev_idle *w);
 void ev_idle_stop      (EV_P_ ev_idle *w);
 void ev_idle_start     (EV_P_ ev_idle *w);
 void ev_idle_stop      (EV_P_ ev_idle *w);

+# endif

 
 void ev_prepare_start  (EV_P_ ev_prepare *w);
 void ev_prepare_stop   (EV_P_ ev_prepare *w);
 
 void ev_prepare_start  (EV_P_ ev_prepare *w);
 void ev_prepare_stop   (EV_P_ ev_prepare *w);