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

Comparing libev/ev.c (file contents):
Revision 1.339 by root, Tue Mar 16 00:43:22 2010 UTC vs.
Revision 1.354 by root, Fri Oct 22 09:24:11 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
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP EV_FEATURE_OS 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT EV_FEATURE_BACKENDS 98# define EV_USE_POLL EV_FEATURE_BACKENDS
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL EV_FEATURE_BACKENDS
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# ifndef EV_USE_EPOLL
108# define EV_USE_EPOLL EV_FEATURE_BACKENDS 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
109# else
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
115# ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# ifndef EV_USE_PORT
124# define EV_USE_PORT EV_FEATURE_BACKENDS 125# define EV_USE_PORT EV_FEATURE_BACKENDS
125# else
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
133# ifndef EV_USE_INOTIFY
132# define EV_USE_INOTIFY EV_FEATURE_OS 134# define EV_USE_INOTIFY EV_FEATURE_OS
133# else
134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
142# ifndef EV_USE_SIGNALFD
140# define EV_USE_SIGNALFD EV_FEATURE_OS 143# define EV_USE_SIGNALFD EV_FEATURE_OS
141# else
142# define EV_USE_SIGNALFD 0
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD EV_FEATURE_OS 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
… …
172#ifdef EV_H 177#ifdef EV_H
173# include EV_H 178# include EV_H
174#else 179#else
175# include "ev.h" 180# include "ev.h"
176#endif 181#endif
182
183EV_CPP(extern "C" {)
177 184
178#ifndef _WIN32 185#ifndef _WIN32
179# include <sys/time.h> 186# include <sys/time.h>
180# include <sys/wait.h> 187# include <sys/wait.h>
181# include <unistd.h> 188# include <unistd.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
188# endif 195# endif
189# undef EV_AVOID_STDIO 196# undef EV_AVOID_STDIO
190#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
191 206
192/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
193 208
194/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
394# define EFD_CLOEXEC O_CLOEXEC 409# define EFD_CLOEXEC O_CLOEXEC
395# else 410# else
396# define EFD_CLOEXEC 02000000 411# define EFD_CLOEXEC 02000000
397# endif 412# endif
398# endif 413# endif
399# ifdef __cplusplus
400extern "C" {
401# endif
402int (eventfd) (unsigned int initval, int flags); 414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
403# ifdef __cplusplus
404}
405# endif
406#endif 415#endif
407 416
408#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h> 419# include <stdint.h>
… …
416# define SFD_CLOEXEC O_CLOEXEC 425# define SFD_CLOEXEC O_CLOEXEC
417# else 426# else
418# define SFD_CLOEXEC 02000000 427# define SFD_CLOEXEC 02000000
419# endif 428# endif
420# endif 429# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags); 430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
425 431
426struct signalfd_siginfo 432struct signalfd_siginfo
427{ 433{
428 uint32_t ssi_signo; 434 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)]; 435 char pad[128 - sizeof (uint32_t)];
430}; 436};
431# ifdef __cplusplus
432}
433# endif 437#endif
434#endif
435
436 438
437/**/ 439/**/
438 440
439#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
440# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
441#else 443#else
442# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
443#endif 445#endif
444 446
445/* 447/*
… …
453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
454 456
455#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
456#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
457 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
462
458#if __GNUC__ >= 4 463#if __GNUC__ >= 4
459# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
460# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
461#else 466#else
462# define expect(expr,value) (expr) 467# define expect(expr,value) (expr)
… …
494#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
495#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
496 501
497#if EV_USE_REALTIME 502#if EV_USE_REALTIME
498/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* sig_atomic_t is used to avoid per-thread variables or locking but still */
499/* giving it a reasonably high chance of working on typical architetcures */ 504/* giving it a reasonably high chance of working on typical architectures */
500static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
501#endif 506#endif
502 507
503#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
698# define EV_RELEASE_CB (void)0 703# define EV_RELEASE_CB (void)0
699# define EV_ACQUIRE_CB (void)0 704# define EV_ACQUIRE_CB (void)0
700# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 705# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
701#endif 706#endif
702 707
703#define EVUNLOOP_RECURSE 0x80 708#define EVBREAK_RECURSE 0x80
704 709
705/*****************************************************************************/ 710/*****************************************************************************/
706 711
707#ifndef EV_HAVE_EV_TIME 712#ifndef EV_HAVE_EV_TIME
708ev_tstamp 713ev_tstamp
… …
752 if (delay > 0.) 757 if (delay > 0.)
753 { 758 {
754#if EV_USE_NANOSLEEP 759#if EV_USE_NANOSLEEP
755 struct timespec ts; 760 struct timespec ts;
756 761
757 ts.tv_sec = (time_t)delay; 762 EV_TS_SET (ts, delay);
758 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
759
760 nanosleep (&ts, 0); 763 nanosleep (&ts, 0);
761#elif defined(_WIN32) 764#elif defined(_WIN32)
762 Sleep ((unsigned long)(delay * 1e3)); 765 Sleep ((unsigned long)(delay * 1e3));
763#else 766#else
764 struct timeval tv; 767 struct timeval tv;
765 768
766 tv.tv_sec = (time_t)delay;
767 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
768
769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
770 /* something not guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
771 /* by older ones */ 771 /* by older ones */
772 EV_TV_SET (tv, delay);
772 select (0, 0, 0, 0, &tv); 773 select (0, 0, 0, 0, &tv);
773#endif 774#endif
774 } 775 }
775} 776}
776 777
777/*****************************************************************************/ 778/*****************************************************************************/
778 779
779#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 780#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
780 781
781/* find a suitable new size for the given array, */ 782/* find a suitable new size for the given array, */
782/* hopefully by rounding to a ncie-to-malloc size */ 783/* hopefully by rounding to a nice-to-malloc size */
783inline_size int 784inline_size int
784array_nextsize (int elem, int cur, int cnt) 785array_nextsize (int elem, int cur, int cnt)
785{ 786{
786 int ncur = cur + 1; 787 int ncur = cur + 1;
787 788
… …
928 { 929 {
929 int fd = fdchanges [i]; 930 int fd = fdchanges [i];
930 ANFD *anfd = anfds + fd; 931 ANFD *anfd = anfds + fd;
931 ev_io *w; 932 ev_io *w;
932 933
933 unsigned char events = 0; 934 unsigned char o_events = anfd->events;
935 unsigned char o_reify = anfd->reify;
934 936
935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 937 anfd->reify = 0;
936 events |= (unsigned char)w->events;
937 938
938#if EV_SELECT_IS_WINSOCKET 939#if EV_SELECT_IS_WINSOCKET
939 if (events) 940 if (o_reify & EV__IOFDSET)
940 { 941 {
941 unsigned long arg; 942 unsigned long arg;
942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 943 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 944 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
944 } 945 }
945#endif 946#endif
946 947
948 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
947 { 949 {
948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
950
951 anfd->reify = 0;
952 anfd->events = events; 950 anfd->events = 0;
953 951
954 if (o_events != events || o_reify & EV__IOFDSET) 952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
953 anfd->events |= (unsigned char)w->events;
954
955 if (o_events != anfd->events)
956 o_reify = EV__IOFDSET; /* actually |= */
957 }
958
959 if (o_reify & EV__IOFDSET)
955 backend_modify (EV_A_ fd, o_events, events); 960 backend_modify (EV_A_ fd, o_events, anfd->events);
956 }
957 } 961 }
958 962
959 fdchangecnt = 0; 963 fdchangecnt = 0;
960} 964}
961 965
… …
1054} 1058}
1055 1059
1056/*****************************************************************************/ 1060/*****************************************************************************/
1057 1061
1058/* 1062/*
1059 * the heap functions want a real array index. array index 0 uis guaranteed to not 1063 * the heap functions want a real array index. array index 0 is guaranteed to not
1060 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1064 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1061 * the branching factor of the d-tree. 1065 * the branching factor of the d-tree.
1062 */ 1066 */
1063 1067
1064/* 1068/*
… …
1264 uint64_t counter = 1; 1268 uint64_t counter = 1;
1265 write (evfd, &counter, sizeof (uint64_t)); 1269 write (evfd, &counter, sizeof (uint64_t));
1266 } 1270 }
1267 else 1271 else
1268#endif 1272#endif
1273 /* win32 people keep sending patches that change this write() to send() */
1274 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1275 /* so when you think this write should be a send instead, please find out */
1276 /* where your send() is from - it's definitely not the microsoft send, and */
1277 /* tell me. thank you. */
1269 write (evpipe [1], &dummy, 1); 1278 write (evpipe [1], &dummy, 1);
1270 1279
1271 errno = old_errno; 1280 errno = old_errno;
1272 } 1281 }
1273} 1282}
… …
1287 } 1296 }
1288 else 1297 else
1289#endif 1298#endif
1290 { 1299 {
1291 char dummy; 1300 char dummy;
1301 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1292 read (evpipe [0], &dummy, 1); 1302 read (evpipe [0], &dummy, 1);
1293 } 1303 }
1294 1304
1295 if (sig_pending) 1305 if (sig_pending)
1296 { 1306 {
… …
1507#ifdef __APPLE__ 1517#ifdef __APPLE__
1508 /* only select works correctly on that "unix-certified" platform */ 1518 /* only select works correctly on that "unix-certified" platform */
1509 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1519 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1510 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1520 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1511#endif 1521#endif
1522#ifdef __FreeBSD__
1523 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1524#endif
1512 1525
1513 return flags; 1526 return flags;
1514} 1527}
1515 1528
1516unsigned int 1529unsigned int
… …
1531 return backend; 1544 return backend;
1532} 1545}
1533 1546
1534#if EV_FEATURE_API 1547#if EV_FEATURE_API
1535unsigned int 1548unsigned int
1536ev_loop_count (EV_P) 1549ev_iteration (EV_P)
1537{ 1550{
1538 return loop_count; 1551 return loop_count;
1539} 1552}
1540 1553
1541unsigned int 1554unsigned int
1542ev_loop_depth (EV_P) 1555ev_depth (EV_P)
1543{ 1556{
1544 return loop_depth; 1557 return loop_depth;
1545} 1558}
1546 1559
1547void 1560void
… …
1868} 1881}
1869#endif 1882#endif
1870 1883
1871#if EV_FEATURE_API 1884#if EV_FEATURE_API
1872void 1885void
1873ev_loop_verify (EV_P) 1886ev_verify (EV_P)
1874{ 1887{
1875#if EV_VERIFY 1888#if EV_VERIFY
1876 int i; 1889 int i;
1877 WL w; 1890 WL w;
1878 1891
… …
2096 EV_FREQUENT_CHECK; 2109 EV_FREQUENT_CHECK;
2097 feed_reverse (EV_A_ (W)w); 2110 feed_reverse (EV_A_ (W)w);
2098 } 2111 }
2099 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2112 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2100 2113
2101 feed_reverse_done (EV_A_ EV_TIMEOUT); 2114 feed_reverse_done (EV_A_ EV_TIMER);
2102 } 2115 }
2103} 2116}
2104 2117
2105#if EV_PERIODIC_ENABLE 2118#if EV_PERIODIC_ENABLE
2106/* make periodics pending */ 2119/* make periodics pending */
… …
2159 feed_reverse_done (EV_A_ EV_PERIODIC); 2172 feed_reverse_done (EV_A_ EV_PERIODIC);
2160 } 2173 }
2161} 2174}
2162 2175
2163/* simply recalculate all periodics */ 2176/* simply recalculate all periodics */
2164/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2177/* TODO: maybe ensure that at least one event happens when jumping forward? */
2165static void noinline 2178static void noinline
2166periodics_reschedule (EV_P) 2179periodics_reschedule (EV_P)
2167{ 2180{
2168 int i; 2181 int i;
2169 2182
… …
2265 mn_now = ev_rt_now; 2278 mn_now = ev_rt_now;
2266 } 2279 }
2267} 2280}
2268 2281
2269void 2282void
2270ev_loop (EV_P_ int flags) 2283ev_run (EV_P_ int flags)
2271{ 2284{
2272#if EV_FEATURE_API 2285#if EV_FEATURE_API
2273 ++loop_depth; 2286 ++loop_depth;
2274#endif 2287#endif
2275 2288
2276 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2289 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2277 2290
2278 loop_done = EVUNLOOP_CANCEL; 2291 loop_done = EVBREAK_CANCEL;
2279 2292
2280 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2293 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2281 2294
2282 do 2295 do
2283 { 2296 {
2284#if EV_VERIFY >= 2 2297#if EV_VERIFY >= 2
2285 ev_loop_verify (EV_A); 2298 ev_verify (EV_A);
2286#endif 2299#endif
2287 2300
2288#ifndef _WIN32 2301#ifndef _WIN32
2289 if (expect_false (curpid)) /* penalise the forking check even more */ 2302 if (expect_false (curpid)) /* penalise the forking check even more */
2290 if (expect_false (getpid () != curpid)) 2303 if (expect_false (getpid () != curpid))
… …
2326 /* calculate blocking time */ 2339 /* calculate blocking time */
2327 { 2340 {
2328 ev_tstamp waittime = 0.; 2341 ev_tstamp waittime = 0.;
2329 ev_tstamp sleeptime = 0.; 2342 ev_tstamp sleeptime = 0.;
2330 2343
2344 /* remember old timestamp for io_blocktime calculation */
2345 ev_tstamp prev_mn_now = mn_now;
2346
2347 /* update time to cancel out callback processing overhead */
2348 time_update (EV_A_ 1e100);
2349
2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2350 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2332 { 2351 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
2336 /* update time to cancel out callback processing overhead */
2337 time_update (EV_A_ 1e100);
2338
2339 waittime = MAX_BLOCKTIME; 2352 waittime = MAX_BLOCKTIME;
2340 2353
2341 if (timercnt) 2354 if (timercnt)
2342 { 2355 {
2343 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2356 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2373 } 2386 }
2374 2387
2375#if EV_FEATURE_API 2388#if EV_FEATURE_API
2376 ++loop_count; 2389 ++loop_count;
2377#endif 2390#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2391 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2379 backend_poll (EV_A_ waittime); 2392 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2393 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2381 2394
2382 /* update ev_rt_now, do magic */ 2395 /* update ev_rt_now, do magic */
2383 time_update (EV_A_ waittime + sleeptime); 2396 time_update (EV_A_ waittime + sleeptime);
2384 } 2397 }
2385 2398
… …
2403 EV_INVOKE_PENDING; 2416 EV_INVOKE_PENDING;
2404 } 2417 }
2405 while (expect_true ( 2418 while (expect_true (
2406 activecnt 2419 activecnt
2407 && !loop_done 2420 && !loop_done
2408 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2421 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2409 )); 2422 ));
2410 2423
2411 if (loop_done == EVUNLOOP_ONE) 2424 if (loop_done == EVBREAK_ONE)
2412 loop_done = EVUNLOOP_CANCEL; 2425 loop_done = EVBREAK_CANCEL;
2413 2426
2414#if EV_FEATURE_API 2427#if EV_FEATURE_API
2415 --loop_depth; 2428 --loop_depth;
2416#endif 2429#endif
2417} 2430}
2418 2431
2419void 2432void
2420ev_unloop (EV_P_ int how) 2433ev_break (EV_P_ int how)
2421{ 2434{
2422 loop_done = how; 2435 loop_done = how;
2423} 2436}
2424 2437
2425void 2438void
… …
2573 EV_FREQUENT_CHECK; 2586 EV_FREQUENT_CHECK;
2574 2587
2575 wlist_del (&anfds[w->fd].head, (WL)w); 2588 wlist_del (&anfds[w->fd].head, (WL)w);
2576 ev_stop (EV_A_ (W)w); 2589 ev_stop (EV_A_ (W)w);
2577 2590
2578 fd_change (EV_A_ w->fd, 1); 2591 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2579 2592
2580 EV_FREQUENT_CHECK; 2593 EV_FREQUENT_CHECK;
2581} 2594}
2582 2595
2583void noinline 2596void noinline
… …
3400 3413
3401#if EV_EMBED_ENABLE 3414#if EV_EMBED_ENABLE
3402void noinline 3415void noinline
3403ev_embed_sweep (EV_P_ ev_embed *w) 3416ev_embed_sweep (EV_P_ ev_embed *w)
3404{ 3417{
3405 ev_loop (w->other, EVLOOP_NONBLOCK); 3418 ev_run (w->other, EVRUN_NOWAIT);
3406} 3419}
3407 3420
3408static void 3421static void
3409embed_io_cb (EV_P_ ev_io *io, int revents) 3422embed_io_cb (EV_P_ ev_io *io, int revents)
3410{ 3423{
3411 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3424 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3412 3425
3413 if (ev_cb (w)) 3426 if (ev_cb (w))
3414 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3427 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3415 else 3428 else
3416 ev_loop (w->other, EVLOOP_NONBLOCK); 3429 ev_run (w->other, EVRUN_NOWAIT);
3417} 3430}
3418 3431
3419static void 3432static void
3420embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3433embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3421{ 3434{
… …
3425 EV_P = w->other; 3438 EV_P = w->other;
3426 3439
3427 while (fdchangecnt) 3440 while (fdchangecnt)
3428 { 3441 {
3429 fd_reify (EV_A); 3442 fd_reify (EV_A);
3430 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3443 ev_run (EV_A_ EVRUN_NOWAIT);
3431 } 3444 }
3432 } 3445 }
3433} 3446}
3434 3447
3435static void 3448static void
… …
3441 3454
3442 { 3455 {
3443 EV_P = w->other; 3456 EV_P = w->other;
3444 3457
3445 ev_loop_fork (EV_A); 3458 ev_loop_fork (EV_A);
3446 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3459 ev_run (EV_A_ EVRUN_NOWAIT);
3447 } 3460 }
3448 3461
3449 ev_embed_start (EV_A_ w); 3462 ev_embed_start (EV_A_ w);
3450} 3463}
3451 3464
… …
3550ev_async_start (EV_P_ ev_async *w) 3563ev_async_start (EV_P_ ev_async *w)
3551{ 3564{
3552 if (expect_false (ev_is_active (w))) 3565 if (expect_false (ev_is_active (w)))
3553 return; 3566 return;
3554 3567
3568 w->sent = 0;
3569
3555 evpipe_init (EV_A); 3570 evpipe_init (EV_A);
3556 3571
3557 EV_FREQUENT_CHECK; 3572 EV_FREQUENT_CHECK;
3558 3573
3559 ev_start (EV_A_ (W)w, ++asynccnt); 3574 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3636{ 3651{
3637 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3652 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3638 3653
3639 if (expect_false (!once)) 3654 if (expect_false (!once))
3640 { 3655 {
3641 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3656 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3642 return; 3657 return;
3643 } 3658 }
3644 3659
3645 once->cb = cb; 3660 once->cb = cb;
3646 once->arg = arg; 3661 once->arg = arg;
… …
3778 3793
3779#if EV_MULTIPLICITY 3794#if EV_MULTIPLICITY
3780 #include "ev_wrap.h" 3795 #include "ev_wrap.h"
3781#endif 3796#endif
3782 3797
3783#ifdef __cplusplus 3798EV_CPP(})
3784}
3785#endif
3786 3799

Diff Legend

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