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

Comparing libev/ev.c (file contents):
Revision 1.320 by root, Fri Dec 4 20:25:06 2009 UTC vs.
Revision 1.352 by root, Thu Oct 21 02:33:08 2010 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 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 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 *
… …
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
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 119# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
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>
… …
163 172
164#include <assert.h> 173#include <assert.h>
165#include <errno.h> 174#include <errno.h>
166#include <sys/types.h> 175#include <sys/types.h>
167#include <time.h> 176#include <time.h>
177#include <limits.h>
168 178
169#include <signal.h> 179#include <signal.h>
170 180
171#ifdef EV_H 181#ifdef EV_H
172# include EV_H 182# include EV_H
… …
183# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
184# include <windows.h> 194# include <windows.h>
185# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
186# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
187# endif 197# endif
198# undef EV_AVOID_STDIO
188#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
189 208
190/* 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 */
191 210
192/* try to deduce the maximum number of signals on this platform */ 211/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG) 212#if defined (EV_NSIG)
… …
205#elif defined (MAXSIG) 224#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 225# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 226#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 227# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 228#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 230#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 232#else
214# error "unable to find value for NSIG, please report" 233# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */ 234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
216# define EV_NSIG 65 236# define EV_NSIG 65
217#endif 237#endif
218 238
219#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 242# else
223# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
224# endif 244# endif
225#endif 245#endif
226 246
227#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 250# else
231# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
232# endif 252# endif
233#endif 253#endif
234 254
… …
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 257#endif
238 258
239#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 262# else
243# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
244# endif 264# endif
245#endif 265#endif
246 266
247#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 269#endif
250 270
251#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
252# ifdef _WIN32 272# ifdef _WIN32
253# define EV_USE_POLL 0 273# define EV_USE_POLL 0
254# else 274# else
255# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 276# endif
257#endif 277#endif
258 278
259#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 282# else
263# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
264# endif 284# endif
265#endif 285#endif
266 286
… …
272# define EV_USE_PORT 0 292# define EV_USE_PORT 0
273#endif 293#endif
274 294
275#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 298# else
279# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
280# endif 300# endif
281#endif 301#endif
282 302
283#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 305#endif
290 306
291#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 309#endif
298 310
299#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 314# else
303# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
304# endif 316# endif
305#endif 317#endif
306 318
307#ifndef EV_USE_SIGNALFD 319#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 321# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 322# else
311# define EV_USE_SIGNALFD 0 323# define EV_USE_SIGNALFD 0
312# endif 324# endif
313#endif 325#endif
314 326
… …
317# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
319#endif 331#endif
320 332
321#ifndef EV_VERIFY 333#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 335#endif
324 336
325#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 339#endif
328 340
329#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 343#endif
332 344
333/* 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, */
334/* which makes programs even slower. might work on other unices, too. */ 346/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
… …
343# define EV_USE_CLOCK_SYSCALL 0 355# define EV_USE_CLOCK_SYSCALL 0
344# endif 356# endif
345#endif 357#endif
346 358
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 359/* this block fixes any misconfiguration where we know we run into trouble otherwise */
360
361#ifdef _AIX
362/* AIX has a completely broken poll.h header */
363# undef EV_USE_POLL
364# define EV_USE_POLL 0
365#endif
348 366
349#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
352#endif 370#endif
… …
396# endif 414# endif
397# endif 415# endif
398# ifdef __cplusplus 416# ifdef __cplusplus
399extern "C" { 417extern "C" {
400# endif 418# endif
401int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
402# ifdef __cplusplus 420# ifdef __cplusplus
403} 421}
404# endif 422# endif
405#endif 423#endif
406 424
… …
430# ifdef __cplusplus 448# ifdef __cplusplus
431} 449}
432# endif 450# endif
433#endif 451#endif
434 452
435
436/**/ 453/**/
437 454
438#if EV_VERIFY >= 3 455#if EV_VERIFY >= 3
439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 456# define EV_FREQUENT_CHECK ev_verify (EV_A)
440#else 457#else
441# define EV_FREQUENT_CHECK do { } while (0) 458# define EV_FREQUENT_CHECK do { } while (0)
442#endif 459#endif
443 460
444/* 461/*
… …
452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 469#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
453 470
454#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) */
455#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) */
456 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
457#if __GNUC__ >= 4 477#if __GNUC__ >= 4
458# define expect(expr,value) __builtin_expect ((expr),(value)) 478# define expect(expr,value) __builtin_expect ((expr),(value))
459# define noinline __attribute__ ((noinline)) 479# define noinline __attribute__ ((noinline))
460#else 480#else
461# define expect(expr,value) (expr) 481# define expect(expr,value) (expr)
… …
467 487
468#define expect_false(expr) expect ((expr) != 0, 0) 488#define expect_false(expr) expect ((expr) != 0, 0)
469#define expect_true(expr) expect ((expr) != 0, 1) 489#define expect_true(expr) expect ((expr) != 0, 1)
470#define inline_size static inline 490#define inline_size static inline
471 491
472#if EV_MINIMAL 492#if EV_FEATURE_CODE
493# define inline_speed static inline
494#else
473# define inline_speed static noinline 495# define inline_speed static noinline
474#else
475# define inline_speed static inline
476#endif 496#endif
477 497
478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 498#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479 499
480#if EV_MINPRI == EV_MAXPRI 500#if EV_MINPRI == EV_MAXPRI
… …
493#define ev_active(w) ((W)(w))->active 513#define ev_active(w) ((W)(w))->active
494#define ev_at(w) ((WT)(w))->at 514#define ev_at(w) ((WT)(w))->at
495 515
496#if EV_USE_REALTIME 516#if EV_USE_REALTIME
497/* 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 */
498/* giving it a reasonably high chance of working on typical architetcures */ 518/* giving it a reasonably high chance of working on typical architectures */
499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 519static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
500#endif 520#endif
501 521
502#if EV_USE_MONOTONIC 522#if EV_USE_MONOTONIC
503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 523static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
505 525
506#ifndef EV_FD_TO_WIN32_HANDLE 526#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 527# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif 528#endif
509#ifndef EV_WIN32_HANDLE_TO_FD 529#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 530# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif 531#endif
512#ifndef EV_WIN32_CLOSE_FD 532#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd) 533# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif 534#endif
515 535
516#ifdef _WIN32 536#ifdef _WIN32
517# include "ev_win32.c" 537# include "ev_win32.c"
518#endif 538#endif
519 539
520/*****************************************************************************/ 540/*****************************************************************************/
541
542#if EV_AVOID_STDIO
543static void noinline
544ev_printerr (const char *msg)
545{
546 write (STDERR_FILENO, msg, strlen (msg));
547}
548#endif
521 549
522static void (*syserr_cb)(const char *msg); 550static void (*syserr_cb)(const char *msg);
523 551
524void 552void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 553ev_set_syserr_cb (void (*cb)(const char *msg))
… …
535 563
536 if (syserr_cb) 564 if (syserr_cb)
537 syserr_cb (msg); 565 syserr_cb (msg);
538 else 566 else
539 { 567 {
568#if EV_AVOID_STDIO
569 const char *err = strerror (errno);
570
571 ev_printerr (msg);
572 ev_printerr (": ");
573 ev_printerr (err);
574 ev_printerr ("\n");
575#else
540 perror (msg); 576 perror (msg);
577#endif
541 abort (); 578 abort ();
542 } 579 }
543} 580}
544 581
545static void * 582static void *
546ev_realloc_emul (void *ptr, long size) 583ev_realloc_emul (void *ptr, long size)
547{ 584{
585#if __GLIBC__
586 return realloc (ptr, size);
587#else
548 /* some systems, notably openbsd and darwin, fail to properly 588 /* some systems, notably openbsd and darwin, fail to properly
549 * implement realloc (x, 0) (as required by both ansi c-98 and 589 * implement realloc (x, 0) (as required by both ansi c-89 and
550 * the single unix specification, so work around them here. 590 * the single unix specification, so work around them here.
551 */ 591 */
552 592
553 if (size) 593 if (size)
554 return realloc (ptr, size); 594 return realloc (ptr, size);
555 595
556 free (ptr); 596 free (ptr);
557 return 0; 597 return 0;
598#endif
558} 599}
559 600
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 601static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 602
562void 603void
… …
570{ 611{
571 ptr = alloc (ptr, size); 612 ptr = alloc (ptr, size);
572 613
573 if (!ptr && size) 614 if (!ptr && size)
574 { 615 {
616#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n");
618#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
620#endif
576 abort (); 621 abort ();
577 } 622 }
578 623
579 return ptr; 624 return ptr;
580} 625}
… …
662 707
663 static int ev_default_loop_ptr; 708 static int ev_default_loop_ptr;
664 709
665#endif 710#endif
666 711
667#if EV_MINIMAL < 2 712#if EV_FEATURE_API
668# 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)
669# 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)
670# define EV_INVOKE_PENDING invoke_cb (EV_A) 715# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else 716#else
672# define EV_RELEASE_CB (void)0 717# define EV_RELEASE_CB (void)0
… …
726 if (delay > 0.) 771 if (delay > 0.)
727 { 772 {
728#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
729 struct timespec ts; 774 struct timespec ts;
730 775
731 ts.tv_sec = (time_t)delay; 776 EV_TS_SET (ts, delay);
732 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
733
734 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
735#elif defined(_WIN32) 778#elif defined(_WIN32)
736 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
737#else 780#else
738 struct timeval tv; 781 struct timeval tv;
739 782
740 tv.tv_sec = (time_t)delay;
741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
742
743 /* 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 */
744 /* something not guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
745 /* by older ones */ 785 /* by older ones */
786 EV_TV_SET (tv, delay);
746 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
747#endif 788#endif
748 } 789 }
749} 790}
750 791
751/*****************************************************************************/ 792/*****************************************************************************/
752 793
753#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 */
754 795
755/* find a suitable new size for the given array, */ 796/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */ 797/* hopefully by rounding to a nice-to-malloc size */
757inline_size int 798inline_size int
758array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
759{ 800{
760 int ncur = cur + 1; 801 int ncur = cur + 1;
761 802
… …
857} 898}
858 899
859/*****************************************************************************/ 900/*****************************************************************************/
860 901
861inline_speed void 902inline_speed void
862fd_event_nc (EV_P_ int fd, int revents) 903fd_event_nocheck (EV_P_ int fd, int revents)
863{ 904{
864 ANFD *anfd = anfds + fd; 905 ANFD *anfd = anfds + fd;
865 ev_io *w; 906 ev_io *w;
866 907
867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 908 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
879fd_event (EV_P_ int fd, int revents) 920fd_event (EV_P_ int fd, int revents)
880{ 921{
881 ANFD *anfd = anfds + fd; 922 ANFD *anfd = anfds + fd;
882 923
883 if (expect_true (!anfd->reify)) 924 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents); 925 fd_event_nocheck (EV_A_ fd, revents);
885} 926}
886 927
887void 928void
888ev_feed_fd_event (EV_P_ int fd, int revents) 929ev_feed_fd_event (EV_P_ int fd, int revents)
889{ 930{
890 if (fd >= 0 && fd < anfdmax) 931 if (fd >= 0 && fd < anfdmax)
891 fd_event_nc (EV_A_ fd, revents); 932 fd_event_nocheck (EV_A_ fd, revents);
892} 933}
893 934
894/* make sure the external fd watch events are in-sync */ 935/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */ 936/* with the kernel/libev internal state */
896inline_size void 937inline_size void
… …
902 { 943 {
903 int fd = fdchanges [i]; 944 int fd = fdchanges [i];
904 ANFD *anfd = anfds + fd; 945 ANFD *anfd = anfds + fd;
905 ev_io *w; 946 ev_io *w;
906 947
907 unsigned char events = 0; 948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
908 950
909 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 951 anfd->reify = 0;
910 events |= (unsigned char)w->events;
911 952
912#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
913 if (events) 954 if (o_reify & EV__IOFDSET)
914 { 955 {
915 unsigned long arg; 956 unsigned long arg;
916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
917 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));
918 } 959 }
919#endif 960#endif
920 961
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
921 { 963 {
922 unsigned char o_events = anfd->events;
923 unsigned char o_reify = anfd->reify;
924
925 anfd->reify = 0;
926 anfd->events = events; 964 anfd->events = 0;
927 965
928 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)
929 backend_modify (EV_A_ fd, o_events, events); 974 backend_modify (EV_A_ fd, o_events, anfd->events);
930 }
931 } 975 }
932 976
933 fdchangecnt = 0; 977 fdchangecnt = 0;
934} 978}
935 979
… …
959 ev_io_stop (EV_A_ w); 1003 ev_io_stop (EV_A_ w);
960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1004 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
961 } 1005 }
962} 1006}
963 1007
964/* check whether the given fd is atcually valid, for error recovery */ 1008/* check whether the given fd is actually valid, for error recovery */
965inline_size int 1009inline_size int
966fd_valid (int fd) 1010fd_valid (int fd)
967{ 1011{
968#ifdef _WIN32 1012#ifdef _WIN32
969 return _get_osfhandle (fd) != -1; 1013 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
970#else 1014#else
971 return fcntl (fd, F_GETFD) != -1; 1015 return fcntl (fd, F_GETFD) != -1;
972#endif 1016#endif
973} 1017}
974 1018
… …
1011 anfds [fd].emask = 0; 1055 anfds [fd].emask = 0;
1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1056 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
1013 } 1057 }
1014} 1058}
1015 1059
1060/* used to prepare libev internal fd's */
1061/* this is not fork-safe */
1062inline_speed void
1063fd_intern (int fd)
1064{
1065#ifdef _WIN32
1066 unsigned long arg = 1;
1067 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1068#else
1069 fcntl (fd, F_SETFD, FD_CLOEXEC);
1070 fcntl (fd, F_SETFL, O_NONBLOCK);
1071#endif
1072}
1073
1016/*****************************************************************************/ 1074/*****************************************************************************/
1017 1075
1018/* 1076/*
1019 * 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
1020 * 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
1021 * the branching factor of the d-tree. 1079 * the branching factor of the d-tree.
1022 */ 1080 */
1023 1081
1024/* 1082/*
… …
1172 1230
1173static ANSIG signals [EV_NSIG - 1]; 1231static ANSIG signals [EV_NSIG - 1];
1174 1232
1175/*****************************************************************************/ 1233/*****************************************************************************/
1176 1234
1177/* used to prepare libev internal fd's */ 1235#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1178/* this is not fork-safe */
1179inline_speed void
1180fd_intern (int fd)
1181{
1182#ifdef _WIN32
1183 unsigned long arg = 1;
1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1185#else
1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
1187 fcntl (fd, F_SETFL, O_NONBLOCK);
1188#endif
1189}
1190 1236
1191static void noinline 1237static void noinline
1192evpipe_init (EV_P) 1238evpipe_init (EV_P)
1193{ 1239{
1194 if (!ev_is_active (&pipe_w)) 1240 if (!ev_is_active (&pipe_w))
1195 { 1241 {
1196#if EV_USE_EVENTFD 1242# if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1243 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL) 1244 if (evfd < 0 && errno == EINVAL)
1199 evfd = eventfd (0, 0); 1245 evfd = eventfd (0, 0);
1200 1246
1201 if (evfd >= 0) 1247 if (evfd >= 0)
… …
1203 evpipe [0] = -1; 1249 evpipe [0] = -1;
1204 fd_intern (evfd); /* doing it twice doesn't hurt */ 1250 fd_intern (evfd); /* doing it twice doesn't hurt */
1205 ev_io_set (&pipe_w, evfd, EV_READ); 1251 ev_io_set (&pipe_w, evfd, EV_READ);
1206 } 1252 }
1207 else 1253 else
1208#endif 1254# endif
1209 { 1255 {
1210 while (pipe (evpipe)) 1256 while (pipe (evpipe))
1211 ev_syserr ("(libev) error creating signal/async pipe"); 1257 ev_syserr ("(libev) error creating signal/async pipe");
1212 1258
1213 fd_intern (evpipe [0]); 1259 fd_intern (evpipe [0]);
… …
1224evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1270evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1225{ 1271{
1226 if (!*flag) 1272 if (!*flag)
1227 { 1273 {
1228 int old_errno = errno; /* save errno because write might clobber it */ 1274 int old_errno = errno; /* save errno because write might clobber it */
1275 char dummy;
1229 1276
1230 *flag = 1; 1277 *flag = 1;
1231 1278
1232#if EV_USE_EVENTFD 1279#if EV_USE_EVENTFD
1233 if (evfd >= 0) 1280 if (evfd >= 0)
… …
1235 uint64_t counter = 1; 1282 uint64_t counter = 1;
1236 write (evfd, &counter, sizeof (uint64_t)); 1283 write (evfd, &counter, sizeof (uint64_t));
1237 } 1284 }
1238 else 1285 else
1239#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. */
1240 write (evpipe [1], &old_errno, 1); 1292 write (evpipe [1], &dummy, 1);
1241 1293
1242 errno = old_errno; 1294 errno = old_errno;
1243 } 1295 }
1244} 1296}
1245 1297
… …
1258 } 1310 }
1259 else 1311 else
1260#endif 1312#endif
1261 { 1313 {
1262 char dummy; 1314 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1263 read (evpipe [0], &dummy, 1); 1316 read (evpipe [0], &dummy, 1);
1264 } 1317 }
1265 1318
1266 if (sig_pending) 1319 if (sig_pending)
1267 { 1320 {
… …
1294{ 1347{
1295#if EV_MULTIPLICITY 1348#if EV_MULTIPLICITY
1296 EV_P = signals [signum - 1].loop; 1349 EV_P = signals [signum - 1].loop;
1297#endif 1350#endif
1298 1351
1299#if _WIN32 1352#ifdef _WIN32
1300 signal (signum, ev_sighandler); 1353 signal (signum, ev_sighandler);
1301#endif 1354#endif
1302 1355
1303 signals [signum - 1].pending = 1; 1356 signals [signum - 1].pending = 1;
1304 evpipe_write (EV_A_ &sig_pending); 1357 evpipe_write (EV_A_ &sig_pending);
… …
1346 break; 1399 break;
1347 } 1400 }
1348} 1401}
1349#endif 1402#endif
1350 1403
1404#endif
1405
1351/*****************************************************************************/ 1406/*****************************************************************************/
1352 1407
1408#if EV_CHILD_ENABLE
1353static WL childs [EV_PID_HASHSIZE]; 1409static WL childs [EV_PID_HASHSIZE];
1354
1355#ifndef _WIN32
1356 1410
1357static ev_signal childev; 1411static ev_signal childev;
1358 1412
1359#ifndef WIFCONTINUED 1413#ifndef WIFCONTINUED
1360# define WIFCONTINUED(status) 0 1414# define WIFCONTINUED(status) 0
… …
1365child_reap (EV_P_ int chain, int pid, int status) 1419child_reap (EV_P_ int chain, int pid, int status)
1366{ 1420{
1367 ev_child *w; 1421 ev_child *w;
1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1422 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1369 1423
1370 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)
1371 { 1425 {
1372 if ((w->pid == pid || !w->pid) 1426 if ((w->pid == pid || !w->pid)
1373 && (!traced || (w->flags & 1))) 1427 && (!traced || (w->flags & 1)))
1374 { 1428 {
1375 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 */
… …
1400 /* 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 */
1401 /* 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 */
1402 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1456 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1403 1457
1404 child_reap (EV_A_ pid, pid, status); 1458 child_reap (EV_A_ pid, pid, status);
1405 if (EV_PID_HASHSIZE > 1) 1459 if ((EV_PID_HASHSIZE) > 1)
1406 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 */
1407} 1461}
1408 1462
1409#endif 1463#endif
1410 1464
… …
1477#ifdef __APPLE__ 1531#ifdef __APPLE__
1478 /* only select works correctly on that "unix-certified" platform */ 1532 /* only select works correctly on that "unix-certified" platform */
1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1533 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 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 */
1481#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
1482 1539
1483 return flags; 1540 return flags;
1484} 1541}
1485 1542
1486unsigned int 1543unsigned int
… …
1499ev_backend (EV_P) 1556ev_backend (EV_P)
1500{ 1557{
1501 return backend; 1558 return backend;
1502} 1559}
1503 1560
1504#if EV_MINIMAL < 2 1561#if EV_FEATURE_API
1505unsigned int 1562unsigned int
1506ev_loop_count (EV_P) 1563ev_iteration (EV_P)
1507{ 1564{
1508 return loop_count; 1565 return loop_count;
1509} 1566}
1510 1567
1511unsigned int 1568unsigned int
1512ev_loop_depth (EV_P) 1569ev_depth (EV_P)
1513{ 1570{
1514 return loop_depth; 1571 return loop_depth;
1515} 1572}
1516 1573
1517void 1574void
… …
1589 1646
1590 ev_rt_now = ev_time (); 1647 ev_rt_now = ev_time ();
1591 mn_now = get_clock (); 1648 mn_now = get_clock ();
1592 now_floor = mn_now; 1649 now_floor = mn_now;
1593 rtmn_diff = ev_rt_now - mn_now; 1650 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2 1651#if EV_FEATURE_API
1595 invoke_cb = ev_invoke_pending; 1652 invoke_cb = ev_invoke_pending;
1596#endif 1653#endif
1597 1654
1598 io_blocktime = 0.; 1655 io_blocktime = 0.;
1599 timeout_blocktime = 0.; 1656 timeout_blocktime = 0.;
… …
1605#endif 1662#endif
1606#if EV_USE_INOTIFY 1663#if EV_USE_INOTIFY
1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1664 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1608#endif 1665#endif
1609#if EV_USE_SIGNALFD 1666#if EV_USE_SIGNALFD
1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1667 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1611#endif 1668#endif
1612 1669
1613 if (!(flags & 0x0000ffffU)) 1670 if (!(flags & 0x0000ffffU))
1614 flags |= ev_recommended_backends (); 1671 flags |= ev_recommended_backends ();
1615 1672
… …
1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1686 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1630#endif 1687#endif
1631 1688
1632 ev_prepare_init (&pending_w, pendingcb); 1689 ev_prepare_init (&pending_w, pendingcb);
1633 1690
1691#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1634 ev_init (&pipe_w, pipecb); 1692 ev_init (&pipe_w, pipecb);
1635 ev_set_priority (&pipe_w, EV_MAXPRI); 1693 ev_set_priority (&pipe_w, EV_MAXPRI);
1694#endif
1636 } 1695 }
1637} 1696}
1638 1697
1639/* free up a loop structure */ 1698/* free up a loop structure */
1640static void noinline 1699static void noinline
… …
1758 { 1817 {
1759 EV_WIN32_CLOSE_FD (evpipe [0]); 1818 EV_WIN32_CLOSE_FD (evpipe [0]);
1760 EV_WIN32_CLOSE_FD (evpipe [1]); 1819 EV_WIN32_CLOSE_FD (evpipe [1]);
1761 } 1820 }
1762 1821
1822#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1763 evpipe_init (EV_A); 1823 evpipe_init (EV_A);
1764 /* now iterate over everything, in case we missed something */ 1824 /* now iterate over everything, in case we missed something */
1765 pipecb (EV_A_ &pipe_w, EV_READ); 1825 pipecb (EV_A_ &pipe_w, EV_READ);
1826#endif
1766 } 1827 }
1767 1828
1768 postfork = 0; 1829 postfork = 0;
1769} 1830}
1770 1831
… …
1832 verify_watcher (EV_A_ ws [cnt]); 1893 verify_watcher (EV_A_ ws [cnt]);
1833 } 1894 }
1834} 1895}
1835#endif 1896#endif
1836 1897
1837#if EV_MINIMAL < 2 1898#if EV_FEATURE_API
1838void 1899void
1839ev_loop_verify (EV_P) 1900ev_verify (EV_P)
1840{ 1901{
1841#if EV_VERIFY 1902#if EV_VERIFY
1842 int i; 1903 int i;
1843 WL w; 1904 WL w;
1844 1905
… …
1883#if EV_ASYNC_ENABLE 1944#if EV_ASYNC_ENABLE
1884 assert (asyncmax >= asynccnt); 1945 assert (asyncmax >= asynccnt);
1885 array_verify (EV_A_ (W *)asyncs, asynccnt); 1946 array_verify (EV_A_ (W *)asyncs, asynccnt);
1886#endif 1947#endif
1887 1948
1949#if EV_PREPARE_ENABLE
1888 assert (preparemax >= preparecnt); 1950 assert (preparemax >= preparecnt);
1889 array_verify (EV_A_ (W *)prepares, preparecnt); 1951 array_verify (EV_A_ (W *)prepares, preparecnt);
1952#endif
1890 1953
1954#if EV_CHECK_ENABLE
1891 assert (checkmax >= checkcnt); 1955 assert (checkmax >= checkcnt);
1892 array_verify (EV_A_ (W *)checks, checkcnt); 1956 array_verify (EV_A_ (W *)checks, checkcnt);
1957#endif
1893 1958
1894# if 0 1959# if 0
1960#if EV_CHILD_ENABLE
1895 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)
1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1962 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1963#endif
1897# endif 1964# endif
1898#endif 1965#endif
1899} 1966}
1900#endif 1967#endif
1901 1968
… …
1917 1984
1918 loop_init (EV_A_ flags); 1985 loop_init (EV_A_ flags);
1919 1986
1920 if (ev_backend (EV_A)) 1987 if (ev_backend (EV_A))
1921 { 1988 {
1922#ifndef _WIN32 1989#if EV_CHILD_ENABLE
1923 ev_signal_init (&childev, childcb, SIGCHLD); 1990 ev_signal_init (&childev, childcb, SIGCHLD);
1924 ev_set_priority (&childev, EV_MAXPRI); 1991 ev_set_priority (&childev, EV_MAXPRI);
1925 ev_signal_start (EV_A_ &childev); 1992 ev_signal_start (EV_A_ &childev);
1926 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1993 ev_unref (EV_A); /* child watcher should not keep loop alive */
1927#endif 1994#endif
… …
1940 EV_P = ev_default_loop_ptr; 2007 EV_P = ev_default_loop_ptr;
1941#endif 2008#endif
1942 2009
1943 ev_default_loop_ptr = 0; 2010 ev_default_loop_ptr = 0;
1944 2011
1945#ifndef _WIN32 2012#if EV_CHILD_ENABLE
1946 ev_ref (EV_A); /* child watcher */ 2013 ev_ref (EV_A); /* child watcher */
1947 ev_signal_stop (EV_A_ &childev); 2014 ev_signal_stop (EV_A_ &childev);
1948#endif 2015#endif
1949 2016
1950 loop_destroy (EV_A); 2017 loop_destroy (EV_A);
… …
2056 EV_FREQUENT_CHECK; 2123 EV_FREQUENT_CHECK;
2057 feed_reverse (EV_A_ (W)w); 2124 feed_reverse (EV_A_ (W)w);
2058 } 2125 }
2059 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2126 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2060 2127
2061 feed_reverse_done (EV_A_ EV_TIMEOUT); 2128 feed_reverse_done (EV_A_ EV_TIMER);
2062 } 2129 }
2063} 2130}
2064 2131
2065#if EV_PERIODIC_ENABLE 2132#if EV_PERIODIC_ENABLE
2066/* make periodics pending */ 2133/* make periodics pending */
… …
2119 feed_reverse_done (EV_A_ EV_PERIODIC); 2186 feed_reverse_done (EV_A_ EV_PERIODIC);
2120 } 2187 }
2121} 2188}
2122 2189
2123/* simply recalculate all periodics */ 2190/* simply recalculate all periodics */
2124/* 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? */
2125static void noinline 2192static void noinline
2126periodics_reschedule (EV_P) 2193periodics_reschedule (EV_P)
2127{ 2194{
2128 int i; 2195 int i;
2129 2196
… …
2157 ANHE_at_cache (*he); 2224 ANHE_at_cache (*he);
2158 } 2225 }
2159} 2226}
2160 2227
2161/* fetch new monotonic and realtime times from the kernel */ 2228/* fetch new monotonic and realtime times from the kernel */
2162/* also detetc if there was a timejump, and act accordingly */ 2229/* also detect if there was a timejump, and act accordingly */
2163inline_speed void 2230inline_speed void
2164time_update (EV_P_ ev_tstamp max_block) 2231time_update (EV_P_ ev_tstamp max_block)
2165{ 2232{
2166#if EV_USE_MONOTONIC 2233#if EV_USE_MONOTONIC
2167 if (expect_true (have_monotonic)) 2234 if (expect_true (have_monotonic))
… …
2227} 2294}
2228 2295
2229void 2296void
2230ev_loop (EV_P_ int flags) 2297ev_loop (EV_P_ int flags)
2231{ 2298{
2232#if EV_MINIMAL < 2 2299#if EV_FEATURE_API
2233 ++loop_depth; 2300 ++loop_depth;
2234#endif 2301#endif
2235 2302
2236 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));
2237 2304
… …
2240 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 */
2241 2308
2242 do 2309 do
2243 { 2310 {
2244#if EV_VERIFY >= 2 2311#if EV_VERIFY >= 2
2245 ev_loop_verify (EV_A); 2312 ev_verify (EV_A);
2246#endif 2313#endif
2247 2314
2248#ifndef _WIN32 2315#ifndef _WIN32
2249 if (expect_false (curpid)) /* penalise the forking check even more */ 2316 if (expect_false (curpid)) /* penalise the forking check even more */
2250 if (expect_false (getpid () != curpid)) 2317 if (expect_false (getpid () != curpid))
… …
2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2329 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2263 EV_INVOKE_PENDING; 2330 EV_INVOKE_PENDING;
2264 } 2331 }
2265#endif 2332#endif
2266 2333
2334#if EV_PREPARE_ENABLE
2267 /* queue prepare watchers (and execute them) */ 2335 /* queue prepare watchers (and execute them) */
2268 if (expect_false (preparecnt)) 2336 if (expect_false (preparecnt))
2269 { 2337 {
2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2338 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2271 EV_INVOKE_PENDING; 2339 EV_INVOKE_PENDING;
2272 } 2340 }
2341#endif
2273 2342
2274 if (expect_false (loop_done)) 2343 if (expect_false (loop_done))
2275 break; 2344 break;
2276 2345
2277 /* we might have forked, so reify kernel state if necessary */ 2346 /* we might have forked, so reify kernel state if necessary */
… …
2328 waittime -= sleeptime; 2397 waittime -= sleeptime;
2329 } 2398 }
2330 } 2399 }
2331 } 2400 }
2332 2401
2333#if EV_MINIMAL < 2 2402#if EV_FEATURE_API
2334 ++loop_count; 2403 ++loop_count;
2335#endif 2404#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2405 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2337 backend_poll (EV_A_ waittime); 2406 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2407 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
… …
2350#if EV_IDLE_ENABLE 2419#if EV_IDLE_ENABLE
2351 /* queue idle watchers unless other events are pending */ 2420 /* queue idle watchers unless other events are pending */
2352 idle_reify (EV_A); 2421 idle_reify (EV_A);
2353#endif 2422#endif
2354 2423
2424#if EV_CHECK_ENABLE
2355 /* queue check watchers, to be executed first */ 2425 /* queue check watchers, to be executed first */
2356 if (expect_false (checkcnt)) 2426 if (expect_false (checkcnt))
2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2427 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2428#endif
2358 2429
2359 EV_INVOKE_PENDING; 2430 EV_INVOKE_PENDING;
2360 } 2431 }
2361 while (expect_true ( 2432 while (expect_true (
2362 activecnt 2433 activecnt
… …
2365 )); 2436 ));
2366 2437
2367 if (loop_done == EVUNLOOP_ONE) 2438 if (loop_done == EVUNLOOP_ONE)
2368 loop_done = EVUNLOOP_CANCEL; 2439 loop_done = EVUNLOOP_CANCEL;
2369 2440
2370#if EV_MINIMAL < 2 2441#if EV_FEATURE_API
2371 --loop_depth; 2442 --loop_depth;
2372#endif 2443#endif
2373} 2444}
2374 2445
2375void 2446void
… …
2501 2572
2502 if (expect_false (ev_is_active (w))) 2573 if (expect_false (ev_is_active (w)))
2503 return; 2574 return;
2504 2575
2505 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2576 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2506 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2577 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2507 2578
2508 EV_FREQUENT_CHECK; 2579 EV_FREQUENT_CHECK;
2509 2580
2510 ev_start (EV_A_ (W)w, 1); 2581 ev_start (EV_A_ (W)w, 1);
2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2582 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2529 EV_FREQUENT_CHECK; 2600 EV_FREQUENT_CHECK;
2530 2601
2531 wlist_del (&anfds[w->fd].head, (WL)w); 2602 wlist_del (&anfds[w->fd].head, (WL)w);
2532 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
2533 2604
2534 fd_change (EV_A_ w->fd, 1); 2605 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2535 2606
2536 EV_FREQUENT_CHECK; 2607 EV_FREQUENT_CHECK;
2537} 2608}
2538 2609
2539void noinline 2610void noinline
… …
2581 timers [active] = timers [timercnt + HEAP0]; 2652 timers [active] = timers [timercnt + HEAP0];
2582 adjustheap (timers, timercnt, active); 2653 adjustheap (timers, timercnt, active);
2583 } 2654 }
2584 } 2655 }
2585 2656
2586 EV_FREQUENT_CHECK;
2587
2588 ev_at (w) -= mn_now; 2657 ev_at (w) -= mn_now;
2589 2658
2590 ev_stop (EV_A_ (W)w); 2659 ev_stop (EV_A_ (W)w);
2660
2661 EV_FREQUENT_CHECK;
2591} 2662}
2592 2663
2593void noinline 2664void noinline
2594ev_timer_again (EV_P_ ev_timer *w) 2665ev_timer_again (EV_P_ ev_timer *w)
2595{ 2666{
… …
2674 periodics [active] = periodics [periodiccnt + HEAP0]; 2745 periodics [active] = periodics [periodiccnt + HEAP0];
2675 adjustheap (periodics, periodiccnt, active); 2746 adjustheap (periodics, periodiccnt, active);
2676 } 2747 }
2677 } 2748 }
2678 2749
2679 EV_FREQUENT_CHECK;
2680
2681 ev_stop (EV_A_ (W)w); 2750 ev_stop (EV_A_ (W)w);
2751
2752 EV_FREQUENT_CHECK;
2682} 2753}
2683 2754
2684void noinline 2755void noinline
2685ev_periodic_again (EV_P_ ev_periodic *w) 2756ev_periodic_again (EV_P_ ev_periodic *w)
2686{ 2757{
… …
2691#endif 2762#endif
2692 2763
2693#ifndef SA_RESTART 2764#ifndef SA_RESTART
2694# define SA_RESTART 0 2765# define SA_RESTART 0
2695#endif 2766#endif
2767
2768#if EV_SIGNAL_ENABLE
2696 2769
2697void noinline 2770void noinline
2698ev_signal_start (EV_P_ ev_signal *w) 2771ev_signal_start (EV_P_ ev_signal *w)
2699{ 2772{
2700 if (expect_false (ev_is_active (w))) 2773 if (expect_false (ev_is_active (w)))
… …
2747 if (!((WL)w)->next) 2820 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD 2821# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/ 2822 if (sigfd < 0) /*TODO*/
2750# endif 2823# endif
2751 { 2824 {
2752# if _WIN32 2825# ifdef _WIN32
2753 evpipe_init (EV_A); 2826 evpipe_init (EV_A);
2754 2827
2755 signal (w->signum, ev_sighandler); 2828 signal (w->signum, ev_sighandler);
2756# else 2829# else
2757 struct sigaction sa; 2830 struct sigaction sa;
… …
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2863 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif 2864#endif
2792#if EV_USE_SIGNALFD 2865#if EV_USE_SIGNALFD
2793 if (sigfd >= 0) 2866 if (sigfd >= 0)
2794 { 2867 {
2795 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2868 sigset_t ss;
2869
2870 sigemptyset (&ss);
2871 sigaddset (&ss, w->signum);
2796 sigdelset (&sigfd_set, w->signum); 2872 sigdelset (&sigfd_set, w->signum);
2873
2797 signalfd (sigfd, &sigfd_set, 0); 2874 signalfd (sigfd, &sigfd_set, 0);
2798 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2875 sigprocmask (SIG_UNBLOCK, &ss, 0);
2799 /*TODO: maybe unblock signal? */
2800 } 2876 }
2801 else 2877 else
2802#endif 2878#endif
2803 signal (w->signum, SIG_DFL); 2879 signal (w->signum, SIG_DFL);
2804 } 2880 }
2805 2881
2806 EV_FREQUENT_CHECK; 2882 EV_FREQUENT_CHECK;
2807} 2883}
2808 2884
2885#endif
2886
2887#if EV_CHILD_ENABLE
2888
2809void 2889void
2810ev_child_start (EV_P_ ev_child *w) 2890ev_child_start (EV_P_ ev_child *w)
2811{ 2891{
2812#if EV_MULTIPLICITY 2892#if EV_MULTIPLICITY
2813 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2893 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
… …
2816 return; 2896 return;
2817 2897
2818 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2819 2899
2820 ev_start (EV_A_ (W)w, 1); 2900 ev_start (EV_A_ (W)w, 1);
2821 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2822 2902
2823 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2824} 2904}
2825 2905
2826void 2906void
… …
2830 if (expect_false (!ev_is_active (w))) 2910 if (expect_false (!ev_is_active (w)))
2831 return; 2911 return;
2832 2912
2833 EV_FREQUENT_CHECK; 2913 EV_FREQUENT_CHECK;
2834 2914
2835 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2915 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2836 ev_stop (EV_A_ (W)w); 2916 ev_stop (EV_A_ (W)w);
2837 2917
2838 EV_FREQUENT_CHECK; 2918 EV_FREQUENT_CHECK;
2839} 2919}
2920
2921#endif
2840 2922
2841#if EV_STAT_ENABLE 2923#if EV_STAT_ENABLE
2842 2924
2843# ifdef _WIN32 2925# ifdef _WIN32
2844# undef lstat 2926# undef lstat
… …
2850#define MIN_STAT_INTERVAL 0.1074891 2932#define MIN_STAT_INTERVAL 0.1074891
2851 2933
2852static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2934static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2853 2935
2854#if EV_USE_INOTIFY 2936#if EV_USE_INOTIFY
2855# define EV_INOTIFY_BUFSIZE 8192 2937
2938/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2939# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2856 2940
2857static void noinline 2941static void noinline
2858infy_add (EV_P_ ev_stat *w) 2942infy_add (EV_P_ ev_stat *w)
2859{ 2943{
2860 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2944 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
… …
2909 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2993 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2910 } 2994 }
2911 } 2995 }
2912 2996
2913 if (w->wd >= 0) 2997 if (w->wd >= 0)
2914 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);
2915 2999
2916 /* now re-arm timer, if required */ 3000 /* now re-arm timer, if required */
2917 if (ev_is_active (&w->timer)) ev_ref (EV_A); 3001 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2918 ev_timer_again (EV_A_ &w->timer); 3002 ev_timer_again (EV_A_ &w->timer);
2919 if (ev_is_active (&w->timer)) ev_unref (EV_A); 3003 if (ev_is_active (&w->timer)) ev_unref (EV_A);
… …
2927 3011
2928 if (wd < 0) 3012 if (wd < 0)
2929 return; 3013 return;
2930 3014
2931 w->wd = -2; 3015 w->wd = -2;
2932 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3016 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2933 wlist_del (&fs_hash [slot].head, (WL)w); 3017 wlist_del (&fs_hash [slot].head, (WL)w);
2934 3018
2935 /* remove this watcher, if others are watching it, they will rearm */ 3019 /* remove this watcher, if others are watching it, they will rearm */
2936 inotify_rm_watch (fs_fd, wd); 3020 inotify_rm_watch (fs_fd, wd);
2937} 3021}
… …
2939static void noinline 3023static void noinline
2940infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3024infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2941{ 3025{
2942 if (slot < 0) 3026 if (slot < 0)
2943 /* overflow, need to check for all hash slots */ 3027 /* overflow, need to check for all hash slots */
2944 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3028 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2945 infy_wd (EV_A_ slot, wd, ev); 3029 infy_wd (EV_A_ slot, wd, ev);
2946 else 3030 else
2947 { 3031 {
2948 WL w_; 3032 WL w_;
2949 3033
2950 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3034 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2951 { 3035 {
2952 ev_stat *w = (ev_stat *)w_; 3036 ev_stat *w = (ev_stat *)w_;
2953 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 */
2954 3038
2955 if (w->wd == wd || wd == -1) 3039 if (w->wd == wd || wd == -1)
2956 { 3040 {
2957 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3041 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2958 { 3042 {
2959 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);
2960 w->wd = -1; 3044 w->wd = -1;
2961 infy_add (EV_A_ w); /* re-add, no matter what */ 3045 infy_add (EV_A_ w); /* re-add, no matter what */
2962 } 3046 }
2963 3047
2964 stat_timer_cb (EV_A_ &w->timer, 0); 3048 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2969 3053
2970static void 3054static void
2971infy_cb (EV_P_ ev_io *w, int revents) 3055infy_cb (EV_P_ ev_io *w, int revents)
2972{ 3056{
2973 char buf [EV_INOTIFY_BUFSIZE]; 3057 char buf [EV_INOTIFY_BUFSIZE];
2974 struct inotify_event *ev = (struct inotify_event *)buf;
2975 int ofs; 3058 int ofs;
2976 int len = read (fs_fd, buf, sizeof (buf)); 3059 int len = read (fs_fd, buf, sizeof (buf));
2977 3060
2978 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3061 for (ofs = 0; ofs < len; )
3062 {
3063 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2979 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3064 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3065 ofs += sizeof (struct inotify_event) + ev->len;
3066 }
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;
2980} 3099}
2981 3100
2982inline_size void 3101inline_size void
2983check_2625 (EV_P) 3102ev_check_2625 (EV_P)
2984{ 3103{
2985 /* kernels < 2.6.25 are borked 3104 /* kernels < 2.6.25 are borked
2986 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3105 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2987 */ 3106 */
2988 struct utsname buf; 3107 if (ev_linux_version () < 0x020619)
2989 int major, minor, micro;
2990
2991 if (uname (&buf))
2992 return;
2993
2994 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2995 return;
2996
2997 if (major < 2
2998 || (major == 2 && minor < 6)
2999 || (major == 2 && minor == 6 && micro < 25))
3000 return; 3108 return;
3001 3109
3002 fs_2625 = 1; 3110 fs_2625 = 1;
3003} 3111}
3004 3112
… …
3019 if (fs_fd != -2) 3127 if (fs_fd != -2)
3020 return; 3128 return;
3021 3129
3022 fs_fd = -1; 3130 fs_fd = -1;
3023 3131
3024 check_2625 (EV_A); 3132 ev_check_2625 (EV_A);
3025 3133
3026 fs_fd = infy_newfd (); 3134 fs_fd = infy_newfd ();
3027 3135
3028 if (fs_fd >= 0) 3136 if (fs_fd >= 0)
3029 { 3137 {
… …
3054 ev_io_set (&fs_w, fs_fd, EV_READ); 3162 ev_io_set (&fs_w, fs_fd, EV_READ);
3055 ev_io_start (EV_A_ &fs_w); 3163 ev_io_start (EV_A_ &fs_w);
3056 ev_unref (EV_A); 3164 ev_unref (EV_A);
3057 } 3165 }
3058 3166
3059 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3167 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3060 { 3168 {
3061 WL w_ = fs_hash [slot].head; 3169 WL w_ = fs_hash [slot].head;
3062 fs_hash [slot].head = 0; 3170 fs_hash [slot].head = 0;
3063 3171
3064 while (w_) 3172 while (w_)
… …
3239 3347
3240 EV_FREQUENT_CHECK; 3348 EV_FREQUENT_CHECK;
3241} 3349}
3242#endif 3350#endif
3243 3351
3352#if EV_PREPARE_ENABLE
3244void 3353void
3245ev_prepare_start (EV_P_ ev_prepare *w) 3354ev_prepare_start (EV_P_ ev_prepare *w)
3246{ 3355{
3247 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
3248 return; 3357 return;
… …
3274 3383
3275 ev_stop (EV_A_ (W)w); 3384 ev_stop (EV_A_ (W)w);
3276 3385
3277 EV_FREQUENT_CHECK; 3386 EV_FREQUENT_CHECK;
3278} 3387}
3388#endif
3279 3389
3390#if EV_CHECK_ENABLE
3280void 3391void
3281ev_check_start (EV_P_ ev_check *w) 3392ev_check_start (EV_P_ ev_check *w)
3282{ 3393{
3283 if (expect_false (ev_is_active (w))) 3394 if (expect_false (ev_is_active (w)))
3284 return; 3395 return;
… …
3310 3421
3311 ev_stop (EV_A_ (W)w); 3422 ev_stop (EV_A_ (W)w);
3312 3423
3313 EV_FREQUENT_CHECK; 3424 EV_FREQUENT_CHECK;
3314} 3425}
3426#endif
3315 3427
3316#if EV_EMBED_ENABLE 3428#if EV_EMBED_ENABLE
3317void noinline 3429void noinline
3318ev_embed_sweep (EV_P_ ev_embed *w) 3430ev_embed_sweep (EV_P_ ev_embed *w)
3319{ 3431{
… …
3414 3526
3415 ev_io_stop (EV_A_ &w->io); 3527 ev_io_stop (EV_A_ &w->io);
3416 ev_prepare_stop (EV_A_ &w->prepare); 3528 ev_prepare_stop (EV_A_ &w->prepare);
3417 ev_fork_stop (EV_A_ &w->fork); 3529 ev_fork_stop (EV_A_ &w->fork);
3418 3530
3531 ev_stop (EV_A_ (W)w);
3532
3419 EV_FREQUENT_CHECK; 3533 EV_FREQUENT_CHECK;
3420} 3534}
3421#endif 3535#endif
3422 3536
3423#if EV_FORK_ENABLE 3537#if EV_FORK_ENABLE
… …
3462void 3576void
3463ev_async_start (EV_P_ ev_async *w) 3577ev_async_start (EV_P_ ev_async *w)
3464{ 3578{
3465 if (expect_false (ev_is_active (w))) 3579 if (expect_false (ev_is_active (w)))
3466 return; 3580 return;
3581
3582 w->sent = 0;
3467 3583
3468 evpipe_init (EV_A); 3584 evpipe_init (EV_A);
3469 3585
3470 EV_FREQUENT_CHECK; 3586 EV_FREQUENT_CHECK;
3471 3587
… …
3549{ 3665{
3550 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3666 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3551 3667
3552 if (expect_false (!once)) 3668 if (expect_false (!once))
3553 { 3669 {
3554 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3670 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3555 return; 3671 return;
3556 } 3672 }
3557 3673
3558 once->cb = cb; 3674 once->cb = cb;
3559 once->arg = arg; 3675 once->arg = arg;
… …
3646 if (types & EV_ASYNC) 3762 if (types & EV_ASYNC)
3647 for (i = asynccnt; i--; ) 3763 for (i = asynccnt; i--; )
3648 cb (EV_A_ EV_ASYNC, asyncs [i]); 3764 cb (EV_A_ EV_ASYNC, asyncs [i]);
3649#endif 3765#endif
3650 3766
3767#if EV_PREPARE_ENABLE
3651 if (types & EV_PREPARE) 3768 if (types & EV_PREPARE)
3652 for (i = preparecnt; i--; ) 3769 for (i = preparecnt; i--; )
3653#if EV_EMBED_ENABLE 3770# if EV_EMBED_ENABLE
3654 if (ev_cb (prepares [i]) != embed_prepare_cb) 3771 if (ev_cb (prepares [i]) != embed_prepare_cb)
3655#endif 3772# endif
3656 cb (EV_A_ EV_PREPARE, prepares [i]); 3773 cb (EV_A_ EV_PREPARE, prepares [i]);
3774#endif
3657 3775
3776#if EV_CHECK_ENABLE
3658 if (types & EV_CHECK) 3777 if (types & EV_CHECK)
3659 for (i = checkcnt; i--; ) 3778 for (i = checkcnt; i--; )
3660 cb (EV_A_ EV_CHECK, checks [i]); 3779 cb (EV_A_ EV_CHECK, checks [i]);
3780#endif
3661 3781
3782#if EV_SIGNAL_ENABLE
3662 if (types & EV_SIGNAL) 3783 if (types & EV_SIGNAL)
3663 for (i = 0; i < EV_NSIG - 1; ++i) 3784 for (i = 0; i < EV_NSIG - 1; ++i)
3664 for (wl = signals [i].head; wl; ) 3785 for (wl = signals [i].head; wl; )
3665 { 3786 {
3666 wn = wl->next; 3787 wn = wl->next;
3667 cb (EV_A_ EV_SIGNAL, wl); 3788 cb (EV_A_ EV_SIGNAL, wl);
3668 wl = wn; 3789 wl = wn;
3669 } 3790 }
3791#endif
3670 3792
3793#if EV_CHILD_ENABLE
3671 if (types & EV_CHILD) 3794 if (types & EV_CHILD)
3672 for (i = EV_PID_HASHSIZE; i--; ) 3795 for (i = (EV_PID_HASHSIZE); i--; )
3673 for (wl = childs [i]; wl; ) 3796 for (wl = childs [i]; wl; )
3674 { 3797 {
3675 wn = wl->next; 3798 wn = wl->next;
3676 cb (EV_A_ EV_CHILD, wl); 3799 cb (EV_A_ EV_CHILD, wl);
3677 wl = wn; 3800 wl = wn;
3678 } 3801 }
3802#endif
3679/* EV_STAT 0x00001000 /* stat data changed */ 3803/* EV_STAT 0x00001000 /* stat data changed */
3680/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3804/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3681} 3805}
3682#endif 3806#endif
3683 3807

Diff Legend

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