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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.342 by root, Mon Mar 29 12:40:57 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 */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 195#if defined (EV_NSIG)
194/* use what's provided */ 196/* use what's provided */
195#elif defined (NSIG) 197#elif defined (NSIG)
196# define EV_NSIG (NSIG) 198# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 199#elif defined(_NSIG)
205#elif defined (MAXSIG) 207#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 215#else
214# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
215/* 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! :) */
216# define EV_NSIG 65 219# define EV_NSIG 65
217#endif 220#endif
218 221
219#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 225# else
223# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
224# endif 227# endif
225#endif 228#endif
226 229
227#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 233# else
231# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
232# endif 235# endif
233#endif 236#endif
234 237
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 240#endif
238 241
239#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 245# else
243# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
244# endif 247# endif
245#endif 248#endif
246 249
247#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 252#endif
250 253
251#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
252# ifdef _WIN32 255# ifdef _WIN32
253# define EV_USE_POLL 0 256# define EV_USE_POLL 0
254# else 257# else
255# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 259# endif
257#endif 260#endif
258 261
259#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 265# else
263# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
264# endif 267# endif
265#endif 268#endif
266 269
272# define EV_USE_PORT 0 275# define EV_USE_PORT 0
273#endif 276#endif
274 277
275#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 281# else
279# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
280# endif 283# endif
281#endif 284#endif
282 285
283#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 288#endif
290 289
291#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 292#endif
298 293
299#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 297# else
303# define EV_USE_EVENTFD 0 298# define EV_USE_EVENTFD 0
304# endif 299# endif
305#endif 300#endif
306 301
307#ifndef EV_USE_SIGNALFD 302#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 304# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 305# else
311# define EV_USE_SIGNALFD 0 306# define EV_USE_SIGNALFD 0
312# endif 307# endif
313#endif 308#endif
314 309
317# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
319#endif 314#endif
320 315
321#ifndef EV_VERIFY 316#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 318#endif
324 319
325#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 322#endif
328 323
329#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 326#endif
332 327
333/* 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, */
334/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
344# endif 339# endif
345#endif 340#endif
346 341
347/* 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 */
348 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
349#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
352#endif 353#endif
353 354
387# include <stdint.h> 388# include <stdint.h>
388# ifndef EFD_NONBLOCK 389# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 390# define EFD_NONBLOCK O_NONBLOCK
390# endif 391# endif
391# ifndef EFD_CLOEXEC 392# ifndef EFD_CLOEXEC
393# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 394# define EFD_CLOEXEC O_CLOEXEC
395# else
396# define EFD_CLOEXEC 02000000
397# endif
393# endif 398# endif
394# ifdef __cplusplus 399# ifdef __cplusplus
395extern "C" { 400extern "C" {
396# endif 401# endif
397int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
398# ifdef __cplusplus 403# ifdef __cplusplus
399} 404}
400# endif 405# endif
401#endif 406#endif
402 407
403#if EV_USE_SIGNALFD 408#if EV_USE_SIGNALFD
404# 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
405#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
406 436
407/**/ 437/**/
408 438
409#if EV_VERIFY >= 3 439#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 440# define EV_FREQUENT_CHECK ev_verify (EV_A)
411#else 441#else
412# define EV_FREQUENT_CHECK do { } while (0) 442# define EV_FREQUENT_CHECK do { } while (0)
413#endif 443#endif
414 444
415/* 445/*
422 */ 452 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424 454
425#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) */
426#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) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
428 457
429#if __GNUC__ >= 4 458#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 459# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 460# define noinline __attribute__ ((noinline))
432#else 461#else
439 468
440#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
441#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
442#define inline_size static inline 471#define inline_size static inline
443 472
444#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
445# define inline_speed static noinline 476# define inline_speed static noinline
446#else
447# define inline_speed static inline
448#endif 477#endif
449 478
450#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
451 480
452#if EV_MINPRI == EV_MAXPRI 481#if EV_MINPRI == EV_MAXPRI
473 502
474#if EV_USE_MONOTONIC 503#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476#endif 505#endif
477 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
478#ifdef _WIN32 517#ifdef _WIN32
479# include "ev_win32.c" 518# include "ev_win32.c"
480#endif 519#endif
481 520
482/*****************************************************************************/ 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
483 530
484static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
485 532
486void 533void
487ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
497 544
498 if (syserr_cb) 545 if (syserr_cb)
499 syserr_cb (msg); 546 syserr_cb (msg);
500 else 547 else
501 { 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
502 perror (msg); 557 perror (msg);
558#endif
503 abort (); 559 abort ();
504 } 560 }
505} 561}
506 562
507static void * 563static void *
508ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
509{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
510 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
511 * 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
512 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
513 */ 572 */
514 573
515 if (size) 574 if (size)
516 return realloc (ptr, size); 575 return realloc (ptr, size);
517 576
518 free (ptr); 577 free (ptr);
519 return 0; 578 return 0;
579#endif
520} 580}
521 581
522static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
523 583
524void 584void
532{ 592{
533 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
534 594
535 if (!ptr && size) 595 if (!ptr && size)
536 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
537 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
538 abort (); 602 abort ();
539 } 603 }
540 604
541 return ptr; 605 return ptr;
542} 606}
624 688
625 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
626 690
627#endif 691#endif
628 692
629#if EV_MINIMAL < 2 693#if EV_FEATURE_API
630# 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)
631# 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)
632# define EV_INVOKE_PENDING invoke_cb (EV_A) 696# define EV_INVOKE_PENDING invoke_cb (EV_A)
633#else 697#else
634# define EV_RELEASE_CB (void)0 698# define EV_RELEASE_CB (void)0
819} 883}
820 884
821/*****************************************************************************/ 885/*****************************************************************************/
822 886
823inline_speed void 887inline_speed void
824fd_event_nc (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
825{ 889{
826 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
827 ev_io *w; 891 ev_io *w;
828 892
829 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)
841fd_event (EV_P_ int fd, int revents) 905fd_event (EV_P_ int fd, int revents)
842{ 906{
843 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
844 908
845 if (expect_true (!anfd->reify)) 909 if (expect_true (!anfd->reify))
846 fd_event_nc (EV_A_ fd, revents); 910 fd_event_nocheck (EV_A_ fd, revents);
847} 911}
848 912
849void 913void
850ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
851{ 915{
852 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
853 fd_event_nc (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
854} 918}
855 919
856/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
857/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
858inline_size void 922inline_size void
873 937
874#if EV_SELECT_IS_WINSOCKET 938#if EV_SELECT_IS_WINSOCKET
875 if (events) 939 if (events)
876 { 940 {
877 unsigned long arg; 941 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
880 #else
881 anfd->handle = _get_osfhandle (fd);
882 #endif
883 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));
884 } 944 }
885#endif 945#endif
886 946
887 { 947 {
925 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
926 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);
927 } 987 }
928} 988}
929 989
930/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
931inline_size int 991inline_size int
932fd_valid (int fd) 992fd_valid (int fd)
933{ 993{
934#ifdef _WIN32 994#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 996#else
937 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
938#endif 998#endif
939} 999}
940 1000
958 1018
959 for (fd = anfdmax; fd--; ) 1019 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1020 if (anfds [fd].events)
961 { 1021 {
962 fd_kill (EV_A_ fd); 1022 fd_kill (EV_A_ fd);
963 return; 1023 break;
964 } 1024 }
965} 1025}
966 1026
967/* 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 */
968static void noinline 1028static void noinline
975 { 1035 {
976 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
977 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
979 } 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
980} 1054}
981 1055
982/*****************************************************************************/ 1056/*****************************************************************************/
983 1057
984/* 1058/*
1058 1132
1059 for (;;) 1133 for (;;)
1060 { 1134 {
1061 int c = k << 1; 1135 int c = k << 1;
1062 1136
1063 if (c > N + HEAP0 - 1) 1137 if (c >= N + HEAP0)
1064 break; 1138 break;
1065 1139
1066 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])
1067 ? 1 : 0; 1141 ? 1 : 0;
1068 1142
1104 1178
1105/* move an element suitably so it is in a correct place */ 1179/* move an element suitably so it is in a correct place */
1106inline_size void 1180inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1181adjustheap (ANHE *heap, int N, int k)
1108{ 1182{
1109 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)]))
1110 upheap (heap, k); 1184 upheap (heap, k);
1111 else 1185 else
1112 downheap (heap, N, k); 1186 downheap (heap, N, k);
1113} 1187}
1114 1188
1127/*****************************************************************************/ 1201/*****************************************************************************/
1128 1202
1129/* associate signal watchers to a signal signal */ 1203/* associate signal watchers to a signal signal */
1130typedef struct 1204typedef struct
1131{ 1205{
1206 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1207#if EV_MULTIPLICITY
1133 EV_P; 1208 EV_P;
1134#endif 1209#endif
1135 WL head; 1210 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1211} ANSIG;
1138 1212
1139static ANSIG signals [EV_NSIG - 1]; 1213static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1214
1142/*****************************************************************************/ 1215/*****************************************************************************/
1143 1216
1144/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1145/* this is not fork-safe */
1146inline_speed void
1147fd_intern (int fd)
1148{
1149#ifdef _WIN32
1150 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1152#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif
1156}
1157 1218
1158static void noinline 1219static void noinline
1159evpipe_init (EV_P) 1220evpipe_init (EV_P)
1160{ 1221{
1161 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1162 { 1223 {
1163#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL) 1226 if (evfd < 0 && errno == EINVAL)
1166 evfd = eventfd (0, 0); 1227 evfd = eventfd (0, 0);
1167 1228
1168 if (evfd >= 0) 1229 if (evfd >= 0)
1170 evpipe [0] = -1; 1231 evpipe [0] = -1;
1171 fd_intern (evfd); /* doing it twice doesn't hurt */ 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1172 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1173 } 1234 }
1174 else 1235 else
1175#endif 1236# endif
1176 { 1237 {
1177 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1178 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1179 1240
1180 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
1191evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1192{ 1253{
1193 if (!*flag) 1254 if (!*flag)
1194 { 1255 {
1195 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;
1196 1258
1197 *flag = 1; 1259 *flag = 1;
1198 1260
1199#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1200 if (evfd >= 0) 1262 if (evfd >= 0)
1202 uint64_t counter = 1; 1264 uint64_t counter = 1;
1203 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1204 } 1266 }
1205 else 1267 else
1206#endif 1268#endif
1207 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1208 1270
1209 errno = old_errno; 1271 errno = old_errno;
1210 } 1272 }
1211} 1273}
1212 1274
1213/* called whenever the libev signal pipe */ 1275/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1276/* got some events (signal, async) */
1215static void 1277static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1279{
1280 int i;
1281
1218#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1283 if (evfd >= 0)
1220 { 1284 {
1221 uint64_t counter; 1285 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
1226 { 1290 {
1227 char dummy; 1291 char dummy;
1228 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1229 } 1293 }
1230 1294
1231 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1232 { 1296 {
1233 int signum; 1297 sig_pending = 0;
1234 gotsig = 0;
1235 1298
1236 for (signum = EV_NSIG - 1; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1302 }
1240 1303
1241#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1242 if (gotasync) 1305 if (async_pending)
1243 { 1306 {
1244 int i; 1307 async_pending = 0;
1245 gotasync = 0;
1246 1308
1247 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1249 { 1311 {
1250 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
1261{ 1323{
1262#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop; 1325 EV_P = signals [signum - 1].loop;
1264#endif 1326#endif
1265 1327
1266#if _WIN32 1328#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1268#endif 1330#endif
1269 1331
1270 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1271 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1272} 1334}
1273 1335
1274void noinline 1336void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1276{ 1338{
1277 WL w; 1339 WL w;
1278 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1279#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1280 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 */
1281#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1349
1283 if (signum <= 0 || signum > EV_NSIG) 1350 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1351 return;
1352#endif
1285 1353
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1289 1355
1290 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1358}
1293 1359
1309 break; 1375 break;
1310 } 1376 }
1311} 1377}
1312#endif 1378#endif
1313 1379
1380#endif
1381
1314/*****************************************************************************/ 1382/*****************************************************************************/
1315 1383
1384#if EV_CHILD_ENABLE
1316static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1317
1318#ifndef _WIN32
1319 1386
1320static ev_signal childev; 1387static ev_signal childev;
1321 1388
1322#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1323# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
1328child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1329{ 1396{
1330 ev_child *w; 1397 ev_child *w;
1331 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1332 1399
1333 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)
1334 { 1401 {
1335 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1336 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1337 { 1404 {
1338 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 */
1363 /* 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 */
1364 /* 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 */
1365 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1366 1433
1367 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1368 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1369 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 */
1370} 1437}
1371 1438
1372#endif 1439#endif
1373 1440
1440#ifdef __APPLE__ 1507#ifdef __APPLE__
1441 /* only select works correctly on that "unix-certified" platform */ 1508 /* only select works correctly on that "unix-certified" platform */
1442 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1509 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1443 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1510 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1444#endif 1511#endif
1512#ifdef __FreeBSD__
1513 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1514#endif
1445 1515
1446 return flags; 1516 return flags;
1447} 1517}
1448 1518
1449unsigned int 1519unsigned int
1462ev_backend (EV_P) 1532ev_backend (EV_P)
1463{ 1533{
1464 return backend; 1534 return backend;
1465} 1535}
1466 1536
1467#if EV_MINIMAL < 2 1537#if EV_FEATURE_API
1468unsigned int 1538unsigned int
1469ev_loop_count (EV_P) 1539ev_iteration (EV_P)
1470{ 1540{
1471 return loop_count; 1541 return loop_count;
1472} 1542}
1473 1543
1474unsigned int 1544unsigned int
1475ev_loop_depth (EV_P) 1545ev_depth (EV_P)
1476{ 1546{
1477 return loop_depth; 1547 return loop_depth;
1478} 1548}
1479 1549
1480void 1550void
1552 1622
1553 ev_rt_now = ev_time (); 1623 ev_rt_now = ev_time ();
1554 mn_now = get_clock (); 1624 mn_now = get_clock ();
1555 now_floor = mn_now; 1625 now_floor = mn_now;
1556 rtmn_diff = ev_rt_now - mn_now; 1626 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2 1627#if EV_FEATURE_API
1558 invoke_cb = ev_invoke_pending; 1628 invoke_cb = ev_invoke_pending;
1559#endif 1629#endif
1560 1630
1561 io_blocktime = 0.; 1631 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1632 timeout_blocktime = 0.;
1563 backend = 0; 1633 backend = 0;
1564 backend_fd = -1; 1634 backend_fd = -1;
1565 gotasync = 0; 1635 sig_pending = 0;
1636#if EV_ASYNC_ENABLE
1637 async_pending = 0;
1638#endif
1566#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1641#endif
1569#if EV_USE_SIGNALFD 1642#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1644#endif
1572 1645
1573 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1574 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1575 1648
1589 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1662 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1590#endif 1663#endif
1591 1664
1592 ev_prepare_init (&pending_w, pendingcb); 1665 ev_prepare_init (&pending_w, pendingcb);
1593 1666
1667#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1594 ev_init (&pipe_w, pipecb); 1668 ev_init (&pipe_w, pipecb);
1595 ev_set_priority (&pipe_w, EV_MAXPRI); 1669 ev_set_priority (&pipe_w, EV_MAXPRI);
1670#endif
1596 } 1671 }
1597} 1672}
1598 1673
1599/* free up a loop structure */ 1674/* free up a loop structure */
1600static void noinline 1675static void noinline
1612 close (evfd); 1687 close (evfd);
1613#endif 1688#endif
1614 1689
1615 if (evpipe [0] >= 0) 1690 if (evpipe [0] >= 0)
1616 { 1691 {
1617 close (evpipe [0]); 1692 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1693 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1694 }
1620 } 1695 }
1621 1696
1622#if EV_USE_SIGNALFD 1697#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1698 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1699 close (sigfd);
1629 }
1630#endif 1700#endif
1631 1701
1632#if EV_USE_INOTIFY 1702#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1703 if (fs_fd >= 0)
1634 close (fs_fd); 1704 close (fs_fd);
1704 1774
1705 if (ev_is_active (&pipe_w)) 1775 if (ev_is_active (&pipe_w))
1706 { 1776 {
1707 /* this "locks" the handlers against writing to the pipe */ 1777 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1778 /* while we modify the fd vars */
1709 gotsig = 1; 1779 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1780#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1781 async_pending = 1;
1712#endif 1782#endif
1713 1783
1714 ev_ref (EV_A); 1784 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1785 ev_io_stop (EV_A_ &pipe_w);
1716 1786
1719 close (evfd); 1789 close (evfd);
1720#endif 1790#endif
1721 1791
1722 if (evpipe [0] >= 0) 1792 if (evpipe [0] >= 0)
1723 { 1793 {
1724 close (evpipe [0]); 1794 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1795 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1796 }
1727 1797
1798#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1728 evpipe_init (EV_A); 1799 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1800 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1801 pipecb (EV_A_ &pipe_w, EV_READ);
1802#endif
1731 } 1803 }
1732 1804
1733 postfork = 0; 1805 postfork = 0;
1734} 1806}
1735 1807
1797 verify_watcher (EV_A_ ws [cnt]); 1869 verify_watcher (EV_A_ ws [cnt]);
1798 } 1870 }
1799} 1871}
1800#endif 1872#endif
1801 1873
1802#if EV_MINIMAL < 2 1874#if EV_FEATURE_API
1803void 1875void
1804ev_loop_verify (EV_P) 1876ev_verify (EV_P)
1805{ 1877{
1806#if EV_VERIFY 1878#if EV_VERIFY
1807 int i; 1879 int i;
1808 WL w; 1880 WL w;
1809 1881
1848#if EV_ASYNC_ENABLE 1920#if EV_ASYNC_ENABLE
1849 assert (asyncmax >= asynccnt); 1921 assert (asyncmax >= asynccnt);
1850 array_verify (EV_A_ (W *)asyncs, asynccnt); 1922 array_verify (EV_A_ (W *)asyncs, asynccnt);
1851#endif 1923#endif
1852 1924
1925#if EV_PREPARE_ENABLE
1853 assert (preparemax >= preparecnt); 1926 assert (preparemax >= preparecnt);
1854 array_verify (EV_A_ (W *)prepares, preparecnt); 1927 array_verify (EV_A_ (W *)prepares, preparecnt);
1928#endif
1855 1929
1930#if EV_CHECK_ENABLE
1856 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1933#endif
1858 1934
1859# if 0 1935# if 0
1936#if EV_CHILD_ENABLE
1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1937 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 1938 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1939#endif
1862# endif 1940# endif
1863#endif 1941#endif
1864} 1942}
1865#endif 1943#endif
1866 1944
1882 1960
1883 loop_init (EV_A_ flags); 1961 loop_init (EV_A_ flags);
1884 1962
1885 if (ev_backend (EV_A)) 1963 if (ev_backend (EV_A))
1886 { 1964 {
1887#ifndef _WIN32 1965#if EV_CHILD_ENABLE
1888 ev_signal_init (&childev, childcb, SIGCHLD); 1966 ev_signal_init (&childev, childcb, SIGCHLD);
1889 ev_set_priority (&childev, EV_MAXPRI); 1967 ev_set_priority (&childev, EV_MAXPRI);
1890 ev_signal_start (EV_A_ &childev); 1968 ev_signal_start (EV_A_ &childev);
1891 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1969 ev_unref (EV_A); /* child watcher should not keep loop alive */
1892#endif 1970#endif
1905 EV_P = ev_default_loop_ptr; 1983 EV_P = ev_default_loop_ptr;
1906#endif 1984#endif
1907 1985
1908 ev_default_loop_ptr = 0; 1986 ev_default_loop_ptr = 0;
1909 1987
1910#ifndef _WIN32 1988#if EV_CHILD_ENABLE
1911 ev_ref (EV_A); /* child watcher */ 1989 ev_ref (EV_A); /* child watcher */
1912 ev_signal_stop (EV_A_ &childev); 1990 ev_signal_stop (EV_A_ &childev);
1913#endif 1991#endif
1914 1992
1915 loop_destroy (EV_A); 1993 loop_destroy (EV_A);
2021 EV_FREQUENT_CHECK; 2099 EV_FREQUENT_CHECK;
2022 feed_reverse (EV_A_ (W)w); 2100 feed_reverse (EV_A_ (W)w);
2023 } 2101 }
2024 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2102 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2025 2103
2026 feed_reverse_done (EV_A_ EV_TIMEOUT); 2104 feed_reverse_done (EV_A_ EV_TIMER);
2027 } 2105 }
2028} 2106}
2029 2107
2030#if EV_PERIODIC_ENABLE 2108#if EV_PERIODIC_ENABLE
2031/* make periodics pending */ 2109/* make periodics pending */
2122 ANHE_at_cache (*he); 2200 ANHE_at_cache (*he);
2123 } 2201 }
2124} 2202}
2125 2203
2126/* fetch new monotonic and realtime times from the kernel */ 2204/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2205/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2206inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2207time_update (EV_P_ ev_tstamp max_block)
2130{ 2208{
2131#if EV_USE_MONOTONIC 2209#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2210 if (expect_true (have_monotonic))
2192} 2270}
2193 2271
2194void 2272void
2195ev_loop (EV_P_ int flags) 2273ev_loop (EV_P_ int flags)
2196{ 2274{
2197#if EV_MINIMAL < 2 2275#if EV_FEATURE_API
2198 ++loop_depth; 2276 ++loop_depth;
2199#endif 2277#endif
2200 2278
2201 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2279 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2202 2280
2205 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2283 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2206 2284
2207 do 2285 do
2208 { 2286 {
2209#if EV_VERIFY >= 2 2287#if EV_VERIFY >= 2
2210 ev_loop_verify (EV_A); 2288 ev_verify (EV_A);
2211#endif 2289#endif
2212 2290
2213#ifndef _WIN32 2291#ifndef _WIN32
2214 if (expect_false (curpid)) /* penalise the forking check even more */ 2292 if (expect_false (curpid)) /* penalise the forking check even more */
2215 if (expect_false (getpid () != curpid)) 2293 if (expect_false (getpid () != curpid))
2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2305 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2228 EV_INVOKE_PENDING; 2306 EV_INVOKE_PENDING;
2229 } 2307 }
2230#endif 2308#endif
2231 2309
2310#if EV_PREPARE_ENABLE
2232 /* queue prepare watchers (and execute them) */ 2311 /* queue prepare watchers (and execute them) */
2233 if (expect_false (preparecnt)) 2312 if (expect_false (preparecnt))
2234 { 2313 {
2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2314 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2236 EV_INVOKE_PENDING; 2315 EV_INVOKE_PENDING;
2237 } 2316 }
2317#endif
2238 2318
2239 if (expect_false (loop_done)) 2319 if (expect_false (loop_done))
2240 break; 2320 break;
2241 2321
2242 /* we might have forked, so reify kernel state if necessary */ 2322 /* we might have forked, so reify kernel state if necessary */
2293 waittime -= sleeptime; 2373 waittime -= sleeptime;
2294 } 2374 }
2295 } 2375 }
2296 } 2376 }
2297 2377
2298#if EV_MINIMAL < 2 2378#if EV_FEATURE_API
2299 ++loop_count; 2379 ++loop_count;
2300#endif 2380#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2381 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2302 backend_poll (EV_A_ waittime); 2382 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2383 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2315#if EV_IDLE_ENABLE 2395#if EV_IDLE_ENABLE
2316 /* queue idle watchers unless other events are pending */ 2396 /* queue idle watchers unless other events are pending */
2317 idle_reify (EV_A); 2397 idle_reify (EV_A);
2318#endif 2398#endif
2319 2399
2400#if EV_CHECK_ENABLE
2320 /* queue check watchers, to be executed first */ 2401 /* queue check watchers, to be executed first */
2321 if (expect_false (checkcnt)) 2402 if (expect_false (checkcnt))
2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2403 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2404#endif
2323 2405
2324 EV_INVOKE_PENDING; 2406 EV_INVOKE_PENDING;
2325 } 2407 }
2326 while (expect_true ( 2408 while (expect_true (
2327 activecnt 2409 activecnt
2330 )); 2412 ));
2331 2413
2332 if (loop_done == EVUNLOOP_ONE) 2414 if (loop_done == EVUNLOOP_ONE)
2333 loop_done = EVUNLOOP_CANCEL; 2415 loop_done = EVUNLOOP_CANCEL;
2334 2416
2335#if EV_MINIMAL < 2 2417#if EV_FEATURE_API
2336 --loop_depth; 2418 --loop_depth;
2337#endif 2419#endif
2338} 2420}
2339 2421
2340void 2422void
2393inline_size void 2475inline_size void
2394wlist_del (WL *head, WL elem) 2476wlist_del (WL *head, WL elem)
2395{ 2477{
2396 while (*head) 2478 while (*head)
2397 { 2479 {
2398 if (*head == elem) 2480 if (expect_true (*head == elem))
2399 { 2481 {
2400 *head = elem->next; 2482 *head = elem->next;
2401 return; 2483 break;
2402 } 2484 }
2403 2485
2404 head = &(*head)->next; 2486 head = &(*head)->next;
2405 } 2487 }
2406} 2488}
2466 2548
2467 if (expect_false (ev_is_active (w))) 2549 if (expect_false (ev_is_active (w)))
2468 return; 2550 return;
2469 2551
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2552 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2553 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2554
2473 EV_FREQUENT_CHECK; 2555 EV_FREQUENT_CHECK;
2474 2556
2475 ev_start (EV_A_ (W)w, 1); 2557 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2558 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2546 timers [active] = timers [timercnt + HEAP0]; 2628 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2629 adjustheap (timers, timercnt, active);
2548 } 2630 }
2549 } 2631 }
2550 2632
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2633 ev_at (w) -= mn_now;
2554 2634
2555 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2636
2637 EV_FREQUENT_CHECK;
2556} 2638}
2557 2639
2558void noinline 2640void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2641ev_timer_again (EV_P_ ev_timer *w)
2560{ 2642{
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2721 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2722 adjustheap (periodics, periodiccnt, active);
2641 } 2723 }
2642 } 2724 }
2643 2725
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2726 ev_stop (EV_A_ (W)w);
2727
2728 EV_FREQUENT_CHECK;
2647} 2729}
2648 2730
2649void noinline 2731void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2732ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2733{
2657 2739
2658#ifndef SA_RESTART 2740#ifndef SA_RESTART
2659# define SA_RESTART 0 2741# define SA_RESTART 0
2660#endif 2742#endif
2661 2743
2744#if EV_SIGNAL_ENABLE
2745
2662void noinline 2746void noinline
2663ev_signal_start (EV_P_ ev_signal *w) 2747ev_signal_start (EV_P_ ev_signal *w)
2664{ 2748{
2665 if (expect_false (ev_is_active (w))) 2749 if (expect_false (ev_is_active (w)))
2666 return; 2750 return;
2667 2751
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2752 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2753
2670#if EV_MULTIPLICITY 2754#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2755 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2756 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2757
2674 signals [w->signum - 1].loop = EV_A; 2758 signals [w->signum - 1].loop = EV_A;
2675#endif 2759#endif
2676 2760
2712 if (!((WL)w)->next) 2796 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2797# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2798 if (sigfd < 0) /*TODO*/
2715# endif 2799# endif
2716 { 2800 {
2717# if _WIN32 2801# ifdef _WIN32
2802 evpipe_init (EV_A);
2803
2718 signal (w->signum, ev_sighandler); 2804 signal (w->signum, ev_sighandler);
2719# else 2805# else
2720 struct sigaction sa; 2806 struct sigaction sa;
2721 2807
2722 evpipe_init (EV_A); 2808 evpipe_init (EV_A);
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2833 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2834 ev_stop (EV_A_ (W)w);
2749 2835
2750 if (!signals [w->signum - 1].head) 2836 if (!signals [w->signum - 1].head)
2751 { 2837 {
2752 #if EV_MULTIPLICITY 2838#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2839 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2840#endif
2755 #if EV_USE_SIGNALFD 2841#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2842 if (sigfd >= 0)
2757 { 2843 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2844 sigset_t ss;
2845
2846 sigemptyset (&ss);
2847 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2848 sigdelset (&sigfd_set, w->signum);
2849
2760 signalfd (sigfd, &sigfd_set, 0); 2850 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2851 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2852 }
2764 else 2853 else
2765 #endif 2854#endif
2766 signal (w->signum, SIG_DFL); 2855 signal (w->signum, SIG_DFL);
2767 } 2856 }
2768 2857
2769 EV_FREQUENT_CHECK; 2858 EV_FREQUENT_CHECK;
2770} 2859}
2860
2861#endif
2862
2863#if EV_CHILD_ENABLE
2771 2864
2772void 2865void
2773ev_child_start (EV_P_ ev_child *w) 2866ev_child_start (EV_P_ ev_child *w)
2774{ 2867{
2775#if EV_MULTIPLICITY 2868#if EV_MULTIPLICITY
2779 return; 2872 return;
2780 2873
2781 EV_FREQUENT_CHECK; 2874 EV_FREQUENT_CHECK;
2782 2875
2783 ev_start (EV_A_ (W)w, 1); 2876 ev_start (EV_A_ (W)w, 1);
2784 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2877 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2785 2878
2786 EV_FREQUENT_CHECK; 2879 EV_FREQUENT_CHECK;
2787} 2880}
2788 2881
2789void 2882void
2793 if (expect_false (!ev_is_active (w))) 2886 if (expect_false (!ev_is_active (w)))
2794 return; 2887 return;
2795 2888
2796 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2797 2890
2798 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2891 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2799 ev_stop (EV_A_ (W)w); 2892 ev_stop (EV_A_ (W)w);
2800 2893
2801 EV_FREQUENT_CHECK; 2894 EV_FREQUENT_CHECK;
2802} 2895}
2896
2897#endif
2803 2898
2804#if EV_STAT_ENABLE 2899#if EV_STAT_ENABLE
2805 2900
2806# ifdef _WIN32 2901# ifdef _WIN32
2807# undef lstat 2902# undef lstat
2813#define MIN_STAT_INTERVAL 0.1074891 2908#define MIN_STAT_INTERVAL 0.1074891
2814 2909
2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2910static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816 2911
2817#if EV_USE_INOTIFY 2912#if EV_USE_INOTIFY
2818# define EV_INOTIFY_BUFSIZE 8192 2913
2914/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2915# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819 2916
2820static void noinline 2917static void noinline
2821infy_add (EV_P_ ev_stat *w) 2918infy_add (EV_P_ ev_stat *w)
2822{ 2919{
2823 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); 2920 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);
2824 2921
2825 if (w->wd < 0) 2922 if (w->wd >= 0)
2923 {
2924 struct statfs sfs;
2925
2926 /* now local changes will be tracked by inotify, but remote changes won't */
2927 /* unless the filesystem is known to be local, we therefore still poll */
2928 /* also do poll on <2.6.25, but with normal frequency */
2929
2930 if (!fs_2625)
2931 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2932 else if (!statfs (w->path, &sfs)
2933 && (sfs.f_type == 0x1373 /* devfs */
2934 || sfs.f_type == 0xEF53 /* ext2/3 */
2935 || sfs.f_type == 0x3153464a /* jfs */
2936 || sfs.f_type == 0x52654973 /* reiser3 */
2937 || sfs.f_type == 0x01021994 /* tempfs */
2938 || sfs.f_type == 0x58465342 /* xfs */))
2939 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2940 else
2941 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826 { 2942 }
2943 else
2944 {
2945 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2946 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829 2947
2830 /* monitor some parent directory for speedup hints */ 2948 /* if path is not there, monitor some parent directory for speedup hints */
2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2949 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 2950 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2951 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 2952 {
2835 char path [4096]; 2953 char path [4096];
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2969 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 2970 }
2853 } 2971 }
2854 2972
2855 if (w->wd >= 0) 2973 if (w->wd >= 0)
2856 {
2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2974 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2858 2975
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 2976 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 2977 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer); 2978 ev_timer_again (EV_A_ &w->timer);
2875 } 2979 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 2980}
2877 2981
2878static void noinline 2982static void noinline
2879infy_del (EV_P_ ev_stat *w) 2983infy_del (EV_P_ ev_stat *w)
2880{ 2984{
2883 2987
2884 if (wd < 0) 2988 if (wd < 0)
2885 return; 2989 return;
2886 2990
2887 w->wd = -2; 2991 w->wd = -2;
2888 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2992 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2889 wlist_del (&fs_hash [slot].head, (WL)w); 2993 wlist_del (&fs_hash [slot].head, (WL)w);
2890 2994
2891 /* remove this watcher, if others are watching it, they will rearm */ 2995 /* remove this watcher, if others are watching it, they will rearm */
2892 inotify_rm_watch (fs_fd, wd); 2996 inotify_rm_watch (fs_fd, wd);
2893} 2997}
2895static void noinline 2999static void noinline
2896infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3000infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2897{ 3001{
2898 if (slot < 0) 3002 if (slot < 0)
2899 /* overflow, need to check for all hash slots */ 3003 /* overflow, need to check for all hash slots */
2900 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3004 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2901 infy_wd (EV_A_ slot, wd, ev); 3005 infy_wd (EV_A_ slot, wd, ev);
2902 else 3006 else
2903 { 3007 {
2904 WL w_; 3008 WL w_;
2905 3009
2906 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3010 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2907 { 3011 {
2908 ev_stat *w = (ev_stat *)w_; 3012 ev_stat *w = (ev_stat *)w_;
2909 w_ = w_->next; /* lets us remove this watcher and all before it */ 3013 w_ = w_->next; /* lets us remove this watcher and all before it */
2910 3014
2911 if (w->wd == wd || wd == -1) 3015 if (w->wd == wd || wd == -1)
2912 { 3016 {
2913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3017 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2914 { 3018 {
2915 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3019 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2916 w->wd = -1; 3020 w->wd = -1;
2917 infy_add (EV_A_ w); /* re-add, no matter what */ 3021 infy_add (EV_A_ w); /* re-add, no matter what */
2918 } 3022 }
2919 3023
2920 stat_timer_cb (EV_A_ &w->timer, 0); 3024 stat_timer_cb (EV_A_ &w->timer, 0);
2925 3029
2926static void 3030static void
2927infy_cb (EV_P_ ev_io *w, int revents) 3031infy_cb (EV_P_ ev_io *w, int revents)
2928{ 3032{
2929 char buf [EV_INOTIFY_BUFSIZE]; 3033 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 3034 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3035 int len = read (fs_fd, buf, sizeof (buf));
2933 3036
2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3037 for (ofs = 0; ofs < len; )
3038 {
3039 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2935 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3040 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3041 ofs += sizeof (struct inotify_event) + ev->len;
3042 }
3043}
3044
3045inline_size unsigned int
3046ev_linux_version (void)
3047{
3048 struct utsname buf;
3049 unsigned int v;
3050 int i;
3051 char *p = buf.release;
3052
3053 if (uname (&buf))
3054 return 0;
3055
3056 for (i = 3+1; --i; )
3057 {
3058 unsigned int c = 0;
3059
3060 for (;;)
3061 {
3062 if (*p >= '0' && *p <= '9')
3063 c = c * 10 + *p++ - '0';
3064 else
3065 {
3066 p += *p == '.';
3067 break;
3068 }
3069 }
3070
3071 v = (v << 8) | c;
3072 }
3073
3074 return v;
2936} 3075}
2937 3076
2938inline_size void 3077inline_size void
2939check_2625 (EV_P) 3078ev_check_2625 (EV_P)
2940{ 3079{
2941 /* kernels < 2.6.25 are borked 3080 /* kernels < 2.6.25 are borked
2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3081 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943 */ 3082 */
2944 struct utsname buf; 3083 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3084 return;
2949 3085
2950 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2951 return;
2952
2953 if (major < 2
2954 || (major == 2 && minor < 6)
2955 || (major == 2 && minor == 6 && micro < 25))
2956 return;
2957
2958 fs_2625 = 1; 3086 fs_2625 = 1;
3087}
3088
3089inline_size int
3090infy_newfd (void)
3091{
3092#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3093 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3094 if (fd >= 0)
3095 return fd;
3096#endif
3097 return inotify_init ();
2959} 3098}
2960 3099
2961inline_size void 3100inline_size void
2962infy_init (EV_P) 3101infy_init (EV_P)
2963{ 3102{
2964 if (fs_fd != -2) 3103 if (fs_fd != -2)
2965 return; 3104 return;
2966 3105
2967 fs_fd = -1; 3106 fs_fd = -1;
2968 3107
2969 check_2625 (EV_A); 3108 ev_check_2625 (EV_A);
2970 3109
2971 fs_fd = inotify_init (); 3110 fs_fd = infy_newfd ();
2972 3111
2973 if (fs_fd >= 0) 3112 if (fs_fd >= 0)
2974 { 3113 {
3114 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3115 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3116 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3117 ev_io_start (EV_A_ &fs_w);
3118 ev_unref (EV_A);
2978 } 3119 }
2979} 3120}
2980 3121
2981inline_size void 3122inline_size void
2982infy_fork (EV_P) 3123infy_fork (EV_P)
2984 int slot; 3125 int slot;
2985 3126
2986 if (fs_fd < 0) 3127 if (fs_fd < 0)
2987 return; 3128 return;
2988 3129
3130 ev_ref (EV_A);
3131 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3132 close (fs_fd);
2990 fs_fd = inotify_init (); 3133 fs_fd = infy_newfd ();
2991 3134
3135 if (fs_fd >= 0)
3136 {
3137 fd_intern (fs_fd);
3138 ev_io_set (&fs_w, fs_fd, EV_READ);
3139 ev_io_start (EV_A_ &fs_w);
3140 ev_unref (EV_A);
3141 }
3142
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3143 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2993 { 3144 {
2994 WL w_ = fs_hash [slot].head; 3145 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3146 fs_hash [slot].head = 0;
2996 3147
2997 while (w_) 3148 while (w_)
3002 w->wd = -1; 3153 w->wd = -1;
3003 3154
3004 if (fs_fd >= 0) 3155 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3156 infy_add (EV_A_ w); /* re-add, no matter what */
3006 else 3157 else
3158 {
3159 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3160 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007 ev_timer_again (EV_A_ &w->timer); 3161 ev_timer_again (EV_A_ &w->timer);
3162 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3163 }
3008 } 3164 }
3009 } 3165 }
3010} 3166}
3011 3167
3012#endif 3168#endif
3029static void noinline 3185static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3186stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3187{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3188 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3189
3034 /* we copy this here each the time so that */ 3190 ev_statdata prev = w->attr;
3035 /* prev has the old value when the callback gets invoked */
3036 w->prev = w->attr;
3037 ev_stat_stat (EV_A_ w); 3191 ev_stat_stat (EV_A_ w);
3038 3192
3039 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3193 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040 if ( 3194 if (
3041 w->prev.st_dev != w->attr.st_dev 3195 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3196 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3197 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3198 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3199 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3200 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3201 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3202 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3203 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3204 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3205 || prev.st_ctime != w->attr.st_ctime
3052 ) { 3206 ) {
3207 /* we only update w->prev on actual differences */
3208 /* in case we test more often than invoke the callback, */
3209 /* to ensure that prev is always different to attr */
3210 w->prev = prev;
3211
3053 #if EV_USE_INOTIFY 3212 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3213 if (fs_fd >= 0)
3055 { 3214 {
3056 infy_del (EV_A_ w); 3215 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3216 infy_add (EV_A_ w);
3082 3241
3083 if (fs_fd >= 0) 3242 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3243 infy_add (EV_A_ w);
3085 else 3244 else
3086#endif 3245#endif
3246 {
3087 ev_timer_again (EV_A_ &w->timer); 3247 ev_timer_again (EV_A_ &w->timer);
3248 ev_unref (EV_A);
3249 }
3088 3250
3089 ev_start (EV_A_ (W)w, 1); 3251 ev_start (EV_A_ (W)w, 1);
3090 3252
3091 EV_FREQUENT_CHECK; 3253 EV_FREQUENT_CHECK;
3092} 3254}
3101 EV_FREQUENT_CHECK; 3263 EV_FREQUENT_CHECK;
3102 3264
3103#if EV_USE_INOTIFY 3265#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3266 infy_del (EV_A_ w);
3105#endif 3267#endif
3268
3269 if (ev_is_active (&w->timer))
3270 {
3271 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3272 ev_timer_stop (EV_A_ &w->timer);
3273 }
3107 3274
3108 ev_stop (EV_A_ (W)w); 3275 ev_stop (EV_A_ (W)w);
3109 3276
3110 EV_FREQUENT_CHECK; 3277 EV_FREQUENT_CHECK;
3111} 3278}
3156 3323
3157 EV_FREQUENT_CHECK; 3324 EV_FREQUENT_CHECK;
3158} 3325}
3159#endif 3326#endif
3160 3327
3328#if EV_PREPARE_ENABLE
3161void 3329void
3162ev_prepare_start (EV_P_ ev_prepare *w) 3330ev_prepare_start (EV_P_ ev_prepare *w)
3163{ 3331{
3164 if (expect_false (ev_is_active (w))) 3332 if (expect_false (ev_is_active (w)))
3165 return; 3333 return;
3191 3359
3192 ev_stop (EV_A_ (W)w); 3360 ev_stop (EV_A_ (W)w);
3193 3361
3194 EV_FREQUENT_CHECK; 3362 EV_FREQUENT_CHECK;
3195} 3363}
3364#endif
3196 3365
3366#if EV_CHECK_ENABLE
3197void 3367void
3198ev_check_start (EV_P_ ev_check *w) 3368ev_check_start (EV_P_ ev_check *w)
3199{ 3369{
3200 if (expect_false (ev_is_active (w))) 3370 if (expect_false (ev_is_active (w)))
3201 return; 3371 return;
3227 3397
3228 ev_stop (EV_A_ (W)w); 3398 ev_stop (EV_A_ (W)w);
3229 3399
3230 EV_FREQUENT_CHECK; 3400 EV_FREQUENT_CHECK;
3231} 3401}
3402#endif
3232 3403
3233#if EV_EMBED_ENABLE 3404#if EV_EMBED_ENABLE
3234void noinline 3405void noinline
3235ev_embed_sweep (EV_P_ ev_embed *w) 3406ev_embed_sweep (EV_P_ ev_embed *w)
3236{ 3407{
3331 3502
3332 ev_io_stop (EV_A_ &w->io); 3503 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3504 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3505 ev_fork_stop (EV_A_ &w->fork);
3335 3506
3507 ev_stop (EV_A_ (W)w);
3508
3336 EV_FREQUENT_CHECK; 3509 EV_FREQUENT_CHECK;
3337} 3510}
3338#endif 3511#endif
3339 3512
3340#if EV_FORK_ENABLE 3513#if EV_FORK_ENABLE
3416 3589
3417void 3590void
3418ev_async_send (EV_P_ ev_async *w) 3591ev_async_send (EV_P_ ev_async *w)
3419{ 3592{
3420 w->sent = 1; 3593 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3594 evpipe_write (EV_A_ &async_pending);
3422} 3595}
3423#endif 3596#endif
3424 3597
3425/*****************************************************************************/ 3598/*****************************************************************************/
3426 3599
3466{ 3639{
3467 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3640 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3468 3641
3469 if (expect_false (!once)) 3642 if (expect_false (!once))
3470 { 3643 {
3471 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3644 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3472 return; 3645 return;
3473 } 3646 }
3474 3647
3475 once->cb = cb; 3648 once->cb = cb;
3476 once->arg = arg; 3649 once->arg = arg;
3563 if (types & EV_ASYNC) 3736 if (types & EV_ASYNC)
3564 for (i = asynccnt; i--; ) 3737 for (i = asynccnt; i--; )
3565 cb (EV_A_ EV_ASYNC, asyncs [i]); 3738 cb (EV_A_ EV_ASYNC, asyncs [i]);
3566#endif 3739#endif
3567 3740
3741#if EV_PREPARE_ENABLE
3568 if (types & EV_PREPARE) 3742 if (types & EV_PREPARE)
3569 for (i = preparecnt; i--; ) 3743 for (i = preparecnt; i--; )
3570#if EV_EMBED_ENABLE 3744# if EV_EMBED_ENABLE
3571 if (ev_cb (prepares [i]) != embed_prepare_cb) 3745 if (ev_cb (prepares [i]) != embed_prepare_cb)
3572#endif 3746# endif
3573 cb (EV_A_ EV_PREPARE, prepares [i]); 3747 cb (EV_A_ EV_PREPARE, prepares [i]);
3748#endif
3574 3749
3750#if EV_CHECK_ENABLE
3575 if (types & EV_CHECK) 3751 if (types & EV_CHECK)
3576 for (i = checkcnt; i--; ) 3752 for (i = checkcnt; i--; )
3577 cb (EV_A_ EV_CHECK, checks [i]); 3753 cb (EV_A_ EV_CHECK, checks [i]);
3754#endif
3578 3755
3756#if EV_SIGNAL_ENABLE
3579 if (types & EV_SIGNAL) 3757 if (types & EV_SIGNAL)
3580 for (i = 0; i < EV_NSIG - 1; ++i) 3758 for (i = 0; i < EV_NSIG - 1; ++i)
3581 for (wl = signals [i].head; wl; ) 3759 for (wl = signals [i].head; wl; )
3582 { 3760 {
3583 wn = wl->next; 3761 wn = wl->next;
3584 cb (EV_A_ EV_SIGNAL, wl); 3762 cb (EV_A_ EV_SIGNAL, wl);
3585 wl = wn; 3763 wl = wn;
3586 } 3764 }
3765#endif
3587 3766
3767#if EV_CHILD_ENABLE
3588 if (types & EV_CHILD) 3768 if (types & EV_CHILD)
3589 for (i = EV_PID_HASHSIZE; i--; ) 3769 for (i = (EV_PID_HASHSIZE); i--; )
3590 for (wl = childs [i]; wl; ) 3770 for (wl = childs [i]; wl; )
3591 { 3771 {
3592 wn = wl->next; 3772 wn = wl->next;
3593 cb (EV_A_ EV_CHILD, wl); 3773 cb (EV_A_ EV_CHILD, wl);
3594 wl = wn; 3774 wl = wn;
3595 } 3775 }
3776#endif
3596/* EV_STAT 0x00001000 /* stat data changed */ 3777/* EV_STAT 0x00001000 /* stat data changed */
3597/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3778/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3598} 3779}
3599#endif 3780#endif
3600 3781

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines