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

Comparing libev/ev.c (file contents):
Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs.
Revision 1.304 by root, Sun Jul 19 03:12:28 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
… …
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
164# endif 186# endif
165#endif 187#endif
166 188
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
168 190
191#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1
194# else
195# define EV_USE_CLOCK_SYSCALL 0
196# endif
197#endif
198
169#ifndef EV_USE_MONOTONIC 199#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 200# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 201# define EV_USE_MONOTONIC 1
172# else 202# else
173# define EV_USE_MONOTONIC 0 203# define EV_USE_MONOTONIC 0
174# endif 204# endif
175#endif 205#endif
176 206
177#ifndef EV_USE_REALTIME 207#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 208# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 209#endif
180 210
181#ifndef EV_USE_NANOSLEEP 211#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 212# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 213# define EV_USE_NANOSLEEP 1
… …
244# else 274# else
245# define EV_USE_EVENTFD 0 275# define EV_USE_EVENTFD 0
246# endif 276# endif
247#endif 277#endif
248 278
279#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
281# define EV_USE_SIGNALFD 1
282# else
283# define EV_USE_SIGNALFD 0
284# endif
285#endif
286
249#if 0 /* debugging */ 287#if 0 /* debugging */
250# define EV_VERIFY 3 288# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 289# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 290# define EV_HEAP_CACHE_AT 1
253#endif 291#endif
… …
262 300
263#ifndef EV_HEAP_CACHE_AT 301#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 302# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 303#endif
266 304
305/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
306/* which makes programs even slower. might work on other unices, too. */
307#if EV_USE_CLOCK_SYSCALL
308# include <syscall.h>
309# ifdef SYS_clock_gettime
310# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
311# undef EV_USE_MONOTONIC
312# define EV_USE_MONOTONIC 1
313# else
314# undef EV_USE_CLOCK_SYSCALL
315# define EV_USE_CLOCK_SYSCALL 0
316# endif
317#endif
318
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 319/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 320
269#ifndef CLOCK_MONOTONIC 321#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 322# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 323# define EV_USE_MONOTONIC 0
… …
286# include <sys/select.h> 338# include <sys/select.h>
287# endif 339# endif
288#endif 340#endif
289 341
290#if EV_USE_INOTIFY 342#if EV_USE_INOTIFY
343# include <sys/utsname.h>
344# include <sys/statfs.h>
291# include <sys/inotify.h> 345# include <sys/inotify.h>
292/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 346/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
293# ifndef IN_DONT_FOLLOW 347# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY 348# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0 349# define EV_USE_INOTIFY 0
… …
301#endif 355#endif
302 356
303#if EV_USE_EVENTFD 357#if EV_USE_EVENTFD
304/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 358/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
305# include <stdint.h> 359# include <stdint.h>
360# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK
362# endif
363# ifndef EFD_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC
365# endif
306# ifdef __cplusplus 366# ifdef __cplusplus
307extern "C" { 367extern "C" {
308# endif 368# endif
309int eventfd (unsigned int initval, int flags); 369int eventfd (unsigned int initval, int flags);
310# ifdef __cplusplus 370# ifdef __cplusplus
311} 371}
312# endif 372# endif
373#endif
374
375#if EV_USE_SIGNALFD
376# include <sys/signalfd.h>
313#endif 377#endif
314 378
315/**/ 379/**/
316 380
317#if EV_VERIFY >= 3 381#if EV_VERIFY >= 3
… …
353# define inline_speed static noinline 417# define inline_speed static noinline
354#else 418#else
355# define inline_speed static inline 419# define inline_speed static inline
356#endif 420#endif
357 421
358#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 422#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
423
424#if EV_MINPRI == EV_MAXPRI
425# define ABSPRI(w) (((W)w), 0)
426#else
359#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 427# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
428#endif
360 429
361#define EMPTY /* required for microsofts broken pseudo-c compiler */ 430#define EMPTY /* required for microsofts broken pseudo-c compiler */
362#define EMPTY2(a,b) /* used to suppress some warnings */ 431#define EMPTY2(a,b) /* used to suppress some warnings */
363 432
364typedef ev_watcher *W; 433typedef ev_watcher *W;
… …
366typedef ev_watcher_time *WT; 435typedef ev_watcher_time *WT;
367 436
368#define ev_active(w) ((W)(w))->active 437#define ev_active(w) ((W)(w))->active
369#define ev_at(w) ((WT)(w))->at 438#define ev_at(w) ((WT)(w))->at
370 439
371#if EV_USE_MONOTONIC 440#if EV_USE_REALTIME
372/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 441/* sig_atomic_t is used to avoid per-thread variables or locking but still */
373/* giving it a reasonably high chance of working on typical architetcures */ 442/* giving it a reasonably high chance of working on typical architetcures */
443static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
444#endif
445
446#if EV_USE_MONOTONIC
374static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
375#endif 448#endif
376 449
377#ifdef _WIN32 450#ifdef _WIN32
378# include "ev_win32.c" 451# include "ev_win32.c"
… …
387{ 460{
388 syserr_cb = cb; 461 syserr_cb = cb;
389} 462}
390 463
391static void noinline 464static void noinline
392syserr (const char *msg) 465ev_syserr (const char *msg)
393{ 466{
394 if (!msg) 467 if (!msg)
395 msg = "(libev) system error"; 468 msg = "(libev) system error";
396 469
397 if (syserr_cb) 470 if (syserr_cb)
… …
443#define ev_malloc(size) ev_realloc (0, (size)) 516#define ev_malloc(size) ev_realloc (0, (size))
444#define ev_free(ptr) ev_realloc ((ptr), 0) 517#define ev_free(ptr) ev_realloc ((ptr), 0)
445 518
446/*****************************************************************************/ 519/*****************************************************************************/
447 520
521/* set in reify when reification needed */
522#define EV_ANFD_REIFY 1
523
524/* file descriptor info structure */
448typedef struct 525typedef struct
449{ 526{
450 WL head; 527 WL head;
451 unsigned char events; 528 unsigned char events; /* the events watched for */
529 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
530 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
452 unsigned char reify; 531 unsigned char unused;
532#if EV_USE_EPOLL
533 unsigned int egen; /* generation counter to counter epoll bugs */
534#endif
453#if EV_SELECT_IS_WINSOCKET 535#if EV_SELECT_IS_WINSOCKET
454 SOCKET handle; 536 SOCKET handle;
455#endif 537#endif
456} ANFD; 538} ANFD;
457 539
540/* stores the pending event set for a given watcher */
458typedef struct 541typedef struct
459{ 542{
460 W w; 543 W w;
461 int events; 544 int events; /* the pending event set for the given watcher */
462} ANPENDING; 545} ANPENDING;
463 546
464#if EV_USE_INOTIFY 547#if EV_USE_INOTIFY
465/* hash table entry per inotify-id */ 548/* hash table entry per inotify-id */
466typedef struct 549typedef struct
… …
469} ANFS; 552} ANFS;
470#endif 553#endif
471 554
472/* Heap Entry */ 555/* Heap Entry */
473#if EV_HEAP_CACHE_AT 556#if EV_HEAP_CACHE_AT
557 /* a heap element */
474 typedef struct { 558 typedef struct {
475 ev_tstamp at; 559 ev_tstamp at;
476 WT w; 560 WT w;
477 } ANHE; 561 } ANHE;
478 562
479 #define ANHE_w(he) (he).w /* access watcher, read-write */ 563 #define ANHE_w(he) (he).w /* access watcher, read-write */
480 #define ANHE_at(he) (he).at /* access cached at, read-only */ 564 #define ANHE_at(he) (he).at /* access cached at, read-only */
481 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 565 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
482#else 566#else
567 /* a heap element */
483 typedef WT ANHE; 568 typedef WT ANHE;
484 569
485 #define ANHE_w(he) (he) 570 #define ANHE_w(he) (he)
486 #define ANHE_at(he) (he)->at 571 #define ANHE_at(he) (he)->at
487 #define ANHE_at_cache(he) 572 #define ANHE_at_cache(he)
… …
511 596
512 static int ev_default_loop_ptr; 597 static int ev_default_loop_ptr;
513 598
514#endif 599#endif
515 600
601#if EV_MINIMAL < 2
602# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
603# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
604# define EV_INVOKE_PENDING invoke_cb (EV_A)
605#else
606# define EV_RELEASE_CB (void)0
607# define EV_ACQUIRE_CB (void)0
608# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
609#endif
610
611#define EVUNLOOP_RECURSE 0x80
612
516/*****************************************************************************/ 613/*****************************************************************************/
517 614
615#ifndef EV_HAVE_EV_TIME
518ev_tstamp 616ev_tstamp
519ev_time (void) 617ev_time (void)
520{ 618{
521#if EV_USE_REALTIME 619#if EV_USE_REALTIME
620 if (expect_true (have_realtime))
621 {
522 struct timespec ts; 622 struct timespec ts;
523 clock_gettime (CLOCK_REALTIME, &ts); 623 clock_gettime (CLOCK_REALTIME, &ts);
524 return ts.tv_sec + ts.tv_nsec * 1e-9; 624 return ts.tv_sec + ts.tv_nsec * 1e-9;
525#else 625 }
626#endif
627
526 struct timeval tv; 628 struct timeval tv;
527 gettimeofday (&tv, 0); 629 gettimeofday (&tv, 0);
528 return tv.tv_sec + tv.tv_usec * 1e-6; 630 return tv.tv_sec + tv.tv_usec * 1e-6;
529#endif
530} 631}
632#endif
531 633
532ev_tstamp inline_size 634inline_size ev_tstamp
533get_clock (void) 635get_clock (void)
534{ 636{
535#if EV_USE_MONOTONIC 637#if EV_USE_MONOTONIC
536 if (expect_true (have_monotonic)) 638 if (expect_true (have_monotonic))
537 { 639 {
… …
571 673
572 tv.tv_sec = (time_t)delay; 674 tv.tv_sec = (time_t)delay;
573 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 675 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
574 676
575 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 677 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
576 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 678 /* something not guaranteed by newer posix versions, but guaranteed */
577 /* by older ones */ 679 /* by older ones */
578 select (0, 0, 0, 0, &tv); 680 select (0, 0, 0, 0, &tv);
579#endif 681#endif
580 } 682 }
581} 683}
582 684
583/*****************************************************************************/ 685/*****************************************************************************/
584 686
585#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 687#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
586 688
587int inline_size 689/* find a suitable new size for the given array, */
690/* hopefully by rounding to a ncie-to-malloc size */
691inline_size int
588array_nextsize (int elem, int cur, int cnt) 692array_nextsize (int elem, int cur, int cnt)
589{ 693{
590 int ncur = cur + 1; 694 int ncur = cur + 1;
591 695
592 do 696 do
… …
609array_realloc (int elem, void *base, int *cur, int cnt) 713array_realloc (int elem, void *base, int *cur, int cnt)
610{ 714{
611 *cur = array_nextsize (elem, *cur, cnt); 715 *cur = array_nextsize (elem, *cur, cnt);
612 return ev_realloc (base, elem * *cur); 716 return ev_realloc (base, elem * *cur);
613} 717}
718
719#define array_init_zero(base,count) \
720 memset ((void *)(base), 0, sizeof (*(base)) * (count))
614 721
615#define array_needsize(type,base,cur,cnt,init) \ 722#define array_needsize(type,base,cur,cnt,init) \
616 if (expect_false ((cnt) > (cur))) \ 723 if (expect_false ((cnt) > (cur))) \
617 { \ 724 { \
618 int ocur_ = (cur); \ 725 int ocur_ = (cur); \
… …
630 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 737 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
631 } 738 }
632#endif 739#endif
633 740
634#define array_free(stem, idx) \ 741#define array_free(stem, idx) \
635 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 742 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
636 743
637/*****************************************************************************/ 744/*****************************************************************************/
745
746/* dummy callback for pending events */
747static void noinline
748pendingcb (EV_P_ ev_prepare *w, int revents)
749{
750}
638 751
639void noinline 752void noinline
640ev_feed_event (EV_P_ void *w, int revents) 753ev_feed_event (EV_P_ void *w, int revents)
641{ 754{
642 W w_ = (W)w; 755 W w_ = (W)w;
… …
651 pendings [pri][w_->pending - 1].w = w_; 764 pendings [pri][w_->pending - 1].w = w_;
652 pendings [pri][w_->pending - 1].events = revents; 765 pendings [pri][w_->pending - 1].events = revents;
653 } 766 }
654} 767}
655 768
656void inline_speed 769inline_speed void
770feed_reverse (EV_P_ W w)
771{
772 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
773 rfeeds [rfeedcnt++] = w;
774}
775
776inline_size void
777feed_reverse_done (EV_P_ int revents)
778{
779 do
780 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
781 while (rfeedcnt);
782}
783
784inline_speed void
657queue_events (EV_P_ W *events, int eventcnt, int type) 785queue_events (EV_P_ W *events, int eventcnt, int type)
658{ 786{
659 int i; 787 int i;
660 788
661 for (i = 0; i < eventcnt; ++i) 789 for (i = 0; i < eventcnt; ++i)
662 ev_feed_event (EV_A_ events [i], type); 790 ev_feed_event (EV_A_ events [i], type);
663} 791}
664 792
665/*****************************************************************************/ 793/*****************************************************************************/
666 794
667void inline_size 795inline_speed void
668anfds_init (ANFD *base, int count)
669{
670 while (count--)
671 {
672 base->head = 0;
673 base->events = EV_NONE;
674 base->reify = 0;
675
676 ++base;
677 }
678}
679
680void inline_speed
681fd_event (EV_P_ int fd, int revents) 796fd_event_nc (EV_P_ int fd, int revents)
682{ 797{
683 ANFD *anfd = anfds + fd; 798 ANFD *anfd = anfds + fd;
684 ev_io *w; 799 ev_io *w;
685 800
686 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 801 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
690 if (ev) 805 if (ev)
691 ev_feed_event (EV_A_ (W)w, ev); 806 ev_feed_event (EV_A_ (W)w, ev);
692 } 807 }
693} 808}
694 809
810/* do not submit kernel events for fds that have reify set */
811/* because that means they changed while we were polling for new events */
812inline_speed void
813fd_event (EV_P_ int fd, int revents)
814{
815 ANFD *anfd = anfds + fd;
816
817 if (expect_true (!anfd->reify))
818 fd_event_nc (EV_A_ fd, revents);
819}
820
695void 821void
696ev_feed_fd_event (EV_P_ int fd, int revents) 822ev_feed_fd_event (EV_P_ int fd, int revents)
697{ 823{
698 if (fd >= 0 && fd < anfdmax) 824 if (fd >= 0 && fd < anfdmax)
699 fd_event (EV_A_ fd, revents); 825 fd_event_nc (EV_A_ fd, revents);
700} 826}
701 827
702void inline_size 828/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */
830inline_size void
703fd_reify (EV_P) 831fd_reify (EV_P)
704{ 832{
705 int i; 833 int i;
706 834
707 for (i = 0; i < fdchangecnt; ++i) 835 for (i = 0; i < fdchangecnt; ++i)
… …
722 #ifdef EV_FD_TO_WIN32_HANDLE 850 #ifdef EV_FD_TO_WIN32_HANDLE
723 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
724 #else 852 #else
725 anfd->handle = _get_osfhandle (fd); 853 anfd->handle = _get_osfhandle (fd);
726 #endif 854 #endif
727 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 855 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
728 } 856 }
729#endif 857#endif
730 858
731 { 859 {
732 unsigned char o_events = anfd->events; 860 unsigned char o_events = anfd->events;
733 unsigned char o_reify = anfd->reify; 861 unsigned char o_reify = anfd->reify;
734 862
735 anfd->reify = 0; 863 anfd->reify = 0;
736 anfd->events = events; 864 anfd->events = events;
737 865
738 if (o_events != events || o_reify & EV_IOFDSET) 866 if (o_events != events || o_reify & EV__IOFDSET)
739 backend_modify (EV_A_ fd, o_events, events); 867 backend_modify (EV_A_ fd, o_events, events);
740 } 868 }
741 } 869 }
742 870
743 fdchangecnt = 0; 871 fdchangecnt = 0;
744} 872}
745 873
746void inline_size 874/* something about the given fd changed */
875inline_size void
747fd_change (EV_P_ int fd, int flags) 876fd_change (EV_P_ int fd, int flags)
748{ 877{
749 unsigned char reify = anfds [fd].reify; 878 unsigned char reify = anfds [fd].reify;
750 anfds [fd].reify |= flags; 879 anfds [fd].reify |= flags;
751 880
… …
755 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 884 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
756 fdchanges [fdchangecnt - 1] = fd; 885 fdchanges [fdchangecnt - 1] = fd;
757 } 886 }
758} 887}
759 888
760void inline_speed 889/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
890inline_speed void
761fd_kill (EV_P_ int fd) 891fd_kill (EV_P_ int fd)
762{ 892{
763 ev_io *w; 893 ev_io *w;
764 894
765 while ((w = (ev_io *)anfds [fd].head)) 895 while ((w = (ev_io *)anfds [fd].head))
… …
767 ev_io_stop (EV_A_ w); 897 ev_io_stop (EV_A_ w);
768 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 898 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
769 } 899 }
770} 900}
771 901
772int inline_size 902/* check whether the given fd is atcually valid, for error recovery */
903inline_size int
773fd_valid (int fd) 904fd_valid (int fd)
774{ 905{
775#ifdef _WIN32 906#ifdef _WIN32
776 return _get_osfhandle (fd) != -1; 907 return _get_osfhandle (fd) != -1;
777#else 908#else
… …
813 944
814 for (fd = 0; fd < anfdmax; ++fd) 945 for (fd = 0; fd < anfdmax; ++fd)
815 if (anfds [fd].events) 946 if (anfds [fd].events)
816 { 947 {
817 anfds [fd].events = 0; 948 anfds [fd].events = 0;
949 anfds [fd].emask = 0;
818 fd_change (EV_A_ fd, EV_IOFDSET | 1); 950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
819 } 951 }
820} 952}
821 953
822/*****************************************************************************/ 954/*****************************************************************************/
823 955
… …
839#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 971#define HEAP0 (DHEAP - 1) /* index of first element in heap */
840#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 972#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
841#define UPHEAP_DONE(p,k) ((p) == (k)) 973#define UPHEAP_DONE(p,k) ((p) == (k))
842 974
843/* away from the root */ 975/* away from the root */
844void inline_speed 976inline_speed void
845downheap (ANHE *heap, int N, int k) 977downheap (ANHE *heap, int N, int k)
846{ 978{
847 ANHE he = heap [k]; 979 ANHE he = heap [k];
848 ANHE *E = heap + N + HEAP0; 980 ANHE *E = heap + N + HEAP0;
849 981
… …
889#define HEAP0 1 1021#define HEAP0 1
890#define HPARENT(k) ((k) >> 1) 1022#define HPARENT(k) ((k) >> 1)
891#define UPHEAP_DONE(p,k) (!(p)) 1023#define UPHEAP_DONE(p,k) (!(p))
892 1024
893/* away from the root */ 1025/* away from the root */
894void inline_speed 1026inline_speed void
895downheap (ANHE *heap, int N, int k) 1027downheap (ANHE *heap, int N, int k)
896{ 1028{
897 ANHE he = heap [k]; 1029 ANHE he = heap [k];
898 1030
899 for (;;) 1031 for (;;)
… …
919 ev_active (ANHE_w (he)) = k; 1051 ev_active (ANHE_w (he)) = k;
920} 1052}
921#endif 1053#endif
922 1054
923/* towards the root */ 1055/* towards the root */
924void inline_speed 1056inline_speed void
925upheap (ANHE *heap, int k) 1057upheap (ANHE *heap, int k)
926{ 1058{
927 ANHE he = heap [k]; 1059 ANHE he = heap [k];
928 1060
929 for (;;) 1061 for (;;)
… …
940 1072
941 heap [k] = he; 1073 heap [k] = he;
942 ev_active (ANHE_w (he)) = k; 1074 ev_active (ANHE_w (he)) = k;
943} 1075}
944 1076
945void inline_size 1077/* move an element suitably so it is in a correct place */
1078inline_size void
946adjustheap (ANHE *heap, int N, int k) 1079adjustheap (ANHE *heap, int N, int k)
947{ 1080{
948 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1081 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
949 upheap (heap, k); 1082 upheap (heap, k);
950 else 1083 else
951 downheap (heap, N, k); 1084 downheap (heap, N, k);
952} 1085}
953 1086
954/* rebuild the heap: this function is used only once and executed rarely */ 1087/* rebuild the heap: this function is used only once and executed rarely */
955void inline_size 1088inline_size void
956reheap (ANHE *heap, int N) 1089reheap (ANHE *heap, int N)
957{ 1090{
958 int i; 1091 int i;
959 1092
960 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1093 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
963 upheap (heap, i + HEAP0); 1096 upheap (heap, i + HEAP0);
964} 1097}
965 1098
966/*****************************************************************************/ 1099/*****************************************************************************/
967 1100
1101/* associate signal watchers to a signal signal */
968typedef struct 1102typedef struct
969{ 1103{
970 WL head; 1104 WL head;
971 EV_ATOMIC_T gotsig; 1105 EV_ATOMIC_T gotsig;
972} ANSIG; 1106} ANSIG;
… …
974static ANSIG *signals; 1108static ANSIG *signals;
975static int signalmax; 1109static int signalmax;
976 1110
977static EV_ATOMIC_T gotsig; 1111static EV_ATOMIC_T gotsig;
978 1112
979void inline_size
980signals_init (ANSIG *base, int count)
981{
982 while (count--)
983 {
984 base->head = 0;
985 base->gotsig = 0;
986
987 ++base;
988 }
989}
990
991/*****************************************************************************/ 1113/*****************************************************************************/
992 1114
993void inline_speed 1115/* used to prepare libev internal fd's */
1116/* this is not fork-safe */
1117inline_speed void
994fd_intern (int fd) 1118fd_intern (int fd)
995{ 1119{
996#ifdef _WIN32 1120#ifdef _WIN32
997 unsigned long arg = 1; 1121 unsigned long arg = 1;
998 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1003} 1127}
1004 1128
1005static void noinline 1129static void noinline
1006evpipe_init (EV_P) 1130evpipe_init (EV_P)
1007{ 1131{
1008 if (!ev_is_active (&pipeev)) 1132 if (!ev_is_active (&pipe_w))
1009 { 1133 {
1010#if EV_USE_EVENTFD 1134#if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL)
1011 if ((evfd = eventfd (0, 0)) >= 0) 1137 evfd = eventfd (0, 0);
1138
1139 if (evfd >= 0)
1012 { 1140 {
1013 evpipe [0] = -1; 1141 evpipe [0] = -1;
1014 fd_intern (evfd); 1142 fd_intern (evfd); /* doing it twice doesn't hurt */
1015 ev_io_set (&pipeev, evfd, EV_READ); 1143 ev_io_set (&pipe_w, evfd, EV_READ);
1016 } 1144 }
1017 else 1145 else
1018#endif 1146#endif
1019 { 1147 {
1020 while (pipe (evpipe)) 1148 while (pipe (evpipe))
1021 syserr ("(libev) error creating signal/async pipe"); 1149 ev_syserr ("(libev) error creating signal/async pipe");
1022 1150
1023 fd_intern (evpipe [0]); 1151 fd_intern (evpipe [0]);
1024 fd_intern (evpipe [1]); 1152 fd_intern (evpipe [1]);
1025 ev_io_set (&pipeev, evpipe [0], EV_READ); 1153 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1026 } 1154 }
1027 1155
1028 ev_io_start (EV_A_ &pipeev); 1156 ev_io_start (EV_A_ &pipe_w);
1029 ev_unref (EV_A); /* watcher should not keep loop alive */ 1157 ev_unref (EV_A); /* watcher should not keep loop alive */
1030 } 1158 }
1031} 1159}
1032 1160
1033void inline_size 1161inline_size void
1034evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1162evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1035{ 1163{
1036 if (!*flag) 1164 if (!*flag)
1037 { 1165 {
1038 int old_errno = errno; /* save errno because write might clobber it */ 1166 int old_errno = errno; /* save errno because write might clobber it */
… …
1051 1179
1052 errno = old_errno; 1180 errno = old_errno;
1053 } 1181 }
1054} 1182}
1055 1183
1184/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */
1056static void 1186static void
1057pipecb (EV_P_ ev_io *iow, int revents) 1187pipecb (EV_P_ ev_io *iow, int revents)
1058{ 1188{
1059#if EV_USE_EVENTFD 1189#if EV_USE_EVENTFD
1060 if (evfd >= 0) 1190 if (evfd >= 0)
… …
1116ev_feed_signal_event (EV_P_ int signum) 1246ev_feed_signal_event (EV_P_ int signum)
1117{ 1247{
1118 WL w; 1248 WL w;
1119 1249
1120#if EV_MULTIPLICITY 1250#if EV_MULTIPLICITY
1121 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1122#endif 1252#endif
1123 1253
1124 --signum; 1254 --signum;
1125 1255
1126 if (signum < 0 || signum >= signalmax) 1256 if (signum < 0 || signum >= signalmax)
… …
1130 1260
1131 for (w = signals [signum].head; w; w = w->next) 1261 for (w = signals [signum].head; w; w = w->next)
1132 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1133} 1263}
1134 1264
1265#if EV_USE_SIGNALFD
1266static void
1267sigfdcb (EV_P_ ev_io *iow, int revents)
1268{
1269 struct signalfd_siginfo si[4], *sip;
1270
1271 for (;;)
1272 {
1273 ssize_t res = read (sigfd, si, sizeof (si));
1274
1275 /* not ISO-C, as res might be -1, but works with SuS */
1276 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1277 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1278
1279 if (res < (ssize_t)sizeof (si))
1280 break;
1281 }
1282}
1283#endif
1284
1135/*****************************************************************************/ 1285/*****************************************************************************/
1136 1286
1137static WL childs [EV_PID_HASHSIZE]; 1287static WL childs [EV_PID_HASHSIZE];
1138 1288
1139#ifndef _WIN32 1289#ifndef _WIN32
… …
1142 1292
1143#ifndef WIFCONTINUED 1293#ifndef WIFCONTINUED
1144# define WIFCONTINUED(status) 0 1294# define WIFCONTINUED(status) 0
1145#endif 1295#endif
1146 1296
1147void inline_speed 1297/* handle a single child status event */
1298inline_speed void
1148child_reap (EV_P_ int chain, int pid, int status) 1299child_reap (EV_P_ int chain, int pid, int status)
1149{ 1300{
1150 ev_child *w; 1301 ev_child *w;
1151 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1302 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1152 1303
… …
1165 1316
1166#ifndef WCONTINUED 1317#ifndef WCONTINUED
1167# define WCONTINUED 0 1318# define WCONTINUED 0
1168#endif 1319#endif
1169 1320
1321/* called on sigchld etc., calls waitpid */
1170static void 1322static void
1171childcb (EV_P_ ev_signal *sw, int revents) 1323childcb (EV_P_ ev_signal *sw, int revents)
1172{ 1324{
1173 int pid, status; 1325 int pid, status;
1174 1326
… …
1255 /* kqueue is borked on everything but netbsd apparently */ 1407 /* kqueue is borked on everything but netbsd apparently */
1256 /* it usually doesn't work correctly on anything but sockets and pipes */ 1408 /* it usually doesn't work correctly on anything but sockets and pipes */
1257 flags &= ~EVBACKEND_KQUEUE; 1409 flags &= ~EVBACKEND_KQUEUE;
1258#endif 1410#endif
1259#ifdef __APPLE__ 1411#ifdef __APPLE__
1260 // flags &= ~EVBACKEND_KQUEUE; for documentation 1412 /* only select works correctly on that "unix-certified" platform */
1261 flags &= ~EVBACKEND_POLL; 1413 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1414 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1262#endif 1415#endif
1263 1416
1264 return flags; 1417 return flags;
1265} 1418}
1266 1419
… …
1280ev_backend (EV_P) 1433ev_backend (EV_P)
1281{ 1434{
1282 return backend; 1435 return backend;
1283} 1436}
1284 1437
1438#if EV_MINIMAL < 2
1285unsigned int 1439unsigned int
1286ev_loop_count (EV_P) 1440ev_loop_count (EV_P)
1287{ 1441{
1288 return loop_count; 1442 return loop_count;
1289} 1443}
1290 1444
1445unsigned int
1446ev_loop_depth (EV_P)
1447{
1448 return loop_depth;
1449}
1450
1291void 1451void
1292ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1452ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1293{ 1453{
1294 io_blocktime = interval; 1454 io_blocktime = interval;
1295} 1455}
… …
1298ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1458ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1299{ 1459{
1300 timeout_blocktime = interval; 1460 timeout_blocktime = interval;
1301} 1461}
1302 1462
1463void
1464ev_set_userdata (EV_P_ void *data)
1465{
1466 userdata = data;
1467}
1468
1469void *
1470ev_userdata (EV_P)
1471{
1472 return userdata;
1473}
1474
1475void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1476{
1477 invoke_cb = invoke_pending_cb;
1478}
1479
1480void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1481{
1482 release_cb = release;
1483 acquire_cb = acquire;
1484}
1485#endif
1486
1487/* initialise a loop structure, must be zero-initialised */
1303static void noinline 1488static void noinline
1304loop_init (EV_P_ unsigned int flags) 1489loop_init (EV_P_ unsigned int flags)
1305{ 1490{
1306 if (!backend) 1491 if (!backend)
1307 { 1492 {
1493#if EV_USE_REALTIME
1494 if (!have_realtime)
1495 {
1496 struct timespec ts;
1497
1498 if (!clock_gettime (CLOCK_REALTIME, &ts))
1499 have_realtime = 1;
1500 }
1501#endif
1502
1308#if EV_USE_MONOTONIC 1503#if EV_USE_MONOTONIC
1504 if (!have_monotonic)
1309 { 1505 {
1310 struct timespec ts; 1506 struct timespec ts;
1507
1311 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1312 have_monotonic = 1; 1509 have_monotonic = 1;
1313 } 1510 }
1314#endif 1511#endif
1315 1512
1316 ev_rt_now = ev_time (); 1513 ev_rt_now = ev_time ();
1317 mn_now = get_clock (); 1514 mn_now = get_clock ();
1318 now_floor = mn_now; 1515 now_floor = mn_now;
1319 rtmn_diff = ev_rt_now - mn_now; 1516 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2
1518 invoke_cb = ev_invoke_pending;
1519#endif
1320 1520
1321 io_blocktime = 0.; 1521 io_blocktime = 0.;
1322 timeout_blocktime = 0.; 1522 timeout_blocktime = 0.;
1323 backend = 0; 1523 backend = 0;
1324 backend_fd = -1; 1524 backend_fd = -1;
1325 gotasync = 0; 1525 gotasync = 0;
1326#if EV_USE_INOTIFY 1526#if EV_USE_INOTIFY
1327 fs_fd = -2; 1527 fs_fd = -2;
1328#endif 1528#endif
1529#if EV_USE_SIGNALFD
1530 sigfd = -2;
1531#endif
1329 1532
1330 /* pid check not overridable via env */ 1533 /* pid check not overridable via env */
1331#ifndef _WIN32 1534#ifndef _WIN32
1332 if (flags & EVFLAG_FORKCHECK) 1535 if (flags & EVFLAG_FORKCHECK)
1333 curpid = getpid (); 1536 curpid = getpid ();
… …
1355#endif 1558#endif
1356#if EV_USE_SELECT 1559#if EV_USE_SELECT
1357 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1358#endif 1561#endif
1359 1562
1563 ev_prepare_init (&pending_w, pendingcb);
1564
1360 ev_init (&pipeev, pipecb); 1565 ev_init (&pipe_w, pipecb);
1361 ev_set_priority (&pipeev, EV_MAXPRI); 1566 ev_set_priority (&pipe_w, EV_MAXPRI);
1362 } 1567 }
1363} 1568}
1364 1569
1570/* free up a loop structure */
1365static void noinline 1571static void noinline
1366loop_destroy (EV_P) 1572loop_destroy (EV_P)
1367{ 1573{
1368 int i; 1574 int i;
1369 1575
1370 if (ev_is_active (&pipeev)) 1576 if (ev_is_active (&pipe_w))
1371 { 1577 {
1372 ev_ref (EV_A); /* signal watcher */ 1578 /*ev_ref (EV_A);*/
1373 ev_io_stop (EV_A_ &pipeev); 1579 /*ev_io_stop (EV_A_ &pipe_w);*/
1374 1580
1375#if EV_USE_EVENTFD 1581#if EV_USE_EVENTFD
1376 if (evfd >= 0) 1582 if (evfd >= 0)
1377 close (evfd); 1583 close (evfd);
1378#endif 1584#endif
… …
1382 close (evpipe [0]); 1588 close (evpipe [0]);
1383 close (evpipe [1]); 1589 close (evpipe [1]);
1384 } 1590 }
1385 } 1591 }
1386 1592
1593#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd);
1600 }
1601#endif
1602
1387#if EV_USE_INOTIFY 1603#if EV_USE_INOTIFY
1388 if (fs_fd >= 0) 1604 if (fs_fd >= 0)
1389 close (fs_fd); 1605 close (fs_fd);
1390#endif 1606#endif
1391 1607
… …
1417 } 1633 }
1418 1634
1419 ev_free (anfds); anfdmax = 0; 1635 ev_free (anfds); anfdmax = 0;
1420 1636
1421 /* have to use the microsoft-never-gets-it-right macro */ 1637 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY);
1422 array_free (fdchange, EMPTY); 1639 array_free (fdchange, EMPTY);
1423 array_free (timer, EMPTY); 1640 array_free (timer, EMPTY);
1424#if EV_PERIODIC_ENABLE 1641#if EV_PERIODIC_ENABLE
1425 array_free (periodic, EMPTY); 1642 array_free (periodic, EMPTY);
1426#endif 1643#endif
… …
1435 1652
1436 backend = 0; 1653 backend = 0;
1437} 1654}
1438 1655
1439#if EV_USE_INOTIFY 1656#if EV_USE_INOTIFY
1440void inline_size infy_fork (EV_P); 1657inline_size void infy_fork (EV_P);
1441#endif 1658#endif
1442 1659
1443void inline_size 1660inline_size void
1444loop_fork (EV_P) 1661loop_fork (EV_P)
1445{ 1662{
1446#if EV_USE_PORT 1663#if EV_USE_PORT
1447 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1664 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1448#endif 1665#endif
… …
1454#endif 1671#endif
1455#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1456 infy_fork (EV_A); 1673 infy_fork (EV_A);
1457#endif 1674#endif
1458 1675
1459 if (ev_is_active (&pipeev)) 1676 if (ev_is_active (&pipe_w))
1460 { 1677 {
1461 /* this "locks" the handlers against writing to the pipe */ 1678 /* this "locks" the handlers against writing to the pipe */
1462 /* while we modify the fd vars */ 1679 /* while we modify the fd vars */
1463 gotsig = 1; 1680 gotsig = 1;
1464#if EV_ASYNC_ENABLE 1681#if EV_ASYNC_ENABLE
1465 gotasync = 1; 1682 gotasync = 1;
1466#endif 1683#endif
1467 1684
1468 ev_ref (EV_A); 1685 ev_ref (EV_A);
1469 ev_io_stop (EV_A_ &pipeev); 1686 ev_io_stop (EV_A_ &pipe_w);
1470 1687
1471#if EV_USE_EVENTFD 1688#if EV_USE_EVENTFD
1472 if (evfd >= 0) 1689 if (evfd >= 0)
1473 close (evfd); 1690 close (evfd);
1474#endif 1691#endif
… …
1479 close (evpipe [1]); 1696 close (evpipe [1]);
1480 } 1697 }
1481 1698
1482 evpipe_init (EV_A); 1699 evpipe_init (EV_A);
1483 /* now iterate over everything, in case we missed something */ 1700 /* now iterate over everything, in case we missed something */
1484 pipecb (EV_A_ &pipeev, EV_READ); 1701 pipecb (EV_A_ &pipe_w, EV_READ);
1485 } 1702 }
1486 1703
1487 postfork = 0; 1704 postfork = 0;
1488} 1705}
1489 1706
… …
1493ev_loop_new (unsigned int flags) 1710ev_loop_new (unsigned int flags)
1494{ 1711{
1495 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1496 1713
1497 memset (loop, 0, sizeof (struct ev_loop)); 1714 memset (loop, 0, sizeof (struct ev_loop));
1498
1499 loop_init (EV_A_ flags); 1715 loop_init (EV_A_ flags);
1500 1716
1501 if (ev_backend (EV_A)) 1717 if (ev_backend (EV_A))
1502 return loop; 1718 return loop;
1503 1719
… …
1514void 1730void
1515ev_loop_fork (EV_P) 1731ev_loop_fork (EV_P)
1516{ 1732{
1517 postfork = 1; /* must be in line with ev_default_fork */ 1733 postfork = 1; /* must be in line with ev_default_fork */
1518} 1734}
1735#endif /* multiplicity */
1519 1736
1520#if EV_VERIFY 1737#if EV_VERIFY
1521static void noinline 1738static void noinline
1522verify_watcher (EV_P_ W w) 1739verify_watcher (EV_P_ W w)
1523{ 1740{
1524 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1741 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1525 1742
1526 if (w->pending) 1743 if (w->pending)
1527 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1744 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1528} 1745}
1529 1746
1530static void noinline 1747static void noinline
1531verify_heap (EV_P_ ANHE *heap, int N) 1748verify_heap (EV_P_ ANHE *heap, int N)
1532{ 1749{
1533 int i; 1750 int i;
1534 1751
1535 for (i = HEAP0; i < N + HEAP0; ++i) 1752 for (i = HEAP0; i < N + HEAP0; ++i)
1536 { 1753 {
1537 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1754 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1538 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1755 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1539 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1756 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1540 1757
1541 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1758 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1542 } 1759 }
1543} 1760}
1544 1761
1545static void noinline 1762static void noinline
1546array_verify (EV_P_ W *ws, int cnt) 1763array_verify (EV_P_ W *ws, int cnt)
1547{ 1764{
1548 while (cnt--) 1765 while (cnt--)
1549 { 1766 {
1550 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1767 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1551 verify_watcher (EV_A_ ws [cnt]); 1768 verify_watcher (EV_A_ ws [cnt]);
1552 } 1769 }
1553} 1770}
1554#endif 1771#endif
1555 1772
1773#if EV_MINIMAL < 2
1556void 1774void
1557ev_loop_verify (EV_P) 1775ev_loop_verify (EV_P)
1558{ 1776{
1559#if EV_VERIFY 1777#if EV_VERIFY
1560 int i; 1778 int i;
… …
1562 1780
1563 assert (activecnt >= -1); 1781 assert (activecnt >= -1);
1564 1782
1565 assert (fdchangemax >= fdchangecnt); 1783 assert (fdchangemax >= fdchangecnt);
1566 for (i = 0; i < fdchangecnt; ++i) 1784 for (i = 0; i < fdchangecnt; ++i)
1567 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1785 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1568 1786
1569 assert (anfdmax >= 0); 1787 assert (anfdmax >= 0);
1570 for (i = 0; i < anfdmax; ++i) 1788 for (i = 0; i < anfdmax; ++i)
1571 for (w = anfds [i].head; w; w = w->next) 1789 for (w = anfds [i].head; w; w = w->next)
1572 { 1790 {
1573 verify_watcher (EV_A_ (W)w); 1791 verify_watcher (EV_A_ (W)w);
1574 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1792 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1575 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1793 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1576 } 1794 }
1577 1795
1578 assert (timermax >= timercnt); 1796 assert (timermax >= timercnt);
1579 verify_heap (EV_A_ timers, timercnt); 1797 verify_heap (EV_A_ timers, timercnt);
1580 1798
… …
1613 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1831 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1614 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1615# endif 1833# endif
1616#endif 1834#endif
1617} 1835}
1618 1836#endif
1619#endif /* multiplicity */
1620 1837
1621#if EV_MULTIPLICITY 1838#if EV_MULTIPLICITY
1622struct ev_loop * 1839struct ev_loop *
1623ev_default_loop_init (unsigned int flags) 1840ev_default_loop_init (unsigned int flags)
1624#else 1841#else
… …
1657{ 1874{
1658#if EV_MULTIPLICITY 1875#if EV_MULTIPLICITY
1659 struct ev_loop *loop = ev_default_loop_ptr; 1876 struct ev_loop *loop = ev_default_loop_ptr;
1660#endif 1877#endif
1661 1878
1879 ev_default_loop_ptr = 0;
1880
1662#ifndef _WIN32 1881#ifndef _WIN32
1663 ev_ref (EV_A); /* child watcher */ 1882 ev_ref (EV_A); /* child watcher */
1664 ev_signal_stop (EV_A_ &childev); 1883 ev_signal_stop (EV_A_ &childev);
1665#endif 1884#endif
1666 1885
… …
1672{ 1891{
1673#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1893 struct ev_loop *loop = ev_default_loop_ptr;
1675#endif 1894#endif
1676 1895
1677 if (backend)
1678 postfork = 1; /* must be in line with ev_loop_fork */ 1896 postfork = 1; /* must be in line with ev_loop_fork */
1679} 1897}
1680 1898
1681/*****************************************************************************/ 1899/*****************************************************************************/
1682 1900
1683void 1901void
1684ev_invoke (EV_P_ void *w, int revents) 1902ev_invoke (EV_P_ void *w, int revents)
1685{ 1903{
1686 EV_CB_INVOKE ((W)w, revents); 1904 EV_CB_INVOKE ((W)w, revents);
1687} 1905}
1688 1906
1689void inline_speed 1907unsigned int
1690call_pending (EV_P) 1908ev_pending_count (EV_P)
1909{
1910 int pri;
1911 unsigned int count = 0;
1912
1913 for (pri = NUMPRI; pri--; )
1914 count += pendingcnt [pri];
1915
1916 return count;
1917}
1918
1919void noinline
1920ev_invoke_pending (EV_P)
1691{ 1921{
1692 int pri; 1922 int pri;
1693 1923
1694 for (pri = NUMPRI; pri--; ) 1924 for (pri = NUMPRI; pri--; )
1695 while (pendingcnt [pri]) 1925 while (pendingcnt [pri])
1696 { 1926 {
1697 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1927 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1698 1928
1699 if (expect_true (p->w))
1700 {
1701 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1929 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1930 /* ^ this is no longer true, as pending_w could be here */
1702 1931
1703 p->w->pending = 0; 1932 p->w->pending = 0;
1704 EV_CB_INVOKE (p->w, p->events); 1933 EV_CB_INVOKE (p->w, p->events);
1705 EV_FREQUENT_CHECK; 1934 EV_FREQUENT_CHECK;
1706 }
1707 } 1935 }
1708} 1936}
1709 1937
1710#if EV_IDLE_ENABLE 1938#if EV_IDLE_ENABLE
1711void inline_size 1939/* make idle watchers pending. this handles the "call-idle */
1940/* only when higher priorities are idle" logic */
1941inline_size void
1712idle_reify (EV_P) 1942idle_reify (EV_P)
1713{ 1943{
1714 if (expect_false (idleall)) 1944 if (expect_false (idleall))
1715 { 1945 {
1716 int pri; 1946 int pri;
… …
1728 } 1958 }
1729 } 1959 }
1730} 1960}
1731#endif 1961#endif
1732 1962
1733void inline_size 1963/* make timers pending */
1964inline_size void
1734timers_reify (EV_P) 1965timers_reify (EV_P)
1735{ 1966{
1736 EV_FREQUENT_CHECK; 1967 EV_FREQUENT_CHECK;
1737 1968
1738 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1969 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1739 { 1970 {
1740 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1971 do
1741
1742 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1743
1744 /* first reschedule or stop timer */
1745 if (w->repeat)
1746 { 1972 {
1973 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1974
1975 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1976
1977 /* first reschedule or stop timer */
1978 if (w->repeat)
1979 {
1747 ev_at (w) += w->repeat; 1980 ev_at (w) += w->repeat;
1748 if (ev_at (w) < mn_now) 1981 if (ev_at (w) < mn_now)
1749 ev_at (w) = mn_now; 1982 ev_at (w) = mn_now;
1750 1983
1751 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1984 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1752 1985
1753 ANHE_at_cache (timers [HEAP0]); 1986 ANHE_at_cache (timers [HEAP0]);
1754 downheap (timers, timercnt, HEAP0); 1987 downheap (timers, timercnt, HEAP0);
1988 }
1989 else
1990 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1991
1992 EV_FREQUENT_CHECK;
1993 feed_reverse (EV_A_ (W)w);
1755 } 1994 }
1756 else 1995 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1757 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1758 1996
1759 EV_FREQUENT_CHECK;
1760 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1997 feed_reverse_done (EV_A_ EV_TIMEOUT);
1761 } 1998 }
1762} 1999}
1763 2000
1764#if EV_PERIODIC_ENABLE 2001#if EV_PERIODIC_ENABLE
1765void inline_size 2002/* make periodics pending */
2003inline_size void
1766periodics_reify (EV_P) 2004periodics_reify (EV_P)
1767{ 2005{
1768 EV_FREQUENT_CHECK; 2006 EV_FREQUENT_CHECK;
1769 2007
1770 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2008 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1771 { 2009 {
1772 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2010 int feed_count = 0;
1773 2011
1774 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2012 do
1775
1776 /* first reschedule or stop timer */
1777 if (w->reschedule_cb)
1778 { 2013 {
2014 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2015
2016 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2017
2018 /* first reschedule or stop timer */
2019 if (w->reschedule_cb)
2020 {
1779 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2021 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1780 2022
1781 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2023 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1782 2024
1783 ANHE_at_cache (periodics [HEAP0]); 2025 ANHE_at_cache (periodics [HEAP0]);
1784 downheap (periodics, periodiccnt, HEAP0); 2026 downheap (periodics, periodiccnt, HEAP0);
2027 }
2028 else if (w->interval)
2029 {
2030 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2031 /* if next trigger time is not sufficiently in the future, put it there */
2032 /* this might happen because of floating point inexactness */
2033 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2034 {
2035 ev_at (w) += w->interval;
2036
2037 /* if interval is unreasonably low we might still have a time in the past */
2038 /* so correct this. this will make the periodic very inexact, but the user */
2039 /* has effectively asked to get triggered more often than possible */
2040 if (ev_at (w) < ev_rt_now)
2041 ev_at (w) = ev_rt_now;
2042 }
2043
2044 ANHE_at_cache (periodics [HEAP0]);
2045 downheap (periodics, periodiccnt, HEAP0);
2046 }
2047 else
2048 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2049
2050 EV_FREQUENT_CHECK;
2051 feed_reverse (EV_A_ (W)w);
1785 } 2052 }
1786 else if (w->interval) 2053 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1787 {
1788 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1789 /* if next trigger time is not sufficiently in the future, put it there */
1790 /* this might happen because of floating point inexactness */
1791 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1792 {
1793 ev_at (w) += w->interval;
1794 2054
1795 /* if interval is unreasonably low we might still have a time in the past */
1796 /* so correct this. this will make the periodic very inexact, but the user */
1797 /* has effectively asked to get triggered more often than possible */
1798 if (ev_at (w) < ev_rt_now)
1799 ev_at (w) = ev_rt_now;
1800 }
1801
1802 ANHE_at_cache (periodics [HEAP0]);
1803 downheap (periodics, periodiccnt, HEAP0);
1804 }
1805 else
1806 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1807
1808 EV_FREQUENT_CHECK;
1809 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2055 feed_reverse_done (EV_A_ EV_PERIODIC);
1810 } 2056 }
1811} 2057}
1812 2058
2059/* simply recalculate all periodics */
2060/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1813static void noinline 2061static void noinline
1814periodics_reschedule (EV_P) 2062periodics_reschedule (EV_P)
1815{ 2063{
1816 int i; 2064 int i;
1817 2065
… …
1830 2078
1831 reheap (periodics, periodiccnt); 2079 reheap (periodics, periodiccnt);
1832} 2080}
1833#endif 2081#endif
1834 2082
1835void inline_speed 2083/* adjust all timers by a given offset */
2084static void noinline
2085timers_reschedule (EV_P_ ev_tstamp adjust)
2086{
2087 int i;
2088
2089 for (i = 0; i < timercnt; ++i)
2090 {
2091 ANHE *he = timers + i + HEAP0;
2092 ANHE_w (*he)->at += adjust;
2093 ANHE_at_cache (*he);
2094 }
2095}
2096
2097/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */
2099inline_speed void
1836time_update (EV_P_ ev_tstamp max_block) 2100time_update (EV_P_ ev_tstamp max_block)
1837{ 2101{
1838 int i;
1839
1840#if EV_USE_MONOTONIC 2102#if EV_USE_MONOTONIC
1841 if (expect_true (have_monotonic)) 2103 if (expect_true (have_monotonic))
1842 { 2104 {
2105 int i;
1843 ev_tstamp odiff = rtmn_diff; 2106 ev_tstamp odiff = rtmn_diff;
1844 2107
1845 mn_now = get_clock (); 2108 mn_now = get_clock ();
1846 2109
1847 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2110 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1873 ev_rt_now = ev_time (); 2136 ev_rt_now = ev_time ();
1874 mn_now = get_clock (); 2137 mn_now = get_clock ();
1875 now_floor = mn_now; 2138 now_floor = mn_now;
1876 } 2139 }
1877 2140
2141 /* no timer adjustment, as the monotonic clock doesn't jump */
2142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1878# if EV_PERIODIC_ENABLE 2143# if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2144 periodics_reschedule (EV_A);
1880# endif 2145# endif
1881 /* no timer adjustment, as the monotonic clock doesn't jump */
1882 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1883 } 2146 }
1884 else 2147 else
1885#endif 2148#endif
1886 { 2149 {
1887 ev_rt_now = ev_time (); 2150 ev_rt_now = ev_time ();
1888 2151
1889 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2152 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1890 { 2153 {
2154 /* adjust timers. this is easy, as the offset is the same for all of them */
2155 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1891#if EV_PERIODIC_ENABLE 2156#if EV_PERIODIC_ENABLE
1892 periodics_reschedule (EV_A); 2157 periodics_reschedule (EV_A);
1893#endif 2158#endif
1894 /* adjust timers. this is easy, as the offset is the same for all of them */
1895 for (i = 0; i < timercnt; ++i)
1896 {
1897 ANHE *he = timers + i + HEAP0;
1898 ANHE_w (*he)->at += ev_rt_now - mn_now;
1899 ANHE_at_cache (*he);
1900 }
1901 } 2159 }
1902 2160
1903 mn_now = ev_rt_now; 2161 mn_now = ev_rt_now;
1904 } 2162 }
1905} 2163}
1906 2164
1907void 2165void
1908ev_ref (EV_P)
1909{
1910 ++activecnt;
1911}
1912
1913void
1914ev_unref (EV_P)
1915{
1916 --activecnt;
1917}
1918
1919void
1920ev_now_update (EV_P)
1921{
1922 time_update (EV_A_ 1e100);
1923}
1924
1925static int loop_done;
1926
1927void
1928ev_loop (EV_P_ int flags) 2166ev_loop (EV_P_ int flags)
1929{ 2167{
2168#if EV_MINIMAL < 2
2169 ++loop_depth;
2170#endif
2171
2172 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2173
1930 loop_done = EVUNLOOP_CANCEL; 2174 loop_done = EVUNLOOP_CANCEL;
1931 2175
1932 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2176 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1933 2177
1934 do 2178 do
1935 { 2179 {
1936#if EV_VERIFY >= 2 2180#if EV_VERIFY >= 2
1937 ev_loop_verify (EV_A); 2181 ev_loop_verify (EV_A);
… …
1950 /* we might have forked, so queue fork handlers */ 2194 /* we might have forked, so queue fork handlers */
1951 if (expect_false (postfork)) 2195 if (expect_false (postfork))
1952 if (forkcnt) 2196 if (forkcnt)
1953 { 2197 {
1954 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1955 call_pending (EV_A); 2199 EV_INVOKE_PENDING;
1956 } 2200 }
1957#endif 2201#endif
1958 2202
1959 /* queue prepare watchers (and execute them) */ 2203 /* queue prepare watchers (and execute them) */
1960 if (expect_false (preparecnt)) 2204 if (expect_false (preparecnt))
1961 { 2205 {
1962 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1963 call_pending (EV_A); 2207 EV_INVOKE_PENDING;
1964 } 2208 }
1965 2209
1966 if (expect_false (!activecnt)) 2210 if (expect_false (loop_done))
1967 break; 2211 break;
1968 2212
1969 /* we might have forked, so reify kernel state if necessary */ 2213 /* we might have forked, so reify kernel state if necessary */
1970 if (expect_false (postfork)) 2214 if (expect_false (postfork))
1971 loop_fork (EV_A); 2215 loop_fork (EV_A);
… …
1978 ev_tstamp waittime = 0.; 2222 ev_tstamp waittime = 0.;
1979 ev_tstamp sleeptime = 0.; 2223 ev_tstamp sleeptime = 0.;
1980 2224
1981 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2225 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1982 { 2226 {
2227 /* remember old timestamp for io_blocktime calculation */
2228 ev_tstamp prev_mn_now = mn_now;
2229
1983 /* update time to cancel out callback processing overhead */ 2230 /* update time to cancel out callback processing overhead */
1984 time_update (EV_A_ 1e100); 2231 time_update (EV_A_ 1e100);
1985 2232
1986 waittime = MAX_BLOCKTIME; 2233 waittime = MAX_BLOCKTIME;
1987 2234
… …
1997 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2244 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1998 if (waittime > to) waittime = to; 2245 if (waittime > to) waittime = to;
1999 } 2246 }
2000#endif 2247#endif
2001 2248
2249 /* don't let timeouts decrease the waittime below timeout_blocktime */
2002 if (expect_false (waittime < timeout_blocktime)) 2250 if (expect_false (waittime < timeout_blocktime))
2003 waittime = timeout_blocktime; 2251 waittime = timeout_blocktime;
2004 2252
2005 sleeptime = waittime - backend_fudge; 2253 /* extra check because io_blocktime is commonly 0 */
2006
2007 if (expect_true (sleeptime > io_blocktime)) 2254 if (expect_false (io_blocktime))
2008 sleeptime = io_blocktime;
2009
2010 if (sleeptime)
2011 { 2255 {
2256 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2257
2258 if (sleeptime > waittime - backend_fudge)
2259 sleeptime = waittime - backend_fudge;
2260
2261 if (expect_true (sleeptime > 0.))
2262 {
2012 ev_sleep (sleeptime); 2263 ev_sleep (sleeptime);
2013 waittime -= sleeptime; 2264 waittime -= sleeptime;
2265 }
2014 } 2266 }
2015 } 2267 }
2016 2268
2269#if EV_MINIMAL < 2
2017 ++loop_count; 2270 ++loop_count;
2271#endif
2272 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2018 backend_poll (EV_A_ waittime); 2273 backend_poll (EV_A_ waittime);
2274 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2019 2275
2020 /* update ev_rt_now, do magic */ 2276 /* update ev_rt_now, do magic */
2021 time_update (EV_A_ waittime + sleeptime); 2277 time_update (EV_A_ waittime + sleeptime);
2022 } 2278 }
2023 2279
… …
2034 2290
2035 /* queue check watchers, to be executed first */ 2291 /* queue check watchers, to be executed first */
2036 if (expect_false (checkcnt)) 2292 if (expect_false (checkcnt))
2037 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2038 2294
2039 call_pending (EV_A); 2295 EV_INVOKE_PENDING;
2040 } 2296 }
2041 while (expect_true ( 2297 while (expect_true (
2042 activecnt 2298 activecnt
2043 && !loop_done 2299 && !loop_done
2044 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2300 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2045 )); 2301 ));
2046 2302
2047 if (loop_done == EVUNLOOP_ONE) 2303 if (loop_done == EVUNLOOP_ONE)
2048 loop_done = EVUNLOOP_CANCEL; 2304 loop_done = EVUNLOOP_CANCEL;
2305
2306#if EV_MINIMAL < 2
2307 --loop_depth;
2308#endif
2049} 2309}
2050 2310
2051void 2311void
2052ev_unloop (EV_P_ int how) 2312ev_unloop (EV_P_ int how)
2053{ 2313{
2054 loop_done = how; 2314 loop_done = how;
2055} 2315}
2056 2316
2317void
2318ev_ref (EV_P)
2319{
2320 ++activecnt;
2321}
2322
2323void
2324ev_unref (EV_P)
2325{
2326 --activecnt;
2327}
2328
2329void
2330ev_now_update (EV_P)
2331{
2332 time_update (EV_A_ 1e100);
2333}
2334
2335void
2336ev_suspend (EV_P)
2337{
2338 ev_now_update (EV_A);
2339}
2340
2341void
2342ev_resume (EV_P)
2343{
2344 ev_tstamp mn_prev = mn_now;
2345
2346 ev_now_update (EV_A);
2347 timers_reschedule (EV_A_ mn_now - mn_prev);
2348#if EV_PERIODIC_ENABLE
2349 /* TODO: really do this? */
2350 periodics_reschedule (EV_A);
2351#endif
2352}
2353
2057/*****************************************************************************/ 2354/*****************************************************************************/
2355/* singly-linked list management, used when the expected list length is short */
2058 2356
2059void inline_size 2357inline_size void
2060wlist_add (WL *head, WL elem) 2358wlist_add (WL *head, WL elem)
2061{ 2359{
2062 elem->next = *head; 2360 elem->next = *head;
2063 *head = elem; 2361 *head = elem;
2064} 2362}
2065 2363
2066void inline_size 2364inline_size void
2067wlist_del (WL *head, WL elem) 2365wlist_del (WL *head, WL elem)
2068{ 2366{
2069 while (*head) 2367 while (*head)
2070 { 2368 {
2071 if (*head == elem) 2369 if (*head == elem)
… …
2076 2374
2077 head = &(*head)->next; 2375 head = &(*head)->next;
2078 } 2376 }
2079} 2377}
2080 2378
2081void inline_speed 2379/* internal, faster, version of ev_clear_pending */
2380inline_speed void
2082clear_pending (EV_P_ W w) 2381clear_pending (EV_P_ W w)
2083{ 2382{
2084 if (w->pending) 2383 if (w->pending)
2085 { 2384 {
2086 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2385 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2087 w->pending = 0; 2386 w->pending = 0;
2088 } 2387 }
2089} 2388}
2090 2389
2091int 2390int
… …
2095 int pending = w_->pending; 2394 int pending = w_->pending;
2096 2395
2097 if (expect_true (pending)) 2396 if (expect_true (pending))
2098 { 2397 {
2099 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2398 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2399 p->w = (W)&pending_w;
2100 w_->pending = 0; 2400 w_->pending = 0;
2101 p->w = 0;
2102 return p->events; 2401 return p->events;
2103 } 2402 }
2104 else 2403 else
2105 return 0; 2404 return 0;
2106} 2405}
2107 2406
2108void inline_size 2407inline_size void
2109pri_adjust (EV_P_ W w) 2408pri_adjust (EV_P_ W w)
2110{ 2409{
2111 int pri = w->priority; 2410 int pri = ev_priority (w);
2112 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2411 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2113 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2412 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2114 w->priority = pri; 2413 ev_set_priority (w, pri);
2115} 2414}
2116 2415
2117void inline_speed 2416inline_speed void
2118ev_start (EV_P_ W w, int active) 2417ev_start (EV_P_ W w, int active)
2119{ 2418{
2120 pri_adjust (EV_A_ w); 2419 pri_adjust (EV_A_ w);
2121 w->active = active; 2420 w->active = active;
2122 ev_ref (EV_A); 2421 ev_ref (EV_A);
2123} 2422}
2124 2423
2125void inline_size 2424inline_size void
2126ev_stop (EV_P_ W w) 2425ev_stop (EV_P_ W w)
2127{ 2426{
2128 ev_unref (EV_A); 2427 ev_unref (EV_A);
2129 w->active = 0; 2428 w->active = 0;
2130} 2429}
… …
2137 int fd = w->fd; 2436 int fd = w->fd;
2138 2437
2139 if (expect_false (ev_is_active (w))) 2438 if (expect_false (ev_is_active (w)))
2140 return; 2439 return;
2141 2440
2142 assert (("ev_io_start called with negative fd", fd >= 0)); 2441 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2442 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2143 2443
2144 EV_FREQUENT_CHECK; 2444 EV_FREQUENT_CHECK;
2145 2445
2146 ev_start (EV_A_ (W)w, 1); 2446 ev_start (EV_A_ (W)w, 1);
2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2148 wlist_add (&anfds[fd].head, (WL)w); 2448 wlist_add (&anfds[fd].head, (WL)w);
2149 2449
2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2450 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2151 w->events &= ~EV_IOFDSET; 2451 w->events &= ~EV__IOFDSET;
2152 2452
2153 EV_FREQUENT_CHECK; 2453 EV_FREQUENT_CHECK;
2154} 2454}
2155 2455
2156void noinline 2456void noinline
… …
2158{ 2458{
2159 clear_pending (EV_A_ (W)w); 2459 clear_pending (EV_A_ (W)w);
2160 if (expect_false (!ev_is_active (w))) 2460 if (expect_false (!ev_is_active (w)))
2161 return; 2461 return;
2162 2462
2163 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2463 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2164 2464
2165 EV_FREQUENT_CHECK; 2465 EV_FREQUENT_CHECK;
2166 2466
2167 wlist_del (&anfds[w->fd].head, (WL)w); 2467 wlist_del (&anfds[w->fd].head, (WL)w);
2168 ev_stop (EV_A_ (W)w); 2468 ev_stop (EV_A_ (W)w);
… …
2178 if (expect_false (ev_is_active (w))) 2478 if (expect_false (ev_is_active (w)))
2179 return; 2479 return;
2180 2480
2181 ev_at (w) += mn_now; 2481 ev_at (w) += mn_now;
2182 2482
2183 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2483 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2184 2484
2185 EV_FREQUENT_CHECK; 2485 EV_FREQUENT_CHECK;
2186 2486
2187 ++timercnt; 2487 ++timercnt;
2188 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2488 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2191 ANHE_at_cache (timers [ev_active (w)]); 2491 ANHE_at_cache (timers [ev_active (w)]);
2192 upheap (timers, ev_active (w)); 2492 upheap (timers, ev_active (w));
2193 2493
2194 EV_FREQUENT_CHECK; 2494 EV_FREQUENT_CHECK;
2195 2495
2196 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2496 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2197} 2497}
2198 2498
2199void noinline 2499void noinline
2200ev_timer_stop (EV_P_ ev_timer *w) 2500ev_timer_stop (EV_P_ ev_timer *w)
2201{ 2501{
… …
2206 EV_FREQUENT_CHECK; 2506 EV_FREQUENT_CHECK;
2207 2507
2208 { 2508 {
2209 int active = ev_active (w); 2509 int active = ev_active (w);
2210 2510
2211 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2511 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2212 2512
2213 --timercnt; 2513 --timercnt;
2214 2514
2215 if (expect_true (active < timercnt + HEAP0)) 2515 if (expect_true (active < timercnt + HEAP0))
2216 { 2516 {
… …
2249 } 2549 }
2250 2550
2251 EV_FREQUENT_CHECK; 2551 EV_FREQUENT_CHECK;
2252} 2552}
2253 2553
2554ev_tstamp
2555ev_timer_remaining (EV_P_ ev_timer *w)
2556{
2557 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2558}
2559
2254#if EV_PERIODIC_ENABLE 2560#if EV_PERIODIC_ENABLE
2255void noinline 2561void noinline
2256ev_periodic_start (EV_P_ ev_periodic *w) 2562ev_periodic_start (EV_P_ ev_periodic *w)
2257{ 2563{
2258 if (expect_false (ev_is_active (w))) 2564 if (expect_false (ev_is_active (w)))
… …
2260 2566
2261 if (w->reschedule_cb) 2567 if (w->reschedule_cb)
2262 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2568 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2263 else if (w->interval) 2569 else if (w->interval)
2264 { 2570 {
2265 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2571 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2266 /* this formula differs from the one in periodic_reify because we do not always round up */ 2572 /* this formula differs from the one in periodic_reify because we do not always round up */
2267 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2573 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2268 } 2574 }
2269 else 2575 else
2270 ev_at (w) = w->offset; 2576 ev_at (w) = w->offset;
… …
2278 ANHE_at_cache (periodics [ev_active (w)]); 2584 ANHE_at_cache (periodics [ev_active (w)]);
2279 upheap (periodics, ev_active (w)); 2585 upheap (periodics, ev_active (w));
2280 2586
2281 EV_FREQUENT_CHECK; 2587 EV_FREQUENT_CHECK;
2282 2588
2283 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2589 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2284} 2590}
2285 2591
2286void noinline 2592void noinline
2287ev_periodic_stop (EV_P_ ev_periodic *w) 2593ev_periodic_stop (EV_P_ ev_periodic *w)
2288{ 2594{
… …
2293 EV_FREQUENT_CHECK; 2599 EV_FREQUENT_CHECK;
2294 2600
2295 { 2601 {
2296 int active = ev_active (w); 2602 int active = ev_active (w);
2297 2603
2298 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2604 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2299 2605
2300 --periodiccnt; 2606 --periodiccnt;
2301 2607
2302 if (expect_true (active < periodiccnt + HEAP0)) 2608 if (expect_true (active < periodiccnt + HEAP0))
2303 { 2609 {
… …
2326 2632
2327void noinline 2633void noinline
2328ev_signal_start (EV_P_ ev_signal *w) 2634ev_signal_start (EV_P_ ev_signal *w)
2329{ 2635{
2330#if EV_MULTIPLICITY 2636#if EV_MULTIPLICITY
2331 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2332#endif 2638#endif
2333 if (expect_false (ev_is_active (w))) 2639 if (expect_false (ev_is_active (w)))
2334 return; 2640 return;
2335 2641
2336 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2337 2643
2644 EV_FREQUENT_CHECK;
2645
2646#if EV_USE_SIGNALFD
2647 if (sigfd == -2)
2648 {
2649 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2650 if (sigfd < 0 && errno == EINVAL)
2651 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2652
2653 if (sigfd >= 0)
2654 {
2655 fd_intern (sigfd); /* doing it twice will not hurt */
2656
2657 sigemptyset (&sigfd_set);
2658
2659 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2660 ev_set_priority (&sigfd_w, EV_MAXPRI);
2661 ev_io_start (EV_A_ &sigfd_w);
2662 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2663 }
2664 }
2665
2666 if (sigfd >= 0)
2667 {
2668 /* TODO: check .head */
2669 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671
2672 signalfd (sigfd, &sigfd_set, 0);
2673 }
2674 else
2675#endif
2338 evpipe_init (EV_A); 2676 evpipe_init (EV_A);
2339
2340 EV_FREQUENT_CHECK;
2341 2677
2342 { 2678 {
2343#ifndef _WIN32 2679#ifndef _WIN32
2344 sigset_t full, prev; 2680 sigset_t full, prev;
2345 sigfillset (&full); 2681 sigfillset (&full);
2346 sigprocmask (SIG_SETMASK, &full, &prev); 2682 sigprocmask (SIG_SETMASK, &full, &prev);
2347#endif 2683#endif
2348 2684
2349 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2350 2686
2351#ifndef _WIN32 2687#ifndef _WIN32
2688# if EV_USE_SIGNALFD
2689 if (sigfd < 0)/*TODO*/
2690# endif
2691 sigdelset (&prev, w->signum);
2352 sigprocmask (SIG_SETMASK, &prev, 0); 2692 sigprocmask (SIG_SETMASK, &prev, 0);
2353#endif 2693#endif
2354 } 2694 }
2355 2695
2356 ev_start (EV_A_ (W)w, 1); 2696 ev_start (EV_A_ (W)w, 1);
… …
2359 if (!((WL)w)->next) 2699 if (!((WL)w)->next)
2360 { 2700 {
2361#if _WIN32 2701#if _WIN32
2362 signal (w->signum, ev_sighandler); 2702 signal (w->signum, ev_sighandler);
2363#else 2703#else
2704# if EV_USE_SIGNALFD
2705 if (sigfd < 0) /*TODO*/
2706# endif
2707 {
2364 struct sigaction sa; 2708 struct sigaction sa = { };
2365 sa.sa_handler = ev_sighandler; 2709 sa.sa_handler = ev_sighandler;
2366 sigfillset (&sa.sa_mask); 2710 sigfillset (&sa.sa_mask);
2367 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2711 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2368 sigaction (w->signum, &sa, 0); 2712 sigaction (w->signum, &sa, 0);
2713 }
2369#endif 2714#endif
2370 } 2715 }
2371 2716
2372 EV_FREQUENT_CHECK; 2717 EV_FREQUENT_CHECK;
2373} 2718}
… …
2383 2728
2384 wlist_del (&signals [w->signum - 1].head, (WL)w); 2729 wlist_del (&signals [w->signum - 1].head, (WL)w);
2385 ev_stop (EV_A_ (W)w); 2730 ev_stop (EV_A_ (W)w);
2386 2731
2387 if (!signals [w->signum - 1].head) 2732 if (!signals [w->signum - 1].head)
2733#if EV_USE_SIGNALFD
2734 if (sigfd >= 0)
2735 {
2736 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2737 sigdelset (&sigfd_set, w->signum);
2738 signalfd (sigfd, &sigfd_set, 0);
2739 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2740 /*TODO: maybe unblock signal? */
2741 }
2742 else
2743#endif
2388 signal (w->signum, SIG_DFL); 2744 signal (w->signum, SIG_DFL);
2389 2745
2390 EV_FREQUENT_CHECK; 2746 EV_FREQUENT_CHECK;
2391} 2747}
2392 2748
2393void 2749void
2394ev_child_start (EV_P_ ev_child *w) 2750ev_child_start (EV_P_ ev_child *w)
2395{ 2751{
2396#if EV_MULTIPLICITY 2752#if EV_MULTIPLICITY
2397 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2753 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2398#endif 2754#endif
2399 if (expect_false (ev_is_active (w))) 2755 if (expect_false (ev_is_active (w)))
2400 return; 2756 return;
2401 2757
2402 EV_FREQUENT_CHECK; 2758 EV_FREQUENT_CHECK;
… …
2427# ifdef _WIN32 2783# ifdef _WIN32
2428# undef lstat 2784# undef lstat
2429# define lstat(a,b) _stati64 (a,b) 2785# define lstat(a,b) _stati64 (a,b)
2430# endif 2786# endif
2431 2787
2432#define DEF_STAT_INTERVAL 5.0074891 2788#define DEF_STAT_INTERVAL 5.0074891
2789#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2433#define MIN_STAT_INTERVAL 0.1074891 2790#define MIN_STAT_INTERVAL 0.1074891
2434 2791
2435static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2792static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2436 2793
2437#if EV_USE_INOTIFY 2794#if EV_USE_INOTIFY
2438# define EV_INOTIFY_BUFSIZE 8192 2795# define EV_INOTIFY_BUFSIZE 8192
… …
2442{ 2799{
2443 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); 2800 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);
2444 2801
2445 if (w->wd < 0) 2802 if (w->wd < 0)
2446 { 2803 {
2804 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2447 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2805 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2448 2806
2449 /* monitor some parent directory for speedup hints */ 2807 /* monitor some parent directory for speedup hints */
2450 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2808 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2451 /* but an efficiency issue only */ 2809 /* but an efficiency issue only */
2452 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2810 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2453 { 2811 {
2454 char path [4096]; 2812 char path [4096];
2455 strcpy (path, w->path); 2813 strcpy (path, w->path);
… …
2459 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2817 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2460 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2818 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2461 2819
2462 char *pend = strrchr (path, '/'); 2820 char *pend = strrchr (path, '/');
2463 2821
2464 if (!pend) 2822 if (!pend || pend == path)
2465 break; /* whoops, no '/', complain to your admin */ 2823 break;
2466 2824
2467 *pend = 0; 2825 *pend = 0;
2468 w->wd = inotify_add_watch (fs_fd, path, mask); 2826 w->wd = inotify_add_watch (fs_fd, path, mask);
2469 } 2827 }
2470 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2828 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2471 } 2829 }
2472 } 2830 }
2473 else
2474 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2475 2831
2476 if (w->wd >= 0) 2832 if (w->wd >= 0)
2833 {
2477 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2834 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2835
2836 /* now local changes will be tracked by inotify, but remote changes won't */
2837 /* unless the filesystem it known to be local, we therefore still poll */
2838 /* also do poll on <2.6.25, but with normal frequency */
2839 struct statfs sfs;
2840
2841 if (fs_2625 && !statfs (w->path, &sfs))
2842 if (sfs.f_type == 0x1373 /* devfs */
2843 || sfs.f_type == 0xEF53 /* ext2/3 */
2844 || sfs.f_type == 0x3153464a /* jfs */
2845 || sfs.f_type == 0x52654973 /* reiser3 */
2846 || sfs.f_type == 0x01021994 /* tempfs */
2847 || sfs.f_type == 0x58465342 /* xfs */)
2848 return;
2849
2850 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2851 ev_timer_again (EV_A_ &w->timer);
2852 }
2478} 2853}
2479 2854
2480static void noinline 2855static void noinline
2481infy_del (EV_P_ ev_stat *w) 2856infy_del (EV_P_ ev_stat *w)
2482{ 2857{
… …
2496 2871
2497static void noinline 2872static void noinline
2498infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2873infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2499{ 2874{
2500 if (slot < 0) 2875 if (slot < 0)
2501 /* overflow, need to check for all hahs slots */ 2876 /* overflow, need to check for all hash slots */
2502 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2877 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2503 infy_wd (EV_A_ slot, wd, ev); 2878 infy_wd (EV_A_ slot, wd, ev);
2504 else 2879 else
2505 { 2880 {
2506 WL w_; 2881 WL w_;
… …
2512 2887
2513 if (w->wd == wd || wd == -1) 2888 if (w->wd == wd || wd == -1)
2514 { 2889 {
2515 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2890 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2516 { 2891 {
2892 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2517 w->wd = -1; 2893 w->wd = -1;
2518 infy_add (EV_A_ w); /* re-add, no matter what */ 2894 infy_add (EV_A_ w); /* re-add, no matter what */
2519 } 2895 }
2520 2896
2521 stat_timer_cb (EV_A_ &w->timer, 0); 2897 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2534 2910
2535 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2911 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2536 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2912 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2537} 2913}
2538 2914
2539void inline_size 2915inline_size void
2916check_2625 (EV_P)
2917{
2918 /* kernels < 2.6.25 are borked
2919 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2920 */
2921 struct utsname buf;
2922 int major, minor, micro;
2923
2924 if (uname (&buf))
2925 return;
2926
2927 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2928 return;
2929
2930 if (major < 2
2931 || (major == 2 && minor < 6)
2932 || (major == 2 && minor == 6 && micro < 25))
2933 return;
2934
2935 fs_2625 = 1;
2936}
2937
2938inline_size void
2540infy_init (EV_P) 2939infy_init (EV_P)
2541{ 2940{
2542 if (fs_fd != -2) 2941 if (fs_fd != -2)
2543 return; 2942 return;
2943
2944 fs_fd = -1;
2945
2946 check_2625 (EV_A);
2544 2947
2545 fs_fd = inotify_init (); 2948 fs_fd = inotify_init ();
2546 2949
2547 if (fs_fd >= 0) 2950 if (fs_fd >= 0)
2548 { 2951 {
… …
2550 ev_set_priority (&fs_w, EV_MAXPRI); 2953 ev_set_priority (&fs_w, EV_MAXPRI);
2551 ev_io_start (EV_A_ &fs_w); 2954 ev_io_start (EV_A_ &fs_w);
2552 } 2955 }
2553} 2956}
2554 2957
2555void inline_size 2958inline_size void
2556infy_fork (EV_P) 2959infy_fork (EV_P)
2557{ 2960{
2558 int slot; 2961 int slot;
2559 2962
2560 if (fs_fd < 0) 2963 if (fs_fd < 0)
… …
2576 w->wd = -1; 2979 w->wd = -1;
2577 2980
2578 if (fs_fd >= 0) 2981 if (fs_fd >= 0)
2579 infy_add (EV_A_ w); /* re-add, no matter what */ 2982 infy_add (EV_A_ w); /* re-add, no matter what */
2580 else 2983 else
2581 ev_timer_start (EV_A_ &w->timer); 2984 ev_timer_again (EV_A_ &w->timer);
2582 } 2985 }
2583
2584 } 2986 }
2585} 2987}
2586 2988
2587#endif 2989#endif
2588 2990
… …
2624 || w->prev.st_atime != w->attr.st_atime 3026 || w->prev.st_atime != w->attr.st_atime
2625 || w->prev.st_mtime != w->attr.st_mtime 3027 || w->prev.st_mtime != w->attr.st_mtime
2626 || w->prev.st_ctime != w->attr.st_ctime 3028 || w->prev.st_ctime != w->attr.st_ctime
2627 ) { 3029 ) {
2628 #if EV_USE_INOTIFY 3030 #if EV_USE_INOTIFY
3031 if (fs_fd >= 0)
3032 {
2629 infy_del (EV_A_ w); 3033 infy_del (EV_A_ w);
2630 infy_add (EV_A_ w); 3034 infy_add (EV_A_ w);
2631 ev_stat_stat (EV_A_ w); /* avoid race... */ 3035 ev_stat_stat (EV_A_ w); /* avoid race... */
3036 }
2632 #endif 3037 #endif
2633 3038
2634 ev_feed_event (EV_A_ w, EV_STAT); 3039 ev_feed_event (EV_A_ w, EV_STAT);
2635 } 3040 }
2636} 3041}
… …
2639ev_stat_start (EV_P_ ev_stat *w) 3044ev_stat_start (EV_P_ ev_stat *w)
2640{ 3045{
2641 if (expect_false (ev_is_active (w))) 3046 if (expect_false (ev_is_active (w)))
2642 return; 3047 return;
2643 3048
2644 /* since we use memcmp, we need to clear any padding data etc. */
2645 memset (&w->prev, 0, sizeof (ev_statdata));
2646 memset (&w->attr, 0, sizeof (ev_statdata));
2647
2648 ev_stat_stat (EV_A_ w); 3049 ev_stat_stat (EV_A_ w);
2649 3050
3051 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2650 if (w->interval < MIN_STAT_INTERVAL) 3052 w->interval = MIN_STAT_INTERVAL;
2651 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2652 3053
2653 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3054 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2654 ev_set_priority (&w->timer, ev_priority (w)); 3055 ev_set_priority (&w->timer, ev_priority (w));
2655 3056
2656#if EV_USE_INOTIFY 3057#if EV_USE_INOTIFY
2657 infy_init (EV_A); 3058 infy_init (EV_A);
2658 3059
2659 if (fs_fd >= 0) 3060 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); 3061 infy_add (EV_A_ w);
2661 else 3062 else
2662#endif 3063#endif
2663 ev_timer_start (EV_A_ &w->timer); 3064 ev_timer_again (EV_A_ &w->timer);
2664 3065
2665 ev_start (EV_A_ (W)w, 1); 3066 ev_start (EV_A_ (W)w, 1);
2666 3067
2667 EV_FREQUENT_CHECK; 3068 EV_FREQUENT_CHECK;
2668} 3069}
… …
2843static void 3244static void
2844embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3245embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2845{ 3246{
2846 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3247 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2847 3248
3249 ev_embed_stop (EV_A_ w);
3250
2848 { 3251 {
2849 struct ev_loop *loop = w->other; 3252 struct ev_loop *loop = w->other;
2850 3253
2851 ev_loop_fork (EV_A); 3254 ev_loop_fork (EV_A);
3255 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2852 } 3256 }
3257
3258 ev_embed_start (EV_A_ w);
2853} 3259}
2854 3260
2855#if 0 3261#if 0
2856static void 3262static void
2857embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3263embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2866 if (expect_false (ev_is_active (w))) 3272 if (expect_false (ev_is_active (w)))
2867 return; 3273 return;
2868 3274
2869 { 3275 {
2870 struct ev_loop *loop = w->other; 3276 struct ev_loop *loop = w->other;
2871 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3277 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2872 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3278 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2873 } 3279 }
2874 3280
2875 EV_FREQUENT_CHECK; 3281 EV_FREQUENT_CHECK;
2876 3282
… …
3059 ev_timer_set (&once->to, timeout, 0.); 3465 ev_timer_set (&once->to, timeout, 0.);
3060 ev_timer_start (EV_A_ &once->to); 3466 ev_timer_start (EV_A_ &once->to);
3061 } 3467 }
3062} 3468}
3063 3469
3470/*****************************************************************************/
3471
3472#if EV_WALK_ENABLE
3473void
3474ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3475{
3476 int i, j;
3477 ev_watcher_list *wl, *wn;
3478
3479 if (types & (EV_IO | EV_EMBED))
3480 for (i = 0; i < anfdmax; ++i)
3481 for (wl = anfds [i].head; wl; )
3482 {
3483 wn = wl->next;
3484
3485#if EV_EMBED_ENABLE
3486 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3487 {
3488 if (types & EV_EMBED)
3489 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3490 }
3491 else
3492#endif
3493#if EV_USE_INOTIFY
3494 if (ev_cb ((ev_io *)wl) == infy_cb)
3495 ;
3496 else
3497#endif
3498 if ((ev_io *)wl != &pipe_w)
3499 if (types & EV_IO)
3500 cb (EV_A_ EV_IO, wl);
3501
3502 wl = wn;
3503 }
3504
3505 if (types & (EV_TIMER | EV_STAT))
3506 for (i = timercnt + HEAP0; i-- > HEAP0; )
3507#if EV_STAT_ENABLE
3508 /*TODO: timer is not always active*/
3509 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3510 {
3511 if (types & EV_STAT)
3512 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3513 }
3514 else
3515#endif
3516 if (types & EV_TIMER)
3517 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3518
3519#if EV_PERIODIC_ENABLE
3520 if (types & EV_PERIODIC)
3521 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3522 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3523#endif
3524
3525#if EV_IDLE_ENABLE
3526 if (types & EV_IDLE)
3527 for (j = NUMPRI; i--; )
3528 for (i = idlecnt [j]; i--; )
3529 cb (EV_A_ EV_IDLE, idles [j][i]);
3530#endif
3531
3532#if EV_FORK_ENABLE
3533 if (types & EV_FORK)
3534 for (i = forkcnt; i--; )
3535 if (ev_cb (forks [i]) != embed_fork_cb)
3536 cb (EV_A_ EV_FORK, forks [i]);
3537#endif
3538
3539#if EV_ASYNC_ENABLE
3540 if (types & EV_ASYNC)
3541 for (i = asynccnt; i--; )
3542 cb (EV_A_ EV_ASYNC, asyncs [i]);
3543#endif
3544
3545 if (types & EV_PREPARE)
3546 for (i = preparecnt; i--; )
3547#if EV_EMBED_ENABLE
3548 if (ev_cb (prepares [i]) != embed_prepare_cb)
3549#endif
3550 cb (EV_A_ EV_PREPARE, prepares [i]);
3551
3552 if (types & EV_CHECK)
3553 for (i = checkcnt; i--; )
3554 cb (EV_A_ EV_CHECK, checks [i]);
3555
3556 if (types & EV_SIGNAL)
3557 for (i = 0; i < signalmax; ++i)
3558 for (wl = signals [i].head; wl; )
3559 {
3560 wn = wl->next;
3561 cb (EV_A_ EV_SIGNAL, wl);
3562 wl = wn;
3563 }
3564
3565 if (types & EV_CHILD)
3566 for (i = EV_PID_HASHSIZE; i--; )
3567 for (wl = childs [i]; wl; )
3568 {
3569 wn = wl->next;
3570 cb (EV_A_ EV_CHILD, wl);
3571 wl = wn;
3572 }
3573/* EV_STAT 0x00001000 /* stat data changed */
3574/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3575}
3576#endif
3577
3064#if EV_MULTIPLICITY 3578#if EV_MULTIPLICITY
3065 #include "ev_wrap.h" 3579 #include "ev_wrap.h"
3066#endif 3580#endif
3067 3581
3068#ifdef __cplusplus 3582#ifdef __cplusplus

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines