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

Comparing libev/ev.c (file contents):
Revision 1.337 by root, Wed Mar 10 09:18:24 2010 UTC vs.
Revision 1.351 by root, Sat Oct 16 06:46:55 2010 UTC

… …
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 94# endif
95# else
96# undef EV_USE_SELECT
97# define EV_USE_SELECT 0
88# endif 98# endif
89 99
100# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 101# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 102# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# define EV_USE_POLL 0 106# define EV_USE_POLL 0
103# endif
104# endif 107# endif
105 108
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 110# ifndef EV_USE_EPOLL
109# else 111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
112# endif 116# endif
113 117
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 119# ifndef EV_USE_KQUEUE
117# else 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
118# define EV_USE_KQUEUE 0
119# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
120# endif 125# endif
121 126
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 128# ifndef EV_USE_PORT
125# else 129# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 130# endif
131# else
132# undef EV_USE_PORT
133# define EV_USE_PORT 0
128# endif 134# endif
129 135
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 137# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 138# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 139# endif
140# else
141# undef EV_USE_INOTIFY
142# define EV_USE_INOTIFY 0
136# endif 143# endif
137 144
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 146# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 147# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
144# endif 152# endif
145 153
154# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 155# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 156# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
152# endif 161# endif
153 162
154#endif 163#endif
155 164
156#include <math.h> 165#include <math.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
188# endif 197# endif
189# undef EV_AVOID_STDIO 198# undef EV_AVOID_STDIO
190#endif 199#endif
200
201/* OS X, in its infinite idiocy, actually HARDCODES
202 * a limit of 1024 into their select. Where people have brains,
203 * OS X engineers apparently have a vacuum. Or maybe they were
204 * ordered to have a vacuum, or they do anything for money.
205 * This might help. Or not.
206 */
207#define _DARWIN_UNLIMITED_SELECT 1
191 208
192/* this block tries to deduce configuration from header-defined symbols and defaults */ 209/* this block tries to deduce configuration from header-defined symbols and defaults */
193 210
194/* try to deduce the maximum number of signals on this platform */ 211/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 212#if defined (EV_NSIG)
… …
219# define EV_NSIG 65 236# define EV_NSIG 65
220#endif 237#endif
221 238
222#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
223# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
224# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
225# else 242# else
226# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
227# endif 244# endif
228#endif 245#endif
229 246
230#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
232# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
233# else 250# else
234# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
235# endif 252# endif
236#endif 253#endif
237 254
… …
239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
240#endif 257#endif
241 258
242#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
243# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
244# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
245# else 262# else
246# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
247# endif 264# endif
248#endif 265#endif
249 266
250#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
251# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
252#endif 269#endif
253 270
254#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
255# ifdef _WIN32 272# ifdef _WIN32
256# define EV_USE_POLL 0 273# define EV_USE_POLL 0
257# else 274# else
258# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
259# endif 276# endif
260#endif 277#endif
261 278
262#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
264# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
265# else 282# else
266# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
267# endif 284# endif
268#endif 285#endif
269 286
… …
275# define EV_USE_PORT 0 292# define EV_USE_PORT 0
276#endif 293#endif
277 294
278#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
280# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
281# else 298# else
282# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
283# endif 300# endif
284#endif 301#endif
285 302
286#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
287# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
288# define EV_PID_HASHSIZE 1
289# else
290# define EV_PID_HASHSIZE 16
291# endif
292#endif 305#endif
293 306
294#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
295# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
296# define EV_INOTIFY_HASHSIZE 1
297# else
298# define EV_INOTIFY_HASHSIZE 16
299# endif
300#endif 309#endif
301 310
302#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
304# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
305# else 314# else
306# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
307# endif 316# endif
308#endif 317#endif
309 318
310#ifndef EV_USE_SIGNALFD 319#ifndef EV_USE_SIGNALFD
311# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
312# define EV_USE_SIGNALFD 1 321# define EV_USE_SIGNALFD EV_FEATURE_OS
313# else 322# else
314# define EV_USE_SIGNALFD 0 323# define EV_USE_SIGNALFD 0
315# endif 324# endif
316#endif 325#endif
317 326
… …
320# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
321# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
322#endif 331#endif
323 332
324#ifndef EV_VERIFY 333#ifndef EV_VERIFY
325# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
326#endif 335#endif
327 336
328#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
329# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
330#endif 339#endif
331 340
332#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
333# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
334#endif 343#endif
335 344
336/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 345/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
337/* which makes programs even slower. might work on other unices, too. */ 346/* which makes programs even slower. might work on other unices, too. */
338#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
… …
439# ifdef __cplusplus 448# ifdef __cplusplus
440} 449}
441# endif 450# endif
442#endif 451#endif
443 452
444
445/**/ 453/**/
446 454
447#if EV_VERIFY >= 3 455#if EV_VERIFY >= 3
448# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 456# define EV_FREQUENT_CHECK ev_verify (EV_A)
449#else 457#else
450# define EV_FREQUENT_CHECK do { } while (0) 458# define EV_FREQUENT_CHECK do { } while (0)
451#endif 459#endif
452 460
453/* 461/*
… …
461#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 469#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
462 470
463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 471#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 472#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
465 473
474#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
475#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
476
466#if __GNUC__ >= 4 477#if __GNUC__ >= 4
467# define expect(expr,value) __builtin_expect ((expr),(value)) 478# define expect(expr,value) __builtin_expect ((expr),(value))
468# define noinline __attribute__ ((noinline)) 479# define noinline __attribute__ ((noinline))
469#else 480#else
470# define expect(expr,value) (expr) 481# define expect(expr,value) (expr)
… …
476 487
477#define expect_false(expr) expect ((expr) != 0, 0) 488#define expect_false(expr) expect ((expr) != 0, 0)
478#define expect_true(expr) expect ((expr) != 0, 1) 489#define expect_true(expr) expect ((expr) != 0, 1)
479#define inline_size static inline 490#define inline_size static inline
480 491
481#if EV_MINIMAL 492#if EV_FEATURE_CODE
493# define inline_speed static inline
494#else
482# define inline_speed static noinline 495# define inline_speed static noinline
483#else
484# define inline_speed static inline
485#endif 496#endif
486 497
487#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 498#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
488 499
489#if EV_MINPRI == EV_MAXPRI 500#if EV_MINPRI == EV_MAXPRI
… …
502#define ev_active(w) ((W)(w))->active 513#define ev_active(w) ((W)(w))->active
503#define ev_at(w) ((WT)(w))->at 514#define ev_at(w) ((WT)(w))->at
504 515
505#if EV_USE_REALTIME 516#if EV_USE_REALTIME
506/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 517/* sig_atomic_t is used to avoid per-thread variables or locking but still */
507/* giving it a reasonably high chance of working on typical architetcures */ 518/* giving it a reasonably high chance of working on typical architectures */
508static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 519static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
509#endif 520#endif
510 521
511#if EV_USE_MONOTONIC 522#if EV_USE_MONOTONIC
512static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 523static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
696 707
697 static int ev_default_loop_ptr; 708 static int ev_default_loop_ptr;
698 709
699#endif 710#endif
700 711
701#if EV_MINIMAL < 2 712#if EV_FEATURE_API
702# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 713# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
703# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 714# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
704# define EV_INVOKE_PENDING invoke_cb (EV_A) 715# define EV_INVOKE_PENDING invoke_cb (EV_A)
705#else 716#else
706# define EV_RELEASE_CB (void)0 717# define EV_RELEASE_CB (void)0
… …
760 if (delay > 0.) 771 if (delay > 0.)
761 { 772 {
762#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
763 struct timespec ts; 774 struct timespec ts;
764 775
765 ts.tv_sec = (time_t)delay; 776 EV_TS_SET (ts, delay);
766 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
767
768 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
769#elif defined(_WIN32) 778#elif defined(_WIN32)
770 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
771#else 780#else
772 struct timeval tv; 781 struct timeval tv;
773 782
774 tv.tv_sec = (time_t)delay;
775 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
776
777 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 783 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
778 /* something not guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
779 /* by older ones */ 785 /* by older ones */
786 EV_TV_SET (tv, delay);
780 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
781#endif 788#endif
782 } 789 }
783} 790}
784 791
785/*****************************************************************************/ 792/*****************************************************************************/
786 793
787#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 794#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
788 795
789/* find a suitable new size for the given array, */ 796/* find a suitable new size for the given array, */
790/* hopefully by rounding to a ncie-to-malloc size */ 797/* hopefully by rounding to a nice-to-malloc size */
791inline_size int 798inline_size int
792array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
793{ 800{
794 int ncur = cur + 1; 801 int ncur = cur + 1;
795 802
… …
936 { 943 {
937 int fd = fdchanges [i]; 944 int fd = fdchanges [i];
938 ANFD *anfd = anfds + fd; 945 ANFD *anfd = anfds + fd;
939 ev_io *w; 946 ev_io *w;
940 947
941 unsigned char events = 0; 948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
942 950
943 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 951 anfd->reify = 0;
944 events |= (unsigned char)w->events;
945 952
946#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
947 if (events) 954 if (o_reify & EV__IOFDSET)
948 { 955 {
949 unsigned long arg; 956 unsigned long arg;
950 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
951 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
952 } 959 }
953#endif 960#endif
954 961
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
955 { 963 {
956 unsigned char o_events = anfd->events;
957 unsigned char o_reify = anfd->reify;
958
959 anfd->reify = 0;
960 anfd->events = events; 964 anfd->events = 0;
961 965
962 if (o_events != events || o_reify & EV__IOFDSET) 966 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
967 anfd->events |= (unsigned char)w->events;
968
969 if (o_events != anfd->events)
970 o_reify = EV__IOFDSET; /* actually |= */
971 }
972
973 if (o_reify & EV__IOFDSET)
963 backend_modify (EV_A_ fd, o_events, events); 974 backend_modify (EV_A_ fd, o_events, anfd->events);
964 }
965 } 975 }
966 976
967 fdchangecnt = 0; 977 fdchangecnt = 0;
968} 978}
969 979
… …
1062} 1072}
1063 1073
1064/*****************************************************************************/ 1074/*****************************************************************************/
1065 1075
1066/* 1076/*
1067 * the heap functions want a real array index. array index 0 uis guaranteed to not 1077 * the heap functions want a real array index. array index 0 is guaranteed to not
1068 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1078 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1069 * the branching factor of the d-tree. 1079 * the branching factor of the d-tree.
1070 */ 1080 */
1071 1081
1072/* 1082/*
… …
1272 uint64_t counter = 1; 1282 uint64_t counter = 1;
1273 write (evfd, &counter, sizeof (uint64_t)); 1283 write (evfd, &counter, sizeof (uint64_t));
1274 } 1284 }
1275 else 1285 else
1276#endif 1286#endif
1287 /* win32 people keep sending patches that change this write() to send() */
1288 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1289 /* so when you think this write should be a send instead, please find out */
1290 /* where your send() is from - it's definitely not the microsoft send, and */
1291 /* tell me. thank you. */
1277 write (evpipe [1], &dummy, 1); 1292 write (evpipe [1], &dummy, 1);
1278 1293
1279 errno = old_errno; 1294 errno = old_errno;
1280 } 1295 }
1281} 1296}
… …
1295 } 1310 }
1296 else 1311 else
1297#endif 1312#endif
1298 { 1313 {
1299 char dummy; 1314 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1300 read (evpipe [0], &dummy, 1); 1316 read (evpipe [0], &dummy, 1);
1301 } 1317 }
1302 1318
1303 if (sig_pending) 1319 if (sig_pending)
1304 { 1320 {
… …
1403child_reap (EV_P_ int chain, int pid, int status) 1419child_reap (EV_P_ int chain, int pid, int status)
1404{ 1420{
1405 ev_child *w; 1421 ev_child *w;
1406 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1422 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1407 1423
1408 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1424 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1409 { 1425 {
1410 if ((w->pid == pid || !w->pid) 1426 if ((w->pid == pid || !w->pid)
1411 && (!traced || (w->flags & 1))) 1427 && (!traced || (w->flags & 1)))
1412 { 1428 {
1413 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1429 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1438 /* make sure we are called again until all children have been reaped */ 1454 /* make sure we are called again until all children have been reaped */
1439 /* we need to do it this way so that the callback gets called before we continue */ 1455 /* we need to do it this way so that the callback gets called before we continue */
1440 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1456 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1441 1457
1442 child_reap (EV_A_ pid, pid, status); 1458 child_reap (EV_A_ pid, pid, status);
1443 if (EV_PID_HASHSIZE > 1) 1459 if ((EV_PID_HASHSIZE) > 1)
1444 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1460 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1445} 1461}
1446 1462
1447#endif 1463#endif
1448 1464
… …
1515#ifdef __APPLE__ 1531#ifdef __APPLE__
1516 /* only select works correctly on that "unix-certified" platform */ 1532 /* only select works correctly on that "unix-certified" platform */
1517 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1533 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1518 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1534 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1519#endif 1535#endif
1536#ifdef __FreeBSD__
1537 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1538#endif
1520 1539
1521 return flags; 1540 return flags;
1522} 1541}
1523 1542
1524unsigned int 1543unsigned int
… …
1537ev_backend (EV_P) 1556ev_backend (EV_P)
1538{ 1557{
1539 return backend; 1558 return backend;
1540} 1559}
1541 1560
1542#if EV_MINIMAL < 2 1561#if EV_FEATURE_API
1543unsigned int 1562unsigned int
1544ev_loop_count (EV_P) 1563ev_iteration (EV_P)
1545{ 1564{
1546 return loop_count; 1565 return loop_count;
1547} 1566}
1548 1567
1549unsigned int 1568unsigned int
1550ev_loop_depth (EV_P) 1569ev_depth (EV_P)
1551{ 1570{
1552 return loop_depth; 1571 return loop_depth;
1553} 1572}
1554 1573
1555void 1574void
… …
1627 1646
1628 ev_rt_now = ev_time (); 1647 ev_rt_now = ev_time ();
1629 mn_now = get_clock (); 1648 mn_now = get_clock ();
1630 now_floor = mn_now; 1649 now_floor = mn_now;
1631 rtmn_diff = ev_rt_now - mn_now; 1650 rtmn_diff = ev_rt_now - mn_now;
1632#if EV_MINIMAL < 2 1651#if EV_FEATURE_API
1633 invoke_cb = ev_invoke_pending; 1652 invoke_cb = ev_invoke_pending;
1634#endif 1653#endif
1635 1654
1636 io_blocktime = 0.; 1655 io_blocktime = 0.;
1637 timeout_blocktime = 0.; 1656 timeout_blocktime = 0.;
… …
1874 verify_watcher (EV_A_ ws [cnt]); 1893 verify_watcher (EV_A_ ws [cnt]);
1875 } 1894 }
1876} 1895}
1877#endif 1896#endif
1878 1897
1879#if EV_MINIMAL < 2 1898#if EV_FEATURE_API
1880void 1899void
1881ev_loop_verify (EV_P) 1900ev_verify (EV_P)
1882{ 1901{
1883#if EV_VERIFY 1902#if EV_VERIFY
1884 int i; 1903 int i;
1885 WL w; 1904 WL w;
1886 1905
… …
1937 array_verify (EV_A_ (W *)checks, checkcnt); 1956 array_verify (EV_A_ (W *)checks, checkcnt);
1938#endif 1957#endif
1939 1958
1940# if 0 1959# if 0
1941#if EV_CHILD_ENABLE 1960#if EV_CHILD_ENABLE
1942 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1961 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1943 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1962 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1944#endif 1963#endif
1945# endif 1964# endif
1946#endif 1965#endif
1947} 1966}
… …
2104 EV_FREQUENT_CHECK; 2123 EV_FREQUENT_CHECK;
2105 feed_reverse (EV_A_ (W)w); 2124 feed_reverse (EV_A_ (W)w);
2106 } 2125 }
2107 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2126 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2108 2127
2109 feed_reverse_done (EV_A_ EV_TIMEOUT); 2128 feed_reverse_done (EV_A_ EV_TIMER);
2110 } 2129 }
2111} 2130}
2112 2131
2113#if EV_PERIODIC_ENABLE 2132#if EV_PERIODIC_ENABLE
2114/* make periodics pending */ 2133/* make periodics pending */
… …
2167 feed_reverse_done (EV_A_ EV_PERIODIC); 2186 feed_reverse_done (EV_A_ EV_PERIODIC);
2168 } 2187 }
2169} 2188}
2170 2189
2171/* simply recalculate all periodics */ 2190/* simply recalculate all periodics */
2172/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2191/* TODO: maybe ensure that at least one event happens when jumping forward? */
2173static void noinline 2192static void noinline
2174periodics_reschedule (EV_P) 2193periodics_reschedule (EV_P)
2175{ 2194{
2176 int i; 2195 int i;
2177 2196
… …
2275} 2294}
2276 2295
2277void 2296void
2278ev_loop (EV_P_ int flags) 2297ev_loop (EV_P_ int flags)
2279{ 2298{
2280#if EV_MINIMAL < 2 2299#if EV_FEATURE_API
2281 ++loop_depth; 2300 ++loop_depth;
2282#endif 2301#endif
2283 2302
2284 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2303 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2285 2304
… …
2288 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2307 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2289 2308
2290 do 2309 do
2291 { 2310 {
2292#if EV_VERIFY >= 2 2311#if EV_VERIFY >= 2
2293 ev_loop_verify (EV_A); 2312 ev_verify (EV_A);
2294#endif 2313#endif
2295 2314
2296#ifndef _WIN32 2315#ifndef _WIN32
2297 if (expect_false (curpid)) /* penalise the forking check even more */ 2316 if (expect_false (curpid)) /* penalise the forking check even more */
2298 if (expect_false (getpid () != curpid)) 2317 if (expect_false (getpid () != curpid))
… …
2378 waittime -= sleeptime; 2397 waittime -= sleeptime;
2379 } 2398 }
2380 } 2399 }
2381 } 2400 }
2382 2401
2383#if EV_MINIMAL < 2 2402#if EV_FEATURE_API
2384 ++loop_count; 2403 ++loop_count;
2385#endif 2404#endif
2386 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2405 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2387 backend_poll (EV_A_ waittime); 2406 backend_poll (EV_A_ waittime);
2388 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2407 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
… …
2417 )); 2436 ));
2418 2437
2419 if (loop_done == EVUNLOOP_ONE) 2438 if (loop_done == EVUNLOOP_ONE)
2420 loop_done = EVUNLOOP_CANCEL; 2439 loop_done = EVUNLOOP_CANCEL;
2421 2440
2422#if EV_MINIMAL < 2 2441#if EV_FEATURE_API
2423 --loop_depth; 2442 --loop_depth;
2424#endif 2443#endif
2425} 2444}
2426 2445
2427void 2446void
… …
2581 EV_FREQUENT_CHECK; 2600 EV_FREQUENT_CHECK;
2582 2601
2583 wlist_del (&anfds[w->fd].head, (WL)w); 2602 wlist_del (&anfds[w->fd].head, (WL)w);
2584 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
2585 2604
2586 fd_change (EV_A_ w->fd, 1); 2605 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2587 2606
2588 EV_FREQUENT_CHECK; 2607 EV_FREQUENT_CHECK;
2589} 2608}
2590 2609
2591void noinline 2610void noinline
… …
2877 return; 2896 return;
2878 2897
2879 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2880 2899
2881 ev_start (EV_A_ (W)w, 1); 2900 ev_start (EV_A_ (W)w, 1);
2882 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2883 2902
2884 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2885} 2904}
2886 2905
2887void 2906void
… …
2891 if (expect_false (!ev_is_active (w))) 2910 if (expect_false (!ev_is_active (w)))
2892 return; 2911 return;
2893 2912
2894 EV_FREQUENT_CHECK; 2913 EV_FREQUENT_CHECK;
2895 2914
2896 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2915 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2897 ev_stop (EV_A_ (W)w); 2916 ev_stop (EV_A_ (W)w);
2898 2917
2899 EV_FREQUENT_CHECK; 2918 EV_FREQUENT_CHECK;
2900} 2919}
2901 2920
… …
2974 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2993 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2975 } 2994 }
2976 } 2995 }
2977 2996
2978 if (w->wd >= 0) 2997 if (w->wd >= 0)
2979 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2998 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2980 2999
2981 /* now re-arm timer, if required */ 3000 /* now re-arm timer, if required */
2982 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3001 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2983 ev_timer_again (EV_A_ &w->timer); 3002 ev_timer_again (EV_A_ &w->timer);
2984 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3003 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2992 3011
2993 if (wd < 0) 3012 if (wd < 0)
2994 return; 3013 return;
2995 3014
2996 w->wd = -2; 3015 w->wd = -2;
2997 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3016 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2998 wlist_del (&fs_hash [slot].head, (WL)w); 3017 wlist_del (&fs_hash [slot].head, (WL)w);
2999 3018
3000 /* remove this watcher, if others are watching it, they will rearm */ 3019 /* remove this watcher, if others are watching it, they will rearm */
3001 inotify_rm_watch (fs_fd, wd); 3020 inotify_rm_watch (fs_fd, wd);
3002} 3021}
… …
3004static void noinline 3023static void noinline
3005infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3024infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
3006{ 3025{
3007 if (slot < 0) 3026 if (slot < 0)
3008 /* overflow, need to check for all hash slots */ 3027 /* overflow, need to check for all hash slots */
3009 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3028 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3010 infy_wd (EV_A_ slot, wd, ev); 3029 infy_wd (EV_A_ slot, wd, ev);
3011 else 3030 else
3012 { 3031 {
3013 WL w_; 3032 WL w_;
3014 3033
3015 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3034 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
3016 { 3035 {
3017 ev_stat *w = (ev_stat *)w_; 3036 ev_stat *w = (ev_stat *)w_;
3018 w_ = w_->next; /* lets us remove this watcher and all before it */ 3037 w_ = w_->next; /* lets us remove this watcher and all before it */
3019 3038
3020 if (w->wd == wd || wd == -1) 3039 if (w->wd == wd || wd == -1)
3021 { 3040 {
3022 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3041 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
3023 { 3042 {
3024 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3043 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
3025 w->wd = -1; 3044 w->wd = -1;
3026 infy_add (EV_A_ w); /* re-add, no matter what */ 3045 infy_add (EV_A_ w); /* re-add, no matter what */
3027 } 3046 }
3028 3047
3029 stat_timer_cb (EV_A_ &w->timer, 0); 3048 stat_timer_cb (EV_A_ &w->timer, 0);
… …
3143 ev_io_set (&fs_w, fs_fd, EV_READ); 3162 ev_io_set (&fs_w, fs_fd, EV_READ);
3144 ev_io_start (EV_A_ &fs_w); 3163 ev_io_start (EV_A_ &fs_w);
3145 ev_unref (EV_A); 3164 ev_unref (EV_A);
3146 } 3165 }
3147 3166
3148 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3167 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3149 { 3168 {
3150 WL w_ = fs_hash [slot].head; 3169 WL w_ = fs_hash [slot].head;
3151 fs_hash [slot].head = 0; 3170 fs_hash [slot].head = 0;
3152 3171
3153 while (w_) 3172 while (w_)
… …
3644{ 3663{
3645 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3664 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3646 3665
3647 if (expect_false (!once)) 3666 if (expect_false (!once))
3648 { 3667 {
3649 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3668 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3650 return; 3669 return;
3651 } 3670 }
3652 3671
3653 once->cb = cb; 3672 once->cb = cb;
3654 once->arg = arg; 3673 once->arg = arg;
… …
3769 } 3788 }
3770#endif 3789#endif
3771 3790
3772#if EV_CHILD_ENABLE 3791#if EV_CHILD_ENABLE
3773 if (types & EV_CHILD) 3792 if (types & EV_CHILD)
3774 for (i = EV_PID_HASHSIZE; i--; ) 3793 for (i = (EV_PID_HASHSIZE); i--; )
3775 for (wl = childs [i]; wl; ) 3794 for (wl = childs [i]; wl; )
3776 { 3795 {
3777 wn = wl->next; 3796 wn = wl->next;
3778 cb (EV_A_ EV_CHILD, wl); 3797 cb (EV_A_ EV_CHILD, wl);
3779 wl = wn; 3798 wl = wn;

Diff Legend

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