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

Comparing libev/ev.c (file contents):
Revision 1.301 by root, Wed Jul 15 16:58:53 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
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
136# endif 152# endif
137 153
154# if HAVE_EVENTFD
138# ifndef EV_USE_EVENTFD 155# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 156# define EV_USE_EVENTFD EV_FEATURE_OS
141# else
142# define EV_USE_EVENTFD 0
143# endif 157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
144# endif 161# endif
145 162
146#endif 163#endif
147 164
148#include <math.h> 165#include <math.h>
149#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
150#include <fcntl.h> 168#include <fcntl.h>
151#include <stddef.h> 169#include <stddef.h>
152 170
153#include <stdio.h> 171#include <stdio.h>
154 172
155#include <assert.h> 173#include <assert.h>
156#include <errno.h> 174#include <errno.h>
157#include <sys/types.h> 175#include <sys/types.h>
158#include <time.h> 176#include <time.h>
177#include <limits.h>
159 178
160#include <signal.h> 179#include <signal.h>
161 180
162#ifdef EV_H 181#ifdef EV_H
163# include EV_H 182# include EV_H
174# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 194# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
178# endif 197# endif
198# undef EV_AVOID_STDIO
179#endif 199#endif
180 200
181/* 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 */
202
203/* try to deduce the maximum number of signals on this platform */
204#if defined (EV_NSIG)
205/* use what's provided */
206#elif defined (NSIG)
207# define EV_NSIG (NSIG)
208#elif defined(_NSIG)
209# define EV_NSIG (_NSIG)
210#elif defined (SIGMAX)
211# define EV_NSIG (SIGMAX+1)
212#elif defined (SIG_MAX)
213# define EV_NSIG (SIG_MAX+1)
214#elif defined (_SIG_MAX)
215# define EV_NSIG (_SIG_MAX+1)
216#elif defined (MAXSIG)
217# define EV_NSIG (MAXSIG+1)
218#elif defined (MAX_SIG)
219# define EV_NSIG (MAX_SIG+1)
220#elif defined (SIGARRAYSIZE)
221# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
222#elif defined (_sys_nsig)
223# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
224#else
225# error "unable to find value for NSIG, please report"
226/* to make it compile regardless, just remove the above line, */
227/* but consider reporting it, too! :) */
228# define EV_NSIG 65
229#endif
182 230
183#ifndef EV_USE_CLOCK_SYSCALL 231#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 232# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 233# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 234# else
187# define EV_USE_CLOCK_SYSCALL 0 235# define EV_USE_CLOCK_SYSCALL 0
188# endif 236# endif
189#endif 237#endif
190 238
191#ifndef EV_USE_MONOTONIC 239#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 240# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 241# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 242# else
195# define EV_USE_MONOTONIC 0 243# define EV_USE_MONOTONIC 0
196# endif 244# endif
197#endif 245#endif
198 246
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 248# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 249#endif
202 250
203#ifndef EV_USE_NANOSLEEP 251#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 252# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 253# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 254# else
207# define EV_USE_NANOSLEEP 0 255# define EV_USE_NANOSLEEP 0
208# endif 256# endif
209#endif 257#endif
210 258
211#ifndef EV_USE_SELECT 259#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 260# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 261#endif
214 262
215#ifndef EV_USE_POLL 263#ifndef EV_USE_POLL
216# ifdef _WIN32 264# ifdef _WIN32
217# define EV_USE_POLL 0 265# define EV_USE_POLL 0
218# else 266# else
219# define EV_USE_POLL 1 267# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 268# endif
221#endif 269#endif
222 270
223#ifndef EV_USE_EPOLL 271#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 273# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 274# else
227# define EV_USE_EPOLL 0 275# define EV_USE_EPOLL 0
228# endif 276# endif
229#endif 277#endif
230 278
236# define EV_USE_PORT 0 284# define EV_USE_PORT 0
237#endif 285#endif
238 286
239#ifndef EV_USE_INOTIFY 287#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 288# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 289# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 290# else
243# define EV_USE_INOTIFY 0 291# define EV_USE_INOTIFY 0
244# endif 292# endif
245#endif 293#endif
246 294
247#ifndef EV_PID_HASHSIZE 295#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 296# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
249# define EV_PID_HASHSIZE 1
250# else
251# define EV_PID_HASHSIZE 16
252# endif
253#endif 297#endif
254 298
255#ifndef EV_INOTIFY_HASHSIZE 299#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 300# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_INOTIFY_HASHSIZE 1
258# else
259# define EV_INOTIFY_HASHSIZE 16
260# endif
261#endif 301#endif
262 302
263#ifndef EV_USE_EVENTFD 303#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 304# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 305# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 306# else
267# define EV_USE_EVENTFD 0 307# define EV_USE_EVENTFD 0
308# endif
309#endif
310
311#ifndef EV_USE_SIGNALFD
312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
313# define EV_USE_SIGNALFD EV_FEATURE_OS
314# else
315# define EV_USE_SIGNALFD 0
268# endif 316# endif
269#endif 317#endif
270 318
271#if 0 /* debugging */ 319#if 0 /* debugging */
272# define EV_VERIFY 3 320# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 321# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 322# define EV_HEAP_CACHE_AT 1
275#endif 323#endif
276 324
277#ifndef EV_VERIFY 325#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 326# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 327#endif
280 328
281#ifndef EV_USE_4HEAP 329#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 330# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 331#endif
284 332
285#ifndef EV_HEAP_CACHE_AT 333#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 334# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif 335#endif
288 336
289/* 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, */
290/* which makes programs even slower. might work on other unices, too. */ 338/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL 339#if EV_USE_CLOCK_SYSCALL
300# endif 348# endif
301#endif 349#endif
302 350
303/* 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 */
304 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
305#ifndef CLOCK_MONOTONIC 359#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 360# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 361# define EV_USE_MONOTONIC 0
308#endif 362#endif
309 363
339#endif 393#endif
340 394
341#if EV_USE_EVENTFD 395#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 396/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 397# include <stdint.h>
398# ifndef EFD_NONBLOCK
399# define EFD_NONBLOCK O_NONBLOCK
400# endif
401# ifndef EFD_CLOEXEC
402# ifdef O_CLOEXEC
403# define EFD_CLOEXEC O_CLOEXEC
404# else
405# define EFD_CLOEXEC 02000000
406# endif
407# endif
344# ifdef __cplusplus 408# ifdef __cplusplus
345extern "C" { 409extern "C" {
346# endif 410# endif
347int eventfd (unsigned int initval, int flags); 411int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 412# ifdef __cplusplus
349} 413}
350# endif 414# endif
351#endif 415#endif
352 416
417#if EV_USE_SIGNALFD
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
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
445
353/**/ 446/**/
354 447
355#if EV_VERIFY >= 3 448#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 449# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 450#else
358# define EV_FREQUENT_CHECK do { } while (0) 451# define EV_FREQUENT_CHECK do { } while (0)
359#endif 452#endif
360 453
361/* 454/*
368 */ 461 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 462#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 463
371#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) */
372#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) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 466
375#if __GNUC__ >= 4 467#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 468# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 469# define noinline __attribute__ ((noinline))
378#else 470#else
385 477
386#define expect_false(expr) expect ((expr) != 0, 0) 478#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 479#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 480#define inline_size static inline
389 481
390#if EV_MINIMAL 482#if EV_FEATURE_CODE
483# define inline_speed static inline
484#else
391# define inline_speed static noinline 485# define inline_speed static noinline
392#else
393# define inline_speed static inline
394#endif 486#endif
395 487
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 488#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397 489
398#if EV_MINPRI == EV_MAXPRI 490#if EV_MINPRI == EV_MAXPRI
419 511
420#if EV_USE_MONOTONIC 512#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 513static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 514#endif
423 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
424#ifdef _WIN32 526#ifdef _WIN32
425# include "ev_win32.c" 527# include "ev_win32.c"
426#endif 528#endif
427 529
428/*****************************************************************************/ 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
429 539
430static void (*syserr_cb)(const char *msg); 540static void (*syserr_cb)(const char *msg);
431 541
432void 542void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 543ev_set_syserr_cb (void (*cb)(const char *msg))
443 553
444 if (syserr_cb) 554 if (syserr_cb)
445 syserr_cb (msg); 555 syserr_cb (msg);
446 else 556 else
447 { 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
448 perror (msg); 566 perror (msg);
567#endif
449 abort (); 568 abort ();
450 } 569 }
451} 570}
452 571
453static void * 572static void *
454ev_realloc_emul (void *ptr, long size) 573ev_realloc_emul (void *ptr, long size)
455{ 574{
575#if __GLIBC__
576 return realloc (ptr, size);
577#else
456 /* some systems, notably openbsd and darwin, fail to properly 578 /* some systems, notably openbsd and darwin, fail to properly
457 * 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
458 * the single unix specification, so work around them here. 580 * the single unix specification, so work around them here.
459 */ 581 */
460 582
461 if (size) 583 if (size)
462 return realloc (ptr, size); 584 return realloc (ptr, size);
463 585
464 free (ptr); 586 free (ptr);
465 return 0; 587 return 0;
588#endif
466} 589}
467 590
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 591static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 592
470void 593void
478{ 601{
479 ptr = alloc (ptr, size); 602 ptr = alloc (ptr, size);
480 603
481 if (!ptr && size) 604 if (!ptr && size)
482 { 605 {
606#if EV_AVOID_STDIO
607 ev_printerr ("libev: memory allocation failed, aborting.\n");
608#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 609 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
610#endif
484 abort (); 611 abort ();
485 } 612 }
486 613
487 return ptr; 614 return ptr;
488} 615}
570 697
571 static int ev_default_loop_ptr; 698 static int ev_default_loop_ptr;
572 699
573#endif 700#endif
574 701
575#if EV_MINIMAL < 2 702#if EV_FEATURE_API
576# 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)
577# 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)
578# define EV_INVOKE_PENDING invoke_cb (EV_A) 705# define EV_INVOKE_PENDING invoke_cb (EV_A)
579#else 706#else
580# define EV_RELEASE_CB (void)0 707# define EV_RELEASE_CB (void)0
647 774
648 tv.tv_sec = (time_t)delay; 775 tv.tv_sec = (time_t)delay;
649 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 776 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
650 777
651 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 778 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
652 /* somehting not guaranteed by newer posix versions, but guaranteed */ 779 /* something not guaranteed by newer posix versions, but guaranteed */
653 /* by older ones */ 780 /* by older ones */
654 select (0, 0, 0, 0, &tv); 781 select (0, 0, 0, 0, &tv);
655#endif 782#endif
656 } 783 }
657} 784}
765} 892}
766 893
767/*****************************************************************************/ 894/*****************************************************************************/
768 895
769inline_speed void 896inline_speed void
770fd_event_nc (EV_P_ int fd, int revents) 897fd_event_nocheck (EV_P_ int fd, int revents)
771{ 898{
772 ANFD *anfd = anfds + fd; 899 ANFD *anfd = anfds + fd;
773 ev_io *w; 900 ev_io *w;
774 901
775 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)
787fd_event (EV_P_ int fd, int revents) 914fd_event (EV_P_ int fd, int revents)
788{ 915{
789 ANFD *anfd = anfds + fd; 916 ANFD *anfd = anfds + fd;
790 917
791 if (expect_true (!anfd->reify)) 918 if (expect_true (!anfd->reify))
792 fd_event_nc (EV_A_ fd, revents); 919 fd_event_nocheck (EV_A_ fd, revents);
793} 920}
794 921
795void 922void
796ev_feed_fd_event (EV_P_ int fd, int revents) 923ev_feed_fd_event (EV_P_ int fd, int revents)
797{ 924{
798 if (fd >= 0 && fd < anfdmax) 925 if (fd >= 0 && fd < anfdmax)
799 fd_event_nc (EV_A_ fd, revents); 926 fd_event_nocheck (EV_A_ fd, revents);
800} 927}
801 928
802/* make sure the external fd watch events are in-sync */ 929/* make sure the external fd watch events are in-sync */
803/* with the kernel/libev internal state */ 930/* with the kernel/libev internal state */
804inline_size void 931inline_size void
819 946
820#if EV_SELECT_IS_WINSOCKET 947#if EV_SELECT_IS_WINSOCKET
821 if (events) 948 if (events)
822 { 949 {
823 unsigned long arg; 950 unsigned long arg;
824 #ifdef EV_FD_TO_WIN32_HANDLE
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 951 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
826 #else
827 anfd->handle = _get_osfhandle (fd);
828 #endif
829 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));
830 } 953 }
831#endif 954#endif
832 955
833 { 956 {
871 ev_io_stop (EV_A_ w); 994 ev_io_stop (EV_A_ w);
872 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);
873 } 996 }
874} 997}
875 998
876/* check whether the given fd is atcually valid, for error recovery */ 999/* check whether the given fd is actually valid, for error recovery */
877inline_size int 1000inline_size int
878fd_valid (int fd) 1001fd_valid (int fd)
879{ 1002{
880#ifdef _WIN32 1003#ifdef _WIN32
881 return _get_osfhandle (fd) != -1; 1004 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
882#else 1005#else
883 return fcntl (fd, F_GETFD) != -1; 1006 return fcntl (fd, F_GETFD) != -1;
884#endif 1007#endif
885} 1008}
886 1009
904 1027
905 for (fd = anfdmax; fd--; ) 1028 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 1029 if (anfds [fd].events)
907 { 1030 {
908 fd_kill (EV_A_ fd); 1031 fd_kill (EV_A_ fd);
909 return; 1032 break;
910 } 1033 }
911} 1034}
912 1035
913/* 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 */
914static void noinline 1037static void noinline
921 { 1044 {
922 anfds [fd].events = 0; 1045 anfds [fd].events = 0;
923 anfds [fd].emask = 0; 1046 anfds [fd].emask = 0;
924 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1047 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
925 } 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
926} 1063}
927 1064
928/*****************************************************************************/ 1065/*****************************************************************************/
929 1066
930/* 1067/*
1004 1141
1005 for (;;) 1142 for (;;)
1006 { 1143 {
1007 int c = k << 1; 1144 int c = k << 1;
1008 1145
1009 if (c > N + HEAP0 - 1) 1146 if (c >= N + HEAP0)
1010 break; 1147 break;
1011 1148
1012 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])
1013 ? 1 : 0; 1150 ? 1 : 0;
1014 1151
1050 1187
1051/* move an element suitably so it is in a correct place */ 1188/* move an element suitably so it is in a correct place */
1052inline_size void 1189inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1190adjustheap (ANHE *heap, int N, int k)
1054{ 1191{
1055 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)]))
1056 upheap (heap, k); 1193 upheap (heap, k);
1057 else 1194 else
1058 downheap (heap, N, k); 1195 downheap (heap, N, k);
1059} 1196}
1060 1197
1073/*****************************************************************************/ 1210/*****************************************************************************/
1074 1211
1075/* associate signal watchers to a signal signal */ 1212/* associate signal watchers to a signal signal */
1076typedef struct 1213typedef struct
1077{ 1214{
1215 EV_ATOMIC_T pending;
1216#if EV_MULTIPLICITY
1217 EV_P;
1218#endif
1078 WL head; 1219 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1220} ANSIG;
1081 1221
1082static ANSIG *signals; 1222static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1223
1087/*****************************************************************************/ 1224/*****************************************************************************/
1088 1225
1089/* used to prepare libev internal fd's */ 1226#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1090/* this is not fork-safe */
1091inline_speed void
1092fd_intern (int fd)
1093{
1094#ifdef _WIN32
1095 unsigned long arg = 1;
1096 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1097#else
1098 fcntl (fd, F_SETFD, FD_CLOEXEC);
1099 fcntl (fd, F_SETFL, O_NONBLOCK);
1100#endif
1101}
1102 1227
1103static void noinline 1228static void noinline
1104evpipe_init (EV_P) 1229evpipe_init (EV_P)
1105{ 1230{
1106 if (!ev_is_active (&pipe_w)) 1231 if (!ev_is_active (&pipe_w))
1107 { 1232 {
1108#if EV_USE_EVENTFD 1233# if EV_USE_EVENTFD
1234 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1235 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1236 evfd = eventfd (0, 0);
1237
1238 if (evfd >= 0)
1110 { 1239 {
1111 evpipe [0] = -1; 1240 evpipe [0] = -1;
1112 fd_intern (evfd); 1241 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1242 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1243 }
1115 else 1244 else
1116#endif 1245# endif
1117 { 1246 {
1118 while (pipe (evpipe)) 1247 while (pipe (evpipe))
1119 ev_syserr ("(libev) error creating signal/async pipe"); 1248 ev_syserr ("(libev) error creating signal/async pipe");
1120 1249
1121 fd_intern (evpipe [0]); 1250 fd_intern (evpipe [0]);
1132evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1261evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1133{ 1262{
1134 if (!*flag) 1263 if (!*flag)
1135 { 1264 {
1136 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;
1137 1267
1138 *flag = 1; 1268 *flag = 1;
1139 1269
1140#if EV_USE_EVENTFD 1270#if EV_USE_EVENTFD
1141 if (evfd >= 0) 1271 if (evfd >= 0)
1143 uint64_t counter = 1; 1273 uint64_t counter = 1;
1144 write (evfd, &counter, sizeof (uint64_t)); 1274 write (evfd, &counter, sizeof (uint64_t));
1145 } 1275 }
1146 else 1276 else
1147#endif 1277#endif
1148 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1149 1279
1150 errno = old_errno; 1280 errno = old_errno;
1151 } 1281 }
1152} 1282}
1153 1283
1154/* called whenever the libev signal pipe */ 1284/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1285/* got some events (signal, async) */
1156static void 1286static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1287pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1288{
1289 int i;
1290
1159#if EV_USE_EVENTFD 1291#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1292 if (evfd >= 0)
1161 { 1293 {
1162 uint64_t counter; 1294 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1295 read (evfd, &counter, sizeof (uint64_t));
1167 { 1299 {
1168 char dummy; 1300 char dummy;
1169 read (evpipe [0], &dummy, 1); 1301 read (evpipe [0], &dummy, 1);
1170 } 1302 }
1171 1303
1172 if (gotsig && ev_is_default_loop (EV_A)) 1304 if (sig_pending)
1173 { 1305 {
1174 int signum; 1306 sig_pending = 0;
1175 gotsig = 0;
1176 1307
1177 for (signum = signalmax; signum--; ) 1308 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1309 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1310 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1311 }
1181 1312
1182#if EV_ASYNC_ENABLE 1313#if EV_ASYNC_ENABLE
1183 if (gotasync) 1314 if (async_pending)
1184 { 1315 {
1185 int i; 1316 async_pending = 0;
1186 gotasync = 0;
1187 1317
1188 for (i = asynccnt; i--; ) 1318 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1319 if (asyncs [i]->sent)
1190 { 1320 {
1191 asyncs [i]->sent = 0; 1321 asyncs [i]->sent = 0;
1199 1329
1200static void 1330static void
1201ev_sighandler (int signum) 1331ev_sighandler (int signum)
1202{ 1332{
1203#if EV_MULTIPLICITY 1333#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1334 EV_P = signals [signum - 1].loop;
1205#endif 1335#endif
1206 1336
1207#if _WIN32 1337#ifdef _WIN32
1208 signal (signum, ev_sighandler); 1338 signal (signum, ev_sighandler);
1209#endif 1339#endif
1210 1340
1211 signals [signum - 1].gotsig = 1; 1341 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1342 evpipe_write (EV_A_ &sig_pending);
1213} 1343}
1214 1344
1215void noinline 1345void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1346ev_feed_signal_event (EV_P_ int signum)
1217{ 1347{
1218 WL w; 1348 WL w;
1219 1349
1350 if (expect_false (signum <= 0 || signum > EV_NSIG))
1351 return;
1352
1353 --signum;
1354
1220#if EV_MULTIPLICITY 1355#if EV_MULTIPLICITY
1221 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 */
1222#endif 1357 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1358
1224 --signum; 1359 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1360 return;
1361#endif
1228 1362
1229 signals [signum].gotsig = 0; 1363 signals [signum].pending = 0;
1230 1364
1231 for (w = signals [signum].head; w; w = w->next) 1365 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1366 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1367}
1234 1368
1369#if EV_USE_SIGNALFD
1370static void
1371sigfdcb (EV_P_ ev_io *iow, int revents)
1372{
1373 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1374
1375 for (;;)
1376 {
1377 ssize_t res = read (sigfd, si, sizeof (si));
1378
1379 /* not ISO-C, as res might be -1, but works with SuS */
1380 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1381 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1382
1383 if (res < (ssize_t)sizeof (si))
1384 break;
1385 }
1386}
1387#endif
1388
1389#endif
1390
1235/*****************************************************************************/ 1391/*****************************************************************************/
1236 1392
1393#if EV_CHILD_ENABLE
1237static WL childs [EV_PID_HASHSIZE]; 1394static WL childs [EV_PID_HASHSIZE];
1238
1239#ifndef _WIN32
1240 1395
1241static ev_signal childev; 1396static ev_signal childev;
1242 1397
1243#ifndef WIFCONTINUED 1398#ifndef WIFCONTINUED
1244# define WIFCONTINUED(status) 0 1399# define WIFCONTINUED(status) 0
1249child_reap (EV_P_ int chain, int pid, int status) 1404child_reap (EV_P_ int chain, int pid, int status)
1250{ 1405{
1251 ev_child *w; 1406 ev_child *w;
1252 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1407 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1253 1408
1254 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)
1255 { 1410 {
1256 if ((w->pid == pid || !w->pid) 1411 if ((w->pid == pid || !w->pid)
1257 && (!traced || (w->flags & 1))) 1412 && (!traced || (w->flags & 1)))
1258 { 1413 {
1259 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 */
1284 /* 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 */
1285 /* 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 */
1286 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1441 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1287 1442
1288 child_reap (EV_A_ pid, pid, status); 1443 child_reap (EV_A_ pid, pid, status);
1289 if (EV_PID_HASHSIZE > 1) 1444 if ((EV_PID_HASHSIZE) > 1)
1290 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 */
1291} 1446}
1292 1447
1293#endif 1448#endif
1294 1449
1361#ifdef __APPLE__ 1516#ifdef __APPLE__
1362 /* only select works correctly on that "unix-certified" platform */ 1517 /* only select works correctly on that "unix-certified" platform */
1363 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1518 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1364 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 */
1365#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
1366 1524
1367 return flags; 1525 return flags;
1368} 1526}
1369 1527
1370unsigned int 1528unsigned int
1383ev_backend (EV_P) 1541ev_backend (EV_P)
1384{ 1542{
1385 return backend; 1543 return backend;
1386} 1544}
1387 1545
1388#if EV_MINIMAL < 2 1546#if EV_FEATURE_API
1389unsigned int 1547unsigned int
1390ev_loop_count (EV_P) 1548ev_iteration (EV_P)
1391{ 1549{
1392 return loop_count; 1550 return loop_count;
1393} 1551}
1394 1552
1395unsigned int 1553unsigned int
1396ev_loop_depth (EV_P) 1554ev_depth (EV_P)
1397{ 1555{
1398 return loop_depth; 1556 return loop_depth;
1399} 1557}
1400 1558
1401void 1559void
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1616 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1617 have_monotonic = 1;
1460 } 1618 }
1461#endif 1619#endif
1462 1620
1621 /* pid check not overridable via env */
1622#ifndef _WIN32
1623 if (flags & EVFLAG_FORKCHECK)
1624 curpid = getpid ();
1625#endif
1626
1627 if (!(flags & EVFLAG_NOENV)
1628 && !enable_secure ()
1629 && getenv ("LIBEV_FLAGS"))
1630 flags = atoi (getenv ("LIBEV_FLAGS"));
1631
1463 ev_rt_now = ev_time (); 1632 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1633 mn_now = get_clock ();
1465 now_floor = mn_now; 1634 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1635 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1636#if EV_FEATURE_API
1468 invoke_cb = ev_invoke_pending; 1637 invoke_cb = ev_invoke_pending;
1469#endif 1638#endif
1470 1639
1471 io_blocktime = 0.; 1640 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1641 timeout_blocktime = 0.;
1473 backend = 0; 1642 backend = 0;
1474 backend_fd = -1; 1643 backend_fd = -1;
1475 gotasync = 0; 1644 sig_pending = 0;
1645#if EV_ASYNC_ENABLE
1646 async_pending = 0;
1647#endif
1476#if EV_USE_INOTIFY 1648#if EV_USE_INOTIFY
1477 fs_fd = -2; 1649 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1650#endif
1479 1651#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1652 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1653#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1654
1491 if (!(flags & 0x0000ffffU)) 1655 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1656 flags |= ev_recommended_backends ();
1493 1657
1494#if EV_USE_PORT 1658#if EV_USE_PORT
1507 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1671 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1508#endif 1672#endif
1509 1673
1510 ev_prepare_init (&pending_w, pendingcb); 1674 ev_prepare_init (&pending_w, pendingcb);
1511 1675
1676#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1512 ev_init (&pipe_w, pipecb); 1677 ev_init (&pipe_w, pipecb);
1513 ev_set_priority (&pipe_w, EV_MAXPRI); 1678 ev_set_priority (&pipe_w, EV_MAXPRI);
1679#endif
1514 } 1680 }
1515} 1681}
1516 1682
1517/* free up a loop structure */ 1683/* free up a loop structure */
1518static void noinline 1684static void noinline
1520{ 1686{
1521 int i; 1687 int i;
1522 1688
1523 if (ev_is_active (&pipe_w)) 1689 if (ev_is_active (&pipe_w))
1524 { 1690 {
1525 ev_ref (EV_A); /* signal watcher */ 1691 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1692 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1693
1528#if EV_USE_EVENTFD 1694#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1695 if (evfd >= 0)
1530 close (evfd); 1696 close (evfd);
1531#endif 1697#endif
1532 1698
1533 if (evpipe [0] >= 0) 1699 if (evpipe [0] >= 0)
1534 { 1700 {
1535 close (evpipe [0]); 1701 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1702 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1703 }
1538 } 1704 }
1705
1706#if EV_USE_SIGNALFD
1707 if (ev_is_active (&sigfd_w))
1708 close (sigfd);
1709#endif
1539 1710
1540#if EV_USE_INOTIFY 1711#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1712 if (fs_fd >= 0)
1542 close (fs_fd); 1713 close (fs_fd);
1543#endif 1714#endif
1567#if EV_IDLE_ENABLE 1738#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1739 array_free (idle, [i]);
1569#endif 1740#endif
1570 } 1741 }
1571 1742
1572 ev_free (anfds); anfdmax = 0; 1743 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1744
1574 /* have to use the microsoft-never-gets-it-right macro */ 1745 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1746 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1747 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1748 array_free (timer, EMPTY);
1612 1783
1613 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1614 { 1785 {
1615 /* this "locks" the handlers against writing to the pipe */ 1786 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1787 /* while we modify the fd vars */
1617 gotsig = 1; 1788 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1789#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1790 async_pending = 1;
1620#endif 1791#endif
1621 1792
1622 ev_ref (EV_A); 1793 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1794 ev_io_stop (EV_A_ &pipe_w);
1624 1795
1627 close (evfd); 1798 close (evfd);
1628#endif 1799#endif
1629 1800
1630 if (evpipe [0] >= 0) 1801 if (evpipe [0] >= 0)
1631 { 1802 {
1632 close (evpipe [0]); 1803 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1804 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1805 }
1635 1806
1807#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1636 evpipe_init (EV_A); 1808 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1809 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1810 pipecb (EV_A_ &pipe_w, EV_READ);
1811#endif
1639 } 1812 }
1640 1813
1641 postfork = 0; 1814 postfork = 0;
1642} 1815}
1643 1816
1644#if EV_MULTIPLICITY 1817#if EV_MULTIPLICITY
1645 1818
1646struct ev_loop * 1819struct ev_loop *
1647ev_loop_new (unsigned int flags) 1820ev_loop_new (unsigned int flags)
1648{ 1821{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1822 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1823
1651 memset (loop, 0, sizeof (struct ev_loop)); 1824 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1825 loop_init (EV_A_ flags);
1654 1826
1655 if (ev_backend (EV_A)) 1827 if (ev_backend (EV_A))
1656 return loop; 1828 return EV_A;
1657 1829
1658 return 0; 1830 return 0;
1659} 1831}
1660 1832
1661void 1833void
1706 verify_watcher (EV_A_ ws [cnt]); 1878 verify_watcher (EV_A_ ws [cnt]);
1707 } 1879 }
1708} 1880}
1709#endif 1881#endif
1710 1882
1711#if EV_MINIMAL < 2 1883#if EV_FEATURE_API
1712void 1884void
1713ev_loop_verify (EV_P) 1885ev_verify (EV_P)
1714{ 1886{
1715#if EV_VERIFY 1887#if EV_VERIFY
1716 int i; 1888 int i;
1717 WL w; 1889 WL w;
1718 1890
1757#if EV_ASYNC_ENABLE 1929#if EV_ASYNC_ENABLE
1758 assert (asyncmax >= asynccnt); 1930 assert (asyncmax >= asynccnt);
1759 array_verify (EV_A_ (W *)asyncs, asynccnt); 1931 array_verify (EV_A_ (W *)asyncs, asynccnt);
1760#endif 1932#endif
1761 1933
1934#if EV_PREPARE_ENABLE
1762 assert (preparemax >= preparecnt); 1935 assert (preparemax >= preparecnt);
1763 array_verify (EV_A_ (W *)prepares, preparecnt); 1936 array_verify (EV_A_ (W *)prepares, preparecnt);
1937#endif
1764 1938
1939#if EV_CHECK_ENABLE
1765 assert (checkmax >= checkcnt); 1940 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 1941 array_verify (EV_A_ (W *)checks, checkcnt);
1942#endif
1767 1943
1768# if 0 1944# if 0
1945#if EV_CHILD_ENABLE
1769 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)
1770 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1947 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1948#endif
1771# endif 1949# endif
1772#endif 1950#endif
1773} 1951}
1774#endif 1952#endif
1775 1953
1782#endif 1960#endif
1783{ 1961{
1784 if (!ev_default_loop_ptr) 1962 if (!ev_default_loop_ptr)
1785 { 1963 {
1786#if EV_MULTIPLICITY 1964#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1965 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 1966#else
1789 ev_default_loop_ptr = 1; 1967 ev_default_loop_ptr = 1;
1790#endif 1968#endif
1791 1969
1792 loop_init (EV_A_ flags); 1970 loop_init (EV_A_ flags);
1793 1971
1794 if (ev_backend (EV_A)) 1972 if (ev_backend (EV_A))
1795 { 1973 {
1796#ifndef _WIN32 1974#if EV_CHILD_ENABLE
1797 ev_signal_init (&childev, childcb, SIGCHLD); 1975 ev_signal_init (&childev, childcb, SIGCHLD);
1798 ev_set_priority (&childev, EV_MAXPRI); 1976 ev_set_priority (&childev, EV_MAXPRI);
1799 ev_signal_start (EV_A_ &childev); 1977 ev_signal_start (EV_A_ &childev);
1800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1978 ev_unref (EV_A); /* child watcher should not keep loop alive */
1801#endif 1979#endif
1809 1987
1810void 1988void
1811ev_default_destroy (void) 1989ev_default_destroy (void)
1812{ 1990{
1813#if EV_MULTIPLICITY 1991#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr; 1992 EV_P = ev_default_loop_ptr;
1815#endif 1993#endif
1816 1994
1817 ev_default_loop_ptr = 0; 1995 ev_default_loop_ptr = 0;
1818 1996
1819#ifndef _WIN32 1997#if EV_CHILD_ENABLE
1820 ev_ref (EV_A); /* child watcher */ 1998 ev_ref (EV_A); /* child watcher */
1821 ev_signal_stop (EV_A_ &childev); 1999 ev_signal_stop (EV_A_ &childev);
1822#endif 2000#endif
1823 2001
1824 loop_destroy (EV_A); 2002 loop_destroy (EV_A);
1826 2004
1827void 2005void
1828ev_default_fork (void) 2006ev_default_fork (void)
1829{ 2007{
1830#if EV_MULTIPLICITY 2008#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr; 2009 EV_P = ev_default_loop_ptr;
1832#endif 2010#endif
1833 2011
1834 postfork = 1; /* must be in line with ev_loop_fork */ 2012 postfork = 1; /* must be in line with ev_loop_fork */
1835} 2013}
1836 2014
1930 EV_FREQUENT_CHECK; 2108 EV_FREQUENT_CHECK;
1931 feed_reverse (EV_A_ (W)w); 2109 feed_reverse (EV_A_ (W)w);
1932 } 2110 }
1933 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2111 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1934 2112
1935 feed_reverse_done (EV_A_ EV_TIMEOUT); 2113 feed_reverse_done (EV_A_ EV_TIMER);
1936 } 2114 }
1937} 2115}
1938 2116
1939#if EV_PERIODIC_ENABLE 2117#if EV_PERIODIC_ENABLE
1940/* make periodics pending */ 2118/* make periodics pending */
2031 ANHE_at_cache (*he); 2209 ANHE_at_cache (*he);
2032 } 2210 }
2033} 2211}
2034 2212
2035/* fetch new monotonic and realtime times from the kernel */ 2213/* fetch new monotonic and realtime times from the kernel */
2036/* also detetc if there was a timejump, and act accordingly */ 2214/* also detect if there was a timejump, and act accordingly */
2037inline_speed void 2215inline_speed void
2038time_update (EV_P_ ev_tstamp max_block) 2216time_update (EV_P_ ev_tstamp max_block)
2039{ 2217{
2040#if EV_USE_MONOTONIC 2218#if EV_USE_MONOTONIC
2041 if (expect_true (have_monotonic)) 2219 if (expect_true (have_monotonic))
2101} 2279}
2102 2280
2103void 2281void
2104ev_loop (EV_P_ int flags) 2282ev_loop (EV_P_ int flags)
2105{ 2283{
2106#if EV_MINIMAL < 2 2284#if EV_FEATURE_API
2107 ++loop_depth; 2285 ++loop_depth;
2108#endif 2286#endif
2109 2287
2110 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));
2111 2289
2114 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 */
2115 2293
2116 do 2294 do
2117 { 2295 {
2118#if EV_VERIFY >= 2 2296#if EV_VERIFY >= 2
2119 ev_loop_verify (EV_A); 2297 ev_verify (EV_A);
2120#endif 2298#endif
2121 2299
2122#ifndef _WIN32 2300#ifndef _WIN32
2123 if (expect_false (curpid)) /* penalise the forking check even more */ 2301 if (expect_false (curpid)) /* penalise the forking check even more */
2124 if (expect_false (getpid () != curpid)) 2302 if (expect_false (getpid () != curpid))
2136 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2314 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2137 EV_INVOKE_PENDING; 2315 EV_INVOKE_PENDING;
2138 } 2316 }
2139#endif 2317#endif
2140 2318
2319#if EV_PREPARE_ENABLE
2141 /* queue prepare watchers (and execute them) */ 2320 /* queue prepare watchers (and execute them) */
2142 if (expect_false (preparecnt)) 2321 if (expect_false (preparecnt))
2143 { 2322 {
2144 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2323 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2145 EV_INVOKE_PENDING; 2324 EV_INVOKE_PENDING;
2146 } 2325 }
2326#endif
2147 2327
2148 if (expect_false (loop_done)) 2328 if (expect_false (loop_done))
2149 break; 2329 break;
2150 2330
2151 /* we might have forked, so reify kernel state if necessary */ 2331 /* we might have forked, so reify kernel state if necessary */
2202 waittime -= sleeptime; 2382 waittime -= sleeptime;
2203 } 2383 }
2204 } 2384 }
2205 } 2385 }
2206 2386
2207#if EV_MINIMAL < 2 2387#if EV_FEATURE_API
2208 ++loop_count; 2388 ++loop_count;
2209#endif 2389#endif
2210 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2211 backend_poll (EV_A_ waittime); 2391 backend_poll (EV_A_ waittime);
2212 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2224#if EV_IDLE_ENABLE 2404#if EV_IDLE_ENABLE
2225 /* queue idle watchers unless other events are pending */ 2405 /* queue idle watchers unless other events are pending */
2226 idle_reify (EV_A); 2406 idle_reify (EV_A);
2227#endif 2407#endif
2228 2408
2409#if EV_CHECK_ENABLE
2229 /* queue check watchers, to be executed first */ 2410 /* queue check watchers, to be executed first */
2230 if (expect_false (checkcnt)) 2411 if (expect_false (checkcnt))
2231 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2412 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2413#endif
2232 2414
2233 EV_INVOKE_PENDING; 2415 EV_INVOKE_PENDING;
2234 } 2416 }
2235 while (expect_true ( 2417 while (expect_true (
2236 activecnt 2418 activecnt
2239 )); 2421 ));
2240 2422
2241 if (loop_done == EVUNLOOP_ONE) 2423 if (loop_done == EVUNLOOP_ONE)
2242 loop_done = EVUNLOOP_CANCEL; 2424 loop_done = EVUNLOOP_CANCEL;
2243 2425
2244#if EV_MINIMAL < 2 2426#if EV_FEATURE_API
2245 --loop_depth; 2427 --loop_depth;
2246#endif 2428#endif
2247} 2429}
2248 2430
2249void 2431void
2302inline_size void 2484inline_size void
2303wlist_del (WL *head, WL elem) 2485wlist_del (WL *head, WL elem)
2304{ 2486{
2305 while (*head) 2487 while (*head)
2306 { 2488 {
2307 if (*head == elem) 2489 if (expect_true (*head == elem))
2308 { 2490 {
2309 *head = elem->next; 2491 *head = elem->next;
2310 return; 2492 break;
2311 } 2493 }
2312 2494
2313 head = &(*head)->next; 2495 head = &(*head)->next;
2314 } 2496 }
2315} 2497}
2375 2557
2376 if (expect_false (ev_is_active (w))) 2558 if (expect_false (ev_is_active (w)))
2377 return; 2559 return;
2378 2560
2379 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2561 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2380 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))));
2381 2563
2382 EV_FREQUENT_CHECK; 2564 EV_FREQUENT_CHECK;
2383 2565
2384 ev_start (EV_A_ (W)w, 1); 2566 ev_start (EV_A_ (W)w, 1);
2385 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2567 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2455 timers [active] = timers [timercnt + HEAP0]; 2637 timers [active] = timers [timercnt + HEAP0];
2456 adjustheap (timers, timercnt, active); 2638 adjustheap (timers, timercnt, active);
2457 } 2639 }
2458 } 2640 }
2459 2641
2460 EV_FREQUENT_CHECK;
2461
2462 ev_at (w) -= mn_now; 2642 ev_at (w) -= mn_now;
2463 2643
2464 ev_stop (EV_A_ (W)w); 2644 ev_stop (EV_A_ (W)w);
2645
2646 EV_FREQUENT_CHECK;
2465} 2647}
2466 2648
2467void noinline 2649void noinline
2468ev_timer_again (EV_P_ ev_timer *w) 2650ev_timer_again (EV_P_ ev_timer *w)
2469{ 2651{
2548 periodics [active] = periodics [periodiccnt + HEAP0]; 2730 periodics [active] = periodics [periodiccnt + HEAP0];
2549 adjustheap (periodics, periodiccnt, active); 2731 adjustheap (periodics, periodiccnt, active);
2550 } 2732 }
2551 } 2733 }
2552 2734
2553 EV_FREQUENT_CHECK;
2554
2555 ev_stop (EV_A_ (W)w); 2735 ev_stop (EV_A_ (W)w);
2736
2737 EV_FREQUENT_CHECK;
2556} 2738}
2557 2739
2558void noinline 2740void noinline
2559ev_periodic_again (EV_P_ ev_periodic *w) 2741ev_periodic_again (EV_P_ ev_periodic *w)
2560{ 2742{
2566 2748
2567#ifndef SA_RESTART 2749#ifndef SA_RESTART
2568# define SA_RESTART 0 2750# define SA_RESTART 0
2569#endif 2751#endif
2570 2752
2753#if EV_SIGNAL_ENABLE
2754
2571void noinline 2755void noinline
2572ev_signal_start (EV_P_ ev_signal *w) 2756ev_signal_start (EV_P_ ev_signal *w)
2573{ 2757{
2574#if EV_MULTIPLICITY
2575 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2576#endif
2577 if (expect_false (ev_is_active (w))) 2758 if (expect_false (ev_is_active (w)))
2578 return; 2759 return;
2579 2760
2580 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2761 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2581 2762
2582 evpipe_init (EV_A); 2763#if EV_MULTIPLICITY
2764 assert (("libev: a signal must not be attached to two different loops",
2765 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2583 2766
2584 EV_FREQUENT_CHECK; 2767 signals [w->signum - 1].loop = EV_A;
2768#endif
2585 2769
2770 EV_FREQUENT_CHECK;
2771
2772#if EV_USE_SIGNALFD
2773 if (sigfd == -2)
2586 { 2774 {
2587#ifndef _WIN32 2775 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2588 sigset_t full, prev; 2776 if (sigfd < 0 && errno == EINVAL)
2589 sigfillset (&full); 2777 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2590 sigprocmask (SIG_SETMASK, &full, &prev);
2591#endif
2592 2778
2593 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2779 if (sigfd >= 0)
2780 {
2781 fd_intern (sigfd); /* doing it twice will not hurt */
2594 2782
2595#ifndef _WIN32 2783 sigemptyset (&sigfd_set);
2596 sigprocmask (SIG_SETMASK, &prev, 0); 2784
2597#endif 2785 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2786 ev_set_priority (&sigfd_w, EV_MAXPRI);
2787 ev_io_start (EV_A_ &sigfd_w);
2788 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2789 }
2598 } 2790 }
2791
2792 if (sigfd >= 0)
2793 {
2794 /* TODO: check .head */
2795 sigaddset (&sigfd_set, w->signum);
2796 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2797
2798 signalfd (sigfd, &sigfd_set, 0);
2799 }
2800#endif
2599 2801
2600 ev_start (EV_A_ (W)w, 1); 2802 ev_start (EV_A_ (W)w, 1);
2601 wlist_add (&signals [w->signum - 1].head, (WL)w); 2803 wlist_add (&signals [w->signum - 1].head, (WL)w);
2602 2804
2603 if (!((WL)w)->next) 2805 if (!((WL)w)->next)
2806# if EV_USE_SIGNALFD
2807 if (sigfd < 0) /*TODO*/
2808# endif
2604 { 2809 {
2605#if _WIN32 2810# ifdef _WIN32
2811 evpipe_init (EV_A);
2812
2606 signal (w->signum, ev_sighandler); 2813 signal (w->signum, ev_sighandler);
2607#else 2814# else
2608 struct sigaction sa = { }; 2815 struct sigaction sa;
2816
2817 evpipe_init (EV_A);
2818
2609 sa.sa_handler = ev_sighandler; 2819 sa.sa_handler = ev_sighandler;
2610 sigfillset (&sa.sa_mask); 2820 sigfillset (&sa.sa_mask);
2611 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2821 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2612 sigaction (w->signum, &sa, 0); 2822 sigaction (w->signum, &sa, 0);
2823
2824 sigemptyset (&sa.sa_mask);
2825 sigaddset (&sa.sa_mask, w->signum);
2826 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2613#endif 2827#endif
2614 } 2828 }
2615 2829
2616 EV_FREQUENT_CHECK; 2830 EV_FREQUENT_CHECK;
2617} 2831}
2618 2832
2619void noinline 2833void noinline
2627 2841
2628 wlist_del (&signals [w->signum - 1].head, (WL)w); 2842 wlist_del (&signals [w->signum - 1].head, (WL)w);
2629 ev_stop (EV_A_ (W)w); 2843 ev_stop (EV_A_ (W)w);
2630 2844
2631 if (!signals [w->signum - 1].head) 2845 if (!signals [w->signum - 1].head)
2846 {
2847#if EV_MULTIPLICITY
2848 signals [w->signum - 1].loop = 0; /* unattach from signal */
2849#endif
2850#if EV_USE_SIGNALFD
2851 if (sigfd >= 0)
2852 {
2853 sigset_t ss;
2854
2855 sigemptyset (&ss);
2856 sigaddset (&ss, w->signum);
2857 sigdelset (&sigfd_set, w->signum);
2858
2859 signalfd (sigfd, &sigfd_set, 0);
2860 sigprocmask (SIG_UNBLOCK, &ss, 0);
2861 }
2862 else
2863#endif
2632 signal (w->signum, SIG_DFL); 2864 signal (w->signum, SIG_DFL);
2865 }
2633 2866
2634 EV_FREQUENT_CHECK; 2867 EV_FREQUENT_CHECK;
2635} 2868}
2869
2870#endif
2871
2872#if EV_CHILD_ENABLE
2636 2873
2637void 2874void
2638ev_child_start (EV_P_ ev_child *w) 2875ev_child_start (EV_P_ ev_child *w)
2639{ 2876{
2640#if EV_MULTIPLICITY 2877#if EV_MULTIPLICITY
2644 return; 2881 return;
2645 2882
2646 EV_FREQUENT_CHECK; 2883 EV_FREQUENT_CHECK;
2647 2884
2648 ev_start (EV_A_ (W)w, 1); 2885 ev_start (EV_A_ (W)w, 1);
2649 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2886 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2650 2887
2651 EV_FREQUENT_CHECK; 2888 EV_FREQUENT_CHECK;
2652} 2889}
2653 2890
2654void 2891void
2658 if (expect_false (!ev_is_active (w))) 2895 if (expect_false (!ev_is_active (w)))
2659 return; 2896 return;
2660 2897
2661 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2662 2899
2663 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2664 ev_stop (EV_A_ (W)w); 2901 ev_stop (EV_A_ (W)w);
2665 2902
2666 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2667} 2904}
2905
2906#endif
2668 2907
2669#if EV_STAT_ENABLE 2908#if EV_STAT_ENABLE
2670 2909
2671# ifdef _WIN32 2910# ifdef _WIN32
2672# undef lstat 2911# undef lstat
2678#define MIN_STAT_INTERVAL 0.1074891 2917#define MIN_STAT_INTERVAL 0.1074891
2679 2918
2680static 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);
2681 2920
2682#if EV_USE_INOTIFY 2921#if EV_USE_INOTIFY
2683# 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)
2684 2925
2685static void noinline 2926static void noinline
2686infy_add (EV_P_ ev_stat *w) 2927infy_add (EV_P_ ev_stat *w)
2687{ 2928{
2688 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);
2689 2930
2690 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 */
2691 { 2951 }
2952 else
2953 {
2954 /* can't use inotify, continue to stat */
2692 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2955 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2693 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2694 2956
2695 /* monitor some parent directory for speedup hints */ 2957 /* if path is not there, monitor some parent directory for speedup hints */
2696 /* 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, */
2697 /* but an efficiency issue only */ 2959 /* but an efficiency issue only */
2698 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2960 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2699 { 2961 {
2700 char path [4096]; 2962 char path [4096];
2716 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2978 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2717 } 2979 }
2718 } 2980 }
2719 2981
2720 if (w->wd >= 0) 2982 if (w->wd >= 0)
2721 {
2722 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);
2723 2984
2724 /* now local changes will be tracked by inotify, but remote changes won't */ 2985 /* now re-arm timer, if required */
2725 /* unless the filesystem it known to be local, we therefore still poll */ 2986 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2726 /* also do poll on <2.6.25, but with normal frequency */
2727 struct statfs sfs;
2728
2729 if (fs_2625 && !statfs (w->path, &sfs))
2730 if (sfs.f_type == 0x1373 /* devfs */
2731 || sfs.f_type == 0xEF53 /* ext2/3 */
2732 || sfs.f_type == 0x3153464a /* jfs */
2733 || sfs.f_type == 0x52654973 /* reiser3 */
2734 || sfs.f_type == 0x01021994 /* tempfs */
2735 || sfs.f_type == 0x58465342 /* xfs */)
2736 return;
2737
2738 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2739 ev_timer_again (EV_A_ &w->timer); 2987 ev_timer_again (EV_A_ &w->timer);
2740 } 2988 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2741} 2989}
2742 2990
2743static void noinline 2991static void noinline
2744infy_del (EV_P_ ev_stat *w) 2992infy_del (EV_P_ ev_stat *w)
2745{ 2993{
2748 2996
2749 if (wd < 0) 2997 if (wd < 0)
2750 return; 2998 return;
2751 2999
2752 w->wd = -2; 3000 w->wd = -2;
2753 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3001 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2754 wlist_del (&fs_hash [slot].head, (WL)w); 3002 wlist_del (&fs_hash [slot].head, (WL)w);
2755 3003
2756 /* remove this watcher, if others are watching it, they will rearm */ 3004 /* remove this watcher, if others are watching it, they will rearm */
2757 inotify_rm_watch (fs_fd, wd); 3005 inotify_rm_watch (fs_fd, wd);
2758} 3006}
2760static void noinline 3008static void noinline
2761infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3009infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2762{ 3010{
2763 if (slot < 0) 3011 if (slot < 0)
2764 /* overflow, need to check for all hash slots */ 3012 /* overflow, need to check for all hash slots */
2765 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3013 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2766 infy_wd (EV_A_ slot, wd, ev); 3014 infy_wd (EV_A_ slot, wd, ev);
2767 else 3015 else
2768 { 3016 {
2769 WL w_; 3017 WL w_;
2770 3018
2771 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3019 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2772 { 3020 {
2773 ev_stat *w = (ev_stat *)w_; 3021 ev_stat *w = (ev_stat *)w_;
2774 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 */
2775 3023
2776 if (w->wd == wd || wd == -1) 3024 if (w->wd == wd || wd == -1)
2777 { 3025 {
2778 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3026 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2779 { 3027 {
2780 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);
2781 w->wd = -1; 3029 w->wd = -1;
2782 infy_add (EV_A_ w); /* re-add, no matter what */ 3030 infy_add (EV_A_ w); /* re-add, no matter what */
2783 } 3031 }
2784 3032
2785 stat_timer_cb (EV_A_ &w->timer, 0); 3033 stat_timer_cb (EV_A_ &w->timer, 0);
2790 3038
2791static void 3039static void
2792infy_cb (EV_P_ ev_io *w, int revents) 3040infy_cb (EV_P_ ev_io *w, int revents)
2793{ 3041{
2794 char buf [EV_INOTIFY_BUFSIZE]; 3042 char buf [EV_INOTIFY_BUFSIZE];
2795 struct inotify_event *ev = (struct inotify_event *)buf;
2796 int ofs; 3043 int ofs;
2797 int len = read (fs_fd, buf, sizeof (buf)); 3044 int len = read (fs_fd, buf, sizeof (buf));
2798 3045
2799 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);
2800 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;
2801} 3084}
2802 3085
2803inline_size void 3086inline_size void
2804check_2625 (EV_P) 3087ev_check_2625 (EV_P)
2805{ 3088{
2806 /* kernels < 2.6.25 are borked 3089 /* kernels < 2.6.25 are borked
2807 * 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
2808 */ 3091 */
2809 struct utsname buf; 3092 if (ev_linux_version () < 0x020619)
2810 int major, minor, micro;
2811
2812 if (uname (&buf))
2813 return; 3093 return;
2814 3094
2815 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2816 return;
2817
2818 if (major < 2
2819 || (major == 2 && minor < 6)
2820 || (major == 2 && minor == 6 && micro < 25))
2821 return;
2822
2823 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 ();
2824} 3107}
2825 3108
2826inline_size void 3109inline_size void
2827infy_init (EV_P) 3110infy_init (EV_P)
2828{ 3111{
2829 if (fs_fd != -2) 3112 if (fs_fd != -2)
2830 return; 3113 return;
2831 3114
2832 fs_fd = -1; 3115 fs_fd = -1;
2833 3116
2834 check_2625 (EV_A); 3117 ev_check_2625 (EV_A);
2835 3118
2836 fs_fd = inotify_init (); 3119 fs_fd = infy_newfd ();
2837 3120
2838 if (fs_fd >= 0) 3121 if (fs_fd >= 0)
2839 { 3122 {
3123 fd_intern (fs_fd);
2840 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3124 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2841 ev_set_priority (&fs_w, EV_MAXPRI); 3125 ev_set_priority (&fs_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &fs_w); 3126 ev_io_start (EV_A_ &fs_w);
3127 ev_unref (EV_A);
2843 } 3128 }
2844} 3129}
2845 3130
2846inline_size void 3131inline_size void
2847infy_fork (EV_P) 3132infy_fork (EV_P)
2849 int slot; 3134 int slot;
2850 3135
2851 if (fs_fd < 0) 3136 if (fs_fd < 0)
2852 return; 3137 return;
2853 3138
3139 ev_ref (EV_A);
3140 ev_io_stop (EV_A_ &fs_w);
2854 close (fs_fd); 3141 close (fs_fd);
2855 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
2856 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
2857 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3152 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2858 { 3153 {
2859 WL w_ = fs_hash [slot].head; 3154 WL w_ = fs_hash [slot].head;
2860 fs_hash [slot].head = 0; 3155 fs_hash [slot].head = 0;
2861 3156
2862 while (w_) 3157 while (w_)
2867 w->wd = -1; 3162 w->wd = -1;
2868 3163
2869 if (fs_fd >= 0) 3164 if (fs_fd >= 0)
2870 infy_add (EV_A_ w); /* re-add, no matter what */ 3165 infy_add (EV_A_ w); /* re-add, no matter what */
2871 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);
2872 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 }
2873 } 3173 }
2874 } 3174 }
2875} 3175}
2876 3176
2877#endif 3177#endif
2894static void noinline 3194static void noinline
2895stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3195stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2896{ 3196{
2897 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3197 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2898 3198
2899 /* we copy this here each the time so that */ 3199 ev_statdata prev = w->attr;
2900 /* prev has the old value when the callback gets invoked */
2901 w->prev = w->attr;
2902 ev_stat_stat (EV_A_ w); 3200 ev_stat_stat (EV_A_ w);
2903 3201
2904 /* 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 */
2905 if ( 3203 if (
2906 w->prev.st_dev != w->attr.st_dev 3204 prev.st_dev != w->attr.st_dev
2907 || w->prev.st_ino != w->attr.st_ino 3205 || prev.st_ino != w->attr.st_ino
2908 || w->prev.st_mode != w->attr.st_mode 3206 || prev.st_mode != w->attr.st_mode
2909 || w->prev.st_nlink != w->attr.st_nlink 3207 || prev.st_nlink != w->attr.st_nlink
2910 || w->prev.st_uid != w->attr.st_uid 3208 || prev.st_uid != w->attr.st_uid
2911 || w->prev.st_gid != w->attr.st_gid 3209 || prev.st_gid != w->attr.st_gid
2912 || w->prev.st_rdev != w->attr.st_rdev 3210 || prev.st_rdev != w->attr.st_rdev
2913 || w->prev.st_size != w->attr.st_size 3211 || prev.st_size != w->attr.st_size
2914 || w->prev.st_atime != w->attr.st_atime 3212 || prev.st_atime != w->attr.st_atime
2915 || w->prev.st_mtime != w->attr.st_mtime 3213 || prev.st_mtime != w->attr.st_mtime
2916 || w->prev.st_ctime != w->attr.st_ctime 3214 || prev.st_ctime != w->attr.st_ctime
2917 ) { 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
2918 #if EV_USE_INOTIFY 3221 #if EV_USE_INOTIFY
2919 if (fs_fd >= 0) 3222 if (fs_fd >= 0)
2920 { 3223 {
2921 infy_del (EV_A_ w); 3224 infy_del (EV_A_ w);
2922 infy_add (EV_A_ w); 3225 infy_add (EV_A_ w);
2947 3250
2948 if (fs_fd >= 0) 3251 if (fs_fd >= 0)
2949 infy_add (EV_A_ w); 3252 infy_add (EV_A_ w);
2950 else 3253 else
2951#endif 3254#endif
3255 {
2952 ev_timer_again (EV_A_ &w->timer); 3256 ev_timer_again (EV_A_ &w->timer);
3257 ev_unref (EV_A);
3258 }
2953 3259
2954 ev_start (EV_A_ (W)w, 1); 3260 ev_start (EV_A_ (W)w, 1);
2955 3261
2956 EV_FREQUENT_CHECK; 3262 EV_FREQUENT_CHECK;
2957} 3263}
2966 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
2967 3273
2968#if EV_USE_INOTIFY 3274#if EV_USE_INOTIFY
2969 infy_del (EV_A_ w); 3275 infy_del (EV_A_ w);
2970#endif 3276#endif
3277
3278 if (ev_is_active (&w->timer))
3279 {
3280 ev_ref (EV_A);
2971 ev_timer_stop (EV_A_ &w->timer); 3281 ev_timer_stop (EV_A_ &w->timer);
3282 }
2972 3283
2973 ev_stop (EV_A_ (W)w); 3284 ev_stop (EV_A_ (W)w);
2974 3285
2975 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
2976} 3287}
3021 3332
3022 EV_FREQUENT_CHECK; 3333 EV_FREQUENT_CHECK;
3023} 3334}
3024#endif 3335#endif
3025 3336
3337#if EV_PREPARE_ENABLE
3026void 3338void
3027ev_prepare_start (EV_P_ ev_prepare *w) 3339ev_prepare_start (EV_P_ ev_prepare *w)
3028{ 3340{
3029 if (expect_false (ev_is_active (w))) 3341 if (expect_false (ev_is_active (w)))
3030 return; 3342 return;
3056 3368
3057 ev_stop (EV_A_ (W)w); 3369 ev_stop (EV_A_ (W)w);
3058 3370
3059 EV_FREQUENT_CHECK; 3371 EV_FREQUENT_CHECK;
3060} 3372}
3373#endif
3061 3374
3375#if EV_CHECK_ENABLE
3062void 3376void
3063ev_check_start (EV_P_ ev_check *w) 3377ev_check_start (EV_P_ ev_check *w)
3064{ 3378{
3065 if (expect_false (ev_is_active (w))) 3379 if (expect_false (ev_is_active (w)))
3066 return; 3380 return;
3092 3406
3093 ev_stop (EV_A_ (W)w); 3407 ev_stop (EV_A_ (W)w);
3094 3408
3095 EV_FREQUENT_CHECK; 3409 EV_FREQUENT_CHECK;
3096} 3410}
3411#endif
3097 3412
3098#if EV_EMBED_ENABLE 3413#if EV_EMBED_ENABLE
3099void noinline 3414void noinline
3100ev_embed_sweep (EV_P_ ev_embed *w) 3415ev_embed_sweep (EV_P_ ev_embed *w)
3101{ 3416{
3117embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3432embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3118{ 3433{
3119 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3434 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3120 3435
3121 { 3436 {
3122 struct ev_loop *loop = w->other; 3437 EV_P = w->other;
3123 3438
3124 while (fdchangecnt) 3439 while (fdchangecnt)
3125 { 3440 {
3126 fd_reify (EV_A); 3441 fd_reify (EV_A);
3127 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3442 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3135 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3450 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3136 3451
3137 ev_embed_stop (EV_A_ w); 3452 ev_embed_stop (EV_A_ w);
3138 3453
3139 { 3454 {
3140 struct ev_loop *loop = w->other; 3455 EV_P = w->other;
3141 3456
3142 ev_loop_fork (EV_A); 3457 ev_loop_fork (EV_A);
3143 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3458 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3144 } 3459 }
3145 3460
3159{ 3474{
3160 if (expect_false (ev_is_active (w))) 3475 if (expect_false (ev_is_active (w)))
3161 return; 3476 return;
3162 3477
3163 { 3478 {
3164 struct ev_loop *loop = w->other; 3479 EV_P = w->other;
3165 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3480 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3166 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3481 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3167 } 3482 }
3168 3483
3169 EV_FREQUENT_CHECK; 3484 EV_FREQUENT_CHECK;
3196 3511
3197 ev_io_stop (EV_A_ &w->io); 3512 ev_io_stop (EV_A_ &w->io);
3198 ev_prepare_stop (EV_A_ &w->prepare); 3513 ev_prepare_stop (EV_A_ &w->prepare);
3199 ev_fork_stop (EV_A_ &w->fork); 3514 ev_fork_stop (EV_A_ &w->fork);
3200 3515
3516 ev_stop (EV_A_ (W)w);
3517
3201 EV_FREQUENT_CHECK; 3518 EV_FREQUENT_CHECK;
3202} 3519}
3203#endif 3520#endif
3204 3521
3205#if EV_FORK_ENABLE 3522#if EV_FORK_ENABLE
3281 3598
3282void 3599void
3283ev_async_send (EV_P_ ev_async *w) 3600ev_async_send (EV_P_ ev_async *w)
3284{ 3601{
3285 w->sent = 1; 3602 w->sent = 1;
3286 evpipe_write (EV_A_ &gotasync); 3603 evpipe_write (EV_A_ &async_pending);
3287} 3604}
3288#endif 3605#endif
3289 3606
3290/*****************************************************************************/ 3607/*****************************************************************************/
3291 3608
3331{ 3648{
3332 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));
3333 3650
3334 if (expect_false (!once)) 3651 if (expect_false (!once))
3335 { 3652 {
3336 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3653 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3337 return; 3654 return;
3338 } 3655 }
3339 3656
3340 once->cb = cb; 3657 once->cb = cb;
3341 once->arg = arg; 3658 once->arg = arg;
3428 if (types & EV_ASYNC) 3745 if (types & EV_ASYNC)
3429 for (i = asynccnt; i--; ) 3746 for (i = asynccnt; i--; )
3430 cb (EV_A_ EV_ASYNC, asyncs [i]); 3747 cb (EV_A_ EV_ASYNC, asyncs [i]);
3431#endif 3748#endif
3432 3749
3750#if EV_PREPARE_ENABLE
3433 if (types & EV_PREPARE) 3751 if (types & EV_PREPARE)
3434 for (i = preparecnt; i--; ) 3752 for (i = preparecnt; i--; )
3435#if EV_EMBED_ENABLE 3753# if EV_EMBED_ENABLE
3436 if (ev_cb (prepares [i]) != embed_prepare_cb) 3754 if (ev_cb (prepares [i]) != embed_prepare_cb)
3437#endif 3755# endif
3438 cb (EV_A_ EV_PREPARE, prepares [i]); 3756 cb (EV_A_ EV_PREPARE, prepares [i]);
3757#endif
3439 3758
3759#if EV_CHECK_ENABLE
3440 if (types & EV_CHECK) 3760 if (types & EV_CHECK)
3441 for (i = checkcnt; i--; ) 3761 for (i = checkcnt; i--; )
3442 cb (EV_A_ EV_CHECK, checks [i]); 3762 cb (EV_A_ EV_CHECK, checks [i]);
3763#endif
3443 3764
3765#if EV_SIGNAL_ENABLE
3444 if (types & EV_SIGNAL) 3766 if (types & EV_SIGNAL)
3445 for (i = 0; i < signalmax; ++i) 3767 for (i = 0; i < EV_NSIG - 1; ++i)
3446 for (wl = signals [i].head; wl; ) 3768 for (wl = signals [i].head; wl; )
3447 { 3769 {
3448 wn = wl->next; 3770 wn = wl->next;
3449 cb (EV_A_ EV_SIGNAL, wl); 3771 cb (EV_A_ EV_SIGNAL, wl);
3450 wl = wn; 3772 wl = wn;
3451 } 3773 }
3774#endif
3452 3775
3776#if EV_CHILD_ENABLE
3453 if (types & EV_CHILD) 3777 if (types & EV_CHILD)
3454 for (i = EV_PID_HASHSIZE; i--; ) 3778 for (i = (EV_PID_HASHSIZE); i--; )
3455 for (wl = childs [i]; wl; ) 3779 for (wl = childs [i]; wl; )
3456 { 3780 {
3457 wn = wl->next; 3781 wn = wl->next;
3458 cb (EV_A_ EV_CHILD, wl); 3782 cb (EV_A_ EV_CHILD, wl);
3459 wl = wn; 3783 wl = wn;
3460 } 3784 }
3785#endif
3461/* EV_STAT 0x00001000 /* stat data changed */ 3786/* EV_STAT 0x00001000 /* stat data changed */
3462/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3787/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3463} 3788}
3464#endif 3789#endif
3465 3790

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines