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

Diff Legend

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