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

Comparing libev/ev.c (file contents):
Revision 1.149 by root, Tue Nov 27 19:23:31 2007 UTC vs.
Revision 1.197 by root, Sat Dec 22 15:20:13 2007 UTC

51# ifndef EV_USE_MONOTONIC 51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 52# define EV_USE_MONOTONIC 0
53# endif 53# endif
54# ifndef EV_USE_REALTIME 54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 55# define EV_USE_REALTIME 0
56# endif
57# endif
58
59# ifndef EV_USE_NANOSLEEP
60# if HAVE_NANOSLEEP
61# define EV_USE_NANOSLEEP 1
62# else
63# define EV_USE_NANOSLEEP 0
56# endif 64# endif
57# endif 65# endif
58 66
59# ifndef EV_USE_SELECT 67# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 68# if HAVE_SELECT && HAVE_SYS_SELECT_H
94# else 102# else
95# define EV_USE_PORT 0 103# define EV_USE_PORT 0
96# endif 104# endif
97# endif 105# endif
98 106
107# ifndef EV_USE_INOTIFY
108# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
109# define EV_USE_INOTIFY 1
110# else
111# define EV_USE_INOTIFY 0
112# endif
113# endif
114
99#endif 115#endif
100 116
101#include <math.h> 117#include <math.h>
102#include <stdlib.h> 118#include <stdlib.h>
103#include <fcntl.h> 119#include <fcntl.h>
109#include <errno.h> 125#include <errno.h>
110#include <sys/types.h> 126#include <sys/types.h>
111#include <time.h> 127#include <time.h>
112 128
113#include <signal.h> 129#include <signal.h>
130
131#ifdef EV_H
132# include EV_H
133#else
134# include "ev.h"
135#endif
114 136
115#ifndef _WIN32 137#ifndef _WIN32
116# include <sys/time.h> 138# include <sys/time.h>
117# include <sys/wait.h> 139# include <sys/wait.h>
118# include <unistd.h> 140# include <unistd.h>
132 154
133#ifndef EV_USE_REALTIME 155#ifndef EV_USE_REALTIME
134# define EV_USE_REALTIME 0 156# define EV_USE_REALTIME 0
135#endif 157#endif
136 158
159#ifndef EV_USE_NANOSLEEP
160# define EV_USE_NANOSLEEP 0
161#endif
162
137#ifndef EV_USE_SELECT 163#ifndef EV_USE_SELECT
138# define EV_USE_SELECT 1 164# define EV_USE_SELECT 1
139#endif 165#endif
140 166
141#ifndef EV_USE_POLL 167#ifndef EV_USE_POLL
156 182
157#ifndef EV_USE_PORT 183#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 184# define EV_USE_PORT 0
159#endif 185#endif
160 186
187#ifndef EV_USE_INOTIFY
188# define EV_USE_INOTIFY 0
189#endif
190
161#ifndef EV_PID_HASHSIZE 191#ifndef EV_PID_HASHSIZE
162# if EV_MINIMAL 192# if EV_MINIMAL
163# define EV_PID_HASHSIZE 1 193# define EV_PID_HASHSIZE 1
164# else 194# else
165# define EV_PID_HASHSIZE 16 195# define EV_PID_HASHSIZE 16
166# endif 196# endif
167#endif 197#endif
168 198
199#ifndef EV_INOTIFY_HASHSIZE
200# if EV_MINIMAL
201# define EV_INOTIFY_HASHSIZE 1
202# else
203# define EV_INOTIFY_HASHSIZE 16
204# endif
205#endif
206
169/**/ 207/**/
170 208
171#ifndef CLOCK_MONOTONIC 209#ifndef CLOCK_MONOTONIC
172# undef EV_USE_MONOTONIC 210# undef EV_USE_MONOTONIC
173# define EV_USE_MONOTONIC 0 211# define EV_USE_MONOTONIC 0
176#ifndef CLOCK_REALTIME 214#ifndef CLOCK_REALTIME
177# undef EV_USE_REALTIME 215# undef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 216# define EV_USE_REALTIME 0
179#endif 217#endif
180 218
219#if !EV_STAT_ENABLE
220# undef EV_USE_INOTIFY
221# define EV_USE_INOTIFY 0
222#endif
223
224#if !EV_USE_NANOSLEEP
225# ifndef _WIN32
226# include <sys/select.h>
227# endif
228#endif
229
230#if EV_USE_INOTIFY
231# include <sys/inotify.h>
232#endif
233
181#if EV_SELECT_IS_WINSOCKET 234#if EV_SELECT_IS_WINSOCKET
182# include <winsock.h> 235# include <winsock.h>
183#endif 236#endif
184 237
185/**/ 238/**/
186 239
240/*
241 * This is used to avoid floating point rounding problems.
242 * It is added to ev_rt_now when scheduling periodics
243 * to ensure progress, time-wise, even when rounding
244 * errors are against us.
245 * This value is good at least till the year 4000.
246 * Better solutions welcome.
247 */
248#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
249
187#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 250#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
188#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 251#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
189/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 252/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
190 253
191#ifdef EV_H
192# include EV_H
193#else
194# include "ev.h"
195#endif
196
197#if __GNUC__ >= 3 254#if __GNUC__ >= 4
198# define expect(expr,value) __builtin_expect ((expr),(value)) 255# define expect(expr,value) __builtin_expect ((expr),(value))
199# define inline_size static inline /* inline for codesize */
200# if EV_MINIMAL
201# define noinline __attribute__ ((noinline)) 256# define noinline __attribute__ ((noinline))
202# define inline_speed static noinline
203# else
204# define noinline
205# define inline_speed static inline
206# endif
207#else 257#else
208# define expect(expr,value) (expr) 258# define expect(expr,value) (expr)
209# define inline_speed static
210# define inline_size static
211# define noinline 259# define noinline
260# if __STDC_VERSION__ < 199901L
261# define inline
262# endif
212#endif 263#endif
213 264
214#define expect_false(expr) expect ((expr) != 0, 0) 265#define expect_false(expr) expect ((expr) != 0, 0)
215#define expect_true(expr) expect ((expr) != 0, 1) 266#define expect_true(expr) expect ((expr) != 0, 1)
267#define inline_size static inline
268
269#if EV_MINIMAL
270# define inline_speed static noinline
271#else
272# define inline_speed static inline
273#endif
216 274
217#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 275#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
218#define ABSPRI(w) ((w)->priority - EV_MINPRI) 276#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
219 277
220#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 278#define EMPTY /* required for microsofts broken pseudo-c compiler */
221#define EMPTY2(a,b) /* used to suppress some warnings */ 279#define EMPTY2(a,b) /* used to suppress some warnings */
222 280
223typedef ev_watcher *W; 281typedef ev_watcher *W;
224typedef ev_watcher_list *WL; 282typedef ev_watcher_list *WL;
225typedef ev_watcher_time *WT; 283typedef ev_watcher_time *WT;
226 284
285/* sig_atomic_t is used to avoid per-thread variables or locking but still */
286/* giving it a reasonably high chance of working on typical architetcures */
227static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 287static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
228 288
229#ifdef _WIN32 289#ifdef _WIN32
230# include "ev_win32.c" 290# include "ev_win32.c"
231#endif 291#endif
232 292
261ev_set_allocator (void *(*cb)(void *ptr, long size)) 321ev_set_allocator (void *(*cb)(void *ptr, long size))
262{ 322{
263 alloc = cb; 323 alloc = cb;
264} 324}
265 325
266static void * 326inline_speed void *
267ev_realloc (void *ptr, long size) 327ev_realloc (void *ptr, long size)
268{ 328{
269 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 329 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
270 330
271 if (!ptr && size) 331 if (!ptr && size)
295typedef struct 355typedef struct
296{ 356{
297 W w; 357 W w;
298 int events; 358 int events;
299} ANPENDING; 359} ANPENDING;
360
361#if EV_USE_INOTIFY
362typedef struct
363{
364 WL head;
365} ANFS;
366#endif
300 367
301#if EV_MULTIPLICITY 368#if EV_MULTIPLICITY
302 369
303 struct ev_loop 370 struct ev_loop
304 { 371 {
361{ 428{
362 return ev_rt_now; 429 return ev_rt_now;
363} 430}
364#endif 431#endif
365 432
366#define array_roundsize(type,n) (((n) | 4) & ~3) 433void
434ev_sleep (ev_tstamp delay)
435{
436 if (delay > 0.)
437 {
438#if EV_USE_NANOSLEEP
439 struct timespec ts;
440
441 ts.tv_sec = (time_t)delay;
442 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
443
444 nanosleep (&ts, 0);
445#elif defined(_WIN32)
446 Sleep (delay * 1e3);
447#else
448 struct timeval tv;
449
450 tv.tv_sec = (time_t)delay;
451 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
452
453 select (0, 0, 0, 0, &tv);
454#endif
455 }
456}
457
458/*****************************************************************************/
459
460int inline_size
461array_nextsize (int elem, int cur, int cnt)
462{
463 int ncur = cur + 1;
464
465 do
466 ncur <<= 1;
467 while (cnt > ncur);
468
469 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
470 if (elem * ncur > 4096)
471 {
472 ncur *= elem;
473 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
474 ncur = ncur - sizeof (void *) * 4;
475 ncur /= elem;
476 }
477
478 return ncur;
479}
480
481static noinline void *
482array_realloc (int elem, void *base, int *cur, int cnt)
483{
484 *cur = array_nextsize (elem, *cur, cnt);
485 return ev_realloc (base, elem * *cur);
486}
367 487
368#define array_needsize(type,base,cur,cnt,init) \ 488#define array_needsize(type,base,cur,cnt,init) \
369 if (expect_false ((cnt) > cur)) \ 489 if (expect_false ((cnt) > (cur))) \
370 { \ 490 { \
371 int newcnt = cur; \ 491 int ocur_ = (cur); \
372 do \ 492 (base) = (type *)array_realloc \
373 { \ 493 (sizeof (type), (base), &(cur), (cnt)); \
374 newcnt = array_roundsize (type, newcnt << 1); \ 494 init ((base) + (ocur_), (cur) - ocur_); \
375 } \
376 while ((cnt) > newcnt); \
377 \
378 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
379 init (base + cur, newcnt - cur); \
380 cur = newcnt; \
381 } 495 }
382 496
497#if 0
383#define array_slim(type,stem) \ 498#define array_slim(type,stem) \
384 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 499 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
385 { \ 500 { \
386 stem ## max = array_roundsize (stem ## cnt >> 1); \ 501 stem ## max = array_roundsize (stem ## cnt >> 1); \
387 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 502 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
388 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 503 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
389 } 504 }
505#endif
390 506
391#define array_free(stem, idx) \ 507#define array_free(stem, idx) \
392 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 508 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
393 509
394/*****************************************************************************/ 510/*****************************************************************************/
395 511
396void noinline 512void noinline
397ev_feed_event (EV_P_ void *w, int revents) 513ev_feed_event (EV_P_ void *w, int revents)
398{ 514{
399 W w_ = (W)w; 515 W w_ = (W)w;
516 int pri = ABSPRI (w_);
400 517
401 if (expect_false (w_->pending)) 518 if (expect_false (w_->pending))
519 pendings [pri][w_->pending - 1].events |= revents;
520 else
402 { 521 {
522 w_->pending = ++pendingcnt [pri];
523 array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
524 pendings [pri][w_->pending - 1].w = w_;
403 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 525 pendings [pri][w_->pending - 1].events = revents;
404 return;
405 } 526 }
406
407 w_->pending = ++pendingcnt [ABSPRI (w_)];
408 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
409 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
410 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
411} 527}
412 528
413void inline_size 529void inline_speed
414queue_events (EV_P_ W *events, int eventcnt, int type) 530queue_events (EV_P_ W *events, int eventcnt, int type)
415{ 531{
416 int i; 532 int i;
417 533
418 for (i = 0; i < eventcnt; ++i) 534 for (i = 0; i < eventcnt; ++i)
450} 566}
451 567
452void 568void
453ev_feed_fd_event (EV_P_ int fd, int revents) 569ev_feed_fd_event (EV_P_ int fd, int revents)
454{ 570{
571 if (fd >= 0 && fd < anfdmax)
455 fd_event (EV_A_ fd, revents); 572 fd_event (EV_A_ fd, revents);
456} 573}
457 574
458void inline_size 575void inline_size
459fd_reify (EV_P) 576fd_reify (EV_P)
460{ 577{
464 { 581 {
465 int fd = fdchanges [i]; 582 int fd = fdchanges [i];
466 ANFD *anfd = anfds + fd; 583 ANFD *anfd = anfds + fd;
467 ev_io *w; 584 ev_io *w;
468 585
469 int events = 0; 586 unsigned char events = 0;
470 587
471 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 588 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
472 events |= w->events; 589 events |= (unsigned char)w->events;
473 590
474#if EV_SELECT_IS_WINSOCKET 591#if EV_SELECT_IS_WINSOCKET
475 if (events) 592 if (events)
476 { 593 {
477 unsigned long argp; 594 unsigned long argp;
478 anfd->handle = _get_osfhandle (fd); 595 anfd->handle = _get_osfhandle (fd);
479 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 596 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
480 } 597 }
481#endif 598#endif
482 599
600 {
601 unsigned char o_events = anfd->events;
602 unsigned char o_reify = anfd->reify;
603
483 anfd->reify = 0; 604 anfd->reify = 0;
484
485 backend_modify (EV_A_ fd, anfd->events, events);
486 anfd->events = events; 605 anfd->events = events;
606
607 if (o_events != events || o_reify & EV_IOFDSET)
608 backend_modify (EV_A_ fd, o_events, events);
609 }
487 } 610 }
488 611
489 fdchangecnt = 0; 612 fdchangecnt = 0;
490} 613}
491 614
492void inline_size 615void inline_size
493fd_change (EV_P_ int fd) 616fd_change (EV_P_ int fd, int flags)
494{ 617{
495 if (expect_false (anfds [fd].reify)) 618 unsigned char reify = anfds [fd].reify;
496 return;
497
498 anfds [fd].reify = 1; 619 anfds [fd].reify |= flags;
499 620
621 if (expect_true (!reify))
622 {
500 ++fdchangecnt; 623 ++fdchangecnt;
501 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 624 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
502 fdchanges [fdchangecnt - 1] = fd; 625 fdchanges [fdchangecnt - 1] = fd;
626 }
503} 627}
504 628
505void inline_speed 629void inline_speed
506fd_kill (EV_P_ int fd) 630fd_kill (EV_P_ int fd)
507{ 631{
554static void noinline 678static void noinline
555fd_rearm_all (EV_P) 679fd_rearm_all (EV_P)
556{ 680{
557 int fd; 681 int fd;
558 682
559 /* this should be highly optimised to not do anything but set a flag */
560 for (fd = 0; fd < anfdmax; ++fd) 683 for (fd = 0; fd < anfdmax; ++fd)
561 if (anfds [fd].events) 684 if (anfds [fd].events)
562 { 685 {
563 anfds [fd].events = 0; 686 anfds [fd].events = 0;
564 fd_change (EV_A_ fd); 687 fd_change (EV_A_ fd, EV_IOFDSET | 1);
565 } 688 }
566} 689}
567 690
568/*****************************************************************************/ 691/*****************************************************************************/
569 692
570void inline_speed 693void inline_speed
571upheap (WT *heap, int k) 694upheap (WT *heap, int k)
572{ 695{
573 WT w = heap [k]; 696 WT w = heap [k];
574 697
575 while (k && heap [k >> 1]->at > w->at) 698 while (k)
576 { 699 {
700 int p = (k - 1) >> 1;
701
702 if (heap [p]->at <= w->at)
703 break;
704
577 heap [k] = heap [k >> 1]; 705 heap [k] = heap [p];
578 ((W)heap [k])->active = k + 1; 706 ((W)heap [k])->active = k + 1;
579 k >>= 1; 707 k = p;
580 } 708 }
581 709
582 heap [k] = w; 710 heap [k] = w;
583 ((W)heap [k])->active = k + 1; 711 ((W)heap [k])->active = k + 1;
584
585} 712}
586 713
587void inline_speed 714void inline_speed
588downheap (WT *heap, int N, int k) 715downheap (WT *heap, int N, int k)
589{ 716{
590 WT w = heap [k]; 717 WT w = heap [k];
591 718
592 while (k < (N >> 1)) 719 for (;;)
593 { 720 {
594 int j = k << 1; 721 int c = (k << 1) + 1;
595 722
596 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 723 if (c >= N)
597 ++j;
598
599 if (w->at <= heap [j]->at)
600 break; 724 break;
601 725
726 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
727 ? 1 : 0;
728
729 if (w->at <= heap [c]->at)
730 break;
731
602 heap [k] = heap [j]; 732 heap [k] = heap [c];
603 ((W)heap [k])->active = k + 1; 733 ((W)heap [k])->active = k + 1;
734
604 k = j; 735 k = c;
605 } 736 }
606 737
607 heap [k] = w; 738 heap [k] = w;
608 ((W)heap [k])->active = k + 1; 739 ((W)heap [k])->active = k + 1;
609} 740}
691 for (signum = signalmax; signum--; ) 822 for (signum = signalmax; signum--; )
692 if (signals [signum].gotsig) 823 if (signals [signum].gotsig)
693 ev_feed_signal_event (EV_A_ signum + 1); 824 ev_feed_signal_event (EV_A_ signum + 1);
694} 825}
695 826
696void inline_size 827void inline_speed
697fd_intern (int fd) 828fd_intern (int fd)
698{ 829{
699#ifdef _WIN32 830#ifdef _WIN32
700 int arg = 1; 831 int arg = 1;
701 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 832 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
716 ev_unref (EV_A); /* child watcher should not keep loop alive */ 847 ev_unref (EV_A); /* child watcher should not keep loop alive */
717} 848}
718 849
719/*****************************************************************************/ 850/*****************************************************************************/
720 851
721static ev_child *childs [EV_PID_HASHSIZE]; 852static WL childs [EV_PID_HASHSIZE];
722 853
723#ifndef _WIN32 854#ifndef _WIN32
724 855
725static ev_signal childev; 856static ev_signal childev;
726 857
730 ev_child *w; 861 ev_child *w;
731 862
732 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 863 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
733 if (w->pid == pid || !w->pid) 864 if (w->pid == pid || !w->pid)
734 { 865 {
735 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 866 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
736 w->rpid = pid; 867 w->rpid = pid;
737 w->rstatus = status; 868 w->rstatus = status;
738 ev_feed_event (EV_A_ (W)w, EV_CHILD); 869 ev_feed_event (EV_A_ (W)w, EV_CHILD);
739 } 870 }
740} 871}
741 872
742#ifndef WCONTINUED 873#ifndef WCONTINUED
841} 972}
842 973
843unsigned int 974unsigned int
844ev_embeddable_backends (void) 975ev_embeddable_backends (void)
845{ 976{
846 return EVBACKEND_EPOLL 977 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
847 | EVBACKEND_KQUEUE 978
848 | EVBACKEND_PORT; 979 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
980 /* please fix it and tell me how to detect the fix */
981 flags &= ~EVBACKEND_EPOLL;
982
983 return flags;
849} 984}
850 985
851unsigned int 986unsigned int
852ev_backend (EV_P) 987ev_backend (EV_P)
853{ 988{
854 return backend; 989 return backend;
855} 990}
856 991
857static void 992unsigned int
993ev_loop_count (EV_P)
994{
995 return loop_count;
996}
997
998void
999ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1000{
1001 io_blocktime = interval;
1002}
1003
1004void
1005ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1006{
1007 timeout_blocktime = interval;
1008}
1009
1010static void noinline
858loop_init (EV_P_ unsigned int flags) 1011loop_init (EV_P_ unsigned int flags)
859{ 1012{
860 if (!backend) 1013 if (!backend)
861 { 1014 {
862#if EV_USE_MONOTONIC 1015#if EV_USE_MONOTONIC
870 ev_rt_now = ev_time (); 1023 ev_rt_now = ev_time ();
871 mn_now = get_clock (); 1024 mn_now = get_clock ();
872 now_floor = mn_now; 1025 now_floor = mn_now;
873 rtmn_diff = ev_rt_now - mn_now; 1026 rtmn_diff = ev_rt_now - mn_now;
874 1027
1028 io_blocktime = 0.;
1029 timeout_blocktime = 0.;
1030
1031 /* pid check not overridable via env */
1032#ifndef _WIN32
1033 if (flags & EVFLAG_FORKCHECK)
1034 curpid = getpid ();
1035#endif
1036
875 if (!(flags & EVFLAG_NOENV) 1037 if (!(flags & EVFLAG_NOENV)
876 && !enable_secure () 1038 && !enable_secure ()
877 && getenv ("LIBEV_FLAGS")) 1039 && getenv ("LIBEV_FLAGS"))
878 flags = atoi (getenv ("LIBEV_FLAGS")); 1040 flags = atoi (getenv ("LIBEV_FLAGS"));
879 1041
880 if (!(flags & 0x0000ffffUL)) 1042 if (!(flags & 0x0000ffffUL))
881 flags |= ev_recommended_backends (); 1043 flags |= ev_recommended_backends ();
882 1044
883 backend = 0; 1045 backend = 0;
1046 backend_fd = -1;
1047#if EV_USE_INOTIFY
1048 fs_fd = -2;
1049#endif
1050
884#if EV_USE_PORT 1051#if EV_USE_PORT
885 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1052 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
886#endif 1053#endif
887#if EV_USE_KQUEUE 1054#if EV_USE_KQUEUE
888 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1055 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
900 ev_init (&sigev, sigcb); 1067 ev_init (&sigev, sigcb);
901 ev_set_priority (&sigev, EV_MAXPRI); 1068 ev_set_priority (&sigev, EV_MAXPRI);
902 } 1069 }
903} 1070}
904 1071
905static void 1072static void noinline
906loop_destroy (EV_P) 1073loop_destroy (EV_P)
907{ 1074{
908 int i; 1075 int i;
1076
1077#if EV_USE_INOTIFY
1078 if (fs_fd >= 0)
1079 close (fs_fd);
1080#endif
1081
1082 if (backend_fd >= 0)
1083 close (backend_fd);
909 1084
910#if EV_USE_PORT 1085#if EV_USE_PORT
911 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1086 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
912#endif 1087#endif
913#if EV_USE_KQUEUE 1088#if EV_USE_KQUEUE
922#if EV_USE_SELECT 1097#if EV_USE_SELECT
923 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1098 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
924#endif 1099#endif
925 1100
926 for (i = NUMPRI; i--; ) 1101 for (i = NUMPRI; i--; )
1102 {
927 array_free (pending, [i]); 1103 array_free (pending, [i]);
1104#if EV_IDLE_ENABLE
1105 array_free (idle, [i]);
1106#endif
1107 }
1108
1109 ev_free (anfds); anfdmax = 0;
928 1110
929 /* have to use the microsoft-never-gets-it-right macro */ 1111 /* have to use the microsoft-never-gets-it-right macro */
930 array_free (fdchange, EMPTY0); 1112 array_free (fdchange, EMPTY);
931 array_free (timer, EMPTY0); 1113 array_free (timer, EMPTY);
932#if EV_PERIODIC_ENABLE 1114#if EV_PERIODIC_ENABLE
933 array_free (periodic, EMPTY0); 1115 array_free (periodic, EMPTY);
934#endif 1116#endif
1117#if EV_FORK_ENABLE
935 array_free (idle, EMPTY0); 1118 array_free (fork, EMPTY);
1119#endif
936 array_free (prepare, EMPTY0); 1120 array_free (prepare, EMPTY);
937 array_free (check, EMPTY0); 1121 array_free (check, EMPTY);
938 1122
939 backend = 0; 1123 backend = 0;
940} 1124}
941 1125
942static void 1126void inline_size infy_fork (EV_P);
1127
1128void inline_size
943loop_fork (EV_P) 1129loop_fork (EV_P)
944{ 1130{
945#if EV_USE_PORT 1131#if EV_USE_PORT
946 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1132 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
947#endif 1133#endif
948#if EV_USE_KQUEUE 1134#if EV_USE_KQUEUE
949 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1135 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
950#endif 1136#endif
951#if EV_USE_EPOLL 1137#if EV_USE_EPOLL
952 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1138 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1139#endif
1140#if EV_USE_INOTIFY
1141 infy_fork (EV_A);
953#endif 1142#endif
954 1143
955 if (ev_is_active (&sigev)) 1144 if (ev_is_active (&sigev))
956 { 1145 {
957 /* default loop */ 1146 /* default loop */
1073 postfork = 1; 1262 postfork = 1;
1074} 1263}
1075 1264
1076/*****************************************************************************/ 1265/*****************************************************************************/
1077 1266
1078int inline_size 1267void
1079any_pending (EV_P) 1268ev_invoke (EV_P_ void *w, int revents)
1080{ 1269{
1081 int pri; 1270 EV_CB_INVOKE ((W)w, revents);
1082
1083 for (pri = NUMPRI; pri--; )
1084 if (pendingcnt [pri])
1085 return 1;
1086
1087 return 0;
1088} 1271}
1089 1272
1090void inline_speed 1273void inline_speed
1091call_pending (EV_P) 1274call_pending (EV_P)
1092{ 1275{
1097 { 1280 {
1098 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1281 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1099 1282
1100 if (expect_true (p->w)) 1283 if (expect_true (p->w))
1101 { 1284 {
1102 assert (("non-pending watcher on pending list", p->w->pending)); 1285 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1103 1286
1104 p->w->pending = 0; 1287 p->w->pending = 0;
1105 EV_CB_INVOKE (p->w, p->events); 1288 EV_CB_INVOKE (p->w, p->events);
1106 } 1289 }
1107 } 1290 }
1110void inline_size 1293void inline_size
1111timers_reify (EV_P) 1294timers_reify (EV_P)
1112{ 1295{
1113 while (timercnt && ((WT)timers [0])->at <= mn_now) 1296 while (timercnt && ((WT)timers [0])->at <= mn_now)
1114 { 1297 {
1115 ev_timer *w = timers [0]; 1298 ev_timer *w = (ev_timer *)timers [0];
1116 1299
1117 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1300 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1118 1301
1119 /* first reschedule or stop timer */ 1302 /* first reschedule or stop timer */
1120 if (w->repeat) 1303 if (w->repeat)
1121 { 1304 {
1122 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1305 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1123 1306
1124 ((WT)w)->at += w->repeat; 1307 ((WT)w)->at += w->repeat;
1125 if (((WT)w)->at < mn_now) 1308 if (((WT)w)->at < mn_now)
1126 ((WT)w)->at = mn_now; 1309 ((WT)w)->at = mn_now;
1127 1310
1128 downheap ((WT *)timers, timercnt, 0); 1311 downheap (timers, timercnt, 0);
1129 } 1312 }
1130 else 1313 else
1131 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1314 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1132 1315
1133 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1316 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1138void inline_size 1321void inline_size
1139periodics_reify (EV_P) 1322periodics_reify (EV_P)
1140{ 1323{
1141 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1324 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1142 { 1325 {
1143 ev_periodic *w = periodics [0]; 1326 ev_periodic *w = (ev_periodic *)periodics [0];
1144 1327
1145 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1328 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1146 1329
1147 /* first reschedule or stop timer */ 1330 /* first reschedule or stop timer */
1148 if (w->reschedule_cb) 1331 if (w->reschedule_cb)
1149 { 1332 {
1150 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1333 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1151 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1334 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1152 downheap ((WT *)periodics, periodiccnt, 0); 1335 downheap (periodics, periodiccnt, 0);
1153 } 1336 }
1154 else if (w->interval) 1337 else if (w->interval)
1155 { 1338 {
1156 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1339 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1340 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1157 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1341 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1158 downheap ((WT *)periodics, periodiccnt, 0); 1342 downheap (periodics, periodiccnt, 0);
1159 } 1343 }
1160 else 1344 else
1161 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1345 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1162 1346
1163 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1347 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1170 int i; 1354 int i;
1171 1355
1172 /* adjust periodics after time jump */ 1356 /* adjust periodics after time jump */
1173 for (i = 0; i < periodiccnt; ++i) 1357 for (i = 0; i < periodiccnt; ++i)
1174 { 1358 {
1175 ev_periodic *w = periodics [i]; 1359 ev_periodic *w = (ev_periodic *)periodics [i];
1176 1360
1177 if (w->reschedule_cb) 1361 if (w->reschedule_cb)
1178 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1362 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1179 else if (w->interval) 1363 else if (w->interval)
1180 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1364 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1181 } 1365 }
1182 1366
1183 /* now rebuild the heap */ 1367 /* now rebuild the heap */
1184 for (i = periodiccnt >> 1; i--; ) 1368 for (i = periodiccnt >> 1; i--; )
1185 downheap ((WT *)periodics, periodiccnt, i); 1369 downheap (periodics, periodiccnt, i);
1186} 1370}
1187#endif 1371#endif
1188 1372
1373#if EV_IDLE_ENABLE
1189int inline_size 1374void inline_size
1190time_update_monotonic (EV_P) 1375idle_reify (EV_P)
1191{ 1376{
1377 if (expect_false (idleall))
1378 {
1379 int pri;
1380
1381 for (pri = NUMPRI; pri--; )
1382 {
1383 if (pendingcnt [pri])
1384 break;
1385
1386 if (idlecnt [pri])
1387 {
1388 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1389 break;
1390 }
1391 }
1392 }
1393}
1394#endif
1395
1396void inline_speed
1397time_update (EV_P_ ev_tstamp max_block)
1398{
1399 int i;
1400
1401#if EV_USE_MONOTONIC
1402 if (expect_true (have_monotonic))
1403 {
1404 ev_tstamp odiff = rtmn_diff;
1405
1192 mn_now = get_clock (); 1406 mn_now = get_clock ();
1193 1407
1408 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1409 /* interpolate in the meantime */
1194 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1410 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1195 { 1411 {
1196 ev_rt_now = rtmn_diff + mn_now; 1412 ev_rt_now = rtmn_diff + mn_now;
1197 return 0; 1413 return;
1198 } 1414 }
1199 else 1415
1200 {
1201 now_floor = mn_now; 1416 now_floor = mn_now;
1202 ev_rt_now = ev_time (); 1417 ev_rt_now = ev_time ();
1203 return 1;
1204 }
1205}
1206 1418
1207void inline_size 1419 /* loop a few times, before making important decisions.
1208time_update (EV_P) 1420 * on the choice of "4": one iteration isn't enough,
1209{ 1421 * in case we get preempted during the calls to
1210 int i; 1422 * ev_time and get_clock. a second call is almost guaranteed
1211 1423 * to succeed in that case, though. and looping a few more times
1212#if EV_USE_MONOTONIC 1424 * doesn't hurt either as we only do this on time-jumps or
1213 if (expect_true (have_monotonic)) 1425 * in the unlikely event of having been preempted here.
1214 { 1426 */
1215 if (time_update_monotonic (EV_A)) 1427 for (i = 4; --i; )
1216 { 1428 {
1217 ev_tstamp odiff = rtmn_diff;
1218
1219 /* loop a few times, before making important decisions.
1220 * on the choice of "4": one iteration isn't enough,
1221 * in case we get preempted during the calls to
1222 * ev_time and get_clock. a second call is almost guarenteed
1223 * to succeed in that case, though. and looping a few more times
1224 * doesn't hurt either as we only do this on time-jumps or
1225 * in the unlikely event of getting preempted here.
1226 */
1227 for (i = 4; --i; )
1228 {
1229 rtmn_diff = ev_rt_now - mn_now; 1429 rtmn_diff = ev_rt_now - mn_now;
1230 1430
1231 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1431 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1232 return; /* all is well */ 1432 return; /* all is well */
1233 1433
1234 ev_rt_now = ev_time (); 1434 ev_rt_now = ev_time ();
1235 mn_now = get_clock (); 1435 mn_now = get_clock ();
1236 now_floor = mn_now; 1436 now_floor = mn_now;
1237 } 1437 }
1238 1438
1239# if EV_PERIODIC_ENABLE 1439# if EV_PERIODIC_ENABLE
1240 periodics_reschedule (EV_A); 1440 periodics_reschedule (EV_A);
1241# endif 1441# endif
1242 /* no timer adjustment, as the monotonic clock doesn't jump */ 1442 /* no timer adjustment, as the monotonic clock doesn't jump */
1243 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1443 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1244 }
1245 } 1444 }
1246 else 1445 else
1247#endif 1446#endif
1248 { 1447 {
1249 ev_rt_now = ev_time (); 1448 ev_rt_now = ev_time ();
1250 1449
1251 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1450 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1252 { 1451 {
1253#if EV_PERIODIC_ENABLE 1452#if EV_PERIODIC_ENABLE
1254 periodics_reschedule (EV_A); 1453 periodics_reschedule (EV_A);
1255#endif 1454#endif
1256
1257 /* adjust timers. this is easy, as the offset is the same for all */ 1455 /* adjust timers. this is easy, as the offset is the same for all of them */
1258 for (i = 0; i < timercnt; ++i) 1456 for (i = 0; i < timercnt; ++i)
1259 ((WT)timers [i])->at += ev_rt_now - mn_now; 1457 ((WT)timers [i])->at += ev_rt_now - mn_now;
1260 } 1458 }
1261 1459
1262 mn_now = ev_rt_now; 1460 mn_now = ev_rt_now;
1282{ 1480{
1283 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1481 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1284 ? EVUNLOOP_ONE 1482 ? EVUNLOOP_ONE
1285 : EVUNLOOP_CANCEL; 1483 : EVUNLOOP_CANCEL;
1286 1484
1287 while (activecnt) 1485 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1486
1487 do
1288 { 1488 {
1289 /* we might have forked, so reify kernel state if necessary */ 1489#ifndef _WIN32
1490 if (expect_false (curpid)) /* penalise the forking check even more */
1491 if (expect_false (getpid () != curpid))
1492 {
1493 curpid = getpid ();
1494 postfork = 1;
1495 }
1496#endif
1497
1290 #if EV_FORK_ENABLE 1498#if EV_FORK_ENABLE
1499 /* we might have forked, so queue fork handlers */
1291 if (expect_false (postfork)) 1500 if (expect_false (postfork))
1292 if (forkcnt) 1501 if (forkcnt)
1293 { 1502 {
1294 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 1503 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1295 call_pending (EV_A); 1504 call_pending (EV_A);
1296 } 1505 }
1297 #endif 1506#endif
1298 1507
1299 /* queue check watchers (and execute them) */ 1508 /* queue prepare watchers (and execute them) */
1300 if (expect_false (preparecnt)) 1509 if (expect_false (preparecnt))
1301 { 1510 {
1302 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1511 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1303 call_pending (EV_A); 1512 call_pending (EV_A);
1304 } 1513 }
1305 1514
1515 if (expect_false (!activecnt))
1516 break;
1517
1306 /* we might have forked, so reify kernel state if necessary */ 1518 /* we might have forked, so reify kernel state if necessary */
1307 if (expect_false (postfork)) 1519 if (expect_false (postfork))
1308 loop_fork (EV_A); 1520 loop_fork (EV_A);
1309 1521
1310 /* update fd-related kernel structures */ 1522 /* update fd-related kernel structures */
1311 fd_reify (EV_A); 1523 fd_reify (EV_A);
1312 1524
1313 /* calculate blocking time */ 1525 /* calculate blocking time */
1314 { 1526 {
1315 double block; 1527 ev_tstamp waittime = 0.;
1528 ev_tstamp sleeptime = 0.;
1316 1529
1317 if (flags & EVLOOP_NONBLOCK || idlecnt) 1530 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1318 block = 0.; /* do not block at all */
1319 else
1320 { 1531 {
1321 /* update time to cancel out callback processing overhead */ 1532 /* update time to cancel out callback processing overhead */
1322#if EV_USE_MONOTONIC
1323 if (expect_true (have_monotonic))
1324 time_update_monotonic (EV_A); 1533 time_update (EV_A_ 1e100);
1325 else
1326#endif
1327 {
1328 ev_rt_now = ev_time ();
1329 mn_now = ev_rt_now;
1330 }
1331 1534
1332 block = MAX_BLOCKTIME; 1535 waittime = MAX_BLOCKTIME;
1333 1536
1334 if (timercnt) 1537 if (timercnt)
1335 { 1538 {
1336 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1539 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1337 if (block > to) block = to; 1540 if (waittime > to) waittime = to;
1338 } 1541 }
1339 1542
1340#if EV_PERIODIC_ENABLE 1543#if EV_PERIODIC_ENABLE
1341 if (periodiccnt) 1544 if (periodiccnt)
1342 { 1545 {
1343 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1546 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1344 if (block > to) block = to; 1547 if (waittime > to) waittime = to;
1345 } 1548 }
1346#endif 1549#endif
1347 1550
1348 if (expect_false (block < 0.)) block = 0.; 1551 if (expect_false (waittime < timeout_blocktime))
1552 waittime = timeout_blocktime;
1553
1554 sleeptime = waittime - backend_fudge;
1555
1556 if (expect_true (sleeptime > io_blocktime))
1557 sleeptime = io_blocktime;
1558
1559 if (sleeptime)
1560 {
1561 ev_sleep (sleeptime);
1562 waittime -= sleeptime;
1563 }
1349 } 1564 }
1350 1565
1566 ++loop_count;
1351 backend_poll (EV_A_ block); 1567 backend_poll (EV_A_ waittime);
1568
1569 /* update ev_rt_now, do magic */
1570 time_update (EV_A_ waittime + sleeptime);
1352 } 1571 }
1353
1354 /* update ev_rt_now, do magic */
1355 time_update (EV_A);
1356 1572
1357 /* queue pending timers and reschedule them */ 1573 /* queue pending timers and reschedule them */
1358 timers_reify (EV_A); /* relative timers called last */ 1574 timers_reify (EV_A); /* relative timers called last */
1359#if EV_PERIODIC_ENABLE 1575#if EV_PERIODIC_ENABLE
1360 periodics_reify (EV_A); /* absolute timers called first */ 1576 periodics_reify (EV_A); /* absolute timers called first */
1361#endif 1577#endif
1362 1578
1579#if EV_IDLE_ENABLE
1363 /* queue idle watchers unless other events are pending */ 1580 /* queue idle watchers unless other events are pending */
1364 if (idlecnt && !any_pending (EV_A)) 1581 idle_reify (EV_A);
1365 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1582#endif
1366 1583
1367 /* queue check watchers, to be executed first */ 1584 /* queue check watchers, to be executed first */
1368 if (expect_false (checkcnt)) 1585 if (expect_false (checkcnt))
1369 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1586 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1370 1587
1371 call_pending (EV_A); 1588 call_pending (EV_A);
1372 1589
1373 if (expect_false (loop_done))
1374 break;
1375 } 1590 }
1591 while (expect_true (activecnt && !loop_done));
1376 1592
1377 if (loop_done == EVUNLOOP_ONE) 1593 if (loop_done == EVUNLOOP_ONE)
1378 loop_done = EVUNLOOP_CANCEL; 1594 loop_done = EVUNLOOP_CANCEL;
1379} 1595}
1380 1596
1407 head = &(*head)->next; 1623 head = &(*head)->next;
1408 } 1624 }
1409} 1625}
1410 1626
1411void inline_speed 1627void inline_speed
1412ev_clear_pending (EV_P_ W w) 1628clear_pending (EV_P_ W w)
1413{ 1629{
1414 if (w->pending) 1630 if (w->pending)
1415 { 1631 {
1416 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1632 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1417 w->pending = 0; 1633 w->pending = 0;
1418 } 1634 }
1419} 1635}
1420 1636
1637int
1638ev_clear_pending (EV_P_ void *w)
1639{
1640 W w_ = (W)w;
1641 int pending = w_->pending;
1642
1643 if (expect_true (pending))
1644 {
1645 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1646 w_->pending = 0;
1647 p->w = 0;
1648 return p->events;
1649 }
1650 else
1651 return 0;
1652}
1653
1654void inline_size
1655pri_adjust (EV_P_ W w)
1656{
1657 int pri = w->priority;
1658 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1659 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1660 w->priority = pri;
1661}
1662
1421void inline_speed 1663void inline_speed
1422ev_start (EV_P_ W w, int active) 1664ev_start (EV_P_ W w, int active)
1423{ 1665{
1424 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1666 pri_adjust (EV_A_ w);
1425 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1426
1427 w->active = active; 1667 w->active = active;
1428 ev_ref (EV_A); 1668 ev_ref (EV_A);
1429} 1669}
1430 1670
1431void inline_size 1671void inline_size
1435 w->active = 0; 1675 w->active = 0;
1436} 1676}
1437 1677
1438/*****************************************************************************/ 1678/*****************************************************************************/
1439 1679
1440void 1680void noinline
1441ev_io_start (EV_P_ ev_io *w) 1681ev_io_start (EV_P_ ev_io *w)
1442{ 1682{
1443 int fd = w->fd; 1683 int fd = w->fd;
1444 1684
1445 if (expect_false (ev_is_active (w))) 1685 if (expect_false (ev_is_active (w)))
1447 1687
1448 assert (("ev_io_start called with negative fd", fd >= 0)); 1688 assert (("ev_io_start called with negative fd", fd >= 0));
1449 1689
1450 ev_start (EV_A_ (W)w, 1); 1690 ev_start (EV_A_ (W)w, 1);
1451 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1691 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1452 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1692 wlist_add (&anfds[fd].head, (WL)w);
1453 1693
1454 fd_change (EV_A_ fd); 1694 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1695 w->events &= ~EV_IOFDSET;
1455} 1696}
1456 1697
1457void 1698void noinline
1458ev_io_stop (EV_P_ ev_io *w) 1699ev_io_stop (EV_P_ ev_io *w)
1459{ 1700{
1460 ev_clear_pending (EV_A_ (W)w); 1701 clear_pending (EV_A_ (W)w);
1461 if (expect_false (!ev_is_active (w))) 1702 if (expect_false (!ev_is_active (w)))
1462 return; 1703 return;
1463 1704
1464 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1705 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1465 1706
1466 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1707 wlist_del (&anfds[w->fd].head, (WL)w);
1467 ev_stop (EV_A_ (W)w); 1708 ev_stop (EV_A_ (W)w);
1468 1709
1469 fd_change (EV_A_ w->fd); 1710 fd_change (EV_A_ w->fd, 1);
1470} 1711}
1471 1712
1472void 1713void noinline
1473ev_timer_start (EV_P_ ev_timer *w) 1714ev_timer_start (EV_P_ ev_timer *w)
1474{ 1715{
1475 if (expect_false (ev_is_active (w))) 1716 if (expect_false (ev_is_active (w)))
1476 return; 1717 return;
1477 1718
1478 ((WT)w)->at += mn_now; 1719 ((WT)w)->at += mn_now;
1479 1720
1480 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1721 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1481 1722
1482 ev_start (EV_A_ (W)w, ++timercnt); 1723 ev_start (EV_A_ (W)w, ++timercnt);
1483 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1724 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1484 timers [timercnt - 1] = w; 1725 timers [timercnt - 1] = (WT)w;
1485 upheap ((WT *)timers, timercnt - 1); 1726 upheap (timers, timercnt - 1);
1486 1727
1487 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1728 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1488} 1729}
1489 1730
1490void 1731void noinline
1491ev_timer_stop (EV_P_ ev_timer *w) 1732ev_timer_stop (EV_P_ ev_timer *w)
1492{ 1733{
1493 ev_clear_pending (EV_A_ (W)w); 1734 clear_pending (EV_A_ (W)w);
1494 if (expect_false (!ev_is_active (w))) 1735 if (expect_false (!ev_is_active (w)))
1495 return; 1736 return;
1496 1737
1497 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1738 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1498 1739
1740 {
1741 int active = ((W)w)->active;
1742
1499 if (expect_true (((W)w)->active < timercnt--)) 1743 if (expect_true (--active < --timercnt))
1500 { 1744 {
1501 timers [((W)w)->active - 1] = timers [timercnt]; 1745 timers [active] = timers [timercnt];
1502 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1746 adjustheap (timers, timercnt, active);
1503 } 1747 }
1748 }
1504 1749
1505 ((WT)w)->at -= mn_now; 1750 ((WT)w)->at -= mn_now;
1506 1751
1507 ev_stop (EV_A_ (W)w); 1752 ev_stop (EV_A_ (W)w);
1508} 1753}
1509 1754
1510void 1755void noinline
1511ev_timer_again (EV_P_ ev_timer *w) 1756ev_timer_again (EV_P_ ev_timer *w)
1512{ 1757{
1513 if (ev_is_active (w)) 1758 if (ev_is_active (w))
1514 { 1759 {
1515 if (w->repeat) 1760 if (w->repeat)
1516 { 1761 {
1517 ((WT)w)->at = mn_now + w->repeat; 1762 ((WT)w)->at = mn_now + w->repeat;
1518 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1763 adjustheap (timers, timercnt, ((W)w)->active - 1);
1519 } 1764 }
1520 else 1765 else
1521 ev_timer_stop (EV_A_ w); 1766 ev_timer_stop (EV_A_ w);
1522 } 1767 }
1523 else if (w->repeat) 1768 else if (w->repeat)
1526 ev_timer_start (EV_A_ w); 1771 ev_timer_start (EV_A_ w);
1527 } 1772 }
1528} 1773}
1529 1774
1530#if EV_PERIODIC_ENABLE 1775#if EV_PERIODIC_ENABLE
1531void 1776void noinline
1532ev_periodic_start (EV_P_ ev_periodic *w) 1777ev_periodic_start (EV_P_ ev_periodic *w)
1533{ 1778{
1534 if (expect_false (ev_is_active (w))) 1779 if (expect_false (ev_is_active (w)))
1535 return; 1780 return;
1536 1781
1538 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1783 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1539 else if (w->interval) 1784 else if (w->interval)
1540 { 1785 {
1541 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1786 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1542 /* this formula differs from the one in periodic_reify because we do not always round up */ 1787 /* this formula differs from the one in periodic_reify because we do not always round up */
1543 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1788 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1544 } 1789 }
1790 else
1791 ((WT)w)->at = w->offset;
1545 1792
1546 ev_start (EV_A_ (W)w, ++periodiccnt); 1793 ev_start (EV_A_ (W)w, ++periodiccnt);
1547 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1794 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1548 periodics [periodiccnt - 1] = w; 1795 periodics [periodiccnt - 1] = (WT)w;
1549 upheap ((WT *)periodics, periodiccnt - 1); 1796 upheap (periodics, periodiccnt - 1);
1550 1797
1551 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1798 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1552} 1799}
1553 1800
1554void 1801void noinline
1555ev_periodic_stop (EV_P_ ev_periodic *w) 1802ev_periodic_stop (EV_P_ ev_periodic *w)
1556{ 1803{
1557 ev_clear_pending (EV_A_ (W)w); 1804 clear_pending (EV_A_ (W)w);
1558 if (expect_false (!ev_is_active (w))) 1805 if (expect_false (!ev_is_active (w)))
1559 return; 1806 return;
1560 1807
1561 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1808 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1562 1809
1810 {
1811 int active = ((W)w)->active;
1812
1563 if (expect_true (((W)w)->active < periodiccnt--)) 1813 if (expect_true (--active < --periodiccnt))
1564 { 1814 {
1565 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1815 periodics [active] = periodics [periodiccnt];
1566 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1816 adjustheap (periodics, periodiccnt, active);
1567 } 1817 }
1818 }
1568 1819
1569 ev_stop (EV_A_ (W)w); 1820 ev_stop (EV_A_ (W)w);
1570} 1821}
1571 1822
1572void 1823void noinline
1573ev_periodic_again (EV_P_ ev_periodic *w) 1824ev_periodic_again (EV_P_ ev_periodic *w)
1574{ 1825{
1575 /* TODO: use adjustheap and recalculation */ 1826 /* TODO: use adjustheap and recalculation */
1576 ev_periodic_stop (EV_A_ w); 1827 ev_periodic_stop (EV_A_ w);
1577 ev_periodic_start (EV_A_ w); 1828 ev_periodic_start (EV_A_ w);
1580 1831
1581#ifndef SA_RESTART 1832#ifndef SA_RESTART
1582# define SA_RESTART 0 1833# define SA_RESTART 0
1583#endif 1834#endif
1584 1835
1585void 1836void noinline
1586ev_signal_start (EV_P_ ev_signal *w) 1837ev_signal_start (EV_P_ ev_signal *w)
1587{ 1838{
1588#if EV_MULTIPLICITY 1839#if EV_MULTIPLICITY
1589 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 1840 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1590#endif 1841#endif
1591 if (expect_false (ev_is_active (w))) 1842 if (expect_false (ev_is_active (w)))
1592 return; 1843 return;
1593 1844
1594 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1845 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1595 1846
1847 {
1848#ifndef _WIN32
1849 sigset_t full, prev;
1850 sigfillset (&full);
1851 sigprocmask (SIG_SETMASK, &full, &prev);
1852#endif
1853
1854 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1855
1856#ifndef _WIN32
1857 sigprocmask (SIG_SETMASK, &prev, 0);
1858#endif
1859 }
1860
1596 ev_start (EV_A_ (W)w, 1); 1861 ev_start (EV_A_ (W)w, 1);
1597 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1598 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1862 wlist_add (&signals [w->signum - 1].head, (WL)w);
1599 1863
1600 if (!((WL)w)->next) 1864 if (!((WL)w)->next)
1601 { 1865 {
1602#if _WIN32 1866#if _WIN32
1603 signal (w->signum, sighandler); 1867 signal (w->signum, sighandler);
1609 sigaction (w->signum, &sa, 0); 1873 sigaction (w->signum, &sa, 0);
1610#endif 1874#endif
1611 } 1875 }
1612} 1876}
1613 1877
1614void 1878void noinline
1615ev_signal_stop (EV_P_ ev_signal *w) 1879ev_signal_stop (EV_P_ ev_signal *w)
1616{ 1880{
1617 ev_clear_pending (EV_A_ (W)w); 1881 clear_pending (EV_A_ (W)w);
1618 if (expect_false (!ev_is_active (w))) 1882 if (expect_false (!ev_is_active (w)))
1619 return; 1883 return;
1620 1884
1621 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1885 wlist_del (&signals [w->signum - 1].head, (WL)w);
1622 ev_stop (EV_A_ (W)w); 1886 ev_stop (EV_A_ (W)w);
1623 1887
1624 if (!signals [w->signum - 1].head) 1888 if (!signals [w->signum - 1].head)
1625 signal (w->signum, SIG_DFL); 1889 signal (w->signum, SIG_DFL);
1626} 1890}
1633#endif 1897#endif
1634 if (expect_false (ev_is_active (w))) 1898 if (expect_false (ev_is_active (w)))
1635 return; 1899 return;
1636 1900
1637 ev_start (EV_A_ (W)w, 1); 1901 ev_start (EV_A_ (W)w, 1);
1638 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1902 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1639} 1903}
1640 1904
1641void 1905void
1642ev_child_stop (EV_P_ ev_child *w) 1906ev_child_stop (EV_P_ ev_child *w)
1643{ 1907{
1644 ev_clear_pending (EV_A_ (W)w); 1908 clear_pending (EV_A_ (W)w);
1645 if (expect_false (!ev_is_active (w))) 1909 if (expect_false (!ev_is_active (w)))
1646 return; 1910 return;
1647 1911
1648 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1912 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1649 ev_stop (EV_A_ (W)w); 1913 ev_stop (EV_A_ (W)w);
1650} 1914}
1651 1915
1652#if EV_STAT_ENABLE 1916#if EV_STAT_ENABLE
1653 1917
1657# endif 1921# endif
1658 1922
1659#define DEF_STAT_INTERVAL 5.0074891 1923#define DEF_STAT_INTERVAL 5.0074891
1660#define MIN_STAT_INTERVAL 0.1074891 1924#define MIN_STAT_INTERVAL 0.1074891
1661 1925
1926static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1927
1928#if EV_USE_INOTIFY
1929# define EV_INOTIFY_BUFSIZE 8192
1930
1931static void noinline
1932infy_add (EV_P_ ev_stat *w)
1933{
1934 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);
1935
1936 if (w->wd < 0)
1937 {
1938 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1939
1940 /* monitor some parent directory for speedup hints */
1941 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1942 {
1943 char path [4096];
1944 strcpy (path, w->path);
1945
1946 do
1947 {
1948 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1949 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1950
1951 char *pend = strrchr (path, '/');
1952
1953 if (!pend)
1954 break; /* whoops, no '/', complain to your admin */
1955
1956 *pend = 0;
1957 w->wd = inotify_add_watch (fs_fd, path, mask);
1958 }
1959 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1960 }
1961 }
1962 else
1963 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1964
1965 if (w->wd >= 0)
1966 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1967}
1968
1969static void noinline
1970infy_del (EV_P_ ev_stat *w)
1971{
1972 int slot;
1973 int wd = w->wd;
1974
1975 if (wd < 0)
1976 return;
1977
1978 w->wd = -2;
1979 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1980 wlist_del (&fs_hash [slot].head, (WL)w);
1981
1982 /* remove this watcher, if others are watching it, they will rearm */
1983 inotify_rm_watch (fs_fd, wd);
1984}
1985
1986static void noinline
1987infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1988{
1989 if (slot < 0)
1990 /* overflow, need to check for all hahs slots */
1991 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1992 infy_wd (EV_A_ slot, wd, ev);
1993 else
1994 {
1995 WL w_;
1996
1997 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1998 {
1999 ev_stat *w = (ev_stat *)w_;
2000 w_ = w_->next; /* lets us remove this watcher and all before it */
2001
2002 if (w->wd == wd || wd == -1)
2003 {
2004 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2005 {
2006 w->wd = -1;
2007 infy_add (EV_A_ w); /* re-add, no matter what */
2008 }
2009
2010 stat_timer_cb (EV_A_ &w->timer, 0);
2011 }
2012 }
2013 }
2014}
2015
2016static void
2017infy_cb (EV_P_ ev_io *w, int revents)
2018{
2019 char buf [EV_INOTIFY_BUFSIZE];
2020 struct inotify_event *ev = (struct inotify_event *)buf;
2021 int ofs;
2022 int len = read (fs_fd, buf, sizeof (buf));
2023
2024 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2025 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2026}
2027
2028void inline_size
2029infy_init (EV_P)
2030{
2031 if (fs_fd != -2)
2032 return;
2033
2034 fs_fd = inotify_init ();
2035
2036 if (fs_fd >= 0)
2037 {
2038 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2039 ev_set_priority (&fs_w, EV_MAXPRI);
2040 ev_io_start (EV_A_ &fs_w);
2041 }
2042}
2043
2044void inline_size
2045infy_fork (EV_P)
2046{
2047 int slot;
2048
2049 if (fs_fd < 0)
2050 return;
2051
2052 close (fs_fd);
2053 fs_fd = inotify_init ();
2054
2055 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2056 {
2057 WL w_ = fs_hash [slot].head;
2058 fs_hash [slot].head = 0;
2059
2060 while (w_)
2061 {
2062 ev_stat *w = (ev_stat *)w_;
2063 w_ = w_->next; /* lets us add this watcher */
2064
2065 w->wd = -1;
2066
2067 if (fs_fd >= 0)
2068 infy_add (EV_A_ w); /* re-add, no matter what */
2069 else
2070 ev_timer_start (EV_A_ &w->timer);
2071 }
2072
2073 }
2074}
2075
2076#endif
2077
1662void 2078void
1663ev_stat_stat (EV_P_ ev_stat *w) 2079ev_stat_stat (EV_P_ ev_stat *w)
1664{ 2080{
1665 if (lstat (w->path, &w->attr) < 0) 2081 if (lstat (w->path, &w->attr) < 0)
1666 w->attr.st_nlink = 0; 2082 w->attr.st_nlink = 0;
1667 else if (!w->attr.st_nlink) 2083 else if (!w->attr.st_nlink)
1668 w->attr.st_nlink = 1; 2084 w->attr.st_nlink = 1;
1669} 2085}
1670 2086
1671static void 2087static void noinline
1672stat_timer_cb (EV_P_ ev_timer *w_, int revents) 2088stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1673{ 2089{
1674 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 2090 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1675 2091
1676 /* we copy this here each the time so that */ 2092 /* we copy this here each the time so that */
1677 /* prev has the old value when the callback gets invoked */ 2093 /* prev has the old value when the callback gets invoked */
1678 w->prev = w->attr; 2094 w->prev = w->attr;
1679 ev_stat_stat (EV_A_ w); 2095 ev_stat_stat (EV_A_ w);
1680 2096
1681 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata))) 2097 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2098 if (
2099 w->prev.st_dev != w->attr.st_dev
2100 || w->prev.st_ino != w->attr.st_ino
2101 || w->prev.st_mode != w->attr.st_mode
2102 || w->prev.st_nlink != w->attr.st_nlink
2103 || w->prev.st_uid != w->attr.st_uid
2104 || w->prev.st_gid != w->attr.st_gid
2105 || w->prev.st_rdev != w->attr.st_rdev
2106 || w->prev.st_size != w->attr.st_size
2107 || w->prev.st_atime != w->attr.st_atime
2108 || w->prev.st_mtime != w->attr.st_mtime
2109 || w->prev.st_ctime != w->attr.st_ctime
2110 ) {
2111 #if EV_USE_INOTIFY
2112 infy_del (EV_A_ w);
2113 infy_add (EV_A_ w);
2114 ev_stat_stat (EV_A_ w); /* avoid race... */
2115 #endif
2116
1682 ev_feed_event (EV_A_ w, EV_STAT); 2117 ev_feed_event (EV_A_ w, EV_STAT);
2118 }
1683} 2119}
1684 2120
1685void 2121void
1686ev_stat_start (EV_P_ ev_stat *w) 2122ev_stat_start (EV_P_ ev_stat *w)
1687{ 2123{
1697 if (w->interval < MIN_STAT_INTERVAL) 2133 if (w->interval < MIN_STAT_INTERVAL)
1698 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL; 2134 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1699 2135
1700 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2136 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1701 ev_set_priority (&w->timer, ev_priority (w)); 2137 ev_set_priority (&w->timer, ev_priority (w));
2138
2139#if EV_USE_INOTIFY
2140 infy_init (EV_A);
2141
2142 if (fs_fd >= 0)
2143 infy_add (EV_A_ w);
2144 else
2145#endif
1702 ev_timer_start (EV_A_ &w->timer); 2146 ev_timer_start (EV_A_ &w->timer);
1703 2147
1704 ev_start (EV_A_ (W)w, 1); 2148 ev_start (EV_A_ (W)w, 1);
1705} 2149}
1706 2150
1707void 2151void
1708ev_stat_stop (EV_P_ ev_stat *w) 2152ev_stat_stop (EV_P_ ev_stat *w)
1709{ 2153{
1710 ev_clear_pending (EV_A_ (W)w); 2154 clear_pending (EV_A_ (W)w);
1711 if (expect_false (!ev_is_active (w))) 2155 if (expect_false (!ev_is_active (w)))
1712 return; 2156 return;
1713 2157
2158#if EV_USE_INOTIFY
2159 infy_del (EV_A_ w);
2160#endif
1714 ev_timer_stop (EV_A_ &w->timer); 2161 ev_timer_stop (EV_A_ &w->timer);
1715 2162
1716 ev_stop (EV_A_ (W)w); 2163 ev_stop (EV_A_ (W)w);
1717} 2164}
1718#endif 2165#endif
1719 2166
2167#if EV_IDLE_ENABLE
1720void 2168void
1721ev_idle_start (EV_P_ ev_idle *w) 2169ev_idle_start (EV_P_ ev_idle *w)
1722{ 2170{
1723 if (expect_false (ev_is_active (w))) 2171 if (expect_false (ev_is_active (w)))
1724 return; 2172 return;
1725 2173
2174 pri_adjust (EV_A_ (W)w);
2175
2176 {
2177 int active = ++idlecnt [ABSPRI (w)];
2178
2179 ++idleall;
1726 ev_start (EV_A_ (W)w, ++idlecnt); 2180 ev_start (EV_A_ (W)w, active);
2181
1727 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); 2182 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
1728 idles [idlecnt - 1] = w; 2183 idles [ABSPRI (w)][active - 1] = w;
2184 }
1729} 2185}
1730 2186
1731void 2187void
1732ev_idle_stop (EV_P_ ev_idle *w) 2188ev_idle_stop (EV_P_ ev_idle *w)
1733{ 2189{
1734 ev_clear_pending (EV_A_ (W)w); 2190 clear_pending (EV_A_ (W)w);
1735 if (expect_false (!ev_is_active (w))) 2191 if (expect_false (!ev_is_active (w)))
1736 return; 2192 return;
1737 2193
1738 { 2194 {
1739 int active = ((W)w)->active; 2195 int active = ((W)w)->active;
1740 idles [active - 1] = idles [--idlecnt]; 2196
2197 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
1741 ((W)idles [active - 1])->active = active; 2198 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2199
2200 ev_stop (EV_A_ (W)w);
2201 --idleall;
1742 } 2202 }
1743
1744 ev_stop (EV_A_ (W)w);
1745} 2203}
2204#endif
1746 2205
1747void 2206void
1748ev_prepare_start (EV_P_ ev_prepare *w) 2207ev_prepare_start (EV_P_ ev_prepare *w)
1749{ 2208{
1750 if (expect_false (ev_is_active (w))) 2209 if (expect_false (ev_is_active (w)))
1756} 2215}
1757 2216
1758void 2217void
1759ev_prepare_stop (EV_P_ ev_prepare *w) 2218ev_prepare_stop (EV_P_ ev_prepare *w)
1760{ 2219{
1761 ev_clear_pending (EV_A_ (W)w); 2220 clear_pending (EV_A_ (W)w);
1762 if (expect_false (!ev_is_active (w))) 2221 if (expect_false (!ev_is_active (w)))
1763 return; 2222 return;
1764 2223
1765 { 2224 {
1766 int active = ((W)w)->active; 2225 int active = ((W)w)->active;
1783} 2242}
1784 2243
1785void 2244void
1786ev_check_stop (EV_P_ ev_check *w) 2245ev_check_stop (EV_P_ ev_check *w)
1787{ 2246{
1788 ev_clear_pending (EV_A_ (W)w); 2247 clear_pending (EV_A_ (W)w);
1789 if (expect_false (!ev_is_active (w))) 2248 if (expect_false (!ev_is_active (w)))
1790 return; 2249 return;
1791 2250
1792 { 2251 {
1793 int active = ((W)w)->active; 2252 int active = ((W)w)->active;
1800 2259
1801#if EV_EMBED_ENABLE 2260#if EV_EMBED_ENABLE
1802void noinline 2261void noinline
1803ev_embed_sweep (EV_P_ ev_embed *w) 2262ev_embed_sweep (EV_P_ ev_embed *w)
1804{ 2263{
1805 ev_loop (w->loop, EVLOOP_NONBLOCK); 2264 ev_loop (w->other, EVLOOP_NONBLOCK);
1806} 2265}
1807 2266
1808static void 2267static void
1809embed_cb (EV_P_ ev_io *io, int revents) 2268embed_io_cb (EV_P_ ev_io *io, int revents)
1810{ 2269{
1811 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2270 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1812 2271
1813 if (ev_cb (w)) 2272 if (ev_cb (w))
1814 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2273 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1815 else 2274 else
1816 ev_embed_sweep (loop, w); 2275 ev_loop (w->other, EVLOOP_NONBLOCK);
1817} 2276}
2277
2278static void
2279embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2280{
2281 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2282
2283 {
2284 struct ev_loop *loop = w->other;
2285
2286 while (fdchangecnt)
2287 {
2288 fd_reify (EV_A);
2289 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2290 }
2291 }
2292}
2293
2294#if 0
2295static void
2296embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2297{
2298 ev_idle_stop (EV_A_ idle);
2299}
2300#endif
1818 2301
1819void 2302void
1820ev_embed_start (EV_P_ ev_embed *w) 2303ev_embed_start (EV_P_ ev_embed *w)
1821{ 2304{
1822 if (expect_false (ev_is_active (w))) 2305 if (expect_false (ev_is_active (w)))
1823 return; 2306 return;
1824 2307
1825 { 2308 {
1826 struct ev_loop *loop = w->loop; 2309 struct ev_loop *loop = w->other;
1827 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2310 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
1828 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2311 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
1829 } 2312 }
1830 2313
1831 ev_set_priority (&w->io, ev_priority (w)); 2314 ev_set_priority (&w->io, ev_priority (w));
1832 ev_io_start (EV_A_ &w->io); 2315 ev_io_start (EV_A_ &w->io);
1833 2316
2317 ev_prepare_init (&w->prepare, embed_prepare_cb);
2318 ev_set_priority (&w->prepare, EV_MINPRI);
2319 ev_prepare_start (EV_A_ &w->prepare);
2320
2321 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2322
1834 ev_start (EV_A_ (W)w, 1); 2323 ev_start (EV_A_ (W)w, 1);
1835} 2324}
1836 2325
1837void 2326void
1838ev_embed_stop (EV_P_ ev_embed *w) 2327ev_embed_stop (EV_P_ ev_embed *w)
1839{ 2328{
1840 ev_clear_pending (EV_A_ (W)w); 2329 clear_pending (EV_A_ (W)w);
1841 if (expect_false (!ev_is_active (w))) 2330 if (expect_false (!ev_is_active (w)))
1842 return; 2331 return;
1843 2332
1844 ev_io_stop (EV_A_ &w->io); 2333 ev_io_stop (EV_A_ &w->io);
2334 ev_prepare_stop (EV_A_ &w->prepare);
1845 2335
1846 ev_stop (EV_A_ (W)w); 2336 ev_stop (EV_A_ (W)w);
1847} 2337}
1848#endif 2338#endif
1849 2339
1860} 2350}
1861 2351
1862void 2352void
1863ev_fork_stop (EV_P_ ev_fork *w) 2353ev_fork_stop (EV_P_ ev_fork *w)
1864{ 2354{
1865 ev_clear_pending (EV_A_ (W)w); 2355 clear_pending (EV_A_ (W)w);
1866 if (expect_false (!ev_is_active (w))) 2356 if (expect_false (!ev_is_active (w)))
1867 return; 2357 return;
1868 2358
1869 { 2359 {
1870 int active = ((W)w)->active; 2360 int active = ((W)w)->active;
1938 ev_timer_set (&once->to, timeout, 0.); 2428 ev_timer_set (&once->to, timeout, 0.);
1939 ev_timer_start (EV_A_ &once->to); 2429 ev_timer_start (EV_A_ &once->to);
1940 } 2430 }
1941} 2431}
1942 2432
2433#if EV_MULTIPLICITY
2434 #include "ev_wrap.h"
2435#endif
2436
1943#ifdef __cplusplus 2437#ifdef __cplusplus
1944} 2438}
1945#endif 2439#endif
1946 2440

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines