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

Comparing libev/ev.c (file contents):
Revision 1.288 by root, Sat Apr 25 14:12:48 2009 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 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 *
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
108# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
109# endif 111# endif
110# endif 112# endif
111 113
112# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
115# else 117# else
116# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
117# endif 119# endif
118# endif 120# endif
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
143 153
144#endif 154#endif
145 155
146#include <math.h> 156#include <math.h>
147#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
148#include <fcntl.h> 159#include <fcntl.h>
149#include <stddef.h> 160#include <stddef.h>
150 161
151#include <stdio.h> 162#include <stdio.h>
152 163
153#include <assert.h> 164#include <assert.h>
154#include <errno.h> 165#include <errno.h>
155#include <sys/types.h> 166#include <sys/types.h>
156#include <time.h> 167#include <time.h>
168#include <limits.h>
157 169
158#include <signal.h> 170#include <signal.h>
159 171
160#ifdef EV_H 172#ifdef EV_H
161# include EV_H 173# include EV_H
176# endif 188# endif
177#endif 189#endif
178 190
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 191/* this block tries to deduce configuration from header-defined symbols and defaults */
180 192
193/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG)
195/* use what's provided */
196#elif defined (NSIG)
197# define EV_NSIG (NSIG)
198#elif defined(_NSIG)
199# define EV_NSIG (_NSIG)
200#elif defined (SIGMAX)
201# define EV_NSIG (SIGMAX+1)
202#elif defined (SIG_MAX)
203# define EV_NSIG (SIG_MAX+1)
204#elif defined (_SIG_MAX)
205# define EV_NSIG (_SIG_MAX+1)
206#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else
215# error "unable to find value for NSIG, please report"
216/* to make it compile regardless, just remove the above line */
217# define EV_NSIG 65
218#endif
219
181#ifndef EV_USE_CLOCK_SYSCALL 220#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 221# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 222# define EV_USE_CLOCK_SYSCALL 1
184# else 223# else
185# define EV_USE_CLOCK_SYSCALL 0 224# define EV_USE_CLOCK_SYSCALL 0
264# else 303# else
265# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
266# endif 305# endif
267#endif 306#endif
268 307
308#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1
311# else
312# define EV_USE_SIGNALFD 0
313# endif
314#endif
315
269#if 0 /* debugging */ 316#if 0 /* debugging */
270# define EV_VERIFY 3 317# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 318# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 319# define EV_HEAP_CACHE_AT 1
273#endif 320#endif
282 329
283#ifndef EV_HEAP_CACHE_AT 330#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 331# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 332#endif
286 333
334/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
335/* which makes programs even slower. might work on other unices, too. */
336#if EV_USE_CLOCK_SYSCALL
337# include <syscall.h>
338# ifdef SYS_clock_gettime
339# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
340# undef EV_USE_MONOTONIC
341# define EV_USE_MONOTONIC 1
342# else
343# undef EV_USE_CLOCK_SYSCALL
344# define EV_USE_CLOCK_SYSCALL 0
345# endif
346#endif
347
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
288 355
289#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
292#endif 359#endif
320 387
321#if EV_SELECT_IS_WINSOCKET 388#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 389# include <winsock.h>
323#endif 390#endif
324 391
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 392#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 393/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 394# include <stdint.h>
395# ifndef EFD_NONBLOCK
396# define EFD_NONBLOCK O_NONBLOCK
397# endif
398# ifndef EFD_CLOEXEC
399# ifdef O_CLOEXEC
400# define EFD_CLOEXEC O_CLOEXEC
401# else
402# define EFD_CLOEXEC 02000000
403# endif
404# endif
337# ifdef __cplusplus 405# ifdef __cplusplus
338extern "C" { 406extern "C" {
339# endif 407# endif
340int eventfd (unsigned int initval, int flags); 408int (eventfd) (unsigned int initval, int flags);
341# ifdef __cplusplus 409# ifdef __cplusplus
342} 410}
343# endif 411# endif
344#endif 412#endif
413
414#if EV_USE_SIGNALFD
415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
345 442
346/**/ 443/**/
347 444
348#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 458 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 460
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 462#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 463
368#if __GNUC__ >= 4 464#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
371#else 467#else
384# define inline_speed static noinline 480# define inline_speed static noinline
385#else 481#else
386# define inline_speed static inline 482# define inline_speed static inline
387#endif 483#endif
388 484
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 485#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
486
487#if EV_MINPRI == EV_MAXPRI
488# define ABSPRI(w) (((W)w), 0)
489#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 490# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
491#endif
391 492
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 493#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 494#define EMPTY2(a,b) /* used to suppress some warnings */
394 495
395typedef ev_watcher *W; 496typedef ev_watcher *W;
407 508
408#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 511#endif
411 512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
521#endif
522
412#ifdef _WIN32 523#ifdef _WIN32
413# include "ev_win32.c" 524# include "ev_win32.c"
414#endif 525#endif
415 526
416/*****************************************************************************/ 527/*****************************************************************************/
431 542
432 if (syserr_cb) 543 if (syserr_cb)
433 syserr_cb (msg); 544 syserr_cb (msg);
434 else 545 else
435 { 546 {
547#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg));
552 write (STDERR_FILENO, "\n", 1);
553#else
436 perror (msg); 554 perror (msg);
555#endif
437 abort (); 556 abort ();
438 } 557 }
439} 558}
440 559
441static void * 560static void *
466{ 585{
467 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
468 587
469 if (!ptr && size) 588 if (!ptr && size)
470 { 589 {
590#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
472 abort (); 596 abort ();
473 } 597 }
474 598
475 return ptr; 599 return ptr;
476} 600}
478#define ev_malloc(size) ev_realloc (0, (size)) 602#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 603#define ev_free(ptr) ev_realloc ((ptr), 0)
480 604
481/*****************************************************************************/ 605/*****************************************************************************/
482 606
607/* set in reify when reification needed */
608#define EV_ANFD_REIFY 1
609
483/* file descriptor info structure */ 610/* file descriptor info structure */
484typedef struct 611typedef struct
485{ 612{
486 WL head; 613 WL head;
487 unsigned char events; /* the events watched for */ 614 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 615 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 616 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 617 unsigned char unused;
491#if EV_USE_EPOLL 618#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 619 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 620#endif
555 682
556 static int ev_default_loop_ptr; 683 static int ev_default_loop_ptr;
557 684
558#endif 685#endif
559 686
687#if EV_MINIMAL < 2
688# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
689# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
690# define EV_INVOKE_PENDING invoke_cb (EV_A)
691#else
692# define EV_RELEASE_CB (void)0
693# define EV_ACQUIRE_CB (void)0
694# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
695#endif
696
697#define EVUNLOOP_RECURSE 0x80
698
560/*****************************************************************************/ 699/*****************************************************************************/
561 700
701#ifndef EV_HAVE_EV_TIME
562ev_tstamp 702ev_tstamp
563ev_time (void) 703ev_time (void)
564{ 704{
565#if EV_USE_REALTIME 705#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 706 if (expect_true (have_realtime))
573 713
574 struct timeval tv; 714 struct timeval tv;
575 gettimeofday (&tv, 0); 715 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 716 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 717}
718#endif
578 719
579inline_size ev_tstamp 720inline_size ev_tstamp
580get_clock (void) 721get_clock (void)
581{ 722{
582#if EV_USE_MONOTONIC 723#if EV_USE_MONOTONIC
618 759
619 tv.tv_sec = (time_t)delay; 760 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 762
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 763 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 764 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 765 /* by older ones */
625 select (0, 0, 0, 0, &tv); 766 select (0, 0, 0, 0, &tv);
626#endif 767#endif
627 } 768 }
628} 769}
736} 877}
737 878
738/*****************************************************************************/ 879/*****************************************************************************/
739 880
740inline_speed void 881inline_speed void
741fd_event (EV_P_ int fd, int revents) 882fd_event_nc (EV_P_ int fd, int revents)
742{ 883{
743 ANFD *anfd = anfds + fd; 884 ANFD *anfd = anfds + fd;
744 ev_io *w; 885 ev_io *w;
745 886
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 887 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
750 if (ev) 891 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 892 ev_feed_event (EV_A_ (W)w, ev);
752 } 893 }
753} 894}
754 895
896/* do not submit kernel events for fds that have reify set */
897/* because that means they changed while we were polling for new events */
898inline_speed void
899fd_event (EV_P_ int fd, int revents)
900{
901 ANFD *anfd = anfds + fd;
902
903 if (expect_true (!anfd->reify))
904 fd_event_nc (EV_A_ fd, revents);
905}
906
755void 907void
756ev_feed_fd_event (EV_P_ int fd, int revents) 908ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 909{
758 if (fd >= 0 && fd < anfdmax) 910 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 911 fd_event_nc (EV_A_ fd, revents);
760} 912}
761 913
762/* make sure the external fd watch events are in-sync */ 914/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 915/* with the kernel/libev internal state */
764inline_size void 916inline_size void
779 931
780#if EV_SELECT_IS_WINSOCKET 932#if EV_SELECT_IS_WINSOCKET
781 if (events) 933 if (events)
782 { 934 {
783 unsigned long arg; 935 unsigned long arg;
784 #ifdef EV_FD_TO_WIN32_HANDLE
785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
786 #else
787 anfd->handle = _get_osfhandle (fd);
788 #endif
789 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
790 } 938 }
791#endif 939#endif
792 940
793 { 941 {
836/* check whether the given fd is atcually valid, for error recovery */ 984/* check whether the given fd is atcually valid, for error recovery */
837inline_size int 985inline_size int
838fd_valid (int fd) 986fd_valid (int fd)
839{ 987{
840#ifdef _WIN32 988#ifdef _WIN32
841 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
842#else 990#else
843 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
844#endif 992#endif
845} 993}
846 994
864 1012
865 for (fd = anfdmax; fd--; ) 1013 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 1014 if (anfds [fd].events)
867 { 1015 {
868 fd_kill (EV_A_ fd); 1016 fd_kill (EV_A_ fd);
869 return; 1017 break;
870 } 1018 }
871} 1019}
872 1020
873/* usually called after fork if backend needs to re-arm all fds from scratch */ 1021/* usually called after fork if backend needs to re-arm all fds from scratch */
874static void noinline 1022static void noinline
879 for (fd = 0; fd < anfdmax; ++fd) 1027 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 1028 if (anfds [fd].events)
881 { 1029 {
882 anfds [fd].events = 0; 1030 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 1031 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 1033 }
886} 1034}
887 1035
888/*****************************************************************************/ 1036/*****************************************************************************/
889 1037
964 1112
965 for (;;) 1113 for (;;)
966 { 1114 {
967 int c = k << 1; 1115 int c = k << 1;
968 1116
969 if (c > N + HEAP0 - 1) 1117 if (c >= N + HEAP0)
970 break; 1118 break;
971 1119
972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1120 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
973 ? 1 : 0; 1121 ? 1 : 0;
974 1122
1010 1158
1011/* move an element suitably so it is in a correct place */ 1159/* move an element suitably so it is in a correct place */
1012inline_size void 1160inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1161adjustheap (ANHE *heap, int N, int k)
1014{ 1162{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1163 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1016 upheap (heap, k); 1164 upheap (heap, k);
1017 else 1165 else
1018 downheap (heap, N, k); 1166 downheap (heap, N, k);
1019} 1167}
1020 1168
1033/*****************************************************************************/ 1181/*****************************************************************************/
1034 1182
1035/* associate signal watchers to a signal signal */ 1183/* associate signal watchers to a signal signal */
1036typedef struct 1184typedef struct
1037{ 1185{
1186 EV_ATOMIC_T pending;
1187#if EV_MULTIPLICITY
1188 EV_P;
1189#endif
1038 WL head; 1190 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1191} ANSIG;
1041 1192
1042static ANSIG *signals; 1193static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1194
1047/*****************************************************************************/ 1195/*****************************************************************************/
1048 1196
1049/* used to prepare libev internal fd's */ 1197/* used to prepare libev internal fd's */
1050/* this is not fork-safe */ 1198/* this is not fork-safe */
1051inline_speed void 1199inline_speed void
1052fd_intern (int fd) 1200fd_intern (int fd)
1053{ 1201{
1054#ifdef _WIN32 1202#ifdef _WIN32
1055 unsigned long arg = 1; 1203 unsigned long arg = 1;
1056 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1057#else 1205#else
1058 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
1059 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
1060#endif 1208#endif
1061} 1209}
1064evpipe_init (EV_P) 1212evpipe_init (EV_P)
1065{ 1213{
1066 if (!ev_is_active (&pipe_w)) 1214 if (!ev_is_active (&pipe_w))
1067 { 1215 {
1068#if EV_USE_EVENTFD 1216#if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1219 evfd = eventfd (0, 0);
1220
1221 if (evfd >= 0)
1070 { 1222 {
1071 evpipe [0] = -1; 1223 evpipe [0] = -1;
1072 fd_intern (evfd); 1224 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1225 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1226 }
1075 else 1227 else
1076#endif 1228#endif
1077 { 1229 {
1114/* called whenever the libev signal pipe */ 1266/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1267/* got some events (signal, async) */
1116static void 1268static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1269pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1270{
1271 int i;
1272
1119#if EV_USE_EVENTFD 1273#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1274 if (evfd >= 0)
1121 { 1275 {
1122 uint64_t counter; 1276 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1277 read (evfd, &counter, sizeof (uint64_t));
1127 { 1281 {
1128 char dummy; 1282 char dummy;
1129 read (evpipe [0], &dummy, 1); 1283 read (evpipe [0], &dummy, 1);
1130 } 1284 }
1131 1285
1132 if (gotsig && ev_is_default_loop (EV_A)) 1286 if (sig_pending)
1133 { 1287 {
1134 int signum; 1288 sig_pending = 0;
1135 gotsig = 0;
1136 1289
1137 for (signum = signalmax; signum--; ) 1290 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1291 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1292 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1293 }
1141 1294
1142#if EV_ASYNC_ENABLE 1295#if EV_ASYNC_ENABLE
1143 if (gotasync) 1296 if (async_pending)
1144 { 1297 {
1145 int i; 1298 async_pending = 0;
1146 gotasync = 0;
1147 1299
1148 for (i = asynccnt; i--; ) 1300 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1301 if (asyncs [i]->sent)
1150 { 1302 {
1151 asyncs [i]->sent = 0; 1303 asyncs [i]->sent = 0;
1159 1311
1160static void 1312static void
1161ev_sighandler (int signum) 1313ev_sighandler (int signum)
1162{ 1314{
1163#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1316 EV_P = signals [signum - 1].loop;
1165#endif 1317#endif
1166 1318
1167#if _WIN32 1319#ifdef _WIN32
1168 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1169#endif 1321#endif
1170 1322
1171 signals [signum - 1].gotsig = 1; 1323 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1324 evpipe_write (EV_A_ &sig_pending);
1173} 1325}
1174 1326
1175void noinline 1327void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1328ev_feed_signal_event (EV_P_ int signum)
1177{ 1329{
1178 WL w; 1330 WL w;
1179 1331
1332 if (expect_false (signum <= 0 || signum > EV_NSIG))
1333 return;
1334
1335 --signum;
1336
1180#if EV_MULTIPLICITY 1337#if EV_MULTIPLICITY
1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1338 /* it is permissible to try to feed a signal to the wrong loop */
1182#endif 1339 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1340
1184 --signum; 1341 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1342 return;
1343#endif
1188 1344
1189 signals [signum].gotsig = 0; 1345 signals [signum].pending = 0;
1190 1346
1191 for (w = signals [signum].head; w; w = w->next) 1347 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1348 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1349}
1350
1351#if EV_USE_SIGNALFD
1352static void
1353sigfdcb (EV_P_ ev_io *iow, int revents)
1354{
1355 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1356
1357 for (;;)
1358 {
1359 ssize_t res = read (sigfd, si, sizeof (si));
1360
1361 /* not ISO-C, as res might be -1, but works with SuS */
1362 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1363 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1364
1365 if (res < (ssize_t)sizeof (si))
1366 break;
1367 }
1368}
1369#endif
1194 1370
1195/*****************************************************************************/ 1371/*****************************************************************************/
1196 1372
1197static WL childs [EV_PID_HASHSIZE]; 1373static WL childs [EV_PID_HASHSIZE];
1198 1374
1343ev_backend (EV_P) 1519ev_backend (EV_P)
1344{ 1520{
1345 return backend; 1521 return backend;
1346} 1522}
1347 1523
1524#if EV_MINIMAL < 2
1348unsigned int 1525unsigned int
1349ev_loop_count (EV_P) 1526ev_loop_count (EV_P)
1350{ 1527{
1351 return loop_count; 1528 return loop_count;
1352} 1529}
1353 1530
1531unsigned int
1532ev_loop_depth (EV_P)
1533{
1534 return loop_depth;
1535}
1536
1354void 1537void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1538ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1539{
1357 io_blocktime = interval; 1540 io_blocktime = interval;
1358} 1541}
1360void 1543void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1544ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1545{
1363 timeout_blocktime = interval; 1546 timeout_blocktime = interval;
1364} 1547}
1548
1549void
1550ev_set_userdata (EV_P_ void *data)
1551{
1552 userdata = data;
1553}
1554
1555void *
1556ev_userdata (EV_P)
1557{
1558 return userdata;
1559}
1560
1561void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1562{
1563 invoke_cb = invoke_pending_cb;
1564}
1565
1566void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1567{
1568 release_cb = release;
1569 acquire_cb = acquire;
1570}
1571#endif
1365 1572
1366/* initialise a loop structure, must be zero-initialised */ 1573/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1574static void noinline
1368loop_init (EV_P_ unsigned int flags) 1575loop_init (EV_P_ unsigned int flags)
1369{ 1576{
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1594 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1595 have_monotonic = 1;
1389 } 1596 }
1390#endif 1597#endif
1391 1598
1599 /* pid check not overridable via env */
1600#ifndef _WIN32
1601 if (flags & EVFLAG_FORKCHECK)
1602 curpid = getpid ();
1603#endif
1604
1605 if (!(flags & EVFLAG_NOENV)
1606 && !enable_secure ()
1607 && getenv ("LIBEV_FLAGS"))
1608 flags = atoi (getenv ("LIBEV_FLAGS"));
1609
1392 ev_rt_now = ev_time (); 1610 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1611 mn_now = get_clock ();
1394 now_floor = mn_now; 1612 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1613 rtmn_diff = ev_rt_now - mn_now;
1614#if EV_MINIMAL < 2
1615 invoke_cb = ev_invoke_pending;
1616#endif
1396 1617
1397 io_blocktime = 0.; 1618 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1619 timeout_blocktime = 0.;
1399 backend = 0; 1620 backend = 0;
1400 backend_fd = -1; 1621 backend_fd = -1;
1401 gotasync = 0; 1622 sig_pending = 0;
1623#if EV_ASYNC_ENABLE
1624 async_pending = 0;
1625#endif
1402#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1403 fs_fd = -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1628#endif
1405 1629#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1631#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1632
1417 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1419 1635
1420#if EV_USE_PORT 1636#if EV_USE_PORT
1446{ 1662{
1447 int i; 1663 int i;
1448 1664
1449 if (ev_is_active (&pipe_w)) 1665 if (ev_is_active (&pipe_w))
1450 { 1666 {
1451 ev_ref (EV_A); /* signal watcher */ 1667 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1668 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1669
1454#if EV_USE_EVENTFD 1670#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1671 if (evfd >= 0)
1456 close (evfd); 1672 close (evfd);
1457#endif 1673#endif
1458 1674
1459 if (evpipe [0] >= 0) 1675 if (evpipe [0] >= 0)
1460 { 1676 {
1461 close (evpipe [0]); 1677 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1678 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1679 }
1464 } 1680 }
1681
1682#if EV_USE_SIGNALFD
1683 if (ev_is_active (&sigfd_w))
1684 close (sigfd);
1685#endif
1465 1686
1466#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1688 if (fs_fd >= 0)
1468 close (fs_fd); 1689 close (fs_fd);
1469#endif 1690#endif
1493#if EV_IDLE_ENABLE 1714#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1715 array_free (idle, [i]);
1495#endif 1716#endif
1496 } 1717 }
1497 1718
1498 ev_free (anfds); anfdmax = 0; 1719 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1720
1500 /* have to use the microsoft-never-gets-it-right macro */ 1721 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1722 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1723 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1724 array_free (timer, EMPTY);
1538 1759
1539 if (ev_is_active (&pipe_w)) 1760 if (ev_is_active (&pipe_w))
1540 { 1761 {
1541 /* this "locks" the handlers against writing to the pipe */ 1762 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1763 /* while we modify the fd vars */
1543 gotsig = 1; 1764 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1765#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1766 async_pending = 1;
1546#endif 1767#endif
1547 1768
1548 ev_ref (EV_A); 1769 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1770 ev_io_stop (EV_A_ &pipe_w);
1550 1771
1553 close (evfd); 1774 close (evfd);
1554#endif 1775#endif
1555 1776
1556 if (evpipe [0] >= 0) 1777 if (evpipe [0] >= 0)
1557 { 1778 {
1558 close (evpipe [0]); 1779 EV_WIN32_CLOSE_FD (evpipe [0]);
1559 close (evpipe [1]); 1780 EV_WIN32_CLOSE_FD (evpipe [1]);
1560 } 1781 }
1561 1782
1562 evpipe_init (EV_A); 1783 evpipe_init (EV_A);
1563 /* now iterate over everything, in case we missed something */ 1784 /* now iterate over everything, in case we missed something */
1564 pipecb (EV_A_ &pipe_w, EV_READ); 1785 pipecb (EV_A_ &pipe_w, EV_READ);
1570#if EV_MULTIPLICITY 1791#if EV_MULTIPLICITY
1571 1792
1572struct ev_loop * 1793struct ev_loop *
1573ev_loop_new (unsigned int flags) 1794ev_loop_new (unsigned int flags)
1574{ 1795{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1796 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1797
1577 memset (loop, 0, sizeof (struct ev_loop)); 1798 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1799 loop_init (EV_A_ flags);
1580 1800
1581 if (ev_backend (EV_A)) 1801 if (ev_backend (EV_A))
1582 return loop; 1802 return EV_A;
1583 1803
1584 return 0; 1804 return 0;
1585} 1805}
1586 1806
1587void 1807void
1594void 1814void
1595ev_loop_fork (EV_P) 1815ev_loop_fork (EV_P)
1596{ 1816{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1817 postfork = 1; /* must be in line with ev_default_fork */
1598} 1818}
1819#endif /* multiplicity */
1599 1820
1600#if EV_VERIFY 1821#if EV_VERIFY
1601static void noinline 1822static void noinline
1602verify_watcher (EV_P_ W w) 1823verify_watcher (EV_P_ W w)
1603{ 1824{
1631 verify_watcher (EV_A_ ws [cnt]); 1852 verify_watcher (EV_A_ ws [cnt]);
1632 } 1853 }
1633} 1854}
1634#endif 1855#endif
1635 1856
1857#if EV_MINIMAL < 2
1636void 1858void
1637ev_loop_verify (EV_P) 1859ev_loop_verify (EV_P)
1638{ 1860{
1639#if EV_VERIFY 1861#if EV_VERIFY
1640 int i; 1862 int i;
1689 assert (checkmax >= checkcnt); 1911 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1912 array_verify (EV_A_ (W *)checks, checkcnt);
1691 1913
1692# if 0 1914# if 0
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1915 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1695# endif
1696#endif 1917# endif
1918#endif
1697} 1919}
1698 1920#endif
1699#endif /* multiplicity */
1700 1921
1701#if EV_MULTIPLICITY 1922#if EV_MULTIPLICITY
1702struct ev_loop * 1923struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1924ev_default_loop_init (unsigned int flags)
1704#else 1925#else
1707#endif 1928#endif
1708{ 1929{
1709 if (!ev_default_loop_ptr) 1930 if (!ev_default_loop_ptr)
1710 { 1931 {
1711#if EV_MULTIPLICITY 1932#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1933 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 1934#else
1714 ev_default_loop_ptr = 1; 1935 ev_default_loop_ptr = 1;
1715#endif 1936#endif
1716 1937
1717 loop_init (EV_A_ flags); 1938 loop_init (EV_A_ flags);
1734 1955
1735void 1956void
1736ev_default_destroy (void) 1957ev_default_destroy (void)
1737{ 1958{
1738#if EV_MULTIPLICITY 1959#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 1960 EV_P = ev_default_loop_ptr;
1740#endif 1961#endif
1741 1962
1742 ev_default_loop_ptr = 0; 1963 ev_default_loop_ptr = 0;
1743 1964
1744#ifndef _WIN32 1965#ifndef _WIN32
1751 1972
1752void 1973void
1753ev_default_fork (void) 1974ev_default_fork (void)
1754{ 1975{
1755#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 1977 EV_P = ev_default_loop_ptr;
1757#endif 1978#endif
1758 1979
1759 postfork = 1; /* must be in line with ev_loop_fork */ 1980 postfork = 1; /* must be in line with ev_loop_fork */
1760} 1981}
1761 1982
1765ev_invoke (EV_P_ void *w, int revents) 1986ev_invoke (EV_P_ void *w, int revents)
1766{ 1987{
1767 EV_CB_INVOKE ((W)w, revents); 1988 EV_CB_INVOKE ((W)w, revents);
1768} 1989}
1769 1990
1770inline_speed void 1991unsigned int
1771call_pending (EV_P) 1992ev_pending_count (EV_P)
1993{
1994 int pri;
1995 unsigned int count = 0;
1996
1997 for (pri = NUMPRI; pri--; )
1998 count += pendingcnt [pri];
1999
2000 return count;
2001}
2002
2003void noinline
2004ev_invoke_pending (EV_P)
1772{ 2005{
1773 int pri; 2006 int pri;
1774 2007
1775 for (pri = NUMPRI; pri--; ) 2008 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 2009 while (pendingcnt [pri])
1944 ANHE_at_cache (*he); 2177 ANHE_at_cache (*he);
1945 } 2178 }
1946} 2179}
1947 2180
1948/* fetch new monotonic and realtime times from the kernel */ 2181/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2182/* also detect if there was a timejump, and act accordingly */
1950inline_speed void 2183inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
1952{ 2185{
1953 int i;
1954
1955#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
1956 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
1957 { 2188 {
2189 int i;
1958 ev_tstamp odiff = rtmn_diff; 2190 ev_tstamp odiff = rtmn_diff;
1959 2191
1960 mn_now = get_clock (); 2192 mn_now = get_clock ();
1961 2193
1962 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2194 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
2012 2244
2013 mn_now = ev_rt_now; 2245 mn_now = ev_rt_now;
2014 } 2246 }
2015} 2247}
2016 2248
2017static int loop_done;
2018
2019void 2249void
2020ev_loop (EV_P_ int flags) 2250ev_loop (EV_P_ int flags)
2021{ 2251{
2252#if EV_MINIMAL < 2
2253 ++loop_depth;
2254#endif
2255
2256 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2257
2022 loop_done = EVUNLOOP_CANCEL; 2258 loop_done = EVUNLOOP_CANCEL;
2023 2259
2024 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2260 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2025 2261
2026 do 2262 do
2027 { 2263 {
2028#if EV_VERIFY >= 2 2264#if EV_VERIFY >= 2
2029 ev_loop_verify (EV_A); 2265 ev_loop_verify (EV_A);
2042 /* we might have forked, so queue fork handlers */ 2278 /* we might have forked, so queue fork handlers */
2043 if (expect_false (postfork)) 2279 if (expect_false (postfork))
2044 if (forkcnt) 2280 if (forkcnt)
2045 { 2281 {
2046 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2047 call_pending (EV_A); 2283 EV_INVOKE_PENDING;
2048 } 2284 }
2049#endif 2285#endif
2050 2286
2051 /* queue prepare watchers (and execute them) */ 2287 /* queue prepare watchers (and execute them) */
2052 if (expect_false (preparecnt)) 2288 if (expect_false (preparecnt))
2053 { 2289 {
2054 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2055 call_pending (EV_A); 2291 EV_INVOKE_PENDING;
2056 } 2292 }
2293
2294 if (expect_false (loop_done))
2295 break;
2057 2296
2058 /* we might have forked, so reify kernel state if necessary */ 2297 /* we might have forked, so reify kernel state if necessary */
2059 if (expect_false (postfork)) 2298 if (expect_false (postfork))
2060 loop_fork (EV_A); 2299 loop_fork (EV_A);
2061 2300
2067 ev_tstamp waittime = 0.; 2306 ev_tstamp waittime = 0.;
2068 ev_tstamp sleeptime = 0.; 2307 ev_tstamp sleeptime = 0.;
2069 2308
2070 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2309 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2071 { 2310 {
2311 /* remember old timestamp for io_blocktime calculation */
2312 ev_tstamp prev_mn_now = mn_now;
2313
2072 /* update time to cancel out callback processing overhead */ 2314 /* update time to cancel out callback processing overhead */
2073 time_update (EV_A_ 1e100); 2315 time_update (EV_A_ 1e100);
2074 2316
2075 waittime = MAX_BLOCKTIME; 2317 waittime = MAX_BLOCKTIME;
2076 2318
2086 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2328 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2087 if (waittime > to) waittime = to; 2329 if (waittime > to) waittime = to;
2088 } 2330 }
2089#endif 2331#endif
2090 2332
2333 /* don't let timeouts decrease the waittime below timeout_blocktime */
2091 if (expect_false (waittime < timeout_blocktime)) 2334 if (expect_false (waittime < timeout_blocktime))
2092 waittime = timeout_blocktime; 2335 waittime = timeout_blocktime;
2093 2336
2094 sleeptime = waittime - backend_fudge; 2337 /* extra check because io_blocktime is commonly 0 */
2095
2096 if (expect_true (sleeptime > io_blocktime)) 2338 if (expect_false (io_blocktime))
2097 sleeptime = io_blocktime;
2098
2099 if (sleeptime)
2100 { 2339 {
2340 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2341
2342 if (sleeptime > waittime - backend_fudge)
2343 sleeptime = waittime - backend_fudge;
2344
2345 if (expect_true (sleeptime > 0.))
2346 {
2101 ev_sleep (sleeptime); 2347 ev_sleep (sleeptime);
2102 waittime -= sleeptime; 2348 waittime -= sleeptime;
2349 }
2103 } 2350 }
2104 } 2351 }
2105 2352
2353#if EV_MINIMAL < 2
2106 ++loop_count; 2354 ++loop_count;
2355#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2107 backend_poll (EV_A_ waittime); 2357 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2108 2359
2109 /* update ev_rt_now, do magic */ 2360 /* update ev_rt_now, do magic */
2110 time_update (EV_A_ waittime + sleeptime); 2361 time_update (EV_A_ waittime + sleeptime);
2111 } 2362 }
2112 2363
2123 2374
2124 /* queue check watchers, to be executed first */ 2375 /* queue check watchers, to be executed first */
2125 if (expect_false (checkcnt)) 2376 if (expect_false (checkcnt))
2126 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2127 2378
2128 call_pending (EV_A); 2379 EV_INVOKE_PENDING;
2129 } 2380 }
2130 while (expect_true ( 2381 while (expect_true (
2131 activecnt 2382 activecnt
2132 && !loop_done 2383 && !loop_done
2133 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2134 )); 2385 ));
2135 2386
2136 if (loop_done == EVUNLOOP_ONE) 2387 if (loop_done == EVUNLOOP_ONE)
2137 loop_done = EVUNLOOP_CANCEL; 2388 loop_done = EVUNLOOP_CANCEL;
2389
2390#if EV_MINIMAL < 2
2391 --loop_depth;
2392#endif
2138} 2393}
2139 2394
2140void 2395void
2141ev_unloop (EV_P_ int how) 2396ev_unloop (EV_P_ int how)
2142{ 2397{
2193inline_size void 2448inline_size void
2194wlist_del (WL *head, WL elem) 2449wlist_del (WL *head, WL elem)
2195{ 2450{
2196 while (*head) 2451 while (*head)
2197 { 2452 {
2198 if (*head == elem) 2453 if (expect_true (*head == elem))
2199 { 2454 {
2200 *head = elem->next; 2455 *head = elem->next;
2201 return; 2456 break;
2202 } 2457 }
2203 2458
2204 head = &(*head)->next; 2459 head = &(*head)->next;
2205 } 2460 }
2206} 2461}
2234} 2489}
2235 2490
2236inline_size void 2491inline_size void
2237pri_adjust (EV_P_ W w) 2492pri_adjust (EV_P_ W w)
2238{ 2493{
2239 int pri = w->priority; 2494 int pri = ev_priority (w);
2240 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2495 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2241 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2496 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2242 w->priority = pri; 2497 ev_set_priority (w, pri);
2243} 2498}
2244 2499
2245inline_speed void 2500inline_speed void
2246ev_start (EV_P_ W w, int active) 2501ev_start (EV_P_ W w, int active)
2247{ 2502{
2266 2521
2267 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2268 return; 2523 return;
2269 2524
2270 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2525 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2271 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2272 2527
2273 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2274 2529
2275 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2276 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2277 wlist_add (&anfds[fd].head, (WL)w); 2532 wlist_add (&anfds[fd].head, (WL)w);
2278 2533
2279 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2534 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2280 w->events &= ~EV__IOFDSET; 2535 w->events &= ~EV__IOFDSET;
2281 2536
2282 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2283} 2538}
2284 2539
2346 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2347 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2348 } 2603 }
2349 } 2604 }
2350 2605
2351 EV_FREQUENT_CHECK;
2352
2353 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2354 2607
2355 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2356} 2611}
2357 2612
2358void noinline 2613void noinline
2359ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2360{ 2615{
2378 } 2633 }
2379 2634
2380 EV_FREQUENT_CHECK; 2635 EV_FREQUENT_CHECK;
2381} 2636}
2382 2637
2638ev_tstamp
2639ev_timer_remaining (EV_P_ ev_timer *w)
2640{
2641 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2642}
2643
2383#if EV_PERIODIC_ENABLE 2644#if EV_PERIODIC_ENABLE
2384void noinline 2645void noinline
2385ev_periodic_start (EV_P_ ev_periodic *w) 2646ev_periodic_start (EV_P_ ev_periodic *w)
2386{ 2647{
2387 if (expect_false (ev_is_active (w))) 2648 if (expect_false (ev_is_active (w)))
2433 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2434 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2435 } 2696 }
2436 } 2697 }
2437 2698
2438 EV_FREQUENT_CHECK;
2439
2440 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2441} 2702}
2442 2703
2443void noinline 2704void noinline
2444ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2445{ 2706{
2454#endif 2715#endif
2455 2716
2456void noinline 2717void noinline
2457ev_signal_start (EV_P_ ev_signal *w) 2718ev_signal_start (EV_P_ ev_signal *w)
2458{ 2719{
2459#if EV_MULTIPLICITY
2460 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2461#endif
2462 if (expect_false (ev_is_active (w))) 2720 if (expect_false (ev_is_active (w)))
2463 return; 2721 return;
2464 2722
2465 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2723 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2466 2724
2467 evpipe_init (EV_A); 2725#if EV_MULTIPLICITY
2726 assert (("libev: a signal must not be attached to two different loops",
2727 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2468 2728
2469 EV_FREQUENT_CHECK; 2729 signals [w->signum - 1].loop = EV_A;
2730#endif
2470 2731
2732 EV_FREQUENT_CHECK;
2733
2734#if EV_USE_SIGNALFD
2735 if (sigfd == -2)
2471 { 2736 {
2472#ifndef _WIN32 2737 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2473 sigset_t full, prev; 2738 if (sigfd < 0 && errno == EINVAL)
2474 sigfillset (&full); 2739 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2475 sigprocmask (SIG_SETMASK, &full, &prev);
2476#endif
2477 2740
2478 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2741 if (sigfd >= 0)
2742 {
2743 fd_intern (sigfd); /* doing it twice will not hurt */
2479 2744
2480#ifndef _WIN32 2745 sigemptyset (&sigfd_set);
2481 sigprocmask (SIG_SETMASK, &prev, 0); 2746
2482#endif 2747 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2748 ev_set_priority (&sigfd_w, EV_MAXPRI);
2749 ev_io_start (EV_A_ &sigfd_w);
2750 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2751 }
2483 } 2752 }
2753
2754 if (sigfd >= 0)
2755 {
2756 /* TODO: check .head */
2757 sigaddset (&sigfd_set, w->signum);
2758 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2759
2760 signalfd (sigfd, &sigfd_set, 0);
2761 }
2762#endif
2484 2763
2485 ev_start (EV_A_ (W)w, 1); 2764 ev_start (EV_A_ (W)w, 1);
2486 wlist_add (&signals [w->signum - 1].head, (WL)w); 2765 wlist_add (&signals [w->signum - 1].head, (WL)w);
2487 2766
2488 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2768# if EV_USE_SIGNALFD
2769 if (sigfd < 0) /*TODO*/
2770# endif
2489 { 2771 {
2490#if _WIN32 2772# ifdef _WIN32
2773 evpipe_init (EV_A);
2774
2491 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2492#else 2776# else
2493 struct sigaction sa; 2777 struct sigaction sa;
2778
2779 evpipe_init (EV_A);
2780
2494 sa.sa_handler = ev_sighandler; 2781 sa.sa_handler = ev_sighandler;
2495 sigfillset (&sa.sa_mask); 2782 sigfillset (&sa.sa_mask);
2496 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2783 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2497 sigaction (w->signum, &sa, 0); 2784 sigaction (w->signum, &sa, 0);
2785
2786 sigemptyset (&sa.sa_mask);
2787 sigaddset (&sa.sa_mask, w->signum);
2788 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2498#endif 2789#endif
2499 } 2790 }
2500 2791
2501 EV_FREQUENT_CHECK; 2792 EV_FREQUENT_CHECK;
2502} 2793}
2503 2794
2504void noinline 2795void noinline
2512 2803
2513 wlist_del (&signals [w->signum - 1].head, (WL)w); 2804 wlist_del (&signals [w->signum - 1].head, (WL)w);
2514 ev_stop (EV_A_ (W)w); 2805 ev_stop (EV_A_ (W)w);
2515 2806
2516 if (!signals [w->signum - 1].head) 2807 if (!signals [w->signum - 1].head)
2808 {
2809#if EV_MULTIPLICITY
2810 signals [w->signum - 1].loop = 0; /* unattach from signal */
2811#endif
2812#if EV_USE_SIGNALFD
2813 if (sigfd >= 0)
2814 {
2815 sigset_t ss;
2816
2817 sigemptyset (&ss);
2818 sigaddset (&ss, w->signum);
2819 sigdelset (&sigfd_set, w->signum);
2820
2821 signalfd (sigfd, &sigfd_set, 0);
2822 sigprocmask (SIG_UNBLOCK, &ss, 0);
2823 }
2824 else
2825#endif
2517 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2827 }
2518 2828
2519 EV_FREQUENT_CHECK; 2829 EV_FREQUENT_CHECK;
2520} 2830}
2521 2831
2522void 2832void
2563#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2564 2874
2565static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2875static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2566 2876
2567#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2568# define EV_INOTIFY_BUFSIZE 8192 2878
2879/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2880# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2569 2881
2570static void noinline 2882static void noinline
2571infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2572{ 2884{
2573 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); 2885 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);
2574 2886
2575 if (w->wd < 0) 2887 if (w->wd >= 0)
2888 {
2889 struct statfs sfs;
2890
2891 /* now local changes will be tracked by inotify, but remote changes won't */
2892 /* unless the filesystem is known to be local, we therefore still poll */
2893 /* also do poll on <2.6.25, but with normal frequency */
2894
2895 if (!fs_2625)
2896 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2897 else if (!statfs (w->path, &sfs)
2898 && (sfs.f_type == 0x1373 /* devfs */
2899 || sfs.f_type == 0xEF53 /* ext2/3 */
2900 || sfs.f_type == 0x3153464a /* jfs */
2901 || sfs.f_type == 0x52654973 /* reiser3 */
2902 || sfs.f_type == 0x01021994 /* tempfs */
2903 || sfs.f_type == 0x58465342 /* xfs */))
2904 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2905 else
2906 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2576 { 2907 }
2908 else
2909 {
2910 /* can't use inotify, continue to stat */
2577 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2911 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2578 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2579 2912
2580 /* monitor some parent directory for speedup hints */ 2913 /* if path is not there, monitor some parent directory for speedup hints */
2581 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2914 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2582 /* but an efficiency issue only */ 2915 /* but an efficiency issue only */
2583 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2916 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2584 { 2917 {
2585 char path [4096]; 2918 char path [4096];
2601 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2602 } 2935 }
2603 } 2936 }
2604 2937
2605 if (w->wd >= 0) 2938 if (w->wd >= 0)
2606 {
2607 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2608 2940
2609 /* now local changes will be tracked by inotify, but remote changes won't */ 2941 /* now re-arm timer, if required */
2610 /* unless the filesystem it known to be local, we therefore still poll */ 2942 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2611 /* also do poll on <2.6.25, but with normal frequency */
2612 struct statfs sfs;
2613
2614 if (fs_2625 && !statfs (w->path, &sfs))
2615 if (sfs.f_type == 0x1373 /* devfs */
2616 || sfs.f_type == 0xEF53 /* ext2/3 */
2617 || sfs.f_type == 0x3153464a /* jfs */
2618 || sfs.f_type == 0x52654973 /* reiser3 */
2619 || sfs.f_type == 0x01021994 /* tempfs */
2620 || sfs.f_type == 0x58465342 /* xfs */)
2621 return;
2622
2623 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2624 ev_timer_again (EV_A_ &w->timer); 2943 ev_timer_again (EV_A_ &w->timer);
2625 } 2944 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2626} 2945}
2627 2946
2628static void noinline 2947static void noinline
2629infy_del (EV_P_ ev_stat *w) 2948infy_del (EV_P_ ev_stat *w)
2630{ 2949{
2675 2994
2676static void 2995static void
2677infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2678{ 2997{
2679 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2680 struct inotify_event *ev = (struct inotify_event *)buf;
2681 int ofs; 2999 int ofs;
2682 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2683 3001
2684 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3002 for (ofs = 0; ofs < len; )
3003 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2685 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3005 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len;
3007 }
3008}
3009
3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
2686} 3040}
2687 3041
2688inline_size void 3042inline_size void
2689check_2625 (EV_P) 3043ev_check_2625 (EV_P)
2690{ 3044{
2691 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2692 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2693 */ 3047 */
2694 struct utsname buf; 3048 if (ev_linux_version () < 0x020619)
2695 int major, minor, micro;
2696
2697 if (uname (&buf))
2698 return; 3049 return;
2699 3050
2700 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2701 return;
2702
2703 if (major < 2
2704 || (major == 2 && minor < 6)
2705 || (major == 2 && minor == 6 && micro < 25))
2706 return;
2707
2708 fs_2625 = 1; 3051 fs_2625 = 1;
3052}
3053
3054inline_size int
3055infy_newfd (void)
3056{
3057#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3058 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3059 if (fd >= 0)
3060 return fd;
3061#endif
3062 return inotify_init ();
2709} 3063}
2710 3064
2711inline_size void 3065inline_size void
2712infy_init (EV_P) 3066infy_init (EV_P)
2713{ 3067{
2714 if (fs_fd != -2) 3068 if (fs_fd != -2)
2715 return; 3069 return;
2716 3070
2717 fs_fd = -1; 3071 fs_fd = -1;
2718 3072
2719 check_2625 (EV_A); 3073 ev_check_2625 (EV_A);
2720 3074
2721 fs_fd = inotify_init (); 3075 fs_fd = infy_newfd ();
2722 3076
2723 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
2724 { 3078 {
3079 fd_intern (fs_fd);
2725 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3080 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2726 ev_set_priority (&fs_w, EV_MAXPRI); 3081 ev_set_priority (&fs_w, EV_MAXPRI);
2727 ev_io_start (EV_A_ &fs_w); 3082 ev_io_start (EV_A_ &fs_w);
3083 ev_unref (EV_A);
2728 } 3084 }
2729} 3085}
2730 3086
2731inline_size void 3087inline_size void
2732infy_fork (EV_P) 3088infy_fork (EV_P)
2734 int slot; 3090 int slot;
2735 3091
2736 if (fs_fd < 0) 3092 if (fs_fd < 0)
2737 return; 3093 return;
2738 3094
3095 ev_ref (EV_A);
3096 ev_io_stop (EV_A_ &fs_w);
2739 close (fs_fd); 3097 close (fs_fd);
2740 fs_fd = inotify_init (); 3098 fs_fd = infy_newfd ();
3099
3100 if (fs_fd >= 0)
3101 {
3102 fd_intern (fs_fd);
3103 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A);
3106 }
2741 3107
2742 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2743 { 3109 {
2744 WL w_ = fs_hash [slot].head; 3110 WL w_ = fs_hash [slot].head;
2745 fs_hash [slot].head = 0; 3111 fs_hash [slot].head = 0;
2752 w->wd = -1; 3118 w->wd = -1;
2753 3119
2754 if (fs_fd >= 0) 3120 if (fs_fd >= 0)
2755 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2756 else 3122 else
3123 {
3124 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3125 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2757 ev_timer_again (EV_A_ &w->timer); 3126 ev_timer_again (EV_A_ &w->timer);
3127 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3128 }
2758 } 3129 }
2759 } 3130 }
2760} 3131}
2761 3132
2762#endif 3133#endif
2779static void noinline 3150static void noinline
2780stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3151stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2781{ 3152{
2782 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3153 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2783 3154
2784 /* we copy this here each the time so that */ 3155 ev_statdata prev = w->attr;
2785 /* prev has the old value when the callback gets invoked */
2786 w->prev = w->attr;
2787 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
2788 3157
2789 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3158 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2790 if ( 3159 if (
2791 w->prev.st_dev != w->attr.st_dev 3160 prev.st_dev != w->attr.st_dev
2792 || w->prev.st_ino != w->attr.st_ino 3161 || prev.st_ino != w->attr.st_ino
2793 || w->prev.st_mode != w->attr.st_mode 3162 || prev.st_mode != w->attr.st_mode
2794 || w->prev.st_nlink != w->attr.st_nlink 3163 || prev.st_nlink != w->attr.st_nlink
2795 || w->prev.st_uid != w->attr.st_uid 3164 || prev.st_uid != w->attr.st_uid
2796 || w->prev.st_gid != w->attr.st_gid 3165 || prev.st_gid != w->attr.st_gid
2797 || w->prev.st_rdev != w->attr.st_rdev 3166 || prev.st_rdev != w->attr.st_rdev
2798 || w->prev.st_size != w->attr.st_size 3167 || prev.st_size != w->attr.st_size
2799 || w->prev.st_atime != w->attr.st_atime 3168 || prev.st_atime != w->attr.st_atime
2800 || w->prev.st_mtime != w->attr.st_mtime 3169 || prev.st_mtime != w->attr.st_mtime
2801 || w->prev.st_ctime != w->attr.st_ctime 3170 || prev.st_ctime != w->attr.st_ctime
2802 ) { 3171 ) {
3172 /* we only update w->prev on actual differences */
3173 /* in case we test more often than invoke the callback, */
3174 /* to ensure that prev is always different to attr */
3175 w->prev = prev;
3176
2803 #if EV_USE_INOTIFY 3177 #if EV_USE_INOTIFY
2804 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
2805 { 3179 {
2806 infy_del (EV_A_ w); 3180 infy_del (EV_A_ w);
2807 infy_add (EV_A_ w); 3181 infy_add (EV_A_ w);
2832 3206
2833 if (fs_fd >= 0) 3207 if (fs_fd >= 0)
2834 infy_add (EV_A_ w); 3208 infy_add (EV_A_ w);
2835 else 3209 else
2836#endif 3210#endif
3211 {
2837 ev_timer_again (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 ev_unref (EV_A);
3214 }
2838 3215
2839 ev_start (EV_A_ (W)w, 1); 3216 ev_start (EV_A_ (W)w, 1);
2840 3217
2841 EV_FREQUENT_CHECK; 3218 EV_FREQUENT_CHECK;
2842} 3219}
2851 EV_FREQUENT_CHECK; 3228 EV_FREQUENT_CHECK;
2852 3229
2853#if EV_USE_INOTIFY 3230#if EV_USE_INOTIFY
2854 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
2855#endif 3232#endif
3233
3234 if (ev_is_active (&w->timer))
3235 {
3236 ev_ref (EV_A);
2856 ev_timer_stop (EV_A_ &w->timer); 3237 ev_timer_stop (EV_A_ &w->timer);
3238 }
2857 3239
2858 ev_stop (EV_A_ (W)w); 3240 ev_stop (EV_A_ (W)w);
2859 3241
2860 EV_FREQUENT_CHECK; 3242 EV_FREQUENT_CHECK;
2861} 3243}
3002embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3003{ 3385{
3004 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3386 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3005 3387
3006 { 3388 {
3007 struct ev_loop *loop = w->other; 3389 EV_P = w->other;
3008 3390
3009 while (fdchangecnt) 3391 while (fdchangecnt)
3010 { 3392 {
3011 fd_reify (EV_A); 3393 fd_reify (EV_A);
3012 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3394 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3020 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3402 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3021 3403
3022 ev_embed_stop (EV_A_ w); 3404 ev_embed_stop (EV_A_ w);
3023 3405
3024 { 3406 {
3025 struct ev_loop *loop = w->other; 3407 EV_P = w->other;
3026 3408
3027 ev_loop_fork (EV_A); 3409 ev_loop_fork (EV_A);
3028 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3410 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3029 } 3411 }
3030 3412
3044{ 3426{
3045 if (expect_false (ev_is_active (w))) 3427 if (expect_false (ev_is_active (w)))
3046 return; 3428 return;
3047 3429
3048 { 3430 {
3049 struct ev_loop *loop = w->other; 3431 EV_P = w->other;
3050 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3432 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3051 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3433 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3052 } 3434 }
3053 3435
3054 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
3081 3463
3082 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
3083 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
3084 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
3085 3467
3468 ev_stop (EV_A_ (W)w);
3469
3086 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
3087} 3471}
3088#endif 3472#endif
3089 3473
3090#if EV_FORK_ENABLE 3474#if EV_FORK_ENABLE
3166 3550
3167void 3551void
3168ev_async_send (EV_P_ ev_async *w) 3552ev_async_send (EV_P_ ev_async *w)
3169{ 3553{
3170 w->sent = 1; 3554 w->sent = 1;
3171 evpipe_write (EV_A_ &gotasync); 3555 evpipe_write (EV_A_ &async_pending);
3172} 3556}
3173#endif 3557#endif
3174 3558
3175/*****************************************************************************/ 3559/*****************************************************************************/
3176 3560
3325 if (types & EV_CHECK) 3709 if (types & EV_CHECK)
3326 for (i = checkcnt; i--; ) 3710 for (i = checkcnt; i--; )
3327 cb (EV_A_ EV_CHECK, checks [i]); 3711 cb (EV_A_ EV_CHECK, checks [i]);
3328 3712
3329 if (types & EV_SIGNAL) 3713 if (types & EV_SIGNAL)
3330 for (i = 0; i < signalmax; ++i) 3714 for (i = 0; i < EV_NSIG - 1; ++i)
3331 for (wl = signals [i].head; wl; ) 3715 for (wl = signals [i].head; wl; )
3332 { 3716 {
3333 wn = wl->next; 3717 wn = wl->next;
3334 cb (EV_A_ EV_SIGNAL, wl); 3718 cb (EV_A_ EV_SIGNAL, wl);
3335 wl = wn; 3719 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines