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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.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 */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG) 204#if defined (EV_NSIG)
194/* use what's provided */ 205/* use what's provided */
195#elif defined (NSIG) 206#elif defined (NSIG)
196# define EV_NSIG (NSIG) 207# define EV_NSIG (NSIG)
197#elif defined(_NSIG) 208#elif defined(_NSIG)
205#elif defined (MAXSIG) 216#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1) 217# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG) 218#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1) 219# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE) 220#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 221# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig) 222#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 223# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else 224#else
214# error "unable to find value for NSIG, please report" 225# error "unable to find value for NSIG, please report"
215/* 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! :) */
216# define EV_NSIG 65 228# define EV_NSIG 65
217#endif 229#endif
218 230
219#ifndef EV_USE_CLOCK_SYSCALL 231#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2 232# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1 233# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
222# else 234# else
223# define EV_USE_CLOCK_SYSCALL 0 235# define EV_USE_CLOCK_SYSCALL 0
224# endif 236# endif
225#endif 237#endif
226 238
227#ifndef EV_USE_MONOTONIC 239#ifndef EV_USE_MONOTONIC
228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 240# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
229# define EV_USE_MONOTONIC 1 241# define EV_USE_MONOTONIC EV_FEATURE_OS
230# else 242# else
231# define EV_USE_MONOTONIC 0 243# define EV_USE_MONOTONIC 0
232# endif 244# endif
233#endif 245#endif
234 246
236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 248# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
237#endif 249#endif
238 250
239#ifndef EV_USE_NANOSLEEP 251#ifndef EV_USE_NANOSLEEP
240# if _POSIX_C_SOURCE >= 199309L 252# if _POSIX_C_SOURCE >= 199309L
241# define EV_USE_NANOSLEEP 1 253# define EV_USE_NANOSLEEP EV_FEATURE_OS
242# else 254# else
243# define EV_USE_NANOSLEEP 0 255# define EV_USE_NANOSLEEP 0
244# endif 256# endif
245#endif 257#endif
246 258
247#ifndef EV_USE_SELECT 259#ifndef EV_USE_SELECT
248# define EV_USE_SELECT 1 260# define EV_USE_SELECT EV_FEATURE_BACKENDS
249#endif 261#endif
250 262
251#ifndef EV_USE_POLL 263#ifndef EV_USE_POLL
252# ifdef _WIN32 264# ifdef _WIN32
253# define EV_USE_POLL 0 265# define EV_USE_POLL 0
254# else 266# else
255# define EV_USE_POLL 1 267# define EV_USE_POLL EV_FEATURE_BACKENDS
256# endif 268# endif
257#endif 269#endif
258 270
259#ifndef EV_USE_EPOLL 271#ifndef EV_USE_EPOLL
260# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
261# define EV_USE_EPOLL 1 273# define EV_USE_EPOLL EV_FEATURE_BACKENDS
262# else 274# else
263# define EV_USE_EPOLL 0 275# define EV_USE_EPOLL 0
264# endif 276# endif
265#endif 277#endif
266 278
272# define EV_USE_PORT 0 284# define EV_USE_PORT 0
273#endif 285#endif
274 286
275#ifndef EV_USE_INOTIFY 287#ifndef EV_USE_INOTIFY
276# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 288# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
277# define EV_USE_INOTIFY 1 289# define EV_USE_INOTIFY EV_FEATURE_OS
278# else 290# else
279# define EV_USE_INOTIFY 0 291# define EV_USE_INOTIFY 0
280# endif 292# endif
281#endif 293#endif
282 294
283#ifndef EV_PID_HASHSIZE 295#ifndef EV_PID_HASHSIZE
284# if EV_MINIMAL 296# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
285# define EV_PID_HASHSIZE 1
286# else
287# define EV_PID_HASHSIZE 16
288# endif
289#endif 297#endif
290 298
291#ifndef EV_INOTIFY_HASHSIZE 299#ifndef EV_INOTIFY_HASHSIZE
292# if EV_MINIMAL 300# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
293# define EV_INOTIFY_HASHSIZE 1
294# else
295# define EV_INOTIFY_HASHSIZE 16
296# endif
297#endif 301#endif
298 302
299#ifndef EV_USE_EVENTFD 303#ifndef EV_USE_EVENTFD
300# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 304# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
301# define EV_USE_EVENTFD 1 305# define EV_USE_EVENTFD EV_FEATURE_OS
302# else 306# else
303# define EV_USE_EVENTFD 0 307# define EV_USE_EVENTFD 0
304# endif 308# endif
305#endif 309#endif
306 310
307#ifndef EV_USE_SIGNALFD 311#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1 313# define EV_USE_SIGNALFD EV_FEATURE_OS
310# else 314# else
311# define EV_USE_SIGNALFD 0 315# define EV_USE_SIGNALFD 0
312# endif 316# endif
313#endif 317#endif
314 318
317# define EV_USE_4HEAP 1 321# define EV_USE_4HEAP 1
318# define EV_HEAP_CACHE_AT 1 322# define EV_HEAP_CACHE_AT 1
319#endif 323#endif
320 324
321#ifndef EV_VERIFY 325#ifndef EV_VERIFY
322# define EV_VERIFY !EV_MINIMAL 326# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
323#endif 327#endif
324 328
325#ifndef EV_USE_4HEAP 329#ifndef EV_USE_4HEAP
326# define EV_USE_4HEAP !EV_MINIMAL 330# define EV_USE_4HEAP EV_FEATURE_DATA
327#endif 331#endif
328 332
329#ifndef EV_HEAP_CACHE_AT 333#ifndef EV_HEAP_CACHE_AT
330# define EV_HEAP_CACHE_AT !EV_MINIMAL 334# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
331#endif 335#endif
332 336
333/* 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, */
334/* which makes programs even slower. might work on other unices, too. */ 338/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL 339#if EV_USE_CLOCK_SYSCALL
344# endif 348# endif
345#endif 349#endif
346 350
347/* 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 */
348 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
349#ifndef CLOCK_MONOTONIC 359#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 360# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 361# define EV_USE_MONOTONIC 0
352#endif 362#endif
353 363
387# include <stdint.h> 397# include <stdint.h>
388# ifndef EFD_NONBLOCK 398# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK 399# define EFD_NONBLOCK O_NONBLOCK
390# endif 400# endif
391# ifndef EFD_CLOEXEC 401# ifndef EFD_CLOEXEC
402# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC 403# define EFD_CLOEXEC O_CLOEXEC
404# else
405# define EFD_CLOEXEC 02000000
406# endif
393# endif 407# endif
394# ifdef __cplusplus 408# ifdef __cplusplus
395extern "C" { 409extern "C" {
396# endif 410# endif
397int eventfd (unsigned int initval, int flags); 411int (eventfd) (unsigned int initval, int flags);
398# ifdef __cplusplus 412# ifdef __cplusplus
399} 413}
400# endif 414# endif
401#endif 415#endif
402 416
403#if EV_USE_SIGNALFD 417#if EV_USE_SIGNALFD
404# 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
405#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
406 445
407/**/ 446/**/
408 447
409#if EV_VERIFY >= 3 448#if EV_VERIFY >= 3
410# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 449# define EV_FREQUENT_CHECK ev_verify (EV_A)
411#else 450#else
412# define EV_FREQUENT_CHECK do { } while (0) 451# define EV_FREQUENT_CHECK do { } while (0)
413#endif 452#endif
414 453
415/* 454/*
422 */ 461 */
423#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 462#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424 463
425#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) */
426#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) */
427/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
428 466
429#if __GNUC__ >= 4 467#if __GNUC__ >= 4
430# define expect(expr,value) __builtin_expect ((expr),(value)) 468# define expect(expr,value) __builtin_expect ((expr),(value))
431# define noinline __attribute__ ((noinline)) 469# define noinline __attribute__ ((noinline))
432#else 470#else
439 477
440#define expect_false(expr) expect ((expr) != 0, 0) 478#define expect_false(expr) expect ((expr) != 0, 0)
441#define expect_true(expr) expect ((expr) != 0, 1) 479#define expect_true(expr) expect ((expr) != 0, 1)
442#define inline_size static inline 480#define inline_size static inline
443 481
444#if EV_MINIMAL 482#if EV_FEATURE_CODE
483# define inline_speed static inline
484#else
445# define inline_speed static noinline 485# define inline_speed static noinline
446#else
447# define inline_speed static inline
448#endif 486#endif
449 487
450#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 488#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
451 489
452#if EV_MINPRI == EV_MAXPRI 490#if EV_MINPRI == EV_MAXPRI
473 511
474#if EV_USE_MONOTONIC 512#if EV_USE_MONOTONIC
475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 513static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476#endif 514#endif
477 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
478#ifdef _WIN32 526#ifdef _WIN32
479# include "ev_win32.c" 527# include "ev_win32.c"
480#endif 528#endif
481 529
482/*****************************************************************************/ 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
483 539
484static void (*syserr_cb)(const char *msg); 540static void (*syserr_cb)(const char *msg);
485 541
486void 542void
487ev_set_syserr_cb (void (*cb)(const char *msg)) 543ev_set_syserr_cb (void (*cb)(const char *msg))
497 553
498 if (syserr_cb) 554 if (syserr_cb)
499 syserr_cb (msg); 555 syserr_cb (msg);
500 else 556 else
501 { 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
502 perror (msg); 566 perror (msg);
567#endif
503 abort (); 568 abort ();
504 } 569 }
505} 570}
506 571
507static void * 572static void *
508ev_realloc_emul (void *ptr, long size) 573ev_realloc_emul (void *ptr, long size)
509{ 574{
575#if __GLIBC__
576 return realloc (ptr, size);
577#else
510 /* some systems, notably openbsd and darwin, fail to properly 578 /* some systems, notably openbsd and darwin, fail to properly
511 * 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
512 * the single unix specification, so work around them here. 580 * the single unix specification, so work around them here.
513 */ 581 */
514 582
515 if (size) 583 if (size)
516 return realloc (ptr, size); 584 return realloc (ptr, size);
517 585
518 free (ptr); 586 free (ptr);
519 return 0; 587 return 0;
588#endif
520} 589}
521 590
522static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 591static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
523 592
524void 593void
532{ 601{
533 ptr = alloc (ptr, size); 602 ptr = alloc (ptr, size);
534 603
535 if (!ptr && size) 604 if (!ptr && size)
536 { 605 {
606#if EV_AVOID_STDIO
607 ev_printerr ("libev: memory allocation failed, aborting.\n");
608#else
537 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 609 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
610#endif
538 abort (); 611 abort ();
539 } 612 }
540 613
541 return ptr; 614 return ptr;
542} 615}
624 697
625 static int ev_default_loop_ptr; 698 static int ev_default_loop_ptr;
626 699
627#endif 700#endif
628 701
629#if EV_MINIMAL < 2 702#if EV_FEATURE_API
630# 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)
631# 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)
632# define EV_INVOKE_PENDING invoke_cb (EV_A) 705# define EV_INVOKE_PENDING invoke_cb (EV_A)
633#else 706#else
634# define EV_RELEASE_CB (void)0 707# define EV_RELEASE_CB (void)0
819} 892}
820 893
821/*****************************************************************************/ 894/*****************************************************************************/
822 895
823inline_speed void 896inline_speed void
824fd_event_nc (EV_P_ int fd, int revents) 897fd_event_nocheck (EV_P_ int fd, int revents)
825{ 898{
826 ANFD *anfd = anfds + fd; 899 ANFD *anfd = anfds + fd;
827 ev_io *w; 900 ev_io *w;
828 901
829 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)
841fd_event (EV_P_ int fd, int revents) 914fd_event (EV_P_ int fd, int revents)
842{ 915{
843 ANFD *anfd = anfds + fd; 916 ANFD *anfd = anfds + fd;
844 917
845 if (expect_true (!anfd->reify)) 918 if (expect_true (!anfd->reify))
846 fd_event_nc (EV_A_ fd, revents); 919 fd_event_nocheck (EV_A_ fd, revents);
847} 920}
848 921
849void 922void
850ev_feed_fd_event (EV_P_ int fd, int revents) 923ev_feed_fd_event (EV_P_ int fd, int revents)
851{ 924{
852 if (fd >= 0 && fd < anfdmax) 925 if (fd >= 0 && fd < anfdmax)
853 fd_event_nc (EV_A_ fd, revents); 926 fd_event_nocheck (EV_A_ fd, revents);
854} 927}
855 928
856/* make sure the external fd watch events are in-sync */ 929/* make sure the external fd watch events are in-sync */
857/* with the kernel/libev internal state */ 930/* with the kernel/libev internal state */
858inline_size void 931inline_size void
873 946
874#if EV_SELECT_IS_WINSOCKET 947#if EV_SELECT_IS_WINSOCKET
875 if (events) 948 if (events)
876 { 949 {
877 unsigned long arg; 950 unsigned long arg;
878 #ifdef EV_FD_TO_WIN32_HANDLE
879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 951 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
880 #else
881 anfd->handle = _get_osfhandle (fd);
882 #endif
883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 952 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
884 } 953 }
885#endif 954#endif
886 955
887 { 956 {
925 ev_io_stop (EV_A_ w); 994 ev_io_stop (EV_A_ w);
926 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);
927 } 996 }
928} 997}
929 998
930/* check whether the given fd is atcually valid, for error recovery */ 999/* check whether the given fd is actually valid, for error recovery */
931inline_size int 1000inline_size int
932fd_valid (int fd) 1001fd_valid (int fd)
933{ 1002{
934#ifdef _WIN32 1003#ifdef _WIN32
935 return _get_osfhandle (fd) != -1; 1004 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936#else 1005#else
937 return fcntl (fd, F_GETFD) != -1; 1006 return fcntl (fd, F_GETFD) != -1;
938#endif 1007#endif
939} 1008}
940 1009
958 1027
959 for (fd = anfdmax; fd--; ) 1028 for (fd = anfdmax; fd--; )
960 if (anfds [fd].events) 1029 if (anfds [fd].events)
961 { 1030 {
962 fd_kill (EV_A_ fd); 1031 fd_kill (EV_A_ fd);
963 return; 1032 break;
964 } 1033 }
965} 1034}
966 1035
967/* usually called after fork if backend needs to re-arm all fds from scratch */ 1036/* usually called after fork if backend needs to re-arm all fds from scratch */
968static void noinline 1037static void noinline
975 { 1044 {
976 anfds [fd].events = 0; 1045 anfds [fd].events = 0;
977 anfds [fd].emask = 0; 1046 anfds [fd].emask = 0;
978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1047 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
979 } 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
980} 1063}
981 1064
982/*****************************************************************************/ 1065/*****************************************************************************/
983 1066
984/* 1067/*
1058 1141
1059 for (;;) 1142 for (;;)
1060 { 1143 {
1061 int c = k << 1; 1144 int c = k << 1;
1062 1145
1063 if (c > N + HEAP0 - 1) 1146 if (c >= N + HEAP0)
1064 break; 1147 break;
1065 1148
1066 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1149 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067 ? 1 : 0; 1150 ? 1 : 0;
1068 1151
1104 1187
1105/* move an element suitably so it is in a correct place */ 1188/* move an element suitably so it is in a correct place */
1106inline_size void 1189inline_size void
1107adjustheap (ANHE *heap, int N, int k) 1190adjustheap (ANHE *heap, int N, int k)
1108{ 1191{
1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1192 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110 upheap (heap, k); 1193 upheap (heap, k);
1111 else 1194 else
1112 downheap (heap, N, k); 1195 downheap (heap, N, k);
1113} 1196}
1114 1197
1127/*****************************************************************************/ 1210/*****************************************************************************/
1128 1211
1129/* associate signal watchers to a signal signal */ 1212/* associate signal watchers to a signal signal */
1130typedef struct 1213typedef struct
1131{ 1214{
1215 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY 1216#if EV_MULTIPLICITY
1133 EV_P; 1217 EV_P;
1134#endif 1218#endif
1135 WL head; 1219 WL head;
1136 EV_ATOMIC_T gotsig;
1137} ANSIG; 1220} ANSIG;
1138 1221
1139static ANSIG signals [EV_NSIG - 1]; 1222static ANSIG signals [EV_NSIG - 1];
1140static EV_ATOMIC_T gotsig;
1141 1223
1142/*****************************************************************************/ 1224/*****************************************************************************/
1143 1225
1144/* used to prepare libev internal fd's */ 1226#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1145/* this is not fork-safe */
1146inline_speed void
1147fd_intern (int fd)
1148{
1149#ifdef _WIN32
1150 unsigned long arg = 1;
1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1152#else
1153 fcntl (fd, F_SETFD, FD_CLOEXEC);
1154 fcntl (fd, F_SETFL, O_NONBLOCK);
1155#endif
1156}
1157 1227
1158static void noinline 1228static void noinline
1159evpipe_init (EV_P) 1229evpipe_init (EV_P)
1160{ 1230{
1161 if (!ev_is_active (&pipe_w)) 1231 if (!ev_is_active (&pipe_w))
1162 { 1232 {
1163#if EV_USE_EVENTFD 1233# if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1234 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL) 1235 if (evfd < 0 && errno == EINVAL)
1166 evfd = eventfd (0, 0); 1236 evfd = eventfd (0, 0);
1167 1237
1168 if (evfd >= 0) 1238 if (evfd >= 0)
1170 evpipe [0] = -1; 1240 evpipe [0] = -1;
1171 fd_intern (evfd); /* doing it twice doesn't hurt */ 1241 fd_intern (evfd); /* doing it twice doesn't hurt */
1172 ev_io_set (&pipe_w, evfd, EV_READ); 1242 ev_io_set (&pipe_w, evfd, EV_READ);
1173 } 1243 }
1174 else 1244 else
1175#endif 1245# endif
1176 { 1246 {
1177 while (pipe (evpipe)) 1247 while (pipe (evpipe))
1178 ev_syserr ("(libev) error creating signal/async pipe"); 1248 ev_syserr ("(libev) error creating signal/async pipe");
1179 1249
1180 fd_intern (evpipe [0]); 1250 fd_intern (evpipe [0]);
1191evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1261evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1192{ 1262{
1193 if (!*flag) 1263 if (!*flag)
1194 { 1264 {
1195 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;
1196 1267
1197 *flag = 1; 1268 *flag = 1;
1198 1269
1199#if EV_USE_EVENTFD 1270#if EV_USE_EVENTFD
1200 if (evfd >= 0) 1271 if (evfd >= 0)
1202 uint64_t counter = 1; 1273 uint64_t counter = 1;
1203 write (evfd, &counter, sizeof (uint64_t)); 1274 write (evfd, &counter, sizeof (uint64_t));
1204 } 1275 }
1205 else 1276 else
1206#endif 1277#endif
1207 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1208 1279
1209 errno = old_errno; 1280 errno = old_errno;
1210 } 1281 }
1211} 1282}
1212 1283
1213/* called whenever the libev signal pipe */ 1284/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */ 1285/* got some events (signal, async) */
1215static void 1286static void
1216pipecb (EV_P_ ev_io *iow, int revents) 1287pipecb (EV_P_ ev_io *iow, int revents)
1217{ 1288{
1289 int i;
1290
1218#if EV_USE_EVENTFD 1291#if EV_USE_EVENTFD
1219 if (evfd >= 0) 1292 if (evfd >= 0)
1220 { 1293 {
1221 uint64_t counter; 1294 uint64_t counter;
1222 read (evfd, &counter, sizeof (uint64_t)); 1295 read (evfd, &counter, sizeof (uint64_t));
1226 { 1299 {
1227 char dummy; 1300 char dummy;
1228 read (evpipe [0], &dummy, 1); 1301 read (evpipe [0], &dummy, 1);
1229 } 1302 }
1230 1303
1231 if (gotsig && ev_is_default_loop (EV_A)) 1304 if (sig_pending)
1232 { 1305 {
1233 int signum; 1306 sig_pending = 0;
1234 gotsig = 0;
1235 1307
1236 for (signum = EV_NSIG - 1; signum--; ) 1308 for (i = EV_NSIG - 1; i--; )
1237 if (signals [signum].gotsig) 1309 if (expect_false (signals [i].pending))
1238 ev_feed_signal_event (EV_A_ signum + 1); 1310 ev_feed_signal_event (EV_A_ i + 1);
1239 } 1311 }
1240 1312
1241#if EV_ASYNC_ENABLE 1313#if EV_ASYNC_ENABLE
1242 if (gotasync) 1314 if (async_pending)
1243 { 1315 {
1244 int i; 1316 async_pending = 0;
1245 gotasync = 0;
1246 1317
1247 for (i = asynccnt; i--; ) 1318 for (i = asynccnt; i--; )
1248 if (asyncs [i]->sent) 1319 if (asyncs [i]->sent)
1249 { 1320 {
1250 asyncs [i]->sent = 0; 1321 asyncs [i]->sent = 0;
1261{ 1332{
1262#if EV_MULTIPLICITY 1333#if EV_MULTIPLICITY
1263 EV_P = signals [signum - 1].loop; 1334 EV_P = signals [signum - 1].loop;
1264#endif 1335#endif
1265 1336
1266#if _WIN32 1337#ifdef _WIN32
1267 signal (signum, ev_sighandler); 1338 signal (signum, ev_sighandler);
1268#endif 1339#endif
1269 1340
1270 signals [signum - 1].gotsig = 1; 1341 signals [signum - 1].pending = 1;
1271 evpipe_write (EV_A_ &gotsig); 1342 evpipe_write (EV_A_ &sig_pending);
1272} 1343}
1273 1344
1274void noinline 1345void noinline
1275ev_feed_signal_event (EV_P_ int signum) 1346ev_feed_signal_event (EV_P_ int signum)
1276{ 1347{
1277 WL w; 1348 WL w;
1278 1349
1350 if (expect_false (signum <= 0 || signum > EV_NSIG))
1351 return;
1352
1353 --signum;
1354
1279#if EV_MULTIPLICITY 1355#if EV_MULTIPLICITY
1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1356 /* it is permissible to try to feed a signal to the wrong loop */
1281#endif 1357 /* or, likely more useful, feeding a signal nobody is waiting for */
1282 1358
1283 if (signum <= 0 || signum > EV_NSIG) 1359 if (expect_false (signals [signum].loop != EV_A))
1284 return; 1360 return;
1361#endif
1285 1362
1286 --signum;
1287
1288 signals [signum].gotsig = 0; 1363 signals [signum].pending = 0;
1289 1364
1290 for (w = signals [signum].head; w; w = w->next) 1365 for (w = signals [signum].head; w; w = w->next)
1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1366 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292} 1367}
1293 1368
1309 break; 1384 break;
1310 } 1385 }
1311} 1386}
1312#endif 1387#endif
1313 1388
1389#endif
1390
1314/*****************************************************************************/ 1391/*****************************************************************************/
1315 1392
1393#if EV_CHILD_ENABLE
1316static WL childs [EV_PID_HASHSIZE]; 1394static WL childs [EV_PID_HASHSIZE];
1317
1318#ifndef _WIN32
1319 1395
1320static ev_signal childev; 1396static ev_signal childev;
1321 1397
1322#ifndef WIFCONTINUED 1398#ifndef WIFCONTINUED
1323# define WIFCONTINUED(status) 0 1399# define WIFCONTINUED(status) 0
1328child_reap (EV_P_ int chain, int pid, int status) 1404child_reap (EV_P_ int chain, int pid, int status)
1329{ 1405{
1330 ev_child *w; 1406 ev_child *w;
1331 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1407 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1332 1408
1333 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)
1334 { 1410 {
1335 if ((w->pid == pid || !w->pid) 1411 if ((w->pid == pid || !w->pid)
1336 && (!traced || (w->flags & 1))) 1412 && (!traced || (w->flags & 1)))
1337 { 1413 {
1338 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 */
1363 /* 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 */
1364 /* 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 */
1365 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1441 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1366 1442
1367 child_reap (EV_A_ pid, pid, status); 1443 child_reap (EV_A_ pid, pid, status);
1368 if (EV_PID_HASHSIZE > 1) 1444 if ((EV_PID_HASHSIZE) > 1)
1369 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 */
1370} 1446}
1371 1447
1372#endif 1448#endif
1373 1449
1440#ifdef __APPLE__ 1516#ifdef __APPLE__
1441 /* only select works correctly on that "unix-certified" platform */ 1517 /* only select works correctly on that "unix-certified" platform */
1442 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1518 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1443 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 */
1444#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
1445 1524
1446 return flags; 1525 return flags;
1447} 1526}
1448 1527
1449unsigned int 1528unsigned int
1462ev_backend (EV_P) 1541ev_backend (EV_P)
1463{ 1542{
1464 return backend; 1543 return backend;
1465} 1544}
1466 1545
1467#if EV_MINIMAL < 2 1546#if EV_FEATURE_API
1468unsigned int 1547unsigned int
1469ev_loop_count (EV_P) 1548ev_iteration (EV_P)
1470{ 1549{
1471 return loop_count; 1550 return loop_count;
1472} 1551}
1473 1552
1474unsigned int 1553unsigned int
1475ev_loop_depth (EV_P) 1554ev_depth (EV_P)
1476{ 1555{
1477 return loop_depth; 1556 return loop_depth;
1478} 1557}
1479 1558
1480void 1559void
1552 1631
1553 ev_rt_now = ev_time (); 1632 ev_rt_now = ev_time ();
1554 mn_now = get_clock (); 1633 mn_now = get_clock ();
1555 now_floor = mn_now; 1634 now_floor = mn_now;
1556 rtmn_diff = ev_rt_now - mn_now; 1635 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2 1636#if EV_FEATURE_API
1558 invoke_cb = ev_invoke_pending; 1637 invoke_cb = ev_invoke_pending;
1559#endif 1638#endif
1560 1639
1561 io_blocktime = 0.; 1640 io_blocktime = 0.;
1562 timeout_blocktime = 0.; 1641 timeout_blocktime = 0.;
1563 backend = 0; 1642 backend = 0;
1564 backend_fd = -1; 1643 backend_fd = -1;
1565 gotasync = 0; 1644 sig_pending = 0;
1645#if EV_ASYNC_ENABLE
1646 async_pending = 0;
1647#endif
1566#if EV_USE_INOTIFY 1648#if EV_USE_INOTIFY
1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1649 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568#endif 1650#endif
1569#if EV_USE_SIGNALFD 1651#if EV_USE_SIGNALFD
1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2; 1652 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571#endif 1653#endif
1572 1654
1573 if (!(flags & 0x0000ffffU)) 1655 if (!(flags & 0x0000ffffU))
1574 flags |= ev_recommended_backends (); 1656 flags |= ev_recommended_backends ();
1575 1657
1589 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1671 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1590#endif 1672#endif
1591 1673
1592 ev_prepare_init (&pending_w, pendingcb); 1674 ev_prepare_init (&pending_w, pendingcb);
1593 1675
1676#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1594 ev_init (&pipe_w, pipecb); 1677 ev_init (&pipe_w, pipecb);
1595 ev_set_priority (&pipe_w, EV_MAXPRI); 1678 ev_set_priority (&pipe_w, EV_MAXPRI);
1679#endif
1596 } 1680 }
1597} 1681}
1598 1682
1599/* free up a loop structure */ 1683/* free up a loop structure */
1600static void noinline 1684static void noinline
1612 close (evfd); 1696 close (evfd);
1613#endif 1697#endif
1614 1698
1615 if (evpipe [0] >= 0) 1699 if (evpipe [0] >= 0)
1616 { 1700 {
1617 close (evpipe [0]); 1701 EV_WIN32_CLOSE_FD (evpipe [0]);
1618 close (evpipe [1]); 1702 EV_WIN32_CLOSE_FD (evpipe [1]);
1619 } 1703 }
1620 } 1704 }
1621 1705
1622#if EV_USE_SIGNALFD 1706#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w)) 1707 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd); 1708 close (sigfd);
1629 }
1630#endif 1709#endif
1631 1710
1632#if EV_USE_INOTIFY 1711#if EV_USE_INOTIFY
1633 if (fs_fd >= 0) 1712 if (fs_fd >= 0)
1634 close (fs_fd); 1713 close (fs_fd);
1704 1783
1705 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1706 { 1785 {
1707 /* this "locks" the handlers against writing to the pipe */ 1786 /* this "locks" the handlers against writing to the pipe */
1708 /* while we modify the fd vars */ 1787 /* while we modify the fd vars */
1709 gotsig = 1; 1788 sig_pending = 1;
1710#if EV_ASYNC_ENABLE 1789#if EV_ASYNC_ENABLE
1711 gotasync = 1; 1790 async_pending = 1;
1712#endif 1791#endif
1713 1792
1714 ev_ref (EV_A); 1793 ev_ref (EV_A);
1715 ev_io_stop (EV_A_ &pipe_w); 1794 ev_io_stop (EV_A_ &pipe_w);
1716 1795
1719 close (evfd); 1798 close (evfd);
1720#endif 1799#endif
1721 1800
1722 if (evpipe [0] >= 0) 1801 if (evpipe [0] >= 0)
1723 { 1802 {
1724 close (evpipe [0]); 1803 EV_WIN32_CLOSE_FD (evpipe [0]);
1725 close (evpipe [1]); 1804 EV_WIN32_CLOSE_FD (evpipe [1]);
1726 } 1805 }
1727 1806
1807#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1728 evpipe_init (EV_A); 1808 evpipe_init (EV_A);
1729 /* now iterate over everything, in case we missed something */ 1809 /* now iterate over everything, in case we missed something */
1730 pipecb (EV_A_ &pipe_w, EV_READ); 1810 pipecb (EV_A_ &pipe_w, EV_READ);
1811#endif
1731 } 1812 }
1732 1813
1733 postfork = 0; 1814 postfork = 0;
1734} 1815}
1735 1816
1797 verify_watcher (EV_A_ ws [cnt]); 1878 verify_watcher (EV_A_ ws [cnt]);
1798 } 1879 }
1799} 1880}
1800#endif 1881#endif
1801 1882
1802#if EV_MINIMAL < 2 1883#if EV_FEATURE_API
1803void 1884void
1804ev_loop_verify (EV_P) 1885ev_verify (EV_P)
1805{ 1886{
1806#if EV_VERIFY 1887#if EV_VERIFY
1807 int i; 1888 int i;
1808 WL w; 1889 WL w;
1809 1890
1848#if EV_ASYNC_ENABLE 1929#if EV_ASYNC_ENABLE
1849 assert (asyncmax >= asynccnt); 1930 assert (asyncmax >= asynccnt);
1850 array_verify (EV_A_ (W *)asyncs, asynccnt); 1931 array_verify (EV_A_ (W *)asyncs, asynccnt);
1851#endif 1932#endif
1852 1933
1934#if EV_PREPARE_ENABLE
1853 assert (preparemax >= preparecnt); 1935 assert (preparemax >= preparecnt);
1854 array_verify (EV_A_ (W *)prepares, preparecnt); 1936 array_verify (EV_A_ (W *)prepares, preparecnt);
1937#endif
1855 1938
1939#if EV_CHECK_ENABLE
1856 assert (checkmax >= checkcnt); 1940 assert (checkmax >= checkcnt);
1857 array_verify (EV_A_ (W *)checks, checkcnt); 1941 array_verify (EV_A_ (W *)checks, checkcnt);
1942#endif
1858 1943
1859# if 0 1944# if 0
1945#if EV_CHILD_ENABLE
1860 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)
1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig) 1947 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1948#endif
1862# endif 1949# endif
1863#endif 1950#endif
1864} 1951}
1865#endif 1952#endif
1866 1953
1882 1969
1883 loop_init (EV_A_ flags); 1970 loop_init (EV_A_ flags);
1884 1971
1885 if (ev_backend (EV_A)) 1972 if (ev_backend (EV_A))
1886 { 1973 {
1887#ifndef _WIN32 1974#if EV_CHILD_ENABLE
1888 ev_signal_init (&childev, childcb, SIGCHLD); 1975 ev_signal_init (&childev, childcb, SIGCHLD);
1889 ev_set_priority (&childev, EV_MAXPRI); 1976 ev_set_priority (&childev, EV_MAXPRI);
1890 ev_signal_start (EV_A_ &childev); 1977 ev_signal_start (EV_A_ &childev);
1891 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1978 ev_unref (EV_A); /* child watcher should not keep loop alive */
1892#endif 1979#endif
1905 EV_P = ev_default_loop_ptr; 1992 EV_P = ev_default_loop_ptr;
1906#endif 1993#endif
1907 1994
1908 ev_default_loop_ptr = 0; 1995 ev_default_loop_ptr = 0;
1909 1996
1910#ifndef _WIN32 1997#if EV_CHILD_ENABLE
1911 ev_ref (EV_A); /* child watcher */ 1998 ev_ref (EV_A); /* child watcher */
1912 ev_signal_stop (EV_A_ &childev); 1999 ev_signal_stop (EV_A_ &childev);
1913#endif 2000#endif
1914 2001
1915 loop_destroy (EV_A); 2002 loop_destroy (EV_A);
2021 EV_FREQUENT_CHECK; 2108 EV_FREQUENT_CHECK;
2022 feed_reverse (EV_A_ (W)w); 2109 feed_reverse (EV_A_ (W)w);
2023 } 2110 }
2024 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2111 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2025 2112
2026 feed_reverse_done (EV_A_ EV_TIMEOUT); 2113 feed_reverse_done (EV_A_ EV_TIMER);
2027 } 2114 }
2028} 2115}
2029 2116
2030#if EV_PERIODIC_ENABLE 2117#if EV_PERIODIC_ENABLE
2031/* make periodics pending */ 2118/* make periodics pending */
2122 ANHE_at_cache (*he); 2209 ANHE_at_cache (*he);
2123 } 2210 }
2124} 2211}
2125 2212
2126/* fetch new monotonic and realtime times from the kernel */ 2213/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */ 2214/* also detect if there was a timejump, and act accordingly */
2128inline_speed void 2215inline_speed void
2129time_update (EV_P_ ev_tstamp max_block) 2216time_update (EV_P_ ev_tstamp max_block)
2130{ 2217{
2131#if EV_USE_MONOTONIC 2218#if EV_USE_MONOTONIC
2132 if (expect_true (have_monotonic)) 2219 if (expect_true (have_monotonic))
2192} 2279}
2193 2280
2194void 2281void
2195ev_loop (EV_P_ int flags) 2282ev_loop (EV_P_ int flags)
2196{ 2283{
2197#if EV_MINIMAL < 2 2284#if EV_FEATURE_API
2198 ++loop_depth; 2285 ++loop_depth;
2199#endif 2286#endif
2200 2287
2201 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));
2202 2289
2205 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 */
2206 2293
2207 do 2294 do
2208 { 2295 {
2209#if EV_VERIFY >= 2 2296#if EV_VERIFY >= 2
2210 ev_loop_verify (EV_A); 2297 ev_verify (EV_A);
2211#endif 2298#endif
2212 2299
2213#ifndef _WIN32 2300#ifndef _WIN32
2214 if (expect_false (curpid)) /* penalise the forking check even more */ 2301 if (expect_false (curpid)) /* penalise the forking check even more */
2215 if (expect_false (getpid () != curpid)) 2302 if (expect_false (getpid () != curpid))
2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2314 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2228 EV_INVOKE_PENDING; 2315 EV_INVOKE_PENDING;
2229 } 2316 }
2230#endif 2317#endif
2231 2318
2319#if EV_PREPARE_ENABLE
2232 /* queue prepare watchers (and execute them) */ 2320 /* queue prepare watchers (and execute them) */
2233 if (expect_false (preparecnt)) 2321 if (expect_false (preparecnt))
2234 { 2322 {
2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2323 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2236 EV_INVOKE_PENDING; 2324 EV_INVOKE_PENDING;
2237 } 2325 }
2326#endif
2238 2327
2239 if (expect_false (loop_done)) 2328 if (expect_false (loop_done))
2240 break; 2329 break;
2241 2330
2242 /* we might have forked, so reify kernel state if necessary */ 2331 /* we might have forked, so reify kernel state if necessary */
2293 waittime -= sleeptime; 2382 waittime -= sleeptime;
2294 } 2383 }
2295 } 2384 }
2296 } 2385 }
2297 2386
2298#if EV_MINIMAL < 2 2387#if EV_FEATURE_API
2299 ++loop_count; 2388 ++loop_count;
2300#endif 2389#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2302 backend_poll (EV_A_ waittime); 2391 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2315#if EV_IDLE_ENABLE 2404#if EV_IDLE_ENABLE
2316 /* queue idle watchers unless other events are pending */ 2405 /* queue idle watchers unless other events are pending */
2317 idle_reify (EV_A); 2406 idle_reify (EV_A);
2318#endif 2407#endif
2319 2408
2409#if EV_CHECK_ENABLE
2320 /* queue check watchers, to be executed first */ 2410 /* queue check watchers, to be executed first */
2321 if (expect_false (checkcnt)) 2411 if (expect_false (checkcnt))
2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2412 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2413#endif
2323 2414
2324 EV_INVOKE_PENDING; 2415 EV_INVOKE_PENDING;
2325 } 2416 }
2326 while (expect_true ( 2417 while (expect_true (
2327 activecnt 2418 activecnt
2330 )); 2421 ));
2331 2422
2332 if (loop_done == EVUNLOOP_ONE) 2423 if (loop_done == EVUNLOOP_ONE)
2333 loop_done = EVUNLOOP_CANCEL; 2424 loop_done = EVUNLOOP_CANCEL;
2334 2425
2335#if EV_MINIMAL < 2 2426#if EV_FEATURE_API
2336 --loop_depth; 2427 --loop_depth;
2337#endif 2428#endif
2338} 2429}
2339 2430
2340void 2431void
2393inline_size void 2484inline_size void
2394wlist_del (WL *head, WL elem) 2485wlist_del (WL *head, WL elem)
2395{ 2486{
2396 while (*head) 2487 while (*head)
2397 { 2488 {
2398 if (*head == elem) 2489 if (expect_true (*head == elem))
2399 { 2490 {
2400 *head = elem->next; 2491 *head = elem->next;
2401 return; 2492 break;
2402 } 2493 }
2403 2494
2404 head = &(*head)->next; 2495 head = &(*head)->next;
2405 } 2496 }
2406} 2497}
2466 2557
2467 if (expect_false (ev_is_active (w))) 2558 if (expect_false (ev_is_active (w)))
2468 return; 2559 return;
2469 2560
2470 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2561 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2562 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2472 2563
2473 EV_FREQUENT_CHECK; 2564 EV_FREQUENT_CHECK;
2474 2565
2475 ev_start (EV_A_ (W)w, 1); 2566 ev_start (EV_A_ (W)w, 1);
2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2567 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2546 timers [active] = timers [timercnt + HEAP0]; 2637 timers [active] = timers [timercnt + HEAP0];
2547 adjustheap (timers, timercnt, active); 2638 adjustheap (timers, timercnt, active);
2548 } 2639 }
2549 } 2640 }
2550 2641
2551 EV_FREQUENT_CHECK;
2552
2553 ev_at (w) -= mn_now; 2642 ev_at (w) -= mn_now;
2554 2643
2555 ev_stop (EV_A_ (W)w); 2644 ev_stop (EV_A_ (W)w);
2645
2646 EV_FREQUENT_CHECK;
2556} 2647}
2557 2648
2558void noinline 2649void noinline
2559ev_timer_again (EV_P_ ev_timer *w) 2650ev_timer_again (EV_P_ ev_timer *w)
2560{ 2651{
2639 periodics [active] = periodics [periodiccnt + HEAP0]; 2730 periodics [active] = periodics [periodiccnt + HEAP0];
2640 adjustheap (periodics, periodiccnt, active); 2731 adjustheap (periodics, periodiccnt, active);
2641 } 2732 }
2642 } 2733 }
2643 2734
2644 EV_FREQUENT_CHECK;
2645
2646 ev_stop (EV_A_ (W)w); 2735 ev_stop (EV_A_ (W)w);
2736
2737 EV_FREQUENT_CHECK;
2647} 2738}
2648 2739
2649void noinline 2740void noinline
2650ev_periodic_again (EV_P_ ev_periodic *w) 2741ev_periodic_again (EV_P_ ev_periodic *w)
2651{ 2742{
2657 2748
2658#ifndef SA_RESTART 2749#ifndef SA_RESTART
2659# define SA_RESTART 0 2750# define SA_RESTART 0
2660#endif 2751#endif
2661 2752
2753#if EV_SIGNAL_ENABLE
2754
2662void noinline 2755void noinline
2663ev_signal_start (EV_P_ ev_signal *w) 2756ev_signal_start (EV_P_ ev_signal *w)
2664{ 2757{
2665 if (expect_false (ev_is_active (w))) 2758 if (expect_false (ev_is_active (w)))
2666 return; 2759 return;
2667 2760
2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG)); 2761 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669 2762
2670#if EV_MULTIPLICITY 2763#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops", 2764 assert (("libev: a signal must not be attached to two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop)); 2765 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2673 2766
2674 signals [w->signum - 1].loop = EV_A; 2767 signals [w->signum - 1].loop = EV_A;
2675#endif 2768#endif
2676 2769
2712 if (!((WL)w)->next) 2805 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD 2806# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/ 2807 if (sigfd < 0) /*TODO*/
2715# endif 2808# endif
2716 { 2809 {
2717# if _WIN32 2810# ifdef _WIN32
2811 evpipe_init (EV_A);
2812
2718 signal (w->signum, ev_sighandler); 2813 signal (w->signum, ev_sighandler);
2719# else 2814# else
2720 struct sigaction sa; 2815 struct sigaction sa;
2721 2816
2722 evpipe_init (EV_A); 2817 evpipe_init (EV_A);
2747 wlist_del (&signals [w->signum - 1].head, (WL)w); 2842 wlist_del (&signals [w->signum - 1].head, (WL)w);
2748 ev_stop (EV_A_ (W)w); 2843 ev_stop (EV_A_ (W)w);
2749 2844
2750 if (!signals [w->signum - 1].head) 2845 if (!signals [w->signum - 1].head)
2751 { 2846 {
2752 #if EV_MULTIPLICITY 2847#if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */ 2848 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif 2849#endif
2755 #if EV_USE_SIGNALFD 2850#if EV_USE_SIGNALFD
2756 if (sigfd >= 0) 2851 if (sigfd >= 0)
2757 { 2852 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2853 sigset_t ss;
2854
2855 sigemptyset (&ss);
2856 sigaddset (&ss, w->signum);
2759 sigdelset (&sigfd_set, w->signum); 2857 sigdelset (&sigfd_set, w->signum);
2858
2760 signalfd (sigfd, &sigfd_set, 0); 2859 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2860 sigprocmask (SIG_UNBLOCK, &ss, 0);
2762 /*TODO: maybe unblock signal? */
2763 } 2861 }
2764 else 2862 else
2765 #endif 2863#endif
2766 signal (w->signum, SIG_DFL); 2864 signal (w->signum, SIG_DFL);
2767 } 2865 }
2768 2866
2769 EV_FREQUENT_CHECK; 2867 EV_FREQUENT_CHECK;
2770} 2868}
2869
2870#endif
2871
2872#if EV_CHILD_ENABLE
2771 2873
2772void 2874void
2773ev_child_start (EV_P_ ev_child *w) 2875ev_child_start (EV_P_ ev_child *w)
2774{ 2876{
2775#if EV_MULTIPLICITY 2877#if EV_MULTIPLICITY
2779 return; 2881 return;
2780 2882
2781 EV_FREQUENT_CHECK; 2883 EV_FREQUENT_CHECK;
2782 2884
2783 ev_start (EV_A_ (W)w, 1); 2885 ev_start (EV_A_ (W)w, 1);
2784 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2886 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2785 2887
2786 EV_FREQUENT_CHECK; 2888 EV_FREQUENT_CHECK;
2787} 2889}
2788 2890
2789void 2891void
2793 if (expect_false (!ev_is_active (w))) 2895 if (expect_false (!ev_is_active (w)))
2794 return; 2896 return;
2795 2897
2796 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2797 2899
2798 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2799 ev_stop (EV_A_ (W)w); 2901 ev_stop (EV_A_ (W)w);
2800 2902
2801 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2802} 2904}
2905
2906#endif
2803 2907
2804#if EV_STAT_ENABLE 2908#if EV_STAT_ENABLE
2805 2909
2806# ifdef _WIN32 2910# ifdef _WIN32
2807# undef lstat 2911# undef lstat
2813#define MIN_STAT_INTERVAL 0.1074891 2917#define MIN_STAT_INTERVAL 0.1074891
2814 2918
2815static 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);
2816 2920
2817#if EV_USE_INOTIFY 2921#if EV_USE_INOTIFY
2818# 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)
2819 2925
2820static void noinline 2926static void noinline
2821infy_add (EV_P_ ev_stat *w) 2927infy_add (EV_P_ ev_stat *w)
2822{ 2928{
2823 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 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);
2824 2930
2825 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 */
2826 { 2951 }
2952 else
2953 {
2954 /* can't use inotify, continue to stat */
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2955 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829 2956
2830 /* monitor some parent directory for speedup hints */ 2957 /* if path is not there, monitor some parent directory for speedup hints */
2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2958 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2832 /* but an efficiency issue only */ 2959 /* but an efficiency issue only */
2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2960 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2834 { 2961 {
2835 char path [4096]; 2962 char path [4096];
2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2978 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2852 } 2979 }
2853 } 2980 }
2854 2981
2855 if (w->wd >= 0) 2982 if (w->wd >= 0)
2856 {
2857 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);
2858 2984
2859 /* now local changes will be tracked by inotify, but remote changes won't */ 2985 /* now re-arm timer, if required */
2860 /* unless the filesystem it known to be local, we therefore still poll */ 2986 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer); 2987 ev_timer_again (EV_A_ &w->timer);
2875 } 2988 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876} 2989}
2877 2990
2878static void noinline 2991static void noinline
2879infy_del (EV_P_ ev_stat *w) 2992infy_del (EV_P_ ev_stat *w)
2880{ 2993{
2883 2996
2884 if (wd < 0) 2997 if (wd < 0)
2885 return; 2998 return;
2886 2999
2887 w->wd = -2; 3000 w->wd = -2;
2888 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3001 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2889 wlist_del (&fs_hash [slot].head, (WL)w); 3002 wlist_del (&fs_hash [slot].head, (WL)w);
2890 3003
2891 /* remove this watcher, if others are watching it, they will rearm */ 3004 /* remove this watcher, if others are watching it, they will rearm */
2892 inotify_rm_watch (fs_fd, wd); 3005 inotify_rm_watch (fs_fd, wd);
2893} 3006}
2895static void noinline 3008static void noinline
2896infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3009infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2897{ 3010{
2898 if (slot < 0) 3011 if (slot < 0)
2899 /* overflow, need to check for all hash slots */ 3012 /* overflow, need to check for all hash slots */
2900 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3013 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2901 infy_wd (EV_A_ slot, wd, ev); 3014 infy_wd (EV_A_ slot, wd, ev);
2902 else 3015 else
2903 { 3016 {
2904 WL w_; 3017 WL w_;
2905 3018
2906 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3019 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2907 { 3020 {
2908 ev_stat *w = (ev_stat *)w_; 3021 ev_stat *w = (ev_stat *)w_;
2909 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 */
2910 3023
2911 if (w->wd == wd || wd == -1) 3024 if (w->wd == wd || wd == -1)
2912 { 3025 {
2913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3026 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2914 { 3027 {
2915 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);
2916 w->wd = -1; 3029 w->wd = -1;
2917 infy_add (EV_A_ w); /* re-add, no matter what */ 3030 infy_add (EV_A_ w); /* re-add, no matter what */
2918 } 3031 }
2919 3032
2920 stat_timer_cb (EV_A_ &w->timer, 0); 3033 stat_timer_cb (EV_A_ &w->timer, 0);
2925 3038
2926static void 3039static void
2927infy_cb (EV_P_ ev_io *w, int revents) 3040infy_cb (EV_P_ ev_io *w, int revents)
2928{ 3041{
2929 char buf [EV_INOTIFY_BUFSIZE]; 3042 char buf [EV_INOTIFY_BUFSIZE];
2930 struct inotify_event *ev = (struct inotify_event *)buf;
2931 int ofs; 3043 int ofs;
2932 int len = read (fs_fd, buf, sizeof (buf)); 3044 int len = read (fs_fd, buf, sizeof (buf));
2933 3045
2934 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);
2935 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;
2936} 3084}
2937 3085
2938inline_size void 3086inline_size void
2939check_2625 (EV_P) 3087ev_check_2625 (EV_P)
2940{ 3088{
2941 /* kernels < 2.6.25 are borked 3089 /* kernels < 2.6.25 are borked
2942 * 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
2943 */ 3091 */
2944 struct utsname buf; 3092 if (ev_linux_version () < 0x020619)
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return; 3093 return;
2949 3094
2950 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2951 return;
2952
2953 if (major < 2
2954 || (major == 2 && minor < 6)
2955 || (major == 2 && minor == 6 && micro < 25))
2956 return;
2957
2958 fs_2625 = 1; 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 ();
2959} 3107}
2960 3108
2961inline_size void 3109inline_size void
2962infy_init (EV_P) 3110infy_init (EV_P)
2963{ 3111{
2964 if (fs_fd != -2) 3112 if (fs_fd != -2)
2965 return; 3113 return;
2966 3114
2967 fs_fd = -1; 3115 fs_fd = -1;
2968 3116
2969 check_2625 (EV_A); 3117 ev_check_2625 (EV_A);
2970 3118
2971 fs_fd = inotify_init (); 3119 fs_fd = infy_newfd ();
2972 3120
2973 if (fs_fd >= 0) 3121 if (fs_fd >= 0)
2974 { 3122 {
3123 fd_intern (fs_fd);
2975 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3124 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976 ev_set_priority (&fs_w, EV_MAXPRI); 3125 ev_set_priority (&fs_w, EV_MAXPRI);
2977 ev_io_start (EV_A_ &fs_w); 3126 ev_io_start (EV_A_ &fs_w);
3127 ev_unref (EV_A);
2978 } 3128 }
2979} 3129}
2980 3130
2981inline_size void 3131inline_size void
2982infy_fork (EV_P) 3132infy_fork (EV_P)
2984 int slot; 3134 int slot;
2985 3135
2986 if (fs_fd < 0) 3136 if (fs_fd < 0)
2987 return; 3137 return;
2988 3138
3139 ev_ref (EV_A);
3140 ev_io_stop (EV_A_ &fs_w);
2989 close (fs_fd); 3141 close (fs_fd);
2990 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
2991 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
2992 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3152 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2993 { 3153 {
2994 WL w_ = fs_hash [slot].head; 3154 WL w_ = fs_hash [slot].head;
2995 fs_hash [slot].head = 0; 3155 fs_hash [slot].head = 0;
2996 3156
2997 while (w_) 3157 while (w_)
3002 w->wd = -1; 3162 w->wd = -1;
3003 3163
3004 if (fs_fd >= 0) 3164 if (fs_fd >= 0)
3005 infy_add (EV_A_ w); /* re-add, no matter what */ 3165 infy_add (EV_A_ w); /* re-add, no matter what */
3006 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);
3007 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 }
3008 } 3173 }
3009 } 3174 }
3010} 3175}
3011 3176
3012#endif 3177#endif
3029static void noinline 3194static void noinline
3030stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3195stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031{ 3196{
3032 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3197 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3033 3198
3034 /* we copy this here each the time so that */ 3199 ev_statdata prev = w->attr;
3035 /* prev has the old value when the callback gets invoked */
3036 w->prev = w->attr;
3037 ev_stat_stat (EV_A_ w); 3200 ev_stat_stat (EV_A_ w);
3038 3201
3039 /* 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 */
3040 if ( 3203 if (
3041 w->prev.st_dev != w->attr.st_dev 3204 prev.st_dev != w->attr.st_dev
3042 || w->prev.st_ino != w->attr.st_ino 3205 || prev.st_ino != w->attr.st_ino
3043 || w->prev.st_mode != w->attr.st_mode 3206 || prev.st_mode != w->attr.st_mode
3044 || w->prev.st_nlink != w->attr.st_nlink 3207 || prev.st_nlink != w->attr.st_nlink
3045 || w->prev.st_uid != w->attr.st_uid 3208 || prev.st_uid != w->attr.st_uid
3046 || w->prev.st_gid != w->attr.st_gid 3209 || prev.st_gid != w->attr.st_gid
3047 || w->prev.st_rdev != w->attr.st_rdev 3210 || prev.st_rdev != w->attr.st_rdev
3048 || w->prev.st_size != w->attr.st_size 3211 || prev.st_size != w->attr.st_size
3049 || w->prev.st_atime != w->attr.st_atime 3212 || prev.st_atime != w->attr.st_atime
3050 || w->prev.st_mtime != w->attr.st_mtime 3213 || prev.st_mtime != w->attr.st_mtime
3051 || w->prev.st_ctime != w->attr.st_ctime 3214 || prev.st_ctime != w->attr.st_ctime
3052 ) { 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
3053 #if EV_USE_INOTIFY 3221 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0) 3222 if (fs_fd >= 0)
3055 { 3223 {
3056 infy_del (EV_A_ w); 3224 infy_del (EV_A_ w);
3057 infy_add (EV_A_ w); 3225 infy_add (EV_A_ w);
3082 3250
3083 if (fs_fd >= 0) 3251 if (fs_fd >= 0)
3084 infy_add (EV_A_ w); 3252 infy_add (EV_A_ w);
3085 else 3253 else
3086#endif 3254#endif
3255 {
3087 ev_timer_again (EV_A_ &w->timer); 3256 ev_timer_again (EV_A_ &w->timer);
3257 ev_unref (EV_A);
3258 }
3088 3259
3089 ev_start (EV_A_ (W)w, 1); 3260 ev_start (EV_A_ (W)w, 1);
3090 3261
3091 EV_FREQUENT_CHECK; 3262 EV_FREQUENT_CHECK;
3092} 3263}
3101 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
3102 3273
3103#if EV_USE_INOTIFY 3274#if EV_USE_INOTIFY
3104 infy_del (EV_A_ w); 3275 infy_del (EV_A_ w);
3105#endif 3276#endif
3277
3278 if (ev_is_active (&w->timer))
3279 {
3280 ev_ref (EV_A);
3106 ev_timer_stop (EV_A_ &w->timer); 3281 ev_timer_stop (EV_A_ &w->timer);
3282 }
3107 3283
3108 ev_stop (EV_A_ (W)w); 3284 ev_stop (EV_A_ (W)w);
3109 3285
3110 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
3111} 3287}
3156 3332
3157 EV_FREQUENT_CHECK; 3333 EV_FREQUENT_CHECK;
3158} 3334}
3159#endif 3335#endif
3160 3336
3337#if EV_PREPARE_ENABLE
3161void 3338void
3162ev_prepare_start (EV_P_ ev_prepare *w) 3339ev_prepare_start (EV_P_ ev_prepare *w)
3163{ 3340{
3164 if (expect_false (ev_is_active (w))) 3341 if (expect_false (ev_is_active (w)))
3165 return; 3342 return;
3191 3368
3192 ev_stop (EV_A_ (W)w); 3369 ev_stop (EV_A_ (W)w);
3193 3370
3194 EV_FREQUENT_CHECK; 3371 EV_FREQUENT_CHECK;
3195} 3372}
3373#endif
3196 3374
3375#if EV_CHECK_ENABLE
3197void 3376void
3198ev_check_start (EV_P_ ev_check *w) 3377ev_check_start (EV_P_ ev_check *w)
3199{ 3378{
3200 if (expect_false (ev_is_active (w))) 3379 if (expect_false (ev_is_active (w)))
3201 return; 3380 return;
3227 3406
3228 ev_stop (EV_A_ (W)w); 3407 ev_stop (EV_A_ (W)w);
3229 3408
3230 EV_FREQUENT_CHECK; 3409 EV_FREQUENT_CHECK;
3231} 3410}
3411#endif
3232 3412
3233#if EV_EMBED_ENABLE 3413#if EV_EMBED_ENABLE
3234void noinline 3414void noinline
3235ev_embed_sweep (EV_P_ ev_embed *w) 3415ev_embed_sweep (EV_P_ ev_embed *w)
3236{ 3416{
3331 3511
3332 ev_io_stop (EV_A_ &w->io); 3512 ev_io_stop (EV_A_ &w->io);
3333 ev_prepare_stop (EV_A_ &w->prepare); 3513 ev_prepare_stop (EV_A_ &w->prepare);
3334 ev_fork_stop (EV_A_ &w->fork); 3514 ev_fork_stop (EV_A_ &w->fork);
3335 3515
3516 ev_stop (EV_A_ (W)w);
3517
3336 EV_FREQUENT_CHECK; 3518 EV_FREQUENT_CHECK;
3337} 3519}
3338#endif 3520#endif
3339 3521
3340#if EV_FORK_ENABLE 3522#if EV_FORK_ENABLE
3416 3598
3417void 3599void
3418ev_async_send (EV_P_ ev_async *w) 3600ev_async_send (EV_P_ ev_async *w)
3419{ 3601{
3420 w->sent = 1; 3602 w->sent = 1;
3421 evpipe_write (EV_A_ &gotasync); 3603 evpipe_write (EV_A_ &async_pending);
3422} 3604}
3423#endif 3605#endif
3424 3606
3425/*****************************************************************************/ 3607/*****************************************************************************/
3426 3608
3466{ 3648{
3467 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));
3468 3650
3469 if (expect_false (!once)) 3651 if (expect_false (!once))
3470 { 3652 {
3471 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3653 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3472 return; 3654 return;
3473 } 3655 }
3474 3656
3475 once->cb = cb; 3657 once->cb = cb;
3476 once->arg = arg; 3658 once->arg = arg;
3563 if (types & EV_ASYNC) 3745 if (types & EV_ASYNC)
3564 for (i = asynccnt; i--; ) 3746 for (i = asynccnt; i--; )
3565 cb (EV_A_ EV_ASYNC, asyncs [i]); 3747 cb (EV_A_ EV_ASYNC, asyncs [i]);
3566#endif 3748#endif
3567 3749
3750#if EV_PREPARE_ENABLE
3568 if (types & EV_PREPARE) 3751 if (types & EV_PREPARE)
3569 for (i = preparecnt; i--; ) 3752 for (i = preparecnt; i--; )
3570#if EV_EMBED_ENABLE 3753# if EV_EMBED_ENABLE
3571 if (ev_cb (prepares [i]) != embed_prepare_cb) 3754 if (ev_cb (prepares [i]) != embed_prepare_cb)
3572#endif 3755# endif
3573 cb (EV_A_ EV_PREPARE, prepares [i]); 3756 cb (EV_A_ EV_PREPARE, prepares [i]);
3757#endif
3574 3758
3759#if EV_CHECK_ENABLE
3575 if (types & EV_CHECK) 3760 if (types & EV_CHECK)
3576 for (i = checkcnt; i--; ) 3761 for (i = checkcnt; i--; )
3577 cb (EV_A_ EV_CHECK, checks [i]); 3762 cb (EV_A_ EV_CHECK, checks [i]);
3763#endif
3578 3764
3765#if EV_SIGNAL_ENABLE
3579 if (types & EV_SIGNAL) 3766 if (types & EV_SIGNAL)
3580 for (i = 0; i < EV_NSIG - 1; ++i) 3767 for (i = 0; i < EV_NSIG - 1; ++i)
3581 for (wl = signals [i].head; wl; ) 3768 for (wl = signals [i].head; wl; )
3582 { 3769 {
3583 wn = wl->next; 3770 wn = wl->next;
3584 cb (EV_A_ EV_SIGNAL, wl); 3771 cb (EV_A_ EV_SIGNAL, wl);
3585 wl = wn; 3772 wl = wn;
3586 } 3773 }
3774#endif
3587 3775
3776#if EV_CHILD_ENABLE
3588 if (types & EV_CHILD) 3777 if (types & EV_CHILD)
3589 for (i = EV_PID_HASHSIZE; i--; ) 3778 for (i = (EV_PID_HASHSIZE); i--; )
3590 for (wl = childs [i]; wl; ) 3779 for (wl = childs [i]; wl; )
3591 { 3780 {
3592 wn = wl->next; 3781 wn = wl->next;
3593 cb (EV_A_ EV_CHILD, wl); 3782 cb (EV_A_ EV_CHILD, wl);
3594 wl = wn; 3783 wl = wn;
3595 } 3784 }
3785#endif
3596/* EV_STAT 0x00001000 /* stat data changed */ 3786/* EV_STAT 0x00001000 /* stat data changed */
3597/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3787/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3598} 3788}
3599#endif 3789#endif
3600 3790

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines