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.314 by root, Wed Aug 26 17:31:20 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/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
218#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1
221# else
222# define EV_USE_CLOCK_SYSCALL 0
223# endif
224#endif
167 225
168#ifndef EV_USE_MONOTONIC 226#ifndef EV_USE_MONOTONIC
169# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
170# define EV_USE_MONOTONIC 1 228# define EV_USE_MONOTONIC 1
171# else 229# else
172# define EV_USE_MONOTONIC 0 230# define EV_USE_MONOTONIC 0
173# endif 231# endif
174#endif 232#endif
175 233
176#ifndef EV_USE_REALTIME 234#ifndef EV_USE_REALTIME
177# define EV_USE_REALTIME 0 235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
178#endif 236#endif
179 237
180#ifndef EV_USE_NANOSLEEP 238#ifndef EV_USE_NANOSLEEP
181# if _POSIX_C_SOURCE >= 199309L 239# if _POSIX_C_SOURCE >= 199309L
182# define EV_USE_NANOSLEEP 1 240# define EV_USE_NANOSLEEP 1
… …
243# else 301# else
244# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
245# endif 303# endif
246#endif 304#endif
247 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
248#if 0 /* debugging */ 314#if 0 /* debugging */
249# define EV_VERIFY 3 315# define EV_VERIFY 3
250# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
251# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
252#endif 318#endif
… …
261 327
262#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
263# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
264#endif 330#endif
265 331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
344#endif
345
266/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
267 347
268#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
269# undef EV_USE_MONOTONIC 349# undef EV_USE_MONOTONIC
270# define EV_USE_MONOTONIC 0 350# define EV_USE_MONOTONIC 0
… …
285# include <sys/select.h> 365# include <sys/select.h>
286# endif 366# endif
287#endif 367#endif
288 368
289#if EV_USE_INOTIFY 369#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h>
290# include <sys/inotify.h> 372# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY
376# define EV_USE_INOTIFY 0
377# endif
291#endif 378#endif
292 379
293#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
294# include <winsock.h> 381# include <winsock.h>
295#endif 382#endif
296 383
297#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
298/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
299# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
300# ifdef __cplusplus 397# ifdef __cplusplus
301extern "C" { 398extern "C" {
302# endif 399# endif
303int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
304# ifdef __cplusplus 401# ifdef __cplusplus
305} 402}
306# endif 403# endif
307#endif 404#endif
405
406#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
308 434
309/**/ 435/**/
310 436
311#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
312# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
347# define inline_speed static noinline 473# define inline_speed static noinline
348#else 474#else
349# define inline_speed static inline 475# define inline_speed static inline
350#endif 476#endif
351 477
352#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479
480#if EV_MINPRI == EV_MAXPRI
481# define ABSPRI(w) (((W)w), 0)
482#else
353#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
354 485
355#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
356#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
357 488
358typedef ev_watcher *W; 489typedef ev_watcher *W;
… …
360typedef ev_watcher_time *WT; 491typedef ev_watcher_time *WT;
361 492
362#define ev_active(w) ((W)(w))->active 493#define ev_active(w) ((W)(w))->active
363#define ev_at(w) ((WT)(w))->at 494#define ev_at(w) ((WT)(w))->at
364 495
365#if EV_USE_MONOTONIC 496#if EV_USE_REALTIME
366/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 497/* 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 */ 498/* giving it a reasonably high chance of working on typical architetcures */
499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
500#endif
501
502#if EV_USE_MONOTONIC
368static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
504#endif
505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
369#endif 514#endif
370 515
371#ifdef _WIN32 516#ifdef _WIN32
372# include "ev_win32.c" 517# include "ev_win32.c"
373#endif 518#endif
… …
381{ 526{
382 syserr_cb = cb; 527 syserr_cb = cb;
383} 528}
384 529
385static void noinline 530static void noinline
386syserr (const char *msg) 531ev_syserr (const char *msg)
387{ 532{
388 if (!msg) 533 if (!msg)
389 msg = "(libev) system error"; 534 msg = "(libev) system error";
390 535
391 if (syserr_cb) 536 if (syserr_cb)
… …
437#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
438#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
439 584
440/*****************************************************************************/ 585/*****************************************************************************/
441 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
590/* file descriptor info structure */
442typedef struct 591typedef struct
443{ 592{
444 WL head; 593 WL head;
445 unsigned char events; 594 unsigned char events; /* the events watched for */
595 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
446 unsigned char reify; 597 unsigned char unused;
598#if EV_USE_EPOLL
599 unsigned int egen; /* generation counter to counter epoll bugs */
600#endif
447#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
448 SOCKET handle; 602 SOCKET handle;
449#endif 603#endif
450} ANFD; 604} ANFD;
451 605
606/* stores the pending event set for a given watcher */
452typedef struct 607typedef struct
453{ 608{
454 W w; 609 W w;
455 int events; 610 int events; /* the pending event set for the given watcher */
456} ANPENDING; 611} ANPENDING;
457 612
458#if EV_USE_INOTIFY 613#if EV_USE_INOTIFY
459/* hash table entry per inotify-id */ 614/* hash table entry per inotify-id */
460typedef struct 615typedef struct
… …
463} ANFS; 618} ANFS;
464#endif 619#endif
465 620
466/* Heap Entry */ 621/* Heap Entry */
467#if EV_HEAP_CACHE_AT 622#if EV_HEAP_CACHE_AT
623 /* a heap element */
468 typedef struct { 624 typedef struct {
469 ev_tstamp at; 625 ev_tstamp at;
470 WT w; 626 WT w;
471 } ANHE; 627 } ANHE;
472 628
473 #define ANHE_w(he) (he).w /* access watcher, read-write */ 629 #define ANHE_w(he) (he).w /* access watcher, read-write */
474 #define ANHE_at(he) (he).at /* access cached at, read-only */ 630 #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 */ 631 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
476#else 632#else
633 /* a heap element */
477 typedef WT ANHE; 634 typedef WT ANHE;
478 635
479 #define ANHE_w(he) (he) 636 #define ANHE_w(he) (he)
480 #define ANHE_at(he) (he)->at 637 #define ANHE_at(he) (he)->at
481 #define ANHE_at_cache(he) 638 #define ANHE_at_cache(he)
… …
505 662
506 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
507 664
508#endif 665#endif
509 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
510/*****************************************************************************/ 679/*****************************************************************************/
511 680
681#ifndef EV_HAVE_EV_TIME
512ev_tstamp 682ev_tstamp
513ev_time (void) 683ev_time (void)
514{ 684{
515#if EV_USE_REALTIME 685#if EV_USE_REALTIME
686 if (expect_true (have_realtime))
687 {
516 struct timespec ts; 688 struct timespec ts;
517 clock_gettime (CLOCK_REALTIME, &ts); 689 clock_gettime (CLOCK_REALTIME, &ts);
518 return ts.tv_sec + ts.tv_nsec * 1e-9; 690 return ts.tv_sec + ts.tv_nsec * 1e-9;
519#else 691 }
692#endif
693
520 struct timeval tv; 694 struct timeval tv;
521 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
522 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
523#endif
524} 697}
698#endif
525 699
526ev_tstamp inline_size 700inline_size ev_tstamp
527get_clock (void) 701get_clock (void)
528{ 702{
529#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
530 if (expect_true (have_monotonic)) 704 if (expect_true (have_monotonic))
531 { 705 {
… …
564 struct timeval tv; 738 struct timeval tv;
565 739
566 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
567 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568 742
743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
744 /* something not guaranteed by newer posix versions, but guaranteed */
745 /* by older ones */
569 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
570#endif 747#endif
571 } 748 }
572} 749}
573 750
574/*****************************************************************************/ 751/*****************************************************************************/
575 752
576#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 753#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
577 754
578int inline_size 755/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */
757inline_size int
579array_nextsize (int elem, int cur, int cnt) 758array_nextsize (int elem, int cur, int cnt)
580{ 759{
581 int ncur = cur + 1; 760 int ncur = cur + 1;
582 761
583 do 762 do
… …
600array_realloc (int elem, void *base, int *cur, int cnt) 779array_realloc (int elem, void *base, int *cur, int cnt)
601{ 780{
602 *cur = array_nextsize (elem, *cur, cnt); 781 *cur = array_nextsize (elem, *cur, cnt);
603 return ev_realloc (base, elem * *cur); 782 return ev_realloc (base, elem * *cur);
604} 783}
784
785#define array_init_zero(base,count) \
786 memset ((void *)(base), 0, sizeof (*(base)) * (count))
605 787
606#define array_needsize(type,base,cur,cnt,init) \ 788#define array_needsize(type,base,cur,cnt,init) \
607 if (expect_false ((cnt) > (cur))) \ 789 if (expect_false ((cnt) > (cur))) \
608 { \ 790 { \
609 int ocur_ = (cur); \ 791 int ocur_ = (cur); \
… …
621 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 803 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
622 } 804 }
623#endif 805#endif
624 806
625#define array_free(stem, idx) \ 807#define array_free(stem, idx) \
626 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 808 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
627 809
628/*****************************************************************************/ 810/*****************************************************************************/
811
812/* dummy callback for pending events */
813static void noinline
814pendingcb (EV_P_ ev_prepare *w, int revents)
815{
816}
629 817
630void noinline 818void noinline
631ev_feed_event (EV_P_ void *w, int revents) 819ev_feed_event (EV_P_ void *w, int revents)
632{ 820{
633 W w_ = (W)w; 821 W w_ = (W)w;
… …
642 pendings [pri][w_->pending - 1].w = w_; 830 pendings [pri][w_->pending - 1].w = w_;
643 pendings [pri][w_->pending - 1].events = revents; 831 pendings [pri][w_->pending - 1].events = revents;
644 } 832 }
645} 833}
646 834
647void inline_speed 835inline_speed void
836feed_reverse (EV_P_ W w)
837{
838 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
839 rfeeds [rfeedcnt++] = w;
840}
841
842inline_size void
843feed_reverse_done (EV_P_ int revents)
844{
845 do
846 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
847 while (rfeedcnt);
848}
849
850inline_speed void
648queue_events (EV_P_ W *events, int eventcnt, int type) 851queue_events (EV_P_ W *events, int eventcnt, int type)
649{ 852{
650 int i; 853 int i;
651 854
652 for (i = 0; i < eventcnt; ++i) 855 for (i = 0; i < eventcnt; ++i)
653 ev_feed_event (EV_A_ events [i], type); 856 ev_feed_event (EV_A_ events [i], type);
654} 857}
655 858
656/*****************************************************************************/ 859/*****************************************************************************/
657 860
658void inline_size 861inline_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) 862fd_event_nc (EV_P_ int fd, int revents)
673{ 863{
674 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
675 ev_io *w; 865 ev_io *w;
676 866
677 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
681 if (ev) 871 if (ev)
682 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
683 } 873 }
684} 874}
685 875
876/* do not submit kernel events for fds that have reify set */
877/* because that means they changed while we were polling for new events */
878inline_speed void
879fd_event (EV_P_ int fd, int revents)
880{
881 ANFD *anfd = anfds + fd;
882
883 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents);
885}
886
686void 887void
687ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
688{ 889{
689 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
690 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
691} 892}
692 893
693void inline_size 894/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */
896inline_size void
694fd_reify (EV_P) 897fd_reify (EV_P)
695{ 898{
696 int i; 899 int i;
697 900
698 for (i = 0; i < fdchangecnt; ++i) 901 for (i = 0; i < fdchangecnt; ++i)
… …
707 events |= (unsigned char)w->events; 910 events |= (unsigned char)w->events;
708 911
709#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
710 if (events) 913 if (events)
711 { 914 {
712 unsigned long argp; 915 unsigned long arg;
713 #ifdef EV_FD_TO_WIN32_HANDLE
714 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
715 #else
716 anfd->handle = _get_osfhandle (fd);
717 #endif
718 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
719 } 918 }
720#endif 919#endif
721 920
722 { 921 {
723 unsigned char o_events = anfd->events; 922 unsigned char o_events = anfd->events;
724 unsigned char o_reify = anfd->reify; 923 unsigned char o_reify = anfd->reify;
725 924
726 anfd->reify = 0; 925 anfd->reify = 0;
727 anfd->events = events; 926 anfd->events = events;
728 927
729 if (o_events != events || o_reify & EV_IOFDSET) 928 if (o_events != events || o_reify & EV__IOFDSET)
730 backend_modify (EV_A_ fd, o_events, events); 929 backend_modify (EV_A_ fd, o_events, events);
731 } 930 }
732 } 931 }
733 932
734 fdchangecnt = 0; 933 fdchangecnt = 0;
735} 934}
736 935
737void inline_size 936/* something about the given fd changed */
937inline_size void
738fd_change (EV_P_ int fd, int flags) 938fd_change (EV_P_ int fd, int flags)
739{ 939{
740 unsigned char reify = anfds [fd].reify; 940 unsigned char reify = anfds [fd].reify;
741 anfds [fd].reify |= flags; 941 anfds [fd].reify |= flags;
742 942
… …
746 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 946 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
747 fdchanges [fdchangecnt - 1] = fd; 947 fdchanges [fdchangecnt - 1] = fd;
748 } 948 }
749} 949}
750 950
751void inline_speed 951/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
952inline_speed void
752fd_kill (EV_P_ int fd) 953fd_kill (EV_P_ int fd)
753{ 954{
754 ev_io *w; 955 ev_io *w;
755 956
756 while ((w = (ev_io *)anfds [fd].head)) 957 while ((w = (ev_io *)anfds [fd].head))
… …
758 ev_io_stop (EV_A_ w); 959 ev_io_stop (EV_A_ w);
759 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
760 } 961 }
761} 962}
762 963
763int inline_size 964/* check whether the given fd is atcually valid, for error recovery */
965inline_size int
764fd_valid (int fd) 966fd_valid (int fd)
765{ 967{
766#ifdef _WIN32 968#ifdef _WIN32
767 return _get_osfhandle (fd) != -1; 969 return _get_osfhandle (fd) != -1;
768#else 970#else
… …
776{ 978{
777 int fd; 979 int fd;
778 980
779 for (fd = 0; fd < anfdmax; ++fd) 981 for (fd = 0; fd < anfdmax; ++fd)
780 if (anfds [fd].events) 982 if (anfds [fd].events)
781 if (!fd_valid (fd) == -1 && errno == EBADF) 983 if (!fd_valid (fd) && errno == EBADF)
782 fd_kill (EV_A_ fd); 984 fd_kill (EV_A_ fd);
783} 985}
784 986
785/* called on ENOMEM in select/poll to kill some fds and retry */ 987/* called on ENOMEM in select/poll to kill some fds and retry */
786static void noinline 988static void noinline
… …
790 992
791 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
792 if (anfds [fd].events) 994 if (anfds [fd].events)
793 { 995 {
794 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
795 return; 997 break;
796 } 998 }
797} 999}
798 1000
799/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
800static void noinline 1002static void noinline
… …
804 1006
805 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
806 if (anfds [fd].events) 1008 if (anfds [fd].events)
807 { 1009 {
808 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
1011 anfds [fd].emask = 0;
809 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
810 } 1013 }
811} 1014}
812 1015
813/*****************************************************************************/ 1016/*****************************************************************************/
814 1017
… …
830#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1033#define HEAP0 (DHEAP - 1) /* index of first element in heap */
831#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1034#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
832#define UPHEAP_DONE(p,k) ((p) == (k)) 1035#define UPHEAP_DONE(p,k) ((p) == (k))
833 1036
834/* away from the root */ 1037/* away from the root */
835void inline_speed 1038inline_speed void
836downheap (ANHE *heap, int N, int k) 1039downheap (ANHE *heap, int N, int k)
837{ 1040{
838 ANHE he = heap [k]; 1041 ANHE he = heap [k];
839 ANHE *E = heap + N + HEAP0; 1042 ANHE *E = heap + N + HEAP0;
840 1043
… …
880#define HEAP0 1 1083#define HEAP0 1
881#define HPARENT(k) ((k) >> 1) 1084#define HPARENT(k) ((k) >> 1)
882#define UPHEAP_DONE(p,k) (!(p)) 1085#define UPHEAP_DONE(p,k) (!(p))
883 1086
884/* away from the root */ 1087/* away from the root */
885void inline_speed 1088inline_speed void
886downheap (ANHE *heap, int N, int k) 1089downheap (ANHE *heap, int N, int k)
887{ 1090{
888 ANHE he = heap [k]; 1091 ANHE he = heap [k];
889 1092
890 for (;;) 1093 for (;;)
891 { 1094 {
892 int c = k << 1; 1095 int c = k << 1;
893 1096
894 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
895 break; 1098 break;
896 1099
897 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
898 ? 1 : 0; 1101 ? 1 : 0;
899 1102
… …
910 ev_active (ANHE_w (he)) = k; 1113 ev_active (ANHE_w (he)) = k;
911} 1114}
912#endif 1115#endif
913 1116
914/* towards the root */ 1117/* towards the root */
915void inline_speed 1118inline_speed void
916upheap (ANHE *heap, int k) 1119upheap (ANHE *heap, int k)
917{ 1120{
918 ANHE he = heap [k]; 1121 ANHE he = heap [k];
919 1122
920 for (;;) 1123 for (;;)
… …
931 1134
932 heap [k] = he; 1135 heap [k] = he;
933 ev_active (ANHE_w (he)) = k; 1136 ev_active (ANHE_w (he)) = k;
934} 1137}
935 1138
936void inline_size 1139/* move an element suitably so it is in a correct place */
1140inline_size void
937adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
938{ 1142{
939 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
940 upheap (heap, k); 1144 upheap (heap, k);
941 else 1145 else
942 downheap (heap, N, k); 1146 downheap (heap, N, k);
943} 1147}
944 1148
945/* rebuild the heap: this function is used only once and executed rarely */ 1149/* rebuild the heap: this function is used only once and executed rarely */
946void inline_size 1150inline_size void
947reheap (ANHE *heap, int N) 1151reheap (ANHE *heap, int N)
948{ 1152{
949 int i; 1153 int i;
950 1154
951 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1155 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
954 upheap (heap, i + HEAP0); 1158 upheap (heap, i + HEAP0);
955} 1159}
956 1160
957/*****************************************************************************/ 1161/*****************************************************************************/
958 1162
1163/* associate signal watchers to a signal signal */
959typedef struct 1164typedef struct
960{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
961 WL head; 1170 WL head;
962 EV_ATOMIC_T gotsig;
963} ANSIG; 1171} ANSIG;
964 1172
965static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
966static int signalmax;
967
968static EV_ATOMIC_T gotsig;
969
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 1174
982/*****************************************************************************/ 1175/*****************************************************************************/
983 1176
984void inline_speed 1177/* used to prepare libev internal fd's */
1178/* this is not fork-safe */
1179inline_speed void
985fd_intern (int fd) 1180fd_intern (int fd)
986{ 1181{
987#ifdef _WIN32 1182#ifdef _WIN32
988 int arg = 1; 1183 unsigned long arg = 1;
989 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
990#else 1185#else
991 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
992 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
993#endif 1188#endif
994} 1189}
995 1190
996static void noinline 1191static void noinline
997evpipe_init (EV_P) 1192evpipe_init (EV_P)
998{ 1193{
999 if (!ev_is_active (&pipeev)) 1194 if (!ev_is_active (&pipe_w))
1000 { 1195 {
1001#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1002 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1003 { 1202 {
1004 evpipe [0] = -1; 1203 evpipe [0] = -1;
1005 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1006 ev_io_set (&pipeev, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1007 } 1206 }
1008 else 1207 else
1009#endif 1208#endif
1010 { 1209 {
1011 while (pipe (evpipe)) 1210 while (pipe (evpipe))
1012 syserr ("(libev) error creating signal/async pipe"); 1211 ev_syserr ("(libev) error creating signal/async pipe");
1013 1212
1014 fd_intern (evpipe [0]); 1213 fd_intern (evpipe [0]);
1015 fd_intern (evpipe [1]); 1214 fd_intern (evpipe [1]);
1016 ev_io_set (&pipeev, evpipe [0], EV_READ); 1215 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1017 } 1216 }
1018 1217
1019 ev_io_start (EV_A_ &pipeev); 1218 ev_io_start (EV_A_ &pipe_w);
1020 ev_unref (EV_A); /* watcher should not keep loop alive */ 1219 ev_unref (EV_A); /* watcher should not keep loop alive */
1021 } 1220 }
1022} 1221}
1023 1222
1024void inline_size 1223inline_size void
1025evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1224evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1026{ 1225{
1027 if (!*flag) 1226 if (!*flag)
1028 { 1227 {
1029 int old_errno = errno; /* save errno because write might clobber it */ 1228 int old_errno = errno; /* save errno because write might clobber it */
… …
1042 1241
1043 errno = old_errno; 1242 errno = old_errno;
1044 } 1243 }
1045} 1244}
1046 1245
1246/* called whenever the libev signal pipe */
1247/* got some events (signal, async) */
1047static void 1248static void
1048pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1049{ 1250{
1251 int i;
1252
1050#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1051 if (evfd >= 0) 1254 if (evfd >= 0)
1052 { 1255 {
1053 uint64_t counter; 1256 uint64_t counter;
1054 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
… …
1058 { 1261 {
1059 char dummy; 1262 char dummy;
1060 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1061 } 1264 }
1062 1265
1063 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1064 { 1267 {
1065 int signum; 1268 sig_pending = 0;
1066 gotsig = 0;
1067 1269
1068 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1069 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1070 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1071 } 1273 }
1072 1274
1073#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1074 if (gotasync) 1276 if (async_pending)
1075 { 1277 {
1076 int i; 1278 async_pending = 0;
1077 gotasync = 0;
1078 1279
1079 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1080 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1081 { 1282 {
1082 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
… …
1090 1291
1091static void 1292static void
1092ev_sighandler (int signum) 1293ev_sighandler (int signum)
1093{ 1294{
1094#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1095 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1096#endif 1297#endif
1097 1298
1098#if _WIN32 1299#if _WIN32
1099 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1100#endif 1301#endif
1101 1302
1102 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1103 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1104} 1305}
1105 1306
1106void noinline 1307void noinline
1107ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1108{ 1309{
1109 WL w; 1310 WL w;
1110 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1111#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1112 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1113#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1114 1320
1115 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1116
1117 if (signum < 0 || signum >= signalmax)
1118 return; 1322 return;
1323#endif
1119 1324
1120 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1121 1326
1122 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1123 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1124} 1329}
1125 1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1350
1126/*****************************************************************************/ 1351/*****************************************************************************/
1127 1352
1128static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1129 1354
1130#ifndef _WIN32 1355#ifndef _WIN32
… …
1133 1358
1134#ifndef WIFCONTINUED 1359#ifndef WIFCONTINUED
1135# define WIFCONTINUED(status) 0 1360# define WIFCONTINUED(status) 0
1136#endif 1361#endif
1137 1362
1138void inline_speed 1363/* handle a single child status event */
1364inline_speed void
1139child_reap (EV_P_ int chain, int pid, int status) 1365child_reap (EV_P_ int chain, int pid, int status)
1140{ 1366{
1141 ev_child *w; 1367 ev_child *w;
1142 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1143 1369
… …
1156 1382
1157#ifndef WCONTINUED 1383#ifndef WCONTINUED
1158# define WCONTINUED 0 1384# define WCONTINUED 0
1159#endif 1385#endif
1160 1386
1387/* called on sigchld etc., calls waitpid */
1161static void 1388static void
1162childcb (EV_P_ ev_signal *sw, int revents) 1389childcb (EV_P_ ev_signal *sw, int revents)
1163{ 1390{
1164 int pid, status; 1391 int pid, status;
1165 1392
… …
1246 /* kqueue is borked on everything but netbsd apparently */ 1473 /* kqueue is borked on everything but netbsd apparently */
1247 /* it usually doesn't work correctly on anything but sockets and pipes */ 1474 /* it usually doesn't work correctly on anything but sockets and pipes */
1248 flags &= ~EVBACKEND_KQUEUE; 1475 flags &= ~EVBACKEND_KQUEUE;
1249#endif 1476#endif
1250#ifdef __APPLE__ 1477#ifdef __APPLE__
1251 // flags &= ~EVBACKEND_KQUEUE; for documentation 1478 /* only select works correctly on that "unix-certified" platform */
1252 flags &= ~EVBACKEND_POLL; 1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1253#endif 1481#endif
1254 1482
1255 return flags; 1483 return flags;
1256} 1484}
1257 1485
… …
1271ev_backend (EV_P) 1499ev_backend (EV_P)
1272{ 1500{
1273 return backend; 1501 return backend;
1274} 1502}
1275 1503
1504#if EV_MINIMAL < 2
1276unsigned int 1505unsigned int
1277ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1278{ 1507{
1279 return loop_count; 1508 return loop_count;
1280} 1509}
1281 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1282void 1517void
1283ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1284{ 1519{
1285 io_blocktime = interval; 1520 io_blocktime = interval;
1286} 1521}
… …
1289ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1290{ 1525{
1291 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1292} 1527}
1293 1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1552
1553/* initialise a loop structure, must be zero-initialised */
1294static void noinline 1554static void noinline
1295loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1296{ 1556{
1297 if (!backend) 1557 if (!backend)
1298 { 1558 {
1559#if EV_USE_REALTIME
1560 if (!have_realtime)
1561 {
1562 struct timespec ts;
1563
1564 if (!clock_gettime (CLOCK_REALTIME, &ts))
1565 have_realtime = 1;
1566 }
1567#endif
1568
1299#if EV_USE_MONOTONIC 1569#if EV_USE_MONOTONIC
1570 if (!have_monotonic)
1300 { 1571 {
1301 struct timespec ts; 1572 struct timespec ts;
1573
1302 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1303 have_monotonic = 1; 1575 have_monotonic = 1;
1304 } 1576 }
1305#endif 1577#endif
1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1306 1589
1307 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1308 mn_now = get_clock (); 1591 mn_now = get_clock ();
1309 now_floor = mn_now; 1592 now_floor = mn_now;
1310 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1595 invoke_cb = ev_invoke_pending;
1596#endif
1311 1597
1312 io_blocktime = 0.; 1598 io_blocktime = 0.;
1313 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1314 backend = 0; 1600 backend = 0;
1315 backend_fd = -1; 1601 backend_fd = -1;
1316 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1317#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1318 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1319#endif 1608#endif
1320 1609#if EV_USE_SIGNALFD
1321 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1322#ifndef _WIN32
1323 if (flags & EVFLAG_FORKCHECK)
1324 curpid = getpid ();
1325#endif 1611#endif
1326
1327 if (!(flags & EVFLAG_NOENV)
1328 && !enable_secure ()
1329 && getenv ("LIBEV_FLAGS"))
1330 flags = atoi (getenv ("LIBEV_FLAGS"));
1331 1612
1332 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1333 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1334 1615
1335#if EV_USE_PORT 1616#if EV_USE_PORT
… …
1346#endif 1627#endif
1347#if EV_USE_SELECT 1628#if EV_USE_SELECT
1348 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1349#endif 1630#endif
1350 1631
1632 ev_prepare_init (&pending_w, pendingcb);
1633
1351 ev_init (&pipeev, pipecb); 1634 ev_init (&pipe_w, pipecb);
1352 ev_set_priority (&pipeev, EV_MAXPRI); 1635 ev_set_priority (&pipe_w, EV_MAXPRI);
1353 } 1636 }
1354} 1637}
1355 1638
1639/* free up a loop structure */
1356static void noinline 1640static void noinline
1357loop_destroy (EV_P) 1641loop_destroy (EV_P)
1358{ 1642{
1359 int i; 1643 int i;
1360 1644
1361 if (ev_is_active (&pipeev)) 1645 if (ev_is_active (&pipe_w))
1362 { 1646 {
1363 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1364 ev_io_stop (EV_A_ &pipeev); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1365 1649
1366#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1367 if (evfd >= 0) 1651 if (evfd >= 0)
1368 close (evfd); 1652 close (evfd);
1369#endif 1653#endif
1370 1654
1371 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1372 { 1656 {
1373 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1374 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1375 } 1659 }
1376 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd);
1669 }
1670#endif
1377 1671
1378#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1379 if (fs_fd >= 0) 1673 if (fs_fd >= 0)
1380 close (fs_fd); 1674 close (fs_fd);
1381#endif 1675#endif
… …
1405#if EV_IDLE_ENABLE 1699#if EV_IDLE_ENABLE
1406 array_free (idle, [i]); 1700 array_free (idle, [i]);
1407#endif 1701#endif
1408 } 1702 }
1409 1703
1410 ev_free (anfds); anfdmax = 0; 1704 ev_free (anfds); anfds = 0; anfdmax = 0;
1411 1705
1412 /* have to use the microsoft-never-gets-it-right macro */ 1706 /* have to use the microsoft-never-gets-it-right macro */
1707 array_free (rfeed, EMPTY);
1413 array_free (fdchange, EMPTY); 1708 array_free (fdchange, EMPTY);
1414 array_free (timer, EMPTY); 1709 array_free (timer, EMPTY);
1415#if EV_PERIODIC_ENABLE 1710#if EV_PERIODIC_ENABLE
1416 array_free (periodic, EMPTY); 1711 array_free (periodic, EMPTY);
1417#endif 1712#endif
… …
1426 1721
1427 backend = 0; 1722 backend = 0;
1428} 1723}
1429 1724
1430#if EV_USE_INOTIFY 1725#if EV_USE_INOTIFY
1431void inline_size infy_fork (EV_P); 1726inline_size void infy_fork (EV_P);
1432#endif 1727#endif
1433 1728
1434void inline_size 1729inline_size void
1435loop_fork (EV_P) 1730loop_fork (EV_P)
1436{ 1731{
1437#if EV_USE_PORT 1732#if EV_USE_PORT
1438 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1733 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1439#endif 1734#endif
… …
1445#endif 1740#endif
1446#if EV_USE_INOTIFY 1741#if EV_USE_INOTIFY
1447 infy_fork (EV_A); 1742 infy_fork (EV_A);
1448#endif 1743#endif
1449 1744
1450 if (ev_is_active (&pipeev)) 1745 if (ev_is_active (&pipe_w))
1451 { 1746 {
1452 /* this "locks" the handlers against writing to the pipe */ 1747 /* this "locks" the handlers against writing to the pipe */
1453 /* while we modify the fd vars */ 1748 /* while we modify the fd vars */
1454 gotsig = 1; 1749 sig_pending = 1;
1455#if EV_ASYNC_ENABLE 1750#if EV_ASYNC_ENABLE
1456 gotasync = 1; 1751 async_pending = 1;
1457#endif 1752#endif
1458 1753
1459 ev_ref (EV_A); 1754 ev_ref (EV_A);
1460 ev_io_stop (EV_A_ &pipeev); 1755 ev_io_stop (EV_A_ &pipe_w);
1461 1756
1462#if EV_USE_EVENTFD 1757#if EV_USE_EVENTFD
1463 if (evfd >= 0) 1758 if (evfd >= 0)
1464 close (evfd); 1759 close (evfd);
1465#endif 1760#endif
1466 1761
1467 if (evpipe [0] >= 0) 1762 if (evpipe [0] >= 0)
1468 { 1763 {
1469 close (evpipe [0]); 1764 EV_WIN32_CLOSE_FD (evpipe [0]);
1470 close (evpipe [1]); 1765 EV_WIN32_CLOSE_FD (evpipe [1]);
1471 } 1766 }
1472 1767
1473 evpipe_init (EV_A); 1768 evpipe_init (EV_A);
1474 /* now iterate over everything, in case we missed something */ 1769 /* now iterate over everything, in case we missed something */
1475 pipecb (EV_A_ &pipeev, EV_READ); 1770 pipecb (EV_A_ &pipe_w, EV_READ);
1476 } 1771 }
1477 1772
1478 postfork = 0; 1773 postfork = 0;
1479} 1774}
1480 1775
1481#if EV_MULTIPLICITY 1776#if EV_MULTIPLICITY
1482 1777
1483struct ev_loop * 1778struct ev_loop *
1484ev_loop_new (unsigned int flags) 1779ev_loop_new (unsigned int flags)
1485{ 1780{
1486 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1781 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1487 1782
1488 memset (loop, 0, sizeof (struct ev_loop)); 1783 memset (EV_A, 0, sizeof (struct ev_loop));
1489
1490 loop_init (EV_A_ flags); 1784 loop_init (EV_A_ flags);
1491 1785
1492 if (ev_backend (EV_A)) 1786 if (ev_backend (EV_A))
1493 return loop; 1787 return EV_A;
1494 1788
1495 return 0; 1789 return 0;
1496} 1790}
1497 1791
1498void 1792void
… …
1505void 1799void
1506ev_loop_fork (EV_P) 1800ev_loop_fork (EV_P)
1507{ 1801{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1802 postfork = 1; /* must be in line with ev_default_fork */
1509} 1803}
1804#endif /* multiplicity */
1510 1805
1511#if EV_VERIFY 1806#if EV_VERIFY
1512void noinline 1807static void noinline
1513verify_watcher (EV_P_ W w) 1808verify_watcher (EV_P_ W w)
1514{ 1809{
1515 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1810 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516 1811
1517 if (w->pending) 1812 if (w->pending)
1518 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1813 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1519} 1814}
1520 1815
1521static void noinline 1816static void noinline
1522verify_heap (EV_P_ ANHE *heap, int N) 1817verify_heap (EV_P_ ANHE *heap, int N)
1523{ 1818{
1524 int i; 1819 int i;
1525 1820
1526 for (i = HEAP0; i < N + HEAP0; ++i) 1821 for (i = HEAP0; i < N + HEAP0; ++i)
1527 { 1822 {
1528 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1823 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]))); 1824 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])))); 1825 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1531 1826
1532 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1827 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1533 } 1828 }
1534} 1829}
1535 1830
1536static void noinline 1831static void noinline
1537array_verify (EV_P_ W *ws, int cnt) 1832array_verify (EV_P_ W *ws, int cnt)
1538{ 1833{
1539 while (cnt--) 1834 while (cnt--)
1540 { 1835 {
1541 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1836 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1542 verify_watcher (EV_A_ ws [cnt]); 1837 verify_watcher (EV_A_ ws [cnt]);
1543 } 1838 }
1544} 1839}
1545#endif 1840#endif
1546 1841
1842#if EV_MINIMAL < 2
1547void 1843void
1548ev_loop_verify (EV_P) 1844ev_loop_verify (EV_P)
1549{ 1845{
1550#if EV_VERIFY 1846#if EV_VERIFY
1551 int i; 1847 int i;
… …
1553 1849
1554 assert (activecnt >= -1); 1850 assert (activecnt >= -1);
1555 1851
1556 assert (fdchangemax >= fdchangecnt); 1852 assert (fdchangemax >= fdchangecnt);
1557 for (i = 0; i < fdchangecnt; ++i) 1853 for (i = 0; i < fdchangecnt; ++i)
1558 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1854 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1559 1855
1560 assert (anfdmax >= 0); 1856 assert (anfdmax >= 0);
1561 for (i = 0; i < anfdmax; ++i) 1857 for (i = 0; i < anfdmax; ++i)
1562 for (w = anfds [i].head; w; w = w->next) 1858 for (w = anfds [i].head; w; w = w->next)
1563 { 1859 {
1564 verify_watcher (EV_A_ (W)w); 1860 verify_watcher (EV_A_ (W)w);
1565 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1861 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)); 1862 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1567 } 1863 }
1568 1864
1569 assert (timermax >= timercnt); 1865 assert (timermax >= timercnt);
1570 verify_heap (EV_A_ timers, timercnt); 1866 verify_heap (EV_A_ timers, timercnt);
1571 1867
… …
1600 assert (checkmax >= checkcnt); 1896 assert (checkmax >= checkcnt);
1601 array_verify (EV_A_ (W *)checks, checkcnt); 1897 array_verify (EV_A_ (W *)checks, checkcnt);
1602 1898
1603# if 0 1899# if 0
1604 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1900 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) 1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1606# endif
1607#endif 1902# endif
1903#endif
1608} 1904}
1609 1905#endif
1610#endif /* multiplicity */
1611 1906
1612#if EV_MULTIPLICITY 1907#if EV_MULTIPLICITY
1613struct ev_loop * 1908struct ev_loop *
1614ev_default_loop_init (unsigned int flags) 1909ev_default_loop_init (unsigned int flags)
1615#else 1910#else
… …
1618#endif 1913#endif
1619{ 1914{
1620 if (!ev_default_loop_ptr) 1915 if (!ev_default_loop_ptr)
1621 { 1916 {
1622#if EV_MULTIPLICITY 1917#if EV_MULTIPLICITY
1623 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1918 EV_P = ev_default_loop_ptr = &default_loop_struct;
1624#else 1919#else
1625 ev_default_loop_ptr = 1; 1920 ev_default_loop_ptr = 1;
1626#endif 1921#endif
1627 1922
1628 loop_init (EV_A_ flags); 1923 loop_init (EV_A_ flags);
… …
1645 1940
1646void 1941void
1647ev_default_destroy (void) 1942ev_default_destroy (void)
1648{ 1943{
1649#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1650 struct ev_loop *loop = ev_default_loop_ptr; 1945 EV_P = ev_default_loop_ptr;
1651#endif 1946#endif
1947
1948 ev_default_loop_ptr = 0;
1652 1949
1653#ifndef _WIN32 1950#ifndef _WIN32
1654 ev_ref (EV_A); /* child watcher */ 1951 ev_ref (EV_A); /* child watcher */
1655 ev_signal_stop (EV_A_ &childev); 1952 ev_signal_stop (EV_A_ &childev);
1656#endif 1953#endif
… …
1660 1957
1661void 1958void
1662ev_default_fork (void) 1959ev_default_fork (void)
1663{ 1960{
1664#if EV_MULTIPLICITY 1961#if EV_MULTIPLICITY
1665 struct ev_loop *loop = ev_default_loop_ptr; 1962 EV_P = ev_default_loop_ptr;
1666#endif 1963#endif
1667 1964
1668 if (backend)
1669 postfork = 1; /* must be in line with ev_loop_fork */ 1965 postfork = 1; /* must be in line with ev_loop_fork */
1670} 1966}
1671 1967
1672/*****************************************************************************/ 1968/*****************************************************************************/
1673 1969
1674void 1970void
1675ev_invoke (EV_P_ void *w, int revents) 1971ev_invoke (EV_P_ void *w, int revents)
1676{ 1972{
1677 EV_CB_INVOKE ((W)w, revents); 1973 EV_CB_INVOKE ((W)w, revents);
1678} 1974}
1679 1975
1680void inline_speed 1976unsigned int
1681call_pending (EV_P) 1977ev_pending_count (EV_P)
1978{
1979 int pri;
1980 unsigned int count = 0;
1981
1982 for (pri = NUMPRI; pri--; )
1983 count += pendingcnt [pri];
1984
1985 return count;
1986}
1987
1988void noinline
1989ev_invoke_pending (EV_P)
1682{ 1990{
1683 int pri; 1991 int pri;
1684 1992
1685 for (pri = NUMPRI; pri--; ) 1993 for (pri = NUMPRI; pri--; )
1686 while (pendingcnt [pri]) 1994 while (pendingcnt [pri])
1687 { 1995 {
1688 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1996 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1689 1997
1690 if (expect_true (p->w))
1691 {
1692 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1998 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1999 /* ^ this is no longer true, as pending_w could be here */
1693 2000
1694 p->w->pending = 0; 2001 p->w->pending = 0;
1695 EV_CB_INVOKE (p->w, p->events); 2002 EV_CB_INVOKE (p->w, p->events);
1696 EV_FREQUENT_CHECK; 2003 EV_FREQUENT_CHECK;
1697 }
1698 } 2004 }
1699} 2005}
1700 2006
1701#if EV_IDLE_ENABLE 2007#if EV_IDLE_ENABLE
1702void inline_size 2008/* make idle watchers pending. this handles the "call-idle */
2009/* only when higher priorities are idle" logic */
2010inline_size void
1703idle_reify (EV_P) 2011idle_reify (EV_P)
1704{ 2012{
1705 if (expect_false (idleall)) 2013 if (expect_false (idleall))
1706 { 2014 {
1707 int pri; 2015 int pri;
… …
1719 } 2027 }
1720 } 2028 }
1721} 2029}
1722#endif 2030#endif
1723 2031
1724void inline_size 2032/* make timers pending */
2033inline_size void
1725timers_reify (EV_P) 2034timers_reify (EV_P)
1726{ 2035{
1727 EV_FREQUENT_CHECK; 2036 EV_FREQUENT_CHECK;
1728 2037
1729 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2038 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1730 { 2039 {
1731 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2040 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 { 2041 {
2042 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2043
2044 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2045
2046 /* first reschedule or stop timer */
2047 if (w->repeat)
2048 {
1738 ev_at (w) += w->repeat; 2049 ev_at (w) += w->repeat;
1739 if (ev_at (w) < mn_now) 2050 if (ev_at (w) < mn_now)
1740 ev_at (w) = mn_now; 2051 ev_at (w) = mn_now;
1741 2052
1742 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2053 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1743 2054
1744 ANHE_at_cache (timers [HEAP0]); 2055 ANHE_at_cache (timers [HEAP0]);
1745 downheap (timers, timercnt, HEAP0); 2056 downheap (timers, timercnt, HEAP0);
2057 }
2058 else
2059 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2060
2061 EV_FREQUENT_CHECK;
2062 feed_reverse (EV_A_ (W)w);
1746 } 2063 }
1747 else 2064 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1748 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1749 2065
1750 EV_FREQUENT_CHECK;
1751 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2066 feed_reverse_done (EV_A_ EV_TIMEOUT);
1752 } 2067 }
1753} 2068}
1754 2069
1755#if EV_PERIODIC_ENABLE 2070#if EV_PERIODIC_ENABLE
1756void inline_size 2071/* make periodics pending */
2072inline_size void
1757periodics_reify (EV_P) 2073periodics_reify (EV_P)
1758{ 2074{
1759 EV_FREQUENT_CHECK; 2075 EV_FREQUENT_CHECK;
1760 2076
1761 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2077 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1762 { 2078 {
1763 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2079 int feed_count = 0;
1764 2080
1765 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2081 do
1766
1767 /* first reschedule or stop timer */
1768 if (w->reschedule_cb)
1769 { 2082 {
2083 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2084
2085 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2086
2087 /* first reschedule or stop timer */
2088 if (w->reschedule_cb)
2089 {
1770 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2090 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1771 2091
1772 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2092 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1773 2093
1774 ANHE_at_cache (periodics [HEAP0]); 2094 ANHE_at_cache (periodics [HEAP0]);
1775 downheap (periodics, periodiccnt, HEAP0); 2095 downheap (periodics, periodiccnt, HEAP0);
2096 }
2097 else if (w->interval)
2098 {
2099 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2100 /* if next trigger time is not sufficiently in the future, put it there */
2101 /* this might happen because of floating point inexactness */
2102 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2103 {
2104 ev_at (w) += w->interval;
2105
2106 /* if interval is unreasonably low we might still have a time in the past */
2107 /* so correct this. this will make the periodic very inexact, but the user */
2108 /* has effectively asked to get triggered more often than possible */
2109 if (ev_at (w) < ev_rt_now)
2110 ev_at (w) = ev_rt_now;
2111 }
2112
2113 ANHE_at_cache (periodics [HEAP0]);
2114 downheap (periodics, periodiccnt, HEAP0);
2115 }
2116 else
2117 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2118
2119 EV_FREQUENT_CHECK;
2120 feed_reverse (EV_A_ (W)w);
1776 } 2121 }
1777 else if (w->interval) 2122 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 2123
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); 2124 feed_reverse_done (EV_A_ EV_PERIODIC);
1801 } 2125 }
1802} 2126}
1803 2127
2128/* simply recalculate all periodics */
2129/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1804static void noinline 2130static void noinline
1805periodics_reschedule (EV_P) 2131periodics_reschedule (EV_P)
1806{ 2132{
1807 int i; 2133 int i;
1808 2134
… …
1821 2147
1822 reheap (periodics, periodiccnt); 2148 reheap (periodics, periodiccnt);
1823} 2149}
1824#endif 2150#endif
1825 2151
1826void inline_speed 2152/* adjust all timers by a given offset */
2153static void noinline
2154timers_reschedule (EV_P_ ev_tstamp adjust)
2155{
2156 int i;
2157
2158 for (i = 0; i < timercnt; ++i)
2159 {
2160 ANHE *he = timers + i + HEAP0;
2161 ANHE_w (*he)->at += adjust;
2162 ANHE_at_cache (*he);
2163 }
2164}
2165
2166/* fetch new monotonic and realtime times from the kernel */
2167/* also detetc if there was a timejump, and act accordingly */
2168inline_speed void
1827time_update (EV_P_ ev_tstamp max_block) 2169time_update (EV_P_ ev_tstamp max_block)
1828{ 2170{
1829 int i;
1830
1831#if EV_USE_MONOTONIC 2171#if EV_USE_MONOTONIC
1832 if (expect_true (have_monotonic)) 2172 if (expect_true (have_monotonic))
1833 { 2173 {
2174 int i;
1834 ev_tstamp odiff = rtmn_diff; 2175 ev_tstamp odiff = rtmn_diff;
1835 2176
1836 mn_now = get_clock (); 2177 mn_now = get_clock ();
1837 2178
1838 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2179 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1864 ev_rt_now = ev_time (); 2205 ev_rt_now = ev_time ();
1865 mn_now = get_clock (); 2206 mn_now = get_clock ();
1866 now_floor = mn_now; 2207 now_floor = mn_now;
1867 } 2208 }
1868 2209
2210 /* no timer adjustment, as the monotonic clock doesn't jump */
2211 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1869# if EV_PERIODIC_ENABLE 2212# if EV_PERIODIC_ENABLE
1870 periodics_reschedule (EV_A); 2213 periodics_reschedule (EV_A);
1871# endif 2214# endif
1872 /* no timer adjustment, as the monotonic clock doesn't jump */
1873 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1874 } 2215 }
1875 else 2216 else
1876#endif 2217#endif
1877 { 2218 {
1878 ev_rt_now = ev_time (); 2219 ev_rt_now = ev_time ();
1879 2220
1880 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2221 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1881 { 2222 {
2223 /* adjust timers. this is easy, as the offset is the same for all of them */
2224 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1882#if EV_PERIODIC_ENABLE 2225#if EV_PERIODIC_ENABLE
1883 periodics_reschedule (EV_A); 2226 periodics_reschedule (EV_A);
1884#endif 2227#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 } 2228 }
1893 2229
1894 mn_now = ev_rt_now; 2230 mn_now = ev_rt_now;
1895 } 2231 }
1896} 2232}
1897 2233
1898void 2234void
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) 2235ev_loop (EV_P_ int flags)
1914{ 2236{
2237#if EV_MINIMAL < 2
2238 ++loop_depth;
2239#endif
2240
2241 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2242
1915 loop_done = EVUNLOOP_CANCEL; 2243 loop_done = EVUNLOOP_CANCEL;
1916 2244
1917 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2245 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1918 2246
1919 do 2247 do
1920 { 2248 {
1921#if EV_VERIFY >= 2 2249#if EV_VERIFY >= 2
1922 ev_loop_verify (EV_A); 2250 ev_loop_verify (EV_A);
… …
1935 /* we might have forked, so queue fork handlers */ 2263 /* we might have forked, so queue fork handlers */
1936 if (expect_false (postfork)) 2264 if (expect_false (postfork))
1937 if (forkcnt) 2265 if (forkcnt)
1938 { 2266 {
1939 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1940 call_pending (EV_A); 2268 EV_INVOKE_PENDING;
1941 } 2269 }
1942#endif 2270#endif
1943 2271
1944 /* queue prepare watchers (and execute them) */ 2272 /* queue prepare watchers (and execute them) */
1945 if (expect_false (preparecnt)) 2273 if (expect_false (preparecnt))
1946 { 2274 {
1947 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1948 call_pending (EV_A); 2276 EV_INVOKE_PENDING;
1949 } 2277 }
1950 2278
1951 if (expect_false (!activecnt)) 2279 if (expect_false (loop_done))
1952 break; 2280 break;
1953 2281
1954 /* we might have forked, so reify kernel state if necessary */ 2282 /* we might have forked, so reify kernel state if necessary */
1955 if (expect_false (postfork)) 2283 if (expect_false (postfork))
1956 loop_fork (EV_A); 2284 loop_fork (EV_A);
… …
1963 ev_tstamp waittime = 0.; 2291 ev_tstamp waittime = 0.;
1964 ev_tstamp sleeptime = 0.; 2292 ev_tstamp sleeptime = 0.;
1965 2293
1966 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2294 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1967 { 2295 {
2296 /* remember old timestamp for io_blocktime calculation */
2297 ev_tstamp prev_mn_now = mn_now;
2298
1968 /* update time to cancel out callback processing overhead */ 2299 /* update time to cancel out callback processing overhead */
1969 time_update (EV_A_ 1e100); 2300 time_update (EV_A_ 1e100);
1970 2301
1971 waittime = MAX_BLOCKTIME; 2302 waittime = MAX_BLOCKTIME;
1972 2303
… …
1982 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2313 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1983 if (waittime > to) waittime = to; 2314 if (waittime > to) waittime = to;
1984 } 2315 }
1985#endif 2316#endif
1986 2317
2318 /* don't let timeouts decrease the waittime below timeout_blocktime */
1987 if (expect_false (waittime < timeout_blocktime)) 2319 if (expect_false (waittime < timeout_blocktime))
1988 waittime = timeout_blocktime; 2320 waittime = timeout_blocktime;
1989 2321
1990 sleeptime = waittime - backend_fudge; 2322 /* extra check because io_blocktime is commonly 0 */
1991
1992 if (expect_true (sleeptime > io_blocktime)) 2323 if (expect_false (io_blocktime))
1993 sleeptime = io_blocktime;
1994
1995 if (sleeptime)
1996 { 2324 {
2325 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2326
2327 if (sleeptime > waittime - backend_fudge)
2328 sleeptime = waittime - backend_fudge;
2329
2330 if (expect_true (sleeptime > 0.))
2331 {
1997 ev_sleep (sleeptime); 2332 ev_sleep (sleeptime);
1998 waittime -= sleeptime; 2333 waittime -= sleeptime;
2334 }
1999 } 2335 }
2000 } 2336 }
2001 2337
2338#if EV_MINIMAL < 2
2002 ++loop_count; 2339 ++loop_count;
2340#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2003 backend_poll (EV_A_ waittime); 2342 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2004 2344
2005 /* update ev_rt_now, do magic */ 2345 /* update ev_rt_now, do magic */
2006 time_update (EV_A_ waittime + sleeptime); 2346 time_update (EV_A_ waittime + sleeptime);
2007 } 2347 }
2008 2348
… …
2019 2359
2020 /* queue check watchers, to be executed first */ 2360 /* queue check watchers, to be executed first */
2021 if (expect_false (checkcnt)) 2361 if (expect_false (checkcnt))
2022 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2023 2363
2024 call_pending (EV_A); 2364 EV_INVOKE_PENDING;
2025 } 2365 }
2026 while (expect_true ( 2366 while (expect_true (
2027 activecnt 2367 activecnt
2028 && !loop_done 2368 && !loop_done
2029 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2369 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2030 )); 2370 ));
2031 2371
2032 if (loop_done == EVUNLOOP_ONE) 2372 if (loop_done == EVUNLOOP_ONE)
2033 loop_done = EVUNLOOP_CANCEL; 2373 loop_done = EVUNLOOP_CANCEL;
2374
2375#if EV_MINIMAL < 2
2376 --loop_depth;
2377#endif
2034} 2378}
2035 2379
2036void 2380void
2037ev_unloop (EV_P_ int how) 2381ev_unloop (EV_P_ int how)
2038{ 2382{
2039 loop_done = how; 2383 loop_done = how;
2040} 2384}
2041 2385
2386void
2387ev_ref (EV_P)
2388{
2389 ++activecnt;
2390}
2391
2392void
2393ev_unref (EV_P)
2394{
2395 --activecnt;
2396}
2397
2398void
2399ev_now_update (EV_P)
2400{
2401 time_update (EV_A_ 1e100);
2402}
2403
2404void
2405ev_suspend (EV_P)
2406{
2407 ev_now_update (EV_A);
2408}
2409
2410void
2411ev_resume (EV_P)
2412{
2413 ev_tstamp mn_prev = mn_now;
2414
2415 ev_now_update (EV_A);
2416 timers_reschedule (EV_A_ mn_now - mn_prev);
2417#if EV_PERIODIC_ENABLE
2418 /* TODO: really do this? */
2419 periodics_reschedule (EV_A);
2420#endif
2421}
2422
2042/*****************************************************************************/ 2423/*****************************************************************************/
2424/* singly-linked list management, used when the expected list length is short */
2043 2425
2044void inline_size 2426inline_size void
2045wlist_add (WL *head, WL elem) 2427wlist_add (WL *head, WL elem)
2046{ 2428{
2047 elem->next = *head; 2429 elem->next = *head;
2048 *head = elem; 2430 *head = elem;
2049} 2431}
2050 2432
2051void inline_size 2433inline_size void
2052wlist_del (WL *head, WL elem) 2434wlist_del (WL *head, WL elem)
2053{ 2435{
2054 while (*head) 2436 while (*head)
2055 { 2437 {
2056 if (*head == elem) 2438 if (expect_true (*head == elem))
2057 { 2439 {
2058 *head = elem->next; 2440 *head = elem->next;
2059 return; 2441 break;
2060 } 2442 }
2061 2443
2062 head = &(*head)->next; 2444 head = &(*head)->next;
2063 } 2445 }
2064} 2446}
2065 2447
2066void inline_speed 2448/* internal, faster, version of ev_clear_pending */
2449inline_speed void
2067clear_pending (EV_P_ W w) 2450clear_pending (EV_P_ W w)
2068{ 2451{
2069 if (w->pending) 2452 if (w->pending)
2070 { 2453 {
2071 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2454 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2072 w->pending = 0; 2455 w->pending = 0;
2073 } 2456 }
2074} 2457}
2075 2458
2076int 2459int
… …
2080 int pending = w_->pending; 2463 int pending = w_->pending;
2081 2464
2082 if (expect_true (pending)) 2465 if (expect_true (pending))
2083 { 2466 {
2084 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2467 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2468 p->w = (W)&pending_w;
2085 w_->pending = 0; 2469 w_->pending = 0;
2086 p->w = 0;
2087 return p->events; 2470 return p->events;
2088 } 2471 }
2089 else 2472 else
2090 return 0; 2473 return 0;
2091} 2474}
2092 2475
2093void inline_size 2476inline_size void
2094pri_adjust (EV_P_ W w) 2477pri_adjust (EV_P_ W w)
2095{ 2478{
2096 int pri = w->priority; 2479 int pri = ev_priority (w);
2097 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2480 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2098 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2481 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2099 w->priority = pri; 2482 ev_set_priority (w, pri);
2100} 2483}
2101 2484
2102void inline_speed 2485inline_speed void
2103ev_start (EV_P_ W w, int active) 2486ev_start (EV_P_ W w, int active)
2104{ 2487{
2105 pri_adjust (EV_A_ w); 2488 pri_adjust (EV_A_ w);
2106 w->active = active; 2489 w->active = active;
2107 ev_ref (EV_A); 2490 ev_ref (EV_A);
2108} 2491}
2109 2492
2110void inline_size 2493inline_size void
2111ev_stop (EV_P_ W w) 2494ev_stop (EV_P_ W w)
2112{ 2495{
2113 ev_unref (EV_A); 2496 ev_unref (EV_A);
2114 w->active = 0; 2497 w->active = 0;
2115} 2498}
… …
2122 int fd = w->fd; 2505 int fd = w->fd;
2123 2506
2124 if (expect_false (ev_is_active (w))) 2507 if (expect_false (ev_is_active (w)))
2125 return; 2508 return;
2126 2509
2127 assert (("ev_io_start called with negative fd", fd >= 0)); 2510 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2511 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2128 2512
2129 EV_FREQUENT_CHECK; 2513 EV_FREQUENT_CHECK;
2130 2514
2131 ev_start (EV_A_ (W)w, 1); 2515 ev_start (EV_A_ (W)w, 1);
2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133 wlist_add (&anfds[fd].head, (WL)w); 2517 wlist_add (&anfds[fd].head, (WL)w);
2134 2518
2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2519 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2136 w->events &= ~EV_IOFDSET; 2520 w->events &= ~EV__IOFDSET;
2137 2521
2138 EV_FREQUENT_CHECK; 2522 EV_FREQUENT_CHECK;
2139} 2523}
2140 2524
2141void noinline 2525void noinline
… …
2143{ 2527{
2144 clear_pending (EV_A_ (W)w); 2528 clear_pending (EV_A_ (W)w);
2145 if (expect_false (!ev_is_active (w))) 2529 if (expect_false (!ev_is_active (w)))
2146 return; 2530 return;
2147 2531
2148 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2532 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2149 2533
2150 EV_FREQUENT_CHECK; 2534 EV_FREQUENT_CHECK;
2151 2535
2152 wlist_del (&anfds[w->fd].head, (WL)w); 2536 wlist_del (&anfds[w->fd].head, (WL)w);
2153 ev_stop (EV_A_ (W)w); 2537 ev_stop (EV_A_ (W)w);
… …
2163 if (expect_false (ev_is_active (w))) 2547 if (expect_false (ev_is_active (w)))
2164 return; 2548 return;
2165 2549
2166 ev_at (w) += mn_now; 2550 ev_at (w) += mn_now;
2167 2551
2168 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2552 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2169 2553
2170 EV_FREQUENT_CHECK; 2554 EV_FREQUENT_CHECK;
2171 2555
2172 ++timercnt; 2556 ++timercnt;
2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2557 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2176 ANHE_at_cache (timers [ev_active (w)]); 2560 ANHE_at_cache (timers [ev_active (w)]);
2177 upheap (timers, ev_active (w)); 2561 upheap (timers, ev_active (w));
2178 2562
2179 EV_FREQUENT_CHECK; 2563 EV_FREQUENT_CHECK;
2180 2564
2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2565 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2182} 2566}
2183 2567
2184void noinline 2568void noinline
2185ev_timer_stop (EV_P_ ev_timer *w) 2569ev_timer_stop (EV_P_ ev_timer *w)
2186{ 2570{
… …
2191 EV_FREQUENT_CHECK; 2575 EV_FREQUENT_CHECK;
2192 2576
2193 { 2577 {
2194 int active = ev_active (w); 2578 int active = ev_active (w);
2195 2579
2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2580 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2197 2581
2198 --timercnt; 2582 --timercnt;
2199 2583
2200 if (expect_true (active < timercnt + HEAP0)) 2584 if (expect_true (active < timercnt + HEAP0))
2201 { 2585 {
… …
2234 } 2618 }
2235 2619
2236 EV_FREQUENT_CHECK; 2620 EV_FREQUENT_CHECK;
2237} 2621}
2238 2622
2623ev_tstamp
2624ev_timer_remaining (EV_P_ ev_timer *w)
2625{
2626 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2627}
2628
2239#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2240void noinline 2630void noinline
2241ev_periodic_start (EV_P_ ev_periodic *w) 2631ev_periodic_start (EV_P_ ev_periodic *w)
2242{ 2632{
2243 if (expect_false (ev_is_active (w))) 2633 if (expect_false (ev_is_active (w)))
… …
2245 2635
2246 if (w->reschedule_cb) 2636 if (w->reschedule_cb)
2247 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2637 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2248 else if (w->interval) 2638 else if (w->interval)
2249 { 2639 {
2250 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2640 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 */ 2641 /* 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; 2642 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2253 } 2643 }
2254 else 2644 else
2255 ev_at (w) = w->offset; 2645 ev_at (w) = w->offset;
… …
2263 ANHE_at_cache (periodics [ev_active (w)]); 2653 ANHE_at_cache (periodics [ev_active (w)]);
2264 upheap (periodics, ev_active (w)); 2654 upheap (periodics, ev_active (w));
2265 2655
2266 EV_FREQUENT_CHECK; 2656 EV_FREQUENT_CHECK;
2267 2657
2268 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2658 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2269} 2659}
2270 2660
2271void noinline 2661void noinline
2272ev_periodic_stop (EV_P_ ev_periodic *w) 2662ev_periodic_stop (EV_P_ ev_periodic *w)
2273{ 2663{
… …
2278 EV_FREQUENT_CHECK; 2668 EV_FREQUENT_CHECK;
2279 2669
2280 { 2670 {
2281 int active = ev_active (w); 2671 int active = ev_active (w);
2282 2672
2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2673 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2284 2674
2285 --periodiccnt; 2675 --periodiccnt;
2286 2676
2287 if (expect_true (active < periodiccnt + HEAP0)) 2677 if (expect_true (active < periodiccnt + HEAP0))
2288 { 2678 {
… …
2310#endif 2700#endif
2311 2701
2312void noinline 2702void noinline
2313ev_signal_start (EV_P_ ev_signal *w) 2703ev_signal_start (EV_P_ ev_signal *w)
2314{ 2704{
2315#if EV_MULTIPLICITY
2316 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2317#endif
2318 if (expect_false (ev_is_active (w))) 2705 if (expect_false (ev_is_active (w)))
2319 return; 2706 return;
2320 2707
2321 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2708 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2322 2709
2323 evpipe_init (EV_A); 2710#if EV_MULTIPLICITY
2711 assert (("libev: a signal must not be attached to two different loops",
2712 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2324 2713
2325 EV_FREQUENT_CHECK; 2714 signals [w->signum - 1].loop = EV_A;
2715#endif
2326 2716
2717 EV_FREQUENT_CHECK;
2718
2719#if EV_USE_SIGNALFD
2720 if (sigfd == -2)
2327 { 2721 {
2328#ifndef _WIN32 2722 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2329 sigset_t full, prev; 2723 if (sigfd < 0 && errno == EINVAL)
2330 sigfillset (&full); 2724 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2331 sigprocmask (SIG_SETMASK, &full, &prev);
2332#endif
2333 2725
2334 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2726 if (sigfd >= 0)
2727 {
2728 fd_intern (sigfd); /* doing it twice will not hurt */
2335 2729
2336#ifndef _WIN32 2730 sigemptyset (&sigfd_set);
2337 sigprocmask (SIG_SETMASK, &prev, 0); 2731
2338#endif 2732 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2733 ev_set_priority (&sigfd_w, EV_MAXPRI);
2734 ev_io_start (EV_A_ &sigfd_w);
2735 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2736 }
2339 } 2737 }
2738
2739 if (sigfd >= 0)
2740 {
2741 /* TODO: check .head */
2742 sigaddset (&sigfd_set, w->signum);
2743 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2744
2745 signalfd (sigfd, &sigfd_set, 0);
2746 }
2747#endif
2340 2748
2341 ev_start (EV_A_ (W)w, 1); 2749 ev_start (EV_A_ (W)w, 1);
2342 wlist_add (&signals [w->signum - 1].head, (WL)w); 2750 wlist_add (&signals [w->signum - 1].head, (WL)w);
2343 2751
2344 if (!((WL)w)->next) 2752 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/
2755# endif
2345 { 2756 {
2346#if _WIN32 2757# if _WIN32
2347 signal (w->signum, ev_sighandler); 2758 signal (w->signum, ev_sighandler);
2348#else 2759# else
2349 struct sigaction sa; 2760 struct sigaction sa;
2761
2762 evpipe_init (EV_A);
2763
2350 sa.sa_handler = ev_sighandler; 2764 sa.sa_handler = ev_sighandler;
2351 sigfillset (&sa.sa_mask); 2765 sigfillset (&sa.sa_mask);
2352 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2766 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2353 sigaction (w->signum, &sa, 0); 2767 sigaction (w->signum, &sa, 0);
2768
2769 sigemptyset (&sa.sa_mask);
2770 sigaddset (&sa.sa_mask, w->signum);
2771 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2354#endif 2772#endif
2355 } 2773 }
2356 2774
2357 EV_FREQUENT_CHECK; 2775 EV_FREQUENT_CHECK;
2358} 2776}
2359 2777
2360void noinline 2778void noinline
… …
2368 2786
2369 wlist_del (&signals [w->signum - 1].head, (WL)w); 2787 wlist_del (&signals [w->signum - 1].head, (WL)w);
2370 ev_stop (EV_A_ (W)w); 2788 ev_stop (EV_A_ (W)w);
2371 2789
2372 if (!signals [w->signum - 1].head) 2790 if (!signals [w->signum - 1].head)
2791 {
2792#if EV_MULTIPLICITY
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif
2795#if EV_USE_SIGNALFD
2796 if (sigfd >= 0)
2797 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2799 sigdelset (&sigfd_set, w->signum);
2800 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2802 /*TODO: maybe unblock signal? */
2803 }
2804 else
2805#endif
2373 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2374 2808
2375 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2376} 2810}
2377 2811
2378void 2812void
2379ev_child_start (EV_P_ ev_child *w) 2813ev_child_start (EV_P_ ev_child *w)
2380{ 2814{
2381#if EV_MULTIPLICITY 2815#if EV_MULTIPLICITY
2382 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2816 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2383#endif 2817#endif
2384 if (expect_false (ev_is_active (w))) 2818 if (expect_false (ev_is_active (w)))
2385 return; 2819 return;
2386 2820
2387 EV_FREQUENT_CHECK; 2821 EV_FREQUENT_CHECK;
… …
2412# ifdef _WIN32 2846# ifdef _WIN32
2413# undef lstat 2847# undef lstat
2414# define lstat(a,b) _stati64 (a,b) 2848# define lstat(a,b) _stati64 (a,b)
2415# endif 2849# endif
2416 2850
2417#define DEF_STAT_INTERVAL 5.0074891 2851#define DEF_STAT_INTERVAL 5.0074891
2852#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2418#define MIN_STAT_INTERVAL 0.1074891 2853#define MIN_STAT_INTERVAL 0.1074891
2419 2854
2420static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2421 2856
2422#if EV_USE_INOTIFY 2857#if EV_USE_INOTIFY
2423# define EV_INOTIFY_BUFSIZE 8192 2858# define EV_INOTIFY_BUFSIZE 8192
… …
2427{ 2862{
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); 2863 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 2864
2430 if (w->wd < 0) 2865 if (w->wd < 0)
2431 { 2866 {
2867 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 */ 2868 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2433 2869
2434 /* monitor some parent directory for speedup hints */ 2870 /* monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2871 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2436 /* but an efficiency issue only */ 2872 /* but an efficiency issue only */
2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2873 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2438 { 2874 {
2439 char path [4096]; 2875 char path [4096];
2440 strcpy (path, w->path); 2876 strcpy (path, w->path);
… …
2444 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2880 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2445 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2881 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2446 2882
2447 char *pend = strrchr (path, '/'); 2883 char *pend = strrchr (path, '/');
2448 2884
2449 if (!pend) 2885 if (!pend || pend == path)
2450 break; /* whoops, no '/', complain to your admin */ 2886 break;
2451 2887
2452 *pend = 0; 2888 *pend = 0;
2453 w->wd = inotify_add_watch (fs_fd, path, mask); 2889 w->wd = inotify_add_watch (fs_fd, path, mask);
2454 } 2890 }
2455 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2891 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2456 } 2892 }
2457 } 2893 }
2458 else
2459 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2460 2894
2461 if (w->wd >= 0) 2895 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2462 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2900
2901 /* now local changes will be tracked by inotify, but remote changes won't */
2902 /* unless the filesystem it known to be local, we therefore still poll */
2903 /* also do poll on <2.6.25, but with normal frequency */
2904
2905 if (fs_2625 && !statfs (w->path, &sfs))
2906 if (sfs.f_type == 0x1373 /* devfs */
2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2908 || sfs.f_type == 0x3153464a /* jfs */
2909 || sfs.f_type == 0x52654973 /* reiser3 */
2910 || sfs.f_type == 0x01021994 /* tempfs */
2911 || sfs.f_type == 0x58465342 /* xfs */)
2912 return;
2913
2914 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2915 ev_timer_again (EV_A_ &w->timer);
2916 }
2463} 2917}
2464 2918
2465static void noinline 2919static void noinline
2466infy_del (EV_P_ ev_stat *w) 2920infy_del (EV_P_ ev_stat *w)
2467{ 2921{
… …
2481 2935
2482static void noinline 2936static void noinline
2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2937infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484{ 2938{
2485 if (slot < 0) 2939 if (slot < 0)
2486 /* overflow, need to check for all hahs slots */ 2940 /* overflow, need to check for all hash slots */
2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2941 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488 infy_wd (EV_A_ slot, wd, ev); 2942 infy_wd (EV_A_ slot, wd, ev);
2489 else 2943 else
2490 { 2944 {
2491 WL w_; 2945 WL w_;
… …
2497 2951
2498 if (w->wd == wd || wd == -1) 2952 if (w->wd == wd || wd == -1)
2499 { 2953 {
2500 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2954 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2501 { 2955 {
2956 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2502 w->wd = -1; 2957 w->wd = -1;
2503 infy_add (EV_A_ w); /* re-add, no matter what */ 2958 infy_add (EV_A_ w); /* re-add, no matter what */
2504 } 2959 }
2505 2960
2506 stat_timer_cb (EV_A_ &w->timer, 0); 2961 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2519 2974
2520 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2975 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2521 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2976 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2522} 2977}
2523 2978
2524void inline_size 2979inline_size void
2980check_2625 (EV_P)
2981{
2982 /* kernels < 2.6.25 are borked
2983 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2984 */
2985 struct utsname buf;
2986 int major, minor, micro;
2987
2988 if (uname (&buf))
2989 return;
2990
2991 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2992 return;
2993
2994 if (major < 2
2995 || (major == 2 && minor < 6)
2996 || (major == 2 && minor == 6 && micro < 25))
2997 return;
2998
2999 fs_2625 = 1;
3000}
3001
3002inline_size void
2525infy_init (EV_P) 3003infy_init (EV_P)
2526{ 3004{
2527 if (fs_fd != -2) 3005 if (fs_fd != -2)
2528 return; 3006 return;
3007
3008 fs_fd = -1;
3009
3010 check_2625 (EV_A);
2529 3011
2530 fs_fd = inotify_init (); 3012 fs_fd = inotify_init ();
2531 3013
2532 if (fs_fd >= 0) 3014 if (fs_fd >= 0)
2533 { 3015 {
… …
2535 ev_set_priority (&fs_w, EV_MAXPRI); 3017 ev_set_priority (&fs_w, EV_MAXPRI);
2536 ev_io_start (EV_A_ &fs_w); 3018 ev_io_start (EV_A_ &fs_w);
2537 } 3019 }
2538} 3020}
2539 3021
2540void inline_size 3022inline_size void
2541infy_fork (EV_P) 3023infy_fork (EV_P)
2542{ 3024{
2543 int slot; 3025 int slot;
2544 3026
2545 if (fs_fd < 0) 3027 if (fs_fd < 0)
… …
2561 w->wd = -1; 3043 w->wd = -1;
2562 3044
2563 if (fs_fd >= 0) 3045 if (fs_fd >= 0)
2564 infy_add (EV_A_ w); /* re-add, no matter what */ 3046 infy_add (EV_A_ w); /* re-add, no matter what */
2565 else 3047 else
2566 ev_timer_start (EV_A_ &w->timer); 3048 ev_timer_again (EV_A_ &w->timer);
2567 } 3049 }
2568
2569 } 3050 }
2570} 3051}
2571 3052
3053#endif
3054
3055#ifdef _WIN32
3056# define EV_LSTAT(p,b) _stati64 (p, b)
3057#else
3058# define EV_LSTAT(p,b) lstat (p, b)
2572#endif 3059#endif
2573 3060
2574void 3061void
2575ev_stat_stat (EV_P_ ev_stat *w) 3062ev_stat_stat (EV_P_ ev_stat *w)
2576{ 3063{
… …
2603 || w->prev.st_atime != w->attr.st_atime 3090 || w->prev.st_atime != w->attr.st_atime
2604 || w->prev.st_mtime != w->attr.st_mtime 3091 || w->prev.st_mtime != w->attr.st_mtime
2605 || w->prev.st_ctime != w->attr.st_ctime 3092 || w->prev.st_ctime != w->attr.st_ctime
2606 ) { 3093 ) {
2607 #if EV_USE_INOTIFY 3094 #if EV_USE_INOTIFY
3095 if (fs_fd >= 0)
3096 {
2608 infy_del (EV_A_ w); 3097 infy_del (EV_A_ w);
2609 infy_add (EV_A_ w); 3098 infy_add (EV_A_ w);
2610 ev_stat_stat (EV_A_ w); /* avoid race... */ 3099 ev_stat_stat (EV_A_ w); /* avoid race... */
3100 }
2611 #endif 3101 #endif
2612 3102
2613 ev_feed_event (EV_A_ w, EV_STAT); 3103 ev_feed_event (EV_A_ w, EV_STAT);
2614 } 3104 }
2615} 3105}
… …
2618ev_stat_start (EV_P_ ev_stat *w) 3108ev_stat_start (EV_P_ ev_stat *w)
2619{ 3109{
2620 if (expect_false (ev_is_active (w))) 3110 if (expect_false (ev_is_active (w)))
2621 return; 3111 return;
2622 3112
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); 3113 ev_stat_stat (EV_A_ w);
2628 3114
3115 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2629 if (w->interval < MIN_STAT_INTERVAL) 3116 w->interval = MIN_STAT_INTERVAL;
2630 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2631 3117
2632 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3118 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)); 3119 ev_set_priority (&w->timer, ev_priority (w));
2634 3120
2635#if EV_USE_INOTIFY 3121#if EV_USE_INOTIFY
2636 infy_init (EV_A); 3122 infy_init (EV_A);
2637 3123
2638 if (fs_fd >= 0) 3124 if (fs_fd >= 0)
2639 infy_add (EV_A_ w); 3125 infy_add (EV_A_ w);
2640 else 3126 else
2641#endif 3127#endif
2642 ev_timer_start (EV_A_ &w->timer); 3128 ev_timer_again (EV_A_ &w->timer);
2643 3129
2644 ev_start (EV_A_ (W)w, 1); 3130 ev_start (EV_A_ (W)w, 1);
2645 3131
2646 EV_FREQUENT_CHECK; 3132 EV_FREQUENT_CHECK;
2647} 3133}
… …
2807embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3293embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2808{ 3294{
2809 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3295 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2810 3296
2811 { 3297 {
2812 struct ev_loop *loop = w->other; 3298 EV_P = w->other;
2813 3299
2814 while (fdchangecnt) 3300 while (fdchangecnt)
2815 { 3301 {
2816 fd_reify (EV_A); 3302 fd_reify (EV_A);
2817 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3303 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2818 } 3304 }
2819 } 3305 }
2820} 3306}
2821 3307
3308static void
3309embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3310{
3311 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3312
3313 ev_embed_stop (EV_A_ w);
3314
3315 {
3316 EV_P = w->other;
3317
3318 ev_loop_fork (EV_A);
3319 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3320 }
3321
3322 ev_embed_start (EV_A_ w);
3323}
3324
2822#if 0 3325#if 0
2823static void 3326static void
2824embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3327embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2825{ 3328{
2826 ev_idle_stop (EV_A_ idle); 3329 ev_idle_stop (EV_A_ idle);
… …
2832{ 3335{
2833 if (expect_false (ev_is_active (w))) 3336 if (expect_false (ev_is_active (w)))
2834 return; 3337 return;
2835 3338
2836 { 3339 {
2837 struct ev_loop *loop = w->other; 3340 EV_P = w->other;
2838 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3341 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); 3342 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2840 } 3343 }
2841 3344
2842 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
2843 3346
… …
2846 3349
2847 ev_prepare_init (&w->prepare, embed_prepare_cb); 3350 ev_prepare_init (&w->prepare, embed_prepare_cb);
2848 ev_set_priority (&w->prepare, EV_MINPRI); 3351 ev_set_priority (&w->prepare, EV_MINPRI);
2849 ev_prepare_start (EV_A_ &w->prepare); 3352 ev_prepare_start (EV_A_ &w->prepare);
2850 3353
3354 ev_fork_init (&w->fork, embed_fork_cb);
3355 ev_fork_start (EV_A_ &w->fork);
3356
2851 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3357 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2852 3358
2853 ev_start (EV_A_ (W)w, 1); 3359 ev_start (EV_A_ (W)w, 1);
2854 3360
2855 EV_FREQUENT_CHECK; 3361 EV_FREQUENT_CHECK;
… …
2862 if (expect_false (!ev_is_active (w))) 3368 if (expect_false (!ev_is_active (w)))
2863 return; 3369 return;
2864 3370
2865 EV_FREQUENT_CHECK; 3371 EV_FREQUENT_CHECK;
2866 3372
2867 ev_io_stop (EV_A_ &w->io); 3373 ev_io_stop (EV_A_ &w->io);
2868 ev_prepare_stop (EV_A_ &w->prepare); 3374 ev_prepare_stop (EV_A_ &w->prepare);
2869 3375 ev_fork_stop (EV_A_ &w->fork);
2870 ev_stop (EV_A_ (W)w);
2871 3376
2872 EV_FREQUENT_CHECK; 3377 EV_FREQUENT_CHECK;
2873} 3378}
2874#endif 3379#endif
2875 3380
… …
2952 3457
2953void 3458void
2954ev_async_send (EV_P_ ev_async *w) 3459ev_async_send (EV_P_ ev_async *w)
2955{ 3460{
2956 w->sent = 1; 3461 w->sent = 1;
2957 evpipe_write (EV_A_ &gotasync); 3462 evpipe_write (EV_A_ &async_pending);
2958} 3463}
2959#endif 3464#endif
2960 3465
2961/*****************************************************************************/ 3466/*****************************************************************************/
2962 3467
… …
2972once_cb (EV_P_ struct ev_once *once, int revents) 3477once_cb (EV_P_ struct ev_once *once, int revents)
2973{ 3478{
2974 void (*cb)(int revents, void *arg) = once->cb; 3479 void (*cb)(int revents, void *arg) = once->cb;
2975 void *arg = once->arg; 3480 void *arg = once->arg;
2976 3481
2977 ev_io_stop (EV_A_ &once->io); 3482 ev_io_stop (EV_A_ &once->io);
2978 ev_timer_stop (EV_A_ &once->to); 3483 ev_timer_stop (EV_A_ &once->to);
2979 ev_free (once); 3484 ev_free (once);
2980 3485
2981 cb (revents, arg); 3486 cb (revents, arg);
2982} 3487}
2983 3488
2984static void 3489static void
2985once_cb_io (EV_P_ ev_io *w, int revents) 3490once_cb_io (EV_P_ ev_io *w, int revents)
2986{ 3491{
2987 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3492 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3493
3494 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2988} 3495}
2989 3496
2990static void 3497static void
2991once_cb_to (EV_P_ ev_timer *w, int revents) 3498once_cb_to (EV_P_ ev_timer *w, int revents)
2992{ 3499{
2993 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3500 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3501
3502 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2994} 3503}
2995 3504
2996void 3505void
2997ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3506ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2998{ 3507{
… …
3020 ev_timer_set (&once->to, timeout, 0.); 3529 ev_timer_set (&once->to, timeout, 0.);
3021 ev_timer_start (EV_A_ &once->to); 3530 ev_timer_start (EV_A_ &once->to);
3022 } 3531 }
3023} 3532}
3024 3533
3534/*****************************************************************************/
3535
3536#if EV_WALK_ENABLE
3537void
3538ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3539{
3540 int i, j;
3541 ev_watcher_list *wl, *wn;
3542
3543 if (types & (EV_IO | EV_EMBED))
3544 for (i = 0; i < anfdmax; ++i)
3545 for (wl = anfds [i].head; wl; )
3546 {
3547 wn = wl->next;
3548
3549#if EV_EMBED_ENABLE
3550 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3551 {
3552 if (types & EV_EMBED)
3553 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3554 }
3555 else
3556#endif
3557#if EV_USE_INOTIFY
3558 if (ev_cb ((ev_io *)wl) == infy_cb)
3559 ;
3560 else
3561#endif
3562 if ((ev_io *)wl != &pipe_w)
3563 if (types & EV_IO)
3564 cb (EV_A_ EV_IO, wl);
3565
3566 wl = wn;
3567 }
3568
3569 if (types & (EV_TIMER | EV_STAT))
3570 for (i = timercnt + HEAP0; i-- > HEAP0; )
3571#if EV_STAT_ENABLE
3572 /*TODO: timer is not always active*/
3573 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3574 {
3575 if (types & EV_STAT)
3576 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3577 }
3578 else
3579#endif
3580 if (types & EV_TIMER)
3581 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3582
3583#if EV_PERIODIC_ENABLE
3584 if (types & EV_PERIODIC)
3585 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3586 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3587#endif
3588
3589#if EV_IDLE_ENABLE
3590 if (types & EV_IDLE)
3591 for (j = NUMPRI; i--; )
3592 for (i = idlecnt [j]; i--; )
3593 cb (EV_A_ EV_IDLE, idles [j][i]);
3594#endif
3595
3596#if EV_FORK_ENABLE
3597 if (types & EV_FORK)
3598 for (i = forkcnt; i--; )
3599 if (ev_cb (forks [i]) != embed_fork_cb)
3600 cb (EV_A_ EV_FORK, forks [i]);
3601#endif
3602
3603#if EV_ASYNC_ENABLE
3604 if (types & EV_ASYNC)
3605 for (i = asynccnt; i--; )
3606 cb (EV_A_ EV_ASYNC, asyncs [i]);
3607#endif
3608
3609 if (types & EV_PREPARE)
3610 for (i = preparecnt; i--; )
3611#if EV_EMBED_ENABLE
3612 if (ev_cb (prepares [i]) != embed_prepare_cb)
3613#endif
3614 cb (EV_A_ EV_PREPARE, prepares [i]);
3615
3616 if (types & EV_CHECK)
3617 for (i = checkcnt; i--; )
3618 cb (EV_A_ EV_CHECK, checks [i]);
3619
3620 if (types & EV_SIGNAL)
3621 for (i = 0; i < EV_NSIG - 1; ++i)
3622 for (wl = signals [i].head; wl; )
3623 {
3624 wn = wl->next;
3625 cb (EV_A_ EV_SIGNAL, wl);
3626 wl = wn;
3627 }
3628
3629 if (types & EV_CHILD)
3630 for (i = EV_PID_HASHSIZE; i--; )
3631 for (wl = childs [i]; wl; )
3632 {
3633 wn = wl->next;
3634 cb (EV_A_ EV_CHILD, wl);
3635 wl = wn;
3636 }
3637/* EV_STAT 0x00001000 /* stat data changed */
3638/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3639}
3640#endif
3641
3025#if EV_MULTIPLICITY 3642#if EV_MULTIPLICITY
3026 #include "ev_wrap.h" 3643 #include "ev_wrap.h"
3027#endif 3644#endif
3028 3645
3029#ifdef __cplusplus 3646#ifdef __cplusplus

Diff Legend

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