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

Comparing libev/ev.c (file contents):
Revision 1.293 by root, Mon Jun 29 18:46:52 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
… …
391# define inline_speed static noinline 445# define inline_speed static noinline
392#else 446#else
393# define inline_speed static inline 447# define inline_speed static inline
394#endif 448#endif
395 449
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 450#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
451
452#if EV_MINPRI == EV_MAXPRI
453# define ABSPRI(w) (((W)w), 0)
454#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 455# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
456#endif
398 457
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 458#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 459#define EMPTY2(a,b) /* used to suppress some warnings */
401 460
402typedef ev_watcher *W; 461typedef ev_watcher *W;
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 544#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 545#define ev_free(ptr) ev_realloc ((ptr), 0)
487 546
488/*****************************************************************************/ 547/*****************************************************************************/
489 548
549/* set in reify when reification needed */
550#define EV_ANFD_REIFY 1
551
490/* file descriptor info structure */ 552/* file descriptor info structure */
491typedef struct 553typedef struct
492{ 554{
493 WL head; 555 WL head;
494 unsigned char events; /* the events watched for */ 556 unsigned char events; /* the events watched for */
495 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) */
496 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 */
497 unsigned char unused; 559 unsigned char unused;
498#if EV_USE_EPOLL 560#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 561 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 562#endif
… …
562 624
563 static int ev_default_loop_ptr; 625 static int ev_default_loop_ptr;
564 626
565#endif 627#endif
566 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
567/*****************************************************************************/ 641/*****************************************************************************/
568 642
569#ifndef EV_HAVE_EV_TIME 643#ifndef EV_HAVE_EV_TIME
570ev_tstamp 644ev_tstamp
571ev_time (void) 645ev_time (void)
… …
627 701
628 tv.tv_sec = (time_t)delay; 702 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 703 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 704
631 /* 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 */
632 /* somehting not guaranteed by newer posix versions, but guaranteed */ 706 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 707 /* by older ones */
634 select (0, 0, 0, 0, &tv); 708 select (0, 0, 0, 0, &tv);
635#endif 709#endif
636 } 710 }
637} 711}
… …
745} 819}
746 820
747/*****************************************************************************/ 821/*****************************************************************************/
748 822
749inline_speed void 823inline_speed void
750fd_event (EV_P_ int fd, int revents) 824fd_event_nc (EV_P_ int fd, int revents)
751{ 825{
752 ANFD *anfd = anfds + fd; 826 ANFD *anfd = anfds + fd;
753 ev_io *w; 827 ev_io *w;
754 828
755 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)
… …
759 if (ev) 833 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 834 ev_feed_event (EV_A_ (W)w, ev);
761 } 835 }
762} 836}
763 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
764void 849void
765ev_feed_fd_event (EV_P_ int fd, int revents) 850ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 851{
767 if (fd >= 0 && fd < anfdmax) 852 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 853 fd_event_nc (EV_A_ fd, revents);
769} 854}
770 855
771/* make sure the external fd watch events are in-sync */ 856/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 857/* with the kernel/libev internal state */
773inline_size void 858inline_size void
… …
888 for (fd = 0; fd < anfdmax; ++fd) 973 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 974 if (anfds [fd].events)
890 { 975 {
891 anfds [fd].events = 0; 976 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 977 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 979 }
895} 980}
896 981
897/*****************************************************************************/ 982/*****************************************************************************/
898 983
… …
1042/*****************************************************************************/ 1127/*****************************************************************************/
1043 1128
1044/* associate signal watchers to a signal signal */ 1129/* associate signal watchers to a signal signal */
1045typedef struct 1130typedef struct
1046{ 1131{
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
1047 WL head; 1135 WL head;
1048 EV_ATOMIC_T gotsig; 1136 EV_ATOMIC_T gotsig;
1049} ANSIG; 1137} ANSIG;
1050 1138
1051static ANSIG *signals; 1139static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig; 1140static EV_ATOMIC_T gotsig;
1055 1141
1056/*****************************************************************************/ 1142/*****************************************************************************/
1057 1143
1058/* used to prepare libev internal fd's */ 1144/* used to prepare libev internal fd's */
… …
1073evpipe_init (EV_P) 1159evpipe_init (EV_P)
1074{ 1160{
1075 if (!ev_is_active (&pipe_w)) 1161 if (!ev_is_active (&pipe_w))
1076 { 1162 {
1077#if EV_USE_EVENTFD 1163#if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1166 evfd = eventfd (0, 0);
1167
1168 if (evfd >= 0)
1079 { 1169 {
1080 evpipe [0] = -1; 1170 evpipe [0] = -1;
1081 fd_intern (evfd); 1171 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1172 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1173 }
1084 else 1174 else
1085#endif 1175#endif
1086 { 1176 {
… …
1141 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (gotsig && ev_is_default_loop (EV_A))
1142 { 1232 {
1143 int signum; 1233 int signum;
1144 gotsig = 0; 1234 gotsig = 0;
1145 1235
1146 for (signum = signalmax; signum--; ) 1236 for (signum = EV_NSIG - 1; signum--; )
1147 if (signals [signum].gotsig) 1237 if (signals [signum].gotsig)
1148 ev_feed_signal_event (EV_A_ signum + 1); 1238 ev_feed_signal_event (EV_A_ signum + 1);
1149 } 1239 }
1150 1240
1151#if EV_ASYNC_ENABLE 1241#if EV_ASYNC_ENABLE
… …
1168 1258
1169static void 1259static void
1170ev_sighandler (int signum) 1260ev_sighandler (int signum)
1171{ 1261{
1172#if EV_MULTIPLICITY 1262#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1263 EV_P = signals [signum - 1].loop;
1174#endif 1264#endif
1175 1265
1176#if _WIN32 1266#if _WIN32
1177 signal (signum, ev_sighandler); 1267 signal (signum, ev_sighandler);
1178#endif 1268#endif
… …
1188 1278
1189#if EV_MULTIPLICITY 1279#if EV_MULTIPLICITY
1190 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));
1191#endif 1281#endif
1192 1282
1283 if (signum <= 0 || signum > EV_NSIG)
1284 return;
1285
1193 --signum; 1286 --signum;
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return;
1197 1287
1198 signals [signum].gotsig = 0; 1288 signals [signum].gotsig = 0;
1199 1289
1200 for (w = signals [signum].head; w; w = w->next) 1290 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 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
1203 1313
1204/*****************************************************************************/ 1314/*****************************************************************************/
1205 1315
1206static WL childs [EV_PID_HASHSIZE]; 1316static WL childs [EV_PID_HASHSIZE];
1207 1317
… …
1352ev_backend (EV_P) 1462ev_backend (EV_P)
1353{ 1463{
1354 return backend; 1464 return backend;
1355} 1465}
1356 1466
1467#if EV_MINIMAL < 2
1357unsigned int 1468unsigned int
1358ev_loop_count (EV_P) 1469ev_loop_count (EV_P)
1359{ 1470{
1360 return loop_count; 1471 return loop_count;
1361} 1472}
1362 1473
1474unsigned int
1475ev_loop_depth (EV_P)
1476{
1477 return loop_depth;
1478}
1479
1363void 1480void
1364ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1481ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1365{ 1482{
1366 io_blocktime = interval; 1483 io_blocktime = interval;
1367} 1484}
… …
1369void 1486void
1370ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1487ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1371{ 1488{
1372 timeout_blocktime = interval; 1489 timeout_blocktime = interval;
1373} 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
1374 1515
1375/* initialise a loop structure, must be zero-initialised */ 1516/* initialise a loop structure, must be zero-initialised */
1376static void noinline 1517static void noinline
1377loop_init (EV_P_ unsigned int flags) 1518loop_init (EV_P_ unsigned int flags)
1378{ 1519{
… …
1396 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1537 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1397 have_monotonic = 1; 1538 have_monotonic = 1;
1398 } 1539 }
1399#endif 1540#endif
1400 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
1401 ev_rt_now = ev_time (); 1553 ev_rt_now = ev_time ();
1402 mn_now = get_clock (); 1554 mn_now = get_clock ();
1403 now_floor = mn_now; 1555 now_floor = mn_now;
1404 rtmn_diff = ev_rt_now - mn_now; 1556 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2
1558 invoke_cb = ev_invoke_pending;
1559#endif
1405 1560
1406 io_blocktime = 0.; 1561 io_blocktime = 0.;
1407 timeout_blocktime = 0.; 1562 timeout_blocktime = 0.;
1408 backend = 0; 1563 backend = 0;
1409 backend_fd = -1; 1564 backend_fd = -1;
1410 gotasync = 0; 1565 gotasync = 0;
1411#if EV_USE_INOTIFY 1566#if EV_USE_INOTIFY
1412 fs_fd = -2; 1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1413#endif 1568#endif
1414 1569#if EV_USE_SIGNALFD
1415 /* pid check not overridable via env */ 1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1416#ifndef _WIN32
1417 if (flags & EVFLAG_FORKCHECK)
1418 curpid = getpid ();
1419#endif 1571#endif
1420
1421 if (!(flags & EVFLAG_NOENV)
1422 && !enable_secure ()
1423 && getenv ("LIBEV_FLAGS"))
1424 flags = atoi (getenv ("LIBEV_FLAGS"));
1425 1572
1426 if (!(flags & 0x0000ffffU)) 1573 if (!(flags & 0x0000ffffU))
1427 flags |= ev_recommended_backends (); 1574 flags |= ev_recommended_backends ();
1428 1575
1429#if EV_USE_PORT 1576#if EV_USE_PORT
… …
1455{ 1602{
1456 int i; 1603 int i;
1457 1604
1458 if (ev_is_active (&pipe_w)) 1605 if (ev_is_active (&pipe_w))
1459 { 1606 {
1460 ev_ref (EV_A); /* signal watcher */ 1607 /*ev_ref (EV_A);*/
1461 ev_io_stop (EV_A_ &pipe_w); 1608 /*ev_io_stop (EV_A_ &pipe_w);*/
1462 1609
1463#if EV_USE_EVENTFD 1610#if EV_USE_EVENTFD
1464 if (evfd >= 0) 1611 if (evfd >= 0)
1465 close (evfd); 1612 close (evfd);
1466#endif 1613#endif
… …
1470 close (evpipe [0]); 1617 close (evpipe [0]);
1471 close (evpipe [1]); 1618 close (evpipe [1]);
1472 } 1619 }
1473 } 1620 }
1474 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
1475#if EV_USE_INOTIFY 1632#if EV_USE_INOTIFY
1476 if (fs_fd >= 0) 1633 if (fs_fd >= 0)
1477 close (fs_fd); 1634 close (fs_fd);
1478#endif 1635#endif
1479 1636
… …
1502#if EV_IDLE_ENABLE 1659#if EV_IDLE_ENABLE
1503 array_free (idle, [i]); 1660 array_free (idle, [i]);
1504#endif 1661#endif
1505 } 1662 }
1506 1663
1507 ev_free (anfds); anfdmax = 0; 1664 ev_free (anfds); anfds = 0; anfdmax = 0;
1508 1665
1509 /* have to use the microsoft-never-gets-it-right macro */ 1666 /* have to use the microsoft-never-gets-it-right macro */
1510 array_free (rfeed, EMPTY); 1667 array_free (rfeed, EMPTY);
1511 array_free (fdchange, EMPTY); 1668 array_free (fdchange, EMPTY);
1512 array_free (timer, EMPTY); 1669 array_free (timer, EMPTY);
… …
1579#if EV_MULTIPLICITY 1736#if EV_MULTIPLICITY
1580 1737
1581struct ev_loop * 1738struct ev_loop *
1582ev_loop_new (unsigned int flags) 1739ev_loop_new (unsigned int flags)
1583{ 1740{
1584 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));
1585 1742
1586 memset (loop, 0, sizeof (struct ev_loop)); 1743 memset (EV_A, 0, sizeof (struct ev_loop));
1587
1588 loop_init (EV_A_ flags); 1744 loop_init (EV_A_ flags);
1589 1745
1590 if (ev_backend (EV_A)) 1746 if (ev_backend (EV_A))
1591 return loop; 1747 return EV_A;
1592 1748
1593 return 0; 1749 return 0;
1594} 1750}
1595 1751
1596void 1752void
… …
1603void 1759void
1604ev_loop_fork (EV_P) 1760ev_loop_fork (EV_P)
1605{ 1761{
1606 postfork = 1; /* must be in line with ev_default_fork */ 1762 postfork = 1; /* must be in line with ev_default_fork */
1607} 1763}
1764#endif /* multiplicity */
1608 1765
1609#if EV_VERIFY 1766#if EV_VERIFY
1610static void noinline 1767static void noinline
1611verify_watcher (EV_P_ W w) 1768verify_watcher (EV_P_ W w)
1612{ 1769{
… …
1640 verify_watcher (EV_A_ ws [cnt]); 1797 verify_watcher (EV_A_ ws [cnt]);
1641 } 1798 }
1642} 1799}
1643#endif 1800#endif
1644 1801
1802#if EV_MINIMAL < 2
1645void 1803void
1646ev_loop_verify (EV_P) 1804ev_loop_verify (EV_P)
1647{ 1805{
1648#if EV_VERIFY 1806#if EV_VERIFY
1649 int i; 1807 int i;
… …
1698 assert (checkmax >= checkcnt); 1856 assert (checkmax >= checkcnt);
1699 array_verify (EV_A_ (W *)checks, checkcnt); 1857 array_verify (EV_A_ (W *)checks, checkcnt);
1700 1858
1701# if 0 1859# if 0
1702 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)
1703 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig)
1704# endif 1862# endif
1705#endif 1863#endif
1706} 1864}
1707 1865#endif
1708#endif /* multiplicity */
1709 1866
1710#if EV_MULTIPLICITY 1867#if EV_MULTIPLICITY
1711struct ev_loop * 1868struct ev_loop *
1712ev_default_loop_init (unsigned int flags) 1869ev_default_loop_init (unsigned int flags)
1713#else 1870#else
… …
1716#endif 1873#endif
1717{ 1874{
1718 if (!ev_default_loop_ptr) 1875 if (!ev_default_loop_ptr)
1719 { 1876 {
1720#if EV_MULTIPLICITY 1877#if EV_MULTIPLICITY
1721 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1878 EV_P = ev_default_loop_ptr = &default_loop_struct;
1722#else 1879#else
1723 ev_default_loop_ptr = 1; 1880 ev_default_loop_ptr = 1;
1724#endif 1881#endif
1725 1882
1726 loop_init (EV_A_ flags); 1883 loop_init (EV_A_ flags);
… …
1743 1900
1744void 1901void
1745ev_default_destroy (void) 1902ev_default_destroy (void)
1746{ 1903{
1747#if EV_MULTIPLICITY 1904#if EV_MULTIPLICITY
1748 struct ev_loop *loop = ev_default_loop_ptr; 1905 EV_P = ev_default_loop_ptr;
1749#endif 1906#endif
1750 1907
1751 ev_default_loop_ptr = 0; 1908 ev_default_loop_ptr = 0;
1752 1909
1753#ifndef _WIN32 1910#ifndef _WIN32
… …
1760 1917
1761void 1918void
1762ev_default_fork (void) 1919ev_default_fork (void)
1763{ 1920{
1764#if EV_MULTIPLICITY 1921#if EV_MULTIPLICITY
1765 struct ev_loop *loop = ev_default_loop_ptr; 1922 EV_P = ev_default_loop_ptr;
1766#endif 1923#endif
1767 1924
1768 postfork = 1; /* must be in line with ev_loop_fork */ 1925 postfork = 1; /* must be in line with ev_loop_fork */
1769} 1926}
1770 1927
… …
1774ev_invoke (EV_P_ void *w, int revents) 1931ev_invoke (EV_P_ void *w, int revents)
1775{ 1932{
1776 EV_CB_INVOKE ((W)w, revents); 1933 EV_CB_INVOKE ((W)w, revents);
1777} 1934}
1778 1935
1779inline_speed void 1936unsigned int
1780call_pending (EV_P) 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
1949ev_invoke_pending (EV_P)
1781{ 1950{
1782 int pri; 1951 int pri;
1783 1952
1784 for (pri = NUMPRI; pri--; ) 1953 for (pri = NUMPRI; pri--; )
1785 while (pendingcnt [pri]) 1954 while (pendingcnt [pri])
… …
2020 2189
2021 mn_now = ev_rt_now; 2190 mn_now = ev_rt_now;
2022 } 2191 }
2023} 2192}
2024 2193
2025static int loop_done;
2026
2027void 2194void
2028ev_loop (EV_P_ int flags) 2195ev_loop (EV_P_ int flags)
2029{ 2196{
2197#if EV_MINIMAL < 2
2198 ++loop_depth;
2199#endif
2200
2201 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2202
2030 loop_done = EVUNLOOP_CANCEL; 2203 loop_done = EVUNLOOP_CANCEL;
2031 2204
2032 call_pending (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 */
2033 2206
2034 do 2207 do
2035 { 2208 {
2036#if EV_VERIFY >= 2 2209#if EV_VERIFY >= 2
2037 ev_loop_verify (EV_A); 2210 ev_loop_verify (EV_A);
… …
2050 /* we might have forked, so queue fork handlers */ 2223 /* we might have forked, so queue fork handlers */
2051 if (expect_false (postfork)) 2224 if (expect_false (postfork))
2052 if (forkcnt) 2225 if (forkcnt)
2053 { 2226 {
2054 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2055 call_pending (EV_A); 2228 EV_INVOKE_PENDING;
2056 } 2229 }
2057#endif 2230#endif
2058 2231
2059 /* queue prepare watchers (and execute them) */ 2232 /* queue prepare watchers (and execute them) */
2060 if (expect_false (preparecnt)) 2233 if (expect_false (preparecnt))
2061 { 2234 {
2062 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2063 call_pending (EV_A); 2236 EV_INVOKE_PENDING;
2064 } 2237 }
2238
2239 if (expect_false (loop_done))
2240 break;
2065 2241
2066 /* we might have forked, so reify kernel state if necessary */ 2242 /* we might have forked, so reify kernel state if necessary */
2067 if (expect_false (postfork)) 2243 if (expect_false (postfork))
2068 loop_fork (EV_A); 2244 loop_fork (EV_A);
2069 2245
… …
2117 waittime -= sleeptime; 2293 waittime -= sleeptime;
2118 } 2294 }
2119 } 2295 }
2120 } 2296 }
2121 2297
2298#if EV_MINIMAL < 2
2122 ++loop_count; 2299 ++loop_count;
2300#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2123 backend_poll (EV_A_ waittime); 2302 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2124 2304
2125 /* update ev_rt_now, do magic */ 2305 /* update ev_rt_now, do magic */
2126 time_update (EV_A_ waittime + sleeptime); 2306 time_update (EV_A_ waittime + sleeptime);
2127 } 2307 }
2128 2308
… …
2139 2319
2140 /* queue check watchers, to be executed first */ 2320 /* queue check watchers, to be executed first */
2141 if (expect_false (checkcnt)) 2321 if (expect_false (checkcnt))
2142 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2143 2323
2144 call_pending (EV_A); 2324 EV_INVOKE_PENDING;
2145 } 2325 }
2146 while (expect_true ( 2326 while (expect_true (
2147 activecnt 2327 activecnt
2148 && !loop_done 2328 && !loop_done
2149 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2329 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2150 )); 2330 ));
2151 2331
2152 if (loop_done == EVUNLOOP_ONE) 2332 if (loop_done == EVUNLOOP_ONE)
2153 loop_done = EVUNLOOP_CANCEL; 2333 loop_done = EVUNLOOP_CANCEL;
2334
2335#if EV_MINIMAL < 2
2336 --loop_depth;
2337#endif
2154} 2338}
2155 2339
2156void 2340void
2157ev_unloop (EV_P_ int how) 2341ev_unloop (EV_P_ int how)
2158{ 2342{
… …
2250} 2434}
2251 2435
2252inline_size void 2436inline_size void
2253pri_adjust (EV_P_ W w) 2437pri_adjust (EV_P_ W w)
2254{ 2438{
2255 int pri = w->priority; 2439 int pri = ev_priority (w);
2256 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2440 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2257 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2441 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2258 w->priority = pri; 2442 ev_set_priority (w, pri);
2259} 2443}
2260 2444
2261inline_speed void 2445inline_speed void
2262ev_start (EV_P_ W w, int active) 2446ev_start (EV_P_ W w, int active)
2263{ 2447{
… …
2290 2474
2291 ev_start (EV_A_ (W)w, 1); 2475 ev_start (EV_A_ (W)w, 1);
2292 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2293 wlist_add (&anfds[fd].head, (WL)w); 2477 wlist_add (&anfds[fd].head, (WL)w);
2294 2478
2295 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2479 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2296 w->events &= ~EV__IOFDSET; 2480 w->events &= ~EV__IOFDSET;
2297 2481
2298 EV_FREQUENT_CHECK; 2482 EV_FREQUENT_CHECK;
2299} 2483}
2300 2484
… …
2394 } 2578 }
2395 2579
2396 EV_FREQUENT_CHECK; 2580 EV_FREQUENT_CHECK;
2397} 2581}
2398 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
2399#if EV_PERIODIC_ENABLE 2589#if EV_PERIODIC_ENABLE
2400void noinline 2590void noinline
2401ev_periodic_start (EV_P_ ev_periodic *w) 2591ev_periodic_start (EV_P_ ev_periodic *w)
2402{ 2592{
2403 if (expect_false (ev_is_active (w))) 2593 if (expect_false (ev_is_active (w)))
… …
2470#endif 2660#endif
2471 2661
2472void noinline 2662void noinline
2473ev_signal_start (EV_P_ ev_signal *w) 2663ev_signal_start (EV_P_ ev_signal *w)
2474{ 2664{
2475#if EV_MULTIPLICITY
2476 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2477#endif
2478 if (expect_false (ev_is_active (w))) 2665 if (expect_false (ev_is_active (w)))
2479 return; 2666 return;
2480 2667
2481 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));
2482 2669
2483 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));
2484 2673
2485 EV_FREQUENT_CHECK; 2674 signals [w->signum - 1].loop = EV_A;
2675#endif
2486 2676
2677 EV_FREQUENT_CHECK;
2678
2679#if EV_USE_SIGNALFD
2680 if (sigfd == -2)
2487 { 2681 {
2488#ifndef _WIN32 2682 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2489 sigset_t full, prev; 2683 if (sigfd < 0 && errno == EINVAL)
2490 sigfillset (&full); 2684 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2491 sigprocmask (SIG_SETMASK, &full, &prev);
2492#endif
2493 2685
2494 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 */
2495 2689
2496#ifndef _WIN32 2690 sigemptyset (&sigfd_set);
2497 sigprocmask (SIG_SETMASK, &prev, 0); 2691
2498#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 }
2499 } 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
2500 2708
2501 ev_start (EV_A_ (W)w, 1); 2709 ev_start (EV_A_ (W)w, 1);
2502 wlist_add (&signals [w->signum - 1].head, (WL)w); 2710 wlist_add (&signals [w->signum - 1].head, (WL)w);
2503 2711
2504 if (!((WL)w)->next) 2712 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/
2715# endif
2505 { 2716 {
2506#if _WIN32 2717# if _WIN32
2507 signal (w->signum, ev_sighandler); 2718 signal (w->signum, ev_sighandler);
2508#else 2719# else
2509 struct sigaction sa; 2720 struct sigaction sa;
2721
2722 evpipe_init (EV_A);
2723
2510 sa.sa_handler = ev_sighandler; 2724 sa.sa_handler = ev_sighandler;
2511 sigfillset (&sa.sa_mask); 2725 sigfillset (&sa.sa_mask);
2512 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 */
2513 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);
2514#endif 2732#endif
2515 } 2733 }
2516 2734
2517 EV_FREQUENT_CHECK; 2735 EV_FREQUENT_CHECK;
2518} 2736}
2519 2737
2520void noinline 2738void noinline
… …
2528 2746
2529 wlist_del (&signals [w->signum - 1].head, (WL)w); 2747 wlist_del (&signals [w->signum - 1].head, (WL)w);
2530 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2531 2749
2532 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
2533 signal (w->signum, SIG_DFL); 2766 signal (w->signum, SIG_DFL);
2767 }
2534 2768
2535 EV_FREQUENT_CHECK; 2769 EV_FREQUENT_CHECK;
2536} 2770}
2537 2771
2538void 2772void
… …
3018embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3019{ 3253{
3020 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3254 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3021 3255
3022 { 3256 {
3023 struct ev_loop *loop = w->other; 3257 EV_P = w->other;
3024 3258
3025 while (fdchangecnt) 3259 while (fdchangecnt)
3026 { 3260 {
3027 fd_reify (EV_A); 3261 fd_reify (EV_A);
3028 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3262 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3036 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));
3037 3271
3038 ev_embed_stop (EV_A_ w); 3272 ev_embed_stop (EV_A_ w);
3039 3273
3040 { 3274 {
3041 struct ev_loop *loop = w->other; 3275 EV_P = w->other;
3042 3276
3043 ev_loop_fork (EV_A); 3277 ev_loop_fork (EV_A);
3044 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3045 } 3279 }
3046 3280
… …
3060{ 3294{
3061 if (expect_false (ev_is_active (w))) 3295 if (expect_false (ev_is_active (w)))
3062 return; 3296 return;
3063 3297
3064 { 3298 {
3065 struct ev_loop *loop = w->other; 3299 EV_P = w->other;
3066 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 ()));
3067 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);
3068 } 3302 }
3069 3303
3070 EV_FREQUENT_CHECK; 3304 EV_FREQUENT_CHECK;
… …
3341 if (types & EV_CHECK) 3575 if (types & EV_CHECK)
3342 for (i = checkcnt; i--; ) 3576 for (i = checkcnt; i--; )
3343 cb (EV_A_ EV_CHECK, checks [i]); 3577 cb (EV_A_ EV_CHECK, checks [i]);
3344 3578
3345 if (types & EV_SIGNAL) 3579 if (types & EV_SIGNAL)
3346 for (i = 0; i < signalmax; ++i) 3580 for (i = 0; i < EV_NSIG - 1; ++i)
3347 for (wl = signals [i].head; wl; ) 3581 for (wl = signals [i].head; wl; )
3348 { 3582 {
3349 wn = wl->next; 3583 wn = wl->next;
3350 cb (EV_A_ EV_SIGNAL, wl); 3584 cb (EV_A_ EV_SIGNAL, wl);
3351 wl = wn; 3585 wl = wn;

Diff Legend

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