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.344 by root, Fri Jul 9 20:55:14 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
95# else
96# undef EV_USE_SELECT
97# define EV_USE_SELECT 0
88# endif 98# endif
89 99
100# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 101# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 102# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
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
103# endif
104# endif 107# endif
105 108
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 110# ifndef EV_USE_EPOLL
109# else 111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
112# endif 116# endif
113 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 119# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
120# endif 125# endif
121 126
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 128# ifndef EV_USE_PORT
125# else 129# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 130# endif
131# else
132# undef EV_USE_PORT
133# define EV_USE_PORT 0
128# endif 134# endif
129 135
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 137# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 138# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 139# endif
140# else
141# undef EV_USE_INOTIFY
142# define EV_USE_INOTIFY 0
136# endif 143# endif
137 144
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1 146# ifndef EV_USE_SIGNALFD
141# else
142# define EV_USE_SIGNALFD 0 147# define EV_USE_SIGNALFD EV_FEATURE_OS
143# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
144# endif 152# endif
145 153
154# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 155# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD 1 156# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
152# endif 161# endif
153 162
154#endif 163#endif
155 164
156#include <math.h> 165#include <math.h>
157#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
158#include <fcntl.h> 168#include <fcntl.h>
159#include <stddef.h> 169#include <stddef.h>
160 170
161#include <stdio.h> 171#include <stdio.h>
162 172
163#include <assert.h> 173#include <assert.h>
164#include <errno.h> 174#include <errno.h>
165#include <sys/types.h> 175#include <sys/types.h>
166#include <time.h> 176#include <time.h>
177#include <limits.h>
167 178
168#include <signal.h> 179#include <signal.h>
169 180
170#ifdef EV_H 181#ifdef EV_H
171# include EV_H 182# include EV_H
182# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
183# include <windows.h> 194# include <windows.h>
184# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
185# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
186# endif 197# endif
198# undef EV_AVOID_STDIO
187#endif 199#endif
200
201/* OS X, in its infinite idiocy, actually HARDCODES
202 * a limit of 1024 into their select. Where people have brains,
203 * OS X engineers apparently have a vacuum. Or maybe they were
204 * ordered to have a vacuum, or they do anything for money.
205 * This might help. Or not.
206 */
207#define _DARWIN_UNLIMITED_SELECT 1
188 208
189/* this block tries to deduce configuration from header-defined symbols and defaults */ 209/* this block tries to deduce configuration from header-defined symbols and defaults */
190 210
191/* try to deduce the maximum number of signals on this platform */ 211/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG) 212#if defined (EV_NSIG)
204#elif defined (MAXSIG) 224#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1) 225# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG) 226#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1) 227# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE) 228#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */ 229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig) 230#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else 232#else
213# error "unable to find value for NSIG, please report" 233# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */ 234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
215# define EV_NSIG 64 236# define EV_NSIG 65
216#endif 237#endif
217 238
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 239#ifndef EV_USE_CLOCK_SYSCALL
226# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
227# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
228# else 242# else
229# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
230# endif 244# endif
231#endif 245#endif
232 246
233#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
234# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
235# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
236# else 250# else
237# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
238# endif 252# endif
239#endif 253#endif
240 254
242# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
243#endif 257#endif
244 258
245#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
246# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
247# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
248# else 262# else
249# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
250# endif 264# endif
251#endif 265#endif
252 266
253#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
254# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
255#endif 269#endif
256 270
257#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
258# ifdef _WIN32 272# ifdef _WIN32
259# define EV_USE_POLL 0 273# define EV_USE_POLL 0
260# else 274# else
261# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
262# endif 276# endif
263#endif 277#endif
264 278
265#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
266# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
267# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
268# else 282# else
269# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
270# endif 284# endif
271#endif 285#endif
272 286
278# define EV_USE_PORT 0 292# define EV_USE_PORT 0
279#endif 293#endif
280 294
281#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
282# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
283# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
284# else 298# else
285# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
286# endif 300# endif
287#endif 301#endif
288 302
289#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
290# if EV_MINIMAL 304# 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 305#endif
296 306
297#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
298# if EV_MINIMAL 308# 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 309#endif
304 310
305#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
306# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
307# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
308# else 314# else
309# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
310# endif 316# endif
311#endif 317#endif
312 318
313#ifndef EV_USE_SIGNALFD 319#ifndef EV_USE_SIGNALFD
314# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9)) 320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
315# define EV_USE_SIGNALFD 1 321# define EV_USE_SIGNALFD EV_FEATURE_OS
316# else 322# else
317# define EV_USE_SIGNALFD 0 323# define EV_USE_SIGNALFD 0
318# endif 324# endif
319#endif 325#endif
320 326
323# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
324# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
325#endif 331#endif
326 332
327#ifndef EV_VERIFY 333#ifndef EV_VERIFY
328# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
329#endif 335#endif
330 336
331#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
332# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
333#endif 339#endif
334 340
335#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
336# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
337#endif 343#endif
338 344
339/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 345/* 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. */ 346/* which makes programs even slower. might work on other unices, too. */
341#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
350# endif 356# endif
351#endif 357#endif
352 358
353/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 359/* this block fixes any misconfiguration where we know we run into trouble otherwise */
354 360
361#ifdef _AIX
362/* AIX has a completely broken poll.h header */
363# undef EV_USE_POLL
364# define EV_USE_POLL 0
365#endif
366
355#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
356# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
357# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
358#endif 370#endif
359 371
393# include <stdint.h> 405# include <stdint.h>
394# ifndef EFD_NONBLOCK 406# ifndef EFD_NONBLOCK
395# define EFD_NONBLOCK O_NONBLOCK 407# define EFD_NONBLOCK O_NONBLOCK
396# endif 408# endif
397# ifndef EFD_CLOEXEC 409# ifndef EFD_CLOEXEC
410# ifdef O_CLOEXEC
398# define EFD_CLOEXEC O_CLOEXEC 411# define EFD_CLOEXEC O_CLOEXEC
412# else
413# define EFD_CLOEXEC 02000000
414# endif
399# endif 415# endif
400# ifdef __cplusplus 416# ifdef __cplusplus
401extern "C" { 417extern "C" {
402# endif 418# endif
403int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
404# ifdef __cplusplus 420# ifdef __cplusplus
405} 421}
406# endif 422# endif
407#endif 423#endif
408 424
409#if EV_USE_SIGNALFD 425#if EV_USE_SIGNALFD
410# include <sys/signalfd.h> 426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h>
428# ifndef SFD_NONBLOCK
429# define SFD_NONBLOCK O_NONBLOCK
411#endif 430# endif
431# ifndef SFD_CLOEXEC
432# ifdef O_CLOEXEC
433# define SFD_CLOEXEC O_CLOEXEC
434# else
435# define SFD_CLOEXEC 02000000
436# endif
437# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags);
442
443struct signalfd_siginfo
444{
445 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)];
447};
448# ifdef __cplusplus
449}
450# endif
451#endif
452
412 453
413/**/ 454/**/
414 455
415#if EV_VERIFY >= 3 456#if EV_VERIFY >= 3
416# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 457# define EV_FREQUENT_CHECK ev_verify (EV_A)
417#else 458#else
418# define EV_FREQUENT_CHECK do { } while (0) 459# define EV_FREQUENT_CHECK do { } while (0)
419#endif 460#endif
420 461
421/* 462/*
428 */ 469 */
429#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
430 471
431#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 472#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) */ 473#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 474
435#if __GNUC__ >= 4 475#if __GNUC__ >= 4
436# define expect(expr,value) __builtin_expect ((expr),(value)) 476# define expect(expr,value) __builtin_expect ((expr),(value))
437# define noinline __attribute__ ((noinline)) 477# define noinline __attribute__ ((noinline))
438#else 478#else
445 485
446#define expect_false(expr) expect ((expr) != 0, 0) 486#define expect_false(expr) expect ((expr) != 0, 0)
447#define expect_true(expr) expect ((expr) != 0, 1) 487#define expect_true(expr) expect ((expr) != 0, 1)
448#define inline_size static inline 488#define inline_size static inline
449 489
450#if EV_MINIMAL 490#if EV_FEATURE_CODE
491# define inline_speed static inline
492#else
451# define inline_speed static noinline 493# define inline_speed static noinline
452#else
453# define inline_speed static inline
454#endif 494#endif
455 495
456#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 496#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
457 497
458#if EV_MINPRI == EV_MAXPRI 498#if EV_MINPRI == EV_MAXPRI
479 519
480#if EV_USE_MONOTONIC 520#if EV_USE_MONOTONIC
481static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 521static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
482#endif 522#endif
483 523
524#ifndef EV_FD_TO_WIN32_HANDLE
525# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
526#endif
527#ifndef EV_WIN32_HANDLE_TO_FD
528# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
529#endif
530#ifndef EV_WIN32_CLOSE_FD
531# define EV_WIN32_CLOSE_FD(fd) close (fd)
532#endif
533
484#ifdef _WIN32 534#ifdef _WIN32
485# include "ev_win32.c" 535# include "ev_win32.c"
486#endif 536#endif
487 537
488/*****************************************************************************/ 538/*****************************************************************************/
539
540#if EV_AVOID_STDIO
541static void noinline
542ev_printerr (const char *msg)
543{
544 write (STDERR_FILENO, msg, strlen (msg));
545}
546#endif
489 547
490static void (*syserr_cb)(const char *msg); 548static void (*syserr_cb)(const char *msg);
491 549
492void 550void
493ev_set_syserr_cb (void (*cb)(const char *msg)) 551ev_set_syserr_cb (void (*cb)(const char *msg))
503 561
504 if (syserr_cb) 562 if (syserr_cb)
505 syserr_cb (msg); 563 syserr_cb (msg);
506 else 564 else
507 { 565 {
566#if EV_AVOID_STDIO
567 const char *err = strerror (errno);
568
569 ev_printerr (msg);
570 ev_printerr (": ");
571 ev_printerr (err);
572 ev_printerr ("\n");
573#else
508 perror (msg); 574 perror (msg);
575#endif
509 abort (); 576 abort ();
510 } 577 }
511} 578}
512 579
513static void * 580static void *
514ev_realloc_emul (void *ptr, long size) 581ev_realloc_emul (void *ptr, long size)
515{ 582{
583#if __GLIBC__
584 return realloc (ptr, size);
585#else
516 /* some systems, notably openbsd and darwin, fail to properly 586 /* some systems, notably openbsd and darwin, fail to properly
517 * implement realloc (x, 0) (as required by both ansi c-98 and 587 * implement realloc (x, 0) (as required by both ansi c-89 and
518 * the single unix specification, so work around them here. 588 * the single unix specification, so work around them here.
519 */ 589 */
520 590
521 if (size) 591 if (size)
522 return realloc (ptr, size); 592 return realloc (ptr, size);
523 593
524 free (ptr); 594 free (ptr);
525 return 0; 595 return 0;
596#endif
526} 597}
527 598
528static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 599static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
529 600
530void 601void
538{ 609{
539 ptr = alloc (ptr, size); 610 ptr = alloc (ptr, size);
540 611
541 if (!ptr && size) 612 if (!ptr && size)
542 { 613 {
614#if EV_AVOID_STDIO
615 ev_printerr ("libev: memory allocation failed, aborting.\n");
616#else
543 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 617 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
618#endif
544 abort (); 619 abort ();
545 } 620 }
546 621
547 return ptr; 622 return ptr;
548} 623}
630 705
631 static int ev_default_loop_ptr; 706 static int ev_default_loop_ptr;
632 707
633#endif 708#endif
634 709
635#if EV_MINIMAL < 2 710#if EV_FEATURE_API
636# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 711# 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) 712# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
638# define EV_INVOKE_PENDING invoke_cb (EV_A) 713# define EV_INVOKE_PENDING invoke_cb (EV_A)
639#else 714#else
640# define EV_RELEASE_CB (void)0 715# define EV_RELEASE_CB (void)0
825} 900}
826 901
827/*****************************************************************************/ 902/*****************************************************************************/
828 903
829inline_speed void 904inline_speed void
830fd_event_nc (EV_P_ int fd, int revents) 905fd_event_nocheck (EV_P_ int fd, int revents)
831{ 906{
832 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
833 ev_io *w; 908 ev_io *w;
834 909
835 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 910 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
847fd_event (EV_P_ int fd, int revents) 922fd_event (EV_P_ int fd, int revents)
848{ 923{
849 ANFD *anfd = anfds + fd; 924 ANFD *anfd = anfds + fd;
850 925
851 if (expect_true (!anfd->reify)) 926 if (expect_true (!anfd->reify))
852 fd_event_nc (EV_A_ fd, revents); 927 fd_event_nocheck (EV_A_ fd, revents);
853} 928}
854 929
855void 930void
856ev_feed_fd_event (EV_P_ int fd, int revents) 931ev_feed_fd_event (EV_P_ int fd, int revents)
857{ 932{
858 if (fd >= 0 && fd < anfdmax) 933 if (fd >= 0 && fd < anfdmax)
859 fd_event_nc (EV_A_ fd, revents); 934 fd_event_nocheck (EV_A_ fd, revents);
860} 935}
861 936
862/* make sure the external fd watch events are in-sync */ 937/* make sure the external fd watch events are in-sync */
863/* with the kernel/libev internal state */ 938/* with the kernel/libev internal state */
864inline_size void 939inline_size void
879 954
880#if EV_SELECT_IS_WINSOCKET 955#if EV_SELECT_IS_WINSOCKET
881 if (events) 956 if (events)
882 { 957 {
883 unsigned long arg; 958 unsigned long arg;
884 #ifdef EV_FD_TO_WIN32_HANDLE
885 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 959 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)); 960 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
890 } 961 }
891#endif 962#endif
892 963
893 { 964 {
931 ev_io_stop (EV_A_ w); 1002 ev_io_stop (EV_A_ w);
932 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1003 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
933 } 1004 }
934} 1005}
935 1006
936/* check whether the given fd is atcually valid, for error recovery */ 1007/* check whether the given fd is actually valid, for error recovery */
937inline_size int 1008inline_size int
938fd_valid (int fd) 1009fd_valid (int fd)
939{ 1010{
940#ifdef _WIN32 1011#ifdef _WIN32
941 return _get_osfhandle (fd) != -1; 1012 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
942#else 1013#else
943 return fcntl (fd, F_GETFD) != -1; 1014 return fcntl (fd, F_GETFD) != -1;
944#endif 1015#endif
945} 1016}
946 1017
964 1035
965 for (fd = anfdmax; fd--; ) 1036 for (fd = anfdmax; fd--; )
966 if (anfds [fd].events) 1037 if (anfds [fd].events)
967 { 1038 {
968 fd_kill (EV_A_ fd); 1039 fd_kill (EV_A_ fd);
969 return; 1040 break;
970 } 1041 }
971} 1042}
972 1043
973/* usually called after fork if backend needs to re-arm all fds from scratch */ 1044/* usually called after fork if backend needs to re-arm all fds from scratch */
974static void noinline 1045static void noinline
981 { 1052 {
982 anfds [fd].events = 0; 1053 anfds [fd].events = 0;
983 anfds [fd].emask = 0; 1054 anfds [fd].emask = 0;
984 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1055 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
985 } 1056 }
1057}
1058
1059/* used to prepare libev internal fd's */
1060/* this is not fork-safe */
1061inline_speed void
1062fd_intern (int fd)
1063{
1064#ifdef _WIN32
1065 unsigned long arg = 1;
1066 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1067#else
1068 fcntl (fd, F_SETFD, FD_CLOEXEC);
1069 fcntl (fd, F_SETFL, O_NONBLOCK);
1070#endif
986} 1071}
987 1072
988/*****************************************************************************/ 1073/*****************************************************************************/
989 1074
990/* 1075/*
1064 1149
1065 for (;;) 1150 for (;;)
1066 { 1151 {
1067 int c = k << 1; 1152 int c = k << 1;
1068 1153
1069 if (c > N + HEAP0 - 1) 1154 if (c >= N + HEAP0)
1070 break; 1155 break;
1071 1156
1072 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1157 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1073 ? 1 : 0; 1158 ? 1 : 0;
1074 1159
1110 1195
1111/* move an element suitably so it is in a correct place */ 1196/* move an element suitably so it is in a correct place */
1112inline_size void 1197inline_size void
1113adjustheap (ANHE *heap, int N, int k) 1198adjustheap (ANHE *heap, int N, int k)
1114{ 1199{
1115 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1200 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1116 upheap (heap, k); 1201 upheap (heap, k);
1117 else 1202 else
1118 downheap (heap, N, k); 1203 downheap (heap, N, k);
1119} 1204}
1120 1205
1133/*****************************************************************************/ 1218/*****************************************************************************/
1134 1219
1135/* associate signal watchers to a signal signal */ 1220/* associate signal watchers to a signal signal */
1136typedef struct 1221typedef struct
1137{ 1222{
1223 EV_ATOMIC_T pending;
1224#if EV_MULTIPLICITY
1225 EV_P;
1226#endif
1138 WL head; 1227 WL head;
1139 EV_ATOMIC_T gotsig;
1140} ANSIG; 1228} ANSIG;
1141 1229
1142static ANSIG *signals; 1230static ANSIG signals [EV_NSIG - 1];
1143static int signalmax;
1144
1145static EV_ATOMIC_T gotsig;
1146 1231
1147/*****************************************************************************/ 1232/*****************************************************************************/
1148 1233
1149/* used to prepare libev internal fd's */ 1234#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 1235
1163static void noinline 1236static void noinline
1164evpipe_init (EV_P) 1237evpipe_init (EV_P)
1165{ 1238{
1166 if (!ev_is_active (&pipe_w)) 1239 if (!ev_is_active (&pipe_w))
1167 { 1240 {
1168#if EV_USE_EVENTFD 1241# if EV_USE_EVENTFD
1169 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC); 1242 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1170 if (evfd < 0 && errno == EINVAL) 1243 if (evfd < 0 && errno == EINVAL)
1171 evfd = eventfd (0, 0); 1244 evfd = eventfd (0, 0);
1172 1245
1173 if (evfd >= 0) 1246 if (evfd >= 0)
1175 evpipe [0] = -1; 1248 evpipe [0] = -1;
1176 fd_intern (evfd); /* doing it twice doesn't hurt */ 1249 fd_intern (evfd); /* doing it twice doesn't hurt */
1177 ev_io_set (&pipe_w, evfd, EV_READ); 1250 ev_io_set (&pipe_w, evfd, EV_READ);
1178 } 1251 }
1179 else 1252 else
1180#endif 1253# endif
1181 { 1254 {
1182 while (pipe (evpipe)) 1255 while (pipe (evpipe))
1183 ev_syserr ("(libev) error creating signal/async pipe"); 1256 ev_syserr ("(libev) error creating signal/async pipe");
1184 1257
1185 fd_intern (evpipe [0]); 1258 fd_intern (evpipe [0]);
1196evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1269evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1197{ 1270{
1198 if (!*flag) 1271 if (!*flag)
1199 { 1272 {
1200 int old_errno = errno; /* save errno because write might clobber it */ 1273 int old_errno = errno; /* save errno because write might clobber it */
1274 char dummy;
1201 1275
1202 *flag = 1; 1276 *flag = 1;
1203 1277
1204#if EV_USE_EVENTFD 1278#if EV_USE_EVENTFD
1205 if (evfd >= 0) 1279 if (evfd >= 0)
1207 uint64_t counter = 1; 1281 uint64_t counter = 1;
1208 write (evfd, &counter, sizeof (uint64_t)); 1282 write (evfd, &counter, sizeof (uint64_t));
1209 } 1283 }
1210 else 1284 else
1211#endif 1285#endif
1212 write (evpipe [1], &old_errno, 1); 1286 write (evpipe [1], &dummy, 1);
1213 1287
1214 errno = old_errno; 1288 errno = old_errno;
1215 } 1289 }
1216} 1290}
1217 1291
1218/* called whenever the libev signal pipe */ 1292/* called whenever the libev signal pipe */
1219/* got some events (signal, async) */ 1293/* got some events (signal, async) */
1220static void 1294static void
1221pipecb (EV_P_ ev_io *iow, int revents) 1295pipecb (EV_P_ ev_io *iow, int revents)
1222{ 1296{
1297 int i;
1298
1223#if EV_USE_EVENTFD 1299#if EV_USE_EVENTFD
1224 if (evfd >= 0) 1300 if (evfd >= 0)
1225 { 1301 {
1226 uint64_t counter; 1302 uint64_t counter;
1227 read (evfd, &counter, sizeof (uint64_t)); 1303 read (evfd, &counter, sizeof (uint64_t));
1231 { 1307 {
1232 char dummy; 1308 char dummy;
1233 read (evpipe [0], &dummy, 1); 1309 read (evpipe [0], &dummy, 1);
1234 } 1310 }
1235 1311
1236 if (gotsig && ev_is_default_loop (EV_A)) 1312 if (sig_pending)
1237 { 1313 {
1238 int signum; 1314 sig_pending = 0;
1239 gotsig = 0;
1240 1315
1241 for (signum = signalmax; signum--; ) 1316 for (i = EV_NSIG - 1; i--; )
1242 if (signals [signum].gotsig) 1317 if (expect_false (signals [i].pending))
1243 ev_feed_signal_event (EV_A_ signum + 1); 1318 ev_feed_signal_event (EV_A_ i + 1);
1244 } 1319 }
1245 1320
1246#if EV_ASYNC_ENABLE 1321#if EV_ASYNC_ENABLE
1247 if (gotasync) 1322 if (async_pending)
1248 { 1323 {
1249 int i; 1324 async_pending = 0;
1250 gotasync = 0;
1251 1325
1252 for (i = asynccnt; i--; ) 1326 for (i = asynccnt; i--; )
1253 if (asyncs [i]->sent) 1327 if (asyncs [i]->sent)
1254 { 1328 {
1255 asyncs [i]->sent = 0; 1329 asyncs [i]->sent = 0;
1263 1337
1264static void 1338static void
1265ev_sighandler (int signum) 1339ev_sighandler (int signum)
1266{ 1340{
1267#if EV_MULTIPLICITY 1341#if EV_MULTIPLICITY
1268 struct ev_loop *loop = &default_loop_struct; 1342 EV_P = signals [signum - 1].loop;
1269#endif 1343#endif
1270 1344
1271#if _WIN32 1345#ifdef _WIN32
1272 signal (signum, ev_sighandler); 1346 signal (signum, ev_sighandler);
1273#endif 1347#endif
1274 1348
1275 signals [signum - 1].gotsig = 1; 1349 signals [signum - 1].pending = 1;
1276 evpipe_write (EV_A_ &gotsig); 1350 evpipe_write (EV_A_ &sig_pending);
1277} 1351}
1278 1352
1279void noinline 1353void noinline
1280ev_feed_signal_event (EV_P_ int signum) 1354ev_feed_signal_event (EV_P_ int signum)
1281{ 1355{
1282 WL w; 1356 WL w;
1283 1357
1358 if (expect_false (signum <= 0 || signum > EV_NSIG))
1359 return;
1360
1361 --signum;
1362
1284#if EV_MULTIPLICITY 1363#if EV_MULTIPLICITY
1285 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1364 /* it is permissible to try to feed a signal to the wrong loop */
1286#endif 1365 /* or, likely more useful, feeding a signal nobody is waiting for */
1287 1366
1288 --signum; 1367 if (expect_false (signals [signum].loop != EV_A))
1289
1290 if (signum < 0 || signum >= signalmax)
1291 return; 1368 return;
1369#endif
1292 1370
1293 signals [signum].gotsig = 0; 1371 signals [signum].pending = 0;
1294 1372
1295 for (w = signals [signum].head; w; w = w->next) 1373 for (w = signals [signum].head; w; w = w->next)
1296 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1374 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1297} 1375}
1298 1376
1299#if EV_USE_SIGNALFD 1377#if EV_USE_SIGNALFD
1300static void 1378static void
1301sigfdcb (EV_P_ ev_io *iow, int revents) 1379sigfdcb (EV_P_ ev_io *iow, int revents)
1302{ 1380{
1303 struct signalfd_siginfo si[4], *sip; 1381 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1304 1382
1305 for (;;) 1383 for (;;)
1306 { 1384 {
1307 ssize_t res = read (sigfd, si, sizeof (si)); 1385 ssize_t res = read (sigfd, si, sizeof (si));
1308 1386
1314 break; 1392 break;
1315 } 1393 }
1316} 1394}
1317#endif 1395#endif
1318 1396
1397#endif
1398
1319/*****************************************************************************/ 1399/*****************************************************************************/
1320 1400
1401#if EV_CHILD_ENABLE
1321static WL childs [EV_PID_HASHSIZE]; 1402static WL childs [EV_PID_HASHSIZE];
1322
1323#ifndef _WIN32
1324 1403
1325static ev_signal childev; 1404static ev_signal childev;
1326 1405
1327#ifndef WIFCONTINUED 1406#ifndef WIFCONTINUED
1328# define WIFCONTINUED(status) 0 1407# define WIFCONTINUED(status) 0
1333child_reap (EV_P_ int chain, int pid, int status) 1412child_reap (EV_P_ int chain, int pid, int status)
1334{ 1413{
1335 ev_child *w; 1414 ev_child *w;
1336 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1415 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1337 1416
1338 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1417 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1339 { 1418 {
1340 if ((w->pid == pid || !w->pid) 1419 if ((w->pid == pid || !w->pid)
1341 && (!traced || (w->flags & 1))) 1420 && (!traced || (w->flags & 1)))
1342 { 1421 {
1343 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1422 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 */ 1447 /* 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 */ 1448 /* 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); 1449 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1371 1450
1372 child_reap (EV_A_ pid, pid, status); 1451 child_reap (EV_A_ pid, pid, status);
1373 if (EV_PID_HASHSIZE > 1) 1452 if ((EV_PID_HASHSIZE) > 1)
1374 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1453 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1375} 1454}
1376 1455
1377#endif 1456#endif
1378 1457
1445#ifdef __APPLE__ 1524#ifdef __APPLE__
1446 /* only select works correctly on that "unix-certified" platform */ 1525 /* only select works correctly on that "unix-certified" platform */
1447 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1526 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1448 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1527 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1449#endif 1528#endif
1529#ifdef __FreeBSD__
1530 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1531#endif
1450 1532
1451 return flags; 1533 return flags;
1452} 1534}
1453 1535
1454unsigned int 1536unsigned int
1467ev_backend (EV_P) 1549ev_backend (EV_P)
1468{ 1550{
1469 return backend; 1551 return backend;
1470} 1552}
1471 1553
1472#if EV_MINIMAL < 2 1554#if EV_FEATURE_API
1473unsigned int 1555unsigned int
1474ev_loop_count (EV_P) 1556ev_iteration (EV_P)
1475{ 1557{
1476 return loop_count; 1558 return loop_count;
1477} 1559}
1478 1560
1479unsigned int 1561unsigned int
1480ev_loop_depth (EV_P) 1562ev_depth (EV_P)
1481{ 1563{
1482 return loop_depth; 1564 return loop_depth;
1483} 1565}
1484 1566
1485void 1567void
1542 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1624 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1543 have_monotonic = 1; 1625 have_monotonic = 1;
1544 } 1626 }
1545#endif 1627#endif
1546 1628
1629 /* pid check not overridable via env */
1630#ifndef _WIN32
1631 if (flags & EVFLAG_FORKCHECK)
1632 curpid = getpid ();
1633#endif
1634
1635 if (!(flags & EVFLAG_NOENV)
1636 && !enable_secure ()
1637 && getenv ("LIBEV_FLAGS"))
1638 flags = atoi (getenv ("LIBEV_FLAGS"));
1639
1547 ev_rt_now = ev_time (); 1640 ev_rt_now = ev_time ();
1548 mn_now = get_clock (); 1641 mn_now = get_clock ();
1549 now_floor = mn_now; 1642 now_floor = mn_now;
1550 rtmn_diff = ev_rt_now - mn_now; 1643 rtmn_diff = ev_rt_now - mn_now;
1551#if EV_MINIMAL < 2 1644#if EV_FEATURE_API
1552 invoke_cb = ev_invoke_pending; 1645 invoke_cb = ev_invoke_pending;
1553#endif 1646#endif
1554 1647
1555 io_blocktime = 0.; 1648 io_blocktime = 0.;
1556 timeout_blocktime = 0.; 1649 timeout_blocktime = 0.;
1557 backend = 0; 1650 backend = 0;
1558 backend_fd = -1; 1651 backend_fd = -1;
1559 gotasync = 0; 1652 sig_pending = 0;
1653#if EV_ASYNC_ENABLE
1654 async_pending = 0;
1655#endif
1560#if EV_USE_INOTIFY 1656#if EV_USE_INOTIFY
1561 fs_fd = -2; 1657 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1562#endif 1658#endif
1563#if EV_USE_SIGNALFD 1659#if EV_USE_SIGNALFD
1564 sigfd = -2; 1660 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1565#endif 1661#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 1662
1578 if (!(flags & 0x0000ffffU)) 1663 if (!(flags & 0x0000ffffU))
1579 flags |= ev_recommended_backends (); 1664 flags |= ev_recommended_backends ();
1580 1665
1581#if EV_USE_PORT 1666#if EV_USE_PORT
1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1679 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1595#endif 1680#endif
1596 1681
1597 ev_prepare_init (&pending_w, pendingcb); 1682 ev_prepare_init (&pending_w, pendingcb);
1598 1683
1684#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1599 ev_init (&pipe_w, pipecb); 1685 ev_init (&pipe_w, pipecb);
1600 ev_set_priority (&pipe_w, EV_MAXPRI); 1686 ev_set_priority (&pipe_w, EV_MAXPRI);
1687#endif
1601 } 1688 }
1602} 1689}
1603 1690
1604/* free up a loop structure */ 1691/* free up a loop structure */
1605static void noinline 1692static void noinline
1617 close (evfd); 1704 close (evfd);
1618#endif 1705#endif
1619 1706
1620 if (evpipe [0] >= 0) 1707 if (evpipe [0] >= 0)
1621 { 1708 {
1622 close (evpipe [0]); 1709 EV_WIN32_CLOSE_FD (evpipe [0]);
1623 close (evpipe [1]); 1710 EV_WIN32_CLOSE_FD (evpipe [1]);
1624 } 1711 }
1625 } 1712 }
1626 1713
1627#if EV_USE_SIGNALFD 1714#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w)) 1715 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd); 1716 close (sigfd);
1634 }
1635#endif 1717#endif
1636 1718
1637#if EV_USE_INOTIFY 1719#if EV_USE_INOTIFY
1638 if (fs_fd >= 0) 1720 if (fs_fd >= 0)
1639 close (fs_fd); 1721 close (fs_fd);
1709 1791
1710 if (ev_is_active (&pipe_w)) 1792 if (ev_is_active (&pipe_w))
1711 { 1793 {
1712 /* this "locks" the handlers against writing to the pipe */ 1794 /* this "locks" the handlers against writing to the pipe */
1713 /* while we modify the fd vars */ 1795 /* while we modify the fd vars */
1714 gotsig = 1; 1796 sig_pending = 1;
1715#if EV_ASYNC_ENABLE 1797#if EV_ASYNC_ENABLE
1716 gotasync = 1; 1798 async_pending = 1;
1717#endif 1799#endif
1718 1800
1719 ev_ref (EV_A); 1801 ev_ref (EV_A);
1720 ev_io_stop (EV_A_ &pipe_w); 1802 ev_io_stop (EV_A_ &pipe_w);
1721 1803
1724 close (evfd); 1806 close (evfd);
1725#endif 1807#endif
1726 1808
1727 if (evpipe [0] >= 0) 1809 if (evpipe [0] >= 0)
1728 { 1810 {
1729 close (evpipe [0]); 1811 EV_WIN32_CLOSE_FD (evpipe [0]);
1730 close (evpipe [1]); 1812 EV_WIN32_CLOSE_FD (evpipe [1]);
1731 } 1813 }
1732 1814
1815#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1733 evpipe_init (EV_A); 1816 evpipe_init (EV_A);
1734 /* now iterate over everything, in case we missed something */ 1817 /* now iterate over everything, in case we missed something */
1735 pipecb (EV_A_ &pipe_w, EV_READ); 1818 pipecb (EV_A_ &pipe_w, EV_READ);
1819#endif
1736 } 1820 }
1737 1821
1738 postfork = 0; 1822 postfork = 0;
1739} 1823}
1740 1824
1741#if EV_MULTIPLICITY 1825#if EV_MULTIPLICITY
1742 1826
1743struct ev_loop * 1827struct ev_loop *
1744ev_loop_new (unsigned int flags) 1828ev_loop_new (unsigned int flags)
1745{ 1829{
1746 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1830 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1747 1831
1748 memset (loop, 0, sizeof (struct ev_loop)); 1832 memset (EV_A, 0, sizeof (struct ev_loop));
1749 loop_init (EV_A_ flags); 1833 loop_init (EV_A_ flags);
1750 1834
1751 if (ev_backend (EV_A)) 1835 if (ev_backend (EV_A))
1752 return loop; 1836 return EV_A;
1753 1837
1754 return 0; 1838 return 0;
1755} 1839}
1756 1840
1757void 1841void
1802 verify_watcher (EV_A_ ws [cnt]); 1886 verify_watcher (EV_A_ ws [cnt]);
1803 } 1887 }
1804} 1888}
1805#endif 1889#endif
1806 1890
1807#if EV_MINIMAL < 2 1891#if EV_FEATURE_API
1808void 1892void
1809ev_loop_verify (EV_P) 1893ev_verify (EV_P)
1810{ 1894{
1811#if EV_VERIFY 1895#if EV_VERIFY
1812 int i; 1896 int i;
1813 WL w; 1897 WL w;
1814 1898
1853#if EV_ASYNC_ENABLE 1937#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt); 1938 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt); 1939 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif 1940#endif
1857 1941
1942#if EV_PREPARE_ENABLE
1858 assert (preparemax >= preparecnt); 1943 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt); 1944 array_verify (EV_A_ (W *)prepares, preparecnt);
1945#endif
1860 1946
1947#if EV_CHECK_ENABLE
1861 assert (checkmax >= checkcnt); 1948 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt); 1949 array_verify (EV_A_ (W *)checks, checkcnt);
1950#endif
1863 1951
1864# if 0 1952# if 0
1953#if EV_CHILD_ENABLE
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1954 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) 1955 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1956#endif
1867# endif 1957# endif
1868#endif 1958#endif
1869} 1959}
1870#endif 1960#endif
1871 1961
1878#endif 1968#endif
1879{ 1969{
1880 if (!ev_default_loop_ptr) 1970 if (!ev_default_loop_ptr)
1881 { 1971 {
1882#if EV_MULTIPLICITY 1972#if EV_MULTIPLICITY
1883 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1973 EV_P = ev_default_loop_ptr = &default_loop_struct;
1884#else 1974#else
1885 ev_default_loop_ptr = 1; 1975 ev_default_loop_ptr = 1;
1886#endif 1976#endif
1887 1977
1888 loop_init (EV_A_ flags); 1978 loop_init (EV_A_ flags);
1889 1979
1890 if (ev_backend (EV_A)) 1980 if (ev_backend (EV_A))
1891 { 1981 {
1892#ifndef _WIN32 1982#if EV_CHILD_ENABLE
1893 ev_signal_init (&childev, childcb, SIGCHLD); 1983 ev_signal_init (&childev, childcb, SIGCHLD);
1894 ev_set_priority (&childev, EV_MAXPRI); 1984 ev_set_priority (&childev, EV_MAXPRI);
1895 ev_signal_start (EV_A_ &childev); 1985 ev_signal_start (EV_A_ &childev);
1896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1986 ev_unref (EV_A); /* child watcher should not keep loop alive */
1897#endif 1987#endif
1905 1995
1906void 1996void
1907ev_default_destroy (void) 1997ev_default_destroy (void)
1908{ 1998{
1909#if EV_MULTIPLICITY 1999#if EV_MULTIPLICITY
1910 struct ev_loop *loop = ev_default_loop_ptr; 2000 EV_P = ev_default_loop_ptr;
1911#endif 2001#endif
1912 2002
1913 ev_default_loop_ptr = 0; 2003 ev_default_loop_ptr = 0;
1914 2004
1915#ifndef _WIN32 2005#if EV_CHILD_ENABLE
1916 ev_ref (EV_A); /* child watcher */ 2006 ev_ref (EV_A); /* child watcher */
1917 ev_signal_stop (EV_A_ &childev); 2007 ev_signal_stop (EV_A_ &childev);
1918#endif 2008#endif
1919 2009
1920 loop_destroy (EV_A); 2010 loop_destroy (EV_A);
1922 2012
1923void 2013void
1924ev_default_fork (void) 2014ev_default_fork (void)
1925{ 2015{
1926#if EV_MULTIPLICITY 2016#if EV_MULTIPLICITY
1927 struct ev_loop *loop = ev_default_loop_ptr; 2017 EV_P = ev_default_loop_ptr;
1928#endif 2018#endif
1929 2019
1930 postfork = 1; /* must be in line with ev_loop_fork */ 2020 postfork = 1; /* must be in line with ev_loop_fork */
1931} 2021}
1932 2022
2026 EV_FREQUENT_CHECK; 2116 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w); 2117 feed_reverse (EV_A_ (W)w);
2028 } 2118 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2119 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030 2120
2031 feed_reverse_done (EV_A_ EV_TIMEOUT); 2121 feed_reverse_done (EV_A_ EV_TIMER);
2032 } 2122 }
2033} 2123}
2034 2124
2035#if EV_PERIODIC_ENABLE 2125#if EV_PERIODIC_ENABLE
2036/* make periodics pending */ 2126/* make periodics pending */
2127 ANHE_at_cache (*he); 2217 ANHE_at_cache (*he);
2128 } 2218 }
2129} 2219}
2130 2220
2131/* fetch new monotonic and realtime times from the kernel */ 2221/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */ 2222/* also detect if there was a timejump, and act accordingly */
2133inline_speed void 2223inline_speed void
2134time_update (EV_P_ ev_tstamp max_block) 2224time_update (EV_P_ ev_tstamp max_block)
2135{ 2225{
2136#if EV_USE_MONOTONIC 2226#if EV_USE_MONOTONIC
2137 if (expect_true (have_monotonic)) 2227 if (expect_true (have_monotonic))
2197} 2287}
2198 2288
2199void 2289void
2200ev_loop (EV_P_ int flags) 2290ev_loop (EV_P_ int flags)
2201{ 2291{
2202#if EV_MINIMAL < 2 2292#if EV_FEATURE_API
2203 ++loop_depth; 2293 ++loop_depth;
2204#endif 2294#endif
2205 2295
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2296 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207 2297
2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2300 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2211 2301
2212 do 2302 do
2213 { 2303 {
2214#if EV_VERIFY >= 2 2304#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A); 2305 ev_verify (EV_A);
2216#endif 2306#endif
2217 2307
2218#ifndef _WIN32 2308#ifndef _WIN32
2219 if (expect_false (curpid)) /* penalise the forking check even more */ 2309 if (expect_false (curpid)) /* penalise the forking check even more */
2220 if (expect_false (getpid () != curpid)) 2310 if (expect_false (getpid () != curpid))
2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2322 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2233 EV_INVOKE_PENDING; 2323 EV_INVOKE_PENDING;
2234 } 2324 }
2235#endif 2325#endif
2236 2326
2327#if EV_PREPARE_ENABLE
2237 /* queue prepare watchers (and execute them) */ 2328 /* queue prepare watchers (and execute them) */
2238 if (expect_false (preparecnt)) 2329 if (expect_false (preparecnt))
2239 { 2330 {
2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2331 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2241 EV_INVOKE_PENDING; 2332 EV_INVOKE_PENDING;
2242 } 2333 }
2334#endif
2243 2335
2244 if (expect_false (loop_done)) 2336 if (expect_false (loop_done))
2245 break; 2337 break;
2246 2338
2247 /* we might have forked, so reify kernel state if necessary */ 2339 /* we might have forked, so reify kernel state if necessary */
2298 waittime -= sleeptime; 2390 waittime -= sleeptime;
2299 } 2391 }
2300 } 2392 }
2301 } 2393 }
2302 2394
2303#if EV_MINIMAL < 2 2395#if EV_FEATURE_API
2304 ++loop_count; 2396 ++loop_count;
2305#endif 2397#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2398 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2307 backend_poll (EV_A_ waittime); 2399 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2400 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2320#if EV_IDLE_ENABLE 2412#if EV_IDLE_ENABLE
2321 /* queue idle watchers unless other events are pending */ 2413 /* queue idle watchers unless other events are pending */
2322 idle_reify (EV_A); 2414 idle_reify (EV_A);
2323#endif 2415#endif
2324 2416
2417#if EV_CHECK_ENABLE
2325 /* queue check watchers, to be executed first */ 2418 /* queue check watchers, to be executed first */
2326 if (expect_false (checkcnt)) 2419 if (expect_false (checkcnt))
2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2420 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2421#endif
2328 2422
2329 EV_INVOKE_PENDING; 2423 EV_INVOKE_PENDING;
2330 } 2424 }
2331 while (expect_true ( 2425 while (expect_true (
2332 activecnt 2426 activecnt
2335 )); 2429 ));
2336 2430
2337 if (loop_done == EVUNLOOP_ONE) 2431 if (loop_done == EVUNLOOP_ONE)
2338 loop_done = EVUNLOOP_CANCEL; 2432 loop_done = EVUNLOOP_CANCEL;
2339 2433
2340#if EV_MINIMAL < 2 2434#if EV_FEATURE_API
2341 --loop_depth; 2435 --loop_depth;
2342#endif 2436#endif
2343} 2437}
2344 2438
2345void 2439void
2398inline_size void 2492inline_size void
2399wlist_del (WL *head, WL elem) 2493wlist_del (WL *head, WL elem)
2400{ 2494{
2401 while (*head) 2495 while (*head)
2402 { 2496 {
2403 if (*head == elem) 2497 if (expect_true (*head == elem))
2404 { 2498 {
2405 *head = elem->next; 2499 *head = elem->next;
2406 return; 2500 break;
2407 } 2501 }
2408 2502
2409 head = &(*head)->next; 2503 head = &(*head)->next;
2410 } 2504 }
2411} 2505}
2471 2565
2472 if (expect_false (ev_is_active (w))) 2566 if (expect_false (ev_is_active (w)))
2473 return; 2567 return;
2474 2568
2475 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2569 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)))); 2570 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477 2571
2478 EV_FREQUENT_CHECK; 2572 EV_FREQUENT_CHECK;
2479 2573
2480 ev_start (EV_A_ (W)w, 1); 2574 ev_start (EV_A_ (W)w, 1);
2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2575 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2551 timers [active] = timers [timercnt + HEAP0]; 2645 timers [active] = timers [timercnt + HEAP0];
2552 adjustheap (timers, timercnt, active); 2646 adjustheap (timers, timercnt, active);
2553 } 2647 }
2554 } 2648 }
2555 2649
2556 EV_FREQUENT_CHECK;
2557
2558 ev_at (w) -= mn_now; 2650 ev_at (w) -= mn_now;
2559 2651
2560 ev_stop (EV_A_ (W)w); 2652 ev_stop (EV_A_ (W)w);
2653
2654 EV_FREQUENT_CHECK;
2561} 2655}
2562 2656
2563void noinline 2657void noinline
2564ev_timer_again (EV_P_ ev_timer *w) 2658ev_timer_again (EV_P_ ev_timer *w)
2565{ 2659{
2644 periodics [active] = periodics [periodiccnt + HEAP0]; 2738 periodics [active] = periodics [periodiccnt + HEAP0];
2645 adjustheap (periodics, periodiccnt, active); 2739 adjustheap (periodics, periodiccnt, active);
2646 } 2740 }
2647 } 2741 }
2648 2742
2649 EV_FREQUENT_CHECK;
2650
2651 ev_stop (EV_A_ (W)w); 2743 ev_stop (EV_A_ (W)w);
2744
2745 EV_FREQUENT_CHECK;
2652} 2746}
2653 2747
2654void noinline 2748void noinline
2655ev_periodic_again (EV_P_ ev_periodic *w) 2749ev_periodic_again (EV_P_ ev_periodic *w)
2656{ 2750{
2662 2756
2663#ifndef SA_RESTART 2757#ifndef SA_RESTART
2664# define SA_RESTART 0 2758# define SA_RESTART 0
2665#endif 2759#endif
2666 2760
2761#if EV_SIGNAL_ENABLE
2762
2667void noinline 2763void noinline
2668ev_signal_start (EV_P_ ev_signal *w) 2764ev_signal_start (EV_P_ ev_signal *w)
2669{ 2765{
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))) 2766 if (expect_false (ev_is_active (w)))
2674 return; 2767 return;
2675 2768
2676 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2769 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2770
2771#if EV_MULTIPLICITY
2772 assert (("libev: a signal must not be attached to two different loops",
2773 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2774
2775 signals [w->signum - 1].loop = EV_A;
2776#endif
2677 2777
2678 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2679 2779
2680#if EV_USE_SIGNALFD 2780#if EV_USE_SIGNALFD
2681 if (sigfd == -2) 2781 if (sigfd == -2)
2703 sigaddset (&sigfd_set, w->signum); 2803 sigaddset (&sigfd_set, w->signum);
2704 sigprocmask (SIG_BLOCK, &sigfd_set, 0); 2804 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2705 2805
2706 signalfd (sigfd, &sigfd_set, 0); 2806 signalfd (sigfd, &sigfd_set, 0);
2707 } 2807 }
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 2808#endif
2725 sigdelset (&prev, w->signum);
2726 sigprocmask (SIG_SETMASK, &prev, 0);
2727#endif
2728 }
2729 2809
2730 ev_start (EV_A_ (W)w, 1); 2810 ev_start (EV_A_ (W)w, 1);
2731 wlist_add (&signals [w->signum - 1].head, (WL)w); 2811 wlist_add (&signals [w->signum - 1].head, (WL)w);
2732 2812
2733 if (!((WL)w)->next) 2813 if (!((WL)w)->next)
2734 {
2735#if _WIN32
2736 signal (w->signum, ev_sighandler);
2737#else
2738# if EV_USE_SIGNALFD 2814# if EV_USE_SIGNALFD
2739 if (sigfd < 0) /*TODO*/ 2815 if (sigfd < 0) /*TODO*/
2740# endif 2816# endif
2741 { 2817 {
2818# ifdef _WIN32
2819 evpipe_init (EV_A);
2820
2821 signal (w->signum, ev_sighandler);
2822# else
2742 struct sigaction sa = { }; 2823 struct sigaction sa;
2824
2825 evpipe_init (EV_A);
2826
2743 sa.sa_handler = ev_sighandler; 2827 sa.sa_handler = ev_sighandler;
2744 sigfillset (&sa.sa_mask); 2828 sigfillset (&sa.sa_mask);
2745 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2829 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2746 sigaction (w->signum, &sa, 0); 2830 sigaction (w->signum, &sa, 0);
2831
2832 sigemptyset (&sa.sa_mask);
2833 sigaddset (&sa.sa_mask, w->signum);
2834 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2835#endif
2747 } 2836 }
2748#endif
2749 }
2750 2837
2751 EV_FREQUENT_CHECK; 2838 EV_FREQUENT_CHECK;
2752} 2839}
2753 2840
2754void noinline 2841void noinline
2762 2849
2763 wlist_del (&signals [w->signum - 1].head, (WL)w); 2850 wlist_del (&signals [w->signum - 1].head, (WL)w);
2764 ev_stop (EV_A_ (W)w); 2851 ev_stop (EV_A_ (W)w);
2765 2852
2766 if (!signals [w->signum - 1].head) 2853 if (!signals [w->signum - 1].head)
2854 {
2855#if EV_MULTIPLICITY
2856 signals [w->signum - 1].loop = 0; /* unattach from signal */
2857#endif
2767#if EV_USE_SIGNALFD 2858#if EV_USE_SIGNALFD
2768 if (sigfd >= 0) 2859 if (sigfd >= 0)
2769 { 2860 {
2770 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D 2861 sigset_t ss;
2862
2863 sigemptyset (&ss);
2864 sigaddset (&ss, w->signum);
2771 sigdelset (&sigfd_set, w->signum); 2865 sigdelset (&sigfd_set, w->signum);
2866
2772 signalfd (sigfd, &sigfd_set, 0); 2867 signalfd (sigfd, &sigfd_set, 0);
2773 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D 2868 sigprocmask (SIG_UNBLOCK, &ss, 0);
2774 /*TODO: maybe unblock signal? */
2775 } 2869 }
2776 else 2870 else
2777#endif 2871#endif
2778 signal (w->signum, SIG_DFL); 2872 signal (w->signum, SIG_DFL);
2873 }
2779 2874
2780 EV_FREQUENT_CHECK; 2875 EV_FREQUENT_CHECK;
2781} 2876}
2877
2878#endif
2879
2880#if EV_CHILD_ENABLE
2782 2881
2783void 2882void
2784ev_child_start (EV_P_ ev_child *w) 2883ev_child_start (EV_P_ ev_child *w)
2785{ 2884{
2786#if EV_MULTIPLICITY 2885#if EV_MULTIPLICITY
2790 return; 2889 return;
2791 2890
2792 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2793 2892
2794 ev_start (EV_A_ (W)w, 1); 2893 ev_start (EV_A_ (W)w, 1);
2795 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2894 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2796 2895
2797 EV_FREQUENT_CHECK; 2896 EV_FREQUENT_CHECK;
2798} 2897}
2799 2898
2800void 2899void
2804 if (expect_false (!ev_is_active (w))) 2903 if (expect_false (!ev_is_active (w)))
2805 return; 2904 return;
2806 2905
2807 EV_FREQUENT_CHECK; 2906 EV_FREQUENT_CHECK;
2808 2907
2809 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2908 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2810 ev_stop (EV_A_ (W)w); 2909 ev_stop (EV_A_ (W)w);
2811 2910
2812 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2813} 2912}
2913
2914#endif
2814 2915
2815#if EV_STAT_ENABLE 2916#if EV_STAT_ENABLE
2816 2917
2817# ifdef _WIN32 2918# ifdef _WIN32
2818# undef lstat 2919# undef lstat
2824#define MIN_STAT_INTERVAL 0.1074891 2925#define MIN_STAT_INTERVAL 0.1074891
2825 2926
2826static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2927static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2827 2928
2828#if EV_USE_INOTIFY 2929#if EV_USE_INOTIFY
2829# define EV_INOTIFY_BUFSIZE 8192 2930
2931/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2932# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2830 2933
2831static void noinline 2934static void noinline
2832infy_add (EV_P_ ev_stat *w) 2935infy_add (EV_P_ ev_stat *w)
2833{ 2936{
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); 2937 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 2938
2836 if (w->wd < 0) 2939 if (w->wd >= 0)
2940 {
2941 struct statfs sfs;
2942
2943 /* now local changes will be tracked by inotify, but remote changes won't */
2944 /* unless the filesystem is known to be local, we therefore still poll */
2945 /* also do poll on <2.6.25, but with normal frequency */
2946
2947 if (!fs_2625)
2948 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2949 else if (!statfs (w->path, &sfs)
2950 && (sfs.f_type == 0x1373 /* devfs */
2951 || sfs.f_type == 0xEF53 /* ext2/3 */
2952 || sfs.f_type == 0x3153464a /* jfs */
2953 || sfs.f_type == 0x52654973 /* reiser3 */
2954 || sfs.f_type == 0x01021994 /* tempfs */
2955 || sfs.f_type == 0x58465342 /* xfs */))
2956 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2957 else
2958 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2837 { 2959 }
2960 else
2961 {
2962 /* can't use inotify, continue to stat */
2838 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2963 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 2964
2841 /* monitor some parent directory for speedup hints */ 2965 /* 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, */ 2966 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2843 /* but an efficiency issue only */ 2967 /* but an efficiency issue only */
2844 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2968 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2845 { 2969 {
2846 char path [4096]; 2970 char path [4096];
2862 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2986 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2863 } 2987 }
2864 } 2988 }
2865 2989
2866 if (w->wd >= 0) 2990 if (w->wd >= 0)
2867 {
2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2991 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2869 2992
2870 /* now local changes will be tracked by inotify, but remote changes won't */ 2993 /* now re-arm timer, if required */
2871 /* unless the filesystem it known to be local, we therefore still poll */ 2994 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); 2995 ev_timer_again (EV_A_ &w->timer);
2886 } 2996 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2887} 2997}
2888 2998
2889static void noinline 2999static void noinline
2890infy_del (EV_P_ ev_stat *w) 3000infy_del (EV_P_ ev_stat *w)
2891{ 3001{
2894 3004
2895 if (wd < 0) 3005 if (wd < 0)
2896 return; 3006 return;
2897 3007
2898 w->wd = -2; 3008 w->wd = -2;
2899 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3009 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2900 wlist_del (&fs_hash [slot].head, (WL)w); 3010 wlist_del (&fs_hash [slot].head, (WL)w);
2901 3011
2902 /* remove this watcher, if others are watching it, they will rearm */ 3012 /* remove this watcher, if others are watching it, they will rearm */
2903 inotify_rm_watch (fs_fd, wd); 3013 inotify_rm_watch (fs_fd, wd);
2904} 3014}
2906static void noinline 3016static void noinline
2907infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3017infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2908{ 3018{
2909 if (slot < 0) 3019 if (slot < 0)
2910 /* overflow, need to check for all hash slots */ 3020 /* overflow, need to check for all hash slots */
2911 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3021 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2912 infy_wd (EV_A_ slot, wd, ev); 3022 infy_wd (EV_A_ slot, wd, ev);
2913 else 3023 else
2914 { 3024 {
2915 WL w_; 3025 WL w_;
2916 3026
2917 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3027 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2918 { 3028 {
2919 ev_stat *w = (ev_stat *)w_; 3029 ev_stat *w = (ev_stat *)w_;
2920 w_ = w_->next; /* lets us remove this watcher and all before it */ 3030 w_ = w_->next; /* lets us remove this watcher and all before it */
2921 3031
2922 if (w->wd == wd || wd == -1) 3032 if (w->wd == wd || wd == -1)
2923 { 3033 {
2924 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3034 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2925 { 3035 {
2926 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3036 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2927 w->wd = -1; 3037 w->wd = -1;
2928 infy_add (EV_A_ w); /* re-add, no matter what */ 3038 infy_add (EV_A_ w); /* re-add, no matter what */
2929 } 3039 }
2930 3040
2931 stat_timer_cb (EV_A_ &w->timer, 0); 3041 stat_timer_cb (EV_A_ &w->timer, 0);
2936 3046
2937static void 3047static void
2938infy_cb (EV_P_ ev_io *w, int revents) 3048infy_cb (EV_P_ ev_io *w, int revents)
2939{ 3049{
2940 char buf [EV_INOTIFY_BUFSIZE]; 3050 char buf [EV_INOTIFY_BUFSIZE];
2941 struct inotify_event *ev = (struct inotify_event *)buf;
2942 int ofs; 3051 int ofs;
2943 int len = read (fs_fd, buf, sizeof (buf)); 3052 int len = read (fs_fd, buf, sizeof (buf));
2944 3053
2945 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3054 for (ofs = 0; ofs < len; )
3055 {
3056 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2946 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3057 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3058 ofs += sizeof (struct inotify_event) + ev->len;
3059 }
3060}
3061
3062inline_size unsigned int
3063ev_linux_version (void)
3064{
3065 struct utsname buf;
3066 unsigned int v;
3067 int i;
3068 char *p = buf.release;
3069
3070 if (uname (&buf))
3071 return 0;
3072
3073 for (i = 3+1; --i; )
3074 {
3075 unsigned int c = 0;
3076
3077 for (;;)
3078 {
3079 if (*p >= '0' && *p <= '9')
3080 c = c * 10 + *p++ - '0';
3081 else
3082 {
3083 p += *p == '.';
3084 break;
3085 }
3086 }
3087
3088 v = (v << 8) | c;
3089 }
3090
3091 return v;
2947} 3092}
2948 3093
2949inline_size void 3094inline_size void
2950check_2625 (EV_P) 3095ev_check_2625 (EV_P)
2951{ 3096{
2952 /* kernels < 2.6.25 are borked 3097 /* kernels < 2.6.25 are borked
2953 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3098 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2954 */ 3099 */
2955 struct utsname buf; 3100 if (ev_linux_version () < 0x020619)
2956 int major, minor, micro;
2957
2958 if (uname (&buf))
2959 return; 3101 return;
2960 3102
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; 3103 fs_2625 = 1;
3104}
3105
3106inline_size int
3107infy_newfd (void)
3108{
3109#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3110 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3111 if (fd >= 0)
3112 return fd;
3113#endif
3114 return inotify_init ();
2970} 3115}
2971 3116
2972inline_size void 3117inline_size void
2973infy_init (EV_P) 3118infy_init (EV_P)
2974{ 3119{
2975 if (fs_fd != -2) 3120 if (fs_fd != -2)
2976 return; 3121 return;
2977 3122
2978 fs_fd = -1; 3123 fs_fd = -1;
2979 3124
2980 check_2625 (EV_A); 3125 ev_check_2625 (EV_A);
2981 3126
2982 fs_fd = inotify_init (); 3127 fs_fd = infy_newfd ();
2983 3128
2984 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
2985 { 3130 {
3131 fd_intern (fs_fd);
2986 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3132 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2987 ev_set_priority (&fs_w, EV_MAXPRI); 3133 ev_set_priority (&fs_w, EV_MAXPRI);
2988 ev_io_start (EV_A_ &fs_w); 3134 ev_io_start (EV_A_ &fs_w);
3135 ev_unref (EV_A);
2989 } 3136 }
2990} 3137}
2991 3138
2992inline_size void 3139inline_size void
2993infy_fork (EV_P) 3140infy_fork (EV_P)
2995 int slot; 3142 int slot;
2996 3143
2997 if (fs_fd < 0) 3144 if (fs_fd < 0)
2998 return; 3145 return;
2999 3146
3147 ev_ref (EV_A);
3148 ev_io_stop (EV_A_ &fs_w);
3000 close (fs_fd); 3149 close (fs_fd);
3001 fs_fd = inotify_init (); 3150 fs_fd = infy_newfd ();
3002 3151
3152 if (fs_fd >= 0)
3153 {
3154 fd_intern (fs_fd);
3155 ev_io_set (&fs_w, fs_fd, EV_READ);
3156 ev_io_start (EV_A_ &fs_w);
3157 ev_unref (EV_A);
3158 }
3159
3003 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3160 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
3004 { 3161 {
3005 WL w_ = fs_hash [slot].head; 3162 WL w_ = fs_hash [slot].head;
3006 fs_hash [slot].head = 0; 3163 fs_hash [slot].head = 0;
3007 3164
3008 while (w_) 3165 while (w_)
3013 w->wd = -1; 3170 w->wd = -1;
3014 3171
3015 if (fs_fd >= 0) 3172 if (fs_fd >= 0)
3016 infy_add (EV_A_ w); /* re-add, no matter what */ 3173 infy_add (EV_A_ w); /* re-add, no matter what */
3017 else 3174 else
3175 {
3176 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3177 if (ev_is_active (&w->timer)) ev_ref (EV_A);
3018 ev_timer_again (EV_A_ &w->timer); 3178 ev_timer_again (EV_A_ &w->timer);
3179 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3180 }
3019 } 3181 }
3020 } 3182 }
3021} 3183}
3022 3184
3023#endif 3185#endif
3040static void noinline 3202static void noinline
3041stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3203stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3042{ 3204{
3043 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3205 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
3044 3206
3045 /* we copy this here each the time so that */ 3207 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); 3208 ev_stat_stat (EV_A_ w);
3049 3209
3050 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3210 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3051 if ( 3211 if (
3052 w->prev.st_dev != w->attr.st_dev 3212 prev.st_dev != w->attr.st_dev
3053 || w->prev.st_ino != w->attr.st_ino 3213 || prev.st_ino != w->attr.st_ino
3054 || w->prev.st_mode != w->attr.st_mode 3214 || prev.st_mode != w->attr.st_mode
3055 || w->prev.st_nlink != w->attr.st_nlink 3215 || prev.st_nlink != w->attr.st_nlink
3056 || w->prev.st_uid != w->attr.st_uid 3216 || prev.st_uid != w->attr.st_uid
3057 || w->prev.st_gid != w->attr.st_gid 3217 || prev.st_gid != w->attr.st_gid
3058 || w->prev.st_rdev != w->attr.st_rdev 3218 || prev.st_rdev != w->attr.st_rdev
3059 || w->prev.st_size != w->attr.st_size 3219 || prev.st_size != w->attr.st_size
3060 || w->prev.st_atime != w->attr.st_atime 3220 || prev.st_atime != w->attr.st_atime
3061 || w->prev.st_mtime != w->attr.st_mtime 3221 || prev.st_mtime != w->attr.st_mtime
3062 || w->prev.st_ctime != w->attr.st_ctime 3222 || prev.st_ctime != w->attr.st_ctime
3063 ) { 3223 ) {
3224 /* we only update w->prev on actual differences */
3225 /* in case we test more often than invoke the callback, */
3226 /* to ensure that prev is always different to attr */
3227 w->prev = prev;
3228
3064 #if EV_USE_INOTIFY 3229 #if EV_USE_INOTIFY
3065 if (fs_fd >= 0) 3230 if (fs_fd >= 0)
3066 { 3231 {
3067 infy_del (EV_A_ w); 3232 infy_del (EV_A_ w);
3068 infy_add (EV_A_ w); 3233 infy_add (EV_A_ w);
3093 3258
3094 if (fs_fd >= 0) 3259 if (fs_fd >= 0)
3095 infy_add (EV_A_ w); 3260 infy_add (EV_A_ w);
3096 else 3261 else
3097#endif 3262#endif
3263 {
3098 ev_timer_again (EV_A_ &w->timer); 3264 ev_timer_again (EV_A_ &w->timer);
3265 ev_unref (EV_A);
3266 }
3099 3267
3100 ev_start (EV_A_ (W)w, 1); 3268 ev_start (EV_A_ (W)w, 1);
3101 3269
3102 EV_FREQUENT_CHECK; 3270 EV_FREQUENT_CHECK;
3103} 3271}
3112 EV_FREQUENT_CHECK; 3280 EV_FREQUENT_CHECK;
3113 3281
3114#if EV_USE_INOTIFY 3282#if EV_USE_INOTIFY
3115 infy_del (EV_A_ w); 3283 infy_del (EV_A_ w);
3116#endif 3284#endif
3285
3286 if (ev_is_active (&w->timer))
3287 {
3288 ev_ref (EV_A);
3117 ev_timer_stop (EV_A_ &w->timer); 3289 ev_timer_stop (EV_A_ &w->timer);
3290 }
3118 3291
3119 ev_stop (EV_A_ (W)w); 3292 ev_stop (EV_A_ (W)w);
3120 3293
3121 EV_FREQUENT_CHECK; 3294 EV_FREQUENT_CHECK;
3122} 3295}
3167 3340
3168 EV_FREQUENT_CHECK; 3341 EV_FREQUENT_CHECK;
3169} 3342}
3170#endif 3343#endif
3171 3344
3345#if EV_PREPARE_ENABLE
3172void 3346void
3173ev_prepare_start (EV_P_ ev_prepare *w) 3347ev_prepare_start (EV_P_ ev_prepare *w)
3174{ 3348{
3175 if (expect_false (ev_is_active (w))) 3349 if (expect_false (ev_is_active (w)))
3176 return; 3350 return;
3202 3376
3203 ev_stop (EV_A_ (W)w); 3377 ev_stop (EV_A_ (W)w);
3204 3378
3205 EV_FREQUENT_CHECK; 3379 EV_FREQUENT_CHECK;
3206} 3380}
3381#endif
3207 3382
3383#if EV_CHECK_ENABLE
3208void 3384void
3209ev_check_start (EV_P_ ev_check *w) 3385ev_check_start (EV_P_ ev_check *w)
3210{ 3386{
3211 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
3212 return; 3388 return;
3238 3414
3239 ev_stop (EV_A_ (W)w); 3415 ev_stop (EV_A_ (W)w);
3240 3416
3241 EV_FREQUENT_CHECK; 3417 EV_FREQUENT_CHECK;
3242} 3418}
3419#endif
3243 3420
3244#if EV_EMBED_ENABLE 3421#if EV_EMBED_ENABLE
3245void noinline 3422void noinline
3246ev_embed_sweep (EV_P_ ev_embed *w) 3423ev_embed_sweep (EV_P_ ev_embed *w)
3247{ 3424{
3263embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3440embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3264{ 3441{
3265 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3442 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3266 3443
3267 { 3444 {
3268 struct ev_loop *loop = w->other; 3445 EV_P = w->other;
3269 3446
3270 while (fdchangecnt) 3447 while (fdchangecnt)
3271 { 3448 {
3272 fd_reify (EV_A); 3449 fd_reify (EV_A);
3273 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3450 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3281 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3458 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3282 3459
3283 ev_embed_stop (EV_A_ w); 3460 ev_embed_stop (EV_A_ w);
3284 3461
3285 { 3462 {
3286 struct ev_loop *loop = w->other; 3463 EV_P = w->other;
3287 3464
3288 ev_loop_fork (EV_A); 3465 ev_loop_fork (EV_A);
3289 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3466 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3290 } 3467 }
3291 3468
3305{ 3482{
3306 if (expect_false (ev_is_active (w))) 3483 if (expect_false (ev_is_active (w)))
3307 return; 3484 return;
3308 3485
3309 { 3486 {
3310 struct ev_loop *loop = w->other; 3487 EV_P = w->other;
3311 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3488 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); 3489 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3313 } 3490 }
3314 3491
3315 EV_FREQUENT_CHECK; 3492 EV_FREQUENT_CHECK;
3342 3519
3343 ev_io_stop (EV_A_ &w->io); 3520 ev_io_stop (EV_A_ &w->io);
3344 ev_prepare_stop (EV_A_ &w->prepare); 3521 ev_prepare_stop (EV_A_ &w->prepare);
3345 ev_fork_stop (EV_A_ &w->fork); 3522 ev_fork_stop (EV_A_ &w->fork);
3346 3523
3524 ev_stop (EV_A_ (W)w);
3525
3347 EV_FREQUENT_CHECK; 3526 EV_FREQUENT_CHECK;
3348} 3527}
3349#endif 3528#endif
3350 3529
3351#if EV_FORK_ENABLE 3530#if EV_FORK_ENABLE
3427 3606
3428void 3607void
3429ev_async_send (EV_P_ ev_async *w) 3608ev_async_send (EV_P_ ev_async *w)
3430{ 3609{
3431 w->sent = 1; 3610 w->sent = 1;
3432 evpipe_write (EV_A_ &gotasync); 3611 evpipe_write (EV_A_ &async_pending);
3433} 3612}
3434#endif 3613#endif
3435 3614
3436/*****************************************************************************/ 3615/*****************************************************************************/
3437 3616
3477{ 3656{
3478 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3657 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3479 3658
3480 if (expect_false (!once)) 3659 if (expect_false (!once))
3481 { 3660 {
3482 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3661 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3483 return; 3662 return;
3484 } 3663 }
3485 3664
3486 once->cb = cb; 3665 once->cb = cb;
3487 once->arg = arg; 3666 once->arg = arg;
3574 if (types & EV_ASYNC) 3753 if (types & EV_ASYNC)
3575 for (i = asynccnt; i--; ) 3754 for (i = asynccnt; i--; )
3576 cb (EV_A_ EV_ASYNC, asyncs [i]); 3755 cb (EV_A_ EV_ASYNC, asyncs [i]);
3577#endif 3756#endif
3578 3757
3758#if EV_PREPARE_ENABLE
3579 if (types & EV_PREPARE) 3759 if (types & EV_PREPARE)
3580 for (i = preparecnt; i--; ) 3760 for (i = preparecnt; i--; )
3581#if EV_EMBED_ENABLE 3761# if EV_EMBED_ENABLE
3582 if (ev_cb (prepares [i]) != embed_prepare_cb) 3762 if (ev_cb (prepares [i]) != embed_prepare_cb)
3583#endif 3763# endif
3584 cb (EV_A_ EV_PREPARE, prepares [i]); 3764 cb (EV_A_ EV_PREPARE, prepares [i]);
3765#endif
3585 3766
3767#if EV_CHECK_ENABLE
3586 if (types & EV_CHECK) 3768 if (types & EV_CHECK)
3587 for (i = checkcnt; i--; ) 3769 for (i = checkcnt; i--; )
3588 cb (EV_A_ EV_CHECK, checks [i]); 3770 cb (EV_A_ EV_CHECK, checks [i]);
3771#endif
3589 3772
3773#if EV_SIGNAL_ENABLE
3590 if (types & EV_SIGNAL) 3774 if (types & EV_SIGNAL)
3591 for (i = 0; i < signalmax; ++i) 3775 for (i = 0; i < EV_NSIG - 1; ++i)
3592 for (wl = signals [i].head; wl; ) 3776 for (wl = signals [i].head; wl; )
3593 { 3777 {
3594 wn = wl->next; 3778 wn = wl->next;
3595 cb (EV_A_ EV_SIGNAL, wl); 3779 cb (EV_A_ EV_SIGNAL, wl);
3596 wl = wn; 3780 wl = wn;
3597 } 3781 }
3782#endif
3598 3783
3784#if EV_CHILD_ENABLE
3599 if (types & EV_CHILD) 3785 if (types & EV_CHILD)
3600 for (i = EV_PID_HASHSIZE; i--; ) 3786 for (i = (EV_PID_HASHSIZE); i--; )
3601 for (wl = childs [i]; wl; ) 3787 for (wl = childs [i]; wl; )
3602 { 3788 {
3603 wn = wl->next; 3789 wn = wl->next;
3604 cb (EV_A_ EV_CHILD, wl); 3790 cb (EV_A_ EV_CHILD, wl);
3605 wl = wn; 3791 wl = wn;
3606 } 3792 }
3793#endif
3607/* EV_STAT 0x00001000 /* stat data changed */ 3794/* EV_STAT 0x00001000 /* stat data changed */
3608/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3795/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3609} 3796}
3610#endif 3797#endif
3611 3798

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines