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

Comparing libev/ev.c (file contents):
Revision 1.311 by root, Wed Jul 29 09:36:05 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 */
204#elif defined (MAXSIG) 207#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 215#else
213# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
215# define EV_NSIG 65 219# define EV_NSIG 65
216#endif 220#endif
217 221
218#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 225# else
222# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
223# endif 227# endif
224#endif 228#endif
225 229
226#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 233# else
230# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
231# endif 235# endif
232#endif 236#endif
233 237
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 240#endif
237 241
238#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 245# else
242# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
243# endif 247# endif
244#endif 248#endif
245 249
246#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 252#endif
249 253
250#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
251# ifdef _WIN32 255# ifdef _WIN32
252# define EV_USE_POLL 0 256# define EV_USE_POLL 0
253# else 257# else
254# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 259# endif
256#endif 260#endif
257 261
258#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 265# else
262# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
263# endif 267# endif
264#endif 268#endif
265 269
271# define EV_USE_PORT 0 275# define EV_USE_PORT 0
272#endif 276#endif
273 277
274#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 281# else
278# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
279# endif 283# endif
280#endif 284#endif
281 285
282#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
284# define EV_PID_HASHSIZE 1
285# else
286# define EV_PID_HASHSIZE 16
287# endif
288#endif 288#endif
289 289
290#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
292# define EV_INOTIFY_HASHSIZE 1
293# else
294# define EV_INOTIFY_HASHSIZE 16
295# endif
296#endif 292#endif
297 293
298#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 297# else
302# define EV_USE_EVENTFD 0 298# define EV_USE_EVENTFD 0
303# endif 299# endif
304#endif 300#endif
305 301
306#ifndef EV_USE_SIGNALFD 302#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 304# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 305# else
310# define EV_USE_SIGNALFD 0 306# define EV_USE_SIGNALFD 0
311# endif 307# endif
312#endif 308#endif
313 309
316# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
318#endif 314#endif
319 315
320#ifndef EV_VERIFY 316#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 318#endif
323 319
324#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 322#endif
327 323
328#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 326#endif
331 327
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 328/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
343# endif 339# endif
344#endif 340#endif
345 341
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 342/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 343
344#ifdef _AIX
345/* AIX has a completely broken poll.h header */
346# undef EV_USE_POLL
347# define EV_USE_POLL 0
348#endif
349
348#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
351#endif 353#endif
352 354
395# endif 397# endif
396# endif 398# endif
397# ifdef __cplusplus 399# ifdef __cplusplus
398extern "C" { 400extern "C" {
399# endif 401# endif
400int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
401# ifdef __cplusplus 403# ifdef __cplusplus
402} 404}
403# endif 405# endif
404#endif 406#endif
405 407
406#if EV_USE_SIGNALFD 408#if EV_USE_SIGNALFD
407# include <sys/signalfd.h> 409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h>
411# ifndef SFD_NONBLOCK
412# define SFD_NONBLOCK O_NONBLOCK
408#endif 413# endif
414# ifndef SFD_CLOEXEC
415# ifdef O_CLOEXEC
416# define SFD_CLOEXEC O_CLOEXEC
417# else
418# define SFD_CLOEXEC 02000000
419# endif
420# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags);
425
426struct signalfd_siginfo
427{
428 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)];
430};
431# ifdef __cplusplus
432}
433# endif
434#endif
435
409 436
410/**/ 437/**/
411 438
412#if EV_VERIFY >= 3 439#if EV_VERIFY >= 3
413# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 440# define EV_FREQUENT_CHECK ev_verify (EV_A)
414#else 441#else
415# define EV_FREQUENT_CHECK do { } while (0) 442# define EV_FREQUENT_CHECK do { } while (0)
416#endif 443#endif
417 444
418/* 445/*
425 */ 452 */
426#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
427 454
428#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 455#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
429#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 456#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
430/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
431 457
432#if __GNUC__ >= 4 458#if __GNUC__ >= 4
433# define expect(expr,value) __builtin_expect ((expr),(value)) 459# define expect(expr,value) __builtin_expect ((expr),(value))
434# define noinline __attribute__ ((noinline)) 460# define noinline __attribute__ ((noinline))
435#else 461#else
442 468
443#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
444#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
445#define inline_size static inline 471#define inline_size static inline
446 472
447#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
448# define inline_speed static noinline 476# define inline_speed static noinline
449#else
450# define inline_speed static inline
451#endif 477#endif
452 478
453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454 480
455#if EV_MINPRI == EV_MAXPRI 481#if EV_MINPRI == EV_MAXPRI
476 502
477#if EV_USE_MONOTONIC 503#if EV_USE_MONOTONIC
478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
479#endif 505#endif
480 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
481#ifdef _WIN32 517#ifdef _WIN32
482# include "ev_win32.c" 518# include "ev_win32.c"
483#endif 519#endif
484 520
485/*****************************************************************************/ 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
486 530
487static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
488 532
489void 533void
490ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
500 544
501 if (syserr_cb) 545 if (syserr_cb)
502 syserr_cb (msg); 546 syserr_cb (msg);
503 else 547 else
504 { 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
505 perror (msg); 557 perror (msg);
558#endif
506 abort (); 559 abort ();
507 } 560 }
508} 561}
509 562
510static void * 563static void *
511ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
512{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
513 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
514 * 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
515 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
516 */ 572 */
517 573
518 if (size) 574 if (size)
519 return realloc (ptr, size); 575 return realloc (ptr, size);
520 576
521 free (ptr); 577 free (ptr);
522 return 0; 578 return 0;
579#endif
523} 580}
524 581
525static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
526 583
527void 584void
535{ 592{
536 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
537 594
538 if (!ptr && size) 595 if (!ptr && size)
539 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
540 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
541 abort (); 602 abort ();
542 } 603 }
543 604
544 return ptr; 605 return ptr;
545} 606}
627 688
628 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
629 690
630#endif 691#endif
631 692
632#if EV_MINIMAL < 2 693#if EV_FEATURE_API
633# 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)
634# 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)
635# define EV_INVOKE_PENDING invoke_cb (EV_A) 696# define EV_INVOKE_PENDING invoke_cb (EV_A)
636#else 697#else
637# define EV_RELEASE_CB (void)0 698# define EV_RELEASE_CB (void)0
822} 883}
823 884
824/*****************************************************************************/ 885/*****************************************************************************/
825 886
826inline_speed void 887inline_speed void
827fd_event_nc (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
828{ 889{
829 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
830 ev_io *w; 891 ev_io *w;
831 892
832 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)
844fd_event (EV_P_ int fd, int revents) 905fd_event (EV_P_ int fd, int revents)
845{ 906{
846 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
847 908
848 if (expect_true (!anfd->reify)) 909 if (expect_true (!anfd->reify))
849 fd_event_nc (EV_A_ fd, revents); 910 fd_event_nocheck (EV_A_ fd, revents);
850} 911}
851 912
852void 913void
853ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
854{ 915{
855 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
856 fd_event_nc (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
857} 918}
858 919
859/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
860/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
861inline_size void 922inline_size void
876 937
877#if EV_SELECT_IS_WINSOCKET 938#if EV_SELECT_IS_WINSOCKET
878 if (events) 939 if (events)
879 { 940 {
880 unsigned long arg; 941 unsigned long arg;
881 #ifdef EV_FD_TO_WIN32_HANDLE
882 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
883 #else
884 anfd->handle = _get_osfhandle (fd);
885 #endif
886 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));
887 } 944 }
888#endif 945#endif
889 946
890 { 947 {
928 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
929 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);
930 } 987 }
931} 988}
932 989
933/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
934inline_size int 991inline_size int
935fd_valid (int fd) 992fd_valid (int fd)
936{ 993{
937#ifdef _WIN32 994#ifdef _WIN32
938 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
939#else 996#else
940 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
941#endif 998#endif
942} 999}
943 1000
978 { 1035 {
979 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
980 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
982 } 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
983} 1054}
984 1055
985/*****************************************************************************/ 1056/*****************************************************************************/
986 1057
987/* 1058/*
1141 1212
1142static ANSIG signals [EV_NSIG - 1]; 1213static ANSIG signals [EV_NSIG - 1];
1143 1214
1144/*****************************************************************************/ 1215/*****************************************************************************/
1145 1216
1146/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1147/* this is not fork-safe */
1148inline_speed void
1149fd_intern (int fd)
1150{
1151#ifdef _WIN32
1152 unsigned long arg = 1;
1153 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1154#else
1155 fcntl (fd, F_SETFD, FD_CLOEXEC);
1156 fcntl (fd, F_SETFL, O_NONBLOCK);
1157#endif
1158}
1159 1218
1160static void noinline 1219static void noinline
1161evpipe_init (EV_P) 1220evpipe_init (EV_P)
1162{ 1221{
1163 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1164 { 1223 {
1165#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL) 1226 if (evfd < 0 && errno == EINVAL)
1168 evfd = eventfd (0, 0); 1227 evfd = eventfd (0, 0);
1169 1228
1170 if (evfd >= 0) 1229 if (evfd >= 0)
1172 evpipe [0] = -1; 1231 evpipe [0] = -1;
1173 fd_intern (evfd); /* doing it twice doesn't hurt */ 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1174 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1175 } 1234 }
1176 else 1235 else
1177#endif 1236# endif
1178 { 1237 {
1179 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1180 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1181 1240
1182 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
1193evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1194{ 1253{
1195 if (!*flag) 1254 if (!*flag)
1196 { 1255 {
1197 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;
1198 1258
1199 *flag = 1; 1259 *flag = 1;
1200 1260
1201#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1202 if (evfd >= 0) 1262 if (evfd >= 0)
1204 uint64_t counter = 1; 1264 uint64_t counter = 1;
1205 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1206 } 1266 }
1207 else 1267 else
1208#endif 1268#endif
1209 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1210 1270
1211 errno = old_errno; 1271 errno = old_errno;
1212 } 1272 }
1213} 1273}
1214 1274
1263{ 1323{
1264#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1265 EV_P = signals [signum - 1].loop; 1325 EV_P = signals [signum - 1].loop;
1266#endif 1326#endif
1267 1327
1268#if _WIN32 1328#ifdef _WIN32
1269 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1270#endif 1330#endif
1271 1331
1272 signals [signum - 1].pending = 1; 1332 signals [signum - 1].pending = 1;
1273 evpipe_write (EV_A_ &sig_pending); 1333 evpipe_write (EV_A_ &sig_pending);
1315 break; 1375 break;
1316 } 1376 }
1317} 1377}
1318#endif 1378#endif
1319 1379
1380#endif
1381
1320/*****************************************************************************/ 1382/*****************************************************************************/
1321 1383
1384#if EV_CHILD_ENABLE
1322static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1323
1324#ifndef _WIN32
1325 1386
1326static ev_signal childev; 1387static ev_signal childev;
1327 1388
1328#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1329# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
1334child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1335{ 1396{
1336 ev_child *w; 1397 ev_child *w;
1337 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1338 1399
1339 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)
1340 { 1401 {
1341 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1342 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1343 { 1404 {
1344 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 */
1369 /* 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 */
1370 /* 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 */
1371 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1372 1433
1373 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1374 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1375 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 */
1376} 1437}
1377 1438
1378#endif 1439#endif
1379 1440
1446#ifdef __APPLE__ 1507#ifdef __APPLE__
1447 /* only select works correctly on that "unix-certified" platform */ 1508 /* only select works correctly on that "unix-certified" platform */
1448 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1509 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1449 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 */
1450#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
1451 1515
1452 return flags; 1516 return flags;
1453} 1517}
1454 1518
1455unsigned int 1519unsigned int
1468ev_backend (EV_P) 1532ev_backend (EV_P)
1469{ 1533{
1470 return backend; 1534 return backend;
1471} 1535}
1472 1536
1473#if EV_MINIMAL < 2 1537#if EV_FEATURE_API
1474unsigned int 1538unsigned int
1475ev_loop_count (EV_P) 1539ev_iteration (EV_P)
1476{ 1540{
1477 return loop_count; 1541 return loop_count;
1478} 1542}
1479 1543
1480unsigned int 1544unsigned int
1481ev_loop_depth (EV_P) 1545ev_depth (EV_P)
1482{ 1546{
1483 return loop_depth; 1547 return loop_depth;
1484} 1548}
1485 1549
1486void 1550void
1558 1622
1559 ev_rt_now = ev_time (); 1623 ev_rt_now = ev_time ();
1560 mn_now = get_clock (); 1624 mn_now = get_clock ();
1561 now_floor = mn_now; 1625 now_floor = mn_now;
1562 rtmn_diff = ev_rt_now - mn_now; 1626 rtmn_diff = ev_rt_now - mn_now;
1563#if EV_MINIMAL < 2 1627#if EV_FEATURE_API
1564 invoke_cb = ev_invoke_pending; 1628 invoke_cb = ev_invoke_pending;
1565#endif 1629#endif
1566 1630
1567 io_blocktime = 0.; 1631 io_blocktime = 0.;
1568 timeout_blocktime = 0.; 1632 timeout_blocktime = 0.;
1574#endif 1638#endif
1575#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1577#endif 1641#endif
1578#if EV_USE_SIGNALFD 1642#if EV_USE_SIGNALFD
1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1580#endif 1644#endif
1581 1645
1582 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1583 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1584 1648
1598 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1662 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1599#endif 1663#endif
1600 1664
1601 ev_prepare_init (&pending_w, pendingcb); 1665 ev_prepare_init (&pending_w, pendingcb);
1602 1666
1667#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1603 ev_init (&pipe_w, pipecb); 1668 ev_init (&pipe_w, pipecb);
1604 ev_set_priority (&pipe_w, EV_MAXPRI); 1669 ev_set_priority (&pipe_w, EV_MAXPRI);
1670#endif
1605 } 1671 }
1606} 1672}
1607 1673
1608/* free up a loop structure */ 1674/* free up a loop structure */
1609static void noinline 1675static void noinline
1621 close (evfd); 1687 close (evfd);
1622#endif 1688#endif
1623 1689
1624 if (evpipe [0] >= 0) 1690 if (evpipe [0] >= 0)
1625 { 1691 {
1626 close (evpipe [0]); 1692 EV_WIN32_CLOSE_FD (evpipe [0]);
1627 close (evpipe [1]); 1693 EV_WIN32_CLOSE_FD (evpipe [1]);
1628 } 1694 }
1629 } 1695 }
1630 1696
1631#if EV_USE_SIGNALFD 1697#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w)) 1698 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd); 1699 close (sigfd);
1638 }
1639#endif 1700#endif
1640 1701
1641#if EV_USE_INOTIFY 1702#if EV_USE_INOTIFY
1642 if (fs_fd >= 0) 1703 if (fs_fd >= 0)
1643 close (fs_fd); 1704 close (fs_fd);
1728 close (evfd); 1789 close (evfd);
1729#endif 1790#endif
1730 1791
1731 if (evpipe [0] >= 0) 1792 if (evpipe [0] >= 0)
1732 { 1793 {
1733 close (evpipe [0]); 1794 EV_WIN32_CLOSE_FD (evpipe [0]);
1734 close (evpipe [1]); 1795 EV_WIN32_CLOSE_FD (evpipe [1]);
1735 } 1796 }
1736 1797
1798#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1737 evpipe_init (EV_A); 1799 evpipe_init (EV_A);
1738 /* now iterate over everything, in case we missed something */ 1800 /* now iterate over everything, in case we missed something */
1739 pipecb (EV_A_ &pipe_w, EV_READ); 1801 pipecb (EV_A_ &pipe_w, EV_READ);
1802#endif
1740 } 1803 }
1741 1804
1742 postfork = 0; 1805 postfork = 0;
1743} 1806}
1744 1807
1806 verify_watcher (EV_A_ ws [cnt]); 1869 verify_watcher (EV_A_ ws [cnt]);
1807 } 1870 }
1808} 1871}
1809#endif 1872#endif
1810 1873
1811#if EV_MINIMAL < 2 1874#if EV_FEATURE_API
1812void 1875void
1813ev_loop_verify (EV_P) 1876ev_verify (EV_P)
1814{ 1877{
1815#if EV_VERIFY 1878#if EV_VERIFY
1816 int i; 1879 int i;
1817 WL w; 1880 WL w;
1818 1881
1857#if EV_ASYNC_ENABLE 1920#if EV_ASYNC_ENABLE
1858 assert (asyncmax >= asynccnt); 1921 assert (asyncmax >= asynccnt);
1859 array_verify (EV_A_ (W *)asyncs, asynccnt); 1922 array_verify (EV_A_ (W *)asyncs, asynccnt);
1860#endif 1923#endif
1861 1924
1925#if EV_PREPARE_ENABLE
1862 assert (preparemax >= preparecnt); 1926 assert (preparemax >= preparecnt);
1863 array_verify (EV_A_ (W *)prepares, preparecnt); 1927 array_verify (EV_A_ (W *)prepares, preparecnt);
1928#endif
1864 1929
1930#if EV_CHECK_ENABLE
1865 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1866 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1933#endif
1867 1934
1868# if 0 1935# if 0
1936#if EV_CHILD_ENABLE
1869 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)
1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1938 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1939#endif
1871# endif 1940# endif
1872#endif 1941#endif
1873} 1942}
1874#endif 1943#endif
1875 1944
1891 1960
1892 loop_init (EV_A_ flags); 1961 loop_init (EV_A_ flags);
1893 1962
1894 if (ev_backend (EV_A)) 1963 if (ev_backend (EV_A))
1895 { 1964 {
1896#ifndef _WIN32 1965#if EV_CHILD_ENABLE
1897 ev_signal_init (&childev, childcb, SIGCHLD); 1966 ev_signal_init (&childev, childcb, SIGCHLD);
1898 ev_set_priority (&childev, EV_MAXPRI); 1967 ev_set_priority (&childev, EV_MAXPRI);
1899 ev_signal_start (EV_A_ &childev); 1968 ev_signal_start (EV_A_ &childev);
1900 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1969 ev_unref (EV_A); /* child watcher should not keep loop alive */
1901#endif 1970#endif
1914 EV_P = ev_default_loop_ptr; 1983 EV_P = ev_default_loop_ptr;
1915#endif 1984#endif
1916 1985
1917 ev_default_loop_ptr = 0; 1986 ev_default_loop_ptr = 0;
1918 1987
1919#ifndef _WIN32 1988#if EV_CHILD_ENABLE
1920 ev_ref (EV_A); /* child watcher */ 1989 ev_ref (EV_A); /* child watcher */
1921 ev_signal_stop (EV_A_ &childev); 1990 ev_signal_stop (EV_A_ &childev);
1922#endif 1991#endif
1923 1992
1924 loop_destroy (EV_A); 1993 loop_destroy (EV_A);
2030 EV_FREQUENT_CHECK; 2099 EV_FREQUENT_CHECK;
2031 feed_reverse (EV_A_ (W)w); 2100 feed_reverse (EV_A_ (W)w);
2032 } 2101 }
2033 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2102 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2034 2103
2035 feed_reverse_done (EV_A_ EV_TIMEOUT); 2104 feed_reverse_done (EV_A_ EV_TIMER);
2036 } 2105 }
2037} 2106}
2038 2107
2039#if EV_PERIODIC_ENABLE 2108#if EV_PERIODIC_ENABLE
2040/* make periodics pending */ 2109/* make periodics pending */
2131 ANHE_at_cache (*he); 2200 ANHE_at_cache (*he);
2132 } 2201 }
2133} 2202}
2134 2203
2135/* fetch new monotonic and realtime times from the kernel */ 2204/* fetch new monotonic and realtime times from the kernel */
2136/* also detetc if there was a timejump, and act accordingly */ 2205/* also detect if there was a timejump, and act accordingly */
2137inline_speed void 2206inline_speed void
2138time_update (EV_P_ ev_tstamp max_block) 2207time_update (EV_P_ ev_tstamp max_block)
2139{ 2208{
2140#if EV_USE_MONOTONIC 2209#if EV_USE_MONOTONIC
2141 if (expect_true (have_monotonic)) 2210 if (expect_true (have_monotonic))
2201} 2270}
2202 2271
2203void 2272void
2204ev_loop (EV_P_ int flags) 2273ev_loop (EV_P_ int flags)
2205{ 2274{
2206#if EV_MINIMAL < 2 2275#if EV_FEATURE_API
2207 ++loop_depth; 2276 ++loop_depth;
2208#endif 2277#endif
2209 2278
2210 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));
2211 2280
2214 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 */
2215 2284
2216 do 2285 do
2217 { 2286 {
2218#if EV_VERIFY >= 2 2287#if EV_VERIFY >= 2
2219 ev_loop_verify (EV_A); 2288 ev_verify (EV_A);
2220#endif 2289#endif
2221 2290
2222#ifndef _WIN32 2291#ifndef _WIN32
2223 if (expect_false (curpid)) /* penalise the forking check even more */ 2292 if (expect_false (curpid)) /* penalise the forking check even more */
2224 if (expect_false (getpid () != curpid)) 2293 if (expect_false (getpid () != curpid))
2236 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2305 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2237 EV_INVOKE_PENDING; 2306 EV_INVOKE_PENDING;
2238 } 2307 }
2239#endif 2308#endif
2240 2309
2310#if EV_PREPARE_ENABLE
2241 /* queue prepare watchers (and execute them) */ 2311 /* queue prepare watchers (and execute them) */
2242 if (expect_false (preparecnt)) 2312 if (expect_false (preparecnt))
2243 { 2313 {
2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2314 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2245 EV_INVOKE_PENDING; 2315 EV_INVOKE_PENDING;
2246 } 2316 }
2317#endif
2247 2318
2248 if (expect_false (loop_done)) 2319 if (expect_false (loop_done))
2249 break; 2320 break;
2250 2321
2251 /* we might have forked, so reify kernel state if necessary */ 2322 /* we might have forked, so reify kernel state if necessary */
2302 waittime -= sleeptime; 2373 waittime -= sleeptime;
2303 } 2374 }
2304 } 2375 }
2305 } 2376 }
2306 2377
2307#if EV_MINIMAL < 2 2378#if EV_FEATURE_API
2308 ++loop_count; 2379 ++loop_count;
2309#endif 2380#endif
2310 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2381 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2311 backend_poll (EV_A_ waittime); 2382 backend_poll (EV_A_ waittime);
2312 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2383 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2324#if EV_IDLE_ENABLE 2395#if EV_IDLE_ENABLE
2325 /* queue idle watchers unless other events are pending */ 2396 /* queue idle watchers unless other events are pending */
2326 idle_reify (EV_A); 2397 idle_reify (EV_A);
2327#endif 2398#endif
2328 2399
2400#if EV_CHECK_ENABLE
2329 /* queue check watchers, to be executed first */ 2401 /* queue check watchers, to be executed first */
2330 if (expect_false (checkcnt)) 2402 if (expect_false (checkcnt))
2331 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2403 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2404#endif
2332 2405
2333 EV_INVOKE_PENDING; 2406 EV_INVOKE_PENDING;
2334 } 2407 }
2335 while (expect_true ( 2408 while (expect_true (
2336 activecnt 2409 activecnt
2339 )); 2412 ));
2340 2413
2341 if (loop_done == EVUNLOOP_ONE) 2414 if (loop_done == EVUNLOOP_ONE)
2342 loop_done = EVUNLOOP_CANCEL; 2415 loop_done = EVUNLOOP_CANCEL;
2343 2416
2344#if EV_MINIMAL < 2 2417#if EV_FEATURE_API
2345 --loop_depth; 2418 --loop_depth;
2346#endif 2419#endif
2347} 2420}
2348 2421
2349void 2422void
2475 2548
2476 if (expect_false (ev_is_active (w))) 2549 if (expect_false (ev_is_active (w)))
2477 return; 2550 return;
2478 2551
2479 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2552 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2480 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))));
2481 2554
2482 EV_FREQUENT_CHECK; 2555 EV_FREQUENT_CHECK;
2483 2556
2484 ev_start (EV_A_ (W)w, 1); 2557 ev_start (EV_A_ (W)w, 1);
2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2558 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2555 timers [active] = timers [timercnt + HEAP0]; 2628 timers [active] = timers [timercnt + HEAP0];
2556 adjustheap (timers, timercnt, active); 2629 adjustheap (timers, timercnt, active);
2557 } 2630 }
2558 } 2631 }
2559 2632
2560 EV_FREQUENT_CHECK;
2561
2562 ev_at (w) -= mn_now; 2633 ev_at (w) -= mn_now;
2563 2634
2564 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2636
2637 EV_FREQUENT_CHECK;
2565} 2638}
2566 2639
2567void noinline 2640void noinline
2568ev_timer_again (EV_P_ ev_timer *w) 2641ev_timer_again (EV_P_ ev_timer *w)
2569{ 2642{
2648 periodics [active] = periodics [periodiccnt + HEAP0]; 2721 periodics [active] = periodics [periodiccnt + HEAP0];
2649 adjustheap (periodics, periodiccnt, active); 2722 adjustheap (periodics, periodiccnt, active);
2650 } 2723 }
2651 } 2724 }
2652 2725
2653 EV_FREQUENT_CHECK;
2654
2655 ev_stop (EV_A_ (W)w); 2726 ev_stop (EV_A_ (W)w);
2727
2728 EV_FREQUENT_CHECK;
2656} 2729}
2657 2730
2658void noinline 2731void noinline
2659ev_periodic_again (EV_P_ ev_periodic *w) 2732ev_periodic_again (EV_P_ ev_periodic *w)
2660{ 2733{
2665#endif 2738#endif
2666 2739
2667#ifndef SA_RESTART 2740#ifndef SA_RESTART
2668# define SA_RESTART 0 2741# define SA_RESTART 0
2669#endif 2742#endif
2743
2744#if EV_SIGNAL_ENABLE
2670 2745
2671void noinline 2746void noinline
2672ev_signal_start (EV_P_ ev_signal *w) 2747ev_signal_start (EV_P_ ev_signal *w)
2673{ 2748{
2674 if (expect_false (ev_is_active (w))) 2749 if (expect_false (ev_is_active (w)))
2721 if (!((WL)w)->next) 2796 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD 2797# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/ 2798 if (sigfd < 0) /*TODO*/
2724# endif 2799# endif
2725 { 2800 {
2726# if _WIN32 2801# ifdef _WIN32
2802 evpipe_init (EV_A);
2803
2727 signal (w->signum, ev_sighandler); 2804 signal (w->signum, ev_sighandler);
2728# else 2805# else
2729 struct sigaction sa; 2806 struct sigaction sa;
2730 2807
2731 evpipe_init (EV_A); 2808 evpipe_init (EV_A);
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2839 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif 2840#endif
2764#if EV_USE_SIGNALFD 2841#if EV_USE_SIGNALFD
2765 if (sigfd >= 0) 2842 if (sigfd >= 0)
2766 { 2843 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2844 sigset_t ss;
2845
2846 sigemptyset (&ss);
2847 sigaddset (&ss, w->signum);
2768 sigdelset (&sigfd_set, w->signum); 2848 sigdelset (&sigfd_set, w->signum);
2849
2769 signalfd (sigfd, &sigfd_set, 0); 2850 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2851 sigprocmask (SIG_UNBLOCK, &ss, 0);
2771 /*TODO: maybe unblock signal? */
2772 } 2852 }
2773 else 2853 else
2774#endif 2854#endif
2775 signal (w->signum, SIG_DFL); 2855 signal (w->signum, SIG_DFL);
2776 } 2856 }
2777 2857
2778 EV_FREQUENT_CHECK; 2858 EV_FREQUENT_CHECK;
2779} 2859}
2780 2860
2861#endif
2862
2863#if EV_CHILD_ENABLE
2864
2781void 2865void
2782ev_child_start (EV_P_ ev_child *w) 2866ev_child_start (EV_P_ ev_child *w)
2783{ 2867{
2784#if EV_MULTIPLICITY 2868#if EV_MULTIPLICITY
2785 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2869 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2788 return; 2872 return;
2789 2873
2790 EV_FREQUENT_CHECK; 2874 EV_FREQUENT_CHECK;
2791 2875
2792 ev_start (EV_A_ (W)w, 1); 2876 ev_start (EV_A_ (W)w, 1);
2793 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2877 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2794 2878
2795 EV_FREQUENT_CHECK; 2879 EV_FREQUENT_CHECK;
2796} 2880}
2797 2881
2798void 2882void
2802 if (expect_false (!ev_is_active (w))) 2886 if (expect_false (!ev_is_active (w)))
2803 return; 2887 return;
2804 2888
2805 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2806 2890
2807 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2891 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2808 ev_stop (EV_A_ (W)w); 2892 ev_stop (EV_A_ (W)w);
2809 2893
2810 EV_FREQUENT_CHECK; 2894 EV_FREQUENT_CHECK;
2811} 2895}
2896
2897#endif
2812 2898
2813#if EV_STAT_ENABLE 2899#if EV_STAT_ENABLE
2814 2900
2815# ifdef _WIN32 2901# ifdef _WIN32
2816# undef lstat 2902# undef lstat
2822#define MIN_STAT_INTERVAL 0.1074891 2908#define MIN_STAT_INTERVAL 0.1074891
2823 2909
2824static 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);
2825 2911
2826#if EV_USE_INOTIFY 2912#if EV_USE_INOTIFY
2827# 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)
2828 2916
2829static void noinline 2917static void noinline
2830infy_add (EV_P_ ev_stat *w) 2918infy_add (EV_P_ ev_stat *w)
2831{ 2919{
2832 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);
2833 2921
2834 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 */
2835 { 2942 }
2943 else
2944 {
2945 /* can't use inotify, continue to stat */
2836 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2946 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2837 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2838 2947
2839 /* monitor some parent directory for speedup hints */ 2948 /* if path is not there, monitor some parent directory for speedup hints */
2840 /* 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, */
2841 /* but an efficiency issue only */ 2950 /* but an efficiency issue only */
2842 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2951 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2843 { 2952 {
2844 char path [4096]; 2953 char path [4096];
2860 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2969 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2861 } 2970 }
2862 } 2971 }
2863 2972
2864 if (w->wd >= 0) 2973 if (w->wd >= 0)
2865 {
2866 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);
2867 2975
2868 /* now local changes will be tracked by inotify, but remote changes won't */ 2976 /* now re-arm timer, if required */
2869 /* unless the filesystem it known to be local, we therefore still poll */ 2977 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2870 /* also do poll on <2.6.25, but with normal frequency */
2871 struct statfs sfs;
2872
2873 if (fs_2625 && !statfs (w->path, &sfs))
2874 if (sfs.f_type == 0x1373 /* devfs */
2875 || sfs.f_type == 0xEF53 /* ext2/3 */
2876 || sfs.f_type == 0x3153464a /* jfs */
2877 || sfs.f_type == 0x52654973 /* reiser3 */
2878 || sfs.f_type == 0x01021994 /* tempfs */
2879 || sfs.f_type == 0x58465342 /* xfs */)
2880 return;
2881
2882 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2883 ev_timer_again (EV_A_ &w->timer); 2978 ev_timer_again (EV_A_ &w->timer);
2884 } 2979 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2885} 2980}
2886 2981
2887static void noinline 2982static void noinline
2888infy_del (EV_P_ ev_stat *w) 2983infy_del (EV_P_ ev_stat *w)
2889{ 2984{
2892 2987
2893 if (wd < 0) 2988 if (wd < 0)
2894 return; 2989 return;
2895 2990
2896 w->wd = -2; 2991 w->wd = -2;
2897 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2992 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2898 wlist_del (&fs_hash [slot].head, (WL)w); 2993 wlist_del (&fs_hash [slot].head, (WL)w);
2899 2994
2900 /* remove this watcher, if others are watching it, they will rearm */ 2995 /* remove this watcher, if others are watching it, they will rearm */
2901 inotify_rm_watch (fs_fd, wd); 2996 inotify_rm_watch (fs_fd, wd);
2902} 2997}
2904static void noinline 2999static void noinline
2905infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3000infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2906{ 3001{
2907 if (slot < 0) 3002 if (slot < 0)
2908 /* overflow, need to check for all hash slots */ 3003 /* overflow, need to check for all hash slots */
2909 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3004 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2910 infy_wd (EV_A_ slot, wd, ev); 3005 infy_wd (EV_A_ slot, wd, ev);
2911 else 3006 else
2912 { 3007 {
2913 WL w_; 3008 WL w_;
2914 3009
2915 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3010 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2916 { 3011 {
2917 ev_stat *w = (ev_stat *)w_; 3012 ev_stat *w = (ev_stat *)w_;
2918 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 */
2919 3014
2920 if (w->wd == wd || wd == -1) 3015 if (w->wd == wd || wd == -1)
2921 { 3016 {
2922 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3017 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2923 { 3018 {
2924 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);
2925 w->wd = -1; 3020 w->wd = -1;
2926 infy_add (EV_A_ w); /* re-add, no matter what */ 3021 infy_add (EV_A_ w); /* re-add, no matter what */
2927 } 3022 }
2928 3023
2929 stat_timer_cb (EV_A_ &w->timer, 0); 3024 stat_timer_cb (EV_A_ &w->timer, 0);
2934 3029
2935static void 3030static void
2936infy_cb (EV_P_ ev_io *w, int revents) 3031infy_cb (EV_P_ ev_io *w, int revents)
2937{ 3032{
2938 char buf [EV_INOTIFY_BUFSIZE]; 3033 char buf [EV_INOTIFY_BUFSIZE];
2939 struct inotify_event *ev = (struct inotify_event *)buf;
2940 int ofs; 3034 int ofs;
2941 int len = read (fs_fd, buf, sizeof (buf)); 3035 int len = read (fs_fd, buf, sizeof (buf));
2942 3036
2943 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);
2944 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;
2945} 3075}
2946 3076
2947inline_size void 3077inline_size void
2948check_2625 (EV_P) 3078ev_check_2625 (EV_P)
2949{ 3079{
2950 /* kernels < 2.6.25 are borked 3080 /* kernels < 2.6.25 are borked
2951 * 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
2952 */ 3082 */
2953 struct utsname buf; 3083 if (ev_linux_version () < 0x020619)
2954 int major, minor, micro;
2955
2956 if (uname (&buf))
2957 return; 3084 return;
2958 3085
2959 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2960 return;
2961
2962 if (major < 2
2963 || (major == 2 && minor < 6)
2964 || (major == 2 && minor == 6 && micro < 25))
2965 return;
2966
2967 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 ();
2968} 3098}
2969 3099
2970inline_size void 3100inline_size void
2971infy_init (EV_P) 3101infy_init (EV_P)
2972{ 3102{
2973 if (fs_fd != -2) 3103 if (fs_fd != -2)
2974 return; 3104 return;
2975 3105
2976 fs_fd = -1; 3106 fs_fd = -1;
2977 3107
2978 check_2625 (EV_A); 3108 ev_check_2625 (EV_A);
2979 3109
2980 fs_fd = inotify_init (); 3110 fs_fd = infy_newfd ();
2981 3111
2982 if (fs_fd >= 0) 3112 if (fs_fd >= 0)
2983 { 3113 {
3114 fd_intern (fs_fd);
2984 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3115 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2985 ev_set_priority (&fs_w, EV_MAXPRI); 3116 ev_set_priority (&fs_w, EV_MAXPRI);
2986 ev_io_start (EV_A_ &fs_w); 3117 ev_io_start (EV_A_ &fs_w);
3118 ev_unref (EV_A);
2987 } 3119 }
2988} 3120}
2989 3121
2990inline_size void 3122inline_size void
2991infy_fork (EV_P) 3123infy_fork (EV_P)
2993 int slot; 3125 int slot;
2994 3126
2995 if (fs_fd < 0) 3127 if (fs_fd < 0)
2996 return; 3128 return;
2997 3129
3130 ev_ref (EV_A);
3131 ev_io_stop (EV_A_ &fs_w);
2998 close (fs_fd); 3132 close (fs_fd);
2999 fs_fd = inotify_init (); 3133 fs_fd = infy_newfd ();
3000 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
3001 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3143 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3002 { 3144 {
3003 WL w_ = fs_hash [slot].head; 3145 WL w_ = fs_hash [slot].head;
3004 fs_hash [slot].head = 0; 3146 fs_hash [slot].head = 0;
3005 3147
3006 while (w_) 3148 while (w_)
3011 w->wd = -1; 3153 w->wd = -1;
3012 3154
3013 if (fs_fd >= 0) 3155 if (fs_fd >= 0)
3014 infy_add (EV_A_ w); /* re-add, no matter what */ 3156 infy_add (EV_A_ w); /* re-add, no matter what */
3015 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);
3016 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 }
3017 } 3164 }
3018 } 3165 }
3019} 3166}
3020 3167
3021#endif 3168#endif
3038static void noinline 3185static void noinline
3039stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3186stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3040{ 3187{
3041 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3188 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3042 3189
3043 /* we copy this here each the time so that */ 3190 ev_statdata prev = w->attr;
3044 /* prev has the old value when the callback gets invoked */
3045 w->prev = w->attr;
3046 ev_stat_stat (EV_A_ w); 3191 ev_stat_stat (EV_A_ w);
3047 3192
3048 /* 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 */
3049 if ( 3194 if (
3050 w->prev.st_dev != w->attr.st_dev 3195 prev.st_dev != w->attr.st_dev
3051 || w->prev.st_ino != w->attr.st_ino 3196 || prev.st_ino != w->attr.st_ino
3052 || w->prev.st_mode != w->attr.st_mode 3197 || prev.st_mode != w->attr.st_mode
3053 || w->prev.st_nlink != w->attr.st_nlink 3198 || prev.st_nlink != w->attr.st_nlink
3054 || w->prev.st_uid != w->attr.st_uid 3199 || prev.st_uid != w->attr.st_uid
3055 || w->prev.st_gid != w->attr.st_gid 3200 || prev.st_gid != w->attr.st_gid
3056 || w->prev.st_rdev != w->attr.st_rdev 3201 || prev.st_rdev != w->attr.st_rdev
3057 || w->prev.st_size != w->attr.st_size 3202 || prev.st_size != w->attr.st_size
3058 || w->prev.st_atime != w->attr.st_atime 3203 || prev.st_atime != w->attr.st_atime
3059 || w->prev.st_mtime != w->attr.st_mtime 3204 || prev.st_mtime != w->attr.st_mtime
3060 || w->prev.st_ctime != w->attr.st_ctime 3205 || prev.st_ctime != w->attr.st_ctime
3061 ) { 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
3062 #if EV_USE_INOTIFY 3212 #if EV_USE_INOTIFY
3063 if (fs_fd >= 0) 3213 if (fs_fd >= 0)
3064 { 3214 {
3065 infy_del (EV_A_ w); 3215 infy_del (EV_A_ w);
3066 infy_add (EV_A_ w); 3216 infy_add (EV_A_ w);
3091 3241
3092 if (fs_fd >= 0) 3242 if (fs_fd >= 0)
3093 infy_add (EV_A_ w); 3243 infy_add (EV_A_ w);
3094 else 3244 else
3095#endif 3245#endif
3246 {
3096 ev_timer_again (EV_A_ &w->timer); 3247 ev_timer_again (EV_A_ &w->timer);
3248 ev_unref (EV_A);
3249 }
3097 3250
3098 ev_start (EV_A_ (W)w, 1); 3251 ev_start (EV_A_ (W)w, 1);
3099 3252
3100 EV_FREQUENT_CHECK; 3253 EV_FREQUENT_CHECK;
3101} 3254}
3110 EV_FREQUENT_CHECK; 3263 EV_FREQUENT_CHECK;
3111 3264
3112#if EV_USE_INOTIFY 3265#if EV_USE_INOTIFY
3113 infy_del (EV_A_ w); 3266 infy_del (EV_A_ w);
3114#endif 3267#endif
3268
3269 if (ev_is_active (&w->timer))
3270 {
3271 ev_ref (EV_A);
3115 ev_timer_stop (EV_A_ &w->timer); 3272 ev_timer_stop (EV_A_ &w->timer);
3273 }
3116 3274
3117 ev_stop (EV_A_ (W)w); 3275 ev_stop (EV_A_ (W)w);
3118 3276
3119 EV_FREQUENT_CHECK; 3277 EV_FREQUENT_CHECK;
3120} 3278}
3165 3323
3166 EV_FREQUENT_CHECK; 3324 EV_FREQUENT_CHECK;
3167} 3325}
3168#endif 3326#endif
3169 3327
3328#if EV_PREPARE_ENABLE
3170void 3329void
3171ev_prepare_start (EV_P_ ev_prepare *w) 3330ev_prepare_start (EV_P_ ev_prepare *w)
3172{ 3331{
3173 if (expect_false (ev_is_active (w))) 3332 if (expect_false (ev_is_active (w)))
3174 return; 3333 return;
3200 3359
3201 ev_stop (EV_A_ (W)w); 3360 ev_stop (EV_A_ (W)w);
3202 3361
3203 EV_FREQUENT_CHECK; 3362 EV_FREQUENT_CHECK;
3204} 3363}
3364#endif
3205 3365
3366#if EV_CHECK_ENABLE
3206void 3367void
3207ev_check_start (EV_P_ ev_check *w) 3368ev_check_start (EV_P_ ev_check *w)
3208{ 3369{
3209 if (expect_false (ev_is_active (w))) 3370 if (expect_false (ev_is_active (w)))
3210 return; 3371 return;
3236 3397
3237 ev_stop (EV_A_ (W)w); 3398 ev_stop (EV_A_ (W)w);
3238 3399
3239 EV_FREQUENT_CHECK; 3400 EV_FREQUENT_CHECK;
3240} 3401}
3402#endif
3241 3403
3242#if EV_EMBED_ENABLE 3404#if EV_EMBED_ENABLE
3243void noinline 3405void noinline
3244ev_embed_sweep (EV_P_ ev_embed *w) 3406ev_embed_sweep (EV_P_ ev_embed *w)
3245{ 3407{
3340 3502
3341 ev_io_stop (EV_A_ &w->io); 3503 ev_io_stop (EV_A_ &w->io);
3342 ev_prepare_stop (EV_A_ &w->prepare); 3504 ev_prepare_stop (EV_A_ &w->prepare);
3343 ev_fork_stop (EV_A_ &w->fork); 3505 ev_fork_stop (EV_A_ &w->fork);
3344 3506
3507 ev_stop (EV_A_ (W)w);
3508
3345 EV_FREQUENT_CHECK; 3509 EV_FREQUENT_CHECK;
3346} 3510}
3347#endif 3511#endif
3348 3512
3349#if EV_FORK_ENABLE 3513#if EV_FORK_ENABLE
3475{ 3639{
3476 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));
3477 3641
3478 if (expect_false (!once)) 3642 if (expect_false (!once))
3479 { 3643 {
3480 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3644 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3481 return; 3645 return;
3482 } 3646 }
3483 3647
3484 once->cb = cb; 3648 once->cb = cb;
3485 once->arg = arg; 3649 once->arg = arg;
3572 if (types & EV_ASYNC) 3736 if (types & EV_ASYNC)
3573 for (i = asynccnt; i--; ) 3737 for (i = asynccnt; i--; )
3574 cb (EV_A_ EV_ASYNC, asyncs [i]); 3738 cb (EV_A_ EV_ASYNC, asyncs [i]);
3575#endif 3739#endif
3576 3740
3741#if EV_PREPARE_ENABLE
3577 if (types & EV_PREPARE) 3742 if (types & EV_PREPARE)
3578 for (i = preparecnt; i--; ) 3743 for (i = preparecnt; i--; )
3579#if EV_EMBED_ENABLE 3744# if EV_EMBED_ENABLE
3580 if (ev_cb (prepares [i]) != embed_prepare_cb) 3745 if (ev_cb (prepares [i]) != embed_prepare_cb)
3581#endif 3746# endif
3582 cb (EV_A_ EV_PREPARE, prepares [i]); 3747 cb (EV_A_ EV_PREPARE, prepares [i]);
3748#endif
3583 3749
3750#if EV_CHECK_ENABLE
3584 if (types & EV_CHECK) 3751 if (types & EV_CHECK)
3585 for (i = checkcnt; i--; ) 3752 for (i = checkcnt; i--; )
3586 cb (EV_A_ EV_CHECK, checks [i]); 3753 cb (EV_A_ EV_CHECK, checks [i]);
3754#endif
3587 3755
3756#if EV_SIGNAL_ENABLE
3588 if (types & EV_SIGNAL) 3757 if (types & EV_SIGNAL)
3589 for (i = 0; i < EV_NSIG - 1; ++i) 3758 for (i = 0; i < EV_NSIG - 1; ++i)
3590 for (wl = signals [i].head; wl; ) 3759 for (wl = signals [i].head; wl; )
3591 { 3760 {
3592 wn = wl->next; 3761 wn = wl->next;
3593 cb (EV_A_ EV_SIGNAL, wl); 3762 cb (EV_A_ EV_SIGNAL, wl);
3594 wl = wn; 3763 wl = wn;
3595 } 3764 }
3765#endif
3596 3766
3767#if EV_CHILD_ENABLE
3597 if (types & EV_CHILD) 3768 if (types & EV_CHILD)
3598 for (i = EV_PID_HASHSIZE; i--; ) 3769 for (i = (EV_PID_HASHSIZE); i--; )
3599 for (wl = childs [i]; wl; ) 3770 for (wl = childs [i]; wl; )
3600 { 3771 {
3601 wn = wl->next; 3772 wn = wl->next;
3602 cb (EV_A_ EV_CHILD, wl); 3773 cb (EV_A_ EV_CHILD, wl);
3603 wl = wn; 3774 wl = wn;
3604 } 3775 }
3776#endif
3605/* EV_STAT 0x00001000 /* stat data changed */ 3777/* EV_STAT 0x00001000 /* stat data changed */
3606/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3778/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3607} 3779}
3608#endif 3780#endif
3609 3781

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines