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

Comparing libev/ev.c (file contents):
Revision 1.123 by root, Sat Nov 17 02:23:54 2007 UTC vs.
Revision 1.184 by root, Wed Dec 12 05:30:52 2007 UTC

32#ifdef __cplusplus 32#ifdef __cplusplus
33extern "C" { 33extern "C" {
34#endif 34#endif
35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
37# include "config.h" 40# include "config.h"
41# endif
38 42
39# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC 44# ifndef EV_USE_MONOTONIC
41# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
42# endif 46# endif
43# ifndef EV_USE_REALTIME 47# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
45# endif 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
46# endif 57# endif
47 58
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 59# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H
49# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
50# endif 65# endif
51 66
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 67# ifndef EV_USE_POLL
68# if HAVE_POLL && HAVE_POLL_H
53# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
54# endif 73# endif
55 74
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 75# ifndef EV_USE_EPOLL
76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
57# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
58# endif 81# endif
59 82
83# ifndef EV_USE_KQUEUE
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
61# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
62# endif 89# endif
63 90
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) 91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
65# define EV_USE_PORT 1 93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
97# endif
98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
66# endif 105# endif
67 106
68#endif 107#endif
69 108
70#include <math.h> 109#include <math.h>
79#include <sys/types.h> 118#include <sys/types.h>
80#include <time.h> 119#include <time.h>
81 120
82#include <signal.h> 121#include <signal.h>
83 122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
128
84#ifndef _WIN32 129#ifndef _WIN32
85# include <unistd.h>
86# include <sys/time.h> 130# include <sys/time.h>
87# include <sys/wait.h> 131# include <sys/wait.h>
132# include <unistd.h>
88#else 133#else
89# define WIN32_LEAN_AND_MEAN 134# define WIN32_LEAN_AND_MEAN
90# include <windows.h> 135# include <windows.h>
91# ifndef EV_SELECT_IS_WINSOCKET 136# ifndef EV_SELECT_IS_WINSOCKET
92# define EV_SELECT_IS_WINSOCKET 1 137# define EV_SELECT_IS_WINSOCKET 1
125 170
126#ifndef EV_USE_PORT 171#ifndef EV_USE_PORT
127# define EV_USE_PORT 0 172# define EV_USE_PORT 0
128#endif 173#endif
129 174
175#ifndef EV_USE_INOTIFY
176# define EV_USE_INOTIFY 0
177#endif
178
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
182# else
183# define EV_PID_HASHSIZE 16
184# endif
185#endif
186
187#ifndef EV_INOTIFY_HASHSIZE
188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
193#endif
194
130/**/ 195/**/
131
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
137 196
138#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
139# undef EV_USE_MONOTONIC 198# undef EV_USE_MONOTONIC
140# define EV_USE_MONOTONIC 0 199# define EV_USE_MONOTONIC 0
141#endif 200#endif
147 206
148#if EV_SELECT_IS_WINSOCKET 207#if EV_SELECT_IS_WINSOCKET
149# include <winsock.h> 208# include <winsock.h>
150#endif 209#endif
151 210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
152/**/ 219/**/
220
221/*
222 * This is used to avoid floating point rounding problems.
223 * It is added to ev_rt_now when scheduling periodics
224 * to ensure progress, time-wise, even when rounding
225 * errors are against us.
226 * This value is good at least till the year 4000.
227 * Better solutions welcome.
228 */
229#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
153 230
154#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
155#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
156#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
157/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
158
159#ifdef EV_H
160# include EV_H
161#else
162# include "ev.h"
163#endif
164 234
165#if __GNUC__ >= 3 235#if __GNUC__ >= 3
166# define expect(expr,value) __builtin_expect ((expr),(value)) 236# define expect(expr,value) __builtin_expect ((expr),(value))
167# define inline static inline 237# define noinline __attribute__ ((noinline))
168#else 238#else
169# define expect(expr,value) (expr) 239# define expect(expr,value) (expr)
170# define inline static 240# define noinline
241# if __STDC_VERSION__ < 199901L
242# define inline
243# endif
171#endif 244#endif
172 245
173#define expect_false(expr) expect ((expr) != 0, 0) 246#define expect_false(expr) expect ((expr) != 0, 0)
174#define expect_true(expr) expect ((expr) != 0, 1) 247#define expect_true(expr) expect ((expr) != 0, 1)
248#define inline_size static inline
249
250#if EV_MINIMAL
251# define inline_speed static noinline
252#else
253# define inline_speed static inline
254#endif
175 255
176#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 256#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
177#define ABSPRI(w) ((w)->priority - EV_MINPRI) 257#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
178 258
179#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 259#define EMPTY /* required for microsofts broken pseudo-c compiler */
180#define EMPTY2(a,b) /* used to suppress some warnings */ 260#define EMPTY2(a,b) /* used to suppress some warnings */
181 261
182typedef struct ev_watcher *W; 262typedef ev_watcher *W;
183typedef struct ev_watcher_list *WL; 263typedef ev_watcher_list *WL;
184typedef struct ev_watcher_time *WT; 264typedef ev_watcher_time *WT;
185 265
186static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
187 267
188#ifdef _WIN32 268#ifdef _WIN32
189# include "ev_win32.c" 269# include "ev_win32.c"
191 271
192/*****************************************************************************/ 272/*****************************************************************************/
193 273
194static void (*syserr_cb)(const char *msg); 274static void (*syserr_cb)(const char *msg);
195 275
276void
196void ev_set_syserr_cb (void (*cb)(const char *msg)) 277ev_set_syserr_cb (void (*cb)(const char *msg))
197{ 278{
198 syserr_cb = cb; 279 syserr_cb = cb;
199} 280}
200 281
201static void 282static void noinline
202syserr (const char *msg) 283syserr (const char *msg)
203{ 284{
204 if (!msg) 285 if (!msg)
205 msg = "(libev) system error"; 286 msg = "(libev) system error";
206 287
213 } 294 }
214} 295}
215 296
216static void *(*alloc)(void *ptr, long size); 297static void *(*alloc)(void *ptr, long size);
217 298
299void
218void ev_set_allocator (void *(*cb)(void *ptr, long size)) 300ev_set_allocator (void *(*cb)(void *ptr, long size))
219{ 301{
220 alloc = cb; 302 alloc = cb;
221} 303}
222 304
223static void * 305inline_speed void *
224ev_realloc (void *ptr, long size) 306ev_realloc (void *ptr, long size)
225{ 307{
226 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
227 309
228 if (!ptr && size) 310 if (!ptr && size)
252typedef struct 334typedef struct
253{ 335{
254 W w; 336 W w;
255 int events; 337 int events;
256} ANPENDING; 338} ANPENDING;
339
340#if EV_USE_INOTIFY
341typedef struct
342{
343 WL head;
344} ANFS;
345#endif
257 346
258#if EV_MULTIPLICITY 347#if EV_MULTIPLICITY
259 348
260 struct ev_loop 349 struct ev_loop
261 { 350 {
295 gettimeofday (&tv, 0); 384 gettimeofday (&tv, 0);
296 return tv.tv_sec + tv.tv_usec * 1e-6; 385 return tv.tv_sec + tv.tv_usec * 1e-6;
297#endif 386#endif
298} 387}
299 388
300inline ev_tstamp 389ev_tstamp inline_size
301get_clock (void) 390get_clock (void)
302{ 391{
303#if EV_USE_MONOTONIC 392#if EV_USE_MONOTONIC
304 if (expect_true (have_monotonic)) 393 if (expect_true (have_monotonic))
305 { 394 {
318{ 407{
319 return ev_rt_now; 408 return ev_rt_now;
320} 409}
321#endif 410#endif
322 411
323#define array_roundsize(type,n) (((n) | 4) & ~3) 412int inline_size
413array_nextsize (int elem, int cur, int cnt)
414{
415 int ncur = cur + 1;
416
417 do
418 ncur <<= 1;
419 while (cnt > ncur);
420
421 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
422 if (elem * ncur > 4096)
423 {
424 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
426 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem;
428 }
429
430 return ncur;
431}
432
433static noinline void *
434array_realloc (int elem, void *base, int *cur, int cnt)
435{
436 *cur = array_nextsize (elem, *cur, cnt);
437 return ev_realloc (base, elem * *cur);
438}
324 439
325#define array_needsize(type,base,cur,cnt,init) \ 440#define array_needsize(type,base,cur,cnt,init) \
326 if (expect_false ((cnt) > cur)) \ 441 if (expect_false ((cnt) > (cur))) \
327 { \ 442 { \
328 int newcnt = cur; \ 443 int ocur_ = (cur); \
329 do \ 444 (base) = (type *)array_realloc \
330 { \ 445 (sizeof (type), (base), &(cur), (cnt)); \
331 newcnt = array_roundsize (type, newcnt << 1); \ 446 init ((base) + (ocur_), (cur) - ocur_); \
332 } \
333 while ((cnt) > newcnt); \
334 \
335 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
336 init (base + cur, newcnt - cur); \
337 cur = newcnt; \
338 } 447 }
339 448
449#if 0
340#define array_slim(type,stem) \ 450#define array_slim(type,stem) \
341 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 451 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
342 { \ 452 { \
343 stem ## max = array_roundsize (stem ## cnt >> 1); \ 453 stem ## max = array_roundsize (stem ## cnt >> 1); \
344 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 454 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
345 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 455 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
346 } 456 }
457#endif
347 458
348#define array_free(stem, idx) \ 459#define array_free(stem, idx) \
349 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 460 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
350 461
351/*****************************************************************************/ 462/*****************************************************************************/
352 463
353static void 464void noinline
465ev_feed_event (EV_P_ void *w, int revents)
466{
467 W w_ = (W)w;
468 int pri = ABSPRI (w_);
469
470 if (expect_false (w_->pending))
471 pendings [pri][w_->pending - 1].events |= revents;
472 else
473 {
474 w_->pending = ++pendingcnt [pri];
475 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
476 pendings [pri][w_->pending - 1].w = w_;
477 pendings [pri][w_->pending - 1].events = revents;
478 }
479}
480
481void inline_speed
482queue_events (EV_P_ W *events, int eventcnt, int type)
483{
484 int i;
485
486 for (i = 0; i < eventcnt; ++i)
487 ev_feed_event (EV_A_ events [i], type);
488}
489
490/*****************************************************************************/
491
492void inline_size
354anfds_init (ANFD *base, int count) 493anfds_init (ANFD *base, int count)
355{ 494{
356 while (count--) 495 while (count--)
357 { 496 {
358 base->head = 0; 497 base->head = 0;
361 500
362 ++base; 501 ++base;
363 } 502 }
364} 503}
365 504
366void 505void inline_speed
367ev_feed_event (EV_P_ void *w, int revents)
368{
369 W w_ = (W)w;
370
371 if (expect_false (w_->pending))
372 {
373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
374 return;
375 }
376
377 w_->pending = ++pendingcnt [ABSPRI (w_)];
378 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
381}
382
383static void
384queue_events (EV_P_ W *events, int eventcnt, int type)
385{
386 int i;
387
388 for (i = 0; i < eventcnt; ++i)
389 ev_feed_event (EV_A_ events [i], type);
390}
391
392inline void
393fd_event (EV_P_ int fd, int revents) 506fd_event (EV_P_ int fd, int revents)
394{ 507{
395 ANFD *anfd = anfds + fd; 508 ANFD *anfd = anfds + fd;
396 struct ev_io *w; 509 ev_io *w;
397 510
398 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 511 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
399 { 512 {
400 int ev = w->events & revents; 513 int ev = w->events & revents;
401 514
402 if (ev) 515 if (ev)
403 ev_feed_event (EV_A_ (W)w, ev); 516 ev_feed_event (EV_A_ (W)w, ev);
405} 518}
406 519
407void 520void
408ev_feed_fd_event (EV_P_ int fd, int revents) 521ev_feed_fd_event (EV_P_ int fd, int revents)
409{ 522{
523 if (fd >= 0 && fd < anfdmax)
410 fd_event (EV_A_ fd, revents); 524 fd_event (EV_A_ fd, revents);
411} 525}
412 526
413/*****************************************************************************/ 527void inline_size
414
415inline void
416fd_reify (EV_P) 528fd_reify (EV_P)
417{ 529{
418 int i; 530 int i;
419 531
420 for (i = 0; i < fdchangecnt; ++i) 532 for (i = 0; i < fdchangecnt; ++i)
421 { 533 {
422 int fd = fdchanges [i]; 534 int fd = fdchanges [i];
423 ANFD *anfd = anfds + fd; 535 ANFD *anfd = anfds + fd;
424 struct ev_io *w; 536 ev_io *w;
425 537
426 int events = 0; 538 unsigned char events = 0;
427 539
428 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 540 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
429 events |= w->events; 541 events |= (unsigned char)w->events;
430 542
431#if EV_SELECT_IS_WINSOCKET 543#if EV_SELECT_IS_WINSOCKET
432 if (events) 544 if (events)
433 { 545 {
434 unsigned long argp; 546 unsigned long argp;
435 anfd->handle = _get_osfhandle (fd); 547 anfd->handle = _get_osfhandle (fd);
436 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
437 } 549 }
438#endif 550#endif
439 551
552 {
553 unsigned char o_events = anfd->events;
554 unsigned char o_reify = anfd->reify;
555
440 anfd->reify = 0; 556 anfd->reify = 0;
441
442 method_modify (EV_A_ fd, anfd->events, events);
443 anfd->events = events; 557 anfd->events = events;
558
559 if (o_events != events || o_reify & EV_IOFDSET)
560 backend_modify (EV_A_ fd, o_events, events);
561 }
444 } 562 }
445 563
446 fdchangecnt = 0; 564 fdchangecnt = 0;
447} 565}
448 566
449static void 567void inline_size
450fd_change (EV_P_ int fd) 568fd_change (EV_P_ int fd, int flags)
451{ 569{
452 if (expect_false (anfds [fd].reify)) 570 unsigned char reify = anfds [fd].reify;
453 return;
454
455 anfds [fd].reify = 1; 571 anfds [fd].reify |= flags;
456 572
573 if (expect_true (!reify))
574 {
457 ++fdchangecnt; 575 ++fdchangecnt;
458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 576 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
459 fdchanges [fdchangecnt - 1] = fd; 577 fdchanges [fdchangecnt - 1] = fd;
578 }
460} 579}
461 580
462static void 581void inline_speed
463fd_kill (EV_P_ int fd) 582fd_kill (EV_P_ int fd)
464{ 583{
465 struct ev_io *w; 584 ev_io *w;
466 585
467 while ((w = (struct ev_io *)anfds [fd].head)) 586 while ((w = (ev_io *)anfds [fd].head))
468 { 587 {
469 ev_io_stop (EV_A_ w); 588 ev_io_stop (EV_A_ w);
470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 589 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
471 } 590 }
472} 591}
473 592
474inline int 593int inline_size
475fd_valid (int fd) 594fd_valid (int fd)
476{ 595{
477#ifdef _WIN32 596#ifdef _WIN32
478 return _get_osfhandle (fd) != -1; 597 return _get_osfhandle (fd) != -1;
479#else 598#else
480 return fcntl (fd, F_GETFD) != -1; 599 return fcntl (fd, F_GETFD) != -1;
481#endif 600#endif
482} 601}
483 602
484/* called on EBADF to verify fds */ 603/* called on EBADF to verify fds */
485static void 604static void noinline
486fd_ebadf (EV_P) 605fd_ebadf (EV_P)
487{ 606{
488 int fd; 607 int fd;
489 608
490 for (fd = 0; fd < anfdmax; ++fd) 609 for (fd = 0; fd < anfdmax; ++fd)
492 if (!fd_valid (fd) == -1 && errno == EBADF) 611 if (!fd_valid (fd) == -1 && errno == EBADF)
493 fd_kill (EV_A_ fd); 612 fd_kill (EV_A_ fd);
494} 613}
495 614
496/* called on ENOMEM in select/poll to kill some fds and retry */ 615/* called on ENOMEM in select/poll to kill some fds and retry */
497static void 616static void noinline
498fd_enomem (EV_P) 617fd_enomem (EV_P)
499{ 618{
500 int fd; 619 int fd;
501 620
502 for (fd = anfdmax; fd--; ) 621 for (fd = anfdmax; fd--; )
505 fd_kill (EV_A_ fd); 624 fd_kill (EV_A_ fd);
506 return; 625 return;
507 } 626 }
508} 627}
509 628
510/* usually called after fork if method needs to re-arm all fds from scratch */ 629/* usually called after fork if backend needs to re-arm all fds from scratch */
511static void 630static void noinline
512fd_rearm_all (EV_P) 631fd_rearm_all (EV_P)
513{ 632{
514 int fd; 633 int fd;
515 634
516 /* this should be highly optimised to not do anything but set a flag */
517 for (fd = 0; fd < anfdmax; ++fd) 635 for (fd = 0; fd < anfdmax; ++fd)
518 if (anfds [fd].events) 636 if (anfds [fd].events)
519 { 637 {
520 anfds [fd].events = 0; 638 anfds [fd].events = 0;
521 fd_change (EV_A_ fd); 639 fd_change (EV_A_ fd, EV_IOFDSET | 1);
522 } 640 }
523} 641}
524 642
525/*****************************************************************************/ 643/*****************************************************************************/
526 644
527static void 645void inline_speed
528upheap (WT *heap, int k) 646upheap (WT *heap, int k)
529{ 647{
530 WT w = heap [k]; 648 WT w = heap [k];
531 649
532 while (k && heap [k >> 1]->at > w->at) 650 while (k)
533 { 651 {
652 int p = (k - 1) >> 1;
653
654 if (heap [p]->at <= w->at)
655 break;
656
534 heap [k] = heap [k >> 1]; 657 heap [k] = heap [p];
535 ((W)heap [k])->active = k + 1; 658 ((W)heap [k])->active = k + 1;
536 k >>= 1; 659 k = p;
537 } 660 }
538 661
539 heap [k] = w; 662 heap [k] = w;
540 ((W)heap [k])->active = k + 1; 663 ((W)heap [k])->active = k + 1;
541
542} 664}
543 665
544static void 666void inline_speed
545downheap (WT *heap, int N, int k) 667downheap (WT *heap, int N, int k)
546{ 668{
547 WT w = heap [k]; 669 WT w = heap [k];
548 670
549 while (k < (N >> 1)) 671 for (;;)
550 { 672 {
551 int j = k << 1; 673 int c = (k << 1) + 1;
552 674
553 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 675 if (c >= N)
554 ++j;
555
556 if (w->at <= heap [j]->at)
557 break; 676 break;
558 677
678 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
679 ? 1 : 0;
680
681 if (w->at <= heap [c]->at)
682 break;
683
559 heap [k] = heap [j]; 684 heap [k] = heap [c];
560 ((W)heap [k])->active = k + 1; 685 ((W)heap [k])->active = k + 1;
686
561 k = j; 687 k = c;
562 } 688 }
563 689
564 heap [k] = w; 690 heap [k] = w;
565 ((W)heap [k])->active = k + 1; 691 ((W)heap [k])->active = k + 1;
566} 692}
567 693
568inline void 694void inline_size
569adjustheap (WT *heap, int N, int k) 695adjustheap (WT *heap, int N, int k)
570{ 696{
571 upheap (heap, k); 697 upheap (heap, k);
572 downheap (heap, N, k); 698 downheap (heap, N, k);
573} 699}
583static ANSIG *signals; 709static ANSIG *signals;
584static int signalmax; 710static int signalmax;
585 711
586static int sigpipe [2]; 712static int sigpipe [2];
587static sig_atomic_t volatile gotsig; 713static sig_atomic_t volatile gotsig;
588static struct ev_io sigev; 714static ev_io sigev;
589 715
590static void 716void inline_size
591signals_init (ANSIG *base, int count) 717signals_init (ANSIG *base, int count)
592{ 718{
593 while (count--) 719 while (count--)
594 { 720 {
595 base->head = 0; 721 base->head = 0;
615 write (sigpipe [1], &signum, 1); 741 write (sigpipe [1], &signum, 1);
616 errno = old_errno; 742 errno = old_errno;
617 } 743 }
618} 744}
619 745
620void 746void noinline
621ev_feed_signal_event (EV_P_ int signum) 747ev_feed_signal_event (EV_P_ int signum)
622{ 748{
623 WL w; 749 WL w;
624 750
625#if EV_MULTIPLICITY 751#if EV_MULTIPLICITY
636 for (w = signals [signum].head; w; w = w->next) 762 for (w = signals [signum].head; w; w = w->next)
637 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 763 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
638} 764}
639 765
640static void 766static void
641sigcb (EV_P_ struct ev_io *iow, int revents) 767sigcb (EV_P_ ev_io *iow, int revents)
642{ 768{
643 int signum; 769 int signum;
644 770
645 read (sigpipe [0], &revents, 1); 771 read (sigpipe [0], &revents, 1);
646 gotsig = 0; 772 gotsig = 0;
648 for (signum = signalmax; signum--; ) 774 for (signum = signalmax; signum--; )
649 if (signals [signum].gotsig) 775 if (signals [signum].gotsig)
650 ev_feed_signal_event (EV_A_ signum + 1); 776 ev_feed_signal_event (EV_A_ signum + 1);
651} 777}
652 778
653static void 779void inline_speed
654fd_intern (int fd) 780fd_intern (int fd)
655{ 781{
656#ifdef _WIN32 782#ifdef _WIN32
657 int arg = 1; 783 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 784 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
660 fcntl (fd, F_SETFD, FD_CLOEXEC); 786 fcntl (fd, F_SETFD, FD_CLOEXEC);
661 fcntl (fd, F_SETFL, O_NONBLOCK); 787 fcntl (fd, F_SETFL, O_NONBLOCK);
662#endif 788#endif
663} 789}
664 790
665static void 791static void noinline
666siginit (EV_P) 792siginit (EV_P)
667{ 793{
668 fd_intern (sigpipe [0]); 794 fd_intern (sigpipe [0]);
669 fd_intern (sigpipe [1]); 795 fd_intern (sigpipe [1]);
670 796
673 ev_unref (EV_A); /* child watcher should not keep loop alive */ 799 ev_unref (EV_A); /* child watcher should not keep loop alive */
674} 800}
675 801
676/*****************************************************************************/ 802/*****************************************************************************/
677 803
678static struct ev_child *childs [PID_HASHSIZE]; 804static WL childs [EV_PID_HASHSIZE];
679 805
680#ifndef _WIN32 806#ifndef _WIN32
681 807
682static struct ev_signal childev; 808static ev_signal childev;
809
810void inline_speed
811child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
812{
813 ev_child *w;
814
815 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
816 if (w->pid == pid || !w->pid)
817 {
818 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
819 w->rpid = pid;
820 w->rstatus = status;
821 ev_feed_event (EV_A_ (W)w, EV_CHILD);
822 }
823}
683 824
684#ifndef WCONTINUED 825#ifndef WCONTINUED
685# define WCONTINUED 0 826# define WCONTINUED 0
686#endif 827#endif
687 828
688static void 829static void
689child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
690{
691 struct ev_child *w;
692
693 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
694 if (w->pid == pid || !w->pid)
695 {
696 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
697 w->rpid = pid;
698 w->rstatus = status;
699 ev_feed_event (EV_A_ (W)w, EV_CHILD);
700 }
701}
702
703static void
704childcb (EV_P_ struct ev_signal *sw, int revents) 830childcb (EV_P_ ev_signal *sw, int revents)
705{ 831{
706 int pid, status; 832 int pid, status;
707 833
834 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
708 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 835 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
709 { 836 if (!WCONTINUED
837 || errno != EINVAL
838 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
839 return;
840
710 /* make sure we are called again until all childs have been reaped */ 841 /* make sure we are called again until all childs have been reaped */
842 /* we need to do it this way so that the callback gets called before we continue */
711 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 843 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
712 844
713 child_reap (EV_A_ sw, pid, pid, status); 845 child_reap (EV_A_ sw, pid, pid, status);
846 if (EV_PID_HASHSIZE > 1)
714 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 847 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
715 }
716} 848}
717 849
718#endif 850#endif
719 851
720/*****************************************************************************/ 852/*****************************************************************************/
746{ 878{
747 return EV_VERSION_MINOR; 879 return EV_VERSION_MINOR;
748} 880}
749 881
750/* return true if we are running with elevated privileges and should ignore env variables */ 882/* return true if we are running with elevated privileges and should ignore env variables */
751static int 883int inline_size
752enable_secure (void) 884enable_secure (void)
753{ 885{
754#ifdef _WIN32 886#ifdef _WIN32
755 return 0; 887 return 0;
756#else 888#else
758 || getgid () != getegid (); 890 || getgid () != getegid ();
759#endif 891#endif
760} 892}
761 893
762unsigned int 894unsigned int
763ev_method (EV_P) 895ev_supported_backends (void)
764{ 896{
765 return method; 897 unsigned int flags = 0;
766}
767 898
768static void 899 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
900 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
901 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
902 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
903 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
904
905 return flags;
906}
907
908unsigned int
909ev_recommended_backends (void)
910{
911 unsigned int flags = ev_supported_backends ();
912
913#ifndef __NetBSD__
914 /* kqueue is borked on everything but netbsd apparently */
915 /* it usually doesn't work correctly on anything but sockets and pipes */
916 flags &= ~EVBACKEND_KQUEUE;
917#endif
918#ifdef __APPLE__
919 // flags &= ~EVBACKEND_KQUEUE; for documentation
920 flags &= ~EVBACKEND_POLL;
921#endif
922
923 return flags;
924}
925
926unsigned int
927ev_embeddable_backends (void)
928{
929 return EVBACKEND_EPOLL
930 | EVBACKEND_KQUEUE
931 | EVBACKEND_PORT;
932}
933
934unsigned int
935ev_backend (EV_P)
936{
937 return backend;
938}
939
940unsigned int
941ev_loop_count (EV_P)
942{
943 return loop_count;
944}
945
946static void noinline
769loop_init (EV_P_ unsigned int flags) 947loop_init (EV_P_ unsigned int flags)
770{ 948{
771 if (!method) 949 if (!backend)
772 { 950 {
773#if EV_USE_MONOTONIC 951#if EV_USE_MONOTONIC
774 { 952 {
775 struct timespec ts; 953 struct timespec ts;
776 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 954 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
781 ev_rt_now = ev_time (); 959 ev_rt_now = ev_time ();
782 mn_now = get_clock (); 960 mn_now = get_clock ();
783 now_floor = mn_now; 961 now_floor = mn_now;
784 rtmn_diff = ev_rt_now - mn_now; 962 rtmn_diff = ev_rt_now - mn_now;
785 963
786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) 964 /* pid check not overridable via env */
965#ifndef _WIN32
966 if (flags & EVFLAG_FORKCHECK)
967 curpid = getpid ();
968#endif
969
970 if (!(flags & EVFLAG_NOENV)
971 && !enable_secure ()
972 && getenv ("LIBEV_FLAGS"))
787 flags = atoi (getenv ("LIBEV_FLAGS")); 973 flags = atoi (getenv ("LIBEV_FLAGS"));
788 974
789 if (!(flags & 0x0000ffff)) 975 if (!(flags & 0x0000ffffUL))
790 flags |= 0x0000ffff; 976 flags |= ev_recommended_backends ();
791 977
792 method = 0; 978 backend = 0;
979 backend_fd = -1;
980#if EV_USE_INOTIFY
981 fs_fd = -2;
982#endif
983
793#if EV_USE_PORT 984#if EV_USE_PORT
794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags); 985 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
795#endif 986#endif
796#if EV_USE_KQUEUE 987#if EV_USE_KQUEUE
797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); 988 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
798#endif 989#endif
799#if EV_USE_EPOLL 990#if EV_USE_EPOLL
800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); 991 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
801#endif 992#endif
802#if EV_USE_POLL 993#if EV_USE_POLL
803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); 994 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
804#endif 995#endif
805#if EV_USE_SELECT 996#if EV_USE_SELECT
806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); 997 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
807#endif 998#endif
808 999
809 ev_init (&sigev, sigcb); 1000 ev_init (&sigev, sigcb);
810 ev_set_priority (&sigev, EV_MAXPRI); 1001 ev_set_priority (&sigev, EV_MAXPRI);
811 } 1002 }
812} 1003}
813 1004
814void 1005static void noinline
815loop_destroy (EV_P) 1006loop_destroy (EV_P)
816{ 1007{
817 int i; 1008 int i;
818 1009
1010#if EV_USE_INOTIFY
1011 if (fs_fd >= 0)
1012 close (fs_fd);
1013#endif
1014
1015 if (backend_fd >= 0)
1016 close (backend_fd);
1017
819#if EV_USE_PORT 1018#if EV_USE_PORT
820 if (method == EVMETHOD_PORT ) port_destroy (EV_A); 1019 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
821#endif 1020#endif
822#if EV_USE_KQUEUE 1021#if EV_USE_KQUEUE
823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 1022 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
824#endif 1023#endif
825#if EV_USE_EPOLL 1024#if EV_USE_EPOLL
826 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 1025 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
827#endif 1026#endif
828#if EV_USE_POLL 1027#if EV_USE_POLL
829 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 1028 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
830#endif 1029#endif
831#if EV_USE_SELECT 1030#if EV_USE_SELECT
832 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 1031 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
833#endif 1032#endif
834 1033
835 for (i = NUMPRI; i--; ) 1034 for (i = NUMPRI; i--; )
1035 {
836 array_free (pending, [i]); 1036 array_free (pending, [i]);
1037#if EV_IDLE_ENABLE
1038 array_free (idle, [i]);
1039#endif
1040 }
837 1041
838 /* have to use the microsoft-never-gets-it-right macro */ 1042 /* have to use the microsoft-never-gets-it-right macro */
839 array_free (fdchange, EMPTY0); 1043 array_free (fdchange, EMPTY);
840 array_free (timer, EMPTY0); 1044 array_free (timer, EMPTY);
841#if EV_PERIODICS 1045#if EV_PERIODIC_ENABLE
842 array_free (periodic, EMPTY0); 1046 array_free (periodic, EMPTY);
843#endif 1047#endif
844 array_free (idle, EMPTY0);
845 array_free (prepare, EMPTY0); 1048 array_free (prepare, EMPTY);
846 array_free (check, EMPTY0); 1049 array_free (check, EMPTY);
847 1050
848 method = 0; 1051 backend = 0;
849} 1052}
850 1053
851static void 1054void inline_size infy_fork (EV_P);
1055
1056void inline_size
852loop_fork (EV_P) 1057loop_fork (EV_P)
853{ 1058{
854#if EV_USE_PORT 1059#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A); 1060 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
856#endif 1061#endif
857#if EV_USE_KQUEUE 1062#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 1063 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
859#endif 1064#endif
860#if EV_USE_EPOLL 1065#if EV_USE_EPOLL
861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 1066 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1067#endif
1068#if EV_USE_INOTIFY
1069 infy_fork (EV_A);
862#endif 1070#endif
863 1071
864 if (ev_is_active (&sigev)) 1072 if (ev_is_active (&sigev))
865 { 1073 {
866 /* default loop */ 1074 /* default loop */
887 1095
888 memset (loop, 0, sizeof (struct ev_loop)); 1096 memset (loop, 0, sizeof (struct ev_loop));
889 1097
890 loop_init (EV_A_ flags); 1098 loop_init (EV_A_ flags);
891 1099
892 if (ev_method (EV_A)) 1100 if (ev_backend (EV_A))
893 return loop; 1101 return loop;
894 1102
895 return 0; 1103 return 0;
896} 1104}
897 1105
910 1118
911#endif 1119#endif
912 1120
913#if EV_MULTIPLICITY 1121#if EV_MULTIPLICITY
914struct ev_loop * 1122struct ev_loop *
915ev_default_loop_ (unsigned int flags) 1123ev_default_loop_init (unsigned int flags)
916#else 1124#else
917int 1125int
918ev_default_loop (unsigned int flags) 1126ev_default_loop (unsigned int flags)
919#endif 1127#endif
920{ 1128{
930 ev_default_loop_ptr = 1; 1138 ev_default_loop_ptr = 1;
931#endif 1139#endif
932 1140
933 loop_init (EV_A_ flags); 1141 loop_init (EV_A_ flags);
934 1142
935 if (ev_method (EV_A)) 1143 if (ev_backend (EV_A))
936 { 1144 {
937 siginit (EV_A); 1145 siginit (EV_A);
938 1146
939#ifndef _WIN32 1147#ifndef _WIN32
940 ev_signal_init (&childev, childcb, SIGCHLD); 1148 ev_signal_init (&childev, childcb, SIGCHLD);
976{ 1184{
977#if EV_MULTIPLICITY 1185#if EV_MULTIPLICITY
978 struct ev_loop *loop = ev_default_loop_ptr; 1186 struct ev_loop *loop = ev_default_loop_ptr;
979#endif 1187#endif
980 1188
981 if (method) 1189 if (backend)
982 postfork = 1; 1190 postfork = 1;
983} 1191}
984 1192
985/*****************************************************************************/ 1193/*****************************************************************************/
986 1194
987static int 1195void
988any_pending (EV_P) 1196ev_invoke (EV_P_ void *w, int revents)
989{ 1197{
990 int pri; 1198 EV_CB_INVOKE ((W)w, revents);
991
992 for (pri = NUMPRI; pri--; )
993 if (pendingcnt [pri])
994 return 1;
995
996 return 0;
997} 1199}
998 1200
999inline void 1201void inline_speed
1000call_pending (EV_P) 1202call_pending (EV_P)
1001{ 1203{
1002 int pri; 1204 int pri;
1003 1205
1004 for (pri = NUMPRI; pri--; ) 1206 for (pri = NUMPRI; pri--; )
1006 { 1208 {
1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1209 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1008 1210
1009 if (expect_true (p->w)) 1211 if (expect_true (p->w))
1010 { 1212 {
1213 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1214
1011 p->w->pending = 0; 1215 p->w->pending = 0;
1012 EV_CB_INVOKE (p->w, p->events); 1216 EV_CB_INVOKE (p->w, p->events);
1013 } 1217 }
1014 } 1218 }
1015} 1219}
1016 1220
1017inline void 1221void inline_size
1018timers_reify (EV_P) 1222timers_reify (EV_P)
1019{ 1223{
1020 while (timercnt && ((WT)timers [0])->at <= mn_now) 1224 while (timercnt && ((WT)timers [0])->at <= mn_now)
1021 { 1225 {
1022 struct ev_timer *w = timers [0]; 1226 ev_timer *w = (ev_timer *)timers [0];
1023 1227
1024 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1228 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1025 1229
1026 /* first reschedule or stop timer */ 1230 /* first reschedule or stop timer */
1027 if (w->repeat) 1231 if (w->repeat)
1028 { 1232 {
1029 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1233 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1030 1234
1031 ((WT)w)->at += w->repeat; 1235 ((WT)w)->at += w->repeat;
1032 if (((WT)w)->at < mn_now) 1236 if (((WT)w)->at < mn_now)
1033 ((WT)w)->at = mn_now; 1237 ((WT)w)->at = mn_now;
1034 1238
1035 downheap ((WT *)timers, timercnt, 0); 1239 downheap (timers, timercnt, 0);
1036 } 1240 }
1037 else 1241 else
1038 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1242 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1039 1243
1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1244 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1041 } 1245 }
1042} 1246}
1043 1247
1044#if EV_PERIODICS 1248#if EV_PERIODIC_ENABLE
1045inline void 1249void inline_size
1046periodics_reify (EV_P) 1250periodics_reify (EV_P)
1047{ 1251{
1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1252 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1049 { 1253 {
1050 struct ev_periodic *w = periodics [0]; 1254 ev_periodic *w = (ev_periodic *)periodics [0];
1051 1255
1052 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1256 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1053 1257
1054 /* first reschedule or stop timer */ 1258 /* first reschedule or stop timer */
1055 if (w->reschedule_cb) 1259 if (w->reschedule_cb)
1056 { 1260 {
1057 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1261 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1058 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1262 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1059 downheap ((WT *)periodics, periodiccnt, 0); 1263 downheap (periodics, periodiccnt, 0);
1060 } 1264 }
1061 else if (w->interval) 1265 else if (w->interval)
1062 { 1266 {
1063 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1267 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1268 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1064 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1269 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1065 downheap ((WT *)periodics, periodiccnt, 0); 1270 downheap (periodics, periodiccnt, 0);
1066 } 1271 }
1067 else 1272 else
1068 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1273 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1069 1274
1070 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1275 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1071 } 1276 }
1072} 1277}
1073 1278
1074static void 1279static void noinline
1075periodics_reschedule (EV_P) 1280periodics_reschedule (EV_P)
1076{ 1281{
1077 int i; 1282 int i;
1078 1283
1079 /* adjust periodics after time jump */ 1284 /* adjust periodics after time jump */
1080 for (i = 0; i < periodiccnt; ++i) 1285 for (i = 0; i < periodiccnt; ++i)
1081 { 1286 {
1082 struct ev_periodic *w = periodics [i]; 1287 ev_periodic *w = (ev_periodic *)periodics [i];
1083 1288
1084 if (w->reschedule_cb) 1289 if (w->reschedule_cb)
1085 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1290 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1086 else if (w->interval) 1291 else if (w->interval)
1087 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1292 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1088 } 1293 }
1089 1294
1090 /* now rebuild the heap */ 1295 /* now rebuild the heap */
1091 for (i = periodiccnt >> 1; i--; ) 1296 for (i = periodiccnt >> 1; i--; )
1092 downheap ((WT *)periodics, periodiccnt, i); 1297 downheap (periodics, periodiccnt, i);
1093} 1298}
1094#endif 1299#endif
1095 1300
1096inline int 1301#if EV_IDLE_ENABLE
1097time_update_monotonic (EV_P) 1302void inline_size
1303idle_reify (EV_P)
1098{ 1304{
1305 if (expect_false (idleall))
1306 {
1307 int pri;
1308
1309 for (pri = NUMPRI; pri--; )
1310 {
1311 if (pendingcnt [pri])
1312 break;
1313
1314 if (idlecnt [pri])
1315 {
1316 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1317 break;
1318 }
1319 }
1320 }
1321}
1322#endif
1323
1324void inline_speed
1325time_update (EV_P_ ev_tstamp max_block)
1326{
1327 int i;
1328
1329#if EV_USE_MONOTONIC
1330 if (expect_true (have_monotonic))
1331 {
1332 ev_tstamp odiff = rtmn_diff;
1333
1099 mn_now = get_clock (); 1334 mn_now = get_clock ();
1100 1335
1336 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1337 /* interpolate in the meantime */
1101 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1338 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1102 { 1339 {
1103 ev_rt_now = rtmn_diff + mn_now; 1340 ev_rt_now = rtmn_diff + mn_now;
1104 return 0; 1341 return;
1105 } 1342 }
1106 else 1343
1107 {
1108 now_floor = mn_now; 1344 now_floor = mn_now;
1109 ev_rt_now = ev_time (); 1345 ev_rt_now = ev_time ();
1110 return 1;
1111 }
1112}
1113 1346
1114inline void 1347 /* loop a few times, before making important decisions.
1115time_update (EV_P) 1348 * on the choice of "4": one iteration isn't enough,
1116{ 1349 * in case we get preempted during the calls to
1117 int i; 1350 * ev_time and get_clock. a second call is almost guaranteed
1118 1351 * to succeed in that case, though. and looping a few more times
1119#if EV_USE_MONOTONIC 1352 * doesn't hurt either as we only do this on time-jumps or
1120 if (expect_true (have_monotonic)) 1353 * in the unlikely event of having been preempted here.
1121 { 1354 */
1122 if (time_update_monotonic (EV_A)) 1355 for (i = 4; --i; )
1123 { 1356 {
1124 ev_tstamp odiff = rtmn_diff;
1125
1126 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1127 {
1128 rtmn_diff = ev_rt_now - mn_now; 1357 rtmn_diff = ev_rt_now - mn_now;
1129 1358
1130 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1359 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1131 return; /* all is well */ 1360 return; /* all is well */
1132 1361
1133 ev_rt_now = ev_time (); 1362 ev_rt_now = ev_time ();
1134 mn_now = get_clock (); 1363 mn_now = get_clock ();
1135 now_floor = mn_now; 1364 now_floor = mn_now;
1136 } 1365 }
1137 1366
1138# if EV_PERIODICS 1367# if EV_PERIODIC_ENABLE
1368 periodics_reschedule (EV_A);
1369# endif
1370 /* no timer adjustment, as the monotonic clock doesn't jump */
1371 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1372 }
1373 else
1374#endif
1375 {
1376 ev_rt_now = ev_time ();
1377
1378 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1379 {
1380#if EV_PERIODIC_ENABLE
1139 periodics_reschedule (EV_A); 1381 periodics_reschedule (EV_A);
1140# endif 1382#endif
1141 /* no timer adjustment, as the monotonic clock doesn't jump */
1142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1143 }
1144 }
1145 else
1146#endif
1147 {
1148 ev_rt_now = ev_time ();
1149
1150 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1151 {
1152#if EV_PERIODICS
1153 periodics_reschedule (EV_A);
1154#endif
1155
1156 /* adjust timers. this is easy, as the offset is the same for all */ 1383 /* adjust timers. this is easy, as the offset is the same for all of them */
1157 for (i = 0; i < timercnt; ++i) 1384 for (i = 0; i < timercnt; ++i)
1158 ((WT)timers [i])->at += ev_rt_now - mn_now; 1385 ((WT)timers [i])->at += ev_rt_now - mn_now;
1159 } 1386 }
1160 1387
1161 mn_now = ev_rt_now; 1388 mn_now = ev_rt_now;
1177static int loop_done; 1404static int loop_done;
1178 1405
1179void 1406void
1180ev_loop (EV_P_ int flags) 1407ev_loop (EV_P_ int flags)
1181{ 1408{
1182 double block;
1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1409 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1410 ? EVUNLOOP_ONE
1411 : EVUNLOOP_CANCEL;
1184 1412
1185 while (activecnt) 1413 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1414
1415 do
1186 { 1416 {
1417#ifndef _WIN32
1418 if (expect_false (curpid)) /* penalise the forking check even more */
1419 if (expect_false (getpid () != curpid))
1420 {
1421 curpid = getpid ();
1422 postfork = 1;
1423 }
1424#endif
1425
1426#if EV_FORK_ENABLE
1427 /* we might have forked, so queue fork handlers */
1428 if (expect_false (postfork))
1429 if (forkcnt)
1430 {
1431 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1432 call_pending (EV_A);
1433 }
1434#endif
1435
1187 /* queue check watchers (and execute them) */ 1436 /* queue prepare watchers (and execute them) */
1188 if (expect_false (preparecnt)) 1437 if (expect_false (preparecnt))
1189 { 1438 {
1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1439 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1191 call_pending (EV_A); 1440 call_pending (EV_A);
1192 } 1441 }
1193 1442
1443 if (expect_false (!activecnt))
1444 break;
1445
1194 /* we might have forked, so reify kernel state if necessary */ 1446 /* we might have forked, so reify kernel state if necessary */
1195 if (expect_false (postfork)) 1447 if (expect_false (postfork))
1196 loop_fork (EV_A); 1448 loop_fork (EV_A);
1197 1449
1198 /* update fd-related kernel structures */ 1450 /* update fd-related kernel structures */
1199 fd_reify (EV_A); 1451 fd_reify (EV_A);
1200 1452
1201 /* calculate blocking time */ 1453 /* calculate blocking time */
1454 {
1455 ev_tstamp block;
1202 1456
1203 /* we only need this for !monotonic clock or timers, but as we basically 1457 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1204 always have timers, we just calculate it always */ 1458 block = 0.; /* do not block at all */
1205#if EV_USE_MONOTONIC
1206 if (expect_true (have_monotonic))
1207 time_update_monotonic (EV_A);
1208 else 1459 else
1209#endif
1210 { 1460 {
1211 ev_rt_now = ev_time (); 1461 /* update time to cancel out callback processing overhead */
1212 mn_now = ev_rt_now; 1462 time_update (EV_A_ 1e100);
1213 }
1214 1463
1215 if (flags & EVLOOP_NONBLOCK || idlecnt)
1216 block = 0.;
1217 else
1218 {
1219 block = MAX_BLOCKTIME; 1464 block = MAX_BLOCKTIME;
1220 1465
1221 if (timercnt) 1466 if (timercnt)
1222 { 1467 {
1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1468 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1224 if (block > to) block = to; 1469 if (block > to) block = to;
1225 } 1470 }
1226 1471
1227#if EV_PERIODICS 1472#if EV_PERIODIC_ENABLE
1228 if (periodiccnt) 1473 if (periodiccnt)
1229 { 1474 {
1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1475 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1231 if (block > to) block = to; 1476 if (block > to) block = to;
1232 } 1477 }
1233#endif 1478#endif
1234 1479
1235 if (expect_false (block < 0.)) block = 0.; 1480 if (expect_false (block < 0.)) block = 0.;
1236 } 1481 }
1237 1482
1483 ++loop_count;
1238 method_poll (EV_A_ block); 1484 backend_poll (EV_A_ block);
1239 1485
1240 /* update ev_rt_now, do magic */ 1486 /* update ev_rt_now, do magic */
1241 time_update (EV_A); 1487 time_update (EV_A_ block);
1488 }
1242 1489
1243 /* queue pending timers and reschedule them */ 1490 /* queue pending timers and reschedule them */
1244 timers_reify (EV_A); /* relative timers called last */ 1491 timers_reify (EV_A); /* relative timers called last */
1245#if EV_PERIODICS 1492#if EV_PERIODIC_ENABLE
1246 periodics_reify (EV_A); /* absolute timers called first */ 1493 periodics_reify (EV_A); /* absolute timers called first */
1247#endif 1494#endif
1248 1495
1496#if EV_IDLE_ENABLE
1249 /* queue idle watchers unless io or timers are pending */ 1497 /* queue idle watchers unless other events are pending */
1250 if (idlecnt && !any_pending (EV_A)) 1498 idle_reify (EV_A);
1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1499#endif
1252 1500
1253 /* queue check watchers, to be executed first */ 1501 /* queue check watchers, to be executed first */
1254 if (expect_false (checkcnt)) 1502 if (expect_false (checkcnt))
1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1503 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1256 1504
1257 call_pending (EV_A); 1505 call_pending (EV_A);
1258 1506
1259 if (expect_false (loop_done))
1260 break;
1261 } 1507 }
1508 while (expect_true (activecnt && !loop_done));
1262 1509
1263 if (loop_done != 2) 1510 if (loop_done == EVUNLOOP_ONE)
1264 loop_done = 0; 1511 loop_done = EVUNLOOP_CANCEL;
1265} 1512}
1266 1513
1267void 1514void
1268ev_unloop (EV_P_ int how) 1515ev_unloop (EV_P_ int how)
1269{ 1516{
1270 loop_done = how; 1517 loop_done = how;
1271} 1518}
1272 1519
1273/*****************************************************************************/ 1520/*****************************************************************************/
1274 1521
1275inline void 1522void inline_size
1276wlist_add (WL *head, WL elem) 1523wlist_add (WL *head, WL elem)
1277{ 1524{
1278 elem->next = *head; 1525 elem->next = *head;
1279 *head = elem; 1526 *head = elem;
1280} 1527}
1281 1528
1282inline void 1529void inline_size
1283wlist_del (WL *head, WL elem) 1530wlist_del (WL *head, WL elem)
1284{ 1531{
1285 while (*head) 1532 while (*head)
1286 { 1533 {
1287 if (*head == elem) 1534 if (*head == elem)
1292 1539
1293 head = &(*head)->next; 1540 head = &(*head)->next;
1294 } 1541 }
1295} 1542}
1296 1543
1297inline void 1544void inline_speed
1298ev_clear_pending (EV_P_ W w) 1545clear_pending (EV_P_ W w)
1299{ 1546{
1300 if (w->pending) 1547 if (w->pending)
1301 { 1548 {
1302 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1549 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1303 w->pending = 0; 1550 w->pending = 0;
1304 } 1551 }
1305} 1552}
1306 1553
1307inline void 1554int
1555ev_clear_pending (EV_P_ void *w)
1556{
1557 W w_ = (W)w;
1558 int pending = w_->pending;
1559
1560 if (expect_true (pending))
1561 {
1562 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1563 w_->pending = 0;
1564 p->w = 0;
1565 return p->events;
1566 }
1567 else
1568 return 0;
1569}
1570
1571void inline_size
1572pri_adjust (EV_P_ W w)
1573{
1574 int pri = w->priority;
1575 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1576 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1577 w->priority = pri;
1578}
1579
1580void inline_speed
1308ev_start (EV_P_ W w, int active) 1581ev_start (EV_P_ W w, int active)
1309{ 1582{
1310 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1583 pri_adjust (EV_A_ w);
1311 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1312
1313 w->active = active; 1584 w->active = active;
1314 ev_ref (EV_A); 1585 ev_ref (EV_A);
1315} 1586}
1316 1587
1317inline void 1588void inline_size
1318ev_stop (EV_P_ W w) 1589ev_stop (EV_P_ W w)
1319{ 1590{
1320 ev_unref (EV_A); 1591 ev_unref (EV_A);
1321 w->active = 0; 1592 w->active = 0;
1322} 1593}
1323 1594
1324/*****************************************************************************/ 1595/*****************************************************************************/
1325 1596
1326void 1597void noinline
1327ev_io_start (EV_P_ struct ev_io *w) 1598ev_io_start (EV_P_ ev_io *w)
1328{ 1599{
1329 int fd = w->fd; 1600 int fd = w->fd;
1330 1601
1331 if (expect_false (ev_is_active (w))) 1602 if (expect_false (ev_is_active (w)))
1332 return; 1603 return;
1333 1604
1334 assert (("ev_io_start called with negative fd", fd >= 0)); 1605 assert (("ev_io_start called with negative fd", fd >= 0));
1335 1606
1336 ev_start (EV_A_ (W)w, 1); 1607 ev_start (EV_A_ (W)w, 1);
1337 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1608 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1338 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1609 wlist_add (&anfds[fd].head, (WL)w);
1339 1610
1340 fd_change (EV_A_ fd); 1611 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1612 w->events &= ~EV_IOFDSET;
1341} 1613}
1342 1614
1343void 1615void noinline
1344ev_io_stop (EV_P_ struct ev_io *w) 1616ev_io_stop (EV_P_ ev_io *w)
1345{ 1617{
1346 ev_clear_pending (EV_A_ (W)w); 1618 clear_pending (EV_A_ (W)w);
1347 if (expect_false (!ev_is_active (w))) 1619 if (expect_false (!ev_is_active (w)))
1348 return; 1620 return;
1349 1621
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1622 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1351 1623
1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1624 wlist_del (&anfds[w->fd].head, (WL)w);
1353 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1354 1626
1355 fd_change (EV_A_ w->fd); 1627 fd_change (EV_A_ w->fd, 1);
1356} 1628}
1357 1629
1358void 1630void noinline
1359ev_timer_start (EV_P_ struct ev_timer *w) 1631ev_timer_start (EV_P_ ev_timer *w)
1360{ 1632{
1361 if (expect_false (ev_is_active (w))) 1633 if (expect_false (ev_is_active (w)))
1362 return; 1634 return;
1363 1635
1364 ((WT)w)->at += mn_now; 1636 ((WT)w)->at += mn_now;
1365 1637
1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1638 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1367 1639
1368 ev_start (EV_A_ (W)w, ++timercnt); 1640 ev_start (EV_A_ (W)w, ++timercnt);
1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2); 1641 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1370 timers [timercnt - 1] = w; 1642 timers [timercnt - 1] = (WT)w;
1371 upheap ((WT *)timers, timercnt - 1); 1643 upheap (timers, timercnt - 1);
1372 1644
1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1374} 1646}
1375 1647
1376void 1648void noinline
1377ev_timer_stop (EV_P_ struct ev_timer *w) 1649ev_timer_stop (EV_P_ ev_timer *w)
1378{ 1650{
1379 ev_clear_pending (EV_A_ (W)w); 1651 clear_pending (EV_A_ (W)w);
1380 if (expect_false (!ev_is_active (w))) 1652 if (expect_false (!ev_is_active (w)))
1381 return; 1653 return;
1382 1654
1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1384 1656
1657 {
1658 int active = ((W)w)->active;
1659
1385 if (expect_true (((W)w)->active < timercnt--)) 1660 if (expect_true (--active < --timercnt))
1386 { 1661 {
1387 timers [((W)w)->active - 1] = timers [timercnt]; 1662 timers [active] = timers [timercnt];
1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1663 adjustheap (timers, timercnt, active);
1389 } 1664 }
1665 }
1390 1666
1391 ((WT)w)->at -= mn_now; 1667 ((WT)w)->at -= mn_now;
1392 1668
1393 ev_stop (EV_A_ (W)w); 1669 ev_stop (EV_A_ (W)w);
1394} 1670}
1395 1671
1396void 1672void noinline
1397ev_timer_again (EV_P_ struct ev_timer *w) 1673ev_timer_again (EV_P_ ev_timer *w)
1398{ 1674{
1399 if (ev_is_active (w)) 1675 if (ev_is_active (w))
1400 { 1676 {
1401 if (w->repeat) 1677 if (w->repeat)
1402 { 1678 {
1403 ((WT)w)->at = mn_now + w->repeat; 1679 ((WT)w)->at = mn_now + w->repeat;
1404 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1680 adjustheap (timers, timercnt, ((W)w)->active - 1);
1405 } 1681 }
1406 else 1682 else
1407 ev_timer_stop (EV_A_ w); 1683 ev_timer_stop (EV_A_ w);
1408 } 1684 }
1409 else if (w->repeat) 1685 else if (w->repeat)
1411 w->at = w->repeat; 1687 w->at = w->repeat;
1412 ev_timer_start (EV_A_ w); 1688 ev_timer_start (EV_A_ w);
1413 } 1689 }
1414} 1690}
1415 1691
1416#if EV_PERIODICS 1692#if EV_PERIODIC_ENABLE
1417void 1693void noinline
1418ev_periodic_start (EV_P_ struct ev_periodic *w) 1694ev_periodic_start (EV_P_ ev_periodic *w)
1419{ 1695{
1420 if (expect_false (ev_is_active (w))) 1696 if (expect_false (ev_is_active (w)))
1421 return; 1697 return;
1422 1698
1423 if (w->reschedule_cb) 1699 if (w->reschedule_cb)
1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1425 else if (w->interval) 1701 else if (w->interval)
1426 { 1702 {
1427 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1703 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1428 /* this formula differs from the one in periodic_reify because we do not always round up */ 1704 /* this formula differs from the one in periodic_reify because we do not always round up */
1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1705 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1430 } 1706 }
1707 else
1708 ((WT)w)->at = w->offset;
1431 1709
1432 ev_start (EV_A_ (W)w, ++periodiccnt); 1710 ev_start (EV_A_ (W)w, ++periodiccnt);
1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1711 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1434 periodics [periodiccnt - 1] = w; 1712 periodics [periodiccnt - 1] = (WT)w;
1435 upheap ((WT *)periodics, periodiccnt - 1); 1713 upheap (periodics, periodiccnt - 1);
1436 1714
1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1438} 1716}
1439 1717
1440void 1718void noinline
1441ev_periodic_stop (EV_P_ struct ev_periodic *w) 1719ev_periodic_stop (EV_P_ ev_periodic *w)
1442{ 1720{
1443 ev_clear_pending (EV_A_ (W)w); 1721 clear_pending (EV_A_ (W)w);
1444 if (expect_false (!ev_is_active (w))) 1722 if (expect_false (!ev_is_active (w)))
1445 return; 1723 return;
1446 1724
1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1448 1726
1727 {
1728 int active = ((W)w)->active;
1729
1449 if (expect_true (((W)w)->active < periodiccnt--)) 1730 if (expect_true (--active < --periodiccnt))
1450 { 1731 {
1451 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1732 periodics [active] = periodics [periodiccnt];
1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1733 adjustheap (periodics, periodiccnt, active);
1453 } 1734 }
1735 }
1454 1736
1455 ev_stop (EV_A_ (W)w); 1737 ev_stop (EV_A_ (W)w);
1456} 1738}
1457 1739
1458void 1740void noinline
1459ev_periodic_again (EV_P_ struct ev_periodic *w) 1741ev_periodic_again (EV_P_ ev_periodic *w)
1460{ 1742{
1461 /* TODO: use adjustheap and recalculation */ 1743 /* TODO: use adjustheap and recalculation */
1462 ev_periodic_stop (EV_A_ w); 1744 ev_periodic_stop (EV_A_ w);
1463 ev_periodic_start (EV_A_ w); 1745 ev_periodic_start (EV_A_ w);
1464} 1746}
1465#endif 1747#endif
1466 1748
1467void
1468ev_idle_start (EV_P_ struct ev_idle *w)
1469{
1470 if (expect_false (ev_is_active (w)))
1471 return;
1472
1473 ev_start (EV_A_ (W)w, ++idlecnt);
1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1475 idles [idlecnt - 1] = w;
1476}
1477
1478void
1479ev_idle_stop (EV_P_ struct ev_idle *w)
1480{
1481 ev_clear_pending (EV_A_ (W)w);
1482 if (expect_false (!ev_is_active (w)))
1483 return;
1484
1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1486 ev_stop (EV_A_ (W)w);
1487}
1488
1489void
1490ev_prepare_start (EV_P_ struct ev_prepare *w)
1491{
1492 if (expect_false (ev_is_active (w)))
1493 return;
1494
1495 ev_start (EV_A_ (W)w, ++preparecnt);
1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1497 prepares [preparecnt - 1] = w;
1498}
1499
1500void
1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1502{
1503 ev_clear_pending (EV_A_ (W)w);
1504 if (expect_false (!ev_is_active (w)))
1505 return;
1506
1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1508 ev_stop (EV_A_ (W)w);
1509}
1510
1511void
1512ev_check_start (EV_P_ struct ev_check *w)
1513{
1514 if (expect_false (ev_is_active (w)))
1515 return;
1516
1517 ev_start (EV_A_ (W)w, ++checkcnt);
1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1519 checks [checkcnt - 1] = w;
1520}
1521
1522void
1523ev_check_stop (EV_P_ struct ev_check *w)
1524{
1525 ev_clear_pending (EV_A_ (W)w);
1526 if (expect_false (!ev_is_active (w)))
1527 return;
1528
1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1530 ev_stop (EV_A_ (W)w);
1531}
1532
1533#ifndef SA_RESTART 1749#ifndef SA_RESTART
1534# define SA_RESTART 0 1750# define SA_RESTART 0
1535#endif 1751#endif
1536 1752
1537void 1753void noinline
1538ev_signal_start (EV_P_ struct ev_signal *w) 1754ev_signal_start (EV_P_ ev_signal *w)
1539{ 1755{
1540#if EV_MULTIPLICITY 1756#if EV_MULTIPLICITY
1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1757 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1542#endif 1758#endif
1543 if (expect_false (ev_is_active (w))) 1759 if (expect_false (ev_is_active (w)))
1544 return; 1760 return;
1545 1761
1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1762 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1547 1763
1764 {
1765#ifndef _WIN32
1766 sigset_t full, prev;
1767 sigfillset (&full);
1768 sigprocmask (SIG_SETMASK, &full, &prev);
1769#endif
1770
1771 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1772
1773#ifndef _WIN32
1774 sigprocmask (SIG_SETMASK, &prev, 0);
1775#endif
1776 }
1777
1548 ev_start (EV_A_ (W)w, 1); 1778 ev_start (EV_A_ (W)w, 1);
1549 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1550 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1779 wlist_add (&signals [w->signum - 1].head, (WL)w);
1551 1780
1552 if (!((WL)w)->next) 1781 if (!((WL)w)->next)
1553 { 1782 {
1554#if _WIN32 1783#if _WIN32
1555 signal (w->signum, sighandler); 1784 signal (w->signum, sighandler);
1561 sigaction (w->signum, &sa, 0); 1790 sigaction (w->signum, &sa, 0);
1562#endif 1791#endif
1563 } 1792 }
1564} 1793}
1565 1794
1566void 1795void noinline
1567ev_signal_stop (EV_P_ struct ev_signal *w) 1796ev_signal_stop (EV_P_ ev_signal *w)
1568{ 1797{
1569 ev_clear_pending (EV_A_ (W)w); 1798 clear_pending (EV_A_ (W)w);
1570 if (expect_false (!ev_is_active (w))) 1799 if (expect_false (!ev_is_active (w)))
1571 return; 1800 return;
1572 1801
1573 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1802 wlist_del (&signals [w->signum - 1].head, (WL)w);
1574 ev_stop (EV_A_ (W)w); 1803 ev_stop (EV_A_ (W)w);
1575 1804
1576 if (!signals [w->signum - 1].head) 1805 if (!signals [w->signum - 1].head)
1577 signal (w->signum, SIG_DFL); 1806 signal (w->signum, SIG_DFL);
1578} 1807}
1579 1808
1580void 1809void
1581ev_child_start (EV_P_ struct ev_child *w) 1810ev_child_start (EV_P_ ev_child *w)
1582{ 1811{
1583#if EV_MULTIPLICITY 1812#if EV_MULTIPLICITY
1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1813 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1585#endif 1814#endif
1586 if (expect_false (ev_is_active (w))) 1815 if (expect_false (ev_is_active (w)))
1587 return; 1816 return;
1588 1817
1589 ev_start (EV_A_ (W)w, 1); 1818 ev_start (EV_A_ (W)w, 1);
1590 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1819 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1591} 1820}
1592 1821
1593void 1822void
1594ev_child_stop (EV_P_ struct ev_child *w) 1823ev_child_stop (EV_P_ ev_child *w)
1595{ 1824{
1596 ev_clear_pending (EV_A_ (W)w); 1825 clear_pending (EV_A_ (W)w);
1597 if (expect_false (!ev_is_active (w))) 1826 if (expect_false (!ev_is_active (w)))
1598 return; 1827 return;
1599 1828
1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1829 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1601 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1602} 1831}
1603 1832
1833#if EV_STAT_ENABLE
1834
1835# ifdef _WIN32
1836# undef lstat
1837# define lstat(a,b) _stati64 (a,b)
1838# endif
1839
1840#define DEF_STAT_INTERVAL 5.0074891
1841#define MIN_STAT_INTERVAL 0.1074891
1842
1843static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1844
1845#if EV_USE_INOTIFY
1846# define EV_INOTIFY_BUFSIZE 8192
1847
1848static void noinline
1849infy_add (EV_P_ ev_stat *w)
1850{
1851 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
1852
1853 if (w->wd < 0)
1854 {
1855 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1856
1857 /* monitor some parent directory for speedup hints */
1858 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1859 {
1860 char path [4096];
1861 strcpy (path, w->path);
1862
1863 do
1864 {
1865 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1866 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1867
1868 char *pend = strrchr (path, '/');
1869
1870 if (!pend)
1871 break; /* whoops, no '/', complain to your admin */
1872
1873 *pend = 0;
1874 w->wd = inotify_add_watch (fs_fd, path, mask);
1875 }
1876 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1877 }
1878 }
1879 else
1880 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1881
1882 if (w->wd >= 0)
1883 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1884}
1885
1886static void noinline
1887infy_del (EV_P_ ev_stat *w)
1888{
1889 int slot;
1890 int wd = w->wd;
1891
1892 if (wd < 0)
1893 return;
1894
1895 w->wd = -2;
1896 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1897 wlist_del (&fs_hash [slot].head, (WL)w);
1898
1899 /* remove this watcher, if others are watching it, they will rearm */
1900 inotify_rm_watch (fs_fd, wd);
1901}
1902
1903static void noinline
1904infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1905{
1906 if (slot < 0)
1907 /* overflow, need to check for all hahs slots */
1908 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1909 infy_wd (EV_A_ slot, wd, ev);
1910 else
1911 {
1912 WL w_;
1913
1914 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1915 {
1916 ev_stat *w = (ev_stat *)w_;
1917 w_ = w_->next; /* lets us remove this watcher and all before it */
1918
1919 if (w->wd == wd || wd == -1)
1920 {
1921 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1922 {
1923 w->wd = -1;
1924 infy_add (EV_A_ w); /* re-add, no matter what */
1925 }
1926
1927 stat_timer_cb (EV_A_ &w->timer, 0);
1928 }
1929 }
1930 }
1931}
1932
1933static void
1934infy_cb (EV_P_ ev_io *w, int revents)
1935{
1936 char buf [EV_INOTIFY_BUFSIZE];
1937 struct inotify_event *ev = (struct inotify_event *)buf;
1938 int ofs;
1939 int len = read (fs_fd, buf, sizeof (buf));
1940
1941 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1942 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1943}
1944
1945void inline_size
1946infy_init (EV_P)
1947{
1948 if (fs_fd != -2)
1949 return;
1950
1951 fs_fd = inotify_init ();
1952
1953 if (fs_fd >= 0)
1954 {
1955 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1956 ev_set_priority (&fs_w, EV_MAXPRI);
1957 ev_io_start (EV_A_ &fs_w);
1958 }
1959}
1960
1961void inline_size
1962infy_fork (EV_P)
1963{
1964 int slot;
1965
1966 if (fs_fd < 0)
1967 return;
1968
1969 close (fs_fd);
1970 fs_fd = inotify_init ();
1971
1972 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1973 {
1974 WL w_ = fs_hash [slot].head;
1975 fs_hash [slot].head = 0;
1976
1977 while (w_)
1978 {
1979 ev_stat *w = (ev_stat *)w_;
1980 w_ = w_->next; /* lets us add this watcher */
1981
1982 w->wd = -1;
1983
1984 if (fs_fd >= 0)
1985 infy_add (EV_A_ w); /* re-add, no matter what */
1986 else
1987 ev_timer_start (EV_A_ &w->timer);
1988 }
1989
1990 }
1991}
1992
1993#endif
1994
1995void
1996ev_stat_stat (EV_P_ ev_stat *w)
1997{
1998 if (lstat (w->path, &w->attr) < 0)
1999 w->attr.st_nlink = 0;
2000 else if (!w->attr.st_nlink)
2001 w->attr.st_nlink = 1;
2002}
2003
2004static void noinline
2005stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2006{
2007 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2008
2009 /* we copy this here each the time so that */
2010 /* prev has the old value when the callback gets invoked */
2011 w->prev = w->attr;
2012 ev_stat_stat (EV_A_ w);
2013
2014 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2015 if (
2016 w->prev.st_dev != w->attr.st_dev
2017 || w->prev.st_ino != w->attr.st_ino
2018 || w->prev.st_mode != w->attr.st_mode
2019 || w->prev.st_nlink != w->attr.st_nlink
2020 || w->prev.st_uid != w->attr.st_uid
2021 || w->prev.st_gid != w->attr.st_gid
2022 || w->prev.st_rdev != w->attr.st_rdev
2023 || w->prev.st_size != w->attr.st_size
2024 || w->prev.st_atime != w->attr.st_atime
2025 || w->prev.st_mtime != w->attr.st_mtime
2026 || w->prev.st_ctime != w->attr.st_ctime
2027 ) {
2028 #if EV_USE_INOTIFY
2029 infy_del (EV_A_ w);
2030 infy_add (EV_A_ w);
2031 ev_stat_stat (EV_A_ w); /* avoid race... */
2032 #endif
2033
2034 ev_feed_event (EV_A_ w, EV_STAT);
2035 }
2036}
2037
2038void
2039ev_stat_start (EV_P_ ev_stat *w)
2040{
2041 if (expect_false (ev_is_active (w)))
2042 return;
2043
2044 /* since we use memcmp, we need to clear any padding data etc. */
2045 memset (&w->prev, 0, sizeof (ev_statdata));
2046 memset (&w->attr, 0, sizeof (ev_statdata));
2047
2048 ev_stat_stat (EV_A_ w);
2049
2050 if (w->interval < MIN_STAT_INTERVAL)
2051 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2052
2053 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
2054 ev_set_priority (&w->timer, ev_priority (w));
2055
2056#if EV_USE_INOTIFY
2057 infy_init (EV_A);
2058
2059 if (fs_fd >= 0)
2060 infy_add (EV_A_ w);
2061 else
2062#endif
2063 ev_timer_start (EV_A_ &w->timer);
2064
2065 ev_start (EV_A_ (W)w, 1);
2066}
2067
2068void
2069ev_stat_stop (EV_P_ ev_stat *w)
2070{
2071 clear_pending (EV_A_ (W)w);
2072 if (expect_false (!ev_is_active (w)))
2073 return;
2074
2075#if EV_USE_INOTIFY
2076 infy_del (EV_A_ w);
2077#endif
2078 ev_timer_stop (EV_A_ &w->timer);
2079
2080 ev_stop (EV_A_ (W)w);
2081}
2082#endif
2083
2084#if EV_IDLE_ENABLE
2085void
2086ev_idle_start (EV_P_ ev_idle *w)
2087{
2088 if (expect_false (ev_is_active (w)))
2089 return;
2090
2091 pri_adjust (EV_A_ (W)w);
2092
2093 {
2094 int active = ++idlecnt [ABSPRI (w)];
2095
2096 ++idleall;
2097 ev_start (EV_A_ (W)w, active);
2098
2099 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2100 idles [ABSPRI (w)][active - 1] = w;
2101 }
2102}
2103
2104void
2105ev_idle_stop (EV_P_ ev_idle *w)
2106{
2107 clear_pending (EV_A_ (W)w);
2108 if (expect_false (!ev_is_active (w)))
2109 return;
2110
2111 {
2112 int active = ((W)w)->active;
2113
2114 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2115 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2116
2117 ev_stop (EV_A_ (W)w);
2118 --idleall;
2119 }
2120}
2121#endif
2122
2123void
2124ev_prepare_start (EV_P_ ev_prepare *w)
2125{
2126 if (expect_false (ev_is_active (w)))
2127 return;
2128
2129 ev_start (EV_A_ (W)w, ++preparecnt);
2130 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2131 prepares [preparecnt - 1] = w;
2132}
2133
2134void
2135ev_prepare_stop (EV_P_ ev_prepare *w)
2136{
2137 clear_pending (EV_A_ (W)w);
2138 if (expect_false (!ev_is_active (w)))
2139 return;
2140
2141 {
2142 int active = ((W)w)->active;
2143 prepares [active - 1] = prepares [--preparecnt];
2144 ((W)prepares [active - 1])->active = active;
2145 }
2146
2147 ev_stop (EV_A_ (W)w);
2148}
2149
2150void
2151ev_check_start (EV_P_ ev_check *w)
2152{
2153 if (expect_false (ev_is_active (w)))
2154 return;
2155
2156 ev_start (EV_A_ (W)w, ++checkcnt);
2157 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2158 checks [checkcnt - 1] = w;
2159}
2160
2161void
2162ev_check_stop (EV_P_ ev_check *w)
2163{
2164 clear_pending (EV_A_ (W)w);
2165 if (expect_false (!ev_is_active (w)))
2166 return;
2167
2168 {
2169 int active = ((W)w)->active;
2170 checks [active - 1] = checks [--checkcnt];
2171 ((W)checks [active - 1])->active = active;
2172 }
2173
2174 ev_stop (EV_A_ (W)w);
2175}
2176
2177#if EV_EMBED_ENABLE
2178void noinline
2179ev_embed_sweep (EV_P_ ev_embed *w)
2180{
2181 ev_loop (w->loop, EVLOOP_NONBLOCK);
2182}
2183
2184static void
2185embed_cb (EV_P_ ev_io *io, int revents)
2186{
2187 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2188
2189 if (ev_cb (w))
2190 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2191 else
2192 ev_embed_sweep (loop, w);
2193}
2194
2195void
2196ev_embed_start (EV_P_ ev_embed *w)
2197{
2198 if (expect_false (ev_is_active (w)))
2199 return;
2200
2201 {
2202 struct ev_loop *loop = w->loop;
2203 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2204 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
2205 }
2206
2207 ev_set_priority (&w->io, ev_priority (w));
2208 ev_io_start (EV_A_ &w->io);
2209
2210 ev_start (EV_A_ (W)w, 1);
2211}
2212
2213void
2214ev_embed_stop (EV_P_ ev_embed *w)
2215{
2216 clear_pending (EV_A_ (W)w);
2217 if (expect_false (!ev_is_active (w)))
2218 return;
2219
2220 ev_io_stop (EV_A_ &w->io);
2221
2222 ev_stop (EV_A_ (W)w);
2223}
2224#endif
2225
2226#if EV_FORK_ENABLE
2227void
2228ev_fork_start (EV_P_ ev_fork *w)
2229{
2230 if (expect_false (ev_is_active (w)))
2231 return;
2232
2233 ev_start (EV_A_ (W)w, ++forkcnt);
2234 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2235 forks [forkcnt - 1] = w;
2236}
2237
2238void
2239ev_fork_stop (EV_P_ ev_fork *w)
2240{
2241 clear_pending (EV_A_ (W)w);
2242 if (expect_false (!ev_is_active (w)))
2243 return;
2244
2245 {
2246 int active = ((W)w)->active;
2247 forks [active - 1] = forks [--forkcnt];
2248 ((W)forks [active - 1])->active = active;
2249 }
2250
2251 ev_stop (EV_A_ (W)w);
2252}
2253#endif
2254
1604/*****************************************************************************/ 2255/*****************************************************************************/
1605 2256
1606struct ev_once 2257struct ev_once
1607{ 2258{
1608 struct ev_io io; 2259 ev_io io;
1609 struct ev_timer to; 2260 ev_timer to;
1610 void (*cb)(int revents, void *arg); 2261 void (*cb)(int revents, void *arg);
1611 void *arg; 2262 void *arg;
1612}; 2263};
1613 2264
1614static void 2265static void
1623 2274
1624 cb (revents, arg); 2275 cb (revents, arg);
1625} 2276}
1626 2277
1627static void 2278static void
1628once_cb_io (EV_P_ struct ev_io *w, int revents) 2279once_cb_io (EV_P_ ev_io *w, int revents)
1629{ 2280{
1630 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 2281 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1631} 2282}
1632 2283
1633static void 2284static void
1634once_cb_to (EV_P_ struct ev_timer *w, int revents) 2285once_cb_to (EV_P_ ev_timer *w, int revents)
1635{ 2286{
1636 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 2287 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1637} 2288}
1638 2289
1639void 2290void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines