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

Comparing libev/ev.c (file contents):
Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC vs.
Revision 1.313 by root, Wed Aug 19 23:44:51 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__ >= 9))
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
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
351#endif 408#endif
352 409
353/**/ 410/**/
354 411
355#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
419 476
420#if EV_USE_MONOTONIC 477#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 479#endif
423 480
481#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif
484#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
486#endif
487#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd)
489#endif
490
424#ifdef _WIN32 491#ifdef _WIN32
425# include "ev_win32.c" 492# include "ev_win32.c"
426#endif 493#endif
427 494
428/*****************************************************************************/ 495/*****************************************************************************/
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 557#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 558#define ev_free(ptr) ev_realloc ((ptr), 0)
492 559
493/*****************************************************************************/ 560/*****************************************************************************/
494 561
562/* set in reify when reification needed */
563#define EV_ANFD_REIFY 1
564
495/* file descriptor info structure */ 565/* file descriptor info structure */
496typedef struct 566typedef struct
497{ 567{
498 WL head; 568 WL head;
499 unsigned char events; /* the events watched for */ 569 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 570 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 571 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 572 unsigned char unused;
503#if EV_USE_EPOLL 573#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 574 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 575#endif
… …
568 static int ev_default_loop_ptr; 638 static int ev_default_loop_ptr;
569 639
570#endif 640#endif
571 641
572#if EV_MINIMAL < 2 642#if EV_MINIMAL < 2
573# define EV_SUSPEND_CB if (expect_false (suspend_cb)) suspend_cb (EV_A)
574# define EV_RESUME_CB if (expect_false (resume_cb )) resume_cb (EV_A) 643# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
644# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
575# define EV_INVOKE_PENDING invoke_cb (EV_A) 645# define EV_INVOKE_PENDING invoke_cb (EV_A)
576#else 646#else
577# define EV_SUSPEND_CB (void)0
578# define EV_RESUME_CB (void)0 647# define EV_RELEASE_CB (void)0
648# define EV_ACQUIRE_CB (void)0
579# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 649# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
580#endif 650#endif
651
652#define EVUNLOOP_RECURSE 0x80
581 653
582/*****************************************************************************/ 654/*****************************************************************************/
583 655
584#ifndef EV_HAVE_EV_TIME 656#ifndef EV_HAVE_EV_TIME
585ev_tstamp 657ev_tstamp
… …
642 714
643 tv.tv_sec = (time_t)delay; 715 tv.tv_sec = (time_t)delay;
644 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 716 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
645 717
646 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 718 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
647 /* somehting not guaranteed by newer posix versions, but guaranteed */ 719 /* something not guaranteed by newer posix versions, but guaranteed */
648 /* by older ones */ 720 /* by older ones */
649 select (0, 0, 0, 0, &tv); 721 select (0, 0, 0, 0, &tv);
650#endif 722#endif
651 } 723 }
652} 724}
… …
760} 832}
761 833
762/*****************************************************************************/ 834/*****************************************************************************/
763 835
764inline_speed void 836inline_speed void
765fd_event (EV_P_ int fd, int revents) 837fd_event_nc (EV_P_ int fd, int revents)
766{ 838{
767 ANFD *anfd = anfds + fd; 839 ANFD *anfd = anfds + fd;
768 ev_io *w; 840 ev_io *w;
769 841
770 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 842 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
774 if (ev) 846 if (ev)
775 ev_feed_event (EV_A_ (W)w, ev); 847 ev_feed_event (EV_A_ (W)w, ev);
776 } 848 }
777} 849}
778 850
851/* do not submit kernel events for fds that have reify set */
852/* because that means they changed while we were polling for new events */
853inline_speed void
854fd_event (EV_P_ int fd, int revents)
855{
856 ANFD *anfd = anfds + fd;
857
858 if (expect_true (!anfd->reify))
859 fd_event_nc (EV_A_ fd, revents);
860}
861
779void 862void
780ev_feed_fd_event (EV_P_ int fd, int revents) 863ev_feed_fd_event (EV_P_ int fd, int revents)
781{ 864{
782 if (fd >= 0 && fd < anfdmax) 865 if (fd >= 0 && fd < anfdmax)
783 fd_event (EV_A_ fd, revents); 866 fd_event_nc (EV_A_ fd, revents);
784} 867}
785 868
786/* make sure the external fd watch events are in-sync */ 869/* make sure the external fd watch events are in-sync */
787/* with the kernel/libev internal state */ 870/* with the kernel/libev internal state */
788inline_size void 871inline_size void
… …
803 886
804#if EV_SELECT_IS_WINSOCKET 887#if EV_SELECT_IS_WINSOCKET
805 if (events) 888 if (events)
806 { 889 {
807 unsigned long arg; 890 unsigned long arg;
808 #ifdef EV_FD_TO_WIN32_HANDLE
809 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 891 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
810 #else
811 anfd->handle = _get_osfhandle (fd);
812 #endif
813 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 892 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
814 } 893 }
815#endif 894#endif
816 895
817 { 896 {
… …
888 967
889 for (fd = anfdmax; fd--; ) 968 for (fd = anfdmax; fd--; )
890 if (anfds [fd].events) 969 if (anfds [fd].events)
891 { 970 {
892 fd_kill (EV_A_ fd); 971 fd_kill (EV_A_ fd);
893 return; 972 break;
894 } 973 }
895} 974}
896 975
897/* usually called after fork if backend needs to re-arm all fds from scratch */ 976/* usually called after fork if backend needs to re-arm all fds from scratch */
898static void noinline 977static void noinline
… …
903 for (fd = 0; fd < anfdmax; ++fd) 982 for (fd = 0; fd < anfdmax; ++fd)
904 if (anfds [fd].events) 983 if (anfds [fd].events)
905 { 984 {
906 anfds [fd].events = 0; 985 anfds [fd].events = 0;
907 anfds [fd].emask = 0; 986 anfds [fd].emask = 0;
908 fd_change (EV_A_ fd, EV__IOFDSET | 1); 987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
909 } 988 }
910} 989}
911 990
912/*****************************************************************************/ 991/*****************************************************************************/
913 992
… …
988 1067
989 for (;;) 1068 for (;;)
990 { 1069 {
991 int c = k << 1; 1070 int c = k << 1;
992 1071
993 if (c > N + HEAP0 - 1) 1072 if (c >= N + HEAP0)
994 break; 1073 break;
995 1074
996 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1075 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
997 ? 1 : 0; 1076 ? 1 : 0;
998 1077
… …
1034 1113
1035/* move an element suitably so it is in a correct place */ 1114/* move an element suitably so it is in a correct place */
1036inline_size void 1115inline_size void
1037adjustheap (ANHE *heap, int N, int k) 1116adjustheap (ANHE *heap, int N, int k)
1038{ 1117{
1039 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1118 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1040 upheap (heap, k); 1119 upheap (heap, k);
1041 else 1120 else
1042 downheap (heap, N, k); 1121 downheap (heap, N, k);
1043} 1122}
1044 1123
… …
1057/*****************************************************************************/ 1136/*****************************************************************************/
1058 1137
1059/* associate signal watchers to a signal signal */ 1138/* associate signal watchers to a signal signal */
1060typedef struct 1139typedef struct
1061{ 1140{
1141 EV_ATOMIC_T pending;
1142#if EV_MULTIPLICITY
1143 EV_P;
1144#endif
1062 WL head; 1145 WL head;
1063 EV_ATOMIC_T gotsig;
1064} ANSIG; 1146} ANSIG;
1065 1147
1066static ANSIG *signals; 1148static ANSIG signals [EV_NSIG - 1];
1067static int signalmax;
1068
1069static EV_ATOMIC_T gotsig;
1070 1149
1071/*****************************************************************************/ 1150/*****************************************************************************/
1072 1151
1073/* used to prepare libev internal fd's */ 1152/* used to prepare libev internal fd's */
1074/* this is not fork-safe */ 1153/* this is not fork-safe */
… …
1088evpipe_init (EV_P) 1167evpipe_init (EV_P)
1089{ 1168{
1090 if (!ev_is_active (&pipe_w)) 1169 if (!ev_is_active (&pipe_w))
1091 { 1170 {
1092#if EV_USE_EVENTFD 1171#if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL)
1093 if ((evfd = eventfd (0, 0)) >= 0) 1174 evfd = eventfd (0, 0);
1175
1176 if (evfd >= 0)
1094 { 1177 {
1095 evpipe [0] = -1; 1178 evpipe [0] = -1;
1096 fd_intern (evfd); 1179 fd_intern (evfd); /* doing it twice doesn't hurt */
1097 ev_io_set (&pipe_w, evfd, EV_READ); 1180 ev_io_set (&pipe_w, evfd, EV_READ);
1098 } 1181 }
1099 else 1182 else
1100#endif 1183#endif
1101 { 1184 {
… …
1138/* called whenever the libev signal pipe */ 1221/* called whenever the libev signal pipe */
1139/* got some events (signal, async) */ 1222/* got some events (signal, async) */
1140static void 1223static void
1141pipecb (EV_P_ ev_io *iow, int revents) 1224pipecb (EV_P_ ev_io *iow, int revents)
1142{ 1225{
1226 int i;
1227
1143#if EV_USE_EVENTFD 1228#if EV_USE_EVENTFD
1144 if (evfd >= 0) 1229 if (evfd >= 0)
1145 { 1230 {
1146 uint64_t counter; 1231 uint64_t counter;
1147 read (evfd, &counter, sizeof (uint64_t)); 1232 read (evfd, &counter, sizeof (uint64_t));
… …
1151 { 1236 {
1152 char dummy; 1237 char dummy;
1153 read (evpipe [0], &dummy, 1); 1238 read (evpipe [0], &dummy, 1);
1154 } 1239 }
1155 1240
1156 if (gotsig && ev_is_default_loop (EV_A)) 1241 if (sig_pending)
1157 { 1242 {
1158 int signum; 1243 sig_pending = 0;
1159 gotsig = 0;
1160 1244
1161 for (signum = signalmax; signum--; ) 1245 for (i = EV_NSIG - 1; i--; )
1162 if (signals [signum].gotsig) 1246 if (expect_false (signals [i].pending))
1163 ev_feed_signal_event (EV_A_ signum + 1); 1247 ev_feed_signal_event (EV_A_ i + 1);
1164 } 1248 }
1165 1249
1166#if EV_ASYNC_ENABLE 1250#if EV_ASYNC_ENABLE
1167 if (gotasync) 1251 if (async_pending)
1168 { 1252 {
1169 int i; 1253 async_pending = 0;
1170 gotasync = 0;
1171 1254
1172 for (i = asynccnt; i--; ) 1255 for (i = asynccnt; i--; )
1173 if (asyncs [i]->sent) 1256 if (asyncs [i]->sent)
1174 { 1257 {
1175 asyncs [i]->sent = 0; 1258 asyncs [i]->sent = 0;
… …
1183 1266
1184static void 1267static void
1185ev_sighandler (int signum) 1268ev_sighandler (int signum)
1186{ 1269{
1187#if EV_MULTIPLICITY 1270#if EV_MULTIPLICITY
1188 struct ev_loop *loop = &default_loop_struct; 1271 EV_P = signals [signum - 1].loop;
1189#endif 1272#endif
1190 1273
1191#if _WIN32 1274#if _WIN32
1192 signal (signum, ev_sighandler); 1275 signal (signum, ev_sighandler);
1193#endif 1276#endif
1194 1277
1195 signals [signum - 1].gotsig = 1; 1278 signals [signum - 1].pending = 1;
1196 evpipe_write (EV_A_ &gotsig); 1279 evpipe_write (EV_A_ &sig_pending);
1197} 1280}
1198 1281
1199void noinline 1282void noinline
1200ev_feed_signal_event (EV_P_ int signum) 1283ev_feed_signal_event (EV_P_ int signum)
1201{ 1284{
1202 WL w; 1285 WL w;
1203 1286
1287 if (expect_false (signum <= 0 || signum > EV_NSIG))
1288 return;
1289
1290 --signum;
1291
1204#if EV_MULTIPLICITY 1292#if EV_MULTIPLICITY
1205 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1293 /* it is permissible to try to feed a signal to the wrong loop */
1206#endif 1294 /* or, likely more useful, feeding a signal nobody is waiting for */
1207 1295
1208 --signum; 1296 if (expect_false (signals [signum].loop != EV_A))
1209
1210 if (signum < 0 || signum >= signalmax)
1211 return; 1297 return;
1298#endif
1212 1299
1213 signals [signum].gotsig = 0; 1300 signals [signum].pending = 0;
1214 1301
1215 for (w = signals [signum].head; w; w = w->next) 1302 for (w = signals [signum].head; w; w = w->next)
1216 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1303 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1217} 1304}
1305
1306#if EV_USE_SIGNALFD
1307static void
1308sigfdcb (EV_P_ ev_io *iow, int revents)
1309{
1310 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1311
1312 for (;;)
1313 {
1314 ssize_t res = read (sigfd, si, sizeof (si));
1315
1316 /* not ISO-C, as res might be -1, but works with SuS */
1317 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1318 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1319
1320 if (res < (ssize_t)sizeof (si))
1321 break;
1322 }
1323}
1324#endif
1218 1325
1219/*****************************************************************************/ 1326/*****************************************************************************/
1220 1327
1221static WL childs [EV_PID_HASHSIZE]; 1328static WL childs [EV_PID_HASHSIZE];
1222 1329
… …
1409void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1516void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1410{ 1517{
1411 invoke_cb = invoke_pending_cb; 1518 invoke_cb = invoke_pending_cb;
1412} 1519}
1413 1520
1414void ev_set_blocking_cb (EV_P_ void (*suspend_cb_)(EV_P), void (*resume_cb_)(EV_P)) 1521void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1415{ 1522{
1416 suspend_cb = suspend_cb_; 1523 release_cb = release;
1417 resume_cb = resume_cb_; 1524 acquire_cb = acquire;
1418} 1525}
1419#endif 1526#endif
1420 1527
1421/* initialise a loop structure, must be zero-initialised */ 1528/* initialise a loop structure, must be zero-initialised */
1422static void noinline 1529static void noinline
… …
1441 1548
1442 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1549 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1443 have_monotonic = 1; 1550 have_monotonic = 1;
1444 } 1551 }
1445#endif 1552#endif
1553
1554 /* pid check not overridable via env */
1555#ifndef _WIN32
1556 if (flags & EVFLAG_FORKCHECK)
1557 curpid = getpid ();
1558#endif
1559
1560 if (!(flags & EVFLAG_NOENV)
1561 && !enable_secure ()
1562 && getenv ("LIBEV_FLAGS"))
1563 flags = atoi (getenv ("LIBEV_FLAGS"));
1446 1564
1447 ev_rt_now = ev_time (); 1565 ev_rt_now = ev_time ();
1448 mn_now = get_clock (); 1566 mn_now = get_clock ();
1449 now_floor = mn_now; 1567 now_floor = mn_now;
1450 rtmn_diff = ev_rt_now - mn_now; 1568 rtmn_diff = ev_rt_now - mn_now;
… …
1454 1572
1455 io_blocktime = 0.; 1573 io_blocktime = 0.;
1456 timeout_blocktime = 0.; 1574 timeout_blocktime = 0.;
1457 backend = 0; 1575 backend = 0;
1458 backend_fd = -1; 1576 backend_fd = -1;
1459 gotasync = 0; 1577 sig_pending = 0;
1578#if EV_ASYNC_ENABLE
1579 async_pending = 0;
1580#endif
1460#if EV_USE_INOTIFY 1581#if EV_USE_INOTIFY
1461 fs_fd = -2; 1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1462#endif 1583#endif
1463 1584#if EV_USE_SIGNALFD
1464 /* pid check not overridable via env */ 1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1465#ifndef _WIN32
1466 if (flags & EVFLAG_FORKCHECK)
1467 curpid = getpid ();
1468#endif 1586#endif
1469
1470 if (!(flags & EVFLAG_NOENV)
1471 && !enable_secure ()
1472 && getenv ("LIBEV_FLAGS"))
1473 flags = atoi (getenv ("LIBEV_FLAGS"));
1474 1587
1475 if (!(flags & 0x0000ffffU)) 1588 if (!(flags & 0x0000ffffU))
1476 flags |= ev_recommended_backends (); 1589 flags |= ev_recommended_backends ();
1477 1590
1478#if EV_USE_PORT 1591#if EV_USE_PORT
… …
1504{ 1617{
1505 int i; 1618 int i;
1506 1619
1507 if (ev_is_active (&pipe_w)) 1620 if (ev_is_active (&pipe_w))
1508 { 1621 {
1509 ev_ref (EV_A); /* signal watcher */ 1622 /*ev_ref (EV_A);*/
1510 ev_io_stop (EV_A_ &pipe_w); 1623 /*ev_io_stop (EV_A_ &pipe_w);*/
1511 1624
1512#if EV_USE_EVENTFD 1625#if EV_USE_EVENTFD
1513 if (evfd >= 0) 1626 if (evfd >= 0)
1514 close (evfd); 1627 close (evfd);
1515#endif 1628#endif
1516 1629
1517 if (evpipe [0] >= 0) 1630 if (evpipe [0] >= 0)
1518 { 1631 {
1519 close (evpipe [0]); 1632 EV_WIN32_CLOSE_FD (evpipe [0]);
1520 close (evpipe [1]); 1633 EV_WIN32_CLOSE_FD (evpipe [1]);
1521 } 1634 }
1522 } 1635 }
1636
1637#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd);
1644 }
1645#endif
1523 1646
1524#if EV_USE_INOTIFY 1647#if EV_USE_INOTIFY
1525 if (fs_fd >= 0) 1648 if (fs_fd >= 0)
1526 close (fs_fd); 1649 close (fs_fd);
1527#endif 1650#endif
… …
1551#if EV_IDLE_ENABLE 1674#if EV_IDLE_ENABLE
1552 array_free (idle, [i]); 1675 array_free (idle, [i]);
1553#endif 1676#endif
1554 } 1677 }
1555 1678
1556 ev_free (anfds); anfdmax = 0; 1679 ev_free (anfds); anfds = 0; anfdmax = 0;
1557 1680
1558 /* have to use the microsoft-never-gets-it-right macro */ 1681 /* have to use the microsoft-never-gets-it-right macro */
1559 array_free (rfeed, EMPTY); 1682 array_free (rfeed, EMPTY);
1560 array_free (fdchange, EMPTY); 1683 array_free (fdchange, EMPTY);
1561 array_free (timer, EMPTY); 1684 array_free (timer, EMPTY);
… …
1596 1719
1597 if (ev_is_active (&pipe_w)) 1720 if (ev_is_active (&pipe_w))
1598 { 1721 {
1599 /* this "locks" the handlers against writing to the pipe */ 1722 /* this "locks" the handlers against writing to the pipe */
1600 /* while we modify the fd vars */ 1723 /* while we modify the fd vars */
1601 gotsig = 1; 1724 sig_pending = 1;
1602#if EV_ASYNC_ENABLE 1725#if EV_ASYNC_ENABLE
1603 gotasync = 1; 1726 async_pending = 1;
1604#endif 1727#endif
1605 1728
1606 ev_ref (EV_A); 1729 ev_ref (EV_A);
1607 ev_io_stop (EV_A_ &pipe_w); 1730 ev_io_stop (EV_A_ &pipe_w);
1608 1731
… …
1611 close (evfd); 1734 close (evfd);
1612#endif 1735#endif
1613 1736
1614 if (evpipe [0] >= 0) 1737 if (evpipe [0] >= 0)
1615 { 1738 {
1616 close (evpipe [0]); 1739 EV_WIN32_CLOSE_FD (evpipe [0]);
1617 close (evpipe [1]); 1740 EV_WIN32_CLOSE_FD (evpipe [1]);
1618 } 1741 }
1619 1742
1620 evpipe_init (EV_A); 1743 evpipe_init (EV_A);
1621 /* now iterate over everything, in case we missed something */ 1744 /* now iterate over everything, in case we missed something */
1622 pipecb (EV_A_ &pipe_w, EV_READ); 1745 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1628#if EV_MULTIPLICITY 1751#if EV_MULTIPLICITY
1629 1752
1630struct ev_loop * 1753struct ev_loop *
1631ev_loop_new (unsigned int flags) 1754ev_loop_new (unsigned int flags)
1632{ 1755{
1633 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1756 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1634 1757
1635 memset (loop, 0, sizeof (struct ev_loop)); 1758 memset (EV_A, 0, sizeof (struct ev_loop));
1636
1637 loop_init (EV_A_ flags); 1759 loop_init (EV_A_ flags);
1638 1760
1639 if (ev_backend (EV_A)) 1761 if (ev_backend (EV_A))
1640 return loop; 1762 return EV_A;
1641 1763
1642 return 0; 1764 return 0;
1643} 1765}
1644 1766
1645void 1767void
… …
1749 assert (checkmax >= checkcnt); 1871 assert (checkmax >= checkcnt);
1750 array_verify (EV_A_ (W *)checks, checkcnt); 1872 array_verify (EV_A_ (W *)checks, checkcnt);
1751 1873
1752# if 0 1874# if 0
1753 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1875 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1754 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1755# endif 1877# endif
1756#endif 1878#endif
1757} 1879}
1758#endif 1880#endif
1759 1881
… …
1766#endif 1888#endif
1767{ 1889{
1768 if (!ev_default_loop_ptr) 1890 if (!ev_default_loop_ptr)
1769 { 1891 {
1770#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1893 EV_P = ev_default_loop_ptr = &default_loop_struct;
1772#else 1894#else
1773 ev_default_loop_ptr = 1; 1895 ev_default_loop_ptr = 1;
1774#endif 1896#endif
1775 1897
1776 loop_init (EV_A_ flags); 1898 loop_init (EV_A_ flags);
… …
1793 1915
1794void 1916void
1795ev_default_destroy (void) 1917ev_default_destroy (void)
1796{ 1918{
1797#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1798 struct ev_loop *loop = ev_default_loop_ptr; 1920 EV_P = ev_default_loop_ptr;
1799#endif 1921#endif
1800 1922
1801 ev_default_loop_ptr = 0; 1923 ev_default_loop_ptr = 0;
1802 1924
1803#ifndef _WIN32 1925#ifndef _WIN32
… …
1810 1932
1811void 1933void
1812ev_default_fork (void) 1934ev_default_fork (void)
1813{ 1935{
1814#if EV_MULTIPLICITY 1936#if EV_MULTIPLICITY
1815 struct ev_loop *loop = ev_default_loop_ptr; 1937 EV_P = ev_default_loop_ptr;
1816#endif 1938#endif
1817 1939
1818 postfork = 1; /* must be in line with ev_loop_fork */ 1940 postfork = 1; /* must be in line with ev_loop_fork */
1819} 1941}
1820 1942
… …
1822 1944
1823void 1945void
1824ev_invoke (EV_P_ void *w, int revents) 1946ev_invoke (EV_P_ void *w, int revents)
1825{ 1947{
1826 EV_CB_INVOKE ((W)w, revents); 1948 EV_CB_INVOKE ((W)w, revents);
1949}
1950
1951unsigned int
1952ev_pending_count (EV_P)
1953{
1954 int pri;
1955 unsigned int count = 0;
1956
1957 for (pri = NUMPRI; pri--; )
1958 count += pendingcnt [pri];
1959
1960 return count;
1827} 1961}
1828 1962
1829void noinline 1963void noinline
1830ev_invoke_pending (EV_P) 1964ev_invoke_pending (EV_P)
1831{ 1965{
… …
2077{ 2211{
2078#if EV_MINIMAL < 2 2212#if EV_MINIMAL < 2
2079 ++loop_depth; 2213 ++loop_depth;
2080#endif 2214#endif
2081 2215
2216 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2217
2082 loop_done = EVUNLOOP_CANCEL; 2218 loop_done = EVUNLOOP_CANCEL;
2083 2219
2084 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2220 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2085 2221
2086 do 2222 do
… …
2113 { 2249 {
2114 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2115 EV_INVOKE_PENDING; 2251 EV_INVOKE_PENDING;
2116 } 2252 }
2117 2253
2254 if (expect_false (loop_done))
2255 break;
2256
2118 /* we might have forked, so reify kernel state if necessary */ 2257 /* we might have forked, so reify kernel state if necessary */
2119 if (expect_false (postfork)) 2258 if (expect_false (postfork))
2120 loop_fork (EV_A); 2259 loop_fork (EV_A);
2121 2260
2122 /* update fd-related kernel structures */ 2261 /* update fd-related kernel structures */
… …
2172 } 2311 }
2173 2312
2174#if EV_MINIMAL < 2 2313#if EV_MINIMAL < 2
2175 ++loop_count; 2314 ++loop_count;
2176#endif 2315#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2177 backend_poll (EV_A_ waittime); 2317 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2178 2319
2179 /* update ev_rt_now, do magic */ 2320 /* update ev_rt_now, do magic */
2180 time_update (EV_A_ waittime + sleeptime); 2321 time_update (EV_A_ waittime + sleeptime);
2181 } 2322 }
2182 2323
… …
2267inline_size void 2408inline_size void
2268wlist_del (WL *head, WL elem) 2409wlist_del (WL *head, WL elem)
2269{ 2410{
2270 while (*head) 2411 while (*head)
2271 { 2412 {
2272 if (*head == elem) 2413 if (expect_true (*head == elem))
2273 { 2414 {
2274 *head = elem->next; 2415 *head = elem->next;
2275 return; 2416 break;
2276 } 2417 }
2277 2418
2278 head = &(*head)->next; 2419 head = &(*head)->next;
2279 } 2420 }
2280} 2421}
… …
2348 2489
2349 ev_start (EV_A_ (W)w, 1); 2490 ev_start (EV_A_ (W)w, 1);
2350 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2351 wlist_add (&anfds[fd].head, (WL)w); 2492 wlist_add (&anfds[fd].head, (WL)w);
2352 2493
2353 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2494 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2354 w->events &= ~EV__IOFDSET; 2495 w->events &= ~EV__IOFDSET;
2355 2496
2356 EV_FREQUENT_CHECK; 2497 EV_FREQUENT_CHECK;
2357} 2498}
2358 2499
… …
2452 } 2593 }
2453 2594
2454 EV_FREQUENT_CHECK; 2595 EV_FREQUENT_CHECK;
2455} 2596}
2456 2597
2598ev_tstamp
2599ev_timer_remaining (EV_P_ ev_timer *w)
2600{
2601 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2602}
2603
2457#if EV_PERIODIC_ENABLE 2604#if EV_PERIODIC_ENABLE
2458void noinline 2605void noinline
2459ev_periodic_start (EV_P_ ev_periodic *w) 2606ev_periodic_start (EV_P_ ev_periodic *w)
2460{ 2607{
2461 if (expect_false (ev_is_active (w))) 2608 if (expect_false (ev_is_active (w)))
… …
2528#endif 2675#endif
2529 2676
2530void noinline 2677void noinline
2531ev_signal_start (EV_P_ ev_signal *w) 2678ev_signal_start (EV_P_ ev_signal *w)
2532{ 2679{
2533#if EV_MULTIPLICITY
2534 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2535#endif
2536 if (expect_false (ev_is_active (w))) 2680 if (expect_false (ev_is_active (w)))
2537 return; 2681 return;
2538 2682
2539 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2683 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2540 2684
2541 evpipe_init (EV_A); 2685#if EV_MULTIPLICITY
2686 assert (("libev: a signal must not be attached to two different loops",
2687 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2542 2688
2543 EV_FREQUENT_CHECK; 2689 signals [w->signum - 1].loop = EV_A;
2690#endif
2544 2691
2692 EV_FREQUENT_CHECK;
2693
2694#if EV_USE_SIGNALFD
2695 if (sigfd == -2)
2545 { 2696 {
2546#ifndef _WIN32 2697 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2547 sigset_t full, prev; 2698 if (sigfd < 0 && errno == EINVAL)
2548 sigfillset (&full); 2699 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2549 sigprocmask (SIG_SETMASK, &full, &prev);
2550#endif
2551 2700
2552 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2701 if (sigfd >= 0)
2702 {
2703 fd_intern (sigfd); /* doing it twice will not hurt */
2553 2704
2554#ifndef _WIN32 2705 sigemptyset (&sigfd_set);
2555 sigprocmask (SIG_SETMASK, &prev, 0); 2706
2556#endif 2707 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2708 ev_set_priority (&sigfd_w, EV_MAXPRI);
2709 ev_io_start (EV_A_ &sigfd_w);
2710 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2711 }
2557 } 2712 }
2713
2714 if (sigfd >= 0)
2715 {
2716 /* TODO: check .head */
2717 sigaddset (&sigfd_set, w->signum);
2718 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2719
2720 signalfd (sigfd, &sigfd_set, 0);
2721 }
2722#endif
2558 2723
2559 ev_start (EV_A_ (W)w, 1); 2724 ev_start (EV_A_ (W)w, 1);
2560 wlist_add (&signals [w->signum - 1].head, (WL)w); 2725 wlist_add (&signals [w->signum - 1].head, (WL)w);
2561 2726
2562 if (!((WL)w)->next) 2727 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/
2730# endif
2563 { 2731 {
2564#if _WIN32 2732# if _WIN32
2565 signal (w->signum, ev_sighandler); 2733 signal (w->signum, ev_sighandler);
2566#else 2734# else
2567 struct sigaction sa; 2735 struct sigaction sa;
2736
2737 evpipe_init (EV_A);
2738
2568 sa.sa_handler = ev_sighandler; 2739 sa.sa_handler = ev_sighandler;
2569 sigfillset (&sa.sa_mask); 2740 sigfillset (&sa.sa_mask);
2570 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2741 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2571 sigaction (w->signum, &sa, 0); 2742 sigaction (w->signum, &sa, 0);
2743
2744 sigemptyset (&sa.sa_mask);
2745 sigaddset (&sa.sa_mask, w->signum);
2746 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2572#endif 2747#endif
2573 } 2748 }
2574 2749
2575 EV_FREQUENT_CHECK; 2750 EV_FREQUENT_CHECK;
2576} 2751}
2577 2752
2578void noinline 2753void noinline
… …
2586 2761
2587 wlist_del (&signals [w->signum - 1].head, (WL)w); 2762 wlist_del (&signals [w->signum - 1].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2763 ev_stop (EV_A_ (W)w);
2589 2764
2590 if (!signals [w->signum - 1].head) 2765 if (!signals [w->signum - 1].head)
2766 {
2767#if EV_MULTIPLICITY
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif
2770#if EV_USE_SIGNALFD
2771 if (sigfd >= 0)
2772 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2774 sigdelset (&sigfd_set, w->signum);
2775 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2777 /*TODO: maybe unblock signal? */
2778 }
2779 else
2780#endif
2591 signal (w->signum, SIG_DFL); 2781 signal (w->signum, SIG_DFL);
2782 }
2592 2783
2593 EV_FREQUENT_CHECK; 2784 EV_FREQUENT_CHECK;
2594} 2785}
2595 2786
2596void 2787void
… …
2676 } 2867 }
2677 } 2868 }
2678 2869
2679 if (w->wd >= 0) 2870 if (w->wd >= 0)
2680 { 2871 {
2872 struct statfs sfs;
2873
2681 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2682 2875
2683 /* now local changes will be tracked by inotify, but remote changes won't */ 2876 /* now local changes will be tracked by inotify, but remote changes won't */
2684 /* unless the filesystem it known to be local, we therefore still poll */ 2877 /* unless the filesystem it known to be local, we therefore still poll */
2685 /* also do poll on <2.6.25, but with normal frequency */ 2878 /* also do poll on <2.6.25, but with normal frequency */
2686 struct statfs sfs;
2687 2879
2688 if (fs_2625 && !statfs (w->path, &sfs)) 2880 if (fs_2625 && !statfs (w->path, &sfs))
2689 if (sfs.f_type == 0x1373 /* devfs */ 2881 if (sfs.f_type == 0x1373 /* devfs */
2690 || sfs.f_type == 0xEF53 /* ext2/3 */ 2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2691 || sfs.f_type == 0x3153464a /* jfs */ 2883 || sfs.f_type == 0x3153464a /* jfs */
… …
3076embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3077{ 3269{
3078 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3270 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3079 3271
3080 { 3272 {
3081 struct ev_loop *loop = w->other; 3273 EV_P = w->other;
3082 3274
3083 while (fdchangecnt) 3275 while (fdchangecnt)
3084 { 3276 {
3085 fd_reify (EV_A); 3277 fd_reify (EV_A);
3086 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3094 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3286 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3095 3287
3096 ev_embed_stop (EV_A_ w); 3288 ev_embed_stop (EV_A_ w);
3097 3289
3098 { 3290 {
3099 struct ev_loop *loop = w->other; 3291 EV_P = w->other;
3100 3292
3101 ev_loop_fork (EV_A); 3293 ev_loop_fork (EV_A);
3102 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3103 } 3295 }
3104 3296
… …
3118{ 3310{
3119 if (expect_false (ev_is_active (w))) 3311 if (expect_false (ev_is_active (w)))
3120 return; 3312 return;
3121 3313
3122 { 3314 {
3123 struct ev_loop *loop = w->other; 3315 EV_P = w->other;
3124 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3316 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3125 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3317 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3126 } 3318 }
3127 3319
3128 EV_FREQUENT_CHECK; 3320 EV_FREQUENT_CHECK;
… …
3240 3432
3241void 3433void
3242ev_async_send (EV_P_ ev_async *w) 3434ev_async_send (EV_P_ ev_async *w)
3243{ 3435{
3244 w->sent = 1; 3436 w->sent = 1;
3245 evpipe_write (EV_A_ &gotasync); 3437 evpipe_write (EV_A_ &async_pending);
3246} 3438}
3247#endif 3439#endif
3248 3440
3249/*****************************************************************************/ 3441/*****************************************************************************/
3250 3442
… …
3399 if (types & EV_CHECK) 3591 if (types & EV_CHECK)
3400 for (i = checkcnt; i--; ) 3592 for (i = checkcnt; i--; )
3401 cb (EV_A_ EV_CHECK, checks [i]); 3593 cb (EV_A_ EV_CHECK, checks [i]);
3402 3594
3403 if (types & EV_SIGNAL) 3595 if (types & EV_SIGNAL)
3404 for (i = 0; i < signalmax; ++i) 3596 for (i = 0; i < EV_NSIG - 1; ++i)
3405 for (wl = signals [i].head; wl; ) 3597 for (wl = signals [i].head; wl; )
3406 { 3598 {
3407 wn = wl->next; 3599 wn = wl->next;
3408 cb (EV_A_ EV_SIGNAL, wl); 3600 cb (EV_A_ EV_SIGNAL, wl);
3409 wl = wn; 3601 wl = wn;

Diff Legend

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