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

Comparing libev/ev.c (file contents):
Revision 1.351 by root, Sat Oct 16 06:46:55 2010 UTC vs.
Revision 1.369 by root, Sun Jan 23 18:53:06 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
… …
785 /* by older ones */ 813 /* by older ones */
786 EV_TV_SET (tv, delay); 814 EV_TV_SET (tv, delay);
787 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
788#endif 816#endif
789 } 817 }
818}
819
820inline_speed int
821ev_timeout_to_ms (ev_tstamp timeout)
822{
823 int ms = timeout * 1000. + .999999;
824
825 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
790} 826}
791 827
792/*****************************************************************************/ 828/*****************************************************************************/
793 829
794#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 830#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
… …
948 unsigned char o_events = anfd->events; 984 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify; 985 unsigned char o_reify = anfd->reify;
950 986
951 anfd->reify = 0; 987 anfd->reify = 0;
952 988
953#if EV_SELECT_IS_WINSOCKET 989#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
954 if (o_reify & EV__IOFDSET) 990 if (o_reify & EV__IOFDSET)
955 { 991 {
956 unsigned long arg; 992 unsigned long arg;
957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 993 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 994 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
995 printf ("oi %d %x\n", fd, anfd->handle);//D
959 } 996 }
960#endif 997#endif
961 998
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 999 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
963 { 1000 {
… …
1314 char dummy; 1351 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1352 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1316 read (evpipe [0], &dummy, 1); 1353 read (evpipe [0], &dummy, 1);
1317 } 1354 }
1318 1355
1356#if EV_SIGNAL_ENABLE
1319 if (sig_pending) 1357 if (sig_pending)
1320 { 1358 {
1321 sig_pending = 0; 1359 sig_pending = 0;
1322 1360
1323 for (i = EV_NSIG - 1; i--; ) 1361 for (i = EV_NSIG - 1; i--; )
1324 if (expect_false (signals [i].pending)) 1362 if (expect_false (signals [i].pending))
1325 ev_feed_signal_event (EV_A_ i + 1); 1363 ev_feed_signal_event (EV_A_ i + 1);
1326 } 1364 }
1365#endif
1327 1366
1328#if EV_ASYNC_ENABLE 1367#if EV_ASYNC_ENABLE
1329 if (async_pending) 1368 if (async_pending)
1330 { 1369 {
1331 async_pending = 0; 1370 async_pending = 0;
… …
1340#endif 1379#endif
1341} 1380}
1342 1381
1343/*****************************************************************************/ 1382/*****************************************************************************/
1344 1383
1384void
1385ev_feed_signal (int signum)
1386{
1387#if EV_MULTIPLICITY
1388 EV_P = signals [signum - 1].loop;
1389
1390 if (!EV_A)
1391 return;
1392#endif
1393
1394 signals [signum - 1].pending = 1;
1395 evpipe_write (EV_A_ &sig_pending);
1396}
1397
1345static void 1398static void
1346ev_sighandler (int signum) 1399ev_sighandler (int signum)
1347{ 1400{
1348#if EV_MULTIPLICITY
1349 EV_P = signals [signum - 1].loop;
1350#endif
1351
1352#ifdef _WIN32 1401#ifdef _WIN32
1353 signal (signum, ev_sighandler); 1402 signal (signum, ev_sighandler);
1354#endif 1403#endif
1355 1404
1356 signals [signum - 1].pending = 1; 1405 ev_feed_signal (signum);
1357 evpipe_write (EV_A_ &sig_pending);
1358} 1406}
1359 1407
1360void noinline 1408void noinline
1361ev_feed_signal_event (EV_P_ int signum) 1409ev_feed_signal_event (EV_P_ int signum)
1362{ 1410{
… …
1462 1510
1463#endif 1511#endif
1464 1512
1465/*****************************************************************************/ 1513/*****************************************************************************/
1466 1514
1515#if EV_USE_IOCP
1516# include "ev_iocp.c"
1517#endif
1467#if EV_USE_PORT 1518#if EV_USE_PORT
1468# include "ev_port.c" 1519# include "ev_port.c"
1469#endif 1520#endif
1470#if EV_USE_KQUEUE 1521#if EV_USE_KQUEUE
1471# include "ev_kqueue.c" 1522# include "ev_kqueue.c"
… …
1544ev_embeddable_backends (void) 1595ev_embeddable_backends (void)
1545{ 1596{
1546 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1597 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1547 1598
1548 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1599 /* 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 */ 1600 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1550 flags &= ~EVBACKEND_EPOLL; 1601 flags &= ~EVBACKEND_EPOLL;
1551 1602
1552 return flags; 1603 return flags;
1553} 1604}
1554 1605
1555unsigned int 1606unsigned int
… …
1611static void noinline 1662static void noinline
1612loop_init (EV_P_ unsigned int flags) 1663loop_init (EV_P_ unsigned int flags)
1613{ 1664{
1614 if (!backend) 1665 if (!backend)
1615 { 1666 {
1667 origflags = flags;
1668
1616#if EV_USE_REALTIME 1669#if EV_USE_REALTIME
1617 if (!have_realtime) 1670 if (!have_realtime)
1618 { 1671 {
1619 struct timespec ts; 1672 struct timespec ts;
1620 1673
… …
1665#endif 1718#endif
1666#if EV_USE_SIGNALFD 1719#if EV_USE_SIGNALFD
1667 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1720 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1668#endif 1721#endif
1669 1722
1670 if (!(flags & 0x0000ffffU)) 1723 if (!(flags & EVBACKEND_MASK))
1671 flags |= ev_recommended_backends (); 1724 flags |= ev_recommended_backends ();
1672 1725
1726#if EV_USE_IOCP
1727 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1728#endif
1673#if EV_USE_PORT 1729#if EV_USE_PORT
1674 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1730 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1675#endif 1731#endif
1676#if EV_USE_KQUEUE 1732#if EV_USE_KQUEUE
1677 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1733 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1694#endif 1750#endif
1695 } 1751 }
1696} 1752}
1697 1753
1698/* free up a loop structure */ 1754/* free up a loop structure */
1699static void noinline 1755void
1700loop_destroy (EV_P) 1756ev_loop_destroy (EV_P)
1701{ 1757{
1702 int i; 1758 int i;
1759
1760#if EV_MULTIPLICITY
1761 /* mimic free (0) */
1762 if (!EV_A)
1763 return;
1764#endif
1765
1766#if EV_CLEANUP_ENABLE
1767 /* queue cleanup watchers (and execute them) */
1768 if (expect_false (cleanupcnt))
1769 {
1770 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1771 EV_INVOKE_PENDING;
1772 }
1773#endif
1774
1775#if EV_CHILD_ENABLE
1776 if (ev_is_active (&childev))
1777 {
1778 ev_ref (EV_A); /* child watcher */
1779 ev_signal_stop (EV_A_ &childev);
1780 }
1781#endif
1703 1782
1704 if (ev_is_active (&pipe_w)) 1783 if (ev_is_active (&pipe_w))
1705 { 1784 {
1706 /*ev_ref (EV_A);*/ 1785 /*ev_ref (EV_A);*/
1707 /*ev_io_stop (EV_A_ &pipe_w);*/ 1786 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1729#endif 1808#endif
1730 1809
1731 if (backend_fd >= 0) 1810 if (backend_fd >= 0)
1732 close (backend_fd); 1811 close (backend_fd);
1733 1812
1813#if EV_USE_IOCP
1814 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1815#endif
1734#if EV_USE_PORT 1816#if EV_USE_PORT
1735 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1817 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1736#endif 1818#endif
1737#if EV_USE_KQUEUE 1819#if EV_USE_KQUEUE
1738 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1820 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1765 array_free (periodic, EMPTY); 1847 array_free (periodic, EMPTY);
1766#endif 1848#endif
1767#if EV_FORK_ENABLE 1849#if EV_FORK_ENABLE
1768 array_free (fork, EMPTY); 1850 array_free (fork, EMPTY);
1769#endif 1851#endif
1852#if EV_CLEANUP_ENABLE
1853 array_free (cleanup, EMPTY);
1854#endif
1770 array_free (prepare, EMPTY); 1855 array_free (prepare, EMPTY);
1771 array_free (check, EMPTY); 1856 array_free (check, EMPTY);
1772#if EV_ASYNC_ENABLE 1857#if EV_ASYNC_ENABLE
1773 array_free (async, EMPTY); 1858 array_free (async, EMPTY);
1774#endif 1859#endif
1775 1860
1776 backend = 0; 1861 backend = 0;
1862
1863#if EV_MULTIPLICITY
1864 if (ev_is_default_loop (EV_A))
1865#endif
1866 ev_default_loop_ptr = 0;
1867#if EV_MULTIPLICITY
1868 else
1869 ev_free (EV_A);
1870#endif
1777} 1871}
1778 1872
1779#if EV_USE_INOTIFY 1873#if EV_USE_INOTIFY
1780inline_size void infy_fork (EV_P); 1874inline_size void infy_fork (EV_P);
1781#endif 1875#endif
… …
1840 loop_init (EV_A_ flags); 1934 loop_init (EV_A_ flags);
1841 1935
1842 if (ev_backend (EV_A)) 1936 if (ev_backend (EV_A))
1843 return EV_A; 1937 return EV_A;
1844 1938
1939 ev_free (EV_A);
1845 return 0; 1940 return 0;
1846} 1941}
1847 1942
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 */ 1943#endif /* multiplicity */
1861 1944
1862#if EV_VERIFY 1945#if EV_VERIFY
1863static void noinline 1946static void noinline
1864verify_watcher (EV_P_ W w) 1947verify_watcher (EV_P_ W w)
… …
1939#if EV_FORK_ENABLE 2022#if EV_FORK_ENABLE
1940 assert (forkmax >= forkcnt); 2023 assert (forkmax >= forkcnt);
1941 array_verify (EV_A_ (W *)forks, forkcnt); 2024 array_verify (EV_A_ (W *)forks, forkcnt);
1942#endif 2025#endif
1943 2026
2027#if EV_CLEANUP_ENABLE
2028 assert (cleanupmax >= cleanupcnt);
2029 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2030#endif
2031
1944#if EV_ASYNC_ENABLE 2032#if EV_ASYNC_ENABLE
1945 assert (asyncmax >= asynccnt); 2033 assert (asyncmax >= asynccnt);
1946 array_verify (EV_A_ (W *)asyncs, asynccnt); 2034 array_verify (EV_A_ (W *)asyncs, asynccnt);
1947#endif 2035#endif
1948 2036
… …
1966} 2054}
1967#endif 2055#endif
1968 2056
1969#if EV_MULTIPLICITY 2057#if EV_MULTIPLICITY
1970struct ev_loop * 2058struct ev_loop *
1971ev_default_loop_init (unsigned int flags)
1972#else 2059#else
1973int 2060int
2061#endif
1974ev_default_loop (unsigned int flags) 2062ev_default_loop (unsigned int flags)
1975#endif
1976{ 2063{
1977 if (!ev_default_loop_ptr) 2064 if (!ev_default_loop_ptr)
1978 { 2065 {
1979#if EV_MULTIPLICITY 2066#if EV_MULTIPLICITY
1980 EV_P = ev_default_loop_ptr = &default_loop_struct; 2067 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1999 2086
2000 return ev_default_loop_ptr; 2087 return ev_default_loop_ptr;
2001} 2088}
2002 2089
2003void 2090void
2004ev_default_destroy (void) 2091ev_loop_fork (EV_P)
2005{ 2092{
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 */ 2093 postfork = 1; /* must be in line with ev_default_fork */
2028} 2094}
2029 2095
2030/*****************************************************************************/ 2096/*****************************************************************************/
2031 2097
2032void 2098void
… …
2054 2120
2055 for (pri = NUMPRI; pri--; ) 2121 for (pri = NUMPRI; pri--; )
2056 while (pendingcnt [pri]) 2122 while (pendingcnt [pri])
2057 { 2123 {
2058 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2124 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 2125
2063 p->w->pending = 0; 2126 p->w->pending = 0;
2064 EV_CB_INVOKE (p->w, p->events); 2127 EV_CB_INVOKE (p->w, p->events);
2065 EV_FREQUENT_CHECK; 2128 EV_FREQUENT_CHECK;
2066 } 2129 }
… …
2292 mn_now = ev_rt_now; 2355 mn_now = ev_rt_now;
2293 } 2356 }
2294} 2357}
2295 2358
2296void 2359void
2297ev_loop (EV_P_ int flags) 2360ev_run (EV_P_ int flags)
2298{ 2361{
2299#if EV_FEATURE_API 2362#if EV_FEATURE_API
2300 ++loop_depth; 2363 ++loop_depth;
2301#endif 2364#endif
2302 2365
2303 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2366 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2304 2367
2305 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVBREAK_CANCEL;
2306 2369
2307 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2370 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2308 2371
2309 do 2372 do
2310 { 2373 {
… …
2353 /* calculate blocking time */ 2416 /* calculate blocking time */
2354 { 2417 {
2355 ev_tstamp waittime = 0.; 2418 ev_tstamp waittime = 0.;
2356 ev_tstamp sleeptime = 0.; 2419 ev_tstamp sleeptime = 0.;
2357 2420
2421 /* remember old timestamp for io_blocktime calculation */
2422 ev_tstamp prev_mn_now = mn_now;
2423
2424 /* update time to cancel out callback processing overhead */
2425 time_update (EV_A_ 1e100);
2426
2358 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2427 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2359 { 2428 {
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; 2429 waittime = MAX_BLOCKTIME;
2367 2430
2368 if (timercnt) 2431 if (timercnt)
2369 { 2432 {
2370 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2433 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2400 } 2463 }
2401 2464
2402#if EV_FEATURE_API 2465#if EV_FEATURE_API
2403 ++loop_count; 2466 ++loop_count;
2404#endif 2467#endif
2405 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2468 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2406 backend_poll (EV_A_ waittime); 2469 backend_poll (EV_A_ waittime);
2407 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2470 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2408 2471
2409 /* update ev_rt_now, do magic */ 2472 /* update ev_rt_now, do magic */
2410 time_update (EV_A_ waittime + sleeptime); 2473 time_update (EV_A_ waittime + sleeptime);
2411 } 2474 }
2412 2475
… …
2430 EV_INVOKE_PENDING; 2493 EV_INVOKE_PENDING;
2431 } 2494 }
2432 while (expect_true ( 2495 while (expect_true (
2433 activecnt 2496 activecnt
2434 && !loop_done 2497 && !loop_done
2435 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2498 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2436 )); 2499 ));
2437 2500
2438 if (loop_done == EVUNLOOP_ONE) 2501 if (loop_done == EVBREAK_ONE)
2439 loop_done = EVUNLOOP_CANCEL; 2502 loop_done = EVBREAK_CANCEL;
2440 2503
2441#if EV_FEATURE_API 2504#if EV_FEATURE_API
2442 --loop_depth; 2505 --loop_depth;
2443#endif 2506#endif
2444} 2507}
2445 2508
2446void 2509void
2447ev_unloop (EV_P_ int how) 2510ev_break (EV_P_ int how)
2448{ 2511{
2449 loop_done = how; 2512 loop_done = how;
2450} 2513}
2451 2514
2452void 2515void
… …
2834 sa.sa_handler = ev_sighandler; 2897 sa.sa_handler = ev_sighandler;
2835 sigfillset (&sa.sa_mask); 2898 sigfillset (&sa.sa_mask);
2836 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2899 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2837 sigaction (w->signum, &sa, 0); 2900 sigaction (w->signum, &sa, 0);
2838 2901
2902 if (origflags & EVFLAG_NOSIGMASK)
2903 {
2839 sigemptyset (&sa.sa_mask); 2904 sigemptyset (&sa.sa_mask);
2840 sigaddset (&sa.sa_mask, w->signum); 2905 sigaddset (&sa.sa_mask, w->signum);
2841 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2906 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2907 }
2842#endif 2908#endif
2843 } 2909 }
2844 2910
2845 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2846} 2912}
… …
3062 { 3128 {
3063 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3129 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3064 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3130 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3065 ofs += sizeof (struct inotify_event) + ev->len; 3131 ofs += sizeof (struct inotify_event) + ev->len;
3066 } 3132 }
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} 3133}
3100 3134
3101inline_size void 3135inline_size void
3102ev_check_2625 (EV_P) 3136ev_check_2625 (EV_P)
3103{ 3137{
… …
3427 3461
3428#if EV_EMBED_ENABLE 3462#if EV_EMBED_ENABLE
3429void noinline 3463void noinline
3430ev_embed_sweep (EV_P_ ev_embed *w) 3464ev_embed_sweep (EV_P_ ev_embed *w)
3431{ 3465{
3432 ev_loop (w->other, EVLOOP_NONBLOCK); 3466 ev_run (w->other, EVRUN_NOWAIT);
3433} 3467}
3434 3468
3435static void 3469static void
3436embed_io_cb (EV_P_ ev_io *io, int revents) 3470embed_io_cb (EV_P_ ev_io *io, int revents)
3437{ 3471{
3438 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3472 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3439 3473
3440 if (ev_cb (w)) 3474 if (ev_cb (w))
3441 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3475 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3442 else 3476 else
3443 ev_loop (w->other, EVLOOP_NONBLOCK); 3477 ev_run (w->other, EVRUN_NOWAIT);
3444} 3478}
3445 3479
3446static void 3480static void
3447embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3481embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3448{ 3482{
… …
3452 EV_P = w->other; 3486 EV_P = w->other;
3453 3487
3454 while (fdchangecnt) 3488 while (fdchangecnt)
3455 { 3489 {
3456 fd_reify (EV_A); 3490 fd_reify (EV_A);
3457 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3491 ev_run (EV_A_ EVRUN_NOWAIT);
3458 } 3492 }
3459 } 3493 }
3460} 3494}
3461 3495
3462static void 3496static void
… …
3468 3502
3469 { 3503 {
3470 EV_P = w->other; 3504 EV_P = w->other;
3471 3505
3472 ev_loop_fork (EV_A); 3506 ev_loop_fork (EV_A);
3473 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3507 ev_run (EV_A_ EVRUN_NOWAIT);
3474 } 3508 }
3475 3509
3476 ev_embed_start (EV_A_ w); 3510 ev_embed_start (EV_A_ w);
3477} 3511}
3478 3512
… …
3570 3604
3571 EV_FREQUENT_CHECK; 3605 EV_FREQUENT_CHECK;
3572} 3606}
3573#endif 3607#endif
3574 3608
3575#if EV_ASYNC_ENABLE 3609#if EV_CLEANUP_ENABLE
3576void 3610void
3577ev_async_start (EV_P_ ev_async *w) 3611ev_cleanup_start (EV_P_ ev_cleanup *w)
3578{ 3612{
3579 if (expect_false (ev_is_active (w))) 3613 if (expect_false (ev_is_active (w)))
3580 return; 3614 return;
3615
3616 EV_FREQUENT_CHECK;
3617
3618 ev_start (EV_A_ (W)w, ++cleanupcnt);
3619 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3620 cleanups [cleanupcnt - 1] = w;
3621
3622 /* cleanup watchers should never keep a refcount on the loop */
3623 ev_unref (EV_A);
3624 EV_FREQUENT_CHECK;
3625}
3626
3627void
3628ev_cleanup_stop (EV_P_ ev_cleanup *w)
3629{
3630 clear_pending (EV_A_ (W)w);
3631 if (expect_false (!ev_is_active (w)))
3632 return;
3633
3634 EV_FREQUENT_CHECK;
3635 ev_ref (EV_A);
3636
3637 {
3638 int active = ev_active (w);
3639
3640 cleanups [active - 1] = cleanups [--cleanupcnt];
3641 ev_active (cleanups [active - 1]) = active;
3642 }
3643
3644 ev_stop (EV_A_ (W)w);
3645
3646 EV_FREQUENT_CHECK;
3647}
3648#endif
3649
3650#if EV_ASYNC_ENABLE
3651void
3652ev_async_start (EV_P_ ev_async *w)
3653{
3654 if (expect_false (ev_is_active (w)))
3655 return;
3656
3657 w->sent = 0;
3581 3658
3582 evpipe_init (EV_A); 3659 evpipe_init (EV_A);
3583 3660
3584 EV_FREQUENT_CHECK; 3661 EV_FREQUENT_CHECK;
3585 3662
… …
3805 3882
3806#if EV_MULTIPLICITY 3883#if EV_MULTIPLICITY
3807 #include "ev_wrap.h" 3884 #include "ev_wrap.h"
3808#endif 3885#endif
3809 3886
3810#ifdef __cplusplus 3887EV_CPP(})
3811}
3812#endif
3813 3888

Diff Legend

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