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

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

Diff Legend

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