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

Comparing libev/ev.c (file contents):
Revision 1.352 by root, Thu Oct 21 02:33:08 2010 UTC vs.
Revision 1.367 by root, Tue Jan 11 02:15:58 2011 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
34 * by deleting the provisions above and replace them with the notice 34 * by deleting the provisions above and replace them with the notice
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
40#ifdef __cplusplus
41extern "C" {
42#endif
43 39
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
… …
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
451#endif 436#endif
452 437
453/**/ 438/**/
454 439
455#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
… …
537# include "ev_win32.c" 522# include "ev_win32.c"
538#endif 523#endif
539 524
540/*****************************************************************************/ 525/*****************************************************************************/
541 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}
566
567/*****************************************************************************/
568
542#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
543static void noinline 570static void noinline
544ev_printerr (const char *msg) 571ev_printerr (const char *msg)
545{ 572{
546 write (STDERR_FILENO, msg, strlen (msg)); 573 write (STDERR_FILENO, msg, strlen (msg));
… …
564 if (syserr_cb) 591 if (syserr_cb)
565 syserr_cb (msg); 592 syserr_cb (msg);
566 else 593 else
567 { 594 {
568#if EV_AVOID_STDIO 595#if EV_AVOID_STDIO
569 const char *err = strerror (errno);
570
571 ev_printerr (msg); 596 ev_printerr (msg);
572 ev_printerr (": "); 597 ev_printerr (": ");
573 ev_printerr (err); 598 ev_printerr (strerror (errno));
574 ev_printerr ("\n"); 599 ev_printerr ("\n");
575#else 600#else
576 perror (msg); 601 perror (msg);
577#endif 602#endif
578 abort (); 603 abort ();
… …
612 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
613 638
614 if (!ptr && size) 639 if (!ptr && size)
615 { 640 {
616#if EV_AVOID_STDIO 641#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n"); 642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
618#else 643#else
619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
620#endif 645#endif
621 abort (); 646 abort ();
622 } 647 }
623 648
624 return ptr; 649 return ptr;
… …
641 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 */
642 unsigned char unused; 667 unsigned char unused;
643#if EV_USE_EPOLL 668#if EV_USE_EPOLL
644 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
645#endif 670#endif
646#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
647 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
648#endif 676#endif
649} ANFD; 677} ANFD;
650 678
651/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
652typedef struct 680typedef struct
… …
717# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
718# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
719# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
720#endif 748#endif
721 749
722#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
723 751
724/*****************************************************************************/ 752/*****************************************************************************/
725 753
726#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
727ev_tstamp 755ev_tstamp
… …
948 unsigned char o_events = anfd->events; 976 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify; 977 unsigned char o_reify = anfd->reify;
950 978
951 anfd->reify = 0; 979 anfd->reify = 0;
952 980
953#if EV_SELECT_IS_WINSOCKET 981#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
954 if (o_reify & EV__IOFDSET) 982 if (o_reify & EV__IOFDSET)
955 { 983 {
956 unsigned long arg; 984 unsigned long arg;
957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 985 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
958 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
959 } 988 }
960#endif 989#endif
961 990
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 991 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
963 { 992 {
… …
1340#endif 1369#endif
1341} 1370}
1342 1371
1343/*****************************************************************************/ 1372/*****************************************************************************/
1344 1373
1374void
1375ev_feed_signal (int signum)
1376{
1377#if EV_MULTIPLICITY
1378 EV_P = signals [signum - 1].loop;
1379
1380 if (!EV_A)
1381 return;
1382#endif
1383
1384 signals [signum - 1].pending = 1;
1385 evpipe_write (EV_A_ &sig_pending);
1386}
1387
1345static void 1388static void
1346ev_sighandler (int signum) 1389ev_sighandler (int signum)
1347{ 1390{
1348#if EV_MULTIPLICITY
1349 EV_P = signals [signum - 1].loop;
1350#endif
1351
1352#ifdef _WIN32 1391#ifdef _WIN32
1353 signal (signum, ev_sighandler); 1392 signal (signum, ev_sighandler);
1354#endif 1393#endif
1355 1394
1356 signals [signum - 1].pending = 1; 1395 ev_feed_signal (signum);
1357 evpipe_write (EV_A_ &sig_pending);
1358} 1396}
1359 1397
1360void noinline 1398void noinline
1361ev_feed_signal_event (EV_P_ int signum) 1399ev_feed_signal_event (EV_P_ int signum)
1362{ 1400{
… …
1462 1500
1463#endif 1501#endif
1464 1502
1465/*****************************************************************************/ 1503/*****************************************************************************/
1466 1504
1505#if EV_USE_IOCP
1506# include "ev_iocp.c"
1507#endif
1467#if EV_USE_PORT 1508#if EV_USE_PORT
1468# include "ev_port.c" 1509# include "ev_port.c"
1469#endif 1510#endif
1470#if EV_USE_KQUEUE 1511#if EV_USE_KQUEUE
1471# include "ev_kqueue.c" 1512# include "ev_kqueue.c"
… …
1544ev_embeddable_backends (void) 1585ev_embeddable_backends (void)
1545{ 1586{
1546 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1587 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1547 1588
1548 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1589 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1549 /* please fix it and tell me how to detect the fix */ 1590 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1550 flags &= ~EVBACKEND_EPOLL; 1591 flags &= ~EVBACKEND_EPOLL;
1551 1592
1552 return flags; 1593 return flags;
1553} 1594}
1554 1595
1555unsigned int 1596unsigned int
… …
1611static void noinline 1652static void noinline
1612loop_init (EV_P_ unsigned int flags) 1653loop_init (EV_P_ unsigned int flags)
1613{ 1654{
1614 if (!backend) 1655 if (!backend)
1615 { 1656 {
1657 origflags = flags;
1658
1616#if EV_USE_REALTIME 1659#if EV_USE_REALTIME
1617 if (!have_realtime) 1660 if (!have_realtime)
1618 { 1661 {
1619 struct timespec ts; 1662 struct timespec ts;
1620 1663
… …
1665#endif 1708#endif
1666#if EV_USE_SIGNALFD 1709#if EV_USE_SIGNALFD
1667 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1710 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1668#endif 1711#endif
1669 1712
1670 if (!(flags & 0x0000ffffU)) 1713 if (!(flags & EVBACKEND_MASK))
1671 flags |= ev_recommended_backends (); 1714 flags |= ev_recommended_backends ();
1672 1715
1716#if EV_USE_IOCP
1717 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1718#endif
1673#if EV_USE_PORT 1719#if EV_USE_PORT
1674 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1720 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1675#endif 1721#endif
1676#if EV_USE_KQUEUE 1722#if EV_USE_KQUEUE
1677 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1694#endif 1740#endif
1695 } 1741 }
1696} 1742}
1697 1743
1698/* free up a loop structure */ 1744/* free up a loop structure */
1699static void noinline 1745void
1700loop_destroy (EV_P) 1746ev_loop_destroy (EV_P)
1701{ 1747{
1702 int i; 1748 int i;
1749
1750#if EV_MULTIPLICITY
1751 /* mimic free (0) */
1752 if (!EV_A)
1753 return;
1754#endif
1755
1756#if EV_CLEANUP_ENABLE
1757 /* queue cleanup watchers (and execute them) */
1758 if (expect_false (cleanupcnt))
1759 {
1760 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1761 EV_INVOKE_PENDING;
1762 }
1763#endif
1764
1765#if EV_CHILD_ENABLE
1766 if (ev_is_active (&childev))
1767 {
1768 ev_ref (EV_A); /* child watcher */
1769 ev_signal_stop (EV_A_ &childev);
1770 }
1771#endif
1703 1772
1704 if (ev_is_active (&pipe_w)) 1773 if (ev_is_active (&pipe_w))
1705 { 1774 {
1706 /*ev_ref (EV_A);*/ 1775 /*ev_ref (EV_A);*/
1707 /*ev_io_stop (EV_A_ &pipe_w);*/ 1776 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1729#endif 1798#endif
1730 1799
1731 if (backend_fd >= 0) 1800 if (backend_fd >= 0)
1732 close (backend_fd); 1801 close (backend_fd);
1733 1802
1803#if EV_USE_IOCP
1804 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1805#endif
1734#if EV_USE_PORT 1806#if EV_USE_PORT
1735 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1807 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1736#endif 1808#endif
1737#if EV_USE_KQUEUE 1809#if EV_USE_KQUEUE
1738 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1810 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1765 array_free (periodic, EMPTY); 1837 array_free (periodic, EMPTY);
1766#endif 1838#endif
1767#if EV_FORK_ENABLE 1839#if EV_FORK_ENABLE
1768 array_free (fork, EMPTY); 1840 array_free (fork, EMPTY);
1769#endif 1841#endif
1842#if EV_CLEANUP_ENABLE
1843 array_free (cleanup, EMPTY);
1844#endif
1770 array_free (prepare, EMPTY); 1845 array_free (prepare, EMPTY);
1771 array_free (check, EMPTY); 1846 array_free (check, EMPTY);
1772#if EV_ASYNC_ENABLE 1847#if EV_ASYNC_ENABLE
1773 array_free (async, EMPTY); 1848 array_free (async, EMPTY);
1774#endif 1849#endif
1775 1850
1776 backend = 0; 1851 backend = 0;
1852
1853#if EV_MULTIPLICITY
1854 if (ev_is_default_loop (EV_A))
1855#endif
1856 ev_default_loop_ptr = 0;
1857#if EV_MULTIPLICITY
1858 else
1859 ev_free (EV_A);
1860#endif
1777} 1861}
1778 1862
1779#if EV_USE_INOTIFY 1863#if EV_USE_INOTIFY
1780inline_size void infy_fork (EV_P); 1864inline_size void infy_fork (EV_P);
1781#endif 1865#endif
… …
1840 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
1841 1925
1842 if (ev_backend (EV_A)) 1926 if (ev_backend (EV_A))
1843 return EV_A; 1927 return EV_A;
1844 1928
1929 ev_free (EV_A);
1845 return 0; 1930 return 0;
1846} 1931}
1847 1932
1848void
1849ev_loop_destroy (EV_P)
1850{
1851 loop_destroy (EV_A);
1852 ev_free (loop);
1853}
1854
1855void
1856ev_loop_fork (EV_P)
1857{
1858 postfork = 1; /* must be in line with ev_default_fork */
1859}
1860#endif /* multiplicity */ 1933#endif /* multiplicity */
1861 1934
1862#if EV_VERIFY 1935#if EV_VERIFY
1863static void noinline 1936static void noinline
1864verify_watcher (EV_P_ W w) 1937verify_watcher (EV_P_ W w)
… …
1939#if EV_FORK_ENABLE 2012#if EV_FORK_ENABLE
1940 assert (forkmax >= forkcnt); 2013 assert (forkmax >= forkcnt);
1941 array_verify (EV_A_ (W *)forks, forkcnt); 2014 array_verify (EV_A_ (W *)forks, forkcnt);
1942#endif 2015#endif
1943 2016
2017#if EV_CLEANUP_ENABLE
2018 assert (cleanupmax >= cleanupcnt);
2019 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2020#endif
2021
1944#if EV_ASYNC_ENABLE 2022#if EV_ASYNC_ENABLE
1945 assert (asyncmax >= asynccnt); 2023 assert (asyncmax >= asynccnt);
1946 array_verify (EV_A_ (W *)asyncs, asynccnt); 2024 array_verify (EV_A_ (W *)asyncs, asynccnt);
1947#endif 2025#endif
1948 2026
… …
1966} 2044}
1967#endif 2045#endif
1968 2046
1969#if EV_MULTIPLICITY 2047#if EV_MULTIPLICITY
1970struct ev_loop * 2048struct ev_loop *
1971ev_default_loop_init (unsigned int flags)
1972#else 2049#else
1973int 2050int
2051#endif
1974ev_default_loop (unsigned int flags) 2052ev_default_loop (unsigned int flags)
1975#endif
1976{ 2053{
1977 if (!ev_default_loop_ptr) 2054 if (!ev_default_loop_ptr)
1978 { 2055 {
1979#if EV_MULTIPLICITY 2056#if EV_MULTIPLICITY
1980 EV_P = ev_default_loop_ptr = &default_loop_struct; 2057 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1999 2076
2000 return ev_default_loop_ptr; 2077 return ev_default_loop_ptr;
2001} 2078}
2002 2079
2003void 2080void
2004ev_default_destroy (void) 2081ev_loop_fork (EV_P)
2005{ 2082{
2006#if EV_MULTIPLICITY
2007 EV_P = ev_default_loop_ptr;
2008#endif
2009
2010 ev_default_loop_ptr = 0;
2011
2012#if EV_CHILD_ENABLE
2013 ev_ref (EV_A); /* child watcher */
2014 ev_signal_stop (EV_A_ &childev);
2015#endif
2016
2017 loop_destroy (EV_A);
2018}
2019
2020void
2021ev_default_fork (void)
2022{
2023#if EV_MULTIPLICITY
2024 EV_P = ev_default_loop_ptr;
2025#endif
2026
2027 postfork = 1; /* must be in line with ev_loop_fork */ 2083 postfork = 1; /* must be in line with ev_default_fork */
2028} 2084}
2029 2085
2030/*****************************************************************************/ 2086/*****************************************************************************/
2031 2087
2032void 2088void
… …
2054 2110
2055 for (pri = NUMPRI; pri--; ) 2111 for (pri = NUMPRI; pri--; )
2056 while (pendingcnt [pri]) 2112 while (pendingcnt [pri])
2057 { 2113 {
2058 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2114 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
2059
2060 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2061 /* ^ this is no longer true, as pending_w could be here */
2062 2115
2063 p->w->pending = 0; 2116 p->w->pending = 0;
2064 EV_CB_INVOKE (p->w, p->events); 2117 EV_CB_INVOKE (p->w, p->events);
2065 EV_FREQUENT_CHECK; 2118 EV_FREQUENT_CHECK;
2066 } 2119 }
… …
2292 mn_now = ev_rt_now; 2345 mn_now = ev_rt_now;
2293 } 2346 }
2294} 2347}
2295 2348
2296void 2349void
2297ev_loop (EV_P_ int flags) 2350ev_run (EV_P_ int flags)
2298{ 2351{
2299#if EV_FEATURE_API 2352#if EV_FEATURE_API
2300 ++loop_depth; 2353 ++loop_depth;
2301#endif 2354#endif
2302 2355
2303 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2356 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2304 2357
2305 loop_done = EVUNLOOP_CANCEL; 2358 loop_done = EVBREAK_CANCEL;
2306 2359
2307 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2360 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2308 2361
2309 do 2362 do
2310 { 2363 {
… …
2353 /* calculate blocking time */ 2406 /* calculate blocking time */
2354 { 2407 {
2355 ev_tstamp waittime = 0.; 2408 ev_tstamp waittime = 0.;
2356 ev_tstamp sleeptime = 0.; 2409 ev_tstamp sleeptime = 0.;
2357 2410
2411 /* remember old timestamp for io_blocktime calculation */
2412 ev_tstamp prev_mn_now = mn_now;
2413
2414 /* update time to cancel out callback processing overhead */
2415 time_update (EV_A_ 1e100);
2416
2358 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2417 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2359 { 2418 {
2360 /* remember old timestamp for io_blocktime calculation */
2361 ev_tstamp prev_mn_now = mn_now;
2362
2363 /* update time to cancel out callback processing overhead */
2364 time_update (EV_A_ 1e100);
2365
2366 waittime = MAX_BLOCKTIME; 2419 waittime = MAX_BLOCKTIME;
2367 2420
2368 if (timercnt) 2421 if (timercnt)
2369 { 2422 {
2370 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2423 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2400 } 2453 }
2401 2454
2402#if EV_FEATURE_API 2455#if EV_FEATURE_API
2403 ++loop_count; 2456 ++loop_count;
2404#endif 2457#endif
2405 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2458 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2406 backend_poll (EV_A_ waittime); 2459 backend_poll (EV_A_ waittime);
2407 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2460 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2408 2461
2409 /* update ev_rt_now, do magic */ 2462 /* update ev_rt_now, do magic */
2410 time_update (EV_A_ waittime + sleeptime); 2463 time_update (EV_A_ waittime + sleeptime);
2411 } 2464 }
2412 2465
… …
2430 EV_INVOKE_PENDING; 2483 EV_INVOKE_PENDING;
2431 } 2484 }
2432 while (expect_true ( 2485 while (expect_true (
2433 activecnt 2486 activecnt
2434 && !loop_done 2487 && !loop_done
2435 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2488 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2436 )); 2489 ));
2437 2490
2438 if (loop_done == EVUNLOOP_ONE) 2491 if (loop_done == EVBREAK_ONE)
2439 loop_done = EVUNLOOP_CANCEL; 2492 loop_done = EVBREAK_CANCEL;
2440 2493
2441#if EV_FEATURE_API 2494#if EV_FEATURE_API
2442 --loop_depth; 2495 --loop_depth;
2443#endif 2496#endif
2444} 2497}
2445 2498
2446void 2499void
2447ev_unloop (EV_P_ int how) 2500ev_break (EV_P_ int how)
2448{ 2501{
2449 loop_done = how; 2502 loop_done = how;
2450} 2503}
2451 2504
2452void 2505void
… …
2834 sa.sa_handler = ev_sighandler; 2887 sa.sa_handler = ev_sighandler;
2835 sigfillset (&sa.sa_mask); 2888 sigfillset (&sa.sa_mask);
2836 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2889 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2837 sigaction (w->signum, &sa, 0); 2890 sigaction (w->signum, &sa, 0);
2838 2891
2892 if (origflags & EVFLAG_NOSIGMASK)
2893 {
2839 sigemptyset (&sa.sa_mask); 2894 sigemptyset (&sa.sa_mask);
2840 sigaddset (&sa.sa_mask, w->signum); 2895 sigaddset (&sa.sa_mask, w->signum);
2841 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2896 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2897 }
2842#endif 2898#endif
2843 } 2899 }
2844 2900
2845 EV_FREQUENT_CHECK; 2901 EV_FREQUENT_CHECK;
2846} 2902}
… …
3062 { 3118 {
3063 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3119 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3064 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3120 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3065 ofs += sizeof (struct inotify_event) + ev->len; 3121 ofs += sizeof (struct inotify_event) + ev->len;
3066 } 3122 }
3067}
3068
3069inline_size unsigned int
3070ev_linux_version (void)
3071{
3072 struct utsname buf;
3073 unsigned int v;
3074 int i;
3075 char *p = buf.release;
3076
3077 if (uname (&buf))
3078 return 0;
3079
3080 for (i = 3+1; --i; )
3081 {
3082 unsigned int c = 0;
3083
3084 for (;;)
3085 {
3086 if (*p >= '0' && *p <= '9')
3087 c = c * 10 + *p++ - '0';
3088 else
3089 {
3090 p += *p == '.';
3091 break;
3092 }
3093 }
3094
3095 v = (v << 8) | c;
3096 }
3097
3098 return v;
3099} 3123}
3100 3124
3101inline_size void 3125inline_size void
3102ev_check_2625 (EV_P) 3126ev_check_2625 (EV_P)
3103{ 3127{
… …
3427 3451
3428#if EV_EMBED_ENABLE 3452#if EV_EMBED_ENABLE
3429void noinline 3453void noinline
3430ev_embed_sweep (EV_P_ ev_embed *w) 3454ev_embed_sweep (EV_P_ ev_embed *w)
3431{ 3455{
3432 ev_loop (w->other, EVLOOP_NONBLOCK); 3456 ev_run (w->other, EVRUN_NOWAIT);
3433} 3457}
3434 3458
3435static void 3459static void
3436embed_io_cb (EV_P_ ev_io *io, int revents) 3460embed_io_cb (EV_P_ ev_io *io, int revents)
3437{ 3461{
3438 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3462 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3439 3463
3440 if (ev_cb (w)) 3464 if (ev_cb (w))
3441 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3465 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3442 else 3466 else
3443 ev_loop (w->other, EVLOOP_NONBLOCK); 3467 ev_run (w->other, EVRUN_NOWAIT);
3444} 3468}
3445 3469
3446static void 3470static void
3447embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3471embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3448{ 3472{
… …
3452 EV_P = w->other; 3476 EV_P = w->other;
3453 3477
3454 while (fdchangecnt) 3478 while (fdchangecnt)
3455 { 3479 {
3456 fd_reify (EV_A); 3480 fd_reify (EV_A);
3457 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3481 ev_run (EV_A_ EVRUN_NOWAIT);
3458 } 3482 }
3459 } 3483 }
3460} 3484}
3461 3485
3462static void 3486static void
… …
3468 3492
3469 { 3493 {
3470 EV_P = w->other; 3494 EV_P = w->other;
3471 3495
3472 ev_loop_fork (EV_A); 3496 ev_loop_fork (EV_A);
3473 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3497 ev_run (EV_A_ EVRUN_NOWAIT);
3474 } 3498 }
3475 3499
3476 ev_embed_start (EV_A_ w); 3500 ev_embed_start (EV_A_ w);
3477} 3501}
3478 3502
… …
3562 { 3586 {
3563 int active = ev_active (w); 3587 int active = ev_active (w);
3564 3588
3565 forks [active - 1] = forks [--forkcnt]; 3589 forks [active - 1] = forks [--forkcnt];
3566 ev_active (forks [active - 1]) = active; 3590 ev_active (forks [active - 1]) = active;
3591 }
3592
3593 ev_stop (EV_A_ (W)w);
3594
3595 EV_FREQUENT_CHECK;
3596}
3597#endif
3598
3599#if EV_CLEANUP_ENABLE
3600void
3601ev_cleanup_start (EV_P_ ev_cleanup *w)
3602{
3603 if (expect_false (ev_is_active (w)))
3604 return;
3605
3606 EV_FREQUENT_CHECK;
3607
3608 ev_start (EV_A_ (W)w, ++cleanupcnt);
3609 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3610 cleanups [cleanupcnt - 1] = w;
3611
3612 /* cleanup watchers should never keep a refcount on the loop */
3613 ev_unref (EV_A);
3614 EV_FREQUENT_CHECK;
3615}
3616
3617void
3618ev_cleanup_stop (EV_P_ ev_cleanup *w)
3619{
3620 clear_pending (EV_A_ (W)w);
3621 if (expect_false (!ev_is_active (w)))
3622 return;
3623
3624 EV_FREQUENT_CHECK;
3625 ev_ref (EV_A);
3626
3627 {
3628 int active = ev_active (w);
3629
3630 cleanups [active - 1] = cleanups [--cleanupcnt];
3631 ev_active (cleanups [active - 1]) = active;
3567 } 3632 }
3568 3633
3569 ev_stop (EV_A_ (W)w); 3634 ev_stop (EV_A_ (W)w);
3570 3635
3571 EV_FREQUENT_CHECK; 3636 EV_FREQUENT_CHECK;
… …
3807 3872
3808#if EV_MULTIPLICITY 3873#if EV_MULTIPLICITY
3809 #include "ev_wrap.h" 3874 #include "ev_wrap.h"
3810#endif 3875#endif
3811 3876
3812#ifdef __cplusplus 3877EV_CPP(})
3813}
3814#endif
3815 3878

Diff Legend

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