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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines