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

Comparing libev/ev.c (file contents):
Revision 1.310 by root, Sun Jul 26 04:43:03 2009 UTC vs.
Revision 1.343 by root, Fri Apr 2 21:03:46 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 94# endif
88# endif
89
90# ifndef EV_USE_SELECT
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT 1
93# else 95# else
96# undef EV_USE_SELECT
94# define EV_USE_SELECT 0 97# define EV_USE_SELECT 0
98# endif
99
100# if HAVE_POLL && HAVE_POLL_H
101# ifndef EV_USE_POLL
102# define EV_USE_POLL EV_FEATURE_BACKENDS
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# define EV_USE_POLL 0 106# define EV_USE_POLL 0
107# endif
108
109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
110# ifndef EV_USE_EPOLL
111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
103# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
104# endif 116# endif
105 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
106# ifndef EV_USE_EPOLL 119# ifndef EV_USE_KQUEUE
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 1
109# else
110# define EV_USE_EPOLL 0
111# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
112# endif 125# endif
113 126
114# ifndef EV_USE_KQUEUE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 128# ifndef EV_USE_PORT
116# define EV_USE_KQUEUE 1 129# define EV_USE_PORT EV_FEATURE_BACKENDS
117# else
118# define EV_USE_KQUEUE 0
119# endif 130# endif
120# endif
121
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1
125# else 131# else
132# undef EV_USE_PORT
126# define EV_USE_PORT 0 133# define EV_USE_PORT 0
134# endif
135
136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
137# ifndef EV_USE_INOTIFY
138# define EV_USE_INOTIFY EV_FEATURE_OS
127# endif 139# endif
128# endif
129
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1
133# else 140# else
141# undef EV_USE_INOTIFY
134# define EV_USE_INOTIFY 0 142# define EV_USE_INOTIFY 0
143# endif
144
145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
146# ifndef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD EV_FEATURE_OS
135# endif 148# endif
136# endif
137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else 149# else
150# undef EV_USE_SIGNALFD
142# define EV_USE_SIGNALFD 0 151# define EV_USE_SIGNALFD 0
152# endif
153
154# if HAVE_EVENTFD
155# ifndef EV_USE_EVENTFD
156# define EV_USE_EVENTFD EV_FEATURE_OS
143# endif 157# endif
144# endif
145
146# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1
149# else 158# else
159# undef EV_USE_EVENTFD
150# define EV_USE_EVENTFD 0 160# define EV_USE_EVENTFD 0
151# endif
152# endif 161# endif
153 162
154#endif 163#endif
155 164
156#include <math.h> 165#include <math.h>
157#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
158#include <fcntl.h> 168#include <fcntl.h>
159#include <stddef.h> 169#include <stddef.h>
160 170
161#include <stdio.h> 171#include <stdio.h>
162 172
163#include <assert.h> 173#include <assert.h>
164#include <errno.h> 174#include <errno.h>
165#include <sys/types.h> 175#include <sys/types.h>
166#include <time.h> 176#include <time.h>
177#include <limits.h>
167 178
168#include <signal.h> 179#include <signal.h>
169 180
170#ifdef EV_H 181#ifdef EV_H
171# include EV_H 182# include EV_H
182# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 194# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
186# endif 197# endif
198# undef EV_AVOID_STDIO
187#endif 199#endif
188 200
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 201/* this block tries to deduce configuration from header-defined symbols and defaults */
190 202
191/* try to deduce the maximum number of signals on this platform */ 203/* try to deduce the maximum number of signals on this platform */
204#elif defined (MAXSIG) 216#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 217# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 218#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 219# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 220#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 221# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 222#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 223# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 224#else
213# error "unable to find value for NSIG, please report" 225# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 226/* to make it compile regardless, just remove the above line, */
227/* but consider reporting it, too! :) */
215# define EV_NSIG 65 228# define EV_NSIG 65
216#endif 229#endif
217 230
218#ifndef EV_USE_CLOCK_SYSCALL 231#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2 232# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1 233# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
221# else 234# else
222# define EV_USE_CLOCK_SYSCALL 0 235# define EV_USE_CLOCK_SYSCALL 0
223# endif 236# endif
224#endif 237#endif
225 238
226#ifndef EV_USE_MONOTONIC 239#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 240# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1 241# define EV_USE_MONOTONIC EV_FEATURE_OS
229# else 242# else
230# define EV_USE_MONOTONIC 0 243# define EV_USE_MONOTONIC 0
231# endif 244# endif
232#endif 245#endif
233 246
235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 248# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
236#endif 249#endif
237 250
238#ifndef EV_USE_NANOSLEEP 251#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L 252# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1 253# define EV_USE_NANOSLEEP EV_FEATURE_OS
241# else 254# else
242# define EV_USE_NANOSLEEP 0 255# define EV_USE_NANOSLEEP 0
243# endif 256# endif
244#endif 257#endif
245 258
246#ifndef EV_USE_SELECT 259#ifndef EV_USE_SELECT
247# define EV_USE_SELECT 1 260# define EV_USE_SELECT EV_FEATURE_BACKENDS
248#endif 261#endif
249 262
250#ifndef EV_USE_POLL 263#ifndef EV_USE_POLL
251# ifdef _WIN32 264# ifdef _WIN32
252# define EV_USE_POLL 0 265# define EV_USE_POLL 0
253# else 266# else
254# define EV_USE_POLL 1 267# define EV_USE_POLL EV_FEATURE_BACKENDS
255# endif 268# endif
256#endif 269#endif
257 270
258#ifndef EV_USE_EPOLL 271#ifndef EV_USE_EPOLL
259# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
260# define EV_USE_EPOLL 1 273# define EV_USE_EPOLL EV_FEATURE_BACKENDS
261# else 274# else
262# define EV_USE_EPOLL 0 275# define EV_USE_EPOLL 0
263# endif 276# endif
264#endif 277#endif
265 278
271# define EV_USE_PORT 0 284# define EV_USE_PORT 0
272#endif 285#endif
273 286
274#ifndef EV_USE_INOTIFY 287#ifndef EV_USE_INOTIFY
275# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 288# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
276# define EV_USE_INOTIFY 1 289# define EV_USE_INOTIFY EV_FEATURE_OS
277# else 290# else
278# define EV_USE_INOTIFY 0 291# define EV_USE_INOTIFY 0
279# endif 292# endif
280#endif 293#endif
281 294
282#ifndef EV_PID_HASHSIZE 295#ifndef EV_PID_HASHSIZE
283# if EV_MINIMAL 296# 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 297#endif
289 298
290#ifndef EV_INOTIFY_HASHSIZE 299#ifndef EV_INOTIFY_HASHSIZE
291# if EV_MINIMAL 300# 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 301#endif
297 302
298#ifndef EV_USE_EVENTFD 303#ifndef EV_USE_EVENTFD
299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 304# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
300# define EV_USE_EVENTFD 1 305# define EV_USE_EVENTFD EV_FEATURE_OS
301# else 306# else
302# define EV_USE_EVENTFD 0 307# define EV_USE_EVENTFD 0
303# endif 308# endif
304#endif 309#endif
305 310
306#ifndef EV_USE_SIGNALFD 311#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1 313# define EV_USE_SIGNALFD EV_FEATURE_OS
309# else 314# else
310# define EV_USE_SIGNALFD 0 315# define EV_USE_SIGNALFD 0
311# endif 316# endif
312#endif 317#endif
313 318
316# define EV_USE_4HEAP 1 321# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1 322# define EV_HEAP_CACHE_AT 1
318#endif 323#endif
319 324
320#ifndef EV_VERIFY 325#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL 326# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
322#endif 327#endif
323 328
324#ifndef EV_USE_4HEAP 329#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL 330# define EV_USE_4HEAP EV_FEATURE_DATA
326#endif 331#endif
327 332
328#ifndef EV_HEAP_CACHE_AT 333#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL 334# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
330#endif 335#endif
331 336
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 337/* 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. */ 338/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL 339#if EV_USE_CLOCK_SYSCALL
343# endif 348# endif
344#endif 349#endif
345 350
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 351/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347 352
353#ifdef _AIX
354/* AIX has a completely broken poll.h header */
355# undef EV_USE_POLL
356# define EV_USE_POLL 0
357#endif
358
348#ifndef CLOCK_MONOTONIC 359#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC 360# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0 361# define EV_USE_MONOTONIC 0
351#endif 362#endif
352 363
386# include <stdint.h> 397# include <stdint.h>
387# ifndef EFD_NONBLOCK 398# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK 399# define EFD_NONBLOCK O_NONBLOCK
389# endif 400# endif
390# ifndef EFD_CLOEXEC 401# ifndef EFD_CLOEXEC
402# ifdef O_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC 403# define EFD_CLOEXEC O_CLOEXEC
404# else
405# define EFD_CLOEXEC 02000000
406# endif
392# endif 407# endif
393# ifdef __cplusplus 408# ifdef __cplusplus
394extern "C" { 409extern "C" {
395# endif 410# endif
396int eventfd (unsigned int initval, int flags); 411int (eventfd) (unsigned int initval, int flags);
397# ifdef __cplusplus 412# ifdef __cplusplus
398} 413}
399# endif 414# endif
400#endif 415#endif
401 416
402#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
403# include <sys/signalfd.h> 418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
404#endif 422# endif
423# ifndef SFD_CLOEXEC
424# ifdef O_CLOEXEC
425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
429# endif
430# ifdef __cplusplus
431extern "C" {
432# endif
433int signalfd (int fd, const sigset_t *mask, int flags);
434
435struct signalfd_siginfo
436{
437 uint32_t ssi_signo;
438 char pad[128 - sizeof (uint32_t)];
439};
440# ifdef __cplusplus
441}
442# endif
443#endif
444
405 445
406/**/ 446/**/
407 447
408#if EV_VERIFY >= 3 448#if EV_VERIFY >= 3
409# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 449# define EV_FREQUENT_CHECK ev_verify (EV_A)
410#else 450#else
411# define EV_FREQUENT_CHECK do { } while (0) 451# define EV_FREQUENT_CHECK do { } while (0)
412#endif 452#endif
413 453
414/* 454/*
421 */ 461 */
422#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 462#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
423 463
424#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 464#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
425#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 465#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
426/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
427 466
428#if __GNUC__ >= 4 467#if __GNUC__ >= 4
429# define expect(expr,value) __builtin_expect ((expr),(value)) 468# define expect(expr,value) __builtin_expect ((expr),(value))
430# define noinline __attribute__ ((noinline)) 469# define noinline __attribute__ ((noinline))
431#else 470#else
438 477
439#define expect_false(expr) expect ((expr) != 0, 0) 478#define expect_false(expr) expect ((expr) != 0, 0)
440#define expect_true(expr) expect ((expr) != 0, 1) 479#define expect_true(expr) expect ((expr) != 0, 1)
441#define inline_size static inline 480#define inline_size static inline
442 481
443#if EV_MINIMAL 482#if EV_FEATURE_CODE
483# define inline_speed static inline
484#else
444# define inline_speed static noinline 485# define inline_speed static noinline
445#else
446# define inline_speed static inline
447#endif 486#endif
448 487
449#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 488#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
450 489
451#if EV_MINPRI == EV_MAXPRI 490#if EV_MINPRI == EV_MAXPRI
472 511
473#if EV_USE_MONOTONIC 512#if EV_USE_MONOTONIC
474static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 513static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
475#endif 514#endif
476 515
516#ifndef EV_FD_TO_WIN32_HANDLE
517# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
518#endif
519#ifndef EV_WIN32_HANDLE_TO_FD
520# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
521#endif
522#ifndef EV_WIN32_CLOSE_FD
523# define EV_WIN32_CLOSE_FD(fd) close (fd)
524#endif
525
477#ifdef _WIN32 526#ifdef _WIN32
478# include "ev_win32.c" 527# include "ev_win32.c"
479#endif 528#endif
480 529
481/*****************************************************************************/ 530/*****************************************************************************/
531
532#if EV_AVOID_STDIO
533static void noinline
534ev_printerr (const char *msg)
535{
536 write (STDERR_FILENO, msg, strlen (msg));
537}
538#endif
482 539
483static void (*syserr_cb)(const char *msg); 540static void (*syserr_cb)(const char *msg);
484 541
485void 542void
486ev_set_syserr_cb (void (*cb)(const char *msg)) 543ev_set_syserr_cb (void (*cb)(const char *msg))
496 553
497 if (syserr_cb) 554 if (syserr_cb)
498 syserr_cb (msg); 555 syserr_cb (msg);
499 else 556 else
500 { 557 {
558#if EV_AVOID_STDIO
559 const char *err = strerror (errno);
560
561 ev_printerr (msg);
562 ev_printerr (": ");
563 ev_printerr (err);
564 ev_printerr ("\n");
565#else
501 perror (msg); 566 perror (msg);
567#endif
502 abort (); 568 abort ();
503 } 569 }
504} 570}
505 571
506static void * 572static void *
507ev_realloc_emul (void *ptr, long size) 573ev_realloc_emul (void *ptr, long size)
508{ 574{
575#if __GLIBC__
576 return realloc (ptr, size);
577#else
509 /* some systems, notably openbsd and darwin, fail to properly 578 /* some systems, notably openbsd and darwin, fail to properly
510 * implement realloc (x, 0) (as required by both ansi c-98 and 579 * implement realloc (x, 0) (as required by both ansi c-89 and
511 * the single unix specification, so work around them here. 580 * the single unix specification, so work around them here.
512 */ 581 */
513 582
514 if (size) 583 if (size)
515 return realloc (ptr, size); 584 return realloc (ptr, size);
516 585
517 free (ptr); 586 free (ptr);
518 return 0; 587 return 0;
588#endif
519} 589}
520 590
521static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 591static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
522 592
523void 593void
531{ 601{
532 ptr = alloc (ptr, size); 602 ptr = alloc (ptr, size);
533 603
534 if (!ptr && size) 604 if (!ptr && size)
535 { 605 {
606#if EV_AVOID_STDIO
607 ev_printerr ("libev: memory allocation failed, aborting.\n");
608#else
536 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 609 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
610#endif
537 abort (); 611 abort ();
538 } 612 }
539 613
540 return ptr; 614 return ptr;
541} 615}
623 697
624 static int ev_default_loop_ptr; 698 static int ev_default_loop_ptr;
625 699
626#endif 700#endif
627 701
628#if EV_MINIMAL < 2 702#if EV_FEATURE_API
629# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 703# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
630# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 704# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
631# define EV_INVOKE_PENDING invoke_cb (EV_A) 705# define EV_INVOKE_PENDING invoke_cb (EV_A)
632#else 706#else
633# define EV_RELEASE_CB (void)0 707# define EV_RELEASE_CB (void)0
818} 892}
819 893
820/*****************************************************************************/ 894/*****************************************************************************/
821 895
822inline_speed void 896inline_speed void
823fd_event_nc (EV_P_ int fd, int revents) 897fd_event_nocheck (EV_P_ int fd, int revents)
824{ 898{
825 ANFD *anfd = anfds + fd; 899 ANFD *anfd = anfds + fd;
826 ev_io *w; 900 ev_io *w;
827 901
828 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 902 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
840fd_event (EV_P_ int fd, int revents) 914fd_event (EV_P_ int fd, int revents)
841{ 915{
842 ANFD *anfd = anfds + fd; 916 ANFD *anfd = anfds + fd;
843 917
844 if (expect_true (!anfd->reify)) 918 if (expect_true (!anfd->reify))
845 fd_event_nc (EV_A_ fd, revents); 919 fd_event_nocheck (EV_A_ fd, revents);
846} 920}
847 921
848void 922void
849ev_feed_fd_event (EV_P_ int fd, int revents) 923ev_feed_fd_event (EV_P_ int fd, int revents)
850{ 924{
851 if (fd >= 0 && fd < anfdmax) 925 if (fd >= 0 && fd < anfdmax)
852 fd_event_nc (EV_A_ fd, revents); 926 fd_event_nocheck (EV_A_ fd, revents);
853} 927}
854 928
855/* make sure the external fd watch events are in-sync */ 929/* make sure the external fd watch events are in-sync */
856/* with the kernel/libev internal state */ 930/* with the kernel/libev internal state */
857inline_size void 931inline_size void
872 946
873#if EV_SELECT_IS_WINSOCKET 947#if EV_SELECT_IS_WINSOCKET
874 if (events) 948 if (events)
875 { 949 {
876 unsigned long arg; 950 unsigned long arg;
877 #ifdef EV_FD_TO_WIN32_HANDLE
878 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 951 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
879 #else
880 anfd->handle = _get_osfhandle (fd);
881 #endif
882 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 952 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
883 } 953 }
884#endif 954#endif
885 955
886 { 956 {
924 ev_io_stop (EV_A_ w); 994 ev_io_stop (EV_A_ w);
925 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 995 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
926 } 996 }
927} 997}
928 998
929/* check whether the given fd is atcually valid, for error recovery */ 999/* check whether the given fd is actually valid, for error recovery */
930inline_size int 1000inline_size int
931fd_valid (int fd) 1001fd_valid (int fd)
932{ 1002{
933#ifdef _WIN32 1003#ifdef _WIN32
934 return _get_osfhandle (fd) != -1; 1004 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
935#else 1005#else
936 return fcntl (fd, F_GETFD) != -1; 1006 return fcntl (fd, F_GETFD) != -1;
937#endif 1007#endif
938} 1008}
939 1009
974 { 1044 {
975 anfds [fd].events = 0; 1045 anfds [fd].events = 0;
976 anfds [fd].emask = 0; 1046 anfds [fd].emask = 0;
977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1047 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
978 } 1048 }
1049}
1050
1051/* used to prepare libev internal fd's */
1052/* this is not fork-safe */
1053inline_speed void
1054fd_intern (int fd)
1055{
1056#ifdef _WIN32
1057 unsigned long arg = 1;
1058 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1059#else
1060 fcntl (fd, F_SETFD, FD_CLOEXEC);
1061 fcntl (fd, F_SETFL, O_NONBLOCK);
1062#endif
979} 1063}
980 1064
981/*****************************************************************************/ 1065/*****************************************************************************/
982 1066
983/* 1067/*
1137 1221
1138static ANSIG signals [EV_NSIG - 1]; 1222static ANSIG signals [EV_NSIG - 1];
1139 1223
1140/*****************************************************************************/ 1224/*****************************************************************************/
1141 1225
1142/* used to prepare libev internal fd's */ 1226#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1143/* this is not fork-safe */
1144inline_speed void
1145fd_intern (int fd)
1146{
1147#ifdef _WIN32
1148 unsigned long arg = 1;
1149 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1150#else
1151 fcntl (fd, F_SETFD, FD_CLOEXEC);
1152 fcntl (fd, F_SETFL, O_NONBLOCK);
1153#endif
1154}
1155 1227
1156static void noinline 1228static void noinline
1157evpipe_init (EV_P) 1229evpipe_init (EV_P)
1158{ 1230{
1159 if (!ev_is_active (&pipe_w)) 1231 if (!ev_is_active (&pipe_w))
1160 { 1232 {
1161#if EV_USE_EVENTFD 1233# if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1234 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL) 1235 if (evfd < 0 && errno == EINVAL)
1164 evfd = eventfd (0, 0); 1236 evfd = eventfd (0, 0);
1165 1237
1166 if (evfd >= 0) 1238 if (evfd >= 0)
1168 evpipe [0] = -1; 1240 evpipe [0] = -1;
1169 fd_intern (evfd); /* doing it twice doesn't hurt */ 1241 fd_intern (evfd); /* doing it twice doesn't hurt */
1170 ev_io_set (&pipe_w, evfd, EV_READ); 1242 ev_io_set (&pipe_w, evfd, EV_READ);
1171 } 1243 }
1172 else 1244 else
1173#endif 1245# endif
1174 { 1246 {
1175 while (pipe (evpipe)) 1247 while (pipe (evpipe))
1176 ev_syserr ("(libev) error creating signal/async pipe"); 1248 ev_syserr ("(libev) error creating signal/async pipe");
1177 1249
1178 fd_intern (evpipe [0]); 1250 fd_intern (evpipe [0]);
1189evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1261evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1190{ 1262{
1191 if (!*flag) 1263 if (!*flag)
1192 { 1264 {
1193 int old_errno = errno; /* save errno because write might clobber it */ 1265 int old_errno = errno; /* save errno because write might clobber it */
1266 char dummy;
1194 1267
1195 *flag = 1; 1268 *flag = 1;
1196 1269
1197#if EV_USE_EVENTFD 1270#if EV_USE_EVENTFD
1198 if (evfd >= 0) 1271 if (evfd >= 0)
1200 uint64_t counter = 1; 1273 uint64_t counter = 1;
1201 write (evfd, &counter, sizeof (uint64_t)); 1274 write (evfd, &counter, sizeof (uint64_t));
1202 } 1275 }
1203 else 1276 else
1204#endif 1277#endif
1205 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1206 1279
1207 errno = old_errno; 1280 errno = old_errno;
1208 } 1281 }
1209} 1282}
1210 1283
1259{ 1332{
1260#if EV_MULTIPLICITY 1333#if EV_MULTIPLICITY
1261 EV_P = signals [signum - 1].loop; 1334 EV_P = signals [signum - 1].loop;
1262#endif 1335#endif
1263 1336
1264#if _WIN32 1337#ifdef _WIN32
1265 signal (signum, ev_sighandler); 1338 signal (signum, ev_sighandler);
1266#endif 1339#endif
1267 1340
1268 signals [signum - 1].pending = 1; 1341 signals [signum - 1].pending = 1;
1269 evpipe_write (EV_A_ &sig_pending); 1342 evpipe_write (EV_A_ &sig_pending);
1311 break; 1384 break;
1312 } 1385 }
1313} 1386}
1314#endif 1387#endif
1315 1388
1389#endif
1390
1316/*****************************************************************************/ 1391/*****************************************************************************/
1317 1392
1393#if EV_CHILD_ENABLE
1318static WL childs [EV_PID_HASHSIZE]; 1394static WL childs [EV_PID_HASHSIZE];
1319
1320#ifndef _WIN32
1321 1395
1322static ev_signal childev; 1396static ev_signal childev;
1323 1397
1324#ifndef WIFCONTINUED 1398#ifndef WIFCONTINUED
1325# define WIFCONTINUED(status) 0 1399# define WIFCONTINUED(status) 0
1330child_reap (EV_P_ int chain, int pid, int status) 1404child_reap (EV_P_ int chain, int pid, int status)
1331{ 1405{
1332 ev_child *w; 1406 ev_child *w;
1333 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1407 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1334 1408
1335 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1409 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1336 { 1410 {
1337 if ((w->pid == pid || !w->pid) 1411 if ((w->pid == pid || !w->pid)
1338 && (!traced || (w->flags & 1))) 1412 && (!traced || (w->flags & 1)))
1339 { 1413 {
1340 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1414 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
1365 /* make sure we are called again until all children have been reaped */ 1439 /* make sure we are called again until all children have been reaped */
1366 /* we need to do it this way so that the callback gets called before we continue */ 1440 /* we need to do it this way so that the callback gets called before we continue */
1367 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1441 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1368 1442
1369 child_reap (EV_A_ pid, pid, status); 1443 child_reap (EV_A_ pid, pid, status);
1370 if (EV_PID_HASHSIZE > 1) 1444 if ((EV_PID_HASHSIZE) > 1)
1371 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1445 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1372} 1446}
1373 1447
1374#endif 1448#endif
1375 1449
1442#ifdef __APPLE__ 1516#ifdef __APPLE__
1443 /* only select works correctly on that "unix-certified" platform */ 1517 /* only select works correctly on that "unix-certified" platform */
1444 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1518 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1445 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1519 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1446#endif 1520#endif
1521#ifdef __FreeBSD__
1522 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1523#endif
1447 1524
1448 return flags; 1525 return flags;
1449} 1526}
1450 1527
1451unsigned int 1528unsigned int
1464ev_backend (EV_P) 1541ev_backend (EV_P)
1465{ 1542{
1466 return backend; 1543 return backend;
1467} 1544}
1468 1545
1469#if EV_MINIMAL < 2 1546#if EV_FEATURE_API
1470unsigned int 1547unsigned int
1471ev_loop_count (EV_P) 1548ev_iteration (EV_P)
1472{ 1549{
1473 return loop_count; 1550 return loop_count;
1474} 1551}
1475 1552
1476unsigned int 1553unsigned int
1477ev_loop_depth (EV_P) 1554ev_depth (EV_P)
1478{ 1555{
1479 return loop_depth; 1556 return loop_depth;
1480} 1557}
1481 1558
1482void 1559void
1554 1631
1555 ev_rt_now = ev_time (); 1632 ev_rt_now = ev_time ();
1556 mn_now = get_clock (); 1633 mn_now = get_clock ();
1557 now_floor = mn_now; 1634 now_floor = mn_now;
1558 rtmn_diff = ev_rt_now - mn_now; 1635 rtmn_diff = ev_rt_now - mn_now;
1559#if EV_MINIMAL < 2 1636#if EV_FEATURE_API
1560 invoke_cb = ev_invoke_pending; 1637 invoke_cb = ev_invoke_pending;
1561#endif 1638#endif
1562 1639
1563 io_blocktime = 0.; 1640 io_blocktime = 0.;
1564 timeout_blocktime = 0.; 1641 timeout_blocktime = 0.;
1570#endif 1647#endif
1571#if EV_USE_INOTIFY 1648#if EV_USE_INOTIFY
1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1649 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1573#endif 1650#endif
1574#if EV_USE_SIGNALFD 1651#if EV_USE_SIGNALFD
1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1652 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1576#endif 1653#endif
1577 1654
1578 if (!(flags & 0x0000ffffU)) 1655 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1656 flags |= ev_recommended_backends ();
1580 1657
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1671 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1672#endif
1596 1673
1597 ev_prepare_init (&pending_w, pendingcb); 1674 ev_prepare_init (&pending_w, pendingcb);
1598 1675
1676#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1677 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1678 ev_set_priority (&pipe_w, EV_MAXPRI);
1679#endif
1601 } 1680 }
1602} 1681}
1603 1682
1604/* free up a loop structure */ 1683/* free up a loop structure */
1605static void noinline 1684static void noinline
1617 close (evfd); 1696 close (evfd);
1618#endif 1697#endif
1619 1698
1620 if (evpipe [0] >= 0) 1699 if (evpipe [0] >= 0)
1621 { 1700 {
1622 close (evpipe [0]); 1701 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1702 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1703 }
1625 } 1704 }
1626 1705
1627#if EV_USE_SIGNALFD 1706#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1707 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1708 close (sigfd);
1634 }
1635#endif 1709#endif
1636 1710
1637#if EV_USE_INOTIFY 1711#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1712 if (fs_fd >= 0)
1639 close (fs_fd); 1713 close (fs_fd);
1724 close (evfd); 1798 close (evfd);
1725#endif 1799#endif
1726 1800
1727 if (evpipe [0] >= 0) 1801 if (evpipe [0] >= 0)
1728 { 1802 {
1729 close (evpipe [0]); 1803 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1804 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1805 }
1732 1806
1807#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 1808 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1809 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1810 pipecb (EV_A_ &pipe_w, EV_READ);
1811#endif
1736 } 1812 }
1737 1813
1738 postfork = 0; 1814 postfork = 0;
1739} 1815}
1740 1816
1802 verify_watcher (EV_A_ ws [cnt]); 1878 verify_watcher (EV_A_ ws [cnt]);
1803 } 1879 }
1804} 1880}
1805#endif 1881#endif
1806 1882
1807#if EV_MINIMAL < 2 1883#if EV_FEATURE_API
1808void 1884void
1809ev_loop_verify (EV_P) 1885ev_verify (EV_P)
1810{ 1886{
1811#if EV_VERIFY 1887#if EV_VERIFY
1812 int i; 1888 int i;
1813 WL w; 1889 WL w;
1814 1890
1853#if EV_ASYNC_ENABLE 1929#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 1930 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 1931 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 1932#endif
1857 1933
1934#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 1935 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 1936 array_verify (EV_A_ (W *)prepares, preparecnt);
1937#endif
1860 1938
1939#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 1940 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1941 array_verify (EV_A_ (W *)checks, checkcnt);
1942#endif
1863 1943
1864# if 0 1944# if 0
1945#if EV_CHILD_ENABLE
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1946 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending) 1947 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1948#endif
1867# endif 1949# endif
1868#endif 1950#endif
1869} 1951}
1870#endif 1952#endif
1871 1953
1887 1969
1888 loop_init (EV_A_ flags); 1970 loop_init (EV_A_ flags);
1889 1971
1890 if (ev_backend (EV_A)) 1972 if (ev_backend (EV_A))
1891 { 1973 {
1892#ifndef _WIN32 1974#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 1975 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 1976 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 1977 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1978 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 1979#endif
1910 EV_P = ev_default_loop_ptr; 1992 EV_P = ev_default_loop_ptr;
1911#endif 1993#endif
1912 1994
1913 ev_default_loop_ptr = 0; 1995 ev_default_loop_ptr = 0;
1914 1996
1915#ifndef _WIN32 1997#if EV_CHILD_ENABLE
1916 ev_ref (EV_A); /* child watcher */ 1998 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev); 1999 ev_signal_stop (EV_A_ &childev);
1918#endif 2000#endif
1919 2001
1920 loop_destroy (EV_A); 2002 loop_destroy (EV_A);
2026 EV_FREQUENT_CHECK; 2108 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w); 2109 feed_reverse (EV_A_ (W)w);
2028 } 2110 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2111 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030 2112
2031 feed_reverse_done (EV_A_ EV_TIMEOUT); 2113 feed_reverse_done (EV_A_ EV_TIMER);
2032 } 2114 }
2033} 2115}
2034 2116
2035#if EV_PERIODIC_ENABLE 2117#if EV_PERIODIC_ENABLE
2036/* make periodics pending */ 2118/* make periodics pending */
2127 ANHE_at_cache (*he); 2209 ANHE_at_cache (*he);
2128 } 2210 }
2129} 2211}
2130 2212
2131/* fetch new monotonic and realtime times from the kernel */ 2213/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2214/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2215inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2216time_update (EV_P_ ev_tstamp max_block)
2135{ 2217{
2136#if EV_USE_MONOTONIC 2218#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2219 if (expect_true (have_monotonic))
2197} 2279}
2198 2280
2199void 2281void
2200ev_loop (EV_P_ int flags) 2282ev_loop (EV_P_ int flags)
2201{ 2283{
2202#if EV_MINIMAL < 2 2284#if EV_FEATURE_API
2203 ++loop_depth; 2285 ++loop_depth;
2204#endif 2286#endif
2205 2287
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2288 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207 2289
2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2292 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2211 2293
2212 do 2294 do
2213 { 2295 {
2214#if EV_VERIFY >= 2 2296#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A); 2297 ev_verify (EV_A);
2216#endif 2298#endif
2217 2299
2218#ifndef _WIN32 2300#ifndef _WIN32
2219 if (expect_false (curpid)) /* penalise the forking check even more */ 2301 if (expect_false (curpid)) /* penalise the forking check even more */
2220 if (expect_false (getpid () != curpid)) 2302 if (expect_false (getpid () != curpid))
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2314 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2315 EV_INVOKE_PENDING;
2234 } 2316 }
2235#endif 2317#endif
2236 2318
2319#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2320 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2321 if (expect_false (preparecnt))
2239 { 2322 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2323 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2324 EV_INVOKE_PENDING;
2242 } 2325 }
2326#endif
2243 2327
2244 if (expect_false (loop_done)) 2328 if (expect_false (loop_done))
2245 break; 2329 break;
2246 2330
2247 /* we might have forked, so reify kernel state if necessary */ 2331 /* we might have forked, so reify kernel state if necessary */
2298 waittime -= sleeptime; 2382 waittime -= sleeptime;
2299 } 2383 }
2300 } 2384 }
2301 } 2385 }
2302 2386
2303#if EV_MINIMAL < 2 2387#if EV_FEATURE_API
2304 ++loop_count; 2388 ++loop_count;
2305#endif 2389#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2307 backend_poll (EV_A_ waittime); 2391 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2320#if EV_IDLE_ENABLE 2404#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2405 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2406 idle_reify (EV_A);
2323#endif 2407#endif
2324 2408
2409#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2410 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2411 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2412 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2413#endif
2328 2414
2329 EV_INVOKE_PENDING; 2415 EV_INVOKE_PENDING;
2330 } 2416 }
2331 while (expect_true ( 2417 while (expect_true (
2332 activecnt 2418 activecnt
2335 )); 2421 ));
2336 2422
2337 if (loop_done == EVUNLOOP_ONE) 2423 if (loop_done == EVUNLOOP_ONE)
2338 loop_done = EVUNLOOP_CANCEL; 2424 loop_done = EVUNLOOP_CANCEL;
2339 2425
2340#if EV_MINIMAL < 2 2426#if EV_FEATURE_API
2341 --loop_depth; 2427 --loop_depth;
2342#endif 2428#endif
2343} 2429}
2344 2430
2345void 2431void
2471 2557
2472 if (expect_false (ev_is_active (w))) 2558 if (expect_false (ev_is_active (w)))
2473 return; 2559 return;
2474 2560
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2561 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2562 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2563
2478 EV_FREQUENT_CHECK; 2564 EV_FREQUENT_CHECK;
2479 2565
2480 ev_start (EV_A_ (W)w, 1); 2566 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2567 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2551 timers [active] = timers [timercnt + HEAP0]; 2637 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2638 adjustheap (timers, timercnt, active);
2553 } 2639 }
2554 } 2640 }
2555 2641
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2642 ev_at (w) -= mn_now;
2559 2643
2560 ev_stop (EV_A_ (W)w); 2644 ev_stop (EV_A_ (W)w);
2645
2646 EV_FREQUENT_CHECK;
2561} 2647}
2562 2648
2563void noinline 2649void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2650ev_timer_again (EV_P_ ev_timer *w)
2565{ 2651{
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2730 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2731 adjustheap (periodics, periodiccnt, active);
2646 } 2732 }
2647 } 2733 }
2648 2734
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2735 ev_stop (EV_A_ (W)w);
2736
2737 EV_FREQUENT_CHECK;
2652} 2738}
2653 2739
2654void noinline 2740void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2741ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2742{
2661#endif 2747#endif
2662 2748
2663#ifndef SA_RESTART 2749#ifndef SA_RESTART
2664# define SA_RESTART 0 2750# define SA_RESTART 0
2665#endif 2751#endif
2752
2753#if EV_SIGNAL_ENABLE
2666 2754
2667void noinline 2755void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2756ev_signal_start (EV_P_ ev_signal *w)
2669{ 2757{
2670 if (expect_false (ev_is_active (w))) 2758 if (expect_false (ev_is_active (w)))
2717 if (!((WL)w)->next) 2805 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD 2806# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/ 2807 if (sigfd < 0) /*TODO*/
2720# endif 2808# endif
2721 { 2809 {
2722# if _WIN32 2810# ifdef _WIN32
2811 evpipe_init (EV_A);
2812
2723 signal (w->signum, ev_sighandler); 2813 signal (w->signum, ev_sighandler);
2724# else 2814# else
2725 struct sigaction sa; 2815 struct sigaction sa;
2726 2816
2727 evpipe_init (EV_A); 2817 evpipe_init (EV_A);
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2848 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif 2849#endif
2760#if EV_USE_SIGNALFD 2850#if EV_USE_SIGNALFD
2761 if (sigfd >= 0) 2851 if (sigfd >= 0)
2762 { 2852 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2853 sigset_t ss;
2854
2855 sigemptyset (&ss);
2856 sigaddset (&ss, w->signum);
2764 sigdelset (&sigfd_set, w->signum); 2857 sigdelset (&sigfd_set, w->signum);
2858
2765 signalfd (sigfd, &sigfd_set, 0); 2859 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2860 sigprocmask (SIG_UNBLOCK, &ss, 0);
2767 /*TODO: maybe unblock signal? */
2768 } 2861 }
2769 else 2862 else
2770#endif 2863#endif
2771 signal (w->signum, SIG_DFL); 2864 signal (w->signum, SIG_DFL);
2772 } 2865 }
2773 2866
2774 EV_FREQUENT_CHECK; 2867 EV_FREQUENT_CHECK;
2775} 2868}
2776 2869
2870#endif
2871
2872#if EV_CHILD_ENABLE
2873
2777void 2874void
2778ev_child_start (EV_P_ ev_child *w) 2875ev_child_start (EV_P_ ev_child *w)
2779{ 2876{
2780#if EV_MULTIPLICITY 2877#if EV_MULTIPLICITY
2781 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2878 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2784 return; 2881 return;
2785 2882
2786 EV_FREQUENT_CHECK; 2883 EV_FREQUENT_CHECK;
2787 2884
2788 ev_start (EV_A_ (W)w, 1); 2885 ev_start (EV_A_ (W)w, 1);
2789 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2886 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2790 2887
2791 EV_FREQUENT_CHECK; 2888 EV_FREQUENT_CHECK;
2792} 2889}
2793 2890
2794void 2891void
2798 if (expect_false (!ev_is_active (w))) 2895 if (expect_false (!ev_is_active (w)))
2799 return; 2896 return;
2800 2897
2801 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2802 2899
2803 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2804 ev_stop (EV_A_ (W)w); 2901 ev_stop (EV_A_ (W)w);
2805 2902
2806 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2807} 2904}
2905
2906#endif
2808 2907
2809#if EV_STAT_ENABLE 2908#if EV_STAT_ENABLE
2810 2909
2811# ifdef _WIN32 2910# ifdef _WIN32
2812# undef lstat 2911# undef lstat
2818#define MIN_STAT_INTERVAL 0.1074891 2917#define MIN_STAT_INTERVAL 0.1074891
2819 2918
2820static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2919static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2821 2920
2822#if EV_USE_INOTIFY 2921#if EV_USE_INOTIFY
2823# define EV_INOTIFY_BUFSIZE 8192 2922
2923/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2924# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2824 2925
2825static void noinline 2926static void noinline
2826infy_add (EV_P_ ev_stat *w) 2927infy_add (EV_P_ ev_stat *w)
2827{ 2928{
2828 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); 2929 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);
2829 2930
2830 if (w->wd < 0) 2931 if (w->wd >= 0)
2932 {
2933 struct statfs sfs;
2934
2935 /* now local changes will be tracked by inotify, but remote changes won't */
2936 /* unless the filesystem is known to be local, we therefore still poll */
2937 /* also do poll on <2.6.25, but with normal frequency */
2938
2939 if (!fs_2625)
2940 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2941 else if (!statfs (w->path, &sfs)
2942 && (sfs.f_type == 0x1373 /* devfs */
2943 || sfs.f_type == 0xEF53 /* ext2/3 */
2944 || sfs.f_type == 0x3153464a /* jfs */
2945 || sfs.f_type == 0x52654973 /* reiser3 */
2946 || sfs.f_type == 0x01021994 /* tempfs */
2947 || sfs.f_type == 0x58465342 /* xfs */))
2948 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2949 else
2950 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2831 { 2951 }
2952 else
2953 {
2954 /* can't use inotify, continue to stat */
2832 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2955 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2833 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2834 2956
2835 /* monitor some parent directory for speedup hints */ 2957 /* if path is not there, monitor some parent directory for speedup hints */
2836 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2958 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2837 /* but an efficiency issue only */ 2959 /* but an efficiency issue only */
2838 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2960 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2839 { 2961 {
2840 char path [4096]; 2962 char path [4096];
2856 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2978 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2857 } 2979 }
2858 } 2980 }
2859 2981
2860 if (w->wd >= 0) 2982 if (w->wd >= 0)
2861 {
2862 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2983 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2863 2984
2864 /* now local changes will be tracked by inotify, but remote changes won't */ 2985 /* now re-arm timer, if required */
2865 /* unless the filesystem it known to be local, we therefore still poll */ 2986 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2866 /* also do poll on <2.6.25, but with normal frequency */
2867 struct statfs sfs;
2868
2869 if (fs_2625 && !statfs (w->path, &sfs))
2870 if (sfs.f_type == 0x1373 /* devfs */
2871 || sfs.f_type == 0xEF53 /* ext2/3 */
2872 || sfs.f_type == 0x3153464a /* jfs */
2873 || sfs.f_type == 0x52654973 /* reiser3 */
2874 || sfs.f_type == 0x01021994 /* tempfs */
2875 || sfs.f_type == 0x58465342 /* xfs */)
2876 return;
2877
2878 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2879 ev_timer_again (EV_A_ &w->timer); 2987 ev_timer_again (EV_A_ &w->timer);
2880 } 2988 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2881} 2989}
2882 2990
2883static void noinline 2991static void noinline
2884infy_del (EV_P_ ev_stat *w) 2992infy_del (EV_P_ ev_stat *w)
2885{ 2993{
2888 2996
2889 if (wd < 0) 2997 if (wd < 0)
2890 return; 2998 return;
2891 2999
2892 w->wd = -2; 3000 w->wd = -2;
2893 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3001 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2894 wlist_del (&fs_hash [slot].head, (WL)w); 3002 wlist_del (&fs_hash [slot].head, (WL)w);
2895 3003
2896 /* remove this watcher, if others are watching it, they will rearm */ 3004 /* remove this watcher, if others are watching it, they will rearm */
2897 inotify_rm_watch (fs_fd, wd); 3005 inotify_rm_watch (fs_fd, wd);
2898} 3006}
2900static void noinline 3008static void noinline
2901infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3009infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2902{ 3010{
2903 if (slot < 0) 3011 if (slot < 0)
2904 /* overflow, need to check for all hash slots */ 3012 /* overflow, need to check for all hash slots */
2905 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3013 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2906 infy_wd (EV_A_ slot, wd, ev); 3014 infy_wd (EV_A_ slot, wd, ev);
2907 else 3015 else
2908 { 3016 {
2909 WL w_; 3017 WL w_;
2910 3018
2911 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3019 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2912 { 3020 {
2913 ev_stat *w = (ev_stat *)w_; 3021 ev_stat *w = (ev_stat *)w_;
2914 w_ = w_->next; /* lets us remove this watcher and all before it */ 3022 w_ = w_->next; /* lets us remove this watcher and all before it */
2915 3023
2916 if (w->wd == wd || wd == -1) 3024 if (w->wd == wd || wd == -1)
2917 { 3025 {
2918 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3026 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2919 { 3027 {
2920 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3028 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2921 w->wd = -1; 3029 w->wd = -1;
2922 infy_add (EV_A_ w); /* re-add, no matter what */ 3030 infy_add (EV_A_ w); /* re-add, no matter what */
2923 } 3031 }
2924 3032
2925 stat_timer_cb (EV_A_ &w->timer, 0); 3033 stat_timer_cb (EV_A_ &w->timer, 0);
2930 3038
2931static void 3039static void
2932infy_cb (EV_P_ ev_io *w, int revents) 3040infy_cb (EV_P_ ev_io *w, int revents)
2933{ 3041{
2934 char buf [EV_INOTIFY_BUFSIZE]; 3042 char buf [EV_INOTIFY_BUFSIZE];
2935 struct inotify_event *ev = (struct inotify_event *)buf;
2936 int ofs; 3043 int ofs;
2937 int len = read (fs_fd, buf, sizeof (buf)); 3044 int len = read (fs_fd, buf, sizeof (buf));
2938 3045
2939 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3046 for (ofs = 0; ofs < len; )
3047 {
3048 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2940 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3049 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3050 ofs += sizeof (struct inotify_event) + ev->len;
3051 }
3052}
3053
3054inline_size unsigned int
3055ev_linux_version (void)
3056{
3057 struct utsname buf;
3058 unsigned int v;
3059 int i;
3060 char *p = buf.release;
3061
3062 if (uname (&buf))
3063 return 0;
3064
3065 for (i = 3+1; --i; )
3066 {
3067 unsigned int c = 0;
3068
3069 for (;;)
3070 {
3071 if (*p >= '0' && *p <= '9')
3072 c = c * 10 + *p++ - '0';
3073 else
3074 {
3075 p += *p == '.';
3076 break;
3077 }
3078 }
3079
3080 v = (v << 8) | c;
3081 }
3082
3083 return v;
2941} 3084}
2942 3085
2943inline_size void 3086inline_size void
2944check_2625 (EV_P) 3087ev_check_2625 (EV_P)
2945{ 3088{
2946 /* kernels < 2.6.25 are borked 3089 /* kernels < 2.6.25 are borked
2947 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3090 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2948 */ 3091 */
2949 struct utsname buf; 3092 if (ev_linux_version () < 0x020619)
2950 int major, minor, micro;
2951
2952 if (uname (&buf))
2953 return; 3093 return;
2954 3094
2955 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2956 return;
2957
2958 if (major < 2
2959 || (major == 2 && minor < 6)
2960 || (major == 2 && minor == 6 && micro < 25))
2961 return;
2962
2963 fs_2625 = 1; 3095 fs_2625 = 1;
3096}
3097
3098inline_size int
3099infy_newfd (void)
3100{
3101#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3102 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3103 if (fd >= 0)
3104 return fd;
3105#endif
3106 return inotify_init ();
2964} 3107}
2965 3108
2966inline_size void 3109inline_size void
2967infy_init (EV_P) 3110infy_init (EV_P)
2968{ 3111{
2969 if (fs_fd != -2) 3112 if (fs_fd != -2)
2970 return; 3113 return;
2971 3114
2972 fs_fd = -1; 3115 fs_fd = -1;
2973 3116
2974 check_2625 (EV_A); 3117 ev_check_2625 (EV_A);
2975 3118
2976 fs_fd = inotify_init (); 3119 fs_fd = infy_newfd ();
2977 3120
2978 if (fs_fd >= 0) 3121 if (fs_fd >= 0)
2979 { 3122 {
3123 fd_intern (fs_fd);
2980 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3124 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2981 ev_set_priority (&fs_w, EV_MAXPRI); 3125 ev_set_priority (&fs_w, EV_MAXPRI);
2982 ev_io_start (EV_A_ &fs_w); 3126 ev_io_start (EV_A_ &fs_w);
3127 ev_unref (EV_A);
2983 } 3128 }
2984} 3129}
2985 3130
2986inline_size void 3131inline_size void
2987infy_fork (EV_P) 3132infy_fork (EV_P)
2989 int slot; 3134 int slot;
2990 3135
2991 if (fs_fd < 0) 3136 if (fs_fd < 0)
2992 return; 3137 return;
2993 3138
3139 ev_ref (EV_A);
3140 ev_io_stop (EV_A_ &fs_w);
2994 close (fs_fd); 3141 close (fs_fd);
2995 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
2996 3143
3144 if (fs_fd >= 0)
3145 {
3146 fd_intern (fs_fd);
3147 ev_io_set (&fs_w, fs_fd, EV_READ);
3148 ev_io_start (EV_A_ &fs_w);
3149 ev_unref (EV_A);
3150 }
3151
2997 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3152 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2998 { 3153 {
2999 WL w_ = fs_hash [slot].head; 3154 WL w_ = fs_hash [slot].head;
3000 fs_hash [slot].head = 0; 3155 fs_hash [slot].head = 0;
3001 3156
3002 while (w_) 3157 while (w_)
3007 w->wd = -1; 3162 w->wd = -1;
3008 3163
3009 if (fs_fd >= 0) 3164 if (fs_fd >= 0)
3010 infy_add (EV_A_ w); /* re-add, no matter what */ 3165 infy_add (EV_A_ w); /* re-add, no matter what */
3011 else 3166 else
3167 {
3168 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3169 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3012 ev_timer_again (EV_A_ &w->timer); 3170 ev_timer_again (EV_A_ &w->timer);
3171 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3172 }
3013 } 3173 }
3014 } 3174 }
3015} 3175}
3016 3176
3017#endif 3177#endif
3034static void noinline 3194static void noinline
3035stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3195stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3036{ 3196{
3037 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3197 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3038 3198
3039 /* we copy this here each the time so that */ 3199 ev_statdata prev = w->attr;
3040 /* prev has the old value when the callback gets invoked */
3041 w->prev = w->attr;
3042 ev_stat_stat (EV_A_ w); 3200 ev_stat_stat (EV_A_ w);
3043 3201
3044 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3202 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3045 if ( 3203 if (
3046 w->prev.st_dev != w->attr.st_dev 3204 prev.st_dev != w->attr.st_dev
3047 || w->prev.st_ino != w->attr.st_ino 3205 || prev.st_ino != w->attr.st_ino
3048 || w->prev.st_mode != w->attr.st_mode 3206 || prev.st_mode != w->attr.st_mode
3049 || w->prev.st_nlink != w->attr.st_nlink 3207 || prev.st_nlink != w->attr.st_nlink
3050 || w->prev.st_uid != w->attr.st_uid 3208 || prev.st_uid != w->attr.st_uid
3051 || w->prev.st_gid != w->attr.st_gid 3209 || prev.st_gid != w->attr.st_gid
3052 || w->prev.st_rdev != w->attr.st_rdev 3210 || prev.st_rdev != w->attr.st_rdev
3053 || w->prev.st_size != w->attr.st_size 3211 || prev.st_size != w->attr.st_size
3054 || w->prev.st_atime != w->attr.st_atime 3212 || prev.st_atime != w->attr.st_atime
3055 || w->prev.st_mtime != w->attr.st_mtime 3213 || prev.st_mtime != w->attr.st_mtime
3056 || w->prev.st_ctime != w->attr.st_ctime 3214 || prev.st_ctime != w->attr.st_ctime
3057 ) { 3215 ) {
3216 /* we only update w->prev on actual differences */
3217 /* in case we test more often than invoke the callback, */
3218 /* to ensure that prev is always different to attr */
3219 w->prev = prev;
3220
3058 #if EV_USE_INOTIFY 3221 #if EV_USE_INOTIFY
3059 if (fs_fd >= 0) 3222 if (fs_fd >= 0)
3060 { 3223 {
3061 infy_del (EV_A_ w); 3224 infy_del (EV_A_ w);
3062 infy_add (EV_A_ w); 3225 infy_add (EV_A_ w);
3087 3250
3088 if (fs_fd >= 0) 3251 if (fs_fd >= 0)
3089 infy_add (EV_A_ w); 3252 infy_add (EV_A_ w);
3090 else 3253 else
3091#endif 3254#endif
3255 {
3092 ev_timer_again (EV_A_ &w->timer); 3256 ev_timer_again (EV_A_ &w->timer);
3257 ev_unref (EV_A);
3258 }
3093 3259
3094 ev_start (EV_A_ (W)w, 1); 3260 ev_start (EV_A_ (W)w, 1);
3095 3261
3096 EV_FREQUENT_CHECK; 3262 EV_FREQUENT_CHECK;
3097} 3263}
3106 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
3107 3273
3108#if EV_USE_INOTIFY 3274#if EV_USE_INOTIFY
3109 infy_del (EV_A_ w); 3275 infy_del (EV_A_ w);
3110#endif 3276#endif
3277
3278 if (ev_is_active (&w->timer))
3279 {
3280 ev_ref (EV_A);
3111 ev_timer_stop (EV_A_ &w->timer); 3281 ev_timer_stop (EV_A_ &w->timer);
3282 }
3112 3283
3113 ev_stop (EV_A_ (W)w); 3284 ev_stop (EV_A_ (W)w);
3114 3285
3115 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
3116} 3287}
3161 3332
3162 EV_FREQUENT_CHECK; 3333 EV_FREQUENT_CHECK;
3163} 3334}
3164#endif 3335#endif
3165 3336
3337#if EV_PREPARE_ENABLE
3166void 3338void
3167ev_prepare_start (EV_P_ ev_prepare *w) 3339ev_prepare_start (EV_P_ ev_prepare *w)
3168{ 3340{
3169 if (expect_false (ev_is_active (w))) 3341 if (expect_false (ev_is_active (w)))
3170 return; 3342 return;
3196 3368
3197 ev_stop (EV_A_ (W)w); 3369 ev_stop (EV_A_ (W)w);
3198 3370
3199 EV_FREQUENT_CHECK; 3371 EV_FREQUENT_CHECK;
3200} 3372}
3373#endif
3201 3374
3375#if EV_CHECK_ENABLE
3202void 3376void
3203ev_check_start (EV_P_ ev_check *w) 3377ev_check_start (EV_P_ ev_check *w)
3204{ 3378{
3205 if (expect_false (ev_is_active (w))) 3379 if (expect_false (ev_is_active (w)))
3206 return; 3380 return;
3232 3406
3233 ev_stop (EV_A_ (W)w); 3407 ev_stop (EV_A_ (W)w);
3234 3408
3235 EV_FREQUENT_CHECK; 3409 EV_FREQUENT_CHECK;
3236} 3410}
3411#endif
3237 3412
3238#if EV_EMBED_ENABLE 3413#if EV_EMBED_ENABLE
3239void noinline 3414void noinline
3240ev_embed_sweep (EV_P_ ev_embed *w) 3415ev_embed_sweep (EV_P_ ev_embed *w)
3241{ 3416{
3336 3511
3337 ev_io_stop (EV_A_ &w->io); 3512 ev_io_stop (EV_A_ &w->io);
3338 ev_prepare_stop (EV_A_ &w->prepare); 3513 ev_prepare_stop (EV_A_ &w->prepare);
3339 ev_fork_stop (EV_A_ &w->fork); 3514 ev_fork_stop (EV_A_ &w->fork);
3340 3515
3516 ev_stop (EV_A_ (W)w);
3517
3341 EV_FREQUENT_CHECK; 3518 EV_FREQUENT_CHECK;
3342} 3519}
3343#endif 3520#endif
3344 3521
3345#if EV_FORK_ENABLE 3522#if EV_FORK_ENABLE
3471{ 3648{
3472 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3649 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3473 3650
3474 if (expect_false (!once)) 3651 if (expect_false (!once))
3475 { 3652 {
3476 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3653 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3477 return; 3654 return;
3478 } 3655 }
3479 3656
3480 once->cb = cb; 3657 once->cb = cb;
3481 once->arg = arg; 3658 once->arg = arg;
3568 if (types & EV_ASYNC) 3745 if (types & EV_ASYNC)
3569 for (i = asynccnt; i--; ) 3746 for (i = asynccnt; i--; )
3570 cb (EV_A_ EV_ASYNC, asyncs [i]); 3747 cb (EV_A_ EV_ASYNC, asyncs [i]);
3571#endif 3748#endif
3572 3749
3750#if EV_PREPARE_ENABLE
3573 if (types & EV_PREPARE) 3751 if (types & EV_PREPARE)
3574 for (i = preparecnt; i--; ) 3752 for (i = preparecnt; i--; )
3575#if EV_EMBED_ENABLE 3753# if EV_EMBED_ENABLE
3576 if (ev_cb (prepares [i]) != embed_prepare_cb) 3754 if (ev_cb (prepares [i]) != embed_prepare_cb)
3577#endif 3755# endif
3578 cb (EV_A_ EV_PREPARE, prepares [i]); 3756 cb (EV_A_ EV_PREPARE, prepares [i]);
3757#endif
3579 3758
3759#if EV_CHECK_ENABLE
3580 if (types & EV_CHECK) 3760 if (types & EV_CHECK)
3581 for (i = checkcnt; i--; ) 3761 for (i = checkcnt; i--; )
3582 cb (EV_A_ EV_CHECK, checks [i]); 3762 cb (EV_A_ EV_CHECK, checks [i]);
3763#endif
3583 3764
3765#if EV_SIGNAL_ENABLE
3584 if (types & EV_SIGNAL) 3766 if (types & EV_SIGNAL)
3585 for (i = 0; i < EV_NSIG - 1; ++i) 3767 for (i = 0; i < EV_NSIG - 1; ++i)
3586 for (wl = signals [i].head; wl; ) 3768 for (wl = signals [i].head; wl; )
3587 { 3769 {
3588 wn = wl->next; 3770 wn = wl->next;
3589 cb (EV_A_ EV_SIGNAL, wl); 3771 cb (EV_A_ EV_SIGNAL, wl);
3590 wl = wn; 3772 wl = wn;
3591 } 3773 }
3774#endif
3592 3775
3776#if EV_CHILD_ENABLE
3593 if (types & EV_CHILD) 3777 if (types & EV_CHILD)
3594 for (i = EV_PID_HASHSIZE; i--; ) 3778 for (i = (EV_PID_HASHSIZE); i--; )
3595 for (wl = childs [i]; wl; ) 3779 for (wl = childs [i]; wl; )
3596 { 3780 {
3597 wn = wl->next; 3781 wn = wl->next;
3598 cb (EV_A_ EV_CHILD, wl); 3782 cb (EV_A_ EV_CHILD, wl);
3599 wl = wn; 3783 wl = wn;
3600 } 3784 }
3785#endif
3601/* EV_STAT 0x00001000 /* stat data changed */ 3786/* EV_STAT 0x00001000 /* stat data changed */
3602/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3787/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3603} 3788}
3604#endif 3789#endif
3605 3790

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines