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

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

Diff Legend

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