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

Comparing libev/ev.c (file contents):
Revision 1.295 by root, Wed Jul 8 04:29:31 2009 UTC vs.
Revision 1.327 by root, Sun Feb 14 19:09:04 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
… …
178# endif 188# endif
179#endif 189#endif
180 190
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 191/* this block tries to deduce configuration from header-defined symbols and defaults */
182 192
193/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG)
195/* use what's provided */
196#elif defined (NSIG)
197# define EV_NSIG (NSIG)
198#elif defined(_NSIG)
199# define EV_NSIG (_NSIG)
200#elif defined (SIGMAX)
201# define EV_NSIG (SIGMAX+1)
202#elif defined (SIG_MAX)
203# define EV_NSIG (SIG_MAX+1)
204#elif defined (_SIG_MAX)
205# define EV_NSIG (_SIG_MAX+1)
206#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else
215# error "unable to find value for NSIG, please report"
216/* to make it compile regardless, just remove the above line */
217# define EV_NSIG 65
218#endif
219
183#ifndef EV_USE_CLOCK_SYSCALL 220#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 221# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 222# define EV_USE_CLOCK_SYSCALL 1
186# else 223# else
187# define EV_USE_CLOCK_SYSCALL 0 224# define EV_USE_CLOCK_SYSCALL 0
… …
263#ifndef EV_USE_EVENTFD 300#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 301# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 302# define EV_USE_EVENTFD 1
266# else 303# else
267# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
305# endif
306#endif
307
308#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1
311# else
312# define EV_USE_SIGNALFD 0
268# endif 313# endif
269#endif 314#endif
270 315
271#if 0 /* debugging */ 316#if 0 /* debugging */
272# define EV_VERIFY 3 317# define EV_VERIFY 3
… …
300# endif 345# endif
301#endif 346#endif
302 347
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
355
305#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
308#endif 359#endif
309 360
… …
339#endif 390#endif
340 391
341#if EV_USE_EVENTFD 392#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 393/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 394# include <stdint.h>
395# ifndef EFD_NONBLOCK
396# define EFD_NONBLOCK O_NONBLOCK
397# endif
398# ifndef EFD_CLOEXEC
399# ifdef O_CLOEXEC
400# define EFD_CLOEXEC O_CLOEXEC
401# else
402# define EFD_CLOEXEC 02000000
403# endif
404# endif
344# ifdef __cplusplus 405# ifdef __cplusplus
345extern "C" { 406extern "C" {
346# endif 407# endif
347int eventfd (unsigned int initval, int flags); 408int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 409# ifdef __cplusplus
349} 410}
350# endif 411# endif
351#endif 412#endif
413
414#if EV_USE_SIGNALFD
415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
352 442
353/**/ 443/**/
354 444
355#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
368 */ 458 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 460
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
372#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 462#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 463
375#if __GNUC__ >= 4 464#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
378#else 467#else
… …
419 508
420#if EV_USE_MONOTONIC 509#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 511#endif
423 512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
521#endif
522
424#ifdef _WIN32 523#ifdef _WIN32
425# include "ev_win32.c" 524# include "ev_win32.c"
426#endif 525#endif
427 526
428/*****************************************************************************/ 527/*****************************************************************************/
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 589#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 590#define ev_free(ptr) ev_realloc ((ptr), 0)
492 591
493/*****************************************************************************/ 592/*****************************************************************************/
494 593
594/* set in reify when reification needed */
595#define EV_ANFD_REIFY 1
596
495/* file descriptor info structure */ 597/* file descriptor info structure */
496typedef struct 598typedef struct
497{ 599{
498 WL head; 600 WL head;
499 unsigned char events; /* the events watched for */ 601 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 602 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 603 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 604 unsigned char unused;
503#if EV_USE_EPOLL 605#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 606 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 607#endif
… …
567 669
568 static int ev_default_loop_ptr; 670 static int ev_default_loop_ptr;
569 671
570#endif 672#endif
571 673
674#if EV_MINIMAL < 2
675# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
676# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
677# define EV_INVOKE_PENDING invoke_cb (EV_A)
678#else
679# define EV_RELEASE_CB (void)0
680# define EV_ACQUIRE_CB (void)0
681# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
682#endif
683
684#define EVUNLOOP_RECURSE 0x80
685
572/*****************************************************************************/ 686/*****************************************************************************/
573 687
574#ifndef EV_HAVE_EV_TIME 688#ifndef EV_HAVE_EV_TIME
575ev_tstamp 689ev_tstamp
576ev_time (void) 690ev_time (void)
… …
632 746
633 tv.tv_sec = (time_t)delay; 747 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 748 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 749
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 750 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 751 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 752 /* by older ones */
639 select (0, 0, 0, 0, &tv); 753 select (0, 0, 0, 0, &tv);
640#endif 754#endif
641 } 755 }
642} 756}
… …
750} 864}
751 865
752/*****************************************************************************/ 866/*****************************************************************************/
753 867
754inline_speed void 868inline_speed void
755fd_event (EV_P_ int fd, int revents) 869fd_event_nc (EV_P_ int fd, int revents)
756{ 870{
757 ANFD *anfd = anfds + fd; 871 ANFD *anfd = anfds + fd;
758 ev_io *w; 872 ev_io *w;
759 873
760 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 874 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
764 if (ev) 878 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 879 ev_feed_event (EV_A_ (W)w, ev);
766 } 880 }
767} 881}
768 882
883/* do not submit kernel events for fds that have reify set */
884/* because that means they changed while we were polling for new events */
885inline_speed void
886fd_event (EV_P_ int fd, int revents)
887{
888 ANFD *anfd = anfds + fd;
889
890 if (expect_true (!anfd->reify))
891 fd_event_nc (EV_A_ fd, revents);
892}
893
769void 894void
770ev_feed_fd_event (EV_P_ int fd, int revents) 895ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 896{
772 if (fd >= 0 && fd < anfdmax) 897 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 898 fd_event_nc (EV_A_ fd, revents);
774} 899}
775 900
776/* make sure the external fd watch events are in-sync */ 901/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 902/* with the kernel/libev internal state */
778inline_size void 903inline_size void
… …
793 918
794#if EV_SELECT_IS_WINSOCKET 919#if EV_SELECT_IS_WINSOCKET
795 if (events) 920 if (events)
796 { 921 {
797 unsigned long arg; 922 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 923 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
800 #else
801 anfd->handle = _get_osfhandle (fd);
802 #endif
803 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 924 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
804 } 925 }
805#endif 926#endif
806 927
807 { 928 {
… …
850/* check whether the given fd is atcually valid, for error recovery */ 971/* check whether the given fd is atcually valid, for error recovery */
851inline_size int 972inline_size int
852fd_valid (int fd) 973fd_valid (int fd)
853{ 974{
854#ifdef _WIN32 975#ifdef _WIN32
855 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
856#else 977#else
857 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
858#endif 979#endif
859} 980}
860 981
… …
878 999
879 for (fd = anfdmax; fd--; ) 1000 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 1001 if (anfds [fd].events)
881 { 1002 {
882 fd_kill (EV_A_ fd); 1003 fd_kill (EV_A_ fd);
883 return; 1004 break;
884 } 1005 }
885} 1006}
886 1007
887/* usually called after fork if backend needs to re-arm all fds from scratch */ 1008/* usually called after fork if backend needs to re-arm all fds from scratch */
888static void noinline 1009static void noinline
… …
893 for (fd = 0; fd < anfdmax; ++fd) 1014 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 1015 if (anfds [fd].events)
895 { 1016 {
896 anfds [fd].events = 0; 1017 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 1018 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1019 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 1020 }
900} 1021}
901 1022
902/*****************************************************************************/ 1023/*****************************************************************************/
903 1024
… …
978 1099
979 for (;;) 1100 for (;;)
980 { 1101 {
981 int c = k << 1; 1102 int c = k << 1;
982 1103
983 if (c > N + HEAP0 - 1) 1104 if (c >= N + HEAP0)
984 break; 1105 break;
985 1106
986 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1107 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
987 ? 1 : 0; 1108 ? 1 : 0;
988 1109
… …
1024 1145
1025/* move an element suitably so it is in a correct place */ 1146/* move an element suitably so it is in a correct place */
1026inline_size void 1147inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1148adjustheap (ANHE *heap, int N, int k)
1028{ 1149{
1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1150 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1030 upheap (heap, k); 1151 upheap (heap, k);
1031 else 1152 else
1032 downheap (heap, N, k); 1153 downheap (heap, N, k);
1033} 1154}
1034 1155
… …
1047/*****************************************************************************/ 1168/*****************************************************************************/
1048 1169
1049/* associate signal watchers to a signal signal */ 1170/* associate signal watchers to a signal signal */
1050typedef struct 1171typedef struct
1051{ 1172{
1173 EV_ATOMIC_T pending;
1174#if EV_MULTIPLICITY
1175 EV_P;
1176#endif
1052 WL head; 1177 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1178} ANSIG;
1055 1179
1056static ANSIG *signals; 1180static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1181
1061/*****************************************************************************/ 1182/*****************************************************************************/
1062 1183
1063/* used to prepare libev internal fd's */ 1184/* used to prepare libev internal fd's */
1064/* this is not fork-safe */ 1185/* this is not fork-safe */
1065inline_speed void 1186inline_speed void
1066fd_intern (int fd) 1187fd_intern (int fd)
1067{ 1188{
1068#ifdef _WIN32 1189#ifdef _WIN32
1069 unsigned long arg = 1; 1190 unsigned long arg = 1;
1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1071#else 1192#else
1072 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
1073 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1074#endif 1195#endif
1075} 1196}
… …
1078evpipe_init (EV_P) 1199evpipe_init (EV_P)
1079{ 1200{
1080 if (!ev_is_active (&pipe_w)) 1201 if (!ev_is_active (&pipe_w))
1081 { 1202 {
1082#if EV_USE_EVENTFD 1203#if EV_USE_EVENTFD
1204 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1205 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1206 evfd = eventfd (0, 0);
1207
1208 if (evfd >= 0)
1084 { 1209 {
1085 evpipe [0] = -1; 1210 evpipe [0] = -1;
1086 fd_intern (evfd); 1211 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1212 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1213 }
1089 else 1214 else
1090#endif 1215#endif
1091 { 1216 {
… …
1128/* called whenever the libev signal pipe */ 1253/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1254/* got some events (signal, async) */
1130static void 1255static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1256pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1257{
1258 int i;
1259
1133#if EV_USE_EVENTFD 1260#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1261 if (evfd >= 0)
1135 { 1262 {
1136 uint64_t counter; 1263 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1264 read (evfd, &counter, sizeof (uint64_t));
… …
1141 { 1268 {
1142 char dummy; 1269 char dummy;
1143 read (evpipe [0], &dummy, 1); 1270 read (evpipe [0], &dummy, 1);
1144 } 1271 }
1145 1272
1146 if (gotsig && ev_is_default_loop (EV_A)) 1273 if (sig_pending)
1147 { 1274 {
1148 int signum; 1275 sig_pending = 0;
1149 gotsig = 0;
1150 1276
1151 for (signum = signalmax; signum--; ) 1277 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1278 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1279 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1280 }
1155 1281
1156#if EV_ASYNC_ENABLE 1282#if EV_ASYNC_ENABLE
1157 if (gotasync) 1283 if (async_pending)
1158 { 1284 {
1159 int i; 1285 async_pending = 0;
1160 gotasync = 0;
1161 1286
1162 for (i = asynccnt; i--; ) 1287 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1288 if (asyncs [i]->sent)
1164 { 1289 {
1165 asyncs [i]->sent = 0; 1290 asyncs [i]->sent = 0;
… …
1173 1298
1174static void 1299static void
1175ev_sighandler (int signum) 1300ev_sighandler (int signum)
1176{ 1301{
1177#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1303 EV_P = signals [signum - 1].loop;
1179#endif 1304#endif
1180 1305
1181#if _WIN32 1306#ifdef _WIN32
1182 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1183#endif 1308#endif
1184 1309
1185 signals [signum - 1].gotsig = 1; 1310 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1311 evpipe_write (EV_A_ &sig_pending);
1187} 1312}
1188 1313
1189void noinline 1314void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1315ev_feed_signal_event (EV_P_ int signum)
1191{ 1316{
1192 WL w; 1317 WL w;
1193 1318
1319 if (expect_false (signum <= 0 || signum > EV_NSIG))
1320 return;
1321
1322 --signum;
1323
1194#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1325 /* it is permissible to try to feed a signal to the wrong loop */
1196#endif 1326 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1327
1198 --signum; 1328 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1329 return;
1330#endif
1202 1331
1203 signals [signum].gotsig = 0; 1332 signals [signum].pending = 0;
1204 1333
1205 for (w = signals [signum].head; w; w = w->next) 1334 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1335 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1336}
1337
1338#if EV_USE_SIGNALFD
1339static void
1340sigfdcb (EV_P_ ev_io *iow, int revents)
1341{
1342 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1343
1344 for (;;)
1345 {
1346 ssize_t res = read (sigfd, si, sizeof (si));
1347
1348 /* not ISO-C, as res might be -1, but works with SuS */
1349 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1350 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1351
1352 if (res < (ssize_t)sizeof (si))
1353 break;
1354 }
1355}
1356#endif
1208 1357
1209/*****************************************************************************/ 1358/*****************************************************************************/
1210 1359
1211static WL childs [EV_PID_HASHSIZE]; 1360static WL childs [EV_PID_HASHSIZE];
1212 1361
… …
1357ev_backend (EV_P) 1506ev_backend (EV_P)
1358{ 1507{
1359 return backend; 1508 return backend;
1360} 1509}
1361 1510
1511#if EV_MINIMAL < 2
1362unsigned int 1512unsigned int
1363ev_loop_count (EV_P) 1513ev_loop_count (EV_P)
1364{ 1514{
1365 return loop_count; 1515 return loop_count;
1366} 1516}
… …
1380void 1530void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1531ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1532{
1383 timeout_blocktime = interval; 1533 timeout_blocktime = interval;
1384} 1534}
1535
1536void
1537ev_set_userdata (EV_P_ void *data)
1538{
1539 userdata = data;
1540}
1541
1542void *
1543ev_userdata (EV_P)
1544{
1545 return userdata;
1546}
1547
1548void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1549{
1550 invoke_cb = invoke_pending_cb;
1551}
1552
1553void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1554{
1555 release_cb = release;
1556 acquire_cb = acquire;
1557}
1558#endif
1385 1559
1386/* initialise a loop structure, must be zero-initialised */ 1560/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1561static void noinline
1388loop_init (EV_P_ unsigned int flags) 1562loop_init (EV_P_ unsigned int flags)
1389{ 1563{
… …
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1581 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1582 have_monotonic = 1;
1409 } 1583 }
1410#endif 1584#endif
1411 1585
1586 /* pid check not overridable via env */
1587#ifndef _WIN32
1588 if (flags & EVFLAG_FORKCHECK)
1589 curpid = getpid ();
1590#endif
1591
1592 if (!(flags & EVFLAG_NOENV)
1593 && !enable_secure ()
1594 && getenv ("LIBEV_FLAGS"))
1595 flags = atoi (getenv ("LIBEV_FLAGS"));
1596
1412 ev_rt_now = ev_time (); 1597 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1598 mn_now = get_clock ();
1414 now_floor = mn_now; 1599 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1600 rtmn_diff = ev_rt_now - mn_now;
1601#if EV_MINIMAL < 2
1602 invoke_cb = ev_invoke_pending;
1603#endif
1416 1604
1417 io_blocktime = 0.; 1605 io_blocktime = 0.;
1418 timeout_blocktime = 0.; 1606 timeout_blocktime = 0.;
1419 backend = 0; 1607 backend = 0;
1420 backend_fd = -1; 1608 backend_fd = -1;
1421 gotasync = 0; 1609 sig_pending = 0;
1610#if EV_ASYNC_ENABLE
1611 async_pending = 0;
1612#endif
1422#if EV_USE_INOTIFY 1613#if EV_USE_INOTIFY
1423 fs_fd = -2; 1614 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1424#endif 1615#endif
1425 1616#if EV_USE_SIGNALFD
1426 /* pid check not overridable via env */ 1617 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1427#ifndef _WIN32
1428 if (flags & EVFLAG_FORKCHECK)
1429 curpid = getpid ();
1430#endif 1618#endif
1431
1432 if (!(flags & EVFLAG_NOENV)
1433 && !enable_secure ()
1434 && getenv ("LIBEV_FLAGS"))
1435 flags = atoi (getenv ("LIBEV_FLAGS"));
1436 1619
1437 if (!(flags & 0x0000ffffU)) 1620 if (!(flags & 0x0000ffffU))
1438 flags |= ev_recommended_backends (); 1621 flags |= ev_recommended_backends ();
1439 1622
1440#if EV_USE_PORT 1623#if EV_USE_PORT
… …
1466{ 1649{
1467 int i; 1650 int i;
1468 1651
1469 if (ev_is_active (&pipe_w)) 1652 if (ev_is_active (&pipe_w))
1470 { 1653 {
1471 ev_ref (EV_A); /* signal watcher */ 1654 /*ev_ref (EV_A);*/
1472 ev_io_stop (EV_A_ &pipe_w); 1655 /*ev_io_stop (EV_A_ &pipe_w);*/
1473 1656
1474#if EV_USE_EVENTFD 1657#if EV_USE_EVENTFD
1475 if (evfd >= 0) 1658 if (evfd >= 0)
1476 close (evfd); 1659 close (evfd);
1477#endif 1660#endif
1478 1661
1479 if (evpipe [0] >= 0) 1662 if (evpipe [0] >= 0)
1480 { 1663 {
1481 close (evpipe [0]); 1664 EV_WIN32_CLOSE_FD (evpipe [0]);
1482 close (evpipe [1]); 1665 EV_WIN32_CLOSE_FD (evpipe [1]);
1483 } 1666 }
1484 } 1667 }
1668
1669#if EV_USE_SIGNALFD
1670 if (ev_is_active (&sigfd_w))
1671 close (sigfd);
1672#endif
1485 1673
1486#if EV_USE_INOTIFY 1674#if EV_USE_INOTIFY
1487 if (fs_fd >= 0) 1675 if (fs_fd >= 0)
1488 close (fs_fd); 1676 close (fs_fd);
1489#endif 1677#endif
… …
1513#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
1514 array_free (idle, [i]); 1702 array_free (idle, [i]);
1515#endif 1703#endif
1516 } 1704 }
1517 1705
1518 ev_free (anfds); anfdmax = 0; 1706 ev_free (anfds); anfds = 0; anfdmax = 0;
1519 1707
1520 /* have to use the microsoft-never-gets-it-right macro */ 1708 /* have to use the microsoft-never-gets-it-right macro */
1521 array_free (rfeed, EMPTY); 1709 array_free (rfeed, EMPTY);
1522 array_free (fdchange, EMPTY); 1710 array_free (fdchange, EMPTY);
1523 array_free (timer, EMPTY); 1711 array_free (timer, EMPTY);
… …
1558 1746
1559 if (ev_is_active (&pipe_w)) 1747 if (ev_is_active (&pipe_w))
1560 { 1748 {
1561 /* this "locks" the handlers against writing to the pipe */ 1749 /* this "locks" the handlers against writing to the pipe */
1562 /* while we modify the fd vars */ 1750 /* while we modify the fd vars */
1563 gotsig = 1; 1751 sig_pending = 1;
1564#if EV_ASYNC_ENABLE 1752#if EV_ASYNC_ENABLE
1565 gotasync = 1; 1753 async_pending = 1;
1566#endif 1754#endif
1567 1755
1568 ev_ref (EV_A); 1756 ev_ref (EV_A);
1569 ev_io_stop (EV_A_ &pipe_w); 1757 ev_io_stop (EV_A_ &pipe_w);
1570 1758
… …
1573 close (evfd); 1761 close (evfd);
1574#endif 1762#endif
1575 1763
1576 if (evpipe [0] >= 0) 1764 if (evpipe [0] >= 0)
1577 { 1765 {
1578 close (evpipe [0]); 1766 EV_WIN32_CLOSE_FD (evpipe [0]);
1579 close (evpipe [1]); 1767 EV_WIN32_CLOSE_FD (evpipe [1]);
1580 } 1768 }
1581 1769
1582 evpipe_init (EV_A); 1770 evpipe_init (EV_A);
1583 /* now iterate over everything, in case we missed something */ 1771 /* now iterate over everything, in case we missed something */
1584 pipecb (EV_A_ &pipe_w, EV_READ); 1772 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1590#if EV_MULTIPLICITY 1778#if EV_MULTIPLICITY
1591 1779
1592struct ev_loop * 1780struct ev_loop *
1593ev_loop_new (unsigned int flags) 1781ev_loop_new (unsigned int flags)
1594{ 1782{
1595 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1783 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1596 1784
1597 memset (loop, 0, sizeof (struct ev_loop)); 1785 memset (EV_A, 0, sizeof (struct ev_loop));
1598
1599 loop_init (EV_A_ flags); 1786 loop_init (EV_A_ flags);
1600 1787
1601 if (ev_backend (EV_A)) 1788 if (ev_backend (EV_A))
1602 return loop; 1789 return EV_A;
1603 1790
1604 return 0; 1791 return 0;
1605} 1792}
1606 1793
1607void 1794void
… …
1614void 1801void
1615ev_loop_fork (EV_P) 1802ev_loop_fork (EV_P)
1616{ 1803{
1617 postfork = 1; /* must be in line with ev_default_fork */ 1804 postfork = 1; /* must be in line with ev_default_fork */
1618} 1805}
1806#endif /* multiplicity */
1619 1807
1620#if EV_VERIFY 1808#if EV_VERIFY
1621static void noinline 1809static void noinline
1622verify_watcher (EV_P_ W w) 1810verify_watcher (EV_P_ W w)
1623{ 1811{
… …
1651 verify_watcher (EV_A_ ws [cnt]); 1839 verify_watcher (EV_A_ ws [cnt]);
1652 } 1840 }
1653} 1841}
1654#endif 1842#endif
1655 1843
1844#if EV_MINIMAL < 2
1656void 1845void
1657ev_loop_verify (EV_P) 1846ev_loop_verify (EV_P)
1658{ 1847{
1659#if EV_VERIFY 1848#if EV_VERIFY
1660 int i; 1849 int i;
… …
1709 assert (checkmax >= checkcnt); 1898 assert (checkmax >= checkcnt);
1710 array_verify (EV_A_ (W *)checks, checkcnt); 1899 array_verify (EV_A_ (W *)checks, checkcnt);
1711 1900
1712# if 0 1901# if 0
1713 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1902 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1714 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1903 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1715# endif
1716#endif 1904# endif
1905#endif
1717} 1906}
1718 1907#endif
1719#endif /* multiplicity */
1720 1908
1721#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1722struct ev_loop * 1910struct ev_loop *
1723ev_default_loop_init (unsigned int flags) 1911ev_default_loop_init (unsigned int flags)
1724#else 1912#else
… …
1727#endif 1915#endif
1728{ 1916{
1729 if (!ev_default_loop_ptr) 1917 if (!ev_default_loop_ptr)
1730 { 1918 {
1731#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1732 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1920 EV_P = ev_default_loop_ptr = &default_loop_struct;
1733#else 1921#else
1734 ev_default_loop_ptr = 1; 1922 ev_default_loop_ptr = 1;
1735#endif 1923#endif
1736 1924
1737 loop_init (EV_A_ flags); 1925 loop_init (EV_A_ flags);
… …
1754 1942
1755void 1943void
1756ev_default_destroy (void) 1944ev_default_destroy (void)
1757{ 1945{
1758#if EV_MULTIPLICITY 1946#if EV_MULTIPLICITY
1759 struct ev_loop *loop = ev_default_loop_ptr; 1947 EV_P = ev_default_loop_ptr;
1760#endif 1948#endif
1761 1949
1762 ev_default_loop_ptr = 0; 1950 ev_default_loop_ptr = 0;
1763 1951
1764#ifndef _WIN32 1952#ifndef _WIN32
… …
1771 1959
1772void 1960void
1773ev_default_fork (void) 1961ev_default_fork (void)
1774{ 1962{
1775#if EV_MULTIPLICITY 1963#if EV_MULTIPLICITY
1776 struct ev_loop *loop = ev_default_loop_ptr; 1964 EV_P = ev_default_loop_ptr;
1777#endif 1965#endif
1778 1966
1779 postfork = 1; /* must be in line with ev_loop_fork */ 1967 postfork = 1; /* must be in line with ev_loop_fork */
1780} 1968}
1781 1969
… …
1785ev_invoke (EV_P_ void *w, int revents) 1973ev_invoke (EV_P_ void *w, int revents)
1786{ 1974{
1787 EV_CB_INVOKE ((W)w, revents); 1975 EV_CB_INVOKE ((W)w, revents);
1788} 1976}
1789 1977
1790inline_speed void 1978unsigned int
1791call_pending (EV_P) 1979ev_pending_count (EV_P)
1980{
1981 int pri;
1982 unsigned int count = 0;
1983
1984 for (pri = NUMPRI; pri--; )
1985 count += pendingcnt [pri];
1986
1987 return count;
1988}
1989
1990void noinline
1991ev_invoke_pending (EV_P)
1792{ 1992{
1793 int pri; 1993 int pri;
1794 1994
1795 for (pri = NUMPRI; pri--; ) 1995 for (pri = NUMPRI; pri--; )
1796 while (pendingcnt [pri]) 1996 while (pendingcnt [pri])
… …
1964 ANHE_at_cache (*he); 2164 ANHE_at_cache (*he);
1965 } 2165 }
1966} 2166}
1967 2167
1968/* fetch new monotonic and realtime times from the kernel */ 2168/* fetch new monotonic and realtime times from the kernel */
1969/* also detetc if there was a timejump, and act accordingly */ 2169/* also detect if there was a timejump, and act accordingly */
1970inline_speed void 2170inline_speed void
1971time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
1972{ 2172{
1973#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
1974 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
… …
2034} 2234}
2035 2235
2036void 2236void
2037ev_loop (EV_P_ int flags) 2237ev_loop (EV_P_ int flags)
2038{ 2238{
2239#if EV_MINIMAL < 2
2039 ++loop_depth; 2240 ++loop_depth;
2241#endif
2242
2243 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2040 2244
2041 loop_done = EVUNLOOP_CANCEL; 2245 loop_done = EVUNLOOP_CANCEL;
2042 2246
2043 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2247 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2044 2248
2045 do 2249 do
2046 { 2250 {
2047#if EV_VERIFY >= 2 2251#if EV_VERIFY >= 2
2048 ev_loop_verify (EV_A); 2252 ev_loop_verify (EV_A);
… …
2061 /* we might have forked, so queue fork handlers */ 2265 /* we might have forked, so queue fork handlers */
2062 if (expect_false (postfork)) 2266 if (expect_false (postfork))
2063 if (forkcnt) 2267 if (forkcnt)
2064 { 2268 {
2065 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2269 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2066 call_pending (EV_A); 2270 EV_INVOKE_PENDING;
2067 } 2271 }
2068#endif 2272#endif
2069 2273
2070 /* queue prepare watchers (and execute them) */ 2274 /* queue prepare watchers (and execute them) */
2071 if (expect_false (preparecnt)) 2275 if (expect_false (preparecnt))
2072 { 2276 {
2073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2277 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2074 call_pending (EV_A); 2278 EV_INVOKE_PENDING;
2075 } 2279 }
2280
2281 if (expect_false (loop_done))
2282 break;
2076 2283
2077 /* we might have forked, so reify kernel state if necessary */ 2284 /* we might have forked, so reify kernel state if necessary */
2078 if (expect_false (postfork)) 2285 if (expect_false (postfork))
2079 loop_fork (EV_A); 2286 loop_fork (EV_A);
2080 2287
… …
2128 waittime -= sleeptime; 2335 waittime -= sleeptime;
2129 } 2336 }
2130 } 2337 }
2131 } 2338 }
2132 2339
2340#if EV_MINIMAL < 2
2133 ++loop_count; 2341 ++loop_count;
2342#endif
2343 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2134 backend_poll (EV_A_ waittime); 2344 backend_poll (EV_A_ waittime);
2345 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2135 2346
2136 /* update ev_rt_now, do magic */ 2347 /* update ev_rt_now, do magic */
2137 time_update (EV_A_ waittime + sleeptime); 2348 time_update (EV_A_ waittime + sleeptime);
2138 } 2349 }
2139 2350
… …
2150 2361
2151 /* queue check watchers, to be executed first */ 2362 /* queue check watchers, to be executed first */
2152 if (expect_false (checkcnt)) 2363 if (expect_false (checkcnt))
2153 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2364 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2154 2365
2155 call_pending (EV_A); 2366 EV_INVOKE_PENDING;
2156 } 2367 }
2157 while (expect_true ( 2368 while (expect_true (
2158 activecnt 2369 activecnt
2159 && !loop_done 2370 && !loop_done
2160 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2371 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2161 )); 2372 ));
2162 2373
2163 if (loop_done == EVUNLOOP_ONE) 2374 if (loop_done == EVUNLOOP_ONE)
2164 loop_done = EVUNLOOP_CANCEL; 2375 loop_done = EVUNLOOP_CANCEL;
2165 2376
2377#if EV_MINIMAL < 2
2166 --loop_depth; 2378 --loop_depth;
2379#endif
2167} 2380}
2168 2381
2169void 2382void
2170ev_unloop (EV_P_ int how) 2383ev_unloop (EV_P_ int how)
2171{ 2384{
… …
2222inline_size void 2435inline_size void
2223wlist_del (WL *head, WL elem) 2436wlist_del (WL *head, WL elem)
2224{ 2437{
2225 while (*head) 2438 while (*head)
2226 { 2439 {
2227 if (*head == elem) 2440 if (expect_true (*head == elem))
2228 { 2441 {
2229 *head = elem->next; 2442 *head = elem->next;
2230 return; 2443 break;
2231 } 2444 }
2232 2445
2233 head = &(*head)->next; 2446 head = &(*head)->next;
2234 } 2447 }
2235} 2448}
… …
2295 2508
2296 if (expect_false (ev_is_active (w))) 2509 if (expect_false (ev_is_active (w)))
2297 return; 2510 return;
2298 2511
2299 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2512 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2300 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2513 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2301 2514
2302 EV_FREQUENT_CHECK; 2515 EV_FREQUENT_CHECK;
2303 2516
2304 ev_start (EV_A_ (W)w, 1); 2517 ev_start (EV_A_ (W)w, 1);
2305 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2306 wlist_add (&anfds[fd].head, (WL)w); 2519 wlist_add (&anfds[fd].head, (WL)w);
2307 2520
2308 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2521 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2309 w->events &= ~EV__IOFDSET; 2522 w->events &= ~EV__IOFDSET;
2310 2523
2311 EV_FREQUENT_CHECK; 2524 EV_FREQUENT_CHECK;
2312} 2525}
2313 2526
… …
2407 } 2620 }
2408 2621
2409 EV_FREQUENT_CHECK; 2622 EV_FREQUENT_CHECK;
2410} 2623}
2411 2624
2625ev_tstamp
2626ev_timer_remaining (EV_P_ ev_timer *w)
2627{
2628 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2629}
2630
2412#if EV_PERIODIC_ENABLE 2631#if EV_PERIODIC_ENABLE
2413void noinline 2632void noinline
2414ev_periodic_start (EV_P_ ev_periodic *w) 2633ev_periodic_start (EV_P_ ev_periodic *w)
2415{ 2634{
2416 if (expect_false (ev_is_active (w))) 2635 if (expect_false (ev_is_active (w)))
… …
2483#endif 2702#endif
2484 2703
2485void noinline 2704void noinline
2486ev_signal_start (EV_P_ ev_signal *w) 2705ev_signal_start (EV_P_ ev_signal *w)
2487{ 2706{
2488#if EV_MULTIPLICITY
2489 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2490#endif
2491 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2492 return; 2708 return;
2493 2709
2494 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2710 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2495 2711
2496 evpipe_init (EV_A); 2712#if EV_MULTIPLICITY
2713 assert (("libev: a signal must not be attached to two different loops",
2714 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2497 2715
2498 EV_FREQUENT_CHECK; 2716 signals [w->signum - 1].loop = EV_A;
2717#endif
2499 2718
2719 EV_FREQUENT_CHECK;
2720
2721#if EV_USE_SIGNALFD
2722 if (sigfd == -2)
2500 { 2723 {
2501#ifndef _WIN32 2724 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2502 sigset_t full, prev; 2725 if (sigfd < 0 && errno == EINVAL)
2503 sigfillset (&full); 2726 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2504 sigprocmask (SIG_SETMASK, &full, &prev);
2505#endif
2506 2727
2507 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2728 if (sigfd >= 0)
2729 {
2730 fd_intern (sigfd); /* doing it twice will not hurt */
2508 2731
2509#ifndef _WIN32 2732 sigemptyset (&sigfd_set);
2510 sigprocmask (SIG_SETMASK, &prev, 0); 2733
2511#endif 2734 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2735 ev_set_priority (&sigfd_w, EV_MAXPRI);
2736 ev_io_start (EV_A_ &sigfd_w);
2737 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2738 }
2512 } 2739 }
2740
2741 if (sigfd >= 0)
2742 {
2743 /* TODO: check .head */
2744 sigaddset (&sigfd_set, w->signum);
2745 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2746
2747 signalfd (sigfd, &sigfd_set, 0);
2748 }
2749#endif
2513 2750
2514 ev_start (EV_A_ (W)w, 1); 2751 ev_start (EV_A_ (W)w, 1);
2515 wlist_add (&signals [w->signum - 1].head, (WL)w); 2752 wlist_add (&signals [w->signum - 1].head, (WL)w);
2516 2753
2517 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2755# if EV_USE_SIGNALFD
2756 if (sigfd < 0) /*TODO*/
2757# endif
2518 { 2758 {
2519#if _WIN32 2759# ifdef _WIN32
2760 evpipe_init (EV_A);
2761
2520 signal (w->signum, ev_sighandler); 2762 signal (w->signum, ev_sighandler);
2521#else 2763# else
2522 struct sigaction sa; 2764 struct sigaction sa;
2765
2766 evpipe_init (EV_A);
2767
2523 sa.sa_handler = ev_sighandler; 2768 sa.sa_handler = ev_sighandler;
2524 sigfillset (&sa.sa_mask); 2769 sigfillset (&sa.sa_mask);
2525 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2770 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2526 sigaction (w->signum, &sa, 0); 2771 sigaction (w->signum, &sa, 0);
2772
2773 sigemptyset (&sa.sa_mask);
2774 sigaddset (&sa.sa_mask, w->signum);
2775 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2527#endif 2776#endif
2528 } 2777 }
2529 2778
2530 EV_FREQUENT_CHECK; 2779 EV_FREQUENT_CHECK;
2531} 2780}
2532 2781
2533void noinline 2782void noinline
… …
2541 2790
2542 wlist_del (&signals [w->signum - 1].head, (WL)w); 2791 wlist_del (&signals [w->signum - 1].head, (WL)w);
2543 ev_stop (EV_A_ (W)w); 2792 ev_stop (EV_A_ (W)w);
2544 2793
2545 if (!signals [w->signum - 1].head) 2794 if (!signals [w->signum - 1].head)
2795 {
2796#if EV_MULTIPLICITY
2797 signals [w->signum - 1].loop = 0; /* unattach from signal */
2798#endif
2799#if EV_USE_SIGNALFD
2800 if (sigfd >= 0)
2801 {
2802 sigset_t ss;
2803
2804 sigemptyset (&ss);
2805 sigaddset (&ss, w->signum);
2806 sigdelset (&sigfd_set, w->signum);
2807
2808 signalfd (sigfd, &sigfd_set, 0);
2809 sigprocmask (SIG_UNBLOCK, &ss, 0);
2810 }
2811 else
2812#endif
2546 signal (w->signum, SIG_DFL); 2813 signal (w->signum, SIG_DFL);
2814 }
2547 2815
2548 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2549} 2817}
2550 2818
2551void 2819void
… …
2592#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2593 2861
2594static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2862static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2595 2863
2596#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2597# define EV_INOTIFY_BUFSIZE 8192 2865
2866/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2867# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2598 2868
2599static void noinline 2869static void noinline
2600infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2601{ 2871{
2602 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); 2872 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);
2603 2873
2604 if (w->wd < 0) 2874 if (w->wd >= 0)
2875 {
2876 struct statfs sfs;
2877
2878 /* now local changes will be tracked by inotify, but remote changes won't */
2879 /* unless the filesystem is known to be local, we therefore still poll */
2880 /* also do poll on <2.6.25, but with normal frequency */
2881
2882 if (!fs_2625)
2883 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2884 else if (!statfs (w->path, &sfs)
2885 && (sfs.f_type == 0x1373 /* devfs */
2886 || sfs.f_type == 0xEF53 /* ext2/3 */
2887 || sfs.f_type == 0x3153464a /* jfs */
2888 || sfs.f_type == 0x52654973 /* reiser3 */
2889 || sfs.f_type == 0x01021994 /* tempfs */
2890 || sfs.f_type == 0x58465342 /* xfs */))
2891 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2892 else
2893 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2605 { 2894 }
2895 else
2896 {
2897 /* can't use inotify, continue to stat */
2606 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2898 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2607 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2608 2899
2609 /* monitor some parent directory for speedup hints */ 2900 /* if path is not there, monitor some parent directory for speedup hints */
2610 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2901 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2611 /* but an efficiency issue only */ 2902 /* but an efficiency issue only */
2612 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2903 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2613 { 2904 {
2614 char path [4096]; 2905 char path [4096];
… …
2630 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2921 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2631 } 2922 }
2632 } 2923 }
2633 2924
2634 if (w->wd >= 0) 2925 if (w->wd >= 0)
2635 {
2636 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2926 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2637 2927
2638 /* now local changes will be tracked by inotify, but remote changes won't */ 2928 /* now re-arm timer, if required */
2639 /* unless the filesystem it known to be local, we therefore still poll */ 2929 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2640 /* also do poll on <2.6.25, but with normal frequency */
2641 struct statfs sfs;
2642
2643 if (fs_2625 && !statfs (w->path, &sfs))
2644 if (sfs.f_type == 0x1373 /* devfs */
2645 || sfs.f_type == 0xEF53 /* ext2/3 */
2646 || sfs.f_type == 0x3153464a /* jfs */
2647 || sfs.f_type == 0x52654973 /* reiser3 */
2648 || sfs.f_type == 0x01021994 /* tempfs */
2649 || sfs.f_type == 0x58465342 /* xfs */)
2650 return;
2651
2652 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2653 ev_timer_again (EV_A_ &w->timer); 2930 ev_timer_again (EV_A_ &w->timer);
2654 } 2931 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2655} 2932}
2656 2933
2657static void noinline 2934static void noinline
2658infy_del (EV_P_ ev_stat *w) 2935infy_del (EV_P_ ev_stat *w)
2659{ 2936{
… …
2704 2981
2705static void 2982static void
2706infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2707{ 2984{
2708 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2709 struct inotify_event *ev = (struct inotify_event *)buf;
2710 int ofs; 2986 int ofs;
2711 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2712 2988
2713 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2989 for (ofs = 0; ofs < len; )
2990 {
2991 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2714 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2992 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2993 ofs += sizeof (struct inotify_event) + ev->len;
2994 }
2715} 2995}
2716 2996
2717inline_size void 2997inline_size void
2718check_2625 (EV_P) 2998check_2625 (EV_P)
2719{ 2999{
… …
2735 return; 3015 return;
2736 3016
2737 fs_2625 = 1; 3017 fs_2625 = 1;
2738} 3018}
2739 3019
3020inline_size int
3021infy_newfd (void)
3022{
3023#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3024 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3025 if (fd >= 0)
3026 return fd;
3027#endif
3028 return inotify_init ();
3029}
3030
2740inline_size void 3031inline_size void
2741infy_init (EV_P) 3032infy_init (EV_P)
2742{ 3033{
2743 if (fs_fd != -2) 3034 if (fs_fd != -2)
2744 return; 3035 return;
2745 3036
2746 fs_fd = -1; 3037 fs_fd = -1;
2747 3038
2748 check_2625 (EV_A); 3039 check_2625 (EV_A);
2749 3040
2750 fs_fd = inotify_init (); 3041 fs_fd = infy_newfd ();
2751 3042
2752 if (fs_fd >= 0) 3043 if (fs_fd >= 0)
2753 { 3044 {
3045 fd_intern (fs_fd);
2754 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3046 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2755 ev_set_priority (&fs_w, EV_MAXPRI); 3047 ev_set_priority (&fs_w, EV_MAXPRI);
2756 ev_io_start (EV_A_ &fs_w); 3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
2757 } 3050 }
2758} 3051}
2759 3052
2760inline_size void 3053inline_size void
2761infy_fork (EV_P) 3054infy_fork (EV_P)
… …
2763 int slot; 3056 int slot;
2764 3057
2765 if (fs_fd < 0) 3058 if (fs_fd < 0)
2766 return; 3059 return;
2767 3060
3061 ev_ref (EV_A);
3062 ev_io_stop (EV_A_ &fs_w);
2768 close (fs_fd); 3063 close (fs_fd);
2769 fs_fd = inotify_init (); 3064 fs_fd = infy_newfd ();
3065
3066 if (fs_fd >= 0)
3067 {
3068 fd_intern (fs_fd);
3069 ev_io_set (&fs_w, fs_fd, EV_READ);
3070 ev_io_start (EV_A_ &fs_w);
3071 ev_unref (EV_A);
3072 }
2770 3073
2771 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3074 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2772 { 3075 {
2773 WL w_ = fs_hash [slot].head; 3076 WL w_ = fs_hash [slot].head;
2774 fs_hash [slot].head = 0; 3077 fs_hash [slot].head = 0;
… …
2781 w->wd = -1; 3084 w->wd = -1;
2782 3085
2783 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2784 infy_add (EV_A_ w); /* re-add, no matter what */ 3087 infy_add (EV_A_ w); /* re-add, no matter what */
2785 else 3088 else
3089 {
3090 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3091 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2786 ev_timer_again (EV_A_ &w->timer); 3092 ev_timer_again (EV_A_ &w->timer);
3093 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3094 }
2787 } 3095 }
2788 } 3096 }
2789} 3097}
2790 3098
2791#endif 3099#endif
… …
2808static void noinline 3116static void noinline
2809stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3117stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2810{ 3118{
2811 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3119 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2812 3120
2813 /* we copy this here each the time so that */ 3121 ev_statdata prev = w->attr;
2814 /* prev has the old value when the callback gets invoked */
2815 w->prev = w->attr;
2816 ev_stat_stat (EV_A_ w); 3122 ev_stat_stat (EV_A_ w);
2817 3123
2818 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3124 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2819 if ( 3125 if (
2820 w->prev.st_dev != w->attr.st_dev 3126 prev.st_dev != w->attr.st_dev
2821 || w->prev.st_ino != w->attr.st_ino 3127 || prev.st_ino != w->attr.st_ino
2822 || w->prev.st_mode != w->attr.st_mode 3128 || prev.st_mode != w->attr.st_mode
2823 || w->prev.st_nlink != w->attr.st_nlink 3129 || prev.st_nlink != w->attr.st_nlink
2824 || w->prev.st_uid != w->attr.st_uid 3130 || prev.st_uid != w->attr.st_uid
2825 || w->prev.st_gid != w->attr.st_gid 3131 || prev.st_gid != w->attr.st_gid
2826 || w->prev.st_rdev != w->attr.st_rdev 3132 || prev.st_rdev != w->attr.st_rdev
2827 || w->prev.st_size != w->attr.st_size 3133 || prev.st_size != w->attr.st_size
2828 || w->prev.st_atime != w->attr.st_atime 3134 || prev.st_atime != w->attr.st_atime
2829 || w->prev.st_mtime != w->attr.st_mtime 3135 || prev.st_mtime != w->attr.st_mtime
2830 || w->prev.st_ctime != w->attr.st_ctime 3136 || prev.st_ctime != w->attr.st_ctime
2831 ) { 3137 ) {
3138 /* we only update w->prev on actual differences */
3139 /* in case we test more often than invoke the callback, */
3140 /* to ensure that prev is always different to attr */
3141 w->prev = prev;
3142
2832 #if EV_USE_INOTIFY 3143 #if EV_USE_INOTIFY
2833 if (fs_fd >= 0) 3144 if (fs_fd >= 0)
2834 { 3145 {
2835 infy_del (EV_A_ w); 3146 infy_del (EV_A_ w);
2836 infy_add (EV_A_ w); 3147 infy_add (EV_A_ w);
… …
2861 3172
2862 if (fs_fd >= 0) 3173 if (fs_fd >= 0)
2863 infy_add (EV_A_ w); 3174 infy_add (EV_A_ w);
2864 else 3175 else
2865#endif 3176#endif
3177 {
2866 ev_timer_again (EV_A_ &w->timer); 3178 ev_timer_again (EV_A_ &w->timer);
3179 ev_unref (EV_A);
3180 }
2867 3181
2868 ev_start (EV_A_ (W)w, 1); 3182 ev_start (EV_A_ (W)w, 1);
2869 3183
2870 EV_FREQUENT_CHECK; 3184 EV_FREQUENT_CHECK;
2871} 3185}
… …
2880 EV_FREQUENT_CHECK; 3194 EV_FREQUENT_CHECK;
2881 3195
2882#if EV_USE_INOTIFY 3196#if EV_USE_INOTIFY
2883 infy_del (EV_A_ w); 3197 infy_del (EV_A_ w);
2884#endif 3198#endif
3199
3200 if (ev_is_active (&w->timer))
3201 {
3202 ev_ref (EV_A);
2885 ev_timer_stop (EV_A_ &w->timer); 3203 ev_timer_stop (EV_A_ &w->timer);
3204 }
2886 3205
2887 ev_stop (EV_A_ (W)w); 3206 ev_stop (EV_A_ (W)w);
2888 3207
2889 EV_FREQUENT_CHECK; 3208 EV_FREQUENT_CHECK;
2890} 3209}
… …
3031embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3350embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3032{ 3351{
3033 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3352 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3034 3353
3035 { 3354 {
3036 struct ev_loop *loop = w->other; 3355 EV_P = w->other;
3037 3356
3038 while (fdchangecnt) 3357 while (fdchangecnt)
3039 { 3358 {
3040 fd_reify (EV_A); 3359 fd_reify (EV_A);
3041 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3360 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3049 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3368 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3050 3369
3051 ev_embed_stop (EV_A_ w); 3370 ev_embed_stop (EV_A_ w);
3052 3371
3053 { 3372 {
3054 struct ev_loop *loop = w->other; 3373 EV_P = w->other;
3055 3374
3056 ev_loop_fork (EV_A); 3375 ev_loop_fork (EV_A);
3057 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3376 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3058 } 3377 }
3059 3378
… …
3073{ 3392{
3074 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
3075 return; 3394 return;
3076 3395
3077 { 3396 {
3078 struct ev_loop *loop = w->other; 3397 EV_P = w->other;
3079 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3398 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3080 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3399 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3081 } 3400 }
3082 3401
3083 EV_FREQUENT_CHECK; 3402 EV_FREQUENT_CHECK;
… …
3195 3514
3196void 3515void
3197ev_async_send (EV_P_ ev_async *w) 3516ev_async_send (EV_P_ ev_async *w)
3198{ 3517{
3199 w->sent = 1; 3518 w->sent = 1;
3200 evpipe_write (EV_A_ &gotasync); 3519 evpipe_write (EV_A_ &async_pending);
3201} 3520}
3202#endif 3521#endif
3203 3522
3204/*****************************************************************************/ 3523/*****************************************************************************/
3205 3524
… …
3354 if (types & EV_CHECK) 3673 if (types & EV_CHECK)
3355 for (i = checkcnt; i--; ) 3674 for (i = checkcnt; i--; )
3356 cb (EV_A_ EV_CHECK, checks [i]); 3675 cb (EV_A_ EV_CHECK, checks [i]);
3357 3676
3358 if (types & EV_SIGNAL) 3677 if (types & EV_SIGNAL)
3359 for (i = 0; i < signalmax; ++i) 3678 for (i = 0; i < EV_NSIG - 1; ++i)
3360 for (wl = signals [i].head; wl; ) 3679 for (wl = signals [i].head; wl; )
3361 { 3680 {
3362 wn = wl->next; 3681 wn = wl->next;
3363 cb (EV_A_ EV_SIGNAL, wl); 3682 cb (EV_A_ EV_SIGNAL, wl);
3364 wl = wn; 3683 wl = wn;

Diff Legend

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