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

Comparing libev/ev.c (file contents):
Revision 1.349 by sf-exg, Fri Oct 15 22:59:59 2010 UTC vs.
Revision 1.366 by root, Mon Jan 10 01:58:54 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
… …
943 { 971 {
944 int fd = fdchanges [i]; 972 int fd = fdchanges [i];
945 ANFD *anfd = anfds + fd; 973 ANFD *anfd = anfds + fd;
946 ev_io *w; 974 ev_io *w;
947 975
948 unsigned char events = 0; 976 unsigned char o_events = anfd->events;
977 unsigned char o_reify = anfd->reify;
949 978
950 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 979 anfd->reify = 0;
951 events |= (unsigned char)w->events;
952 980
953#if EV_SELECT_IS_WINSOCKET 981#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
954 if (events) 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
991 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
962 { 992 {
963 unsigned char o_events = anfd->events;
964 unsigned char o_reify = anfd->reify;
965
966 anfd->reify = 0;
967 anfd->events = events; 993 anfd->events = 0;
968 994
969 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)
970 backend_modify (EV_A_ fd, o_events, events); 1003 backend_modify (EV_A_ fd, o_events, anfd->events);
971 }
972 } 1004 }
973 1005
974 fdchangecnt = 0; 1006 fdchangecnt = 0;
975} 1007}
976 1008
… …
1337#endif 1369#endif
1338} 1370}
1339 1371
1340/*****************************************************************************/ 1372/*****************************************************************************/
1341 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
1342static void 1388static void
1343ev_sighandler (int signum) 1389ev_sighandler (int signum)
1344{ 1390{
1345#if EV_MULTIPLICITY
1346 EV_P = signals [signum - 1].loop;
1347#endif
1348
1349#ifdef _WIN32 1391#ifdef _WIN32
1350 signal (signum, ev_sighandler); 1392 signal (signum, ev_sighandler);
1351#endif 1393#endif
1352 1394
1353 signals [signum - 1].pending = 1; 1395 ev_feed_signal (signum);
1354 evpipe_write (EV_A_ &sig_pending);
1355} 1396}
1356 1397
1357void noinline 1398void noinline
1358ev_feed_signal_event (EV_P_ int signum) 1399ev_feed_signal_event (EV_P_ int signum)
1359{ 1400{
… …
1459 1500
1460#endif 1501#endif
1461 1502
1462/*****************************************************************************/ 1503/*****************************************************************************/
1463 1504
1505#if EV_USE_IOCP
1506# include "ev_iocp.c"
1507#endif
1464#if EV_USE_PORT 1508#if EV_USE_PORT
1465# include "ev_port.c" 1509# include "ev_port.c"
1466#endif 1510#endif
1467#if EV_USE_KQUEUE 1511#if EV_USE_KQUEUE
1468# include "ev_kqueue.c" 1512# include "ev_kqueue.c"
… …
1541ev_embeddable_backends (void) 1585ev_embeddable_backends (void)
1542{ 1586{
1543 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1587 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1544 1588
1545 /* 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 */
1546 /* please fix it and tell me how to detect the fix */ 1590 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1547 flags &= ~EVBACKEND_EPOLL; 1591 flags &= ~EVBACKEND_EPOLL;
1548 1592
1549 return flags; 1593 return flags;
1550} 1594}
1551 1595
1552unsigned int 1596unsigned int
… …
1608static void noinline 1652static void noinline
1609loop_init (EV_P_ unsigned int flags) 1653loop_init (EV_P_ unsigned int flags)
1610{ 1654{
1611 if (!backend) 1655 if (!backend)
1612 { 1656 {
1657 origflags = flags;
1658
1613#if EV_USE_REALTIME 1659#if EV_USE_REALTIME
1614 if (!have_realtime) 1660 if (!have_realtime)
1615 { 1661 {
1616 struct timespec ts; 1662 struct timespec ts;
1617 1663
… …
1662#endif 1708#endif
1663#if EV_USE_SIGNALFD 1709#if EV_USE_SIGNALFD
1664 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1710 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1665#endif 1711#endif
1666 1712
1667 if (!(flags & 0x0000ffffU)) 1713 if (!(flags & EVBACKEND_MASK))
1668 flags |= ev_recommended_backends (); 1714 flags |= ev_recommended_backends ();
1669 1715
1716#if EV_USE_IOCP
1717 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1718#endif
1670#if EV_USE_PORT 1719#if EV_USE_PORT
1671 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1720 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1672#endif 1721#endif
1673#if EV_USE_KQUEUE 1722#if EV_USE_KQUEUE
1674 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1723 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1691#endif 1740#endif
1692 } 1741 }
1693} 1742}
1694 1743
1695/* free up a loop structure */ 1744/* free up a loop structure */
1696static void noinline 1745void
1697loop_destroy (EV_P) 1746ev_loop_destroy (EV_P)
1698{ 1747{
1699 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
1700 1772
1701 if (ev_is_active (&pipe_w)) 1773 if (ev_is_active (&pipe_w))
1702 { 1774 {
1703 /*ev_ref (EV_A);*/ 1775 /*ev_ref (EV_A);*/
1704 /*ev_io_stop (EV_A_ &pipe_w);*/ 1776 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1726#endif 1798#endif
1727 1799
1728 if (backend_fd >= 0) 1800 if (backend_fd >= 0)
1729 close (backend_fd); 1801 close (backend_fd);
1730 1802
1803#if EV_USE_IOCP
1804 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1805#endif
1731#if EV_USE_PORT 1806#if EV_USE_PORT
1732 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1807 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1733#endif 1808#endif
1734#if EV_USE_KQUEUE 1809#if EV_USE_KQUEUE
1735 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1810 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1762 array_free (periodic, EMPTY); 1837 array_free (periodic, EMPTY);
1763#endif 1838#endif
1764#if EV_FORK_ENABLE 1839#if EV_FORK_ENABLE
1765 array_free (fork, EMPTY); 1840 array_free (fork, EMPTY);
1766#endif 1841#endif
1842#if EV_CLEANUP_ENABLE
1843 array_free (cleanup, EMPTY);
1844#endif
1767 array_free (prepare, EMPTY); 1845 array_free (prepare, EMPTY);
1768 array_free (check, EMPTY); 1846 array_free (check, EMPTY);
1769#if EV_ASYNC_ENABLE 1847#if EV_ASYNC_ENABLE
1770 array_free (async, EMPTY); 1848 array_free (async, EMPTY);
1771#endif 1849#endif
1772 1850
1773 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
1774} 1861}
1775 1862
1776#if EV_USE_INOTIFY 1863#if EV_USE_INOTIFY
1777inline_size void infy_fork (EV_P); 1864inline_size void infy_fork (EV_P);
1778#endif 1865#endif
… …
1837 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
1838 1925
1839 if (ev_backend (EV_A)) 1926 if (ev_backend (EV_A))
1840 return EV_A; 1927 return EV_A;
1841 1928
1929 ev_free (EV_A);
1842 return 0; 1930 return 0;
1843} 1931}
1844 1932
1845void
1846ev_loop_destroy (EV_P)
1847{
1848 loop_destroy (EV_A);
1849 ev_free (loop);
1850}
1851
1852void
1853ev_loop_fork (EV_P)
1854{
1855 postfork = 1; /* must be in line with ev_default_fork */
1856}
1857#endif /* multiplicity */ 1933#endif /* multiplicity */
1858 1934
1859#if EV_VERIFY 1935#if EV_VERIFY
1860static void noinline 1936static void noinline
1861verify_watcher (EV_P_ W w) 1937verify_watcher (EV_P_ W w)
… …
1936#if EV_FORK_ENABLE 2012#if EV_FORK_ENABLE
1937 assert (forkmax >= forkcnt); 2013 assert (forkmax >= forkcnt);
1938 array_verify (EV_A_ (W *)forks, forkcnt); 2014 array_verify (EV_A_ (W *)forks, forkcnt);
1939#endif 2015#endif
1940 2016
2017#if EV_CLEANUP_ENABLE
2018 assert (cleanupmax >= cleanupcnt);
2019 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2020#endif
2021
1941#if EV_ASYNC_ENABLE 2022#if EV_ASYNC_ENABLE
1942 assert (asyncmax >= asynccnt); 2023 assert (asyncmax >= asynccnt);
1943 array_verify (EV_A_ (W *)asyncs, asynccnt); 2024 array_verify (EV_A_ (W *)asyncs, asynccnt);
1944#endif 2025#endif
1945 2026
… …
1963} 2044}
1964#endif 2045#endif
1965 2046
1966#if EV_MULTIPLICITY 2047#if EV_MULTIPLICITY
1967struct ev_loop * 2048struct ev_loop *
1968ev_default_loop_init (unsigned int flags)
1969#else 2049#else
1970int 2050int
2051#endif
1971ev_default_loop (unsigned int flags) 2052ev_default_loop (unsigned int flags)
1972#endif
1973{ 2053{
1974 if (!ev_default_loop_ptr) 2054 if (!ev_default_loop_ptr)
1975 { 2055 {
1976#if EV_MULTIPLICITY 2056#if EV_MULTIPLICITY
1977 EV_P = ev_default_loop_ptr = &default_loop_struct; 2057 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1996 2076
1997 return ev_default_loop_ptr; 2077 return ev_default_loop_ptr;
1998} 2078}
1999 2079
2000void 2080void
2001ev_default_destroy (void) 2081ev_loop_fork (EV_P)
2002{ 2082{
2003#if EV_MULTIPLICITY
2004 EV_P = ev_default_loop_ptr;
2005#endif
2006
2007 ev_default_loop_ptr = 0;
2008
2009#if EV_CHILD_ENABLE
2010 ev_ref (EV_A); /* child watcher */
2011 ev_signal_stop (EV_A_ &childev);
2012#endif
2013
2014 loop_destroy (EV_A);
2015}
2016
2017void
2018ev_default_fork (void)
2019{
2020#if EV_MULTIPLICITY
2021 EV_P = ev_default_loop_ptr;
2022#endif
2023
2024 postfork = 1; /* must be in line with ev_loop_fork */ 2083 postfork = 1; /* must be in line with ev_default_fork */
2025} 2084}
2026 2085
2027/*****************************************************************************/ 2086/*****************************************************************************/
2028 2087
2029void 2088void
… …
2289 mn_now = ev_rt_now; 2348 mn_now = ev_rt_now;
2290 } 2349 }
2291} 2350}
2292 2351
2293void 2352void
2294ev_loop (EV_P_ int flags) 2353ev_run (EV_P_ int flags)
2295{ 2354{
2296#if EV_FEATURE_API 2355#if EV_FEATURE_API
2297 ++loop_depth; 2356 ++loop_depth;
2298#endif 2357#endif
2299 2358
2300 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2359 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2301 2360
2302 loop_done = EVUNLOOP_CANCEL; 2361 loop_done = EVBREAK_CANCEL;
2303 2362
2304 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2363 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2305 2364
2306 do 2365 do
2307 { 2366 {
… …
2350 /* calculate blocking time */ 2409 /* calculate blocking time */
2351 { 2410 {
2352 ev_tstamp waittime = 0.; 2411 ev_tstamp waittime = 0.;
2353 ev_tstamp sleeptime = 0.; 2412 ev_tstamp sleeptime = 0.;
2354 2413
2414 /* remember old timestamp for io_blocktime calculation */
2415 ev_tstamp prev_mn_now = mn_now;
2416
2417 /* update time to cancel out callback processing overhead */
2418 time_update (EV_A_ 1e100);
2419
2355 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2420 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2356 { 2421 {
2357 /* remember old timestamp for io_blocktime calculation */
2358 ev_tstamp prev_mn_now = mn_now;
2359
2360 /* update time to cancel out callback processing overhead */
2361 time_update (EV_A_ 1e100);
2362
2363 waittime = MAX_BLOCKTIME; 2422 waittime = MAX_BLOCKTIME;
2364 2423
2365 if (timercnt) 2424 if (timercnt)
2366 { 2425 {
2367 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2426 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2397 } 2456 }
2398 2457
2399#if EV_FEATURE_API 2458#if EV_FEATURE_API
2400 ++loop_count; 2459 ++loop_count;
2401#endif 2460#endif
2402 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2461 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2403 backend_poll (EV_A_ waittime); 2462 backend_poll (EV_A_ waittime);
2404 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2463 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2405 2464
2406 /* update ev_rt_now, do magic */ 2465 /* update ev_rt_now, do magic */
2407 time_update (EV_A_ waittime + sleeptime); 2466 time_update (EV_A_ waittime + sleeptime);
2408 } 2467 }
2409 2468
… …
2427 EV_INVOKE_PENDING; 2486 EV_INVOKE_PENDING;
2428 } 2487 }
2429 while (expect_true ( 2488 while (expect_true (
2430 activecnt 2489 activecnt
2431 && !loop_done 2490 && !loop_done
2432 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2491 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2433 )); 2492 ));
2434 2493
2435 if (loop_done == EVUNLOOP_ONE) 2494 if (loop_done == EVBREAK_ONE)
2436 loop_done = EVUNLOOP_CANCEL; 2495 loop_done = EVBREAK_CANCEL;
2437 2496
2438#if EV_FEATURE_API 2497#if EV_FEATURE_API
2439 --loop_depth; 2498 --loop_depth;
2440#endif 2499#endif
2441} 2500}
2442 2501
2443void 2502void
2444ev_unloop (EV_P_ int how) 2503ev_break (EV_P_ int how)
2445{ 2504{
2446 loop_done = how; 2505 loop_done = how;
2447} 2506}
2448 2507
2449void 2508void
… …
2597 EV_FREQUENT_CHECK; 2656 EV_FREQUENT_CHECK;
2598 2657
2599 wlist_del (&anfds[w->fd].head, (WL)w); 2658 wlist_del (&anfds[w->fd].head, (WL)w);
2600 ev_stop (EV_A_ (W)w); 2659 ev_stop (EV_A_ (W)w);
2601 2660
2602 fd_change (EV_A_ w->fd, 1); 2661 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2603 2662
2604 EV_FREQUENT_CHECK; 2663 EV_FREQUENT_CHECK;
2605} 2664}
2606 2665
2607void noinline 2666void noinline
… …
2831 sa.sa_handler = ev_sighandler; 2890 sa.sa_handler = ev_sighandler;
2832 sigfillset (&sa.sa_mask); 2891 sigfillset (&sa.sa_mask);
2833 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2892 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2834 sigaction (w->signum, &sa, 0); 2893 sigaction (w->signum, &sa, 0);
2835 2894
2895 if (origflags & EVFLAG_NOSIGMASK)
2896 {
2836 sigemptyset (&sa.sa_mask); 2897 sigemptyset (&sa.sa_mask);
2837 sigaddset (&sa.sa_mask, w->signum); 2898 sigaddset (&sa.sa_mask, w->signum);
2838 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0); 2899 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2900 }
2839#endif 2901#endif
2840 } 2902 }
2841 2903
2842 EV_FREQUENT_CHECK; 2904 EV_FREQUENT_CHECK;
2843} 2905}
… …
3059 { 3121 {
3060 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3122 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3061 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3123 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3062 ofs += sizeof (struct inotify_event) + ev->len; 3124 ofs += sizeof (struct inotify_event) + ev->len;
3063 } 3125 }
3064}
3065
3066inline_size unsigned int
3067ev_linux_version (void)
3068{
3069 struct utsname buf;
3070 unsigned int v;
3071 int i;
3072 char *p = buf.release;
3073
3074 if (uname (&buf))
3075 return 0;
3076
3077 for (i = 3+1; --i; )
3078 {
3079 unsigned int c = 0;
3080
3081 for (;;)
3082 {
3083 if (*p >= '0' && *p <= '9')
3084 c = c * 10 + *p++ - '0';
3085 else
3086 {
3087 p += *p == '.';
3088 break;
3089 }
3090 }
3091
3092 v = (v << 8) | c;
3093 }
3094
3095 return v;
3096} 3126}
3097 3127
3098inline_size void 3128inline_size void
3099ev_check_2625 (EV_P) 3129ev_check_2625 (EV_P)
3100{ 3130{
… …
3424 3454
3425#if EV_EMBED_ENABLE 3455#if EV_EMBED_ENABLE
3426void noinline 3456void noinline
3427ev_embed_sweep (EV_P_ ev_embed *w) 3457ev_embed_sweep (EV_P_ ev_embed *w)
3428{ 3458{
3429 ev_loop (w->other, EVLOOP_NONBLOCK); 3459 ev_run (w->other, EVRUN_NOWAIT);
3430} 3460}
3431 3461
3432static void 3462static void
3433embed_io_cb (EV_P_ ev_io *io, int revents) 3463embed_io_cb (EV_P_ ev_io *io, int revents)
3434{ 3464{
3435 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3465 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3436 3466
3437 if (ev_cb (w)) 3467 if (ev_cb (w))
3438 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3468 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3439 else 3469 else
3440 ev_loop (w->other, EVLOOP_NONBLOCK); 3470 ev_run (w->other, EVRUN_NOWAIT);
3441} 3471}
3442 3472
3443static void 3473static void
3444embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3474embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3445{ 3475{
… …
3449 EV_P = w->other; 3479 EV_P = w->other;
3450 3480
3451 while (fdchangecnt) 3481 while (fdchangecnt)
3452 { 3482 {
3453 fd_reify (EV_A); 3483 fd_reify (EV_A);
3454 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3484 ev_run (EV_A_ EVRUN_NOWAIT);
3455 } 3485 }
3456 } 3486 }
3457} 3487}
3458 3488
3459static void 3489static void
… …
3465 3495
3466 { 3496 {
3467 EV_P = w->other; 3497 EV_P = w->other;
3468 3498
3469 ev_loop_fork (EV_A); 3499 ev_loop_fork (EV_A);
3470 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3500 ev_run (EV_A_ EVRUN_NOWAIT);
3471 } 3501 }
3472 3502
3473 ev_embed_start (EV_A_ w); 3503 ev_embed_start (EV_A_ w);
3474} 3504}
3475 3505
… …
3567 3597
3568 EV_FREQUENT_CHECK; 3598 EV_FREQUENT_CHECK;
3569} 3599}
3570#endif 3600#endif
3571 3601
3572#if EV_ASYNC_ENABLE 3602#if EV_CLEANUP_ENABLE
3573void 3603void
3574ev_async_start (EV_P_ ev_async *w) 3604ev_cleanup_start (EV_P_ ev_cleanup *w)
3575{ 3605{
3576 if (expect_false (ev_is_active (w))) 3606 if (expect_false (ev_is_active (w)))
3577 return; 3607 return;
3608
3609 EV_FREQUENT_CHECK;
3610
3611 ev_start (EV_A_ (W)w, ++cleanupcnt);
3612 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3613 cleanups [cleanupcnt - 1] = w;
3614
3615 /* cleanup watchers should never keep a refcount on the loop */
3616 ev_unref (EV_A);
3617 EV_FREQUENT_CHECK;
3618}
3619
3620void
3621ev_cleanup_stop (EV_P_ ev_cleanup *w)
3622{
3623 clear_pending (EV_A_ (W)w);
3624 if (expect_false (!ev_is_active (w)))
3625 return;
3626
3627 EV_FREQUENT_CHECK;
3628 ev_ref (EV_A);
3629
3630 {
3631 int active = ev_active (w);
3632
3633 cleanups [active - 1] = cleanups [--cleanupcnt];
3634 ev_active (cleanups [active - 1]) = active;
3635 }
3636
3637 ev_stop (EV_A_ (W)w);
3638
3639 EV_FREQUENT_CHECK;
3640}
3641#endif
3642
3643#if EV_ASYNC_ENABLE
3644void
3645ev_async_start (EV_P_ ev_async *w)
3646{
3647 if (expect_false (ev_is_active (w)))
3648 return;
3649
3650 w->sent = 0;
3578 3651
3579 evpipe_init (EV_A); 3652 evpipe_init (EV_A);
3580 3653
3581 EV_FREQUENT_CHECK; 3654 EV_FREQUENT_CHECK;
3582 3655
… …
3802 3875
3803#if EV_MULTIPLICITY 3876#if EV_MULTIPLICITY
3804 #include "ev_wrap.h" 3877 #include "ev_wrap.h"
3805#endif 3878#endif
3806 3879
3807#ifdef __cplusplus 3880EV_CPP(})
3808}
3809#endif
3810 3881

Diff Legend

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