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.313 by root, Wed Aug 19 23:44:51 2009 UTC

… …
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
… …
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
… …
176# endif 186# endif
177#endif 187#endif
178 188
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
180 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
181#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
184# else 221# else
185# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
264# else 301# else
265# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
266# endif 303# endif
267#endif 304#endif
268 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
269#if 0 /* debugging */ 314#if 0 /* debugging */
270# define EV_VERIFY 3 315# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
273#endif 318#endif
… …
280# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
281#endif 326#endif
282 327
283#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
285#endif 344#endif
286 345
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 347
289#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
… …
320 379
321#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 381# include <winsock.h>
323#endif 382#endif
324 383
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 384#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
337# ifdef __cplusplus 397# ifdef __cplusplus
338extern "C" { 398extern "C" {
339# endif 399# endif
340int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 401# ifdef __cplusplus
342} 402}
343# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
344#endif 408#endif
345 409
346/**/ 410/**/
347 411
348#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
384# define inline_speed static noinline 448# define inline_speed static noinline
385#else 449#else
386# define inline_speed static inline 450# define inline_speed static inline
387#endif 451#endif
388 452
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454
455#if EV_MINPRI == EV_MAXPRI
456# define ABSPRI(w) (((W)w), 0)
457#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
391 460
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
394 463
395typedef ev_watcher *W; 464typedef ev_watcher *W;
… …
407 476
408#if EV_USE_MONOTONIC 477#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 479#endif
411 480
481#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif
484#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
486#endif
487#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd)
489#endif
490
412#ifdef _WIN32 491#ifdef _WIN32
413# include "ev_win32.c" 492# include "ev_win32.c"
414#endif 493#endif
415 494
416/*****************************************************************************/ 495/*****************************************************************************/
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 557#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 558#define ev_free(ptr) ev_realloc ((ptr), 0)
480 559
481/*****************************************************************************/ 560/*****************************************************************************/
482 561
562/* set in reify when reification needed */
563#define EV_ANFD_REIFY 1
564
483/* file descriptor info structure */ 565/* file descriptor info structure */
484typedef struct 566typedef struct
485{ 567{
486 WL head; 568 WL head;
487 unsigned char events; /* the events watched for */ 569 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 570 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 */ 571 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 572 unsigned char unused;
491#if EV_USE_EPOLL 573#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 574 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 575#endif
… …
555 637
556 static int ev_default_loop_ptr; 638 static int ev_default_loop_ptr;
557 639
558#endif 640#endif
559 641
642#if EV_MINIMAL < 2
643# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
644# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
645# define EV_INVOKE_PENDING invoke_cb (EV_A)
646#else
647# define EV_RELEASE_CB (void)0
648# define EV_ACQUIRE_CB (void)0
649# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
650#endif
651
652#define EVUNLOOP_RECURSE 0x80
653
560/*****************************************************************************/ 654/*****************************************************************************/
561 655
656#ifndef EV_HAVE_EV_TIME
562ev_tstamp 657ev_tstamp
563ev_time (void) 658ev_time (void)
564{ 659{
565#if EV_USE_REALTIME 660#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 661 if (expect_true (have_realtime))
… …
573 668
574 struct timeval tv; 669 struct timeval tv;
575 gettimeofday (&tv, 0); 670 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 671 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 672}
673#endif
578 674
579inline_size ev_tstamp 675inline_size ev_tstamp
580get_clock (void) 676get_clock (void)
581{ 677{
582#if EV_USE_MONOTONIC 678#if EV_USE_MONOTONIC
… …
618 714
619 tv.tv_sec = (time_t)delay; 715 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 716 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 717
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 718 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 719 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 720 /* by older ones */
625 select (0, 0, 0, 0, &tv); 721 select (0, 0, 0, 0, &tv);
626#endif 722#endif
627 } 723 }
628} 724}
… …
736} 832}
737 833
738/*****************************************************************************/ 834/*****************************************************************************/
739 835
740inline_speed void 836inline_speed void
741fd_event (EV_P_ int fd, int revents) 837fd_event_nc (EV_P_ int fd, int revents)
742{ 838{
743 ANFD *anfd = anfds + fd; 839 ANFD *anfd = anfds + fd;
744 ev_io *w; 840 ev_io *w;
745 841
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 842 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
750 if (ev) 846 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 847 ev_feed_event (EV_A_ (W)w, ev);
752 } 848 }
753} 849}
754 850
851/* do not submit kernel events for fds that have reify set */
852/* because that means they changed while we were polling for new events */
853inline_speed void
854fd_event (EV_P_ int fd, int revents)
855{
856 ANFD *anfd = anfds + fd;
857
858 if (expect_true (!anfd->reify))
859 fd_event_nc (EV_A_ fd, revents);
860}
861
755void 862void
756ev_feed_fd_event (EV_P_ int fd, int revents) 863ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 864{
758 if (fd >= 0 && fd < anfdmax) 865 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 866 fd_event_nc (EV_A_ fd, revents);
760} 867}
761 868
762/* make sure the external fd watch events are in-sync */ 869/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 870/* with the kernel/libev internal state */
764inline_size void 871inline_size void
… …
779 886
780#if EV_SELECT_IS_WINSOCKET 887#if EV_SELECT_IS_WINSOCKET
781 if (events) 888 if (events)
782 { 889 {
783 unsigned long arg; 890 unsigned long arg;
784 #ifdef EV_FD_TO_WIN32_HANDLE
785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 891 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)); 892 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
790 } 893 }
791#endif 894#endif
792 895
793 { 896 {
… …
864 967
865 for (fd = anfdmax; fd--; ) 968 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 969 if (anfds [fd].events)
867 { 970 {
868 fd_kill (EV_A_ fd); 971 fd_kill (EV_A_ fd);
869 return; 972 break;
870 } 973 }
871} 974}
872 975
873/* usually called after fork if backend needs to re-arm all fds from scratch */ 976/* usually called after fork if backend needs to re-arm all fds from scratch */
874static void noinline 977static void noinline
… …
879 for (fd = 0; fd < anfdmax; ++fd) 982 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 983 if (anfds [fd].events)
881 { 984 {
882 anfds [fd].events = 0; 985 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 986 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 988 }
886} 989}
887 990
888/*****************************************************************************/ 991/*****************************************************************************/
889 992
… …
964 1067
965 for (;;) 1068 for (;;)
966 { 1069 {
967 int c = k << 1; 1070 int c = k << 1;
968 1071
969 if (c > N + HEAP0 - 1) 1072 if (c >= N + HEAP0)
970 break; 1073 break;
971 1074
972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1075 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
973 ? 1 : 0; 1076 ? 1 : 0;
974 1077
… …
1010 1113
1011/* move an element suitably so it is in a correct place */ 1114/* move an element suitably so it is in a correct place */
1012inline_size void 1115inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1116adjustheap (ANHE *heap, int N, int k)
1014{ 1117{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1118 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1016 upheap (heap, k); 1119 upheap (heap, k);
1017 else 1120 else
1018 downheap (heap, N, k); 1121 downheap (heap, N, k);
1019} 1122}
1020 1123
… …
1033/*****************************************************************************/ 1136/*****************************************************************************/
1034 1137
1035/* associate signal watchers to a signal signal */ 1138/* associate signal watchers to a signal signal */
1036typedef struct 1139typedef struct
1037{ 1140{
1141 EV_ATOMIC_T pending;
1142#if EV_MULTIPLICITY
1143 EV_P;
1144#endif
1038 WL head; 1145 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1146} ANSIG;
1041 1147
1042static ANSIG *signals; 1148static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1149
1047/*****************************************************************************/ 1150/*****************************************************************************/
1048 1151
1049/* used to prepare libev internal fd's */ 1152/* used to prepare libev internal fd's */
1050/* this is not fork-safe */ 1153/* this is not fork-safe */
… …
1064evpipe_init (EV_P) 1167evpipe_init (EV_P)
1065{ 1168{
1066 if (!ev_is_active (&pipe_w)) 1169 if (!ev_is_active (&pipe_w))
1067 { 1170 {
1068#if EV_USE_EVENTFD 1171#if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1174 evfd = eventfd (0, 0);
1175
1176 if (evfd >= 0)
1070 { 1177 {
1071 evpipe [0] = -1; 1178 evpipe [0] = -1;
1072 fd_intern (evfd); 1179 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1180 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1181 }
1075 else 1182 else
1076#endif 1183#endif
1077 { 1184 {
… …
1114/* called whenever the libev signal pipe */ 1221/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1222/* got some events (signal, async) */
1116static void 1223static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1224pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1225{
1226 int i;
1227
1119#if EV_USE_EVENTFD 1228#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1229 if (evfd >= 0)
1121 { 1230 {
1122 uint64_t counter; 1231 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1232 read (evfd, &counter, sizeof (uint64_t));
… …
1127 { 1236 {
1128 char dummy; 1237 char dummy;
1129 read (evpipe [0], &dummy, 1); 1238 read (evpipe [0], &dummy, 1);
1130 } 1239 }
1131 1240
1132 if (gotsig && ev_is_default_loop (EV_A)) 1241 if (sig_pending)
1133 { 1242 {
1134 int signum; 1243 sig_pending = 0;
1135 gotsig = 0;
1136 1244
1137 for (signum = signalmax; signum--; ) 1245 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1246 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1247 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1248 }
1141 1249
1142#if EV_ASYNC_ENABLE 1250#if EV_ASYNC_ENABLE
1143 if (gotasync) 1251 if (async_pending)
1144 { 1252 {
1145 int i; 1253 async_pending = 0;
1146 gotasync = 0;
1147 1254
1148 for (i = asynccnt; i--; ) 1255 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1256 if (asyncs [i]->sent)
1150 { 1257 {
1151 asyncs [i]->sent = 0; 1258 asyncs [i]->sent = 0;
… …
1159 1266
1160static void 1267static void
1161ev_sighandler (int signum) 1268ev_sighandler (int signum)
1162{ 1269{
1163#if EV_MULTIPLICITY 1270#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1271 EV_P = signals [signum - 1].loop;
1165#endif 1272#endif
1166 1273
1167#if _WIN32 1274#if _WIN32
1168 signal (signum, ev_sighandler); 1275 signal (signum, ev_sighandler);
1169#endif 1276#endif
1170 1277
1171 signals [signum - 1].gotsig = 1; 1278 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1279 evpipe_write (EV_A_ &sig_pending);
1173} 1280}
1174 1281
1175void noinline 1282void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1283ev_feed_signal_event (EV_P_ int signum)
1177{ 1284{
1178 WL w; 1285 WL w;
1179 1286
1287 if (expect_false (signum <= 0 || signum > EV_NSIG))
1288 return;
1289
1290 --signum;
1291
1180#if EV_MULTIPLICITY 1292#if EV_MULTIPLICITY
1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1293 /* it is permissible to try to feed a signal to the wrong loop */
1182#endif 1294 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1295
1184 --signum; 1296 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1297 return;
1298#endif
1188 1299
1189 signals [signum].gotsig = 0; 1300 signals [signum].pending = 0;
1190 1301
1191 for (w = signals [signum].head; w; w = w->next) 1302 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1303 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1304}
1305
1306#if EV_USE_SIGNALFD
1307static void
1308sigfdcb (EV_P_ ev_io *iow, int revents)
1309{
1310 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1311
1312 for (;;)
1313 {
1314 ssize_t res = read (sigfd, si, sizeof (si));
1315
1316 /* not ISO-C, as res might be -1, but works with SuS */
1317 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1318 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1319
1320 if (res < (ssize_t)sizeof (si))
1321 break;
1322 }
1323}
1324#endif
1194 1325
1195/*****************************************************************************/ 1326/*****************************************************************************/
1196 1327
1197static WL childs [EV_PID_HASHSIZE]; 1328static WL childs [EV_PID_HASHSIZE];
1198 1329
… …
1343ev_backend (EV_P) 1474ev_backend (EV_P)
1344{ 1475{
1345 return backend; 1476 return backend;
1346} 1477}
1347 1478
1479#if EV_MINIMAL < 2
1348unsigned int 1480unsigned int
1349ev_loop_count (EV_P) 1481ev_loop_count (EV_P)
1350{ 1482{
1351 return loop_count; 1483 return loop_count;
1352} 1484}
1353 1485
1486unsigned int
1487ev_loop_depth (EV_P)
1488{
1489 return loop_depth;
1490}
1491
1354void 1492void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1494{
1357 io_blocktime = interval; 1495 io_blocktime = interval;
1358} 1496}
… …
1360void 1498void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1499ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1500{
1363 timeout_blocktime = interval; 1501 timeout_blocktime = interval;
1364} 1502}
1503
1504void
1505ev_set_userdata (EV_P_ void *data)
1506{
1507 userdata = data;
1508}
1509
1510void *
1511ev_userdata (EV_P)
1512{
1513 return userdata;
1514}
1515
1516void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1517{
1518 invoke_cb = invoke_pending_cb;
1519}
1520
1521void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1522{
1523 release_cb = release;
1524 acquire_cb = acquire;
1525}
1526#endif
1365 1527
1366/* initialise a loop structure, must be zero-initialised */ 1528/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1529static void noinline
1368loop_init (EV_P_ unsigned int flags) 1530loop_init (EV_P_ unsigned int flags)
1369{ 1531{
… …
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1549 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1550 have_monotonic = 1;
1389 } 1551 }
1390#endif 1552#endif
1391 1553
1554 /* pid check not overridable via env */
1555#ifndef _WIN32
1556 if (flags & EVFLAG_FORKCHECK)
1557 curpid = getpid ();
1558#endif
1559
1560 if (!(flags & EVFLAG_NOENV)
1561 && !enable_secure ()
1562 && getenv ("LIBEV_FLAGS"))
1563 flags = atoi (getenv ("LIBEV_FLAGS"));
1564
1392 ev_rt_now = ev_time (); 1565 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1566 mn_now = get_clock ();
1394 now_floor = mn_now; 1567 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1568 rtmn_diff = ev_rt_now - mn_now;
1569#if EV_MINIMAL < 2
1570 invoke_cb = ev_invoke_pending;
1571#endif
1396 1572
1397 io_blocktime = 0.; 1573 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1574 timeout_blocktime = 0.;
1399 backend = 0; 1575 backend = 0;
1400 backend_fd = -1; 1576 backend_fd = -1;
1401 gotasync = 0; 1577 sig_pending = 0;
1578#if EV_ASYNC_ENABLE
1579 async_pending = 0;
1580#endif
1402#if EV_USE_INOTIFY 1581#if EV_USE_INOTIFY
1403 fs_fd = -2; 1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1583#endif
1405 1584#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1586#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1587
1417 if (!(flags & 0x0000ffffU)) 1588 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1589 flags |= ev_recommended_backends ();
1419 1590
1420#if EV_USE_PORT 1591#if EV_USE_PORT
… …
1446{ 1617{
1447 int i; 1618 int i;
1448 1619
1449 if (ev_is_active (&pipe_w)) 1620 if (ev_is_active (&pipe_w))
1450 { 1621 {
1451 ev_ref (EV_A); /* signal watcher */ 1622 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1623 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1624
1454#if EV_USE_EVENTFD 1625#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1626 if (evfd >= 0)
1456 close (evfd); 1627 close (evfd);
1457#endif 1628#endif
1458 1629
1459 if (evpipe [0] >= 0) 1630 if (evpipe [0] >= 0)
1460 { 1631 {
1461 close (evpipe [0]); 1632 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1633 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1634 }
1464 } 1635 }
1636
1637#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd);
1644 }
1645#endif
1465 1646
1466#if EV_USE_INOTIFY 1647#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1648 if (fs_fd >= 0)
1468 close (fs_fd); 1649 close (fs_fd);
1469#endif 1650#endif
… …
1493#if EV_IDLE_ENABLE 1674#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1675 array_free (idle, [i]);
1495#endif 1676#endif
1496 } 1677 }
1497 1678
1498 ev_free (anfds); anfdmax = 0; 1679 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1680
1500 /* have to use the microsoft-never-gets-it-right macro */ 1681 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1682 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1683 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1684 array_free (timer, EMPTY);
… …
1538 1719
1539 if (ev_is_active (&pipe_w)) 1720 if (ev_is_active (&pipe_w))
1540 { 1721 {
1541 /* this "locks" the handlers against writing to the pipe */ 1722 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1723 /* while we modify the fd vars */
1543 gotsig = 1; 1724 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1725#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1726 async_pending = 1;
1546#endif 1727#endif
1547 1728
1548 ev_ref (EV_A); 1729 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1730 ev_io_stop (EV_A_ &pipe_w);
1550 1731
… …
1553 close (evfd); 1734 close (evfd);
1554#endif 1735#endif
1555 1736
1556 if (evpipe [0] >= 0) 1737 if (evpipe [0] >= 0)
1557 { 1738 {
1558 close (evpipe [0]); 1739 EV_WIN32_CLOSE_FD (evpipe [0]);
1559 close (evpipe [1]); 1740 EV_WIN32_CLOSE_FD (evpipe [1]);
1560 } 1741 }
1561 1742
1562 evpipe_init (EV_A); 1743 evpipe_init (EV_A);
1563 /* now iterate over everything, in case we missed something */ 1744 /* now iterate over everything, in case we missed something */
1564 pipecb (EV_A_ &pipe_w, EV_READ); 1745 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1570#if EV_MULTIPLICITY 1751#if EV_MULTIPLICITY
1571 1752
1572struct ev_loop * 1753struct ev_loop *
1573ev_loop_new (unsigned int flags) 1754ev_loop_new (unsigned int flags)
1574{ 1755{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1756 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1757
1577 memset (loop, 0, sizeof (struct ev_loop)); 1758 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1759 loop_init (EV_A_ flags);
1580 1760
1581 if (ev_backend (EV_A)) 1761 if (ev_backend (EV_A))
1582 return loop; 1762 return EV_A;
1583 1763
1584 return 0; 1764 return 0;
1585} 1765}
1586 1766
1587void 1767void
… …
1594void 1774void
1595ev_loop_fork (EV_P) 1775ev_loop_fork (EV_P)
1596{ 1776{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1777 postfork = 1; /* must be in line with ev_default_fork */
1598} 1778}
1779#endif /* multiplicity */
1599 1780
1600#if EV_VERIFY 1781#if EV_VERIFY
1601static void noinline 1782static void noinline
1602verify_watcher (EV_P_ W w) 1783verify_watcher (EV_P_ W w)
1603{ 1784{
… …
1631 verify_watcher (EV_A_ ws [cnt]); 1812 verify_watcher (EV_A_ ws [cnt]);
1632 } 1813 }
1633} 1814}
1634#endif 1815#endif
1635 1816
1817#if EV_MINIMAL < 2
1636void 1818void
1637ev_loop_verify (EV_P) 1819ev_loop_verify (EV_P)
1638{ 1820{
1639#if EV_VERIFY 1821#if EV_VERIFY
1640 int i; 1822 int i;
… …
1689 assert (checkmax >= checkcnt); 1871 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1872 array_verify (EV_A_ (W *)checks, checkcnt);
1691 1873
1692# if 0 1874# if 0
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1875 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1695# endif 1877# endif
1696#endif 1878#endif
1697} 1879}
1698 1880#endif
1699#endif /* multiplicity */
1700 1881
1701#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1702struct ev_loop * 1883struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1884ev_default_loop_init (unsigned int flags)
1704#else 1885#else
… …
1707#endif 1888#endif
1708{ 1889{
1709 if (!ev_default_loop_ptr) 1890 if (!ev_default_loop_ptr)
1710 { 1891 {
1711#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1893 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 1894#else
1714 ev_default_loop_ptr = 1; 1895 ev_default_loop_ptr = 1;
1715#endif 1896#endif
1716 1897
1717 loop_init (EV_A_ flags); 1898 loop_init (EV_A_ flags);
… …
1734 1915
1735void 1916void
1736ev_default_destroy (void) 1917ev_default_destroy (void)
1737{ 1918{
1738#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 1920 EV_P = ev_default_loop_ptr;
1740#endif 1921#endif
1741 1922
1742 ev_default_loop_ptr = 0; 1923 ev_default_loop_ptr = 0;
1743 1924
1744#ifndef _WIN32 1925#ifndef _WIN32
… …
1751 1932
1752void 1933void
1753ev_default_fork (void) 1934ev_default_fork (void)
1754{ 1935{
1755#if EV_MULTIPLICITY 1936#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 1937 EV_P = ev_default_loop_ptr;
1757#endif 1938#endif
1758 1939
1759 postfork = 1; /* must be in line with ev_loop_fork */ 1940 postfork = 1; /* must be in line with ev_loop_fork */
1760} 1941}
1761 1942
… …
1765ev_invoke (EV_P_ void *w, int revents) 1946ev_invoke (EV_P_ void *w, int revents)
1766{ 1947{
1767 EV_CB_INVOKE ((W)w, revents); 1948 EV_CB_INVOKE ((W)w, revents);
1768} 1949}
1769 1950
1770inline_speed void 1951unsigned int
1771call_pending (EV_P) 1952ev_pending_count (EV_P)
1953{
1954 int pri;
1955 unsigned int count = 0;
1956
1957 for (pri = NUMPRI; pri--; )
1958 count += pendingcnt [pri];
1959
1960 return count;
1961}
1962
1963void noinline
1964ev_invoke_pending (EV_P)
1772{ 1965{
1773 int pri; 1966 int pri;
1774 1967
1775 for (pri = NUMPRI; pri--; ) 1968 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 1969 while (pendingcnt [pri])
… …
1948/* fetch new monotonic and realtime times from the kernel */ 2141/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2142/* also detetc if there was a timejump, and act accordingly */
1950inline_speed void 2143inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2144time_update (EV_P_ ev_tstamp max_block)
1952{ 2145{
1953 int i;
1954
1955#if EV_USE_MONOTONIC 2146#if EV_USE_MONOTONIC
1956 if (expect_true (have_monotonic)) 2147 if (expect_true (have_monotonic))
1957 { 2148 {
2149 int i;
1958 ev_tstamp odiff = rtmn_diff; 2150 ev_tstamp odiff = rtmn_diff;
1959 2151
1960 mn_now = get_clock (); 2152 mn_now = get_clock ();
1961 2153
1962 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2154 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
2012 2204
2013 mn_now = ev_rt_now; 2205 mn_now = ev_rt_now;
2014 } 2206 }
2015} 2207}
2016 2208
2017static int loop_done;
2018
2019void 2209void
2020ev_loop (EV_P_ int flags) 2210ev_loop (EV_P_ int flags)
2021{ 2211{
2212#if EV_MINIMAL < 2
2213 ++loop_depth;
2214#endif
2215
2216 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2217
2022 loop_done = EVUNLOOP_CANCEL; 2218 loop_done = EVUNLOOP_CANCEL;
2023 2219
2024 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2220 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2025 2221
2026 do 2222 do
2027 { 2223 {
2028#if EV_VERIFY >= 2 2224#if EV_VERIFY >= 2
2029 ev_loop_verify (EV_A); 2225 ev_loop_verify (EV_A);
… …
2042 /* we might have forked, so queue fork handlers */ 2238 /* we might have forked, so queue fork handlers */
2043 if (expect_false (postfork)) 2239 if (expect_false (postfork))
2044 if (forkcnt) 2240 if (forkcnt)
2045 { 2241 {
2046 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2047 call_pending (EV_A); 2243 EV_INVOKE_PENDING;
2048 } 2244 }
2049#endif 2245#endif
2050 2246
2051 /* queue prepare watchers (and execute them) */ 2247 /* queue prepare watchers (and execute them) */
2052 if (expect_false (preparecnt)) 2248 if (expect_false (preparecnt))
2053 { 2249 {
2054 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2055 call_pending (EV_A); 2251 EV_INVOKE_PENDING;
2056 } 2252 }
2253
2254 if (expect_false (loop_done))
2255 break;
2057 2256
2058 /* we might have forked, so reify kernel state if necessary */ 2257 /* we might have forked, so reify kernel state if necessary */
2059 if (expect_false (postfork)) 2258 if (expect_false (postfork))
2060 loop_fork (EV_A); 2259 loop_fork (EV_A);
2061 2260
… …
2067 ev_tstamp waittime = 0.; 2266 ev_tstamp waittime = 0.;
2068 ev_tstamp sleeptime = 0.; 2267 ev_tstamp sleeptime = 0.;
2069 2268
2070 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2269 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2071 { 2270 {
2271 /* remember old timestamp for io_blocktime calculation */
2272 ev_tstamp prev_mn_now = mn_now;
2273
2072 /* update time to cancel out callback processing overhead */ 2274 /* update time to cancel out callback processing overhead */
2073 time_update (EV_A_ 1e100); 2275 time_update (EV_A_ 1e100);
2074 2276
2075 waittime = MAX_BLOCKTIME; 2277 waittime = MAX_BLOCKTIME;
2076 2278
… …
2086 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2288 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2087 if (waittime > to) waittime = to; 2289 if (waittime > to) waittime = to;
2088 } 2290 }
2089#endif 2291#endif
2090 2292
2293 /* don't let timeouts decrease the waittime below timeout_blocktime */
2091 if (expect_false (waittime < timeout_blocktime)) 2294 if (expect_false (waittime < timeout_blocktime))
2092 waittime = timeout_blocktime; 2295 waittime = timeout_blocktime;
2093 2296
2094 sleeptime = waittime - backend_fudge; 2297 /* extra check because io_blocktime is commonly 0 */
2095
2096 if (expect_true (sleeptime > io_blocktime)) 2298 if (expect_false (io_blocktime))
2097 sleeptime = io_blocktime;
2098
2099 if (sleeptime)
2100 { 2299 {
2300 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2301
2302 if (sleeptime > waittime - backend_fudge)
2303 sleeptime = waittime - backend_fudge;
2304
2305 if (expect_true (sleeptime > 0.))
2306 {
2101 ev_sleep (sleeptime); 2307 ev_sleep (sleeptime);
2102 waittime -= sleeptime; 2308 waittime -= sleeptime;
2309 }
2103 } 2310 }
2104 } 2311 }
2105 2312
2313#if EV_MINIMAL < 2
2106 ++loop_count; 2314 ++loop_count;
2315#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2107 backend_poll (EV_A_ waittime); 2317 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2108 2319
2109 /* update ev_rt_now, do magic */ 2320 /* update ev_rt_now, do magic */
2110 time_update (EV_A_ waittime + sleeptime); 2321 time_update (EV_A_ waittime + sleeptime);
2111 } 2322 }
2112 2323
… …
2123 2334
2124 /* queue check watchers, to be executed first */ 2335 /* queue check watchers, to be executed first */
2125 if (expect_false (checkcnt)) 2336 if (expect_false (checkcnt))
2126 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2127 2338
2128 call_pending (EV_A); 2339 EV_INVOKE_PENDING;
2129 } 2340 }
2130 while (expect_true ( 2341 while (expect_true (
2131 activecnt 2342 activecnt
2132 && !loop_done 2343 && !loop_done
2133 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2344 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2134 )); 2345 ));
2135 2346
2136 if (loop_done == EVUNLOOP_ONE) 2347 if (loop_done == EVUNLOOP_ONE)
2137 loop_done = EVUNLOOP_CANCEL; 2348 loop_done = EVUNLOOP_CANCEL;
2349
2350#if EV_MINIMAL < 2
2351 --loop_depth;
2352#endif
2138} 2353}
2139 2354
2140void 2355void
2141ev_unloop (EV_P_ int how) 2356ev_unloop (EV_P_ int how)
2142{ 2357{
… …
2193inline_size void 2408inline_size void
2194wlist_del (WL *head, WL elem) 2409wlist_del (WL *head, WL elem)
2195{ 2410{
2196 while (*head) 2411 while (*head)
2197 { 2412 {
2198 if (*head == elem) 2413 if (expect_true (*head == elem))
2199 { 2414 {
2200 *head = elem->next; 2415 *head = elem->next;
2201 return; 2416 break;
2202 } 2417 }
2203 2418
2204 head = &(*head)->next; 2419 head = &(*head)->next;
2205 } 2420 }
2206} 2421}
… …
2234} 2449}
2235 2450
2236inline_size void 2451inline_size void
2237pri_adjust (EV_P_ W w) 2452pri_adjust (EV_P_ W w)
2238{ 2453{
2239 int pri = w->priority; 2454 int pri = ev_priority (w);
2240 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2455 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2241 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2456 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2242 w->priority = pri; 2457 ev_set_priority (w, pri);
2243} 2458}
2244 2459
2245inline_speed void 2460inline_speed void
2246ev_start (EV_P_ W w, int active) 2461ev_start (EV_P_ W w, int active)
2247{ 2462{
… …
2274 2489
2275 ev_start (EV_A_ (W)w, 1); 2490 ev_start (EV_A_ (W)w, 1);
2276 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2277 wlist_add (&anfds[fd].head, (WL)w); 2492 wlist_add (&anfds[fd].head, (WL)w);
2278 2493
2279 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2494 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2280 w->events &= ~EV__IOFDSET; 2495 w->events &= ~EV__IOFDSET;
2281 2496
2282 EV_FREQUENT_CHECK; 2497 EV_FREQUENT_CHECK;
2283} 2498}
2284 2499
… …
2378 } 2593 }
2379 2594
2380 EV_FREQUENT_CHECK; 2595 EV_FREQUENT_CHECK;
2381} 2596}
2382 2597
2598ev_tstamp
2599ev_timer_remaining (EV_P_ ev_timer *w)
2600{
2601 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2602}
2603
2383#if EV_PERIODIC_ENABLE 2604#if EV_PERIODIC_ENABLE
2384void noinline 2605void noinline
2385ev_periodic_start (EV_P_ ev_periodic *w) 2606ev_periodic_start (EV_P_ ev_periodic *w)
2386{ 2607{
2387 if (expect_false (ev_is_active (w))) 2608 if (expect_false (ev_is_active (w)))
… …
2454#endif 2675#endif
2455 2676
2456void noinline 2677void noinline
2457ev_signal_start (EV_P_ ev_signal *w) 2678ev_signal_start (EV_P_ ev_signal *w)
2458{ 2679{
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))) 2680 if (expect_false (ev_is_active (w)))
2463 return; 2681 return;
2464 2682
2465 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2683 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2466 2684
2467 evpipe_init (EV_A); 2685#if EV_MULTIPLICITY
2686 assert (("libev: a signal must not be attached to two different loops",
2687 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2468 2688
2469 EV_FREQUENT_CHECK; 2689 signals [w->signum - 1].loop = EV_A;
2690#endif
2470 2691
2692 EV_FREQUENT_CHECK;
2693
2694#if EV_USE_SIGNALFD
2695 if (sigfd == -2)
2471 { 2696 {
2472#ifndef _WIN32 2697 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2473 sigset_t full, prev; 2698 if (sigfd < 0 && errno == EINVAL)
2474 sigfillset (&full); 2699 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2475 sigprocmask (SIG_SETMASK, &full, &prev);
2476#endif
2477 2700
2478 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2701 if (sigfd >= 0)
2702 {
2703 fd_intern (sigfd); /* doing it twice will not hurt */
2479 2704
2480#ifndef _WIN32 2705 sigemptyset (&sigfd_set);
2481 sigprocmask (SIG_SETMASK, &prev, 0); 2706
2482#endif 2707 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2708 ev_set_priority (&sigfd_w, EV_MAXPRI);
2709 ev_io_start (EV_A_ &sigfd_w);
2710 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2711 }
2483 } 2712 }
2713
2714 if (sigfd >= 0)
2715 {
2716 /* TODO: check .head */
2717 sigaddset (&sigfd_set, w->signum);
2718 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2719
2720 signalfd (sigfd, &sigfd_set, 0);
2721 }
2722#endif
2484 2723
2485 ev_start (EV_A_ (W)w, 1); 2724 ev_start (EV_A_ (W)w, 1);
2486 wlist_add (&signals [w->signum - 1].head, (WL)w); 2725 wlist_add (&signals [w->signum - 1].head, (WL)w);
2487 2726
2488 if (!((WL)w)->next) 2727 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/
2730# endif
2489 { 2731 {
2490#if _WIN32 2732# if _WIN32
2491 signal (w->signum, ev_sighandler); 2733 signal (w->signum, ev_sighandler);
2492#else 2734# else
2493 struct sigaction sa; 2735 struct sigaction sa;
2736
2737 evpipe_init (EV_A);
2738
2494 sa.sa_handler = ev_sighandler; 2739 sa.sa_handler = ev_sighandler;
2495 sigfillset (&sa.sa_mask); 2740 sigfillset (&sa.sa_mask);
2496 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2741 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2497 sigaction (w->signum, &sa, 0); 2742 sigaction (w->signum, &sa, 0);
2743
2744 sigemptyset (&sa.sa_mask);
2745 sigaddset (&sa.sa_mask, w->signum);
2746 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2498#endif 2747#endif
2499 } 2748 }
2500 2749
2501 EV_FREQUENT_CHECK; 2750 EV_FREQUENT_CHECK;
2502} 2751}
2503 2752
2504void noinline 2753void noinline
… …
2512 2761
2513 wlist_del (&signals [w->signum - 1].head, (WL)w); 2762 wlist_del (&signals [w->signum - 1].head, (WL)w);
2514 ev_stop (EV_A_ (W)w); 2763 ev_stop (EV_A_ (W)w);
2515 2764
2516 if (!signals [w->signum - 1].head) 2765 if (!signals [w->signum - 1].head)
2766 {
2767#if EV_MULTIPLICITY
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif
2770#if EV_USE_SIGNALFD
2771 if (sigfd >= 0)
2772 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2774 sigdelset (&sigfd_set, w->signum);
2775 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2777 /*TODO: maybe unblock signal? */
2778 }
2779 else
2780#endif
2517 signal (w->signum, SIG_DFL); 2781 signal (w->signum, SIG_DFL);
2782 }
2518 2783
2519 EV_FREQUENT_CHECK; 2784 EV_FREQUENT_CHECK;
2520} 2785}
2521 2786
2522void 2787void
… …
2602 } 2867 }
2603 } 2868 }
2604 2869
2605 if (w->wd >= 0) 2870 if (w->wd >= 0)
2606 { 2871 {
2872 struct statfs sfs;
2873
2607 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2608 2875
2609 /* now local changes will be tracked by inotify, but remote changes won't */ 2876 /* now local changes will be tracked by inotify, but remote changes won't */
2610 /* unless the filesystem it known to be local, we therefore still poll */ 2877 /* unless the filesystem it known to be local, we therefore still poll */
2611 /* also do poll on <2.6.25, but with normal frequency */ 2878 /* also do poll on <2.6.25, but with normal frequency */
2612 struct statfs sfs;
2613 2879
2614 if (fs_2625 && !statfs (w->path, &sfs)) 2880 if (fs_2625 && !statfs (w->path, &sfs))
2615 if (sfs.f_type == 0x1373 /* devfs */ 2881 if (sfs.f_type == 0x1373 /* devfs */
2616 || sfs.f_type == 0xEF53 /* ext2/3 */ 2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2617 || sfs.f_type == 0x3153464a /* jfs */ 2883 || sfs.f_type == 0x3153464a /* jfs */
… …
3002embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3003{ 3269{
3004 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3270 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3005 3271
3006 { 3272 {
3007 struct ev_loop *loop = w->other; 3273 EV_P = w->other;
3008 3274
3009 while (fdchangecnt) 3275 while (fdchangecnt)
3010 { 3276 {
3011 fd_reify (EV_A); 3277 fd_reify (EV_A);
3012 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3020 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3286 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3021 3287
3022 ev_embed_stop (EV_A_ w); 3288 ev_embed_stop (EV_A_ w);
3023 3289
3024 { 3290 {
3025 struct ev_loop *loop = w->other; 3291 EV_P = w->other;
3026 3292
3027 ev_loop_fork (EV_A); 3293 ev_loop_fork (EV_A);
3028 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3029 } 3295 }
3030 3296
… …
3044{ 3310{
3045 if (expect_false (ev_is_active (w))) 3311 if (expect_false (ev_is_active (w)))
3046 return; 3312 return;
3047 3313
3048 { 3314 {
3049 struct ev_loop *loop = w->other; 3315 EV_P = w->other;
3050 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3316 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3051 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3317 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3052 } 3318 }
3053 3319
3054 EV_FREQUENT_CHECK; 3320 EV_FREQUENT_CHECK;
… …
3166 3432
3167void 3433void
3168ev_async_send (EV_P_ ev_async *w) 3434ev_async_send (EV_P_ ev_async *w)
3169{ 3435{
3170 w->sent = 1; 3436 w->sent = 1;
3171 evpipe_write (EV_A_ &gotasync); 3437 evpipe_write (EV_A_ &async_pending);
3172} 3438}
3173#endif 3439#endif
3174 3440
3175/*****************************************************************************/ 3441/*****************************************************************************/
3176 3442
… …
3325 if (types & EV_CHECK) 3591 if (types & EV_CHECK)
3326 for (i = checkcnt; i--; ) 3592 for (i = checkcnt; i--; )
3327 cb (EV_A_ EV_CHECK, checks [i]); 3593 cb (EV_A_ EV_CHECK, checks [i]);
3328 3594
3329 if (types & EV_SIGNAL) 3595 if (types & EV_SIGNAL)
3330 for (i = 0; i < signalmax; ++i) 3596 for (i = 0; i < EV_NSIG - 1; ++i)
3331 for (wl = signals [i].head; wl; ) 3597 for (wl = signals [i].head; wl; )
3332 { 3598 {
3333 wn = wl->next; 3599 wn = wl->next;
3334 cb (EV_A_ EV_SIGNAL, wl); 3600 cb (EV_A_ EV_SIGNAL, wl);
3335 wl = wn; 3601 wl = wn;

Diff Legend

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