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

Comparing libev/ev.c (file contents):
Revision 1.264 by root, Mon Oct 13 23:20:12 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
… …
164# endif 186# endif
165#endif 187#endif
166 188
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
168 190
191/* 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
169#ifndef EV_USE_MONOTONIC 226#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 228# define EV_USE_MONOTONIC 1
172# else 229# else
173# define EV_USE_MONOTONIC 0 230# define EV_USE_MONOTONIC 0
174# endif 231# endif
175#endif 232#endif
176 233
177#ifndef EV_USE_REALTIME 234#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 236#endif
180 237
181#ifndef EV_USE_NANOSLEEP 238#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 239# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 240# define EV_USE_NANOSLEEP 1
… …
244# else 301# else
245# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
246# endif 303# endif
247#endif 304#endif
248 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
249#if 0 /* debugging */ 314#if 0 /* debugging */
250# define EV_VERIFY 3 315# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
253#endif 318#endif
… …
262 327
263#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 330#endif
266 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
267/* 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 */
268 347
269#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 349# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 350# define EV_USE_MONOTONIC 0
… …
287# endif 366# endif
288#endif 367#endif
289 368
290#if EV_USE_INOTIFY 369#if EV_USE_INOTIFY
291# include <sys/utsname.h> 370# include <sys/utsname.h>
371# include <sys/statfs.h>
292# include <sys/inotify.h> 372# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 374# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 375# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 376# define EV_USE_INOTIFY 0
… …
302#endif 382#endif
303 383
304#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
305/* 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 */
306# 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
307# ifdef __cplusplus 397# ifdef __cplusplus
308extern "C" { 398extern "C" {
309# endif 399# endif
310int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
311# ifdef __cplusplus 401# ifdef __cplusplus
312} 402}
313# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
314#endif 408#endif
315 409
316/**/ 410/**/
317 411
318#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
354# define inline_speed static noinline 448# define inline_speed static noinline
355#else 449#else
356# define inline_speed static inline 450# define inline_speed static inline
357#endif 451#endif
358 452
359#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
360#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
361 460
362#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
363#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
364 463
365typedef ev_watcher *W; 464typedef ev_watcher *W;
… …
367typedef ev_watcher_time *WT; 466typedef ev_watcher_time *WT;
368 467
369#define ev_active(w) ((W)(w))->active 468#define ev_active(w) ((W)(w))->active
370#define ev_at(w) ((WT)(w))->at 469#define ev_at(w) ((WT)(w))->at
371 470
372#if EV_USE_MONOTONIC 471#if EV_USE_REALTIME
373/* 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 */
374/* 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
375static 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)
376#endif 489#endif
377 490
378#ifdef _WIN32 491#ifdef _WIN32
379# include "ev_win32.c" 492# include "ev_win32.c"
380#endif 493#endif
… …
388{ 501{
389 syserr_cb = cb; 502 syserr_cb = cb;
390} 503}
391 504
392static void noinline 505static void noinline
393syserr (const char *msg) 506ev_syserr (const char *msg)
394{ 507{
395 if (!msg) 508 if (!msg)
396 msg = "(libev) system error"; 509 msg = "(libev) system error";
397 510
398 if (syserr_cb) 511 if (syserr_cb)
… …
444#define ev_malloc(size) ev_realloc (0, (size)) 557#define ev_malloc(size) ev_realloc (0, (size))
445#define ev_free(ptr) ev_realloc ((ptr), 0) 558#define ev_free(ptr) ev_realloc ((ptr), 0)
446 559
447/*****************************************************************************/ 560/*****************************************************************************/
448 561
562/* set in reify when reification needed */
563#define EV_ANFD_REIFY 1
564
565/* file descriptor info structure */
449typedef struct 566typedef struct
450{ 567{
451 WL head; 568 WL head;
452 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 */
453 unsigned char reify; 572 unsigned char unused;
573#if EV_USE_EPOLL
574 unsigned int egen; /* generation counter to counter epoll bugs */
575#endif
454#if EV_SELECT_IS_WINSOCKET 576#if EV_SELECT_IS_WINSOCKET
455 SOCKET handle; 577 SOCKET handle;
456#endif 578#endif
457} ANFD; 579} ANFD;
458 580
581/* stores the pending event set for a given watcher */
459typedef struct 582typedef struct
460{ 583{
461 W w; 584 W w;
462 int events; 585 int events; /* the pending event set for the given watcher */
463} ANPENDING; 586} ANPENDING;
464 587
465#if EV_USE_INOTIFY 588#if EV_USE_INOTIFY
466/* hash table entry per inotify-id */ 589/* hash table entry per inotify-id */
467typedef struct 590typedef struct
… …
470} ANFS; 593} ANFS;
471#endif 594#endif
472 595
473/* Heap Entry */ 596/* Heap Entry */
474#if EV_HEAP_CACHE_AT 597#if EV_HEAP_CACHE_AT
598 /* a heap element */
475 typedef struct { 599 typedef struct {
476 ev_tstamp at; 600 ev_tstamp at;
477 WT w; 601 WT w;
478 } ANHE; 602 } ANHE;
479 603
480 #define ANHE_w(he) (he).w /* access watcher, read-write */ 604 #define ANHE_w(he) (he).w /* access watcher, read-write */
481 #define ANHE_at(he) (he).at /* access cached at, read-only */ 605 #define ANHE_at(he) (he).at /* access cached at, read-only */
482 #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 */
483#else 607#else
608 /* a heap element */
484 typedef WT ANHE; 609 typedef WT ANHE;
485 610
486 #define ANHE_w(he) (he) 611 #define ANHE_w(he) (he)
487 #define ANHE_at(he) (he)->at 612 #define ANHE_at(he) (he)->at
488 #define ANHE_at_cache(he) 613 #define ANHE_at_cache(he)
… …
512 637
513 static int ev_default_loop_ptr; 638 static int ev_default_loop_ptr;
514 639
515#endif 640#endif
516 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
517/*****************************************************************************/ 654/*****************************************************************************/
518 655
656#ifndef EV_HAVE_EV_TIME
519ev_tstamp 657ev_tstamp
520ev_time (void) 658ev_time (void)
521{ 659{
522#if EV_USE_REALTIME 660#if EV_USE_REALTIME
661 if (expect_true (have_realtime))
662 {
523 struct timespec ts; 663 struct timespec ts;
524 clock_gettime (CLOCK_REALTIME, &ts); 664 clock_gettime (CLOCK_REALTIME, &ts);
525 return ts.tv_sec + ts.tv_nsec * 1e-9; 665 return ts.tv_sec + ts.tv_nsec * 1e-9;
526#else 666 }
667#endif
668
527 struct timeval tv; 669 struct timeval tv;
528 gettimeofday (&tv, 0); 670 gettimeofday (&tv, 0);
529 return tv.tv_sec + tv.tv_usec * 1e-6; 671 return tv.tv_sec + tv.tv_usec * 1e-6;
530#endif
531} 672}
673#endif
532 674
533ev_tstamp inline_size 675inline_size ev_tstamp
534get_clock (void) 676get_clock (void)
535{ 677{
536#if EV_USE_MONOTONIC 678#if EV_USE_MONOTONIC
537 if (expect_true (have_monotonic)) 679 if (expect_true (have_monotonic))
538 { 680 {
… …
572 714
573 tv.tv_sec = (time_t)delay; 715 tv.tv_sec = (time_t)delay;
574 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 716 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
575 717
576 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 718 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
577 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 719 /* something not guaranteed by newer posix versions, but guaranteed */
578 /* by older ones */ 720 /* by older ones */
579 select (0, 0, 0, 0, &tv); 721 select (0, 0, 0, 0, &tv);
580#endif 722#endif
581 } 723 }
582} 724}
583 725
584/*****************************************************************************/ 726/*****************************************************************************/
585 727
586#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 */
587 729
588int 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
589array_nextsize (int elem, int cur, int cnt) 733array_nextsize (int elem, int cur, int cnt)
590{ 734{
591 int ncur = cur + 1; 735 int ncur = cur + 1;
592 736
593 do 737 do
… …
610array_realloc (int elem, void *base, int *cur, int cnt) 754array_realloc (int elem, void *base, int *cur, int cnt)
611{ 755{
612 *cur = array_nextsize (elem, *cur, cnt); 756 *cur = array_nextsize (elem, *cur, cnt);
613 return ev_realloc (base, elem * *cur); 757 return ev_realloc (base, elem * *cur);
614} 758}
759
760#define array_init_zero(base,count) \
761 memset ((void *)(base), 0, sizeof (*(base)) * (count))
615 762
616#define array_needsize(type,base,cur,cnt,init) \ 763#define array_needsize(type,base,cur,cnt,init) \
617 if (expect_false ((cnt) > (cur))) \ 764 if (expect_false ((cnt) > (cur))) \
618 { \ 765 { \
619 int ocur_ = (cur); \ 766 int ocur_ = (cur); \
… …
631 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 778 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
632 } 779 }
633#endif 780#endif
634 781
635#define array_free(stem, idx) \ 782#define array_free(stem, idx) \
636 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
637 784
638/*****************************************************************************/ 785/*****************************************************************************/
786
787/* dummy callback for pending events */
788static void noinline
789pendingcb (EV_P_ ev_prepare *w, int revents)
790{
791}
639 792
640void noinline 793void noinline
641ev_feed_event (EV_P_ void *w, int revents) 794ev_feed_event (EV_P_ void *w, int revents)
642{ 795{
643 W w_ = (W)w; 796 W w_ = (W)w;
… …
652 pendings [pri][w_->pending - 1].w = w_; 805 pendings [pri][w_->pending - 1].w = w_;
653 pendings [pri][w_->pending - 1].events = revents; 806 pendings [pri][w_->pending - 1].events = revents;
654 } 807 }
655} 808}
656 809
657void 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
658queue_events (EV_P_ W *events, int eventcnt, int type) 826queue_events (EV_P_ W *events, int eventcnt, int type)
659{ 827{
660 int i; 828 int i;
661 829
662 for (i = 0; i < eventcnt; ++i) 830 for (i = 0; i < eventcnt; ++i)
663 ev_feed_event (EV_A_ events [i], type); 831 ev_feed_event (EV_A_ events [i], type);
664} 832}
665 833
666/*****************************************************************************/ 834/*****************************************************************************/
667 835
668void inline_size 836inline_speed void
669anfds_init (ANFD *base, int count)
670{
671 while (count--)
672 {
673 base->head = 0;
674 base->events = EV_NONE;
675 base->reify = 0;
676
677 ++base;
678 }
679}
680
681void inline_speed
682fd_event (EV_P_ int fd, int revents) 837fd_event_nc (EV_P_ int fd, int revents)
683{ 838{
684 ANFD *anfd = anfds + fd; 839 ANFD *anfd = anfds + fd;
685 ev_io *w; 840 ev_io *w;
686 841
687 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)
… …
691 if (ev) 846 if (ev)
692 ev_feed_event (EV_A_ (W)w, ev); 847 ev_feed_event (EV_A_ (W)w, ev);
693 } 848 }
694} 849}
695 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
696void 862void
697ev_feed_fd_event (EV_P_ int fd, int revents) 863ev_feed_fd_event (EV_P_ int fd, int revents)
698{ 864{
699 if (fd >= 0 && fd < anfdmax) 865 if (fd >= 0 && fd < anfdmax)
700 fd_event (EV_A_ fd, revents); 866 fd_event_nc (EV_A_ fd, revents);
701} 867}
702 868
703void inline_size 869/* make sure the external fd watch events are in-sync */
870/* with the kernel/libev internal state */
871inline_size void
704fd_reify (EV_P) 872fd_reify (EV_P)
705{ 873{
706 int i; 874 int i;
707 875
708 for (i = 0; i < fdchangecnt; ++i) 876 for (i = 0; i < fdchangecnt; ++i)
… …
718 886
719#if EV_SELECT_IS_WINSOCKET 887#if EV_SELECT_IS_WINSOCKET
720 if (events) 888 if (events)
721 { 889 {
722 unsigned long arg; 890 unsigned long arg;
723 #ifdef EV_FD_TO_WIN32_HANDLE
724 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 891 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
725 #else
726 anfd->handle = _get_osfhandle (fd);
727 #endif
728 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 892 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
729 } 893 }
730#endif 894#endif
731 895
732 { 896 {
733 unsigned char o_events = anfd->events; 897 unsigned char o_events = anfd->events;
734 unsigned char o_reify = anfd->reify; 898 unsigned char o_reify = anfd->reify;
735 899
736 anfd->reify = 0; 900 anfd->reify = 0;
737 anfd->events = events; 901 anfd->events = events;
738 902
739 if (o_events != events || o_reify & EV_IOFDSET) 903 if (o_events != events || o_reify & EV__IOFDSET)
740 backend_modify (EV_A_ fd, o_events, events); 904 backend_modify (EV_A_ fd, o_events, events);
741 } 905 }
742 } 906 }
743 907
744 fdchangecnt = 0; 908 fdchangecnt = 0;
745} 909}
746 910
747void inline_size 911/* something about the given fd changed */
912inline_size void
748fd_change (EV_P_ int fd, int flags) 913fd_change (EV_P_ int fd, int flags)
749{ 914{
750 unsigned char reify = anfds [fd].reify; 915 unsigned char reify = anfds [fd].reify;
751 anfds [fd].reify |= flags; 916 anfds [fd].reify |= flags;
752 917
… …
756 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 921 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
757 fdchanges [fdchangecnt - 1] = fd; 922 fdchanges [fdchangecnt - 1] = fd;
758 } 923 }
759} 924}
760 925
761void inline_speed 926/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
927inline_speed void
762fd_kill (EV_P_ int fd) 928fd_kill (EV_P_ int fd)
763{ 929{
764 ev_io *w; 930 ev_io *w;
765 931
766 while ((w = (ev_io *)anfds [fd].head)) 932 while ((w = (ev_io *)anfds [fd].head))
… …
768 ev_io_stop (EV_A_ w); 934 ev_io_stop (EV_A_ w);
769 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);
770 } 936 }
771} 937}
772 938
773int inline_size 939/* check whether the given fd is atcually valid, for error recovery */
940inline_size int
774fd_valid (int fd) 941fd_valid (int fd)
775{ 942{
776#ifdef _WIN32 943#ifdef _WIN32
777 return _get_osfhandle (fd) != -1; 944 return _get_osfhandle (fd) != -1;
778#else 945#else
… …
800 967
801 for (fd = anfdmax; fd--; ) 968 for (fd = anfdmax; fd--; )
802 if (anfds [fd].events) 969 if (anfds [fd].events)
803 { 970 {
804 fd_kill (EV_A_ fd); 971 fd_kill (EV_A_ fd);
805 return; 972 break;
806 } 973 }
807} 974}
808 975
809/* 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 */
810static void noinline 977static void noinline
… …
814 981
815 for (fd = 0; fd < anfdmax; ++fd) 982 for (fd = 0; fd < anfdmax; ++fd)
816 if (anfds [fd].events) 983 if (anfds [fd].events)
817 { 984 {
818 anfds [fd].events = 0; 985 anfds [fd].events = 0;
986 anfds [fd].emask = 0;
819 fd_change (EV_A_ fd, EV_IOFDSET | 1); 987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
820 } 988 }
821} 989}
822 990
823/*****************************************************************************/ 991/*****************************************************************************/
824 992
… …
840#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1008#define HEAP0 (DHEAP - 1) /* index of first element in heap */
841#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1009#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
842#define UPHEAP_DONE(p,k) ((p) == (k)) 1010#define UPHEAP_DONE(p,k) ((p) == (k))
843 1011
844/* away from the root */ 1012/* away from the root */
845void inline_speed 1013inline_speed void
846downheap (ANHE *heap, int N, int k) 1014downheap (ANHE *heap, int N, int k)
847{ 1015{
848 ANHE he = heap [k]; 1016 ANHE he = heap [k];
849 ANHE *E = heap + N + HEAP0; 1017 ANHE *E = heap + N + HEAP0;
850 1018
… …
890#define HEAP0 1 1058#define HEAP0 1
891#define HPARENT(k) ((k) >> 1) 1059#define HPARENT(k) ((k) >> 1)
892#define UPHEAP_DONE(p,k) (!(p)) 1060#define UPHEAP_DONE(p,k) (!(p))
893 1061
894/* away from the root */ 1062/* away from the root */
895void inline_speed 1063inline_speed void
896downheap (ANHE *heap, int N, int k) 1064downheap (ANHE *heap, int N, int k)
897{ 1065{
898 ANHE he = heap [k]; 1066 ANHE he = heap [k];
899 1067
900 for (;;) 1068 for (;;)
901 { 1069 {
902 int c = k << 1; 1070 int c = k << 1;
903 1071
904 if (c > N + HEAP0 - 1) 1072 if (c >= N + HEAP0)
905 break; 1073 break;
906 1074
907 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])
908 ? 1 : 0; 1076 ? 1 : 0;
909 1077
… …
920 ev_active (ANHE_w (he)) = k; 1088 ev_active (ANHE_w (he)) = k;
921} 1089}
922#endif 1090#endif
923 1091
924/* towards the root */ 1092/* towards the root */
925void inline_speed 1093inline_speed void
926upheap (ANHE *heap, int k) 1094upheap (ANHE *heap, int k)
927{ 1095{
928 ANHE he = heap [k]; 1096 ANHE he = heap [k];
929 1097
930 for (;;) 1098 for (;;)
… …
941 1109
942 heap [k] = he; 1110 heap [k] = he;
943 ev_active (ANHE_w (he)) = k; 1111 ev_active (ANHE_w (he)) = k;
944} 1112}
945 1113
946void inline_size 1114/* move an element suitably so it is in a correct place */
1115inline_size void
947adjustheap (ANHE *heap, int N, int k) 1116adjustheap (ANHE *heap, int N, int k)
948{ 1117{
949 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)]))
950 upheap (heap, k); 1119 upheap (heap, k);
951 else 1120 else
952 downheap (heap, N, k); 1121 downheap (heap, N, k);
953} 1122}
954 1123
955/* 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 */
956void inline_size 1125inline_size void
957reheap (ANHE *heap, int N) 1126reheap (ANHE *heap, int N)
958{ 1127{
959 int i; 1128 int i;
960 1129
961 /* 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 */
… …
964 upheap (heap, i + HEAP0); 1133 upheap (heap, i + HEAP0);
965} 1134}
966 1135
967/*****************************************************************************/ 1136/*****************************************************************************/
968 1137
1138/* associate signal watchers to a signal signal */
969typedef struct 1139typedef struct
970{ 1140{
1141 EV_ATOMIC_T pending;
1142#if EV_MULTIPLICITY
1143 EV_P;
1144#endif
971 WL head; 1145 WL head;
972 EV_ATOMIC_T gotsig;
973} ANSIG; 1146} ANSIG;
974 1147
975static ANSIG *signals; 1148static ANSIG signals [EV_NSIG - 1];
976static int signalmax;
977
978static EV_ATOMIC_T gotsig;
979
980void inline_size
981signals_init (ANSIG *base, int count)
982{
983 while (count--)
984 {
985 base->head = 0;
986 base->gotsig = 0;
987
988 ++base;
989 }
990}
991 1149
992/*****************************************************************************/ 1150/*****************************************************************************/
993 1151
994void inline_speed 1152/* used to prepare libev internal fd's */
1153/* this is not fork-safe */
1154inline_speed void
995fd_intern (int fd) 1155fd_intern (int fd)
996{ 1156{
997#ifdef _WIN32 1157#ifdef _WIN32
998 unsigned long arg = 1; 1158 unsigned long arg = 1;
999 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1159 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1004} 1164}
1005 1165
1006static void noinline 1166static void noinline
1007evpipe_init (EV_P) 1167evpipe_init (EV_P)
1008{ 1168{
1009 if (!ev_is_active (&pipeev)) 1169 if (!ev_is_active (&pipe_w))
1010 { 1170 {
1011#if EV_USE_EVENTFD 1171#if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL)
1012 if ((evfd = eventfd (0, 0)) >= 0) 1174 evfd = eventfd (0, 0);
1175
1176 if (evfd >= 0)
1013 { 1177 {
1014 evpipe [0] = -1; 1178 evpipe [0] = -1;
1015 fd_intern (evfd); 1179 fd_intern (evfd); /* doing it twice doesn't hurt */
1016 ev_io_set (&pipeev, evfd, EV_READ); 1180 ev_io_set (&pipe_w, evfd, EV_READ);
1017 } 1181 }
1018 else 1182 else
1019#endif 1183#endif
1020 { 1184 {
1021 while (pipe (evpipe)) 1185 while (pipe (evpipe))
1022 syserr ("(libev) error creating signal/async pipe"); 1186 ev_syserr ("(libev) error creating signal/async pipe");
1023 1187
1024 fd_intern (evpipe [0]); 1188 fd_intern (evpipe [0]);
1025 fd_intern (evpipe [1]); 1189 fd_intern (evpipe [1]);
1026 ev_io_set (&pipeev, evpipe [0], EV_READ); 1190 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1027 } 1191 }
1028 1192
1029 ev_io_start (EV_A_ &pipeev); 1193 ev_io_start (EV_A_ &pipe_w);
1030 ev_unref (EV_A); /* watcher should not keep loop alive */ 1194 ev_unref (EV_A); /* watcher should not keep loop alive */
1031 } 1195 }
1032} 1196}
1033 1197
1034void inline_size 1198inline_size void
1035evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1199evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1036{ 1200{
1037 if (!*flag) 1201 if (!*flag)
1038 { 1202 {
1039 int old_errno = errno; /* save errno because write might clobber it */ 1203 int old_errno = errno; /* save errno because write might clobber it */
… …
1052 1216
1053 errno = old_errno; 1217 errno = old_errno;
1054 } 1218 }
1055} 1219}
1056 1220
1221/* called whenever the libev signal pipe */
1222/* got some events (signal, async) */
1057static void 1223static void
1058pipecb (EV_P_ ev_io *iow, int revents) 1224pipecb (EV_P_ ev_io *iow, int revents)
1059{ 1225{
1226 int i;
1227
1060#if EV_USE_EVENTFD 1228#if EV_USE_EVENTFD
1061 if (evfd >= 0) 1229 if (evfd >= 0)
1062 { 1230 {
1063 uint64_t counter; 1231 uint64_t counter;
1064 read (evfd, &counter, sizeof (uint64_t)); 1232 read (evfd, &counter, sizeof (uint64_t));
… …
1068 { 1236 {
1069 char dummy; 1237 char dummy;
1070 read (evpipe [0], &dummy, 1); 1238 read (evpipe [0], &dummy, 1);
1071 } 1239 }
1072 1240
1073 if (gotsig && ev_is_default_loop (EV_A)) 1241 if (sig_pending)
1074 { 1242 {
1075 int signum; 1243 sig_pending = 0;
1076 gotsig = 0;
1077 1244
1078 for (signum = signalmax; signum--; ) 1245 for (i = EV_NSIG - 1; i--; )
1079 if (signals [signum].gotsig) 1246 if (expect_false (signals [i].pending))
1080 ev_feed_signal_event (EV_A_ signum + 1); 1247 ev_feed_signal_event (EV_A_ i + 1);
1081 } 1248 }
1082 1249
1083#if EV_ASYNC_ENABLE 1250#if EV_ASYNC_ENABLE
1084 if (gotasync) 1251 if (async_pending)
1085 { 1252 {
1086 int i; 1253 async_pending = 0;
1087 gotasync = 0;
1088 1254
1089 for (i = asynccnt; i--; ) 1255 for (i = asynccnt; i--; )
1090 if (asyncs [i]->sent) 1256 if (asyncs [i]->sent)
1091 { 1257 {
1092 asyncs [i]->sent = 0; 1258 asyncs [i]->sent = 0;
… …
1100 1266
1101static void 1267static void
1102ev_sighandler (int signum) 1268ev_sighandler (int signum)
1103{ 1269{
1104#if EV_MULTIPLICITY 1270#if EV_MULTIPLICITY
1105 struct ev_loop *loop = &default_loop_struct; 1271 EV_P = signals [signum - 1].loop;
1106#endif 1272#endif
1107 1273
1108#if _WIN32 1274#if _WIN32
1109 signal (signum, ev_sighandler); 1275 signal (signum, ev_sighandler);
1110#endif 1276#endif
1111 1277
1112 signals [signum - 1].gotsig = 1; 1278 signals [signum - 1].pending = 1;
1113 evpipe_write (EV_A_ &gotsig); 1279 evpipe_write (EV_A_ &sig_pending);
1114} 1280}
1115 1281
1116void noinline 1282void noinline
1117ev_feed_signal_event (EV_P_ int signum) 1283ev_feed_signal_event (EV_P_ int signum)
1118{ 1284{
1119 WL w; 1285 WL w;
1120 1286
1287 if (expect_false (signum <= 0 || signum > EV_NSIG))
1288 return;
1289
1290 --signum;
1291
1121#if EV_MULTIPLICITY 1292#if EV_MULTIPLICITY
1122 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 */
1123#endif 1294 /* or, likely more useful, feeding a signal nobody is waiting for */
1124 1295
1125 --signum; 1296 if (expect_false (signals [signum].loop != EV_A))
1126
1127 if (signum < 0 || signum >= signalmax)
1128 return; 1297 return;
1298#endif
1129 1299
1130 signals [signum].gotsig = 0; 1300 signals [signum].pending = 0;
1131 1301
1132 for (w = signals [signum].head; w; w = w->next) 1302 for (w = signals [signum].head; w; w = w->next)
1133 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1303 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1134} 1304}
1135 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
1136/*****************************************************************************/ 1326/*****************************************************************************/
1137 1327
1138static WL childs [EV_PID_HASHSIZE]; 1328static WL childs [EV_PID_HASHSIZE];
1139 1329
1140#ifndef _WIN32 1330#ifndef _WIN32
… …
1143 1333
1144#ifndef WIFCONTINUED 1334#ifndef WIFCONTINUED
1145# define WIFCONTINUED(status) 0 1335# define WIFCONTINUED(status) 0
1146#endif 1336#endif
1147 1337
1148void inline_speed 1338/* handle a single child status event */
1339inline_speed void
1149child_reap (EV_P_ int chain, int pid, int status) 1340child_reap (EV_P_ int chain, int pid, int status)
1150{ 1341{
1151 ev_child *w; 1342 ev_child *w;
1152 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1343 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1153 1344
… …
1166 1357
1167#ifndef WCONTINUED 1358#ifndef WCONTINUED
1168# define WCONTINUED 0 1359# define WCONTINUED 0
1169#endif 1360#endif
1170 1361
1362/* called on sigchld etc., calls waitpid */
1171static void 1363static void
1172childcb (EV_P_ ev_signal *sw, int revents) 1364childcb (EV_P_ ev_signal *sw, int revents)
1173{ 1365{
1174 int pid, status; 1366 int pid, status;
1175 1367
… …
1256 /* kqueue is borked on everything but netbsd apparently */ 1448 /* kqueue is borked on everything but netbsd apparently */
1257 /* 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 */
1258 flags &= ~EVBACKEND_KQUEUE; 1450 flags &= ~EVBACKEND_KQUEUE;
1259#endif 1451#endif
1260#ifdef __APPLE__ 1452#ifdef __APPLE__
1261 // flags &= ~EVBACKEND_KQUEUE; for documentation 1453 /* only select works correctly on that "unix-certified" platform */
1262 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 */
1263#endif 1456#endif
1264 1457
1265 return flags; 1458 return flags;
1266} 1459}
1267 1460
… …
1281ev_backend (EV_P) 1474ev_backend (EV_P)
1282{ 1475{
1283 return backend; 1476 return backend;
1284} 1477}
1285 1478
1479#if EV_MINIMAL < 2
1286unsigned int 1480unsigned int
1287ev_loop_count (EV_P) 1481ev_loop_count (EV_P)
1288{ 1482{
1289 return loop_count; 1483 return loop_count;
1290} 1484}
1291 1485
1486unsigned int
1487ev_loop_depth (EV_P)
1488{
1489 return loop_depth;
1490}
1491
1292void 1492void
1293ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1294{ 1494{
1295 io_blocktime = interval; 1495 io_blocktime = interval;
1296} 1496}
… …
1299ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1499ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1300{ 1500{
1301 timeout_blocktime = interval; 1501 timeout_blocktime = interval;
1302} 1502}
1303 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 */
1304static void noinline 1529static void noinline
1305loop_init (EV_P_ unsigned int flags) 1530loop_init (EV_P_ unsigned int flags)
1306{ 1531{
1307 if (!backend) 1532 if (!backend)
1308 { 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
1309#if EV_USE_MONOTONIC 1544#if EV_USE_MONOTONIC
1545 if (!have_monotonic)
1310 { 1546 {
1311 struct timespec ts; 1547 struct timespec ts;
1548
1312 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1549 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1313 have_monotonic = 1; 1550 have_monotonic = 1;
1314 } 1551 }
1315#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"));
1316 1564
1317 ev_rt_now = ev_time (); 1565 ev_rt_now = ev_time ();
1318 mn_now = get_clock (); 1566 mn_now = get_clock ();
1319 now_floor = mn_now; 1567 now_floor = mn_now;
1320 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
1321 1572
1322 io_blocktime = 0.; 1573 io_blocktime = 0.;
1323 timeout_blocktime = 0.; 1574 timeout_blocktime = 0.;
1324 backend = 0; 1575 backend = 0;
1325 backend_fd = -1; 1576 backend_fd = -1;
1326 gotasync = 0; 1577 sig_pending = 0;
1578#if EV_ASYNC_ENABLE
1579 async_pending = 0;
1580#endif
1327#if EV_USE_INOTIFY 1581#if EV_USE_INOTIFY
1328 fs_fd = -2; 1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1329#endif 1583#endif
1330 1584#if EV_USE_SIGNALFD
1331 /* pid check not overridable via env */ 1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1332#ifndef _WIN32
1333 if (flags & EVFLAG_FORKCHECK)
1334 curpid = getpid ();
1335#endif 1586#endif
1336
1337 if (!(flags & EVFLAG_NOENV)
1338 && !enable_secure ()
1339 && getenv ("LIBEV_FLAGS"))
1340 flags = atoi (getenv ("LIBEV_FLAGS"));
1341 1587
1342 if (!(flags & 0x0000ffffU)) 1588 if (!(flags & 0x0000ffffU))
1343 flags |= ev_recommended_backends (); 1589 flags |= ev_recommended_backends ();
1344 1590
1345#if EV_USE_PORT 1591#if EV_USE_PORT
… …
1356#endif 1602#endif
1357#if EV_USE_SELECT 1603#if EV_USE_SELECT
1358 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1604 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1359#endif 1605#endif
1360 1606
1607 ev_prepare_init (&pending_w, pendingcb);
1608
1361 ev_init (&pipeev, pipecb); 1609 ev_init (&pipe_w, pipecb);
1362 ev_set_priority (&pipeev, EV_MAXPRI); 1610 ev_set_priority (&pipe_w, EV_MAXPRI);
1363 } 1611 }
1364} 1612}
1365 1613
1614/* free up a loop structure */
1366static void noinline 1615static void noinline
1367loop_destroy (EV_P) 1616loop_destroy (EV_P)
1368{ 1617{
1369 int i; 1618 int i;
1370 1619
1371 if (ev_is_active (&pipeev)) 1620 if (ev_is_active (&pipe_w))
1372 { 1621 {
1373 ev_ref (EV_A); /* signal watcher */ 1622 /*ev_ref (EV_A);*/
1374 ev_io_stop (EV_A_ &pipeev); 1623 /*ev_io_stop (EV_A_ &pipe_w);*/
1375 1624
1376#if EV_USE_EVENTFD 1625#if EV_USE_EVENTFD
1377 if (evfd >= 0) 1626 if (evfd >= 0)
1378 close (evfd); 1627 close (evfd);
1379#endif 1628#endif
1380 1629
1381 if (evpipe [0] >= 0) 1630 if (evpipe [0] >= 0)
1382 { 1631 {
1383 close (evpipe [0]); 1632 EV_WIN32_CLOSE_FD (evpipe [0]);
1384 close (evpipe [1]); 1633 EV_WIN32_CLOSE_FD (evpipe [1]);
1385 } 1634 }
1386 } 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
1387 1646
1388#if EV_USE_INOTIFY 1647#if EV_USE_INOTIFY
1389 if (fs_fd >= 0) 1648 if (fs_fd >= 0)
1390 close (fs_fd); 1649 close (fs_fd);
1391#endif 1650#endif
… …
1415#if EV_IDLE_ENABLE 1674#if EV_IDLE_ENABLE
1416 array_free (idle, [i]); 1675 array_free (idle, [i]);
1417#endif 1676#endif
1418 } 1677 }
1419 1678
1420 ev_free (anfds); anfdmax = 0; 1679 ev_free (anfds); anfds = 0; anfdmax = 0;
1421 1680
1422 /* 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);
1423 array_free (fdchange, EMPTY); 1683 array_free (fdchange, EMPTY);
1424 array_free (timer, EMPTY); 1684 array_free (timer, EMPTY);
1425#if EV_PERIODIC_ENABLE 1685#if EV_PERIODIC_ENABLE
1426 array_free (periodic, EMPTY); 1686 array_free (periodic, EMPTY);
1427#endif 1687#endif
… …
1436 1696
1437 backend = 0; 1697 backend = 0;
1438} 1698}
1439 1699
1440#if EV_USE_INOTIFY 1700#if EV_USE_INOTIFY
1441void inline_size infy_fork (EV_P); 1701inline_size void infy_fork (EV_P);
1442#endif 1702#endif
1443 1703
1444void inline_size 1704inline_size void
1445loop_fork (EV_P) 1705loop_fork (EV_P)
1446{ 1706{
1447#if EV_USE_PORT 1707#if EV_USE_PORT
1448 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1708 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1449#endif 1709#endif
… …
1455#endif 1715#endif
1456#if EV_USE_INOTIFY 1716#if EV_USE_INOTIFY
1457 infy_fork (EV_A); 1717 infy_fork (EV_A);
1458#endif 1718#endif
1459 1719
1460 if (ev_is_active (&pipeev)) 1720 if (ev_is_active (&pipe_w))
1461 { 1721 {
1462 /* this "locks" the handlers against writing to the pipe */ 1722 /* this "locks" the handlers against writing to the pipe */
1463 /* while we modify the fd vars */ 1723 /* while we modify the fd vars */
1464 gotsig = 1; 1724 sig_pending = 1;
1465#if EV_ASYNC_ENABLE 1725#if EV_ASYNC_ENABLE
1466 gotasync = 1; 1726 async_pending = 1;
1467#endif 1727#endif
1468 1728
1469 ev_ref (EV_A); 1729 ev_ref (EV_A);
1470 ev_io_stop (EV_A_ &pipeev); 1730 ev_io_stop (EV_A_ &pipe_w);
1471 1731
1472#if EV_USE_EVENTFD 1732#if EV_USE_EVENTFD
1473 if (evfd >= 0) 1733 if (evfd >= 0)
1474 close (evfd); 1734 close (evfd);
1475#endif 1735#endif
1476 1736
1477 if (evpipe [0] >= 0) 1737 if (evpipe [0] >= 0)
1478 { 1738 {
1479 close (evpipe [0]); 1739 EV_WIN32_CLOSE_FD (evpipe [0]);
1480 close (evpipe [1]); 1740 EV_WIN32_CLOSE_FD (evpipe [1]);
1481 } 1741 }
1482 1742
1483 evpipe_init (EV_A); 1743 evpipe_init (EV_A);
1484 /* now iterate over everything, in case we missed something */ 1744 /* now iterate over everything, in case we missed something */
1485 pipecb (EV_A_ &pipeev, EV_READ); 1745 pipecb (EV_A_ &pipe_w, EV_READ);
1486 } 1746 }
1487 1747
1488 postfork = 0; 1748 postfork = 0;
1489} 1749}
1490 1750
1491#if EV_MULTIPLICITY 1751#if EV_MULTIPLICITY
1492 1752
1493struct ev_loop * 1753struct ev_loop *
1494ev_loop_new (unsigned int flags) 1754ev_loop_new (unsigned int flags)
1495{ 1755{
1496 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));
1497 1757
1498 memset (loop, 0, sizeof (struct ev_loop)); 1758 memset (EV_A, 0, sizeof (struct ev_loop));
1499
1500 loop_init (EV_A_ flags); 1759 loop_init (EV_A_ flags);
1501 1760
1502 if (ev_backend (EV_A)) 1761 if (ev_backend (EV_A))
1503 return loop; 1762 return EV_A;
1504 1763
1505 return 0; 1764 return 0;
1506} 1765}
1507 1766
1508void 1767void
… …
1515void 1774void
1516ev_loop_fork (EV_P) 1775ev_loop_fork (EV_P)
1517{ 1776{
1518 postfork = 1; /* must be in line with ev_default_fork */ 1777 postfork = 1; /* must be in line with ev_default_fork */
1519} 1778}
1779#endif /* multiplicity */
1520 1780
1521#if EV_VERIFY 1781#if EV_VERIFY
1522static void noinline 1782static void noinline
1523verify_watcher (EV_P_ W w) 1783verify_watcher (EV_P_ W w)
1524{ 1784{
1525 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1785 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1526 1786
1527 if (w->pending) 1787 if (w->pending)
1528 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));
1529} 1789}
1530 1790
1531static void noinline 1791static void noinline
1532verify_heap (EV_P_ ANHE *heap, int N) 1792verify_heap (EV_P_ ANHE *heap, int N)
1533{ 1793{
1534 int i; 1794 int i;
1535 1795
1536 for (i = HEAP0; i < N + HEAP0; ++i) 1796 for (i = HEAP0; i < N + HEAP0; ++i)
1537 { 1797 {
1538 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));
1539 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])));
1540 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]))));
1541 1801
1542 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1802 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1543 } 1803 }
1544} 1804}
1545 1805
1546static void noinline 1806static void noinline
1547array_verify (EV_P_ W *ws, int cnt) 1807array_verify (EV_P_ W *ws, int cnt)
1548{ 1808{
1549 while (cnt--) 1809 while (cnt--)
1550 { 1810 {
1551 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1811 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1552 verify_watcher (EV_A_ ws [cnt]); 1812 verify_watcher (EV_A_ ws [cnt]);
1553 } 1813 }
1554} 1814}
1555#endif 1815#endif
1556 1816
1817#if EV_MINIMAL < 2
1557void 1818void
1558ev_loop_verify (EV_P) 1819ev_loop_verify (EV_P)
1559{ 1820{
1560#if EV_VERIFY 1821#if EV_VERIFY
1561 int i; 1822 int i;
… …
1563 1824
1564 assert (activecnt >= -1); 1825 assert (activecnt >= -1);
1565 1826
1566 assert (fdchangemax >= fdchangecnt); 1827 assert (fdchangemax >= fdchangecnt);
1567 for (i = 0; i < fdchangecnt; ++i) 1828 for (i = 0; i < fdchangecnt; ++i)
1568 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1829 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1569 1830
1570 assert (anfdmax >= 0); 1831 assert (anfdmax >= 0);
1571 for (i = 0; i < anfdmax; ++i) 1832 for (i = 0; i < anfdmax; ++i)
1572 for (w = anfds [i].head; w; w = w->next) 1833 for (w = anfds [i].head; w; w = w->next)
1573 { 1834 {
1574 verify_watcher (EV_A_ (W)w); 1835 verify_watcher (EV_A_ (W)w);
1575 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1836 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1576 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));
1577 } 1838 }
1578 1839
1579 assert (timermax >= timercnt); 1840 assert (timermax >= timercnt);
1580 verify_heap (EV_A_ timers, timercnt); 1841 verify_heap (EV_A_ timers, timercnt);
1581 1842
… …
1610 assert (checkmax >= checkcnt); 1871 assert (checkmax >= checkcnt);
1611 array_verify (EV_A_ (W *)checks, checkcnt); 1872 array_verify (EV_A_ (W *)checks, checkcnt);
1612 1873
1613# if 0 1874# if 0
1614 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)
1615 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1616# endif 1877# endif
1617#endif 1878#endif
1618} 1879}
1619 1880#endif
1620#endif /* multiplicity */
1621 1881
1622#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1623struct ev_loop * 1883struct ev_loop *
1624ev_default_loop_init (unsigned int flags) 1884ev_default_loop_init (unsigned int flags)
1625#else 1885#else
… …
1628#endif 1888#endif
1629{ 1889{
1630 if (!ev_default_loop_ptr) 1890 if (!ev_default_loop_ptr)
1631 { 1891 {
1632#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1633 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1893 EV_P = ev_default_loop_ptr = &default_loop_struct;
1634#else 1894#else
1635 ev_default_loop_ptr = 1; 1895 ev_default_loop_ptr = 1;
1636#endif 1896#endif
1637 1897
1638 loop_init (EV_A_ flags); 1898 loop_init (EV_A_ flags);
… …
1655 1915
1656void 1916void
1657ev_default_destroy (void) 1917ev_default_destroy (void)
1658{ 1918{
1659#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1660 struct ev_loop *loop = ev_default_loop_ptr; 1920 EV_P = ev_default_loop_ptr;
1661#endif 1921#endif
1922
1923 ev_default_loop_ptr = 0;
1662 1924
1663#ifndef _WIN32 1925#ifndef _WIN32
1664 ev_ref (EV_A); /* child watcher */ 1926 ev_ref (EV_A); /* child watcher */
1665 ev_signal_stop (EV_A_ &childev); 1927 ev_signal_stop (EV_A_ &childev);
1666#endif 1928#endif
… …
1670 1932
1671void 1933void
1672ev_default_fork (void) 1934ev_default_fork (void)
1673{ 1935{
1674#if EV_MULTIPLICITY 1936#if EV_MULTIPLICITY
1675 struct ev_loop *loop = ev_default_loop_ptr; 1937 EV_P = ev_default_loop_ptr;
1676#endif 1938#endif
1677 1939
1678 if (backend)
1679 postfork = 1; /* must be in line with ev_loop_fork */ 1940 postfork = 1; /* must be in line with ev_loop_fork */
1680} 1941}
1681 1942
1682/*****************************************************************************/ 1943/*****************************************************************************/
1683 1944
1684void 1945void
1685ev_invoke (EV_P_ void *w, int revents) 1946ev_invoke (EV_P_ void *w, int revents)
1686{ 1947{
1687 EV_CB_INVOKE ((W)w, revents); 1948 EV_CB_INVOKE ((W)w, revents);
1688} 1949}
1689 1950
1690void inline_speed 1951unsigned int
1691call_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)
1692{ 1965{
1693 int pri; 1966 int pri;
1694 1967
1695 for (pri = NUMPRI; pri--; ) 1968 for (pri = NUMPRI; pri--; )
1696 while (pendingcnt [pri]) 1969 while (pendingcnt [pri])
1697 { 1970 {
1698 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1971 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1699 1972
1700 if (expect_true (p->w))
1701 {
1702 /*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 */
1703 1975
1704 p->w->pending = 0; 1976 p->w->pending = 0;
1705 EV_CB_INVOKE (p->w, p->events); 1977 EV_CB_INVOKE (p->w, p->events);
1706 EV_FREQUENT_CHECK; 1978 EV_FREQUENT_CHECK;
1707 }
1708 } 1979 }
1709} 1980}
1710 1981
1711#if EV_IDLE_ENABLE 1982#if EV_IDLE_ENABLE
1712void inline_size 1983/* make idle watchers pending. this handles the "call-idle */
1984/* only when higher priorities are idle" logic */
1985inline_size void
1713idle_reify (EV_P) 1986idle_reify (EV_P)
1714{ 1987{
1715 if (expect_false (idleall)) 1988 if (expect_false (idleall))
1716 { 1989 {
1717 int pri; 1990 int pri;
… …
1729 } 2002 }
1730 } 2003 }
1731} 2004}
1732#endif 2005#endif
1733 2006
1734void inline_size 2007/* make timers pending */
2008inline_size void
1735timers_reify (EV_P) 2009timers_reify (EV_P)
1736{ 2010{
1737 EV_FREQUENT_CHECK; 2011 EV_FREQUENT_CHECK;
1738 2012
1739 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2013 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1740 { 2014 {
1741 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2015 do
1742
1743 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1744
1745 /* first reschedule or stop timer */
1746 if (w->repeat)
1747 { 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 {
1748 ev_at (w) += w->repeat; 2024 ev_at (w) += w->repeat;
1749 if (ev_at (w) < mn_now) 2025 if (ev_at (w) < mn_now)
1750 ev_at (w) = mn_now; 2026 ev_at (w) = mn_now;
1751 2027
1752 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.));
1753 2029
1754 ANHE_at_cache (timers [HEAP0]); 2030 ANHE_at_cache (timers [HEAP0]);
1755 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);
1756 } 2038 }
1757 else 2039 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1758 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1759 2040
1760 EV_FREQUENT_CHECK;
1761 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2041 feed_reverse_done (EV_A_ EV_TIMEOUT);
1762 } 2042 }
1763} 2043}
1764 2044
1765#if EV_PERIODIC_ENABLE 2045#if EV_PERIODIC_ENABLE
1766void inline_size 2046/* make periodics pending */
2047inline_size void
1767periodics_reify (EV_P) 2048periodics_reify (EV_P)
1768{ 2049{
1769 EV_FREQUENT_CHECK; 2050 EV_FREQUENT_CHECK;
1770 2051
1771 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2052 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1772 { 2053 {
1773 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2054 int feed_count = 0;
1774 2055
1775 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2056 do
1776
1777 /* first reschedule or stop timer */
1778 if (w->reschedule_cb)
1779 { 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 {
1780 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2065 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1781 2066
1782 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));
1783 2068
1784 ANHE_at_cache (periodics [HEAP0]); 2069 ANHE_at_cache (periodics [HEAP0]);
1785 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);
1786 } 2096 }
1787 else if (w->interval) 2097 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1788 {
1789 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1790 /* if next trigger time is not sufficiently in the future, put it there */
1791 /* this might happen because of floating point inexactness */
1792 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1793 {
1794 ev_at (w) += w->interval;
1795 2098
1796 /* if interval is unreasonably low we might still have a time in the past */
1797 /* so correct this. this will make the periodic very inexact, but the user */
1798 /* has effectively asked to get triggered more often than possible */
1799 if (ev_at (w) < ev_rt_now)
1800 ev_at (w) = ev_rt_now;
1801 }
1802
1803 ANHE_at_cache (periodics [HEAP0]);
1804 downheap (periodics, periodiccnt, HEAP0);
1805 }
1806 else
1807 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1808
1809 EV_FREQUENT_CHECK;
1810 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2099 feed_reverse_done (EV_A_ EV_PERIODIC);
1811 } 2100 }
1812} 2101}
1813 2102
2103/* simply recalculate all periodics */
2104/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1814static void noinline 2105static void noinline
1815periodics_reschedule (EV_P) 2106periodics_reschedule (EV_P)
1816{ 2107{
1817 int i; 2108 int i;
1818 2109
… …
1831 2122
1832 reheap (periodics, periodiccnt); 2123 reheap (periodics, periodiccnt);
1833} 2124}
1834#endif 2125#endif
1835 2126
1836void 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
1837time_update (EV_P_ ev_tstamp max_block) 2144time_update (EV_P_ ev_tstamp max_block)
1838{ 2145{
1839 int i;
1840
1841#if EV_USE_MONOTONIC 2146#if EV_USE_MONOTONIC
1842 if (expect_true (have_monotonic)) 2147 if (expect_true (have_monotonic))
1843 { 2148 {
2149 int i;
1844 ev_tstamp odiff = rtmn_diff; 2150 ev_tstamp odiff = rtmn_diff;
1845 2151
1846 mn_now = get_clock (); 2152 mn_now = get_clock ();
1847 2153
1848 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2154 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1874 ev_rt_now = ev_time (); 2180 ev_rt_now = ev_time ();
1875 mn_now = get_clock (); 2181 mn_now = get_clock ();
1876 now_floor = mn_now; 2182 now_floor = mn_now;
1877 } 2183 }
1878 2184
2185 /* no timer adjustment, as the monotonic clock doesn't jump */
2186 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1879# if EV_PERIODIC_ENABLE 2187# if EV_PERIODIC_ENABLE
1880 periodics_reschedule (EV_A); 2188 periodics_reschedule (EV_A);
1881# endif 2189# endif
1882 /* no timer adjustment, as the monotonic clock doesn't jump */
1883 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1884 } 2190 }
1885 else 2191 else
1886#endif 2192#endif
1887 { 2193 {
1888 ev_rt_now = ev_time (); 2194 ev_rt_now = ev_time ();
1889 2195
1890 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))
1891 { 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);
1892#if EV_PERIODIC_ENABLE 2200#if EV_PERIODIC_ENABLE
1893 periodics_reschedule (EV_A); 2201 periodics_reschedule (EV_A);
1894#endif 2202#endif
1895 /* adjust timers. this is easy, as the offset is the same for all of them */
1896 for (i = 0; i < timercnt; ++i)
1897 {
1898 ANHE *he = timers + i + HEAP0;
1899 ANHE_w (*he)->at += ev_rt_now - mn_now;
1900 ANHE_at_cache (*he);
1901 }
1902 } 2203 }
1903 2204
1904 mn_now = ev_rt_now; 2205 mn_now = ev_rt_now;
1905 } 2206 }
1906} 2207}
1907 2208
1908void 2209void
1909ev_ref (EV_P)
1910{
1911 ++activecnt;
1912}
1913
1914void
1915ev_unref (EV_P)
1916{
1917 --activecnt;
1918}
1919
1920void
1921ev_now_update (EV_P)
1922{
1923 time_update (EV_A_ 1e100);
1924}
1925
1926static int loop_done;
1927
1928void
1929ev_loop (EV_P_ int flags) 2210ev_loop (EV_P_ int flags)
1930{ 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
1931 loop_done = EVUNLOOP_CANCEL; 2218 loop_done = EVUNLOOP_CANCEL;
1932 2219
1933 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 */
1934 2221
1935 do 2222 do
1936 { 2223 {
1937#if EV_VERIFY >= 2 2224#if EV_VERIFY >= 2
1938 ev_loop_verify (EV_A); 2225 ev_loop_verify (EV_A);
… …
1951 /* we might have forked, so queue fork handlers */ 2238 /* we might have forked, so queue fork handlers */
1952 if (expect_false (postfork)) 2239 if (expect_false (postfork))
1953 if (forkcnt) 2240 if (forkcnt)
1954 { 2241 {
1955 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1956 call_pending (EV_A); 2243 EV_INVOKE_PENDING;
1957 } 2244 }
1958#endif 2245#endif
1959 2246
1960 /* queue prepare watchers (and execute them) */ 2247 /* queue prepare watchers (and execute them) */
1961 if (expect_false (preparecnt)) 2248 if (expect_false (preparecnt))
1962 { 2249 {
1963 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1964 call_pending (EV_A); 2251 EV_INVOKE_PENDING;
1965 } 2252 }
1966 2253
1967 if (expect_false (!activecnt)) 2254 if (expect_false (loop_done))
1968 break; 2255 break;
1969 2256
1970 /* we might have forked, so reify kernel state if necessary */ 2257 /* we might have forked, so reify kernel state if necessary */
1971 if (expect_false (postfork)) 2258 if (expect_false (postfork))
1972 loop_fork (EV_A); 2259 loop_fork (EV_A);
… …
1979 ev_tstamp waittime = 0.; 2266 ev_tstamp waittime = 0.;
1980 ev_tstamp sleeptime = 0.; 2267 ev_tstamp sleeptime = 0.;
1981 2268
1982 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2269 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1983 { 2270 {
2271 /* remember old timestamp for io_blocktime calculation */
2272 ev_tstamp prev_mn_now = mn_now;
2273
1984 /* update time to cancel out callback processing overhead */ 2274 /* update time to cancel out callback processing overhead */
1985 time_update (EV_A_ 1e100); 2275 time_update (EV_A_ 1e100);
1986 2276
1987 waittime = MAX_BLOCKTIME; 2277 waittime = MAX_BLOCKTIME;
1988 2278
… …
1998 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;
1999 if (waittime > to) waittime = to; 2289 if (waittime > to) waittime = to;
2000 } 2290 }
2001#endif 2291#endif
2002 2292
2293 /* don't let timeouts decrease the waittime below timeout_blocktime */
2003 if (expect_false (waittime < timeout_blocktime)) 2294 if (expect_false (waittime < timeout_blocktime))
2004 waittime = timeout_blocktime; 2295 waittime = timeout_blocktime;
2005 2296
2006 sleeptime = waittime - backend_fudge; 2297 /* extra check because io_blocktime is commonly 0 */
2007
2008 if (expect_true (sleeptime > io_blocktime)) 2298 if (expect_false (io_blocktime))
2009 sleeptime = io_blocktime;
2010
2011 if (sleeptime)
2012 { 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 {
2013 ev_sleep (sleeptime); 2307 ev_sleep (sleeptime);
2014 waittime -= sleeptime; 2308 waittime -= sleeptime;
2309 }
2015 } 2310 }
2016 } 2311 }
2017 2312
2313#if EV_MINIMAL < 2
2018 ++loop_count; 2314 ++loop_count;
2315#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2019 backend_poll (EV_A_ waittime); 2317 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2020 2319
2021 /* update ev_rt_now, do magic */ 2320 /* update ev_rt_now, do magic */
2022 time_update (EV_A_ waittime + sleeptime); 2321 time_update (EV_A_ waittime + sleeptime);
2023 } 2322 }
2024 2323
… …
2035 2334
2036 /* queue check watchers, to be executed first */ 2335 /* queue check watchers, to be executed first */
2037 if (expect_false (checkcnt)) 2336 if (expect_false (checkcnt))
2038 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2039 2338
2040 call_pending (EV_A); 2339 EV_INVOKE_PENDING;
2041 } 2340 }
2042 while (expect_true ( 2341 while (expect_true (
2043 activecnt 2342 activecnt
2044 && !loop_done 2343 && !loop_done
2045 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2344 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2046 )); 2345 ));
2047 2346
2048 if (loop_done == EVUNLOOP_ONE) 2347 if (loop_done == EVUNLOOP_ONE)
2049 loop_done = EVUNLOOP_CANCEL; 2348 loop_done = EVUNLOOP_CANCEL;
2349
2350#if EV_MINIMAL < 2
2351 --loop_depth;
2352#endif
2050} 2353}
2051 2354
2052void 2355void
2053ev_unloop (EV_P_ int how) 2356ev_unloop (EV_P_ int how)
2054{ 2357{
2055 loop_done = how; 2358 loop_done = how;
2056} 2359}
2057 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
2058/*****************************************************************************/ 2398/*****************************************************************************/
2399/* singly-linked list management, used when the expected list length is short */
2059 2400
2060void inline_size 2401inline_size void
2061wlist_add (WL *head, WL elem) 2402wlist_add (WL *head, WL elem)
2062{ 2403{
2063 elem->next = *head; 2404 elem->next = *head;
2064 *head = elem; 2405 *head = elem;
2065} 2406}
2066 2407
2067void inline_size 2408inline_size void
2068wlist_del (WL *head, WL elem) 2409wlist_del (WL *head, WL elem)
2069{ 2410{
2070 while (*head) 2411 while (*head)
2071 { 2412 {
2072 if (*head == elem) 2413 if (expect_true (*head == elem))
2073 { 2414 {
2074 *head = elem->next; 2415 *head = elem->next;
2075 return; 2416 break;
2076 } 2417 }
2077 2418
2078 head = &(*head)->next; 2419 head = &(*head)->next;
2079 } 2420 }
2080} 2421}
2081 2422
2082void inline_speed 2423/* internal, faster, version of ev_clear_pending */
2424inline_speed void
2083clear_pending (EV_P_ W w) 2425clear_pending (EV_P_ W w)
2084{ 2426{
2085 if (w->pending) 2427 if (w->pending)
2086 { 2428 {
2087 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2429 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2088 w->pending = 0; 2430 w->pending = 0;
2089 } 2431 }
2090} 2432}
2091 2433
2092int 2434int
… …
2096 int pending = w_->pending; 2438 int pending = w_->pending;
2097 2439
2098 if (expect_true (pending)) 2440 if (expect_true (pending))
2099 { 2441 {
2100 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2442 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2443 p->w = (W)&pending_w;
2101 w_->pending = 0; 2444 w_->pending = 0;
2102 p->w = 0;
2103 return p->events; 2445 return p->events;
2104 } 2446 }
2105 else 2447 else
2106 return 0; 2448 return 0;
2107} 2449}
2108 2450
2109void inline_size 2451inline_size void
2110pri_adjust (EV_P_ W w) 2452pri_adjust (EV_P_ W w)
2111{ 2453{
2112 int pri = w->priority; 2454 int pri = ev_priority (w);
2113 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2455 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2114 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2456 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2115 w->priority = pri; 2457 ev_set_priority (w, pri);
2116} 2458}
2117 2459
2118void inline_speed 2460inline_speed void
2119ev_start (EV_P_ W w, int active) 2461ev_start (EV_P_ W w, int active)
2120{ 2462{
2121 pri_adjust (EV_A_ w); 2463 pri_adjust (EV_A_ w);
2122 w->active = active; 2464 w->active = active;
2123 ev_ref (EV_A); 2465 ev_ref (EV_A);
2124} 2466}
2125 2467
2126void inline_size 2468inline_size void
2127ev_stop (EV_P_ W w) 2469ev_stop (EV_P_ W w)
2128{ 2470{
2129 ev_unref (EV_A); 2471 ev_unref (EV_A);
2130 w->active = 0; 2472 w->active = 0;
2131} 2473}
… …
2138 int fd = w->fd; 2480 int fd = w->fd;
2139 2481
2140 if (expect_false (ev_is_active (w))) 2482 if (expect_false (ev_is_active (w)))
2141 return; 2483 return;
2142 2484
2143 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))));
2144 2487
2145 EV_FREQUENT_CHECK; 2488 EV_FREQUENT_CHECK;
2146 2489
2147 ev_start (EV_A_ (W)w, 1); 2490 ev_start (EV_A_ (W)w, 1);
2148 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2149 wlist_add (&anfds[fd].head, (WL)w); 2492 wlist_add (&anfds[fd].head, (WL)w);
2150 2493
2151 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2494 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2152 w->events &= ~EV_IOFDSET; 2495 w->events &= ~EV__IOFDSET;
2153 2496
2154 EV_FREQUENT_CHECK; 2497 EV_FREQUENT_CHECK;
2155} 2498}
2156 2499
2157void noinline 2500void noinline
… …
2159{ 2502{
2160 clear_pending (EV_A_ (W)w); 2503 clear_pending (EV_A_ (W)w);
2161 if (expect_false (!ev_is_active (w))) 2504 if (expect_false (!ev_is_active (w)))
2162 return; 2505 return;
2163 2506
2164 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));
2165 2508
2166 EV_FREQUENT_CHECK; 2509 EV_FREQUENT_CHECK;
2167 2510
2168 wlist_del (&anfds[w->fd].head, (WL)w); 2511 wlist_del (&anfds[w->fd].head, (WL)w);
2169 ev_stop (EV_A_ (W)w); 2512 ev_stop (EV_A_ (W)w);
… …
2179 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2180 return; 2523 return;
2181 2524
2182 ev_at (w) += mn_now; 2525 ev_at (w) += mn_now;
2183 2526
2184 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.));
2185 2528
2186 EV_FREQUENT_CHECK; 2529 EV_FREQUENT_CHECK;
2187 2530
2188 ++timercnt; 2531 ++timercnt;
2189 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2532 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2192 ANHE_at_cache (timers [ev_active (w)]); 2535 ANHE_at_cache (timers [ev_active (w)]);
2193 upheap (timers, ev_active (w)); 2536 upheap (timers, ev_active (w));
2194 2537
2195 EV_FREQUENT_CHECK; 2538 EV_FREQUENT_CHECK;
2196 2539
2197 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2540 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2198} 2541}
2199 2542
2200void noinline 2543void noinline
2201ev_timer_stop (EV_P_ ev_timer *w) 2544ev_timer_stop (EV_P_ ev_timer *w)
2202{ 2545{
… …
2207 EV_FREQUENT_CHECK; 2550 EV_FREQUENT_CHECK;
2208 2551
2209 { 2552 {
2210 int active = ev_active (w); 2553 int active = ev_active (w);
2211 2554
2212 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2555 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2213 2556
2214 --timercnt; 2557 --timercnt;
2215 2558
2216 if (expect_true (active < timercnt + HEAP0)) 2559 if (expect_true (active < timercnt + HEAP0))
2217 { 2560 {
… …
2250 } 2593 }
2251 2594
2252 EV_FREQUENT_CHECK; 2595 EV_FREQUENT_CHECK;
2253} 2596}
2254 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
2255#if EV_PERIODIC_ENABLE 2604#if EV_PERIODIC_ENABLE
2256void noinline 2605void noinline
2257ev_periodic_start (EV_P_ ev_periodic *w) 2606ev_periodic_start (EV_P_ ev_periodic *w)
2258{ 2607{
2259 if (expect_false (ev_is_active (w))) 2608 if (expect_false (ev_is_active (w)))
… …
2261 2610
2262 if (w->reschedule_cb) 2611 if (w->reschedule_cb)
2263 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2612 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2264 else if (w->interval) 2613 else if (w->interval)
2265 { 2614 {
2266 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.));
2267 /* 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 */
2268 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;
2269 } 2618 }
2270 else 2619 else
2271 ev_at (w) = w->offset; 2620 ev_at (w) = w->offset;
… …
2279 ANHE_at_cache (periodics [ev_active (w)]); 2628 ANHE_at_cache (periodics [ev_active (w)]);
2280 upheap (periodics, ev_active (w)); 2629 upheap (periodics, ev_active (w));
2281 2630
2282 EV_FREQUENT_CHECK; 2631 EV_FREQUENT_CHECK;
2283 2632
2284 /*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));*/
2285} 2634}
2286 2635
2287void noinline 2636void noinline
2288ev_periodic_stop (EV_P_ ev_periodic *w) 2637ev_periodic_stop (EV_P_ ev_periodic *w)
2289{ 2638{
… …
2294 EV_FREQUENT_CHECK; 2643 EV_FREQUENT_CHECK;
2295 2644
2296 { 2645 {
2297 int active = ev_active (w); 2646 int active = ev_active (w);
2298 2647
2299 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2648 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2300 2649
2301 --periodiccnt; 2650 --periodiccnt;
2302 2651
2303 if (expect_true (active < periodiccnt + HEAP0)) 2652 if (expect_true (active < periodiccnt + HEAP0))
2304 { 2653 {
… …
2326#endif 2675#endif
2327 2676
2328void noinline 2677void noinline
2329ev_signal_start (EV_P_ ev_signal *w) 2678ev_signal_start (EV_P_ ev_signal *w)
2330{ 2679{
2331#if EV_MULTIPLICITY
2332 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2333#endif
2334 if (expect_false (ev_is_active (w))) 2680 if (expect_false (ev_is_active (w)))
2335 return; 2681 return;
2336 2682
2337 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));
2338 2684
2339 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));
2340 2688
2341 EV_FREQUENT_CHECK; 2689 signals [w->signum - 1].loop = EV_A;
2690#endif
2342 2691
2692 EV_FREQUENT_CHECK;
2693
2694#if EV_USE_SIGNALFD
2695 if (sigfd == -2)
2343 { 2696 {
2344#ifndef _WIN32 2697 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2345 sigset_t full, prev; 2698 if (sigfd < 0 && errno == EINVAL)
2346 sigfillset (&full); 2699 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2347 sigprocmask (SIG_SETMASK, &full, &prev);
2348#endif
2349 2700
2350 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2701 if (sigfd >= 0)
2702 {
2703 fd_intern (sigfd); /* doing it twice will not hurt */
2351 2704
2352#ifndef _WIN32 2705 sigemptyset (&sigfd_set);
2353 sigprocmask (SIG_SETMASK, &prev, 0); 2706
2354#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 }
2355 } 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
2356 2723
2357 ev_start (EV_A_ (W)w, 1); 2724 ev_start (EV_A_ (W)w, 1);
2358 wlist_add (&signals [w->signum - 1].head, (WL)w); 2725 wlist_add (&signals [w->signum - 1].head, (WL)w);
2359 2726
2360 if (!((WL)w)->next) 2727 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/
2730# endif
2361 { 2731 {
2362#if _WIN32 2732# if _WIN32
2363 signal (w->signum, ev_sighandler); 2733 signal (w->signum, ev_sighandler);
2364#else 2734# else
2365 struct sigaction sa; 2735 struct sigaction sa;
2736
2737 evpipe_init (EV_A);
2738
2366 sa.sa_handler = ev_sighandler; 2739 sa.sa_handler = ev_sighandler;
2367 sigfillset (&sa.sa_mask); 2740 sigfillset (&sa.sa_mask);
2368 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 */
2369 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);
2370#endif 2747#endif
2371 } 2748 }
2372 2749
2373 EV_FREQUENT_CHECK; 2750 EV_FREQUENT_CHECK;
2374} 2751}
2375 2752
2376void noinline 2753void noinline
… …
2384 2761
2385 wlist_del (&signals [w->signum - 1].head, (WL)w); 2762 wlist_del (&signals [w->signum - 1].head, (WL)w);
2386 ev_stop (EV_A_ (W)w); 2763 ev_stop (EV_A_ (W)w);
2387 2764
2388 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
2389 signal (w->signum, SIG_DFL); 2781 signal (w->signum, SIG_DFL);
2782 }
2390 2783
2391 EV_FREQUENT_CHECK; 2784 EV_FREQUENT_CHECK;
2392} 2785}
2393 2786
2394void 2787void
2395ev_child_start (EV_P_ ev_child *w) 2788ev_child_start (EV_P_ ev_child *w)
2396{ 2789{
2397#if EV_MULTIPLICITY 2790#if EV_MULTIPLICITY
2398 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));
2399#endif 2792#endif
2400 if (expect_false (ev_is_active (w))) 2793 if (expect_false (ev_is_active (w)))
2401 return; 2794 return;
2402 2795
2403 EV_FREQUENT_CHECK; 2796 EV_FREQUENT_CHECK;
… …
2428# ifdef _WIN32 2821# ifdef _WIN32
2429# undef lstat 2822# undef lstat
2430# define lstat(a,b) _stati64 (a,b) 2823# define lstat(a,b) _stati64 (a,b)
2431# endif 2824# endif
2432 2825
2433#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 */
2434#define MIN_STAT_INTERVAL 0.1074891 2828#define MIN_STAT_INTERVAL 0.1074891
2435 2829
2436static 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);
2437 2831
2438#if EV_USE_INOTIFY 2832#if EV_USE_INOTIFY
2439# define EV_INOTIFY_BUFSIZE 8192 2833# define EV_INOTIFY_BUFSIZE 8192
… …
2443{ 2837{
2444 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);
2445 2839
2446 if (w->wd < 0) 2840 if (w->wd < 0)
2447 { 2841 {
2842 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2448 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 */
2449 2844
2450 /* monitor some parent directory for speedup hints */ 2845 /* monitor some parent directory for speedup hints */
2451 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2846 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2452 /* but an efficiency issue only */ 2847 /* but an efficiency issue only */
2453 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2848 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2454 { 2849 {
2455 char path [4096]; 2850 char path [4096];
2456 strcpy (path, w->path); 2851 strcpy (path, w->path);
… …
2460 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2855 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2461 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2856 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2462 2857
2463 char *pend = strrchr (path, '/'); 2858 char *pend = strrchr (path, '/');
2464 2859
2465 if (!pend) 2860 if (!pend || pend == path)
2466 break; /* whoops, no '/', complain to your admin */ 2861 break;
2467 2862
2468 *pend = 0; 2863 *pend = 0;
2469 w->wd = inotify_add_watch (fs_fd, path, mask); 2864 w->wd = inotify_add_watch (fs_fd, path, mask);
2470 } 2865 }
2471 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2866 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2472 } 2867 }
2473 } 2868 }
2474 else
2475 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2476 2869
2477 if (w->wd >= 0) 2870 if (w->wd >= 0)
2871 {
2872 struct statfs sfs;
2873
2478 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 }
2479} 2892}
2480 2893
2481static void noinline 2894static void noinline
2482infy_del (EV_P_ ev_stat *w) 2895infy_del (EV_P_ ev_stat *w)
2483{ 2896{
… …
2513 2926
2514 if (w->wd == wd || wd == -1) 2927 if (w->wd == wd || wd == -1)
2515 { 2928 {
2516 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2929 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2517 { 2930 {
2931 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2518 w->wd = -1; 2932 w->wd = -1;
2519 infy_add (EV_A_ w); /* re-add, no matter what */ 2933 infy_add (EV_A_ w); /* re-add, no matter what */
2520 } 2934 }
2521 2935
2522 stat_timer_cb (EV_A_ &w->timer, 0); 2936 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2535 2949
2536 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)
2537 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2951 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2538} 2952}
2539 2953
2540void inline_size 2954inline_size void
2541infy_init (EV_P) 2955check_2625 (EV_P)
2542{ 2956{
2543 if (fs_fd != -2)
2544 return;
2545
2546 /* kernels < 2.6.25 are borked 2957 /* kernels < 2.6.25 are borked
2547 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2958 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2548 */ 2959 */
2549 {
2550 struct utsname buf; 2960 struct utsname buf;
2551 int major, minor, micro; 2961 int major, minor, micro;
2552 2962
2553 fs_fd = -1;
2554
2555 if (uname (&buf)) 2963 if (uname (&buf))
2556 return; 2964 return;
2557 2965
2558 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2966 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2559 return; 2967 return;
2560 2968
2561 if (major < 2 2969 if (major < 2
2562 || (major == 2 && minor < 6) 2970 || (major == 2 && minor < 6)
2563 || (major == 2 && minor == 6 && micro < 25)) 2971 || (major == 2 && minor == 6 && micro < 25))
2564 return; 2972 return;
2565 } 2973
2974 fs_2625 = 1;
2975}
2976
2977inline_size void
2978infy_init (EV_P)
2979{
2980 if (fs_fd != -2)
2981 return;
2982
2983 fs_fd = -1;
2984
2985 check_2625 (EV_A);
2566 2986
2567 fs_fd = inotify_init (); 2987 fs_fd = inotify_init ();
2568 2988
2569 if (fs_fd >= 0) 2989 if (fs_fd >= 0)
2570 { 2990 {
… …
2572 ev_set_priority (&fs_w, EV_MAXPRI); 2992 ev_set_priority (&fs_w, EV_MAXPRI);
2573 ev_io_start (EV_A_ &fs_w); 2993 ev_io_start (EV_A_ &fs_w);
2574 } 2994 }
2575} 2995}
2576 2996
2577void inline_size 2997inline_size void
2578infy_fork (EV_P) 2998infy_fork (EV_P)
2579{ 2999{
2580 int slot; 3000 int slot;
2581 3001
2582 if (fs_fd < 0) 3002 if (fs_fd < 0)
… …
2598 w->wd = -1; 3018 w->wd = -1;
2599 3019
2600 if (fs_fd >= 0) 3020 if (fs_fd >= 0)
2601 infy_add (EV_A_ w); /* re-add, no matter what */ 3021 infy_add (EV_A_ w); /* re-add, no matter what */
2602 else 3022 else
2603 ev_timer_start (EV_A_ &w->timer); 3023 ev_timer_again (EV_A_ &w->timer);
2604 } 3024 }
2605 } 3025 }
2606} 3026}
2607 3027
2608#endif 3028#endif
… …
2663ev_stat_start (EV_P_ ev_stat *w) 3083ev_stat_start (EV_P_ ev_stat *w)
2664{ 3084{
2665 if (expect_false (ev_is_active (w))) 3085 if (expect_false (ev_is_active (w)))
2666 return; 3086 return;
2667 3087
2668 /* since we use memcmp, we need to clear any padding data etc. */
2669 memset (&w->prev, 0, sizeof (ev_statdata));
2670 memset (&w->attr, 0, sizeof (ev_statdata));
2671
2672 ev_stat_stat (EV_A_ w); 3088 ev_stat_stat (EV_A_ w);
2673 3089
3090 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2674 if (w->interval < MIN_STAT_INTERVAL) 3091 w->interval = MIN_STAT_INTERVAL;
2675 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2676 3092
2677 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);
2678 ev_set_priority (&w->timer, ev_priority (w)); 3094 ev_set_priority (&w->timer, ev_priority (w));
2679 3095
2680#if EV_USE_INOTIFY 3096#if EV_USE_INOTIFY
2681 infy_init (EV_A); 3097 infy_init (EV_A);
2682 3098
2683 if (fs_fd >= 0) 3099 if (fs_fd >= 0)
2684 infy_add (EV_A_ w); 3100 infy_add (EV_A_ w);
2685 else 3101 else
2686#endif 3102#endif
2687 ev_timer_start (EV_A_ &w->timer); 3103 ev_timer_again (EV_A_ &w->timer);
2688 3104
2689 ev_start (EV_A_ (W)w, 1); 3105 ev_start (EV_A_ (W)w, 1);
2690 3106
2691 EV_FREQUENT_CHECK; 3107 EV_FREQUENT_CHECK;
2692} 3108}
… …
2852embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2853{ 3269{
2854 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3270 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2855 3271
2856 { 3272 {
2857 struct ev_loop *loop = w->other; 3273 EV_P = w->other;
2858 3274
2859 while (fdchangecnt) 3275 while (fdchangecnt)
2860 { 3276 {
2861 fd_reify (EV_A); 3277 fd_reify (EV_A);
2862 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2867static void 3283static void
2868embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3284embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2869{ 3285{
2870 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3286 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2871 3287
3288 ev_embed_stop (EV_A_ w);
3289
2872 { 3290 {
2873 struct ev_loop *loop = w->other; 3291 EV_P = w->other;
2874 3292
2875 ev_loop_fork (EV_A); 3293 ev_loop_fork (EV_A);
3294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2876 } 3295 }
3296
3297 ev_embed_start (EV_A_ w);
2877} 3298}
2878 3299
2879#if 0 3300#if 0
2880static void 3301static void
2881embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3302embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2889{ 3310{
2890 if (expect_false (ev_is_active (w))) 3311 if (expect_false (ev_is_active (w)))
2891 return; 3312 return;
2892 3313
2893 { 3314 {
2894 struct ev_loop *loop = w->other; 3315 EV_P = w->other;
2895 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 ()));
2896 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);
2897 } 3318 }
2898 3319
2899 EV_FREQUENT_CHECK; 3320 EV_FREQUENT_CHECK;
2900 3321
… …
3011 3432
3012void 3433void
3013ev_async_send (EV_P_ ev_async *w) 3434ev_async_send (EV_P_ ev_async *w)
3014{ 3435{
3015 w->sent = 1; 3436 w->sent = 1;
3016 evpipe_write (EV_A_ &gotasync); 3437 evpipe_write (EV_A_ &async_pending);
3017} 3438}
3018#endif 3439#endif
3019 3440
3020/*****************************************************************************/ 3441/*****************************************************************************/
3021 3442
… …
3083 ev_timer_set (&once->to, timeout, 0.); 3504 ev_timer_set (&once->to, timeout, 0.);
3084 ev_timer_start (EV_A_ &once->to); 3505 ev_timer_start (EV_A_ &once->to);
3085 } 3506 }
3086} 3507}
3087 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
3088#if EV_MULTIPLICITY 3617#if EV_MULTIPLICITY
3089 #include "ev_wrap.h" 3618 #include "ev_wrap.h"
3090#endif 3619#endif
3091 3620
3092#ifdef __cplusplus 3621#ifdef __cplusplus

Diff Legend

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