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

Comparing libev/ev.c (file contents):
Revision 1.302 by root, Thu Jul 16 15:08:08 2009 UTC vs.
Revision 1.354 by root, Fri Oct 22 09:24:11 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 *
… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 98# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 106# ifndef EV_USE_EPOLL
109# else 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 115# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# ifndef EV_USE_PORT
125# else 125# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 133# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
138# ifndef EV_USE_EVENTFD 142# ifndef EV_USE_SIGNALFD
139# if HAVE_EVENTFD 143# define EV_USE_SIGNALFD EV_FEATURE_OS
140# define EV_USE_EVENTFD 1
141# else
142# define EV_USE_EVENTFD 0
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
148# endif
149
150# if HAVE_EVENTFD
151# ifndef EV_USE_EVENTFD
152# define EV_USE_EVENTFD EV_FEATURE_OS
153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
144# endif 157# endif
145 158
146#endif 159#endif
147 160
148#include <math.h> 161#include <math.h>
149#include <stdlib.h> 162#include <stdlib.h>
163#include <string.h>
150#include <fcntl.h> 164#include <fcntl.h>
151#include <stddef.h> 165#include <stddef.h>
152 166
153#include <stdio.h> 167#include <stdio.h>
154 168
155#include <assert.h> 169#include <assert.h>
156#include <errno.h> 170#include <errno.h>
157#include <sys/types.h> 171#include <sys/types.h>
158#include <time.h> 172#include <time.h>
173#include <limits.h>
159 174
160#include <signal.h> 175#include <signal.h>
161 176
162#ifdef EV_H 177#ifdef EV_H
163# include EV_H 178# include EV_H
164#else 179#else
165# include "ev.h" 180# include "ev.h"
166#endif 181#endif
182
183EV_CPP(extern "C" {)
167 184
168#ifndef _WIN32 185#ifndef _WIN32
169# include <sys/time.h> 186# include <sys/time.h>
170# include <sys/wait.h> 187# include <sys/wait.h>
171# include <unistd.h> 188# include <unistd.h>
… …
174# define WIN32_LEAN_AND_MEAN 191# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 192# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
178# endif 195# endif
196# undef EV_AVOID_STDIO
179#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
180 206
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
208
209/* try to deduce the maximum number of signals on this platform */
210#if defined (EV_NSIG)
211/* use what's provided */
212#elif defined (NSIG)
213# define EV_NSIG (NSIG)
214#elif defined(_NSIG)
215# define EV_NSIG (_NSIG)
216#elif defined (SIGMAX)
217# define EV_NSIG (SIGMAX+1)
218#elif defined (SIG_MAX)
219# define EV_NSIG (SIG_MAX+1)
220#elif defined (_SIG_MAX)
221# define EV_NSIG (_SIG_MAX+1)
222#elif defined (MAXSIG)
223# define EV_NSIG (MAXSIG+1)
224#elif defined (MAX_SIG)
225# define EV_NSIG (MAX_SIG+1)
226#elif defined (SIGARRAYSIZE)
227# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
228#elif defined (_sys_nsig)
229# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
230#else
231# error "unable to find value for NSIG, please report"
232/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */
234# define EV_NSIG 65
235#endif
182 236
183#ifndef EV_USE_CLOCK_SYSCALL 237#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 238# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 240# else
187# define EV_USE_CLOCK_SYSCALL 0 241# define EV_USE_CLOCK_SYSCALL 0
188# endif 242# endif
189#endif 243#endif
190 244
191#ifndef EV_USE_MONOTONIC 245#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 246# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 247# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 248# else
195# define EV_USE_MONOTONIC 0 249# define EV_USE_MONOTONIC 0
196# endif 250# endif
197#endif 251#endif
198 252
… …
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 254# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 255#endif
202 256
203#ifndef EV_USE_NANOSLEEP 257#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 258# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 259# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 260# else
207# define EV_USE_NANOSLEEP 0 261# define EV_USE_NANOSLEEP 0
208# endif 262# endif
209#endif 263#endif
210 264
211#ifndef EV_USE_SELECT 265#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 266# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 267#endif
214 268
215#ifndef EV_USE_POLL 269#ifndef EV_USE_POLL
216# ifdef _WIN32 270# ifdef _WIN32
217# define EV_USE_POLL 0 271# define EV_USE_POLL 0
218# else 272# else
219# define EV_USE_POLL 1 273# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 274# endif
221#endif 275#endif
222 276
223#ifndef EV_USE_EPOLL 277#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 278# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 279# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 280# else
227# define EV_USE_EPOLL 0 281# define EV_USE_EPOLL 0
228# endif 282# endif
229#endif 283#endif
230 284
… …
236# define EV_USE_PORT 0 290# define EV_USE_PORT 0
237#endif 291#endif
238 292
239#ifndef EV_USE_INOTIFY 293#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 294# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 295# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 296# else
243# define EV_USE_INOTIFY 0 297# define EV_USE_INOTIFY 0
244# endif 298# endif
245#endif 299#endif
246 300
247#ifndef EV_PID_HASHSIZE 301#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 302# 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 303#endif
254 304
255#ifndef EV_INOTIFY_HASHSIZE 305#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 306# 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 307#endif
262 308
263#ifndef EV_USE_EVENTFD 309#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 311# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 312# else
267# define EV_USE_EVENTFD 0 313# define EV_USE_EVENTFD 0
314# endif
315#endif
316
317#ifndef EV_USE_SIGNALFD
318# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
319# define EV_USE_SIGNALFD EV_FEATURE_OS
320# else
321# define EV_USE_SIGNALFD 0
268# endif 322# endif
269#endif 323#endif
270 324
271#if 0 /* debugging */ 325#if 0 /* debugging */
272# define EV_VERIFY 3 326# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 327# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 328# define EV_HEAP_CACHE_AT 1
275#endif 329#endif
276 330
277#ifndef EV_VERIFY 331#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 332# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 333#endif
280 334
281#ifndef EV_USE_4HEAP 335#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 336# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 337#endif
284 338
285#ifndef EV_HEAP_CACHE_AT 339#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 340# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif 341#endif
288 342
289/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 343/* 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. */ 344/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL 345#if EV_USE_CLOCK_SYSCALL
… …
300# endif 354# endif
301#endif 355#endif
302 356
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 357/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 358
359#ifdef _AIX
360/* AIX has a completely broken poll.h header */
361# undef EV_USE_POLL
362# define EV_USE_POLL 0
363#endif
364
305#ifndef CLOCK_MONOTONIC 365#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 366# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 367# define EV_USE_MONOTONIC 0
308#endif 368#endif
309 369
… …
339#endif 399#endif
340 400
341#if EV_USE_EVENTFD 401#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 402/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 403# include <stdint.h>
344# ifdef __cplusplus 404# ifndef EFD_NONBLOCK
345extern "C" { 405# define EFD_NONBLOCK O_NONBLOCK
346# endif 406# endif
347int eventfd (unsigned int initval, int flags); 407# ifndef EFD_CLOEXEC
348# ifdef __cplusplus 408# ifdef O_CLOEXEC
349} 409# define EFD_CLOEXEC O_CLOEXEC
410# else
411# define EFD_CLOEXEC 02000000
412# endif
350# endif 413# endif
414EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
415#endif
416
417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
422# endif
423# ifndef SFD_CLOEXEC
424# ifdef O_CLOEXEC
425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
429# endif
430EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
351#endif 437#endif
352 438
353/**/ 439/**/
354 440
355#if EV_VERIFY >= 3 441#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 442# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 443#else
358# define EV_FREQUENT_CHECK do { } while (0) 444# define EV_FREQUENT_CHECK do { } while (0)
359#endif 445#endif
360 446
361/* 447/*
… …
368 */ 454 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 456
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 457#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) */ 458#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 */ 459
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
374 462
375#if __GNUC__ >= 4 463#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
378#else 466#else
… …
385 473
386#define expect_false(expr) expect ((expr) != 0, 0) 474#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 475#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 476#define inline_size static inline
389 477
390#if EV_MINIMAL 478#if EV_FEATURE_CODE
479# define inline_speed static inline
480#else
391# define inline_speed static noinline 481# define inline_speed static noinline
392#else
393# define inline_speed static inline
394#endif 482#endif
395 483
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397 485
398#if EV_MINPRI == EV_MAXPRI 486#if EV_MINPRI == EV_MAXPRI
… …
411#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
412#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
413 501
414#if EV_USE_REALTIME 502#if EV_USE_REALTIME
415/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 503/* 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 */ 504/* giving it a reasonably high chance of working on typical architectures */
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 505static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif 506#endif
419 507
420#if EV_USE_MONOTONIC 508#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 509static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 510#endif
423 511
512#ifndef EV_FD_TO_WIN32_HANDLE
513# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
514#endif
515#ifndef EV_WIN32_HANDLE_TO_FD
516# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
517#endif
518#ifndef EV_WIN32_CLOSE_FD
519# define EV_WIN32_CLOSE_FD(fd) close (fd)
520#endif
521
424#ifdef _WIN32 522#ifdef _WIN32
425# include "ev_win32.c" 523# include "ev_win32.c"
426#endif 524#endif
427 525
428/*****************************************************************************/ 526/*****************************************************************************/
527
528#if EV_AVOID_STDIO
529static void noinline
530ev_printerr (const char *msg)
531{
532 write (STDERR_FILENO, msg, strlen (msg));
533}
534#endif
429 535
430static void (*syserr_cb)(const char *msg); 536static void (*syserr_cb)(const char *msg);
431 537
432void 538void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 539ev_set_syserr_cb (void (*cb)(const char *msg))
… …
443 549
444 if (syserr_cb) 550 if (syserr_cb)
445 syserr_cb (msg); 551 syserr_cb (msg);
446 else 552 else
447 { 553 {
554#if EV_AVOID_STDIO
555 const char *err = strerror (errno);
556
557 ev_printerr (msg);
558 ev_printerr (": ");
559 ev_printerr (err);
560 ev_printerr ("\n");
561#else
448 perror (msg); 562 perror (msg);
563#endif
449 abort (); 564 abort ();
450 } 565 }
451} 566}
452 567
453static void * 568static void *
454ev_realloc_emul (void *ptr, long size) 569ev_realloc_emul (void *ptr, long size)
455{ 570{
571#if __GLIBC__
572 return realloc (ptr, size);
573#else
456 /* some systems, notably openbsd and darwin, fail to properly 574 /* some systems, notably openbsd and darwin, fail to properly
457 * implement realloc (x, 0) (as required by both ansi c-98 and 575 * implement realloc (x, 0) (as required by both ansi c-89 and
458 * the single unix specification, so work around them here. 576 * the single unix specification, so work around them here.
459 */ 577 */
460 578
461 if (size) 579 if (size)
462 return realloc (ptr, size); 580 return realloc (ptr, size);
463 581
464 free (ptr); 582 free (ptr);
465 return 0; 583 return 0;
584#endif
466} 585}
467 586
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 587static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 588
470void 589void
… …
478{ 597{
479 ptr = alloc (ptr, size); 598 ptr = alloc (ptr, size);
480 599
481 if (!ptr && size) 600 if (!ptr && size)
482 { 601 {
602#if EV_AVOID_STDIO
603 ev_printerr ("libev: memory allocation failed, aborting.\n");
604#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 605 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
606#endif
484 abort (); 607 abort ();
485 } 608 }
486 609
487 return ptr; 610 return ptr;
488} 611}
… …
570 693
571 static int ev_default_loop_ptr; 694 static int ev_default_loop_ptr;
572 695
573#endif 696#endif
574 697
575#if EV_MINIMAL < 2 698#if EV_FEATURE_API
576# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A) 699# 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) 700# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
578# define EV_INVOKE_PENDING invoke_cb (EV_A) 701# define EV_INVOKE_PENDING invoke_cb (EV_A)
579#else 702#else
580# define EV_RELEASE_CB (void)0 703# define EV_RELEASE_CB (void)0
581# define EV_ACQUIRE_CB (void)0 704# define EV_ACQUIRE_CB (void)0
582# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 705# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
583#endif 706#endif
584 707
585#define EVUNLOOP_RECURSE 0x80 708#define EVBREAK_RECURSE 0x80
586 709
587/*****************************************************************************/ 710/*****************************************************************************/
588 711
589#ifndef EV_HAVE_EV_TIME 712#ifndef EV_HAVE_EV_TIME
590ev_tstamp 713ev_tstamp
… …
634 if (delay > 0.) 757 if (delay > 0.)
635 { 758 {
636#if EV_USE_NANOSLEEP 759#if EV_USE_NANOSLEEP
637 struct timespec ts; 760 struct timespec ts;
638 761
639 ts.tv_sec = (time_t)delay; 762 EV_TS_SET (ts, delay);
640 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
641
642 nanosleep (&ts, 0); 763 nanosleep (&ts, 0);
643#elif defined(_WIN32) 764#elif defined(_WIN32)
644 Sleep ((unsigned long)(delay * 1e3)); 765 Sleep ((unsigned long)(delay * 1e3));
645#else 766#else
646 struct timeval tv; 767 struct timeval tv;
647 768
648 tv.tv_sec = (time_t)delay;
649 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
650
651 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
652 /* something not guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
653 /* by older ones */ 771 /* by older ones */
772 EV_TV_SET (tv, delay);
654 select (0, 0, 0, 0, &tv); 773 select (0, 0, 0, 0, &tv);
655#endif 774#endif
656 } 775 }
657} 776}
658 777
659/*****************************************************************************/ 778/*****************************************************************************/
660 779
661#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 780#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
662 781
663/* find a suitable new size for the given array, */ 782/* find a suitable new size for the given array, */
664/* hopefully by rounding to a ncie-to-malloc size */ 783/* hopefully by rounding to a nice-to-malloc size */
665inline_size int 784inline_size int
666array_nextsize (int elem, int cur, int cnt) 785array_nextsize (int elem, int cur, int cnt)
667{ 786{
668 int ncur = cur + 1; 787 int ncur = cur + 1;
669 788
… …
765} 884}
766 885
767/*****************************************************************************/ 886/*****************************************************************************/
768 887
769inline_speed void 888inline_speed void
770fd_event_nc (EV_P_ int fd, int revents) 889fd_event_nocheck (EV_P_ int fd, int revents)
771{ 890{
772 ANFD *anfd = anfds + fd; 891 ANFD *anfd = anfds + fd;
773 ev_io *w; 892 ev_io *w;
774 893
775 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 894 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
787fd_event (EV_P_ int fd, int revents) 906fd_event (EV_P_ int fd, int revents)
788{ 907{
789 ANFD *anfd = anfds + fd; 908 ANFD *anfd = anfds + fd;
790 909
791 if (expect_true (!anfd->reify)) 910 if (expect_true (!anfd->reify))
792 fd_event_nc (EV_A_ fd, revents); 911 fd_event_nocheck (EV_A_ fd, revents);
793} 912}
794 913
795void 914void
796ev_feed_fd_event (EV_P_ int fd, int revents) 915ev_feed_fd_event (EV_P_ int fd, int revents)
797{ 916{
798 if (fd >= 0 && fd < anfdmax) 917 if (fd >= 0 && fd < anfdmax)
799 fd_event_nc (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
800} 919}
801 920
802/* make sure the external fd watch events are in-sync */ 921/* make sure the external fd watch events are in-sync */
803/* with the kernel/libev internal state */ 922/* with the kernel/libev internal state */
804inline_size void 923inline_size void
… …
810 { 929 {
811 int fd = fdchanges [i]; 930 int fd = fdchanges [i];
812 ANFD *anfd = anfds + fd; 931 ANFD *anfd = anfds + fd;
813 ev_io *w; 932 ev_io *w;
814 933
815 unsigned char events = 0; 934 unsigned char o_events = anfd->events;
935 unsigned char o_reify = anfd->reify;
816 936
817 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 937 anfd->reify = 0;
818 events |= (unsigned char)w->events;
819 938
820#if EV_SELECT_IS_WINSOCKET 939#if EV_SELECT_IS_WINSOCKET
821 if (events) 940 if (o_reify & EV__IOFDSET)
822 { 941 {
823 unsigned long arg; 942 unsigned long arg;
824 #ifdef EV_FD_TO_WIN32_HANDLE
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 943 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)); 944 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
830 } 945 }
831#endif 946#endif
832 947
948 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
833 { 949 {
834 unsigned char o_events = anfd->events;
835 unsigned char o_reify = anfd->reify;
836
837 anfd->reify = 0;
838 anfd->events = events; 950 anfd->events = 0;
839 951
840 if (o_events != events || o_reify & EV__IOFDSET) 952 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
953 anfd->events |= (unsigned char)w->events;
954
955 if (o_events != anfd->events)
956 o_reify = EV__IOFDSET; /* actually |= */
957 }
958
959 if (o_reify & EV__IOFDSET)
841 backend_modify (EV_A_ fd, o_events, events); 960 backend_modify (EV_A_ fd, o_events, anfd->events);
842 }
843 } 961 }
844 962
845 fdchangecnt = 0; 963 fdchangecnt = 0;
846} 964}
847 965
… …
871 ev_io_stop (EV_A_ w); 989 ev_io_stop (EV_A_ w);
872 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 990 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
873 } 991 }
874} 992}
875 993
876/* check whether the given fd is atcually valid, for error recovery */ 994/* check whether the given fd is actually valid, for error recovery */
877inline_size int 995inline_size int
878fd_valid (int fd) 996fd_valid (int fd)
879{ 997{
880#ifdef _WIN32 998#ifdef _WIN32
881 return _get_osfhandle (fd) != -1; 999 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
882#else 1000#else
883 return fcntl (fd, F_GETFD) != -1; 1001 return fcntl (fd, F_GETFD) != -1;
884#endif 1002#endif
885} 1003}
886 1004
… …
904 1022
905 for (fd = anfdmax; fd--; ) 1023 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 1024 if (anfds [fd].events)
907 { 1025 {
908 fd_kill (EV_A_ fd); 1026 fd_kill (EV_A_ fd);
909 return; 1027 break;
910 } 1028 }
911} 1029}
912 1030
913/* usually called after fork if backend needs to re-arm all fds from scratch */ 1031/* usually called after fork if backend needs to re-arm all fds from scratch */
914static void noinline 1032static void noinline
… …
923 anfds [fd].emask = 0; 1041 anfds [fd].emask = 0;
924 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY); 1042 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
925 } 1043 }
926} 1044}
927 1045
1046/* used to prepare libev internal fd's */
1047/* this is not fork-safe */
1048inline_speed void
1049fd_intern (int fd)
1050{
1051#ifdef _WIN32
1052 unsigned long arg = 1;
1053 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1054#else
1055 fcntl (fd, F_SETFD, FD_CLOEXEC);
1056 fcntl (fd, F_SETFL, O_NONBLOCK);
1057#endif
1058}
1059
928/*****************************************************************************/ 1060/*****************************************************************************/
929 1061
930/* 1062/*
931 * the heap functions want a real array index. array index 0 uis guaranteed to not 1063 * 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 1064 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
933 * the branching factor of the d-tree. 1065 * the branching factor of the d-tree.
934 */ 1066 */
935 1067
936/* 1068/*
… …
1004 1136
1005 for (;;) 1137 for (;;)
1006 { 1138 {
1007 int c = k << 1; 1139 int c = k << 1;
1008 1140
1009 if (c > N + HEAP0 - 1) 1141 if (c >= N + HEAP0)
1010 break; 1142 break;
1011 1143
1012 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1144 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1013 ? 1 : 0; 1145 ? 1 : 0;
1014 1146
… …
1050 1182
1051/* move an element suitably so it is in a correct place */ 1183/* move an element suitably so it is in a correct place */
1052inline_size void 1184inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1185adjustheap (ANHE *heap, int N, int k)
1054{ 1186{
1055 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1187 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1056 upheap (heap, k); 1188 upheap (heap, k);
1057 else 1189 else
1058 downheap (heap, N, k); 1190 downheap (heap, N, k);
1059} 1191}
1060 1192
… …
1073/*****************************************************************************/ 1205/*****************************************************************************/
1074 1206
1075/* associate signal watchers to a signal signal */ 1207/* associate signal watchers to a signal signal */
1076typedef struct 1208typedef struct
1077{ 1209{
1210 EV_ATOMIC_T pending;
1211#if EV_MULTIPLICITY
1212 EV_P;
1213#endif
1078 WL head; 1214 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1215} ANSIG;
1081 1216
1082static ANSIG *signals; 1217static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1218
1087/*****************************************************************************/ 1219/*****************************************************************************/
1088 1220
1089/* used to prepare libev internal fd's */ 1221#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 1222
1103static void noinline 1223static void noinline
1104evpipe_init (EV_P) 1224evpipe_init (EV_P)
1105{ 1225{
1106 if (!ev_is_active (&pipe_w)) 1226 if (!ev_is_active (&pipe_w))
1107 { 1227 {
1108#if EV_USE_EVENTFD 1228# if EV_USE_EVENTFD
1229 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1230 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1231 evfd = eventfd (0, 0);
1232
1233 if (evfd >= 0)
1110 { 1234 {
1111 evpipe [0] = -1; 1235 evpipe [0] = -1;
1112 fd_intern (evfd); 1236 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1237 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1238 }
1115 else 1239 else
1116#endif 1240# endif
1117 { 1241 {
1118 while (pipe (evpipe)) 1242 while (pipe (evpipe))
1119 ev_syserr ("(libev) error creating signal/async pipe"); 1243 ev_syserr ("(libev) error creating signal/async pipe");
1120 1244
1121 fd_intern (evpipe [0]); 1245 fd_intern (evpipe [0]);
… …
1132evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1256evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1133{ 1257{
1134 if (!*flag) 1258 if (!*flag)
1135 { 1259 {
1136 int old_errno = errno; /* save errno because write might clobber it */ 1260 int old_errno = errno; /* save errno because write might clobber it */
1261 char dummy;
1137 1262
1138 *flag = 1; 1263 *flag = 1;
1139 1264
1140#if EV_USE_EVENTFD 1265#if EV_USE_EVENTFD
1141 if (evfd >= 0) 1266 if (evfd >= 0)
… …
1143 uint64_t counter = 1; 1268 uint64_t counter = 1;
1144 write (evfd, &counter, sizeof (uint64_t)); 1269 write (evfd, &counter, sizeof (uint64_t));
1145 } 1270 }
1146 else 1271 else
1147#endif 1272#endif
1273 /* win32 people keep sending patches that change this write() to send() */
1274 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1275 /* so when you think this write should be a send instead, please find out */
1276 /* where your send() is from - it's definitely not the microsoft send, and */
1277 /* tell me. thank you. */
1148 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1149 1279
1150 errno = old_errno; 1280 errno = old_errno;
1151 } 1281 }
1152} 1282}
1153 1283
1154/* called whenever the libev signal pipe */ 1284/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1285/* got some events (signal, async) */
1156static void 1286static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1287pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1288{
1289 int i;
1290
1159#if EV_USE_EVENTFD 1291#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1292 if (evfd >= 0)
1161 { 1293 {
1162 uint64_t counter; 1294 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1295 read (evfd, &counter, sizeof (uint64_t));
1164 } 1296 }
1165 else 1297 else
1166#endif 1298#endif
1167 { 1299 {
1168 char dummy; 1300 char dummy;
1301 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1169 read (evpipe [0], &dummy, 1); 1302 read (evpipe [0], &dummy, 1);
1170 } 1303 }
1171 1304
1172 if (gotsig && ev_is_default_loop (EV_A)) 1305 if (sig_pending)
1173 { 1306 {
1174 int signum; 1307 sig_pending = 0;
1175 gotsig = 0;
1176 1308
1177 for (signum = signalmax; signum--; ) 1309 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1310 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1311 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1312 }
1181 1313
1182#if EV_ASYNC_ENABLE 1314#if EV_ASYNC_ENABLE
1183 if (gotasync) 1315 if (async_pending)
1184 { 1316 {
1185 int i; 1317 async_pending = 0;
1186 gotasync = 0;
1187 1318
1188 for (i = asynccnt; i--; ) 1319 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1320 if (asyncs [i]->sent)
1190 { 1321 {
1191 asyncs [i]->sent = 0; 1322 asyncs [i]->sent = 0;
… …
1199 1330
1200static void 1331static void
1201ev_sighandler (int signum) 1332ev_sighandler (int signum)
1202{ 1333{
1203#if EV_MULTIPLICITY 1334#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1335 EV_P = signals [signum - 1].loop;
1205#endif 1336#endif
1206 1337
1207#if _WIN32 1338#ifdef _WIN32
1208 signal (signum, ev_sighandler); 1339 signal (signum, ev_sighandler);
1209#endif 1340#endif
1210 1341
1211 signals [signum - 1].gotsig = 1; 1342 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1343 evpipe_write (EV_A_ &sig_pending);
1213} 1344}
1214 1345
1215void noinline 1346void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1347ev_feed_signal_event (EV_P_ int signum)
1217{ 1348{
1218 WL w; 1349 WL w;
1219 1350
1351 if (expect_false (signum <= 0 || signum > EV_NSIG))
1352 return;
1353
1354 --signum;
1355
1220#if EV_MULTIPLICITY 1356#if EV_MULTIPLICITY
1221 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1357 /* it is permissible to try to feed a signal to the wrong loop */
1222#endif 1358 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1359
1224 --signum; 1360 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1361 return;
1362#endif
1228 1363
1229 signals [signum].gotsig = 0; 1364 signals [signum].pending = 0;
1230 1365
1231 for (w = signals [signum].head; w; w = w->next) 1366 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1367 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1368}
1234 1369
1370#if EV_USE_SIGNALFD
1371static void
1372sigfdcb (EV_P_ ev_io *iow, int revents)
1373{
1374 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1375
1376 for (;;)
1377 {
1378 ssize_t res = read (sigfd, si, sizeof (si));
1379
1380 /* not ISO-C, as res might be -1, but works with SuS */
1381 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1382 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1383
1384 if (res < (ssize_t)sizeof (si))
1385 break;
1386 }
1387}
1388#endif
1389
1390#endif
1391
1235/*****************************************************************************/ 1392/*****************************************************************************/
1236 1393
1394#if EV_CHILD_ENABLE
1237static WL childs [EV_PID_HASHSIZE]; 1395static WL childs [EV_PID_HASHSIZE];
1238
1239#ifndef _WIN32
1240 1396
1241static ev_signal childev; 1397static ev_signal childev;
1242 1398
1243#ifndef WIFCONTINUED 1399#ifndef WIFCONTINUED
1244# define WIFCONTINUED(status) 0 1400# define WIFCONTINUED(status) 0
… …
1249child_reap (EV_P_ int chain, int pid, int status) 1405child_reap (EV_P_ int chain, int pid, int status)
1250{ 1406{
1251 ev_child *w; 1407 ev_child *w;
1252 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1408 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1253 1409
1254 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1410 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1255 { 1411 {
1256 if ((w->pid == pid || !w->pid) 1412 if ((w->pid == pid || !w->pid)
1257 && (!traced || (w->flags & 1))) 1413 && (!traced || (w->flags & 1)))
1258 { 1414 {
1259 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1415 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 */ 1440 /* 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 */ 1441 /* 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); 1442 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1287 1443
1288 child_reap (EV_A_ pid, pid, status); 1444 child_reap (EV_A_ pid, pid, status);
1289 if (EV_PID_HASHSIZE > 1) 1445 if ((EV_PID_HASHSIZE) > 1)
1290 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1446 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1291} 1447}
1292 1448
1293#endif 1449#endif
1294 1450
… …
1361#ifdef __APPLE__ 1517#ifdef __APPLE__
1362 /* only select works correctly on that "unix-certified" platform */ 1518 /* only select works correctly on that "unix-certified" platform */
1363 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1519 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1364 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1520 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1365#endif 1521#endif
1522#ifdef __FreeBSD__
1523 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1524#endif
1366 1525
1367 return flags; 1526 return flags;
1368} 1527}
1369 1528
1370unsigned int 1529unsigned int
… …
1383ev_backend (EV_P) 1542ev_backend (EV_P)
1384{ 1543{
1385 return backend; 1544 return backend;
1386} 1545}
1387 1546
1388#if EV_MINIMAL < 2 1547#if EV_FEATURE_API
1389unsigned int 1548unsigned int
1390ev_loop_count (EV_P) 1549ev_iteration (EV_P)
1391{ 1550{
1392 return loop_count; 1551 return loop_count;
1393} 1552}
1394 1553
1395unsigned int 1554unsigned int
1396ev_loop_depth (EV_P) 1555ev_depth (EV_P)
1397{ 1556{
1398 return loop_depth; 1557 return loop_depth;
1399} 1558}
1400 1559
1401void 1560void
… …
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1617 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1618 have_monotonic = 1;
1460 } 1619 }
1461#endif 1620#endif
1462 1621
1622 /* pid check not overridable via env */
1623#ifndef _WIN32
1624 if (flags & EVFLAG_FORKCHECK)
1625 curpid = getpid ();
1626#endif
1627
1628 if (!(flags & EVFLAG_NOENV)
1629 && !enable_secure ()
1630 && getenv ("LIBEV_FLAGS"))
1631 flags = atoi (getenv ("LIBEV_FLAGS"));
1632
1463 ev_rt_now = ev_time (); 1633 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1634 mn_now = get_clock ();
1465 now_floor = mn_now; 1635 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1636 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1637#if EV_FEATURE_API
1468 invoke_cb = ev_invoke_pending; 1638 invoke_cb = ev_invoke_pending;
1469#endif 1639#endif
1470 1640
1471 io_blocktime = 0.; 1641 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1642 timeout_blocktime = 0.;
1473 backend = 0; 1643 backend = 0;
1474 backend_fd = -1; 1644 backend_fd = -1;
1475 gotasync = 0; 1645 sig_pending = 0;
1646#if EV_ASYNC_ENABLE
1647 async_pending = 0;
1648#endif
1476#if EV_USE_INOTIFY 1649#if EV_USE_INOTIFY
1477 fs_fd = -2; 1650 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1651#endif
1479 1652#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1653 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1654#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1655
1491 if (!(flags & 0x0000ffffU)) 1656 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1657 flags |= ev_recommended_backends ();
1493 1658
1494#if EV_USE_PORT 1659#if EV_USE_PORT
… …
1507 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1672 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1508#endif 1673#endif
1509 1674
1510 ev_prepare_init (&pending_w, pendingcb); 1675 ev_prepare_init (&pending_w, pendingcb);
1511 1676
1677#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1512 ev_init (&pipe_w, pipecb); 1678 ev_init (&pipe_w, pipecb);
1513 ev_set_priority (&pipe_w, EV_MAXPRI); 1679 ev_set_priority (&pipe_w, EV_MAXPRI);
1680#endif
1514 } 1681 }
1515} 1682}
1516 1683
1517/* free up a loop structure */ 1684/* free up a loop structure */
1518static void noinline 1685static void noinline
… …
1520{ 1687{
1521 int i; 1688 int i;
1522 1689
1523 if (ev_is_active (&pipe_w)) 1690 if (ev_is_active (&pipe_w))
1524 { 1691 {
1525 ev_ref (EV_A); /* signal watcher */ 1692 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1693 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1694
1528#if EV_USE_EVENTFD 1695#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1696 if (evfd >= 0)
1530 close (evfd); 1697 close (evfd);
1531#endif 1698#endif
1532 1699
1533 if (evpipe [0] >= 0) 1700 if (evpipe [0] >= 0)
1534 { 1701 {
1535 close (evpipe [0]); 1702 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1703 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1704 }
1538 } 1705 }
1706
1707#if EV_USE_SIGNALFD
1708 if (ev_is_active (&sigfd_w))
1709 close (sigfd);
1710#endif
1539 1711
1540#if EV_USE_INOTIFY 1712#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1713 if (fs_fd >= 0)
1542 close (fs_fd); 1714 close (fs_fd);
1543#endif 1715#endif
… …
1567#if EV_IDLE_ENABLE 1739#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1740 array_free (idle, [i]);
1569#endif 1741#endif
1570 } 1742 }
1571 1743
1572 ev_free (anfds); anfdmax = 0; 1744 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1745
1574 /* have to use the microsoft-never-gets-it-right macro */ 1746 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1747 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1748 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1749 array_free (timer, EMPTY);
… …
1612 1784
1613 if (ev_is_active (&pipe_w)) 1785 if (ev_is_active (&pipe_w))
1614 { 1786 {
1615 /* this "locks" the handlers against writing to the pipe */ 1787 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1788 /* while we modify the fd vars */
1617 gotsig = 1; 1789 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1790#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1791 async_pending = 1;
1620#endif 1792#endif
1621 1793
1622 ev_ref (EV_A); 1794 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1795 ev_io_stop (EV_A_ &pipe_w);
1624 1796
… …
1627 close (evfd); 1799 close (evfd);
1628#endif 1800#endif
1629 1801
1630 if (evpipe [0] >= 0) 1802 if (evpipe [0] >= 0)
1631 { 1803 {
1632 close (evpipe [0]); 1804 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1805 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1806 }
1635 1807
1808#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1636 evpipe_init (EV_A); 1809 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1810 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1811 pipecb (EV_A_ &pipe_w, EV_READ);
1812#endif
1639 } 1813 }
1640 1814
1641 postfork = 0; 1815 postfork = 0;
1642} 1816}
1643 1817
1644#if EV_MULTIPLICITY 1818#if EV_MULTIPLICITY
1645 1819
1646struct ev_loop * 1820struct ev_loop *
1647ev_loop_new (unsigned int flags) 1821ev_loop_new (unsigned int flags)
1648{ 1822{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1823 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1824
1651 memset (loop, 0, sizeof (struct ev_loop)); 1825 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1826 loop_init (EV_A_ flags);
1654 1827
1655 if (ev_backend (EV_A)) 1828 if (ev_backend (EV_A))
1656 return loop; 1829 return EV_A;
1657 1830
1658 return 0; 1831 return 0;
1659} 1832}
1660 1833
1661void 1834void
… …
1706 verify_watcher (EV_A_ ws [cnt]); 1879 verify_watcher (EV_A_ ws [cnt]);
1707 } 1880 }
1708} 1881}
1709#endif 1882#endif
1710 1883
1711#if EV_MINIMAL < 2 1884#if EV_FEATURE_API
1712void 1885void
1713ev_loop_verify (EV_P) 1886ev_verify (EV_P)
1714{ 1887{
1715#if EV_VERIFY 1888#if EV_VERIFY
1716 int i; 1889 int i;
1717 WL w; 1890 WL w;
1718 1891
… …
1757#if EV_ASYNC_ENABLE 1930#if EV_ASYNC_ENABLE
1758 assert (asyncmax >= asynccnt); 1931 assert (asyncmax >= asynccnt);
1759 array_verify (EV_A_ (W *)asyncs, asynccnt); 1932 array_verify (EV_A_ (W *)asyncs, asynccnt);
1760#endif 1933#endif
1761 1934
1935#if EV_PREPARE_ENABLE
1762 assert (preparemax >= preparecnt); 1936 assert (preparemax >= preparecnt);
1763 array_verify (EV_A_ (W *)prepares, preparecnt); 1937 array_verify (EV_A_ (W *)prepares, preparecnt);
1938#endif
1764 1939
1940#if EV_CHECK_ENABLE
1765 assert (checkmax >= checkcnt); 1941 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 1942 array_verify (EV_A_ (W *)checks, checkcnt);
1943#endif
1767 1944
1768# if 0 1945# if 0
1946#if EV_CHILD_ENABLE
1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1947 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) 1948 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1949#endif
1771# endif 1950# endif
1772#endif 1951#endif
1773} 1952}
1774#endif 1953#endif
1775 1954
… …
1782#endif 1961#endif
1783{ 1962{
1784 if (!ev_default_loop_ptr) 1963 if (!ev_default_loop_ptr)
1785 { 1964 {
1786#if EV_MULTIPLICITY 1965#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1966 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 1967#else
1789 ev_default_loop_ptr = 1; 1968 ev_default_loop_ptr = 1;
1790#endif 1969#endif
1791 1970
1792 loop_init (EV_A_ flags); 1971 loop_init (EV_A_ flags);
1793 1972
1794 if (ev_backend (EV_A)) 1973 if (ev_backend (EV_A))
1795 { 1974 {
1796#ifndef _WIN32 1975#if EV_CHILD_ENABLE
1797 ev_signal_init (&childev, childcb, SIGCHLD); 1976 ev_signal_init (&childev, childcb, SIGCHLD);
1798 ev_set_priority (&childev, EV_MAXPRI); 1977 ev_set_priority (&childev, EV_MAXPRI);
1799 ev_signal_start (EV_A_ &childev); 1978 ev_signal_start (EV_A_ &childev);
1800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1979 ev_unref (EV_A); /* child watcher should not keep loop alive */
1801#endif 1980#endif
… …
1809 1988
1810void 1989void
1811ev_default_destroy (void) 1990ev_default_destroy (void)
1812{ 1991{
1813#if EV_MULTIPLICITY 1992#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr; 1993 EV_P = ev_default_loop_ptr;
1815#endif 1994#endif
1816 1995
1817 ev_default_loop_ptr = 0; 1996 ev_default_loop_ptr = 0;
1818 1997
1819#ifndef _WIN32 1998#if EV_CHILD_ENABLE
1820 ev_ref (EV_A); /* child watcher */ 1999 ev_ref (EV_A); /* child watcher */
1821 ev_signal_stop (EV_A_ &childev); 2000 ev_signal_stop (EV_A_ &childev);
1822#endif 2001#endif
1823 2002
1824 loop_destroy (EV_A); 2003 loop_destroy (EV_A);
… …
1826 2005
1827void 2006void
1828ev_default_fork (void) 2007ev_default_fork (void)
1829{ 2008{
1830#if EV_MULTIPLICITY 2009#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr; 2010 EV_P = ev_default_loop_ptr;
1832#endif 2011#endif
1833 2012
1834 postfork = 1; /* must be in line with ev_loop_fork */ 2013 postfork = 1; /* must be in line with ev_loop_fork */
1835} 2014}
1836 2015
… …
1930 EV_FREQUENT_CHECK; 2109 EV_FREQUENT_CHECK;
1931 feed_reverse (EV_A_ (W)w); 2110 feed_reverse (EV_A_ (W)w);
1932 } 2111 }
1933 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2112 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1934 2113
1935 feed_reverse_done (EV_A_ EV_TIMEOUT); 2114 feed_reverse_done (EV_A_ EV_TIMER);
1936 } 2115 }
1937} 2116}
1938 2117
1939#if EV_PERIODIC_ENABLE 2118#if EV_PERIODIC_ENABLE
1940/* make periodics pending */ 2119/* make periodics pending */
… …
1993 feed_reverse_done (EV_A_ EV_PERIODIC); 2172 feed_reverse_done (EV_A_ EV_PERIODIC);
1994 } 2173 }
1995} 2174}
1996 2175
1997/* simply recalculate all periodics */ 2176/* simply recalculate all periodics */
1998/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2177/* TODO: maybe ensure that at least one event happens when jumping forward? */
1999static void noinline 2178static void noinline
2000periodics_reschedule (EV_P) 2179periodics_reschedule (EV_P)
2001{ 2180{
2002 int i; 2181 int i;
2003 2182
… …
2031 ANHE_at_cache (*he); 2210 ANHE_at_cache (*he);
2032 } 2211 }
2033} 2212}
2034 2213
2035/* fetch new monotonic and realtime times from the kernel */ 2214/* fetch new monotonic and realtime times from the kernel */
2036/* also detetc if there was a timejump, and act accordingly */ 2215/* also detect if there was a timejump, and act accordingly */
2037inline_speed void 2216inline_speed void
2038time_update (EV_P_ ev_tstamp max_block) 2217time_update (EV_P_ ev_tstamp max_block)
2039{ 2218{
2040#if EV_USE_MONOTONIC 2219#if EV_USE_MONOTONIC
2041 if (expect_true (have_monotonic)) 2220 if (expect_true (have_monotonic))
… …
2099 mn_now = ev_rt_now; 2278 mn_now = ev_rt_now;
2100 } 2279 }
2101} 2280}
2102 2281
2103void 2282void
2104ev_loop (EV_P_ int flags) 2283ev_run (EV_P_ int flags)
2105{ 2284{
2106#if EV_MINIMAL < 2 2285#if EV_FEATURE_API
2107 ++loop_depth; 2286 ++loop_depth;
2108#endif 2287#endif
2109 2288
2110 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2289 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2111 2290
2112 loop_done = EVUNLOOP_CANCEL; 2291 loop_done = EVBREAK_CANCEL;
2113 2292
2114 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2293 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2115 2294
2116 do 2295 do
2117 { 2296 {
2118#if EV_VERIFY >= 2 2297#if EV_VERIFY >= 2
2119 ev_loop_verify (EV_A); 2298 ev_verify (EV_A);
2120#endif 2299#endif
2121 2300
2122#ifndef _WIN32 2301#ifndef _WIN32
2123 if (expect_false (curpid)) /* penalise the forking check even more */ 2302 if (expect_false (curpid)) /* penalise the forking check even more */
2124 if (expect_false (getpid () != curpid)) 2303 if (expect_false (getpid () != curpid))
… …
2136 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2315 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2137 EV_INVOKE_PENDING; 2316 EV_INVOKE_PENDING;
2138 } 2317 }
2139#endif 2318#endif
2140 2319
2320#if EV_PREPARE_ENABLE
2141 /* queue prepare watchers (and execute them) */ 2321 /* queue prepare watchers (and execute them) */
2142 if (expect_false (preparecnt)) 2322 if (expect_false (preparecnt))
2143 { 2323 {
2144 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2324 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2145 EV_INVOKE_PENDING; 2325 EV_INVOKE_PENDING;
2146 } 2326 }
2327#endif
2147 2328
2148 if (expect_false (loop_done)) 2329 if (expect_false (loop_done))
2149 break; 2330 break;
2150 2331
2151 /* we might have forked, so reify kernel state if necessary */ 2332 /* we might have forked, so reify kernel state if necessary */
… …
2158 /* calculate blocking time */ 2339 /* calculate blocking time */
2159 { 2340 {
2160 ev_tstamp waittime = 0.; 2341 ev_tstamp waittime = 0.;
2161 ev_tstamp sleeptime = 0.; 2342 ev_tstamp sleeptime = 0.;
2162 2343
2344 /* remember old timestamp for io_blocktime calculation */
2345 ev_tstamp prev_mn_now = mn_now;
2346
2347 /* update time to cancel out callback processing overhead */
2348 time_update (EV_A_ 1e100);
2349
2163 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2350 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2164 { 2351 {
2165 /* remember old timestamp for io_blocktime calculation */
2166 ev_tstamp prev_mn_now = mn_now;
2167
2168 /* update time to cancel out callback processing overhead */
2169 time_update (EV_A_ 1e100);
2170
2171 waittime = MAX_BLOCKTIME; 2352 waittime = MAX_BLOCKTIME;
2172 2353
2173 if (timercnt) 2354 if (timercnt)
2174 { 2355 {
2175 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2356 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2202 waittime -= sleeptime; 2383 waittime -= sleeptime;
2203 } 2384 }
2204 } 2385 }
2205 } 2386 }
2206 2387
2207#if EV_MINIMAL < 2 2388#if EV_FEATURE_API
2208 ++loop_count; 2389 ++loop_count;
2209#endif 2390#endif
2210 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2391 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2211 backend_poll (EV_A_ waittime); 2392 backend_poll (EV_A_ waittime);
2212 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2393 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2213 2394
2214 /* update ev_rt_now, do magic */ 2395 /* update ev_rt_now, do magic */
2215 time_update (EV_A_ waittime + sleeptime); 2396 time_update (EV_A_ waittime + sleeptime);
2216 } 2397 }
2217 2398
… …
2224#if EV_IDLE_ENABLE 2405#if EV_IDLE_ENABLE
2225 /* queue idle watchers unless other events are pending */ 2406 /* queue idle watchers unless other events are pending */
2226 idle_reify (EV_A); 2407 idle_reify (EV_A);
2227#endif 2408#endif
2228 2409
2410#if EV_CHECK_ENABLE
2229 /* queue check watchers, to be executed first */ 2411 /* queue check watchers, to be executed first */
2230 if (expect_false (checkcnt)) 2412 if (expect_false (checkcnt))
2231 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2413 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2414#endif
2232 2415
2233 EV_INVOKE_PENDING; 2416 EV_INVOKE_PENDING;
2234 } 2417 }
2235 while (expect_true ( 2418 while (expect_true (
2236 activecnt 2419 activecnt
2237 && !loop_done 2420 && !loop_done
2238 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2421 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2239 )); 2422 ));
2240 2423
2241 if (loop_done == EVUNLOOP_ONE) 2424 if (loop_done == EVBREAK_ONE)
2242 loop_done = EVUNLOOP_CANCEL; 2425 loop_done = EVBREAK_CANCEL;
2243 2426
2244#if EV_MINIMAL < 2 2427#if EV_FEATURE_API
2245 --loop_depth; 2428 --loop_depth;
2246#endif 2429#endif
2247} 2430}
2248 2431
2249void 2432void
2250ev_unloop (EV_P_ int how) 2433ev_break (EV_P_ int how)
2251{ 2434{
2252 loop_done = how; 2435 loop_done = how;
2253} 2436}
2254 2437
2255void 2438void
… …
2302inline_size void 2485inline_size void
2303wlist_del (WL *head, WL elem) 2486wlist_del (WL *head, WL elem)
2304{ 2487{
2305 while (*head) 2488 while (*head)
2306 { 2489 {
2307 if (*head == elem) 2490 if (expect_true (*head == elem))
2308 { 2491 {
2309 *head = elem->next; 2492 *head = elem->next;
2310 return; 2493 break;
2311 } 2494 }
2312 2495
2313 head = &(*head)->next; 2496 head = &(*head)->next;
2314 } 2497 }
2315} 2498}
… …
2375 2558
2376 if (expect_false (ev_is_active (w))) 2559 if (expect_false (ev_is_active (w)))
2377 return; 2560 return;
2378 2561
2379 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2562 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)))); 2563 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2381 2564
2382 EV_FREQUENT_CHECK; 2565 EV_FREQUENT_CHECK;
2383 2566
2384 ev_start (EV_A_ (W)w, 1); 2567 ev_start (EV_A_ (W)w, 1);
2385 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2568 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2403 EV_FREQUENT_CHECK; 2586 EV_FREQUENT_CHECK;
2404 2587
2405 wlist_del (&anfds[w->fd].head, (WL)w); 2588 wlist_del (&anfds[w->fd].head, (WL)w);
2406 ev_stop (EV_A_ (W)w); 2589 ev_stop (EV_A_ (W)w);
2407 2590
2408 fd_change (EV_A_ w->fd, 1); 2591 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2409 2592
2410 EV_FREQUENT_CHECK; 2593 EV_FREQUENT_CHECK;
2411} 2594}
2412 2595
2413void noinline 2596void noinline
… …
2455 timers [active] = timers [timercnt + HEAP0]; 2638 timers [active] = timers [timercnt + HEAP0];
2456 adjustheap (timers, timercnt, active); 2639 adjustheap (timers, timercnt, active);
2457 } 2640 }
2458 } 2641 }
2459 2642
2460 EV_FREQUENT_CHECK;
2461
2462 ev_at (w) -= mn_now; 2643 ev_at (w) -= mn_now;
2463 2644
2464 ev_stop (EV_A_ (W)w); 2645 ev_stop (EV_A_ (W)w);
2646
2647 EV_FREQUENT_CHECK;
2465} 2648}
2466 2649
2467void noinline 2650void noinline
2468ev_timer_again (EV_P_ ev_timer *w) 2651ev_timer_again (EV_P_ ev_timer *w)
2469{ 2652{
… …
2548 periodics [active] = periodics [periodiccnt + HEAP0]; 2731 periodics [active] = periodics [periodiccnt + HEAP0];
2549 adjustheap (periodics, periodiccnt, active); 2732 adjustheap (periodics, periodiccnt, active);
2550 } 2733 }
2551 } 2734 }
2552 2735
2553 EV_FREQUENT_CHECK;
2554
2555 ev_stop (EV_A_ (W)w); 2736 ev_stop (EV_A_ (W)w);
2737
2738 EV_FREQUENT_CHECK;
2556} 2739}
2557 2740
2558void noinline 2741void noinline
2559ev_periodic_again (EV_P_ ev_periodic *w) 2742ev_periodic_again (EV_P_ ev_periodic *w)
2560{ 2743{
… …
2566 2749
2567#ifndef SA_RESTART 2750#ifndef SA_RESTART
2568# define SA_RESTART 0 2751# define SA_RESTART 0
2569#endif 2752#endif
2570 2753
2754#if EV_SIGNAL_ENABLE
2755
2571void noinline 2756void noinline
2572ev_signal_start (EV_P_ ev_signal *w) 2757ev_signal_start (EV_P_ ev_signal *w)
2573{ 2758{
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))) 2759 if (expect_false (ev_is_active (w)))
2578 return; 2760 return;
2579 2761
2580 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2762 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2581 2763
2582 evpipe_init (EV_A); 2764#if EV_MULTIPLICITY
2765 assert (("libev: a signal must not be attached to two different loops",
2766 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2583 2767
2584 EV_FREQUENT_CHECK; 2768 signals [w->signum - 1].loop = EV_A;
2769#endif
2585 2770
2771 EV_FREQUENT_CHECK;
2772
2773#if EV_USE_SIGNALFD
2774 if (sigfd == -2)
2586 { 2775 {
2587#ifndef _WIN32 2776 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2588 sigset_t full, prev; 2777 if (sigfd < 0 && errno == EINVAL)
2589 sigfillset (&full); 2778 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2590 sigprocmask (SIG_SETMASK, &full, &prev);
2591#endif
2592 2779
2593 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2780 if (sigfd >= 0)
2781 {
2782 fd_intern (sigfd); /* doing it twice will not hurt */
2594 2783
2595#ifndef _WIN32 2784 sigemptyset (&sigfd_set);
2596 sigprocmask (SIG_SETMASK, &prev, 0); 2785
2597#endif 2786 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2787 ev_set_priority (&sigfd_w, EV_MAXPRI);
2788 ev_io_start (EV_A_ &sigfd_w);
2789 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2790 }
2598 } 2791 }
2792
2793 if (sigfd >= 0)
2794 {
2795 /* TODO: check .head */
2796 sigaddset (&sigfd_set, w->signum);
2797 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2798
2799 signalfd (sigfd, &sigfd_set, 0);
2800 }
2801#endif
2599 2802
2600 ev_start (EV_A_ (W)w, 1); 2803 ev_start (EV_A_ (W)w, 1);
2601 wlist_add (&signals [w->signum - 1].head, (WL)w); 2804 wlist_add (&signals [w->signum - 1].head, (WL)w);
2602 2805
2603 if (!((WL)w)->next) 2806 if (!((WL)w)->next)
2807# if EV_USE_SIGNALFD
2808 if (sigfd < 0) /*TODO*/
2809# endif
2604 { 2810 {
2605#if _WIN32 2811# ifdef _WIN32
2812 evpipe_init (EV_A);
2813
2606 signal (w->signum, ev_sighandler); 2814 signal (w->signum, ev_sighandler);
2607#else 2815# else
2608 struct sigaction sa = { }; 2816 struct sigaction sa;
2817
2818 evpipe_init (EV_A);
2819
2609 sa.sa_handler = ev_sighandler; 2820 sa.sa_handler = ev_sighandler;
2610 sigfillset (&sa.sa_mask); 2821 sigfillset (&sa.sa_mask);
2611 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2822 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2612 sigaction (w->signum, &sa, 0); 2823 sigaction (w->signum, &sa, 0);
2824
2825 sigemptyset (&sa.sa_mask);
2826 sigaddset (&sa.sa_mask, w->signum);
2827 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2613#endif 2828#endif
2614 } 2829 }
2615 2830
2616 EV_FREQUENT_CHECK; 2831 EV_FREQUENT_CHECK;
2617} 2832}
2618 2833
2619void noinline 2834void noinline
… …
2627 2842
2628 wlist_del (&signals [w->signum - 1].head, (WL)w); 2843 wlist_del (&signals [w->signum - 1].head, (WL)w);
2629 ev_stop (EV_A_ (W)w); 2844 ev_stop (EV_A_ (W)w);
2630 2845
2631 if (!signals [w->signum - 1].head) 2846 if (!signals [w->signum - 1].head)
2847 {
2848#if EV_MULTIPLICITY
2849 signals [w->signum - 1].loop = 0; /* unattach from signal */
2850#endif
2851#if EV_USE_SIGNALFD
2852 if (sigfd >= 0)
2853 {
2854 sigset_t ss;
2855
2856 sigemptyset (&ss);
2857 sigaddset (&ss, w->signum);
2858 sigdelset (&sigfd_set, w->signum);
2859
2860 signalfd (sigfd, &sigfd_set, 0);
2861 sigprocmask (SIG_UNBLOCK, &ss, 0);
2862 }
2863 else
2864#endif
2632 signal (w->signum, SIG_DFL); 2865 signal (w->signum, SIG_DFL);
2866 }
2633 2867
2634 EV_FREQUENT_CHECK; 2868 EV_FREQUENT_CHECK;
2635} 2869}
2870
2871#endif
2872
2873#if EV_CHILD_ENABLE
2636 2874
2637void 2875void
2638ev_child_start (EV_P_ ev_child *w) 2876ev_child_start (EV_P_ ev_child *w)
2639{ 2877{
2640#if EV_MULTIPLICITY 2878#if EV_MULTIPLICITY
… …
2644 return; 2882 return;
2645 2883
2646 EV_FREQUENT_CHECK; 2884 EV_FREQUENT_CHECK;
2647 2885
2648 ev_start (EV_A_ (W)w, 1); 2886 ev_start (EV_A_ (W)w, 1);
2649 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2887 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2650 2888
2651 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2652} 2890}
2653 2891
2654void 2892void
… …
2658 if (expect_false (!ev_is_active (w))) 2896 if (expect_false (!ev_is_active (w)))
2659 return; 2897 return;
2660 2898
2661 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2662 2900
2663 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2664 ev_stop (EV_A_ (W)w); 2902 ev_stop (EV_A_ (W)w);
2665 2903
2666 EV_FREQUENT_CHECK; 2904 EV_FREQUENT_CHECK;
2667} 2905}
2906
2907#endif
2668 2908
2669#if EV_STAT_ENABLE 2909#if EV_STAT_ENABLE
2670 2910
2671# ifdef _WIN32 2911# ifdef _WIN32
2672# undef lstat 2912# undef lstat
… …
2678#define MIN_STAT_INTERVAL 0.1074891 2918#define MIN_STAT_INTERVAL 0.1074891
2679 2919
2680static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2920static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2681 2921
2682#if EV_USE_INOTIFY 2922#if EV_USE_INOTIFY
2683# define EV_INOTIFY_BUFSIZE 8192 2923
2924/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2925# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2684 2926
2685static void noinline 2927static void noinline
2686infy_add (EV_P_ ev_stat *w) 2928infy_add (EV_P_ ev_stat *w)
2687{ 2929{
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); 2930 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 2931
2690 if (w->wd < 0) 2932 if (w->wd >= 0)
2933 {
2934 struct statfs sfs;
2935
2936 /* now local changes will be tracked by inotify, but remote changes won't */
2937 /* unless the filesystem is known to be local, we therefore still poll */
2938 /* also do poll on <2.6.25, but with normal frequency */
2939
2940 if (!fs_2625)
2941 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2942 else if (!statfs (w->path, &sfs)
2943 && (sfs.f_type == 0x1373 /* devfs */
2944 || sfs.f_type == 0xEF53 /* ext2/3 */
2945 || sfs.f_type == 0x3153464a /* jfs */
2946 || sfs.f_type == 0x52654973 /* reiser3 */
2947 || sfs.f_type == 0x01021994 /* tempfs */
2948 || sfs.f_type == 0x58465342 /* xfs */))
2949 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2950 else
2951 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2691 { 2952 }
2953 else
2954 {
2955 /* can't use inotify, continue to stat */
2692 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2956 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 2957
2695 /* monitor some parent directory for speedup hints */ 2958 /* 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, */ 2959 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2697 /* but an efficiency issue only */ 2960 /* but an efficiency issue only */
2698 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2961 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2699 { 2962 {
2700 char path [4096]; 2963 char path [4096];
… …
2716 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2979 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2717 } 2980 }
2718 } 2981 }
2719 2982
2720 if (w->wd >= 0) 2983 if (w->wd >= 0)
2721 {
2722 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2984 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2723 2985
2724 /* now local changes will be tracked by inotify, but remote changes won't */ 2986 /* now re-arm timer, if required */
2725 /* unless the filesystem it known to be local, we therefore still poll */ 2987 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); 2988 ev_timer_again (EV_A_ &w->timer);
2740 } 2989 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2741} 2990}
2742 2991
2743static void noinline 2992static void noinline
2744infy_del (EV_P_ ev_stat *w) 2993infy_del (EV_P_ ev_stat *w)
2745{ 2994{
… …
2748 2997
2749 if (wd < 0) 2998 if (wd < 0)
2750 return; 2999 return;
2751 3000
2752 w->wd = -2; 3001 w->wd = -2;
2753 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3002 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2754 wlist_del (&fs_hash [slot].head, (WL)w); 3003 wlist_del (&fs_hash [slot].head, (WL)w);
2755 3004
2756 /* remove this watcher, if others are watching it, they will rearm */ 3005 /* remove this watcher, if others are watching it, they will rearm */
2757 inotify_rm_watch (fs_fd, wd); 3006 inotify_rm_watch (fs_fd, wd);
2758} 3007}
… …
2760static void noinline 3009static void noinline
2761infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3010infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2762{ 3011{
2763 if (slot < 0) 3012 if (slot < 0)
2764 /* overflow, need to check for all hash slots */ 3013 /* overflow, need to check for all hash slots */
2765 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3014 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2766 infy_wd (EV_A_ slot, wd, ev); 3015 infy_wd (EV_A_ slot, wd, ev);
2767 else 3016 else
2768 { 3017 {
2769 WL w_; 3018 WL w_;
2770 3019
2771 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3020 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2772 { 3021 {
2773 ev_stat *w = (ev_stat *)w_; 3022 ev_stat *w = (ev_stat *)w_;
2774 w_ = w_->next; /* lets us remove this watcher and all before it */ 3023 w_ = w_->next; /* lets us remove this watcher and all before it */
2775 3024
2776 if (w->wd == wd || wd == -1) 3025 if (w->wd == wd || wd == -1)
2777 { 3026 {
2778 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3027 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2779 { 3028 {
2780 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3029 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2781 w->wd = -1; 3030 w->wd = -1;
2782 infy_add (EV_A_ w); /* re-add, no matter what */ 3031 infy_add (EV_A_ w); /* re-add, no matter what */
2783 } 3032 }
2784 3033
2785 stat_timer_cb (EV_A_ &w->timer, 0); 3034 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2790 3039
2791static void 3040static void
2792infy_cb (EV_P_ ev_io *w, int revents) 3041infy_cb (EV_P_ ev_io *w, int revents)
2793{ 3042{
2794 char buf [EV_INOTIFY_BUFSIZE]; 3043 char buf [EV_INOTIFY_BUFSIZE];
2795 struct inotify_event *ev = (struct inotify_event *)buf;
2796 int ofs; 3044 int ofs;
2797 int len = read (fs_fd, buf, sizeof (buf)); 3045 int len = read (fs_fd, buf, sizeof (buf));
2798 3046
2799 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3047 for (ofs = 0; ofs < len; )
3048 {
3049 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2800 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3050 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3051 ofs += sizeof (struct inotify_event) + ev->len;
3052 }
3053}
3054
3055inline_size unsigned int
3056ev_linux_version (void)
3057{
3058 struct utsname buf;
3059 unsigned int v;
3060 int i;
3061 char *p = buf.release;
3062
3063 if (uname (&buf))
3064 return 0;
3065
3066 for (i = 3+1; --i; )
3067 {
3068 unsigned int c = 0;
3069
3070 for (;;)
3071 {
3072 if (*p >= '0' && *p <= '9')
3073 c = c * 10 + *p++ - '0';
3074 else
3075 {
3076 p += *p == '.';
3077 break;
3078 }
3079 }
3080
3081 v = (v << 8) | c;
3082 }
3083
3084 return v;
2801} 3085}
2802 3086
2803inline_size void 3087inline_size void
2804check_2625 (EV_P) 3088ev_check_2625 (EV_P)
2805{ 3089{
2806 /* kernels < 2.6.25 are borked 3090 /* kernels < 2.6.25 are borked
2807 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3091 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2808 */ 3092 */
2809 struct utsname buf; 3093 if (ev_linux_version () < 0x020619)
2810 int major, minor, micro;
2811
2812 if (uname (&buf))
2813 return; 3094 return;
2814 3095
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; 3096 fs_2625 = 1;
3097}
3098
3099inline_size int
3100infy_newfd (void)
3101{
3102#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3103 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3104 if (fd >= 0)
3105 return fd;
3106#endif
3107 return inotify_init ();
2824} 3108}
2825 3109
2826inline_size void 3110inline_size void
2827infy_init (EV_P) 3111infy_init (EV_P)
2828{ 3112{
2829 if (fs_fd != -2) 3113 if (fs_fd != -2)
2830 return; 3114 return;
2831 3115
2832 fs_fd = -1; 3116 fs_fd = -1;
2833 3117
2834 check_2625 (EV_A); 3118 ev_check_2625 (EV_A);
2835 3119
2836 fs_fd = inotify_init (); 3120 fs_fd = infy_newfd ();
2837 3121
2838 if (fs_fd >= 0) 3122 if (fs_fd >= 0)
2839 { 3123 {
3124 fd_intern (fs_fd);
2840 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3125 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2841 ev_set_priority (&fs_w, EV_MAXPRI); 3126 ev_set_priority (&fs_w, EV_MAXPRI);
2842 ev_io_start (EV_A_ &fs_w); 3127 ev_io_start (EV_A_ &fs_w);
3128 ev_unref (EV_A);
2843 } 3129 }
2844} 3130}
2845 3131
2846inline_size void 3132inline_size void
2847infy_fork (EV_P) 3133infy_fork (EV_P)
… …
2849 int slot; 3135 int slot;
2850 3136
2851 if (fs_fd < 0) 3137 if (fs_fd < 0)
2852 return; 3138 return;
2853 3139
3140 ev_ref (EV_A);
3141 ev_io_stop (EV_A_ &fs_w);
2854 close (fs_fd); 3142 close (fs_fd);
2855 fs_fd = inotify_init (); 3143 fs_fd = infy_newfd ();
2856 3144
3145 if (fs_fd >= 0)
3146 {
3147 fd_intern (fs_fd);
3148 ev_io_set (&fs_w, fs_fd, EV_READ);
3149 ev_io_start (EV_A_ &fs_w);
3150 ev_unref (EV_A);
3151 }
3152
2857 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3153 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2858 { 3154 {
2859 WL w_ = fs_hash [slot].head; 3155 WL w_ = fs_hash [slot].head;
2860 fs_hash [slot].head = 0; 3156 fs_hash [slot].head = 0;
2861 3157
2862 while (w_) 3158 while (w_)
… …
2867 w->wd = -1; 3163 w->wd = -1;
2868 3164
2869 if (fs_fd >= 0) 3165 if (fs_fd >= 0)
2870 infy_add (EV_A_ w); /* re-add, no matter what */ 3166 infy_add (EV_A_ w); /* re-add, no matter what */
2871 else 3167 else
3168 {
3169 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3170 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2872 ev_timer_again (EV_A_ &w->timer); 3171 ev_timer_again (EV_A_ &w->timer);
3172 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3173 }
2873 } 3174 }
2874 } 3175 }
2875} 3176}
2876 3177
2877#endif 3178#endif
… …
2894static void noinline 3195static void noinline
2895stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3196stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2896{ 3197{
2897 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3198 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2898 3199
2899 /* we copy this here each the time so that */ 3200 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); 3201 ev_stat_stat (EV_A_ w);
2903 3202
2904 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3203 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2905 if ( 3204 if (
2906 w->prev.st_dev != w->attr.st_dev 3205 prev.st_dev != w->attr.st_dev
2907 || w->prev.st_ino != w->attr.st_ino 3206 || prev.st_ino != w->attr.st_ino
2908 || w->prev.st_mode != w->attr.st_mode 3207 || prev.st_mode != w->attr.st_mode
2909 || w->prev.st_nlink != w->attr.st_nlink 3208 || prev.st_nlink != w->attr.st_nlink
2910 || w->prev.st_uid != w->attr.st_uid 3209 || prev.st_uid != w->attr.st_uid
2911 || w->prev.st_gid != w->attr.st_gid 3210 || prev.st_gid != w->attr.st_gid
2912 || w->prev.st_rdev != w->attr.st_rdev 3211 || prev.st_rdev != w->attr.st_rdev
2913 || w->prev.st_size != w->attr.st_size 3212 || prev.st_size != w->attr.st_size
2914 || w->prev.st_atime != w->attr.st_atime 3213 || prev.st_atime != w->attr.st_atime
2915 || w->prev.st_mtime != w->attr.st_mtime 3214 || prev.st_mtime != w->attr.st_mtime
2916 || w->prev.st_ctime != w->attr.st_ctime 3215 || prev.st_ctime != w->attr.st_ctime
2917 ) { 3216 ) {
3217 /* we only update w->prev on actual differences */
3218 /* in case we test more often than invoke the callback, */
3219 /* to ensure that prev is always different to attr */
3220 w->prev = prev;
3221
2918 #if EV_USE_INOTIFY 3222 #if EV_USE_INOTIFY
2919 if (fs_fd >= 0) 3223 if (fs_fd >= 0)
2920 { 3224 {
2921 infy_del (EV_A_ w); 3225 infy_del (EV_A_ w);
2922 infy_add (EV_A_ w); 3226 infy_add (EV_A_ w);
… …
2947 3251
2948 if (fs_fd >= 0) 3252 if (fs_fd >= 0)
2949 infy_add (EV_A_ w); 3253 infy_add (EV_A_ w);
2950 else 3254 else
2951#endif 3255#endif
3256 {
2952 ev_timer_again (EV_A_ &w->timer); 3257 ev_timer_again (EV_A_ &w->timer);
3258 ev_unref (EV_A);
3259 }
2953 3260
2954 ev_start (EV_A_ (W)w, 1); 3261 ev_start (EV_A_ (W)w, 1);
2955 3262
2956 EV_FREQUENT_CHECK; 3263 EV_FREQUENT_CHECK;
2957} 3264}
… …
2966 EV_FREQUENT_CHECK; 3273 EV_FREQUENT_CHECK;
2967 3274
2968#if EV_USE_INOTIFY 3275#if EV_USE_INOTIFY
2969 infy_del (EV_A_ w); 3276 infy_del (EV_A_ w);
2970#endif 3277#endif
3278
3279 if (ev_is_active (&w->timer))
3280 {
3281 ev_ref (EV_A);
2971 ev_timer_stop (EV_A_ &w->timer); 3282 ev_timer_stop (EV_A_ &w->timer);
3283 }
2972 3284
2973 ev_stop (EV_A_ (W)w); 3285 ev_stop (EV_A_ (W)w);
2974 3286
2975 EV_FREQUENT_CHECK; 3287 EV_FREQUENT_CHECK;
2976} 3288}
… …
3021 3333
3022 EV_FREQUENT_CHECK; 3334 EV_FREQUENT_CHECK;
3023} 3335}
3024#endif 3336#endif
3025 3337
3338#if EV_PREPARE_ENABLE
3026void 3339void
3027ev_prepare_start (EV_P_ ev_prepare *w) 3340ev_prepare_start (EV_P_ ev_prepare *w)
3028{ 3341{
3029 if (expect_false (ev_is_active (w))) 3342 if (expect_false (ev_is_active (w)))
3030 return; 3343 return;
… …
3056 3369
3057 ev_stop (EV_A_ (W)w); 3370 ev_stop (EV_A_ (W)w);
3058 3371
3059 EV_FREQUENT_CHECK; 3372 EV_FREQUENT_CHECK;
3060} 3373}
3374#endif
3061 3375
3376#if EV_CHECK_ENABLE
3062void 3377void
3063ev_check_start (EV_P_ ev_check *w) 3378ev_check_start (EV_P_ ev_check *w)
3064{ 3379{
3065 if (expect_false (ev_is_active (w))) 3380 if (expect_false (ev_is_active (w)))
3066 return; 3381 return;
… …
3092 3407
3093 ev_stop (EV_A_ (W)w); 3408 ev_stop (EV_A_ (W)w);
3094 3409
3095 EV_FREQUENT_CHECK; 3410 EV_FREQUENT_CHECK;
3096} 3411}
3412#endif
3097 3413
3098#if EV_EMBED_ENABLE 3414#if EV_EMBED_ENABLE
3099void noinline 3415void noinline
3100ev_embed_sweep (EV_P_ ev_embed *w) 3416ev_embed_sweep (EV_P_ ev_embed *w)
3101{ 3417{
3102 ev_loop (w->other, EVLOOP_NONBLOCK); 3418 ev_run (w->other, EVRUN_NOWAIT);
3103} 3419}
3104 3420
3105static void 3421static void
3106embed_io_cb (EV_P_ ev_io *io, int revents) 3422embed_io_cb (EV_P_ ev_io *io, int revents)
3107{ 3423{
3108 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3424 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3109 3425
3110 if (ev_cb (w)) 3426 if (ev_cb (w))
3111 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3427 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3112 else 3428 else
3113 ev_loop (w->other, EVLOOP_NONBLOCK); 3429 ev_run (w->other, EVRUN_NOWAIT);
3114} 3430}
3115 3431
3116static void 3432static void
3117embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3433embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3118{ 3434{
3119 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3435 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3120 3436
3121 { 3437 {
3122 struct ev_loop *loop = w->other; 3438 EV_P = w->other;
3123 3439
3124 while (fdchangecnt) 3440 while (fdchangecnt)
3125 { 3441 {
3126 fd_reify (EV_A); 3442 fd_reify (EV_A);
3127 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3443 ev_run (EV_A_ EVRUN_NOWAIT);
3128 } 3444 }
3129 } 3445 }
3130} 3446}
3131 3447
3132static void 3448static void
… …
3135 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3451 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3136 3452
3137 ev_embed_stop (EV_A_ w); 3453 ev_embed_stop (EV_A_ w);
3138 3454
3139 { 3455 {
3140 struct ev_loop *loop = w->other; 3456 EV_P = w->other;
3141 3457
3142 ev_loop_fork (EV_A); 3458 ev_loop_fork (EV_A);
3143 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3459 ev_run (EV_A_ EVRUN_NOWAIT);
3144 } 3460 }
3145 3461
3146 ev_embed_start (EV_A_ w); 3462 ev_embed_start (EV_A_ w);
3147} 3463}
3148 3464
… …
3159{ 3475{
3160 if (expect_false (ev_is_active (w))) 3476 if (expect_false (ev_is_active (w)))
3161 return; 3477 return;
3162 3478
3163 { 3479 {
3164 struct ev_loop *loop = w->other; 3480 EV_P = w->other;
3165 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3481 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); 3482 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3167 } 3483 }
3168 3484
3169 EV_FREQUENT_CHECK; 3485 EV_FREQUENT_CHECK;
… …
3196 3512
3197 ev_io_stop (EV_A_ &w->io); 3513 ev_io_stop (EV_A_ &w->io);
3198 ev_prepare_stop (EV_A_ &w->prepare); 3514 ev_prepare_stop (EV_A_ &w->prepare);
3199 ev_fork_stop (EV_A_ &w->fork); 3515 ev_fork_stop (EV_A_ &w->fork);
3200 3516
3517 ev_stop (EV_A_ (W)w);
3518
3201 EV_FREQUENT_CHECK; 3519 EV_FREQUENT_CHECK;
3202} 3520}
3203#endif 3521#endif
3204 3522
3205#if EV_FORK_ENABLE 3523#if EV_FORK_ENABLE
… …
3245ev_async_start (EV_P_ ev_async *w) 3563ev_async_start (EV_P_ ev_async *w)
3246{ 3564{
3247 if (expect_false (ev_is_active (w))) 3565 if (expect_false (ev_is_active (w)))
3248 return; 3566 return;
3249 3567
3568 w->sent = 0;
3569
3250 evpipe_init (EV_A); 3570 evpipe_init (EV_A);
3251 3571
3252 EV_FREQUENT_CHECK; 3572 EV_FREQUENT_CHECK;
3253 3573
3254 ev_start (EV_A_ (W)w, ++asynccnt); 3574 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3281 3601
3282void 3602void
3283ev_async_send (EV_P_ ev_async *w) 3603ev_async_send (EV_P_ ev_async *w)
3284{ 3604{
3285 w->sent = 1; 3605 w->sent = 1;
3286 evpipe_write (EV_A_ &gotasync); 3606 evpipe_write (EV_A_ &async_pending);
3287} 3607}
3288#endif 3608#endif
3289 3609
3290/*****************************************************************************/ 3610/*****************************************************************************/
3291 3611
… …
3331{ 3651{
3332 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3652 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3333 3653
3334 if (expect_false (!once)) 3654 if (expect_false (!once))
3335 { 3655 {
3336 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3656 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3337 return; 3657 return;
3338 } 3658 }
3339 3659
3340 once->cb = cb; 3660 once->cb = cb;
3341 once->arg = arg; 3661 once->arg = arg;
… …
3428 if (types & EV_ASYNC) 3748 if (types & EV_ASYNC)
3429 for (i = asynccnt; i--; ) 3749 for (i = asynccnt; i--; )
3430 cb (EV_A_ EV_ASYNC, asyncs [i]); 3750 cb (EV_A_ EV_ASYNC, asyncs [i]);
3431#endif 3751#endif
3432 3752
3753#if EV_PREPARE_ENABLE
3433 if (types & EV_PREPARE) 3754 if (types & EV_PREPARE)
3434 for (i = preparecnt; i--; ) 3755 for (i = preparecnt; i--; )
3435#if EV_EMBED_ENABLE 3756# if EV_EMBED_ENABLE
3436 if (ev_cb (prepares [i]) != embed_prepare_cb) 3757 if (ev_cb (prepares [i]) != embed_prepare_cb)
3437#endif 3758# endif
3438 cb (EV_A_ EV_PREPARE, prepares [i]); 3759 cb (EV_A_ EV_PREPARE, prepares [i]);
3760#endif
3439 3761
3762#if EV_CHECK_ENABLE
3440 if (types & EV_CHECK) 3763 if (types & EV_CHECK)
3441 for (i = checkcnt; i--; ) 3764 for (i = checkcnt; i--; )
3442 cb (EV_A_ EV_CHECK, checks [i]); 3765 cb (EV_A_ EV_CHECK, checks [i]);
3766#endif
3443 3767
3768#if EV_SIGNAL_ENABLE
3444 if (types & EV_SIGNAL) 3769 if (types & EV_SIGNAL)
3445 for (i = 0; i < signalmax; ++i) 3770 for (i = 0; i < EV_NSIG - 1; ++i)
3446 for (wl = signals [i].head; wl; ) 3771 for (wl = signals [i].head; wl; )
3447 { 3772 {
3448 wn = wl->next; 3773 wn = wl->next;
3449 cb (EV_A_ EV_SIGNAL, wl); 3774 cb (EV_A_ EV_SIGNAL, wl);
3450 wl = wn; 3775 wl = wn;
3451 } 3776 }
3777#endif
3452 3778
3779#if EV_CHILD_ENABLE
3453 if (types & EV_CHILD) 3780 if (types & EV_CHILD)
3454 for (i = EV_PID_HASHSIZE; i--; ) 3781 for (i = (EV_PID_HASHSIZE); i--; )
3455 for (wl = childs [i]; wl; ) 3782 for (wl = childs [i]; wl; )
3456 { 3783 {
3457 wn = wl->next; 3784 wn = wl->next;
3458 cb (EV_A_ EV_CHILD, wl); 3785 cb (EV_A_ EV_CHILD, wl);
3459 wl = wn; 3786 wl = wn;
3460 } 3787 }
3788#endif
3461/* EV_STAT 0x00001000 /* stat data changed */ 3789/* EV_STAT 0x00001000 /* stat data changed */
3462/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3790/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3463} 3791}
3464#endif 3792#endif
3465 3793
3466#if EV_MULTIPLICITY 3794#if EV_MULTIPLICITY
3467 #include "ev_wrap.h" 3795 #include "ev_wrap.h"
3468#endif 3796#endif
3469 3797
3470#ifdef __cplusplus 3798EV_CPP(})
3471}
3472#endif
3473 3799

Diff Legend

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