libev/ev.h in ebb-0.2.0 vs libev/ev.h in ebb-0.2.1
- old
+ new
@@ -98,41 +98,52 @@
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_UC ev_default_loop_uc ()
+# define EV_DEFAULT_UC_ EV_DEFAULT_UC,
# define EV_DEFAULT ev_default_loop (0)
# 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_
-
+# define EV_DEFAULT_UC
+# define EV_DEFAULT_UC_
# undef EV_EMBED_ENABLE
#endif
+#if __STDC_VERSION__ >= 199901L || __GNUC__ >= 3
+# define EV_INLINE static inline
+#else
+# define EV_INLINE static
+#endif
+
+/*****************************************************************************/
+
/* eventmask, revents, events... */
-#define EV_UNDEF -1L /* guaranteed to be invalid */
-#define EV_NONE 0x00L /* no 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_IOFDSET 0x80L /* internal use only */
-#define EV_TIMEOUT 0x00000100L /* timer timed out */
-#define EV_PERIODIC 0x00000200L /* periodic timer timed out */
-#define EV_SIGNAL 0x00000400L /* signal was received */
-#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 0x00010000L /* embedded event loop needs sweep */
-#define EV_FORK 0x00020000L /* event loop resumed in child */
-#define EV_ASYNC 0x00040000L /* async intra-loop signal */
-#define EV_ERROR 0x80000000L /* sent when an error occurs */
+#define EV_UNDEF -1 /* guaranteed to be invalid */
+#define EV_NONE 0x00 /* no events */
+#define EV_READ 0x01 /* ev_io detected read will not block */
+#define EV_WRITE 0x02 /* ev_io detected write will not block */
+#define EV_IOFDSET 0x80 /* internal use only */
+#define EV_TIMEOUT 0x00000100 /* timer timed out */
+#define EV_PERIODIC 0x00000200 /* periodic timer timed out */
+#define EV_SIGNAL 0x00000400 /* signal was received */
+#define EV_CHILD 0x00000800 /* child/pid had status change */
+#define EV_STAT 0x00001000 /* stat data changed */
+#define EV_IDLE 0x00002000 /* event loop is idling */
+#define EV_PREPARE 0x00004000 /* event loop about to poll */
+#define EV_CHECK 0x00008000 /* event loop finished poll */
+#define EV_EMBED 0x00010000 /* embedded event loop needs sweep */
+#define EV_FORK 0x00020000 /* event loop resumed in child */
+#define EV_ASYNC 0x00040000 /* async intra-loop signal */
+#define EV_ERROR 0x80000000 /* 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;
#endif
@@ -153,10 +164,19 @@
/*
* struct member types:
* private: you can look at them, but not change them, and they might not mean anything to you.
* ro: can be read anytime, but only changed when the watcher isn't active
* rw: can be read and modified anytime, even when the watcher is active
+ *
+ * some internal details that might be helpful for debugging:
+ *
+ * active is either 0, which means the watcher is not active,
+ * or the array index of the watcher (periodics, timers)
+ * or the array index + 1 (most other watchers)
+ * or simply 1 for watchers that aren't in some array.
+ * pending is either 0, in which case the watcher isn't,
+ * or the array index + 1 in the pendings array.
*/
/* shared by all watchers */
#define EV_WATCHER(type) \
int active; /* private */ \
@@ -325,11 +345,11 @@
EV_WATCHER (ev_async)
EV_ATOMIC_T sent; /* private */
} ev_async;
-# define ev_async_pending(w) (((w)->sent + 0)
+# define ev_async_pending(w) ((w)->sent + 0)
#endif
/* the presence of this union forces similar struct layout */
union ev_any_watcher
{
@@ -353,28 +373,28 @@
struct ev_fork fork;
#endif
#if EV_EMBED_ENABLE
struct ev_embed embed;
#endif
-#if EV_ASYND_ENABLE
+#if EV_ASYNC_ENABLE
struct ev_async async;
#endif
};
/* bits for ev_default_loop and ev_loop_new */
/* the default */
-#define EVFLAG_AUTO 0x00000000UL /* not quite a mask */
+#define EVFLAG_AUTO 0x00000000U /* not quite a mask */
/* flag bits */
-#define EVFLAG_NOENV 0x01000000UL /* do NOT consult environment */
-#define EVFLAG_FORKCHECK 0x02000000UL /* check for a fork in each iteration */
+#define EVFLAG_NOENV 0x01000000U /* do NOT consult environment */
+#define EVFLAG_FORKCHECK 0x02000000U /* check for a fork in each iteration */
/* method bits to be ored together */
-#define EVBACKEND_SELECT 0x00000001UL /* about anywhere */
-#define EVBACKEND_POLL 0x00000002UL /* !win */
-#define EVBACKEND_EPOLL 0x00000004UL /* linux */
-#define EVBACKEND_KQUEUE 0x00000008UL /* bsd */
-#define EVBACKEND_DEVPOLL 0x00000010UL /* solaris 8 */ /* NYI */
-#define EVBACKEND_PORT 0x00000020UL /* solaris 10 */
+#define EVBACKEND_SELECT 0x00000001U /* about anywhere */
+#define EVBACKEND_POLL 0x00000002U /* !win */
+#define EVBACKEND_EPOLL 0x00000004U /* linux */
+#define EVBACKEND_KQUEUE 0x00000008U /* bsd */
+#define EVBACKEND_DEVPOLL 0x00000010U /* solaris 8 */ /* NYI */
+#define EVBACKEND_PORT 0x00000020U /* solaris 10 */
#if EV_PROTOTYPES
int ev_version_major (void);
int ev_version_minor (void);
@@ -397,46 +417,58 @@
* retryable syscall error
* (such as failed select, poll, epoll_wait)
*/
void ev_set_syserr_cb (void (*cb)(const char *msg));
-# if EV_MULTIPLICITY
+#if EV_MULTIPLICITY
+EV_INLINE struct ev_loop *
+ev_default_loop_uc (void)
+{
+ extern struct ev_loop *ev_default_loop_ptr;
+
+ return ev_default_loop_ptr;
+}
+
/* the default loop is the only one that handles signals and child watchers */
/* you can call this as often as you like */
-static struct ev_loop *
+EV_INLINE struct ev_loop *
ev_default_loop (unsigned int flags)
{
- extern struct ev_loop *ev_default_loop_ptr;
- extern struct ev_loop *ev_default_loop_init (unsigned int flags);
+ struct ev_loop *loop = ev_default_loop_uc ();
- if (!ev_default_loop_ptr)
- ev_default_loop_init (flags);
+ if (!loop)
+ {
+ extern struct ev_loop *ev_default_loop_init (unsigned int flags);
- return ev_default_loop_ptr;
+ loop = ev_default_loop_init (flags);
+ }
+
+ return loop;
}
/* create and destroy alternative loops that don't handle signals */
struct ev_loop *ev_loop_new (unsigned int flags);
void ev_loop_destroy (EV_P);
void ev_loop_fork (EV_P);
+void ev_loop_verify (EV_P);
ev_tstamp ev_now (EV_P); /* time w.r.t. timers and the eventloop, updated after each poll */
-# else
+#else
int ev_default_loop (unsigned int flags); /* returns true when successful */
-static ev_tstamp
+EV_INLINE ev_tstamp
ev_now (void)
{
extern ev_tstamp ev_rt_now;
return ev_rt_now;
}
-# endif
+#endif /* multiplicity */
-static int
+EV_INLINE int
ev_is_default_loop (EV_P)
{
#if EV_MULTIPLICITY
extern struct ev_loop *ev_default_loop_ptr;
@@ -453,11 +485,11 @@
/* you can actually call it at any time, anywhere :) */
void ev_default_fork (void);
unsigned int ev_backend (EV_P); /* backend in use by loop */
unsigned int ev_loop_count (EV_P); /* number of loop iterations */
-#endif
+#endif /* prototypes */
#define EVLOOP_NONBLOCK 1 /* do not block/wait */
#define EVLOOP_ONESHOT 2 /* block *once* only */
#define EVUNLOOP_CANCEL 0 /* undo unloop */
#define EVUNLOOP_ONE 1 /* unloop once */
@@ -491,11 +523,11 @@
((ev_watcher *)(void *)(ev))->priority = 0; \
ev_set_cb ((ev), cb_); \
} while (0)
#define ev_io_set(ev,fd_,events_) do { (ev)->fd = (fd_); (ev)->events = (events_) | EV_IOFDSET; } while (0)
-#define ev_timer_set(ev,after_,repeat_) do { (ev)->at = (after_); (ev)->repeat = (repeat_); } while (0)
+#define ev_timer_set(ev,after_,repeat_) do { ((ev_watcher_time *)(ev))->at = (after_); (ev)->repeat = (repeat_); } 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_,trace_) do { (ev)->pid = (pid_); (ev)->flags = !!(trace_); } 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 */
@@ -522,9 +554,11 @@
#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) + 0)
#define ev_cb(ev) (ev)->cb /* rw */
#define ev_set_priority(ev,pri) ((ev_watcher *)(void *)(ev))->priority = (pri)
+
+#define ev_periodic_at(ev) (((ev_watcher_time *)(ev))->at + 0.)
#ifndef ev_set_cb
# define ev_set_cb(ev,cb_) ev_cb (ev) = (cb_)
#endif