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

Comparing libev/ev.c (file contents):
Revision 1.313 by root, Wed Aug 19 23:44:51 2009 UTC vs.
Revision 1.341 by root, Tue Mar 16 20:48:29 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 *
79# endif 79# endif
80# endif 80# endif
81 81
82# ifndef EV_USE_NANOSLEEP 82# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP 83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# else 85# else
86# define EV_USE_NANOSLEEP 0 86# define EV_USE_NANOSLEEP 0
87# endif 87# endif
88# endif 88# endif
89 89
90# ifndef EV_USE_SELECT 90# ifndef EV_USE_SELECT
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT 1 92# define EV_USE_SELECT EV_FEATURE_BACKENDS
93# else 93# else
94# define EV_USE_SELECT 0 94# define EV_USE_SELECT 0
95# endif 95# endif
96# endif 96# endif
97 97
98# ifndef EV_USE_POLL 98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H 99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1 100# define EV_USE_POLL EV_FEATURE_BACKENDS
101# else 101# else
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif 103# endif
104# endif 104# endif
105 105
106# ifndef EV_USE_EPOLL 106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 108# define EV_USE_EPOLL EV_FEATURE_BACKENDS
109# else 109# else
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
121 121
122# ifndef EV_USE_PORT 122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# define EV_USE_PORT EV_FEATURE_BACKENDS
125# else 125# else
126# define EV_USE_PORT 0 126# define EV_USE_PORT 0
127# endif 127# endif
128# endif 128# endif
129 129
130# ifndef EV_USE_INOTIFY 130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 132# define EV_USE_INOTIFY EV_FEATURE_OS
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD 138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 140# define EV_USE_SIGNALFD EV_FEATURE_OS
141# else 141# else
142# define EV_USE_SIGNALFD 0 142# define EV_USE_SIGNALFD 0
143# endif 143# endif
144# endif 144# endif
145 145
146# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD 147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD EV_FEATURE_OS
149# else 149# else
150# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
151# endif 151# endif
152# endif 152# endif
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
163#include <assert.h> 164#include <assert.h>
164#include <errno.h> 165#include <errno.h>
165#include <sys/types.h> 166#include <sys/types.h>
166#include <time.h> 167#include <time.h>
168#include <limits.h>
167 169
168#include <signal.h> 170#include <signal.h>
169 171
170#ifdef EV_H 172#ifdef EV_H
171# include EV_H 173# include EV_H
182# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 185# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
186# endif 188# endif
189# undef EV_AVOID_STDIO
187#endif 190#endif
188 191
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
190 193
191/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
204#elif defined (MAXSIG) 207#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 215#else
213# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
215# define EV_NSIG 65 219# define EV_NSIG 65
216#endif 220#endif
217 221
218#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 225# else
222# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
223# endif 227# endif
224#endif 228#endif
225 229
226#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 233# else
230# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
231# endif 235# endif
232#endif 236#endif
233 237
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 240#endif
237 241
238#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 245# else
242# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
243# endif 247# endif
244#endif 248#endif
245 249
246#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 252#endif
249 253
250#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
251# ifdef _WIN32 255# ifdef _WIN32
252# define EV_USE_POLL 0 256# define EV_USE_POLL 0
253# else 257# else
254# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 259# endif
256#endif 260#endif
257 261
258#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 265# else
262# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
263# endif 267# endif
264#endif 268#endif
265 269
271# define EV_USE_PORT 0 275# define EV_USE_PORT 0
272#endif 276#endif
273 277
274#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 281# else
278# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
279# endif 283# endif
280#endif 284#endif
281 285
282#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
284# define EV_PID_HASHSIZE 1
285# else
286# define EV_PID_HASHSIZE 16
287# endif
288#endif 288#endif
289 289
290#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292# define EV_INOTIFY_HASHSIZE 1
293# else
294# define EV_INOTIFY_HASHSIZE 16
295# endif
296#endif 292#endif
297 293
298#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 297# else
302# define EV_USE_EVENTFD 0 298# define EV_USE_EVENTFD 0
303# endif 299# endif
304#endif 300#endif
305 301
306#ifndef EV_USE_SIGNALFD 302#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 304# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 305# else
310# define EV_USE_SIGNALFD 0 306# define EV_USE_SIGNALFD 0
311# endif 307# endif
312#endif 308#endif
313 309
316# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
318#endif 314#endif
319 315
320#ifndef EV_VERIFY 316#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 318#endif
323 319
324#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 322#endif
327 323
328#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 326#endif
331 327
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 328/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
343# endif 339# endif
344#endif 340#endif
345 341
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 342/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 343
344#ifdef _AIX
345/* AIX has a completely broken poll.h header */
346# undef EV_USE_POLL
347# define EV_USE_POLL 0
348#endif
349
348#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
351#endif 353#endif
352 354
395# endif 397# endif
396# endif 398# endif
397# ifdef __cplusplus 399# ifdef __cplusplus
398extern "C" { 400extern "C" {
399# endif 401# endif
400int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 403# ifdef __cplusplus
402} 404}
403# endif 405# endif
404#endif 406#endif
405 407
406#if EV_USE_SIGNALFD 408#if EV_USE_SIGNALFD
407# include <sys/signalfd.h> 409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h>
411# ifndef SFD_NONBLOCK
412# define SFD_NONBLOCK O_NONBLOCK
408#endif 413# endif
414# ifndef SFD_CLOEXEC
415# ifdef O_CLOEXEC
416# define SFD_CLOEXEC O_CLOEXEC
417# else
418# define SFD_CLOEXEC 02000000
419# endif
420# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags);
425
426struct signalfd_siginfo
427{
428 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)];
430};
431# ifdef __cplusplus
432}
433# endif
434#endif
435
409 436
410/**/ 437/**/
411 438
412#if EV_VERIFY >= 3 439#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 440# define EV_FREQUENT_CHECK ev_verify (EV_A)
414#else 441#else
415# define EV_FREQUENT_CHECK do { } while (0) 442# define EV_FREQUENT_CHECK do { } while (0)
416#endif 443#endif
417 444
418/* 445/*
425 */ 452 */
426#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427 454
428#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 455#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
429#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 456#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
430/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
431 457
432#if __GNUC__ >= 4 458#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 459# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 460# define noinline __attribute__ ((noinline))
435#else 461#else
442 468
443#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
444#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
445#define inline_size static inline 471#define inline_size static inline
446 472
447#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
448# define inline_speed static noinline 476# define inline_speed static noinline
449#else
450# define inline_speed static inline
451#endif 477#endif
452 478
453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454 480
455#if EV_MINPRI == EV_MAXPRI 481#if EV_MINPRI == EV_MAXPRI
480 506
481#ifndef EV_FD_TO_WIN32_HANDLE 507#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd) 508# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif 509#endif
484#ifndef EV_WIN32_HANDLE_TO_FD 510#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0) 511# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
486#endif 512#endif
487#ifndef EV_WIN32_CLOSE_FD 513#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd) 514# define EV_WIN32_CLOSE_FD(fd) close (fd)
489#endif 515#endif
490 516
491#ifdef _WIN32 517#ifdef _WIN32
492# include "ev_win32.c" 518# include "ev_win32.c"
493#endif 519#endif
494 520
495/*****************************************************************************/ 521/*****************************************************************************/
522
523#if EV_AVOID_STDIO
524static void noinline
525ev_printerr (const char *msg)
526{
527 write (STDERR_FILENO, msg, strlen (msg));
528}
529#endif
496 530
497static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
498 532
499void 533void
500ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
510 544
511 if (syserr_cb) 545 if (syserr_cb)
512 syserr_cb (msg); 546 syserr_cb (msg);
513 else 547 else
514 { 548 {
549#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg);
553 ev_printerr (": ");
554 ev_printerr (err);
555 ev_printerr ("\n");
556#else
515 perror (msg); 557 perror (msg);
558#endif
516 abort (); 559 abort ();
517 } 560 }
518} 561}
519 562
520static void * 563static void *
521ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
522{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
523 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
524 * implement realloc (x, 0) (as required by both ansi c-98 and 570 * implement realloc (x, 0) (as required by both ansi c-89 and
525 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
526 */ 572 */
527 573
528 if (size) 574 if (size)
529 return realloc (ptr, size); 575 return realloc (ptr, size);
530 576
531 free (ptr); 577 free (ptr);
532 return 0; 578 return 0;
579#endif
533} 580}
534 581
535static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
536 583
537void 584void
545{ 592{
546 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
547 594
548 if (!ptr && size) 595 if (!ptr && size)
549 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
550 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
551 abort (); 602 abort ();
552 } 603 }
553 604
554 return ptr; 605 return ptr;
555} 606}
637 688
638 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
639 690
640#endif 691#endif
641 692
642#if EV_MINIMAL < 2 693#if EV_FEATURE_API
643# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 694# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
644# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 695# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
645# define EV_INVOKE_PENDING invoke_cb (EV_A) 696# define EV_INVOKE_PENDING invoke_cb (EV_A)
646#else 697#else
647# define EV_RELEASE_CB (void)0 698# define EV_RELEASE_CB (void)0
832} 883}
833 884
834/*****************************************************************************/ 885/*****************************************************************************/
835 886
836inline_speed void 887inline_speed void
837fd_event_nc (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
838{ 889{
839 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
840 ev_io *w; 891 ev_io *w;
841 892
842 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 893 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
854fd_event (EV_P_ int fd, int revents) 905fd_event (EV_P_ int fd, int revents)
855{ 906{
856 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
857 908
858 if (expect_true (!anfd->reify)) 909 if (expect_true (!anfd->reify))
859 fd_event_nc (EV_A_ fd, revents); 910 fd_event_nocheck (EV_A_ fd, revents);
860} 911}
861 912
862void 913void
863ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
864{ 915{
865 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
866 fd_event_nc (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
867} 918}
868 919
869/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
870/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
871inline_size void 922inline_size void
934 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
935 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 986 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
936 } 987 }
937} 988}
938 989
939/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
940inline_size int 991inline_size int
941fd_valid (int fd) 992fd_valid (int fd)
942{ 993{
943#ifdef _WIN32 994#ifdef _WIN32
944 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
945#else 996#else
946 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
947#endif 998#endif
948} 999}
949 1000
984 { 1035 {
985 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
986 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
988 } 1039 }
1040}
1041
1042/* used to prepare libev internal fd's */
1043/* this is not fork-safe */
1044inline_speed void
1045fd_intern (int fd)
1046{
1047#ifdef _WIN32
1048 unsigned long arg = 1;
1049 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1050#else
1051 fcntl (fd, F_SETFD, FD_CLOEXEC);
1052 fcntl (fd, F_SETFL, O_NONBLOCK);
1053#endif
989} 1054}
990 1055
991/*****************************************************************************/ 1056/*****************************************************************************/
992 1057
993/* 1058/*
1147 1212
1148static ANSIG signals [EV_NSIG - 1]; 1213static ANSIG signals [EV_NSIG - 1];
1149 1214
1150/*****************************************************************************/ 1215/*****************************************************************************/
1151 1216
1152/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1153/* this is not fork-safe */
1154inline_speed void
1155fd_intern (int fd)
1156{
1157#ifdef _WIN32
1158 unsigned long arg = 1;
1159 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1160#else
1161 fcntl (fd, F_SETFD, FD_CLOEXEC);
1162 fcntl (fd, F_SETFL, O_NONBLOCK);
1163#endif
1164}
1165 1218
1166static void noinline 1219static void noinline
1167evpipe_init (EV_P) 1220evpipe_init (EV_P)
1168{ 1221{
1169 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1170 { 1223 {
1171#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL) 1226 if (evfd < 0 && errno == EINVAL)
1174 evfd = eventfd (0, 0); 1227 evfd = eventfd (0, 0);
1175 1228
1176 if (evfd >= 0) 1229 if (evfd >= 0)
1178 evpipe [0] = -1; 1231 evpipe [0] = -1;
1179 fd_intern (evfd); /* doing it twice doesn't hurt */ 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1180 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1181 } 1234 }
1182 else 1235 else
1183#endif 1236# endif
1184 { 1237 {
1185 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1186 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1187 1240
1188 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
1199evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1200{ 1253{
1201 if (!*flag) 1254 if (!*flag)
1202 { 1255 {
1203 int old_errno = errno; /* save errno because write might clobber it */ 1256 int old_errno = errno; /* save errno because write might clobber it */
1257 char dummy;
1204 1258
1205 *flag = 1; 1259 *flag = 1;
1206 1260
1207#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1208 if (evfd >= 0) 1262 if (evfd >= 0)
1210 uint64_t counter = 1; 1264 uint64_t counter = 1;
1211 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1212 } 1266 }
1213 else 1267 else
1214#endif 1268#endif
1215 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1216 1270
1217 errno = old_errno; 1271 errno = old_errno;
1218 } 1272 }
1219} 1273}
1220 1274
1269{ 1323{
1270#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1271 EV_P = signals [signum - 1].loop; 1325 EV_P = signals [signum - 1].loop;
1272#endif 1326#endif
1273 1327
1274#if _WIN32 1328#ifdef _WIN32
1275 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1276#endif 1330#endif
1277 1331
1278 signals [signum - 1].pending = 1; 1332 signals [signum - 1].pending = 1;
1279 evpipe_write (EV_A_ &sig_pending); 1333 evpipe_write (EV_A_ &sig_pending);
1321 break; 1375 break;
1322 } 1376 }
1323} 1377}
1324#endif 1378#endif
1325 1379
1380#endif
1381
1326/*****************************************************************************/ 1382/*****************************************************************************/
1327 1383
1384#if EV_CHILD_ENABLE
1328static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1329
1330#ifndef _WIN32
1331 1386
1332static ev_signal childev; 1387static ev_signal childev;
1333 1388
1334#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1335# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
1340child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1341{ 1396{
1342 ev_child *w; 1397 ev_child *w;
1343 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1344 1399
1345 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1400 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1346 { 1401 {
1347 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1348 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1349 { 1404 {
1350 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1405 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
1375 /* make sure we are called again until all children have been reaped */ 1430 /* make sure we are called again until all children have been reaped */
1376 /* we need to do it this way so that the callback gets called before we continue */ 1431 /* we need to do it this way so that the callback gets called before we continue */
1377 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1378 1433
1379 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1380 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1381 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1436 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1382} 1437}
1383 1438
1384#endif 1439#endif
1385 1440
1474ev_backend (EV_P) 1529ev_backend (EV_P)
1475{ 1530{
1476 return backend; 1531 return backend;
1477} 1532}
1478 1533
1479#if EV_MINIMAL < 2 1534#if EV_FEATURE_API
1480unsigned int 1535unsigned int
1481ev_loop_count (EV_P) 1536ev_iteration (EV_P)
1482{ 1537{
1483 return loop_count; 1538 return loop_count;
1484} 1539}
1485 1540
1486unsigned int 1541unsigned int
1487ev_loop_depth (EV_P) 1542ev_depth (EV_P)
1488{ 1543{
1489 return loop_depth; 1544 return loop_depth;
1490} 1545}
1491 1546
1492void 1547void
1564 1619
1565 ev_rt_now = ev_time (); 1620 ev_rt_now = ev_time ();
1566 mn_now = get_clock (); 1621 mn_now = get_clock ();
1567 now_floor = mn_now; 1622 now_floor = mn_now;
1568 rtmn_diff = ev_rt_now - mn_now; 1623 rtmn_diff = ev_rt_now - mn_now;
1569#if EV_MINIMAL < 2 1624#if EV_FEATURE_API
1570 invoke_cb = ev_invoke_pending; 1625 invoke_cb = ev_invoke_pending;
1571#endif 1626#endif
1572 1627
1573 io_blocktime = 0.; 1628 io_blocktime = 0.;
1574 timeout_blocktime = 0.; 1629 timeout_blocktime = 0.;
1580#endif 1635#endif
1581#if EV_USE_INOTIFY 1636#if EV_USE_INOTIFY
1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1637 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1583#endif 1638#endif
1584#if EV_USE_SIGNALFD 1639#if EV_USE_SIGNALFD
1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1640 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1586#endif 1641#endif
1587 1642
1588 if (!(flags & 0x0000ffffU)) 1643 if (!(flags & 0x0000ffffU))
1589 flags |= ev_recommended_backends (); 1644 flags |= ev_recommended_backends ();
1590 1645
1604 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1659 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1605#endif 1660#endif
1606 1661
1607 ev_prepare_init (&pending_w, pendingcb); 1662 ev_prepare_init (&pending_w, pendingcb);
1608 1663
1664#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1609 ev_init (&pipe_w, pipecb); 1665 ev_init (&pipe_w, pipecb);
1610 ev_set_priority (&pipe_w, EV_MAXPRI); 1666 ev_set_priority (&pipe_w, EV_MAXPRI);
1667#endif
1611 } 1668 }
1612} 1669}
1613 1670
1614/* free up a loop structure */ 1671/* free up a loop structure */
1615static void noinline 1672static void noinline
1634 } 1691 }
1635 } 1692 }
1636 1693
1637#if EV_USE_SIGNALFD 1694#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w)) 1695 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd); 1696 close (sigfd);
1644 }
1645#endif 1697#endif
1646 1698
1647#if EV_USE_INOTIFY 1699#if EV_USE_INOTIFY
1648 if (fs_fd >= 0) 1700 if (fs_fd >= 0)
1649 close (fs_fd); 1701 close (fs_fd);
1738 { 1790 {
1739 EV_WIN32_CLOSE_FD (evpipe [0]); 1791 EV_WIN32_CLOSE_FD (evpipe [0]);
1740 EV_WIN32_CLOSE_FD (evpipe [1]); 1792 EV_WIN32_CLOSE_FD (evpipe [1]);
1741 } 1793 }
1742 1794
1795#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1743 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1744 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1745 pipecb (EV_A_ &pipe_w, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1799#endif
1746 } 1800 }
1747 1801
1748 postfork = 0; 1802 postfork = 0;
1749} 1803}
1750 1804
1812 verify_watcher (EV_A_ ws [cnt]); 1866 verify_watcher (EV_A_ ws [cnt]);
1813 } 1867 }
1814} 1868}
1815#endif 1869#endif
1816 1870
1817#if EV_MINIMAL < 2 1871#if EV_FEATURE_API
1818void 1872void
1819ev_loop_verify (EV_P) 1873ev_verify (EV_P)
1820{ 1874{
1821#if EV_VERIFY 1875#if EV_VERIFY
1822 int i; 1876 int i;
1823 WL w; 1877 WL w;
1824 1878
1863#if EV_ASYNC_ENABLE 1917#if EV_ASYNC_ENABLE
1864 assert (asyncmax >= asynccnt); 1918 assert (asyncmax >= asynccnt);
1865 array_verify (EV_A_ (W *)asyncs, asynccnt); 1919 array_verify (EV_A_ (W *)asyncs, asynccnt);
1866#endif 1920#endif
1867 1921
1922#if EV_PREPARE_ENABLE
1868 assert (preparemax >= preparecnt); 1923 assert (preparemax >= preparecnt);
1869 array_verify (EV_A_ (W *)prepares, preparecnt); 1924 array_verify (EV_A_ (W *)prepares, preparecnt);
1925#endif
1870 1926
1927#if EV_CHECK_ENABLE
1871 assert (checkmax >= checkcnt); 1928 assert (checkmax >= checkcnt);
1872 array_verify (EV_A_ (W *)checks, checkcnt); 1929 array_verify (EV_A_ (W *)checks, checkcnt);
1930#endif
1873 1931
1874# if 0 1932# if 0
1933#if EV_CHILD_ENABLE
1875 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1934 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1935 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1936#endif
1877# endif 1937# endif
1878#endif 1938#endif
1879} 1939}
1880#endif 1940#endif
1881 1941
1897 1957
1898 loop_init (EV_A_ flags); 1958 loop_init (EV_A_ flags);
1899 1959
1900 if (ev_backend (EV_A)) 1960 if (ev_backend (EV_A))
1901 { 1961 {
1902#ifndef _WIN32 1962#if EV_CHILD_ENABLE
1903 ev_signal_init (&childev, childcb, SIGCHLD); 1963 ev_signal_init (&childev, childcb, SIGCHLD);
1904 ev_set_priority (&childev, EV_MAXPRI); 1964 ev_set_priority (&childev, EV_MAXPRI);
1905 ev_signal_start (EV_A_ &childev); 1965 ev_signal_start (EV_A_ &childev);
1906 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1966 ev_unref (EV_A); /* child watcher should not keep loop alive */
1907#endif 1967#endif
1920 EV_P = ev_default_loop_ptr; 1980 EV_P = ev_default_loop_ptr;
1921#endif 1981#endif
1922 1982
1923 ev_default_loop_ptr = 0; 1983 ev_default_loop_ptr = 0;
1924 1984
1925#ifndef _WIN32 1985#if EV_CHILD_ENABLE
1926 ev_ref (EV_A); /* child watcher */ 1986 ev_ref (EV_A); /* child watcher */
1927 ev_signal_stop (EV_A_ &childev); 1987 ev_signal_stop (EV_A_ &childev);
1928#endif 1988#endif
1929 1989
1930 loop_destroy (EV_A); 1990 loop_destroy (EV_A);
2036 EV_FREQUENT_CHECK; 2096 EV_FREQUENT_CHECK;
2037 feed_reverse (EV_A_ (W)w); 2097 feed_reverse (EV_A_ (W)w);
2038 } 2098 }
2039 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2099 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2040 2100
2041 feed_reverse_done (EV_A_ EV_TIMEOUT); 2101 feed_reverse_done (EV_A_ EV_TIMER);
2042 } 2102 }
2043} 2103}
2044 2104
2045#if EV_PERIODIC_ENABLE 2105#if EV_PERIODIC_ENABLE
2046/* make periodics pending */ 2106/* make periodics pending */
2137 ANHE_at_cache (*he); 2197 ANHE_at_cache (*he);
2138 } 2198 }
2139} 2199}
2140 2200
2141/* fetch new monotonic and realtime times from the kernel */ 2201/* fetch new monotonic and realtime times from the kernel */
2142/* also detetc if there was a timejump, and act accordingly */ 2202/* also detect if there was a timejump, and act accordingly */
2143inline_speed void 2203inline_speed void
2144time_update (EV_P_ ev_tstamp max_block) 2204time_update (EV_P_ ev_tstamp max_block)
2145{ 2205{
2146#if EV_USE_MONOTONIC 2206#if EV_USE_MONOTONIC
2147 if (expect_true (have_monotonic)) 2207 if (expect_true (have_monotonic))
2207} 2267}
2208 2268
2209void 2269void
2210ev_loop (EV_P_ int flags) 2270ev_loop (EV_P_ int flags)
2211{ 2271{
2212#if EV_MINIMAL < 2 2272#if EV_FEATURE_API
2213 ++loop_depth; 2273 ++loop_depth;
2214#endif 2274#endif
2215 2275
2216 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2276 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2217 2277
2220 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2280 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2221 2281
2222 do 2282 do
2223 { 2283 {
2224#if EV_VERIFY >= 2 2284#if EV_VERIFY >= 2
2225 ev_loop_verify (EV_A); 2285 ev_verify (EV_A);
2226#endif 2286#endif
2227 2287
2228#ifndef _WIN32 2288#ifndef _WIN32
2229 if (expect_false (curpid)) /* penalise the forking check even more */ 2289 if (expect_false (curpid)) /* penalise the forking check even more */
2230 if (expect_false (getpid () != curpid)) 2290 if (expect_false (getpid () != curpid))
2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2302 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2243 EV_INVOKE_PENDING; 2303 EV_INVOKE_PENDING;
2244 } 2304 }
2245#endif 2305#endif
2246 2306
2307#if EV_PREPARE_ENABLE
2247 /* queue prepare watchers (and execute them) */ 2308 /* queue prepare watchers (and execute them) */
2248 if (expect_false (preparecnt)) 2309 if (expect_false (preparecnt))
2249 { 2310 {
2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2311 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2251 EV_INVOKE_PENDING; 2312 EV_INVOKE_PENDING;
2252 } 2313 }
2314#endif
2253 2315
2254 if (expect_false (loop_done)) 2316 if (expect_false (loop_done))
2255 break; 2317 break;
2256 2318
2257 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
2308 waittime -= sleeptime; 2370 waittime -= sleeptime;
2309 } 2371 }
2310 } 2372 }
2311 } 2373 }
2312 2374
2313#if EV_MINIMAL < 2 2375#if EV_FEATURE_API
2314 ++loop_count; 2376 ++loop_count;
2315#endif 2377#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2317 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2330#if EV_IDLE_ENABLE 2392#if EV_IDLE_ENABLE
2331 /* queue idle watchers unless other events are pending */ 2393 /* queue idle watchers unless other events are pending */
2332 idle_reify (EV_A); 2394 idle_reify (EV_A);
2333#endif 2395#endif
2334 2396
2397#if EV_CHECK_ENABLE
2335 /* queue check watchers, to be executed first */ 2398 /* queue check watchers, to be executed first */
2336 if (expect_false (checkcnt)) 2399 if (expect_false (checkcnt))
2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2400 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2401#endif
2338 2402
2339 EV_INVOKE_PENDING; 2403 EV_INVOKE_PENDING;
2340 } 2404 }
2341 while (expect_true ( 2405 while (expect_true (
2342 activecnt 2406 activecnt
2345 )); 2409 ));
2346 2410
2347 if (loop_done == EVUNLOOP_ONE) 2411 if (loop_done == EVUNLOOP_ONE)
2348 loop_done = EVUNLOOP_CANCEL; 2412 loop_done = EVUNLOOP_CANCEL;
2349 2413
2350#if EV_MINIMAL < 2 2414#if EV_FEATURE_API
2351 --loop_depth; 2415 --loop_depth;
2352#endif 2416#endif
2353} 2417}
2354 2418
2355void 2419void
2481 2545
2482 if (expect_false (ev_is_active (w))) 2546 if (expect_false (ev_is_active (w)))
2483 return; 2547 return;
2484 2548
2485 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2549 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2486 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2550 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2487 2551
2488 EV_FREQUENT_CHECK; 2552 EV_FREQUENT_CHECK;
2489 2553
2490 ev_start (EV_A_ (W)w, 1); 2554 ev_start (EV_A_ (W)w, 1);
2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2555 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2561 timers [active] = timers [timercnt + HEAP0]; 2625 timers [active] = timers [timercnt + HEAP0];
2562 adjustheap (timers, timercnt, active); 2626 adjustheap (timers, timercnt, active);
2563 } 2627 }
2564 } 2628 }
2565 2629
2566 EV_FREQUENT_CHECK;
2567
2568 ev_at (w) -= mn_now; 2630 ev_at (w) -= mn_now;
2569 2631
2570 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633
2634 EV_FREQUENT_CHECK;
2571} 2635}
2572 2636
2573void noinline 2637void noinline
2574ev_timer_again (EV_P_ ev_timer *w) 2638ev_timer_again (EV_P_ ev_timer *w)
2575{ 2639{
2654 periodics [active] = periodics [periodiccnt + HEAP0]; 2718 periodics [active] = periodics [periodiccnt + HEAP0];
2655 adjustheap (periodics, periodiccnt, active); 2719 adjustheap (periodics, periodiccnt, active);
2656 } 2720 }
2657 } 2721 }
2658 2722
2659 EV_FREQUENT_CHECK;
2660
2661 ev_stop (EV_A_ (W)w); 2723 ev_stop (EV_A_ (W)w);
2724
2725 EV_FREQUENT_CHECK;
2662} 2726}
2663 2727
2664void noinline 2728void noinline
2665ev_periodic_again (EV_P_ ev_periodic *w) 2729ev_periodic_again (EV_P_ ev_periodic *w)
2666{ 2730{
2671#endif 2735#endif
2672 2736
2673#ifndef SA_RESTART 2737#ifndef SA_RESTART
2674# define SA_RESTART 0 2738# define SA_RESTART 0
2675#endif 2739#endif
2740
2741#if EV_SIGNAL_ENABLE
2676 2742
2677void noinline 2743void noinline
2678ev_signal_start (EV_P_ ev_signal *w) 2744ev_signal_start (EV_P_ ev_signal *w)
2679{ 2745{
2680 if (expect_false (ev_is_active (w))) 2746 if (expect_false (ev_is_active (w)))
2727 if (!((WL)w)->next) 2793 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD 2794# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/ 2795 if (sigfd < 0) /*TODO*/
2730# endif 2796# endif
2731 { 2797 {
2732# if _WIN32 2798# ifdef _WIN32
2799 evpipe_init (EV_A);
2800
2733 signal (w->signum, ev_sighandler); 2801 signal (w->signum, ev_sighandler);
2734# else 2802# else
2735 struct sigaction sa; 2803 struct sigaction sa;
2736 2804
2737 evpipe_init (EV_A); 2805 evpipe_init (EV_A);
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2836 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif 2837#endif
2770#if EV_USE_SIGNALFD 2838#if EV_USE_SIGNALFD
2771 if (sigfd >= 0) 2839 if (sigfd >= 0)
2772 { 2840 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2841 sigset_t ss;
2842
2843 sigemptyset (&ss);
2844 sigaddset (&ss, w->signum);
2774 sigdelset (&sigfd_set, w->signum); 2845 sigdelset (&sigfd_set, w->signum);
2846
2775 signalfd (sigfd, &sigfd_set, 0); 2847 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2848 sigprocmask (SIG_UNBLOCK, &ss, 0);
2777 /*TODO: maybe unblock signal? */
2778 } 2849 }
2779 else 2850 else
2780#endif 2851#endif
2781 signal (w->signum, SIG_DFL); 2852 signal (w->signum, SIG_DFL);
2782 } 2853 }
2783 2854
2784 EV_FREQUENT_CHECK; 2855 EV_FREQUENT_CHECK;
2785} 2856}
2786 2857
2858#endif
2859
2860#if EV_CHILD_ENABLE
2861
2787void 2862void
2788ev_child_start (EV_P_ ev_child *w) 2863ev_child_start (EV_P_ ev_child *w)
2789{ 2864{
2790#if EV_MULTIPLICITY 2865#if EV_MULTIPLICITY
2791 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2866 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2794 return; 2869 return;
2795 2870
2796 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2797 2872
2798 ev_start (EV_A_ (W)w, 1); 2873 ev_start (EV_A_ (W)w, 1);
2799 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2874 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2800 2875
2801 EV_FREQUENT_CHECK; 2876 EV_FREQUENT_CHECK;
2802} 2877}
2803 2878
2804void 2879void
2808 if (expect_false (!ev_is_active (w))) 2883 if (expect_false (!ev_is_active (w)))
2809 return; 2884 return;
2810 2885
2811 EV_FREQUENT_CHECK; 2886 EV_FREQUENT_CHECK;
2812 2887
2813 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2888 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2814 ev_stop (EV_A_ (W)w); 2889 ev_stop (EV_A_ (W)w);
2815 2890
2816 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2817} 2892}
2893
2894#endif
2818 2895
2819#if EV_STAT_ENABLE 2896#if EV_STAT_ENABLE
2820 2897
2821# ifdef _WIN32 2898# ifdef _WIN32
2822# undef lstat 2899# undef lstat
2828#define MIN_STAT_INTERVAL 0.1074891 2905#define MIN_STAT_INTERVAL 0.1074891
2829 2906
2830static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2907static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2831 2908
2832#if EV_USE_INOTIFY 2909#if EV_USE_INOTIFY
2833# define EV_INOTIFY_BUFSIZE 8192 2910
2911/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2912# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2834 2913
2835static void noinline 2914static void noinline
2836infy_add (EV_P_ ev_stat *w) 2915infy_add (EV_P_ ev_stat *w)
2837{ 2916{
2838 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); 2917 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);
2839 2918
2840 if (w->wd < 0) 2919 if (w->wd >= 0)
2920 {
2921 struct statfs sfs;
2922
2923 /* now local changes will be tracked by inotify, but remote changes won't */
2924 /* unless the filesystem is known to be local, we therefore still poll */
2925 /* also do poll on <2.6.25, but with normal frequency */
2926
2927 if (!fs_2625)
2928 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2929 else if (!statfs (w->path, &sfs)
2930 && (sfs.f_type == 0x1373 /* devfs */
2931 || sfs.f_type == 0xEF53 /* ext2/3 */
2932 || sfs.f_type == 0x3153464a /* jfs */
2933 || sfs.f_type == 0x52654973 /* reiser3 */
2934 || sfs.f_type == 0x01021994 /* tempfs */
2935 || sfs.f_type == 0x58465342 /* xfs */))
2936 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2937 else
2938 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2841 { 2939 }
2940 else
2941 {
2942 /* can't use inotify, continue to stat */
2842 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2943 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2843 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2844 2944
2845 /* monitor some parent directory for speedup hints */ 2945 /* if path is not there, monitor some parent directory for speedup hints */
2846 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2946 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2847 /* but an efficiency issue only */ 2947 /* but an efficiency issue only */
2848 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2948 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2849 { 2949 {
2850 char path [4096]; 2950 char path [4096];
2866 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2966 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2867 } 2967 }
2868 } 2968 }
2869 2969
2870 if (w->wd >= 0) 2970 if (w->wd >= 0)
2871 {
2872 struct statfs sfs;
2873
2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2971 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2875 2972
2876 /* now local changes will be tracked by inotify, but remote changes won't */ 2973 /* now re-arm timer, if required */
2877 /* unless the filesystem it known to be local, we therefore still poll */ 2974 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2878 /* also do poll on <2.6.25, but with normal frequency */
2879
2880 if (fs_2625 && !statfs (w->path, &sfs))
2881 if (sfs.f_type == 0x1373 /* devfs */
2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2883 || sfs.f_type == 0x3153464a /* jfs */
2884 || sfs.f_type == 0x52654973 /* reiser3 */
2885 || sfs.f_type == 0x01021994 /* tempfs */
2886 || sfs.f_type == 0x58465342 /* xfs */)
2887 return;
2888
2889 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2890 ev_timer_again (EV_A_ &w->timer); 2975 ev_timer_again (EV_A_ &w->timer);
2891 } 2976 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2892} 2977}
2893 2978
2894static void noinline 2979static void noinline
2895infy_del (EV_P_ ev_stat *w) 2980infy_del (EV_P_ ev_stat *w)
2896{ 2981{
2899 2984
2900 if (wd < 0) 2985 if (wd < 0)
2901 return; 2986 return;
2902 2987
2903 w->wd = -2; 2988 w->wd = -2;
2904 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2989 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2905 wlist_del (&fs_hash [slot].head, (WL)w); 2990 wlist_del (&fs_hash [slot].head, (WL)w);
2906 2991
2907 /* remove this watcher, if others are watching it, they will rearm */ 2992 /* remove this watcher, if others are watching it, they will rearm */
2908 inotify_rm_watch (fs_fd, wd); 2993 inotify_rm_watch (fs_fd, wd);
2909} 2994}
2911static void noinline 2996static void noinline
2912infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2997infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2913{ 2998{
2914 if (slot < 0) 2999 if (slot < 0)
2915 /* overflow, need to check for all hash slots */ 3000 /* overflow, need to check for all hash slots */
2916 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3001 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2917 infy_wd (EV_A_ slot, wd, ev); 3002 infy_wd (EV_A_ slot, wd, ev);
2918 else 3003 else
2919 { 3004 {
2920 WL w_; 3005 WL w_;
2921 3006
2922 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3007 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2923 { 3008 {
2924 ev_stat *w = (ev_stat *)w_; 3009 ev_stat *w = (ev_stat *)w_;
2925 w_ = w_->next; /* lets us remove this watcher and all before it */ 3010 w_ = w_->next; /* lets us remove this watcher and all before it */
2926 3011
2927 if (w->wd == wd || wd == -1) 3012 if (w->wd == wd || wd == -1)
2928 { 3013 {
2929 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3014 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2930 { 3015 {
2931 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3016 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2932 w->wd = -1; 3017 w->wd = -1;
2933 infy_add (EV_A_ w); /* re-add, no matter what */ 3018 infy_add (EV_A_ w); /* re-add, no matter what */
2934 } 3019 }
2935 3020
2936 stat_timer_cb (EV_A_ &w->timer, 0); 3021 stat_timer_cb (EV_A_ &w->timer, 0);
2941 3026
2942static void 3027static void
2943infy_cb (EV_P_ ev_io *w, int revents) 3028infy_cb (EV_P_ ev_io *w, int revents)
2944{ 3029{
2945 char buf [EV_INOTIFY_BUFSIZE]; 3030 char buf [EV_INOTIFY_BUFSIZE];
2946 struct inotify_event *ev = (struct inotify_event *)buf;
2947 int ofs; 3031 int ofs;
2948 int len = read (fs_fd, buf, sizeof (buf)); 3032 int len = read (fs_fd, buf, sizeof (buf));
2949 3033
2950 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3034 for (ofs = 0; ofs < len; )
3035 {
3036 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2951 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3037 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3038 ofs += sizeof (struct inotify_event) + ev->len;
3039 }
3040}
3041
3042inline_size unsigned int
3043ev_linux_version (void)
3044{
3045 struct utsname buf;
3046 unsigned int v;
3047 int i;
3048 char *p = buf.release;
3049
3050 if (uname (&buf))
3051 return 0;
3052
3053 for (i = 3+1; --i; )
3054 {
3055 unsigned int c = 0;
3056
3057 for (;;)
3058 {
3059 if (*p >= '0' && *p <= '9')
3060 c = c * 10 + *p++ - '0';
3061 else
3062 {
3063 p += *p == '.';
3064 break;
3065 }
3066 }
3067
3068 v = (v << 8) | c;
3069 }
3070
3071 return v;
2952} 3072}
2953 3073
2954inline_size void 3074inline_size void
2955check_2625 (EV_P) 3075ev_check_2625 (EV_P)
2956{ 3076{
2957 /* kernels < 2.6.25 are borked 3077 /* kernels < 2.6.25 are borked
2958 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3078 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2959 */ 3079 */
2960 struct utsname buf; 3080 if (ev_linux_version () < 0x020619)
2961 int major, minor, micro;
2962
2963 if (uname (&buf))
2964 return; 3081 return;
2965 3082
2966 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2967 return;
2968
2969 if (major < 2
2970 || (major == 2 && minor < 6)
2971 || (major == 2 && minor == 6 && micro < 25))
2972 return;
2973
2974 fs_2625 = 1; 3083 fs_2625 = 1;
3084}
3085
3086inline_size int
3087infy_newfd (void)
3088{
3089#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3090 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3091 if (fd >= 0)
3092 return fd;
3093#endif
3094 return inotify_init ();
2975} 3095}
2976 3096
2977inline_size void 3097inline_size void
2978infy_init (EV_P) 3098infy_init (EV_P)
2979{ 3099{
2980 if (fs_fd != -2) 3100 if (fs_fd != -2)
2981 return; 3101 return;
2982 3102
2983 fs_fd = -1; 3103 fs_fd = -1;
2984 3104
2985 check_2625 (EV_A); 3105 ev_check_2625 (EV_A);
2986 3106
2987 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
2988 3108
2989 if (fs_fd >= 0) 3109 if (fs_fd >= 0)
2990 { 3110 {
3111 fd_intern (fs_fd);
2991 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3112 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2992 ev_set_priority (&fs_w, EV_MAXPRI); 3113 ev_set_priority (&fs_w, EV_MAXPRI);
2993 ev_io_start (EV_A_ &fs_w); 3114 ev_io_start (EV_A_ &fs_w);
3115 ev_unref (EV_A);
2994 } 3116 }
2995} 3117}
2996 3118
2997inline_size void 3119inline_size void
2998infy_fork (EV_P) 3120infy_fork (EV_P)
3000 int slot; 3122 int slot;
3001 3123
3002 if (fs_fd < 0) 3124 if (fs_fd < 0)
3003 return; 3125 return;
3004 3126
3127 ev_ref (EV_A);
3128 ev_io_stop (EV_A_ &fs_w);
3005 close (fs_fd); 3129 close (fs_fd);
3006 fs_fd = inotify_init (); 3130 fs_fd = infy_newfd ();
3007 3131
3132 if (fs_fd >= 0)
3133 {
3134 fd_intern (fs_fd);
3135 ev_io_set (&fs_w, fs_fd, EV_READ);
3136 ev_io_start (EV_A_ &fs_w);
3137 ev_unref (EV_A);
3138 }
3139
3008 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3140 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3009 { 3141 {
3010 WL w_ = fs_hash [slot].head; 3142 WL w_ = fs_hash [slot].head;
3011 fs_hash [slot].head = 0; 3143 fs_hash [slot].head = 0;
3012 3144
3013 while (w_) 3145 while (w_)
3018 w->wd = -1; 3150 w->wd = -1;
3019 3151
3020 if (fs_fd >= 0) 3152 if (fs_fd >= 0)
3021 infy_add (EV_A_ w); /* re-add, no matter what */ 3153 infy_add (EV_A_ w); /* re-add, no matter what */
3022 else 3154 else
3155 {
3156 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3157 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3023 ev_timer_again (EV_A_ &w->timer); 3158 ev_timer_again (EV_A_ &w->timer);
3159 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3160 }
3024 } 3161 }
3025 } 3162 }
3026} 3163}
3027 3164
3028#endif 3165#endif
3045static void noinline 3182static void noinline
3046stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3183stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3047{ 3184{
3048 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3185 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3049 3186
3050 /* we copy this here each the time so that */ 3187 ev_statdata prev = w->attr;
3051 /* prev has the old value when the callback gets invoked */
3052 w->prev = w->attr;
3053 ev_stat_stat (EV_A_ w); 3188 ev_stat_stat (EV_A_ w);
3054 3189
3055 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3190 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3056 if ( 3191 if (
3057 w->prev.st_dev != w->attr.st_dev 3192 prev.st_dev != w->attr.st_dev
3058 || w->prev.st_ino != w->attr.st_ino 3193 || prev.st_ino != w->attr.st_ino
3059 || w->prev.st_mode != w->attr.st_mode 3194 || prev.st_mode != w->attr.st_mode
3060 || w->prev.st_nlink != w->attr.st_nlink 3195 || prev.st_nlink != w->attr.st_nlink
3061 || w->prev.st_uid != w->attr.st_uid 3196 || prev.st_uid != w->attr.st_uid
3062 || w->prev.st_gid != w->attr.st_gid 3197 || prev.st_gid != w->attr.st_gid
3063 || w->prev.st_rdev != w->attr.st_rdev 3198 || prev.st_rdev != w->attr.st_rdev
3064 || w->prev.st_size != w->attr.st_size 3199 || prev.st_size != w->attr.st_size
3065 || w->prev.st_atime != w->attr.st_atime 3200 || prev.st_atime != w->attr.st_atime
3066 || w->prev.st_mtime != w->attr.st_mtime 3201 || prev.st_mtime != w->attr.st_mtime
3067 || w->prev.st_ctime != w->attr.st_ctime 3202 || prev.st_ctime != w->attr.st_ctime
3068 ) { 3203 ) {
3204 /* we only update w->prev on actual differences */
3205 /* in case we test more often than invoke the callback, */
3206 /* to ensure that prev is always different to attr */
3207 w->prev = prev;
3208
3069 #if EV_USE_INOTIFY 3209 #if EV_USE_INOTIFY
3070 if (fs_fd >= 0) 3210 if (fs_fd >= 0)
3071 { 3211 {
3072 infy_del (EV_A_ w); 3212 infy_del (EV_A_ w);
3073 infy_add (EV_A_ w); 3213 infy_add (EV_A_ w);
3098 3238
3099 if (fs_fd >= 0) 3239 if (fs_fd >= 0)
3100 infy_add (EV_A_ w); 3240 infy_add (EV_A_ w);
3101 else 3241 else
3102#endif 3242#endif
3243 {
3103 ev_timer_again (EV_A_ &w->timer); 3244 ev_timer_again (EV_A_ &w->timer);
3245 ev_unref (EV_A);
3246 }
3104 3247
3105 ev_start (EV_A_ (W)w, 1); 3248 ev_start (EV_A_ (W)w, 1);
3106 3249
3107 EV_FREQUENT_CHECK; 3250 EV_FREQUENT_CHECK;
3108} 3251}
3117 EV_FREQUENT_CHECK; 3260 EV_FREQUENT_CHECK;
3118 3261
3119#if EV_USE_INOTIFY 3262#if EV_USE_INOTIFY
3120 infy_del (EV_A_ w); 3263 infy_del (EV_A_ w);
3121#endif 3264#endif
3265
3266 if (ev_is_active (&w->timer))
3267 {
3268 ev_ref (EV_A);
3122 ev_timer_stop (EV_A_ &w->timer); 3269 ev_timer_stop (EV_A_ &w->timer);
3270 }
3123 3271
3124 ev_stop (EV_A_ (W)w); 3272 ev_stop (EV_A_ (W)w);
3125 3273
3126 EV_FREQUENT_CHECK; 3274 EV_FREQUENT_CHECK;
3127} 3275}
3172 3320
3173 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
3174} 3322}
3175#endif 3323#endif
3176 3324
3325#if EV_PREPARE_ENABLE
3177void 3326void
3178ev_prepare_start (EV_P_ ev_prepare *w) 3327ev_prepare_start (EV_P_ ev_prepare *w)
3179{ 3328{
3180 if (expect_false (ev_is_active (w))) 3329 if (expect_false (ev_is_active (w)))
3181 return; 3330 return;
3207 3356
3208 ev_stop (EV_A_ (W)w); 3357 ev_stop (EV_A_ (W)w);
3209 3358
3210 EV_FREQUENT_CHECK; 3359 EV_FREQUENT_CHECK;
3211} 3360}
3361#endif
3212 3362
3363#if EV_CHECK_ENABLE
3213void 3364void
3214ev_check_start (EV_P_ ev_check *w) 3365ev_check_start (EV_P_ ev_check *w)
3215{ 3366{
3216 if (expect_false (ev_is_active (w))) 3367 if (expect_false (ev_is_active (w)))
3217 return; 3368 return;
3243 3394
3244 ev_stop (EV_A_ (W)w); 3395 ev_stop (EV_A_ (W)w);
3245 3396
3246 EV_FREQUENT_CHECK; 3397 EV_FREQUENT_CHECK;
3247} 3398}
3399#endif
3248 3400
3249#if EV_EMBED_ENABLE 3401#if EV_EMBED_ENABLE
3250void noinline 3402void noinline
3251ev_embed_sweep (EV_P_ ev_embed *w) 3403ev_embed_sweep (EV_P_ ev_embed *w)
3252{ 3404{
3347 3499
3348 ev_io_stop (EV_A_ &w->io); 3500 ev_io_stop (EV_A_ &w->io);
3349 ev_prepare_stop (EV_A_ &w->prepare); 3501 ev_prepare_stop (EV_A_ &w->prepare);
3350 ev_fork_stop (EV_A_ &w->fork); 3502 ev_fork_stop (EV_A_ &w->fork);
3351 3503
3504 ev_stop (EV_A_ (W)w);
3505
3352 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3353} 3507}
3354#endif 3508#endif
3355 3509
3356#if EV_FORK_ENABLE 3510#if EV_FORK_ENABLE
3482{ 3636{
3483 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3637 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3484 3638
3485 if (expect_false (!once)) 3639 if (expect_false (!once))
3486 { 3640 {
3487 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3641 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3488 return; 3642 return;
3489 } 3643 }
3490 3644
3491 once->cb = cb; 3645 once->cb = cb;
3492 once->arg = arg; 3646 once->arg = arg;
3579 if (types & EV_ASYNC) 3733 if (types & EV_ASYNC)
3580 for (i = asynccnt; i--; ) 3734 for (i = asynccnt; i--; )
3581 cb (EV_A_ EV_ASYNC, asyncs [i]); 3735 cb (EV_A_ EV_ASYNC, asyncs [i]);
3582#endif 3736#endif
3583 3737
3738#if EV_PREPARE_ENABLE
3584 if (types & EV_PREPARE) 3739 if (types & EV_PREPARE)
3585 for (i = preparecnt; i--; ) 3740 for (i = preparecnt; i--; )
3586#if EV_EMBED_ENABLE 3741# if EV_EMBED_ENABLE
3587 if (ev_cb (prepares [i]) != embed_prepare_cb) 3742 if (ev_cb (prepares [i]) != embed_prepare_cb)
3588#endif 3743# endif
3589 cb (EV_A_ EV_PREPARE, prepares [i]); 3744 cb (EV_A_ EV_PREPARE, prepares [i]);
3745#endif
3590 3746
3747#if EV_CHECK_ENABLE
3591 if (types & EV_CHECK) 3748 if (types & EV_CHECK)
3592 for (i = checkcnt; i--; ) 3749 for (i = checkcnt; i--; )
3593 cb (EV_A_ EV_CHECK, checks [i]); 3750 cb (EV_A_ EV_CHECK, checks [i]);
3751#endif
3594 3752
3753#if EV_SIGNAL_ENABLE
3595 if (types & EV_SIGNAL) 3754 if (types & EV_SIGNAL)
3596 for (i = 0; i < EV_NSIG - 1; ++i) 3755 for (i = 0; i < EV_NSIG - 1; ++i)
3597 for (wl = signals [i].head; wl; ) 3756 for (wl = signals [i].head; wl; )
3598 { 3757 {
3599 wn = wl->next; 3758 wn = wl->next;
3600 cb (EV_A_ EV_SIGNAL, wl); 3759 cb (EV_A_ EV_SIGNAL, wl);
3601 wl = wn; 3760 wl = wn;
3602 } 3761 }
3762#endif
3603 3763
3764#if EV_CHILD_ENABLE
3604 if (types & EV_CHILD) 3765 if (types & EV_CHILD)
3605 for (i = EV_PID_HASHSIZE; i--; ) 3766 for (i = (EV_PID_HASHSIZE); i--; )
3606 for (wl = childs [i]; wl; ) 3767 for (wl = childs [i]; wl; )
3607 { 3768 {
3608 wn = wl->next; 3769 wn = wl->next;
3609 cb (EV_A_ EV_CHILD, wl); 3770 cb (EV_A_ EV_CHILD, wl);
3610 wl = wn; 3771 wl = wn;
3611 } 3772 }
3773#endif
3612/* EV_STAT 0x00001000 /* stat data changed */ 3774/* EV_STAT 0x00001000 /* stat data changed */
3613/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3775/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3614} 3776}
3615#endif 3777#endif
3616 3778

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines