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

Comparing libev/ev.c (file contents):
Revision 1.251 by root, Thu May 22 03:42:34 2008 UTC vs.
Revision 1.313 by root, Wed Aug 19 23:44:51 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 */
167 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
225
168#ifndef EV_USE_MONOTONIC 226#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1
229# else
169# define EV_USE_MONOTONIC 0 230# define EV_USE_MONOTONIC 0
231# endif
170#endif 232#endif
171 233
172#ifndef EV_USE_REALTIME 234#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
174#endif 236#endif
175 237
176#ifndef EV_USE_NANOSLEEP 238#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1
241# else
177# define EV_USE_NANOSLEEP 0 242# define EV_USE_NANOSLEEP 0
243# endif
178#endif 244#endif
179 245
180#ifndef EV_USE_SELECT 246#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 247# define EV_USE_SELECT 1
182#endif 248#endif
… …
235# else 301# else
236# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
237# endif 303# endif
238#endif 304#endif
239 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
240#if 0 /* debugging */ 314#if 0 /* debugging */
241# define EV_VERIFY 3 315# define EV_VERIFY 3
242# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
243# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
244#endif 318#endif
… …
253 327
254#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
255# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
256#endif 330#endif
257 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
258/* 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 */
259 347
260#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
261# undef EV_USE_MONOTONIC 349# undef EV_USE_MONOTONIC
262# define EV_USE_MONOTONIC 0 350# define EV_USE_MONOTONIC 0
… …
277# include <sys/select.h> 365# include <sys/select.h>
278# endif 366# endif
279#endif 367#endif
280 368
281#if EV_USE_INOTIFY 369#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h>
282# 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
283#endif 378#endif
284 379
285#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
286# include <winsock.h> 381# include <winsock.h>
287#endif 382#endif
288 383
289#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
290/* 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 */
291# 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
292# ifdef __cplusplus 397# ifdef __cplusplus
293extern "C" { 398extern "C" {
294# endif 399# endif
295int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
296# ifdef __cplusplus 401# ifdef __cplusplus
297} 402}
298# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
299#endif 408#endif
300 409
301/**/ 410/**/
302 411
303#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
339# define inline_speed static noinline 448# define inline_speed static noinline
340#else 449#else
341# define inline_speed static inline 450# define inline_speed static inline
342#endif 451#endif
343 452
344#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454
455#if EV_MINPRI == EV_MAXPRI
456# define ABSPRI(w) (((W)w), 0)
457#else
345#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
346 460
347#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
348#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
349 463
350typedef ev_watcher *W; 464typedef ev_watcher *W;
… …
352typedef ev_watcher_time *WT; 466typedef ev_watcher_time *WT;
353 467
354#define ev_active(w) ((W)(w))->active 468#define ev_active(w) ((W)(w))->active
355#define ev_at(w) ((WT)(w))->at 469#define ev_at(w) ((WT)(w))->at
356 470
357#if EV_USE_MONOTONIC 471#if EV_USE_REALTIME
358/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 472/* sig_atomic_t is used to avoid per-thread variables or locking but still */
359/* giving it a reasonably high chance of working on typical architetcures */ 473/* giving it a reasonably high chance of working on typical architetcures */
474static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
475#endif
476
477#if EV_USE_MONOTONIC
360static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
479#endif
480
481#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif
484#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
486#endif
487#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd)
361#endif 489#endif
362 490
363#ifdef _WIN32 491#ifdef _WIN32
364# include "ev_win32.c" 492# include "ev_win32.c"
365#endif 493#endif
… …
373{ 501{
374 syserr_cb = cb; 502 syserr_cb = cb;
375} 503}
376 504
377static void noinline 505static void noinline
378syserr (const char *msg) 506ev_syserr (const char *msg)
379{ 507{
380 if (!msg) 508 if (!msg)
381 msg = "(libev) system error"; 509 msg = "(libev) system error";
382 510
383 if (syserr_cb) 511 if (syserr_cb)
… …
429#define ev_malloc(size) ev_realloc (0, (size)) 557#define ev_malloc(size) ev_realloc (0, (size))
430#define ev_free(ptr) ev_realloc ((ptr), 0) 558#define ev_free(ptr) ev_realloc ((ptr), 0)
431 559
432/*****************************************************************************/ 560/*****************************************************************************/
433 561
562/* set in reify when reification needed */
563#define EV_ANFD_REIFY 1
564
565/* file descriptor info structure */
434typedef struct 566typedef struct
435{ 567{
436 WL head; 568 WL head;
437 unsigned char events; 569 unsigned char events; /* the events watched for */
570 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
571 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
438 unsigned char reify; 572 unsigned char unused;
573#if EV_USE_EPOLL
574 unsigned int egen; /* generation counter to counter epoll bugs */
575#endif
439#if EV_SELECT_IS_WINSOCKET 576#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 577 SOCKET handle;
441#endif 578#endif
442} ANFD; 579} ANFD;
443 580
581/* stores the pending event set for a given watcher */
444typedef struct 582typedef struct
445{ 583{
446 W w; 584 W w;
447 int events; 585 int events; /* the pending event set for the given watcher */
448} ANPENDING; 586} ANPENDING;
449 587
450#if EV_USE_INOTIFY 588#if EV_USE_INOTIFY
451/* hash table entry per inotify-id */ 589/* hash table entry per inotify-id */
452typedef struct 590typedef struct
… …
455} ANFS; 593} ANFS;
456#endif 594#endif
457 595
458/* Heap Entry */ 596/* Heap Entry */
459#if EV_HEAP_CACHE_AT 597#if EV_HEAP_CACHE_AT
598 /* a heap element */
460 typedef struct { 599 typedef struct {
461 ev_tstamp at; 600 ev_tstamp at;
462 WT w; 601 WT w;
463 } ANHE; 602 } ANHE;
464 603
465 #define ANHE_w(he) (he).w /* access watcher, read-write */ 604 #define ANHE_w(he) (he).w /* access watcher, read-write */
466 #define ANHE_at(he) (he).at /* access cached at, read-only */ 605 #define ANHE_at(he) (he).at /* access cached at, read-only */
467 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 606 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
468#else 607#else
608 /* a heap element */
469 typedef WT ANHE; 609 typedef WT ANHE;
470 610
471 #define ANHE_w(he) (he) 611 #define ANHE_w(he) (he)
472 #define ANHE_at(he) (he)->at 612 #define ANHE_at(he) (he)->at
473 #define ANHE_at_cache(he) 613 #define ANHE_at_cache(he)
… …
497 637
498 static int ev_default_loop_ptr; 638 static int ev_default_loop_ptr;
499 639
500#endif 640#endif
501 641
642#if EV_MINIMAL < 2
643# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
644# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
645# define EV_INVOKE_PENDING invoke_cb (EV_A)
646#else
647# define EV_RELEASE_CB (void)0
648# define EV_ACQUIRE_CB (void)0
649# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
650#endif
651
652#define EVUNLOOP_RECURSE 0x80
653
502/*****************************************************************************/ 654/*****************************************************************************/
503 655
656#ifndef EV_HAVE_EV_TIME
504ev_tstamp 657ev_tstamp
505ev_time (void) 658ev_time (void)
506{ 659{
507#if EV_USE_REALTIME 660#if EV_USE_REALTIME
661 if (expect_true (have_realtime))
662 {
508 struct timespec ts; 663 struct timespec ts;
509 clock_gettime (CLOCK_REALTIME, &ts); 664 clock_gettime (CLOCK_REALTIME, &ts);
510 return ts.tv_sec + ts.tv_nsec * 1e-9; 665 return ts.tv_sec + ts.tv_nsec * 1e-9;
511#else 666 }
667#endif
668
512 struct timeval tv; 669 struct timeval tv;
513 gettimeofday (&tv, 0); 670 gettimeofday (&tv, 0);
514 return tv.tv_sec + tv.tv_usec * 1e-6; 671 return tv.tv_sec + tv.tv_usec * 1e-6;
515#endif
516} 672}
673#endif
517 674
518ev_tstamp inline_size 675inline_size ev_tstamp
519get_clock (void) 676get_clock (void)
520{ 677{
521#if EV_USE_MONOTONIC 678#if EV_USE_MONOTONIC
522 if (expect_true (have_monotonic)) 679 if (expect_true (have_monotonic))
523 { 680 {
… …
556 struct timeval tv; 713 struct timeval tv;
557 714
558 tv.tv_sec = (time_t)delay; 715 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 716 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 717
718 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
719 /* something not guaranteed by newer posix versions, but guaranteed */
720 /* by older ones */
561 select (0, 0, 0, 0, &tv); 721 select (0, 0, 0, 0, &tv);
562#endif 722#endif
563 } 723 }
564} 724}
565 725
566/*****************************************************************************/ 726/*****************************************************************************/
567 727
568#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 728#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
569 729
570int inline_size 730/* find a suitable new size for the given array, */
731/* hopefully by rounding to a ncie-to-malloc size */
732inline_size int
571array_nextsize (int elem, int cur, int cnt) 733array_nextsize (int elem, int cur, int cnt)
572{ 734{
573 int ncur = cur + 1; 735 int ncur = cur + 1;
574 736
575 do 737 do
… …
592array_realloc (int elem, void *base, int *cur, int cnt) 754array_realloc (int elem, void *base, int *cur, int cnt)
593{ 755{
594 *cur = array_nextsize (elem, *cur, cnt); 756 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 757 return ev_realloc (base, elem * *cur);
596} 758}
759
760#define array_init_zero(base,count) \
761 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 762
598#define array_needsize(type,base,cur,cnt,init) \ 763#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 764 if (expect_false ((cnt) > (cur))) \
600 { \ 765 { \
601 int ocur_ = (cur); \ 766 int ocur_ = (cur); \
… …
613 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 778 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
614 } 779 }
615#endif 780#endif
616 781
617#define array_free(stem, idx) \ 782#define array_free(stem, idx) \
618 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 783 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
619 784
620/*****************************************************************************/ 785/*****************************************************************************/
786
787/* dummy callback for pending events */
788static void noinline
789pendingcb (EV_P_ ev_prepare *w, int revents)
790{
791}
621 792
622void noinline 793void noinline
623ev_feed_event (EV_P_ void *w, int revents) 794ev_feed_event (EV_P_ void *w, int revents)
624{ 795{
625 W w_ = (W)w; 796 W w_ = (W)w;
… …
634 pendings [pri][w_->pending - 1].w = w_; 805 pendings [pri][w_->pending - 1].w = w_;
635 pendings [pri][w_->pending - 1].events = revents; 806 pendings [pri][w_->pending - 1].events = revents;
636 } 807 }
637} 808}
638 809
639void inline_speed 810inline_speed void
811feed_reverse (EV_P_ W w)
812{
813 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
814 rfeeds [rfeedcnt++] = w;
815}
816
817inline_size void
818feed_reverse_done (EV_P_ int revents)
819{
820 do
821 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
822 while (rfeedcnt);
823}
824
825inline_speed void
640queue_events (EV_P_ W *events, int eventcnt, int type) 826queue_events (EV_P_ W *events, int eventcnt, int type)
641{ 827{
642 int i; 828 int i;
643 829
644 for (i = 0; i < eventcnt; ++i) 830 for (i = 0; i < eventcnt; ++i)
645 ev_feed_event (EV_A_ events [i], type); 831 ev_feed_event (EV_A_ events [i], type);
646} 832}
647 833
648/*****************************************************************************/ 834/*****************************************************************************/
649 835
650void inline_size 836inline_speed void
651anfds_init (ANFD *base, int count)
652{
653 while (count--)
654 {
655 base->head = 0;
656 base->events = EV_NONE;
657 base->reify = 0;
658
659 ++base;
660 }
661}
662
663void inline_speed
664fd_event (EV_P_ int fd, int revents) 837fd_event_nc (EV_P_ int fd, int revents)
665{ 838{
666 ANFD *anfd = anfds + fd; 839 ANFD *anfd = anfds + fd;
667 ev_io *w; 840 ev_io *w;
668 841
669 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 842 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
673 if (ev) 846 if (ev)
674 ev_feed_event (EV_A_ (W)w, ev); 847 ev_feed_event (EV_A_ (W)w, ev);
675 } 848 }
676} 849}
677 850
851/* do not submit kernel events for fds that have reify set */
852/* because that means they changed while we were polling for new events */
853inline_speed void
854fd_event (EV_P_ int fd, int revents)
855{
856 ANFD *anfd = anfds + fd;
857
858 if (expect_true (!anfd->reify))
859 fd_event_nc (EV_A_ fd, revents);
860}
861
678void 862void
679ev_feed_fd_event (EV_P_ int fd, int revents) 863ev_feed_fd_event (EV_P_ int fd, int revents)
680{ 864{
681 if (fd >= 0 && fd < anfdmax) 865 if (fd >= 0 && fd < anfdmax)
682 fd_event (EV_A_ fd, revents); 866 fd_event_nc (EV_A_ fd, revents);
683} 867}
684 868
685void inline_size 869/* make sure the external fd watch events are in-sync */
870/* with the kernel/libev internal state */
871inline_size void
686fd_reify (EV_P) 872fd_reify (EV_P)
687{ 873{
688 int i; 874 int i;
689 875
690 for (i = 0; i < fdchangecnt; ++i) 876 for (i = 0; i < fdchangecnt; ++i)
… …
699 events |= (unsigned char)w->events; 885 events |= (unsigned char)w->events;
700 886
701#if EV_SELECT_IS_WINSOCKET 887#if EV_SELECT_IS_WINSOCKET
702 if (events) 888 if (events)
703 { 889 {
704 unsigned long argp; 890 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 891 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else
708 anfd->handle = _get_osfhandle (fd);
709 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 892 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 893 }
712#endif 894#endif
713 895
714 { 896 {
715 unsigned char o_events = anfd->events; 897 unsigned char o_events = anfd->events;
716 unsigned char o_reify = anfd->reify; 898 unsigned char o_reify = anfd->reify;
717 899
718 anfd->reify = 0; 900 anfd->reify = 0;
719 anfd->events = events; 901 anfd->events = events;
720 902
721 if (o_events != events || o_reify & EV_IOFDSET) 903 if (o_events != events || o_reify & EV__IOFDSET)
722 backend_modify (EV_A_ fd, o_events, events); 904 backend_modify (EV_A_ fd, o_events, events);
723 } 905 }
724 } 906 }
725 907
726 fdchangecnt = 0; 908 fdchangecnt = 0;
727} 909}
728 910
729void inline_size 911/* something about the given fd changed */
912inline_size void
730fd_change (EV_P_ int fd, int flags) 913fd_change (EV_P_ int fd, int flags)
731{ 914{
732 unsigned char reify = anfds [fd].reify; 915 unsigned char reify = anfds [fd].reify;
733 anfds [fd].reify |= flags; 916 anfds [fd].reify |= flags;
734 917
… …
738 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 921 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
739 fdchanges [fdchangecnt - 1] = fd; 922 fdchanges [fdchangecnt - 1] = fd;
740 } 923 }
741} 924}
742 925
743void inline_speed 926/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
927inline_speed void
744fd_kill (EV_P_ int fd) 928fd_kill (EV_P_ int fd)
745{ 929{
746 ev_io *w; 930 ev_io *w;
747 931
748 while ((w = (ev_io *)anfds [fd].head)) 932 while ((w = (ev_io *)anfds [fd].head))
… …
750 ev_io_stop (EV_A_ w); 934 ev_io_stop (EV_A_ w);
751 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 935 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
752 } 936 }
753} 937}
754 938
755int inline_size 939/* check whether the given fd is atcually valid, for error recovery */
940inline_size int
756fd_valid (int fd) 941fd_valid (int fd)
757{ 942{
758#ifdef _WIN32 943#ifdef _WIN32
759 return _get_osfhandle (fd) != -1; 944 return _get_osfhandle (fd) != -1;
760#else 945#else
… …
768{ 953{
769 int fd; 954 int fd;
770 955
771 for (fd = 0; fd < anfdmax; ++fd) 956 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 957 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 958 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 959 fd_kill (EV_A_ fd);
775} 960}
776 961
777/* called on ENOMEM in select/poll to kill some fds and retry */ 962/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 963static void noinline
… …
782 967
783 for (fd = anfdmax; fd--; ) 968 for (fd = anfdmax; fd--; )
784 if (anfds [fd].events) 969 if (anfds [fd].events)
785 { 970 {
786 fd_kill (EV_A_ fd); 971 fd_kill (EV_A_ fd);
787 return; 972 break;
788 } 973 }
789} 974}
790 975
791/* usually called after fork if backend needs to re-arm all fds from scratch */ 976/* usually called after fork if backend needs to re-arm all fds from scratch */
792static void noinline 977static void noinline
… …
796 981
797 for (fd = 0; fd < anfdmax; ++fd) 982 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 983 if (anfds [fd].events)
799 { 984 {
800 anfds [fd].events = 0; 985 anfds [fd].events = 0;
986 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
802 } 988 }
803} 989}
804 990
805/*****************************************************************************/ 991/*****************************************************************************/
806 992
… …
822#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1008#define HEAP0 (DHEAP - 1) /* index of first element in heap */
823#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1009#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
824#define UPHEAP_DONE(p,k) ((p) == (k)) 1010#define UPHEAP_DONE(p,k) ((p) == (k))
825 1011
826/* away from the root */ 1012/* away from the root */
827void inline_speed 1013inline_speed void
828downheap (ANHE *heap, int N, int k) 1014downheap (ANHE *heap, int N, int k)
829{ 1015{
830 ANHE he = heap [k]; 1016 ANHE he = heap [k];
831 ANHE *E = heap + N + HEAP0; 1017 ANHE *E = heap + N + HEAP0;
832 1018
… …
872#define HEAP0 1 1058#define HEAP0 1
873#define HPARENT(k) ((k) >> 1) 1059#define HPARENT(k) ((k) >> 1)
874#define UPHEAP_DONE(p,k) (!(p)) 1060#define UPHEAP_DONE(p,k) (!(p))
875 1061
876/* away from the root */ 1062/* away from the root */
877void inline_speed 1063inline_speed void
878downheap (ANHE *heap, int N, int k) 1064downheap (ANHE *heap, int N, int k)
879{ 1065{
880 ANHE he = heap [k]; 1066 ANHE he = heap [k];
881 1067
882 for (;;) 1068 for (;;)
883 { 1069 {
884 int c = k << 1; 1070 int c = k << 1;
885 1071
886 if (c > N + HEAP0 - 1) 1072 if (c >= N + HEAP0)
887 break; 1073 break;
888 1074
889 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1075 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
890 ? 1 : 0; 1076 ? 1 : 0;
891 1077
… …
902 ev_active (ANHE_w (he)) = k; 1088 ev_active (ANHE_w (he)) = k;
903} 1089}
904#endif 1090#endif
905 1091
906/* towards the root */ 1092/* towards the root */
907void inline_speed 1093inline_speed void
908upheap (ANHE *heap, int k) 1094upheap (ANHE *heap, int k)
909{ 1095{
910 ANHE he = heap [k]; 1096 ANHE he = heap [k];
911 1097
912 for (;;) 1098 for (;;)
… …
923 1109
924 heap [k] = he; 1110 heap [k] = he;
925 ev_active (ANHE_w (he)) = k; 1111 ev_active (ANHE_w (he)) = k;
926} 1112}
927 1113
928void inline_size 1114/* move an element suitably so it is in a correct place */
1115inline_size void
929adjustheap (ANHE *heap, int N, int k) 1116adjustheap (ANHE *heap, int N, int k)
930{ 1117{
931 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1118 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
932 upheap (heap, k); 1119 upheap (heap, k);
933 else 1120 else
934 downheap (heap, N, k); 1121 downheap (heap, N, k);
935} 1122}
936 1123
937/* rebuild the heap: this function is used only once and executed rarely */ 1124/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size 1125inline_size void
939reheap (ANHE *heap, int N) 1126reheap (ANHE *heap, int N)
940{ 1127{
941 int i; 1128 int i;
942 1129
943 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1130 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
946 upheap (heap, i + HEAP0); 1133 upheap (heap, i + HEAP0);
947} 1134}
948 1135
949/*****************************************************************************/ 1136/*****************************************************************************/
950 1137
1138/* associate signal watchers to a signal signal */
951typedef struct 1139typedef struct
952{ 1140{
1141 EV_ATOMIC_T pending;
1142#if EV_MULTIPLICITY
1143 EV_P;
1144#endif
953 WL head; 1145 WL head;
954 EV_ATOMIC_T gotsig;
955} ANSIG; 1146} ANSIG;
956 1147
957static ANSIG *signals; 1148static ANSIG signals [EV_NSIG - 1];
958static int signalmax;
959
960static EV_ATOMIC_T gotsig;
961
962void inline_size
963signals_init (ANSIG *base, int count)
964{
965 while (count--)
966 {
967 base->head = 0;
968 base->gotsig = 0;
969
970 ++base;
971 }
972}
973 1149
974/*****************************************************************************/ 1150/*****************************************************************************/
975 1151
976void inline_speed 1152/* used to prepare libev internal fd's */
1153/* this is not fork-safe */
1154inline_speed void
977fd_intern (int fd) 1155fd_intern (int fd)
978{ 1156{
979#ifdef _WIN32 1157#ifdef _WIN32
980 int arg = 1; 1158 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1159 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 1160#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 1161 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 1162 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 1163#endif
986} 1164}
987 1165
988static void noinline 1166static void noinline
989evpipe_init (EV_P) 1167evpipe_init (EV_P)
990{ 1168{
991 if (!ev_is_active (&pipeev)) 1169 if (!ev_is_active (&pipe_w))
992 { 1170 {
993#if EV_USE_EVENTFD 1171#if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL)
994 if ((evfd = eventfd (0, 0)) >= 0) 1174 evfd = eventfd (0, 0);
1175
1176 if (evfd >= 0)
995 { 1177 {
996 evpipe [0] = -1; 1178 evpipe [0] = -1;
997 fd_intern (evfd); 1179 fd_intern (evfd); /* doing it twice doesn't hurt */
998 ev_io_set (&pipeev, evfd, EV_READ); 1180 ev_io_set (&pipe_w, evfd, EV_READ);
999 } 1181 }
1000 else 1182 else
1001#endif 1183#endif
1002 { 1184 {
1003 while (pipe (evpipe)) 1185 while (pipe (evpipe))
1004 syserr ("(libev) error creating signal/async pipe"); 1186 ev_syserr ("(libev) error creating signal/async pipe");
1005 1187
1006 fd_intern (evpipe [0]); 1188 fd_intern (evpipe [0]);
1007 fd_intern (evpipe [1]); 1189 fd_intern (evpipe [1]);
1008 ev_io_set (&pipeev, evpipe [0], EV_READ); 1190 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1009 } 1191 }
1010 1192
1011 ev_io_start (EV_A_ &pipeev); 1193 ev_io_start (EV_A_ &pipe_w);
1012 ev_unref (EV_A); /* watcher should not keep loop alive */ 1194 ev_unref (EV_A); /* watcher should not keep loop alive */
1013 } 1195 }
1014} 1196}
1015 1197
1016void inline_size 1198inline_size void
1017evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1199evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1018{ 1200{
1019 if (!*flag) 1201 if (!*flag)
1020 { 1202 {
1021 int old_errno = errno; /* save errno because write might clobber it */ 1203 int old_errno = errno; /* save errno because write might clobber it */
… …
1034 1216
1035 errno = old_errno; 1217 errno = old_errno;
1036 } 1218 }
1037} 1219}
1038 1220
1221/* called whenever the libev signal pipe */
1222/* got some events (signal, async) */
1039static void 1223static void
1040pipecb (EV_P_ ev_io *iow, int revents) 1224pipecb (EV_P_ ev_io *iow, int revents)
1041{ 1225{
1226 int i;
1227
1042#if EV_USE_EVENTFD 1228#if EV_USE_EVENTFD
1043 if (evfd >= 0) 1229 if (evfd >= 0)
1044 { 1230 {
1045 uint64_t counter; 1231 uint64_t counter;
1046 read (evfd, &counter, sizeof (uint64_t)); 1232 read (evfd, &counter, sizeof (uint64_t));
… …
1050 { 1236 {
1051 char dummy; 1237 char dummy;
1052 read (evpipe [0], &dummy, 1); 1238 read (evpipe [0], &dummy, 1);
1053 } 1239 }
1054 1240
1055 if (gotsig && ev_is_default_loop (EV_A)) 1241 if (sig_pending)
1056 { 1242 {
1057 int signum; 1243 sig_pending = 0;
1058 gotsig = 0;
1059 1244
1060 for (signum = signalmax; signum--; ) 1245 for (i = EV_NSIG - 1; i--; )
1061 if (signals [signum].gotsig) 1246 if (expect_false (signals [i].pending))
1062 ev_feed_signal_event (EV_A_ signum + 1); 1247 ev_feed_signal_event (EV_A_ i + 1);
1063 } 1248 }
1064 1249
1065#if EV_ASYNC_ENABLE 1250#if EV_ASYNC_ENABLE
1066 if (gotasync) 1251 if (async_pending)
1067 { 1252 {
1068 int i; 1253 async_pending = 0;
1069 gotasync = 0;
1070 1254
1071 for (i = asynccnt; i--; ) 1255 for (i = asynccnt; i--; )
1072 if (asyncs [i]->sent) 1256 if (asyncs [i]->sent)
1073 { 1257 {
1074 asyncs [i]->sent = 0; 1258 asyncs [i]->sent = 0;
… …
1082 1266
1083static void 1267static void
1084ev_sighandler (int signum) 1268ev_sighandler (int signum)
1085{ 1269{
1086#if EV_MULTIPLICITY 1270#if EV_MULTIPLICITY
1087 struct ev_loop *loop = &default_loop_struct; 1271 EV_P = signals [signum - 1].loop;
1088#endif 1272#endif
1089 1273
1090#if _WIN32 1274#if _WIN32
1091 signal (signum, ev_sighandler); 1275 signal (signum, ev_sighandler);
1092#endif 1276#endif
1093 1277
1094 signals [signum - 1].gotsig = 1; 1278 signals [signum - 1].pending = 1;
1095 evpipe_write (EV_A_ &gotsig); 1279 evpipe_write (EV_A_ &sig_pending);
1096} 1280}
1097 1281
1098void noinline 1282void noinline
1099ev_feed_signal_event (EV_P_ int signum) 1283ev_feed_signal_event (EV_P_ int signum)
1100{ 1284{
1101 WL w; 1285 WL w;
1102 1286
1287 if (expect_false (signum <= 0 || signum > EV_NSIG))
1288 return;
1289
1290 --signum;
1291
1103#if EV_MULTIPLICITY 1292#if EV_MULTIPLICITY
1104 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1293 /* it is permissible to try to feed a signal to the wrong loop */
1105#endif 1294 /* or, likely more useful, feeding a signal nobody is waiting for */
1106 1295
1107 --signum; 1296 if (expect_false (signals [signum].loop != EV_A))
1108
1109 if (signum < 0 || signum >= signalmax)
1110 return; 1297 return;
1298#endif
1111 1299
1112 signals [signum].gotsig = 0; 1300 signals [signum].pending = 0;
1113 1301
1114 for (w = signals [signum].head; w; w = w->next) 1302 for (w = signals [signum].head; w; w = w->next)
1115 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1303 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1116} 1304}
1117 1305
1306#if EV_USE_SIGNALFD
1307static void
1308sigfdcb (EV_P_ ev_io *iow, int revents)
1309{
1310 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1311
1312 for (;;)
1313 {
1314 ssize_t res = read (sigfd, si, sizeof (si));
1315
1316 /* not ISO-C, as res might be -1, but works with SuS */
1317 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1318 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1319
1320 if (res < (ssize_t)sizeof (si))
1321 break;
1322 }
1323}
1324#endif
1325
1118/*****************************************************************************/ 1326/*****************************************************************************/
1119 1327
1120static WL childs [EV_PID_HASHSIZE]; 1328static WL childs [EV_PID_HASHSIZE];
1121 1329
1122#ifndef _WIN32 1330#ifndef _WIN32
… …
1125 1333
1126#ifndef WIFCONTINUED 1334#ifndef WIFCONTINUED
1127# define WIFCONTINUED(status) 0 1335# define WIFCONTINUED(status) 0
1128#endif 1336#endif
1129 1337
1130void inline_speed 1338/* handle a single child status event */
1339inline_speed void
1131child_reap (EV_P_ int chain, int pid, int status) 1340child_reap (EV_P_ int chain, int pid, int status)
1132{ 1341{
1133 ev_child *w; 1342 ev_child *w;
1134 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1343 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1135 1344
… …
1148 1357
1149#ifndef WCONTINUED 1358#ifndef WCONTINUED
1150# define WCONTINUED 0 1359# define WCONTINUED 0
1151#endif 1360#endif
1152 1361
1362/* called on sigchld etc., calls waitpid */
1153static void 1363static void
1154childcb (EV_P_ ev_signal *sw, int revents) 1364childcb (EV_P_ ev_signal *sw, int revents)
1155{ 1365{
1156 int pid, status; 1366 int pid, status;
1157 1367
… …
1238 /* kqueue is borked on everything but netbsd apparently */ 1448 /* kqueue is borked on everything but netbsd apparently */
1239 /* it usually doesn't work correctly on anything but sockets and pipes */ 1449 /* it usually doesn't work correctly on anything but sockets and pipes */
1240 flags &= ~EVBACKEND_KQUEUE; 1450 flags &= ~EVBACKEND_KQUEUE;
1241#endif 1451#endif
1242#ifdef __APPLE__ 1452#ifdef __APPLE__
1243 // flags &= ~EVBACKEND_KQUEUE; for documentation 1453 /* only select works correctly on that "unix-certified" platform */
1244 flags &= ~EVBACKEND_POLL; 1454 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1455 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1245#endif 1456#endif
1246 1457
1247 return flags; 1458 return flags;
1248} 1459}
1249 1460
… …
1263ev_backend (EV_P) 1474ev_backend (EV_P)
1264{ 1475{
1265 return backend; 1476 return backend;
1266} 1477}
1267 1478
1479#if EV_MINIMAL < 2
1268unsigned int 1480unsigned int
1269ev_loop_count (EV_P) 1481ev_loop_count (EV_P)
1270{ 1482{
1271 return loop_count; 1483 return loop_count;
1272} 1484}
1273 1485
1486unsigned int
1487ev_loop_depth (EV_P)
1488{
1489 return loop_depth;
1490}
1491
1274void 1492void
1275ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1276{ 1494{
1277 io_blocktime = interval; 1495 io_blocktime = interval;
1278} 1496}
… …
1281ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1499ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1282{ 1500{
1283 timeout_blocktime = interval; 1501 timeout_blocktime = interval;
1284} 1502}
1285 1503
1504void
1505ev_set_userdata (EV_P_ void *data)
1506{
1507 userdata = data;
1508}
1509
1510void *
1511ev_userdata (EV_P)
1512{
1513 return userdata;
1514}
1515
1516void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1517{
1518 invoke_cb = invoke_pending_cb;
1519}
1520
1521void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1522{
1523 release_cb = release;
1524 acquire_cb = acquire;
1525}
1526#endif
1527
1528/* initialise a loop structure, must be zero-initialised */
1286static void noinline 1529static void noinline
1287loop_init (EV_P_ unsigned int flags) 1530loop_init (EV_P_ unsigned int flags)
1288{ 1531{
1289 if (!backend) 1532 if (!backend)
1290 { 1533 {
1534#if EV_USE_REALTIME
1535 if (!have_realtime)
1536 {
1537 struct timespec ts;
1538
1539 if (!clock_gettime (CLOCK_REALTIME, &ts))
1540 have_realtime = 1;
1541 }
1542#endif
1543
1291#if EV_USE_MONOTONIC 1544#if EV_USE_MONOTONIC
1545 if (!have_monotonic)
1292 { 1546 {
1293 struct timespec ts; 1547 struct timespec ts;
1548
1294 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1549 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1295 have_monotonic = 1; 1550 have_monotonic = 1;
1296 } 1551 }
1297#endif 1552#endif
1553
1554 /* pid check not overridable via env */
1555#ifndef _WIN32
1556 if (flags & EVFLAG_FORKCHECK)
1557 curpid = getpid ();
1558#endif
1559
1560 if (!(flags & EVFLAG_NOENV)
1561 && !enable_secure ()
1562 && getenv ("LIBEV_FLAGS"))
1563 flags = atoi (getenv ("LIBEV_FLAGS"));
1298 1564
1299 ev_rt_now = ev_time (); 1565 ev_rt_now = ev_time ();
1300 mn_now = get_clock (); 1566 mn_now = get_clock ();
1301 now_floor = mn_now; 1567 now_floor = mn_now;
1302 rtmn_diff = ev_rt_now - mn_now; 1568 rtmn_diff = ev_rt_now - mn_now;
1569#if EV_MINIMAL < 2
1570 invoke_cb = ev_invoke_pending;
1571#endif
1303 1572
1304 io_blocktime = 0.; 1573 io_blocktime = 0.;
1305 timeout_blocktime = 0.; 1574 timeout_blocktime = 0.;
1306 backend = 0; 1575 backend = 0;
1307 backend_fd = -1; 1576 backend_fd = -1;
1308 gotasync = 0; 1577 sig_pending = 0;
1578#if EV_ASYNC_ENABLE
1579 async_pending = 0;
1580#endif
1309#if EV_USE_INOTIFY 1581#if EV_USE_INOTIFY
1310 fs_fd = -2; 1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1311#endif 1583#endif
1312 1584#if EV_USE_SIGNALFD
1313 /* pid check not overridable via env */ 1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1314#ifndef _WIN32
1315 if (flags & EVFLAG_FORKCHECK)
1316 curpid = getpid ();
1317#endif 1586#endif
1318
1319 if (!(flags & EVFLAG_NOENV)
1320 && !enable_secure ()
1321 && getenv ("LIBEV_FLAGS"))
1322 flags = atoi (getenv ("LIBEV_FLAGS"));
1323 1587
1324 if (!(flags & 0x0000ffffU)) 1588 if (!(flags & 0x0000ffffU))
1325 flags |= ev_recommended_backends (); 1589 flags |= ev_recommended_backends ();
1326 1590
1327#if EV_USE_PORT 1591#if EV_USE_PORT
… …
1338#endif 1602#endif
1339#if EV_USE_SELECT 1603#if EV_USE_SELECT
1340 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1604 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1341#endif 1605#endif
1342 1606
1607 ev_prepare_init (&pending_w, pendingcb);
1608
1343 ev_init (&pipeev, pipecb); 1609 ev_init (&pipe_w, pipecb);
1344 ev_set_priority (&pipeev, EV_MAXPRI); 1610 ev_set_priority (&pipe_w, EV_MAXPRI);
1345 } 1611 }
1346} 1612}
1347 1613
1614/* free up a loop structure */
1348static void noinline 1615static void noinline
1349loop_destroy (EV_P) 1616loop_destroy (EV_P)
1350{ 1617{
1351 int i; 1618 int i;
1352 1619
1353 if (ev_is_active (&pipeev)) 1620 if (ev_is_active (&pipe_w))
1354 { 1621 {
1355 ev_ref (EV_A); /* signal watcher */ 1622 /*ev_ref (EV_A);*/
1356 ev_io_stop (EV_A_ &pipeev); 1623 /*ev_io_stop (EV_A_ &pipe_w);*/
1357 1624
1358#if EV_USE_EVENTFD 1625#if EV_USE_EVENTFD
1359 if (evfd >= 0) 1626 if (evfd >= 0)
1360 close (evfd); 1627 close (evfd);
1361#endif 1628#endif
1362 1629
1363 if (evpipe [0] >= 0) 1630 if (evpipe [0] >= 0)
1364 { 1631 {
1365 close (evpipe [0]); 1632 EV_WIN32_CLOSE_FD (evpipe [0]);
1366 close (evpipe [1]); 1633 EV_WIN32_CLOSE_FD (evpipe [1]);
1367 } 1634 }
1368 } 1635 }
1636
1637#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd);
1644 }
1645#endif
1369 1646
1370#if EV_USE_INOTIFY 1647#if EV_USE_INOTIFY
1371 if (fs_fd >= 0) 1648 if (fs_fd >= 0)
1372 close (fs_fd); 1649 close (fs_fd);
1373#endif 1650#endif
… …
1397#if EV_IDLE_ENABLE 1674#if EV_IDLE_ENABLE
1398 array_free (idle, [i]); 1675 array_free (idle, [i]);
1399#endif 1676#endif
1400 } 1677 }
1401 1678
1402 ev_free (anfds); anfdmax = 0; 1679 ev_free (anfds); anfds = 0; anfdmax = 0;
1403 1680
1404 /* have to use the microsoft-never-gets-it-right macro */ 1681 /* have to use the microsoft-never-gets-it-right macro */
1682 array_free (rfeed, EMPTY);
1405 array_free (fdchange, EMPTY); 1683 array_free (fdchange, EMPTY);
1406 array_free (timer, EMPTY); 1684 array_free (timer, EMPTY);
1407#if EV_PERIODIC_ENABLE 1685#if EV_PERIODIC_ENABLE
1408 array_free (periodic, EMPTY); 1686 array_free (periodic, EMPTY);
1409#endif 1687#endif
… …
1418 1696
1419 backend = 0; 1697 backend = 0;
1420} 1698}
1421 1699
1422#if EV_USE_INOTIFY 1700#if EV_USE_INOTIFY
1423void inline_size infy_fork (EV_P); 1701inline_size void infy_fork (EV_P);
1424#endif 1702#endif
1425 1703
1426void inline_size 1704inline_size void
1427loop_fork (EV_P) 1705loop_fork (EV_P)
1428{ 1706{
1429#if EV_USE_PORT 1707#if EV_USE_PORT
1430 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1708 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1431#endif 1709#endif
… …
1437#endif 1715#endif
1438#if EV_USE_INOTIFY 1716#if EV_USE_INOTIFY
1439 infy_fork (EV_A); 1717 infy_fork (EV_A);
1440#endif 1718#endif
1441 1719
1442 if (ev_is_active (&pipeev)) 1720 if (ev_is_active (&pipe_w))
1443 { 1721 {
1444 /* this "locks" the handlers against writing to the pipe */ 1722 /* this "locks" the handlers against writing to the pipe */
1445 /* while we modify the fd vars */ 1723 /* while we modify the fd vars */
1446 gotsig = 1; 1724 sig_pending = 1;
1447#if EV_ASYNC_ENABLE 1725#if EV_ASYNC_ENABLE
1448 gotasync = 1; 1726 async_pending = 1;
1449#endif 1727#endif
1450 1728
1451 ev_ref (EV_A); 1729 ev_ref (EV_A);
1452 ev_io_stop (EV_A_ &pipeev); 1730 ev_io_stop (EV_A_ &pipe_w);
1453 1731
1454#if EV_USE_EVENTFD 1732#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1733 if (evfd >= 0)
1456 close (evfd); 1734 close (evfd);
1457#endif 1735#endif
1458 1736
1459 if (evpipe [0] >= 0) 1737 if (evpipe [0] >= 0)
1460 { 1738 {
1461 close (evpipe [0]); 1739 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1740 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1741 }
1464 1742
1465 evpipe_init (EV_A); 1743 evpipe_init (EV_A);
1466 /* now iterate over everything, in case we missed something */ 1744 /* now iterate over everything, in case we missed something */
1467 pipecb (EV_A_ &pipeev, EV_READ); 1745 pipecb (EV_A_ &pipe_w, EV_READ);
1468 } 1746 }
1469 1747
1470 postfork = 0; 1748 postfork = 0;
1471} 1749}
1472 1750
1473#if EV_MULTIPLICITY 1751#if EV_MULTIPLICITY
1474 1752
1475struct ev_loop * 1753struct ev_loop *
1476ev_loop_new (unsigned int flags) 1754ev_loop_new (unsigned int flags)
1477{ 1755{
1478 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1756 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1479 1757
1480 memset (loop, 0, sizeof (struct ev_loop)); 1758 memset (EV_A, 0, sizeof (struct ev_loop));
1481
1482 loop_init (EV_A_ flags); 1759 loop_init (EV_A_ flags);
1483 1760
1484 if (ev_backend (EV_A)) 1761 if (ev_backend (EV_A))
1485 return loop; 1762 return EV_A;
1486 1763
1487 return 0; 1764 return 0;
1488} 1765}
1489 1766
1490void 1767void
… …
1497void 1774void
1498ev_loop_fork (EV_P) 1775ev_loop_fork (EV_P)
1499{ 1776{
1500 postfork = 1; /* must be in line with ev_default_fork */ 1777 postfork = 1; /* must be in line with ev_default_fork */
1501} 1778}
1779#endif /* multiplicity */
1502 1780
1503#if EV_VERIFY 1781#if EV_VERIFY
1504void noinline 1782static void noinline
1505verify_watcher (EV_P_ W w) 1783verify_watcher (EV_P_ W w)
1506{ 1784{
1507 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1785 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508 1786
1509 if (w->pending) 1787 if (w->pending)
1510 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1788 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1511} 1789}
1512 1790
1513static void noinline 1791static void noinline
1514verify_heap (EV_P_ ANHE *heap, int N) 1792verify_heap (EV_P_ ANHE *heap, int N)
1515{ 1793{
1516 int i; 1794 int i;
1517 1795
1518 for (i = HEAP0; i < N + HEAP0; ++i) 1796 for (i = HEAP0; i < N + HEAP0; ++i)
1519 { 1797 {
1520 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1798 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1521 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1799 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1522 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1800 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1523 1801
1524 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1802 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1525 } 1803 }
1526} 1804}
1527 1805
1528static void noinline 1806static void noinline
1529array_verify (EV_P_ W *ws, int cnt) 1807array_verify (EV_P_ W *ws, int cnt)
1530{ 1808{
1531 while (cnt--) 1809 while (cnt--)
1532 { 1810 {
1533 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1811 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1534 verify_watcher (EV_A_ ws [cnt]); 1812 verify_watcher (EV_A_ ws [cnt]);
1535 } 1813 }
1536} 1814}
1537#endif 1815#endif
1538 1816
1817#if EV_MINIMAL < 2
1539void 1818void
1540ev_loop_verify (EV_P) 1819ev_loop_verify (EV_P)
1541{ 1820{
1542#if EV_VERIFY 1821#if EV_VERIFY
1543 int i; 1822 int i;
… …
1545 1824
1546 assert (activecnt >= -1); 1825 assert (activecnt >= -1);
1547 1826
1548 assert (fdchangemax >= fdchangecnt); 1827 assert (fdchangemax >= fdchangecnt);
1549 for (i = 0; i < fdchangecnt; ++i) 1828 for (i = 0; i < fdchangecnt; ++i)
1550 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1829 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1551 1830
1552 assert (anfdmax >= 0); 1831 assert (anfdmax >= 0);
1553 for (i = 0; i < anfdmax; ++i) 1832 for (i = 0; i < anfdmax; ++i)
1554 for (w = anfds [i].head; w; w = w->next) 1833 for (w = anfds [i].head; w; w = w->next)
1555 { 1834 {
1556 verify_watcher (EV_A_ (W)w); 1835 verify_watcher (EV_A_ (W)w);
1557 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1836 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1558 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1837 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1559 } 1838 }
1560 1839
1561 assert (timermax >= timercnt); 1840 assert (timermax >= timercnt);
1562 verify_heap (EV_A_ timers, timercnt); 1841 verify_heap (EV_A_ timers, timercnt);
1563 1842
… …
1568 1847
1569 for (i = NUMPRI; i--; ) 1848 for (i = NUMPRI; i--; )
1570 { 1849 {
1571 assert (pendingmax [i] >= pendingcnt [i]); 1850 assert (pendingmax [i] >= pendingcnt [i]);
1572#if EV_IDLE_ENABLE 1851#if EV_IDLE_ENABLE
1852 assert (idleall >= 0);
1573 assert (idlemax [i] >= idlecnt [i]); 1853 assert (idlemax [i] >= idlecnt [i]);
1574 array_verify (EV_A_ (W *)idles [i], idlecnt [i]); 1854 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1575#endif 1855#endif
1576 } 1856 }
1577 1857
… …
1591 assert (checkmax >= checkcnt); 1871 assert (checkmax >= checkcnt);
1592 array_verify (EV_A_ (W *)checks, checkcnt); 1872 array_verify (EV_A_ (W *)checks, checkcnt);
1593 1873
1594# if 0 1874# if 0
1595 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1875 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1596 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1597# endif 1877# endif
1598#endif 1878#endif
1599} 1879}
1600 1880#endif
1601#endif /* multiplicity */
1602 1881
1603#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1604struct ev_loop * 1883struct ev_loop *
1605ev_default_loop_init (unsigned int flags) 1884ev_default_loop_init (unsigned int flags)
1606#else 1885#else
… …
1609#endif 1888#endif
1610{ 1889{
1611 if (!ev_default_loop_ptr) 1890 if (!ev_default_loop_ptr)
1612 { 1891 {
1613#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1614 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1893 EV_P = ev_default_loop_ptr = &default_loop_struct;
1615#else 1894#else
1616 ev_default_loop_ptr = 1; 1895 ev_default_loop_ptr = 1;
1617#endif 1896#endif
1618 1897
1619 loop_init (EV_A_ flags); 1898 loop_init (EV_A_ flags);
… …
1636 1915
1637void 1916void
1638ev_default_destroy (void) 1917ev_default_destroy (void)
1639{ 1918{
1640#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1641 struct ev_loop *loop = ev_default_loop_ptr; 1920 EV_P = ev_default_loop_ptr;
1642#endif 1921#endif
1922
1923 ev_default_loop_ptr = 0;
1643 1924
1644#ifndef _WIN32 1925#ifndef _WIN32
1645 ev_ref (EV_A); /* child watcher */ 1926 ev_ref (EV_A); /* child watcher */
1646 ev_signal_stop (EV_A_ &childev); 1927 ev_signal_stop (EV_A_ &childev);
1647#endif 1928#endif
… …
1651 1932
1652void 1933void
1653ev_default_fork (void) 1934ev_default_fork (void)
1654{ 1935{
1655#if EV_MULTIPLICITY 1936#if EV_MULTIPLICITY
1656 struct ev_loop *loop = ev_default_loop_ptr; 1937 EV_P = ev_default_loop_ptr;
1657#endif 1938#endif
1658 1939
1659 if (backend)
1660 postfork = 1; /* must be in line with ev_loop_fork */ 1940 postfork = 1; /* must be in line with ev_loop_fork */
1661} 1941}
1662 1942
1663/*****************************************************************************/ 1943/*****************************************************************************/
1664 1944
1665void 1945void
1666ev_invoke (EV_P_ void *w, int revents) 1946ev_invoke (EV_P_ void *w, int revents)
1667{ 1947{
1668 EV_CB_INVOKE ((W)w, revents); 1948 EV_CB_INVOKE ((W)w, revents);
1669} 1949}
1670 1950
1671void inline_speed 1951unsigned int
1672call_pending (EV_P) 1952ev_pending_count (EV_P)
1953{
1954 int pri;
1955 unsigned int count = 0;
1956
1957 for (pri = NUMPRI; pri--; )
1958 count += pendingcnt [pri];
1959
1960 return count;
1961}
1962
1963void noinline
1964ev_invoke_pending (EV_P)
1673{ 1965{
1674 int pri; 1966 int pri;
1675 1967
1676 for (pri = NUMPRI; pri--; ) 1968 for (pri = NUMPRI; pri--; )
1677 while (pendingcnt [pri]) 1969 while (pendingcnt [pri])
1678 { 1970 {
1679 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1971 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1680 1972
1681 if (expect_true (p->w))
1682 {
1683 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1973 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1974 /* ^ this is no longer true, as pending_w could be here */
1684 1975
1685 p->w->pending = 0; 1976 p->w->pending = 0;
1686 EV_CB_INVOKE (p->w, p->events); 1977 EV_CB_INVOKE (p->w, p->events);
1687 EV_FREQUENT_CHECK; 1978 EV_FREQUENT_CHECK;
1688 }
1689 } 1979 }
1690} 1980}
1691 1981
1692#if EV_IDLE_ENABLE 1982#if EV_IDLE_ENABLE
1693void inline_size 1983/* make idle watchers pending. this handles the "call-idle */
1984/* only when higher priorities are idle" logic */
1985inline_size void
1694idle_reify (EV_P) 1986idle_reify (EV_P)
1695{ 1987{
1696 if (expect_false (idleall)) 1988 if (expect_false (idleall))
1697 { 1989 {
1698 int pri; 1990 int pri;
… …
1710 } 2002 }
1711 } 2003 }
1712} 2004}
1713#endif 2005#endif
1714 2006
1715void inline_size 2007/* make timers pending */
2008inline_size void
1716timers_reify (EV_P) 2009timers_reify (EV_P)
1717{ 2010{
1718 EV_FREQUENT_CHECK; 2011 EV_FREQUENT_CHECK;
1719 2012
1720 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2013 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1721 { 2014 {
1722 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2015 do
1723
1724 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1725
1726 /* first reschedule or stop timer */
1727 if (w->repeat)
1728 { 2016 {
2017 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2018
2019 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2020
2021 /* first reschedule or stop timer */
2022 if (w->repeat)
2023 {
1729 ev_at (w) += w->repeat; 2024 ev_at (w) += w->repeat;
1730 if (ev_at (w) < mn_now) 2025 if (ev_at (w) < mn_now)
1731 ev_at (w) = mn_now; 2026 ev_at (w) = mn_now;
1732 2027
1733 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2028 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1734 2029
1735 ANHE_at_cache (timers [HEAP0]); 2030 ANHE_at_cache (timers [HEAP0]);
1736 downheap (timers, timercnt, HEAP0); 2031 downheap (timers, timercnt, HEAP0);
2032 }
2033 else
2034 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2035
2036 EV_FREQUENT_CHECK;
2037 feed_reverse (EV_A_ (W)w);
1737 } 2038 }
1738 else 2039 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1739 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1740 2040
1741 EV_FREQUENT_CHECK;
1742 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2041 feed_reverse_done (EV_A_ EV_TIMEOUT);
1743 } 2042 }
1744} 2043}
1745 2044
1746#if EV_PERIODIC_ENABLE 2045#if EV_PERIODIC_ENABLE
1747void inline_size 2046/* make periodics pending */
2047inline_size void
1748periodics_reify (EV_P) 2048periodics_reify (EV_P)
1749{ 2049{
1750 EV_FREQUENT_CHECK; 2050 EV_FREQUENT_CHECK;
1751 2051
1752 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2052 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1753 { 2053 {
1754 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2054 int feed_count = 0;
1755 2055
1756 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2056 do
1757
1758 /* first reschedule or stop timer */
1759 if (w->reschedule_cb)
1760 { 2057 {
2058 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2059
2060 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2061
2062 /* first reschedule or stop timer */
2063 if (w->reschedule_cb)
2064 {
1761 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2065 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1762 2066
1763 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2067 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1764 2068
1765 ANHE_at_cache (periodics [HEAP0]); 2069 ANHE_at_cache (periodics [HEAP0]);
1766 downheap (periodics, periodiccnt, HEAP0); 2070 downheap (periodics, periodiccnt, HEAP0);
2071 }
2072 else if (w->interval)
2073 {
2074 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2075 /* if next trigger time is not sufficiently in the future, put it there */
2076 /* this might happen because of floating point inexactness */
2077 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2078 {
2079 ev_at (w) += w->interval;
2080
2081 /* if interval is unreasonably low we might still have a time in the past */
2082 /* so correct this. this will make the periodic very inexact, but the user */
2083 /* has effectively asked to get triggered more often than possible */
2084 if (ev_at (w) < ev_rt_now)
2085 ev_at (w) = ev_rt_now;
2086 }
2087
2088 ANHE_at_cache (periodics [HEAP0]);
2089 downheap (periodics, periodiccnt, HEAP0);
2090 }
2091 else
2092 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2093
2094 EV_FREQUENT_CHECK;
2095 feed_reverse (EV_A_ (W)w);
1767 } 2096 }
1768 else if (w->interval) 2097 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1769 {
1770 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1771 /* if next trigger time is not sufficiently in the future, put it there */
1772 /* this might happen because of floating point inexactness */
1773 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1774 {
1775 ev_at (w) += w->interval;
1776 2098
1777 /* if interval is unreasonably low we might still have a time in the past */
1778 /* so correct this. this will make the periodic very inexact, but the user */
1779 /* has effectively asked to get triggered more often than possible */
1780 if (ev_at (w) < ev_rt_now)
1781 ev_at (w) = ev_rt_now;
1782 }
1783
1784 ANHE_at_cache (periodics [HEAP0]);
1785 downheap (periodics, periodiccnt, HEAP0);
1786 }
1787 else
1788 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1789
1790 EV_FREQUENT_CHECK;
1791 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2099 feed_reverse_done (EV_A_ EV_PERIODIC);
1792 } 2100 }
1793} 2101}
1794 2102
2103/* simply recalculate all periodics */
2104/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1795static void noinline 2105static void noinline
1796periodics_reschedule (EV_P) 2106periodics_reschedule (EV_P)
1797{ 2107{
1798 int i; 2108 int i;
1799 2109
… …
1812 2122
1813 reheap (periodics, periodiccnt); 2123 reheap (periodics, periodiccnt);
1814} 2124}
1815#endif 2125#endif
1816 2126
1817void inline_speed 2127/* adjust all timers by a given offset */
2128static void noinline
2129timers_reschedule (EV_P_ ev_tstamp adjust)
2130{
2131 int i;
2132
2133 for (i = 0; i < timercnt; ++i)
2134 {
2135 ANHE *he = timers + i + HEAP0;
2136 ANHE_w (*he)->at += adjust;
2137 ANHE_at_cache (*he);
2138 }
2139}
2140
2141/* fetch new monotonic and realtime times from the kernel */
2142/* also detetc if there was a timejump, and act accordingly */
2143inline_speed void
1818time_update (EV_P_ ev_tstamp max_block) 2144time_update (EV_P_ ev_tstamp max_block)
1819{ 2145{
1820 int i;
1821
1822#if EV_USE_MONOTONIC 2146#if EV_USE_MONOTONIC
1823 if (expect_true (have_monotonic)) 2147 if (expect_true (have_monotonic))
1824 { 2148 {
2149 int i;
1825 ev_tstamp odiff = rtmn_diff; 2150 ev_tstamp odiff = rtmn_diff;
1826 2151
1827 mn_now = get_clock (); 2152 mn_now = get_clock ();
1828 2153
1829 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2154 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1855 ev_rt_now = ev_time (); 2180 ev_rt_now = ev_time ();
1856 mn_now = get_clock (); 2181 mn_now = get_clock ();
1857 now_floor = mn_now; 2182 now_floor = mn_now;
1858 } 2183 }
1859 2184
2185 /* no timer adjustment, as the monotonic clock doesn't jump */
2186 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1860# if EV_PERIODIC_ENABLE 2187# if EV_PERIODIC_ENABLE
1861 periodics_reschedule (EV_A); 2188 periodics_reschedule (EV_A);
1862# endif 2189# endif
1863 /* no timer adjustment, as the monotonic clock doesn't jump */
1864 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865 } 2190 }
1866 else 2191 else
1867#endif 2192#endif
1868 { 2193 {
1869 ev_rt_now = ev_time (); 2194 ev_rt_now = ev_time ();
1870 2195
1871 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2196 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1872 { 2197 {
2198 /* adjust timers. this is easy, as the offset is the same for all of them */
2199 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1873#if EV_PERIODIC_ENABLE 2200#if EV_PERIODIC_ENABLE
1874 periodics_reschedule (EV_A); 2201 periodics_reschedule (EV_A);
1875#endif 2202#endif
1876 /* adjust timers. this is easy, as the offset is the same for all of them */
1877 for (i = 0; i < timercnt; ++i)
1878 {
1879 ANHE *he = timers + i + HEAP0;
1880 ANHE_w (*he)->at += ev_rt_now - mn_now;
1881 ANHE_at_cache (*he);
1882 }
1883 } 2203 }
1884 2204
1885 mn_now = ev_rt_now; 2205 mn_now = ev_rt_now;
1886 } 2206 }
1887} 2207}
1888 2208
1889void 2209void
1890ev_ref (EV_P)
1891{
1892 ++activecnt;
1893}
1894
1895void
1896ev_unref (EV_P)
1897{
1898 --activecnt;
1899}
1900
1901static int loop_done;
1902
1903void
1904ev_loop (EV_P_ int flags) 2210ev_loop (EV_P_ int flags)
1905{ 2211{
2212#if EV_MINIMAL < 2
2213 ++loop_depth;
2214#endif
2215
2216 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2217
1906 loop_done = EVUNLOOP_CANCEL; 2218 loop_done = EVUNLOOP_CANCEL;
1907 2219
1908 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2220 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1909 2221
1910 do 2222 do
1911 { 2223 {
1912#if EV_VERIFY >= 2 2224#if EV_VERIFY >= 2
1913 ev_loop_verify (EV_A); 2225 ev_loop_verify (EV_A);
… …
1926 /* we might have forked, so queue fork handlers */ 2238 /* we might have forked, so queue fork handlers */
1927 if (expect_false (postfork)) 2239 if (expect_false (postfork))
1928 if (forkcnt) 2240 if (forkcnt)
1929 { 2241 {
1930 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1931 call_pending (EV_A); 2243 EV_INVOKE_PENDING;
1932 } 2244 }
1933#endif 2245#endif
1934 2246
1935 /* queue prepare watchers (and execute them) */ 2247 /* queue prepare watchers (and execute them) */
1936 if (expect_false (preparecnt)) 2248 if (expect_false (preparecnt))
1937 { 2249 {
1938 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1939 call_pending (EV_A); 2251 EV_INVOKE_PENDING;
1940 } 2252 }
1941 2253
1942 if (expect_false (!activecnt)) 2254 if (expect_false (loop_done))
1943 break; 2255 break;
1944 2256
1945 /* we might have forked, so reify kernel state if necessary */ 2257 /* we might have forked, so reify kernel state if necessary */
1946 if (expect_false (postfork)) 2258 if (expect_false (postfork))
1947 loop_fork (EV_A); 2259 loop_fork (EV_A);
… …
1954 ev_tstamp waittime = 0.; 2266 ev_tstamp waittime = 0.;
1955 ev_tstamp sleeptime = 0.; 2267 ev_tstamp sleeptime = 0.;
1956 2268
1957 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2269 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1958 { 2270 {
2271 /* remember old timestamp for io_blocktime calculation */
2272 ev_tstamp prev_mn_now = mn_now;
2273
1959 /* update time to cancel out callback processing overhead */ 2274 /* update time to cancel out callback processing overhead */
1960 time_update (EV_A_ 1e100); 2275 time_update (EV_A_ 1e100);
1961 2276
1962 waittime = MAX_BLOCKTIME; 2277 waittime = MAX_BLOCKTIME;
1963 2278
… …
1973 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2288 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1974 if (waittime > to) waittime = to; 2289 if (waittime > to) waittime = to;
1975 } 2290 }
1976#endif 2291#endif
1977 2292
2293 /* don't let timeouts decrease the waittime below timeout_blocktime */
1978 if (expect_false (waittime < timeout_blocktime)) 2294 if (expect_false (waittime < timeout_blocktime))
1979 waittime = timeout_blocktime; 2295 waittime = timeout_blocktime;
1980 2296
1981 sleeptime = waittime - backend_fudge; 2297 /* extra check because io_blocktime is commonly 0 */
1982
1983 if (expect_true (sleeptime > io_blocktime)) 2298 if (expect_false (io_blocktime))
1984 sleeptime = io_blocktime;
1985
1986 if (sleeptime)
1987 { 2299 {
2300 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2301
2302 if (sleeptime > waittime - backend_fudge)
2303 sleeptime = waittime - backend_fudge;
2304
2305 if (expect_true (sleeptime > 0.))
2306 {
1988 ev_sleep (sleeptime); 2307 ev_sleep (sleeptime);
1989 waittime -= sleeptime; 2308 waittime -= sleeptime;
2309 }
1990 } 2310 }
1991 } 2311 }
1992 2312
2313#if EV_MINIMAL < 2
1993 ++loop_count; 2314 ++loop_count;
2315#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
1994 backend_poll (EV_A_ waittime); 2317 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
1995 2319
1996 /* update ev_rt_now, do magic */ 2320 /* update ev_rt_now, do magic */
1997 time_update (EV_A_ waittime + sleeptime); 2321 time_update (EV_A_ waittime + sleeptime);
1998 } 2322 }
1999 2323
… …
2010 2334
2011 /* queue check watchers, to be executed first */ 2335 /* queue check watchers, to be executed first */
2012 if (expect_false (checkcnt)) 2336 if (expect_false (checkcnt))
2013 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2014 2338
2015 call_pending (EV_A); 2339 EV_INVOKE_PENDING;
2016 } 2340 }
2017 while (expect_true ( 2341 while (expect_true (
2018 activecnt 2342 activecnt
2019 && !loop_done 2343 && !loop_done
2020 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2344 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2021 )); 2345 ));
2022 2346
2023 if (loop_done == EVUNLOOP_ONE) 2347 if (loop_done == EVUNLOOP_ONE)
2024 loop_done = EVUNLOOP_CANCEL; 2348 loop_done = EVUNLOOP_CANCEL;
2349
2350#if EV_MINIMAL < 2
2351 --loop_depth;
2352#endif
2025} 2353}
2026 2354
2027void 2355void
2028ev_unloop (EV_P_ int how) 2356ev_unloop (EV_P_ int how)
2029{ 2357{
2030 loop_done = how; 2358 loop_done = how;
2031} 2359}
2032 2360
2361void
2362ev_ref (EV_P)
2363{
2364 ++activecnt;
2365}
2366
2367void
2368ev_unref (EV_P)
2369{
2370 --activecnt;
2371}
2372
2373void
2374ev_now_update (EV_P)
2375{
2376 time_update (EV_A_ 1e100);
2377}
2378
2379void
2380ev_suspend (EV_P)
2381{
2382 ev_now_update (EV_A);
2383}
2384
2385void
2386ev_resume (EV_P)
2387{
2388 ev_tstamp mn_prev = mn_now;
2389
2390 ev_now_update (EV_A);
2391 timers_reschedule (EV_A_ mn_now - mn_prev);
2392#if EV_PERIODIC_ENABLE
2393 /* TODO: really do this? */
2394 periodics_reschedule (EV_A);
2395#endif
2396}
2397
2033/*****************************************************************************/ 2398/*****************************************************************************/
2399/* singly-linked list management, used when the expected list length is short */
2034 2400
2035void inline_size 2401inline_size void
2036wlist_add (WL *head, WL elem) 2402wlist_add (WL *head, WL elem)
2037{ 2403{
2038 elem->next = *head; 2404 elem->next = *head;
2039 *head = elem; 2405 *head = elem;
2040} 2406}
2041 2407
2042void inline_size 2408inline_size void
2043wlist_del (WL *head, WL elem) 2409wlist_del (WL *head, WL elem)
2044{ 2410{
2045 while (*head) 2411 while (*head)
2046 { 2412 {
2047 if (*head == elem) 2413 if (expect_true (*head == elem))
2048 { 2414 {
2049 *head = elem->next; 2415 *head = elem->next;
2050 return; 2416 break;
2051 } 2417 }
2052 2418
2053 head = &(*head)->next; 2419 head = &(*head)->next;
2054 } 2420 }
2055} 2421}
2056 2422
2057void inline_speed 2423/* internal, faster, version of ev_clear_pending */
2424inline_speed void
2058clear_pending (EV_P_ W w) 2425clear_pending (EV_P_ W w)
2059{ 2426{
2060 if (w->pending) 2427 if (w->pending)
2061 { 2428 {
2062 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2429 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2063 w->pending = 0; 2430 w->pending = 0;
2064 } 2431 }
2065} 2432}
2066 2433
2067int 2434int
… …
2071 int pending = w_->pending; 2438 int pending = w_->pending;
2072 2439
2073 if (expect_true (pending)) 2440 if (expect_true (pending))
2074 { 2441 {
2075 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2442 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2443 p->w = (W)&pending_w;
2076 w_->pending = 0; 2444 w_->pending = 0;
2077 p->w = 0;
2078 return p->events; 2445 return p->events;
2079 } 2446 }
2080 else 2447 else
2081 return 0; 2448 return 0;
2082} 2449}
2083 2450
2084void inline_size 2451inline_size void
2085pri_adjust (EV_P_ W w) 2452pri_adjust (EV_P_ W w)
2086{ 2453{
2087 int pri = w->priority; 2454 int pri = ev_priority (w);
2088 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2455 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2089 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2456 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2090 w->priority = pri; 2457 ev_set_priority (w, pri);
2091} 2458}
2092 2459
2093void inline_speed 2460inline_speed void
2094ev_start (EV_P_ W w, int active) 2461ev_start (EV_P_ W w, int active)
2095{ 2462{
2096 pri_adjust (EV_A_ w); 2463 pri_adjust (EV_A_ w);
2097 w->active = active; 2464 w->active = active;
2098 ev_ref (EV_A); 2465 ev_ref (EV_A);
2099} 2466}
2100 2467
2101void inline_size 2468inline_size void
2102ev_stop (EV_P_ W w) 2469ev_stop (EV_P_ W w)
2103{ 2470{
2104 ev_unref (EV_A); 2471 ev_unref (EV_A);
2105 w->active = 0; 2472 w->active = 0;
2106} 2473}
… …
2113 int fd = w->fd; 2480 int fd = w->fd;
2114 2481
2115 if (expect_false (ev_is_active (w))) 2482 if (expect_false (ev_is_active (w)))
2116 return; 2483 return;
2117 2484
2118 assert (("ev_io_start called with negative fd", fd >= 0)); 2485 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2486 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2119 2487
2120 EV_FREQUENT_CHECK; 2488 EV_FREQUENT_CHECK;
2121 2489
2122 ev_start (EV_A_ (W)w, 1); 2490 ev_start (EV_A_ (W)w, 1);
2123 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2124 wlist_add (&anfds[fd].head, (WL)w); 2492 wlist_add (&anfds[fd].head, (WL)w);
2125 2493
2126 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2494 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2127 w->events &= ~EV_IOFDSET; 2495 w->events &= ~EV__IOFDSET;
2128 2496
2129 EV_FREQUENT_CHECK; 2497 EV_FREQUENT_CHECK;
2130} 2498}
2131 2499
2132void noinline 2500void noinline
… …
2134{ 2502{
2135 clear_pending (EV_A_ (W)w); 2503 clear_pending (EV_A_ (W)w);
2136 if (expect_false (!ev_is_active (w))) 2504 if (expect_false (!ev_is_active (w)))
2137 return; 2505 return;
2138 2506
2139 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2507 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2140 2508
2141 EV_FREQUENT_CHECK; 2509 EV_FREQUENT_CHECK;
2142 2510
2143 wlist_del (&anfds[w->fd].head, (WL)w); 2511 wlist_del (&anfds[w->fd].head, (WL)w);
2144 ev_stop (EV_A_ (W)w); 2512 ev_stop (EV_A_ (W)w);
… …
2154 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2155 return; 2523 return;
2156 2524
2157 ev_at (w) += mn_now; 2525 ev_at (w) += mn_now;
2158 2526
2159 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2527 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2160 2528
2161 EV_FREQUENT_CHECK; 2529 EV_FREQUENT_CHECK;
2162 2530
2163 ++timercnt; 2531 ++timercnt;
2164 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2532 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2167 ANHE_at_cache (timers [ev_active (w)]); 2535 ANHE_at_cache (timers [ev_active (w)]);
2168 upheap (timers, ev_active (w)); 2536 upheap (timers, ev_active (w));
2169 2537
2170 EV_FREQUENT_CHECK; 2538 EV_FREQUENT_CHECK;
2171 2539
2172 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2540 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2173} 2541}
2174 2542
2175void noinline 2543void noinline
2176ev_timer_stop (EV_P_ ev_timer *w) 2544ev_timer_stop (EV_P_ ev_timer *w)
2177{ 2545{
… …
2182 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2183 2551
2184 { 2552 {
2185 int active = ev_active (w); 2553 int active = ev_active (w);
2186 2554
2187 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2555 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2188 2556
2189 --timercnt; 2557 --timercnt;
2190 2558
2191 if (expect_true (active < timercnt + HEAP0)) 2559 if (expect_true (active < timercnt + HEAP0))
2192 { 2560 {
… …
2225 } 2593 }
2226 2594
2227 EV_FREQUENT_CHECK; 2595 EV_FREQUENT_CHECK;
2228} 2596}
2229 2597
2598ev_tstamp
2599ev_timer_remaining (EV_P_ ev_timer *w)
2600{
2601 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2602}
2603
2230#if EV_PERIODIC_ENABLE 2604#if EV_PERIODIC_ENABLE
2231void noinline 2605void noinline
2232ev_periodic_start (EV_P_ ev_periodic *w) 2606ev_periodic_start (EV_P_ ev_periodic *w)
2233{ 2607{
2234 if (expect_false (ev_is_active (w))) 2608 if (expect_false (ev_is_active (w)))
… …
2236 2610
2237 if (w->reschedule_cb) 2611 if (w->reschedule_cb)
2238 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2612 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2239 else if (w->interval) 2613 else if (w->interval)
2240 { 2614 {
2241 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2615 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2242 /* this formula differs from the one in periodic_reify because we do not always round up */ 2616 /* this formula differs from the one in periodic_reify because we do not always round up */
2243 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2617 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2244 } 2618 }
2245 else 2619 else
2246 ev_at (w) = w->offset; 2620 ev_at (w) = w->offset;
… …
2254 ANHE_at_cache (periodics [ev_active (w)]); 2628 ANHE_at_cache (periodics [ev_active (w)]);
2255 upheap (periodics, ev_active (w)); 2629 upheap (periodics, ev_active (w));
2256 2630
2257 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2258 2632
2259 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2633 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2260} 2634}
2261 2635
2262void noinline 2636void noinline
2263ev_periodic_stop (EV_P_ ev_periodic *w) 2637ev_periodic_stop (EV_P_ ev_periodic *w)
2264{ 2638{
… …
2269 EV_FREQUENT_CHECK; 2643 EV_FREQUENT_CHECK;
2270 2644
2271 { 2645 {
2272 int active = ev_active (w); 2646 int active = ev_active (w);
2273 2647
2274 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2648 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2275 2649
2276 --periodiccnt; 2650 --periodiccnt;
2277 2651
2278 if (expect_true (active < periodiccnt + HEAP0)) 2652 if (expect_true (active < periodiccnt + HEAP0))
2279 { 2653 {
… …
2301#endif 2675#endif
2302 2676
2303void noinline 2677void noinline
2304ev_signal_start (EV_P_ ev_signal *w) 2678ev_signal_start (EV_P_ ev_signal *w)
2305{ 2679{
2306#if EV_MULTIPLICITY
2307 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2308#endif
2309 if (expect_false (ev_is_active (w))) 2680 if (expect_false (ev_is_active (w)))
2310 return; 2681 return;
2311 2682
2312 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2683 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2313 2684
2314 evpipe_init (EV_A); 2685#if EV_MULTIPLICITY
2686 assert (("libev: a signal must not be attached to two different loops",
2687 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2315 2688
2316 EV_FREQUENT_CHECK; 2689 signals [w->signum - 1].loop = EV_A;
2690#endif
2317 2691
2692 EV_FREQUENT_CHECK;
2693
2694#if EV_USE_SIGNALFD
2695 if (sigfd == -2)
2318 { 2696 {
2319#ifndef _WIN32 2697 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2320 sigset_t full, prev; 2698 if (sigfd < 0 && errno == EINVAL)
2321 sigfillset (&full); 2699 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2322 sigprocmask (SIG_SETMASK, &full, &prev);
2323#endif
2324 2700
2325 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2701 if (sigfd >= 0)
2702 {
2703 fd_intern (sigfd); /* doing it twice will not hurt */
2326 2704
2327#ifndef _WIN32 2705 sigemptyset (&sigfd_set);
2328 sigprocmask (SIG_SETMASK, &prev, 0); 2706
2329#endif 2707 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2708 ev_set_priority (&sigfd_w, EV_MAXPRI);
2709 ev_io_start (EV_A_ &sigfd_w);
2710 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2711 }
2330 } 2712 }
2713
2714 if (sigfd >= 0)
2715 {
2716 /* TODO: check .head */
2717 sigaddset (&sigfd_set, w->signum);
2718 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2719
2720 signalfd (sigfd, &sigfd_set, 0);
2721 }
2722#endif
2331 2723
2332 ev_start (EV_A_ (W)w, 1); 2724 ev_start (EV_A_ (W)w, 1);
2333 wlist_add (&signals [w->signum - 1].head, (WL)w); 2725 wlist_add (&signals [w->signum - 1].head, (WL)w);
2334 2726
2335 if (!((WL)w)->next) 2727 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/
2730# endif
2336 { 2731 {
2337#if _WIN32 2732# if _WIN32
2338 signal (w->signum, ev_sighandler); 2733 signal (w->signum, ev_sighandler);
2339#else 2734# else
2340 struct sigaction sa; 2735 struct sigaction sa;
2736
2737 evpipe_init (EV_A);
2738
2341 sa.sa_handler = ev_sighandler; 2739 sa.sa_handler = ev_sighandler;
2342 sigfillset (&sa.sa_mask); 2740 sigfillset (&sa.sa_mask);
2343 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2741 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2344 sigaction (w->signum, &sa, 0); 2742 sigaction (w->signum, &sa, 0);
2743
2744 sigemptyset (&sa.sa_mask);
2745 sigaddset (&sa.sa_mask, w->signum);
2746 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2345#endif 2747#endif
2346 } 2748 }
2347 2749
2348 EV_FREQUENT_CHECK; 2750 EV_FREQUENT_CHECK;
2349} 2751}
2350 2752
2351void noinline 2753void noinline
… …
2359 2761
2360 wlist_del (&signals [w->signum - 1].head, (WL)w); 2762 wlist_del (&signals [w->signum - 1].head, (WL)w);
2361 ev_stop (EV_A_ (W)w); 2763 ev_stop (EV_A_ (W)w);
2362 2764
2363 if (!signals [w->signum - 1].head) 2765 if (!signals [w->signum - 1].head)
2766 {
2767#if EV_MULTIPLICITY
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif
2770#if EV_USE_SIGNALFD
2771 if (sigfd >= 0)
2772 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2774 sigdelset (&sigfd_set, w->signum);
2775 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2777 /*TODO: maybe unblock signal? */
2778 }
2779 else
2780#endif
2364 signal (w->signum, SIG_DFL); 2781 signal (w->signum, SIG_DFL);
2782 }
2365 2783
2366 EV_FREQUENT_CHECK; 2784 EV_FREQUENT_CHECK;
2367} 2785}
2368 2786
2369void 2787void
2370ev_child_start (EV_P_ ev_child *w) 2788ev_child_start (EV_P_ ev_child *w)
2371{ 2789{
2372#if EV_MULTIPLICITY 2790#if EV_MULTIPLICITY
2373 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2791 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2374#endif 2792#endif
2375 if (expect_false (ev_is_active (w))) 2793 if (expect_false (ev_is_active (w)))
2376 return; 2794 return;
2377 2795
2378 EV_FREQUENT_CHECK; 2796 EV_FREQUENT_CHECK;
… …
2403# ifdef _WIN32 2821# ifdef _WIN32
2404# undef lstat 2822# undef lstat
2405# define lstat(a,b) _stati64 (a,b) 2823# define lstat(a,b) _stati64 (a,b)
2406# endif 2824# endif
2407 2825
2408#define DEF_STAT_INTERVAL 5.0074891 2826#define DEF_STAT_INTERVAL 5.0074891
2827#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2409#define MIN_STAT_INTERVAL 0.1074891 2828#define MIN_STAT_INTERVAL 0.1074891
2410 2829
2411static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2830static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2412 2831
2413#if EV_USE_INOTIFY 2832#if EV_USE_INOTIFY
2414# define EV_INOTIFY_BUFSIZE 8192 2833# define EV_INOTIFY_BUFSIZE 8192
… …
2418{ 2837{
2419 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); 2838 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);
2420 2839
2421 if (w->wd < 0) 2840 if (w->wd < 0)
2422 { 2841 {
2842 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2423 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2843 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2424 2844
2425 /* monitor some parent directory for speedup hints */ 2845 /* monitor some parent directory for speedup hints */
2426 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2846 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2427 /* but an efficiency issue only */ 2847 /* but an efficiency issue only */
2428 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2848 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2429 { 2849 {
2430 char path [4096]; 2850 char path [4096];
2431 strcpy (path, w->path); 2851 strcpy (path, w->path);
… …
2435 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2855 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2436 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2856 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2437 2857
2438 char *pend = strrchr (path, '/'); 2858 char *pend = strrchr (path, '/');
2439 2859
2440 if (!pend) 2860 if (!pend || pend == path)
2441 break; /* whoops, no '/', complain to your admin */ 2861 break;
2442 2862
2443 *pend = 0; 2863 *pend = 0;
2444 w->wd = inotify_add_watch (fs_fd, path, mask); 2864 w->wd = inotify_add_watch (fs_fd, path, mask);
2445 } 2865 }
2446 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2866 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2447 } 2867 }
2448 } 2868 }
2449 else
2450 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2451 2869
2452 if (w->wd >= 0) 2870 if (w->wd >= 0)
2871 {
2872 struct statfs sfs;
2873
2453 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2875
2876 /* now local changes will be tracked by inotify, but remote changes won't */
2877 /* unless the filesystem it known to be local, we therefore still poll */
2878 /* also do poll on <2.6.25, but with normal frequency */
2879
2880 if (fs_2625 && !statfs (w->path, &sfs))
2881 if (sfs.f_type == 0x1373 /* devfs */
2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2883 || sfs.f_type == 0x3153464a /* jfs */
2884 || sfs.f_type == 0x52654973 /* reiser3 */
2885 || sfs.f_type == 0x01021994 /* tempfs */
2886 || sfs.f_type == 0x58465342 /* xfs */)
2887 return;
2888
2889 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2890 ev_timer_again (EV_A_ &w->timer);
2891 }
2454} 2892}
2455 2893
2456static void noinline 2894static void noinline
2457infy_del (EV_P_ ev_stat *w) 2895infy_del (EV_P_ ev_stat *w)
2458{ 2896{
… …
2472 2910
2473static void noinline 2911static void noinline
2474infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2912infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2475{ 2913{
2476 if (slot < 0) 2914 if (slot < 0)
2477 /* overflow, need to check for all hahs slots */ 2915 /* overflow, need to check for all hash slots */
2478 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2916 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2479 infy_wd (EV_A_ slot, wd, ev); 2917 infy_wd (EV_A_ slot, wd, ev);
2480 else 2918 else
2481 { 2919 {
2482 WL w_; 2920 WL w_;
… …
2488 2926
2489 if (w->wd == wd || wd == -1) 2927 if (w->wd == wd || wd == -1)
2490 { 2928 {
2491 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2929 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2492 { 2930 {
2931 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2493 w->wd = -1; 2932 w->wd = -1;
2494 infy_add (EV_A_ w); /* re-add, no matter what */ 2933 infy_add (EV_A_ w); /* re-add, no matter what */
2495 } 2934 }
2496 2935
2497 stat_timer_cb (EV_A_ &w->timer, 0); 2936 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2510 2949
2511 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2950 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2512 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2951 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2513} 2952}
2514 2953
2515void inline_size 2954inline_size void
2955check_2625 (EV_P)
2956{
2957 /* kernels < 2.6.25 are borked
2958 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2959 */
2960 struct utsname buf;
2961 int major, minor, micro;
2962
2963 if (uname (&buf))
2964 return;
2965
2966 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2967 return;
2968
2969 if (major < 2
2970 || (major == 2 && minor < 6)
2971 || (major == 2 && minor == 6 && micro < 25))
2972 return;
2973
2974 fs_2625 = 1;
2975}
2976
2977inline_size void
2516infy_init (EV_P) 2978infy_init (EV_P)
2517{ 2979{
2518 if (fs_fd != -2) 2980 if (fs_fd != -2)
2519 return; 2981 return;
2982
2983 fs_fd = -1;
2984
2985 check_2625 (EV_A);
2520 2986
2521 fs_fd = inotify_init (); 2987 fs_fd = inotify_init ();
2522 2988
2523 if (fs_fd >= 0) 2989 if (fs_fd >= 0)
2524 { 2990 {
… …
2526 ev_set_priority (&fs_w, EV_MAXPRI); 2992 ev_set_priority (&fs_w, EV_MAXPRI);
2527 ev_io_start (EV_A_ &fs_w); 2993 ev_io_start (EV_A_ &fs_w);
2528 } 2994 }
2529} 2995}
2530 2996
2531void inline_size 2997inline_size void
2532infy_fork (EV_P) 2998infy_fork (EV_P)
2533{ 2999{
2534 int slot; 3000 int slot;
2535 3001
2536 if (fs_fd < 0) 3002 if (fs_fd < 0)
… …
2552 w->wd = -1; 3018 w->wd = -1;
2553 3019
2554 if (fs_fd >= 0) 3020 if (fs_fd >= 0)
2555 infy_add (EV_A_ w); /* re-add, no matter what */ 3021 infy_add (EV_A_ w); /* re-add, no matter what */
2556 else 3022 else
2557 ev_timer_start (EV_A_ &w->timer); 3023 ev_timer_again (EV_A_ &w->timer);
2558 } 3024 }
2559
2560 } 3025 }
2561} 3026}
2562 3027
3028#endif
3029
3030#ifdef _WIN32
3031# define EV_LSTAT(p,b) _stati64 (p, b)
3032#else
3033# define EV_LSTAT(p,b) lstat (p, b)
2563#endif 3034#endif
2564 3035
2565void 3036void
2566ev_stat_stat (EV_P_ ev_stat *w) 3037ev_stat_stat (EV_P_ ev_stat *w)
2567{ 3038{
… …
2594 || w->prev.st_atime != w->attr.st_atime 3065 || w->prev.st_atime != w->attr.st_atime
2595 || w->prev.st_mtime != w->attr.st_mtime 3066 || w->prev.st_mtime != w->attr.st_mtime
2596 || w->prev.st_ctime != w->attr.st_ctime 3067 || w->prev.st_ctime != w->attr.st_ctime
2597 ) { 3068 ) {
2598 #if EV_USE_INOTIFY 3069 #if EV_USE_INOTIFY
3070 if (fs_fd >= 0)
3071 {
2599 infy_del (EV_A_ w); 3072 infy_del (EV_A_ w);
2600 infy_add (EV_A_ w); 3073 infy_add (EV_A_ w);
2601 ev_stat_stat (EV_A_ w); /* avoid race... */ 3074 ev_stat_stat (EV_A_ w); /* avoid race... */
3075 }
2602 #endif 3076 #endif
2603 3077
2604 ev_feed_event (EV_A_ w, EV_STAT); 3078 ev_feed_event (EV_A_ w, EV_STAT);
2605 } 3079 }
2606} 3080}
… …
2609ev_stat_start (EV_P_ ev_stat *w) 3083ev_stat_start (EV_P_ ev_stat *w)
2610{ 3084{
2611 if (expect_false (ev_is_active (w))) 3085 if (expect_false (ev_is_active (w)))
2612 return; 3086 return;
2613 3087
2614 /* since we use memcmp, we need to clear any padding data etc. */
2615 memset (&w->prev, 0, sizeof (ev_statdata));
2616 memset (&w->attr, 0, sizeof (ev_statdata));
2617
2618 ev_stat_stat (EV_A_ w); 3088 ev_stat_stat (EV_A_ w);
2619 3089
3090 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2620 if (w->interval < MIN_STAT_INTERVAL) 3091 w->interval = MIN_STAT_INTERVAL;
2621 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2622 3092
2623 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3093 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2624 ev_set_priority (&w->timer, ev_priority (w)); 3094 ev_set_priority (&w->timer, ev_priority (w));
2625 3095
2626#if EV_USE_INOTIFY 3096#if EV_USE_INOTIFY
2627 infy_init (EV_A); 3097 infy_init (EV_A);
2628 3098
2629 if (fs_fd >= 0) 3099 if (fs_fd >= 0)
2630 infy_add (EV_A_ w); 3100 infy_add (EV_A_ w);
2631 else 3101 else
2632#endif 3102#endif
2633 ev_timer_start (EV_A_ &w->timer); 3103 ev_timer_again (EV_A_ &w->timer);
2634 3104
2635 ev_start (EV_A_ (W)w, 1); 3105 ev_start (EV_A_ (W)w, 1);
2636 3106
2637 EV_FREQUENT_CHECK; 3107 EV_FREQUENT_CHECK;
2638} 3108}
… …
2798embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2799{ 3269{
2800 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3270 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2801 3271
2802 { 3272 {
2803 struct ev_loop *loop = w->other; 3273 EV_P = w->other;
2804 3274
2805 while (fdchangecnt) 3275 while (fdchangecnt)
2806 { 3276 {
2807 fd_reify (EV_A); 3277 fd_reify (EV_A);
2808 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2809 } 3279 }
2810 } 3280 }
2811} 3281}
2812 3282
3283static void
3284embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3285{
3286 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3287
3288 ev_embed_stop (EV_A_ w);
3289
3290 {
3291 EV_P = w->other;
3292
3293 ev_loop_fork (EV_A);
3294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3295 }
3296
3297 ev_embed_start (EV_A_ w);
3298}
3299
2813#if 0 3300#if 0
2814static void 3301static void
2815embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3302embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2816{ 3303{
2817 ev_idle_stop (EV_A_ idle); 3304 ev_idle_stop (EV_A_ idle);
… …
2823{ 3310{
2824 if (expect_false (ev_is_active (w))) 3311 if (expect_false (ev_is_active (w)))
2825 return; 3312 return;
2826 3313
2827 { 3314 {
2828 struct ev_loop *loop = w->other; 3315 EV_P = w->other;
2829 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3316 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2830 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3317 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2831 } 3318 }
2832 3319
2833 EV_FREQUENT_CHECK; 3320 EV_FREQUENT_CHECK;
2834 3321
… …
2837 3324
2838 ev_prepare_init (&w->prepare, embed_prepare_cb); 3325 ev_prepare_init (&w->prepare, embed_prepare_cb);
2839 ev_set_priority (&w->prepare, EV_MINPRI); 3326 ev_set_priority (&w->prepare, EV_MINPRI);
2840 ev_prepare_start (EV_A_ &w->prepare); 3327 ev_prepare_start (EV_A_ &w->prepare);
2841 3328
3329 ev_fork_init (&w->fork, embed_fork_cb);
3330 ev_fork_start (EV_A_ &w->fork);
3331
2842 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3332 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2843 3333
2844 ev_start (EV_A_ (W)w, 1); 3334 ev_start (EV_A_ (W)w, 1);
2845 3335
2846 EV_FREQUENT_CHECK; 3336 EV_FREQUENT_CHECK;
… …
2853 if (expect_false (!ev_is_active (w))) 3343 if (expect_false (!ev_is_active (w)))
2854 return; 3344 return;
2855 3345
2856 EV_FREQUENT_CHECK; 3346 EV_FREQUENT_CHECK;
2857 3347
2858 ev_io_stop (EV_A_ &w->io); 3348 ev_io_stop (EV_A_ &w->io);
2859 ev_prepare_stop (EV_A_ &w->prepare); 3349 ev_prepare_stop (EV_A_ &w->prepare);
2860 3350 ev_fork_stop (EV_A_ &w->fork);
2861 ev_stop (EV_A_ (W)w);
2862 3351
2863 EV_FREQUENT_CHECK; 3352 EV_FREQUENT_CHECK;
2864} 3353}
2865#endif 3354#endif
2866 3355
… …
2943 3432
2944void 3433void
2945ev_async_send (EV_P_ ev_async *w) 3434ev_async_send (EV_P_ ev_async *w)
2946{ 3435{
2947 w->sent = 1; 3436 w->sent = 1;
2948 evpipe_write (EV_A_ &gotasync); 3437 evpipe_write (EV_A_ &async_pending);
2949} 3438}
2950#endif 3439#endif
2951 3440
2952/*****************************************************************************/ 3441/*****************************************************************************/
2953 3442
… …
2963once_cb (EV_P_ struct ev_once *once, int revents) 3452once_cb (EV_P_ struct ev_once *once, int revents)
2964{ 3453{
2965 void (*cb)(int revents, void *arg) = once->cb; 3454 void (*cb)(int revents, void *arg) = once->cb;
2966 void *arg = once->arg; 3455 void *arg = once->arg;
2967 3456
2968 ev_io_stop (EV_A_ &once->io); 3457 ev_io_stop (EV_A_ &once->io);
2969 ev_timer_stop (EV_A_ &once->to); 3458 ev_timer_stop (EV_A_ &once->to);
2970 ev_free (once); 3459 ev_free (once);
2971 3460
2972 cb (revents, arg); 3461 cb (revents, arg);
2973} 3462}
2974 3463
2975static void 3464static void
2976once_cb_io (EV_P_ ev_io *w, int revents) 3465once_cb_io (EV_P_ ev_io *w, int revents)
2977{ 3466{
2978 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3467 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3468
3469 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2979} 3470}
2980 3471
2981static void 3472static void
2982once_cb_to (EV_P_ ev_timer *w, int revents) 3473once_cb_to (EV_P_ ev_timer *w, int revents)
2983{ 3474{
2984 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3475 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3476
3477 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2985} 3478}
2986 3479
2987void 3480void
2988ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3481ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2989{ 3482{
… …
3011 ev_timer_set (&once->to, timeout, 0.); 3504 ev_timer_set (&once->to, timeout, 0.);
3012 ev_timer_start (EV_A_ &once->to); 3505 ev_timer_start (EV_A_ &once->to);
3013 } 3506 }
3014} 3507}
3015 3508
3509/*****************************************************************************/
3510
3511#if EV_WALK_ENABLE
3512void
3513ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3514{
3515 int i, j;
3516 ev_watcher_list *wl, *wn;
3517
3518 if (types & (EV_IO | EV_EMBED))
3519 for (i = 0; i < anfdmax; ++i)
3520 for (wl = anfds [i].head; wl; )
3521 {
3522 wn = wl->next;
3523
3524#if EV_EMBED_ENABLE
3525 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3526 {
3527 if (types & EV_EMBED)
3528 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3529 }
3530 else
3531#endif
3532#if EV_USE_INOTIFY
3533 if (ev_cb ((ev_io *)wl) == infy_cb)
3534 ;
3535 else
3536#endif
3537 if ((ev_io *)wl != &pipe_w)
3538 if (types & EV_IO)
3539 cb (EV_A_ EV_IO, wl);
3540
3541 wl = wn;
3542 }
3543
3544 if (types & (EV_TIMER | EV_STAT))
3545 for (i = timercnt + HEAP0; i-- > HEAP0; )
3546#if EV_STAT_ENABLE
3547 /*TODO: timer is not always active*/
3548 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3549 {
3550 if (types & EV_STAT)
3551 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3552 }
3553 else
3554#endif
3555 if (types & EV_TIMER)
3556 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3557
3558#if EV_PERIODIC_ENABLE
3559 if (types & EV_PERIODIC)
3560 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3561 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3562#endif
3563
3564#if EV_IDLE_ENABLE
3565 if (types & EV_IDLE)
3566 for (j = NUMPRI; i--; )
3567 for (i = idlecnt [j]; i--; )
3568 cb (EV_A_ EV_IDLE, idles [j][i]);
3569#endif
3570
3571#if EV_FORK_ENABLE
3572 if (types & EV_FORK)
3573 for (i = forkcnt; i--; )
3574 if (ev_cb (forks [i]) != embed_fork_cb)
3575 cb (EV_A_ EV_FORK, forks [i]);
3576#endif
3577
3578#if EV_ASYNC_ENABLE
3579 if (types & EV_ASYNC)
3580 for (i = asynccnt; i--; )
3581 cb (EV_A_ EV_ASYNC, asyncs [i]);
3582#endif
3583
3584 if (types & EV_PREPARE)
3585 for (i = preparecnt; i--; )
3586#if EV_EMBED_ENABLE
3587 if (ev_cb (prepares [i]) != embed_prepare_cb)
3588#endif
3589 cb (EV_A_ EV_PREPARE, prepares [i]);
3590
3591 if (types & EV_CHECK)
3592 for (i = checkcnt; i--; )
3593 cb (EV_A_ EV_CHECK, checks [i]);
3594
3595 if (types & EV_SIGNAL)
3596 for (i = 0; i < EV_NSIG - 1; ++i)
3597 for (wl = signals [i].head; wl; )
3598 {
3599 wn = wl->next;
3600 cb (EV_A_ EV_SIGNAL, wl);
3601 wl = wn;
3602 }
3603
3604 if (types & EV_CHILD)
3605 for (i = EV_PID_HASHSIZE; i--; )
3606 for (wl = childs [i]; wl; )
3607 {
3608 wn = wl->next;
3609 cb (EV_A_ EV_CHILD, wl);
3610 wl = wn;
3611 }
3612/* EV_STAT 0x00001000 /* stat data changed */
3613/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3614}
3615#endif
3616
3016#if EV_MULTIPLICITY 3617#if EV_MULTIPLICITY
3017 #include "ev_wrap.h" 3618 #include "ev_wrap.h"
3018#endif 3619#endif
3019 3620
3020#ifdef __cplusplus 3621#ifdef __cplusplus

Diff Legend

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