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

Comparing libev/ev.c (file contents):
Revision 1.292 by root, Mon Jun 29 07:22:56 2009 UTC vs.
Revision 1.331 by root, Tue Mar 9 08:55:03 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 *
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 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
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
155#include <assert.h> 164#include <assert.h>
156#include <errno.h> 165#include <errno.h>
157#include <sys/types.h> 166#include <sys/types.h>
158#include <time.h> 167#include <time.h>
168#include <limits.h>
159 169
160#include <signal.h> 170#include <signal.h>
161 171
162#ifdef EV_H 172#ifdef EV_H
163# include EV_H 173# include EV_H
174# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 185# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
178# endif 188# endif
189# undef EV_AVOID_STDIO
179#endif 190#endif
180 191
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line */
218# define EV_NSIG 65
219#endif
182 220
183#ifndef EV_USE_CLOCK_SYSCALL 221#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 222# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 223# define EV_USE_CLOCK_SYSCALL 1
186# else 224# else
263#ifndef EV_USE_EVENTFD 301#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 302# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 303# define EV_USE_EVENTFD 1
266# else 304# else
267# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
306# endif
307#endif
308
309#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1
312# else
313# define EV_USE_SIGNALFD 0
268# endif 314# endif
269#endif 315#endif
270 316
271#if 0 /* debugging */ 317#if 0 /* debugging */
272# define EV_VERIFY 3 318# define EV_VERIFY 3
300# endif 346# endif
301#endif 347#endif
302 348
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
356
305#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
308#endif 360#endif
309 361
339#endif 391#endif
340 392
341#if EV_USE_EVENTFD 393#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 394/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 395# include <stdint.h>
396# ifndef EFD_NONBLOCK
397# define EFD_NONBLOCK O_NONBLOCK
398# endif
399# ifndef EFD_CLOEXEC
400# ifdef O_CLOEXEC
401# define EFD_CLOEXEC O_CLOEXEC
402# else
403# define EFD_CLOEXEC 02000000
404# endif
405# endif
344# ifdef __cplusplus 406# ifdef __cplusplus
345extern "C" { 407extern "C" {
346# endif 408# endif
347int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 410# ifdef __cplusplus
349} 411}
350# endif 412# endif
351#endif 413#endif
414
415#if EV_USE_SIGNALFD
416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
352 443
353/**/ 444/**/
354 445
355#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 459 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 461
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
372#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 464
375#if __GNUC__ >= 4 465#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
378#else 468#else
391# define inline_speed static noinline 481# define inline_speed static noinline
392#else 482#else
393# define inline_speed static inline 483# define inline_speed static inline
394#endif 484#endif
395 485
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 486#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
487
488#if EV_MINPRI == EV_MAXPRI
489# define ABSPRI(w) (((W)w), 0)
490#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 491# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
492#endif
398 493
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 494#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 495#define EMPTY2(a,b) /* used to suppress some warnings */
401 496
402typedef ev_watcher *W; 497typedef ev_watcher *W;
414 509
415#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 512#endif
418 513
514#ifndef EV_FD_TO_WIN32_HANDLE
515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
516#endif
517#ifndef EV_WIN32_HANDLE_TO_FD
518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
519#endif
520#ifndef EV_WIN32_CLOSE_FD
521# define EV_WIN32_CLOSE_FD(fd) close (fd)
522#endif
523
419#ifdef _WIN32 524#ifdef _WIN32
420# include "ev_win32.c" 525# include "ev_win32.c"
421#endif 526#endif
422 527
423/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
424 537
425static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
426 539
427void 540void
428ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
438 551
439 if (syserr_cb) 552 if (syserr_cb)
440 syserr_cb (msg); 553 syserr_cb (msg);
441 else 554 else
442 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
443 perror (msg); 564 perror (msg);
565#endif
444 abort (); 566 abort ();
445 } 567 }
446} 568}
447 569
448static void * 570static void *
473{ 595{
474 ptr = alloc (ptr, size); 596 ptr = alloc (ptr, size);
475 597
476 if (!ptr && size) 598 if (!ptr && size)
477 { 599 {
600#if EV_AVOID_STDIO
601 ev_printerr ("libev: memory allocation failed, aborting.\n");
602#else
478 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 603 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
604#endif
479 abort (); 605 abort ();
480 } 606 }
481 607
482 return ptr; 608 return ptr;
483} 609}
485#define ev_malloc(size) ev_realloc (0, (size)) 611#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 612#define ev_free(ptr) ev_realloc ((ptr), 0)
487 613
488/*****************************************************************************/ 614/*****************************************************************************/
489 615
616/* set in reify when reification needed */
617#define EV_ANFD_REIFY 1
618
490/* file descriptor info structure */ 619/* file descriptor info structure */
491typedef struct 620typedef struct
492{ 621{
493 WL head; 622 WL head;
494 unsigned char events; /* the events watched for */ 623 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 624 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 625 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 626 unsigned char unused;
498#if EV_USE_EPOLL 627#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 628 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 629#endif
562 691
563 static int ev_default_loop_ptr; 692 static int ev_default_loop_ptr;
564 693
565#endif 694#endif
566 695
696#if EV_MINIMAL < 2
697# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
698# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
699# define EV_INVOKE_PENDING invoke_cb (EV_A)
700#else
701# define EV_RELEASE_CB (void)0
702# define EV_ACQUIRE_CB (void)0
703# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
704#endif
705
706#define EVUNLOOP_RECURSE 0x80
707
567/*****************************************************************************/ 708/*****************************************************************************/
568 709
569#ifndef EV_HAVE_EV_TIME 710#ifndef EV_HAVE_EV_TIME
570ev_tstamp 711ev_tstamp
571ev_time (void) 712ev_time (void)
627 768
628 tv.tv_sec = (time_t)delay; 769 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 770 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 771
631 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 772 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
632 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 773 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 774 /* by older ones */
634 select (0, 0, 0, 0, &tv); 775 select (0, 0, 0, 0, &tv);
635#endif 776#endif
636 } 777 }
637} 778}
745} 886}
746 887
747/*****************************************************************************/ 888/*****************************************************************************/
748 889
749inline_speed void 890inline_speed void
750fd_event (EV_P_ int fd, int revents) 891fd_event_nc (EV_P_ int fd, int revents)
751{ 892{
752 ANFD *anfd = anfds + fd; 893 ANFD *anfd = anfds + fd;
753 ev_io *w; 894 ev_io *w;
754 895
755 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 896 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
759 if (ev) 900 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 901 ev_feed_event (EV_A_ (W)w, ev);
761 } 902 }
762} 903}
763 904
905/* do not submit kernel events for fds that have reify set */
906/* because that means they changed while we were polling for new events */
907inline_speed void
908fd_event (EV_P_ int fd, int revents)
909{
910 ANFD *anfd = anfds + fd;
911
912 if (expect_true (!anfd->reify))
913 fd_event_nc (EV_A_ fd, revents);
914}
915
764void 916void
765ev_feed_fd_event (EV_P_ int fd, int revents) 917ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 918{
767 if (fd >= 0 && fd < anfdmax) 919 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 920 fd_event_nc (EV_A_ fd, revents);
769} 921}
770 922
771/* make sure the external fd watch events are in-sync */ 923/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 924/* with the kernel/libev internal state */
773inline_size void 925inline_size void
788 940
789#if EV_SELECT_IS_WINSOCKET 941#if EV_SELECT_IS_WINSOCKET
790 if (events) 942 if (events)
791 { 943 {
792 unsigned long arg; 944 unsigned long arg;
793 #ifdef EV_FD_TO_WIN32_HANDLE
794 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 945 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
795 #else
796 anfd->handle = _get_osfhandle (fd);
797 #endif
798 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 946 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
799 } 947 }
800#endif 948#endif
801 949
802 { 950 {
845/* check whether the given fd is atcually valid, for error recovery */ 993/* check whether the given fd is atcually valid, for error recovery */
846inline_size int 994inline_size int
847fd_valid (int fd) 995fd_valid (int fd)
848{ 996{
849#ifdef _WIN32 997#ifdef _WIN32
850 return _get_osfhandle (fd) != -1; 998 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
851#else 999#else
852 return fcntl (fd, F_GETFD) != -1; 1000 return fcntl (fd, F_GETFD) != -1;
853#endif 1001#endif
854} 1002}
855 1003
873 1021
874 for (fd = anfdmax; fd--; ) 1022 for (fd = anfdmax; fd--; )
875 if (anfds [fd].events) 1023 if (anfds [fd].events)
876 { 1024 {
877 fd_kill (EV_A_ fd); 1025 fd_kill (EV_A_ fd);
878 return; 1026 break;
879 } 1027 }
880} 1028}
881 1029
882/* usually called after fork if backend needs to re-arm all fds from scratch */ 1030/* usually called after fork if backend needs to re-arm all fds from scratch */
883static void noinline 1031static void noinline
888 for (fd = 0; fd < anfdmax; ++fd) 1036 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 1037 if (anfds [fd].events)
890 { 1038 {
891 anfds [fd].events = 0; 1039 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 1040 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1041 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 1042 }
895} 1043}
896 1044
897/*****************************************************************************/ 1045/*****************************************************************************/
898 1046
973 1121
974 for (;;) 1122 for (;;)
975 { 1123 {
976 int c = k << 1; 1124 int c = k << 1;
977 1125
978 if (c > N + HEAP0 - 1) 1126 if (c >= N + HEAP0)
979 break; 1127 break;
980 1128
981 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1129 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
982 ? 1 : 0; 1130 ? 1 : 0;
983 1131
1019 1167
1020/* move an element suitably so it is in a correct place */ 1168/* move an element suitably so it is in a correct place */
1021inline_size void 1169inline_size void
1022adjustheap (ANHE *heap, int N, int k) 1170adjustheap (ANHE *heap, int N, int k)
1023{ 1171{
1024 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1172 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1025 upheap (heap, k); 1173 upheap (heap, k);
1026 else 1174 else
1027 downheap (heap, N, k); 1175 downheap (heap, N, k);
1028} 1176}
1029 1177
1042/*****************************************************************************/ 1190/*****************************************************************************/
1043 1191
1044/* associate signal watchers to a signal signal */ 1192/* associate signal watchers to a signal signal */
1045typedef struct 1193typedef struct
1046{ 1194{
1195 EV_ATOMIC_T pending;
1196#if EV_MULTIPLICITY
1197 EV_P;
1198#endif
1047 WL head; 1199 WL head;
1048 EV_ATOMIC_T gotsig;
1049} ANSIG; 1200} ANSIG;
1050 1201
1051static ANSIG *signals; 1202static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig;
1055 1203
1056/*****************************************************************************/ 1204/*****************************************************************************/
1057 1205
1058/* used to prepare libev internal fd's */ 1206/* used to prepare libev internal fd's */
1059/* this is not fork-safe */ 1207/* this is not fork-safe */
1060inline_speed void 1208inline_speed void
1061fd_intern (int fd) 1209fd_intern (int fd)
1062{ 1210{
1063#ifdef _WIN32 1211#ifdef _WIN32
1064 unsigned long arg = 1; 1212 unsigned long arg = 1;
1065 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1213 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1066#else 1214#else
1067 fcntl (fd, F_SETFD, FD_CLOEXEC); 1215 fcntl (fd, F_SETFD, FD_CLOEXEC);
1068 fcntl (fd, F_SETFL, O_NONBLOCK); 1216 fcntl (fd, F_SETFL, O_NONBLOCK);
1069#endif 1217#endif
1070} 1218}
1073evpipe_init (EV_P) 1221evpipe_init (EV_P)
1074{ 1222{
1075 if (!ev_is_active (&pipe_w)) 1223 if (!ev_is_active (&pipe_w))
1076 { 1224 {
1077#if EV_USE_EVENTFD 1225#if EV_USE_EVENTFD
1226 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1227 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1228 evfd = eventfd (0, 0);
1229
1230 if (evfd >= 0)
1079 { 1231 {
1080 evpipe [0] = -1; 1232 evpipe [0] = -1;
1081 fd_intern (evfd); 1233 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1234 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1235 }
1084 else 1236 else
1085#endif 1237#endif
1086 { 1238 {
1123/* called whenever the libev signal pipe */ 1275/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */ 1276/* got some events (signal, async) */
1125static void 1277static void
1126pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1127{ 1279{
1280 int i;
1281
1128#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1129 if (evfd >= 0) 1283 if (evfd >= 0)
1130 { 1284 {
1131 uint64_t counter; 1285 uint64_t counter;
1132 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
1136 { 1290 {
1137 char dummy; 1291 char dummy;
1138 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1139 } 1293 }
1140 1294
1141 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1142 { 1296 {
1143 int signum; 1297 sig_pending = 0;
1144 gotsig = 0;
1145 1298
1146 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1147 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1148 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1149 } 1302 }
1150 1303
1151#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1152 if (gotasync) 1305 if (async_pending)
1153 { 1306 {
1154 int i; 1307 async_pending = 0;
1155 gotasync = 0;
1156 1308
1157 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1158 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1159 { 1311 {
1160 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
1168 1320
1169static void 1321static void
1170ev_sighandler (int signum) 1322ev_sighandler (int signum)
1171{ 1323{
1172#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1174#endif 1326#endif
1175 1327
1176#if _WIN32 1328#ifdef _WIN32
1177 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1178#endif 1330#endif
1179 1331
1180 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1181 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1182} 1334}
1183 1335
1184void noinline 1336void noinline
1185ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1186{ 1338{
1187 WL w; 1339 WL w;
1188 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1189#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1190 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1347 /* it is permissible to try to feed a signal to the wrong loop */
1191#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1192 1349
1193 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return; 1351 return;
1352#endif
1197 1353
1198 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1199 1355
1200 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 1358}
1359
1360#if EV_USE_SIGNALFD
1361static void
1362sigfdcb (EV_P_ ev_io *iow, int revents)
1363{
1364 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1365
1366 for (;;)
1367 {
1368 ssize_t res = read (sigfd, si, sizeof (si));
1369
1370 /* not ISO-C, as res might be -1, but works with SuS */
1371 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1372 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1373
1374 if (res < (ssize_t)sizeof (si))
1375 break;
1376 }
1377}
1378#endif
1203 1379
1204/*****************************************************************************/ 1380/*****************************************************************************/
1205 1381
1206static WL childs [EV_PID_HASHSIZE]; 1382static WL childs [EV_PID_HASHSIZE];
1207 1383
1352ev_backend (EV_P) 1528ev_backend (EV_P)
1353{ 1529{
1354 return backend; 1530 return backend;
1355} 1531}
1356 1532
1533#if EV_MINIMAL < 2
1357unsigned int 1534unsigned int
1358ev_loop_count (EV_P) 1535ev_loop_count (EV_P)
1359{ 1536{
1360 return loop_count; 1537 return loop_count;
1361} 1538}
1362 1539
1540unsigned int
1541ev_loop_depth (EV_P)
1542{
1543 return loop_depth;
1544}
1545
1363void 1546void
1364ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1547ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1365{ 1548{
1366 io_blocktime = interval; 1549 io_blocktime = interval;
1367} 1550}
1369void 1552void
1370ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1553ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1371{ 1554{
1372 timeout_blocktime = interval; 1555 timeout_blocktime = interval;
1373} 1556}
1557
1558void
1559ev_set_userdata (EV_P_ void *data)
1560{
1561 userdata = data;
1562}
1563
1564void *
1565ev_userdata (EV_P)
1566{
1567 return userdata;
1568}
1569
1570void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1571{
1572 invoke_cb = invoke_pending_cb;
1573}
1574
1575void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1576{
1577 release_cb = release;
1578 acquire_cb = acquire;
1579}
1580#endif
1374 1581
1375/* initialise a loop structure, must be zero-initialised */ 1582/* initialise a loop structure, must be zero-initialised */
1376static void noinline 1583static void noinline
1377loop_init (EV_P_ unsigned int flags) 1584loop_init (EV_P_ unsigned int flags)
1378{ 1585{
1396 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1603 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1397 have_monotonic = 1; 1604 have_monotonic = 1;
1398 } 1605 }
1399#endif 1606#endif
1400 1607
1608 /* pid check not overridable via env */
1609#ifndef _WIN32
1610 if (flags & EVFLAG_FORKCHECK)
1611 curpid = getpid ();
1612#endif
1613
1614 if (!(flags & EVFLAG_NOENV)
1615 && !enable_secure ()
1616 && getenv ("LIBEV_FLAGS"))
1617 flags = atoi (getenv ("LIBEV_FLAGS"));
1618
1401 ev_rt_now = ev_time (); 1619 ev_rt_now = ev_time ();
1402 mn_now = get_clock (); 1620 mn_now = get_clock ();
1403 now_floor = mn_now; 1621 now_floor = mn_now;
1404 rtmn_diff = ev_rt_now - mn_now; 1622 rtmn_diff = ev_rt_now - mn_now;
1623#if EV_MINIMAL < 2
1624 invoke_cb = ev_invoke_pending;
1625#endif
1405 1626
1406 io_blocktime = 0.; 1627 io_blocktime = 0.;
1407 timeout_blocktime = 0.; 1628 timeout_blocktime = 0.;
1408 backend = 0; 1629 backend = 0;
1409 backend_fd = -1; 1630 backend_fd = -1;
1410 gotasync = 0; 1631 sig_pending = 0;
1632#if EV_ASYNC_ENABLE
1633 async_pending = 0;
1634#endif
1411#if EV_USE_INOTIFY 1635#if EV_USE_INOTIFY
1412 fs_fd = -2; 1636 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1413#endif 1637#endif
1414 1638#if EV_USE_SIGNALFD
1415 /* pid check not overridable via env */ 1639 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1416#ifndef _WIN32
1417 if (flags & EVFLAG_FORKCHECK)
1418 curpid = getpid ();
1419#endif 1640#endif
1420
1421 if (!(flags & EVFLAG_NOENV)
1422 && !enable_secure ()
1423 && getenv ("LIBEV_FLAGS"))
1424 flags = atoi (getenv ("LIBEV_FLAGS"));
1425 1641
1426 if (!(flags & 0x0000ffffU)) 1642 if (!(flags & 0x0000ffffU))
1427 flags |= ev_recommended_backends (); 1643 flags |= ev_recommended_backends ();
1428 1644
1429#if EV_USE_PORT 1645#if EV_USE_PORT
1455{ 1671{
1456 int i; 1672 int i;
1457 1673
1458 if (ev_is_active (&pipe_w)) 1674 if (ev_is_active (&pipe_w))
1459 { 1675 {
1460 ev_ref (EV_A); /* signal watcher */ 1676 /*ev_ref (EV_A);*/
1461 ev_io_stop (EV_A_ &pipe_w); 1677 /*ev_io_stop (EV_A_ &pipe_w);*/
1462 1678
1463#if EV_USE_EVENTFD 1679#if EV_USE_EVENTFD
1464 if (evfd >= 0) 1680 if (evfd >= 0)
1465 close (evfd); 1681 close (evfd);
1466#endif 1682#endif
1467 1683
1468 if (evpipe [0] >= 0) 1684 if (evpipe [0] >= 0)
1469 { 1685 {
1470 close (evpipe [0]); 1686 EV_WIN32_CLOSE_FD (evpipe [0]);
1471 close (evpipe [1]); 1687 EV_WIN32_CLOSE_FD (evpipe [1]);
1472 } 1688 }
1473 } 1689 }
1690
1691#if EV_USE_SIGNALFD
1692 if (ev_is_active (&sigfd_w))
1693 close (sigfd);
1694#endif
1474 1695
1475#if EV_USE_INOTIFY 1696#if EV_USE_INOTIFY
1476 if (fs_fd >= 0) 1697 if (fs_fd >= 0)
1477 close (fs_fd); 1698 close (fs_fd);
1478#endif 1699#endif
1502#if EV_IDLE_ENABLE 1723#if EV_IDLE_ENABLE
1503 array_free (idle, [i]); 1724 array_free (idle, [i]);
1504#endif 1725#endif
1505 } 1726 }
1506 1727
1507 ev_free (anfds); anfdmax = 0; 1728 ev_free (anfds); anfds = 0; anfdmax = 0;
1508 1729
1509 /* have to use the microsoft-never-gets-it-right macro */ 1730 /* have to use the microsoft-never-gets-it-right macro */
1510 array_free (rfeed, EMPTY); 1731 array_free (rfeed, EMPTY);
1511 array_free (fdchange, EMPTY); 1732 array_free (fdchange, EMPTY);
1512 array_free (timer, EMPTY); 1733 array_free (timer, EMPTY);
1547 1768
1548 if (ev_is_active (&pipe_w)) 1769 if (ev_is_active (&pipe_w))
1549 { 1770 {
1550 /* this "locks" the handlers against writing to the pipe */ 1771 /* this "locks" the handlers against writing to the pipe */
1551 /* while we modify the fd vars */ 1772 /* while we modify the fd vars */
1552 gotsig = 1; 1773 sig_pending = 1;
1553#if EV_ASYNC_ENABLE 1774#if EV_ASYNC_ENABLE
1554 gotasync = 1; 1775 async_pending = 1;
1555#endif 1776#endif
1556 1777
1557 ev_ref (EV_A); 1778 ev_ref (EV_A);
1558 ev_io_stop (EV_A_ &pipe_w); 1779 ev_io_stop (EV_A_ &pipe_w);
1559 1780
1562 close (evfd); 1783 close (evfd);
1563#endif 1784#endif
1564 1785
1565 if (evpipe [0] >= 0) 1786 if (evpipe [0] >= 0)
1566 { 1787 {
1567 close (evpipe [0]); 1788 EV_WIN32_CLOSE_FD (evpipe [0]);
1568 close (evpipe [1]); 1789 EV_WIN32_CLOSE_FD (evpipe [1]);
1569 } 1790 }
1570 1791
1571 evpipe_init (EV_A); 1792 evpipe_init (EV_A);
1572 /* now iterate over everything, in case we missed something */ 1793 /* now iterate over everything, in case we missed something */
1573 pipecb (EV_A_ &pipe_w, EV_READ); 1794 pipecb (EV_A_ &pipe_w, EV_READ);
1579#if EV_MULTIPLICITY 1800#if EV_MULTIPLICITY
1580 1801
1581struct ev_loop * 1802struct ev_loop *
1582ev_loop_new (unsigned int flags) 1803ev_loop_new (unsigned int flags)
1583{ 1804{
1584 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1805 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1585 1806
1586 memset (loop, 0, sizeof (struct ev_loop)); 1807 memset (EV_A, 0, sizeof (struct ev_loop));
1587
1588 loop_init (EV_A_ flags); 1808 loop_init (EV_A_ flags);
1589 1809
1590 if (ev_backend (EV_A)) 1810 if (ev_backend (EV_A))
1591 return loop; 1811 return EV_A;
1592 1812
1593 return 0; 1813 return 0;
1594} 1814}
1595 1815
1596void 1816void
1603void 1823void
1604ev_loop_fork (EV_P) 1824ev_loop_fork (EV_P)
1605{ 1825{
1606 postfork = 1; /* must be in line with ev_default_fork */ 1826 postfork = 1; /* must be in line with ev_default_fork */
1607} 1827}
1828#endif /* multiplicity */
1608 1829
1609#if EV_VERIFY 1830#if EV_VERIFY
1610static void noinline 1831static void noinline
1611verify_watcher (EV_P_ W w) 1832verify_watcher (EV_P_ W w)
1612{ 1833{
1640 verify_watcher (EV_A_ ws [cnt]); 1861 verify_watcher (EV_A_ ws [cnt]);
1641 } 1862 }
1642} 1863}
1643#endif 1864#endif
1644 1865
1866#if EV_MINIMAL < 2
1645void 1867void
1646ev_loop_verify (EV_P) 1868ev_loop_verify (EV_P)
1647{ 1869{
1648#if EV_VERIFY 1870#if EV_VERIFY
1649 int i; 1871 int i;
1698 assert (checkmax >= checkcnt); 1920 assert (checkmax >= checkcnt);
1699 array_verify (EV_A_ (W *)checks, checkcnt); 1921 array_verify (EV_A_ (W *)checks, checkcnt);
1700 1922
1701# if 0 1923# if 0
1702 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1924 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1703 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1925 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1704# endif
1705#endif 1926# endif
1927#endif
1706} 1928}
1707 1929#endif
1708#endif /* multiplicity */
1709 1930
1710#if EV_MULTIPLICITY 1931#if EV_MULTIPLICITY
1711struct ev_loop * 1932struct ev_loop *
1712ev_default_loop_init (unsigned int flags) 1933ev_default_loop_init (unsigned int flags)
1713#else 1934#else
1716#endif 1937#endif
1717{ 1938{
1718 if (!ev_default_loop_ptr) 1939 if (!ev_default_loop_ptr)
1719 { 1940 {
1720#if EV_MULTIPLICITY 1941#if EV_MULTIPLICITY
1721 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1942 EV_P = ev_default_loop_ptr = &default_loop_struct;
1722#else 1943#else
1723 ev_default_loop_ptr = 1; 1944 ev_default_loop_ptr = 1;
1724#endif 1945#endif
1725 1946
1726 loop_init (EV_A_ flags); 1947 loop_init (EV_A_ flags);
1743 1964
1744void 1965void
1745ev_default_destroy (void) 1966ev_default_destroy (void)
1746{ 1967{
1747#if EV_MULTIPLICITY 1968#if EV_MULTIPLICITY
1748 struct ev_loop *loop = ev_default_loop_ptr; 1969 EV_P = ev_default_loop_ptr;
1749#endif 1970#endif
1750 1971
1751 ev_default_loop_ptr = 0; 1972 ev_default_loop_ptr = 0;
1752 1973
1753#ifndef _WIN32 1974#ifndef _WIN32
1760 1981
1761void 1982void
1762ev_default_fork (void) 1983ev_default_fork (void)
1763{ 1984{
1764#if EV_MULTIPLICITY 1985#if EV_MULTIPLICITY
1765 struct ev_loop *loop = ev_default_loop_ptr; 1986 EV_P = ev_default_loop_ptr;
1766#endif 1987#endif
1767 1988
1768 postfork = 1; /* must be in line with ev_loop_fork */ 1989 postfork = 1; /* must be in line with ev_loop_fork */
1769} 1990}
1770 1991
1774ev_invoke (EV_P_ void *w, int revents) 1995ev_invoke (EV_P_ void *w, int revents)
1775{ 1996{
1776 EV_CB_INVOKE ((W)w, revents); 1997 EV_CB_INVOKE ((W)w, revents);
1777} 1998}
1778 1999
1779inline_speed void 2000unsigned int
1780call_pending (EV_P) 2001ev_pending_count (EV_P)
2002{
2003 int pri;
2004 unsigned int count = 0;
2005
2006 for (pri = NUMPRI; pri--; )
2007 count += pendingcnt [pri];
2008
2009 return count;
2010}
2011
2012void noinline
2013ev_invoke_pending (EV_P)
1781{ 2014{
1782 int pri; 2015 int pri;
1783 2016
1784 for (pri = NUMPRI; pri--; ) 2017 for (pri = NUMPRI; pri--; )
1785 while (pendingcnt [pri]) 2018 while (pendingcnt [pri])
1953 ANHE_at_cache (*he); 2186 ANHE_at_cache (*he);
1954 } 2187 }
1955} 2188}
1956 2189
1957/* fetch new monotonic and realtime times from the kernel */ 2190/* fetch new monotonic and realtime times from the kernel */
1958/* also detetc if there was a timejump, and act accordingly */ 2191/* also detect if there was a timejump, and act accordingly */
1959inline_speed void 2192inline_speed void
1960time_update (EV_P_ ev_tstamp max_block) 2193time_update (EV_P_ ev_tstamp max_block)
1961{ 2194{
1962#if EV_USE_MONOTONIC 2195#if EV_USE_MONOTONIC
1963 if (expect_true (have_monotonic)) 2196 if (expect_true (have_monotonic))
2020 2253
2021 mn_now = ev_rt_now; 2254 mn_now = ev_rt_now;
2022 } 2255 }
2023} 2256}
2024 2257
2025static int loop_done;
2026
2027void 2258void
2028ev_loop (EV_P_ int flags) 2259ev_loop (EV_P_ int flags)
2029{ 2260{
2261#if EV_MINIMAL < 2
2262 ++loop_depth;
2263#endif
2264
2265 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2266
2030 loop_done = EVUNLOOP_CANCEL; 2267 loop_done = EVUNLOOP_CANCEL;
2031 2268
2032 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2269 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2033 2270
2034 do 2271 do
2035 { 2272 {
2036#if EV_VERIFY >= 2 2273#if EV_VERIFY >= 2
2037 ev_loop_verify (EV_A); 2274 ev_loop_verify (EV_A);
2050 /* we might have forked, so queue fork handlers */ 2287 /* we might have forked, so queue fork handlers */
2051 if (expect_false (postfork)) 2288 if (expect_false (postfork))
2052 if (forkcnt) 2289 if (forkcnt)
2053 { 2290 {
2054 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2291 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2055 call_pending (EV_A); 2292 EV_INVOKE_PENDING;
2056 } 2293 }
2057#endif 2294#endif
2058 2295
2059 /* queue prepare watchers (and execute them) */ 2296 /* queue prepare watchers (and execute them) */
2060 if (expect_false (preparecnt)) 2297 if (expect_false (preparecnt))
2061 { 2298 {
2062 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2299 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2063 call_pending (EV_A); 2300 EV_INVOKE_PENDING;
2064 } 2301 }
2302
2303 if (expect_false (loop_done))
2304 break;
2065 2305
2066 /* we might have forked, so reify kernel state if necessary */ 2306 /* we might have forked, so reify kernel state if necessary */
2067 if (expect_false (postfork)) 2307 if (expect_false (postfork))
2068 loop_fork (EV_A); 2308 loop_fork (EV_A);
2069 2309
2075 ev_tstamp waittime = 0.; 2315 ev_tstamp waittime = 0.;
2076 ev_tstamp sleeptime = 0.; 2316 ev_tstamp sleeptime = 0.;
2077 2317
2078 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2318 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2079 { 2319 {
2320 /* remember old timestamp for io_blocktime calculation */
2321 ev_tstamp prev_mn_now = mn_now;
2322
2080 /* update time to cancel out callback processing overhead */ 2323 /* update time to cancel out callback processing overhead */
2081 time_update (EV_A_ 1e100); 2324 time_update (EV_A_ 1e100);
2082 2325
2083 waittime = MAX_BLOCKTIME; 2326 waittime = MAX_BLOCKTIME;
2084 2327
2094 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2337 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2095 if (waittime > to) waittime = to; 2338 if (waittime > to) waittime = to;
2096 } 2339 }
2097#endif 2340#endif
2098 2341
2342 /* don't let timeouts decrease the waittime below timeout_blocktime */
2099 if (expect_false (waittime < timeout_blocktime)) 2343 if (expect_false (waittime < timeout_blocktime))
2100 waittime = timeout_blocktime; 2344 waittime = timeout_blocktime;
2101 2345
2102 sleeptime = waittime - backend_fudge; 2346 /* extra check because io_blocktime is commonly 0 */
2103
2104 if (expect_true (sleeptime > io_blocktime)) 2347 if (expect_false (io_blocktime))
2105 sleeptime = io_blocktime;
2106
2107 if (sleeptime)
2108 { 2348 {
2349 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2350
2351 if (sleeptime > waittime - backend_fudge)
2352 sleeptime = waittime - backend_fudge;
2353
2354 if (expect_true (sleeptime > 0.))
2355 {
2109 ev_sleep (sleeptime); 2356 ev_sleep (sleeptime);
2110 waittime -= sleeptime; 2357 waittime -= sleeptime;
2358 }
2111 } 2359 }
2112 } 2360 }
2113 2361
2362#if EV_MINIMAL < 2
2114 ++loop_count; 2363 ++loop_count;
2364#endif
2365 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2115 backend_poll (EV_A_ waittime); 2366 backend_poll (EV_A_ waittime);
2367 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2116 2368
2117 /* update ev_rt_now, do magic */ 2369 /* update ev_rt_now, do magic */
2118 time_update (EV_A_ waittime + sleeptime); 2370 time_update (EV_A_ waittime + sleeptime);
2119 } 2371 }
2120 2372
2131 2383
2132 /* queue check watchers, to be executed first */ 2384 /* queue check watchers, to be executed first */
2133 if (expect_false (checkcnt)) 2385 if (expect_false (checkcnt))
2134 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2386 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2135 2387
2136 call_pending (EV_A); 2388 EV_INVOKE_PENDING;
2137 } 2389 }
2138 while (expect_true ( 2390 while (expect_true (
2139 activecnt 2391 activecnt
2140 && !loop_done 2392 && !loop_done
2141 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2393 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2142 )); 2394 ));
2143 2395
2144 if (loop_done == EVUNLOOP_ONE) 2396 if (loop_done == EVUNLOOP_ONE)
2145 loop_done = EVUNLOOP_CANCEL; 2397 loop_done = EVUNLOOP_CANCEL;
2398
2399#if EV_MINIMAL < 2
2400 --loop_depth;
2401#endif
2146} 2402}
2147 2403
2148void 2404void
2149ev_unloop (EV_P_ int how) 2405ev_unloop (EV_P_ int how)
2150{ 2406{
2201inline_size void 2457inline_size void
2202wlist_del (WL *head, WL elem) 2458wlist_del (WL *head, WL elem)
2203{ 2459{
2204 while (*head) 2460 while (*head)
2205 { 2461 {
2206 if (*head == elem) 2462 if (expect_true (*head == elem))
2207 { 2463 {
2208 *head = elem->next; 2464 *head = elem->next;
2209 return; 2465 break;
2210 } 2466 }
2211 2467
2212 head = &(*head)->next; 2468 head = &(*head)->next;
2213 } 2469 }
2214} 2470}
2242} 2498}
2243 2499
2244inline_size void 2500inline_size void
2245pri_adjust (EV_P_ W w) 2501pri_adjust (EV_P_ W w)
2246{ 2502{
2247 int pri = w->priority; 2503 int pri = ev_priority (w);
2248 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2504 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2249 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2505 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2250 w->priority = pri; 2506 ev_set_priority (w, pri);
2251} 2507}
2252 2508
2253inline_speed void 2509inline_speed void
2254ev_start (EV_P_ W w, int active) 2510ev_start (EV_P_ W w, int active)
2255{ 2511{
2274 2530
2275 if (expect_false (ev_is_active (w))) 2531 if (expect_false (ev_is_active (w)))
2276 return; 2532 return;
2277 2533
2278 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2534 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2279 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2535 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2280 2536
2281 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2282 2538
2283 ev_start (EV_A_ (W)w, 1); 2539 ev_start (EV_A_ (W)w, 1);
2284 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2540 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2285 wlist_add (&anfds[fd].head, (WL)w); 2541 wlist_add (&anfds[fd].head, (WL)w);
2286 2542
2287 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2543 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2288 w->events &= ~EV__IOFDSET; 2544 w->events &= ~EV__IOFDSET;
2289 2545
2290 EV_FREQUENT_CHECK; 2546 EV_FREQUENT_CHECK;
2291} 2547}
2292 2548
2354 timers [active] = timers [timercnt + HEAP0]; 2610 timers [active] = timers [timercnt + HEAP0];
2355 adjustheap (timers, timercnt, active); 2611 adjustheap (timers, timercnt, active);
2356 } 2612 }
2357 } 2613 }
2358 2614
2359 EV_FREQUENT_CHECK;
2360
2361 ev_at (w) -= mn_now; 2615 ev_at (w) -= mn_now;
2362 2616
2363 ev_stop (EV_A_ (W)w); 2617 ev_stop (EV_A_ (W)w);
2618
2619 EV_FREQUENT_CHECK;
2364} 2620}
2365 2621
2366void noinline 2622void noinline
2367ev_timer_again (EV_P_ ev_timer *w) 2623ev_timer_again (EV_P_ ev_timer *w)
2368{ 2624{
2386 } 2642 }
2387 2643
2388 EV_FREQUENT_CHECK; 2644 EV_FREQUENT_CHECK;
2389} 2645}
2390 2646
2647ev_tstamp
2648ev_timer_remaining (EV_P_ ev_timer *w)
2649{
2650 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2651}
2652
2391#if EV_PERIODIC_ENABLE 2653#if EV_PERIODIC_ENABLE
2392void noinline 2654void noinline
2393ev_periodic_start (EV_P_ ev_periodic *w) 2655ev_periodic_start (EV_P_ ev_periodic *w)
2394{ 2656{
2395 if (expect_false (ev_is_active (w))) 2657 if (expect_false (ev_is_active (w)))
2441 periodics [active] = periodics [periodiccnt + HEAP0]; 2703 periodics [active] = periodics [periodiccnt + HEAP0];
2442 adjustheap (periodics, periodiccnt, active); 2704 adjustheap (periodics, periodiccnt, active);
2443 } 2705 }
2444 } 2706 }
2445 2707
2446 EV_FREQUENT_CHECK;
2447
2448 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2709
2710 EV_FREQUENT_CHECK;
2449} 2711}
2450 2712
2451void noinline 2713void noinline
2452ev_periodic_again (EV_P_ ev_periodic *w) 2714ev_periodic_again (EV_P_ ev_periodic *w)
2453{ 2715{
2462#endif 2724#endif
2463 2725
2464void noinline 2726void noinline
2465ev_signal_start (EV_P_ ev_signal *w) 2727ev_signal_start (EV_P_ ev_signal *w)
2466{ 2728{
2467#if EV_MULTIPLICITY
2468 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2469#endif
2470 if (expect_false (ev_is_active (w))) 2729 if (expect_false (ev_is_active (w)))
2471 return; 2730 return;
2472 2731
2473 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2732 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2474 2733
2475 evpipe_init (EV_A); 2734#if EV_MULTIPLICITY
2735 assert (("libev: a signal must not be attached to two different loops",
2736 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2476 2737
2477 EV_FREQUENT_CHECK; 2738 signals [w->signum - 1].loop = EV_A;
2739#endif
2478 2740
2741 EV_FREQUENT_CHECK;
2742
2743#if EV_USE_SIGNALFD
2744 if (sigfd == -2)
2479 { 2745 {
2480#ifndef _WIN32 2746 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2481 sigset_t full, prev; 2747 if (sigfd < 0 && errno == EINVAL)
2482 sigfillset (&full); 2748 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2483 sigprocmask (SIG_SETMASK, &full, &prev);
2484#endif
2485 2749
2486 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2750 if (sigfd >= 0)
2751 {
2752 fd_intern (sigfd); /* doing it twice will not hurt */
2487 2753
2488#ifndef _WIN32 2754 sigemptyset (&sigfd_set);
2489 sigprocmask (SIG_SETMASK, &prev, 0); 2755
2490#endif 2756 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2757 ev_set_priority (&sigfd_w, EV_MAXPRI);
2758 ev_io_start (EV_A_ &sigfd_w);
2759 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2760 }
2491 } 2761 }
2762
2763 if (sigfd >= 0)
2764 {
2765 /* TODO: check .head */
2766 sigaddset (&sigfd_set, w->signum);
2767 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2768
2769 signalfd (sigfd, &sigfd_set, 0);
2770 }
2771#endif
2492 2772
2493 ev_start (EV_A_ (W)w, 1); 2773 ev_start (EV_A_ (W)w, 1);
2494 wlist_add (&signals [w->signum - 1].head, (WL)w); 2774 wlist_add (&signals [w->signum - 1].head, (WL)w);
2495 2775
2496 if (!((WL)w)->next) 2776 if (!((WL)w)->next)
2777# if EV_USE_SIGNALFD
2778 if (sigfd < 0) /*TODO*/
2779# endif
2497 { 2780 {
2498#if _WIN32 2781# ifdef _WIN32
2782 evpipe_init (EV_A);
2783
2499 signal (w->signum, ev_sighandler); 2784 signal (w->signum, ev_sighandler);
2500#else 2785# else
2501 struct sigaction sa; 2786 struct sigaction sa;
2787
2788 evpipe_init (EV_A);
2789
2502 sa.sa_handler = ev_sighandler; 2790 sa.sa_handler = ev_sighandler;
2503 sigfillset (&sa.sa_mask); 2791 sigfillset (&sa.sa_mask);
2504 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2792 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2505 sigaction (w->signum, &sa, 0); 2793 sigaction (w->signum, &sa, 0);
2794
2795 sigemptyset (&sa.sa_mask);
2796 sigaddset (&sa.sa_mask, w->signum);
2797 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2506#endif 2798#endif
2507 } 2799 }
2508 2800
2509 EV_FREQUENT_CHECK; 2801 EV_FREQUENT_CHECK;
2510} 2802}
2511 2803
2512void noinline 2804void noinline
2520 2812
2521 wlist_del (&signals [w->signum - 1].head, (WL)w); 2813 wlist_del (&signals [w->signum - 1].head, (WL)w);
2522 ev_stop (EV_A_ (W)w); 2814 ev_stop (EV_A_ (W)w);
2523 2815
2524 if (!signals [w->signum - 1].head) 2816 if (!signals [w->signum - 1].head)
2817 {
2818#if EV_MULTIPLICITY
2819 signals [w->signum - 1].loop = 0; /* unattach from signal */
2820#endif
2821#if EV_USE_SIGNALFD
2822 if (sigfd >= 0)
2823 {
2824 sigset_t ss;
2825
2826 sigemptyset (&ss);
2827 sigaddset (&ss, w->signum);
2828 sigdelset (&sigfd_set, w->signum);
2829
2830 signalfd (sigfd, &sigfd_set, 0);
2831 sigprocmask (SIG_UNBLOCK, &ss, 0);
2832 }
2833 else
2834#endif
2525 signal (w->signum, SIG_DFL); 2835 signal (w->signum, SIG_DFL);
2836 }
2526 2837
2527 EV_FREQUENT_CHECK; 2838 EV_FREQUENT_CHECK;
2528} 2839}
2529 2840
2530void 2841void
2571#define MIN_STAT_INTERVAL 0.1074891 2882#define MIN_STAT_INTERVAL 0.1074891
2572 2883
2573static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2884static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2574 2885
2575#if EV_USE_INOTIFY 2886#if EV_USE_INOTIFY
2576# define EV_INOTIFY_BUFSIZE 8192 2887
2888/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2889# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2577 2890
2578static void noinline 2891static void noinline
2579infy_add (EV_P_ ev_stat *w) 2892infy_add (EV_P_ ev_stat *w)
2580{ 2893{
2581 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); 2894 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);
2582 2895
2583 if (w->wd < 0) 2896 if (w->wd >= 0)
2897 {
2898 struct statfs sfs;
2899
2900 /* now local changes will be tracked by inotify, but remote changes won't */
2901 /* unless the filesystem is known to be local, we therefore still poll */
2902 /* also do poll on <2.6.25, but with normal frequency */
2903
2904 if (!fs_2625)
2905 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2906 else if (!statfs (w->path, &sfs)
2907 && (sfs.f_type == 0x1373 /* devfs */
2908 || sfs.f_type == 0xEF53 /* ext2/3 */
2909 || sfs.f_type == 0x3153464a /* jfs */
2910 || sfs.f_type == 0x52654973 /* reiser3 */
2911 || sfs.f_type == 0x01021994 /* tempfs */
2912 || sfs.f_type == 0x58465342 /* xfs */))
2913 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2914 else
2915 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2584 { 2916 }
2917 else
2918 {
2919 /* can't use inotify, continue to stat */
2585 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2920 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2586 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2587 2921
2588 /* monitor some parent directory for speedup hints */ 2922 /* if path is not there, monitor some parent directory for speedup hints */
2589 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2923 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2590 /* but an efficiency issue only */ 2924 /* but an efficiency issue only */
2591 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2925 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2592 { 2926 {
2593 char path [4096]; 2927 char path [4096];
2609 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2943 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2610 } 2944 }
2611 } 2945 }
2612 2946
2613 if (w->wd >= 0) 2947 if (w->wd >= 0)
2614 {
2615 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2948 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2616 2949
2617 /* now local changes will be tracked by inotify, but remote changes won't */ 2950 /* now re-arm timer, if required */
2618 /* unless the filesystem it known to be local, we therefore still poll */ 2951 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2619 /* also do poll on <2.6.25, but with normal frequency */
2620 struct statfs sfs;
2621
2622 if (fs_2625 && !statfs (w->path, &sfs))
2623 if (sfs.f_type == 0x1373 /* devfs */
2624 || sfs.f_type == 0xEF53 /* ext2/3 */
2625 || sfs.f_type == 0x3153464a /* jfs */
2626 || sfs.f_type == 0x52654973 /* reiser3 */
2627 || sfs.f_type == 0x01021994 /* tempfs */
2628 || sfs.f_type == 0x58465342 /* xfs */)
2629 return;
2630
2631 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2632 ev_timer_again (EV_A_ &w->timer); 2952 ev_timer_again (EV_A_ &w->timer);
2633 } 2953 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2634} 2954}
2635 2955
2636static void noinline 2956static void noinline
2637infy_del (EV_P_ ev_stat *w) 2957infy_del (EV_P_ ev_stat *w)
2638{ 2958{
2683 3003
2684static void 3004static void
2685infy_cb (EV_P_ ev_io *w, int revents) 3005infy_cb (EV_P_ ev_io *w, int revents)
2686{ 3006{
2687 char buf [EV_INOTIFY_BUFSIZE]; 3007 char buf [EV_INOTIFY_BUFSIZE];
2688 struct inotify_event *ev = (struct inotify_event *)buf;
2689 int ofs; 3008 int ofs;
2690 int len = read (fs_fd, buf, sizeof (buf)); 3009 int len = read (fs_fd, buf, sizeof (buf));
2691 3010
2692 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3011 for (ofs = 0; ofs < len; )
3012 {
3013 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2693 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3014 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3015 ofs += sizeof (struct inotify_event) + ev->len;
3016 }
3017}
3018
3019inline_size unsigned int
3020ev_linux_version (void)
3021{
3022 struct utsname buf;
3023 unsigned int v;
3024 int i;
3025 char *p = buf.release;
3026
3027 if (uname (&buf))
3028 return 0;
3029
3030 for (i = 3+1; --i; )
3031 {
3032 unsigned int c = 0;
3033
3034 for (;;)
3035 {
3036 if (*p >= '0' && *p <= '9')
3037 c = c * 10 + *p++ - '0';
3038 else
3039 {
3040 p += *p == '.';
3041 break;
3042 }
3043 }
3044
3045 v = (v << 8) | c;
3046 }
3047
3048 return v;
2694} 3049}
2695 3050
2696inline_size void 3051inline_size void
2697check_2625 (EV_P) 3052ev_check_2625 (EV_P)
2698{ 3053{
2699 /* kernels < 2.6.25 are borked 3054 /* kernels < 2.6.25 are borked
2700 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3055 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2701 */ 3056 */
2702 struct utsname buf; 3057 if (ev_linux_version () < 0x020619)
2703 int major, minor, micro;
2704
2705 if (uname (&buf))
2706 return; 3058 return;
2707 3059
2708 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2709 return;
2710
2711 if (major < 2
2712 || (major == 2 && minor < 6)
2713 || (major == 2 && minor == 6 && micro < 25))
2714 return;
2715
2716 fs_2625 = 1; 3060 fs_2625 = 1;
3061}
3062
3063inline_size int
3064infy_newfd (void)
3065{
3066#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3067 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3068 if (fd >= 0)
3069 return fd;
3070#endif
3071 return inotify_init ();
2717} 3072}
2718 3073
2719inline_size void 3074inline_size void
2720infy_init (EV_P) 3075infy_init (EV_P)
2721{ 3076{
2722 if (fs_fd != -2) 3077 if (fs_fd != -2)
2723 return; 3078 return;
2724 3079
2725 fs_fd = -1; 3080 fs_fd = -1;
2726 3081
2727 check_2625 (EV_A); 3082 ev_check_2625 (EV_A);
2728 3083
2729 fs_fd = inotify_init (); 3084 fs_fd = infy_newfd ();
2730 3085
2731 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2732 { 3087 {
3088 fd_intern (fs_fd);
2733 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3089 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2734 ev_set_priority (&fs_w, EV_MAXPRI); 3090 ev_set_priority (&fs_w, EV_MAXPRI);
2735 ev_io_start (EV_A_ &fs_w); 3091 ev_io_start (EV_A_ &fs_w);
3092 ev_unref (EV_A);
2736 } 3093 }
2737} 3094}
2738 3095
2739inline_size void 3096inline_size void
2740infy_fork (EV_P) 3097infy_fork (EV_P)
2742 int slot; 3099 int slot;
2743 3100
2744 if (fs_fd < 0) 3101 if (fs_fd < 0)
2745 return; 3102 return;
2746 3103
3104 ev_ref (EV_A);
3105 ev_io_stop (EV_A_ &fs_w);
2747 close (fs_fd); 3106 close (fs_fd);
2748 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
3108
3109 if (fs_fd >= 0)
3110 {
3111 fd_intern (fs_fd);
3112 ev_io_set (&fs_w, fs_fd, EV_READ);
3113 ev_io_start (EV_A_ &fs_w);
3114 ev_unref (EV_A);
3115 }
2749 3116
2750 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3117 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2751 { 3118 {
2752 WL w_ = fs_hash [slot].head; 3119 WL w_ = fs_hash [slot].head;
2753 fs_hash [slot].head = 0; 3120 fs_hash [slot].head = 0;
2760 w->wd = -1; 3127 w->wd = -1;
2761 3128
2762 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
2763 infy_add (EV_A_ w); /* re-add, no matter what */ 3130 infy_add (EV_A_ w); /* re-add, no matter what */
2764 else 3131 else
3132 {
3133 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3134 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2765 ev_timer_again (EV_A_ &w->timer); 3135 ev_timer_again (EV_A_ &w->timer);
3136 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3137 }
2766 } 3138 }
2767 } 3139 }
2768} 3140}
2769 3141
2770#endif 3142#endif
2787static void noinline 3159static void noinline
2788stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3160stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2789{ 3161{
2790 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3162 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2791 3163
2792 /* we copy this here each the time so that */ 3164 ev_statdata prev = w->attr;
2793 /* prev has the old value when the callback gets invoked */
2794 w->prev = w->attr;
2795 ev_stat_stat (EV_A_ w); 3165 ev_stat_stat (EV_A_ w);
2796 3166
2797 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3167 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2798 if ( 3168 if (
2799 w->prev.st_dev != w->attr.st_dev 3169 prev.st_dev != w->attr.st_dev
2800 || w->prev.st_ino != w->attr.st_ino 3170 || prev.st_ino != w->attr.st_ino
2801 || w->prev.st_mode != w->attr.st_mode 3171 || prev.st_mode != w->attr.st_mode
2802 || w->prev.st_nlink != w->attr.st_nlink 3172 || prev.st_nlink != w->attr.st_nlink
2803 || w->prev.st_uid != w->attr.st_uid 3173 || prev.st_uid != w->attr.st_uid
2804 || w->prev.st_gid != w->attr.st_gid 3174 || prev.st_gid != w->attr.st_gid
2805 || w->prev.st_rdev != w->attr.st_rdev 3175 || prev.st_rdev != w->attr.st_rdev
2806 || w->prev.st_size != w->attr.st_size 3176 || prev.st_size != w->attr.st_size
2807 || w->prev.st_atime != w->attr.st_atime 3177 || prev.st_atime != w->attr.st_atime
2808 || w->prev.st_mtime != w->attr.st_mtime 3178 || prev.st_mtime != w->attr.st_mtime
2809 || w->prev.st_ctime != w->attr.st_ctime 3179 || prev.st_ctime != w->attr.st_ctime
2810 ) { 3180 ) {
3181 /* we only update w->prev on actual differences */
3182 /* in case we test more often than invoke the callback, */
3183 /* to ensure that prev is always different to attr */
3184 w->prev = prev;
3185
2811 #if EV_USE_INOTIFY 3186 #if EV_USE_INOTIFY
2812 if (fs_fd >= 0) 3187 if (fs_fd >= 0)
2813 { 3188 {
2814 infy_del (EV_A_ w); 3189 infy_del (EV_A_ w);
2815 infy_add (EV_A_ w); 3190 infy_add (EV_A_ w);
2840 3215
2841 if (fs_fd >= 0) 3216 if (fs_fd >= 0)
2842 infy_add (EV_A_ w); 3217 infy_add (EV_A_ w);
2843 else 3218 else
2844#endif 3219#endif
3220 {
2845 ev_timer_again (EV_A_ &w->timer); 3221 ev_timer_again (EV_A_ &w->timer);
3222 ev_unref (EV_A);
3223 }
2846 3224
2847 ev_start (EV_A_ (W)w, 1); 3225 ev_start (EV_A_ (W)w, 1);
2848 3226
2849 EV_FREQUENT_CHECK; 3227 EV_FREQUENT_CHECK;
2850} 3228}
2859 EV_FREQUENT_CHECK; 3237 EV_FREQUENT_CHECK;
2860 3238
2861#if EV_USE_INOTIFY 3239#if EV_USE_INOTIFY
2862 infy_del (EV_A_ w); 3240 infy_del (EV_A_ w);
2863#endif 3241#endif
3242
3243 if (ev_is_active (&w->timer))
3244 {
3245 ev_ref (EV_A);
2864 ev_timer_stop (EV_A_ &w->timer); 3246 ev_timer_stop (EV_A_ &w->timer);
3247 }
2865 3248
2866 ev_stop (EV_A_ (W)w); 3249 ev_stop (EV_A_ (W)w);
2867 3250
2868 EV_FREQUENT_CHECK; 3251 EV_FREQUENT_CHECK;
2869} 3252}
3010embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3393embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3011{ 3394{
3012 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3395 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3013 3396
3014 { 3397 {
3015 struct ev_loop *loop = w->other; 3398 EV_P = w->other;
3016 3399
3017 while (fdchangecnt) 3400 while (fdchangecnt)
3018 { 3401 {
3019 fd_reify (EV_A); 3402 fd_reify (EV_A);
3020 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3403 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3028 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3411 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3029 3412
3030 ev_embed_stop (EV_A_ w); 3413 ev_embed_stop (EV_A_ w);
3031 3414
3032 { 3415 {
3033 struct ev_loop *loop = w->other; 3416 EV_P = w->other;
3034 3417
3035 ev_loop_fork (EV_A); 3418 ev_loop_fork (EV_A);
3036 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3419 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3037 } 3420 }
3038 3421
3052{ 3435{
3053 if (expect_false (ev_is_active (w))) 3436 if (expect_false (ev_is_active (w)))
3054 return; 3437 return;
3055 3438
3056 { 3439 {
3057 struct ev_loop *loop = w->other; 3440 EV_P = w->other;
3058 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3441 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3059 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3442 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3060 } 3443 }
3061 3444
3062 EV_FREQUENT_CHECK; 3445 EV_FREQUENT_CHECK;
3089 3472
3090 ev_io_stop (EV_A_ &w->io); 3473 ev_io_stop (EV_A_ &w->io);
3091 ev_prepare_stop (EV_A_ &w->prepare); 3474 ev_prepare_stop (EV_A_ &w->prepare);
3092 ev_fork_stop (EV_A_ &w->fork); 3475 ev_fork_stop (EV_A_ &w->fork);
3093 3476
3477 ev_stop (EV_A_ (W)w);
3478
3094 EV_FREQUENT_CHECK; 3479 EV_FREQUENT_CHECK;
3095} 3480}
3096#endif 3481#endif
3097 3482
3098#if EV_FORK_ENABLE 3483#if EV_FORK_ENABLE
3174 3559
3175void 3560void
3176ev_async_send (EV_P_ ev_async *w) 3561ev_async_send (EV_P_ ev_async *w)
3177{ 3562{
3178 w->sent = 1; 3563 w->sent = 1;
3179 evpipe_write (EV_A_ &gotasync); 3564 evpipe_write (EV_A_ &async_pending);
3180} 3565}
3181#endif 3566#endif
3182 3567
3183/*****************************************************************************/ 3568/*****************************************************************************/
3184 3569
3333 if (types & EV_CHECK) 3718 if (types & EV_CHECK)
3334 for (i = checkcnt; i--; ) 3719 for (i = checkcnt; i--; )
3335 cb (EV_A_ EV_CHECK, checks [i]); 3720 cb (EV_A_ EV_CHECK, checks [i]);
3336 3721
3337 if (types & EV_SIGNAL) 3722 if (types & EV_SIGNAL)
3338 for (i = 0; i < signalmax; ++i) 3723 for (i = 0; i < EV_NSIG - 1; ++i)
3339 for (wl = signals [i].head; wl; ) 3724 for (wl = signals [i].head; wl; )
3340 { 3725 {
3341 wn = wl->next; 3726 wn = wl->next;
3342 cb (EV_A_ EV_SIGNAL, wl); 3727 cb (EV_A_ EV_SIGNAL, wl);
3343 wl = wn; 3728 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines