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

Comparing libev/ev.c (file contents):
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC vs.
Revision 1.342 by root, Mon Mar 29 12:40:57 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
79# endif 79# endif
80# endif 80# endif
81 81
82# ifndef EV_USE_NANOSLEEP 82# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP 83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# else 85# else
86# define EV_USE_NANOSLEEP 0 86# define EV_USE_NANOSLEEP 0
87# endif 87# endif
88# endif 88# endif
89 89
90# ifndef EV_USE_SELECT 90# ifndef EV_USE_SELECT
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT 1 92# define EV_USE_SELECT EV_FEATURE_BACKENDS
93# else 93# else
94# define EV_USE_SELECT 0 94# define EV_USE_SELECT 0
95# endif 95# endif
96# endif 96# endif
97 97
98# ifndef EV_USE_POLL 98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H 99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1 100# define EV_USE_POLL EV_FEATURE_BACKENDS
101# else 101# else
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif 103# endif
104# endif 104# endif
105 105
106# ifndef EV_USE_EPOLL 106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 108# define EV_USE_EPOLL EV_FEATURE_BACKENDS
109# else 109# else
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
121 121
122# ifndef EV_USE_PORT 122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# define EV_USE_PORT EV_FEATURE_BACKENDS
125# else 125# else
126# define EV_USE_PORT 0 126# define EV_USE_PORT 0
127# endif 127# endif
128# endif 128# endif
129 129
130# ifndef EV_USE_INOTIFY 130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 132# define EV_USE_INOTIFY EV_FEATURE_OS
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD 138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 140# define EV_USE_SIGNALFD EV_FEATURE_OS
141# else 141# else
142# define EV_USE_SIGNALFD 0 142# define EV_USE_SIGNALFD 0
143# endif 143# endif
144# endif 144# endif
145 145
146# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD 147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD EV_FEATURE_OS
149# else 149# else
150# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
151# endif 151# endif
152# endif 152# endif
153 153
154#endif 154#endif
155 155
156#include <math.h> 156#include <math.h>
157#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
158#include <fcntl.h> 159#include <fcntl.h>
159#include <stddef.h> 160#include <stddef.h>
160 161
161#include <stdio.h> 162#include <stdio.h>
162 163
163#include <assert.h> 164#include <assert.h>
164#include <errno.h> 165#include <errno.h>
165#include <sys/types.h> 166#include <sys/types.h>
166#include <time.h> 167#include <time.h>
168#include <limits.h>
167 169
168#include <signal.h> 170#include <signal.h>
169 171
170#ifdef EV_H 172#ifdef EV_H
171# include EV_H 173# include EV_H
182# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 185# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
186# endif 188# endif
189# undef EV_AVOID_STDIO
187#endif 190#endif
188 191
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
190 193
191/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
204#elif defined (MAXSIG) 207#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 208# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 209#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 210# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 211#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 213#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 215#else
213# error "unable to find value for NSIG, please report" 216# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
215# define EV_NSIG 64 219# define EV_NSIG 65
216#endif 220#endif
217 221
218/* Default to some arbitrary number that's big enough to get most
219 of the common signals.
220*/
221#ifndef NSIG
222# define NSIG 50
223#endif
224/* <-- NSIG logic from Configure */
225#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
228# else 225# else
229# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
230# endif 227# endif
231#endif 228#endif
232 229
233#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
234# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
235# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
236# else 233# else
237# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
238# endif 235# endif
239#endif 236#endif
240 237
242# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
243#endif 240#endif
244 241
245#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
246# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
247# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
248# else 245# else
249# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
250# endif 247# endif
251#endif 248#endif
252 249
253#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
254# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
255#endif 252#endif
256 253
257#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
258# ifdef _WIN32 255# ifdef _WIN32
259# define EV_USE_POLL 0 256# define EV_USE_POLL 0
260# else 257# else
261# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
262# endif 259# endif
263#endif 260#endif
264 261
265#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
266# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
267# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
268# else 265# else
269# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
270# endif 267# endif
271#endif 268#endif
272 269
278# define EV_USE_PORT 0 275# define EV_USE_PORT 0
279#endif 276#endif
280 277
281#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
282# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
283# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
284# else 281# else
285# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
286# endif 283# endif
287#endif 284#endif
288 285
289#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
290# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
291# define EV_PID_HASHSIZE 1
292# else
293# define EV_PID_HASHSIZE 16
294# endif
295#endif 288#endif
296 289
297#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
298# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
299# define EV_INOTIFY_HASHSIZE 1
300# else
301# define EV_INOTIFY_HASHSIZE 16
302# endif
303#endif 292#endif
304 293
305#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
306# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
307# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
308# else 297# else
309# define EV_USE_EVENTFD 0 298# define EV_USE_EVENTFD 0
310# endif 299# endif
311#endif 300#endif
312 301
313#ifndef EV_USE_SIGNALFD 302#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
315# define EV_USE_SIGNALFD 1 304# define EV_USE_SIGNALFD EV_FEATURE_OS
316# else 305# else
317# define EV_USE_SIGNALFD 0 306# define EV_USE_SIGNALFD 0
318# endif 307# endif
319#endif 308#endif
320 309
323# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
324# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
325#endif 314#endif
326 315
327#ifndef EV_VERIFY 316#ifndef EV_VERIFY
328# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
329#endif 318#endif
330 319
331#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
332# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
333#endif 322#endif
334 323
335#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
336# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
337#endif 326#endif
338 327
339/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 328/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
340/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
341#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
350# endif 339# endif
351#endif 340#endif
352 341
353/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 342/* this block fixes any misconfiguration where we know we run into trouble otherwise */
354 343
344#ifdef _AIX
345/* AIX has a completely broken poll.h header */
346# undef EV_USE_POLL
347# define EV_USE_POLL 0
348#endif
349
355#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
358#endif 353#endif
359 354
393# include <stdint.h> 388# include <stdint.h>
394# ifndef EFD_NONBLOCK 389# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 390# define EFD_NONBLOCK O_NONBLOCK
396# endif 391# endif
397# ifndef EFD_CLOEXEC 392# ifndef EFD_CLOEXEC
393# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 394# define EFD_CLOEXEC O_CLOEXEC
395# else
396# define EFD_CLOEXEC 02000000
397# endif
399# endif 398# endif
400# ifdef __cplusplus 399# ifdef __cplusplus
401extern "C" { 400extern "C" {
402# endif 401# endif
403int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
404# ifdef __cplusplus 403# ifdef __cplusplus
405} 404}
406# endif 405# endif
407#endif 406#endif
408 407
409#if EV_USE_SIGNALFD 408#if EV_USE_SIGNALFD
410# include <sys/signalfd.h> 409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h>
411# ifndef SFD_NONBLOCK
412# define SFD_NONBLOCK O_NONBLOCK
411#endif 413# endif
414# ifndef SFD_CLOEXEC
415# ifdef O_CLOEXEC
416# define SFD_CLOEXEC O_CLOEXEC
417# else
418# define SFD_CLOEXEC 02000000
419# endif
420# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags);
425
426struct signalfd_siginfo
427{
428 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)];
430};
431# ifdef __cplusplus
432}
433# endif
434#endif
435
412 436
413/**/ 437/**/
414 438
415#if EV_VERIFY >= 3 439#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 440# define EV_FREQUENT_CHECK ev_verify (EV_A)
417#else 441#else
418# define EV_FREQUENT_CHECK do { } while (0) 442# define EV_FREQUENT_CHECK do { } while (0)
419#endif 443#endif
420 444
421/* 445/*
428 */ 452 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 454
431#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 455#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
432#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 456#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
433/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
434 457
435#if __GNUC__ >= 4 458#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 459# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 460# define noinline __attribute__ ((noinline))
438#else 461#else
445 468
446#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
447#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
448#define inline_size static inline 471#define inline_size static inline
449 472
450#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
451# define inline_speed static noinline 476# define inline_speed static noinline
452#else
453# define inline_speed static inline
454#endif 477#endif
455 478
456#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
457 480
458#if EV_MINPRI == EV_MAXPRI 481#if EV_MINPRI == EV_MAXPRI
479 502
480#if EV_USE_MONOTONIC 503#if EV_USE_MONOTONIC
481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
482#endif 505#endif
483 506
507#ifndef EV_FD_TO_WIN32_HANDLE
508# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
509#endif
510#ifndef EV_WIN32_HANDLE_TO_FD
511# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
512#endif
513#ifndef EV_WIN32_CLOSE_FD
514# define EV_WIN32_CLOSE_FD(fd) close (fd)
515#endif
516
484#ifdef _WIN32 517#ifdef _WIN32
485# include "ev_win32.c" 518# include "ev_win32.c"
486#endif 519#endif
487 520
488/*****************************************************************************/ 521/*****************************************************************************/
522
523#if EV_AVOID_STDIO
524static void noinline
525ev_printerr (const char *msg)
526{
527 write (STDERR_FILENO, msg, strlen (msg));
528}
529#endif
489 530
490static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
491 532
492void 533void
493ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
503 544
504 if (syserr_cb) 545 if (syserr_cb)
505 syserr_cb (msg); 546 syserr_cb (msg);
506 else 547 else
507 { 548 {
549#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg);
553 ev_printerr (": ");
554 ev_printerr (err);
555 ev_printerr ("\n");
556#else
508 perror (msg); 557 perror (msg);
558#endif
509 abort (); 559 abort ();
510 } 560 }
511} 561}
512 562
513static void * 563static void *
514ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
515{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
516 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
517 * implement realloc (x, 0) (as required by both ansi c-98 and 570 * implement realloc (x, 0) (as required by both ansi c-89 and
518 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
519 */ 572 */
520 573
521 if (size) 574 if (size)
522 return realloc (ptr, size); 575 return realloc (ptr, size);
523 576
524 free (ptr); 577 free (ptr);
525 return 0; 578 return 0;
579#endif
526} 580}
527 581
528static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
529 583
530void 584void
538{ 592{
539 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
540 594
541 if (!ptr && size) 595 if (!ptr && size)
542 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
543 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
544 abort (); 602 abort ();
545 } 603 }
546 604
547 return ptr; 605 return ptr;
548} 606}
630 688
631 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
632 690
633#endif 691#endif
634 692
635#if EV_MINIMAL < 2 693#if EV_FEATURE_API
636# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 694# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
637# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A) 695# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
638# define EV_INVOKE_PENDING invoke_cb (EV_A) 696# define EV_INVOKE_PENDING invoke_cb (EV_A)
639#else 697#else
640# define EV_RELEASE_CB (void)0 698# define EV_RELEASE_CB (void)0
825} 883}
826 884
827/*****************************************************************************/ 885/*****************************************************************************/
828 886
829inline_speed void 887inline_speed void
830fd_event_nc (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
831{ 889{
832 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
833 ev_io *w; 891 ev_io *w;
834 892
835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 893 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
847fd_event (EV_P_ int fd, int revents) 905fd_event (EV_P_ int fd, int revents)
848{ 906{
849 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
850 908
851 if (expect_true (!anfd->reify)) 909 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents); 910 fd_event_nocheck (EV_A_ fd, revents);
853} 911}
854 912
855void 913void
856ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
857{ 915{
858 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
859 fd_event_nc (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
860} 918}
861 919
862/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
863/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
864inline_size void 922inline_size void
879 937
880#if EV_SELECT_IS_WINSOCKET 938#if EV_SELECT_IS_WINSOCKET
881 if (events) 939 if (events)
882 { 940 {
883 unsigned long arg; 941 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
886 #else
887 anfd->handle = _get_osfhandle (fd);
888 #endif
889 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
890 } 944 }
891#endif 945#endif
892 946
893 { 947 {
931 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
932 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 986 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
933 } 987 }
934} 988}
935 989
936/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
937inline_size int 991inline_size int
938fd_valid (int fd) 992fd_valid (int fd)
939{ 993{
940#ifdef _WIN32 994#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 996#else
943 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
944#endif 998#endif
945} 999}
946 1000
964 1018
965 for (fd = anfdmax; fd--; ) 1019 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 1020 if (anfds [fd].events)
967 { 1021 {
968 fd_kill (EV_A_ fd); 1022 fd_kill (EV_A_ fd);
969 return; 1023 break;
970 } 1024 }
971} 1025}
972 1026
973/* usually called after fork if backend needs to re-arm all fds from scratch */ 1027/* usually called after fork if backend needs to re-arm all fds from scratch */
974static void noinline 1028static void noinline
981 { 1035 {
982 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
983 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
985 } 1039 }
1040}
1041
1042/* used to prepare libev internal fd's */
1043/* this is not fork-safe */
1044inline_speed void
1045fd_intern (int fd)
1046{
1047#ifdef _WIN32
1048 unsigned long arg = 1;
1049 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1050#else
1051 fcntl (fd, F_SETFD, FD_CLOEXEC);
1052 fcntl (fd, F_SETFL, O_NONBLOCK);
1053#endif
986} 1054}
987 1055
988/*****************************************************************************/ 1056/*****************************************************************************/
989 1057
990/* 1058/*
1064 1132
1065 for (;;) 1133 for (;;)
1066 { 1134 {
1067 int c = k << 1; 1135 int c = k << 1;
1068 1136
1069 if (c > N + HEAP0 - 1) 1137 if (c >= N + HEAP0)
1070 break; 1138 break;
1071 1139
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1140 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1141 ? 1 : 0;
1074 1142
1110 1178
1111/* move an element suitably so it is in a correct place */ 1179/* move an element suitably so it is in a correct place */
1112inline_size void 1180inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1181adjustheap (ANHE *heap, int N, int k)
1114{ 1182{
1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1183 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1116 upheap (heap, k); 1184 upheap (heap, k);
1117 else 1185 else
1118 downheap (heap, N, k); 1186 downheap (heap, N, k);
1119} 1187}
1120 1188
1133/*****************************************************************************/ 1201/*****************************************************************************/
1134 1202
1135/* associate signal watchers to a signal signal */ 1203/* associate signal watchers to a signal signal */
1136typedef struct 1204typedef struct
1137{ 1205{
1206 EV_ATOMIC_T pending;
1207#if EV_MULTIPLICITY
1208 EV_P;
1209#endif
1138 WL head; 1210 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1211} ANSIG;
1141 1212
1142static ANSIG *signals; 1213static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1214
1147/*****************************************************************************/ 1215/*****************************************************************************/
1148 1216
1149/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1150/* this is not fork-safe */
1151inline_speed void
1152fd_intern (int fd)
1153{
1154#ifdef _WIN32
1155 unsigned long arg = 1;
1156 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1157#else
1158 fcntl (fd, F_SETFD, FD_CLOEXEC);
1159 fcntl (fd, F_SETFL, O_NONBLOCK);
1160#endif
1161}
1162 1218
1163static void noinline 1219static void noinline
1164evpipe_init (EV_P) 1220evpipe_init (EV_P)
1165{ 1221{
1166 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1167 { 1223 {
1168#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL) 1226 if (evfd < 0 && errno == EINVAL)
1171 evfd = eventfd (0, 0); 1227 evfd = eventfd (0, 0);
1172 1228
1173 if (evfd >= 0) 1229 if (evfd >= 0)
1175 evpipe [0] = -1; 1231 evpipe [0] = -1;
1176 fd_intern (evfd); /* doing it twice doesn't hurt */ 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1177 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1178 } 1234 }
1179 else 1235 else
1180#endif 1236# endif
1181 { 1237 {
1182 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1183 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1184 1240
1185 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
1196evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1197{ 1253{
1198 if (!*flag) 1254 if (!*flag)
1199 { 1255 {
1200 int old_errno = errno; /* save errno because write might clobber it */ 1256 int old_errno = errno; /* save errno because write might clobber it */
1257 char dummy;
1201 1258
1202 *flag = 1; 1259 *flag = 1;
1203 1260
1204#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1205 if (evfd >= 0) 1262 if (evfd >= 0)
1207 uint64_t counter = 1; 1264 uint64_t counter = 1;
1208 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1209 } 1266 }
1210 else 1267 else
1211#endif 1268#endif
1212 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1213 1270
1214 errno = old_errno; 1271 errno = old_errno;
1215 } 1272 }
1216} 1273}
1217 1274
1218/* called whenever the libev signal pipe */ 1275/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1276/* got some events (signal, async) */
1220static void 1277static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1279{
1280 int i;
1281
1223#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1283 if (evfd >= 0)
1225 { 1284 {
1226 uint64_t counter; 1285 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
1231 { 1290 {
1232 char dummy; 1291 char dummy;
1233 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1234 } 1293 }
1235 1294
1236 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1237 { 1296 {
1238 int signum; 1297 sig_pending = 0;
1239 gotsig = 0;
1240 1298
1241 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1302 }
1245 1303
1246#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1247 if (gotasync) 1305 if (async_pending)
1248 { 1306 {
1249 int i; 1307 async_pending = 0;
1250 gotasync = 0;
1251 1308
1252 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1254 { 1311 {
1255 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
1263 1320
1264static void 1321static void
1265ev_sighandler (int signum) 1322ev_sighandler (int signum)
1266{ 1323{
1267#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1269#endif 1326#endif
1270 1327
1271#if _WIN32 1328#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1273#endif 1330#endif
1274 1331
1275 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1277} 1334}
1278 1335
1279void noinline 1336void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1281{ 1338{
1282 WL w; 1339 WL w;
1283 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1284#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1347 /* it is permissible to try to feed a signal to the wrong loop */
1286#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1349
1288 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1351 return;
1352#endif
1292 1353
1293 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1294 1355
1295 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1358}
1298 1359
1299#if EV_USE_SIGNALFD 1360#if EV_USE_SIGNALFD
1300static void 1361static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1362sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1363{
1303 struct signalfd_siginfo si[4], *sip; 1364 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1365
1305 for (;;) 1366 for (;;)
1306 { 1367 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1368 ssize_t res = read (sigfd, si, sizeof (si));
1308 1369
1314 break; 1375 break;
1315 } 1376 }
1316} 1377}
1317#endif 1378#endif
1318 1379
1380#endif
1381
1319/*****************************************************************************/ 1382/*****************************************************************************/
1320 1383
1384#if EV_CHILD_ENABLE
1321static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1322
1323#ifndef _WIN32
1324 1386
1325static ev_signal childev; 1387static ev_signal childev;
1326 1388
1327#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1328# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
1333child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1334{ 1396{
1335 ev_child *w; 1397 ev_child *w;
1336 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1337 1399
1338 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1400 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1339 { 1401 {
1340 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1341 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1342 { 1404 {
1343 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1405 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
1368 /* make sure we are called again until all children have been reaped */ 1430 /* make sure we are called again until all children have been reaped */
1369 /* we need to do it this way so that the callback gets called before we continue */ 1431 /* we need to do it this way so that the callback gets called before we continue */
1370 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1371 1433
1372 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1373 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1374 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1436 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1375} 1437}
1376 1438
1377#endif 1439#endif
1378 1440
1445#ifdef __APPLE__ 1507#ifdef __APPLE__
1446 /* only select works correctly on that "unix-certified" platform */ 1508 /* only select works correctly on that "unix-certified" platform */
1447 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1509 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1448 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1510 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1449#endif 1511#endif
1512#ifdef __FreeBSD__
1513 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1514#endif
1450 1515
1451 return flags; 1516 return flags;
1452} 1517}
1453 1518
1454unsigned int 1519unsigned int
1467ev_backend (EV_P) 1532ev_backend (EV_P)
1468{ 1533{
1469 return backend; 1534 return backend;
1470} 1535}
1471 1536
1472#if EV_MINIMAL < 2 1537#if EV_FEATURE_API
1473unsigned int 1538unsigned int
1474ev_loop_count (EV_P) 1539ev_iteration (EV_P)
1475{ 1540{
1476 return loop_count; 1541 return loop_count;
1477} 1542}
1478 1543
1479unsigned int 1544unsigned int
1480ev_loop_depth (EV_P) 1545ev_depth (EV_P)
1481{ 1546{
1482 return loop_depth; 1547 return loop_depth;
1483} 1548}
1484 1549
1485void 1550void
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1607 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1608 have_monotonic = 1;
1544 } 1609 }
1545#endif 1610#endif
1546 1611
1612 /* pid check not overridable via env */
1613#ifndef _WIN32
1614 if (flags & EVFLAG_FORKCHECK)
1615 curpid = getpid ();
1616#endif
1617
1618 if (!(flags & EVFLAG_NOENV)
1619 && !enable_secure ()
1620 && getenv ("LIBEV_FLAGS"))
1621 flags = atoi (getenv ("LIBEV_FLAGS"));
1622
1547 ev_rt_now = ev_time (); 1623 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1624 mn_now = get_clock ();
1549 now_floor = mn_now; 1625 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1626 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1627#if EV_FEATURE_API
1552 invoke_cb = ev_invoke_pending; 1628 invoke_cb = ev_invoke_pending;
1553#endif 1629#endif
1554 1630
1555 io_blocktime = 0.; 1631 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1632 timeout_blocktime = 0.;
1557 backend = 0; 1633 backend = 0;
1558 backend_fd = -1; 1634 backend_fd = -1;
1559 gotasync = 0; 1635 sig_pending = 0;
1636#if EV_ASYNC_ENABLE
1637 async_pending = 0;
1638#endif
1560#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1561 fs_fd = -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1641#endif
1563#if EV_USE_SIGNALFD 1642#if EV_USE_SIGNALFD
1564 sigfd = -2; 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1644#endif
1566
1567 /* pid check not overridable via env */
1568#ifndef _WIN32
1569 if (flags & EVFLAG_FORKCHECK)
1570 curpid = getpid ();
1571#endif
1572
1573 if (!(flags & EVFLAG_NOENV)
1574 && !enable_secure ()
1575 && getenv ("LIBEV_FLAGS"))
1576 flags = atoi (getenv ("LIBEV_FLAGS"));
1577 1645
1578 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1580 1648
1581#if EV_USE_PORT 1649#if EV_USE_PORT
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1662 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1663#endif
1596 1664
1597 ev_prepare_init (&pending_w, pendingcb); 1665 ev_prepare_init (&pending_w, pendingcb);
1598 1666
1667#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1668 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1669 ev_set_priority (&pipe_w, EV_MAXPRI);
1670#endif
1601 } 1671 }
1602} 1672}
1603 1673
1604/* free up a loop structure */ 1674/* free up a loop structure */
1605static void noinline 1675static void noinline
1617 close (evfd); 1687 close (evfd);
1618#endif 1688#endif
1619 1689
1620 if (evpipe [0] >= 0) 1690 if (evpipe [0] >= 0)
1621 { 1691 {
1622 close (evpipe [0]); 1692 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1693 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1694 }
1625 } 1695 }
1626 1696
1627#if EV_USE_SIGNALFD 1697#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1698 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1699 close (sigfd);
1634 }
1635#endif 1700#endif
1636 1701
1637#if EV_USE_INOTIFY 1702#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1703 if (fs_fd >= 0)
1639 close (fs_fd); 1704 close (fs_fd);
1709 1774
1710 if (ev_is_active (&pipe_w)) 1775 if (ev_is_active (&pipe_w))
1711 { 1776 {
1712 /* this "locks" the handlers against writing to the pipe */ 1777 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1778 /* while we modify the fd vars */
1714 gotsig = 1; 1779 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1780#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1781 async_pending = 1;
1717#endif 1782#endif
1718 1783
1719 ev_ref (EV_A); 1784 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1785 ev_io_stop (EV_A_ &pipe_w);
1721 1786
1724 close (evfd); 1789 close (evfd);
1725#endif 1790#endif
1726 1791
1727 if (evpipe [0] >= 0) 1792 if (evpipe [0] >= 0)
1728 { 1793 {
1729 close (evpipe [0]); 1794 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1795 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1796 }
1732 1797
1798#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 1799 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1800 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1801 pipecb (EV_A_ &pipe_w, EV_READ);
1802#endif
1736 } 1803 }
1737 1804
1738 postfork = 0; 1805 postfork = 0;
1739} 1806}
1740 1807
1741#if EV_MULTIPLICITY 1808#if EV_MULTIPLICITY
1742 1809
1743struct ev_loop * 1810struct ev_loop *
1744ev_loop_new (unsigned int flags) 1811ev_loop_new (unsigned int flags)
1745{ 1812{
1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1813 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 1814
1748 memset (loop, 0, sizeof (struct ev_loop)); 1815 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1816 loop_init (EV_A_ flags);
1750 1817
1751 if (ev_backend (EV_A)) 1818 if (ev_backend (EV_A))
1752 return loop; 1819 return EV_A;
1753 1820
1754 return 0; 1821 return 0;
1755} 1822}
1756 1823
1757void 1824void
1802 verify_watcher (EV_A_ ws [cnt]); 1869 verify_watcher (EV_A_ ws [cnt]);
1803 } 1870 }
1804} 1871}
1805#endif 1872#endif
1806 1873
1807#if EV_MINIMAL < 2 1874#if EV_FEATURE_API
1808void 1875void
1809ev_loop_verify (EV_P) 1876ev_verify (EV_P)
1810{ 1877{
1811#if EV_VERIFY 1878#if EV_VERIFY
1812 int i; 1879 int i;
1813 WL w; 1880 WL w;
1814 1881
1853#if EV_ASYNC_ENABLE 1920#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 1921 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 1922 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 1923#endif
1857 1924
1925#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 1926 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 1927 array_verify (EV_A_ (W *)prepares, preparecnt);
1928#endif
1860 1929
1930#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1933#endif
1863 1934
1864# if 0 1935# if 0
1936#if EV_CHILD_ENABLE
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1937 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1938 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1939#endif
1867# endif 1940# endif
1868#endif 1941#endif
1869} 1942}
1870#endif 1943#endif
1871 1944
1878#endif 1951#endif
1879{ 1952{
1880 if (!ev_default_loop_ptr) 1953 if (!ev_default_loop_ptr)
1881 { 1954 {
1882#if EV_MULTIPLICITY 1955#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1956 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1957#else
1885 ev_default_loop_ptr = 1; 1958 ev_default_loop_ptr = 1;
1886#endif 1959#endif
1887 1960
1888 loop_init (EV_A_ flags); 1961 loop_init (EV_A_ flags);
1889 1962
1890 if (ev_backend (EV_A)) 1963 if (ev_backend (EV_A))
1891 { 1964 {
1892#ifndef _WIN32 1965#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 1966 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 1967 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 1968 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1969 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 1970#endif
1905 1978
1906void 1979void
1907ev_default_destroy (void) 1980ev_default_destroy (void)
1908{ 1981{
1909#if EV_MULTIPLICITY 1982#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 1983 EV_P = ev_default_loop_ptr;
1911#endif 1984#endif
1912 1985
1913 ev_default_loop_ptr = 0; 1986 ev_default_loop_ptr = 0;
1914 1987
1915#ifndef _WIN32 1988#if EV_CHILD_ENABLE
1916 ev_ref (EV_A); /* child watcher */ 1989 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev); 1990 ev_signal_stop (EV_A_ &childev);
1918#endif 1991#endif
1919 1992
1920 loop_destroy (EV_A); 1993 loop_destroy (EV_A);
1922 1995
1923void 1996void
1924ev_default_fork (void) 1997ev_default_fork (void)
1925{ 1998{
1926#if EV_MULTIPLICITY 1999#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 2000 EV_P = ev_default_loop_ptr;
1928#endif 2001#endif
1929 2002
1930 postfork = 1; /* must be in line with ev_loop_fork */ 2003 postfork = 1; /* must be in line with ev_loop_fork */
1931} 2004}
1932 2005
2026 EV_FREQUENT_CHECK; 2099 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w); 2100 feed_reverse (EV_A_ (W)w);
2028 } 2101 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2102 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030 2103
2031 feed_reverse_done (EV_A_ EV_TIMEOUT); 2104 feed_reverse_done (EV_A_ EV_TIMER);
2032 } 2105 }
2033} 2106}
2034 2107
2035#if EV_PERIODIC_ENABLE 2108#if EV_PERIODIC_ENABLE
2036/* make periodics pending */ 2109/* make periodics pending */
2127 ANHE_at_cache (*he); 2200 ANHE_at_cache (*he);
2128 } 2201 }
2129} 2202}
2130 2203
2131/* fetch new monotonic and realtime times from the kernel */ 2204/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2205/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2206inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2207time_update (EV_P_ ev_tstamp max_block)
2135{ 2208{
2136#if EV_USE_MONOTONIC 2209#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2210 if (expect_true (have_monotonic))
2197} 2270}
2198 2271
2199void 2272void
2200ev_loop (EV_P_ int flags) 2273ev_loop (EV_P_ int flags)
2201{ 2274{
2202#if EV_MINIMAL < 2 2275#if EV_FEATURE_API
2203 ++loop_depth; 2276 ++loop_depth;
2204#endif 2277#endif
2205 2278
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2279 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207 2280
2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2283 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2211 2284
2212 do 2285 do
2213 { 2286 {
2214#if EV_VERIFY >= 2 2287#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A); 2288 ev_verify (EV_A);
2216#endif 2289#endif
2217 2290
2218#ifndef _WIN32 2291#ifndef _WIN32
2219 if (expect_false (curpid)) /* penalise the forking check even more */ 2292 if (expect_false (curpid)) /* penalise the forking check even more */
2220 if (expect_false (getpid () != curpid)) 2293 if (expect_false (getpid () != curpid))
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2305 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2306 EV_INVOKE_PENDING;
2234 } 2307 }
2235#endif 2308#endif
2236 2309
2310#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2311 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2312 if (expect_false (preparecnt))
2239 { 2313 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2314 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2315 EV_INVOKE_PENDING;
2242 } 2316 }
2317#endif
2243 2318
2244 if (expect_false (loop_done)) 2319 if (expect_false (loop_done))
2245 break; 2320 break;
2246 2321
2247 /* we might have forked, so reify kernel state if necessary */ 2322 /* we might have forked, so reify kernel state if necessary */
2298 waittime -= sleeptime; 2373 waittime -= sleeptime;
2299 } 2374 }
2300 } 2375 }
2301 } 2376 }
2302 2377
2303#if EV_MINIMAL < 2 2378#if EV_FEATURE_API
2304 ++loop_count; 2379 ++loop_count;
2305#endif 2380#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2381 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2307 backend_poll (EV_A_ waittime); 2382 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2383 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2320#if EV_IDLE_ENABLE 2395#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2396 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2397 idle_reify (EV_A);
2323#endif 2398#endif
2324 2399
2400#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2401 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2402 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2403 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2404#endif
2328 2405
2329 EV_INVOKE_PENDING; 2406 EV_INVOKE_PENDING;
2330 } 2407 }
2331 while (expect_true ( 2408 while (expect_true (
2332 activecnt 2409 activecnt
2335 )); 2412 ));
2336 2413
2337 if (loop_done == EVUNLOOP_ONE) 2414 if (loop_done == EVUNLOOP_ONE)
2338 loop_done = EVUNLOOP_CANCEL; 2415 loop_done = EVUNLOOP_CANCEL;
2339 2416
2340#if EV_MINIMAL < 2 2417#if EV_FEATURE_API
2341 --loop_depth; 2418 --loop_depth;
2342#endif 2419#endif
2343} 2420}
2344 2421
2345void 2422void
2398inline_size void 2475inline_size void
2399wlist_del (WL *head, WL elem) 2476wlist_del (WL *head, WL elem)
2400{ 2477{
2401 while (*head) 2478 while (*head)
2402 { 2479 {
2403 if (*head == elem) 2480 if (expect_true (*head == elem))
2404 { 2481 {
2405 *head = elem->next; 2482 *head = elem->next;
2406 return; 2483 break;
2407 } 2484 }
2408 2485
2409 head = &(*head)->next; 2486 head = &(*head)->next;
2410 } 2487 }
2411} 2488}
2471 2548
2472 if (expect_false (ev_is_active (w))) 2549 if (expect_false (ev_is_active (w)))
2473 return; 2550 return;
2474 2551
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2552 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2553 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2554
2478 EV_FREQUENT_CHECK; 2555 EV_FREQUENT_CHECK;
2479 2556
2480 ev_start (EV_A_ (W)w, 1); 2557 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2558 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2551 timers [active] = timers [timercnt + HEAP0]; 2628 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2629 adjustheap (timers, timercnt, active);
2553 } 2630 }
2554 } 2631 }
2555 2632
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2633 ev_at (w) -= mn_now;
2559 2634
2560 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2636
2637 EV_FREQUENT_CHECK;
2561} 2638}
2562 2639
2563void noinline 2640void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2641ev_timer_again (EV_P_ ev_timer *w)
2565{ 2642{
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2721 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2722 adjustheap (periodics, periodiccnt, active);
2646 } 2723 }
2647 } 2724 }
2648 2725
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2726 ev_stop (EV_A_ (W)w);
2727
2728 EV_FREQUENT_CHECK;
2652} 2729}
2653 2730
2654void noinline 2731void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2732ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2733{
2662 2739
2663#ifndef SA_RESTART 2740#ifndef SA_RESTART
2664# define SA_RESTART 0 2741# define SA_RESTART 0
2665#endif 2742#endif
2666 2743
2744#if EV_SIGNAL_ENABLE
2745
2667void noinline 2746void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2747ev_signal_start (EV_P_ ev_signal *w)
2669{ 2748{
2670#if EV_MULTIPLICITY
2671 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2672#endif
2673 if (expect_false (ev_is_active (w))) 2749 if (expect_false (ev_is_active (w)))
2674 return; 2750 return;
2675 2751
2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2752 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2753
2754#if EV_MULTIPLICITY
2755 assert (("libev: a signal must not be attached to two different loops",
2756 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2757
2758 signals [w->signum - 1].loop = EV_A;
2759#endif
2677 2760
2678 EV_FREQUENT_CHECK; 2761 EV_FREQUENT_CHECK;
2679 2762
2680#if EV_USE_SIGNALFD 2763#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2764 if (sigfd == -2)
2703 sigaddset (&sigfd_set, w->signum); 2786 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2787 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2788
2706 signalfd (sigfd, &sigfd_set, 0); 2789 signalfd (sigfd, &sigfd_set, 0);
2707 } 2790 }
2708 else
2709#endif
2710 evpipe_init (EV_A);
2711
2712 {
2713#ifndef _WIN32
2714 sigset_t full, prev;
2715 sigfillset (&full);
2716 sigprocmask (SIG_SETMASK, &full, &prev);
2717#endif
2718
2719 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2720
2721#ifndef _WIN32
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0)/*TODO*/
2724# endif 2791#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2792
2730 ev_start (EV_A_ (W)w, 1); 2793 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2794 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2795
2733 if (!((WL)w)->next) 2796 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2797# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2798 if (sigfd < 0) /*TODO*/
2740# endif 2799# endif
2741 { 2800 {
2801# ifdef _WIN32
2802 evpipe_init (EV_A);
2803
2804 signal (w->signum, ev_sighandler);
2805# else
2742 struct sigaction sa = { }; 2806 struct sigaction sa;
2807
2808 evpipe_init (EV_A);
2809
2743 sa.sa_handler = ev_sighandler; 2810 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2811 sigfillset (&sa.sa_mask);
2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2812 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2746 sigaction (w->signum, &sa, 0); 2813 sigaction (w->signum, &sa, 0);
2814
2815 sigemptyset (&sa.sa_mask);
2816 sigaddset (&sa.sa_mask, w->signum);
2817 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2818#endif
2747 } 2819 }
2748#endif
2749 }
2750 2820
2751 EV_FREQUENT_CHECK; 2821 EV_FREQUENT_CHECK;
2752} 2822}
2753 2823
2754void noinline 2824void noinline
2762 2832
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2833 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2834 ev_stop (EV_A_ (W)w);
2765 2835
2766 if (!signals [w->signum - 1].head) 2836 if (!signals [w->signum - 1].head)
2837 {
2838#if EV_MULTIPLICITY
2839 signals [w->signum - 1].loop = 0; /* unattach from signal */
2840#endif
2767#if EV_USE_SIGNALFD 2841#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2842 if (sigfd >= 0)
2769 { 2843 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2844 sigset_t ss;
2845
2846 sigemptyset (&ss);
2847 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2848 sigdelset (&sigfd_set, w->signum);
2849
2772 signalfd (sigfd, &sigfd_set, 0); 2850 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2851 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2852 }
2776 else 2853 else
2777#endif 2854#endif
2778 signal (w->signum, SIG_DFL); 2855 signal (w->signum, SIG_DFL);
2856 }
2779 2857
2780 EV_FREQUENT_CHECK; 2858 EV_FREQUENT_CHECK;
2781} 2859}
2860
2861#endif
2862
2863#if EV_CHILD_ENABLE
2782 2864
2783void 2865void
2784ev_child_start (EV_P_ ev_child *w) 2866ev_child_start (EV_P_ ev_child *w)
2785{ 2867{
2786#if EV_MULTIPLICITY 2868#if EV_MULTIPLICITY
2790 return; 2872 return;
2791 2873
2792 EV_FREQUENT_CHECK; 2874 EV_FREQUENT_CHECK;
2793 2875
2794 ev_start (EV_A_ (W)w, 1); 2876 ev_start (EV_A_ (W)w, 1);
2795 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2877 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2796 2878
2797 EV_FREQUENT_CHECK; 2879 EV_FREQUENT_CHECK;
2798} 2880}
2799 2881
2800void 2882void
2804 if (expect_false (!ev_is_active (w))) 2886 if (expect_false (!ev_is_active (w)))
2805 return; 2887 return;
2806 2888
2807 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2808 2890
2809 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2891 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2810 ev_stop (EV_A_ (W)w); 2892 ev_stop (EV_A_ (W)w);
2811 2893
2812 EV_FREQUENT_CHECK; 2894 EV_FREQUENT_CHECK;
2813} 2895}
2896
2897#endif
2814 2898
2815#if EV_STAT_ENABLE 2899#if EV_STAT_ENABLE
2816 2900
2817# ifdef _WIN32 2901# ifdef _WIN32
2818# undef lstat 2902# undef lstat
2824#define MIN_STAT_INTERVAL 0.1074891 2908#define MIN_STAT_INTERVAL 0.1074891
2825 2909
2826static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2910static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2827 2911
2828#if EV_USE_INOTIFY 2912#if EV_USE_INOTIFY
2829# define EV_INOTIFY_BUFSIZE 8192 2913
2914/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2915# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2830 2916
2831static void noinline 2917static void noinline
2832infy_add (EV_P_ ev_stat *w) 2918infy_add (EV_P_ ev_stat *w)
2833{ 2919{
2834 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2920 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2835 2921
2836 if (w->wd < 0) 2922 if (w->wd >= 0)
2923 {
2924 struct statfs sfs;
2925
2926 /* now local changes will be tracked by inotify, but remote changes won't */
2927 /* unless the filesystem is known to be local, we therefore still poll */
2928 /* also do poll on <2.6.25, but with normal frequency */
2929
2930 if (!fs_2625)
2931 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2932 else if (!statfs (w->path, &sfs)
2933 && (sfs.f_type == 0x1373 /* devfs */
2934 || sfs.f_type == 0xEF53 /* ext2/3 */
2935 || sfs.f_type == 0x3153464a /* jfs */
2936 || sfs.f_type == 0x52654973 /* reiser3 */
2937 || sfs.f_type == 0x01021994 /* tempfs */
2938 || sfs.f_type == 0x58465342 /* xfs */))
2939 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2940 else
2941 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2837 { 2942 }
2943 else
2944 {
2945 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2946 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2839 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2840 2947
2841 /* monitor some parent directory for speedup hints */ 2948 /* if path is not there, monitor some parent directory for speedup hints */
2842 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2949 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 2950 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2951 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 2952 {
2846 char path [4096]; 2953 char path [4096];
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2969 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 2970 }
2864 } 2971 }
2865 2972
2866 if (w->wd >= 0) 2973 if (w->wd >= 0)
2867 {
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2974 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2869 2975
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 2976 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 2977 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 /* also do poll on <2.6.25, but with normal frequency */
2873 struct statfs sfs;
2874
2875 if (fs_2625 && !statfs (w->path, &sfs))
2876 if (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */)
2882 return;
2883
2884 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2885 ev_timer_again (EV_A_ &w->timer); 2978 ev_timer_again (EV_A_ &w->timer);
2886 } 2979 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 2980}
2888 2981
2889static void noinline 2982static void noinline
2890infy_del (EV_P_ ev_stat *w) 2983infy_del (EV_P_ ev_stat *w)
2891{ 2984{
2894 2987
2895 if (wd < 0) 2988 if (wd < 0)
2896 return; 2989 return;
2897 2990
2898 w->wd = -2; 2991 w->wd = -2;
2899 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2992 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2900 wlist_del (&fs_hash [slot].head, (WL)w); 2993 wlist_del (&fs_hash [slot].head, (WL)w);
2901 2994
2902 /* remove this watcher, if others are watching it, they will rearm */ 2995 /* remove this watcher, if others are watching it, they will rearm */
2903 inotify_rm_watch (fs_fd, wd); 2996 inotify_rm_watch (fs_fd, wd);
2904} 2997}
2906static void noinline 2999static void noinline
2907infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3000infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2908{ 3001{
2909 if (slot < 0) 3002 if (slot < 0)
2910 /* overflow, need to check for all hash slots */ 3003 /* overflow, need to check for all hash slots */
2911 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3004 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2912 infy_wd (EV_A_ slot, wd, ev); 3005 infy_wd (EV_A_ slot, wd, ev);
2913 else 3006 else
2914 { 3007 {
2915 WL w_; 3008 WL w_;
2916 3009
2917 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3010 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2918 { 3011 {
2919 ev_stat *w = (ev_stat *)w_; 3012 ev_stat *w = (ev_stat *)w_;
2920 w_ = w_->next; /* lets us remove this watcher and all before it */ 3013 w_ = w_->next; /* lets us remove this watcher and all before it */
2921 3014
2922 if (w->wd == wd || wd == -1) 3015 if (w->wd == wd || wd == -1)
2923 { 3016 {
2924 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3017 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2925 { 3018 {
2926 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3019 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2927 w->wd = -1; 3020 w->wd = -1;
2928 infy_add (EV_A_ w); /* re-add, no matter what */ 3021 infy_add (EV_A_ w); /* re-add, no matter what */
2929 } 3022 }
2930 3023
2931 stat_timer_cb (EV_A_ &w->timer, 0); 3024 stat_timer_cb (EV_A_ &w->timer, 0);
2936 3029
2937static void 3030static void
2938infy_cb (EV_P_ ev_io *w, int revents) 3031infy_cb (EV_P_ ev_io *w, int revents)
2939{ 3032{
2940 char buf [EV_INOTIFY_BUFSIZE]; 3033 char buf [EV_INOTIFY_BUFSIZE];
2941 struct inotify_event *ev = (struct inotify_event *)buf;
2942 int ofs; 3034 int ofs;
2943 int len = read (fs_fd, buf, sizeof (buf)); 3035 int len = read (fs_fd, buf, sizeof (buf));
2944 3036
2945 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3037 for (ofs = 0; ofs < len; )
3038 {
3039 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2946 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3040 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3041 ofs += sizeof (struct inotify_event) + ev->len;
3042 }
3043}
3044
3045inline_size unsigned int
3046ev_linux_version (void)
3047{
3048 struct utsname buf;
3049 unsigned int v;
3050 int i;
3051 char *p = buf.release;
3052
3053 if (uname (&buf))
3054 return 0;
3055
3056 for (i = 3+1; --i; )
3057 {
3058 unsigned int c = 0;
3059
3060 for (;;)
3061 {
3062 if (*p >= '0' && *p <= '9')
3063 c = c * 10 + *p++ - '0';
3064 else
3065 {
3066 p += *p == '.';
3067 break;
3068 }
3069 }
3070
3071 v = (v << 8) | c;
3072 }
3073
3074 return v;
2947} 3075}
2948 3076
2949inline_size void 3077inline_size void
2950check_2625 (EV_P) 3078ev_check_2625 (EV_P)
2951{ 3079{
2952 /* kernels < 2.6.25 are borked 3080 /* kernels < 2.6.25 are borked
2953 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3081 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2954 */ 3082 */
2955 struct utsname buf; 3083 if (ev_linux_version () < 0x020619)
2956 int major, minor, micro;
2957
2958 if (uname (&buf))
2959 return; 3084 return;
2960 3085
2961 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2962 return;
2963
2964 if (major < 2
2965 || (major == 2 && minor < 6)
2966 || (major == 2 && minor == 6 && micro < 25))
2967 return;
2968
2969 fs_2625 = 1; 3086 fs_2625 = 1;
3087}
3088
3089inline_size int
3090infy_newfd (void)
3091{
3092#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3093 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3094 if (fd >= 0)
3095 return fd;
3096#endif
3097 return inotify_init ();
2970} 3098}
2971 3099
2972inline_size void 3100inline_size void
2973infy_init (EV_P) 3101infy_init (EV_P)
2974{ 3102{
2975 if (fs_fd != -2) 3103 if (fs_fd != -2)
2976 return; 3104 return;
2977 3105
2978 fs_fd = -1; 3106 fs_fd = -1;
2979 3107
2980 check_2625 (EV_A); 3108 ev_check_2625 (EV_A);
2981 3109
2982 fs_fd = inotify_init (); 3110 fs_fd = infy_newfd ();
2983 3111
2984 if (fs_fd >= 0) 3112 if (fs_fd >= 0)
2985 { 3113 {
3114 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3115 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3116 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3117 ev_io_start (EV_A_ &fs_w);
3118 ev_unref (EV_A);
2989 } 3119 }
2990} 3120}
2991 3121
2992inline_size void 3122inline_size void
2993infy_fork (EV_P) 3123infy_fork (EV_P)
2995 int slot; 3125 int slot;
2996 3126
2997 if (fs_fd < 0) 3127 if (fs_fd < 0)
2998 return; 3128 return;
2999 3129
3130 ev_ref (EV_A);
3131 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3132 close (fs_fd);
3001 fs_fd = inotify_init (); 3133 fs_fd = infy_newfd ();
3002 3134
3135 if (fs_fd >= 0)
3136 {
3137 fd_intern (fs_fd);
3138 ev_io_set (&fs_w, fs_fd, EV_READ);
3139 ev_io_start (EV_A_ &fs_w);
3140 ev_unref (EV_A);
3141 }
3142
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3143 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3004 { 3144 {
3005 WL w_ = fs_hash [slot].head; 3145 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3146 fs_hash [slot].head = 0;
3007 3147
3008 while (w_) 3148 while (w_)
3013 w->wd = -1; 3153 w->wd = -1;
3014 3154
3015 if (fs_fd >= 0) 3155 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3156 infy_add (EV_A_ w); /* re-add, no matter what */
3017 else 3157 else
3158 {
3159 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3160 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3018 ev_timer_again (EV_A_ &w->timer); 3161 ev_timer_again (EV_A_ &w->timer);
3162 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3163 }
3019 } 3164 }
3020 } 3165 }
3021} 3166}
3022 3167
3023#endif 3168#endif
3040static void noinline 3185static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3186stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3187{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3188 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3189
3045 /* we copy this here each the time so that */ 3190 ev_statdata prev = w->attr;
3046 /* prev has the old value when the callback gets invoked */
3047 w->prev = w->attr;
3048 ev_stat_stat (EV_A_ w); 3191 ev_stat_stat (EV_A_ w);
3049 3192
3050 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3193 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3051 if ( 3194 if (
3052 w->prev.st_dev != w->attr.st_dev 3195 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3196 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3197 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3198 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3199 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3200 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3201 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3202 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3203 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3204 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3205 || prev.st_ctime != w->attr.st_ctime
3063 ) { 3206 ) {
3207 /* we only update w->prev on actual differences */
3208 /* in case we test more often than invoke the callback, */
3209 /* to ensure that prev is always different to attr */
3210 w->prev = prev;
3211
3064 #if EV_USE_INOTIFY 3212 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3213 if (fs_fd >= 0)
3066 { 3214 {
3067 infy_del (EV_A_ w); 3215 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3216 infy_add (EV_A_ w);
3093 3241
3094 if (fs_fd >= 0) 3242 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3243 infy_add (EV_A_ w);
3096 else 3244 else
3097#endif 3245#endif
3246 {
3098 ev_timer_again (EV_A_ &w->timer); 3247 ev_timer_again (EV_A_ &w->timer);
3248 ev_unref (EV_A);
3249 }
3099 3250
3100 ev_start (EV_A_ (W)w, 1); 3251 ev_start (EV_A_ (W)w, 1);
3101 3252
3102 EV_FREQUENT_CHECK; 3253 EV_FREQUENT_CHECK;
3103} 3254}
3112 EV_FREQUENT_CHECK; 3263 EV_FREQUENT_CHECK;
3113 3264
3114#if EV_USE_INOTIFY 3265#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3266 infy_del (EV_A_ w);
3116#endif 3267#endif
3268
3269 if (ev_is_active (&w->timer))
3270 {
3271 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3272 ev_timer_stop (EV_A_ &w->timer);
3273 }
3118 3274
3119 ev_stop (EV_A_ (W)w); 3275 ev_stop (EV_A_ (W)w);
3120 3276
3121 EV_FREQUENT_CHECK; 3277 EV_FREQUENT_CHECK;
3122} 3278}
3167 3323
3168 EV_FREQUENT_CHECK; 3324 EV_FREQUENT_CHECK;
3169} 3325}
3170#endif 3326#endif
3171 3327
3328#if EV_PREPARE_ENABLE
3172void 3329void
3173ev_prepare_start (EV_P_ ev_prepare *w) 3330ev_prepare_start (EV_P_ ev_prepare *w)
3174{ 3331{
3175 if (expect_false (ev_is_active (w))) 3332 if (expect_false (ev_is_active (w)))
3176 return; 3333 return;
3202 3359
3203 ev_stop (EV_A_ (W)w); 3360 ev_stop (EV_A_ (W)w);
3204 3361
3205 EV_FREQUENT_CHECK; 3362 EV_FREQUENT_CHECK;
3206} 3363}
3364#endif
3207 3365
3366#if EV_CHECK_ENABLE
3208void 3367void
3209ev_check_start (EV_P_ ev_check *w) 3368ev_check_start (EV_P_ ev_check *w)
3210{ 3369{
3211 if (expect_false (ev_is_active (w))) 3370 if (expect_false (ev_is_active (w)))
3212 return; 3371 return;
3238 3397
3239 ev_stop (EV_A_ (W)w); 3398 ev_stop (EV_A_ (W)w);
3240 3399
3241 EV_FREQUENT_CHECK; 3400 EV_FREQUENT_CHECK;
3242} 3401}
3402#endif
3243 3403
3244#if EV_EMBED_ENABLE 3404#if EV_EMBED_ENABLE
3245void noinline 3405void noinline
3246ev_embed_sweep (EV_P_ ev_embed *w) 3406ev_embed_sweep (EV_P_ ev_embed *w)
3247{ 3407{
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3423embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3424{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3425 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3426
3267 { 3427 {
3268 struct ev_loop *loop = w->other; 3428 EV_P = w->other;
3269 3429
3270 while (fdchangecnt) 3430 while (fdchangecnt)
3271 { 3431 {
3272 fd_reify (EV_A); 3432 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3433 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3441 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3442
3283 ev_embed_stop (EV_A_ w); 3443 ev_embed_stop (EV_A_ w);
3284 3444
3285 { 3445 {
3286 struct ev_loop *loop = w->other; 3446 EV_P = w->other;
3287 3447
3288 ev_loop_fork (EV_A); 3448 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3450 }
3291 3451
3305{ 3465{
3306 if (expect_false (ev_is_active (w))) 3466 if (expect_false (ev_is_active (w)))
3307 return; 3467 return;
3308 3468
3309 { 3469 {
3310 struct ev_loop *loop = w->other; 3470 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3471 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3312 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3472 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3473 }
3314 3474
3315 EV_FREQUENT_CHECK; 3475 EV_FREQUENT_CHECK;
3342 3502
3343 ev_io_stop (EV_A_ &w->io); 3503 ev_io_stop (EV_A_ &w->io);
3344 ev_prepare_stop (EV_A_ &w->prepare); 3504 ev_prepare_stop (EV_A_ &w->prepare);
3345 ev_fork_stop (EV_A_ &w->fork); 3505 ev_fork_stop (EV_A_ &w->fork);
3346 3506
3507 ev_stop (EV_A_ (W)w);
3508
3347 EV_FREQUENT_CHECK; 3509 EV_FREQUENT_CHECK;
3348} 3510}
3349#endif 3511#endif
3350 3512
3351#if EV_FORK_ENABLE 3513#if EV_FORK_ENABLE
3427 3589
3428void 3590void
3429ev_async_send (EV_P_ ev_async *w) 3591ev_async_send (EV_P_ ev_async *w)
3430{ 3592{
3431 w->sent = 1; 3593 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3594 evpipe_write (EV_A_ &async_pending);
3433} 3595}
3434#endif 3596#endif
3435 3597
3436/*****************************************************************************/ 3598/*****************************************************************************/
3437 3599
3477{ 3639{
3478 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3640 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3479 3641
3480 if (expect_false (!once)) 3642 if (expect_false (!once))
3481 { 3643 {
3482 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3644 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3483 return; 3645 return;
3484 } 3646 }
3485 3647
3486 once->cb = cb; 3648 once->cb = cb;
3487 once->arg = arg; 3649 once->arg = arg;
3574 if (types & EV_ASYNC) 3736 if (types & EV_ASYNC)
3575 for (i = asynccnt; i--; ) 3737 for (i = asynccnt; i--; )
3576 cb (EV_A_ EV_ASYNC, asyncs [i]); 3738 cb (EV_A_ EV_ASYNC, asyncs [i]);
3577#endif 3739#endif
3578 3740
3741#if EV_PREPARE_ENABLE
3579 if (types & EV_PREPARE) 3742 if (types & EV_PREPARE)
3580 for (i = preparecnt; i--; ) 3743 for (i = preparecnt; i--; )
3581#if EV_EMBED_ENABLE 3744# if EV_EMBED_ENABLE
3582 if (ev_cb (prepares [i]) != embed_prepare_cb) 3745 if (ev_cb (prepares [i]) != embed_prepare_cb)
3583#endif 3746# endif
3584 cb (EV_A_ EV_PREPARE, prepares [i]); 3747 cb (EV_A_ EV_PREPARE, prepares [i]);
3748#endif
3585 3749
3750#if EV_CHECK_ENABLE
3586 if (types & EV_CHECK) 3751 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3752 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3753 cb (EV_A_ EV_CHECK, checks [i]);
3754#endif
3589 3755
3756#if EV_SIGNAL_ENABLE
3590 if (types & EV_SIGNAL) 3757 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3758 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3759 for (wl = signals [i].head; wl; )
3593 { 3760 {
3594 wn = wl->next; 3761 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3762 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3763 wl = wn;
3597 } 3764 }
3765#endif
3598 3766
3767#if EV_CHILD_ENABLE
3599 if (types & EV_CHILD) 3768 if (types & EV_CHILD)
3600 for (i = EV_PID_HASHSIZE; i--; ) 3769 for (i = (EV_PID_HASHSIZE); i--; )
3601 for (wl = childs [i]; wl; ) 3770 for (wl = childs [i]; wl; )
3602 { 3771 {
3603 wn = wl->next; 3772 wn = wl->next;
3604 cb (EV_A_ EV_CHILD, wl); 3773 cb (EV_A_ EV_CHILD, wl);
3605 wl = wn; 3774 wl = wn;
3606 } 3775 }
3776#endif
3607/* EV_STAT 0x00001000 /* stat data changed */ 3777/* EV_STAT 0x00001000 /* stat data changed */
3608/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3778/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3609} 3779}
3610#endif 3780#endif
3611 3781

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines