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

Comparing libev/ev.c (file contents):
Revision 1.344 by root, Fri Jul 9 20:55:14 2010 UTC vs.
Revision 1.365 by root, Sun Oct 31 22:01:20 2010 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
182# include EV_H 178# include EV_H
183#else 179#else
184# include "ev.h" 180# include "ev.h"
185#endif 181#endif
186 182
183EV_CPP(extern "C" {)
184
187#ifndef _WIN32 185#ifndef _WIN32
188# include <sys/time.h> 186# include <sys/time.h>
189# include <sys/wait.h> 187# include <sys/wait.h>
190# include <unistd.h> 188# include <unistd.h>
191#else 189#else
… …
384# include <sys/select.h> 382# include <sys/select.h>
385# endif 383# endif
386#endif 384#endif
387 385
388#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
389# include <sys/utsname.h>
390# include <sys/statfs.h> 387# include <sys/statfs.h>
391# include <sys/inotify.h> 388# include <sys/inotify.h>
392/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
393# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
394# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
411# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
412# else 409# else
413# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
414# endif 411# endif
415# endif 412# endif
416# ifdef __cplusplus
417extern "C" {
418# endif
419int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
420# ifdef __cplusplus
421}
422# endif
423#endif 414#endif
424 415
425#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h> 418# include <stdint.h>
… …
433# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
434# else 425# else
435# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
436# endif 427# endif
437# endif 428# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
442 430
443struct signalfd_siginfo 431struct signalfd_siginfo
444{ 432{
445 uint32_t ssi_signo; 433 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
447}; 435};
448# ifdef __cplusplus
449}
450# endif 436#endif
451#endif
452
453 437
454/**/ 438/**/
455 439
456#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
457# define EV_FREQUENT_CHECK ev_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
… …
470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
471 455
472#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
473#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
474 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
461
475#if __GNUC__ >= 4 462#if __GNUC__ >= 4
476# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
477# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
478#else 465#else
479# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
511#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
512#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
513 500
514#if EV_USE_REALTIME 501#if EV_USE_REALTIME
515/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
516/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
517static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
518#endif 505#endif
519 506
520#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
521static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
532#endif 519#endif
533 520
534#ifdef _WIN32 521#ifdef _WIN32
535# include "ev_win32.c" 522# include "ev_win32.c"
536#endif 523#endif
524
525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 unsigned int v = 0;
536 struct utsname buf;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
537 566
538/*****************************************************************************/ 567/*****************************************************************************/
539 568
540#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
541static void noinline 570static void noinline
… …
562 if (syserr_cb) 591 if (syserr_cb)
563 syserr_cb (msg); 592 syserr_cb (msg);
564 else 593 else
565 { 594 {
566#if EV_AVOID_STDIO 595#if EV_AVOID_STDIO
567 const char *err = strerror (errno);
568
569 ev_printerr (msg); 596 ev_printerr (msg);
570 ev_printerr (": "); 597 ev_printerr (": ");
571 ev_printerr (err); 598 ev_printerr (strerror (errno));
572 ev_printerr ("\n"); 599 ev_printerr ("\n");
573#else 600#else
574 perror (msg); 601 perror (msg);
575#endif 602#endif
576 abort (); 603 abort ();
… …
610 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
611 638
612 if (!ptr && size) 639 if (!ptr && size)
613 { 640 {
614#if EV_AVOID_STDIO 641#if EV_AVOID_STDIO
615 ev_printerr ("libev: memory allocation failed, aborting.\n"); 642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
616#else 643#else
617 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
618#endif 645#endif
619 abort (); 646 abort ();
620 } 647 }
621 648
622 return ptr; 649 return ptr;
… …
639 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 666 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
640 unsigned char unused; 667 unsigned char unused;
641#if EV_USE_EPOLL 668#if EV_USE_EPOLL
642 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
643#endif 670#endif
644#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
645 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
646#endif 676#endif
647} ANFD; 677} ANFD;
648 678
649/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
650typedef struct 680typedef struct
… …
715# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
716# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
717# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
718#endif 748#endif
719 749
720#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
721 751
722/*****************************************************************************/ 752/*****************************************************************************/
723 753
724#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
725ev_tstamp 755ev_tstamp
… …
769 if (delay > 0.) 799 if (delay > 0.)
770 { 800 {
771#if EV_USE_NANOSLEEP 801#if EV_USE_NANOSLEEP
772 struct timespec ts; 802 struct timespec ts;
773 803
774 ts.tv_sec = (time_t)delay; 804 EV_TS_SET (ts, delay);
775 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
776
777 nanosleep (&ts, 0); 805 nanosleep (&ts, 0);
778#elif defined(_WIN32) 806#elif defined(_WIN32)
779 Sleep ((unsigned long)(delay * 1e3)); 807 Sleep ((unsigned long)(delay * 1e3));
780#else 808#else
781 struct timeval tv; 809 struct timeval tv;
782 810
783 tv.tv_sec = (time_t)delay;
784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
785
786 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 811 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
787 /* something not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
788 /* by older ones */ 813 /* by older ones */
814 EV_TV_SET (tv, delay);
789 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
790#endif 816#endif
791 } 817 }
792} 818}
793 819
794/*****************************************************************************/ 820/*****************************************************************************/
795 821
796#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 822#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
797 823
798/* find a suitable new size for the given array, */ 824/* find a suitable new size for the given array, */
799/* hopefully by rounding to a ncie-to-malloc size */ 825/* hopefully by rounding to a nice-to-malloc size */
800inline_size int 826inline_size int
801array_nextsize (int elem, int cur, int cnt) 827array_nextsize (int elem, int cur, int cnt)
802{ 828{
803 int ncur = cur + 1; 829 int ncur = cur + 1;
804 830
… …
945 { 971 {
946 int fd = fdchanges [i]; 972 int fd = fdchanges [i];
947 ANFD *anfd = anfds + fd; 973 ANFD *anfd = anfds + fd;
948 ev_io *w; 974 ev_io *w;
949 975
950 unsigned char events = 0; 976 unsigned char o_events = anfd->events;
977 unsigned char o_reify = anfd->reify;
951 978
952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 979 anfd->reify = 0;
953 events |= (unsigned char)w->events;
954 980
955#if EV_SELECT_IS_WINSOCKET 981#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
956 if (events) 982 if (o_reify & EV__IOFDSET)
957 { 983 {
958 unsigned long arg; 984 unsigned long arg;
959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 985 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
960 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 986 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
987 printf ("oi %d %x\n", fd, anfd->handle);//D
961 } 988 }
962#endif 989#endif
963 990
991 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
964 { 992 {
965 unsigned char o_events = anfd->events;
966 unsigned char o_reify = anfd->reify;
967
968 anfd->reify = 0;
969 anfd->events = events; 993 anfd->events = 0;
970 994
971 if (o_events != events || o_reify & EV__IOFDSET) 995 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
996 anfd->events |= (unsigned char)w->events;
997
998 if (o_events != anfd->events)
999 o_reify = EV__IOFDSET; /* actually |= */
1000 }
1001
1002 if (o_reify & EV__IOFDSET)
972 backend_modify (EV_A_ fd, o_events, events); 1003 backend_modify (EV_A_ fd, o_events, anfd->events);
973 }
974 } 1004 }
975 1005
976 fdchangecnt = 0; 1006 fdchangecnt = 0;
977} 1007}
978 1008
… …
1071} 1101}
1072 1102
1073/*****************************************************************************/ 1103/*****************************************************************************/
1074 1104
1075/* 1105/*
1076 * the heap functions want a real array index. array index 0 uis guaranteed to not 1106 * the heap functions want a real array index. array index 0 is guaranteed to not
1077 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1107 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1078 * the branching factor of the d-tree. 1108 * the branching factor of the d-tree.
1079 */ 1109 */
1080 1110
1081/* 1111/*
… …
1281 uint64_t counter = 1; 1311 uint64_t counter = 1;
1282 write (evfd, &counter, sizeof (uint64_t)); 1312 write (evfd, &counter, sizeof (uint64_t));
1283 } 1313 }
1284 else 1314 else
1285#endif 1315#endif
1316 /* win32 people keep sending patches that change this write() to send() */
1317 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1318 /* so when you think this write should be a send instead, please find out */
1319 /* where your send() is from - it's definitely not the microsoft send, and */
1320 /* tell me. thank you. */
1286 write (evpipe [1], &dummy, 1); 1321 write (evpipe [1], &dummy, 1);
1287 1322
1288 errno = old_errno; 1323 errno = old_errno;
1289 } 1324 }
1290} 1325}
… …
1304 } 1339 }
1305 else 1340 else
1306#endif 1341#endif
1307 { 1342 {
1308 char dummy; 1343 char dummy;
1344 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1309 read (evpipe [0], &dummy, 1); 1345 read (evpipe [0], &dummy, 1);
1310 } 1346 }
1311 1347
1312 if (sig_pending) 1348 if (sig_pending)
1313 { 1349 {
… …
1455 1491
1456#endif 1492#endif
1457 1493
1458/*****************************************************************************/ 1494/*****************************************************************************/
1459 1495
1496#if EV_USE_IOCP
1497# include "ev_iocp.c"
1498#endif
1460#if EV_USE_PORT 1499#if EV_USE_PORT
1461# include "ev_port.c" 1500# include "ev_port.c"
1462#endif 1501#endif
1463#if EV_USE_KQUEUE 1502#if EV_USE_KQUEUE
1464# include "ev_kqueue.c" 1503# include "ev_kqueue.c"
… …
1537ev_embeddable_backends (void) 1576ev_embeddable_backends (void)
1538{ 1577{
1539 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1578 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1540 1579
1541 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1580 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1542 /* please fix it and tell me how to detect the fix */ 1581 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1543 flags &= ~EVBACKEND_EPOLL; 1582 flags &= ~EVBACKEND_EPOLL;
1544 1583
1545 return flags; 1584 return flags;
1546} 1585}
1547 1586
1548unsigned int 1587unsigned int
… …
1661#endif 1700#endif
1662 1701
1663 if (!(flags & 0x0000ffffU)) 1702 if (!(flags & 0x0000ffffU))
1664 flags |= ev_recommended_backends (); 1703 flags |= ev_recommended_backends ();
1665 1704
1705#if EV_USE_IOCP
1706 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1707#endif
1666#if EV_USE_PORT 1708#if EV_USE_PORT
1667 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1709 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1668#endif 1710#endif
1669#if EV_USE_KQUEUE 1711#if EV_USE_KQUEUE
1670 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1712 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1687#endif 1729#endif
1688 } 1730 }
1689} 1731}
1690 1732
1691/* free up a loop structure */ 1733/* free up a loop structure */
1692static void noinline 1734void
1693loop_destroy (EV_P) 1735ev_loop_destroy (EV_P)
1694{ 1736{
1695 int i; 1737 int i;
1738
1739#if EV_MULTIPLICITY
1740 /* mimic free (0) */
1741 if (!EV_A)
1742 return;
1743#endif
1744
1745#if EV_CLEANUP_ENABLE
1746 /* queue cleanup watchers (and execute them) */
1747 if (expect_false (cleanupcnt))
1748 {
1749 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1750 EV_INVOKE_PENDING;
1751 }
1752#endif
1753
1754#if EV_CHILD_ENABLE
1755 if (ev_is_active (&childev))
1756 {
1757 ev_ref (EV_A); /* child watcher */
1758 ev_signal_stop (EV_A_ &childev);
1759 }
1760#endif
1696 1761
1697 if (ev_is_active (&pipe_w)) 1762 if (ev_is_active (&pipe_w))
1698 { 1763 {
1699 /*ev_ref (EV_A);*/ 1764 /*ev_ref (EV_A);*/
1700 /*ev_io_stop (EV_A_ &pipe_w);*/ 1765 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1722#endif 1787#endif
1723 1788
1724 if (backend_fd >= 0) 1789 if (backend_fd >= 0)
1725 close (backend_fd); 1790 close (backend_fd);
1726 1791
1792#if EV_USE_IOCP
1793 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1794#endif
1727#if EV_USE_PORT 1795#if EV_USE_PORT
1728 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1796 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1729#endif 1797#endif
1730#if EV_USE_KQUEUE 1798#if EV_USE_KQUEUE
1731 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1799 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1758 array_free (periodic, EMPTY); 1826 array_free (periodic, EMPTY);
1759#endif 1827#endif
1760#if EV_FORK_ENABLE 1828#if EV_FORK_ENABLE
1761 array_free (fork, EMPTY); 1829 array_free (fork, EMPTY);
1762#endif 1830#endif
1831#if EV_CLEANUP_ENABLE
1832 array_free (cleanup, EMPTY);
1833#endif
1763 array_free (prepare, EMPTY); 1834 array_free (prepare, EMPTY);
1764 array_free (check, EMPTY); 1835 array_free (check, EMPTY);
1765#if EV_ASYNC_ENABLE 1836#if EV_ASYNC_ENABLE
1766 array_free (async, EMPTY); 1837 array_free (async, EMPTY);
1767#endif 1838#endif
1768 1839
1769 backend = 0; 1840 backend = 0;
1841
1842#if EV_MULTIPLICITY
1843 if (ev_is_default_loop (EV_A))
1844#endif
1845 ev_default_loop_ptr = 0;
1846#if EV_MULTIPLICITY
1847 else
1848 ev_free (EV_A);
1849#endif
1770} 1850}
1771 1851
1772#if EV_USE_INOTIFY 1852#if EV_USE_INOTIFY
1773inline_size void infy_fork (EV_P); 1853inline_size void infy_fork (EV_P);
1774#endif 1854#endif
… …
1833 loop_init (EV_A_ flags); 1913 loop_init (EV_A_ flags);
1834 1914
1835 if (ev_backend (EV_A)) 1915 if (ev_backend (EV_A))
1836 return EV_A; 1916 return EV_A;
1837 1917
1918 ev_free (EV_A);
1838 return 0; 1919 return 0;
1839} 1920}
1840 1921
1841void
1842ev_loop_destroy (EV_P)
1843{
1844 loop_destroy (EV_A);
1845 ev_free (loop);
1846}
1847
1848void
1849ev_loop_fork (EV_P)
1850{
1851 postfork = 1; /* must be in line with ev_default_fork */
1852}
1853#endif /* multiplicity */ 1922#endif /* multiplicity */
1854 1923
1855#if EV_VERIFY 1924#if EV_VERIFY
1856static void noinline 1925static void noinline
1857verify_watcher (EV_P_ W w) 1926verify_watcher (EV_P_ W w)
… …
1932#if EV_FORK_ENABLE 2001#if EV_FORK_ENABLE
1933 assert (forkmax >= forkcnt); 2002 assert (forkmax >= forkcnt);
1934 array_verify (EV_A_ (W *)forks, forkcnt); 2003 array_verify (EV_A_ (W *)forks, forkcnt);
1935#endif 2004#endif
1936 2005
2006#if EV_CLEANUP_ENABLE
2007 assert (cleanupmax >= cleanupcnt);
2008 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2009#endif
2010
1937#if EV_ASYNC_ENABLE 2011#if EV_ASYNC_ENABLE
1938 assert (asyncmax >= asynccnt); 2012 assert (asyncmax >= asynccnt);
1939 array_verify (EV_A_ (W *)asyncs, asynccnt); 2013 array_verify (EV_A_ (W *)asyncs, asynccnt);
1940#endif 2014#endif
1941 2015
… …
1959} 2033}
1960#endif 2034#endif
1961 2035
1962#if EV_MULTIPLICITY 2036#if EV_MULTIPLICITY
1963struct ev_loop * 2037struct ev_loop *
1964ev_default_loop_init (unsigned int flags)
1965#else 2038#else
1966int 2039int
2040#endif
1967ev_default_loop (unsigned int flags) 2041ev_default_loop (unsigned int flags)
1968#endif
1969{ 2042{
1970 if (!ev_default_loop_ptr) 2043 if (!ev_default_loop_ptr)
1971 { 2044 {
1972#if EV_MULTIPLICITY 2045#if EV_MULTIPLICITY
1973 EV_P = ev_default_loop_ptr = &default_loop_struct; 2046 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1992 2065
1993 return ev_default_loop_ptr; 2066 return ev_default_loop_ptr;
1994} 2067}
1995 2068
1996void 2069void
1997ev_default_destroy (void) 2070ev_loop_fork (EV_P)
1998{ 2071{
1999#if EV_MULTIPLICITY
2000 EV_P = ev_default_loop_ptr;
2001#endif
2002
2003 ev_default_loop_ptr = 0;
2004
2005#if EV_CHILD_ENABLE
2006 ev_ref (EV_A); /* child watcher */
2007 ev_signal_stop (EV_A_ &childev);
2008#endif
2009
2010 loop_destroy (EV_A);
2011}
2012
2013void
2014ev_default_fork (void)
2015{
2016#if EV_MULTIPLICITY
2017 EV_P = ev_default_loop_ptr;
2018#endif
2019
2020 postfork = 1; /* must be in line with ev_loop_fork */ 2072 postfork = 1; /* must be in line with ev_default_fork */
2021} 2073}
2022 2074
2023/*****************************************************************************/ 2075/*****************************************************************************/
2024 2076
2025void 2077void
… …
2179 feed_reverse_done (EV_A_ EV_PERIODIC); 2231 feed_reverse_done (EV_A_ EV_PERIODIC);
2180 } 2232 }
2181} 2233}
2182 2234
2183/* simply recalculate all periodics */ 2235/* simply recalculate all periodics */
2184/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2236/* TODO: maybe ensure that at least one event happens when jumping forward? */
2185static void noinline 2237static void noinline
2186periodics_reschedule (EV_P) 2238periodics_reschedule (EV_P)
2187{ 2239{
2188 int i; 2240 int i;
2189 2241
… …
2285 mn_now = ev_rt_now; 2337 mn_now = ev_rt_now;
2286 } 2338 }
2287} 2339}
2288 2340
2289void 2341void
2290ev_loop (EV_P_ int flags) 2342ev_run (EV_P_ int flags)
2291{ 2343{
2292#if EV_FEATURE_API 2344#if EV_FEATURE_API
2293 ++loop_depth; 2345 ++loop_depth;
2294#endif 2346#endif
2295 2347
2296 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2348 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2297 2349
2298 loop_done = EVUNLOOP_CANCEL; 2350 loop_done = EVBREAK_CANCEL;
2299 2351
2300 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2352 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2301 2353
2302 do 2354 do
2303 { 2355 {
… …
2346 /* calculate blocking time */ 2398 /* calculate blocking time */
2347 { 2399 {
2348 ev_tstamp waittime = 0.; 2400 ev_tstamp waittime = 0.;
2349 ev_tstamp sleeptime = 0.; 2401 ev_tstamp sleeptime = 0.;
2350 2402
2403 /* remember old timestamp for io_blocktime calculation */
2404 ev_tstamp prev_mn_now = mn_now;
2405
2406 /* update time to cancel out callback processing overhead */
2407 time_update (EV_A_ 1e100);
2408
2351 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2409 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2352 { 2410 {
2353 /* remember old timestamp for io_blocktime calculation */
2354 ev_tstamp prev_mn_now = mn_now;
2355
2356 /* update time to cancel out callback processing overhead */
2357 time_update (EV_A_ 1e100);
2358
2359 waittime = MAX_BLOCKTIME; 2411 waittime = MAX_BLOCKTIME;
2360 2412
2361 if (timercnt) 2413 if (timercnt)
2362 { 2414 {
2363 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2415 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2393 } 2445 }
2394 2446
2395#if EV_FEATURE_API 2447#if EV_FEATURE_API
2396 ++loop_count; 2448 ++loop_count;
2397#endif 2449#endif
2398 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2450 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2399 backend_poll (EV_A_ waittime); 2451 backend_poll (EV_A_ waittime);
2400 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2452 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2401 2453
2402 /* update ev_rt_now, do magic */ 2454 /* update ev_rt_now, do magic */
2403 time_update (EV_A_ waittime + sleeptime); 2455 time_update (EV_A_ waittime + sleeptime);
2404 } 2456 }
2405 2457
… …
2423 EV_INVOKE_PENDING; 2475 EV_INVOKE_PENDING;
2424 } 2476 }
2425 while (expect_true ( 2477 while (expect_true (
2426 activecnt 2478 activecnt
2427 && !loop_done 2479 && !loop_done
2428 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2480 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2429 )); 2481 ));
2430 2482
2431 if (loop_done == EVUNLOOP_ONE) 2483 if (loop_done == EVBREAK_ONE)
2432 loop_done = EVUNLOOP_CANCEL; 2484 loop_done = EVBREAK_CANCEL;
2433 2485
2434#if EV_FEATURE_API 2486#if EV_FEATURE_API
2435 --loop_depth; 2487 --loop_depth;
2436#endif 2488#endif
2437} 2489}
2438 2490
2439void 2491void
2440ev_unloop (EV_P_ int how) 2492ev_break (EV_P_ int how)
2441{ 2493{
2442 loop_done = how; 2494 loop_done = how;
2443} 2495}
2444 2496
2445void 2497void
… …
2593 EV_FREQUENT_CHECK; 2645 EV_FREQUENT_CHECK;
2594 2646
2595 wlist_del (&anfds[w->fd].head, (WL)w); 2647 wlist_del (&anfds[w->fd].head, (WL)w);
2596 ev_stop (EV_A_ (W)w); 2648 ev_stop (EV_A_ (W)w);
2597 2649
2598 fd_change (EV_A_ w->fd, 1); 2650 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2599 2651
2600 EV_FREQUENT_CHECK; 2652 EV_FREQUENT_CHECK;
2601} 2653}
2602 2654
2603void noinline 2655void noinline
… …
3055 { 3107 {
3056 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3108 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3057 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3109 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3058 ofs += sizeof (struct inotify_event) + ev->len; 3110 ofs += sizeof (struct inotify_event) + ev->len;
3059 } 3111 }
3060}
3061
3062inline_size unsigned int
3063ev_linux_version (void)
3064{
3065 struct utsname buf;
3066 unsigned int v;
3067 int i;
3068 char *p = buf.release;
3069
3070 if (uname (&buf))
3071 return 0;
3072
3073 for (i = 3+1; --i; )
3074 {
3075 unsigned int c = 0;
3076
3077 for (;;)
3078 {
3079 if (*p >= '0' && *p <= '9')
3080 c = c * 10 + *p++ - '0';
3081 else
3082 {
3083 p += *p == '.';
3084 break;
3085 }
3086 }
3087
3088 v = (v << 8) | c;
3089 }
3090
3091 return v;
3092} 3112}
3093 3113
3094inline_size void 3114inline_size void
3095ev_check_2625 (EV_P) 3115ev_check_2625 (EV_P)
3096{ 3116{
… …
3420 3440
3421#if EV_EMBED_ENABLE 3441#if EV_EMBED_ENABLE
3422void noinline 3442void noinline
3423ev_embed_sweep (EV_P_ ev_embed *w) 3443ev_embed_sweep (EV_P_ ev_embed *w)
3424{ 3444{
3425 ev_loop (w->other, EVLOOP_NONBLOCK); 3445 ev_run (w->other, EVRUN_NOWAIT);
3426} 3446}
3427 3447
3428static void 3448static void
3429embed_io_cb (EV_P_ ev_io *io, int revents) 3449embed_io_cb (EV_P_ ev_io *io, int revents)
3430{ 3450{
3431 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3451 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3432 3452
3433 if (ev_cb (w)) 3453 if (ev_cb (w))
3434 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3454 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3435 else 3455 else
3436 ev_loop (w->other, EVLOOP_NONBLOCK); 3456 ev_run (w->other, EVRUN_NOWAIT);
3437} 3457}
3438 3458
3439static void 3459static void
3440embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3460embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3441{ 3461{
… …
3445 EV_P = w->other; 3465 EV_P = w->other;
3446 3466
3447 while (fdchangecnt) 3467 while (fdchangecnt)
3448 { 3468 {
3449 fd_reify (EV_A); 3469 fd_reify (EV_A);
3450 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3470 ev_run (EV_A_ EVRUN_NOWAIT);
3451 } 3471 }
3452 } 3472 }
3453} 3473}
3454 3474
3455static void 3475static void
… …
3461 3481
3462 { 3482 {
3463 EV_P = w->other; 3483 EV_P = w->other;
3464 3484
3465 ev_loop_fork (EV_A); 3485 ev_loop_fork (EV_A);
3466 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3486 ev_run (EV_A_ EVRUN_NOWAIT);
3467 } 3487 }
3468 3488
3469 ev_embed_start (EV_A_ w); 3489 ev_embed_start (EV_A_ w);
3470} 3490}
3471 3491
… …
3563 3583
3564 EV_FREQUENT_CHECK; 3584 EV_FREQUENT_CHECK;
3565} 3585}
3566#endif 3586#endif
3567 3587
3568#if EV_ASYNC_ENABLE 3588#if EV_CLEANUP_ENABLE
3569void 3589void
3570ev_async_start (EV_P_ ev_async *w) 3590ev_cleanup_start (EV_P_ ev_cleanup *w)
3571{ 3591{
3572 if (expect_false (ev_is_active (w))) 3592 if (expect_false (ev_is_active (w)))
3573 return; 3593 return;
3594
3595 EV_FREQUENT_CHECK;
3596
3597 ev_start (EV_A_ (W)w, ++cleanupcnt);
3598 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3599 cleanups [cleanupcnt - 1] = w;
3600
3601 /* cleanup watchers should never keep a refcount on the loop */
3602 ev_unref (EV_A);
3603 EV_FREQUENT_CHECK;
3604}
3605
3606void
3607ev_cleanup_stop (EV_P_ ev_cleanup *w)
3608{
3609 clear_pending (EV_A_ (W)w);
3610 if (expect_false (!ev_is_active (w)))
3611 return;
3612
3613 EV_FREQUENT_CHECK;
3614 ev_ref (EV_A);
3615
3616 {
3617 int active = ev_active (w);
3618
3619 cleanups [active - 1] = cleanups [--cleanupcnt];
3620 ev_active (cleanups [active - 1]) = active;
3621 }
3622
3623 ev_stop (EV_A_ (W)w);
3624
3625 EV_FREQUENT_CHECK;
3626}
3627#endif
3628
3629#if EV_ASYNC_ENABLE
3630void
3631ev_async_start (EV_P_ ev_async *w)
3632{
3633 if (expect_false (ev_is_active (w)))
3634 return;
3635
3636 w->sent = 0;
3574 3637
3575 evpipe_init (EV_A); 3638 evpipe_init (EV_A);
3576 3639
3577 EV_FREQUENT_CHECK; 3640 EV_FREQUENT_CHECK;
3578 3641
… …
3798 3861
3799#if EV_MULTIPLICITY 3862#if EV_MULTIPLICITY
3800 #include "ev_wrap.h" 3863 #include "ev_wrap.h"
3801#endif 3864#endif
3802 3865
3803#ifdef __cplusplus 3866EV_CPP(})
3804}
3805#endif
3806 3867

Diff Legend

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