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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines