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

Comparing libev/ev.c (file contents):
Revision 1.253 by root, Sat May 31 03:13:27 2008 UTC vs.
Revision 1.303 by root, Sun Jul 19 01:36:34 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
… …
154#ifndef _WIN32 176#ifndef _WIN32
155# include <sys/time.h> 177# include <sys/time.h>
156# include <sys/wait.h> 178# include <sys/wait.h>
157# include <unistd.h> 179# include <unistd.h>
158#else 180#else
181# include <io.h>
159# define WIN32_LEAN_AND_MEAN 182# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 183# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 184# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 185# define EV_SELECT_IS_WINSOCKET 1
163# endif 186# endif
164#endif 187#endif
165 188
166/* 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 */
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
167 198
168#ifndef EV_USE_MONOTONIC 199#ifndef EV_USE_MONOTONIC
169# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 200# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
170# define EV_USE_MONOTONIC 1 201# define EV_USE_MONOTONIC 1
171# else 202# else
172# define EV_USE_MONOTONIC 0 203# define EV_USE_MONOTONIC 0
173# endif 204# endif
174#endif 205#endif
175 206
176#ifndef EV_USE_REALTIME 207#ifndef EV_USE_REALTIME
177# define EV_USE_REALTIME 0 208# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
178#endif 209#endif
179 210
180#ifndef EV_USE_NANOSLEEP 211#ifndef EV_USE_NANOSLEEP
181# if _POSIX_C_SOURCE >= 199309L 212# if _POSIX_C_SOURCE >= 199309L
182# define EV_USE_NANOSLEEP 1 213# define EV_USE_NANOSLEEP 1
… …
243# else 274# else
244# define EV_USE_EVENTFD 0 275# define EV_USE_EVENTFD 0
245# endif 276# endif
246#endif 277#endif
247 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
248#if 0 /* debugging */ 287#if 0 /* debugging */
249# define EV_VERIFY 3 288# define EV_VERIFY 3
250# define EV_USE_4HEAP 1 289# define EV_USE_4HEAP 1
251# define EV_HEAP_CACHE_AT 1 290# define EV_HEAP_CACHE_AT 1
252#endif 291#endif
… …
261 300
262#ifndef EV_HEAP_CACHE_AT 301#ifndef EV_HEAP_CACHE_AT
263# define EV_HEAP_CACHE_AT !EV_MINIMAL 302# define EV_HEAP_CACHE_AT !EV_MINIMAL
264#endif 303#endif
265 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
266/* 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 */
267 320
268#ifndef CLOCK_MONOTONIC 321#ifndef CLOCK_MONOTONIC
269# undef EV_USE_MONOTONIC 322# undef EV_USE_MONOTONIC
270# define EV_USE_MONOTONIC 0 323# define EV_USE_MONOTONIC 0
… …
285# include <sys/select.h> 338# include <sys/select.h>
286# endif 339# endif
287#endif 340#endif
288 341
289#if EV_USE_INOTIFY 342#if EV_USE_INOTIFY
343# include <sys/utsname.h>
344# include <sys/statfs.h>
290# include <sys/inotify.h> 345# include <sys/inotify.h>
346/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
347# ifndef IN_DONT_FOLLOW
348# undef EV_USE_INOTIFY
349# define EV_USE_INOTIFY 0
350# endif
291#endif 351#endif
292 352
293#if EV_SELECT_IS_WINSOCKET 353#if EV_SELECT_IS_WINSOCKET
294# include <winsock.h> 354# include <winsock.h>
295#endif 355#endif
296 356
297#if EV_USE_EVENTFD 357#if EV_USE_EVENTFD
298/* 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 */
299# 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
300# ifdef __cplusplus 366# ifdef __cplusplus
301extern "C" { 367extern "C" {
302# endif 368# endif
303int eventfd (unsigned int initval, int flags); 369int eventfd (unsigned int initval, int flags);
304# ifdef __cplusplus 370# ifdef __cplusplus
305} 371}
306# endif 372# endif
373#endif
374
375#if EV_USE_SIGNALFD
376# include <sys/signalfd.h>
307#endif 377#endif
308 378
309/**/ 379/**/
310 380
311#if EV_VERIFY >= 3 381#if EV_VERIFY >= 3
… …
347# define inline_speed static noinline 417# define inline_speed static noinline
348#else 418#else
349# define inline_speed static inline 419# define inline_speed static inline
350#endif 420#endif
351 421
352#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
353#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 427# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
428#endif
354 429
355#define EMPTY /* required for microsofts broken pseudo-c compiler */ 430#define EMPTY /* required for microsofts broken pseudo-c compiler */
356#define EMPTY2(a,b) /* used to suppress some warnings */ 431#define EMPTY2(a,b) /* used to suppress some warnings */
357 432
358typedef ev_watcher *W; 433typedef ev_watcher *W;
… …
360typedef ev_watcher_time *WT; 435typedef ev_watcher_time *WT;
361 436
362#define ev_active(w) ((W)(w))->active 437#define ev_active(w) ((W)(w))->active
363#define ev_at(w) ((WT)(w))->at 438#define ev_at(w) ((WT)(w))->at
364 439
365#if EV_USE_MONOTONIC 440#if EV_USE_REALTIME
366/* 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 */
367/* 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
368static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
369#endif 448#endif
370 449
371#ifdef _WIN32 450#ifdef _WIN32
372# include "ev_win32.c" 451# include "ev_win32.c"
… …
381{ 460{
382 syserr_cb = cb; 461 syserr_cb = cb;
383} 462}
384 463
385static void noinline 464static void noinline
386syserr (const char *msg) 465ev_syserr (const char *msg)
387{ 466{
388 if (!msg) 467 if (!msg)
389 msg = "(libev) system error"; 468 msg = "(libev) system error";
390 469
391 if (syserr_cb) 470 if (syserr_cb)
… …
437#define ev_malloc(size) ev_realloc (0, (size)) 516#define ev_malloc(size) ev_realloc (0, (size))
438#define ev_free(ptr) ev_realloc ((ptr), 0) 517#define ev_free(ptr) ev_realloc ((ptr), 0)
439 518
440/*****************************************************************************/ 519/*****************************************************************************/
441 520
521/* set in reify when reification needed */
522#define EV_ANFD_REIFY 1
523
524/* file descriptor info structure */
442typedef struct 525typedef struct
443{ 526{
444 WL head; 527 WL head;
445 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 */
446 unsigned char reify; 531 unsigned char unused;
532#if EV_USE_EPOLL
533 unsigned int egen; /* generation counter to counter epoll bugs */
534#endif
447#if EV_SELECT_IS_WINSOCKET 535#if EV_SELECT_IS_WINSOCKET
448 SOCKET handle; 536 SOCKET handle;
449#endif 537#endif
450} ANFD; 538} ANFD;
451 539
540/* stores the pending event set for a given watcher */
452typedef struct 541typedef struct
453{ 542{
454 W w; 543 W w;
455 int events; 544 int events; /* the pending event set for the given watcher */
456} ANPENDING; 545} ANPENDING;
457 546
458#if EV_USE_INOTIFY 547#if EV_USE_INOTIFY
459/* hash table entry per inotify-id */ 548/* hash table entry per inotify-id */
460typedef struct 549typedef struct
… …
463} ANFS; 552} ANFS;
464#endif 553#endif
465 554
466/* Heap Entry */ 555/* Heap Entry */
467#if EV_HEAP_CACHE_AT 556#if EV_HEAP_CACHE_AT
557 /* a heap element */
468 typedef struct { 558 typedef struct {
469 ev_tstamp at; 559 ev_tstamp at;
470 WT w; 560 WT w;
471 } ANHE; 561 } ANHE;
472 562
473 #define ANHE_w(he) (he).w /* access watcher, read-write */ 563 #define ANHE_w(he) (he).w /* access watcher, read-write */
474 #define ANHE_at(he) (he).at /* access cached at, read-only */ 564 #define ANHE_at(he) (he).at /* access cached at, read-only */
475 #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 */
476#else 566#else
567 /* a heap element */
477 typedef WT ANHE; 568 typedef WT ANHE;
478 569
479 #define ANHE_w(he) (he) 570 #define ANHE_w(he) (he)
480 #define ANHE_at(he) (he)->at 571 #define ANHE_at(he) (he)->at
481 #define ANHE_at_cache(he) 572 #define ANHE_at_cache(he)
… …
505 596
506 static int ev_default_loop_ptr; 597 static int ev_default_loop_ptr;
507 598
508#endif 599#endif
509 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
510/*****************************************************************************/ 613/*****************************************************************************/
511 614
615#ifndef EV_HAVE_EV_TIME
512ev_tstamp 616ev_tstamp
513ev_time (void) 617ev_time (void)
514{ 618{
515#if EV_USE_REALTIME 619#if EV_USE_REALTIME
620 if (expect_true (have_realtime))
621 {
516 struct timespec ts; 622 struct timespec ts;
517 clock_gettime (CLOCK_REALTIME, &ts); 623 clock_gettime (CLOCK_REALTIME, &ts);
518 return ts.tv_sec + ts.tv_nsec * 1e-9; 624 return ts.tv_sec + ts.tv_nsec * 1e-9;
519#else 625 }
626#endif
627
520 struct timeval tv; 628 struct timeval tv;
521 gettimeofday (&tv, 0); 629 gettimeofday (&tv, 0);
522 return tv.tv_sec + tv.tv_usec * 1e-6; 630 return tv.tv_sec + tv.tv_usec * 1e-6;
523#endif
524} 631}
632#endif
525 633
526ev_tstamp inline_size 634inline_size ev_tstamp
527get_clock (void) 635get_clock (void)
528{ 636{
529#if EV_USE_MONOTONIC 637#if EV_USE_MONOTONIC
530 if (expect_true (have_monotonic)) 638 if (expect_true (have_monotonic))
531 { 639 {
… …
564 struct timeval tv; 672 struct timeval tv;
565 673
566 tv.tv_sec = (time_t)delay; 674 tv.tv_sec = (time_t)delay;
567 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 675 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568 676
677 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
678 /* something not guaranteed by newer posix versions, but guaranteed */
679 /* by older ones */
569 select (0, 0, 0, 0, &tv); 680 select (0, 0, 0, 0, &tv);
570#endif 681#endif
571 } 682 }
572} 683}
573 684
574/*****************************************************************************/ 685/*****************************************************************************/
575 686
576#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 */
577 688
578int 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
579array_nextsize (int elem, int cur, int cnt) 692array_nextsize (int elem, int cur, int cnt)
580{ 693{
581 int ncur = cur + 1; 694 int ncur = cur + 1;
582 695
583 do 696 do
… …
600array_realloc (int elem, void *base, int *cur, int cnt) 713array_realloc (int elem, void *base, int *cur, int cnt)
601{ 714{
602 *cur = array_nextsize (elem, *cur, cnt); 715 *cur = array_nextsize (elem, *cur, cnt);
603 return ev_realloc (base, elem * *cur); 716 return ev_realloc (base, elem * *cur);
604} 717}
718
719#define array_init_zero(base,count) \
720 memset ((void *)(base), 0, sizeof (*(base)) * (count))
605 721
606#define array_needsize(type,base,cur,cnt,init) \ 722#define array_needsize(type,base,cur,cnt,init) \
607 if (expect_false ((cnt) > (cur))) \ 723 if (expect_false ((cnt) > (cur))) \
608 { \ 724 { \
609 int ocur_ = (cur); \ 725 int ocur_ = (cur); \
… …
621 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 737 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
622 } 738 }
623#endif 739#endif
624 740
625#define array_free(stem, idx) \ 741#define array_free(stem, idx) \
626 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
627 743
628/*****************************************************************************/ 744/*****************************************************************************/
745
746/* dummy callback for pending events */
747static void noinline
748pendingcb (EV_P_ ev_prepare *w, int revents)
749{
750}
629 751
630void noinline 752void noinline
631ev_feed_event (EV_P_ void *w, int revents) 753ev_feed_event (EV_P_ void *w, int revents)
632{ 754{
633 W w_ = (W)w; 755 W w_ = (W)w;
… …
642 pendings [pri][w_->pending - 1].w = w_; 764 pendings [pri][w_->pending - 1].w = w_;
643 pendings [pri][w_->pending - 1].events = revents; 765 pendings [pri][w_->pending - 1].events = revents;
644 } 766 }
645} 767}
646 768
647void 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
648queue_events (EV_P_ W *events, int eventcnt, int type) 785queue_events (EV_P_ W *events, int eventcnt, int type)
649{ 786{
650 int i; 787 int i;
651 788
652 for (i = 0; i < eventcnt; ++i) 789 for (i = 0; i < eventcnt; ++i)
653 ev_feed_event (EV_A_ events [i], type); 790 ev_feed_event (EV_A_ events [i], type);
654} 791}
655 792
656/*****************************************************************************/ 793/*****************************************************************************/
657 794
658void inline_size 795inline_speed void
659anfds_init (ANFD *base, int count)
660{
661 while (count--)
662 {
663 base->head = 0;
664 base->events = EV_NONE;
665 base->reify = 0;
666
667 ++base;
668 }
669}
670
671void inline_speed
672fd_event (EV_P_ int fd, int revents) 796fd_event_nc (EV_P_ int fd, int revents)
673{ 797{
674 ANFD *anfd = anfds + fd; 798 ANFD *anfd = anfds + fd;
675 ev_io *w; 799 ev_io *w;
676 800
677 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)
… …
681 if (ev) 805 if (ev)
682 ev_feed_event (EV_A_ (W)w, ev); 806 ev_feed_event (EV_A_ (W)w, ev);
683 } 807 }
684} 808}
685 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
686void 821void
687ev_feed_fd_event (EV_P_ int fd, int revents) 822ev_feed_fd_event (EV_P_ int fd, int revents)
688{ 823{
689 if (fd >= 0 && fd < anfdmax) 824 if (fd >= 0 && fd < anfdmax)
690 fd_event (EV_A_ fd, revents); 825 fd_event_nc (EV_A_ fd, revents);
691} 826}
692 827
693void inline_size 828/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */
830inline_size void
694fd_reify (EV_P) 831fd_reify (EV_P)
695{ 832{
696 int i; 833 int i;
697 834
698 for (i = 0; i < fdchangecnt; ++i) 835 for (i = 0; i < fdchangecnt; ++i)
… …
707 events |= (unsigned char)w->events; 844 events |= (unsigned char)w->events;
708 845
709#if EV_SELECT_IS_WINSOCKET 846#if EV_SELECT_IS_WINSOCKET
710 if (events) 847 if (events)
711 { 848 {
712 unsigned long argp; 849 unsigned long arg;
713 #ifdef EV_FD_TO_WIN32_HANDLE 850 #ifdef EV_FD_TO_WIN32_HANDLE
714 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
715 #else 852 #else
716 anfd->handle = _get_osfhandle (fd); 853 anfd->handle = _get_osfhandle (fd);
717 #endif 854 #endif
718 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 855 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
719 } 856 }
720#endif 857#endif
721 858
722 { 859 {
723 unsigned char o_events = anfd->events; 860 unsigned char o_events = anfd->events;
724 unsigned char o_reify = anfd->reify; 861 unsigned char o_reify = anfd->reify;
725 862
726 anfd->reify = 0; 863 anfd->reify = 0;
727 anfd->events = events; 864 anfd->events = events;
728 865
729 if (o_events != events || o_reify & EV_IOFDSET) 866 if (o_events != events || o_reify & EV__IOFDSET)
730 backend_modify (EV_A_ fd, o_events, events); 867 backend_modify (EV_A_ fd, o_events, events);
731 } 868 }
732 } 869 }
733 870
734 fdchangecnt = 0; 871 fdchangecnt = 0;
735} 872}
736 873
737void inline_size 874/* something about the given fd changed */
875inline_size void
738fd_change (EV_P_ int fd, int flags) 876fd_change (EV_P_ int fd, int flags)
739{ 877{
740 unsigned char reify = anfds [fd].reify; 878 unsigned char reify = anfds [fd].reify;
741 anfds [fd].reify |= flags; 879 anfds [fd].reify |= flags;
742 880
… …
746 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 884 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
747 fdchanges [fdchangecnt - 1] = fd; 885 fdchanges [fdchangecnt - 1] = fd;
748 } 886 }
749} 887}
750 888
751void inline_speed 889/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
890inline_speed void
752fd_kill (EV_P_ int fd) 891fd_kill (EV_P_ int fd)
753{ 892{
754 ev_io *w; 893 ev_io *w;
755 894
756 while ((w = (ev_io *)anfds [fd].head)) 895 while ((w = (ev_io *)anfds [fd].head))
… …
758 ev_io_stop (EV_A_ w); 897 ev_io_stop (EV_A_ w);
759 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);
760 } 899 }
761} 900}
762 901
763int inline_size 902/* check whether the given fd is atcually valid, for error recovery */
903inline_size int
764fd_valid (int fd) 904fd_valid (int fd)
765{ 905{
766#ifdef _WIN32 906#ifdef _WIN32
767 return _get_osfhandle (fd) != -1; 907 return _get_osfhandle (fd) != -1;
768#else 908#else
… …
776{ 916{
777 int fd; 917 int fd;
778 918
779 for (fd = 0; fd < anfdmax; ++fd) 919 for (fd = 0; fd < anfdmax; ++fd)
780 if (anfds [fd].events) 920 if (anfds [fd].events)
781 if (!fd_valid (fd) == -1 && errno == EBADF) 921 if (!fd_valid (fd) && errno == EBADF)
782 fd_kill (EV_A_ fd); 922 fd_kill (EV_A_ fd);
783} 923}
784 924
785/* called on ENOMEM in select/poll to kill some fds and retry */ 925/* called on ENOMEM in select/poll to kill some fds and retry */
786static void noinline 926static void noinline
… …
804 944
805 for (fd = 0; fd < anfdmax; ++fd) 945 for (fd = 0; fd < anfdmax; ++fd)
806 if (anfds [fd].events) 946 if (anfds [fd].events)
807 { 947 {
808 anfds [fd].events = 0; 948 anfds [fd].events = 0;
949 anfds [fd].emask = 0;
809 fd_change (EV_A_ fd, EV_IOFDSET | 1); 950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
810 } 951 }
811} 952}
812 953
813/*****************************************************************************/ 954/*****************************************************************************/
814 955
… …
830#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 971#define HEAP0 (DHEAP - 1) /* index of first element in heap */
831#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 972#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
832#define UPHEAP_DONE(p,k) ((p) == (k)) 973#define UPHEAP_DONE(p,k) ((p) == (k))
833 974
834/* away from the root */ 975/* away from the root */
835void inline_speed 976inline_speed void
836downheap (ANHE *heap, int N, int k) 977downheap (ANHE *heap, int N, int k)
837{ 978{
838 ANHE he = heap [k]; 979 ANHE he = heap [k];
839 ANHE *E = heap + N + HEAP0; 980 ANHE *E = heap + N + HEAP0;
840 981
… …
880#define HEAP0 1 1021#define HEAP0 1
881#define HPARENT(k) ((k) >> 1) 1022#define HPARENT(k) ((k) >> 1)
882#define UPHEAP_DONE(p,k) (!(p)) 1023#define UPHEAP_DONE(p,k) (!(p))
883 1024
884/* away from the root */ 1025/* away from the root */
885void inline_speed 1026inline_speed void
886downheap (ANHE *heap, int N, int k) 1027downheap (ANHE *heap, int N, int k)
887{ 1028{
888 ANHE he = heap [k]; 1029 ANHE he = heap [k];
889 1030
890 for (;;) 1031 for (;;)
… …
910 ev_active (ANHE_w (he)) = k; 1051 ev_active (ANHE_w (he)) = k;
911} 1052}
912#endif 1053#endif
913 1054
914/* towards the root */ 1055/* towards the root */
915void inline_speed 1056inline_speed void
916upheap (ANHE *heap, int k) 1057upheap (ANHE *heap, int k)
917{ 1058{
918 ANHE he = heap [k]; 1059 ANHE he = heap [k];
919 1060
920 for (;;) 1061 for (;;)
… …
931 1072
932 heap [k] = he; 1073 heap [k] = he;
933 ev_active (ANHE_w (he)) = k; 1074 ev_active (ANHE_w (he)) = k;
934} 1075}
935 1076
936void inline_size 1077/* move an element suitably so it is in a correct place */
1078inline_size void
937adjustheap (ANHE *heap, int N, int k) 1079adjustheap (ANHE *heap, int N, int k)
938{ 1080{
939 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]))
940 upheap (heap, k); 1082 upheap (heap, k);
941 else 1083 else
942 downheap (heap, N, k); 1084 downheap (heap, N, k);
943} 1085}
944 1086
945/* 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 */
946void inline_size 1088inline_size void
947reheap (ANHE *heap, int N) 1089reheap (ANHE *heap, int N)
948{ 1090{
949 int i; 1091 int i;
950 1092
951 /* 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 */
… …
954 upheap (heap, i + HEAP0); 1096 upheap (heap, i + HEAP0);
955} 1097}
956 1098
957/*****************************************************************************/ 1099/*****************************************************************************/
958 1100
1101/* associate signal watchers to a signal signal */
959typedef struct 1102typedef struct
960{ 1103{
961 WL head; 1104 WL head;
962 EV_ATOMIC_T gotsig; 1105 EV_ATOMIC_T gotsig;
963} ANSIG; 1106} ANSIG;
… …
965static ANSIG *signals; 1108static ANSIG *signals;
966static int signalmax; 1109static int signalmax;
967 1110
968static EV_ATOMIC_T gotsig; 1111static EV_ATOMIC_T gotsig;
969 1112
970void inline_size
971signals_init (ANSIG *base, int count)
972{
973 while (count--)
974 {
975 base->head = 0;
976 base->gotsig = 0;
977
978 ++base;
979 }
980}
981
982/*****************************************************************************/ 1113/*****************************************************************************/
983 1114
984void inline_speed 1115/* used to prepare libev internal fd's */
1116/* this is not fork-safe */
1117inline_speed void
985fd_intern (int fd) 1118fd_intern (int fd)
986{ 1119{
987#ifdef _WIN32 1120#ifdef _WIN32
988 int arg = 1; 1121 unsigned long arg = 1;
989 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
990#else 1123#else
991 fcntl (fd, F_SETFD, FD_CLOEXEC); 1124 fcntl (fd, F_SETFD, FD_CLOEXEC);
992 fcntl (fd, F_SETFL, O_NONBLOCK); 1125 fcntl (fd, F_SETFL, O_NONBLOCK);
993#endif 1126#endif
994} 1127}
995 1128
996static void noinline 1129static void noinline
997evpipe_init (EV_P) 1130evpipe_init (EV_P)
998{ 1131{
999 if (!ev_is_active (&pipeev)) 1132 if (!ev_is_active (&pipe_w))
1000 { 1133 {
1001#if EV_USE_EVENTFD 1134#if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL)
1002 if ((evfd = eventfd (0, 0)) >= 0) 1137 evfd = eventfd (0, 0);
1138
1139 if (evfd >= 0)
1003 { 1140 {
1004 evpipe [0] = -1; 1141 evpipe [0] = -1;
1005 fd_intern (evfd); 1142 fd_intern (evfd); /* doing it twice doesn't hurt */
1006 ev_io_set (&pipeev, evfd, EV_READ); 1143 ev_io_set (&pipe_w, evfd, EV_READ);
1007 } 1144 }
1008 else 1145 else
1009#endif 1146#endif
1010 { 1147 {
1011 while (pipe (evpipe)) 1148 while (pipe (evpipe))
1012 syserr ("(libev) error creating signal/async pipe"); 1149 ev_syserr ("(libev) error creating signal/async pipe");
1013 1150
1014 fd_intern (evpipe [0]); 1151 fd_intern (evpipe [0]);
1015 fd_intern (evpipe [1]); 1152 fd_intern (evpipe [1]);
1016 ev_io_set (&pipeev, evpipe [0], EV_READ); 1153 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1017 } 1154 }
1018 1155
1019 ev_io_start (EV_A_ &pipeev); 1156 ev_io_start (EV_A_ &pipe_w);
1020 ev_unref (EV_A); /* watcher should not keep loop alive */ 1157 ev_unref (EV_A); /* watcher should not keep loop alive */
1021 } 1158 }
1022} 1159}
1023 1160
1024void inline_size 1161inline_size void
1025evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1162evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1026{ 1163{
1027 if (!*flag) 1164 if (!*flag)
1028 { 1165 {
1029 int old_errno = errno; /* save errno because write might clobber it */ 1166 int old_errno = errno; /* save errno because write might clobber it */
… …
1042 1179
1043 errno = old_errno; 1180 errno = old_errno;
1044 } 1181 }
1045} 1182}
1046 1183
1184/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */
1047static void 1186static void
1048pipecb (EV_P_ ev_io *iow, int revents) 1187pipecb (EV_P_ ev_io *iow, int revents)
1049{ 1188{
1050#if EV_USE_EVENTFD 1189#if EV_USE_EVENTFD
1051 if (evfd >= 0) 1190 if (evfd >= 0)
… …
1107ev_feed_signal_event (EV_P_ int signum) 1246ev_feed_signal_event (EV_P_ int signum)
1108{ 1247{
1109 WL w; 1248 WL w;
1110 1249
1111#if EV_MULTIPLICITY 1250#if EV_MULTIPLICITY
1112 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));
1113#endif 1252#endif
1114 1253
1115 --signum; 1254 --signum;
1116 1255
1117 if (signum < 0 || signum >= signalmax) 1256 if (signum < 0 || signum >= signalmax)
… …
1121 1260
1122 for (w = signals [signum].head; w; w = w->next) 1261 for (w = signals [signum].head; w; w = w->next)
1123 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1124} 1263}
1125 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
1126/*****************************************************************************/ 1285/*****************************************************************************/
1127 1286
1128static WL childs [EV_PID_HASHSIZE]; 1287static WL childs [EV_PID_HASHSIZE];
1129 1288
1130#ifndef _WIN32 1289#ifndef _WIN32
… …
1133 1292
1134#ifndef WIFCONTINUED 1293#ifndef WIFCONTINUED
1135# define WIFCONTINUED(status) 0 1294# define WIFCONTINUED(status) 0
1136#endif 1295#endif
1137 1296
1138void inline_speed 1297/* handle a single child status event */
1298inline_speed void
1139child_reap (EV_P_ int chain, int pid, int status) 1299child_reap (EV_P_ int chain, int pid, int status)
1140{ 1300{
1141 ev_child *w; 1301 ev_child *w;
1142 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1302 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1143 1303
… …
1156 1316
1157#ifndef WCONTINUED 1317#ifndef WCONTINUED
1158# define WCONTINUED 0 1318# define WCONTINUED 0
1159#endif 1319#endif
1160 1320
1321/* called on sigchld etc., calls waitpid */
1161static void 1322static void
1162childcb (EV_P_ ev_signal *sw, int revents) 1323childcb (EV_P_ ev_signal *sw, int revents)
1163{ 1324{
1164 int pid, status; 1325 int pid, status;
1165 1326
… …
1246 /* kqueue is borked on everything but netbsd apparently */ 1407 /* kqueue is borked on everything but netbsd apparently */
1247 /* 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 */
1248 flags &= ~EVBACKEND_KQUEUE; 1409 flags &= ~EVBACKEND_KQUEUE;
1249#endif 1410#endif
1250#ifdef __APPLE__ 1411#ifdef __APPLE__
1251 // flags &= ~EVBACKEND_KQUEUE; for documentation 1412 /* only select works correctly on that "unix-certified" platform */
1252 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 */
1253#endif 1415#endif
1254 1416
1255 return flags; 1417 return flags;
1256} 1418}
1257 1419
… …
1271ev_backend (EV_P) 1433ev_backend (EV_P)
1272{ 1434{
1273 return backend; 1435 return backend;
1274} 1436}
1275 1437
1438#if EV_MINIMAL < 2
1276unsigned int 1439unsigned int
1277ev_loop_count (EV_P) 1440ev_loop_count (EV_P)
1278{ 1441{
1279 return loop_count; 1442 return loop_count;
1280} 1443}
1281 1444
1445unsigned int
1446ev_loop_depth (EV_P)
1447{
1448 return loop_depth;
1449}
1450
1282void 1451void
1283ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1452ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1284{ 1453{
1285 io_blocktime = interval; 1454 io_blocktime = interval;
1286} 1455}
… …
1289ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1458ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1290{ 1459{
1291 timeout_blocktime = interval; 1460 timeout_blocktime = interval;
1292} 1461}
1293 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 */
1294static void noinline 1488static void noinline
1295loop_init (EV_P_ unsigned int flags) 1489loop_init (EV_P_ unsigned int flags)
1296{ 1490{
1297 if (!backend) 1491 if (!backend)
1298 { 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
1299#if EV_USE_MONOTONIC 1503#if EV_USE_MONOTONIC
1504 if (!have_monotonic)
1300 { 1505 {
1301 struct timespec ts; 1506 struct timespec ts;
1507
1302 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1303 have_monotonic = 1; 1509 have_monotonic = 1;
1304 } 1510 }
1305#endif 1511#endif
1306 1512
1307 ev_rt_now = ev_time (); 1513 ev_rt_now = ev_time ();
1308 mn_now = get_clock (); 1514 mn_now = get_clock ();
1309 now_floor = mn_now; 1515 now_floor = mn_now;
1310 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
1311 1520
1312 io_blocktime = 0.; 1521 io_blocktime = 0.;
1313 timeout_blocktime = 0.; 1522 timeout_blocktime = 0.;
1314 backend = 0; 1523 backend = 0;
1315 backend_fd = -1; 1524 backend_fd = -1;
1316 gotasync = 0; 1525 gotasync = 0;
1317#if EV_USE_INOTIFY 1526#if EV_USE_INOTIFY
1318 fs_fd = -2; 1527 fs_fd = -2;
1319#endif 1528#endif
1529#if EV_USE_SIGNALFD
1530 sigfd = -2;
1531#endif
1320 1532
1321 /* pid check not overridable via env */ 1533 /* pid check not overridable via env */
1322#ifndef _WIN32 1534#ifndef _WIN32
1323 if (flags & EVFLAG_FORKCHECK) 1535 if (flags & EVFLAG_FORKCHECK)
1324 curpid = getpid (); 1536 curpid = getpid ();
… …
1346#endif 1558#endif
1347#if EV_USE_SELECT 1559#if EV_USE_SELECT
1348 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1349#endif 1561#endif
1350 1562
1563 ev_prepare_init (&pending_w, pendingcb);
1564
1351 ev_init (&pipeev, pipecb); 1565 ev_init (&pipe_w, pipecb);
1352 ev_set_priority (&pipeev, EV_MAXPRI); 1566 ev_set_priority (&pipe_w, EV_MAXPRI);
1353 } 1567 }
1354} 1568}
1355 1569
1570/* free up a loop structure */
1356static void noinline 1571static void noinline
1357loop_destroy (EV_P) 1572loop_destroy (EV_P)
1358{ 1573{
1359 int i; 1574 int i;
1360 1575
1361 if (ev_is_active (&pipeev)) 1576 if (ev_is_active (&pipe_w))
1362 { 1577 {
1363 ev_ref (EV_A); /* signal watcher */ 1578 /*ev_ref (EV_A);*/
1364 ev_io_stop (EV_A_ &pipeev); 1579 /*ev_io_stop (EV_A_ &pipe_w);*/
1365 1580
1366#if EV_USE_EVENTFD 1581#if EV_USE_EVENTFD
1367 if (evfd >= 0) 1582 if (evfd >= 0)
1368 close (evfd); 1583 close (evfd);
1369#endif 1584#endif
… …
1373 close (evpipe [0]); 1588 close (evpipe [0]);
1374 close (evpipe [1]); 1589 close (evpipe [1]);
1375 } 1590 }
1376 } 1591 }
1377 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
1378#if EV_USE_INOTIFY 1603#if EV_USE_INOTIFY
1379 if (fs_fd >= 0) 1604 if (fs_fd >= 0)
1380 close (fs_fd); 1605 close (fs_fd);
1381#endif 1606#endif
1382 1607
… …
1408 } 1633 }
1409 1634
1410 ev_free (anfds); anfdmax = 0; 1635 ev_free (anfds); anfdmax = 0;
1411 1636
1412 /* 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);
1413 array_free (fdchange, EMPTY); 1639 array_free (fdchange, EMPTY);
1414 array_free (timer, EMPTY); 1640 array_free (timer, EMPTY);
1415#if EV_PERIODIC_ENABLE 1641#if EV_PERIODIC_ENABLE
1416 array_free (periodic, EMPTY); 1642 array_free (periodic, EMPTY);
1417#endif 1643#endif
… …
1426 1652
1427 backend = 0; 1653 backend = 0;
1428} 1654}
1429 1655
1430#if EV_USE_INOTIFY 1656#if EV_USE_INOTIFY
1431void inline_size infy_fork (EV_P); 1657inline_size void infy_fork (EV_P);
1432#endif 1658#endif
1433 1659
1434void inline_size 1660inline_size void
1435loop_fork (EV_P) 1661loop_fork (EV_P)
1436{ 1662{
1437#if EV_USE_PORT 1663#if EV_USE_PORT
1438 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1664 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1439#endif 1665#endif
… …
1445#endif 1671#endif
1446#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1447 infy_fork (EV_A); 1673 infy_fork (EV_A);
1448#endif 1674#endif
1449 1675
1450 if (ev_is_active (&pipeev)) 1676 if (ev_is_active (&pipe_w))
1451 { 1677 {
1452 /* this "locks" the handlers against writing to the pipe */ 1678 /* this "locks" the handlers against writing to the pipe */
1453 /* while we modify the fd vars */ 1679 /* while we modify the fd vars */
1454 gotsig = 1; 1680 gotsig = 1;
1455#if EV_ASYNC_ENABLE 1681#if EV_ASYNC_ENABLE
1456 gotasync = 1; 1682 gotasync = 1;
1457#endif 1683#endif
1458 1684
1459 ev_ref (EV_A); 1685 ev_ref (EV_A);
1460 ev_io_stop (EV_A_ &pipeev); 1686 ev_io_stop (EV_A_ &pipe_w);
1461 1687
1462#if EV_USE_EVENTFD 1688#if EV_USE_EVENTFD
1463 if (evfd >= 0) 1689 if (evfd >= 0)
1464 close (evfd); 1690 close (evfd);
1465#endif 1691#endif
… …
1470 close (evpipe [1]); 1696 close (evpipe [1]);
1471 } 1697 }
1472 1698
1473 evpipe_init (EV_A); 1699 evpipe_init (EV_A);
1474 /* now iterate over everything, in case we missed something */ 1700 /* now iterate over everything, in case we missed something */
1475 pipecb (EV_A_ &pipeev, EV_READ); 1701 pipecb (EV_A_ &pipe_w, EV_READ);
1476 } 1702 }
1477 1703
1478 postfork = 0; 1704 postfork = 0;
1479} 1705}
1480 1706
… …
1484ev_loop_new (unsigned int flags) 1710ev_loop_new (unsigned int flags)
1485{ 1711{
1486 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));
1487 1713
1488 memset (loop, 0, sizeof (struct ev_loop)); 1714 memset (loop, 0, sizeof (struct ev_loop));
1489
1490 loop_init (EV_A_ flags); 1715 loop_init (EV_A_ flags);
1491 1716
1492 if (ev_backend (EV_A)) 1717 if (ev_backend (EV_A))
1493 return loop; 1718 return loop;
1494 1719
… …
1505void 1730void
1506ev_loop_fork (EV_P) 1731ev_loop_fork (EV_P)
1507{ 1732{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1733 postfork = 1; /* must be in line with ev_default_fork */
1509} 1734}
1735#endif /* multiplicity */
1510 1736
1511#if EV_VERIFY 1737#if EV_VERIFY
1512void noinline 1738static void noinline
1513verify_watcher (EV_P_ W w) 1739verify_watcher (EV_P_ W w)
1514{ 1740{
1515 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1741 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516 1742
1517 if (w->pending) 1743 if (w->pending)
1518 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));
1519} 1745}
1520 1746
1521static void noinline 1747static void noinline
1522verify_heap (EV_P_ ANHE *heap, int N) 1748verify_heap (EV_P_ ANHE *heap, int N)
1523{ 1749{
1524 int i; 1750 int i;
1525 1751
1526 for (i = HEAP0; i < N + HEAP0; ++i) 1752 for (i = HEAP0; i < N + HEAP0; ++i)
1527 { 1753 {
1528 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));
1529 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])));
1530 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]))));
1531 1757
1532 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1758 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1533 } 1759 }
1534} 1760}
1535 1761
1536static void noinline 1762static void noinline
1537array_verify (EV_P_ W *ws, int cnt) 1763array_verify (EV_P_ W *ws, int cnt)
1538{ 1764{
1539 while (cnt--) 1765 while (cnt--)
1540 { 1766 {
1541 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1767 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1542 verify_watcher (EV_A_ ws [cnt]); 1768 verify_watcher (EV_A_ ws [cnt]);
1543 } 1769 }
1544} 1770}
1545#endif 1771#endif
1546 1772
1773#if EV_MINIMAL < 2
1547void 1774void
1548ev_loop_verify (EV_P) 1775ev_loop_verify (EV_P)
1549{ 1776{
1550#if EV_VERIFY 1777#if EV_VERIFY
1551 int i; 1778 int i;
… …
1553 1780
1554 assert (activecnt >= -1); 1781 assert (activecnt >= -1);
1555 1782
1556 assert (fdchangemax >= fdchangecnt); 1783 assert (fdchangemax >= fdchangecnt);
1557 for (i = 0; i < fdchangecnt; ++i) 1784 for (i = 0; i < fdchangecnt; ++i)
1558 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1785 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1559 1786
1560 assert (anfdmax >= 0); 1787 assert (anfdmax >= 0);
1561 for (i = 0; i < anfdmax; ++i) 1788 for (i = 0; i < anfdmax; ++i)
1562 for (w = anfds [i].head; w; w = w->next) 1789 for (w = anfds [i].head; w; w = w->next)
1563 { 1790 {
1564 verify_watcher (EV_A_ (W)w); 1791 verify_watcher (EV_A_ (W)w);
1565 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1792 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1566 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));
1567 } 1794 }
1568 1795
1569 assert (timermax >= timercnt); 1796 assert (timermax >= timercnt);
1570 verify_heap (EV_A_ timers, timercnt); 1797 verify_heap (EV_A_ timers, timercnt);
1571 1798
… …
1604 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)
1605 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1606# endif 1833# endif
1607#endif 1834#endif
1608} 1835}
1609 1836#endif
1610#endif /* multiplicity */
1611 1837
1612#if EV_MULTIPLICITY 1838#if EV_MULTIPLICITY
1613struct ev_loop * 1839struct ev_loop *
1614ev_default_loop_init (unsigned int flags) 1840ev_default_loop_init (unsigned int flags)
1615#else 1841#else
… …
1648{ 1874{
1649#if EV_MULTIPLICITY 1875#if EV_MULTIPLICITY
1650 struct ev_loop *loop = ev_default_loop_ptr; 1876 struct ev_loop *loop = ev_default_loop_ptr;
1651#endif 1877#endif
1652 1878
1879 ev_default_loop_ptr = 0;
1880
1653#ifndef _WIN32 1881#ifndef _WIN32
1654 ev_ref (EV_A); /* child watcher */ 1882 ev_ref (EV_A); /* child watcher */
1655 ev_signal_stop (EV_A_ &childev); 1883 ev_signal_stop (EV_A_ &childev);
1656#endif 1884#endif
1657 1885
… …
1663{ 1891{
1664#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1665 struct ev_loop *loop = ev_default_loop_ptr; 1893 struct ev_loop *loop = ev_default_loop_ptr;
1666#endif 1894#endif
1667 1895
1668 if (backend)
1669 postfork = 1; /* must be in line with ev_loop_fork */ 1896 postfork = 1; /* must be in line with ev_loop_fork */
1670} 1897}
1671 1898
1672/*****************************************************************************/ 1899/*****************************************************************************/
1673 1900
1674void 1901void
1675ev_invoke (EV_P_ void *w, int revents) 1902ev_invoke (EV_P_ void *w, int revents)
1676{ 1903{
1677 EV_CB_INVOKE ((W)w, revents); 1904 EV_CB_INVOKE ((W)w, revents);
1678} 1905}
1679 1906
1680void inline_speed 1907unsigned int
1681call_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)
1682{ 1921{
1683 int pri; 1922 int pri;
1684 1923
1685 for (pri = NUMPRI; pri--; ) 1924 for (pri = NUMPRI; pri--; )
1686 while (pendingcnt [pri]) 1925 while (pendingcnt [pri])
1687 { 1926 {
1688 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1927 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1689 1928
1690 if (expect_true (p->w))
1691 {
1692 /*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 */
1693 1931
1694 p->w->pending = 0; 1932 p->w->pending = 0;
1695 EV_CB_INVOKE (p->w, p->events); 1933 EV_CB_INVOKE (p->w, p->events);
1696 EV_FREQUENT_CHECK; 1934 EV_FREQUENT_CHECK;
1697 }
1698 } 1935 }
1699} 1936}
1700 1937
1701#if EV_IDLE_ENABLE 1938#if EV_IDLE_ENABLE
1702void inline_size 1939/* make idle watchers pending. this handles the "call-idle */
1940/* only when higher priorities are idle" logic */
1941inline_size void
1703idle_reify (EV_P) 1942idle_reify (EV_P)
1704{ 1943{
1705 if (expect_false (idleall)) 1944 if (expect_false (idleall))
1706 { 1945 {
1707 int pri; 1946 int pri;
… …
1719 } 1958 }
1720 } 1959 }
1721} 1960}
1722#endif 1961#endif
1723 1962
1724void inline_size 1963/* make timers pending */
1964inline_size void
1725timers_reify (EV_P) 1965timers_reify (EV_P)
1726{ 1966{
1727 EV_FREQUENT_CHECK; 1967 EV_FREQUENT_CHECK;
1728 1968
1729 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1969 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1730 { 1970 {
1731 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1971 do
1732
1733 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1734
1735 /* first reschedule or stop timer */
1736 if (w->repeat)
1737 { 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 {
1738 ev_at (w) += w->repeat; 1980 ev_at (w) += w->repeat;
1739 if (ev_at (w) < mn_now) 1981 if (ev_at (w) < mn_now)
1740 ev_at (w) = mn_now; 1982 ev_at (w) = mn_now;
1741 1983
1742 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.));
1743 1985
1744 ANHE_at_cache (timers [HEAP0]); 1986 ANHE_at_cache (timers [HEAP0]);
1745 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);
1746 } 1994 }
1747 else 1995 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1748 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1749 1996
1750 EV_FREQUENT_CHECK;
1751 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1997 feed_reverse_done (EV_A_ EV_TIMEOUT);
1752 } 1998 }
1753} 1999}
1754 2000
1755#if EV_PERIODIC_ENABLE 2001#if EV_PERIODIC_ENABLE
1756void inline_size 2002/* make periodics pending */
2003inline_size void
1757periodics_reify (EV_P) 2004periodics_reify (EV_P)
1758{ 2005{
1759 EV_FREQUENT_CHECK; 2006 EV_FREQUENT_CHECK;
1760 2007
1761 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2008 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1762 { 2009 {
1763 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2010 int feed_count = 0;
1764 2011
1765 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2012 do
1766
1767 /* first reschedule or stop timer */
1768 if (w->reschedule_cb)
1769 { 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 {
1770 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2021 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1771 2022
1772 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));
1773 2024
1774 ANHE_at_cache (periodics [HEAP0]); 2025 ANHE_at_cache (periodics [HEAP0]);
1775 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);
1776 } 2052 }
1777 else if (w->interval) 2053 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1778 {
1779 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1780 /* if next trigger time is not sufficiently in the future, put it there */
1781 /* this might happen because of floating point inexactness */
1782 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1783 {
1784 ev_at (w) += w->interval;
1785 2054
1786 /* if interval is unreasonably low we might still have a time in the past */
1787 /* so correct this. this will make the periodic very inexact, but the user */
1788 /* has effectively asked to get triggered more often than possible */
1789 if (ev_at (w) < ev_rt_now)
1790 ev_at (w) = ev_rt_now;
1791 }
1792
1793 ANHE_at_cache (periodics [HEAP0]);
1794 downheap (periodics, periodiccnt, HEAP0);
1795 }
1796 else
1797 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1798
1799 EV_FREQUENT_CHECK;
1800 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2055 feed_reverse_done (EV_A_ EV_PERIODIC);
1801 } 2056 }
1802} 2057}
1803 2058
2059/* simply recalculate all periodics */
2060/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1804static void noinline 2061static void noinline
1805periodics_reschedule (EV_P) 2062periodics_reschedule (EV_P)
1806{ 2063{
1807 int i; 2064 int i;
1808 2065
… …
1821 2078
1822 reheap (periodics, periodiccnt); 2079 reheap (periodics, periodiccnt);
1823} 2080}
1824#endif 2081#endif
1825 2082
1826void 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
1827time_update (EV_P_ ev_tstamp max_block) 2100time_update (EV_P_ ev_tstamp max_block)
1828{ 2101{
1829 int i;
1830
1831#if EV_USE_MONOTONIC 2102#if EV_USE_MONOTONIC
1832 if (expect_true (have_monotonic)) 2103 if (expect_true (have_monotonic))
1833 { 2104 {
2105 int i;
1834 ev_tstamp odiff = rtmn_diff; 2106 ev_tstamp odiff = rtmn_diff;
1835 2107
1836 mn_now = get_clock (); 2108 mn_now = get_clock ();
1837 2109
1838 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2110 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1864 ev_rt_now = ev_time (); 2136 ev_rt_now = ev_time ();
1865 mn_now = get_clock (); 2137 mn_now = get_clock ();
1866 now_floor = mn_now; 2138 now_floor = mn_now;
1867 } 2139 }
1868 2140
2141 /* no timer adjustment, as the monotonic clock doesn't jump */
2142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1869# if EV_PERIODIC_ENABLE 2143# if EV_PERIODIC_ENABLE
1870 periodics_reschedule (EV_A); 2144 periodics_reschedule (EV_A);
1871# endif 2145# endif
1872 /* no timer adjustment, as the monotonic clock doesn't jump */
1873 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1874 } 2146 }
1875 else 2147 else
1876#endif 2148#endif
1877 { 2149 {
1878 ev_rt_now = ev_time (); 2150 ev_rt_now = ev_time ();
1879 2151
1880 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))
1881 { 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);
1882#if EV_PERIODIC_ENABLE 2156#if EV_PERIODIC_ENABLE
1883 periodics_reschedule (EV_A); 2157 periodics_reschedule (EV_A);
1884#endif 2158#endif
1885 /* adjust timers. this is easy, as the offset is the same for all of them */
1886 for (i = 0; i < timercnt; ++i)
1887 {
1888 ANHE *he = timers + i + HEAP0;
1889 ANHE_w (*he)->at += ev_rt_now - mn_now;
1890 ANHE_at_cache (*he);
1891 }
1892 } 2159 }
1893 2160
1894 mn_now = ev_rt_now; 2161 mn_now = ev_rt_now;
1895 } 2162 }
1896} 2163}
1897 2164
1898void 2165void
1899ev_ref (EV_P)
1900{
1901 ++activecnt;
1902}
1903
1904void
1905ev_unref (EV_P)
1906{
1907 --activecnt;
1908}
1909
1910static int loop_done;
1911
1912void
1913ev_loop (EV_P_ int flags) 2166ev_loop (EV_P_ int flags)
1914{ 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
1915 loop_done = EVUNLOOP_CANCEL; 2174 loop_done = EVUNLOOP_CANCEL;
1916 2175
1917 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 */
1918 2177
1919 do 2178 do
1920 { 2179 {
1921#if EV_VERIFY >= 2 2180#if EV_VERIFY >= 2
1922 ev_loop_verify (EV_A); 2181 ev_loop_verify (EV_A);
… …
1935 /* we might have forked, so queue fork handlers */ 2194 /* we might have forked, so queue fork handlers */
1936 if (expect_false (postfork)) 2195 if (expect_false (postfork))
1937 if (forkcnt) 2196 if (forkcnt)
1938 { 2197 {
1939 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1940 call_pending (EV_A); 2199 EV_INVOKE_PENDING;
1941 } 2200 }
1942#endif 2201#endif
1943 2202
1944 /* queue prepare watchers (and execute them) */ 2203 /* queue prepare watchers (and execute them) */
1945 if (expect_false (preparecnt)) 2204 if (expect_false (preparecnt))
1946 { 2205 {
1947 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1948 call_pending (EV_A); 2207 EV_INVOKE_PENDING;
1949 } 2208 }
1950 2209
1951 if (expect_false (!activecnt)) 2210 if (expect_false (loop_done))
1952 break; 2211 break;
1953 2212
1954 /* we might have forked, so reify kernel state if necessary */ 2213 /* we might have forked, so reify kernel state if necessary */
1955 if (expect_false (postfork)) 2214 if (expect_false (postfork))
1956 loop_fork (EV_A); 2215 loop_fork (EV_A);
… …
1963 ev_tstamp waittime = 0.; 2222 ev_tstamp waittime = 0.;
1964 ev_tstamp sleeptime = 0.; 2223 ev_tstamp sleeptime = 0.;
1965 2224
1966 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2225 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1967 { 2226 {
2227 /* remember old timestamp for io_blocktime calculation */
2228 ev_tstamp prev_mn_now = mn_now;
2229
1968 /* update time to cancel out callback processing overhead */ 2230 /* update time to cancel out callback processing overhead */
1969 time_update (EV_A_ 1e100); 2231 time_update (EV_A_ 1e100);
1970 2232
1971 waittime = MAX_BLOCKTIME; 2233 waittime = MAX_BLOCKTIME;
1972 2234
… …
1982 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;
1983 if (waittime > to) waittime = to; 2245 if (waittime > to) waittime = to;
1984 } 2246 }
1985#endif 2247#endif
1986 2248
2249 /* don't let timeouts decrease the waittime below timeout_blocktime */
1987 if (expect_false (waittime < timeout_blocktime)) 2250 if (expect_false (waittime < timeout_blocktime))
1988 waittime = timeout_blocktime; 2251 waittime = timeout_blocktime;
1989 2252
1990 sleeptime = waittime - backend_fudge; 2253 /* extra check because io_blocktime is commonly 0 */
1991
1992 if (expect_true (sleeptime > io_blocktime)) 2254 if (expect_false (io_blocktime))
1993 sleeptime = io_blocktime;
1994
1995 if (sleeptime)
1996 { 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 {
1997 ev_sleep (sleeptime); 2263 ev_sleep (sleeptime);
1998 waittime -= sleeptime; 2264 waittime -= sleeptime;
2265 }
1999 } 2266 }
2000 } 2267 }
2001 2268
2269#if EV_MINIMAL < 2
2002 ++loop_count; 2270 ++loop_count;
2271#endif
2272 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2003 backend_poll (EV_A_ waittime); 2273 backend_poll (EV_A_ waittime);
2274 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2004 2275
2005 /* update ev_rt_now, do magic */ 2276 /* update ev_rt_now, do magic */
2006 time_update (EV_A_ waittime + sleeptime); 2277 time_update (EV_A_ waittime + sleeptime);
2007 } 2278 }
2008 2279
… …
2019 2290
2020 /* queue check watchers, to be executed first */ 2291 /* queue check watchers, to be executed first */
2021 if (expect_false (checkcnt)) 2292 if (expect_false (checkcnt))
2022 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2023 2294
2024 call_pending (EV_A); 2295 EV_INVOKE_PENDING;
2025 } 2296 }
2026 while (expect_true ( 2297 while (expect_true (
2027 activecnt 2298 activecnt
2028 && !loop_done 2299 && !loop_done
2029 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2300 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2030 )); 2301 ));
2031 2302
2032 if (loop_done == EVUNLOOP_ONE) 2303 if (loop_done == EVUNLOOP_ONE)
2033 loop_done = EVUNLOOP_CANCEL; 2304 loop_done = EVUNLOOP_CANCEL;
2305
2306#if EV_MINIMAL < 2
2307 --loop_depth;
2308#endif
2034} 2309}
2035 2310
2036void 2311void
2037ev_unloop (EV_P_ int how) 2312ev_unloop (EV_P_ int how)
2038{ 2313{
2039 loop_done = how; 2314 loop_done = how;
2040} 2315}
2041 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
2042/*****************************************************************************/ 2354/*****************************************************************************/
2355/* singly-linked list management, used when the expected list length is short */
2043 2356
2044void inline_size 2357inline_size void
2045wlist_add (WL *head, WL elem) 2358wlist_add (WL *head, WL elem)
2046{ 2359{
2047 elem->next = *head; 2360 elem->next = *head;
2048 *head = elem; 2361 *head = elem;
2049} 2362}
2050 2363
2051void inline_size 2364inline_size void
2052wlist_del (WL *head, WL elem) 2365wlist_del (WL *head, WL elem)
2053{ 2366{
2054 while (*head) 2367 while (*head)
2055 { 2368 {
2056 if (*head == elem) 2369 if (*head == elem)
… …
2061 2374
2062 head = &(*head)->next; 2375 head = &(*head)->next;
2063 } 2376 }
2064} 2377}
2065 2378
2066void inline_speed 2379/* internal, faster, version of ev_clear_pending */
2380inline_speed void
2067clear_pending (EV_P_ W w) 2381clear_pending (EV_P_ W w)
2068{ 2382{
2069 if (w->pending) 2383 if (w->pending)
2070 { 2384 {
2071 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2385 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2072 w->pending = 0; 2386 w->pending = 0;
2073 } 2387 }
2074} 2388}
2075 2389
2076int 2390int
… …
2080 int pending = w_->pending; 2394 int pending = w_->pending;
2081 2395
2082 if (expect_true (pending)) 2396 if (expect_true (pending))
2083 { 2397 {
2084 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2398 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2399 p->w = (W)&pending_w;
2085 w_->pending = 0; 2400 w_->pending = 0;
2086 p->w = 0;
2087 return p->events; 2401 return p->events;
2088 } 2402 }
2089 else 2403 else
2090 return 0; 2404 return 0;
2091} 2405}
2092 2406
2093void inline_size 2407inline_size void
2094pri_adjust (EV_P_ W w) 2408pri_adjust (EV_P_ W w)
2095{ 2409{
2096 int pri = w->priority; 2410 int pri = ev_priority (w);
2097 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2411 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2098 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2412 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2099 w->priority = pri; 2413 ev_set_priority (w, pri);
2100} 2414}
2101 2415
2102void inline_speed 2416inline_speed void
2103ev_start (EV_P_ W w, int active) 2417ev_start (EV_P_ W w, int active)
2104{ 2418{
2105 pri_adjust (EV_A_ w); 2419 pri_adjust (EV_A_ w);
2106 w->active = active; 2420 w->active = active;
2107 ev_ref (EV_A); 2421 ev_ref (EV_A);
2108} 2422}
2109 2423
2110void inline_size 2424inline_size void
2111ev_stop (EV_P_ W w) 2425ev_stop (EV_P_ W w)
2112{ 2426{
2113 ev_unref (EV_A); 2427 ev_unref (EV_A);
2114 w->active = 0; 2428 w->active = 0;
2115} 2429}
… …
2122 int fd = w->fd; 2436 int fd = w->fd;
2123 2437
2124 if (expect_false (ev_is_active (w))) 2438 if (expect_false (ev_is_active (w)))
2125 return; 2439 return;
2126 2440
2127 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))));
2128 2443
2129 EV_FREQUENT_CHECK; 2444 EV_FREQUENT_CHECK;
2130 2445
2131 ev_start (EV_A_ (W)w, 1); 2446 ev_start (EV_A_ (W)w, 1);
2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133 wlist_add (&anfds[fd].head, (WL)w); 2448 wlist_add (&anfds[fd].head, (WL)w);
2134 2449
2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2450 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2136 w->events &= ~EV_IOFDSET; 2451 w->events &= ~EV__IOFDSET;
2137 2452
2138 EV_FREQUENT_CHECK; 2453 EV_FREQUENT_CHECK;
2139} 2454}
2140 2455
2141void noinline 2456void noinline
… …
2143{ 2458{
2144 clear_pending (EV_A_ (W)w); 2459 clear_pending (EV_A_ (W)w);
2145 if (expect_false (!ev_is_active (w))) 2460 if (expect_false (!ev_is_active (w)))
2146 return; 2461 return;
2147 2462
2148 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));
2149 2464
2150 EV_FREQUENT_CHECK; 2465 EV_FREQUENT_CHECK;
2151 2466
2152 wlist_del (&anfds[w->fd].head, (WL)w); 2467 wlist_del (&anfds[w->fd].head, (WL)w);
2153 ev_stop (EV_A_ (W)w); 2468 ev_stop (EV_A_ (W)w);
… …
2163 if (expect_false (ev_is_active (w))) 2478 if (expect_false (ev_is_active (w)))
2164 return; 2479 return;
2165 2480
2166 ev_at (w) += mn_now; 2481 ev_at (w) += mn_now;
2167 2482
2168 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.));
2169 2484
2170 EV_FREQUENT_CHECK; 2485 EV_FREQUENT_CHECK;
2171 2486
2172 ++timercnt; 2487 ++timercnt;
2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2488 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2176 ANHE_at_cache (timers [ev_active (w)]); 2491 ANHE_at_cache (timers [ev_active (w)]);
2177 upheap (timers, ev_active (w)); 2492 upheap (timers, ev_active (w));
2178 2493
2179 EV_FREQUENT_CHECK; 2494 EV_FREQUENT_CHECK;
2180 2495
2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2496 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2182} 2497}
2183 2498
2184void noinline 2499void noinline
2185ev_timer_stop (EV_P_ ev_timer *w) 2500ev_timer_stop (EV_P_ ev_timer *w)
2186{ 2501{
… …
2191 EV_FREQUENT_CHECK; 2506 EV_FREQUENT_CHECK;
2192 2507
2193 { 2508 {
2194 int active = ev_active (w); 2509 int active = ev_active (w);
2195 2510
2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2511 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2197 2512
2198 --timercnt; 2513 --timercnt;
2199 2514
2200 if (expect_true (active < timercnt + HEAP0)) 2515 if (expect_true (active < timercnt + HEAP0))
2201 { 2516 {
… …
2234 } 2549 }
2235 2550
2236 EV_FREQUENT_CHECK; 2551 EV_FREQUENT_CHECK;
2237} 2552}
2238 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
2239#if EV_PERIODIC_ENABLE 2560#if EV_PERIODIC_ENABLE
2240void noinline 2561void noinline
2241ev_periodic_start (EV_P_ ev_periodic *w) 2562ev_periodic_start (EV_P_ ev_periodic *w)
2242{ 2563{
2243 if (expect_false (ev_is_active (w))) 2564 if (expect_false (ev_is_active (w)))
… …
2245 2566
2246 if (w->reschedule_cb) 2567 if (w->reschedule_cb)
2247 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2568 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2248 else if (w->interval) 2569 else if (w->interval)
2249 { 2570 {
2250 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.));
2251 /* 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 */
2252 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;
2253 } 2574 }
2254 else 2575 else
2255 ev_at (w) = w->offset; 2576 ev_at (w) = w->offset;
… …
2263 ANHE_at_cache (periodics [ev_active (w)]); 2584 ANHE_at_cache (periodics [ev_active (w)]);
2264 upheap (periodics, ev_active (w)); 2585 upheap (periodics, ev_active (w));
2265 2586
2266 EV_FREQUENT_CHECK; 2587 EV_FREQUENT_CHECK;
2267 2588
2268 /*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));*/
2269} 2590}
2270 2591
2271void noinline 2592void noinline
2272ev_periodic_stop (EV_P_ ev_periodic *w) 2593ev_periodic_stop (EV_P_ ev_periodic *w)
2273{ 2594{
… …
2278 EV_FREQUENT_CHECK; 2599 EV_FREQUENT_CHECK;
2279 2600
2280 { 2601 {
2281 int active = ev_active (w); 2602 int active = ev_active (w);
2282 2603
2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2604 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2284 2605
2285 --periodiccnt; 2606 --periodiccnt;
2286 2607
2287 if (expect_true (active < periodiccnt + HEAP0)) 2608 if (expect_true (active < periodiccnt + HEAP0))
2288 { 2609 {
… …
2311 2632
2312void noinline 2633void noinline
2313ev_signal_start (EV_P_ ev_signal *w) 2634ev_signal_start (EV_P_ ev_signal *w)
2314{ 2635{
2315#if EV_MULTIPLICITY 2636#if EV_MULTIPLICITY
2316 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));
2317#endif 2638#endif
2318 if (expect_false (ev_is_active (w))) 2639 if (expect_false (ev_is_active (w)))
2319 return; 2640 return;
2320 2641
2321 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));
2322 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
2323 evpipe_init (EV_A); 2676 evpipe_init (EV_A);
2324
2325 EV_FREQUENT_CHECK;
2326 2677
2327 { 2678 {
2328#ifndef _WIN32 2679#ifndef _WIN32
2329 sigset_t full, prev; 2680 sigset_t full, prev;
2330 sigfillset (&full); 2681 sigfillset (&full);
2331 sigprocmask (SIG_SETMASK, &full, &prev); 2682 sigprocmask (SIG_SETMASK, &full, &prev);
2332#endif 2683#endif
2333 2684
2334 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2335 2686
2336#ifndef _WIN32 2687#ifndef _WIN32
2688 if (sigfd < 0)/*TODO*/
2689 sigdelset (&prev, w->signum);
2337 sigprocmask (SIG_SETMASK, &prev, 0); 2690 sigprocmask (SIG_SETMASK, &prev, 0);
2338#endif 2691#endif
2339 } 2692 }
2340 2693
2341 ev_start (EV_A_ (W)w, 1); 2694 ev_start (EV_A_ (W)w, 1);
… …
2344 if (!((WL)w)->next) 2697 if (!((WL)w)->next)
2345 { 2698 {
2346#if _WIN32 2699#if _WIN32
2347 signal (w->signum, ev_sighandler); 2700 signal (w->signum, ev_sighandler);
2348#else 2701#else
2702 if (sigfd < 0) /*TODO*/
2703 {
2349 struct sigaction sa; 2704 struct sigaction sa = { };
2350 sa.sa_handler = ev_sighandler; 2705 sa.sa_handler = ev_sighandler;
2351 sigfillset (&sa.sa_mask); 2706 sigfillset (&sa.sa_mask);
2352 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2707 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2353 sigaction (w->signum, &sa, 0); 2708 sigaction (w->signum, &sa, 0);
2709 }
2354#endif 2710#endif
2355 } 2711 }
2356 2712
2357 EV_FREQUENT_CHECK; 2713 EV_FREQUENT_CHECK;
2358} 2714}
… …
2368 2724
2369 wlist_del (&signals [w->signum - 1].head, (WL)w); 2725 wlist_del (&signals [w->signum - 1].head, (WL)w);
2370 ev_stop (EV_A_ (W)w); 2726 ev_stop (EV_A_ (W)w);
2371 2727
2372 if (!signals [w->signum - 1].head) 2728 if (!signals [w->signum - 1].head)
2729#if EV_USE_SIGNALFD
2730 if (sigfd >= 0)
2731 {
2732 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2733 sigdelset (&sigfd_set, w->signum);
2734 signalfd (sigfd, &sigfd_set, 0);
2735 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2736 /*TODO: maybe unblock signal? */
2737 }
2738 else
2739#endif
2373 signal (w->signum, SIG_DFL); 2740 signal (w->signum, SIG_DFL);
2374 2741
2375 EV_FREQUENT_CHECK; 2742 EV_FREQUENT_CHECK;
2376} 2743}
2377 2744
2378void 2745void
2379ev_child_start (EV_P_ ev_child *w) 2746ev_child_start (EV_P_ ev_child *w)
2380{ 2747{
2381#if EV_MULTIPLICITY 2748#if EV_MULTIPLICITY
2382 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2749 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2383#endif 2750#endif
2384 if (expect_false (ev_is_active (w))) 2751 if (expect_false (ev_is_active (w)))
2385 return; 2752 return;
2386 2753
2387 EV_FREQUENT_CHECK; 2754 EV_FREQUENT_CHECK;
… …
2412# ifdef _WIN32 2779# ifdef _WIN32
2413# undef lstat 2780# undef lstat
2414# define lstat(a,b) _stati64 (a,b) 2781# define lstat(a,b) _stati64 (a,b)
2415# endif 2782# endif
2416 2783
2417#define DEF_STAT_INTERVAL 5.0074891 2784#define DEF_STAT_INTERVAL 5.0074891
2785#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2418#define MIN_STAT_INTERVAL 0.1074891 2786#define MIN_STAT_INTERVAL 0.1074891
2419 2787
2420static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2788static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2421 2789
2422#if EV_USE_INOTIFY 2790#if EV_USE_INOTIFY
2423# define EV_INOTIFY_BUFSIZE 8192 2791# define EV_INOTIFY_BUFSIZE 8192
… …
2427{ 2795{
2428 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); 2796 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);
2429 2797
2430 if (w->wd < 0) 2798 if (w->wd < 0)
2431 { 2799 {
2800 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2432 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2801 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2433 2802
2434 /* monitor some parent directory for speedup hints */ 2803 /* monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2804 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2436 /* but an efficiency issue only */ 2805 /* but an efficiency issue only */
2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2806 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2438 { 2807 {
2439 char path [4096]; 2808 char path [4096];
2440 strcpy (path, w->path); 2809 strcpy (path, w->path);
… …
2444 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2813 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2445 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2814 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2446 2815
2447 char *pend = strrchr (path, '/'); 2816 char *pend = strrchr (path, '/');
2448 2817
2449 if (!pend) 2818 if (!pend || pend == path)
2450 break; /* whoops, no '/', complain to your admin */ 2819 break;
2451 2820
2452 *pend = 0; 2821 *pend = 0;
2453 w->wd = inotify_add_watch (fs_fd, path, mask); 2822 w->wd = inotify_add_watch (fs_fd, path, mask);
2454 } 2823 }
2455 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2824 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2456 } 2825 }
2457 } 2826 }
2458 else
2459 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2460 2827
2461 if (w->wd >= 0) 2828 if (w->wd >= 0)
2829 {
2462 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2830 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2831
2832 /* now local changes will be tracked by inotify, but remote changes won't */
2833 /* unless the filesystem it known to be local, we therefore still poll */
2834 /* also do poll on <2.6.25, but with normal frequency */
2835 struct statfs sfs;
2836
2837 if (fs_2625 && !statfs (w->path, &sfs))
2838 if (sfs.f_type == 0x1373 /* devfs */
2839 || sfs.f_type == 0xEF53 /* ext2/3 */
2840 || sfs.f_type == 0x3153464a /* jfs */
2841 || sfs.f_type == 0x52654973 /* reiser3 */
2842 || sfs.f_type == 0x01021994 /* tempfs */
2843 || sfs.f_type == 0x58465342 /* xfs */)
2844 return;
2845
2846 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2847 ev_timer_again (EV_A_ &w->timer);
2848 }
2463} 2849}
2464 2850
2465static void noinline 2851static void noinline
2466infy_del (EV_P_ ev_stat *w) 2852infy_del (EV_P_ ev_stat *w)
2467{ 2853{
… …
2481 2867
2482static void noinline 2868static void noinline
2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2869infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484{ 2870{
2485 if (slot < 0) 2871 if (slot < 0)
2486 /* overflow, need to check for all hahs slots */ 2872 /* overflow, need to check for all hash slots */
2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2873 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488 infy_wd (EV_A_ slot, wd, ev); 2874 infy_wd (EV_A_ slot, wd, ev);
2489 else 2875 else
2490 { 2876 {
2491 WL w_; 2877 WL w_;
… …
2497 2883
2498 if (w->wd == wd || wd == -1) 2884 if (w->wd == wd || wd == -1)
2499 { 2885 {
2500 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2886 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2501 { 2887 {
2888 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2502 w->wd = -1; 2889 w->wd = -1;
2503 infy_add (EV_A_ w); /* re-add, no matter what */ 2890 infy_add (EV_A_ w); /* re-add, no matter what */
2504 } 2891 }
2505 2892
2506 stat_timer_cb (EV_A_ &w->timer, 0); 2893 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2519 2906
2520 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2907 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2521 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2908 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2522} 2909}
2523 2910
2524void inline_size 2911inline_size void
2912check_2625 (EV_P)
2913{
2914 /* kernels < 2.6.25 are borked
2915 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2916 */
2917 struct utsname buf;
2918 int major, minor, micro;
2919
2920 if (uname (&buf))
2921 return;
2922
2923 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2924 return;
2925
2926 if (major < 2
2927 || (major == 2 && minor < 6)
2928 || (major == 2 && minor == 6 && micro < 25))
2929 return;
2930
2931 fs_2625 = 1;
2932}
2933
2934inline_size void
2525infy_init (EV_P) 2935infy_init (EV_P)
2526{ 2936{
2527 if (fs_fd != -2) 2937 if (fs_fd != -2)
2528 return; 2938 return;
2939
2940 fs_fd = -1;
2941
2942 check_2625 (EV_A);
2529 2943
2530 fs_fd = inotify_init (); 2944 fs_fd = inotify_init ();
2531 2945
2532 if (fs_fd >= 0) 2946 if (fs_fd >= 0)
2533 { 2947 {
… …
2535 ev_set_priority (&fs_w, EV_MAXPRI); 2949 ev_set_priority (&fs_w, EV_MAXPRI);
2536 ev_io_start (EV_A_ &fs_w); 2950 ev_io_start (EV_A_ &fs_w);
2537 } 2951 }
2538} 2952}
2539 2953
2540void inline_size 2954inline_size void
2541infy_fork (EV_P) 2955infy_fork (EV_P)
2542{ 2956{
2543 int slot; 2957 int slot;
2544 2958
2545 if (fs_fd < 0) 2959 if (fs_fd < 0)
… …
2561 w->wd = -1; 2975 w->wd = -1;
2562 2976
2563 if (fs_fd >= 0) 2977 if (fs_fd >= 0)
2564 infy_add (EV_A_ w); /* re-add, no matter what */ 2978 infy_add (EV_A_ w); /* re-add, no matter what */
2565 else 2979 else
2566 ev_timer_start (EV_A_ &w->timer); 2980 ev_timer_again (EV_A_ &w->timer);
2567 } 2981 }
2568
2569 } 2982 }
2570} 2983}
2571 2984
2985#endif
2986
2987#ifdef _WIN32
2988# define EV_LSTAT(p,b) _stati64 (p, b)
2989#else
2990# define EV_LSTAT(p,b) lstat (p, b)
2572#endif 2991#endif
2573 2992
2574void 2993void
2575ev_stat_stat (EV_P_ ev_stat *w) 2994ev_stat_stat (EV_P_ ev_stat *w)
2576{ 2995{
… …
2603 || w->prev.st_atime != w->attr.st_atime 3022 || w->prev.st_atime != w->attr.st_atime
2604 || w->prev.st_mtime != w->attr.st_mtime 3023 || w->prev.st_mtime != w->attr.st_mtime
2605 || w->prev.st_ctime != w->attr.st_ctime 3024 || w->prev.st_ctime != w->attr.st_ctime
2606 ) { 3025 ) {
2607 #if EV_USE_INOTIFY 3026 #if EV_USE_INOTIFY
3027 if (fs_fd >= 0)
3028 {
2608 infy_del (EV_A_ w); 3029 infy_del (EV_A_ w);
2609 infy_add (EV_A_ w); 3030 infy_add (EV_A_ w);
2610 ev_stat_stat (EV_A_ w); /* avoid race... */ 3031 ev_stat_stat (EV_A_ w); /* avoid race... */
3032 }
2611 #endif 3033 #endif
2612 3034
2613 ev_feed_event (EV_A_ w, EV_STAT); 3035 ev_feed_event (EV_A_ w, EV_STAT);
2614 } 3036 }
2615} 3037}
… …
2618ev_stat_start (EV_P_ ev_stat *w) 3040ev_stat_start (EV_P_ ev_stat *w)
2619{ 3041{
2620 if (expect_false (ev_is_active (w))) 3042 if (expect_false (ev_is_active (w)))
2621 return; 3043 return;
2622 3044
2623 /* since we use memcmp, we need to clear any padding data etc. */
2624 memset (&w->prev, 0, sizeof (ev_statdata));
2625 memset (&w->attr, 0, sizeof (ev_statdata));
2626
2627 ev_stat_stat (EV_A_ w); 3045 ev_stat_stat (EV_A_ w);
2628 3046
3047 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2629 if (w->interval < MIN_STAT_INTERVAL) 3048 w->interval = MIN_STAT_INTERVAL;
2630 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2631 3049
2632 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3050 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2633 ev_set_priority (&w->timer, ev_priority (w)); 3051 ev_set_priority (&w->timer, ev_priority (w));
2634 3052
2635#if EV_USE_INOTIFY 3053#if EV_USE_INOTIFY
2636 infy_init (EV_A); 3054 infy_init (EV_A);
2637 3055
2638 if (fs_fd >= 0) 3056 if (fs_fd >= 0)
2639 infy_add (EV_A_ w); 3057 infy_add (EV_A_ w);
2640 else 3058 else
2641#endif 3059#endif
2642 ev_timer_start (EV_A_ &w->timer); 3060 ev_timer_again (EV_A_ &w->timer);
2643 3061
2644 ev_start (EV_A_ (W)w, 1); 3062 ev_start (EV_A_ (W)w, 1);
2645 3063
2646 EV_FREQUENT_CHECK; 3064 EV_FREQUENT_CHECK;
2647} 3065}
… …
2817 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3235 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2818 } 3236 }
2819 } 3237 }
2820} 3238}
2821 3239
3240static void
3241embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3242{
3243 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3244
3245 ev_embed_stop (EV_A_ w);
3246
3247 {
3248 struct ev_loop *loop = w->other;
3249
3250 ev_loop_fork (EV_A);
3251 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3252 }
3253
3254 ev_embed_start (EV_A_ w);
3255}
3256
2822#if 0 3257#if 0
2823static void 3258static void
2824embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3259embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2825{ 3260{
2826 ev_idle_stop (EV_A_ idle); 3261 ev_idle_stop (EV_A_ idle);
… …
2833 if (expect_false (ev_is_active (w))) 3268 if (expect_false (ev_is_active (w)))
2834 return; 3269 return;
2835 3270
2836 { 3271 {
2837 struct ev_loop *loop = w->other; 3272 struct ev_loop *loop = w->other;
2838 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3273 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2839 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3274 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2840 } 3275 }
2841 3276
2842 EV_FREQUENT_CHECK; 3277 EV_FREQUENT_CHECK;
2843 3278
… …
2846 3281
2847 ev_prepare_init (&w->prepare, embed_prepare_cb); 3282 ev_prepare_init (&w->prepare, embed_prepare_cb);
2848 ev_set_priority (&w->prepare, EV_MINPRI); 3283 ev_set_priority (&w->prepare, EV_MINPRI);
2849 ev_prepare_start (EV_A_ &w->prepare); 3284 ev_prepare_start (EV_A_ &w->prepare);
2850 3285
3286 ev_fork_init (&w->fork, embed_fork_cb);
3287 ev_fork_start (EV_A_ &w->fork);
3288
2851 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3289 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2852 3290
2853 ev_start (EV_A_ (W)w, 1); 3291 ev_start (EV_A_ (W)w, 1);
2854 3292
2855 EV_FREQUENT_CHECK; 3293 EV_FREQUENT_CHECK;
… …
2862 if (expect_false (!ev_is_active (w))) 3300 if (expect_false (!ev_is_active (w)))
2863 return; 3301 return;
2864 3302
2865 EV_FREQUENT_CHECK; 3303 EV_FREQUENT_CHECK;
2866 3304
2867 ev_io_stop (EV_A_ &w->io); 3305 ev_io_stop (EV_A_ &w->io);
2868 ev_prepare_stop (EV_A_ &w->prepare); 3306 ev_prepare_stop (EV_A_ &w->prepare);
2869 3307 ev_fork_stop (EV_A_ &w->fork);
2870 ev_stop (EV_A_ (W)w);
2871 3308
2872 EV_FREQUENT_CHECK; 3309 EV_FREQUENT_CHECK;
2873} 3310}
2874#endif 3311#endif
2875 3312
… …
2972once_cb (EV_P_ struct ev_once *once, int revents) 3409once_cb (EV_P_ struct ev_once *once, int revents)
2973{ 3410{
2974 void (*cb)(int revents, void *arg) = once->cb; 3411 void (*cb)(int revents, void *arg) = once->cb;
2975 void *arg = once->arg; 3412 void *arg = once->arg;
2976 3413
2977 ev_io_stop (EV_A_ &once->io); 3414 ev_io_stop (EV_A_ &once->io);
2978 ev_timer_stop (EV_A_ &once->to); 3415 ev_timer_stop (EV_A_ &once->to);
2979 ev_free (once); 3416 ev_free (once);
2980 3417
2981 cb (revents, arg); 3418 cb (revents, arg);
2982} 3419}
2983 3420
2984static void 3421static void
2985once_cb_io (EV_P_ ev_io *w, int revents) 3422once_cb_io (EV_P_ ev_io *w, int revents)
2986{ 3423{
2987 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3424 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3425
3426 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2988} 3427}
2989 3428
2990static void 3429static void
2991once_cb_to (EV_P_ ev_timer *w, int revents) 3430once_cb_to (EV_P_ ev_timer *w, int revents)
2992{ 3431{
2993 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3432 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3433
3434 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2994} 3435}
2995 3436
2996void 3437void
2997ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3438ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2998{ 3439{
… …
3020 ev_timer_set (&once->to, timeout, 0.); 3461 ev_timer_set (&once->to, timeout, 0.);
3021 ev_timer_start (EV_A_ &once->to); 3462 ev_timer_start (EV_A_ &once->to);
3022 } 3463 }
3023} 3464}
3024 3465
3466/*****************************************************************************/
3467
3468#if EV_WALK_ENABLE
3469void
3470ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3471{
3472 int i, j;
3473 ev_watcher_list *wl, *wn;
3474
3475 if (types & (EV_IO | EV_EMBED))
3476 for (i = 0; i < anfdmax; ++i)
3477 for (wl = anfds [i].head; wl; )
3478 {
3479 wn = wl->next;
3480
3481#if EV_EMBED_ENABLE
3482 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3483 {
3484 if (types & EV_EMBED)
3485 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3486 }
3487 else
3488#endif
3489#if EV_USE_INOTIFY
3490 if (ev_cb ((ev_io *)wl) == infy_cb)
3491 ;
3492 else
3493#endif
3494 if ((ev_io *)wl != &pipe_w)
3495 if (types & EV_IO)
3496 cb (EV_A_ EV_IO, wl);
3497
3498 wl = wn;
3499 }
3500
3501 if (types & (EV_TIMER | EV_STAT))
3502 for (i = timercnt + HEAP0; i-- > HEAP0; )
3503#if EV_STAT_ENABLE
3504 /*TODO: timer is not always active*/
3505 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3506 {
3507 if (types & EV_STAT)
3508 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3509 }
3510 else
3511#endif
3512 if (types & EV_TIMER)
3513 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3514
3515#if EV_PERIODIC_ENABLE
3516 if (types & EV_PERIODIC)
3517 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3518 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3519#endif
3520
3521#if EV_IDLE_ENABLE
3522 if (types & EV_IDLE)
3523 for (j = NUMPRI; i--; )
3524 for (i = idlecnt [j]; i--; )
3525 cb (EV_A_ EV_IDLE, idles [j][i]);
3526#endif
3527
3528#if EV_FORK_ENABLE
3529 if (types & EV_FORK)
3530 for (i = forkcnt; i--; )
3531 if (ev_cb (forks [i]) != embed_fork_cb)
3532 cb (EV_A_ EV_FORK, forks [i]);
3533#endif
3534
3535#if EV_ASYNC_ENABLE
3536 if (types & EV_ASYNC)
3537 for (i = asynccnt; i--; )
3538 cb (EV_A_ EV_ASYNC, asyncs [i]);
3539#endif
3540
3541 if (types & EV_PREPARE)
3542 for (i = preparecnt; i--; )
3543#if EV_EMBED_ENABLE
3544 if (ev_cb (prepares [i]) != embed_prepare_cb)
3545#endif
3546 cb (EV_A_ EV_PREPARE, prepares [i]);
3547
3548 if (types & EV_CHECK)
3549 for (i = checkcnt; i--; )
3550 cb (EV_A_ EV_CHECK, checks [i]);
3551
3552 if (types & EV_SIGNAL)
3553 for (i = 0; i < signalmax; ++i)
3554 for (wl = signals [i].head; wl; )
3555 {
3556 wn = wl->next;
3557 cb (EV_A_ EV_SIGNAL, wl);
3558 wl = wn;
3559 }
3560
3561 if (types & EV_CHILD)
3562 for (i = EV_PID_HASHSIZE; i--; )
3563 for (wl = childs [i]; wl; )
3564 {
3565 wn = wl->next;
3566 cb (EV_A_ EV_CHILD, wl);
3567 wl = wn;
3568 }
3569/* EV_STAT 0x00001000 /* stat data changed */
3570/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3571}
3572#endif
3573
3025#if EV_MULTIPLICITY 3574#if EV_MULTIPLICITY
3026 #include "ev_wrap.h" 3575 #include "ev_wrap.h"
3027#endif 3576#endif
3028 3577
3029#ifdef __cplusplus 3578#ifdef __cplusplus

Diff Legend

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