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.311 by root, Wed Jul 29 09:36:05 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
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 547#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 548#define ev_free(ptr) ev_realloc ((ptr), 0)
492 549
493/*****************************************************************************/ 550/*****************************************************************************/
494 551
552/* set in reify when reification needed */
553#define EV_ANFD_REIFY 1
554
495/* file descriptor info structure */ 555/* file descriptor info structure */
496typedef struct 556typedef struct
497{ 557{
498 WL head; 558 WL head;
499 unsigned char events; /* the events watched for */ 559 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 560 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 */ 561 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 562 unsigned char unused;
503#if EV_USE_EPOLL 563#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 564 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 565#endif
… …
568 static int ev_default_loop_ptr; 628 static int ev_default_loop_ptr;
569 629
570#endif 630#endif
571 631
572#if EV_MINIMAL < 2 632#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) 633# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
634# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
575# define EV_INVOKE_PENDING invoke_cb (EV_A) 635# define EV_INVOKE_PENDING invoke_cb (EV_A)
576#else 636#else
577# define EV_SUSPEND_CB (void)0
578# define EV_RESUME_CB (void)0 637# define EV_RELEASE_CB (void)0
638# define EV_ACQUIRE_CB (void)0
579# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 639# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
580#endif 640#endif
641
642#define EVUNLOOP_RECURSE 0x80
581 643
582/*****************************************************************************/ 644/*****************************************************************************/
583 645
584#ifndef EV_HAVE_EV_TIME 646#ifndef EV_HAVE_EV_TIME
585ev_tstamp 647ev_tstamp
… …
642 704
643 tv.tv_sec = (time_t)delay; 705 tv.tv_sec = (time_t)delay;
644 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 706 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
645 707
646 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 708 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
647 /* somehting not guaranteed by newer posix versions, but guaranteed */ 709 /* something not guaranteed by newer posix versions, but guaranteed */
648 /* by older ones */ 710 /* by older ones */
649 select (0, 0, 0, 0, &tv); 711 select (0, 0, 0, 0, &tv);
650#endif 712#endif
651 } 713 }
652} 714}
… …
760} 822}
761 823
762/*****************************************************************************/ 824/*****************************************************************************/
763 825
764inline_speed void 826inline_speed void
765fd_event (EV_P_ int fd, int revents) 827fd_event_nc (EV_P_ int fd, int revents)
766{ 828{
767 ANFD *anfd = anfds + fd; 829 ANFD *anfd = anfds + fd;
768 ev_io *w; 830 ev_io *w;
769 831
770 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 832 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
774 if (ev) 836 if (ev)
775 ev_feed_event (EV_A_ (W)w, ev); 837 ev_feed_event (EV_A_ (W)w, ev);
776 } 838 }
777} 839}
778 840
841/* do not submit kernel events for fds that have reify set */
842/* because that means they changed while we were polling for new events */
843inline_speed void
844fd_event (EV_P_ int fd, int revents)
845{
846 ANFD *anfd = anfds + fd;
847
848 if (expect_true (!anfd->reify))
849 fd_event_nc (EV_A_ fd, revents);
850}
851
779void 852void
780ev_feed_fd_event (EV_P_ int fd, int revents) 853ev_feed_fd_event (EV_P_ int fd, int revents)
781{ 854{
782 if (fd >= 0 && fd < anfdmax) 855 if (fd >= 0 && fd < anfdmax)
783 fd_event (EV_A_ fd, revents); 856 fd_event_nc (EV_A_ fd, revents);
784} 857}
785 858
786/* make sure the external fd watch events are in-sync */ 859/* make sure the external fd watch events are in-sync */
787/* with the kernel/libev internal state */ 860/* with the kernel/libev internal state */
788inline_size void 861inline_size void
… …
888 961
889 for (fd = anfdmax; fd--; ) 962 for (fd = anfdmax; fd--; )
890 if (anfds [fd].events) 963 if (anfds [fd].events)
891 { 964 {
892 fd_kill (EV_A_ fd); 965 fd_kill (EV_A_ fd);
893 return; 966 break;
894 } 967 }
895} 968}
896 969
897/* usually called after fork if backend needs to re-arm all fds from scratch */ 970/* usually called after fork if backend needs to re-arm all fds from scratch */
898static void noinline 971static void noinline
… …
903 for (fd = 0; fd < anfdmax; ++fd) 976 for (fd = 0; fd < anfdmax; ++fd)
904 if (anfds [fd].events) 977 if (anfds [fd].events)
905 { 978 {
906 anfds [fd].events = 0; 979 anfds [fd].events = 0;
907 anfds [fd].emask = 0; 980 anfds [fd].emask = 0;
908 fd_change (EV_A_ fd, EV__IOFDSET | 1); 981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
909 } 982 }
910} 983}
911 984
912/*****************************************************************************/ 985/*****************************************************************************/
913 986
… …
988 1061
989 for (;;) 1062 for (;;)
990 { 1063 {
991 int c = k << 1; 1064 int c = k << 1;
992 1065
993 if (c > N + HEAP0 - 1) 1066 if (c >= N + HEAP0)
994 break; 1067 break;
995 1068
996 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1069 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
997 ? 1 : 0; 1070 ? 1 : 0;
998 1071
… …
1034 1107
1035/* move an element suitably so it is in a correct place */ 1108/* move an element suitably so it is in a correct place */
1036inline_size void 1109inline_size void
1037adjustheap (ANHE *heap, int N, int k) 1110adjustheap (ANHE *heap, int N, int k)
1038{ 1111{
1039 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1112 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1040 upheap (heap, k); 1113 upheap (heap, k);
1041 else 1114 else
1042 downheap (heap, N, k); 1115 downheap (heap, N, k);
1043} 1116}
1044 1117
… …
1057/*****************************************************************************/ 1130/*****************************************************************************/
1058 1131
1059/* associate signal watchers to a signal signal */ 1132/* associate signal watchers to a signal signal */
1060typedef struct 1133typedef struct
1061{ 1134{
1135 EV_ATOMIC_T pending;
1136#if EV_MULTIPLICITY
1137 EV_P;
1138#endif
1062 WL head; 1139 WL head;
1063 EV_ATOMIC_T gotsig;
1064} ANSIG; 1140} ANSIG;
1065 1141
1066static ANSIG *signals; 1142static ANSIG signals [EV_NSIG - 1];
1067static int signalmax;
1068
1069static EV_ATOMIC_T gotsig;
1070 1143
1071/*****************************************************************************/ 1144/*****************************************************************************/
1072 1145
1073/* used to prepare libev internal fd's */ 1146/* used to prepare libev internal fd's */
1074/* this is not fork-safe */ 1147/* this is not fork-safe */
… …
1088evpipe_init (EV_P) 1161evpipe_init (EV_P)
1089{ 1162{
1090 if (!ev_is_active (&pipe_w)) 1163 if (!ev_is_active (&pipe_w))
1091 { 1164 {
1092#if EV_USE_EVENTFD 1165#if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL)
1093 if ((evfd = eventfd (0, 0)) >= 0) 1168 evfd = eventfd (0, 0);
1169
1170 if (evfd >= 0)
1094 { 1171 {
1095 evpipe [0] = -1; 1172 evpipe [0] = -1;
1096 fd_intern (evfd); 1173 fd_intern (evfd); /* doing it twice doesn't hurt */
1097 ev_io_set (&pipe_w, evfd, EV_READ); 1174 ev_io_set (&pipe_w, evfd, EV_READ);
1098 } 1175 }
1099 else 1176 else
1100#endif 1177#endif
1101 { 1178 {
… …
1138/* called whenever the libev signal pipe */ 1215/* called whenever the libev signal pipe */
1139/* got some events (signal, async) */ 1216/* got some events (signal, async) */
1140static void 1217static void
1141pipecb (EV_P_ ev_io *iow, int revents) 1218pipecb (EV_P_ ev_io *iow, int revents)
1142{ 1219{
1220 int i;
1221
1143#if EV_USE_EVENTFD 1222#if EV_USE_EVENTFD
1144 if (evfd >= 0) 1223 if (evfd >= 0)
1145 { 1224 {
1146 uint64_t counter; 1225 uint64_t counter;
1147 read (evfd, &counter, sizeof (uint64_t)); 1226 read (evfd, &counter, sizeof (uint64_t));
… …
1151 { 1230 {
1152 char dummy; 1231 char dummy;
1153 read (evpipe [0], &dummy, 1); 1232 read (evpipe [0], &dummy, 1);
1154 } 1233 }
1155 1234
1156 if (gotsig && ev_is_default_loop (EV_A)) 1235 if (sig_pending)
1157 { 1236 {
1158 int signum; 1237 sig_pending = 0;
1159 gotsig = 0;
1160 1238
1161 for (signum = signalmax; signum--; ) 1239 for (i = EV_NSIG - 1; i--; )
1162 if (signals [signum].gotsig) 1240 if (expect_false (signals [i].pending))
1163 ev_feed_signal_event (EV_A_ signum + 1); 1241 ev_feed_signal_event (EV_A_ i + 1);
1164 } 1242 }
1165 1243
1166#if EV_ASYNC_ENABLE 1244#if EV_ASYNC_ENABLE
1167 if (gotasync) 1245 if (async_pending)
1168 { 1246 {
1169 int i; 1247 async_pending = 0;
1170 gotasync = 0;
1171 1248
1172 for (i = asynccnt; i--; ) 1249 for (i = asynccnt; i--; )
1173 if (asyncs [i]->sent) 1250 if (asyncs [i]->sent)
1174 { 1251 {
1175 asyncs [i]->sent = 0; 1252 asyncs [i]->sent = 0;
… …
1183 1260
1184static void 1261static void
1185ev_sighandler (int signum) 1262ev_sighandler (int signum)
1186{ 1263{
1187#if EV_MULTIPLICITY 1264#if EV_MULTIPLICITY
1188 struct ev_loop *loop = &default_loop_struct; 1265 EV_P = signals [signum - 1].loop;
1189#endif 1266#endif
1190 1267
1191#if _WIN32 1268#if _WIN32
1192 signal (signum, ev_sighandler); 1269 signal (signum, ev_sighandler);
1193#endif 1270#endif
1194 1271
1195 signals [signum - 1].gotsig = 1; 1272 signals [signum - 1].pending = 1;
1196 evpipe_write (EV_A_ &gotsig); 1273 evpipe_write (EV_A_ &sig_pending);
1197} 1274}
1198 1275
1199void noinline 1276void noinline
1200ev_feed_signal_event (EV_P_ int signum) 1277ev_feed_signal_event (EV_P_ int signum)
1201{ 1278{
1202 WL w; 1279 WL w;
1203 1280
1281 if (expect_false (signum <= 0 || signum > EV_NSIG))
1282 return;
1283
1284 --signum;
1285
1204#if EV_MULTIPLICITY 1286#if EV_MULTIPLICITY
1205 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1287 /* it is permissible to try to feed a signal to the wrong loop */
1206#endif 1288 /* or, likely more useful, feeding a signal nobody is waiting for */
1207 1289
1208 --signum; 1290 if (expect_false (signals [signum].loop != EV_A))
1209
1210 if (signum < 0 || signum >= signalmax)
1211 return; 1291 return;
1292#endif
1212 1293
1213 signals [signum].gotsig = 0; 1294 signals [signum].pending = 0;
1214 1295
1215 for (w = signals [signum].head; w; w = w->next) 1296 for (w = signals [signum].head; w; w = w->next)
1216 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1297 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1217} 1298}
1299
1300#if EV_USE_SIGNALFD
1301static void
1302sigfdcb (EV_P_ ev_io *iow, int revents)
1303{
1304 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1305
1306 for (;;)
1307 {
1308 ssize_t res = read (sigfd, si, sizeof (si));
1309
1310 /* not ISO-C, as res might be -1, but works with SuS */
1311 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1312 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1313
1314 if (res < (ssize_t)sizeof (si))
1315 break;
1316 }
1317}
1318#endif
1218 1319
1219/*****************************************************************************/ 1320/*****************************************************************************/
1220 1321
1221static WL childs [EV_PID_HASHSIZE]; 1322static WL childs [EV_PID_HASHSIZE];
1222 1323
… …
1409void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1510void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1410{ 1511{
1411 invoke_cb = invoke_pending_cb; 1512 invoke_cb = invoke_pending_cb;
1412} 1513}
1413 1514
1414void ev_set_blocking_cb (EV_P_ void (*suspend_cb_)(EV_P), void (*resume_cb_)(EV_P)) 1515void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1415{ 1516{
1416 suspend_cb = suspend_cb_; 1517 release_cb = release;
1417 resume_cb = resume_cb_; 1518 acquire_cb = acquire;
1418} 1519}
1419#endif 1520#endif
1420 1521
1421/* initialise a loop structure, must be zero-initialised */ 1522/* initialise a loop structure, must be zero-initialised */
1422static void noinline 1523static void noinline
… …
1441 1542
1442 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1543 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1443 have_monotonic = 1; 1544 have_monotonic = 1;
1444 } 1545 }
1445#endif 1546#endif
1547
1548 /* pid check not overridable via env */
1549#ifndef _WIN32
1550 if (flags & EVFLAG_FORKCHECK)
1551 curpid = getpid ();
1552#endif
1553
1554 if (!(flags & EVFLAG_NOENV)
1555 && !enable_secure ()
1556 && getenv ("LIBEV_FLAGS"))
1557 flags = atoi (getenv ("LIBEV_FLAGS"));
1446 1558
1447 ev_rt_now = ev_time (); 1559 ev_rt_now = ev_time ();
1448 mn_now = get_clock (); 1560 mn_now = get_clock ();
1449 now_floor = mn_now; 1561 now_floor = mn_now;
1450 rtmn_diff = ev_rt_now - mn_now; 1562 rtmn_diff = ev_rt_now - mn_now;
… …
1454 1566
1455 io_blocktime = 0.; 1567 io_blocktime = 0.;
1456 timeout_blocktime = 0.; 1568 timeout_blocktime = 0.;
1457 backend = 0; 1569 backend = 0;
1458 backend_fd = -1; 1570 backend_fd = -1;
1459 gotasync = 0; 1571 sig_pending = 0;
1572#if EV_ASYNC_ENABLE
1573 async_pending = 0;
1574#endif
1460#if EV_USE_INOTIFY 1575#if EV_USE_INOTIFY
1461 fs_fd = -2; 1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1462#endif 1577#endif
1463 1578#if EV_USE_SIGNALFD
1464 /* pid check not overridable via env */ 1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1465#ifndef _WIN32
1466 if (flags & EVFLAG_FORKCHECK)
1467 curpid = getpid ();
1468#endif 1580#endif
1469
1470 if (!(flags & EVFLAG_NOENV)
1471 && !enable_secure ()
1472 && getenv ("LIBEV_FLAGS"))
1473 flags = atoi (getenv ("LIBEV_FLAGS"));
1474 1581
1475 if (!(flags & 0x0000ffffU)) 1582 if (!(flags & 0x0000ffffU))
1476 flags |= ev_recommended_backends (); 1583 flags |= ev_recommended_backends ();
1477 1584
1478#if EV_USE_PORT 1585#if EV_USE_PORT
… …
1504{ 1611{
1505 int i; 1612 int i;
1506 1613
1507 if (ev_is_active (&pipe_w)) 1614 if (ev_is_active (&pipe_w))
1508 { 1615 {
1509 ev_ref (EV_A); /* signal watcher */ 1616 /*ev_ref (EV_A);*/
1510 ev_io_stop (EV_A_ &pipe_w); 1617 /*ev_io_stop (EV_A_ &pipe_w);*/
1511 1618
1512#if EV_USE_EVENTFD 1619#if EV_USE_EVENTFD
1513 if (evfd >= 0) 1620 if (evfd >= 0)
1514 close (evfd); 1621 close (evfd);
1515#endif 1622#endif
… …
1519 close (evpipe [0]); 1626 close (evpipe [0]);
1520 close (evpipe [1]); 1627 close (evpipe [1]);
1521 } 1628 }
1522 } 1629 }
1523 1630
1631#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd);
1638 }
1639#endif
1640
1524#if EV_USE_INOTIFY 1641#if EV_USE_INOTIFY
1525 if (fs_fd >= 0) 1642 if (fs_fd >= 0)
1526 close (fs_fd); 1643 close (fs_fd);
1527#endif 1644#endif
1528 1645
… …
1551#if EV_IDLE_ENABLE 1668#if EV_IDLE_ENABLE
1552 array_free (idle, [i]); 1669 array_free (idle, [i]);
1553#endif 1670#endif
1554 } 1671 }
1555 1672
1556 ev_free (anfds); anfdmax = 0; 1673 ev_free (anfds); anfds = 0; anfdmax = 0;
1557 1674
1558 /* have to use the microsoft-never-gets-it-right macro */ 1675 /* have to use the microsoft-never-gets-it-right macro */
1559 array_free (rfeed, EMPTY); 1676 array_free (rfeed, EMPTY);
1560 array_free (fdchange, EMPTY); 1677 array_free (fdchange, EMPTY);
1561 array_free (timer, EMPTY); 1678 array_free (timer, EMPTY);
… …
1596 1713
1597 if (ev_is_active (&pipe_w)) 1714 if (ev_is_active (&pipe_w))
1598 { 1715 {
1599 /* this "locks" the handlers against writing to the pipe */ 1716 /* this "locks" the handlers against writing to the pipe */
1600 /* while we modify the fd vars */ 1717 /* while we modify the fd vars */
1601 gotsig = 1; 1718 sig_pending = 1;
1602#if EV_ASYNC_ENABLE 1719#if EV_ASYNC_ENABLE
1603 gotasync = 1; 1720 async_pending = 1;
1604#endif 1721#endif
1605 1722
1606 ev_ref (EV_A); 1723 ev_ref (EV_A);
1607 ev_io_stop (EV_A_ &pipe_w); 1724 ev_io_stop (EV_A_ &pipe_w);
1608 1725
… …
1628#if EV_MULTIPLICITY 1745#if EV_MULTIPLICITY
1629 1746
1630struct ev_loop * 1747struct ev_loop *
1631ev_loop_new (unsigned int flags) 1748ev_loop_new (unsigned int flags)
1632{ 1749{
1633 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1750 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1634 1751
1635 memset (loop, 0, sizeof (struct ev_loop)); 1752 memset (EV_A, 0, sizeof (struct ev_loop));
1636
1637 loop_init (EV_A_ flags); 1753 loop_init (EV_A_ flags);
1638 1754
1639 if (ev_backend (EV_A)) 1755 if (ev_backend (EV_A))
1640 return loop; 1756 return EV_A;
1641 1757
1642 return 0; 1758 return 0;
1643} 1759}
1644 1760
1645void 1761void
… …
1749 assert (checkmax >= checkcnt); 1865 assert (checkmax >= checkcnt);
1750 array_verify (EV_A_ (W *)checks, checkcnt); 1866 array_verify (EV_A_ (W *)checks, checkcnt);
1751 1867
1752# if 0 1868# if 0
1753 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1869 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) 1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1755# endif 1871# endif
1756#endif 1872#endif
1757} 1873}
1758#endif 1874#endif
1759 1875
… …
1766#endif 1882#endif
1767{ 1883{
1768 if (!ev_default_loop_ptr) 1884 if (!ev_default_loop_ptr)
1769 { 1885 {
1770#if EV_MULTIPLICITY 1886#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1887 EV_P = ev_default_loop_ptr = &default_loop_struct;
1772#else 1888#else
1773 ev_default_loop_ptr = 1; 1889 ev_default_loop_ptr = 1;
1774#endif 1890#endif
1775 1891
1776 loop_init (EV_A_ flags); 1892 loop_init (EV_A_ flags);
… …
1793 1909
1794void 1910void
1795ev_default_destroy (void) 1911ev_default_destroy (void)
1796{ 1912{
1797#if EV_MULTIPLICITY 1913#if EV_MULTIPLICITY
1798 struct ev_loop *loop = ev_default_loop_ptr; 1914 EV_P = ev_default_loop_ptr;
1799#endif 1915#endif
1800 1916
1801 ev_default_loop_ptr = 0; 1917 ev_default_loop_ptr = 0;
1802 1918
1803#ifndef _WIN32 1919#ifndef _WIN32
… …
1810 1926
1811void 1927void
1812ev_default_fork (void) 1928ev_default_fork (void)
1813{ 1929{
1814#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1815 struct ev_loop *loop = ev_default_loop_ptr; 1931 EV_P = ev_default_loop_ptr;
1816#endif 1932#endif
1817 1933
1818 postfork = 1; /* must be in line with ev_loop_fork */ 1934 postfork = 1; /* must be in line with ev_loop_fork */
1819} 1935}
1820 1936
… …
1822 1938
1823void 1939void
1824ev_invoke (EV_P_ void *w, int revents) 1940ev_invoke (EV_P_ void *w, int revents)
1825{ 1941{
1826 EV_CB_INVOKE ((W)w, revents); 1942 EV_CB_INVOKE ((W)w, revents);
1943}
1944
1945unsigned int
1946ev_pending_count (EV_P)
1947{
1948 int pri;
1949 unsigned int count = 0;
1950
1951 for (pri = NUMPRI; pri--; )
1952 count += pendingcnt [pri];
1953
1954 return count;
1827} 1955}
1828 1956
1829void noinline 1957void noinline
1830ev_invoke_pending (EV_P) 1958ev_invoke_pending (EV_P)
1831{ 1959{
… …
2077{ 2205{
2078#if EV_MINIMAL < 2 2206#if EV_MINIMAL < 2
2079 ++loop_depth; 2207 ++loop_depth;
2080#endif 2208#endif
2081 2209
2210 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2211
2082 loop_done = EVUNLOOP_CANCEL; 2212 loop_done = EVUNLOOP_CANCEL;
2083 2213
2084 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2214 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2085 2215
2086 do 2216 do
… …
2113 { 2243 {
2114 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2115 EV_INVOKE_PENDING; 2245 EV_INVOKE_PENDING;
2116 } 2246 }
2117 2247
2248 if (expect_false (loop_done))
2249 break;
2250
2118 /* we might have forked, so reify kernel state if necessary */ 2251 /* we might have forked, so reify kernel state if necessary */
2119 if (expect_false (postfork)) 2252 if (expect_false (postfork))
2120 loop_fork (EV_A); 2253 loop_fork (EV_A);
2121 2254
2122 /* update fd-related kernel structures */ 2255 /* update fd-related kernel structures */
… …
2172 } 2305 }
2173 2306
2174#if EV_MINIMAL < 2 2307#if EV_MINIMAL < 2
2175 ++loop_count; 2308 ++loop_count;
2176#endif 2309#endif
2310 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2177 backend_poll (EV_A_ waittime); 2311 backend_poll (EV_A_ waittime);
2312 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2178 2313
2179 /* update ev_rt_now, do magic */ 2314 /* update ev_rt_now, do magic */
2180 time_update (EV_A_ waittime + sleeptime); 2315 time_update (EV_A_ waittime + sleeptime);
2181 } 2316 }
2182 2317
… …
2267inline_size void 2402inline_size void
2268wlist_del (WL *head, WL elem) 2403wlist_del (WL *head, WL elem)
2269{ 2404{
2270 while (*head) 2405 while (*head)
2271 { 2406 {
2272 if (*head == elem) 2407 if (expect_true (*head == elem))
2273 { 2408 {
2274 *head = elem->next; 2409 *head = elem->next;
2275 return; 2410 break;
2276 } 2411 }
2277 2412
2278 head = &(*head)->next; 2413 head = &(*head)->next;
2279 } 2414 }
2280} 2415}
… …
2348 2483
2349 ev_start (EV_A_ (W)w, 1); 2484 ev_start (EV_A_ (W)w, 1);
2350 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2351 wlist_add (&anfds[fd].head, (WL)w); 2486 wlist_add (&anfds[fd].head, (WL)w);
2352 2487
2353 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2488 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2354 w->events &= ~EV__IOFDSET; 2489 w->events &= ~EV__IOFDSET;
2355 2490
2356 EV_FREQUENT_CHECK; 2491 EV_FREQUENT_CHECK;
2357} 2492}
2358 2493
… …
2452 } 2587 }
2453 2588
2454 EV_FREQUENT_CHECK; 2589 EV_FREQUENT_CHECK;
2455} 2590}
2456 2591
2592ev_tstamp
2593ev_timer_remaining (EV_P_ ev_timer *w)
2594{
2595 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2596}
2597
2457#if EV_PERIODIC_ENABLE 2598#if EV_PERIODIC_ENABLE
2458void noinline 2599void noinline
2459ev_periodic_start (EV_P_ ev_periodic *w) 2600ev_periodic_start (EV_P_ ev_periodic *w)
2460{ 2601{
2461 if (expect_false (ev_is_active (w))) 2602 if (expect_false (ev_is_active (w)))
… …
2528#endif 2669#endif
2529 2670
2530void noinline 2671void noinline
2531ev_signal_start (EV_P_ ev_signal *w) 2672ev_signal_start (EV_P_ ev_signal *w)
2532{ 2673{
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))) 2674 if (expect_false (ev_is_active (w)))
2537 return; 2675 return;
2538 2676
2539 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2677 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2540 2678
2541 evpipe_init (EV_A); 2679#if EV_MULTIPLICITY
2680 assert (("libev: a signal must not be attached to two different loops",
2681 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2542 2682
2543 EV_FREQUENT_CHECK; 2683 signals [w->signum - 1].loop = EV_A;
2684#endif
2544 2685
2686 EV_FREQUENT_CHECK;
2687
2688#if EV_USE_SIGNALFD
2689 if (sigfd == -2)
2545 { 2690 {
2546#ifndef _WIN32 2691 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2547 sigset_t full, prev; 2692 if (sigfd < 0 && errno == EINVAL)
2548 sigfillset (&full); 2693 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2549 sigprocmask (SIG_SETMASK, &full, &prev);
2550#endif
2551 2694
2552 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2695 if (sigfd >= 0)
2696 {
2697 fd_intern (sigfd); /* doing it twice will not hurt */
2553 2698
2554#ifndef _WIN32 2699 sigemptyset (&sigfd_set);
2555 sigprocmask (SIG_SETMASK, &prev, 0); 2700
2556#endif 2701 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2702 ev_set_priority (&sigfd_w, EV_MAXPRI);
2703 ev_io_start (EV_A_ &sigfd_w);
2704 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2705 }
2557 } 2706 }
2707
2708 if (sigfd >= 0)
2709 {
2710 /* TODO: check .head */
2711 sigaddset (&sigfd_set, w->signum);
2712 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2713
2714 signalfd (sigfd, &sigfd_set, 0);
2715 }
2716#endif
2558 2717
2559 ev_start (EV_A_ (W)w, 1); 2718 ev_start (EV_A_ (W)w, 1);
2560 wlist_add (&signals [w->signum - 1].head, (WL)w); 2719 wlist_add (&signals [w->signum - 1].head, (WL)w);
2561 2720
2562 if (!((WL)w)->next) 2721 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/
2724# endif
2563 { 2725 {
2564#if _WIN32 2726# if _WIN32
2565 signal (w->signum, ev_sighandler); 2727 signal (w->signum, ev_sighandler);
2566#else 2728# else
2567 struct sigaction sa; 2729 struct sigaction sa;
2730
2731 evpipe_init (EV_A);
2732
2568 sa.sa_handler = ev_sighandler; 2733 sa.sa_handler = ev_sighandler;
2569 sigfillset (&sa.sa_mask); 2734 sigfillset (&sa.sa_mask);
2570 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2735 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2571 sigaction (w->signum, &sa, 0); 2736 sigaction (w->signum, &sa, 0);
2737
2738 sigemptyset (&sa.sa_mask);
2739 sigaddset (&sa.sa_mask, w->signum);
2740 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2572#endif 2741#endif
2573 } 2742 }
2574 2743
2575 EV_FREQUENT_CHECK; 2744 EV_FREQUENT_CHECK;
2576} 2745}
2577 2746
2578void noinline 2747void noinline
… …
2586 2755
2587 wlist_del (&signals [w->signum - 1].head, (WL)w); 2756 wlist_del (&signals [w->signum - 1].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2589 2758
2590 if (!signals [w->signum - 1].head) 2759 if (!signals [w->signum - 1].head)
2760 {
2761#if EV_MULTIPLICITY
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif
2764#if EV_USE_SIGNALFD
2765 if (sigfd >= 0)
2766 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2768 sigdelset (&sigfd_set, w->signum);
2769 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2771 /*TODO: maybe unblock signal? */
2772 }
2773 else
2774#endif
2591 signal (w->signum, SIG_DFL); 2775 signal (w->signum, SIG_DFL);
2776 }
2592 2777
2593 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2594} 2779}
2595 2780
2596void 2781void
… …
3076embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3261embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3077{ 3262{
3078 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3263 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3079 3264
3080 { 3265 {
3081 struct ev_loop *loop = w->other; 3266 EV_P = w->other;
3082 3267
3083 while (fdchangecnt) 3268 while (fdchangecnt)
3084 { 3269 {
3085 fd_reify (EV_A); 3270 fd_reify (EV_A);
3086 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3271 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3094 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3279 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3095 3280
3096 ev_embed_stop (EV_A_ w); 3281 ev_embed_stop (EV_A_ w);
3097 3282
3098 { 3283 {
3099 struct ev_loop *loop = w->other; 3284 EV_P = w->other;
3100 3285
3101 ev_loop_fork (EV_A); 3286 ev_loop_fork (EV_A);
3102 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3287 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3103 } 3288 }
3104 3289
… …
3118{ 3303{
3119 if (expect_false (ev_is_active (w))) 3304 if (expect_false (ev_is_active (w)))
3120 return; 3305 return;
3121 3306
3122 { 3307 {
3123 struct ev_loop *loop = w->other; 3308 EV_P = w->other;
3124 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3309 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); 3310 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3126 } 3311 }
3127 3312
3128 EV_FREQUENT_CHECK; 3313 EV_FREQUENT_CHECK;
… …
3240 3425
3241void 3426void
3242ev_async_send (EV_P_ ev_async *w) 3427ev_async_send (EV_P_ ev_async *w)
3243{ 3428{
3244 w->sent = 1; 3429 w->sent = 1;
3245 evpipe_write (EV_A_ &gotasync); 3430 evpipe_write (EV_A_ &async_pending);
3246} 3431}
3247#endif 3432#endif
3248 3433
3249/*****************************************************************************/ 3434/*****************************************************************************/
3250 3435
… …
3399 if (types & EV_CHECK) 3584 if (types & EV_CHECK)
3400 for (i = checkcnt; i--; ) 3585 for (i = checkcnt; i--; )
3401 cb (EV_A_ EV_CHECK, checks [i]); 3586 cb (EV_A_ EV_CHECK, checks [i]);
3402 3587
3403 if (types & EV_SIGNAL) 3588 if (types & EV_SIGNAL)
3404 for (i = 0; i < signalmax; ++i) 3589 for (i = 0; i < EV_NSIG - 1; ++i)
3405 for (wl = signals [i].head; wl; ) 3590 for (wl = signals [i].head; wl; )
3406 { 3591 {
3407 wn = wl->next; 3592 wn = wl->next;
3408 cb (EV_A_ EV_SIGNAL, wl); 3593 cb (EV_A_ EV_SIGNAL, wl);
3409 wl = wn; 3594 wl = wn;

Diff Legend

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