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

Comparing libev/ev.c (file contents):
Revision 1.68 by root, Mon Nov 5 20:19:00 2007 UTC vs.
Revision 1.137 by root, Sat Nov 24 08:28:10 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
32# include "config.h" 40# include "config.h"
41# endif
33 42
34# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
46# endif
47# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
37# endif 57# endif
38 58
59# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 60# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
41# endif 65# endif
42 66
67# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 68# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
45# endif 73# endif
46 74
75# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
49# endif 81# endif
50 82
83# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
53# endif 97# endif
54 98
55#endif 99#endif
56 100
57#include <math.h> 101#include <math.h>
58#include <stdlib.h> 102#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 103#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 104#include <stddef.h>
63 105
64#include <stdio.h> 106#include <stdio.h>
65 107
66#include <assert.h> 108#include <assert.h>
67#include <errno.h> 109#include <errno.h>
68#include <sys/types.h> 110#include <sys/types.h>
111#include <time.h>
112
113#include <signal.h>
114
69#ifndef WIN32 115#ifndef _WIN32
116# include <unistd.h>
117# include <sys/time.h>
70# include <sys/wait.h> 118# include <sys/wait.h>
119#else
120# define WIN32_LEAN_AND_MEAN
121# include <windows.h>
122# ifndef EV_SELECT_IS_WINSOCKET
123# define EV_SELECT_IS_WINSOCKET 1
71#endif 124# endif
72#include <sys/time.h> 125#endif
73#include <time.h>
74 126
75/**/ 127/**/
76 128
77#ifndef EV_USE_MONOTONIC 129#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 130# define EV_USE_MONOTONIC 0
131#endif
132
133#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0
79#endif 135#endif
80 136
81#ifndef EV_USE_SELECT 137#ifndef EV_USE_SELECT
82# define EV_USE_SELECT 1 138# define EV_USE_SELECT 1
83#endif 139#endif
84 140
85#ifndef EV_USE_POLL 141#ifndef EV_USE_POLL
86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 142# ifdef _WIN32
143# define EV_USE_POLL 0
144# else
145# define EV_USE_POLL 1
146# endif
87#endif 147#endif
88 148
89#ifndef EV_USE_EPOLL 149#ifndef EV_USE_EPOLL
90# define EV_USE_EPOLL 0 150# define EV_USE_EPOLL 0
91#endif 151#endif
92 152
93#ifndef EV_USE_KQUEUE 153#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 154# define EV_USE_KQUEUE 0
95#endif 155#endif
96 156
97#ifndef EV_USE_WIN32
98# ifdef WIN32
99# define EV_USE_WIN32 1
100# else
101# define EV_USE_WIN32 0
102# endif
103#endif
104
105#ifndef EV_USE_REALTIME 157#ifndef EV_USE_PORT
106# define EV_USE_REALTIME 1 158# define EV_USE_PORT 0
107#endif 159#endif
108 160
109/**/ 161/**/
110 162
111#ifndef CLOCK_MONOTONIC 163#ifndef CLOCK_MONOTONIC
116#ifndef CLOCK_REALTIME 168#ifndef CLOCK_REALTIME
117# undef EV_USE_REALTIME 169# undef EV_USE_REALTIME
118# define EV_USE_REALTIME 0 170# define EV_USE_REALTIME 0
119#endif 171#endif
120 172
173#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h>
175#endif
176
121/**/ 177/**/
122 178
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
127 183
184#ifdef EV_H
185# include EV_H
186#else
128#include "ev.h" 187# include "ev.h"
188#endif
129 189
130#if __GNUC__ >= 3 190#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 191# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 192# define inline static inline
133#else 193#else
134# define expect(expr,value) (expr) 194# define expect(expr,value) (expr)
135# define inline static 195# define inline static
136#endif 196#endif
137 197
139#define expect_true(expr) expect ((expr) != 0, 1) 199#define expect_true(expr) expect ((expr) != 0, 1)
140 200
141#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 201#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
142#define ABSPRI(w) ((w)->priority - EV_MINPRI) 202#define ABSPRI(w) ((w)->priority - EV_MINPRI)
143 203
204#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
205#define EMPTY2(a,b) /* used to suppress some warnings */
206
144typedef struct ev_watcher *W; 207typedef ev_watcher *W;
145typedef struct ev_watcher_list *WL; 208typedef ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 209typedef ev_watcher_time *WT;
147 210
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 211static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 212
150#if WIN32 213#ifdef _WIN32
151/* note: the comment below could not be substantiated, but what would I care */ 214# include "ev_win32.c"
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif 215#endif
216
217/*****************************************************************************/
218
219static void (*syserr_cb)(const char *msg);
220
221void ev_set_syserr_cb (void (*cb)(const char *msg))
222{
223 syserr_cb = cb;
224}
225
226static void
227syserr (const char *msg)
228{
229 if (!msg)
230 msg = "(libev) system error";
231
232 if (syserr_cb)
233 syserr_cb (msg);
234 else
235 {
236 perror (msg);
237 abort ();
238 }
239}
240
241static void *(*alloc)(void *ptr, long size);
242
243void ev_set_allocator (void *(*cb)(void *ptr, long size))
244{
245 alloc = cb;
246}
247
248static void *
249ev_realloc (void *ptr, long size)
250{
251 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
252
253 if (!ptr && size)
254 {
255 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
256 abort ();
257 }
258
259 return ptr;
260}
261
262#define ev_malloc(size) ev_realloc (0, (size))
263#define ev_free(ptr) ev_realloc ((ptr), 0)
155 264
156/*****************************************************************************/ 265/*****************************************************************************/
157 266
158typedef struct 267typedef struct
159{ 268{
160 WL head; 269 WL head;
161 unsigned char events; 270 unsigned char events;
162 unsigned char reify; 271 unsigned char reify;
272#if EV_SELECT_IS_WINSOCKET
273 SOCKET handle;
274#endif
163} ANFD; 275} ANFD;
164 276
165typedef struct 277typedef struct
166{ 278{
167 W w; 279 W w;
168 int events; 280 int events;
169} ANPENDING; 281} ANPENDING;
170 282
171#if EV_MULTIPLICITY 283#if EV_MULTIPLICITY
172 284
173struct ev_loop 285 struct ev_loop
174{ 286 {
287 ev_tstamp ev_rt_now;
288 #define ev_rt_now ((loop)->ev_rt_now)
175# define VAR(name,decl) decl; 289 #define VAR(name,decl) decl;
176# include "ev_vars.h" 290 #include "ev_vars.h"
177};
178# undef VAR 291 #undef VAR
292 };
179# include "ev_wrap.h" 293 #include "ev_wrap.h"
294
295 static struct ev_loop default_loop_struct;
296 struct ev_loop *ev_default_loop_ptr;
180 297
181#else 298#else
182 299
300 ev_tstamp ev_rt_now;
183# define VAR(name,decl) static decl; 301 #define VAR(name,decl) static decl;
184# include "ev_vars.h" 302 #include "ev_vars.h"
185# undef VAR 303 #undef VAR
304
305 static int ev_default_loop_ptr;
186 306
187#endif 307#endif
188 308
189/*****************************************************************************/ 309/*****************************************************************************/
190 310
191inline ev_tstamp 311ev_tstamp
192ev_time (void) 312ev_time (void)
193{ 313{
194#if EV_USE_REALTIME 314#if EV_USE_REALTIME
195 struct timespec ts; 315 struct timespec ts;
196 clock_gettime (CLOCK_REALTIME, &ts); 316 clock_gettime (CLOCK_REALTIME, &ts);
215#endif 335#endif
216 336
217 return ev_time (); 337 return ev_time ();
218} 338}
219 339
340#if EV_MULTIPLICITY
220ev_tstamp 341ev_tstamp
221ev_now (EV_P) 342ev_now (EV_P)
222{ 343{
223 return rt_now; 344 return ev_rt_now;
224} 345}
346#endif
225 347
226#define array_roundsize(base,n) ((n) | 4 & ~3) 348#define array_roundsize(type,n) (((n) | 4) & ~3)
227 349
228#define array_needsize(base,cur,cnt,init) \ 350#define array_needsize(type,base,cur,cnt,init) \
229 if (expect_false ((cnt) > cur)) \ 351 if (expect_false ((cnt) > cur)) \
230 { \ 352 { \
231 int newcnt = cur; \ 353 int newcnt = cur; \
232 do \ 354 do \
233 { \ 355 { \
234 newcnt = array_roundsize (base, newcnt << 1); \ 356 newcnt = array_roundsize (type, newcnt << 1); \
235 } \ 357 } \
236 while ((cnt) > newcnt); \ 358 while ((cnt) > newcnt); \
237 \ 359 \
238 base = realloc (base, sizeof (*base) * (newcnt)); \ 360 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
239 init (base + cur, newcnt - cur); \ 361 init (base + cur, newcnt - cur); \
240 cur = newcnt; \ 362 cur = newcnt; \
241 } 363 }
242 364
243#define array_slim(stem) \ 365#define array_slim(type,stem) \
244 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 366 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
245 { \ 367 { \
246 stem ## max = array_roundsize (stem ## cnt >> 1); \ 368 stem ## max = array_roundsize (stem ## cnt >> 1); \
247 base = realloc (base, sizeof (*base) * (stem ## max)); \ 369 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
248 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 370 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
249 } 371 }
250 372
251#define array_free(stem, idx) \ 373#define array_free(stem, idx) \
252 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 374 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
253 375
254/*****************************************************************************/ 376/*****************************************************************************/
255 377
256static void 378static void
257anfds_init (ANFD *base, int count) 379anfds_init (ANFD *base, int count)
264 386
265 ++base; 387 ++base;
266 } 388 }
267} 389}
268 390
269static void 391void
270event (EV_P_ W w, int events) 392ev_feed_event (EV_P_ void *w, int revents)
271{ 393{
272 if (w->pending) 394 W w_ = (W)w;
395
396 if (expect_false (w_->pending))
273 { 397 {
274 pendings [ABSPRI (w)][w->pending - 1].events |= events; 398 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
275 return; 399 return;
276 } 400 }
277 401
278 w->pending = ++pendingcnt [ABSPRI (w)]; 402 w_->pending = ++pendingcnt [ABSPRI (w_)];
279 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 403 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
280 pendings [ABSPRI (w)][w->pending - 1].w = w; 404 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
281 pendings [ABSPRI (w)][w->pending - 1].events = events; 405 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
282} 406}
283 407
284static void 408static void
285queue_events (EV_P_ W *events, int eventcnt, int type) 409queue_events (EV_P_ W *events, int eventcnt, int type)
286{ 410{
287 int i; 411 int i;
288 412
289 for (i = 0; i < eventcnt; ++i) 413 for (i = 0; i < eventcnt; ++i)
290 event (EV_A_ events [i], type); 414 ev_feed_event (EV_A_ events [i], type);
291} 415}
292 416
293static void 417inline void
294fd_event (EV_P_ int fd, int events) 418fd_event (EV_P_ int fd, int revents)
295{ 419{
296 ANFD *anfd = anfds + fd; 420 ANFD *anfd = anfds + fd;
297 struct ev_io *w; 421 ev_io *w;
298 422
299 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 423 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
300 { 424 {
301 int ev = w->events & events; 425 int ev = w->events & revents;
302 426
303 if (ev) 427 if (ev)
304 event (EV_A_ (W)w, ev); 428 ev_feed_event (EV_A_ (W)w, ev);
305 } 429 }
430}
431
432void
433ev_feed_fd_event (EV_P_ int fd, int revents)
434{
435 fd_event (EV_A_ fd, revents);
306} 436}
307 437
308/*****************************************************************************/ 438/*****************************************************************************/
309 439
310static void 440inline void
311fd_reify (EV_P) 441fd_reify (EV_P)
312{ 442{
313 int i; 443 int i;
314 444
315 for (i = 0; i < fdchangecnt; ++i) 445 for (i = 0; i < fdchangecnt; ++i)
316 { 446 {
317 int fd = fdchanges [i]; 447 int fd = fdchanges [i];
318 ANFD *anfd = anfds + fd; 448 ANFD *anfd = anfds + fd;
319 struct ev_io *w; 449 ev_io *w;
320 450
321 int events = 0; 451 int events = 0;
322 452
323 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 453 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
324 events |= w->events; 454 events |= w->events;
325 455
456#if EV_SELECT_IS_WINSOCKET
457 if (events)
458 {
459 unsigned long argp;
460 anfd->handle = _get_osfhandle (fd);
461 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
462 }
463#endif
464
326 anfd->reify = 0; 465 anfd->reify = 0;
327 466
328 method_modify (EV_A_ fd, anfd->events, events); 467 backend_modify (EV_A_ fd, anfd->events, events);
329 anfd->events = events; 468 anfd->events = events;
330 } 469 }
331 470
332 fdchangecnt = 0; 471 fdchangecnt = 0;
333} 472}
334 473
335static void 474static void
336fd_change (EV_P_ int fd) 475fd_change (EV_P_ int fd)
337{ 476{
338 if (anfds [fd].reify || fdchangecnt < 0) 477 if (expect_false (anfds [fd].reify))
339 return; 478 return;
340 479
341 anfds [fd].reify = 1; 480 anfds [fd].reify = 1;
342 481
343 ++fdchangecnt; 482 ++fdchangecnt;
344 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 483 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
345 fdchanges [fdchangecnt - 1] = fd; 484 fdchanges [fdchangecnt - 1] = fd;
346} 485}
347 486
348static void 487static void
349fd_kill (EV_P_ int fd) 488fd_kill (EV_P_ int fd)
350{ 489{
351 struct ev_io *w; 490 ev_io *w;
352 491
353 while ((w = (struct ev_io *)anfds [fd].head)) 492 while ((w = (ev_io *)anfds [fd].head))
354 { 493 {
355 ev_io_stop (EV_A_ w); 494 ev_io_stop (EV_A_ w);
356 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 495 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
357 } 496 }
497}
498
499inline int
500fd_valid (int fd)
501{
502#ifdef _WIN32
503 return _get_osfhandle (fd) != -1;
504#else
505 return fcntl (fd, F_GETFD) != -1;
506#endif
358} 507}
359 508
360/* called on EBADF to verify fds */ 509/* called on EBADF to verify fds */
361static void 510static void
362fd_ebadf (EV_P) 511fd_ebadf (EV_P)
363{ 512{
364 int fd; 513 int fd;
365 514
366 for (fd = 0; fd < anfdmax; ++fd) 515 for (fd = 0; fd < anfdmax; ++fd)
367 if (anfds [fd].events) 516 if (anfds [fd].events)
368 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 517 if (!fd_valid (fd) == -1 && errno == EBADF)
369 fd_kill (EV_A_ fd); 518 fd_kill (EV_A_ fd);
370} 519}
371 520
372/* called on ENOMEM in select/poll to kill some fds and retry */ 521/* called on ENOMEM in select/poll to kill some fds and retry */
373static void 522static void
381 fd_kill (EV_A_ fd); 530 fd_kill (EV_A_ fd);
382 return; 531 return;
383 } 532 }
384} 533}
385 534
386/* susually called after fork if method needs to re-arm all fds from scratch */ 535/* usually called after fork if backend needs to re-arm all fds from scratch */
387static void 536static void
388fd_rearm_all (EV_P) 537fd_rearm_all (EV_P)
389{ 538{
390 int fd; 539 int fd;
391 540
439 588
440 heap [k] = w; 589 heap [k] = w;
441 ((W)heap [k])->active = k + 1; 590 ((W)heap [k])->active = k + 1;
442} 591}
443 592
593inline void
594adjustheap (WT *heap, int N, int k)
595{
596 upheap (heap, k);
597 downheap (heap, N, k);
598}
599
444/*****************************************************************************/ 600/*****************************************************************************/
445 601
446typedef struct 602typedef struct
447{ 603{
448 WL head; 604 WL head;
452static ANSIG *signals; 608static ANSIG *signals;
453static int signalmax; 609static int signalmax;
454 610
455static int sigpipe [2]; 611static int sigpipe [2];
456static sig_atomic_t volatile gotsig; 612static sig_atomic_t volatile gotsig;
457static struct ev_io sigev; 613static ev_io sigev;
458 614
459static void 615static void
460signals_init (ANSIG *base, int count) 616signals_init (ANSIG *base, int count)
461{ 617{
462 while (count--) 618 while (count--)
469} 625}
470 626
471static void 627static void
472sighandler (int signum) 628sighandler (int signum)
473{ 629{
474#if WIN32 630#if _WIN32
475 signal (signum, sighandler); 631 signal (signum, sighandler);
476#endif 632#endif
477 633
478 signals [signum - 1].gotsig = 1; 634 signals [signum - 1].gotsig = 1;
479 635
484 write (sigpipe [1], &signum, 1); 640 write (sigpipe [1], &signum, 1);
485 errno = old_errno; 641 errno = old_errno;
486 } 642 }
487} 643}
488 644
489static void 645void
490sigcb (EV_P_ struct ev_io *iow, int revents) 646ev_feed_signal_event (EV_P_ int signum)
491{ 647{
492 WL w; 648 WL w;
649
650#if EV_MULTIPLICITY
651 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
652#endif
653
654 --signum;
655
656 if (signum < 0 || signum >= signalmax)
657 return;
658
659 signals [signum].gotsig = 0;
660
661 for (w = signals [signum].head; w; w = w->next)
662 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
663}
664
665static void
666sigcb (EV_P_ ev_io *iow, int revents)
667{
493 int signum; 668 int signum;
494 669
495 read (sigpipe [0], &revents, 1); 670 read (sigpipe [0], &revents, 1);
496 gotsig = 0; 671 gotsig = 0;
497 672
498 for (signum = signalmax; signum--; ) 673 for (signum = signalmax; signum--; )
499 if (signals [signum].gotsig) 674 if (signals [signum].gotsig)
500 { 675 ev_feed_signal_event (EV_A_ signum + 1);
501 signals [signum].gotsig = 0; 676}
502 677
503 for (w = signals [signum].head; w; w = w->next) 678static void
504 event (EV_A_ (W)w, EV_SIGNAL); 679fd_intern (int fd)
505 } 680{
681#ifdef _WIN32
682 int arg = 1;
683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
684#else
685 fcntl (fd, F_SETFD, FD_CLOEXEC);
686 fcntl (fd, F_SETFL, O_NONBLOCK);
687#endif
506} 688}
507 689
508static void 690static void
509siginit (EV_P) 691siginit (EV_P)
510{ 692{
511#ifndef WIN32 693 fd_intern (sigpipe [0]);
512 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 694 fd_intern (sigpipe [1]);
513 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
514
515 /* rather than sort out wether we really need nb, set it */
516 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
517 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
518#endif
519 695
520 ev_io_set (&sigev, sigpipe [0], EV_READ); 696 ev_io_set (&sigev, sigpipe [0], EV_READ);
521 ev_io_start (EV_A_ &sigev); 697 ev_io_start (EV_A_ &sigev);
522 ev_unref (EV_A); /* child watcher should not keep loop alive */ 698 ev_unref (EV_A); /* child watcher should not keep loop alive */
523} 699}
524 700
525/*****************************************************************************/ 701/*****************************************************************************/
526 702
703static ev_child *childs [PID_HASHSIZE];
704
527#ifndef WIN32 705#ifndef _WIN32
528 706
529static struct ev_child *childs [PID_HASHSIZE];
530static struct ev_signal childev; 707static ev_signal childev;
531 708
532#ifndef WCONTINUED 709#ifndef WCONTINUED
533# define WCONTINUED 0 710# define WCONTINUED 0
534#endif 711#endif
535 712
536static void 713static void
537child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) 714child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
538{ 715{
539 struct ev_child *w; 716 ev_child *w;
540 717
541 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 718 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
542 if (w->pid == pid || !w->pid) 719 if (w->pid == pid || !w->pid)
543 { 720 {
544 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 721 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
545 w->rpid = pid; 722 w->rpid = pid;
546 w->rstatus = status; 723 w->rstatus = status;
547 event (EV_A_ (W)w, EV_CHILD); 724 ev_feed_event (EV_A_ (W)w, EV_CHILD);
548 } 725 }
549} 726}
550 727
551static void 728static void
552childcb (EV_P_ struct ev_signal *sw, int revents) 729childcb (EV_P_ ev_signal *sw, int revents)
553{ 730{
554 int pid, status; 731 int pid, status;
555 732
556 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
557 { 734 {
558 /* make sure we are called again until all childs have been reaped */ 735 /* make sure we are called again until all childs have been reaped */
736 /* we need to do it this way so that the callback gets called before we continue */
559 event (EV_A_ (W)sw, EV_SIGNAL); 737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
560 738
561 child_reap (EV_A_ sw, pid, pid, status); 739 child_reap (EV_A_ sw, pid, pid, status);
562 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 740 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
563 } 741 }
564} 742}
565 743
566#endif 744#endif
567 745
568/*****************************************************************************/ 746/*****************************************************************************/
569 747
748#if EV_USE_PORT
749# include "ev_port.c"
750#endif
570#if EV_USE_KQUEUE 751#if EV_USE_KQUEUE
571# include "ev_kqueue.c" 752# include "ev_kqueue.c"
572#endif 753#endif
573#if EV_USE_EPOLL 754#if EV_USE_EPOLL
574# include "ev_epoll.c" 755# include "ev_epoll.c"
594 775
595/* return true if we are running with elevated privileges and should ignore env variables */ 776/* return true if we are running with elevated privileges and should ignore env variables */
596static int 777static int
597enable_secure (void) 778enable_secure (void)
598{ 779{
599#ifdef WIN32 780#ifdef _WIN32
600 return 0; 781 return 0;
601#else 782#else
602 return getuid () != geteuid () 783 return getuid () != geteuid ()
603 || getgid () != getegid (); 784 || getgid () != getegid ();
604#endif 785#endif
605} 786}
606 787
607int 788unsigned int
608ev_method (EV_P) 789ev_supported_backends (void)
609{ 790{
610 return method; 791 unsigned int flags = 0;
611}
612 792
613static void 793 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
614loop_init (EV_P_ int methods) 794 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
795 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
796 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
797 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
798
799 return flags;
800}
801
802unsigned int
803ev_recommended_backends (void)
615{ 804{
616 if (!method) 805 unsigned int flags = ev_supported_backends ();
806
807#ifndef __NetBSD__
808 /* kqueue is borked on everything but netbsd apparently */
809 /* it usually doesn't work correctly on anything but sockets and pipes */
810 flags &= ~EVBACKEND_KQUEUE;
811#endif
812#ifdef __APPLE__
813 // flags &= ~EVBACKEND_KQUEUE; for documentation
814 flags &= ~EVBACKEND_POLL;
815#endif
816
817 return flags;
818}
819
820unsigned int
821ev_embeddable_backends (void)
822{
823 return EVBACKEND_EPOLL
824 | EVBACKEND_KQUEUE
825 | EVBACKEND_PORT;
826}
827
828unsigned int
829ev_backend (EV_P)
830{
831 return backend;
832}
833
834static void
835loop_init (EV_P_ unsigned int flags)
836{
837 if (!backend)
617 { 838 {
618#if EV_USE_MONOTONIC 839#if EV_USE_MONOTONIC
619 { 840 {
620 struct timespec ts; 841 struct timespec ts;
621 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 842 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
622 have_monotonic = 1; 843 have_monotonic = 1;
623 } 844 }
624#endif 845#endif
625 846
626 rt_now = ev_time (); 847 ev_rt_now = ev_time ();
627 mn_now = get_clock (); 848 mn_now = get_clock ();
628 now_floor = mn_now; 849 now_floor = mn_now;
629 rtmn_diff = rt_now - mn_now; 850 rtmn_diff = ev_rt_now - mn_now;
630 851
631 if (methods == EVMETHOD_AUTO) 852 if (!(flags & EVFLAG_NOENV)
632 if (!enable_secure () && getenv ("LIBEV_METHODS")) 853 && !enable_secure ()
854 && getenv ("LIBEV_FLAGS"))
633 methods = atoi (getenv ("LIBEV_METHODS")); 855 flags = atoi (getenv ("LIBEV_FLAGS"));
634 else
635 methods = EVMETHOD_ANY;
636 856
637 method = 0; 857 if (!(flags & 0x0000ffffUL))
638#if EV_USE_WIN32 858 flags |= ev_recommended_backends ();
639 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 859
860 backend = 0;
861#if EV_USE_PORT
862 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
640#endif 863#endif
641#if EV_USE_KQUEUE 864#if EV_USE_KQUEUE
642 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 865 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
643#endif 866#endif
644#if EV_USE_EPOLL 867#if EV_USE_EPOLL
645 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 868 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
646#endif 869#endif
647#if EV_USE_POLL 870#if EV_USE_POLL
648 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 871 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
649#endif 872#endif
650#if EV_USE_SELECT 873#if EV_USE_SELECT
651 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 874 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
652#endif 875#endif
653 }
654}
655 876
656void 877 ev_init (&sigev, sigcb);
878 ev_set_priority (&sigev, EV_MAXPRI);
879 }
880}
881
882static void
657loop_destroy (EV_P) 883loop_destroy (EV_P)
658{ 884{
659 int i; 885 int i;
660 886
661#if EV_USE_WIN32 887#if EV_USE_PORT
662 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 888 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
663#endif 889#endif
664#if EV_USE_KQUEUE 890#if EV_USE_KQUEUE
665 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 891 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
666#endif 892#endif
667#if EV_USE_EPOLL 893#if EV_USE_EPOLL
668 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 894 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
669#endif 895#endif
670#if EV_USE_POLL 896#if EV_USE_POLL
671 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 897 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
672#endif 898#endif
673#if EV_USE_SELECT 899#if EV_USE_SELECT
674 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 900 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
675#endif 901#endif
676 902
677 for (i = NUMPRI; i--; ) 903 for (i = NUMPRI; i--; )
678 array_free (pending, [i]); 904 array_free (pending, [i]);
679 905
906 /* have to use the microsoft-never-gets-it-right macro */
680 array_free (fdchange, ); 907 array_free (fdchange, EMPTY0);
681 array_free (timer, ); 908 array_free (timer, EMPTY0);
909#if EV_PERIODICS
682 array_free (periodic, ); 910 array_free (periodic, EMPTY0);
911#endif
683 array_free (idle, ); 912 array_free (idle, EMPTY0);
684 array_free (prepare, ); 913 array_free (prepare, EMPTY0);
685 array_free (check, ); 914 array_free (check, EMPTY0);
686 915
687 method = 0; 916 backend = 0;
688 /*TODO*/
689} 917}
690 918
691void 919static void
692loop_fork (EV_P) 920loop_fork (EV_P)
693{ 921{
694 /*TODO*/ 922#if EV_USE_PORT
923 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
924#endif
925#if EV_USE_KQUEUE
926 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
927#endif
695#if EV_USE_EPOLL 928#if EV_USE_EPOLL
696 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 929 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
697#endif 930#endif
698#if EV_USE_KQUEUE 931
699 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 932 if (ev_is_active (&sigev))
700#endif 933 {
934 /* default loop */
935
936 ev_ref (EV_A);
937 ev_io_stop (EV_A_ &sigev);
938 close (sigpipe [0]);
939 close (sigpipe [1]);
940
941 while (pipe (sigpipe))
942 syserr ("(libev) error creating pipe");
943
944 siginit (EV_A);
945 }
946
947 postfork = 0;
701} 948}
702 949
703#if EV_MULTIPLICITY 950#if EV_MULTIPLICITY
704struct ev_loop * 951struct ev_loop *
705ev_loop_new (int methods) 952ev_loop_new (unsigned int flags)
706{ 953{
707 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 954 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
708 955
956 memset (loop, 0, sizeof (struct ev_loop));
957
709 loop_init (EV_A_ methods); 958 loop_init (EV_A_ flags);
710 959
711 if (ev_method (EV_A)) 960 if (ev_backend (EV_A))
712 return loop; 961 return loop;
713 962
714 return 0; 963 return 0;
715} 964}
716 965
717void 966void
718ev_loop_destroy (EV_P) 967ev_loop_destroy (EV_P)
719{ 968{
720 loop_destroy (EV_A); 969 loop_destroy (EV_A);
721 free (loop); 970 ev_free (loop);
722} 971}
723 972
724void 973void
725ev_loop_fork (EV_P) 974ev_loop_fork (EV_P)
726{ 975{
727 loop_fork (EV_A); 976 postfork = 1;
728} 977}
729 978
730#endif 979#endif
731 980
732#if EV_MULTIPLICITY 981#if EV_MULTIPLICITY
733struct ev_loop default_loop_struct;
734static struct ev_loop *default_loop;
735
736struct ev_loop * 982struct ev_loop *
983ev_default_loop_init (unsigned int flags)
737#else 984#else
738static int default_loop;
739
740int 985int
986ev_default_loop (unsigned int flags)
741#endif 987#endif
742ev_default_loop (int methods)
743{ 988{
744 if (sigpipe [0] == sigpipe [1]) 989 if (sigpipe [0] == sigpipe [1])
745 if (pipe (sigpipe)) 990 if (pipe (sigpipe))
746 return 0; 991 return 0;
747 992
748 if (!default_loop) 993 if (!ev_default_loop_ptr)
749 { 994 {
750#if EV_MULTIPLICITY 995#if EV_MULTIPLICITY
751 struct ev_loop *loop = default_loop = &default_loop_struct; 996 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
752#else 997#else
753 default_loop = 1; 998 ev_default_loop_ptr = 1;
754#endif 999#endif
755 1000
756 loop_init (EV_A_ methods); 1001 loop_init (EV_A_ flags);
757 1002
758 if (ev_method (EV_A)) 1003 if (ev_backend (EV_A))
759 { 1004 {
760 ev_watcher_init (&sigev, sigcb);
761 ev_set_priority (&sigev, EV_MAXPRI);
762 siginit (EV_A); 1005 siginit (EV_A);
763 1006
764#ifndef WIN32 1007#ifndef _WIN32
765 ev_signal_init (&childev, childcb, SIGCHLD); 1008 ev_signal_init (&childev, childcb, SIGCHLD);
766 ev_set_priority (&childev, EV_MAXPRI); 1009 ev_set_priority (&childev, EV_MAXPRI);
767 ev_signal_start (EV_A_ &childev); 1010 ev_signal_start (EV_A_ &childev);
768 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1011 ev_unref (EV_A); /* child watcher should not keep loop alive */
769#endif 1012#endif
770 } 1013 }
771 else 1014 else
772 default_loop = 0; 1015 ev_default_loop_ptr = 0;
773 } 1016 }
774 1017
775 return default_loop; 1018 return ev_default_loop_ptr;
776} 1019}
777 1020
778void 1021void
779ev_default_destroy (void) 1022ev_default_destroy (void)
780{ 1023{
781#if EV_MULTIPLICITY 1024#if EV_MULTIPLICITY
782 struct ev_loop *loop = default_loop; 1025 struct ev_loop *loop = ev_default_loop_ptr;
783#endif 1026#endif
784 1027
1028#ifndef _WIN32
785 ev_ref (EV_A); /* child watcher */ 1029 ev_ref (EV_A); /* child watcher */
786 ev_signal_stop (EV_A_ &childev); 1030 ev_signal_stop (EV_A_ &childev);
1031#endif
787 1032
788 ev_ref (EV_A); /* signal watcher */ 1033 ev_ref (EV_A); /* signal watcher */
789 ev_io_stop (EV_A_ &sigev); 1034 ev_io_stop (EV_A_ &sigev);
790 1035
791 close (sigpipe [0]); sigpipe [0] = 0; 1036 close (sigpipe [0]); sigpipe [0] = 0;
796 1041
797void 1042void
798ev_default_fork (void) 1043ev_default_fork (void)
799{ 1044{
800#if EV_MULTIPLICITY 1045#if EV_MULTIPLICITY
801 struct ev_loop *loop = default_loop; 1046 struct ev_loop *loop = ev_default_loop_ptr;
802#endif 1047#endif
803 1048
804 loop_fork (EV_A); 1049 if (backend)
805 1050 postfork = 1;
806 ev_io_stop (EV_A_ &sigev);
807 close (sigpipe [0]);
808 close (sigpipe [1]);
809 pipe (sigpipe);
810
811 ev_ref (EV_A); /* signal watcher */
812 siginit (EV_A);
813} 1051}
814 1052
815/*****************************************************************************/ 1053/*****************************************************************************/
816 1054
817static void 1055static int
1056any_pending (EV_P)
1057{
1058 int pri;
1059
1060 for (pri = NUMPRI; pri--; )
1061 if (pendingcnt [pri])
1062 return 1;
1063
1064 return 0;
1065}
1066
1067inline void
818call_pending (EV_P) 1068call_pending (EV_P)
819{ 1069{
820 int pri; 1070 int pri;
821 1071
822 for (pri = NUMPRI; pri--; ) 1072 for (pri = NUMPRI; pri--; )
823 while (pendingcnt [pri]) 1073 while (pendingcnt [pri])
824 { 1074 {
825 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1075 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
826 1076
827 if (p->w) 1077 if (expect_true (p->w))
828 { 1078 {
829 p->w->pending = 0; 1079 p->w->pending = 0;
830 p->w->cb (EV_A_ p->w, p->events); 1080 EV_CB_INVOKE (p->w, p->events);
831 } 1081 }
832 } 1082 }
833} 1083}
834 1084
835static void 1085inline void
836timers_reify (EV_P) 1086timers_reify (EV_P)
837{ 1087{
838 while (timercnt && ((WT)timers [0])->at <= mn_now) 1088 while (timercnt && ((WT)timers [0])->at <= mn_now)
839 { 1089 {
840 struct ev_timer *w = timers [0]; 1090 ev_timer *w = timers [0];
841 1091
842 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1092 assert (("inactive timer on timer heap detected", ev_is_active (w)));
843 1093
844 /* first reschedule or stop timer */ 1094 /* first reschedule or stop timer */
845 if (w->repeat) 1095 if (w->repeat)
846 { 1096 {
847 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1097 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1098
848 ((WT)w)->at = mn_now + w->repeat; 1099 ((WT)w)->at += w->repeat;
1100 if (((WT)w)->at < mn_now)
1101 ((WT)w)->at = mn_now;
1102
849 downheap ((WT *)timers, timercnt, 0); 1103 downheap ((WT *)timers, timercnt, 0);
850 } 1104 }
851 else 1105 else
852 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1106 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
853 1107
854 event (EV_A_ (W)w, EV_TIMEOUT); 1108 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
855 } 1109 }
856} 1110}
857 1111
858static void 1112#if EV_PERIODICS
1113inline void
859periodics_reify (EV_P) 1114periodics_reify (EV_P)
860{ 1115{
861 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1116 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
862 { 1117 {
863 struct ev_periodic *w = periodics [0]; 1118 ev_periodic *w = periodics [0];
864 1119
865 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1120 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
866 1121
867 /* first reschedule or stop timer */ 1122 /* first reschedule or stop timer */
868 if (w->interval) 1123 if (w->reschedule_cb)
869 { 1124 {
1125 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1126 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1127 downheap ((WT *)periodics, periodiccnt, 0);
1128 }
1129 else if (w->interval)
1130 {
870 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1131 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
871 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1132 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
872 downheap ((WT *)periodics, periodiccnt, 0); 1133 downheap ((WT *)periodics, periodiccnt, 0);
873 } 1134 }
874 else 1135 else
875 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1136 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
876 1137
877 event (EV_A_ (W)w, EV_PERIODIC); 1138 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
878 } 1139 }
879} 1140}
880 1141
881static void 1142static void
882periodics_reschedule (EV_P) 1143periodics_reschedule (EV_P)
884 int i; 1145 int i;
885 1146
886 /* adjust periodics after time jump */ 1147 /* adjust periodics after time jump */
887 for (i = 0; i < periodiccnt; ++i) 1148 for (i = 0; i < periodiccnt; ++i)
888 { 1149 {
889 struct ev_periodic *w = periodics [i]; 1150 ev_periodic *w = periodics [i];
890 1151
1152 if (w->reschedule_cb)
1153 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
891 if (w->interval) 1154 else if (w->interval)
892 {
893 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1155 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
894
895 if (fabs (diff) >= 1e-4)
896 {
897 ev_periodic_stop (EV_A_ w);
898 ev_periodic_start (EV_A_ w);
899
900 i = 0; /* restart loop, inefficient, but time jumps should be rare */
901 }
902 }
903 } 1156 }
1157
1158 /* now rebuild the heap */
1159 for (i = periodiccnt >> 1; i--; )
1160 downheap ((WT *)periodics, periodiccnt, i);
904} 1161}
1162#endif
905 1163
906inline int 1164inline int
907time_update_monotonic (EV_P) 1165time_update_monotonic (EV_P)
908{ 1166{
909 mn_now = get_clock (); 1167 mn_now = get_clock ();
910 1168
911 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1169 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
912 { 1170 {
913 rt_now = rtmn_diff + mn_now; 1171 ev_rt_now = rtmn_diff + mn_now;
914 return 0; 1172 return 0;
915 } 1173 }
916 else 1174 else
917 { 1175 {
918 now_floor = mn_now; 1176 now_floor = mn_now;
919 rt_now = ev_time (); 1177 ev_rt_now = ev_time ();
920 return 1; 1178 return 1;
921 } 1179 }
922} 1180}
923 1181
924static void 1182inline void
925time_update (EV_P) 1183time_update (EV_P)
926{ 1184{
927 int i; 1185 int i;
928 1186
929#if EV_USE_MONOTONIC 1187#if EV_USE_MONOTONIC
933 { 1191 {
934 ev_tstamp odiff = rtmn_diff; 1192 ev_tstamp odiff = rtmn_diff;
935 1193
936 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1194 for (i = 4; --i; ) /* loop a few times, before making important decisions */
937 { 1195 {
938 rtmn_diff = rt_now - mn_now; 1196 rtmn_diff = ev_rt_now - mn_now;
939 1197
940 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1198 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
941 return; /* all is well */ 1199 return; /* all is well */
942 1200
943 rt_now = ev_time (); 1201 ev_rt_now = ev_time ();
944 mn_now = get_clock (); 1202 mn_now = get_clock ();
945 now_floor = mn_now; 1203 now_floor = mn_now;
946 } 1204 }
947 1205
1206# if EV_PERIODICS
948 periodics_reschedule (EV_A); 1207 periodics_reschedule (EV_A);
1208# endif
949 /* no timer adjustment, as the monotonic clock doesn't jump */ 1209 /* no timer adjustment, as the monotonic clock doesn't jump */
950 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1210 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
951 } 1211 }
952 } 1212 }
953 else 1213 else
954#endif 1214#endif
955 { 1215 {
956 rt_now = ev_time (); 1216 ev_rt_now = ev_time ();
957 1217
958 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1218 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
959 { 1219 {
1220#if EV_PERIODICS
960 periodics_reschedule (EV_A); 1221 periodics_reschedule (EV_A);
1222#endif
961 1223
962 /* adjust timers. this is easy, as the offset is the same for all */ 1224 /* adjust timers. this is easy, as the offset is the same for all */
963 for (i = 0; i < timercnt; ++i) 1225 for (i = 0; i < timercnt; ++i)
964 ((WT)timers [i])->at += rt_now - mn_now; 1226 ((WT)timers [i])->at += ev_rt_now - mn_now;
965 } 1227 }
966 1228
967 mn_now = rt_now; 1229 mn_now = ev_rt_now;
968 } 1230 }
969} 1231}
970 1232
971void 1233void
972ev_ref (EV_P) 1234ev_ref (EV_P)
983static int loop_done; 1245static int loop_done;
984 1246
985void 1247void
986ev_loop (EV_P_ int flags) 1248ev_loop (EV_P_ int flags)
987{ 1249{
988 double block;
989 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1250 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1251 ? EVUNLOOP_ONE
1252 : EVUNLOOP_CANCEL;
990 1253
991 do 1254 while (activecnt)
992 { 1255 {
993 /* queue check watchers (and execute them) */ 1256 /* queue check watchers (and execute them) */
994 if (expect_false (preparecnt)) 1257 if (expect_false (preparecnt))
995 { 1258 {
996 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1259 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
997 call_pending (EV_A); 1260 call_pending (EV_A);
998 } 1261 }
999 1262
1263 /* we might have forked, so reify kernel state if necessary */
1264 if (expect_false (postfork))
1265 loop_fork (EV_A);
1266
1000 /* update fd-related kernel structures */ 1267 /* update fd-related kernel structures */
1001 fd_reify (EV_A); 1268 fd_reify (EV_A);
1002 1269
1003 /* calculate blocking time */ 1270 /* calculate blocking time */
1271 {
1272 double block;
1004 1273
1005 /* we only need this for !monotonic clockor timers, but as we basically 1274 if (flags & EVLOOP_NONBLOCK || idlecnt)
1006 always have timers, we just calculate it always */ 1275 block = 0.; /* do not block at all */
1276 else
1277 {
1278 /* update time to cancel out callback processing overhead */
1007#if EV_USE_MONOTONIC 1279#if EV_USE_MONOTONIC
1008 if (expect_true (have_monotonic)) 1280 if (expect_true (have_monotonic))
1009 time_update_monotonic (EV_A); 1281 time_update_monotonic (EV_A);
1010 else 1282 else
1011#endif 1283#endif
1012 { 1284 {
1013 rt_now = ev_time (); 1285 ev_rt_now = ev_time ();
1014 mn_now = rt_now; 1286 mn_now = ev_rt_now;
1015 } 1287 }
1016 1288
1017 if (flags & EVLOOP_NONBLOCK || idlecnt)
1018 block = 0.;
1019 else
1020 {
1021 block = MAX_BLOCKTIME; 1289 block = MAX_BLOCKTIME;
1022 1290
1023 if (timercnt) 1291 if (timercnt)
1024 { 1292 {
1025 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1293 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1026 if (block > to) block = to; 1294 if (block > to) block = to;
1027 } 1295 }
1028 1296
1297#if EV_PERIODICS
1029 if (periodiccnt) 1298 if (periodiccnt)
1030 { 1299 {
1031 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1300 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1032 if (block > to) block = to; 1301 if (block > to) block = to;
1033 } 1302 }
1303#endif
1034 1304
1035 if (block < 0.) block = 0.; 1305 if (expect_false (block < 0.)) block = 0.;
1036 } 1306 }
1037 1307
1038 method_poll (EV_A_ block); 1308 backend_poll (EV_A_ block);
1309 }
1039 1310
1040 /* update rt_now, do magic */ 1311 /* update ev_rt_now, do magic */
1041 time_update (EV_A); 1312 time_update (EV_A);
1042 1313
1043 /* queue pending timers and reschedule them */ 1314 /* queue pending timers and reschedule them */
1044 timers_reify (EV_A); /* relative timers called last */ 1315 timers_reify (EV_A); /* relative timers called last */
1316#if EV_PERIODICS
1045 periodics_reify (EV_A); /* absolute timers called first */ 1317 periodics_reify (EV_A); /* absolute timers called first */
1318#endif
1046 1319
1047 /* queue idle watchers unless io or timers are pending */ 1320 /* queue idle watchers unless other events are pending */
1048 if (!pendingcnt) 1321 if (idlecnt && !any_pending (EV_A))
1049 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1322 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1050 1323
1051 /* queue check watchers, to be executed first */ 1324 /* queue check watchers, to be executed first */
1052 if (checkcnt) 1325 if (expect_false (checkcnt))
1053 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1326 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1054 1327
1055 call_pending (EV_A); 1328 call_pending (EV_A);
1056 }
1057 while (activecnt && !loop_done);
1058 1329
1059 if (loop_done != 2) 1330 if (expect_false (loop_done))
1060 loop_done = 0; 1331 break;
1332 }
1333
1334 if (loop_done == EVUNLOOP_ONE)
1335 loop_done = EVUNLOOP_CANCEL;
1061} 1336}
1062 1337
1063void 1338void
1064ev_unloop (EV_P_ int how) 1339ev_unloop (EV_P_ int how)
1065{ 1340{
1118} 1393}
1119 1394
1120/*****************************************************************************/ 1395/*****************************************************************************/
1121 1396
1122void 1397void
1123ev_io_start (EV_P_ struct ev_io *w) 1398ev_io_start (EV_P_ ev_io *w)
1124{ 1399{
1125 int fd = w->fd; 1400 int fd = w->fd;
1126 1401
1127 if (ev_is_active (w)) 1402 if (expect_false (ev_is_active (w)))
1128 return; 1403 return;
1129 1404
1130 assert (("ev_io_start called with negative fd", fd >= 0)); 1405 assert (("ev_io_start called with negative fd", fd >= 0));
1131 1406
1132 ev_start (EV_A_ (W)w, 1); 1407 ev_start (EV_A_ (W)w, 1);
1133 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1408 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1134 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1409 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1135 1410
1136 fd_change (EV_A_ fd); 1411 fd_change (EV_A_ fd);
1137} 1412}
1138 1413
1139void 1414void
1140ev_io_stop (EV_P_ struct ev_io *w) 1415ev_io_stop (EV_P_ ev_io *w)
1141{ 1416{
1142 ev_clear_pending (EV_A_ (W)w); 1417 ev_clear_pending (EV_A_ (W)w);
1143 if (!ev_is_active (w)) 1418 if (expect_false (!ev_is_active (w)))
1144 return; 1419 return;
1420
1421 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1145 1422
1146 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1423 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1147 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1148 1425
1149 fd_change (EV_A_ w->fd); 1426 fd_change (EV_A_ w->fd);
1150} 1427}
1151 1428
1152void 1429void
1153ev_timer_start (EV_P_ struct ev_timer *w) 1430ev_timer_start (EV_P_ ev_timer *w)
1154{ 1431{
1155 if (ev_is_active (w)) 1432 if (expect_false (ev_is_active (w)))
1156 return; 1433 return;
1157 1434
1158 ((WT)w)->at += mn_now; 1435 ((WT)w)->at += mn_now;
1159 1436
1160 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1437 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1161 1438
1162 ev_start (EV_A_ (W)w, ++timercnt); 1439 ev_start (EV_A_ (W)w, ++timercnt);
1163 array_needsize (timers, timermax, timercnt, ); 1440 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1164 timers [timercnt - 1] = w; 1441 timers [timercnt - 1] = w;
1165 upheap ((WT *)timers, timercnt - 1); 1442 upheap ((WT *)timers, timercnt - 1);
1166 1443
1167 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1444 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1168} 1445}
1169 1446
1170void 1447void
1171ev_timer_stop (EV_P_ struct ev_timer *w) 1448ev_timer_stop (EV_P_ ev_timer *w)
1172{ 1449{
1173 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1174 if (!ev_is_active (w)) 1451 if (expect_false (!ev_is_active (w)))
1175 return; 1452 return;
1176 1453
1177 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1454 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1178 1455
1179 if (((W)w)->active < timercnt--) 1456 if (expect_true (((W)w)->active < timercnt--))
1180 { 1457 {
1181 timers [((W)w)->active - 1] = timers [timercnt]; 1458 timers [((W)w)->active - 1] = timers [timercnt];
1182 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1459 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1183 } 1460 }
1184 1461
1185 ((WT)w)->at = w->repeat; 1462 ((WT)w)->at -= mn_now;
1186 1463
1187 ev_stop (EV_A_ (W)w); 1464 ev_stop (EV_A_ (W)w);
1188} 1465}
1189 1466
1190void 1467void
1191ev_timer_again (EV_P_ struct ev_timer *w) 1468ev_timer_again (EV_P_ ev_timer *w)
1192{ 1469{
1193 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1194 { 1471 {
1195 if (w->repeat) 1472 if (w->repeat)
1196 { 1473 {
1197 ((WT)w)->at = mn_now + w->repeat; 1474 ((WT)w)->at = mn_now + w->repeat;
1198 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1475 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1199 } 1476 }
1200 else 1477 else
1201 ev_timer_stop (EV_A_ w); 1478 ev_timer_stop (EV_A_ w);
1202 } 1479 }
1203 else if (w->repeat) 1480 else if (w->repeat)
1481 {
1482 w->at = w->repeat;
1204 ev_timer_start (EV_A_ w); 1483 ev_timer_start (EV_A_ w);
1484 }
1205} 1485}
1206 1486
1487#if EV_PERIODICS
1207void 1488void
1208ev_periodic_start (EV_P_ struct ev_periodic *w) 1489ev_periodic_start (EV_P_ ev_periodic *w)
1209{ 1490{
1210 if (ev_is_active (w)) 1491 if (expect_false (ev_is_active (w)))
1211 return; 1492 return;
1212 1493
1494 if (w->reschedule_cb)
1495 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1496 else if (w->interval)
1497 {
1213 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1498 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1214
1215 /* this formula differs from the one in periodic_reify because we do not always round up */ 1499 /* this formula differs from the one in periodic_reify because we do not always round up */
1216 if (w->interval)
1217 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1500 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1501 }
1218 1502
1219 ev_start (EV_A_ (W)w, ++periodiccnt); 1503 ev_start (EV_A_ (W)w, ++periodiccnt);
1220 array_needsize (periodics, periodicmax, periodiccnt, ); 1504 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1221 periodics [periodiccnt - 1] = w; 1505 periodics [periodiccnt - 1] = w;
1222 upheap ((WT *)periodics, periodiccnt - 1); 1506 upheap ((WT *)periodics, periodiccnt - 1);
1223 1507
1224 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1508 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1225} 1509}
1226 1510
1227void 1511void
1228ev_periodic_stop (EV_P_ struct ev_periodic *w) 1512ev_periodic_stop (EV_P_ ev_periodic *w)
1229{ 1513{
1230 ev_clear_pending (EV_A_ (W)w); 1514 ev_clear_pending (EV_A_ (W)w);
1231 if (!ev_is_active (w)) 1515 if (expect_false (!ev_is_active (w)))
1232 return; 1516 return;
1233 1517
1234 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1518 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1235 1519
1236 if (((W)w)->active < periodiccnt--) 1520 if (expect_true (((W)w)->active < periodiccnt--))
1237 { 1521 {
1238 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1522 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1239 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1523 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1240 } 1524 }
1241 1525
1242 ev_stop (EV_A_ (W)w); 1526 ev_stop (EV_A_ (W)w);
1243} 1527}
1244 1528
1245void 1529void
1530ev_periodic_again (EV_P_ ev_periodic *w)
1531{
1532 /* TODO: use adjustheap and recalculation */
1533 ev_periodic_stop (EV_A_ w);
1534 ev_periodic_start (EV_A_ w);
1535}
1536#endif
1537
1538void
1246ev_idle_start (EV_P_ struct ev_idle *w) 1539ev_idle_start (EV_P_ ev_idle *w)
1247{ 1540{
1248 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1249 return; 1542 return;
1250 1543
1251 ev_start (EV_A_ (W)w, ++idlecnt); 1544 ev_start (EV_A_ (W)w, ++idlecnt);
1252 array_needsize (idles, idlemax, idlecnt, ); 1545 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1253 idles [idlecnt - 1] = w; 1546 idles [idlecnt - 1] = w;
1254} 1547}
1255 1548
1256void 1549void
1257ev_idle_stop (EV_P_ struct ev_idle *w) 1550ev_idle_stop (EV_P_ ev_idle *w)
1258{ 1551{
1259 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1260 if (ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1261 return; 1554 return;
1262 1555
1263 idles [((W)w)->active - 1] = idles [--idlecnt]; 1556 idles [((W)w)->active - 1] = idles [--idlecnt];
1264 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1265} 1558}
1266 1559
1267void 1560void
1268ev_prepare_start (EV_P_ struct ev_prepare *w) 1561ev_prepare_start (EV_P_ ev_prepare *w)
1269{ 1562{
1270 if (ev_is_active (w)) 1563 if (expect_false (ev_is_active (w)))
1271 return; 1564 return;
1272 1565
1273 ev_start (EV_A_ (W)w, ++preparecnt); 1566 ev_start (EV_A_ (W)w, ++preparecnt);
1274 array_needsize (prepares, preparemax, preparecnt, ); 1567 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1275 prepares [preparecnt - 1] = w; 1568 prepares [preparecnt - 1] = w;
1276} 1569}
1277 1570
1278void 1571void
1279ev_prepare_stop (EV_P_ struct ev_prepare *w) 1572ev_prepare_stop (EV_P_ ev_prepare *w)
1280{ 1573{
1281 ev_clear_pending (EV_A_ (W)w); 1574 ev_clear_pending (EV_A_ (W)w);
1282 if (ev_is_active (w)) 1575 if (expect_false (!ev_is_active (w)))
1283 return; 1576 return;
1284 1577
1285 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1578 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1286 ev_stop (EV_A_ (W)w); 1579 ev_stop (EV_A_ (W)w);
1287} 1580}
1288 1581
1289void 1582void
1290ev_check_start (EV_P_ struct ev_check *w) 1583ev_check_start (EV_P_ ev_check *w)
1291{ 1584{
1292 if (ev_is_active (w)) 1585 if (expect_false (ev_is_active (w)))
1293 return; 1586 return;
1294 1587
1295 ev_start (EV_A_ (W)w, ++checkcnt); 1588 ev_start (EV_A_ (W)w, ++checkcnt);
1296 array_needsize (checks, checkmax, checkcnt, ); 1589 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1297 checks [checkcnt - 1] = w; 1590 checks [checkcnt - 1] = w;
1298} 1591}
1299 1592
1300void 1593void
1301ev_check_stop (EV_P_ struct ev_check *w) 1594ev_check_stop (EV_P_ ev_check *w)
1302{ 1595{
1303 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1304 if (ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1305 return; 1598 return;
1306 1599
1307 checks [((W)w)->active - 1] = checks [--checkcnt]; 1600 checks [((W)w)->active - 1] = checks [--checkcnt];
1308 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1309} 1602}
1311#ifndef SA_RESTART 1604#ifndef SA_RESTART
1312# define SA_RESTART 0 1605# define SA_RESTART 0
1313#endif 1606#endif
1314 1607
1315void 1608void
1316ev_signal_start (EV_P_ struct ev_signal *w) 1609ev_signal_start (EV_P_ ev_signal *w)
1317{ 1610{
1318#if EV_MULTIPLICITY 1611#if EV_MULTIPLICITY
1319 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1612 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1320#endif 1613#endif
1321 if (ev_is_active (w)) 1614 if (expect_false (ev_is_active (w)))
1322 return; 1615 return;
1323 1616
1324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1617 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1325 1618
1326 ev_start (EV_A_ (W)w, 1); 1619 ev_start (EV_A_ (W)w, 1);
1327 array_needsize (signals, signalmax, w->signum, signals_init); 1620 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1328 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1621 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1329 1622
1330 if (!((WL)w)->next) 1623 if (!((WL)w)->next)
1331 { 1624 {
1332#if WIN32 1625#if _WIN32
1333 signal (w->signum, sighandler); 1626 signal (w->signum, sighandler);
1334#else 1627#else
1335 struct sigaction sa; 1628 struct sigaction sa;
1336 sa.sa_handler = sighandler; 1629 sa.sa_handler = sighandler;
1337 sigfillset (&sa.sa_mask); 1630 sigfillset (&sa.sa_mask);
1340#endif 1633#endif
1341 } 1634 }
1342} 1635}
1343 1636
1344void 1637void
1345ev_signal_stop (EV_P_ struct ev_signal *w) 1638ev_signal_stop (EV_P_ ev_signal *w)
1346{ 1639{
1347 ev_clear_pending (EV_A_ (W)w); 1640 ev_clear_pending (EV_A_ (W)w);
1348 if (!ev_is_active (w)) 1641 if (expect_false (!ev_is_active (w)))
1349 return; 1642 return;
1350 1643
1351 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1644 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1352 ev_stop (EV_A_ (W)w); 1645 ev_stop (EV_A_ (W)w);
1353 1646
1354 if (!signals [w->signum - 1].head) 1647 if (!signals [w->signum - 1].head)
1355 signal (w->signum, SIG_DFL); 1648 signal (w->signum, SIG_DFL);
1356} 1649}
1357 1650
1358void 1651void
1359ev_child_start (EV_P_ struct ev_child *w) 1652ev_child_start (EV_P_ ev_child *w)
1360{ 1653{
1361#if EV_MULTIPLICITY 1654#if EV_MULTIPLICITY
1362 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1655 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1363#endif 1656#endif
1364 if (ev_is_active (w)) 1657 if (expect_false (ev_is_active (w)))
1365 return; 1658 return;
1366 1659
1367 ev_start (EV_A_ (W)w, 1); 1660 ev_start (EV_A_ (W)w, 1);
1368 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1661 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1369} 1662}
1370 1663
1371void 1664void
1372ev_child_stop (EV_P_ struct ev_child *w) 1665ev_child_stop (EV_P_ ev_child *w)
1373{ 1666{
1374 ev_clear_pending (EV_A_ (W)w); 1667 ev_clear_pending (EV_A_ (W)w);
1375 if (ev_is_active (w)) 1668 if (expect_false (!ev_is_active (w)))
1376 return; 1669 return;
1377 1670
1378 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1671 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1379 ev_stop (EV_A_ (W)w); 1672 ev_stop (EV_A_ (W)w);
1380} 1673}
1381 1674
1675#if EV_MULTIPLICITY
1676void
1677ev_embed_loop (EV_P_ ev_embed *w)
1678{
1679 ev_loop (w->loop, EVLOOP_NONBLOCK);
1680}
1681
1682static void
1683embed_cb (EV_P_ ev_io *io, int revents)
1684{
1685 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1686
1687 if (ev_cb (w))
1688 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1689 else
1690 ev_embed_loop (loop, w);
1691}
1692
1693void
1694ev_embed_start (EV_P_ ev_embed *w)
1695{
1696 if (expect_false (ev_is_active (w)))
1697 return;
1698
1699 {
1700 struct ev_loop *loop = w->loop;
1701 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1702 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1703 }
1704
1705 ev_set_priority (&w->io, ev_priority (w));
1706 ev_io_start (EV_A_ &w->io);
1707 ev_start (EV_A_ (W)w, 1);
1708}
1709
1710void
1711ev_embed_stop (EV_P_ ev_embed *w)
1712{
1713 ev_clear_pending (EV_A_ (W)w);
1714 if (expect_false (!ev_is_active (w)))
1715 return;
1716
1717 ev_io_stop (EV_A_ &w->io);
1718 ev_stop (EV_A_ (W)w);
1719}
1720#endif
1721
1382/*****************************************************************************/ 1722/*****************************************************************************/
1383 1723
1384struct ev_once 1724struct ev_once
1385{ 1725{
1386 struct ev_io io; 1726 ev_io io;
1387 struct ev_timer to; 1727 ev_timer to;
1388 void (*cb)(int revents, void *arg); 1728 void (*cb)(int revents, void *arg);
1389 void *arg; 1729 void *arg;
1390}; 1730};
1391 1731
1392static void 1732static void
1395 void (*cb)(int revents, void *arg) = once->cb; 1735 void (*cb)(int revents, void *arg) = once->cb;
1396 void *arg = once->arg; 1736 void *arg = once->arg;
1397 1737
1398 ev_io_stop (EV_A_ &once->io); 1738 ev_io_stop (EV_A_ &once->io);
1399 ev_timer_stop (EV_A_ &once->to); 1739 ev_timer_stop (EV_A_ &once->to);
1400 free (once); 1740 ev_free (once);
1401 1741
1402 cb (revents, arg); 1742 cb (revents, arg);
1403} 1743}
1404 1744
1405static void 1745static void
1406once_cb_io (EV_P_ struct ev_io *w, int revents) 1746once_cb_io (EV_P_ ev_io *w, int revents)
1407{ 1747{
1408 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1748 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1409} 1749}
1410 1750
1411static void 1751static void
1412once_cb_to (EV_P_ struct ev_timer *w, int revents) 1752once_cb_to (EV_P_ ev_timer *w, int revents)
1413{ 1753{
1414 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1754 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1415} 1755}
1416 1756
1417void 1757void
1418ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1758ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1419{ 1759{
1420 struct ev_once *once = malloc (sizeof (struct ev_once)); 1760 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1421 1761
1422 if (!once) 1762 if (expect_false (!once))
1763 {
1423 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1764 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1424 else 1765 return;
1425 { 1766 }
1767
1426 once->cb = cb; 1768 once->cb = cb;
1427 once->arg = arg; 1769 once->arg = arg;
1428 1770
1429 ev_watcher_init (&once->io, once_cb_io); 1771 ev_init (&once->io, once_cb_io);
1430 if (fd >= 0) 1772 if (fd >= 0)
1431 { 1773 {
1432 ev_io_set (&once->io, fd, events); 1774 ev_io_set (&once->io, fd, events);
1433 ev_io_start (EV_A_ &once->io); 1775 ev_io_start (EV_A_ &once->io);
1434 } 1776 }
1435 1777
1436 ev_watcher_init (&once->to, once_cb_to); 1778 ev_init (&once->to, once_cb_to);
1437 if (timeout >= 0.) 1779 if (timeout >= 0.)
1438 { 1780 {
1439 ev_timer_set (&once->to, timeout, 0.); 1781 ev_timer_set (&once->to, timeout, 0.);
1440 ev_timer_start (EV_A_ &once->to); 1782 ev_timer_start (EV_A_ &once->to);
1441 }
1442 } 1783 }
1443} 1784}
1444 1785
1786#ifdef __cplusplus
1787}
1788#endif
1789

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines