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

Comparing libev/ev.c (file contents):
Revision 1.296 by root, Thu Jul 9 09:11:20 2009 UTC vs.
Revision 1.306 by root, Sun Jul 19 06:35:25 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/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
183#ifndef EV_USE_CLOCK_SYSCALL 219#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 220# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 221# define EV_USE_CLOCK_SYSCALL 1
186# else 222# else
187# define EV_USE_CLOCK_SYSCALL 0 223# define EV_USE_CLOCK_SYSCALL 0
… …
263#ifndef EV_USE_EVENTFD 299#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 301# define EV_USE_EVENTFD 1
266# else 302# else
267# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
304# endif
305#endif
306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
268# endif 312# endif
269#endif 313#endif
270 314
271#if 0 /* debugging */ 315#if 0 /* debugging */
272# define EV_VERIFY 3 316# define EV_VERIFY 3
… …
339#endif 383#endif
340 384
341#if EV_USE_EVENTFD 385#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 386/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 387# include <stdint.h>
388# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK
390# endif
391# ifndef EFD_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# endif
344# ifdef __cplusplus 394# ifdef __cplusplus
345extern "C" { 395extern "C" {
346# endif 396# endif
347int eventfd (unsigned int initval, int flags); 397int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 398# ifdef __cplusplus
349} 399}
350# endif 400# endif
401#endif
402
403#if EV_USE_SIGNALFD
404# include <sys/signalfd.h>
351#endif 405#endif
352 406
353/**/ 407/**/
354 408
355#if EV_VERIFY >= 3 409#if EV_VERIFY >= 3
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 544#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 545#define ev_free(ptr) ev_realloc ((ptr), 0)
492 546
493/*****************************************************************************/ 547/*****************************************************************************/
494 548
549/* set in reify when reification needed */
550#define EV_ANFD_REIFY 1
551
495/* file descriptor info structure */ 552/* file descriptor info structure */
496typedef struct 553typedef struct
497{ 554{
498 WL head; 555 WL head;
499 unsigned char events; /* the events watched for */ 556 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 557 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 */ 558 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 559 unsigned char unused;
503#if EV_USE_EPOLL 560#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 561 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 562#endif
… …
567 624
568 static int ev_default_loop_ptr; 625 static int ev_default_loop_ptr;
569 626
570#endif 627#endif
571 628
629#if EV_MINIMAL < 2
630# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
631# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
632# define EV_INVOKE_PENDING invoke_cb (EV_A)
633#else
634# define EV_RELEASE_CB (void)0
635# define EV_ACQUIRE_CB (void)0
636# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
637#endif
638
639#define EVUNLOOP_RECURSE 0x80
640
572/*****************************************************************************/ 641/*****************************************************************************/
573 642
574#ifndef EV_HAVE_EV_TIME 643#ifndef EV_HAVE_EV_TIME
575ev_tstamp 644ev_tstamp
576ev_time (void) 645ev_time (void)
… …
632 701
633 tv.tv_sec = (time_t)delay; 702 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 703 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 704
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 705 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 706 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 707 /* by older ones */
639 select (0, 0, 0, 0, &tv); 708 select (0, 0, 0, 0, &tv);
640#endif 709#endif
641 } 710 }
642} 711}
… …
750} 819}
751 820
752/*****************************************************************************/ 821/*****************************************************************************/
753 822
754inline_speed void 823inline_speed void
755fd_event (EV_P_ int fd, int revents) 824fd_event_nc (EV_P_ int fd, int revents)
756{ 825{
757 ANFD *anfd = anfds + fd; 826 ANFD *anfd = anfds + fd;
758 ev_io *w; 827 ev_io *w;
759 828
760 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 829 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
764 if (ev) 833 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 834 ev_feed_event (EV_A_ (W)w, ev);
766 } 835 }
767} 836}
768 837
838/* do not submit kernel events for fds that have reify set */
839/* because that means they changed while we were polling for new events */
840inline_speed void
841fd_event (EV_P_ int fd, int revents)
842{
843 ANFD *anfd = anfds + fd;
844
845 if (expect_true (!anfd->reify))
846 fd_event_nc (EV_A_ fd, revents);
847}
848
769void 849void
770ev_feed_fd_event (EV_P_ int fd, int revents) 850ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 851{
772 if (fd >= 0 && fd < anfdmax) 852 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 853 fd_event_nc (EV_A_ fd, revents);
774} 854}
775 855
776/* make sure the external fd watch events are in-sync */ 856/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 857/* with the kernel/libev internal state */
778inline_size void 858inline_size void
… …
893 for (fd = 0; fd < anfdmax; ++fd) 973 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 974 if (anfds [fd].events)
895 { 975 {
896 anfds [fd].events = 0; 976 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 977 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 979 }
900} 980}
901 981
902/*****************************************************************************/ 982/*****************************************************************************/
903 983
… …
1047/*****************************************************************************/ 1127/*****************************************************************************/
1048 1128
1049/* associate signal watchers to a signal signal */ 1129/* associate signal watchers to a signal signal */
1050typedef struct 1130typedef struct
1051{ 1131{
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1052 WL head; 1135 WL head;
1053 EV_ATOMIC_T gotsig; 1136 EV_ATOMIC_T gotsig;
1054} ANSIG; 1137} ANSIG;
1055 1138
1056static ANSIG *signals; 1139static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig; 1140static EV_ATOMIC_T gotsig;
1060 1141
1061/*****************************************************************************/ 1142/*****************************************************************************/
1062 1143
1063/* used to prepare libev internal fd's */ 1144/* used to prepare libev internal fd's */
… …
1078evpipe_init (EV_P) 1159evpipe_init (EV_P)
1079{ 1160{
1080 if (!ev_is_active (&pipe_w)) 1161 if (!ev_is_active (&pipe_w))
1081 { 1162 {
1082#if EV_USE_EVENTFD 1163#if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1166 evfd = eventfd (0, 0);
1167
1168 if (evfd >= 0)
1084 { 1169 {
1085 evpipe [0] = -1; 1170 evpipe [0] = -1;
1086 fd_intern (evfd); 1171 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1172 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1173 }
1089 else 1174 else
1090#endif 1175#endif
1091 { 1176 {
… …
1146 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (gotsig && ev_is_default_loop (EV_A))
1147 { 1232 {
1148 int signum; 1233 int signum;
1149 gotsig = 0; 1234 gotsig = 0;
1150 1235
1151 for (signum = signalmax; signum--; ) 1236 for (signum = EV_NSIG - 1; signum--; )
1152 if (signals [signum].gotsig) 1237 if (signals [signum].gotsig)
1153 ev_feed_signal_event (EV_A_ signum + 1); 1238 ev_feed_signal_event (EV_A_ signum + 1);
1154 } 1239 }
1155 1240
1156#if EV_ASYNC_ENABLE 1241#if EV_ASYNC_ENABLE
… …
1173 1258
1174static void 1259static void
1175ev_sighandler (int signum) 1260ev_sighandler (int signum)
1176{ 1261{
1177#if EV_MULTIPLICITY 1262#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1263 EV_P = signals [signum - 1].loop;
1179#endif 1264#endif
1180 1265
1181#if _WIN32 1266#if _WIN32
1182 signal (signum, ev_sighandler); 1267 signal (signum, ev_sighandler);
1183#endif 1268#endif
… …
1193 1278
1194#if EV_MULTIPLICITY 1279#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1196#endif 1281#endif
1197 1282
1283 if (signum <= 0 || signum > EV_NSIG)
1284 return;
1285
1198 --signum; 1286 --signum;
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return;
1202 1287
1203 signals [signum].gotsig = 0; 1288 signals [signum].gotsig = 0;
1204 1289
1205 for (w = signals [signum].head; w; w = w->next) 1290 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1292}
1293
1294#if EV_USE_SIGNALFD
1295static void
1296sigfdcb (EV_P_ ev_io *iow, int revents)
1297{
1298 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1299
1300 for (;;)
1301 {
1302 ssize_t res = read (sigfd, si, sizeof (si));
1303
1304 /* not ISO-C, as res might be -1, but works with SuS */
1305 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1306 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1307
1308 if (res < (ssize_t)sizeof (si))
1309 break;
1310 }
1311}
1312#endif
1208 1313
1209/*****************************************************************************/ 1314/*****************************************************************************/
1210 1315
1211static WL childs [EV_PID_HASHSIZE]; 1316static WL childs [EV_PID_HASHSIZE];
1212 1317
… …
1357ev_backend (EV_P) 1462ev_backend (EV_P)
1358{ 1463{
1359 return backend; 1464 return backend;
1360} 1465}
1361 1466
1467#if EV_MINIMAL < 2
1362unsigned int 1468unsigned int
1363ev_loop_count (EV_P) 1469ev_loop_count (EV_P)
1364{ 1470{
1365 return loop_count; 1471 return loop_count;
1366} 1472}
… …
1380void 1486void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1487ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1488{
1383 timeout_blocktime = interval; 1489 timeout_blocktime = interval;
1384} 1490}
1491
1492void
1493ev_set_userdata (EV_P_ void *data)
1494{
1495 userdata = data;
1496}
1497
1498void *
1499ev_userdata (EV_P)
1500{
1501 return userdata;
1502}
1503
1504void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1505{
1506 invoke_cb = invoke_pending_cb;
1507}
1508
1509void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1510{
1511 release_cb = release;
1512 acquire_cb = acquire;
1513}
1514#endif
1385 1515
1386/* initialise a loop structure, must be zero-initialised */ 1516/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1517static void noinline
1388loop_init (EV_P_ unsigned int flags) 1518loop_init (EV_P_ unsigned int flags)
1389{ 1519{
… …
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1537 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1538 have_monotonic = 1;
1409 } 1539 }
1410#endif 1540#endif
1411 1541
1542 /* pid check not overridable via env */
1543#ifndef _WIN32
1544 if (flags & EVFLAG_FORKCHECK)
1545 curpid = getpid ();
1546#endif
1547
1548 if (!(flags & EVFLAG_NOENV)
1549 && !enable_secure ()
1550 && getenv ("LIBEV_FLAGS"))
1551 flags = atoi (getenv ("LIBEV_FLAGS"));
1552
1412 ev_rt_now = ev_time (); 1553 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1554 mn_now = get_clock ();
1414 now_floor = mn_now; 1555 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1556 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2
1416 invoke_cb = ev_invoke_pending; 1558 invoke_cb = ev_invoke_pending;
1559#endif
1417 1560
1418 io_blocktime = 0.; 1561 io_blocktime = 0.;
1419 timeout_blocktime = 0.; 1562 timeout_blocktime = 0.;
1420 backend = 0; 1563 backend = 0;
1421 backend_fd = -1; 1564 backend_fd = -1;
1422 gotasync = 0; 1565 gotasync = 0;
1423#if EV_USE_INOTIFY 1566#if EV_USE_INOTIFY
1424 fs_fd = -2; 1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1425#endif 1568#endif
1426 1569#if EV_USE_SIGNALFD
1427 /* pid check not overridable via env */ 1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1428#ifndef _WIN32
1429 if (flags & EVFLAG_FORKCHECK)
1430 curpid = getpid ();
1431#endif 1571#endif
1432
1433 if (!(flags & EVFLAG_NOENV)
1434 && !enable_secure ()
1435 && getenv ("LIBEV_FLAGS"))
1436 flags = atoi (getenv ("LIBEV_FLAGS"));
1437 1572
1438 if (!(flags & 0x0000ffffU)) 1573 if (!(flags & 0x0000ffffU))
1439 flags |= ev_recommended_backends (); 1574 flags |= ev_recommended_backends ();
1440 1575
1441#if EV_USE_PORT 1576#if EV_USE_PORT
… …
1467{ 1602{
1468 int i; 1603 int i;
1469 1604
1470 if (ev_is_active (&pipe_w)) 1605 if (ev_is_active (&pipe_w))
1471 { 1606 {
1472 ev_ref (EV_A); /* signal watcher */ 1607 /*ev_ref (EV_A);*/
1473 ev_io_stop (EV_A_ &pipe_w); 1608 /*ev_io_stop (EV_A_ &pipe_w);*/
1474 1609
1475#if EV_USE_EVENTFD 1610#if EV_USE_EVENTFD
1476 if (evfd >= 0) 1611 if (evfd >= 0)
1477 close (evfd); 1612 close (evfd);
1478#endif 1613#endif
… …
1482 close (evpipe [0]); 1617 close (evpipe [0]);
1483 close (evpipe [1]); 1618 close (evpipe [1]);
1484 } 1619 }
1485 } 1620 }
1486 1621
1622#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd);
1629 }
1630#endif
1631
1487#if EV_USE_INOTIFY 1632#if EV_USE_INOTIFY
1488 if (fs_fd >= 0) 1633 if (fs_fd >= 0)
1489 close (fs_fd); 1634 close (fs_fd);
1490#endif 1635#endif
1491 1636
… …
1514#if EV_IDLE_ENABLE 1659#if EV_IDLE_ENABLE
1515 array_free (idle, [i]); 1660 array_free (idle, [i]);
1516#endif 1661#endif
1517 } 1662 }
1518 1663
1519 ev_free (anfds); anfdmax = 0; 1664 ev_free (anfds); anfds = 0; anfdmax = 0;
1520 1665
1521 /* have to use the microsoft-never-gets-it-right macro */ 1666 /* have to use the microsoft-never-gets-it-right macro */
1522 array_free (rfeed, EMPTY); 1667 array_free (rfeed, EMPTY);
1523 array_free (fdchange, EMPTY); 1668 array_free (fdchange, EMPTY);
1524 array_free (timer, EMPTY); 1669 array_free (timer, EMPTY);
… …
1591#if EV_MULTIPLICITY 1736#if EV_MULTIPLICITY
1592 1737
1593struct ev_loop * 1738struct ev_loop *
1594ev_loop_new (unsigned int flags) 1739ev_loop_new (unsigned int flags)
1595{ 1740{
1596 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1741 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1597 1742
1598 memset (loop, 0, sizeof (struct ev_loop)); 1743 memset (EV_A, 0, sizeof (struct ev_loop));
1599
1600 loop_init (EV_A_ flags); 1744 loop_init (EV_A_ flags);
1601 1745
1602 if (ev_backend (EV_A)) 1746 if (ev_backend (EV_A))
1603 return loop; 1747 return EV_A;
1604 1748
1605 return 0; 1749 return 0;
1606} 1750}
1607 1751
1608void 1752void
… …
1615void 1759void
1616ev_loop_fork (EV_P) 1760ev_loop_fork (EV_P)
1617{ 1761{
1618 postfork = 1; /* must be in line with ev_default_fork */ 1762 postfork = 1; /* must be in line with ev_default_fork */
1619} 1763}
1764#endif /* multiplicity */
1620 1765
1621#if EV_VERIFY 1766#if EV_VERIFY
1622static void noinline 1767static void noinline
1623verify_watcher (EV_P_ W w) 1768verify_watcher (EV_P_ W w)
1624{ 1769{
… …
1652 verify_watcher (EV_A_ ws [cnt]); 1797 verify_watcher (EV_A_ ws [cnt]);
1653 } 1798 }
1654} 1799}
1655#endif 1800#endif
1656 1801
1802#if EV_MINIMAL < 2
1657void 1803void
1658ev_loop_verify (EV_P) 1804ev_loop_verify (EV_P)
1659{ 1805{
1660#if EV_VERIFY 1806#if EV_VERIFY
1661 int i; 1807 int i;
… …
1710 assert (checkmax >= checkcnt); 1856 assert (checkmax >= checkcnt);
1711 array_verify (EV_A_ (W *)checks, checkcnt); 1857 array_verify (EV_A_ (W *)checks, checkcnt);
1712 1858
1713# if 0 1859# if 0
1714 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1715 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig)
1716# endif 1862# endif
1717#endif 1863#endif
1718} 1864}
1719 1865#endif
1720#endif /* multiplicity */
1721 1866
1722#if EV_MULTIPLICITY 1867#if EV_MULTIPLICITY
1723struct ev_loop * 1868struct ev_loop *
1724ev_default_loop_init (unsigned int flags) 1869ev_default_loop_init (unsigned int flags)
1725#else 1870#else
… …
1728#endif 1873#endif
1729{ 1874{
1730 if (!ev_default_loop_ptr) 1875 if (!ev_default_loop_ptr)
1731 { 1876 {
1732#if EV_MULTIPLICITY 1877#if EV_MULTIPLICITY
1733 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1878 EV_P = ev_default_loop_ptr = &default_loop_struct;
1734#else 1879#else
1735 ev_default_loop_ptr = 1; 1880 ev_default_loop_ptr = 1;
1736#endif 1881#endif
1737 1882
1738 loop_init (EV_A_ flags); 1883 loop_init (EV_A_ flags);
… …
1755 1900
1756void 1901void
1757ev_default_destroy (void) 1902ev_default_destroy (void)
1758{ 1903{
1759#if EV_MULTIPLICITY 1904#if EV_MULTIPLICITY
1760 struct ev_loop *loop = ev_default_loop_ptr; 1905 EV_P = ev_default_loop_ptr;
1761#endif 1906#endif
1762 1907
1763 ev_default_loop_ptr = 0; 1908 ev_default_loop_ptr = 0;
1764 1909
1765#ifndef _WIN32 1910#ifndef _WIN32
… …
1772 1917
1773void 1918void
1774ev_default_fork (void) 1919ev_default_fork (void)
1775{ 1920{
1776#if EV_MULTIPLICITY 1921#if EV_MULTIPLICITY
1777 struct ev_loop *loop = ev_default_loop_ptr; 1922 EV_P = ev_default_loop_ptr;
1778#endif 1923#endif
1779 1924
1780 postfork = 1; /* must be in line with ev_loop_fork */ 1925 postfork = 1; /* must be in line with ev_loop_fork */
1781} 1926}
1782 1927
… …
1786ev_invoke (EV_P_ void *w, int revents) 1931ev_invoke (EV_P_ void *w, int revents)
1787{ 1932{
1788 EV_CB_INVOKE ((W)w, revents); 1933 EV_CB_INVOKE ((W)w, revents);
1789} 1934}
1790 1935
1791void 1936unsigned int
1937ev_pending_count (EV_P)
1938{
1939 int pri;
1940 unsigned int count = 0;
1941
1942 for (pri = NUMPRI; pri--; )
1943 count += pendingcnt [pri];
1944
1945 return count;
1946}
1947
1948void noinline
1792ev_invoke_pending (EV_P) 1949ev_invoke_pending (EV_P)
1793{ 1950{
1794 int pri; 1951 int pri;
1795 1952
1796 for (pri = NUMPRI; pri--; ) 1953 for (pri = NUMPRI; pri--; )
… …
2035} 2192}
2036 2193
2037void 2194void
2038ev_loop (EV_P_ int flags) 2195ev_loop (EV_P_ int flags)
2039{ 2196{
2197#if EV_MINIMAL < 2
2040 ++loop_depth; 2198 ++loop_depth;
2199#endif
2200
2201 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2041 2202
2042 loop_done = EVUNLOOP_CANCEL; 2203 loop_done = EVUNLOOP_CANCEL;
2043 2204
2044 invoke_cb (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2205 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2045 2206
2046 do 2207 do
2047 { 2208 {
2048#if EV_VERIFY >= 2 2209#if EV_VERIFY >= 2
2049 ev_loop_verify (EV_A); 2210 ev_loop_verify (EV_A);
… …
2062 /* we might have forked, so queue fork handlers */ 2223 /* we might have forked, so queue fork handlers */
2063 if (expect_false (postfork)) 2224 if (expect_false (postfork))
2064 if (forkcnt) 2225 if (forkcnt)
2065 { 2226 {
2066 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2067 invoke_cb (EV_A); 2228 EV_INVOKE_PENDING;
2068 } 2229 }
2069#endif 2230#endif
2070 2231
2071 /* queue prepare watchers (and execute them) */ 2232 /* queue prepare watchers (and execute them) */
2072 if (expect_false (preparecnt)) 2233 if (expect_false (preparecnt))
2073 { 2234 {
2074 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2075 invoke_cb (EV_A); 2236 EV_INVOKE_PENDING;
2076 } 2237 }
2238
2239 if (expect_false (loop_done))
2240 break;
2077 2241
2078 /* we might have forked, so reify kernel state if necessary */ 2242 /* we might have forked, so reify kernel state if necessary */
2079 if (expect_false (postfork)) 2243 if (expect_false (postfork))
2080 loop_fork (EV_A); 2244 loop_fork (EV_A);
2081 2245
… …
2129 waittime -= sleeptime; 2293 waittime -= sleeptime;
2130 } 2294 }
2131 } 2295 }
2132 } 2296 }
2133 2297
2298#if EV_MINIMAL < 2
2134 ++loop_count; 2299 ++loop_count;
2300#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2135 backend_poll (EV_A_ waittime); 2302 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2136 2304
2137 /* update ev_rt_now, do magic */ 2305 /* update ev_rt_now, do magic */
2138 time_update (EV_A_ waittime + sleeptime); 2306 time_update (EV_A_ waittime + sleeptime);
2139 } 2307 }
2140 2308
… …
2151 2319
2152 /* queue check watchers, to be executed first */ 2320 /* queue check watchers, to be executed first */
2153 if (expect_false (checkcnt)) 2321 if (expect_false (checkcnt))
2154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2155 2323
2156 invoke_cb (EV_A); 2324 EV_INVOKE_PENDING;
2157 } 2325 }
2158 while (expect_true ( 2326 while (expect_true (
2159 activecnt 2327 activecnt
2160 && !loop_done 2328 && !loop_done
2161 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2329 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2162 )); 2330 ));
2163 2331
2164 if (loop_done == EVUNLOOP_ONE) 2332 if (loop_done == EVUNLOOP_ONE)
2165 loop_done = EVUNLOOP_CANCEL; 2333 loop_done = EVUNLOOP_CANCEL;
2166 2334
2335#if EV_MINIMAL < 2
2167 --loop_depth; 2336 --loop_depth;
2337#endif
2168} 2338}
2169 2339
2170void 2340void
2171ev_unloop (EV_P_ int how) 2341ev_unloop (EV_P_ int how)
2172{ 2342{
… …
2304 2474
2305 ev_start (EV_A_ (W)w, 1); 2475 ev_start (EV_A_ (W)w, 1);
2306 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2307 wlist_add (&anfds[fd].head, (WL)w); 2477 wlist_add (&anfds[fd].head, (WL)w);
2308 2478
2309 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2479 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2310 w->events &= ~EV__IOFDSET; 2480 w->events &= ~EV__IOFDSET;
2311 2481
2312 EV_FREQUENT_CHECK; 2482 EV_FREQUENT_CHECK;
2313} 2483}
2314 2484
… …
2408 } 2578 }
2409 2579
2410 EV_FREQUENT_CHECK; 2580 EV_FREQUENT_CHECK;
2411} 2581}
2412 2582
2583ev_tstamp
2584ev_timer_remaining (EV_P_ ev_timer *w)
2585{
2586 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2587}
2588
2413#if EV_PERIODIC_ENABLE 2589#if EV_PERIODIC_ENABLE
2414void noinline 2590void noinline
2415ev_periodic_start (EV_P_ ev_periodic *w) 2591ev_periodic_start (EV_P_ ev_periodic *w)
2416{ 2592{
2417 if (expect_false (ev_is_active (w))) 2593 if (expect_false (ev_is_active (w)))
… …
2484#endif 2660#endif
2485 2661
2486void noinline 2662void noinline
2487ev_signal_start (EV_P_ ev_signal *w) 2663ev_signal_start (EV_P_ ev_signal *w)
2488{ 2664{
2489#if EV_MULTIPLICITY
2490 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2491#endif
2492 if (expect_false (ev_is_active (w))) 2665 if (expect_false (ev_is_active (w)))
2493 return; 2666 return;
2494 2667
2495 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2496 2669
2497 evpipe_init (EV_A); 2670#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2498 2673
2499 EV_FREQUENT_CHECK; 2674 signals [w->signum - 1].loop = EV_A;
2675#endif
2500 2676
2677 EV_FREQUENT_CHECK;
2678
2679#if EV_USE_SIGNALFD
2680 if (sigfd == -2)
2501 { 2681 {
2502#ifndef _WIN32 2682 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2503 sigset_t full, prev; 2683 if (sigfd < 0 && errno == EINVAL)
2504 sigfillset (&full); 2684 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2505 sigprocmask (SIG_SETMASK, &full, &prev);
2506#endif
2507 2685
2508 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2686 if (sigfd >= 0)
2687 {
2688 fd_intern (sigfd); /* doing it twice will not hurt */
2509 2689
2510#ifndef _WIN32 2690 sigemptyset (&sigfd_set);
2511 sigprocmask (SIG_SETMASK, &prev, 0); 2691
2512#endif 2692 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2693 ev_set_priority (&sigfd_w, EV_MAXPRI);
2694 ev_io_start (EV_A_ &sigfd_w);
2695 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2696 }
2513 } 2697 }
2698
2699 if (sigfd >= 0)
2700 {
2701 /* TODO: check .head */
2702 sigaddset (&sigfd_set, w->signum);
2703 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2704
2705 signalfd (sigfd, &sigfd_set, 0);
2706 }
2707#endif
2514 2708
2515 ev_start (EV_A_ (W)w, 1); 2709 ev_start (EV_A_ (W)w, 1);
2516 wlist_add (&signals [w->signum - 1].head, (WL)w); 2710 wlist_add (&signals [w->signum - 1].head, (WL)w);
2517 2711
2518 if (!((WL)w)->next) 2712 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/
2715# endif
2519 { 2716 {
2520#if _WIN32 2717# if _WIN32
2521 signal (w->signum, ev_sighandler); 2718 signal (w->signum, ev_sighandler);
2522#else 2719# else
2523 struct sigaction sa; 2720 struct sigaction sa;
2721
2722 evpipe_init (EV_A);
2723
2524 sa.sa_handler = ev_sighandler; 2724 sa.sa_handler = ev_sighandler;
2525 sigfillset (&sa.sa_mask); 2725 sigfillset (&sa.sa_mask);
2526 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2726 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2527 sigaction (w->signum, &sa, 0); 2727 sigaction (w->signum, &sa, 0);
2728
2729 sigemptyset (&sa.sa_mask);
2730 sigaddset (&sa.sa_mask, w->signum);
2731 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2528#endif 2732#endif
2529 } 2733 }
2530 2734
2531 EV_FREQUENT_CHECK; 2735 EV_FREQUENT_CHECK;
2532} 2736}
2533 2737
2534void noinline 2738void noinline
… …
2542 2746
2543 wlist_del (&signals [w->signum - 1].head, (WL)w); 2747 wlist_del (&signals [w->signum - 1].head, (WL)w);
2544 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2545 2749
2546 if (!signals [w->signum - 1].head) 2750 if (!signals [w->signum - 1].head)
2751 {
2752 #if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif
2755 #if EV_USE_SIGNALFD
2756 if (sigfd >= 0)
2757 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2759 sigdelset (&sigfd_set, w->signum);
2760 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2762 /*TODO: maybe unblock signal? */
2763 }
2764 else
2765 #endif
2547 signal (w->signum, SIG_DFL); 2766 signal (w->signum, SIG_DFL);
2767 }
2548 2768
2549 EV_FREQUENT_CHECK; 2769 EV_FREQUENT_CHECK;
2550} 2770}
2551 2771
2552void 2772void
… …
3032embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3033{ 3253{
3034 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3254 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3035 3255
3036 { 3256 {
3037 struct ev_loop *loop = w->other; 3257 EV_P = w->other;
3038 3258
3039 while (fdchangecnt) 3259 while (fdchangecnt)
3040 { 3260 {
3041 fd_reify (EV_A); 3261 fd_reify (EV_A);
3042 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3262 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3050 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3270 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3051 3271
3052 ev_embed_stop (EV_A_ w); 3272 ev_embed_stop (EV_A_ w);
3053 3273
3054 { 3274 {
3055 struct ev_loop *loop = w->other; 3275 EV_P = w->other;
3056 3276
3057 ev_loop_fork (EV_A); 3277 ev_loop_fork (EV_A);
3058 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3059 } 3279 }
3060 3280
… …
3074{ 3294{
3075 if (expect_false (ev_is_active (w))) 3295 if (expect_false (ev_is_active (w)))
3076 return; 3296 return;
3077 3297
3078 { 3298 {
3079 struct ev_loop *loop = w->other; 3299 EV_P = w->other;
3080 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3300 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3081 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3301 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3082 } 3302 }
3083 3303
3084 EV_FREQUENT_CHECK; 3304 EV_FREQUENT_CHECK;
… …
3355 if (types & EV_CHECK) 3575 if (types & EV_CHECK)
3356 for (i = checkcnt; i--; ) 3576 for (i = checkcnt; i--; )
3357 cb (EV_A_ EV_CHECK, checks [i]); 3577 cb (EV_A_ EV_CHECK, checks [i]);
3358 3578
3359 if (types & EV_SIGNAL) 3579 if (types & EV_SIGNAL)
3360 for (i = 0; i < signalmax; ++i) 3580 for (i = 0; i < EV_NSIG - 1; ++i)
3361 for (wl = signals [i].head; wl; ) 3581 for (wl = signals [i].head; wl; )
3362 { 3582 {
3363 wn = wl->next; 3583 wn = wl->next;
3364 cb (EV_A_ EV_SIGNAL, wl); 3584 cb (EV_A_ EV_SIGNAL, wl);
3365 wl = wn; 3585 wl = wn;

Diff Legend

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