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.316 by root, Fri Sep 18 21:02:12 2009 UTC

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
178# endif 186# endif
179#endif 187#endif
180 188
181/* 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 */
182 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
183#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
186# else 221# else
187# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
263#ifndef EV_USE_EVENTFD 298#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 300# define EV_USE_EVENTFD 1
266# else 301# else
267# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
303# endif
304#endif
305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
268# endif 311# endif
269#endif 312#endif
270 313
271#if 0 /* debugging */ 314#if 0 /* debugging */
272# define EV_VERIFY 3 315# define EV_VERIFY 3
339#endif 382#endif
340 383
341#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
342/* 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 */
343# 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
344# ifdef __cplusplus 397# ifdef __cplusplus
345extern "C" { 398extern "C" {
346# endif 399# endif
347int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 401# ifdef __cplusplus
349} 402}
350# endif 403# endif
351#endif 404#endif
405
406#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
352 434
353/**/ 435/**/
354 436
355#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
368 */ 450 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 452
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 453#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) */ 454#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 455
375#if __GNUC__ >= 4 456#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
378#else 459#else
419 500
420#if EV_USE_MONOTONIC 501#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 503#endif
423 504
505#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif
508#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
510#endif
511#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif
514
424#ifdef _WIN32 515#ifdef _WIN32
425# include "ev_win32.c" 516# include "ev_win32.c"
426#endif 517#endif
427 518
428/*****************************************************************************/ 519/*****************************************************************************/
490#define ev_malloc(size) ev_realloc (0, (size)) 581#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 582#define ev_free(ptr) ev_realloc ((ptr), 0)
492 583
493/*****************************************************************************/ 584/*****************************************************************************/
494 585
586/* set in reify when reification needed */
587#define EV_ANFD_REIFY 1
588
495/* file descriptor info structure */ 589/* file descriptor info structure */
496typedef struct 590typedef struct
497{ 591{
498 WL head; 592 WL head;
499 unsigned char events; /* the events watched for */ 593 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 594 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 */ 595 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 596 unsigned char unused;
503#if EV_USE_EPOLL 597#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 598 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 599#endif
567 661
568 static int ev_default_loop_ptr; 662 static int ev_default_loop_ptr;
569 663
570#endif 664#endif
571 665
666#if EV_MINIMAL < 2
667# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
668# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
669# define EV_INVOKE_PENDING invoke_cb (EV_A)
670#else
671# define EV_RELEASE_CB (void)0
672# define EV_ACQUIRE_CB (void)0
673# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
674#endif
675
676#define EVUNLOOP_RECURSE 0x80
677
572/*****************************************************************************/ 678/*****************************************************************************/
573 679
574#ifndef EV_HAVE_EV_TIME 680#ifndef EV_HAVE_EV_TIME
575ev_tstamp 681ev_tstamp
576ev_time (void) 682ev_time (void)
632 738
633 tv.tv_sec = (time_t)delay; 739 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 741
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 742 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 743 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 744 /* by older ones */
639 select (0, 0, 0, 0, &tv); 745 select (0, 0, 0, 0, &tv);
640#endif 746#endif
641 } 747 }
642} 748}
750} 856}
751 857
752/*****************************************************************************/ 858/*****************************************************************************/
753 859
754inline_speed void 860inline_speed void
755fd_event (EV_P_ int fd, int revents) 861fd_event_nc (EV_P_ int fd, int revents)
756{ 862{
757 ANFD *anfd = anfds + fd; 863 ANFD *anfd = anfds + fd;
758 ev_io *w; 864 ev_io *w;
759 865
760 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 866 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
764 if (ev) 870 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 871 ev_feed_event (EV_A_ (W)w, ev);
766 } 872 }
767} 873}
768 874
875/* do not submit kernel events for fds that have reify set */
876/* because that means they changed while we were polling for new events */
877inline_speed void
878fd_event (EV_P_ int fd, int revents)
879{
880 ANFD *anfd = anfds + fd;
881
882 if (expect_true (!anfd->reify))
883 fd_event_nc (EV_A_ fd, revents);
884}
885
769void 886void
770ev_feed_fd_event (EV_P_ int fd, int revents) 887ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 888{
772 if (fd >= 0 && fd < anfdmax) 889 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 890 fd_event_nc (EV_A_ fd, revents);
774} 891}
775 892
776/* make sure the external fd watch events are in-sync */ 893/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 894/* with the kernel/libev internal state */
778inline_size void 895inline_size void
793 910
794#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
795 if (events) 912 if (events)
796 { 913 {
797 unsigned long arg; 914 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 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)); 916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
804 } 917 }
805#endif 918#endif
806 919
807 { 920 {
878 991
879 for (fd = anfdmax; fd--; ) 992 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 993 if (anfds [fd].events)
881 { 994 {
882 fd_kill (EV_A_ fd); 995 fd_kill (EV_A_ fd);
883 return; 996 break;
884 } 997 }
885} 998}
886 999
887/* usually called after fork if backend needs to re-arm all fds from scratch */ 1000/* usually called after fork if backend needs to re-arm all fds from scratch */
888static void noinline 1001static void noinline
893 for (fd = 0; fd < anfdmax; ++fd) 1006 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 1007 if (anfds [fd].events)
895 { 1008 {
896 anfds [fd].events = 0; 1009 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 1010 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 1012 }
900} 1013}
901 1014
902/*****************************************************************************/ 1015/*****************************************************************************/
903 1016
978 1091
979 for (;;) 1092 for (;;)
980 { 1093 {
981 int c = k << 1; 1094 int c = k << 1;
982 1095
983 if (c > N + HEAP0 - 1) 1096 if (c >= N + HEAP0)
984 break; 1097 break;
985 1098
986 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1099 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
987 ? 1 : 0; 1100 ? 1 : 0;
988 1101
1024 1137
1025/* move an element suitably so it is in a correct place */ 1138/* move an element suitably so it is in a correct place */
1026inline_size void 1139inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1140adjustheap (ANHE *heap, int N, int k)
1028{ 1141{
1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1142 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1030 upheap (heap, k); 1143 upheap (heap, k);
1031 else 1144 else
1032 downheap (heap, N, k); 1145 downheap (heap, N, k);
1033} 1146}
1034 1147
1047/*****************************************************************************/ 1160/*****************************************************************************/
1048 1161
1049/* associate signal watchers to a signal signal */ 1162/* associate signal watchers to a signal signal */
1050typedef struct 1163typedef struct
1051{ 1164{
1165 EV_ATOMIC_T pending;
1166#if EV_MULTIPLICITY
1167 EV_P;
1168#endif
1052 WL head; 1169 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1170} ANSIG;
1055 1171
1056static ANSIG *signals; 1172static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1173
1061/*****************************************************************************/ 1174/*****************************************************************************/
1062 1175
1063/* used to prepare libev internal fd's */ 1176/* used to prepare libev internal fd's */
1064/* this is not fork-safe */ 1177/* this is not fork-safe */
1078evpipe_init (EV_P) 1191evpipe_init (EV_P)
1079{ 1192{
1080 if (!ev_is_active (&pipe_w)) 1193 if (!ev_is_active (&pipe_w))
1081 { 1194 {
1082#if EV_USE_EVENTFD 1195#if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1198 evfd = eventfd (0, 0);
1199
1200 if (evfd >= 0)
1084 { 1201 {
1085 evpipe [0] = -1; 1202 evpipe [0] = -1;
1086 fd_intern (evfd); 1203 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1204 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1205 }
1089 else 1206 else
1090#endif 1207#endif
1091 { 1208 {
1128/* called whenever the libev signal pipe */ 1245/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1246/* got some events (signal, async) */
1130static void 1247static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1248pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1249{
1250 int i;
1251
1133#if EV_USE_EVENTFD 1252#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1253 if (evfd >= 0)
1135 { 1254 {
1136 uint64_t counter; 1255 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1256 read (evfd, &counter, sizeof (uint64_t));
1141 { 1260 {
1142 char dummy; 1261 char dummy;
1143 read (evpipe [0], &dummy, 1); 1262 read (evpipe [0], &dummy, 1);
1144 } 1263 }
1145 1264
1146 if (gotsig && ev_is_default_loop (EV_A)) 1265 if (sig_pending)
1147 { 1266 {
1148 int signum; 1267 sig_pending = 0;
1149 gotsig = 0;
1150 1268
1151 for (signum = signalmax; signum--; ) 1269 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1270 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1271 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1272 }
1155 1273
1156#if EV_ASYNC_ENABLE 1274#if EV_ASYNC_ENABLE
1157 if (gotasync) 1275 if (async_pending)
1158 { 1276 {
1159 int i; 1277 async_pending = 0;
1160 gotasync = 0;
1161 1278
1162 for (i = asynccnt; i--; ) 1279 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1280 if (asyncs [i]->sent)
1164 { 1281 {
1165 asyncs [i]->sent = 0; 1282 asyncs [i]->sent = 0;
1173 1290
1174static void 1291static void
1175ev_sighandler (int signum) 1292ev_sighandler (int signum)
1176{ 1293{
1177#if EV_MULTIPLICITY 1294#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1295 EV_P = signals [signum - 1].loop;
1179#endif 1296#endif
1180 1297
1181#if _WIN32 1298#if _WIN32
1182 signal (signum, ev_sighandler); 1299 signal (signum, ev_sighandler);
1183#endif 1300#endif
1184 1301
1185 signals [signum - 1].gotsig = 1; 1302 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1303 evpipe_write (EV_A_ &sig_pending);
1187} 1304}
1188 1305
1189void noinline 1306void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1307ev_feed_signal_event (EV_P_ int signum)
1191{ 1308{
1192 WL w; 1309 WL w;
1193 1310
1311 if (expect_false (signum <= 0 || signum > EV_NSIG))
1312 return;
1313
1314 --signum;
1315
1194#if EV_MULTIPLICITY 1316#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1317 /* it is permissible to try to feed a signal to the wrong loop */
1196#endif 1318 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1319
1198 --signum; 1320 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1321 return;
1322#endif
1202 1323
1203 signals [signum].gotsig = 0; 1324 signals [signum].pending = 0;
1204 1325
1205 for (w = signals [signum].head; w; w = w->next) 1326 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1327 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1328}
1329
1330#if EV_USE_SIGNALFD
1331static void
1332sigfdcb (EV_P_ ev_io *iow, int revents)
1333{
1334 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1335
1336 for (;;)
1337 {
1338 ssize_t res = read (sigfd, si, sizeof (si));
1339
1340 /* not ISO-C, as res might be -1, but works with SuS */
1341 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1342 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1343
1344 if (res < (ssize_t)sizeof (si))
1345 break;
1346 }
1347}
1348#endif
1208 1349
1209/*****************************************************************************/ 1350/*****************************************************************************/
1210 1351
1211static WL childs [EV_PID_HASHSIZE]; 1352static WL childs [EV_PID_HASHSIZE];
1212 1353
1357ev_backend (EV_P) 1498ev_backend (EV_P)
1358{ 1499{
1359 return backend; 1500 return backend;
1360} 1501}
1361 1502
1503#if EV_MINIMAL < 2
1362unsigned int 1504unsigned int
1363ev_loop_count (EV_P) 1505ev_loop_count (EV_P)
1364{ 1506{
1365 return loop_count; 1507 return loop_count;
1366} 1508}
1380void 1522void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1523ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1524{
1383 timeout_blocktime = interval; 1525 timeout_blocktime = interval;
1384} 1526}
1527
1528void
1529ev_set_userdata (EV_P_ void *data)
1530{
1531 userdata = data;
1532}
1533
1534void *
1535ev_userdata (EV_P)
1536{
1537 return userdata;
1538}
1539
1540void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1541{
1542 invoke_cb = invoke_pending_cb;
1543}
1544
1545void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1546{
1547 release_cb = release;
1548 acquire_cb = acquire;
1549}
1550#endif
1385 1551
1386/* initialise a loop structure, must be zero-initialised */ 1552/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1553static void noinline
1388loop_init (EV_P_ unsigned int flags) 1554loop_init (EV_P_ unsigned int flags)
1389{ 1555{
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1573 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1574 have_monotonic = 1;
1409 } 1575 }
1410#endif 1576#endif
1411 1577
1578 /* pid check not overridable via env */
1579#ifndef _WIN32
1580 if (flags & EVFLAG_FORKCHECK)
1581 curpid = getpid ();
1582#endif
1583
1584 if (!(flags & EVFLAG_NOENV)
1585 && !enable_secure ()
1586 && getenv ("LIBEV_FLAGS"))
1587 flags = atoi (getenv ("LIBEV_FLAGS"));
1588
1412 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1590 mn_now = get_clock ();
1414 now_floor = mn_now; 1591 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1592 rtmn_diff = ev_rt_now - mn_now;
1593#if EV_MINIMAL < 2
1594 invoke_cb = ev_invoke_pending;
1595#endif
1416 1596
1417 io_blocktime = 0.; 1597 io_blocktime = 0.;
1418 timeout_blocktime = 0.; 1598 timeout_blocktime = 0.;
1419 backend = 0; 1599 backend = 0;
1420 backend_fd = -1; 1600 backend_fd = -1;
1421 gotasync = 0; 1601 sig_pending = 0;
1602#if EV_ASYNC_ENABLE
1603 async_pending = 0;
1604#endif
1422#if EV_USE_INOTIFY 1605#if EV_USE_INOTIFY
1423 fs_fd = -2; 1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1424#endif 1607#endif
1425 1608#if EV_USE_SIGNALFD
1426 /* pid check not overridable via env */ 1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1427#ifndef _WIN32
1428 if (flags & EVFLAG_FORKCHECK)
1429 curpid = getpid ();
1430#endif 1610#endif
1431
1432 if (!(flags & EVFLAG_NOENV)
1433 && !enable_secure ()
1434 && getenv ("LIBEV_FLAGS"))
1435 flags = atoi (getenv ("LIBEV_FLAGS"));
1436 1611
1437 if (!(flags & 0x0000ffffU)) 1612 if (!(flags & 0x0000ffffU))
1438 flags |= ev_recommended_backends (); 1613 flags |= ev_recommended_backends ();
1439 1614
1440#if EV_USE_PORT 1615#if EV_USE_PORT
1466{ 1641{
1467 int i; 1642 int i;
1468 1643
1469 if (ev_is_active (&pipe_w)) 1644 if (ev_is_active (&pipe_w))
1470 { 1645 {
1471 ev_ref (EV_A); /* signal watcher */ 1646 /*ev_ref (EV_A);*/
1472 ev_io_stop (EV_A_ &pipe_w); 1647 /*ev_io_stop (EV_A_ &pipe_w);*/
1473 1648
1474#if EV_USE_EVENTFD 1649#if EV_USE_EVENTFD
1475 if (evfd >= 0) 1650 if (evfd >= 0)
1476 close (evfd); 1651 close (evfd);
1477#endif 1652#endif
1478 1653
1479 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1480 { 1655 {
1481 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1482 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1483 } 1658 }
1484 } 1659 }
1660
1661#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w))
1663 {
1664 /*ev_ref (EV_A);*/
1665 /*ev_io_stop (EV_A_ &sigfd_w);*/
1666
1667 close (sigfd);
1668 }
1669#endif
1485 1670
1486#if EV_USE_INOTIFY 1671#if EV_USE_INOTIFY
1487 if (fs_fd >= 0) 1672 if (fs_fd >= 0)
1488 close (fs_fd); 1673 close (fs_fd);
1489#endif 1674#endif
1513#if EV_IDLE_ENABLE 1698#if EV_IDLE_ENABLE
1514 array_free (idle, [i]); 1699 array_free (idle, [i]);
1515#endif 1700#endif
1516 } 1701 }
1517 1702
1518 ev_free (anfds); anfdmax = 0; 1703 ev_free (anfds); anfds = 0; anfdmax = 0;
1519 1704
1520 /* have to use the microsoft-never-gets-it-right macro */ 1705 /* have to use the microsoft-never-gets-it-right macro */
1521 array_free (rfeed, EMPTY); 1706 array_free (rfeed, EMPTY);
1522 array_free (fdchange, EMPTY); 1707 array_free (fdchange, EMPTY);
1523 array_free (timer, EMPTY); 1708 array_free (timer, EMPTY);
1558 1743
1559 if (ev_is_active (&pipe_w)) 1744 if (ev_is_active (&pipe_w))
1560 { 1745 {
1561 /* this "locks" the handlers against writing to the pipe */ 1746 /* this "locks" the handlers against writing to the pipe */
1562 /* while we modify the fd vars */ 1747 /* while we modify the fd vars */
1563 gotsig = 1; 1748 sig_pending = 1;
1564#if EV_ASYNC_ENABLE 1749#if EV_ASYNC_ENABLE
1565 gotasync = 1; 1750 async_pending = 1;
1566#endif 1751#endif
1567 1752
1568 ev_ref (EV_A); 1753 ev_ref (EV_A);
1569 ev_io_stop (EV_A_ &pipe_w); 1754 ev_io_stop (EV_A_ &pipe_w);
1570 1755
1573 close (evfd); 1758 close (evfd);
1574#endif 1759#endif
1575 1760
1576 if (evpipe [0] >= 0) 1761 if (evpipe [0] >= 0)
1577 { 1762 {
1578 close (evpipe [0]); 1763 EV_WIN32_CLOSE_FD (evpipe [0]);
1579 close (evpipe [1]); 1764 EV_WIN32_CLOSE_FD (evpipe [1]);
1580 } 1765 }
1581 1766
1582 evpipe_init (EV_A); 1767 evpipe_init (EV_A);
1583 /* now iterate over everything, in case we missed something */ 1768 /* now iterate over everything, in case we missed something */
1584 pipecb (EV_A_ &pipe_w, EV_READ); 1769 pipecb (EV_A_ &pipe_w, EV_READ);
1590#if EV_MULTIPLICITY 1775#if EV_MULTIPLICITY
1591 1776
1592struct ev_loop * 1777struct ev_loop *
1593ev_loop_new (unsigned int flags) 1778ev_loop_new (unsigned int flags)
1594{ 1779{
1595 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1780 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1596 1781
1597 memset (loop, 0, sizeof (struct ev_loop)); 1782 memset (EV_A, 0, sizeof (struct ev_loop));
1598
1599 loop_init (EV_A_ flags); 1783 loop_init (EV_A_ flags);
1600 1784
1601 if (ev_backend (EV_A)) 1785 if (ev_backend (EV_A))
1602 return loop; 1786 return EV_A;
1603 1787
1604 return 0; 1788 return 0;
1605} 1789}
1606 1790
1607void 1791void
1614void 1798void
1615ev_loop_fork (EV_P) 1799ev_loop_fork (EV_P)
1616{ 1800{
1617 postfork = 1; /* must be in line with ev_default_fork */ 1801 postfork = 1; /* must be in line with ev_default_fork */
1618} 1802}
1803#endif /* multiplicity */
1619 1804
1620#if EV_VERIFY 1805#if EV_VERIFY
1621static void noinline 1806static void noinline
1622verify_watcher (EV_P_ W w) 1807verify_watcher (EV_P_ W w)
1623{ 1808{
1651 verify_watcher (EV_A_ ws [cnt]); 1836 verify_watcher (EV_A_ ws [cnt]);
1652 } 1837 }
1653} 1838}
1654#endif 1839#endif
1655 1840
1841#if EV_MINIMAL < 2
1656void 1842void
1657ev_loop_verify (EV_P) 1843ev_loop_verify (EV_P)
1658{ 1844{
1659#if EV_VERIFY 1845#if EV_VERIFY
1660 int i; 1846 int i;
1709 assert (checkmax >= checkcnt); 1895 assert (checkmax >= checkcnt);
1710 array_verify (EV_A_ (W *)checks, checkcnt); 1896 array_verify (EV_A_ (W *)checks, checkcnt);
1711 1897
1712# if 0 1898# if 0
1713 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1899 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) 1900 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1715# endif
1716#endif 1901# endif
1902#endif
1717} 1903}
1718 1904#endif
1719#endif /* multiplicity */
1720 1905
1721#if EV_MULTIPLICITY 1906#if EV_MULTIPLICITY
1722struct ev_loop * 1907struct ev_loop *
1723ev_default_loop_init (unsigned int flags) 1908ev_default_loop_init (unsigned int flags)
1724#else 1909#else
1727#endif 1912#endif
1728{ 1913{
1729 if (!ev_default_loop_ptr) 1914 if (!ev_default_loop_ptr)
1730 { 1915 {
1731#if EV_MULTIPLICITY 1916#if EV_MULTIPLICITY
1732 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1917 EV_P = ev_default_loop_ptr = &default_loop_struct;
1733#else 1918#else
1734 ev_default_loop_ptr = 1; 1919 ev_default_loop_ptr = 1;
1735#endif 1920#endif
1736 1921
1737 loop_init (EV_A_ flags); 1922 loop_init (EV_A_ flags);
1754 1939
1755void 1940void
1756ev_default_destroy (void) 1941ev_default_destroy (void)
1757{ 1942{
1758#if EV_MULTIPLICITY 1943#if EV_MULTIPLICITY
1759 struct ev_loop *loop = ev_default_loop_ptr; 1944 EV_P = ev_default_loop_ptr;
1760#endif 1945#endif
1761 1946
1762 ev_default_loop_ptr = 0; 1947 ev_default_loop_ptr = 0;
1763 1948
1764#ifndef _WIN32 1949#ifndef _WIN32
1771 1956
1772void 1957void
1773ev_default_fork (void) 1958ev_default_fork (void)
1774{ 1959{
1775#if EV_MULTIPLICITY 1960#if EV_MULTIPLICITY
1776 struct ev_loop *loop = ev_default_loop_ptr; 1961 EV_P = ev_default_loop_ptr;
1777#endif 1962#endif
1778 1963
1779 postfork = 1; /* must be in line with ev_loop_fork */ 1964 postfork = 1; /* must be in line with ev_loop_fork */
1780} 1965}
1781 1966
1785ev_invoke (EV_P_ void *w, int revents) 1970ev_invoke (EV_P_ void *w, int revents)
1786{ 1971{
1787 EV_CB_INVOKE ((W)w, revents); 1972 EV_CB_INVOKE ((W)w, revents);
1788} 1973}
1789 1974
1790inline_speed void 1975unsigned int
1791call_pending (EV_P) 1976ev_pending_count (EV_P)
1977{
1978 int pri;
1979 unsigned int count = 0;
1980
1981 for (pri = NUMPRI; pri--; )
1982 count += pendingcnt [pri];
1983
1984 return count;
1985}
1986
1987void noinline
1988ev_invoke_pending (EV_P)
1792{ 1989{
1793 int pri; 1990 int pri;
1794 1991
1795 for (pri = NUMPRI; pri--; ) 1992 for (pri = NUMPRI; pri--; )
1796 while (pendingcnt [pri]) 1993 while (pendingcnt [pri])
2034} 2231}
2035 2232
2036void 2233void
2037ev_loop (EV_P_ int flags) 2234ev_loop (EV_P_ int flags)
2038{ 2235{
2236#if EV_MINIMAL < 2
2039 ++loop_depth; 2237 ++loop_depth;
2238#endif
2239
2240 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2040 2241
2041 loop_done = EVUNLOOP_CANCEL; 2242 loop_done = EVUNLOOP_CANCEL;
2042 2243
2043 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2244 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2044 2245
2045 do 2246 do
2046 { 2247 {
2047#if EV_VERIFY >= 2 2248#if EV_VERIFY >= 2
2048 ev_loop_verify (EV_A); 2249 ev_loop_verify (EV_A);
2061 /* we might have forked, so queue fork handlers */ 2262 /* we might have forked, so queue fork handlers */
2062 if (expect_false (postfork)) 2263 if (expect_false (postfork))
2063 if (forkcnt) 2264 if (forkcnt)
2064 { 2265 {
2065 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2266 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2066 call_pending (EV_A); 2267 EV_INVOKE_PENDING;
2067 } 2268 }
2068#endif 2269#endif
2069 2270
2070 /* queue prepare watchers (and execute them) */ 2271 /* queue prepare watchers (and execute them) */
2071 if (expect_false (preparecnt)) 2272 if (expect_false (preparecnt))
2072 { 2273 {
2073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2274 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2074 call_pending (EV_A); 2275 EV_INVOKE_PENDING;
2075 } 2276 }
2277
2278 if (expect_false (loop_done))
2279 break;
2076 2280
2077 /* we might have forked, so reify kernel state if necessary */ 2281 /* we might have forked, so reify kernel state if necessary */
2078 if (expect_false (postfork)) 2282 if (expect_false (postfork))
2079 loop_fork (EV_A); 2283 loop_fork (EV_A);
2080 2284
2128 waittime -= sleeptime; 2332 waittime -= sleeptime;
2129 } 2333 }
2130 } 2334 }
2131 } 2335 }
2132 2336
2337#if EV_MINIMAL < 2
2133 ++loop_count; 2338 ++loop_count;
2339#endif
2340 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2134 backend_poll (EV_A_ waittime); 2341 backend_poll (EV_A_ waittime);
2342 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2135 2343
2136 /* update ev_rt_now, do magic */ 2344 /* update ev_rt_now, do magic */
2137 time_update (EV_A_ waittime + sleeptime); 2345 time_update (EV_A_ waittime + sleeptime);
2138 } 2346 }
2139 2347
2150 2358
2151 /* queue check watchers, to be executed first */ 2359 /* queue check watchers, to be executed first */
2152 if (expect_false (checkcnt)) 2360 if (expect_false (checkcnt))
2153 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2361 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2154 2362
2155 call_pending (EV_A); 2363 EV_INVOKE_PENDING;
2156 } 2364 }
2157 while (expect_true ( 2365 while (expect_true (
2158 activecnt 2366 activecnt
2159 && !loop_done 2367 && !loop_done
2160 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2368 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2161 )); 2369 ));
2162 2370
2163 if (loop_done == EVUNLOOP_ONE) 2371 if (loop_done == EVUNLOOP_ONE)
2164 loop_done = EVUNLOOP_CANCEL; 2372 loop_done = EVUNLOOP_CANCEL;
2165 2373
2374#if EV_MINIMAL < 2
2166 --loop_depth; 2375 --loop_depth;
2376#endif
2167} 2377}
2168 2378
2169void 2379void
2170ev_unloop (EV_P_ int how) 2380ev_unloop (EV_P_ int how)
2171{ 2381{
2222inline_size void 2432inline_size void
2223wlist_del (WL *head, WL elem) 2433wlist_del (WL *head, WL elem)
2224{ 2434{
2225 while (*head) 2435 while (*head)
2226 { 2436 {
2227 if (*head == elem) 2437 if (expect_true (*head == elem))
2228 { 2438 {
2229 *head = elem->next; 2439 *head = elem->next;
2230 return; 2440 break;
2231 } 2441 }
2232 2442
2233 head = &(*head)->next; 2443 head = &(*head)->next;
2234 } 2444 }
2235} 2445}
2303 2513
2304 ev_start (EV_A_ (W)w, 1); 2514 ev_start (EV_A_ (W)w, 1);
2305 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2515 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2306 wlist_add (&anfds[fd].head, (WL)w); 2516 wlist_add (&anfds[fd].head, (WL)w);
2307 2517
2308 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2518 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2309 w->events &= ~EV__IOFDSET; 2519 w->events &= ~EV__IOFDSET;
2310 2520
2311 EV_FREQUENT_CHECK; 2521 EV_FREQUENT_CHECK;
2312} 2522}
2313 2523
2407 } 2617 }
2408 2618
2409 EV_FREQUENT_CHECK; 2619 EV_FREQUENT_CHECK;
2410} 2620}
2411 2621
2622ev_tstamp
2623ev_timer_remaining (EV_P_ ev_timer *w)
2624{
2625 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2626}
2627
2412#if EV_PERIODIC_ENABLE 2628#if EV_PERIODIC_ENABLE
2413void noinline 2629void noinline
2414ev_periodic_start (EV_P_ ev_periodic *w) 2630ev_periodic_start (EV_P_ ev_periodic *w)
2415{ 2631{
2416 if (expect_false (ev_is_active (w))) 2632 if (expect_false (ev_is_active (w)))
2483#endif 2699#endif
2484 2700
2485void noinline 2701void noinline
2486ev_signal_start (EV_P_ ev_signal *w) 2702ev_signal_start (EV_P_ ev_signal *w)
2487{ 2703{
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))) 2704 if (expect_false (ev_is_active (w)))
2492 return; 2705 return;
2493 2706
2494 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2707 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2495 2708
2496 evpipe_init (EV_A); 2709#if EV_MULTIPLICITY
2710 assert (("libev: a signal must not be attached to two different loops",
2711 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2497 2712
2498 EV_FREQUENT_CHECK; 2713 signals [w->signum - 1].loop = EV_A;
2714#endif
2499 2715
2716 EV_FREQUENT_CHECK;
2717
2718#if EV_USE_SIGNALFD
2719 if (sigfd == -2)
2500 { 2720 {
2501#ifndef _WIN32 2721 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2502 sigset_t full, prev; 2722 if (sigfd < 0 && errno == EINVAL)
2503 sigfillset (&full); 2723 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2504 sigprocmask (SIG_SETMASK, &full, &prev);
2505#endif
2506 2724
2507 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2725 if (sigfd >= 0)
2726 {
2727 fd_intern (sigfd); /* doing it twice will not hurt */
2508 2728
2509#ifndef _WIN32 2729 sigemptyset (&sigfd_set);
2510 sigprocmask (SIG_SETMASK, &prev, 0); 2730
2511#endif 2731 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2732 ev_set_priority (&sigfd_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &sigfd_w);
2734 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2735 }
2512 } 2736 }
2737
2738 if (sigfd >= 0)
2739 {
2740 /* TODO: check .head */
2741 sigaddset (&sigfd_set, w->signum);
2742 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2743
2744 signalfd (sigfd, &sigfd_set, 0);
2745 }
2746#endif
2513 2747
2514 ev_start (EV_A_ (W)w, 1); 2748 ev_start (EV_A_ (W)w, 1);
2515 wlist_add (&signals [w->signum - 1].head, (WL)w); 2749 wlist_add (&signals [w->signum - 1].head, (WL)w);
2516 2750
2517 if (!((WL)w)->next) 2751 if (!((WL)w)->next)
2752# if EV_USE_SIGNALFD
2753 if (sigfd < 0) /*TODO*/
2754# endif
2518 { 2755 {
2519#if _WIN32 2756# if _WIN32
2520 signal (w->signum, ev_sighandler); 2757 signal (w->signum, ev_sighandler);
2521#else 2758# else
2522 struct sigaction sa; 2759 struct sigaction sa;
2760
2761 evpipe_init (EV_A);
2762
2523 sa.sa_handler = ev_sighandler; 2763 sa.sa_handler = ev_sighandler;
2524 sigfillset (&sa.sa_mask); 2764 sigfillset (&sa.sa_mask);
2525 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2765 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2526 sigaction (w->signum, &sa, 0); 2766 sigaction (w->signum, &sa, 0);
2767
2768 sigemptyset (&sa.sa_mask);
2769 sigaddset (&sa.sa_mask, w->signum);
2770 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2527#endif 2771#endif
2528 } 2772 }
2529 2773
2530 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2531} 2775}
2532 2776
2533void noinline 2777void noinline
2541 2785
2542 wlist_del (&signals [w->signum - 1].head, (WL)w); 2786 wlist_del (&signals [w->signum - 1].head, (WL)w);
2543 ev_stop (EV_A_ (W)w); 2787 ev_stop (EV_A_ (W)w);
2544 2788
2545 if (!signals [w->signum - 1].head) 2789 if (!signals [w->signum - 1].head)
2790 {
2791#if EV_MULTIPLICITY
2792 signals [w->signum - 1].loop = 0; /* unattach from signal */
2793#endif
2794#if EV_USE_SIGNALFD
2795 if (sigfd >= 0)
2796 {
2797 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2798 sigdelset (&sigfd_set, w->signum);
2799 signalfd (sigfd, &sigfd_set, 0);
2800 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2801 /*TODO: maybe unblock signal? */
2802 }
2803 else
2804#endif
2546 signal (w->signum, SIG_DFL); 2805 signal (w->signum, SIG_DFL);
2806 }
2547 2807
2548 EV_FREQUENT_CHECK; 2808 EV_FREQUENT_CHECK;
2549} 2809}
2550 2810
2551void 2811void
2631 } 2891 }
2632 } 2892 }
2633 2893
2634 if (w->wd >= 0) 2894 if (w->wd >= 0)
2635 { 2895 {
2896 struct statfs sfs;
2897
2636 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2898 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2637 2899
2638 /* now local changes will be tracked by inotify, but remote changes won't */ 2900 /* now local changes will be tracked by inotify, but remote changes won't */
2639 /* unless the filesystem it known to be local, we therefore still poll */ 2901 /* unless the filesystem it known to be local, we therefore still poll */
2640 /* also do poll on <2.6.25, but with normal frequency */ 2902 /* also do poll on <2.6.25, but with normal frequency */
2641 struct statfs sfs;
2642 2903
2643 if (fs_2625 && !statfs (w->path, &sfs)) 2904 if (fs_2625 && !statfs (w->path, &sfs))
2644 if (sfs.f_type == 0x1373 /* devfs */ 2905 if (sfs.f_type == 0x1373 /* devfs */
2645 || sfs.f_type == 0xEF53 /* ext2/3 */ 2906 || sfs.f_type == 0xEF53 /* ext2/3 */
2646 || sfs.f_type == 0x3153464a /* jfs */ 2907 || sfs.f_type == 0x3153464a /* jfs */
2735 return; 2996 return;
2736 2997
2737 fs_2625 = 1; 2998 fs_2625 = 1;
2738} 2999}
2739 3000
3001inline_size int
3002infy_newfd (void)
3003{
3004#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3005 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3006 if (fd >= 0)
3007 return fd;
3008#endif
3009 return inotify_init ();
3010}
3011
2740inline_size void 3012inline_size void
2741infy_init (EV_P) 3013infy_init (EV_P)
2742{ 3014{
2743 if (fs_fd != -2) 3015 if (fs_fd != -2)
2744 return; 3016 return;
2745 3017
2746 fs_fd = -1; 3018 fs_fd = -1;
2747 3019
2748 check_2625 (EV_A); 3020 check_2625 (EV_A);
2749 3021
2750 fs_fd = inotify_init (); 3022 fs_fd = infy_newfd ();
2751 3023
2752 if (fs_fd >= 0) 3024 if (fs_fd >= 0)
2753 { 3025 {
3026 fd_intern (fs_fd);
2754 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2755 ev_set_priority (&fs_w, EV_MAXPRI); 3028 ev_set_priority (&fs_w, EV_MAXPRI);
2756 ev_io_start (EV_A_ &fs_w); 3029 ev_io_start (EV_A_ &fs_w);
2757 } 3030 }
2758} 3031}
2763 int slot; 3036 int slot;
2764 3037
2765 if (fs_fd < 0) 3038 if (fs_fd < 0)
2766 return; 3039 return;
2767 3040
3041 ev_io_stop (EV_A_ &fs_w);
2768 close (fs_fd); 3042 close (fs_fd);
2769 fs_fd = inotify_init (); 3043 fs_fd = infy_newfd ();
3044
3045 if (fs_fd >= 0)
3046 {
3047 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w);
3050 }
2770 3051
2771 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2772 { 3053 {
2773 WL w_ = fs_hash [slot].head; 3054 WL w_ = fs_hash [slot].head;
2774 fs_hash [slot].head = 0; 3055 fs_hash [slot].head = 0;
3031embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3312embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3032{ 3313{
3033 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3314 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3034 3315
3035 { 3316 {
3036 struct ev_loop *loop = w->other; 3317 EV_P = w->other;
3037 3318
3038 while (fdchangecnt) 3319 while (fdchangecnt)
3039 { 3320 {
3040 fd_reify (EV_A); 3321 fd_reify (EV_A);
3041 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3322 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3049 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3330 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3050 3331
3051 ev_embed_stop (EV_A_ w); 3332 ev_embed_stop (EV_A_ w);
3052 3333
3053 { 3334 {
3054 struct ev_loop *loop = w->other; 3335 EV_P = w->other;
3055 3336
3056 ev_loop_fork (EV_A); 3337 ev_loop_fork (EV_A);
3057 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3338 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3058 } 3339 }
3059 3340
3073{ 3354{
3074 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
3075 return; 3356 return;
3076 3357
3077 { 3358 {
3078 struct ev_loop *loop = w->other; 3359 EV_P = w->other;
3079 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3360 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); 3361 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3081 } 3362 }
3082 3363
3083 EV_FREQUENT_CHECK; 3364 EV_FREQUENT_CHECK;
3195 3476
3196void 3477void
3197ev_async_send (EV_P_ ev_async *w) 3478ev_async_send (EV_P_ ev_async *w)
3198{ 3479{
3199 w->sent = 1; 3480 w->sent = 1;
3200 evpipe_write (EV_A_ &gotasync); 3481 evpipe_write (EV_A_ &async_pending);
3201} 3482}
3202#endif 3483#endif
3203 3484
3204/*****************************************************************************/ 3485/*****************************************************************************/
3205 3486
3354 if (types & EV_CHECK) 3635 if (types & EV_CHECK)
3355 for (i = checkcnt; i--; ) 3636 for (i = checkcnt; i--; )
3356 cb (EV_A_ EV_CHECK, checks [i]); 3637 cb (EV_A_ EV_CHECK, checks [i]);
3357 3638
3358 if (types & EV_SIGNAL) 3639 if (types & EV_SIGNAL)
3359 for (i = 0; i < signalmax; ++i) 3640 for (i = 0; i < EV_NSIG - 1; ++i)
3360 for (wl = signals [i].head; wl; ) 3641 for (wl = signals [i].head; wl; )
3361 { 3642 {
3362 wn = wl->next; 3643 wn = wl->next;
3363 cb (EV_A_ EV_SIGNAL, wl); 3644 cb (EV_A_ EV_SIGNAL, wl);
3364 wl = wn; 3645 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines