ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev.h
(Generate patch)

Comparing libev/ev.h (file contents):
Revision 1.104 by root, Thu Jun 19 07:06:35 2008 UTC vs.
Revision 1.128 by root, Tue Oct 20 00:50:31 2009 UTC

1/* 1/*
2 * libev native API header 2 * libev native API header
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifndef EV_H__ 40#ifndef EV_H_
41#define EV_H__ 41#define EV_H_
42 42
43#ifdef __cplusplus 43#ifdef __cplusplus
44extern "C" { 44extern "C" {
45#endif 45#endif
46 46
78# define EV_EMBED_ENABLE 1 78# define EV_EMBED_ENABLE 1
79#endif 79#endif
80 80
81#ifndef EV_ASYNC_ENABLE 81#ifndef EV_ASYNC_ENABLE
82# define EV_ASYNC_ENABLE 1 82# define EV_ASYNC_ENABLE 1
83#endif
84
85#ifndef EV_WALK_ENABLE
86# define EV_WALK_ENABLE 0 /* not yet */
83#endif 87#endif
84 88
85#ifndef EV_ATOMIC_T 89#ifndef EV_ATOMIC_T
86# include <signal.h> 90# include <signal.h>
87# define EV_ATOMIC_T sig_atomic_t volatile 91# define EV_ATOMIC_T sig_atomic_t volatile
131/* eventmask, revents, events... */ 135/* eventmask, revents, events... */
132#define EV_UNDEF -1 /* guaranteed to be invalid */ 136#define EV_UNDEF -1 /* guaranteed to be invalid */
133#define EV_NONE 0x00 /* no events */ 137#define EV_NONE 0x00 /* no events */
134#define EV_READ 0x01 /* ev_io detected read will not block */ 138#define EV_READ 0x01 /* ev_io detected read will not block */
135#define EV_WRITE 0x02 /* ev_io detected write will not block */ 139#define EV_WRITE 0x02 /* ev_io detected write will not block */
136#define EV_IOFDSET 0x80 /* internal use only */ 140#define EV__IOFDSET 0x80 /* internal use only */
141#define EV_IO EV_READ /* alias for type-detection */
137#define EV_TIMEOUT 0x00000100 /* timer timed out */ 142#define EV_TIMEOUT 0x00000100 /* timer timed out */
143#define EV_TIMER EV_TIMEOUT /* alias for type-detection */
138#define EV_PERIODIC 0x00000200 /* periodic timer timed out */ 144#define EV_PERIODIC 0x00000200 /* periodic timer timed out */
139#define EV_SIGNAL 0x00000400 /* signal was received */ 145#define EV_SIGNAL 0x00000400 /* signal was received */
140#define EV_CHILD 0x00000800 /* child/pid had status change */ 146#define EV_CHILD 0x00000800 /* child/pid had status change */
141#define EV_STAT 0x00001000 /* stat data changed */ 147#define EV_STAT 0x00001000 /* stat data changed */
142#define EV_IDLE 0x00002000 /* event loop is idling */ 148#define EV_IDLE 0x00002000 /* event loop is idling */
143#define EV_PREPARE 0x00004000 /* event loop about to poll */ 149#define EV_PREPARE 0x00004000 /* event loop about to poll */
144#define EV_CHECK 0x00008000 /* event loop finished poll */ 150#define EV_CHECK 0x00008000 /* event loop finished poll */
145#define EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 151#define EV_EMBED 0x00010000 /* embedded event loop needs sweep */
146#define EV_FORK 0x00020000 /* event loop resumed in child */ 152#define EV_FORK 0x00020000 /* event loop resumed in child */
147#define EV_ASYNC 0x00040000 /* async intra-loop signal */ 153#define EV_ASYNC 0x00040000 /* async intra-loop signal */
154#define EV_CUSTOM 0x01000000 /* for use by user code */
148#define EV_ERROR 0x80000000 /* sent when an error occurs */ 155#define EV_ERROR 0x80000000 /* sent when an error occurs */
149 156
150/* can be used to add custom fields to all watchers, while losing binary compatibility */ 157/* can be used to add custom fields to all watchers, while losing binary compatibility */
151#ifndef EV_COMMON 158#ifndef EV_COMMON
152# define EV_COMMON void *data; 159# define EV_COMMON void *data;
154#ifndef EV_PROTOTYPES 161#ifndef EV_PROTOTYPES
155# define EV_PROTOTYPES 1 162# define EV_PROTOTYPES 1
156#endif 163#endif
157 164
158#define EV_VERSION_MAJOR 3 165#define EV_VERSION_MAJOR 3
159#define EV_VERSION_MINOR 0 166#define EV_VERSION_MINOR 8
160 167
161#ifndef EV_CB_DECLARE 168#ifndef EV_CB_DECLARE
162# define EV_CB_DECLARE(type) void (*cb)(EV_P_ struct type *w, int revents); 169# define EV_CB_DECLARE(type) void (*cb)(EV_P_ struct type *w, int revents);
163#endif 170#endif
164#ifndef EV_CB_INVOKE 171#ifndef EV_CB_INVOKE
165# define EV_CB_INVOKE(watcher,revents) (watcher)->cb (EV_A_ (watcher), (revents)) 172# define EV_CB_INVOKE(watcher,revents) (watcher)->cb (EV_A_ (watcher), (revents))
166#endif 173#endif
167 174
168/* 175/*
169 * struct member types: 176 * struct member types:
170 * private: you can look at them, but not change them, and they might not mean anything to you. 177 * private: you may look at them, but not change them,
178 * and they might not mean anything to you.
171 * ro: can be read anytime, but only changed when the watcher isn't active 179 * ro: can be read anytime, but only changed when the watcher isn't active.
172 * rw: can be read and modified anytime, even when the watcher is active 180 * rw: can be read and modified anytime, even when the watcher is active.
173 * 181 *
174 * some internal details that might be helpful for debugging: 182 * some internal details that might be helpful for debugging:
175 * 183 *
176 * active is either 0, which means the watcher is not active, 184 * active is either 0, which means the watcher is not active,
177 * or the array index of the watcher (periodics, timers) 185 * or the array index of the watcher (periodics, timers)
178 * or the array index + 1 (most other watchers) 186 * or the array index + 1 (most other watchers)
179 * or simply 1 for watchers that aren't in some array. 187 * or simply 1 for watchers that aren't in some array.
180 * pending is either 0, in which case the watcher isn't, 188 * pending is either 0, in which case the watcher isn't,
181 * or the array index + 1 in the pendings array. 189 * or the array index + 1 in the pendings array.
182 */ 190 */
191
192#if EV_MINPRI == EV_MAXPRI
193# define EV_DECL_PRIORITY
194#else
195# define EV_DECL_PRIORITY int priority;
196#endif
183 197
184/* shared by all watchers */ 198/* shared by all watchers */
185#define EV_WATCHER(type) \ 199#define EV_WATCHER(type) \
186 int active; /* private */ \ 200 int active; /* private */ \
187 int pending; /* private */ \ 201 int pending; /* private */ \
188 int priority; /* private */ \ 202 EV_DECL_PRIORITY /* private */ \
189 EV_COMMON /* rw */ \ 203 EV_COMMON /* rw */ \
190 EV_CB_DECLARE (type) /* private */ 204 EV_CB_DECLARE (type) /* private */
191 205
192#define EV_WATCHER_LIST(type) \ 206#define EV_WATCHER_LIST(type) \
193 EV_WATCHER (type) \ 207 EV_WATCHER (type) \
335 ev_prepare prepare; /* private */ 349 ev_prepare prepare; /* private */
336 ev_check check; /* unused */ 350 ev_check check; /* unused */
337 ev_timer timer; /* unused */ 351 ev_timer timer; /* unused */
338 ev_periodic periodic; /* unused */ 352 ev_periodic periodic; /* unused */
339 ev_idle idle; /* unused */ 353 ev_idle idle; /* unused */
340 ev_fork fork; /* unused */ 354 ev_fork fork; /* private */
341} ev_embed; 355} ev_embed;
342#endif 356#endif
343 357
344#if EV_ASYNC_ENABLE 358#if EV_ASYNC_ENABLE
345/* invoked when somebody calls ev_async_send on the watcher */ 359/* invoked when somebody calls ev_async_send on the watcher */
349 EV_WATCHER (ev_async) 363 EV_WATCHER (ev_async)
350 364
351 EV_ATOMIC_T sent; /* private */ 365 EV_ATOMIC_T sent; /* private */
352} ev_async; 366} ev_async;
353 367
354# define ev_async_pending(w) ((w)->sent + 0) 368# define ev_async_pending(w) (+(w)->sent)
355#endif 369#endif
356 370
357/* the presence of this union forces similar struct layout */ 371/* the presence of this union forces similar struct layout */
358union ev_any_watcher 372union ev_any_watcher
359{ 373{
388/* the default */ 402/* the default */
389#define EVFLAG_AUTO 0x00000000U /* not quite a mask */ 403#define EVFLAG_AUTO 0x00000000U /* not quite a mask */
390/* flag bits */ 404/* flag bits */
391#define EVFLAG_NOENV 0x01000000U /* do NOT consult environment */ 405#define EVFLAG_NOENV 0x01000000U /* do NOT consult environment */
392#define EVFLAG_FORKCHECK 0x02000000U /* check for a fork in each iteration */ 406#define EVFLAG_FORKCHECK 0x02000000U /* check for a fork in each iteration */
407/* debugging/feature disable */
408#define EVFLAG_NOINOTIFY 0x00100000U /* do not attempt to use inotify */
409#define EVFLAG_NOSIGFD 0x00200000U /* do not attempt to use signalfd */
393/* method bits to be ored together */ 410/* method bits to be ored together */
394#define EVBACKEND_SELECT 0x00000001U /* about anywhere */ 411#define EVBACKEND_SELECT 0x00000001U /* about anywhere */
395#define EVBACKEND_POLL 0x00000002U /* !win */ 412#define EVBACKEND_POLL 0x00000002U /* !win */
396#define EVBACKEND_EPOLL 0x00000004U /* linux */ 413#define EVBACKEND_EPOLL 0x00000004U /* linux */
397#define EVBACKEND_KQUEUE 0x00000008U /* bsd */ 414#define EVBACKEND_KQUEUE 0x00000008U /* bsd */
398#define EVBACKEND_DEVPOLL 0x00000010U /* solaris 8 */ /* NYI */ 415#define EVBACKEND_DEVPOLL 0x00000010U /* solaris 8 */ /* NYI */
399#define EVBACKEND_PORT 0x00000020U /* solaris 10 */ 416#define EVBACKEND_PORT 0x00000020U /* solaris 10 */
417#define EVBACKEND_ALL 0x0000003FU
400 418
401#if EV_PROTOTYPES 419#if EV_PROTOTYPES
402int ev_version_major (void); 420int ev_version_major (void);
403int ev_version_minor (void); 421int ev_version_minor (void);
404 422
451 469
452/* create and destroy alternative loops that don't handle signals */ 470/* create and destroy alternative loops that don't handle signals */
453struct ev_loop *ev_loop_new (unsigned int flags); 471struct ev_loop *ev_loop_new (unsigned int flags);
454void ev_loop_destroy (EV_P); 472void ev_loop_destroy (EV_P);
455void ev_loop_fork (EV_P); 473void ev_loop_fork (EV_P);
456void ev_loop_verify (EV_P);
457 474
458ev_tstamp ev_now (EV_P); /* time w.r.t. timers and the eventloop, updated after each poll */ 475ev_tstamp ev_now (EV_P); /* time w.r.t. timers and the eventloop, updated after each poll */
459 476
460#else 477#else
461 478
487/* if you create alternative loops you have to call ev_loop_fork on them */ 504/* if you create alternative loops you have to call ev_loop_fork on them */
488/* you can call it in either the parent or the child */ 505/* you can call it in either the parent or the child */
489/* you can actually call it at any time, anywhere :) */ 506/* you can actually call it at any time, anywhere :) */
490void ev_default_fork (void); 507void ev_default_fork (void);
491 508
492unsigned int ev_backend (EV_P); /* backend in use by loop */ 509unsigned int ev_backend (EV_P); /* backend in use by loop */
493unsigned int ev_loop_count (EV_P); /* number of loop iterations */ 510
511void ev_now_update (EV_P); /* update event loop time */
512
513#if EV_WALK_ENABLE
514/* walk (almost) all watchers in the loop of a given type, invoking the */
515/* callback on every such watcher. The callback might stop the watcher, */
516/* but do nothing else with the loop */
517void ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w));
518#endif
519
494#endif /* prototypes */ 520#endif /* prototypes */
495 521
496#define EVLOOP_NONBLOCK 1 /* do not block/wait */ 522#define EVLOOP_NONBLOCK 1 /* do not block/wait */
497#define EVLOOP_ONESHOT 2 /* block *once* only */ 523#define EVLOOP_ONESHOT 2 /* block *once* only */
498#define EVUNLOOP_CANCEL 0 /* undo unloop */ 524#define EVUNLOOP_CANCEL 0 /* undo unloop */
501 527
502#if EV_PROTOTYPES 528#if EV_PROTOTYPES
503void ev_loop (EV_P_ int flags); 529void ev_loop (EV_P_ int flags);
504void ev_unloop (EV_P_ int how); /* set to 1 to break out of event loop, set to 2 to break out of all event loops */ 530void ev_unloop (EV_P_ int how); /* set to 1 to break out of event loop, set to 2 to break out of all event loops */
505 531
506void ev_set_io_collect_interval (EV_P_ ev_tstamp interval); /* sleep at least this time, default 0 */
507void ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval); /* sleep at least this time, default 0 */
508
509/* 532/*
510 * ref/unref can be used to add or remove a refcount on the mainloop. every watcher 533 * ref/unref can be used to add or remove a refcount on the mainloop. every watcher
511 * keeps one reference. if you have a long-runing watcher you never unregister that 534 * keeps one reference. if you have a long-running watcher you never unregister that
512 * should not keep ev_loop from running, unref() after starting, and ref() before stopping. 535 * should not keep ev_loop from running, unref() after starting, and ref() before stopping.
513 */ 536 */
514void ev_ref (EV_P); 537void ev_ref (EV_P);
515void ev_unref (EV_P); 538void ev_unref (EV_P);
516 539
540/*
517/* convinience function, wait for a single event, without registering an event watcher */ 541 * convenience function, wait for a single event, without registering an event watcher
518/* if timeout is < 0, do wait indefinitely */ 542 * if timeout is < 0, do wait indefinitely
543 */
519void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg); 544void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg);
545
546# if EV_MINIMAL < 2
547unsigned int ev_loop_count (EV_P); /* number of loop iterations */
548unsigned int ev_loop_depth (EV_P); /* #ev_loop enters - #ev_loop leaves */
549void ev_loop_verify (EV_P); /* abort if loop data corrupted */
550
551void ev_set_io_collect_interval (EV_P_ ev_tstamp interval); /* sleep at least this time, default 0 */
552void ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval); /* sleep at least this time, default 0 */
553
554/* advanced stuff for threading etc. support, see docs */
555void ev_set_userdata (EV_P_ void *data);
556void *ev_userdata (EV_P);
557void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P));
558void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P));
559
560unsigned int ev_pending_count (EV_P); /* number of pending events, if any */
561void ev_invoke_pending (EV_P); /* invoke all pending watchers */
562
563/*
564 * stop/start the timer handling.
565 */
566void ev_suspend (EV_P);
567void ev_resume (EV_P);
568#endif
569
520#endif 570#endif
521 571
522/* these may evaluate ev multiple times, and the other arguments at most once */ 572/* these may evaluate ev multiple times, and the other arguments at most once */
523/* either use ev_init + ev_TYPE_set, or the ev_TYPE_init macro, below, to first initialise a watcher */ 573/* either use ev_init + ev_TYPE_set, or the ev_TYPE_init macro, below, to first initialise a watcher */
524#define ev_init(ev,cb_) do { \ 574#define ev_init(ev,cb_) do { \
525 ((ev_watcher *)(void *)(ev))->active = \ 575 ((ev_watcher *)(void *)(ev))->active = \
526 ((ev_watcher *)(void *)(ev))->pending = \ 576 ((ev_watcher *)(void *)(ev))->pending = 0; \
527 ((ev_watcher *)(void *)(ev))->priority = 0; \ 577 ev_set_priority ((ev), 0); \
528 ev_set_cb ((ev), cb_); \ 578 ev_set_cb ((ev), cb_); \
529} while (0) 579} while (0)
530 580
531#define ev_io_set(ev,fd_,events_) do { (ev)->fd = (fd_); (ev)->events = (events_) | EV_IOFDSET; } while (0) 581#define ev_io_set(ev,fd_,events_) do { (ev)->fd = (fd_); (ev)->events = (events_) | EV__IOFDSET; } while (0)
532#define ev_timer_set(ev,after_,repeat_) do { ((ev_watcher_time *)(ev))->at = (after_); (ev)->repeat = (repeat_); } while (0) 582#define ev_timer_set(ev,after_,repeat_) do { ((ev_watcher_time *)(ev))->at = (after_); (ev)->repeat = (repeat_); } while (0)
533#define ev_periodic_set(ev,ofs_,ival_,res_) do { (ev)->offset = (ofs_); (ev)->interval = (ival_); (ev)->reschedule_cb= (res_); } while (0) 583#define ev_periodic_set(ev,ofs_,ival_,rcb_) do { (ev)->offset = (ofs_); (ev)->interval = (ival_); (ev)->reschedule_cb = (rcb_); } while (0)
534#define ev_signal_set(ev,signum_) do { (ev)->signum = (signum_); } while (0) 584#define ev_signal_set(ev,signum_) do { (ev)->signum = (signum_); } while (0)
535#define ev_child_set(ev,pid_,trace_) do { (ev)->pid = (pid_); (ev)->flags = !!(trace_); } while (0) 585#define ev_child_set(ev,pid_,trace_) do { (ev)->pid = (pid_); (ev)->flags = !!(trace_); } while (0)
536#define ev_stat_set(ev,path_,interval_) do { (ev)->path = (path_); (ev)->interval = (interval_); (ev)->wd = -2; } while (0) 586#define ev_stat_set(ev,path_,interval_) do { (ev)->path = (path_); (ev)->interval = (interval_); (ev)->wd = -2; } while (0)
537#define ev_idle_set(ev) /* nop, yes, this is a serious in-joke */ 587#define ev_idle_set(ev) /* nop, yes, this is a serious in-joke */
538#define ev_prepare_set(ev) /* nop, yes, this is a serious in-joke */ 588#define ev_prepare_set(ev) /* nop, yes, this is a serious in-joke */
539#define ev_check_set(ev) /* nop, yes, this is a serious in-joke */ 589#define ev_check_set(ev) /* nop, yes, this is a serious in-joke */
540#define ev_embed_set(ev,other_) do { (ev)->other = (other_); } while (0) 590#define ev_embed_set(ev,other_) do { (ev)->other = (other_); } while (0)
541#define ev_fork_set(ev) /* nop, yes, this is a serious in-joke */ 591#define ev_fork_set(ev) /* nop, yes, this is a serious in-joke */
542#define ev_async_set(ev) do { (ev)->sent = 0; } while (0) 592#define ev_async_set(ev) do { (ev)->sent = 0; } while (0)
543 593
544#define ev_io_init(ev,cb,fd,events) do { ev_init ((ev), (cb)); ev_io_set ((ev),(fd),(events)); } while (0) 594#define ev_io_init(ev,cb,fd,events) do { ev_init ((ev), (cb)); ev_io_set ((ev),(fd),(events)); } while (0)
545#define ev_timer_init(ev,cb,after,repeat) do { ev_init ((ev), (cb)); ev_timer_set ((ev),(after),(repeat)); } while (0) 595#define ev_timer_init(ev,cb,after,repeat) do { ev_init ((ev), (cb)); ev_timer_set ((ev),(after),(repeat)); } while (0)
546#define ev_periodic_init(ev,cb,at,ival,res) do { ev_init ((ev), (cb)); ev_periodic_set ((ev),(at),(ival),(res)); } while (0) 596#define ev_periodic_init(ev,cb,ofs,ival,rcb) do { ev_init ((ev), (cb)); ev_periodic_set ((ev),(ofs),(ival),(rcb)); } while (0)
547#define ev_signal_init(ev,cb,signum) do { ev_init ((ev), (cb)); ev_signal_set ((ev), (signum)); } while (0) 597#define ev_signal_init(ev,cb,signum) do { ev_init ((ev), (cb)); ev_signal_set ((ev), (signum)); } while (0)
548#define ev_child_init(ev,cb,pid,trace) do { ev_init ((ev), (cb)); ev_child_set ((ev),(pid),(trace)); } while (0) 598#define ev_child_init(ev,cb,pid,trace) do { ev_init ((ev), (cb)); ev_child_set ((ev),(pid),(trace)); } while (0)
549#define ev_stat_init(ev,cb,path,interval) do { ev_init ((ev), (cb)); ev_stat_set ((ev),(path),(interval)); } while (0) 599#define ev_stat_init(ev,cb,path,interval) do { ev_init ((ev), (cb)); ev_stat_set ((ev),(path),(interval)); } while (0)
550#define ev_idle_init(ev,cb) do { ev_init ((ev), (cb)); ev_idle_set ((ev)); } while (0) 600#define ev_idle_init(ev,cb) do { ev_init ((ev), (cb)); ev_idle_set ((ev)); } while (0)
551#define ev_prepare_init(ev,cb) do { ev_init ((ev), (cb)); ev_prepare_set ((ev)); } while (0) 601#define ev_prepare_init(ev,cb) do { ev_init ((ev), (cb)); ev_prepare_set ((ev)); } while (0)
552#define ev_check_init(ev,cb) do { ev_init ((ev), (cb)); ev_check_set ((ev)); } while (0) 602#define ev_check_init(ev,cb) do { ev_init ((ev), (cb)); ev_check_set ((ev)); } while (0)
553#define ev_embed_init(ev,cb,other) do { ev_init ((ev), (cb)); ev_embed_set ((ev),(other)); } while (0) 603#define ev_embed_init(ev,cb,other) do { ev_init ((ev), (cb)); ev_embed_set ((ev),(other)); } while (0)
554#define ev_fork_init(ev,cb) do { ev_init ((ev), (cb)); ev_fork_set ((ev)); } while (0) 604#define ev_fork_init(ev,cb) do { ev_init ((ev), (cb)); ev_fork_set ((ev)); } while (0)
555#define ev_async_init(ev,cb) do { ev_init ((ev), (cb)); ev_async_set ((ev)); } while (0) 605#define ev_async_init(ev,cb) do { ev_init ((ev), (cb)); ev_async_set ((ev)); } while (0)
556 606
557#define ev_is_pending(ev) (0 + ((ev_watcher *)(void *)(ev))->pending) /* ro, true when watcher is waiting for callback invocation */ 607#define ev_is_pending(ev) (0 + ((ev_watcher *)(void *)(ev))->pending) /* ro, true when watcher is waiting for callback invocation */
558#define ev_is_active(ev) (0 + ((ev_watcher *)(void *)(ev))->active) /* ro, true when the watcher has been started */ 608#define ev_is_active(ev) (0 + ((ev_watcher *)(void *)(ev))->active) /* ro, true when the watcher has been started */
559 609
560#define ev_priority(ev) ((((ev_watcher *)(void *)(ev))->priority) + 0)
561#define ev_cb(ev) (ev)->cb /* rw */ 610#define ev_cb(ev) (ev)->cb /* rw */
611
612#if EV_MINPRI == EV_MAXPRI
613# define ev_priority(ev) ((ev), EV_MINPRI)
614# define ev_set_priority(ev,pri) ((ev), (pri))
615#else
616# define ev_priority(ev) (+(((ev_watcher *)(void *)(ev))->priority))
562#define ev_set_priority(ev,pri) ((ev_watcher *)(void *)(ev))->priority = (pri) 617# define ev_set_priority(ev,pri) ( (ev_watcher *)(void *)(ev))->priority = (pri)
618#endif
563 619
564#define ev_periodic_at(ev) (((ev_watcher_time *)(ev))->at + 0.) 620#define ev_periodic_at(ev) (+((ev_watcher_time *)(ev))->at)
565 621
566#ifndef ev_set_cb 622#ifndef ev_set_cb
567# define ev_set_cb(ev,cb_) ev_cb (ev) = (cb_) 623# define ev_set_cb(ev,cb_) ev_cb (ev) = (cb_)
568#endif 624#endif
569 625
570/* stopping (enabling, adding) a watcher does nothing if it is already running */ 626/* stopping (enabling, adding) a watcher does nothing if it is already running */
571/* stopping (disabling, deleting) a watcher does nothing unless its already running */ 627/* stopping (disabling, deleting) a watcher does nothing unless its already running */
572#if EV_PROTOTYPES 628#if EV_PROTOTYPES
584 640
585void ev_timer_start (EV_P_ ev_timer *w); 641void ev_timer_start (EV_P_ ev_timer *w);
586void ev_timer_stop (EV_P_ ev_timer *w); 642void ev_timer_stop (EV_P_ ev_timer *w);
587/* stops if active and no repeat, restarts if active and repeating, starts if inactive and repeating */ 643/* stops if active and no repeat, restarts if active and repeating, starts if inactive and repeating */
588void ev_timer_again (EV_P_ ev_timer *w); 644void ev_timer_again (EV_P_ ev_timer *w);
645/* return remaining time */
646ev_tstamp ev_timer_remaining (EV_P_ ev_timer *w);
589 647
590#if EV_PERIODIC_ENABLE 648#if EV_PERIODIC_ENABLE
591void ev_periodic_start (EV_P_ ev_periodic *w); 649void ev_periodic_start (EV_P_ ev_periodic *w);
592void ev_periodic_stop (EV_P_ ev_periodic *w); 650void ev_periodic_stop (EV_P_ ev_periodic *w);
593void ev_periodic_again (EV_P_ ev_periodic *w); 651void ev_periodic_again (EV_P_ ev_periodic *w);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines