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

Comparing libev/ev.c (file contents):
Revision 1.301 by root, Wed Jul 15 16:58:53 2009 UTC vs.
Revision 1.346 by root, Thu Oct 14 05:07:04 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
145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_SIGNALFD
139# if HAVE_EVENTFD 147# define EV_USE_SIGNALFD EV_FEATURE_OS
140# define EV_USE_EVENTFD 1
141# else
142# define EV_USE_EVENTFD 0
143# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
152# endif
153
154# if HAVE_EVENTFD
155# ifndef EV_USE_EVENTFD
156# define EV_USE_EVENTFD EV_FEATURE_OS
157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
144# endif 161# endif
145 162
146#endif 163#endif
147 164
148#include <math.h> 165#include <math.h>
149#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
150#include <fcntl.h> 168#include <fcntl.h>
151#include <stddef.h> 169#include <stddef.h>
152 170
153#include <stdio.h> 171#include <stdio.h>
154 172
155#include <assert.h> 173#include <assert.h>
156#include <errno.h> 174#include <errno.h>
157#include <sys/types.h> 175#include <sys/types.h>
158#include <time.h> 176#include <time.h>
177#include <limits.h>
159 178
160#include <signal.h> 179#include <signal.h>
161 180
162#ifdef EV_H 181#ifdef EV_H
163# include EV_H 182# include EV_H
… …
174# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 194# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
178# endif 197# endif
198# undef EV_AVOID_STDIO
179#endif 199#endif
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
180 208
181/* 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 */
210
211/* try to deduce the maximum number of signals on this platform */
212#if defined (EV_NSIG)
213/* use what's provided */
214#elif defined (NSIG)
215# define EV_NSIG (NSIG)
216#elif defined(_NSIG)
217# define EV_NSIG (_NSIG)
218#elif defined (SIGMAX)
219# define EV_NSIG (SIGMAX+1)
220#elif defined (SIG_MAX)
221# define EV_NSIG (SIG_MAX+1)
222#elif defined (_SIG_MAX)
223# define EV_NSIG (_SIG_MAX+1)
224#elif defined (MAXSIG)
225# define EV_NSIG (MAXSIG+1)
226#elif defined (MAX_SIG)
227# define EV_NSIG (MAX_SIG+1)
228#elif defined (SIGARRAYSIZE)
229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
230#elif defined (_sys_nsig)
231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
232#else
233# error "unable to find value for NSIG, please report"
234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
236# define EV_NSIG 65
237#endif
182 238
183#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 242# else
187# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
188# endif 244# endif
189#endif 245#endif
190 246
191#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 250# else
195# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
196# endif 252# endif
197#endif 253#endif
198 254
… …
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 257#endif
202 258
203#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 262# else
207# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
208# endif 264# endif
209#endif 265#endif
210 266
211#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 269#endif
214 270
215#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
216# ifdef _WIN32 272# ifdef _WIN32
217# define EV_USE_POLL 0 273# define EV_USE_POLL 0
218# else 274# else
219# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 276# endif
221#endif 277#endif
222 278
223#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 282# else
227# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
228# endif 284# endif
229#endif 285#endif
230 286
… …
236# define EV_USE_PORT 0 292# define EV_USE_PORT 0
237#endif 293#endif
238 294
239#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 298# else
243# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
244# endif 300# endif
245#endif 301#endif
246 302
247#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
249# define EV_PID_HASHSIZE 1
250# else
251# define EV_PID_HASHSIZE 16
252# endif
253#endif 305#endif
254 306
255#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_INOTIFY_HASHSIZE 1
258# else
259# define EV_INOTIFY_HASHSIZE 16
260# endif
261#endif 309#endif
262 310
263#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 314# else
267# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
316# endif
317#endif
318
319#ifndef EV_USE_SIGNALFD
320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
321# define EV_USE_SIGNALFD EV_FEATURE_OS
322# else
323# define EV_USE_SIGNALFD 0
268# endif 324# endif
269#endif 325#endif
270 326
271#if 0 /* debugging */ 327#if 0 /* debugging */
272# define EV_VERIFY 3 328# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
275#endif 331#endif
276 332
277#ifndef EV_VERIFY 333#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 335#endif
280 336
281#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 339#endif
284 340
285#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif 343#endif
288 344
289/* 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, */
290/* which makes programs even slower. might work on other unices, too. */ 346/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
… …
300# endif 356# endif
301#endif 357#endif
302 358
303/* 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 */
304 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
305#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
308#endif 370#endif
309 371
… …
339#endif 401#endif
340 402
341#if EV_USE_EVENTFD 403#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 404/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 405# include <stdint.h>
406# ifndef EFD_NONBLOCK
407# define EFD_NONBLOCK O_NONBLOCK
408# endif
409# ifndef EFD_CLOEXEC
410# ifdef O_CLOEXEC
411# define EFD_CLOEXEC O_CLOEXEC
412# else
413# define EFD_CLOEXEC 02000000
414# endif
415# endif
344# ifdef __cplusplus 416# ifdef __cplusplus
345extern "C" { 417extern "C" {
346# endif 418# endif
347int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 420# ifdef __cplusplus
349} 421}
350# endif 422# endif
351#endif 423#endif
352 424
425#if EV_USE_SIGNALFD
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
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
453
353/**/ 454/**/
354 455
355#if EV_VERIFY >= 3 456#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 457# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 458#else
358# define EV_FREQUENT_CHECK do { } while (0) 459# define EV_FREQUENT_CHECK do { } while (0)
359#endif 460#endif
360 461
361/* 462/*
… …
368 */ 469 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 470#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 471
371#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) */
372#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) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 474
375#if __GNUC__ >= 4 475#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 476# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 477# define noinline __attribute__ ((noinline))
378#else 478#else
… …
385 485
386#define expect_false(expr) expect ((expr) != 0, 0) 486#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 487#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 488#define inline_size static inline
389 489
390#if EV_MINIMAL 490#if EV_FEATURE_CODE
491# define inline_speed static inline
492#else
391# define inline_speed static noinline 493# define inline_speed static noinline
392#else
393# define inline_speed static inline
394#endif 494#endif
395 495
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 496#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397 497
398#if EV_MINPRI == EV_MAXPRI 498#if EV_MINPRI == EV_MAXPRI
… …
411#define ev_active(w) ((W)(w))->active 511#define ev_active(w) ((W)(w))->active
412#define ev_at(w) ((WT)(w))->at 512#define ev_at(w) ((WT)(w))->at
413 513
414#if EV_USE_REALTIME 514#if EV_USE_REALTIME
415/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 515/* sig_atomic_t is used to avoid per-thread variables or locking but still */
416/* giving it a reasonably high chance of working on typical architetcures */ 516/* giving it a reasonably high chance of working on typical architectures */
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 517static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif 518#endif
419 519
420#if EV_USE_MONOTONIC 520#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 521static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 522#endif
423 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
424#ifdef _WIN32 534#ifdef _WIN32
425# include "ev_win32.c" 535# include "ev_win32.c"
426#endif 536#endif
427 537
428/*****************************************************************************/ 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
429 547
430static void (*syserr_cb)(const char *msg); 548static void (*syserr_cb)(const char *msg);
431 549
432void 550void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 551ev_set_syserr_cb (void (*cb)(const char *msg))
… …
443 561
444 if (syserr_cb) 562 if (syserr_cb)
445 syserr_cb (msg); 563 syserr_cb (msg);
446 else 564 else
447 { 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
448 perror (msg); 574 perror (msg);
575#endif
449 abort (); 576 abort ();
450 } 577 }
451} 578}
452 579
453static void * 580static void *
454ev_realloc_emul (void *ptr, long size) 581ev_realloc_emul (void *ptr, long size)
455{ 582{
583#if __GLIBC__
584 return realloc (ptr, size);
585#else
456 /* some systems, notably openbsd and darwin, fail to properly 586 /* some systems, notably openbsd and darwin, fail to properly
457 * 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
458 * the single unix specification, so work around them here. 588 * the single unix specification, so work around them here.
459 */ 589 */
460 590
461 if (size) 591 if (size)
462 return realloc (ptr, size); 592 return realloc (ptr, size);
463 593
464 free (ptr); 594 free (ptr);
465 return 0; 595 return 0;
596#endif
466} 597}
467 598
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 599static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 600
470void 601void
… …
478{ 609{
479 ptr = alloc (ptr, size); 610 ptr = alloc (ptr, size);
480 611
481 if (!ptr && size) 612 if (!ptr && size)
482 { 613 {
614#if EV_AVOID_STDIO
615 ev_printerr ("libev: memory allocation failed, aborting.\n");
616#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 617 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
618#endif
484 abort (); 619 abort ();
485 } 620 }
486 621
487 return ptr; 622 return ptr;
488} 623}
… …
570 705
571 static int ev_default_loop_ptr; 706 static int ev_default_loop_ptr;
572 707
573#endif 708#endif
574 709
575#if EV_MINIMAL < 2 710#if EV_FEATURE_API
576# 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)
577# 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)
578# define EV_INVOKE_PENDING invoke_cb (EV_A) 713# define EV_INVOKE_PENDING invoke_cb (EV_A)
579#else 714#else
580# define EV_RELEASE_CB (void)0 715# define EV_RELEASE_CB (void)0
… …
647 782
648 tv.tv_sec = (time_t)delay; 783 tv.tv_sec = (time_t)delay;
649 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
650 785
651 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 786 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
652 /* somehting not guaranteed by newer posix versions, but guaranteed */ 787 /* something not guaranteed by newer posix versions, but guaranteed */
653 /* by older ones */ 788 /* by older ones */
654 select (0, 0, 0, 0, &tv); 789 select (0, 0, 0, 0, &tv);
655#endif 790#endif
656 } 791 }
657} 792}
… …
659/*****************************************************************************/ 794/*****************************************************************************/
660 795
661#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 796#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
662 797
663/* find a suitable new size for the given array, */ 798/* find a suitable new size for the given array, */
664/* hopefully by rounding to a ncie-to-malloc size */ 799/* hopefully by rounding to a nice-to-malloc size */
665inline_size int 800inline_size int
666array_nextsize (int elem, int cur, int cnt) 801array_nextsize (int elem, int cur, int cnt)
667{ 802{
668 int ncur = cur + 1; 803 int ncur = cur + 1;
669 804
… …
765} 900}
766 901
767/*****************************************************************************/ 902/*****************************************************************************/
768 903
769inline_speed void 904inline_speed void
770fd_event_nc (EV_P_ int fd, int revents) 905fd_event_nocheck (EV_P_ int fd, int revents)
771{ 906{
772 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
773 ev_io *w; 908 ev_io *w;
774 909
775 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)
… …
787fd_event (EV_P_ int fd, int revents) 922fd_event (EV_P_ int fd, int revents)
788{ 923{
789 ANFD *anfd = anfds + fd; 924 ANFD *anfd = anfds + fd;
790 925
791 if (expect_true (!anfd->reify)) 926 if (expect_true (!anfd->reify))
792 fd_event_nc (EV_A_ fd, revents); 927 fd_event_nocheck (EV_A_ fd, revents);
793} 928}
794 929
795void 930void
796ev_feed_fd_event (EV_P_ int fd, int revents) 931ev_feed_fd_event (EV_P_ int fd, int revents)
797{ 932{
798 if (fd >= 0 && fd < anfdmax) 933 if (fd >= 0 && fd < anfdmax)
799 fd_event_nc (EV_A_ fd, revents); 934 fd_event_nocheck (EV_A_ fd, revents);
800} 935}
801 936
802/* make sure the external fd watch events are in-sync */ 937/* make sure the external fd watch events are in-sync */
803/* with the kernel/libev internal state */ 938/* with the kernel/libev internal state */
804inline_size void 939inline_size void
… …
819 954
820#if EV_SELECT_IS_WINSOCKET 955#if EV_SELECT_IS_WINSOCKET
821 if (events) 956 if (events)
822 { 957 {
823 unsigned long arg; 958 unsigned long arg;
824 #ifdef EV_FD_TO_WIN32_HANDLE
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
826 #else
827 anfd->handle = _get_osfhandle (fd);
828 #endif
829 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 960 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
830 } 961 }
831#endif 962#endif
832 963
833 { 964 {
… …
871 ev_io_stop (EV_A_ w); 1002 ev_io_stop (EV_A_ w);
872 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);
873 } 1004 }
874} 1005}
875 1006
876/* check whether the given fd is atcually valid, for error recovery */ 1007/* check whether the given fd is actually valid, for error recovery */
877inline_size int 1008inline_size int
878fd_valid (int fd) 1009fd_valid (int fd)
879{ 1010{
880#ifdef _WIN32 1011#ifdef _WIN32
881 return _get_osfhandle (fd) != -1; 1012 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
882#else 1013#else
883 return fcntl (fd, F_GETFD) != -1; 1014 return fcntl (fd, F_GETFD) != -1;
884#endif 1015#endif
885} 1016}
886 1017
… …
904 1035
905 for (fd = anfdmax; fd--; ) 1036 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 1037 if (anfds [fd].events)
907 { 1038 {
908 fd_kill (EV_A_ fd); 1039 fd_kill (EV_A_ fd);
909 return; 1040 break;
910 } 1041 }
911} 1042}
912 1043
913/* 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 */
914static void noinline 1045static void noinline
… …
923 anfds [fd].emask = 0; 1054 anfds [fd].emask = 0;
924 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1055 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
925 } 1056 }
926} 1057}
927 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
1071}
1072
928/*****************************************************************************/ 1073/*****************************************************************************/
929 1074
930/* 1075/*
931 * the heap functions want a real array index. array index 0 uis guaranteed to not 1076 * the heap functions want a real array index. array index 0 is guaranteed to not
932 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1077 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
933 * the branching factor of the d-tree. 1078 * the branching factor of the d-tree.
934 */ 1079 */
935 1080
936/* 1081/*
… …
1004 1149
1005 for (;;) 1150 for (;;)
1006 { 1151 {
1007 int c = k << 1; 1152 int c = k << 1;
1008 1153
1009 if (c > N + HEAP0 - 1) 1154 if (c >= N + HEAP0)
1010 break; 1155 break;
1011 1156
1012 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])
1013 ? 1 : 0; 1158 ? 1 : 0;
1014 1159
… …
1050 1195
1051/* move an element suitably so it is in a correct place */ 1196/* move an element suitably so it is in a correct place */
1052inline_size void 1197inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1198adjustheap (ANHE *heap, int N, int k)
1054{ 1199{
1055 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)]))
1056 upheap (heap, k); 1201 upheap (heap, k);
1057 else 1202 else
1058 downheap (heap, N, k); 1203 downheap (heap, N, k);
1059} 1204}
1060 1205
… …
1073/*****************************************************************************/ 1218/*****************************************************************************/
1074 1219
1075/* associate signal watchers to a signal signal */ 1220/* associate signal watchers to a signal signal */
1076typedef struct 1221typedef struct
1077{ 1222{
1223 EV_ATOMIC_T pending;
1224#if EV_MULTIPLICITY
1225 EV_P;
1226#endif
1078 WL head; 1227 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1228} ANSIG;
1081 1229
1082static ANSIG *signals; 1230static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1231
1087/*****************************************************************************/ 1232/*****************************************************************************/
1088 1233
1089/* used to prepare libev internal fd's */ 1234#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1090/* this is not fork-safe */
1091inline_speed void
1092fd_intern (int fd)
1093{
1094#ifdef _WIN32
1095 unsigned long arg = 1;
1096 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1097#else
1098 fcntl (fd, F_SETFD, FD_CLOEXEC);
1099 fcntl (fd, F_SETFL, O_NONBLOCK);
1100#endif
1101}
1102 1235
1103static void noinline 1236static void noinline
1104evpipe_init (EV_P) 1237evpipe_init (EV_P)
1105{ 1238{
1106 if (!ev_is_active (&pipe_w)) 1239 if (!ev_is_active (&pipe_w))
1107 { 1240 {
1108#if EV_USE_EVENTFD 1241# if EV_USE_EVENTFD
1242 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1243 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1244 evfd = eventfd (0, 0);
1245
1246 if (evfd >= 0)
1110 { 1247 {
1111 evpipe [0] = -1; 1248 evpipe [0] = -1;
1112 fd_intern (evfd); 1249 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1250 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1251 }
1115 else 1252 else
1116#endif 1253# endif
1117 { 1254 {
1118 while (pipe (evpipe)) 1255 while (pipe (evpipe))
1119 ev_syserr ("(libev) error creating signal/async pipe"); 1256 ev_syserr ("(libev) error creating signal/async pipe");
1120 1257
1121 fd_intern (evpipe [0]); 1258 fd_intern (evpipe [0]);
… …
1132evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1269evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1133{ 1270{
1134 if (!*flag) 1271 if (!*flag)
1135 { 1272 {
1136 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;
1137 1275
1138 *flag = 1; 1276 *flag = 1;
1139 1277
1140#if EV_USE_EVENTFD 1278#if EV_USE_EVENTFD
1141 if (evfd >= 0) 1279 if (evfd >= 0)
… …
1143 uint64_t counter = 1; 1281 uint64_t counter = 1;
1144 write (evfd, &counter, sizeof (uint64_t)); 1282 write (evfd, &counter, sizeof (uint64_t));
1145 } 1283 }
1146 else 1284 else
1147#endif 1285#endif
1286 /* win32 people keep sending patches that change this write() to send() */
1287 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1288 /* so when you think this write should be a send instead, please find out */
1289 /* where your send() is from - it's definitely not the microsoft send, and */
1290 /* tell me. thank you. */
1148 write (evpipe [1], &old_errno, 1); 1291 write (evpipe [1], &dummy, 1);
1149 1292
1150 errno = old_errno; 1293 errno = old_errno;
1151 } 1294 }
1152} 1295}
1153 1296
1154/* called whenever the libev signal pipe */ 1297/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1298/* got some events (signal, async) */
1156static void 1299static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1300pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1301{
1302 int i;
1303
1159#if EV_USE_EVENTFD 1304#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1305 if (evfd >= 0)
1161 { 1306 {
1162 uint64_t counter; 1307 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1308 read (evfd, &counter, sizeof (uint64_t));
1164 } 1309 }
1165 else 1310 else
1166#endif 1311#endif
1167 { 1312 {
1168 char dummy; 1313 char dummy;
1314 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1169 read (evpipe [0], &dummy, 1); 1315 read (evpipe [0], &dummy, 1);
1170 } 1316 }
1171 1317
1172 if (gotsig && ev_is_default_loop (EV_A)) 1318 if (sig_pending)
1173 { 1319 {
1174 int signum; 1320 sig_pending = 0;
1175 gotsig = 0;
1176 1321
1177 for (signum = signalmax; signum--; ) 1322 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1323 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1324 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1325 }
1181 1326
1182#if EV_ASYNC_ENABLE 1327#if EV_ASYNC_ENABLE
1183 if (gotasync) 1328 if (async_pending)
1184 { 1329 {
1185 int i; 1330 async_pending = 0;
1186 gotasync = 0;
1187 1331
1188 for (i = asynccnt; i--; ) 1332 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1333 if (asyncs [i]->sent)
1190 { 1334 {
1191 asyncs [i]->sent = 0; 1335 asyncs [i]->sent = 0;
… …
1199 1343
1200static void 1344static void
1201ev_sighandler (int signum) 1345ev_sighandler (int signum)
1202{ 1346{
1203#if EV_MULTIPLICITY 1347#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1348 EV_P = signals [signum - 1].loop;
1205#endif 1349#endif
1206 1350
1207#if _WIN32 1351#ifdef _WIN32
1208 signal (signum, ev_sighandler); 1352 signal (signum, ev_sighandler);
1209#endif 1353#endif
1210 1354
1211 signals [signum - 1].gotsig = 1; 1355 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1356 evpipe_write (EV_A_ &sig_pending);
1213} 1357}
1214 1358
1215void noinline 1359void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1360ev_feed_signal_event (EV_P_ int signum)
1217{ 1361{
1218 WL w; 1362 WL w;
1219 1363
1364 if (expect_false (signum <= 0 || signum > EV_NSIG))
1365 return;
1366
1367 --signum;
1368
1220#if EV_MULTIPLICITY 1369#if EV_MULTIPLICITY
1221 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1370 /* it is permissible to try to feed a signal to the wrong loop */
1222#endif 1371 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1372
1224 --signum; 1373 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1374 return;
1375#endif
1228 1376
1229 signals [signum].gotsig = 0; 1377 signals [signum].pending = 0;
1230 1378
1231 for (w = signals [signum].head; w; w = w->next) 1379 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1380 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1381}
1234 1382
1383#if EV_USE_SIGNALFD
1384static void
1385sigfdcb (EV_P_ ev_io *iow, int revents)
1386{
1387 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1388
1389 for (;;)
1390 {
1391 ssize_t res = read (sigfd, si, sizeof (si));
1392
1393 /* not ISO-C, as res might be -1, but works with SuS */
1394 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1395 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1396
1397 if (res < (ssize_t)sizeof (si))
1398 break;
1399 }
1400}
1401#endif
1402
1403#endif
1404
1235/*****************************************************************************/ 1405/*****************************************************************************/
1236 1406
1407#if EV_CHILD_ENABLE
1237static WL childs [EV_PID_HASHSIZE]; 1408static WL childs [EV_PID_HASHSIZE];
1238
1239#ifndef _WIN32
1240 1409
1241static ev_signal childev; 1410static ev_signal childev;
1242 1411
1243#ifndef WIFCONTINUED 1412#ifndef WIFCONTINUED
1244# define WIFCONTINUED(status) 0 1413# define WIFCONTINUED(status) 0
… …
1249child_reap (EV_P_ int chain, int pid, int status) 1418child_reap (EV_P_ int chain, int pid, int status)
1250{ 1419{
1251 ev_child *w; 1420 ev_child *w;
1252 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1421 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1253 1422
1254 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1423 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1255 { 1424 {
1256 if ((w->pid == pid || !w->pid) 1425 if ((w->pid == pid || !w->pid)
1257 && (!traced || (w->flags & 1))) 1426 && (!traced || (w->flags & 1)))
1258 { 1427 {
1259 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1428 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1284 /* make sure we are called again until all children have been reaped */ 1453 /* make sure we are called again until all children have been reaped */
1285 /* we need to do it this way so that the callback gets called before we continue */ 1454 /* we need to do it this way so that the callback gets called before we continue */
1286 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1455 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1287 1456
1288 child_reap (EV_A_ pid, pid, status); 1457 child_reap (EV_A_ pid, pid, status);
1289 if (EV_PID_HASHSIZE > 1) 1458 if ((EV_PID_HASHSIZE) > 1)
1290 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1459 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1291} 1460}
1292 1461
1293#endif 1462#endif
1294 1463
… …
1361#ifdef __APPLE__ 1530#ifdef __APPLE__
1362 /* only select works correctly on that "unix-certified" platform */ 1531 /* only select works correctly on that "unix-certified" platform */
1363 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1532 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1364 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1533 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1365#endif 1534#endif
1535#ifdef __FreeBSD__
1536 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1537#endif
1366 1538
1367 return flags; 1539 return flags;
1368} 1540}
1369 1541
1370unsigned int 1542unsigned int
… …
1383ev_backend (EV_P) 1555ev_backend (EV_P)
1384{ 1556{
1385 return backend; 1557 return backend;
1386} 1558}
1387 1559
1388#if EV_MINIMAL < 2 1560#if EV_FEATURE_API
1389unsigned int 1561unsigned int
1390ev_loop_count (EV_P) 1562ev_iteration (EV_P)
1391{ 1563{
1392 return loop_count; 1564 return loop_count;
1393} 1565}
1394 1566
1395unsigned int 1567unsigned int
1396ev_loop_depth (EV_P) 1568ev_depth (EV_P)
1397{ 1569{
1398 return loop_depth; 1570 return loop_depth;
1399} 1571}
1400 1572
1401void 1573void
… …
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1630 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1631 have_monotonic = 1;
1460 } 1632 }
1461#endif 1633#endif
1462 1634
1635 /* pid check not overridable via env */
1636#ifndef _WIN32
1637 if (flags & EVFLAG_FORKCHECK)
1638 curpid = getpid ();
1639#endif
1640
1641 if (!(flags & EVFLAG_NOENV)
1642 && !enable_secure ()
1643 && getenv ("LIBEV_FLAGS"))
1644 flags = atoi (getenv ("LIBEV_FLAGS"));
1645
1463 ev_rt_now = ev_time (); 1646 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1647 mn_now = get_clock ();
1465 now_floor = mn_now; 1648 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1649 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1650#if EV_FEATURE_API
1468 invoke_cb = ev_invoke_pending; 1651 invoke_cb = ev_invoke_pending;
1469#endif 1652#endif
1470 1653
1471 io_blocktime = 0.; 1654 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1655 timeout_blocktime = 0.;
1473 backend = 0; 1656 backend = 0;
1474 backend_fd = -1; 1657 backend_fd = -1;
1475 gotasync = 0; 1658 sig_pending = 0;
1659#if EV_ASYNC_ENABLE
1660 async_pending = 0;
1661#endif
1476#if EV_USE_INOTIFY 1662#if EV_USE_INOTIFY
1477 fs_fd = -2; 1663 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1664#endif
1479 1665#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1666 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1667#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1668
1491 if (!(flags & 0x0000ffffU)) 1669 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1670 flags |= ev_recommended_backends ();
1493 1671
1494#if EV_USE_PORT 1672#if EV_USE_PORT
… …
1507 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1685 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1508#endif 1686#endif
1509 1687
1510 ev_prepare_init (&pending_w, pendingcb); 1688 ev_prepare_init (&pending_w, pendingcb);
1511 1689
1690#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1512 ev_init (&pipe_w, pipecb); 1691 ev_init (&pipe_w, pipecb);
1513 ev_set_priority (&pipe_w, EV_MAXPRI); 1692 ev_set_priority (&pipe_w, EV_MAXPRI);
1693#endif
1514 } 1694 }
1515} 1695}
1516 1696
1517/* free up a loop structure */ 1697/* free up a loop structure */
1518static void noinline 1698static void noinline
… …
1520{ 1700{
1521 int i; 1701 int i;
1522 1702
1523 if (ev_is_active (&pipe_w)) 1703 if (ev_is_active (&pipe_w))
1524 { 1704 {
1525 ev_ref (EV_A); /* signal watcher */ 1705 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1706 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1707
1528#if EV_USE_EVENTFD 1708#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1709 if (evfd >= 0)
1530 close (evfd); 1710 close (evfd);
1531#endif 1711#endif
1532 1712
1533 if (evpipe [0] >= 0) 1713 if (evpipe [0] >= 0)
1534 { 1714 {
1535 close (evpipe [0]); 1715 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1716 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1717 }
1538 } 1718 }
1719
1720#if EV_USE_SIGNALFD
1721 if (ev_is_active (&sigfd_w))
1722 close (sigfd);
1723#endif
1539 1724
1540#if EV_USE_INOTIFY 1725#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1726 if (fs_fd >= 0)
1542 close (fs_fd); 1727 close (fs_fd);
1543#endif 1728#endif
… …
1567#if EV_IDLE_ENABLE 1752#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1753 array_free (idle, [i]);
1569#endif 1754#endif
1570 } 1755 }
1571 1756
1572 ev_free (anfds); anfdmax = 0; 1757 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1758
1574 /* have to use the microsoft-never-gets-it-right macro */ 1759 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1760 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1761 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1762 array_free (timer, EMPTY);
… …
1612 1797
1613 if (ev_is_active (&pipe_w)) 1798 if (ev_is_active (&pipe_w))
1614 { 1799 {
1615 /* this "locks" the handlers against writing to the pipe */ 1800 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1801 /* while we modify the fd vars */
1617 gotsig = 1; 1802 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1803#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1804 async_pending = 1;
1620#endif 1805#endif
1621 1806
1622 ev_ref (EV_A); 1807 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1808 ev_io_stop (EV_A_ &pipe_w);
1624 1809
… …
1627 close (evfd); 1812 close (evfd);
1628#endif 1813#endif
1629 1814
1630 if (evpipe [0] >= 0) 1815 if (evpipe [0] >= 0)
1631 { 1816 {
1632 close (evpipe [0]); 1817 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1818 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1819 }
1635 1820
1821#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1636 evpipe_init (EV_A); 1822 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1823 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1824 pipecb (EV_A_ &pipe_w, EV_READ);
1825#endif
1639 } 1826 }
1640 1827
1641 postfork = 0; 1828 postfork = 0;
1642} 1829}
1643 1830
1644#if EV_MULTIPLICITY 1831#if EV_MULTIPLICITY
1645 1832
1646struct ev_loop * 1833struct ev_loop *
1647ev_loop_new (unsigned int flags) 1834ev_loop_new (unsigned int flags)
1648{ 1835{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1836 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1837
1651 memset (loop, 0, sizeof (struct ev_loop)); 1838 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1839 loop_init (EV_A_ flags);
1654 1840
1655 if (ev_backend (EV_A)) 1841 if (ev_backend (EV_A))
1656 return loop; 1842 return EV_A;
1657 1843
1658 return 0; 1844 return 0;
1659} 1845}
1660 1846
1661void 1847void
… …
1706 verify_watcher (EV_A_ ws [cnt]); 1892 verify_watcher (EV_A_ ws [cnt]);
1707 } 1893 }
1708} 1894}
1709#endif 1895#endif
1710 1896
1711#if EV_MINIMAL < 2 1897#if EV_FEATURE_API
1712void 1898void
1713ev_loop_verify (EV_P) 1899ev_verify (EV_P)
1714{ 1900{
1715#if EV_VERIFY 1901#if EV_VERIFY
1716 int i; 1902 int i;
1717 WL w; 1903 WL w;
1718 1904
… …
1757#if EV_ASYNC_ENABLE 1943#if EV_ASYNC_ENABLE
1758 assert (asyncmax >= asynccnt); 1944 assert (asyncmax >= asynccnt);
1759 array_verify (EV_A_ (W *)asyncs, asynccnt); 1945 array_verify (EV_A_ (W *)asyncs, asynccnt);
1760#endif 1946#endif
1761 1947
1948#if EV_PREPARE_ENABLE
1762 assert (preparemax >= preparecnt); 1949 assert (preparemax >= preparecnt);
1763 array_verify (EV_A_ (W *)prepares, preparecnt); 1950 array_verify (EV_A_ (W *)prepares, preparecnt);
1951#endif
1764 1952
1953#if EV_CHECK_ENABLE
1765 assert (checkmax >= checkcnt); 1954 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 1955 array_verify (EV_A_ (W *)checks, checkcnt);
1956#endif
1767 1957
1768# if 0 1958# if 0
1959#if EV_CHILD_ENABLE
1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1960 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1770 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1961 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1962#endif
1771# endif 1963# endif
1772#endif 1964#endif
1773} 1965}
1774#endif 1966#endif
1775 1967
… …
1782#endif 1974#endif
1783{ 1975{
1784 if (!ev_default_loop_ptr) 1976 if (!ev_default_loop_ptr)
1785 { 1977 {
1786#if EV_MULTIPLICITY 1978#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1979 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 1980#else
1789 ev_default_loop_ptr = 1; 1981 ev_default_loop_ptr = 1;
1790#endif 1982#endif
1791 1983
1792 loop_init (EV_A_ flags); 1984 loop_init (EV_A_ flags);
1793 1985
1794 if (ev_backend (EV_A)) 1986 if (ev_backend (EV_A))
1795 { 1987 {
1796#ifndef _WIN32 1988#if EV_CHILD_ENABLE
1797 ev_signal_init (&childev, childcb, SIGCHLD); 1989 ev_signal_init (&childev, childcb, SIGCHLD);
1798 ev_set_priority (&childev, EV_MAXPRI); 1990 ev_set_priority (&childev, EV_MAXPRI);
1799 ev_signal_start (EV_A_ &childev); 1991 ev_signal_start (EV_A_ &childev);
1800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1992 ev_unref (EV_A); /* child watcher should not keep loop alive */
1801#endif 1993#endif
… …
1809 2001
1810void 2002void
1811ev_default_destroy (void) 2003ev_default_destroy (void)
1812{ 2004{
1813#if EV_MULTIPLICITY 2005#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr; 2006 EV_P = ev_default_loop_ptr;
1815#endif 2007#endif
1816 2008
1817 ev_default_loop_ptr = 0; 2009 ev_default_loop_ptr = 0;
1818 2010
1819#ifndef _WIN32 2011#if EV_CHILD_ENABLE
1820 ev_ref (EV_A); /* child watcher */ 2012 ev_ref (EV_A); /* child watcher */
1821 ev_signal_stop (EV_A_ &childev); 2013 ev_signal_stop (EV_A_ &childev);
1822#endif 2014#endif
1823 2015
1824 loop_destroy (EV_A); 2016 loop_destroy (EV_A);
… …
1826 2018
1827void 2019void
1828ev_default_fork (void) 2020ev_default_fork (void)
1829{ 2021{
1830#if EV_MULTIPLICITY 2022#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr; 2023 EV_P = ev_default_loop_ptr;
1832#endif 2024#endif
1833 2025
1834 postfork = 1; /* must be in line with ev_loop_fork */ 2026 postfork = 1; /* must be in line with ev_loop_fork */
1835} 2027}
1836 2028
… …
1930 EV_FREQUENT_CHECK; 2122 EV_FREQUENT_CHECK;
1931 feed_reverse (EV_A_ (W)w); 2123 feed_reverse (EV_A_ (W)w);
1932 } 2124 }
1933 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2125 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1934 2126
1935 feed_reverse_done (EV_A_ EV_TIMEOUT); 2127 feed_reverse_done (EV_A_ EV_TIMER);
1936 } 2128 }
1937} 2129}
1938 2130
1939#if EV_PERIODIC_ENABLE 2131#if EV_PERIODIC_ENABLE
1940/* make periodics pending */ 2132/* make periodics pending */
… …
1993 feed_reverse_done (EV_A_ EV_PERIODIC); 2185 feed_reverse_done (EV_A_ EV_PERIODIC);
1994 } 2186 }
1995} 2187}
1996 2188
1997/* simply recalculate all periodics */ 2189/* simply recalculate all periodics */
1998/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2190/* TODO: maybe ensure that at least one event happens when jumping forward? */
1999static void noinline 2191static void noinline
2000periodics_reschedule (EV_P) 2192periodics_reschedule (EV_P)
2001{ 2193{
2002 int i; 2194 int i;
2003 2195
… …
2031 ANHE_at_cache (*he); 2223 ANHE_at_cache (*he);
2032 } 2224 }
2033} 2225}
2034 2226
2035/* fetch new monotonic and realtime times from the kernel */ 2227/* fetch new monotonic and realtime times from the kernel */
2036/* also detetc if there was a timejump, and act accordingly */ 2228/* also detect if there was a timejump, and act accordingly */
2037inline_speed void 2229inline_speed void
2038time_update (EV_P_ ev_tstamp max_block) 2230time_update (EV_P_ ev_tstamp max_block)
2039{ 2231{
2040#if EV_USE_MONOTONIC 2232#if EV_USE_MONOTONIC
2041 if (expect_true (have_monotonic)) 2233 if (expect_true (have_monotonic))
… …
2101} 2293}
2102 2294
2103void 2295void
2104ev_loop (EV_P_ int flags) 2296ev_loop (EV_P_ int flags)
2105{ 2297{
2106#if EV_MINIMAL < 2 2298#if EV_FEATURE_API
2107 ++loop_depth; 2299 ++loop_depth;
2108#endif 2300#endif
2109 2301
2110 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2302 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2111 2303
… …
2114 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2306 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2115 2307
2116 do 2308 do
2117 { 2309 {
2118#if EV_VERIFY >= 2 2310#if EV_VERIFY >= 2
2119 ev_loop_verify (EV_A); 2311 ev_verify (EV_A);
2120#endif 2312#endif
2121 2313
2122#ifndef _WIN32 2314#ifndef _WIN32
2123 if (expect_false (curpid)) /* penalise the forking check even more */ 2315 if (expect_false (curpid)) /* penalise the forking check even more */
2124 if (expect_false (getpid () != curpid)) 2316 if (expect_false (getpid () != curpid))
… …
2136 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2328 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2137 EV_INVOKE_PENDING; 2329 EV_INVOKE_PENDING;
2138 } 2330 }
2139#endif 2331#endif
2140 2332
2333#if EV_PREPARE_ENABLE
2141 /* queue prepare watchers (and execute them) */ 2334 /* queue prepare watchers (and execute them) */
2142 if (expect_false (preparecnt)) 2335 if (expect_false (preparecnt))
2143 { 2336 {
2144 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2337 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2145 EV_INVOKE_PENDING; 2338 EV_INVOKE_PENDING;
2146 } 2339 }
2340#endif
2147 2341
2148 if (expect_false (loop_done)) 2342 if (expect_false (loop_done))
2149 break; 2343 break;
2150 2344
2151 /* we might have forked, so reify kernel state if necessary */ 2345 /* we might have forked, so reify kernel state if necessary */
… …
2202 waittime -= sleeptime; 2396 waittime -= sleeptime;
2203 } 2397 }
2204 } 2398 }
2205 } 2399 }
2206 2400
2207#if EV_MINIMAL < 2 2401#if EV_FEATURE_API
2208 ++loop_count; 2402 ++loop_count;
2209#endif 2403#endif
2210 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2404 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2211 backend_poll (EV_A_ waittime); 2405 backend_poll (EV_A_ waittime);
2212 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2406 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
… …
2224#if EV_IDLE_ENABLE 2418#if EV_IDLE_ENABLE
2225 /* queue idle watchers unless other events are pending */ 2419 /* queue idle watchers unless other events are pending */
2226 idle_reify (EV_A); 2420 idle_reify (EV_A);
2227#endif 2421#endif
2228 2422
2423#if EV_CHECK_ENABLE
2229 /* queue check watchers, to be executed first */ 2424 /* queue check watchers, to be executed first */
2230 if (expect_false (checkcnt)) 2425 if (expect_false (checkcnt))
2231 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2426 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2427#endif
2232 2428
2233 EV_INVOKE_PENDING; 2429 EV_INVOKE_PENDING;
2234 } 2430 }
2235 while (expect_true ( 2431 while (expect_true (
2236 activecnt 2432 activecnt
… …
2239 )); 2435 ));
2240 2436
2241 if (loop_done == EVUNLOOP_ONE) 2437 if (loop_done == EVUNLOOP_ONE)
2242 loop_done = EVUNLOOP_CANCEL; 2438 loop_done = EVUNLOOP_CANCEL;
2243 2439
2244#if EV_MINIMAL < 2 2440#if EV_FEATURE_API
2245 --loop_depth; 2441 --loop_depth;
2246#endif 2442#endif
2247} 2443}
2248 2444
2249void 2445void
… …
2302inline_size void 2498inline_size void
2303wlist_del (WL *head, WL elem) 2499wlist_del (WL *head, WL elem)
2304{ 2500{
2305 while (*head) 2501 while (*head)
2306 { 2502 {
2307 if (*head == elem) 2503 if (expect_true (*head == elem))
2308 { 2504 {
2309 *head = elem->next; 2505 *head = elem->next;
2310 return; 2506 break;
2311 } 2507 }
2312 2508
2313 head = &(*head)->next; 2509 head = &(*head)->next;
2314 } 2510 }
2315} 2511}
… …
2375 2571
2376 if (expect_false (ev_is_active (w))) 2572 if (expect_false (ev_is_active (w)))
2377 return; 2573 return;
2378 2574
2379 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2575 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2380 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2576 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2381 2577
2382 EV_FREQUENT_CHECK; 2578 EV_FREQUENT_CHECK;
2383 2579
2384 ev_start (EV_A_ (W)w, 1); 2580 ev_start (EV_A_ (W)w, 1);
2385 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2581 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2455 timers [active] = timers [timercnt + HEAP0]; 2651 timers [active] = timers [timercnt + HEAP0];
2456 adjustheap (timers, timercnt, active); 2652 adjustheap (timers, timercnt, active);
2457 } 2653 }
2458 } 2654 }
2459 2655
2460 EV_FREQUENT_CHECK;
2461
2462 ev_at (w) -= mn_now; 2656 ev_at (w) -= mn_now;
2463 2657
2464 ev_stop (EV_A_ (W)w); 2658 ev_stop (EV_A_ (W)w);
2659
2660 EV_FREQUENT_CHECK;
2465} 2661}
2466 2662
2467void noinline 2663void noinline
2468ev_timer_again (EV_P_ ev_timer *w) 2664ev_timer_again (EV_P_ ev_timer *w)
2469{ 2665{
… …
2548 periodics [active] = periodics [periodiccnt + HEAP0]; 2744 periodics [active] = periodics [periodiccnt + HEAP0];
2549 adjustheap (periodics, periodiccnt, active); 2745 adjustheap (periodics, periodiccnt, active);
2550 } 2746 }
2551 } 2747 }
2552 2748
2553 EV_FREQUENT_CHECK;
2554
2555 ev_stop (EV_A_ (W)w); 2749 ev_stop (EV_A_ (W)w);
2750
2751 EV_FREQUENT_CHECK;
2556} 2752}
2557 2753
2558void noinline 2754void noinline
2559ev_periodic_again (EV_P_ ev_periodic *w) 2755ev_periodic_again (EV_P_ ev_periodic *w)
2560{ 2756{
… …
2566 2762
2567#ifndef SA_RESTART 2763#ifndef SA_RESTART
2568# define SA_RESTART 0 2764# define SA_RESTART 0
2569#endif 2765#endif
2570 2766
2767#if EV_SIGNAL_ENABLE
2768
2571void noinline 2769void noinline
2572ev_signal_start (EV_P_ ev_signal *w) 2770ev_signal_start (EV_P_ ev_signal *w)
2573{ 2771{
2574#if EV_MULTIPLICITY
2575 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2576#endif
2577 if (expect_false (ev_is_active (w))) 2772 if (expect_false (ev_is_active (w)))
2578 return; 2773 return;
2579 2774
2580 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2775 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2581 2776
2582 evpipe_init (EV_A); 2777#if EV_MULTIPLICITY
2778 assert (("libev: a signal must not be attached to two different loops",
2779 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2583 2780
2584 EV_FREQUENT_CHECK; 2781 signals [w->signum - 1].loop = EV_A;
2782#endif
2585 2783
2784 EV_FREQUENT_CHECK;
2785
2786#if EV_USE_SIGNALFD
2787 if (sigfd == -2)
2586 { 2788 {
2587#ifndef _WIN32 2789 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2588 sigset_t full, prev; 2790 if (sigfd < 0 && errno == EINVAL)
2589 sigfillset (&full); 2791 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2590 sigprocmask (SIG_SETMASK, &full, &prev);
2591#endif
2592 2792
2593 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2793 if (sigfd >= 0)
2794 {
2795 fd_intern (sigfd); /* doing it twice will not hurt */
2594 2796
2595#ifndef _WIN32 2797 sigemptyset (&sigfd_set);
2596 sigprocmask (SIG_SETMASK, &prev, 0); 2798
2597#endif 2799 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2800 ev_set_priority (&sigfd_w, EV_MAXPRI);
2801 ev_io_start (EV_A_ &sigfd_w);
2802 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2803 }
2598 } 2804 }
2805
2806 if (sigfd >= 0)
2807 {
2808 /* TODO: check .head */
2809 sigaddset (&sigfd_set, w->signum);
2810 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2811
2812 signalfd (sigfd, &sigfd_set, 0);
2813 }
2814#endif
2599 2815
2600 ev_start (EV_A_ (W)w, 1); 2816 ev_start (EV_A_ (W)w, 1);
2601 wlist_add (&signals [w->signum - 1].head, (WL)w); 2817 wlist_add (&signals [w->signum - 1].head, (WL)w);
2602 2818
2603 if (!((WL)w)->next) 2819 if (!((WL)w)->next)
2820# if EV_USE_SIGNALFD
2821 if (sigfd < 0) /*TODO*/
2822# endif
2604 { 2823 {
2605#if _WIN32 2824# ifdef _WIN32
2825 evpipe_init (EV_A);
2826
2606 signal (w->signum, ev_sighandler); 2827 signal (w->signum, ev_sighandler);
2607#else 2828# else
2608 struct sigaction sa = { }; 2829 struct sigaction sa;
2830
2831 evpipe_init (EV_A);
2832
2609 sa.sa_handler = ev_sighandler; 2833 sa.sa_handler = ev_sighandler;
2610 sigfillset (&sa.sa_mask); 2834 sigfillset (&sa.sa_mask);
2611 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2835 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2612 sigaction (w->signum, &sa, 0); 2836 sigaction (w->signum, &sa, 0);
2837
2838 sigemptyset (&sa.sa_mask);
2839 sigaddset (&sa.sa_mask, w->signum);
2840 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2613#endif 2841#endif
2614 } 2842 }
2615 2843
2616 EV_FREQUENT_CHECK; 2844 EV_FREQUENT_CHECK;
2617} 2845}
2618 2846
2619void noinline 2847void noinline
… …
2627 2855
2628 wlist_del (&signals [w->signum - 1].head, (WL)w); 2856 wlist_del (&signals [w->signum - 1].head, (WL)w);
2629 ev_stop (EV_A_ (W)w); 2857 ev_stop (EV_A_ (W)w);
2630 2858
2631 if (!signals [w->signum - 1].head) 2859 if (!signals [w->signum - 1].head)
2860 {
2861#if EV_MULTIPLICITY
2862 signals [w->signum - 1].loop = 0; /* unattach from signal */
2863#endif
2864#if EV_USE_SIGNALFD
2865 if (sigfd >= 0)
2866 {
2867 sigset_t ss;
2868
2869 sigemptyset (&ss);
2870 sigaddset (&ss, w->signum);
2871 sigdelset (&sigfd_set, w->signum);
2872
2873 signalfd (sigfd, &sigfd_set, 0);
2874 sigprocmask (SIG_UNBLOCK, &ss, 0);
2875 }
2876 else
2877#endif
2632 signal (w->signum, SIG_DFL); 2878 signal (w->signum, SIG_DFL);
2879 }
2633 2880
2634 EV_FREQUENT_CHECK; 2881 EV_FREQUENT_CHECK;
2635} 2882}
2883
2884#endif
2885
2886#if EV_CHILD_ENABLE
2636 2887
2637void 2888void
2638ev_child_start (EV_P_ ev_child *w) 2889ev_child_start (EV_P_ ev_child *w)
2639{ 2890{
2640#if EV_MULTIPLICITY 2891#if EV_MULTIPLICITY
… …
2644 return; 2895 return;
2645 2896
2646 EV_FREQUENT_CHECK; 2897 EV_FREQUENT_CHECK;
2647 2898
2648 ev_start (EV_A_ (W)w, 1); 2899 ev_start (EV_A_ (W)w, 1);
2649 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2650 2901
2651 EV_FREQUENT_CHECK; 2902 EV_FREQUENT_CHECK;
2652} 2903}
2653 2904
2654void 2905void
… …
2658 if (expect_false (!ev_is_active (w))) 2909 if (expect_false (!ev_is_active (w)))
2659 return; 2910 return;
2660 2911
2661 EV_FREQUENT_CHECK; 2912 EV_FREQUENT_CHECK;
2662 2913
2663 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2914 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2664 ev_stop (EV_A_ (W)w); 2915 ev_stop (EV_A_ (W)w);
2665 2916
2666 EV_FREQUENT_CHECK; 2917 EV_FREQUENT_CHECK;
2667} 2918}
2919
2920#endif
2668 2921
2669#if EV_STAT_ENABLE 2922#if EV_STAT_ENABLE
2670 2923
2671# ifdef _WIN32 2924# ifdef _WIN32
2672# undef lstat 2925# undef lstat
… …
2678#define MIN_STAT_INTERVAL 0.1074891 2931#define MIN_STAT_INTERVAL 0.1074891
2679 2932
2680static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2933static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2681 2934
2682#if EV_USE_INOTIFY 2935#if EV_USE_INOTIFY
2683# define EV_INOTIFY_BUFSIZE 8192 2936
2937/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2938# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2684 2939
2685static void noinline 2940static void noinline
2686infy_add (EV_P_ ev_stat *w) 2941infy_add (EV_P_ ev_stat *w)
2687{ 2942{
2688 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2943 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2689 2944
2690 if (w->wd < 0) 2945 if (w->wd >= 0)
2946 {
2947 struct statfs sfs;
2948
2949 /* now local changes will be tracked by inotify, but remote changes won't */
2950 /* unless the filesystem is known to be local, we therefore still poll */
2951 /* also do poll on <2.6.25, but with normal frequency */
2952
2953 if (!fs_2625)
2954 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2955 else if (!statfs (w->path, &sfs)
2956 && (sfs.f_type == 0x1373 /* devfs */
2957 || sfs.f_type == 0xEF53 /* ext2/3 */
2958 || sfs.f_type == 0x3153464a /* jfs */
2959 || sfs.f_type == 0x52654973 /* reiser3 */
2960 || sfs.f_type == 0x01021994 /* tempfs */
2961 || sfs.f_type == 0x58465342 /* xfs */))
2962 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2963 else
2964 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2691 { 2965 }
2966 else
2967 {
2968 /* can't use inotify, continue to stat */
2692 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2969 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2693 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2694 2970
2695 /* monitor some parent directory for speedup hints */ 2971 /* if path is not there, monitor some parent directory for speedup hints */
2696 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2972 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2697 /* but an efficiency issue only */ 2973 /* but an efficiency issue only */
2698 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2974 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2699 { 2975 {
2700 char path [4096]; 2976 char path [4096];
… …
2716 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2992 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2717 } 2993 }
2718 } 2994 }
2719 2995
2720 if (w->wd >= 0) 2996 if (w->wd >= 0)
2721 {
2722 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2997 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2723 2998
2724 /* now local changes will be tracked by inotify, but remote changes won't */ 2999 /* now re-arm timer, if required */
2725 /* unless the filesystem it known to be local, we therefore still poll */ 3000 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2726 /* also do poll on <2.6.25, but with normal frequency */
2727 struct statfs sfs;
2728
2729 if (fs_2625 && !statfs (w->path, &sfs))
2730 if (sfs.f_type == 0x1373 /* devfs */
2731 || sfs.f_type == 0xEF53 /* ext2/3 */
2732 || sfs.f_type == 0x3153464a /* jfs */
2733 || sfs.f_type == 0x52654973 /* reiser3 */
2734 || sfs.f_type == 0x01021994 /* tempfs */
2735 || sfs.f_type == 0x58465342 /* xfs */)
2736 return;
2737
2738 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2739 ev_timer_again (EV_A_ &w->timer); 3001 ev_timer_again (EV_A_ &w->timer);
2740 } 3002 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2741} 3003}
2742 3004
2743static void noinline 3005static void noinline
2744infy_del (EV_P_ ev_stat *w) 3006infy_del (EV_P_ ev_stat *w)
2745{ 3007{
… …
2748 3010
2749 if (wd < 0) 3011 if (wd < 0)
2750 return; 3012 return;
2751 3013
2752 w->wd = -2; 3014 w->wd = -2;
2753 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3015 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2754 wlist_del (&fs_hash [slot].head, (WL)w); 3016 wlist_del (&fs_hash [slot].head, (WL)w);
2755 3017
2756 /* remove this watcher, if others are watching it, they will rearm */ 3018 /* remove this watcher, if others are watching it, they will rearm */
2757 inotify_rm_watch (fs_fd, wd); 3019 inotify_rm_watch (fs_fd, wd);
2758} 3020}
… …
2760static void noinline 3022static void noinline
2761infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3023infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2762{ 3024{
2763 if (slot < 0) 3025 if (slot < 0)
2764 /* overflow, need to check for all hash slots */ 3026 /* overflow, need to check for all hash slots */
2765 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3027 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2766 infy_wd (EV_A_ slot, wd, ev); 3028 infy_wd (EV_A_ slot, wd, ev);
2767 else 3029 else
2768 { 3030 {
2769 WL w_; 3031 WL w_;
2770 3032
2771 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3033 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2772 { 3034 {
2773 ev_stat *w = (ev_stat *)w_; 3035 ev_stat *w = (ev_stat *)w_;
2774 w_ = w_->next; /* lets us remove this watcher and all before it */ 3036 w_ = w_->next; /* lets us remove this watcher and all before it */
2775 3037
2776 if (w->wd == wd || wd == -1) 3038 if (w->wd == wd || wd == -1)
2777 { 3039 {
2778 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3040 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2779 { 3041 {
2780 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3042 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2781 w->wd = -1; 3043 w->wd = -1;
2782 infy_add (EV_A_ w); /* re-add, no matter what */ 3044 infy_add (EV_A_ w); /* re-add, no matter what */
2783 } 3045 }
2784 3046
2785 stat_timer_cb (EV_A_ &w->timer, 0); 3047 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2790 3052
2791static void 3053static void
2792infy_cb (EV_P_ ev_io *w, int revents) 3054infy_cb (EV_P_ ev_io *w, int revents)
2793{ 3055{
2794 char buf [EV_INOTIFY_BUFSIZE]; 3056 char buf [EV_INOTIFY_BUFSIZE];
2795 struct inotify_event *ev = (struct inotify_event *)buf;
2796 int ofs; 3057 int ofs;
2797 int len = read (fs_fd, buf, sizeof (buf)); 3058 int len = read (fs_fd, buf, sizeof (buf));
2798 3059
2799 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3060 for (ofs = 0; ofs < len; )
3061 {
3062 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2800 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3063 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3064 ofs += sizeof (struct inotify_event) + ev->len;
3065 }
3066}
3067
3068inline_size unsigned int
3069ev_linux_version (void)
3070{
3071 struct utsname buf;
3072 unsigned int v;
3073 int i;
3074 char *p = buf.release;
3075
3076 if (uname (&buf))
3077 return 0;
3078
3079 for (i = 3+1; --i; )
3080 {
3081 unsigned int c = 0;
3082
3083 for (;;)
3084 {
3085 if (*p >= '0' && *p <= '9')
3086 c = c * 10 + *p++ - '0';
3087 else
3088 {
3089 p += *p == '.';
3090 break;
3091 }
3092 }
3093
3094 v = (v << 8) | c;
3095 }
3096
3097 return v;
2801} 3098}
2802 3099
2803inline_size void 3100inline_size void
2804check_2625 (EV_P) 3101ev_check_2625 (EV_P)
2805{ 3102{
2806 /* kernels < 2.6.25 are borked 3103 /* kernels < 2.6.25 are borked
2807 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3104 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2808 */ 3105 */
2809 struct utsname buf; 3106 if (ev_linux_version () < 0x020619)
2810 int major, minor, micro;
2811
2812 if (uname (&buf))
2813 return; 3107 return;
2814 3108
2815 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2816 return;
2817
2818 if (major < 2
2819 || (major == 2 && minor < 6)
2820 || (major == 2 && minor == 6 && micro < 25))
2821 return;
2822
2823 fs_2625 = 1; 3109 fs_2625 = 1;
3110}
3111
3112inline_size int
3113infy_newfd (void)
3114{
3115#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3116 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3117 if (fd >= 0)
3118 return fd;
3119#endif
3120 return inotify_init ();
2824} 3121}
2825 3122
2826inline_size void 3123inline_size void
2827infy_init (EV_P) 3124infy_init (EV_P)
2828{ 3125{
2829 if (fs_fd != -2) 3126 if (fs_fd != -2)
2830 return; 3127 return;
2831 3128
2832 fs_fd = -1; 3129 fs_fd = -1;
2833 3130
2834 check_2625 (EV_A); 3131 ev_check_2625 (EV_A);
2835 3132
2836 fs_fd = inotify_init (); 3133 fs_fd = infy_newfd ();
2837 3134
2838 if (fs_fd >= 0) 3135 if (fs_fd >= 0)
2839 { 3136 {
3137 fd_intern (fs_fd);
2840 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3138 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2841 ev_set_priority (&fs_w, EV_MAXPRI); 3139 ev_set_priority (&fs_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &fs_w); 3140 ev_io_start (EV_A_ &fs_w);
3141 ev_unref (EV_A);
2843 } 3142 }
2844} 3143}
2845 3144
2846inline_size void 3145inline_size void
2847infy_fork (EV_P) 3146infy_fork (EV_P)
… …
2849 int slot; 3148 int slot;
2850 3149
2851 if (fs_fd < 0) 3150 if (fs_fd < 0)
2852 return; 3151 return;
2853 3152
3153 ev_ref (EV_A);
3154 ev_io_stop (EV_A_ &fs_w);
2854 close (fs_fd); 3155 close (fs_fd);
2855 fs_fd = inotify_init (); 3156 fs_fd = infy_newfd ();
2856 3157
3158 if (fs_fd >= 0)
3159 {
3160 fd_intern (fs_fd);
3161 ev_io_set (&fs_w, fs_fd, EV_READ);
3162 ev_io_start (EV_A_ &fs_w);
3163 ev_unref (EV_A);
3164 }
3165
2857 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3166 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2858 { 3167 {
2859 WL w_ = fs_hash [slot].head; 3168 WL w_ = fs_hash [slot].head;
2860 fs_hash [slot].head = 0; 3169 fs_hash [slot].head = 0;
2861 3170
2862 while (w_) 3171 while (w_)
… …
2867 w->wd = -1; 3176 w->wd = -1;
2868 3177
2869 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
2870 infy_add (EV_A_ w); /* re-add, no matter what */ 3179 infy_add (EV_A_ w); /* re-add, no matter what */
2871 else 3180 else
3181 {
3182 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3183 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 ev_timer_again (EV_A_ &w->timer); 3184 ev_timer_again (EV_A_ &w->timer);
3185 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3186 }
2873 } 3187 }
2874 } 3188 }
2875} 3189}
2876 3190
2877#endif 3191#endif
… …
2894static void noinline 3208static void noinline
2895stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3209stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2896{ 3210{
2897 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3211 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2898 3212
2899 /* we copy this here each the time so that */ 3213 ev_statdata prev = w->attr;
2900 /* prev has the old value when the callback gets invoked */
2901 w->prev = w->attr;
2902 ev_stat_stat (EV_A_ w); 3214 ev_stat_stat (EV_A_ w);
2903 3215
2904 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3216 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2905 if ( 3217 if (
2906 w->prev.st_dev != w->attr.st_dev 3218 prev.st_dev != w->attr.st_dev
2907 || w->prev.st_ino != w->attr.st_ino 3219 || prev.st_ino != w->attr.st_ino
2908 || w->prev.st_mode != w->attr.st_mode 3220 || prev.st_mode != w->attr.st_mode
2909 || w->prev.st_nlink != w->attr.st_nlink 3221 || prev.st_nlink != w->attr.st_nlink
2910 || w->prev.st_uid != w->attr.st_uid 3222 || prev.st_uid != w->attr.st_uid
2911 || w->prev.st_gid != w->attr.st_gid 3223 || prev.st_gid != w->attr.st_gid
2912 || w->prev.st_rdev != w->attr.st_rdev 3224 || prev.st_rdev != w->attr.st_rdev
2913 || w->prev.st_size != w->attr.st_size 3225 || prev.st_size != w->attr.st_size
2914 || w->prev.st_atime != w->attr.st_atime 3226 || prev.st_atime != w->attr.st_atime
2915 || w->prev.st_mtime != w->attr.st_mtime 3227 || prev.st_mtime != w->attr.st_mtime
2916 || w->prev.st_ctime != w->attr.st_ctime 3228 || prev.st_ctime != w->attr.st_ctime
2917 ) { 3229 ) {
3230 /* we only update w->prev on actual differences */
3231 /* in case we test more often than invoke the callback, */
3232 /* to ensure that prev is always different to attr */
3233 w->prev = prev;
3234
2918 #if EV_USE_INOTIFY 3235 #if EV_USE_INOTIFY
2919 if (fs_fd >= 0) 3236 if (fs_fd >= 0)
2920 { 3237 {
2921 infy_del (EV_A_ w); 3238 infy_del (EV_A_ w);
2922 infy_add (EV_A_ w); 3239 infy_add (EV_A_ w);
… …
2947 3264
2948 if (fs_fd >= 0) 3265 if (fs_fd >= 0)
2949 infy_add (EV_A_ w); 3266 infy_add (EV_A_ w);
2950 else 3267 else
2951#endif 3268#endif
3269 {
2952 ev_timer_again (EV_A_ &w->timer); 3270 ev_timer_again (EV_A_ &w->timer);
3271 ev_unref (EV_A);
3272 }
2953 3273
2954 ev_start (EV_A_ (W)w, 1); 3274 ev_start (EV_A_ (W)w, 1);
2955 3275
2956 EV_FREQUENT_CHECK; 3276 EV_FREQUENT_CHECK;
2957} 3277}
… …
2966 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
2967 3287
2968#if EV_USE_INOTIFY 3288#if EV_USE_INOTIFY
2969 infy_del (EV_A_ w); 3289 infy_del (EV_A_ w);
2970#endif 3290#endif
3291
3292 if (ev_is_active (&w->timer))
3293 {
3294 ev_ref (EV_A);
2971 ev_timer_stop (EV_A_ &w->timer); 3295 ev_timer_stop (EV_A_ &w->timer);
3296 }
2972 3297
2973 ev_stop (EV_A_ (W)w); 3298 ev_stop (EV_A_ (W)w);
2974 3299
2975 EV_FREQUENT_CHECK; 3300 EV_FREQUENT_CHECK;
2976} 3301}
… …
3021 3346
3022 EV_FREQUENT_CHECK; 3347 EV_FREQUENT_CHECK;
3023} 3348}
3024#endif 3349#endif
3025 3350
3351#if EV_PREPARE_ENABLE
3026void 3352void
3027ev_prepare_start (EV_P_ ev_prepare *w) 3353ev_prepare_start (EV_P_ ev_prepare *w)
3028{ 3354{
3029 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
3030 return; 3356 return;
… …
3056 3382
3057 ev_stop (EV_A_ (W)w); 3383 ev_stop (EV_A_ (W)w);
3058 3384
3059 EV_FREQUENT_CHECK; 3385 EV_FREQUENT_CHECK;
3060} 3386}
3387#endif
3061 3388
3389#if EV_CHECK_ENABLE
3062void 3390void
3063ev_check_start (EV_P_ ev_check *w) 3391ev_check_start (EV_P_ ev_check *w)
3064{ 3392{
3065 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
3066 return; 3394 return;
… …
3092 3420
3093 ev_stop (EV_A_ (W)w); 3421 ev_stop (EV_A_ (W)w);
3094 3422
3095 EV_FREQUENT_CHECK; 3423 EV_FREQUENT_CHECK;
3096} 3424}
3425#endif
3097 3426
3098#if EV_EMBED_ENABLE 3427#if EV_EMBED_ENABLE
3099void noinline 3428void noinline
3100ev_embed_sweep (EV_P_ ev_embed *w) 3429ev_embed_sweep (EV_P_ ev_embed *w)
3101{ 3430{
… …
3117embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3446embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3118{ 3447{
3119 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3448 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3120 3449
3121 { 3450 {
3122 struct ev_loop *loop = w->other; 3451 EV_P = w->other;
3123 3452
3124 while (fdchangecnt) 3453 while (fdchangecnt)
3125 { 3454 {
3126 fd_reify (EV_A); 3455 fd_reify (EV_A);
3127 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3456 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3135 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3464 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3136 3465
3137 ev_embed_stop (EV_A_ w); 3466 ev_embed_stop (EV_A_ w);
3138 3467
3139 { 3468 {
3140 struct ev_loop *loop = w->other; 3469 EV_P = w->other;
3141 3470
3142 ev_loop_fork (EV_A); 3471 ev_loop_fork (EV_A);
3143 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3472 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3144 } 3473 }
3145 3474
… …
3159{ 3488{
3160 if (expect_false (ev_is_active (w))) 3489 if (expect_false (ev_is_active (w)))
3161 return; 3490 return;
3162 3491
3163 { 3492 {
3164 struct ev_loop *loop = w->other; 3493 EV_P = w->other;
3165 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3494 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3166 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3495 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3167 } 3496 }
3168 3497
3169 EV_FREQUENT_CHECK; 3498 EV_FREQUENT_CHECK;
… …
3196 3525
3197 ev_io_stop (EV_A_ &w->io); 3526 ev_io_stop (EV_A_ &w->io);
3198 ev_prepare_stop (EV_A_ &w->prepare); 3527 ev_prepare_stop (EV_A_ &w->prepare);
3199 ev_fork_stop (EV_A_ &w->fork); 3528 ev_fork_stop (EV_A_ &w->fork);
3200 3529
3530 ev_stop (EV_A_ (W)w);
3531
3201 EV_FREQUENT_CHECK; 3532 EV_FREQUENT_CHECK;
3202} 3533}
3203#endif 3534#endif
3204 3535
3205#if EV_FORK_ENABLE 3536#if EV_FORK_ENABLE
… …
3281 3612
3282void 3613void
3283ev_async_send (EV_P_ ev_async *w) 3614ev_async_send (EV_P_ ev_async *w)
3284{ 3615{
3285 w->sent = 1; 3616 w->sent = 1;
3286 evpipe_write (EV_A_ &gotasync); 3617 evpipe_write (EV_A_ &async_pending);
3287} 3618}
3288#endif 3619#endif
3289 3620
3290/*****************************************************************************/ 3621/*****************************************************************************/
3291 3622
… …
3331{ 3662{
3332 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3663 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3333 3664
3334 if (expect_false (!once)) 3665 if (expect_false (!once))
3335 { 3666 {
3336 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3667 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3337 return; 3668 return;
3338 } 3669 }
3339 3670
3340 once->cb = cb; 3671 once->cb = cb;
3341 once->arg = arg; 3672 once->arg = arg;
… …
3428 if (types & EV_ASYNC) 3759 if (types & EV_ASYNC)
3429 for (i = asynccnt; i--; ) 3760 for (i = asynccnt; i--; )
3430 cb (EV_A_ EV_ASYNC, asyncs [i]); 3761 cb (EV_A_ EV_ASYNC, asyncs [i]);
3431#endif 3762#endif
3432 3763
3764#if EV_PREPARE_ENABLE
3433 if (types & EV_PREPARE) 3765 if (types & EV_PREPARE)
3434 for (i = preparecnt; i--; ) 3766 for (i = preparecnt; i--; )
3435#if EV_EMBED_ENABLE 3767# if EV_EMBED_ENABLE
3436 if (ev_cb (prepares [i]) != embed_prepare_cb) 3768 if (ev_cb (prepares [i]) != embed_prepare_cb)
3437#endif 3769# endif
3438 cb (EV_A_ EV_PREPARE, prepares [i]); 3770 cb (EV_A_ EV_PREPARE, prepares [i]);
3771#endif
3439 3772
3773#if EV_CHECK_ENABLE
3440 if (types & EV_CHECK) 3774 if (types & EV_CHECK)
3441 for (i = checkcnt; i--; ) 3775 for (i = checkcnt; i--; )
3442 cb (EV_A_ EV_CHECK, checks [i]); 3776 cb (EV_A_ EV_CHECK, checks [i]);
3777#endif
3443 3778
3779#if EV_SIGNAL_ENABLE
3444 if (types & EV_SIGNAL) 3780 if (types & EV_SIGNAL)
3445 for (i = 0; i < signalmax; ++i) 3781 for (i = 0; i < EV_NSIG - 1; ++i)
3446 for (wl = signals [i].head; wl; ) 3782 for (wl = signals [i].head; wl; )
3447 { 3783 {
3448 wn = wl->next; 3784 wn = wl->next;
3449 cb (EV_A_ EV_SIGNAL, wl); 3785 cb (EV_A_ EV_SIGNAL, wl);
3450 wl = wn; 3786 wl = wn;
3451 } 3787 }
3788#endif
3452 3789
3790#if EV_CHILD_ENABLE
3453 if (types & EV_CHILD) 3791 if (types & EV_CHILD)
3454 for (i = EV_PID_HASHSIZE; i--; ) 3792 for (i = (EV_PID_HASHSIZE); i--; )
3455 for (wl = childs [i]; wl; ) 3793 for (wl = childs [i]; wl; )
3456 { 3794 {
3457 wn = wl->next; 3795 wn = wl->next;
3458 cb (EV_A_ EV_CHILD, wl); 3796 cb (EV_A_ EV_CHILD, wl);
3459 wl = wn; 3797 wl = wn;
3460 } 3798 }
3799#endif
3461/* EV_STAT 0x00001000 /* stat data changed */ 3800/* EV_STAT 0x00001000 /* stat data changed */
3462/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3801/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3463} 3802}
3464#endif 3803#endif
3465 3804

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines