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

Comparing libev/ev.c (file contents):
Revision 1.290 by root, Mon Jun 29 04:41:34 2009 UTC vs.
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC

… …
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
178# endif 186# endif
179#endif 187#endif
180 188
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
182 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 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 */
183#ifndef EV_USE_CLOCK_SYSCALL 225#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 226# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 227# define EV_USE_CLOCK_SYSCALL 1
186# else 228# else
187# define EV_USE_CLOCK_SYSCALL 0 229# define EV_USE_CLOCK_SYSCALL 0
… …
266# else 308# else
267# define EV_USE_EVENTFD 0 309# define EV_USE_EVENTFD 0
268# endif 310# endif
269#endif 311#endif
270 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
271#if 0 /* debugging */ 321#if 0 /* debugging */
272# define EV_VERIFY 3 322# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 323# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 324# define EV_HEAP_CACHE_AT 1
275#endif 325#endif
… …
282# define EV_USE_4HEAP !EV_MINIMAL 332# define EV_USE_4HEAP !EV_MINIMAL
283#endif 333#endif
284 334
285#ifndef EV_HEAP_CACHE_AT 335#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 336# define EV_HEAP_CACHE_AT !EV_MINIMAL
287#endif
288
289/* this block fixes any misconfiguration where we know we run into trouble otherwise */
290
291#ifndef CLOCK_MONOTONIC
292# undef EV_USE_MONOTONIC
293# define EV_USE_MONOTONIC 0
294#endif
295
296#ifndef CLOCK_REALTIME
297# undef EV_USE_REALTIME
298# define EV_USE_REALTIME 0
299#endif
300
301#if !EV_STAT_ENABLE
302# undef EV_USE_INOTIFY
303# define EV_USE_INOTIFY 0
304#endif
305
306#if !EV_USE_NANOSLEEP
307# ifndef _WIN32
308# include <sys/select.h>
309# endif
310#endif
311
312#if EV_USE_INOTIFY
313# include <sys/utsname.h>
314# include <sys/statfs.h>
315# include <sys/inotify.h>
316/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
317# ifndef IN_DONT_FOLLOW
318# undef EV_USE_INOTIFY
319# define EV_USE_INOTIFY 0
320# endif
321#endif
322
323#if EV_SELECT_IS_WINSOCKET
324# include <winsock.h>
325#endif 337#endif
326 338
327/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 339/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
328/* which makes programs even slower. might work on other unices, too. */ 340/* which makes programs even slower. might work on other unices, too. */
329#if EV_USE_CLOCK_SYSCALL 341#if EV_USE_CLOCK_SYSCALL
… …
336# undef EV_USE_CLOCK_SYSCALL 348# undef EV_USE_CLOCK_SYSCALL
337# define EV_USE_CLOCK_SYSCALL 0 349# define EV_USE_CLOCK_SYSCALL 0
338# endif 350# endif
339#endif 351#endif
340 352
353/* this block fixes any misconfiguration where we know we run into trouble otherwise */
354
355#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0
358#endif
359
360#ifndef CLOCK_REALTIME
361# undef EV_USE_REALTIME
362# define EV_USE_REALTIME 0
363#endif
364
365#if !EV_STAT_ENABLE
366# undef EV_USE_INOTIFY
367# define EV_USE_INOTIFY 0
368#endif
369
370#if !EV_USE_NANOSLEEP
371# ifndef _WIN32
372# include <sys/select.h>
373# endif
374#endif
375
376#if EV_USE_INOTIFY
377# include <sys/utsname.h>
378# include <sys/statfs.h>
379# include <sys/inotify.h>
380/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
381# ifndef IN_DONT_FOLLOW
382# undef EV_USE_INOTIFY
383# define EV_USE_INOTIFY 0
384# endif
385#endif
386
387#if EV_SELECT_IS_WINSOCKET
388# include <winsock.h>
389#endif
390
341#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
342/* 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 */
343# 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
344# ifdef __cplusplus 400# ifdef __cplusplus
345extern "C" { 401extern "C" {
346# endif 402# endif
347int eventfd (unsigned int initval, int flags); 403int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 404# ifdef __cplusplus
349} 405}
350# endif 406# endif
407#endif
408
409#if EV_USE_SIGNALFD
410# include <sys/signalfd.h>
351#endif 411#endif
352 412
353/**/ 413/**/
354 414
355#if EV_VERIFY >= 3 415#if EV_VERIFY >= 3
… …
391# define inline_speed static noinline 451# define inline_speed static noinline
392#else 452#else
393# define inline_speed static inline 453# define inline_speed static inline
394#endif 454#endif
395 455
396#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
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 461# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
462#endif
398 463
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 464#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 465#define EMPTY2(a,b) /* used to suppress some warnings */
401 466
402typedef ev_watcher *W; 467typedef ev_watcher *W;
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 550#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 551#define ev_free(ptr) ev_realloc ((ptr), 0)
487 552
488/*****************************************************************************/ 553/*****************************************************************************/
489 554
555/* set in reify when reification needed */
556#define EV_ANFD_REIFY 1
557
490/* file descriptor info structure */ 558/* file descriptor info structure */
491typedef struct 559typedef struct
492{ 560{
493 WL head; 561 WL head;
494 unsigned char events; /* the events watched for */ 562 unsigned char events; /* the events watched for */
495 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) */
496 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 */
497 unsigned char unused; 565 unsigned char unused;
498#if EV_USE_EPOLL 566#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 567 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 568#endif
… …
562 630
563 static int ev_default_loop_ptr; 631 static int ev_default_loop_ptr;
564 632
565#endif 633#endif
566 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
567/*****************************************************************************/ 647/*****************************************************************************/
568 648
649#ifndef EV_HAVE_EV_TIME
569ev_tstamp 650ev_tstamp
570ev_time (void) 651ev_time (void)
571{ 652{
572#if EV_USE_REALTIME 653#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 654 if (expect_true (have_realtime))
… …
580 661
581 struct timeval tv; 662 struct timeval tv;
582 gettimeofday (&tv, 0); 663 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 664 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 665}
666#endif
585 667
586inline_size ev_tstamp 668inline_size ev_tstamp
587get_clock (void) 669get_clock (void)
588{ 670{
589#if EV_USE_MONOTONIC 671#if EV_USE_MONOTONIC
… …
625 707
626 tv.tv_sec = (time_t)delay; 708 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 709 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 710
629 /* 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 */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 712 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 713 /* by older ones */
632 select (0, 0, 0, 0, &tv); 714 select (0, 0, 0, 0, &tv);
633#endif 715#endif
634 } 716 }
635} 717}
… …
743} 825}
744 826
745/*****************************************************************************/ 827/*****************************************************************************/
746 828
747inline_speed void 829inline_speed void
748fd_event (EV_P_ int fd, int revents) 830fd_event_nc (EV_P_ int fd, int revents)
749{ 831{
750 ANFD *anfd = anfds + fd; 832 ANFD *anfd = anfds + fd;
751 ev_io *w; 833 ev_io *w;
752 834
753 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)
… …
757 if (ev) 839 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 840 ev_feed_event (EV_A_ (W)w, ev);
759 } 841 }
760} 842}
761 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
762void 855void
763ev_feed_fd_event (EV_P_ int fd, int revents) 856ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 857{
765 if (fd >= 0 && fd < anfdmax) 858 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 859 fd_event_nc (EV_A_ fd, revents);
767} 860}
768 861
769/* make sure the external fd watch events are in-sync */ 862/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 863/* with the kernel/libev internal state */
771inline_size void 864inline_size void
… …
886 for (fd = 0; fd < anfdmax; ++fd) 979 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 980 if (anfds [fd].events)
888 { 981 {
889 anfds [fd].events = 0; 982 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 983 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 985 }
893} 986}
894 987
895/*****************************************************************************/ 988/*****************************************************************************/
896 989
… …
1071evpipe_init (EV_P) 1164evpipe_init (EV_P)
1072{ 1165{
1073 if (!ev_is_active (&pipe_w)) 1166 if (!ev_is_active (&pipe_w))
1074 { 1167 {
1075#if EV_USE_EVENTFD 1168#if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1171 evfd = eventfd (0, 0);
1172
1173 if (evfd >= 0)
1077 { 1174 {
1078 evpipe [0] = -1; 1175 evpipe [0] = -1;
1079 fd_intern (evfd); 1176 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1177 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1178 }
1082 else 1179 else
1083#endif 1180#endif
1084 { 1181 {
… …
1196 signals [signum].gotsig = 0; 1293 signals [signum].gotsig = 0;
1197 1294
1198 for (w = signals [signum].head; w; w = w->next) 1295 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 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
1201 1318
1202/*****************************************************************************/ 1319/*****************************************************************************/
1203 1320
1204static WL childs [EV_PID_HASHSIZE]; 1321static WL childs [EV_PID_HASHSIZE];
1205 1322
… …
1350ev_backend (EV_P) 1467ev_backend (EV_P)
1351{ 1468{
1352 return backend; 1469 return backend;
1353} 1470}
1354 1471
1472#if EV_MINIMAL < 2
1355unsigned int 1473unsigned int
1356ev_loop_count (EV_P) 1474ev_loop_count (EV_P)
1357{ 1475{
1358 return loop_count; 1476 return loop_count;
1359} 1477}
1360 1478
1479unsigned int
1480ev_loop_depth (EV_P)
1481{
1482 return loop_depth;
1483}
1484
1361void 1485void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1486ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1487{
1364 io_blocktime = interval; 1488 io_blocktime = interval;
1365} 1489}
… …
1367void 1491void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1492ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1493{
1370 timeout_blocktime = interval; 1494 timeout_blocktime = interval;
1371} 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
1372 1520
1373/* initialise a loop structure, must be zero-initialised */ 1521/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1522static void noinline
1375loop_init (EV_P_ unsigned int flags) 1523loop_init (EV_P_ unsigned int flags)
1376{ 1524{
… …
1398 1546
1399 ev_rt_now = ev_time (); 1547 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1548 mn_now = get_clock ();
1401 now_floor = mn_now; 1549 now_floor = mn_now;
1402 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
1403 1554
1404 io_blocktime = 0.; 1555 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1556 timeout_blocktime = 0.;
1406 backend = 0; 1557 backend = 0;
1407 backend_fd = -1; 1558 backend_fd = -1;
1408 gotasync = 0; 1559 gotasync = 0;
1409#if EV_USE_INOTIFY 1560#if EV_USE_INOTIFY
1410 fs_fd = -2; 1561 fs_fd = -2;
1411#endif 1562#endif
1563#if EV_USE_SIGNALFD
1564 sigfd = -2;
1565#endif
1412 1566
1413 /* pid check not overridable via env */ 1567 /* pid check not overridable via env */
1414#ifndef _WIN32 1568#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK) 1569 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid (); 1570 curpid = getpid ();
… …
1453{ 1607{
1454 int i; 1608 int i;
1455 1609
1456 if (ev_is_active (&pipe_w)) 1610 if (ev_is_active (&pipe_w))
1457 { 1611 {
1458 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1614
1461#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1616 if (evfd >= 0)
1463 close (evfd); 1617 close (evfd);
1464#endif 1618#endif
… …
1468 close (evpipe [0]); 1622 close (evpipe [0]);
1469 close (evpipe [1]); 1623 close (evpipe [1]);
1470 } 1624 }
1471 } 1625 }
1472 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
1473#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1475 close (fs_fd); 1639 close (fs_fd);
1476#endif 1640#endif
1477 1641
… …
1500#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1665 array_free (idle, [i]);
1502#endif 1666#endif
1503 } 1667 }
1504 1668
1505 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1670
1507 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1672 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
… …
1580ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1581{ 1745{
1582 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));
1583 1747
1584 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (loop, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1587 1750
1588 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1589 return loop; 1752 return loop;
1590 1753
… …
1601void 1764void
1602ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1603{ 1766{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1605} 1768}
1769#endif /* multiplicity */
1606 1770
1607#if EV_VERIFY 1771#if EV_VERIFY
1608static void noinline 1772static void noinline
1609verify_watcher (EV_P_ W w) 1773verify_watcher (EV_P_ W w)
1610{ 1774{
… …
1638 verify_watcher (EV_A_ ws [cnt]); 1802 verify_watcher (EV_A_ ws [cnt]);
1639 } 1803 }
1640} 1804}
1641#endif 1805#endif
1642 1806
1807#if EV_MINIMAL < 2
1643void 1808void
1644ev_loop_verify (EV_P) 1809ev_loop_verify (EV_P)
1645{ 1810{
1646#if EV_VERIFY 1811#if EV_VERIFY
1647 int i; 1812 int i;
… …
1700 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)
1701 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1702# endif 1867# endif
1703#endif 1868#endif
1704} 1869}
1705 1870#endif
1706#endif /* multiplicity */
1707 1871
1708#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1709struct ev_loop * 1873struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
1711#else 1875#else
… …
1772ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1773{ 1937{
1774 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1775} 1939}
1776 1940
1777inline_speed void 1941unsigned int
1778call_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)
1779{ 1955{
1780 int pri; 1956 int pri;
1781 1957
1782 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
… …
2018 2194
2019 mn_now = ev_rt_now; 2195 mn_now = ev_rt_now;
2020 } 2196 }
2021} 2197}
2022 2198
2023static int loop_done;
2024
2025void 2199void
2026ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
2027{ 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
2028 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
2029 2209
2030 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 */
2031 2211
2032 do 2212 do
2033 { 2213 {
2034#if EV_VERIFY >= 2 2214#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2215 ev_loop_verify (EV_A);
… …
2048 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2229 if (expect_false (postfork))
2050 if (forkcnt) 2230 if (forkcnt)
2051 { 2231 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
2054 } 2234 }
2055#endif 2235#endif
2056 2236
2057 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
2059 { 2239 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
2062 } 2242 }
2243
2244 if (expect_false (loop_done))
2245 break;
2063 2246
2064 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2248 if (expect_false (postfork))
2066 loop_fork (EV_A); 2249 loop_fork (EV_A);
2067 2250
… …
2073 ev_tstamp waittime = 0.; 2256 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2257 ev_tstamp sleeptime = 0.;
2075 2258
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2260 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
2078 /* update time to cancel out callback processing overhead */ 2264 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2265 time_update (EV_A_ 1e100);
2080 2266
2081 waittime = MAX_BLOCKTIME; 2267 waittime = MAX_BLOCKTIME;
2082 2268
… …
2092 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;
2093 if (waittime > to) waittime = to; 2279 if (waittime > to) waittime = to;
2094 } 2280 }
2095#endif 2281#endif
2096 2282
2283 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2284 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2285 waittime = timeout_blocktime;
2099 2286
2100 sleeptime = waittime - backend_fudge; 2287 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2288 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 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 {
2107 ev_sleep (sleeptime); 2297 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2298 waittime -= sleeptime;
2299 }
2109 } 2300 }
2110 } 2301 }
2111 2302
2303#if EV_MINIMAL < 2
2112 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2309
2115 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
2117 } 2312 }
2118 2313
… …
2129 2324
2130 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2133 2328
2134 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
2135 } 2330 }
2136 while (expect_true ( 2331 while (expect_true (
2137 activecnt 2332 activecnt
2138 && !loop_done 2333 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2335 ));
2141 2336
2142 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2339
2340#if EV_MINIMAL < 2
2341 --loop_depth;
2342#endif
2144} 2343}
2145 2344
2146void 2345void
2147ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
2148{ 2347{
… …
2240} 2439}
2241 2440
2242inline_size void 2441inline_size void
2243pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
2244{ 2443{
2245 int pri = w->priority; 2444 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2447 ev_set_priority (w, pri);
2249} 2448}
2250 2449
2251inline_speed void 2450inline_speed void
2252ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
2253{ 2452{
… …
2280 2479
2281 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
2284 2483
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2287 2486
2288 EV_FREQUENT_CHECK; 2487 EV_FREQUENT_CHECK;
2289} 2488}
2290 2489
… …
2384 } 2583 }
2385 2584
2386 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2387} 2586}
2388 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
2389#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
2390void noinline 2595void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2597{
2393 if (expect_false (ev_is_active (w))) 2598 if (expect_false (ev_is_active (w)))
… …
2468 if (expect_false (ev_is_active (w))) 2673 if (expect_false (ev_is_active (w)))
2469 return; 2674 return;
2470 2675
2471 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));
2472 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
2473 evpipe_init (EV_A); 2710 evpipe_init (EV_A);
2474
2475 EV_FREQUENT_CHECK;
2476 2711
2477 { 2712 {
2478#ifndef _WIN32 2713#ifndef _WIN32
2479 sigset_t full, prev; 2714 sigset_t full, prev;
2480 sigfillset (&full); 2715 sigfillset (&full);
… …
2482#endif 2717#endif
2483 2718
2484 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2485 2720
2486#ifndef _WIN32 2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif
2725 sigdelset (&prev, w->signum);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2726 sigprocmask (SIG_SETMASK, &prev, 0);
2488#endif 2727#endif
2489 } 2728 }
2490 2729
2491 ev_start (EV_A_ (W)w, 1); 2730 ev_start (EV_A_ (W)w, 1);
… …
2494 if (!((WL)w)->next) 2733 if (!((WL)w)->next)
2495 { 2734 {
2496#if _WIN32 2735#if _WIN32
2497 signal (w->signum, ev_sighandler); 2736 signal (w->signum, ev_sighandler);
2498#else 2737#else
2738# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/
2740# endif
2741 {
2499 struct sigaction sa; 2742 struct sigaction sa = { };
2500 sa.sa_handler = ev_sighandler; 2743 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2744 sigfillset (&sa.sa_mask);
2502 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 */
2503 sigaction (w->signum, &sa, 0); 2746 sigaction (w->signum, &sa, 0);
2747 }
2504#endif 2748#endif
2505 } 2749 }
2506 2750
2507 EV_FREQUENT_CHECK; 2751 EV_FREQUENT_CHECK;
2508} 2752}
… …
2518 2762
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2763 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2764 ev_stop (EV_A_ (W)w);
2521 2765
2522 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
2523 signal (w->signum, SIG_DFL); 2778 signal (w->signum, SIG_DFL);
2524 2779
2525 EV_FREQUENT_CHECK; 2780 EV_FREQUENT_CHECK;
2526} 2781}
2527 2782
2528void 2783void

Diff Legend

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