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

Comparing libev/ev.c (file contents):
Revision 1.303 by root, Sun Jul 19 01:36:34 2009 UTC vs.
Revision 1.340 by root, Tue Mar 16 20:39: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 */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
219# define EV_NSIG 65
220#endif
190 221
191#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
192# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
193# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
194# else 225# else
195# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
196# endif 227# endif
197#endif 228#endif
198 229
199#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
200# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
201# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
202# else 233# else
203# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
204# endif 235# endif
205#endif 236#endif
206 237
208# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
209#endif 240#endif
210 241
211#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
212# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
213# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
214# else 245# else
215# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
216# endif 247# endif
217#endif 248#endif
218 249
219#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
220# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
221#endif 252#endif
222 253
223#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
224# ifdef _WIN32 255# ifdef _WIN32
225# define EV_USE_POLL 0 256# define EV_USE_POLL 0
226# else 257# else
227# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
228# endif 259# endif
229#endif 260#endif
230 261
231#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
232# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
233# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
234# else 265# else
235# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
236# endif 267# endif
237#endif 268#endif
238 269
244# define EV_USE_PORT 0 275# define EV_USE_PORT 0
245#endif 276#endif
246 277
247#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
248# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
249# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
250# else 281# else
251# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
252# endif 283# endif
253#endif 284#endif
254 285
255#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
256# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_PID_HASHSIZE 1
258# else
259# define EV_PID_HASHSIZE 16
260# endif
261#endif 288#endif
262 289
263#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
264# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
265# define EV_INOTIFY_HASHSIZE 1
266# else
267# define EV_INOTIFY_HASHSIZE 16
268# endif
269#endif 292#endif
270 293
271#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
273# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
274# else 297# else
275# define EV_USE_EVENTFD 0 298# define EV_USE_EVENTFD 0
276# endif 299# endif
277#endif 300#endif
278 301
279#ifndef EV_USE_SIGNALFD 302#ifndef EV_USE_SIGNALFD
280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
281# define EV_USE_SIGNALFD 1 304# define EV_USE_SIGNALFD EV_FEATURE_OS
282# else 305# else
283# define EV_USE_SIGNALFD 0 306# define EV_USE_SIGNALFD 0
284# endif 307# endif
285#endif 308#endif
286 309
289# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
290# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
291#endif 314#endif
292 315
293#ifndef EV_VERIFY 316#ifndef EV_VERIFY
294# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
295#endif 318#endif
296 319
297#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
298# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
299#endif 322#endif
300 323
301#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
302# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
303#endif 326#endif
304 327
305/* 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, */
306/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
307#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
316# endif 339# endif
317#endif 340#endif
318 341
319/* 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 */
320 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
321#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
322# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
323# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
324#endif 353#endif
325 354
359# include <stdint.h> 388# include <stdint.h>
360# ifndef EFD_NONBLOCK 389# ifndef EFD_NONBLOCK
361# define EFD_NONBLOCK O_NONBLOCK 390# define EFD_NONBLOCK O_NONBLOCK
362# endif 391# endif
363# ifndef EFD_CLOEXEC 392# ifndef EFD_CLOEXEC
393# ifdef O_CLOEXEC
364# define EFD_CLOEXEC O_CLOEXEC 394# define EFD_CLOEXEC O_CLOEXEC
395# else
396# define EFD_CLOEXEC 02000000
397# endif
365# endif 398# endif
366# ifdef __cplusplus 399# ifdef __cplusplus
367extern "C" { 400extern "C" {
368# endif 401# endif
369int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
370# ifdef __cplusplus 403# ifdef __cplusplus
371} 404}
372# endif 405# endif
373#endif 406#endif
374 407
375#if EV_USE_SIGNALFD 408#if EV_USE_SIGNALFD
376# 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
377#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
378 436
379/**/ 437/**/
380 438
381#if EV_VERIFY >= 3 439#if EV_VERIFY >= 3
382# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 440# define EV_FREQUENT_CHECK ev_verify (EV_A)
383#else 441#else
384# define EV_FREQUENT_CHECK do { } while (0) 442# define EV_FREQUENT_CHECK do { } while (0)
385#endif 443#endif
386 444
387/* 445/*
394 */ 452 */
395#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
396 454
397#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) */
398#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) */
399/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
400 457
401#if __GNUC__ >= 4 458#if __GNUC__ >= 4
402# define expect(expr,value) __builtin_expect ((expr),(value)) 459# define expect(expr,value) __builtin_expect ((expr),(value))
403# define noinline __attribute__ ((noinline)) 460# define noinline __attribute__ ((noinline))
404#else 461#else
411 468
412#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
413#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
414#define inline_size static inline 471#define inline_size static inline
415 472
416#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
417# define inline_speed static noinline 476# define inline_speed static noinline
418#else
419# define inline_speed static inline
420#endif 477#endif
421 478
422#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
423 480
424#if EV_MINPRI == EV_MAXPRI 481#if EV_MINPRI == EV_MAXPRI
445 502
446#if EV_USE_MONOTONIC 503#if EV_USE_MONOTONIC
447static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
448#endif 505#endif
449 506
507#ifndef EV_FD_TO_WIN32_HANDLE
508# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
509#endif
510#ifndef EV_WIN32_HANDLE_TO_FD
511# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
512#endif
513#ifndef EV_WIN32_CLOSE_FD
514# define EV_WIN32_CLOSE_FD(fd) close (fd)
515#endif
516
450#ifdef _WIN32 517#ifdef _WIN32
451# include "ev_win32.c" 518# include "ev_win32.c"
452#endif 519#endif
453 520
454/*****************************************************************************/ 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
455 530
456static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
457 532
458void 533void
459ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
469 544
470 if (syserr_cb) 545 if (syserr_cb)
471 syserr_cb (msg); 546 syserr_cb (msg);
472 else 547 else
473 { 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
474 perror (msg); 557 perror (msg);
558#endif
475 abort (); 559 abort ();
476 } 560 }
477} 561}
478 562
479static void * 563static void *
480ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
481{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
482 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
483 * 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
484 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
485 */ 572 */
486 573
487 if (size) 574 if (size)
488 return realloc (ptr, size); 575 return realloc (ptr, size);
489 576
490 free (ptr); 577 free (ptr);
491 return 0; 578 return 0;
579#endif
492} 580}
493 581
494static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
495 583
496void 584void
504{ 592{
505 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
506 594
507 if (!ptr && size) 595 if (!ptr && size)
508 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
509 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
510 abort (); 602 abort ();
511 } 603 }
512 604
513 return ptr; 605 return ptr;
514} 606}
596 688
597 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
598 690
599#endif 691#endif
600 692
601#if EV_MINIMAL < 2 693#if EV_FEATURE_API
602# 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)
603# 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)
604# define EV_INVOKE_PENDING invoke_cb (EV_A) 696# define EV_INVOKE_PENDING invoke_cb (EV_A)
605#else 697#else
606# define EV_RELEASE_CB (void)0 698# define EV_RELEASE_CB (void)0
791} 883}
792 884
793/*****************************************************************************/ 885/*****************************************************************************/
794 886
795inline_speed void 887inline_speed void
796fd_event_nc (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
797{ 889{
798 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
799 ev_io *w; 891 ev_io *w;
800 892
801 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)
813fd_event (EV_P_ int fd, int revents) 905fd_event (EV_P_ int fd, int revents)
814{ 906{
815 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
816 908
817 if (expect_true (!anfd->reify)) 909 if (expect_true (!anfd->reify))
818 fd_event_nc (EV_A_ fd, revents); 910 fd_event_nocheck (EV_A_ fd, revents);
819} 911}
820 912
821void 913void
822ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
823{ 915{
824 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
825 fd_event_nc (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
826} 918}
827 919
828/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
829/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
830inline_size void 922inline_size void
845 937
846#if EV_SELECT_IS_WINSOCKET 938#if EV_SELECT_IS_WINSOCKET
847 if (events) 939 if (events)
848 { 940 {
849 unsigned long arg; 941 unsigned long arg;
850 #ifdef EV_FD_TO_WIN32_HANDLE
851 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
852 #else
853 anfd->handle = _get_osfhandle (fd);
854 #endif
855 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
856 } 944 }
857#endif 945#endif
858 946
859 { 947 {
897 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
898 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);
899 } 987 }
900} 988}
901 989
902/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
903inline_size int 991inline_size int
904fd_valid (int fd) 992fd_valid (int fd)
905{ 993{
906#ifdef _WIN32 994#ifdef _WIN32
907 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
908#else 996#else
909 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
910#endif 998#endif
911} 999}
912 1000
930 1018
931 for (fd = anfdmax; fd--; ) 1019 for (fd = anfdmax; fd--; )
932 if (anfds [fd].events) 1020 if (anfds [fd].events)
933 { 1021 {
934 fd_kill (EV_A_ fd); 1022 fd_kill (EV_A_ fd);
935 return; 1023 break;
936 } 1024 }
937} 1025}
938 1026
939/* usually called after fork if backend needs to re-arm all fds from scratch */ 1027/* usually called after fork if backend needs to re-arm all fds from scratch */
940static void noinline 1028static void noinline
947 { 1035 {
948 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
949 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
950 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
951 } 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
952} 1054}
953 1055
954/*****************************************************************************/ 1056/*****************************************************************************/
955 1057
956/* 1058/*
1030 1132
1031 for (;;) 1133 for (;;)
1032 { 1134 {
1033 int c = k << 1; 1135 int c = k << 1;
1034 1136
1035 if (c > N + HEAP0 - 1) 1137 if (c >= N + HEAP0)
1036 break; 1138 break;
1037 1139
1038 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1140 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1039 ? 1 : 0; 1141 ? 1 : 0;
1040 1142
1076 1178
1077/* move an element suitably so it is in a correct place */ 1179/* move an element suitably so it is in a correct place */
1078inline_size void 1180inline_size void
1079adjustheap (ANHE *heap, int N, int k) 1181adjustheap (ANHE *heap, int N, int k)
1080{ 1182{
1081 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1183 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1082 upheap (heap, k); 1184 upheap (heap, k);
1083 else 1185 else
1084 downheap (heap, N, k); 1186 downheap (heap, N, k);
1085} 1187}
1086 1188
1099/*****************************************************************************/ 1201/*****************************************************************************/
1100 1202
1101/* associate signal watchers to a signal signal */ 1203/* associate signal watchers to a signal signal */
1102typedef struct 1204typedef struct
1103{ 1205{
1206 EV_ATOMIC_T pending;
1207#if EV_MULTIPLICITY
1208 EV_P;
1209#endif
1104 WL head; 1210 WL head;
1105 EV_ATOMIC_T gotsig;
1106} ANSIG; 1211} ANSIG;
1107 1212
1108static ANSIG *signals; 1213static ANSIG signals [EV_NSIG - 1];
1109static int signalmax;
1110
1111static EV_ATOMIC_T gotsig;
1112 1214
1113/*****************************************************************************/ 1215/*****************************************************************************/
1114 1216
1115/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1116/* this is not fork-safe */
1117inline_speed void
1118fd_intern (int fd)
1119{
1120#ifdef _WIN32
1121 unsigned long arg = 1;
1122 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1123#else
1124 fcntl (fd, F_SETFD, FD_CLOEXEC);
1125 fcntl (fd, F_SETFL, O_NONBLOCK);
1126#endif
1127}
1128 1218
1129static void noinline 1219static void noinline
1130evpipe_init (EV_P) 1220evpipe_init (EV_P)
1131{ 1221{
1132 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1133 { 1223 {
1134#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1135 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1136 if (evfd < 0 && errno == EINVAL) 1226 if (evfd < 0 && errno == EINVAL)
1137 evfd = eventfd (0, 0); 1227 evfd = eventfd (0, 0);
1138 1228
1139 if (evfd >= 0) 1229 if (evfd >= 0)
1141 evpipe [0] = -1; 1231 evpipe [0] = -1;
1142 fd_intern (evfd); /* doing it twice doesn't hurt */ 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1143 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1144 } 1234 }
1145 else 1235 else
1146#endif 1236# endif
1147 { 1237 {
1148 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1149 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1150 1240
1151 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
1162evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1163{ 1253{
1164 if (!*flag) 1254 if (!*flag)
1165 { 1255 {
1166 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;
1167 1258
1168 *flag = 1; 1259 *flag = 1;
1169 1260
1170#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1171 if (evfd >= 0) 1262 if (evfd >= 0)
1173 uint64_t counter = 1; 1264 uint64_t counter = 1;
1174 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1175 } 1266 }
1176 else 1267 else
1177#endif 1268#endif
1178 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1179 1270
1180 errno = old_errno; 1271 errno = old_errno;
1181 } 1272 }
1182} 1273}
1183 1274
1184/* called whenever the libev signal pipe */ 1275/* called whenever the libev signal pipe */
1185/* got some events (signal, async) */ 1276/* got some events (signal, async) */
1186static void 1277static void
1187pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1188{ 1279{
1280 int i;
1281
1189#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1190 if (evfd >= 0) 1283 if (evfd >= 0)
1191 { 1284 {
1192 uint64_t counter; 1285 uint64_t counter;
1193 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
1197 { 1290 {
1198 char dummy; 1291 char dummy;
1199 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1200 } 1293 }
1201 1294
1202 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1203 { 1296 {
1204 int signum; 1297 sig_pending = 0;
1205 gotsig = 0;
1206 1298
1207 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1208 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1209 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1210 } 1302 }
1211 1303
1212#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1213 if (gotasync) 1305 if (async_pending)
1214 { 1306 {
1215 int i; 1307 async_pending = 0;
1216 gotasync = 0;
1217 1308
1218 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1219 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1220 { 1311 {
1221 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
1229 1320
1230static void 1321static void
1231ev_sighandler (int signum) 1322ev_sighandler (int signum)
1232{ 1323{
1233#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1234 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1235#endif 1326#endif
1236 1327
1237#if _WIN32 1328#ifdef _WIN32
1238 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1239#endif 1330#endif
1240 1331
1241 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1242 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1243} 1334}
1244 1335
1245void noinline 1336void noinline
1246ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1247{ 1338{
1248 WL w; 1339 WL w;
1249 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1250#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1251 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1347 /* it is permissible to try to feed a signal to the wrong loop */
1252#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1253 1349
1254 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1255
1256 if (signum < 0 || signum >= signalmax)
1257 return; 1351 return;
1352#endif
1258 1353
1259 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1260 1355
1261 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1262 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1263} 1358}
1264 1359
1265#if EV_USE_SIGNALFD 1360#if EV_USE_SIGNALFD
1266static void 1361static void
1267sigfdcb (EV_P_ ev_io *iow, int revents) 1362sigfdcb (EV_P_ ev_io *iow, int revents)
1268{ 1363{
1269 struct signalfd_siginfo si[4], *sip; 1364 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1270 1365
1271 for (;;) 1366 for (;;)
1272 { 1367 {
1273 ssize_t res = read (sigfd, si, sizeof (si)); 1368 ssize_t res = read (sigfd, si, sizeof (si));
1274 1369
1280 break; 1375 break;
1281 } 1376 }
1282} 1377}
1283#endif 1378#endif
1284 1379
1380#endif
1381
1285/*****************************************************************************/ 1382/*****************************************************************************/
1286 1383
1384#if EV_CHILD_ENABLE
1287static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1288
1289#ifndef _WIN32
1290 1386
1291static ev_signal childev; 1387static ev_signal childev;
1292 1388
1293#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1294# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
1299child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1300{ 1396{
1301 ev_child *w; 1397 ev_child *w;
1302 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1303 1399
1304 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)
1305 { 1401 {
1306 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1307 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1308 { 1404 {
1309 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 */
1334 /* 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 */
1335 /* 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 */
1336 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1337 1433
1338 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1339 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1340 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 */
1341} 1437}
1342 1438
1343#endif 1439#endif
1344 1440
1433ev_backend (EV_P) 1529ev_backend (EV_P)
1434{ 1530{
1435 return backend; 1531 return backend;
1436} 1532}
1437 1533
1438#if EV_MINIMAL < 2 1534#if EV_FEATURE_API
1439unsigned int 1535unsigned int
1440ev_loop_count (EV_P) 1536ev_iteration (EV_P)
1441{ 1537{
1442 return loop_count; 1538 return loop_count;
1443} 1539}
1444 1540
1445unsigned int 1541unsigned int
1446ev_loop_depth (EV_P) 1542ev_depth (EV_P)
1447{ 1543{
1448 return loop_depth; 1544 return loop_depth;
1449} 1545}
1450 1546
1451void 1547void
1508 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1604 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1509 have_monotonic = 1; 1605 have_monotonic = 1;
1510 } 1606 }
1511#endif 1607#endif
1512 1608
1609 /* pid check not overridable via env */
1610#ifndef _WIN32
1611 if (flags & EVFLAG_FORKCHECK)
1612 curpid = getpid ();
1613#endif
1614
1615 if (!(flags & EVFLAG_NOENV)
1616 && !enable_secure ()
1617 && getenv ("LIBEV_FLAGS"))
1618 flags = atoi (getenv ("LIBEV_FLAGS"));
1619
1513 ev_rt_now = ev_time (); 1620 ev_rt_now = ev_time ();
1514 mn_now = get_clock (); 1621 mn_now = get_clock ();
1515 now_floor = mn_now; 1622 now_floor = mn_now;
1516 rtmn_diff = ev_rt_now - mn_now; 1623 rtmn_diff = ev_rt_now - mn_now;
1517#if EV_MINIMAL < 2 1624#if EV_FEATURE_API
1518 invoke_cb = ev_invoke_pending; 1625 invoke_cb = ev_invoke_pending;
1519#endif 1626#endif
1520 1627
1521 io_blocktime = 0.; 1628 io_blocktime = 0.;
1522 timeout_blocktime = 0.; 1629 timeout_blocktime = 0.;
1523 backend = 0; 1630 backend = 0;
1524 backend_fd = -1; 1631 backend_fd = -1;
1525 gotasync = 0; 1632 sig_pending = 0;
1633#if EV_ASYNC_ENABLE
1634 async_pending = 0;
1635#endif
1526#if EV_USE_INOTIFY 1636#if EV_USE_INOTIFY
1527 fs_fd = -2; 1637 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1528#endif 1638#endif
1529#if EV_USE_SIGNALFD 1639#if EV_USE_SIGNALFD
1530 sigfd = -2; 1640 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1531#endif 1641#endif
1532
1533 /* pid check not overridable via env */
1534#ifndef _WIN32
1535 if (flags & EVFLAG_FORKCHECK)
1536 curpid = getpid ();
1537#endif
1538
1539 if (!(flags & EVFLAG_NOENV)
1540 && !enable_secure ()
1541 && getenv ("LIBEV_FLAGS"))
1542 flags = atoi (getenv ("LIBEV_FLAGS"));
1543 1642
1544 if (!(flags & 0x0000ffffU)) 1643 if (!(flags & 0x0000ffffU))
1545 flags |= ev_recommended_backends (); 1644 flags |= ev_recommended_backends ();
1546 1645
1547#if EV_USE_PORT 1646#if EV_USE_PORT
1560 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1659 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1561#endif 1660#endif
1562 1661
1563 ev_prepare_init (&pending_w, pendingcb); 1662 ev_prepare_init (&pending_w, pendingcb);
1564 1663
1664#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1565 ev_init (&pipe_w, pipecb); 1665 ev_init (&pipe_w, pipecb);
1566 ev_set_priority (&pipe_w, EV_MAXPRI); 1666 ev_set_priority (&pipe_w, EV_MAXPRI);
1667#endif
1567 } 1668 }
1568} 1669}
1569 1670
1570/* free up a loop structure */ 1671/* free up a loop structure */
1571static void noinline 1672static void noinline
1583 close (evfd); 1684 close (evfd);
1584#endif 1685#endif
1585 1686
1586 if (evpipe [0] >= 0) 1687 if (evpipe [0] >= 0)
1587 { 1688 {
1588 close (evpipe [0]); 1689 EV_WIN32_CLOSE_FD (evpipe [0]);
1589 close (evpipe [1]); 1690 EV_WIN32_CLOSE_FD (evpipe [1]);
1590 } 1691 }
1591 } 1692 }
1592 1693
1593#if EV_USE_SIGNALFD 1694#if EV_USE_SIGNALFD
1594 if (ev_is_active (&sigfd_w)) 1695 if (ev_is_active (&sigfd_w))
1595 {
1596 /*ev_ref (EV_A);*/
1597 /*ev_io_stop (EV_A_ &sigfd_w);*/
1598
1599 close (sigfd); 1696 close (sigfd);
1600 }
1601#endif 1697#endif
1602 1698
1603#if EV_USE_INOTIFY 1699#if EV_USE_INOTIFY
1604 if (fs_fd >= 0) 1700 if (fs_fd >= 0)
1605 close (fs_fd); 1701 close (fs_fd);
1630#if EV_IDLE_ENABLE 1726#if EV_IDLE_ENABLE
1631 array_free (idle, [i]); 1727 array_free (idle, [i]);
1632#endif 1728#endif
1633 } 1729 }
1634 1730
1635 ev_free (anfds); anfdmax = 0; 1731 ev_free (anfds); anfds = 0; anfdmax = 0;
1636 1732
1637 /* have to use the microsoft-never-gets-it-right macro */ 1733 /* have to use the microsoft-never-gets-it-right macro */
1638 array_free (rfeed, EMPTY); 1734 array_free (rfeed, EMPTY);
1639 array_free (fdchange, EMPTY); 1735 array_free (fdchange, EMPTY);
1640 array_free (timer, EMPTY); 1736 array_free (timer, EMPTY);
1675 1771
1676 if (ev_is_active (&pipe_w)) 1772 if (ev_is_active (&pipe_w))
1677 { 1773 {
1678 /* this "locks" the handlers against writing to the pipe */ 1774 /* this "locks" the handlers against writing to the pipe */
1679 /* while we modify the fd vars */ 1775 /* while we modify the fd vars */
1680 gotsig = 1; 1776 sig_pending = 1;
1681#if EV_ASYNC_ENABLE 1777#if EV_ASYNC_ENABLE
1682 gotasync = 1; 1778 async_pending = 1;
1683#endif 1779#endif
1684 1780
1685 ev_ref (EV_A); 1781 ev_ref (EV_A);
1686 ev_io_stop (EV_A_ &pipe_w); 1782 ev_io_stop (EV_A_ &pipe_w);
1687 1783
1690 close (evfd); 1786 close (evfd);
1691#endif 1787#endif
1692 1788
1693 if (evpipe [0] >= 0) 1789 if (evpipe [0] >= 0)
1694 { 1790 {
1695 close (evpipe [0]); 1791 EV_WIN32_CLOSE_FD (evpipe [0]);
1696 close (evpipe [1]); 1792 EV_WIN32_CLOSE_FD (evpipe [1]);
1697 } 1793 }
1698 1794
1795#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1699 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1700 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1701 pipecb (EV_A_ &pipe_w, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1799#endif
1702 } 1800 }
1703 1801
1704 postfork = 0; 1802 postfork = 0;
1705} 1803}
1706 1804
1707#if EV_MULTIPLICITY 1805#if EV_MULTIPLICITY
1708 1806
1709struct ev_loop * 1807struct ev_loop *
1710ev_loop_new (unsigned int flags) 1808ev_loop_new (unsigned int flags)
1711{ 1809{
1712 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1810 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1713 1811
1714 memset (loop, 0, sizeof (struct ev_loop)); 1812 memset (EV_A, 0, sizeof (struct ev_loop));
1715 loop_init (EV_A_ flags); 1813 loop_init (EV_A_ flags);
1716 1814
1717 if (ev_backend (EV_A)) 1815 if (ev_backend (EV_A))
1718 return loop; 1816 return EV_A;
1719 1817
1720 return 0; 1818 return 0;
1721} 1819}
1722 1820
1723void 1821void
1768 verify_watcher (EV_A_ ws [cnt]); 1866 verify_watcher (EV_A_ ws [cnt]);
1769 } 1867 }
1770} 1868}
1771#endif 1869#endif
1772 1870
1773#if EV_MINIMAL < 2 1871#if EV_FEATURE_API
1774void 1872void
1775ev_loop_verify (EV_P) 1873ev_verify (EV_P)
1776{ 1874{
1777#if EV_VERIFY 1875#if EV_VERIFY
1778 int i; 1876 int i;
1779 WL w; 1877 WL w;
1780 1878
1819#if EV_ASYNC_ENABLE 1917#if EV_ASYNC_ENABLE
1820 assert (asyncmax >= asynccnt); 1918 assert (asyncmax >= asynccnt);
1821 array_verify (EV_A_ (W *)asyncs, asynccnt); 1919 array_verify (EV_A_ (W *)asyncs, asynccnt);
1822#endif 1920#endif
1823 1921
1922#if EV_PREPARE_ENABLE
1824 assert (preparemax >= preparecnt); 1923 assert (preparemax >= preparecnt);
1825 array_verify (EV_A_ (W *)prepares, preparecnt); 1924 array_verify (EV_A_ (W *)prepares, preparecnt);
1925#endif
1826 1926
1927#if EV_CHECK_ENABLE
1827 assert (checkmax >= checkcnt); 1928 assert (checkmax >= checkcnt);
1828 array_verify (EV_A_ (W *)checks, checkcnt); 1929 array_verify (EV_A_ (W *)checks, checkcnt);
1930#endif
1829 1931
1830# if 0 1932# if 0
1933#if EV_CHILD_ENABLE
1831 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)
1832 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1935 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1936#endif
1833# endif 1937# endif
1834#endif 1938#endif
1835} 1939}
1836#endif 1940#endif
1837 1941
1844#endif 1948#endif
1845{ 1949{
1846 if (!ev_default_loop_ptr) 1950 if (!ev_default_loop_ptr)
1847 { 1951 {
1848#if EV_MULTIPLICITY 1952#if EV_MULTIPLICITY
1849 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1953 EV_P = ev_default_loop_ptr = &default_loop_struct;
1850#else 1954#else
1851 ev_default_loop_ptr = 1; 1955 ev_default_loop_ptr = 1;
1852#endif 1956#endif
1853 1957
1854 loop_init (EV_A_ flags); 1958 loop_init (EV_A_ flags);
1855 1959
1856 if (ev_backend (EV_A)) 1960 if (ev_backend (EV_A))
1857 { 1961 {
1858#ifndef _WIN32 1962#if EV_CHILD_ENABLE
1859 ev_signal_init (&childev, childcb, SIGCHLD); 1963 ev_signal_init (&childev, childcb, SIGCHLD);
1860 ev_set_priority (&childev, EV_MAXPRI); 1964 ev_set_priority (&childev, EV_MAXPRI);
1861 ev_signal_start (EV_A_ &childev); 1965 ev_signal_start (EV_A_ &childev);
1862 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1966 ev_unref (EV_A); /* child watcher should not keep loop alive */
1863#endif 1967#endif
1871 1975
1872void 1976void
1873ev_default_destroy (void) 1977ev_default_destroy (void)
1874{ 1978{
1875#if EV_MULTIPLICITY 1979#if EV_MULTIPLICITY
1876 struct ev_loop *loop = ev_default_loop_ptr; 1980 EV_P = ev_default_loop_ptr;
1877#endif 1981#endif
1878 1982
1879 ev_default_loop_ptr = 0; 1983 ev_default_loop_ptr = 0;
1880 1984
1881#ifndef _WIN32 1985#if EV_CHILD_ENABLE
1882 ev_ref (EV_A); /* child watcher */ 1986 ev_ref (EV_A); /* child watcher */
1883 ev_signal_stop (EV_A_ &childev); 1987 ev_signal_stop (EV_A_ &childev);
1884#endif 1988#endif
1885 1989
1886 loop_destroy (EV_A); 1990 loop_destroy (EV_A);
1888 1992
1889void 1993void
1890ev_default_fork (void) 1994ev_default_fork (void)
1891{ 1995{
1892#if EV_MULTIPLICITY 1996#if EV_MULTIPLICITY
1893 struct ev_loop *loop = ev_default_loop_ptr; 1997 EV_P = ev_default_loop_ptr;
1894#endif 1998#endif
1895 1999
1896 postfork = 1; /* must be in line with ev_loop_fork */ 2000 postfork = 1; /* must be in line with ev_loop_fork */
1897} 2001}
1898 2002
2093 ANHE_at_cache (*he); 2197 ANHE_at_cache (*he);
2094 } 2198 }
2095} 2199}
2096 2200
2097/* fetch new monotonic and realtime times from the kernel */ 2201/* fetch new monotonic and realtime times from the kernel */
2098/* also detetc if there was a timejump, and act accordingly */ 2202/* also detect if there was a timejump, and act accordingly */
2099inline_speed void 2203inline_speed void
2100time_update (EV_P_ ev_tstamp max_block) 2204time_update (EV_P_ ev_tstamp max_block)
2101{ 2205{
2102#if EV_USE_MONOTONIC 2206#if EV_USE_MONOTONIC
2103 if (expect_true (have_monotonic)) 2207 if (expect_true (have_monotonic))
2163} 2267}
2164 2268
2165void 2269void
2166ev_loop (EV_P_ int flags) 2270ev_loop (EV_P_ int flags)
2167{ 2271{
2168#if EV_MINIMAL < 2 2272#if EV_FEATURE_API
2169 ++loop_depth; 2273 ++loop_depth;
2170#endif 2274#endif
2171 2275
2172 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));
2173 2277
2176 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 */
2177 2281
2178 do 2282 do
2179 { 2283 {
2180#if EV_VERIFY >= 2 2284#if EV_VERIFY >= 2
2181 ev_loop_verify (EV_A); 2285 ev_verify (EV_A);
2182#endif 2286#endif
2183 2287
2184#ifndef _WIN32 2288#ifndef _WIN32
2185 if (expect_false (curpid)) /* penalise the forking check even more */ 2289 if (expect_false (curpid)) /* penalise the forking check even more */
2186 if (expect_false (getpid () != curpid)) 2290 if (expect_false (getpid () != curpid))
2198 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2302 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2199 EV_INVOKE_PENDING; 2303 EV_INVOKE_PENDING;
2200 } 2304 }
2201#endif 2305#endif
2202 2306
2307#if EV_PREPARE_ENABLE
2203 /* queue prepare watchers (and execute them) */ 2308 /* queue prepare watchers (and execute them) */
2204 if (expect_false (preparecnt)) 2309 if (expect_false (preparecnt))
2205 { 2310 {
2206 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2311 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2207 EV_INVOKE_PENDING; 2312 EV_INVOKE_PENDING;
2208 } 2313 }
2314#endif
2209 2315
2210 if (expect_false (loop_done)) 2316 if (expect_false (loop_done))
2211 break; 2317 break;
2212 2318
2213 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
2264 waittime -= sleeptime; 2370 waittime -= sleeptime;
2265 } 2371 }
2266 } 2372 }
2267 } 2373 }
2268 2374
2269#if EV_MINIMAL < 2 2375#if EV_FEATURE_API
2270 ++loop_count; 2376 ++loop_count;
2271#endif 2377#endif
2272 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2273 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2274 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2286#if EV_IDLE_ENABLE 2392#if EV_IDLE_ENABLE
2287 /* queue idle watchers unless other events are pending */ 2393 /* queue idle watchers unless other events are pending */
2288 idle_reify (EV_A); 2394 idle_reify (EV_A);
2289#endif 2395#endif
2290 2396
2397#if EV_CHECK_ENABLE
2291 /* queue check watchers, to be executed first */ 2398 /* queue check watchers, to be executed first */
2292 if (expect_false (checkcnt)) 2399 if (expect_false (checkcnt))
2293 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2400 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2401#endif
2294 2402
2295 EV_INVOKE_PENDING; 2403 EV_INVOKE_PENDING;
2296 } 2404 }
2297 while (expect_true ( 2405 while (expect_true (
2298 activecnt 2406 activecnt
2301 )); 2409 ));
2302 2410
2303 if (loop_done == EVUNLOOP_ONE) 2411 if (loop_done == EVUNLOOP_ONE)
2304 loop_done = EVUNLOOP_CANCEL; 2412 loop_done = EVUNLOOP_CANCEL;
2305 2413
2306#if EV_MINIMAL < 2 2414#if EV_FEATURE_API
2307 --loop_depth; 2415 --loop_depth;
2308#endif 2416#endif
2309} 2417}
2310 2418
2311void 2419void
2364inline_size void 2472inline_size void
2365wlist_del (WL *head, WL elem) 2473wlist_del (WL *head, WL elem)
2366{ 2474{
2367 while (*head) 2475 while (*head)
2368 { 2476 {
2369 if (*head == elem) 2477 if (expect_true (*head == elem))
2370 { 2478 {
2371 *head = elem->next; 2479 *head = elem->next;
2372 return; 2480 break;
2373 } 2481 }
2374 2482
2375 head = &(*head)->next; 2483 head = &(*head)->next;
2376 } 2484 }
2377} 2485}
2437 2545
2438 if (expect_false (ev_is_active (w))) 2546 if (expect_false (ev_is_active (w)))
2439 return; 2547 return;
2440 2548
2441 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2549 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2442 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))));
2443 2551
2444 EV_FREQUENT_CHECK; 2552 EV_FREQUENT_CHECK;
2445 2553
2446 ev_start (EV_A_ (W)w, 1); 2554 ev_start (EV_A_ (W)w, 1);
2447 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2555 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2517 timers [active] = timers [timercnt + HEAP0]; 2625 timers [active] = timers [timercnt + HEAP0];
2518 adjustheap (timers, timercnt, active); 2626 adjustheap (timers, timercnt, active);
2519 } 2627 }
2520 } 2628 }
2521 2629
2522 EV_FREQUENT_CHECK;
2523
2524 ev_at (w) -= mn_now; 2630 ev_at (w) -= mn_now;
2525 2631
2526 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633
2634 EV_FREQUENT_CHECK;
2527} 2635}
2528 2636
2529void noinline 2637void noinline
2530ev_timer_again (EV_P_ ev_timer *w) 2638ev_timer_again (EV_P_ ev_timer *w)
2531{ 2639{
2610 periodics [active] = periodics [periodiccnt + HEAP0]; 2718 periodics [active] = periodics [periodiccnt + HEAP0];
2611 adjustheap (periodics, periodiccnt, active); 2719 adjustheap (periodics, periodiccnt, active);
2612 } 2720 }
2613 } 2721 }
2614 2722
2615 EV_FREQUENT_CHECK;
2616
2617 ev_stop (EV_A_ (W)w); 2723 ev_stop (EV_A_ (W)w);
2724
2725 EV_FREQUENT_CHECK;
2618} 2726}
2619 2727
2620void noinline 2728void noinline
2621ev_periodic_again (EV_P_ ev_periodic *w) 2729ev_periodic_again (EV_P_ ev_periodic *w)
2622{ 2730{
2628 2736
2629#ifndef SA_RESTART 2737#ifndef SA_RESTART
2630# define SA_RESTART 0 2738# define SA_RESTART 0
2631#endif 2739#endif
2632 2740
2741#if EV_SIGNAL_ENABLE
2742
2633void noinline 2743void noinline
2634ev_signal_start (EV_P_ ev_signal *w) 2744ev_signal_start (EV_P_ ev_signal *w)
2635{ 2745{
2636#if EV_MULTIPLICITY
2637 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2638#endif
2639 if (expect_false (ev_is_active (w))) 2746 if (expect_false (ev_is_active (w)))
2640 return; 2747 return;
2641 2748
2642 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2749 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2750
2751#if EV_MULTIPLICITY
2752 assert (("libev: a signal must not be attached to two different loops",
2753 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2754
2755 signals [w->signum - 1].loop = EV_A;
2756#endif
2643 2757
2644 EV_FREQUENT_CHECK; 2758 EV_FREQUENT_CHECK;
2645 2759
2646#if EV_USE_SIGNALFD 2760#if EV_USE_SIGNALFD
2647 if (sigfd == -2) 2761 if (sigfd == -2)
2669 sigaddset (&sigfd_set, w->signum); 2783 sigaddset (&sigfd_set, w->signum);
2670 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2784 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2671 2785
2672 signalfd (sigfd, &sigfd_set, 0); 2786 signalfd (sigfd, &sigfd_set, 0);
2673 } 2787 }
2674 else
2675#endif 2788#endif
2676 evpipe_init (EV_A);
2677
2678 {
2679#ifndef _WIN32
2680 sigset_t full, prev;
2681 sigfillset (&full);
2682 sigprocmask (SIG_SETMASK, &full, &prev);
2683#endif
2684
2685 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2686
2687#ifndef _WIN32
2688 if (sigfd < 0)/*TODO*/
2689 sigdelset (&prev, w->signum);
2690 sigprocmask (SIG_SETMASK, &prev, 0);
2691#endif
2692 }
2693 2789
2694 ev_start (EV_A_ (W)w, 1); 2790 ev_start (EV_A_ (W)w, 1);
2695 wlist_add (&signals [w->signum - 1].head, (WL)w); 2791 wlist_add (&signals [w->signum - 1].head, (WL)w);
2696 2792
2697 if (!((WL)w)->next) 2793 if (!((WL)w)->next)
2794# if EV_USE_SIGNALFD
2795 if (sigfd < 0) /*TODO*/
2796# endif
2698 { 2797 {
2699#if _WIN32 2798# ifdef _WIN32
2799 evpipe_init (EV_A);
2800
2700 signal (w->signum, ev_sighandler); 2801 signal (w->signum, ev_sighandler);
2701#else 2802# else
2702 if (sigfd < 0) /*TODO*/
2703 {
2704 struct sigaction sa = { }; 2803 struct sigaction sa;
2804
2805 evpipe_init (EV_A);
2806
2705 sa.sa_handler = ev_sighandler; 2807 sa.sa_handler = ev_sighandler;
2706 sigfillset (&sa.sa_mask); 2808 sigfillset (&sa.sa_mask);
2707 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2809 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2708 sigaction (w->signum, &sa, 0); 2810 sigaction (w->signum, &sa, 0);
2811
2812 sigemptyset (&sa.sa_mask);
2813 sigaddset (&sa.sa_mask, w->signum);
2814 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2815#endif
2709 } 2816 }
2710#endif
2711 }
2712 2817
2713 EV_FREQUENT_CHECK; 2818 EV_FREQUENT_CHECK;
2714} 2819}
2715 2820
2716void noinline 2821void noinline
2724 2829
2725 wlist_del (&signals [w->signum - 1].head, (WL)w); 2830 wlist_del (&signals [w->signum - 1].head, (WL)w);
2726 ev_stop (EV_A_ (W)w); 2831 ev_stop (EV_A_ (W)w);
2727 2832
2728 if (!signals [w->signum - 1].head) 2833 if (!signals [w->signum - 1].head)
2834 {
2835#if EV_MULTIPLICITY
2836 signals [w->signum - 1].loop = 0; /* unattach from signal */
2837#endif
2729#if EV_USE_SIGNALFD 2838#if EV_USE_SIGNALFD
2730 if (sigfd >= 0) 2839 if (sigfd >= 0)
2731 { 2840 {
2732 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2841 sigset_t ss;
2842
2843 sigemptyset (&ss);
2844 sigaddset (&ss, w->signum);
2733 sigdelset (&sigfd_set, w->signum); 2845 sigdelset (&sigfd_set, w->signum);
2846
2734 signalfd (sigfd, &sigfd_set, 0); 2847 signalfd (sigfd, &sigfd_set, 0);
2735 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2848 sigprocmask (SIG_UNBLOCK, &ss, 0);
2736 /*TODO: maybe unblock signal? */
2737 } 2849 }
2738 else 2850 else
2739#endif 2851#endif
2740 signal (w->signum, SIG_DFL); 2852 signal (w->signum, SIG_DFL);
2853 }
2741 2854
2742 EV_FREQUENT_CHECK; 2855 EV_FREQUENT_CHECK;
2743} 2856}
2857
2858#endif
2859
2860#if EV_CHILD_ENABLE
2744 2861
2745void 2862void
2746ev_child_start (EV_P_ ev_child *w) 2863ev_child_start (EV_P_ ev_child *w)
2747{ 2864{
2748#if EV_MULTIPLICITY 2865#if EV_MULTIPLICITY
2752 return; 2869 return;
2753 2870
2754 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2755 2872
2756 ev_start (EV_A_ (W)w, 1); 2873 ev_start (EV_A_ (W)w, 1);
2757 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2874 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2758 2875
2759 EV_FREQUENT_CHECK; 2876 EV_FREQUENT_CHECK;
2760} 2877}
2761 2878
2762void 2879void
2766 if (expect_false (!ev_is_active (w))) 2883 if (expect_false (!ev_is_active (w)))
2767 return; 2884 return;
2768 2885
2769 EV_FREQUENT_CHECK; 2886 EV_FREQUENT_CHECK;
2770 2887
2771 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2888 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2772 ev_stop (EV_A_ (W)w); 2889 ev_stop (EV_A_ (W)w);
2773 2890
2774 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2775} 2892}
2893
2894#endif
2776 2895
2777#if EV_STAT_ENABLE 2896#if EV_STAT_ENABLE
2778 2897
2779# ifdef _WIN32 2898# ifdef _WIN32
2780# undef lstat 2899# undef lstat
2786#define MIN_STAT_INTERVAL 0.1074891 2905#define MIN_STAT_INTERVAL 0.1074891
2787 2906
2788static 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);
2789 2908
2790#if EV_USE_INOTIFY 2909#if EV_USE_INOTIFY
2791# 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)
2792 2913
2793static void noinline 2914static void noinline
2794infy_add (EV_P_ ev_stat *w) 2915infy_add (EV_P_ ev_stat *w)
2795{ 2916{
2796 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);
2797 2918
2798 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 */
2799 { 2939 }
2940 else
2941 {
2942 /* can't use inotify, continue to stat */
2800 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2943 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2801 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2802 2944
2803 /* monitor some parent directory for speedup hints */ 2945 /* if path is not there, monitor some parent directory for speedup hints */
2804 /* 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, */
2805 /* but an efficiency issue only */ 2947 /* but an efficiency issue only */
2806 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2948 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2807 { 2949 {
2808 char path [4096]; 2950 char path [4096];
2824 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2966 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2825 } 2967 }
2826 } 2968 }
2827 2969
2828 if (w->wd >= 0) 2970 if (w->wd >= 0)
2829 {
2830 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);
2831 2972
2832 /* now local changes will be tracked by inotify, but remote changes won't */ 2973 /* now re-arm timer, if required */
2833 /* unless the filesystem it known to be local, we therefore still poll */ 2974 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2834 /* also do poll on <2.6.25, but with normal frequency */
2835 struct statfs sfs;
2836
2837 if (fs_2625 && !statfs (w->path, &sfs))
2838 if (sfs.f_type == 0x1373 /* devfs */
2839 || sfs.f_type == 0xEF53 /* ext2/3 */
2840 || sfs.f_type == 0x3153464a /* jfs */
2841 || sfs.f_type == 0x52654973 /* reiser3 */
2842 || sfs.f_type == 0x01021994 /* tempfs */
2843 || sfs.f_type == 0x58465342 /* xfs */)
2844 return;
2845
2846 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2847 ev_timer_again (EV_A_ &w->timer); 2975 ev_timer_again (EV_A_ &w->timer);
2848 } 2976 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2849} 2977}
2850 2978
2851static void noinline 2979static void noinline
2852infy_del (EV_P_ ev_stat *w) 2980infy_del (EV_P_ ev_stat *w)
2853{ 2981{
2856 2984
2857 if (wd < 0) 2985 if (wd < 0)
2858 return; 2986 return;
2859 2987
2860 w->wd = -2; 2988 w->wd = -2;
2861 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2989 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2862 wlist_del (&fs_hash [slot].head, (WL)w); 2990 wlist_del (&fs_hash [slot].head, (WL)w);
2863 2991
2864 /* remove this watcher, if others are watching it, they will rearm */ 2992 /* remove this watcher, if others are watching it, they will rearm */
2865 inotify_rm_watch (fs_fd, wd); 2993 inotify_rm_watch (fs_fd, wd);
2866} 2994}
2868static void noinline 2996static void noinline
2869infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2997infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2870{ 2998{
2871 if (slot < 0) 2999 if (slot < 0)
2872 /* overflow, need to check for all hash slots */ 3000 /* overflow, need to check for all hash slots */
2873 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3001 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2874 infy_wd (EV_A_ slot, wd, ev); 3002 infy_wd (EV_A_ slot, wd, ev);
2875 else 3003 else
2876 { 3004 {
2877 WL w_; 3005 WL w_;
2878 3006
2879 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3007 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2880 { 3008 {
2881 ev_stat *w = (ev_stat *)w_; 3009 ev_stat *w = (ev_stat *)w_;
2882 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 */
2883 3011
2884 if (w->wd == wd || wd == -1) 3012 if (w->wd == wd || wd == -1)
2885 { 3013 {
2886 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3014 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2887 { 3015 {
2888 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);
2889 w->wd = -1; 3017 w->wd = -1;
2890 infy_add (EV_A_ w); /* re-add, no matter what */ 3018 infy_add (EV_A_ w); /* re-add, no matter what */
2891 } 3019 }
2892 3020
2893 stat_timer_cb (EV_A_ &w->timer, 0); 3021 stat_timer_cb (EV_A_ &w->timer, 0);
2898 3026
2899static void 3027static void
2900infy_cb (EV_P_ ev_io *w, int revents) 3028infy_cb (EV_P_ ev_io *w, int revents)
2901{ 3029{
2902 char buf [EV_INOTIFY_BUFSIZE]; 3030 char buf [EV_INOTIFY_BUFSIZE];
2903 struct inotify_event *ev = (struct inotify_event *)buf;
2904 int ofs; 3031 int ofs;
2905 int len = read (fs_fd, buf, sizeof (buf)); 3032 int len = read (fs_fd, buf, sizeof (buf));
2906 3033
2907 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);
2908 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;
2909} 3072}
2910 3073
2911inline_size void 3074inline_size void
2912check_2625 (EV_P) 3075ev_check_2625 (EV_P)
2913{ 3076{
2914 /* kernels < 2.6.25 are borked 3077 /* kernels < 2.6.25 are borked
2915 * 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
2916 */ 3079 */
2917 struct utsname buf; 3080 if (ev_linux_version () < 0x020619)
2918 int major, minor, micro;
2919
2920 if (uname (&buf))
2921 return; 3081 return;
2922 3082
2923 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2924 return;
2925
2926 if (major < 2
2927 || (major == 2 && minor < 6)
2928 || (major == 2 && minor == 6 && micro < 25))
2929 return;
2930
2931 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 ();
2932} 3095}
2933 3096
2934inline_size void 3097inline_size void
2935infy_init (EV_P) 3098infy_init (EV_P)
2936{ 3099{
2937 if (fs_fd != -2) 3100 if (fs_fd != -2)
2938 return; 3101 return;
2939 3102
2940 fs_fd = -1; 3103 fs_fd = -1;
2941 3104
2942 check_2625 (EV_A); 3105 ev_check_2625 (EV_A);
2943 3106
2944 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
2945 3108
2946 if (fs_fd >= 0) 3109 if (fs_fd >= 0)
2947 { 3110 {
3111 fd_intern (fs_fd);
2948 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3112 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2949 ev_set_priority (&fs_w, EV_MAXPRI); 3113 ev_set_priority (&fs_w, EV_MAXPRI);
2950 ev_io_start (EV_A_ &fs_w); 3114 ev_io_start (EV_A_ &fs_w);
3115 ev_unref (EV_A);
2951 } 3116 }
2952} 3117}
2953 3118
2954inline_size void 3119inline_size void
2955infy_fork (EV_P) 3120infy_fork (EV_P)
2957 int slot; 3122 int slot;
2958 3123
2959 if (fs_fd < 0) 3124 if (fs_fd < 0)
2960 return; 3125 return;
2961 3126
3127 ev_ref (EV_A);
3128 ev_io_stop (EV_A_ &fs_w);
2962 close (fs_fd); 3129 close (fs_fd);
2963 fs_fd = inotify_init (); 3130 fs_fd = infy_newfd ();
2964 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
2965 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3140 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2966 { 3141 {
2967 WL w_ = fs_hash [slot].head; 3142 WL w_ = fs_hash [slot].head;
2968 fs_hash [slot].head = 0; 3143 fs_hash [slot].head = 0;
2969 3144
2970 while (w_) 3145 while (w_)
2975 w->wd = -1; 3150 w->wd = -1;
2976 3151
2977 if (fs_fd >= 0) 3152 if (fs_fd >= 0)
2978 infy_add (EV_A_ w); /* re-add, no matter what */ 3153 infy_add (EV_A_ w); /* re-add, no matter what */
2979 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);
2980 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 }
2981 } 3161 }
2982 } 3162 }
2983} 3163}
2984 3164
2985#endif 3165#endif
3002static void noinline 3182static void noinline
3003stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3183stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3004{ 3184{
3005 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3185 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3006 3186
3007 /* we copy this here each the time so that */ 3187 ev_statdata prev = w->attr;
3008 /* prev has the old value when the callback gets invoked */
3009 w->prev = w->attr;
3010 ev_stat_stat (EV_A_ w); 3188 ev_stat_stat (EV_A_ w);
3011 3189
3012 /* 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 */
3013 if ( 3191 if (
3014 w->prev.st_dev != w->attr.st_dev 3192 prev.st_dev != w->attr.st_dev
3015 || w->prev.st_ino != w->attr.st_ino 3193 || prev.st_ino != w->attr.st_ino
3016 || w->prev.st_mode != w->attr.st_mode 3194 || prev.st_mode != w->attr.st_mode
3017 || w->prev.st_nlink != w->attr.st_nlink 3195 || prev.st_nlink != w->attr.st_nlink
3018 || w->prev.st_uid != w->attr.st_uid 3196 || prev.st_uid != w->attr.st_uid
3019 || w->prev.st_gid != w->attr.st_gid 3197 || prev.st_gid != w->attr.st_gid
3020 || w->prev.st_rdev != w->attr.st_rdev 3198 || prev.st_rdev != w->attr.st_rdev
3021 || w->prev.st_size != w->attr.st_size 3199 || prev.st_size != w->attr.st_size
3022 || w->prev.st_atime != w->attr.st_atime 3200 || prev.st_atime != w->attr.st_atime
3023 || w->prev.st_mtime != w->attr.st_mtime 3201 || prev.st_mtime != w->attr.st_mtime
3024 || w->prev.st_ctime != w->attr.st_ctime 3202 || prev.st_ctime != w->attr.st_ctime
3025 ) { 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
3026 #if EV_USE_INOTIFY 3209 #if EV_USE_INOTIFY
3027 if (fs_fd >= 0) 3210 if (fs_fd >= 0)
3028 { 3211 {
3029 infy_del (EV_A_ w); 3212 infy_del (EV_A_ w);
3030 infy_add (EV_A_ w); 3213 infy_add (EV_A_ w);
3055 3238
3056 if (fs_fd >= 0) 3239 if (fs_fd >= 0)
3057 infy_add (EV_A_ w); 3240 infy_add (EV_A_ w);
3058 else 3241 else
3059#endif 3242#endif
3243 {
3060 ev_timer_again (EV_A_ &w->timer); 3244 ev_timer_again (EV_A_ &w->timer);
3245 ev_unref (EV_A);
3246 }
3061 3247
3062 ev_start (EV_A_ (W)w, 1); 3248 ev_start (EV_A_ (W)w, 1);
3063 3249
3064 EV_FREQUENT_CHECK; 3250 EV_FREQUENT_CHECK;
3065} 3251}
3074 EV_FREQUENT_CHECK; 3260 EV_FREQUENT_CHECK;
3075 3261
3076#if EV_USE_INOTIFY 3262#if EV_USE_INOTIFY
3077 infy_del (EV_A_ w); 3263 infy_del (EV_A_ w);
3078#endif 3264#endif
3265
3266 if (ev_is_active (&w->timer))
3267 {
3268 ev_ref (EV_A);
3079 ev_timer_stop (EV_A_ &w->timer); 3269 ev_timer_stop (EV_A_ &w->timer);
3270 }
3080 3271
3081 ev_stop (EV_A_ (W)w); 3272 ev_stop (EV_A_ (W)w);
3082 3273
3083 EV_FREQUENT_CHECK; 3274 EV_FREQUENT_CHECK;
3084} 3275}
3129 3320
3130 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
3131} 3322}
3132#endif 3323#endif
3133 3324
3325#if EV_PREPARE_ENABLE
3134void 3326void
3135ev_prepare_start (EV_P_ ev_prepare *w) 3327ev_prepare_start (EV_P_ ev_prepare *w)
3136{ 3328{
3137 if (expect_false (ev_is_active (w))) 3329 if (expect_false (ev_is_active (w)))
3138 return; 3330 return;
3164 3356
3165 ev_stop (EV_A_ (W)w); 3357 ev_stop (EV_A_ (W)w);
3166 3358
3167 EV_FREQUENT_CHECK; 3359 EV_FREQUENT_CHECK;
3168} 3360}
3361#endif
3169 3362
3363#if EV_CHECK_ENABLE
3170void 3364void
3171ev_check_start (EV_P_ ev_check *w) 3365ev_check_start (EV_P_ ev_check *w)
3172{ 3366{
3173 if (expect_false (ev_is_active (w))) 3367 if (expect_false (ev_is_active (w)))
3174 return; 3368 return;
3200 3394
3201 ev_stop (EV_A_ (W)w); 3395 ev_stop (EV_A_ (W)w);
3202 3396
3203 EV_FREQUENT_CHECK; 3397 EV_FREQUENT_CHECK;
3204} 3398}
3399#endif
3205 3400
3206#if EV_EMBED_ENABLE 3401#if EV_EMBED_ENABLE
3207void noinline 3402void noinline
3208ev_embed_sweep (EV_P_ ev_embed *w) 3403ev_embed_sweep (EV_P_ ev_embed *w)
3209{ 3404{
3225embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3420embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3226{ 3421{
3227 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3422 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3228 3423
3229 { 3424 {
3230 struct ev_loop *loop = w->other; 3425 EV_P = w->other;
3231 3426
3232 while (fdchangecnt) 3427 while (fdchangecnt)
3233 { 3428 {
3234 fd_reify (EV_A); 3429 fd_reify (EV_A);
3235 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3430 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3243 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3438 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3244 3439
3245 ev_embed_stop (EV_A_ w); 3440 ev_embed_stop (EV_A_ w);
3246 3441
3247 { 3442 {
3248 struct ev_loop *loop = w->other; 3443 EV_P = w->other;
3249 3444
3250 ev_loop_fork (EV_A); 3445 ev_loop_fork (EV_A);
3251 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3446 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3252 } 3447 }
3253 3448
3267{ 3462{
3268 if (expect_false (ev_is_active (w))) 3463 if (expect_false (ev_is_active (w)))
3269 return; 3464 return;
3270 3465
3271 { 3466 {
3272 struct ev_loop *loop = w->other; 3467 EV_P = w->other;
3273 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3468 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3274 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3469 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3275 } 3470 }
3276 3471
3277 EV_FREQUENT_CHECK; 3472 EV_FREQUENT_CHECK;
3304 3499
3305 ev_io_stop (EV_A_ &w->io); 3500 ev_io_stop (EV_A_ &w->io);
3306 ev_prepare_stop (EV_A_ &w->prepare); 3501 ev_prepare_stop (EV_A_ &w->prepare);
3307 ev_fork_stop (EV_A_ &w->fork); 3502 ev_fork_stop (EV_A_ &w->fork);
3308 3503
3504 ev_stop (EV_A_ (W)w);
3505
3309 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3310} 3507}
3311#endif 3508#endif
3312 3509
3313#if EV_FORK_ENABLE 3510#if EV_FORK_ENABLE
3389 3586
3390void 3587void
3391ev_async_send (EV_P_ ev_async *w) 3588ev_async_send (EV_P_ ev_async *w)
3392{ 3589{
3393 w->sent = 1; 3590 w->sent = 1;
3394 evpipe_write (EV_A_ &gotasync); 3591 evpipe_write (EV_A_ &async_pending);
3395} 3592}
3396#endif 3593#endif
3397 3594
3398/*****************************************************************************/ 3595/*****************************************************************************/
3399 3596
3536 if (types & EV_ASYNC) 3733 if (types & EV_ASYNC)
3537 for (i = asynccnt; i--; ) 3734 for (i = asynccnt; i--; )
3538 cb (EV_A_ EV_ASYNC, asyncs [i]); 3735 cb (EV_A_ EV_ASYNC, asyncs [i]);
3539#endif 3736#endif
3540 3737
3738#if EV_PREPARE_ENABLE
3541 if (types & EV_PREPARE) 3739 if (types & EV_PREPARE)
3542 for (i = preparecnt; i--; ) 3740 for (i = preparecnt; i--; )
3543#if EV_EMBED_ENABLE 3741# if EV_EMBED_ENABLE
3544 if (ev_cb (prepares [i]) != embed_prepare_cb) 3742 if (ev_cb (prepares [i]) != embed_prepare_cb)
3545#endif 3743# endif
3546 cb (EV_A_ EV_PREPARE, prepares [i]); 3744 cb (EV_A_ EV_PREPARE, prepares [i]);
3745#endif
3547 3746
3747#if EV_CHECK_ENABLE
3548 if (types & EV_CHECK) 3748 if (types & EV_CHECK)
3549 for (i = checkcnt; i--; ) 3749 for (i = checkcnt; i--; )
3550 cb (EV_A_ EV_CHECK, checks [i]); 3750 cb (EV_A_ EV_CHECK, checks [i]);
3751#endif
3551 3752
3753#if EV_SIGNAL_ENABLE
3552 if (types & EV_SIGNAL) 3754 if (types & EV_SIGNAL)
3553 for (i = 0; i < signalmax; ++i) 3755 for (i = 0; i < EV_NSIG - 1; ++i)
3554 for (wl = signals [i].head; wl; ) 3756 for (wl = signals [i].head; wl; )
3555 { 3757 {
3556 wn = wl->next; 3758 wn = wl->next;
3557 cb (EV_A_ EV_SIGNAL, wl); 3759 cb (EV_A_ EV_SIGNAL, wl);
3558 wl = wn; 3760 wl = wn;
3559 } 3761 }
3762#endif
3560 3763
3764#if EV_CHILD_ENABLE
3561 if (types & EV_CHILD) 3765 if (types & EV_CHILD)
3562 for (i = EV_PID_HASHSIZE; i--; ) 3766 for (i = (EV_PID_HASHSIZE); i--; )
3563 for (wl = childs [i]; wl; ) 3767 for (wl = childs [i]; wl; )
3564 { 3768 {
3565 wn = wl->next; 3769 wn = wl->next;
3566 cb (EV_A_ EV_CHILD, wl); 3770 cb (EV_A_ EV_CHILD, wl);
3567 wl = wn; 3771 wl = wn;
3568 } 3772 }
3773#endif
3569/* EV_STAT 0x00001000 /* stat data changed */ 3774/* EV_STAT 0x00001000 /* stat data changed */
3570/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3775/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3571} 3776}
3572#endif 3777#endif
3573 3778

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines