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

Comparing libev/ev.c (file contents):
Revision 1.289 by root, Sat Jun 6 11:13:16 2009 UTC vs.
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC

57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 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
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
176# endif 186# endif
177#endif 187#endif
178 188
179/* 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 */
180 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 64
216#endif
217
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
181#ifndef EV_USE_CLOCK_SYSCALL 225#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 226# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 227# define EV_USE_CLOCK_SYSCALL 1
184# else 228# else
185# define EV_USE_CLOCK_SYSCALL 0 229# define EV_USE_CLOCK_SYSCALL 0
264# else 308# else
265# define EV_USE_EVENTFD 0 309# define EV_USE_EVENTFD 0
266# endif 310# endif
267#endif 311#endif
268 312
313#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
315# define EV_USE_SIGNALFD 1
316# else
317# define EV_USE_SIGNALFD 0
318# endif
319#endif
320
269#if 0 /* debugging */ 321#if 0 /* debugging */
270# define EV_VERIFY 3 322# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 323# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 324# define EV_HEAP_CACHE_AT 1
273#endif 325#endif
280# define EV_USE_4HEAP !EV_MINIMAL 332# define EV_USE_4HEAP !EV_MINIMAL
281#endif 333#endif
282 334
283#ifndef EV_HEAP_CACHE_AT 335#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 336# define EV_HEAP_CACHE_AT !EV_MINIMAL
337#endif
338
339/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
340/* which makes programs even slower. might work on other unices, too. */
341#if EV_USE_CLOCK_SYSCALL
342# include <syscall.h>
343# ifdef SYS_clock_gettime
344# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
345# undef EV_USE_MONOTONIC
346# define EV_USE_MONOTONIC 1
347# else
348# undef EV_USE_CLOCK_SYSCALL
349# define EV_USE_CLOCK_SYSCALL 0
350# endif
285#endif 351#endif
286 352
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 353/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 354
289#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
320 386
321#if EV_SELECT_IS_WINSOCKET 387#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 388# include <winsock.h>
323#endif 389#endif
324 390
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 392/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 393# include <stdint.h>
394# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK
396# endif
397# ifndef EFD_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC
399# endif
337# ifdef __cplusplus 400# ifdef __cplusplus
338extern "C" { 401extern "C" {
339# endif 402# endif
340int eventfd (unsigned int initval, int flags); 403int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 404# ifdef __cplusplus
342} 405}
343# endif 406# endif
407#endif
408
409#if EV_USE_SIGNALFD
410# include <sys/signalfd.h>
344#endif 411#endif
345 412
346/**/ 413/**/
347 414
348#if EV_VERIFY >= 3 415#if EV_VERIFY >= 3
384# define inline_speed static noinline 451# define inline_speed static noinline
385#else 452#else
386# define inline_speed static inline 453# define inline_speed static inline
387#endif 454#endif
388 455
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 456#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
457
458#if EV_MINPRI == EV_MAXPRI
459# define ABSPRI(w) (((W)w), 0)
460#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 461# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
462#endif
391 463
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 464#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 465#define EMPTY2(a,b) /* used to suppress some warnings */
394 466
395typedef ev_watcher *W; 467typedef ev_watcher *W;
478#define ev_malloc(size) ev_realloc (0, (size)) 550#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 551#define ev_free(ptr) ev_realloc ((ptr), 0)
480 552
481/*****************************************************************************/ 553/*****************************************************************************/
482 554
555/* set in reify when reification needed */
556#define EV_ANFD_REIFY 1
557
483/* file descriptor info structure */ 558/* file descriptor info structure */
484typedef struct 559typedef struct
485{ 560{
486 WL head; 561 WL head;
487 unsigned char events; /* the events watched for */ 562 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 563 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 564 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 565 unsigned char unused;
491#if EV_USE_EPOLL 566#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 567 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 568#endif
555 630
556 static int ev_default_loop_ptr; 631 static int ev_default_loop_ptr;
557 632
558#endif 633#endif
559 634
635#if EV_MINIMAL < 2
636# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
637# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
638# define EV_INVOKE_PENDING invoke_cb (EV_A)
639#else
640# define EV_RELEASE_CB (void)0
641# define EV_ACQUIRE_CB (void)0
642# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
643#endif
644
645#define EVUNLOOP_RECURSE 0x80
646
560/*****************************************************************************/ 647/*****************************************************************************/
561 648
649#ifndef EV_HAVE_EV_TIME
562ev_tstamp 650ev_tstamp
563ev_time (void) 651ev_time (void)
564{ 652{
565#if EV_USE_REALTIME 653#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 654 if (expect_true (have_realtime))
573 661
574 struct timeval tv; 662 struct timeval tv;
575 gettimeofday (&tv, 0); 663 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 664 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 665}
666#endif
578 667
579inline_size ev_tstamp 668inline_size ev_tstamp
580get_clock (void) 669get_clock (void)
581{ 670{
582#if EV_USE_MONOTONIC 671#if EV_USE_MONOTONIC
618 707
619 tv.tv_sec = (time_t)delay; 708 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 709 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 710
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 711 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 712 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 713 /* by older ones */
625 select (0, 0, 0, 0, &tv); 714 select (0, 0, 0, 0, &tv);
626#endif 715#endif
627 } 716 }
628} 717}
736} 825}
737 826
738/*****************************************************************************/ 827/*****************************************************************************/
739 828
740inline_speed void 829inline_speed void
741fd_event (EV_P_ int fd, int revents) 830fd_event_nc (EV_P_ int fd, int revents)
742{ 831{
743 ANFD *anfd = anfds + fd; 832 ANFD *anfd = anfds + fd;
744 ev_io *w; 833 ev_io *w;
745 834
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
750 if (ev) 839 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 840 ev_feed_event (EV_A_ (W)w, ev);
752 } 841 }
753} 842}
754 843
844/* do not submit kernel events for fds that have reify set */
845/* because that means they changed while we were polling for new events */
846inline_speed void
847fd_event (EV_P_ int fd, int revents)
848{
849 ANFD *anfd = anfds + fd;
850
851 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents);
853}
854
755void 855void
756ev_feed_fd_event (EV_P_ int fd, int revents) 856ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 857{
758 if (fd >= 0 && fd < anfdmax) 858 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 859 fd_event_nc (EV_A_ fd, revents);
760} 860}
761 861
762/* make sure the external fd watch events are in-sync */ 862/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 863/* with the kernel/libev internal state */
764inline_size void 864inline_size void
879 for (fd = 0; fd < anfdmax; ++fd) 979 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 980 if (anfds [fd].events)
881 { 981 {
882 anfds [fd].events = 0; 982 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 983 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 985 }
886} 986}
887 987
888/*****************************************************************************/ 988/*****************************************************************************/
889 989
1064evpipe_init (EV_P) 1164evpipe_init (EV_P)
1065{ 1165{
1066 if (!ev_is_active (&pipe_w)) 1166 if (!ev_is_active (&pipe_w))
1067 { 1167 {
1068#if EV_USE_EVENTFD 1168#if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1171 evfd = eventfd (0, 0);
1172
1173 if (evfd >= 0)
1070 { 1174 {
1071 evpipe [0] = -1; 1175 evpipe [0] = -1;
1072 fd_intern (evfd); 1176 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1177 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1178 }
1075 else 1179 else
1076#endif 1180#endif
1077 { 1181 {
1189 signals [signum].gotsig = 0; 1293 signals [signum].gotsig = 0;
1190 1294
1191 for (w = signals [signum].head; w; w = w->next) 1295 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1297}
1298
1299#if EV_USE_SIGNALFD
1300static void
1301sigfdcb (EV_P_ ev_io *iow, int revents)
1302{
1303 struct signalfd_siginfo si[4], *sip;
1304
1305 for (;;)
1306 {
1307 ssize_t res = read (sigfd, si, sizeof (si));
1308
1309 /* not ISO-C, as res might be -1, but works with SuS */
1310 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1311 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1312
1313 if (res < (ssize_t)sizeof (si))
1314 break;
1315 }
1316}
1317#endif
1194 1318
1195/*****************************************************************************/ 1319/*****************************************************************************/
1196 1320
1197static WL childs [EV_PID_HASHSIZE]; 1321static WL childs [EV_PID_HASHSIZE];
1198 1322
1343ev_backend (EV_P) 1467ev_backend (EV_P)
1344{ 1468{
1345 return backend; 1469 return backend;
1346} 1470}
1347 1471
1472#if EV_MINIMAL < 2
1348unsigned int 1473unsigned int
1349ev_loop_count (EV_P) 1474ev_loop_count (EV_P)
1350{ 1475{
1351 return loop_count; 1476 return loop_count;
1352} 1477}
1353 1478
1479unsigned int
1480ev_loop_depth (EV_P)
1481{
1482 return loop_depth;
1483}
1484
1354void 1485void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1486ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1487{
1357 io_blocktime = interval; 1488 io_blocktime = interval;
1358} 1489}
1360void 1491void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1492ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1493{
1363 timeout_blocktime = interval; 1494 timeout_blocktime = interval;
1364} 1495}
1496
1497void
1498ev_set_userdata (EV_P_ void *data)
1499{
1500 userdata = data;
1501}
1502
1503void *
1504ev_userdata (EV_P)
1505{
1506 return userdata;
1507}
1508
1509void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1510{
1511 invoke_cb = invoke_pending_cb;
1512}
1513
1514void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1515{
1516 release_cb = release;
1517 acquire_cb = acquire;
1518}
1519#endif
1365 1520
1366/* initialise a loop structure, must be zero-initialised */ 1521/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1522static void noinline
1368loop_init (EV_P_ unsigned int flags) 1523loop_init (EV_P_ unsigned int flags)
1369{ 1524{
1391 1546
1392 ev_rt_now = ev_time (); 1547 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1548 mn_now = get_clock ();
1394 now_floor = mn_now; 1549 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1550 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2
1552 invoke_cb = ev_invoke_pending;
1553#endif
1396 1554
1397 io_blocktime = 0.; 1555 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1556 timeout_blocktime = 0.;
1399 backend = 0; 1557 backend = 0;
1400 backend_fd = -1; 1558 backend_fd = -1;
1401 gotasync = 0; 1559 gotasync = 0;
1402#if EV_USE_INOTIFY 1560#if EV_USE_INOTIFY
1403 fs_fd = -2; 1561 fs_fd = -2;
1404#endif 1562#endif
1563#if EV_USE_SIGNALFD
1564 sigfd = -2;
1565#endif
1405 1566
1406 /* pid check not overridable via env */ 1567 /* pid check not overridable via env */
1407#ifndef _WIN32 1568#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK) 1569 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid (); 1570 curpid = getpid ();
1446{ 1607{
1447 int i; 1608 int i;
1448 1609
1449 if (ev_is_active (&pipe_w)) 1610 if (ev_is_active (&pipe_w))
1450 { 1611 {
1451 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1614
1454#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1616 if (evfd >= 0)
1456 close (evfd); 1617 close (evfd);
1457#endif 1618#endif
1461 close (evpipe [0]); 1622 close (evpipe [0]);
1462 close (evpipe [1]); 1623 close (evpipe [1]);
1463 } 1624 }
1464 } 1625 }
1465 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
1466#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1468 close (fs_fd); 1639 close (fs_fd);
1469#endif 1640#endif
1470 1641
1493#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1665 array_free (idle, [i]);
1495#endif 1666#endif
1496 } 1667 }
1497 1668
1498 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1670
1500 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
1573ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1574{ 1745{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1747
1577 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (loop, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1580 1750
1581 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1582 return loop; 1752 return loop;
1583 1753
1594void 1764void
1595ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1596{ 1766{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1598} 1768}
1769#endif /* multiplicity */
1599 1770
1600#if EV_VERIFY 1771#if EV_VERIFY
1601static void noinline 1772static void noinline
1602verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1603{ 1774{
1631 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1632 } 1803 }
1633} 1804}
1634#endif 1805#endif
1635 1806
1807#if EV_MINIMAL < 2
1636void 1808void
1637ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1638{ 1810{
1639#if EV_VERIFY 1811#if EV_VERIFY
1640 int i; 1812 int i;
1693 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)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1695# endif 1867# endif
1696#endif 1868#endif
1697} 1869}
1698 1870#endif
1699#endif /* multiplicity */
1700 1871
1701#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1702struct ev_loop * 1873struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1704#else 1875#else
1765ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1766{ 1937{
1767 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1768} 1939}
1769 1940
1770inline_speed void 1941unsigned int
1771call_pending (EV_P) 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;
1951}
1952
1953void noinline
1954ev_invoke_pending (EV_P)
1772{ 1955{
1773 int pri; 1956 int pri;
1774 1957
1775 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
2011 2194
2012 mn_now = ev_rt_now; 2195 mn_now = ev_rt_now;
2013 } 2196 }
2014} 2197}
2015 2198
2016static int loop_done;
2017
2018void 2199void
2019ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
2020{ 2201{
2202#if EV_MINIMAL < 2
2203 ++loop_depth;
2204#endif
2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207
2021 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
2022 2209
2023 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2024 2211
2025 do 2212 do
2026 { 2213 {
2027#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
2028 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
2041 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
2042 if (expect_false (postfork)) 2229 if (expect_false (postfork))
2043 if (forkcnt) 2230 if (forkcnt)
2044 { 2231 {
2045 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2046 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
2047 } 2234 }
2048#endif 2235#endif
2049 2236
2050 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
2051 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
2052 { 2239 {
2053 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2054 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
2055 } 2242 }
2243
2244 if (expect_false (loop_done))
2245 break;
2056 2246
2057 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
2058 if (expect_false (postfork)) 2248 if (expect_false (postfork))
2059 loop_fork (EV_A); 2249 loop_fork (EV_A);
2060 2250
2066 ev_tstamp waittime = 0.; 2256 ev_tstamp waittime = 0.;
2067 ev_tstamp sleeptime = 0.; 2257 ev_tstamp sleeptime = 0.;
2068 2258
2069 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2070 { 2260 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2071 /* update time to cancel out callback processing overhead */ 2264 /* update time to cancel out callback processing overhead */
2072 time_update (EV_A_ 1e100); 2265 time_update (EV_A_ 1e100);
2073 2266
2074 waittime = MAX_BLOCKTIME; 2267 waittime = MAX_BLOCKTIME;
2075 2268
2085 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2278 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2086 if (waittime > to) waittime = to; 2279 if (waittime > to) waittime = to;
2087 } 2280 }
2088#endif 2281#endif
2089 2282
2283 /* don't let timeouts decrease the waittime below timeout_blocktime */
2090 if (expect_false (waittime < timeout_blocktime)) 2284 if (expect_false (waittime < timeout_blocktime))
2091 waittime = timeout_blocktime; 2285 waittime = timeout_blocktime;
2092 2286
2093 sleeptime = waittime - backend_fudge; 2287 /* extra check because io_blocktime is commonly 0 */
2094
2095 if (expect_true (sleeptime > io_blocktime)) 2288 if (expect_false (io_blocktime))
2096 sleeptime = io_blocktime;
2097
2098 if (sleeptime)
2099 { 2289 {
2290 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2291
2292 if (sleeptime > waittime - backend_fudge)
2293 sleeptime = waittime - backend_fudge;
2294
2295 if (expect_true (sleeptime > 0.))
2296 {
2100 ev_sleep (sleeptime); 2297 ev_sleep (sleeptime);
2101 waittime -= sleeptime; 2298 waittime -= sleeptime;
2299 }
2102 } 2300 }
2103 } 2301 }
2104 2302
2303#if EV_MINIMAL < 2
2105 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2106 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2107 2309
2108 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2109 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2110 } 2312 }
2111 2313
2122 2324
2123 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2124 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2125 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2126 2328
2127 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2128 } 2330 }
2129 while (expect_true ( 2331 while (expect_true (
2130 activecnt 2332 activecnt
2131 && !loop_done 2333 && !loop_done
2132 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2133 )); 2335 ));
2134 2336
2135 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2136 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2339
2340#if EV_MINIMAL < 2
2341 --loop_depth;
2342#endif
2137} 2343}
2138 2344
2139void 2345void
2140ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2141{ 2347{
2233} 2439}
2234 2440
2235inline_size void 2441inline_size void
2236pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
2237{ 2443{
2238 int pri = w->priority; 2444 int pri = ev_priority (w);
2239 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2240 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2241 w->priority = pri; 2447 ev_set_priority (w, pri);
2242} 2448}
2243 2449
2244inline_speed void 2450inline_speed void
2245ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
2246{ 2452{
2273 2479
2274 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2275 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2276 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2277 2483
2278 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2279 w->events &= ~EV__IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2280 2486
2281 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2282} 2488}
2283 2489
2377 } 2583 }
2378 2584
2379 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2380} 2586}
2381 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
2382#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2383void noinline 2595void noinline
2384ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2385{ 2597{
2386 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
2461 if (expect_false (ev_is_active (w))) 2673 if (expect_false (ev_is_active (w)))
2462 return; 2674 return;
2463 2675
2464 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2465 2677
2678 EV_FREQUENT_CHECK;
2679
2680#if EV_USE_SIGNALFD
2681 if (sigfd == -2)
2682 {
2683 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2684 if (sigfd < 0 && errno == EINVAL)
2685 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2686
2687 if (sigfd >= 0)
2688 {
2689 fd_intern (sigfd); /* doing it twice will not hurt */
2690
2691 sigemptyset (&sigfd_set);
2692
2693 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2694 ev_set_priority (&sigfd_w, EV_MAXPRI);
2695 ev_io_start (EV_A_ &sigfd_w);
2696 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2697 }
2698 }
2699
2700 if (sigfd >= 0)
2701 {
2702 /* TODO: check .head */
2703 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705
2706 signalfd (sigfd, &sigfd_set, 0);
2707 }
2708 else
2709#endif
2466 evpipe_init (EV_A); 2710 evpipe_init (EV_A);
2467
2468 EV_FREQUENT_CHECK;
2469 2711
2470 { 2712 {
2471#ifndef _WIN32 2713#ifndef _WIN32
2472 sigset_t full, prev; 2714 sigset_t full, prev;
2473 sigfillset (&full); 2715 sigfillset (&full);
2475#endif 2717#endif
2476 2718
2477 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2478 2720
2479#ifndef _WIN32 2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif
2725 sigdelset (&prev, w->signum);
2480 sigprocmask (SIG_SETMASK, &prev, 0); 2726 sigprocmask (SIG_SETMASK, &prev, 0);
2481#endif 2727#endif
2482 } 2728 }
2483 2729
2484 ev_start (EV_A_ (W)w, 1); 2730 ev_start (EV_A_ (W)w, 1);
2487 if (!((WL)w)->next) 2733 if (!((WL)w)->next)
2488 { 2734 {
2489#if _WIN32 2735#if _WIN32
2490 signal (w->signum, ev_sighandler); 2736 signal (w->signum, ev_sighandler);
2491#else 2737#else
2738# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/
2740# endif
2741 {
2492 struct sigaction sa; 2742 struct sigaction sa = { };
2493 sa.sa_handler = ev_sighandler; 2743 sa.sa_handler = ev_sighandler;
2494 sigfillset (&sa.sa_mask); 2744 sigfillset (&sa.sa_mask);
2495 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2496 sigaction (w->signum, &sa, 0); 2746 sigaction (w->signum, &sa, 0);
2747 }
2497#endif 2748#endif
2498 } 2749 }
2499 2750
2500 EV_FREQUENT_CHECK; 2751 EV_FREQUENT_CHECK;
2501} 2752}
2511 2762
2512 wlist_del (&signals [w->signum - 1].head, (WL)w); 2763 wlist_del (&signals [w->signum - 1].head, (WL)w);
2513 ev_stop (EV_A_ (W)w); 2764 ev_stop (EV_A_ (W)w);
2514 2765
2515 if (!signals [w->signum - 1].head) 2766 if (!signals [w->signum - 1].head)
2767#if EV_USE_SIGNALFD
2768 if (sigfd >= 0)
2769 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2771 sigdelset (&sigfd_set, w->signum);
2772 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2774 /*TODO: maybe unblock signal? */
2775 }
2776 else
2777#endif
2516 signal (w->signum, SIG_DFL); 2778 signal (w->signum, SIG_DFL);
2517 2779
2518 EV_FREQUENT_CHECK; 2780 EV_FREQUENT_CHECK;
2519} 2781}
2520 2782
2521void 2783void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines