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

Comparing libev/ev.c (file contents):
Revision 1.296 by root, Thu Jul 9 09:11:20 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}
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 613#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 614#define ev_free(ptr) ev_realloc ((ptr), 0)
492 615
493/*****************************************************************************/ 616/*****************************************************************************/
494 617
618/* set in reify when reification needed */
619#define EV_ANFD_REIFY 1
620
495/* file descriptor info structure */ 621/* file descriptor info structure */
496typedef struct 622typedef struct
497{ 623{
498 WL head; 624 WL head;
499 unsigned char events; /* the events watched for */ 625 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 626 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 627 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 628 unsigned char unused;
503#if EV_USE_EPOLL 629#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 630 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 631#endif
… …
567 693
568 static int ev_default_loop_ptr; 694 static int ev_default_loop_ptr;
569 695
570#endif 696#endif
571 697
698#if EV_FEATURE_API
699# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
700# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
701# define EV_INVOKE_PENDING invoke_cb (EV_A)
702#else
703# define EV_RELEASE_CB (void)0
704# define EV_ACQUIRE_CB (void)0
705# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
706#endif
707
708#define EVBREAK_RECURSE 0x80
709
572/*****************************************************************************/ 710/*****************************************************************************/
573 711
574#ifndef EV_HAVE_EV_TIME 712#ifndef EV_HAVE_EV_TIME
575ev_tstamp 713ev_tstamp
576ev_time (void) 714ev_time (void)
… …
619 if (delay > 0.) 757 if (delay > 0.)
620 { 758 {
621#if EV_USE_NANOSLEEP 759#if EV_USE_NANOSLEEP
622 struct timespec ts; 760 struct timespec ts;
623 761
624 ts.tv_sec = (time_t)delay; 762 EV_TS_SET (ts, delay);
625 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
626
627 nanosleep (&ts, 0); 763 nanosleep (&ts, 0);
628#elif defined(_WIN32) 764#elif defined(_WIN32)
629 Sleep ((unsigned long)(delay * 1e3)); 765 Sleep ((unsigned long)(delay * 1e3));
630#else 766#else
631 struct timeval tv; 767 struct timeval tv;
632 768
633 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635
636 /* 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 */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 771 /* by older ones */
772 EV_TV_SET (tv, delay);
639 select (0, 0, 0, 0, &tv); 773 select (0, 0, 0, 0, &tv);
640#endif 774#endif
641 } 775 }
642} 776}
643 777
644/*****************************************************************************/ 778/*****************************************************************************/
645 779
646#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 */
647 781
648/* find a suitable new size for the given array, */ 782/* find a suitable new size for the given array, */
649/* hopefully by rounding to a ncie-to-malloc size */ 783/* hopefully by rounding to a nice-to-malloc size */
650inline_size int 784inline_size int
651array_nextsize (int elem, int cur, int cnt) 785array_nextsize (int elem, int cur, int cnt)
652{ 786{
653 int ncur = cur + 1; 787 int ncur = cur + 1;
654 788
… …
750} 884}
751 885
752/*****************************************************************************/ 886/*****************************************************************************/
753 887
754inline_speed void 888inline_speed void
755fd_event (EV_P_ int fd, int revents) 889fd_event_nocheck (EV_P_ int fd, int revents)
756{ 890{
757 ANFD *anfd = anfds + fd; 891 ANFD *anfd = anfds + fd;
758 ev_io *w; 892 ev_io *w;
759 893
760 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)
… …
764 if (ev) 898 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 899 ev_feed_event (EV_A_ (W)w, ev);
766 } 900 }
767} 901}
768 902
903/* do not submit kernel events for fds that have reify set */
904/* because that means they changed while we were polling for new events */
905inline_speed void
906fd_event (EV_P_ int fd, int revents)
907{
908 ANFD *anfd = anfds + fd;
909
910 if (expect_true (!anfd->reify))
911 fd_event_nocheck (EV_A_ fd, revents);
912}
913
769void 914void
770ev_feed_fd_event (EV_P_ int fd, int revents) 915ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 916{
772 if (fd >= 0 && fd < anfdmax) 917 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 918 fd_event_nocheck (EV_A_ fd, revents);
774} 919}
775 920
776/* make sure the external fd watch events are in-sync */ 921/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 922/* with the kernel/libev internal state */
778inline_size void 923inline_size void
… …
784 { 929 {
785 int fd = fdchanges [i]; 930 int fd = fdchanges [i];
786 ANFD *anfd = anfds + fd; 931 ANFD *anfd = anfds + fd;
787 ev_io *w; 932 ev_io *w;
788 933
789 unsigned char events = 0; 934 unsigned char o_events = anfd->events;
935 unsigned char o_reify = anfd->reify;
790 936
791 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 937 anfd->reify = 0;
792 events |= (unsigned char)w->events;
793 938
794#if EV_SELECT_IS_WINSOCKET 939#if EV_SELECT_IS_WINSOCKET
795 if (events) 940 if (o_reify & EV__IOFDSET)
796 { 941 {
797 unsigned long arg; 942 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 943 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
800 #else
801 anfd->handle = _get_osfhandle (fd);
802 #endif
803 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));
804 } 945 }
805#endif 946#endif
806 947
948 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
807 { 949 {
808 unsigned char o_events = anfd->events;
809 unsigned char o_reify = anfd->reify;
810
811 anfd->reify = 0;
812 anfd->events = events; 950 anfd->events = 0;
813 951
814 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)
815 backend_modify (EV_A_ fd, o_events, events); 960 backend_modify (EV_A_ fd, o_events, anfd->events);
816 }
817 } 961 }
818 962
819 fdchangecnt = 0; 963 fdchangecnt = 0;
820} 964}
821 965
… …
845 ev_io_stop (EV_A_ w); 989 ev_io_stop (EV_A_ w);
846 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);
847 } 991 }
848} 992}
849 993
850/* check whether the given fd is atcually valid, for error recovery */ 994/* check whether the given fd is actually valid, for error recovery */
851inline_size int 995inline_size int
852fd_valid (int fd) 996fd_valid (int fd)
853{ 997{
854#ifdef _WIN32 998#ifdef _WIN32
855 return _get_osfhandle (fd) != -1; 999 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
856#else 1000#else
857 return fcntl (fd, F_GETFD) != -1; 1001 return fcntl (fd, F_GETFD) != -1;
858#endif 1002#endif
859} 1003}
860 1004
… …
878 1022
879 for (fd = anfdmax; fd--; ) 1023 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 1024 if (anfds [fd].events)
881 { 1025 {
882 fd_kill (EV_A_ fd); 1026 fd_kill (EV_A_ fd);
883 return; 1027 break;
884 } 1028 }
885} 1029}
886 1030
887/* 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 */
888static void noinline 1032static void noinline
… …
893 for (fd = 0; fd < anfdmax; ++fd) 1037 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 1038 if (anfds [fd].events)
895 { 1039 {
896 anfds [fd].events = 0; 1040 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 1041 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1042 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 1043 }
900} 1044}
901 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
902/*****************************************************************************/ 1060/*****************************************************************************/
903 1061
904/* 1062/*
905 * 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
906 * 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
907 * the branching factor of the d-tree. 1065 * the branching factor of the d-tree.
908 */ 1066 */
909 1067
910/* 1068/*
… …
978 1136
979 for (;;) 1137 for (;;)
980 { 1138 {
981 int c = k << 1; 1139 int c = k << 1;
982 1140
983 if (c > N + HEAP0 - 1) 1141 if (c >= N + HEAP0)
984 break; 1142 break;
985 1143
986 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])
987 ? 1 : 0; 1145 ? 1 : 0;
988 1146
… …
1024 1182
1025/* move an element suitably so it is in a correct place */ 1183/* move an element suitably so it is in a correct place */
1026inline_size void 1184inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1185adjustheap (ANHE *heap, int N, int k)
1028{ 1186{
1029 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)]))
1030 upheap (heap, k); 1188 upheap (heap, k);
1031 else 1189 else
1032 downheap (heap, N, k); 1190 downheap (heap, N, k);
1033} 1191}
1034 1192
… …
1047/*****************************************************************************/ 1205/*****************************************************************************/
1048 1206
1049/* associate signal watchers to a signal signal */ 1207/* associate signal watchers to a signal signal */
1050typedef struct 1208typedef struct
1051{ 1209{
1210 EV_ATOMIC_T pending;
1211#if EV_MULTIPLICITY
1212 EV_P;
1213#endif
1052 WL head; 1214 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1215} ANSIG;
1055 1216
1056static ANSIG *signals; 1217static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1218
1061/*****************************************************************************/ 1219/*****************************************************************************/
1062 1220
1063/* used to prepare libev internal fd's */ 1221#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1064/* this is not fork-safe */
1065inline_speed void
1066fd_intern (int fd)
1067{
1068#ifdef _WIN32
1069 unsigned long arg = 1;
1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1071#else
1072 fcntl (fd, F_SETFD, FD_CLOEXEC);
1073 fcntl (fd, F_SETFL, O_NONBLOCK);
1074#endif
1075}
1076 1222
1077static void noinline 1223static void noinline
1078evpipe_init (EV_P) 1224evpipe_init (EV_P)
1079{ 1225{
1080 if (!ev_is_active (&pipe_w)) 1226 if (!ev_is_active (&pipe_w))
1081 { 1227 {
1082#if EV_USE_EVENTFD 1228# if EV_USE_EVENTFD
1229 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1230 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1231 evfd = eventfd (0, 0);
1232
1233 if (evfd >= 0)
1084 { 1234 {
1085 evpipe [0] = -1; 1235 evpipe [0] = -1;
1086 fd_intern (evfd); 1236 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1237 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1238 }
1089 else 1239 else
1090#endif 1240# endif
1091 { 1241 {
1092 while (pipe (evpipe)) 1242 while (pipe (evpipe))
1093 ev_syserr ("(libev) error creating signal/async pipe"); 1243 ev_syserr ("(libev) error creating signal/async pipe");
1094 1244
1095 fd_intern (evpipe [0]); 1245 fd_intern (evpipe [0]);
… …
1106evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1256evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1107{ 1257{
1108 if (!*flag) 1258 if (!*flag)
1109 { 1259 {
1110 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;
1111 1262
1112 *flag = 1; 1263 *flag = 1;
1113 1264
1114#if EV_USE_EVENTFD 1265#if EV_USE_EVENTFD
1115 if (evfd >= 0) 1266 if (evfd >= 0)
… …
1117 uint64_t counter = 1; 1268 uint64_t counter = 1;
1118 write (evfd, &counter, sizeof (uint64_t)); 1269 write (evfd, &counter, sizeof (uint64_t));
1119 } 1270 }
1120 else 1271 else
1121#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. */
1122 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1123 1279
1124 errno = old_errno; 1280 errno = old_errno;
1125 } 1281 }
1126} 1282}
1127 1283
1128/* called whenever the libev signal pipe */ 1284/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1285/* got some events (signal, async) */
1130static void 1286static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1287pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1288{
1289 int i;
1290
1133#if EV_USE_EVENTFD 1291#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1292 if (evfd >= 0)
1135 { 1293 {
1136 uint64_t counter; 1294 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1295 read (evfd, &counter, sizeof (uint64_t));
1138 } 1296 }
1139 else 1297 else
1140#endif 1298#endif
1141 { 1299 {
1142 char dummy; 1300 char dummy;
1301 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1143 read (evpipe [0], &dummy, 1); 1302 read (evpipe [0], &dummy, 1);
1144 } 1303 }
1145 1304
1146 if (gotsig && ev_is_default_loop (EV_A)) 1305 if (sig_pending)
1147 { 1306 {
1148 int signum; 1307 sig_pending = 0;
1149 gotsig = 0;
1150 1308
1151 for (signum = signalmax; signum--; ) 1309 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1310 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1311 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1312 }
1155 1313
1156#if EV_ASYNC_ENABLE 1314#if EV_ASYNC_ENABLE
1157 if (gotasync) 1315 if (async_pending)
1158 { 1316 {
1159 int i; 1317 async_pending = 0;
1160 gotasync = 0;
1161 1318
1162 for (i = asynccnt; i--; ) 1319 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1320 if (asyncs [i]->sent)
1164 { 1321 {
1165 asyncs [i]->sent = 0; 1322 asyncs [i]->sent = 0;
… …
1173 1330
1174static void 1331static void
1175ev_sighandler (int signum) 1332ev_sighandler (int signum)
1176{ 1333{
1177#if EV_MULTIPLICITY 1334#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1335 EV_P = signals [signum - 1].loop;
1179#endif 1336#endif
1180 1337
1181#if _WIN32 1338#ifdef _WIN32
1182 signal (signum, ev_sighandler); 1339 signal (signum, ev_sighandler);
1183#endif 1340#endif
1184 1341
1185 signals [signum - 1].gotsig = 1; 1342 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1343 evpipe_write (EV_A_ &sig_pending);
1187} 1344}
1188 1345
1189void noinline 1346void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1347ev_feed_signal_event (EV_P_ int signum)
1191{ 1348{
1192 WL w; 1349 WL w;
1193 1350
1351 if (expect_false (signum <= 0 || signum > EV_NSIG))
1352 return;
1353
1354 --signum;
1355
1194#if EV_MULTIPLICITY 1356#if EV_MULTIPLICITY
1195 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 */
1196#endif 1358 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1359
1198 --signum; 1360 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1361 return;
1362#endif
1202 1363
1203 signals [signum].gotsig = 0; 1364 signals [signum].pending = 0;
1204 1365
1205 for (w = signals [signum].head; w; w = w->next) 1366 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1367 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1368}
1208 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
1209/*****************************************************************************/ 1392/*****************************************************************************/
1210 1393
1394#if EV_CHILD_ENABLE
1211static WL childs [EV_PID_HASHSIZE]; 1395static WL childs [EV_PID_HASHSIZE];
1212
1213#ifndef _WIN32
1214 1396
1215static ev_signal childev; 1397static ev_signal childev;
1216 1398
1217#ifndef WIFCONTINUED 1399#ifndef WIFCONTINUED
1218# define WIFCONTINUED(status) 0 1400# define WIFCONTINUED(status) 0
… …
1223child_reap (EV_P_ int chain, int pid, int status) 1405child_reap (EV_P_ int chain, int pid, int status)
1224{ 1406{
1225 ev_child *w; 1407 ev_child *w;
1226 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1408 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1227 1409
1228 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)
1229 { 1411 {
1230 if ((w->pid == pid || !w->pid) 1412 if ((w->pid == pid || !w->pid)
1231 && (!traced || (w->flags & 1))) 1413 && (!traced || (w->flags & 1)))
1232 { 1414 {
1233 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 */
… …
1258 /* 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 */
1259 /* 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 */
1260 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1442 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1261 1443
1262 child_reap (EV_A_ pid, pid, status); 1444 child_reap (EV_A_ pid, pid, status);
1263 if (EV_PID_HASHSIZE > 1) 1445 if ((EV_PID_HASHSIZE) > 1)
1264 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 */
1265} 1447}
1266 1448
1267#endif 1449#endif
1268 1450
… …
1335#ifdef __APPLE__ 1517#ifdef __APPLE__
1336 /* only select works correctly on that "unix-certified" platform */ 1518 /* only select works correctly on that "unix-certified" platform */
1337 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1519 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1338 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 */
1339#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
1340 1525
1341 return flags; 1526 return flags;
1342} 1527}
1343 1528
1344unsigned int 1529unsigned int
… …
1357ev_backend (EV_P) 1542ev_backend (EV_P)
1358{ 1543{
1359 return backend; 1544 return backend;
1360} 1545}
1361 1546
1547#if EV_FEATURE_API
1362unsigned int 1548unsigned int
1363ev_loop_count (EV_P) 1549ev_iteration (EV_P)
1364{ 1550{
1365 return loop_count; 1551 return loop_count;
1366} 1552}
1367 1553
1368unsigned int 1554unsigned int
1369ev_loop_depth (EV_P) 1555ev_depth (EV_P)
1370{ 1556{
1371 return loop_depth; 1557 return loop_depth;
1372} 1558}
1373 1559
1374void 1560void
… …
1380void 1566void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1567ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1568{
1383 timeout_blocktime = interval; 1569 timeout_blocktime = interval;
1384} 1570}
1571
1572void
1573ev_set_userdata (EV_P_ void *data)
1574{
1575 userdata = data;
1576}
1577
1578void *
1579ev_userdata (EV_P)
1580{
1581 return userdata;
1582}
1583
1584void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1585{
1586 invoke_cb = invoke_pending_cb;
1587}
1588
1589void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1590{
1591 release_cb = release;
1592 acquire_cb = acquire;
1593}
1594#endif
1385 1595
1386/* initialise a loop structure, must be zero-initialised */ 1596/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1597static void noinline
1388loop_init (EV_P_ unsigned int flags) 1598loop_init (EV_P_ unsigned int flags)
1389{ 1599{
… …
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1617 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1618 have_monotonic = 1;
1409 } 1619 }
1410#endif 1620#endif
1411 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
1412 ev_rt_now = ev_time (); 1633 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1634 mn_now = get_clock ();
1414 now_floor = mn_now; 1635 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1636 rtmn_diff = ev_rt_now - mn_now;
1637#if EV_FEATURE_API
1416 invoke_cb = ev_invoke_pending; 1638 invoke_cb = ev_invoke_pending;
1639#endif
1417 1640
1418 io_blocktime = 0.; 1641 io_blocktime = 0.;
1419 timeout_blocktime = 0.; 1642 timeout_blocktime = 0.;
1420 backend = 0; 1643 backend = 0;
1421 backend_fd = -1; 1644 backend_fd = -1;
1422 gotasync = 0; 1645 sig_pending = 0;
1646#if EV_ASYNC_ENABLE
1647 async_pending = 0;
1648#endif
1423#if EV_USE_INOTIFY 1649#if EV_USE_INOTIFY
1424 fs_fd = -2; 1650 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1425#endif 1651#endif
1426 1652#if EV_USE_SIGNALFD
1427 /* pid check not overridable via env */ 1653 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1428#ifndef _WIN32
1429 if (flags & EVFLAG_FORKCHECK)
1430 curpid = getpid ();
1431#endif 1654#endif
1432
1433 if (!(flags & EVFLAG_NOENV)
1434 && !enable_secure ()
1435 && getenv ("LIBEV_FLAGS"))
1436 flags = atoi (getenv ("LIBEV_FLAGS"));
1437 1655
1438 if (!(flags & 0x0000ffffU)) 1656 if (!(flags & 0x0000ffffU))
1439 flags |= ev_recommended_backends (); 1657 flags |= ev_recommended_backends ();
1440 1658
1441#if EV_USE_PORT 1659#if EV_USE_PORT
… …
1454 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1672 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1455#endif 1673#endif
1456 1674
1457 ev_prepare_init (&pending_w, pendingcb); 1675 ev_prepare_init (&pending_w, pendingcb);
1458 1676
1677#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1459 ev_init (&pipe_w, pipecb); 1678 ev_init (&pipe_w, pipecb);
1460 ev_set_priority (&pipe_w, EV_MAXPRI); 1679 ev_set_priority (&pipe_w, EV_MAXPRI);
1680#endif
1461 } 1681 }
1462} 1682}
1463 1683
1464/* free up a loop structure */ 1684/* free up a loop structure */
1465static void noinline 1685static void noinline
… …
1467{ 1687{
1468 int i; 1688 int i;
1469 1689
1470 if (ev_is_active (&pipe_w)) 1690 if (ev_is_active (&pipe_w))
1471 { 1691 {
1472 ev_ref (EV_A); /* signal watcher */ 1692 /*ev_ref (EV_A);*/
1473 ev_io_stop (EV_A_ &pipe_w); 1693 /*ev_io_stop (EV_A_ &pipe_w);*/
1474 1694
1475#if EV_USE_EVENTFD 1695#if EV_USE_EVENTFD
1476 if (evfd >= 0) 1696 if (evfd >= 0)
1477 close (evfd); 1697 close (evfd);
1478#endif 1698#endif
1479 1699
1480 if (evpipe [0] >= 0) 1700 if (evpipe [0] >= 0)
1481 { 1701 {
1482 close (evpipe [0]); 1702 EV_WIN32_CLOSE_FD (evpipe [0]);
1483 close (evpipe [1]); 1703 EV_WIN32_CLOSE_FD (evpipe [1]);
1484 } 1704 }
1485 } 1705 }
1706
1707#if EV_USE_SIGNALFD
1708 if (ev_is_active (&sigfd_w))
1709 close (sigfd);
1710#endif
1486 1711
1487#if EV_USE_INOTIFY 1712#if EV_USE_INOTIFY
1488 if (fs_fd >= 0) 1713 if (fs_fd >= 0)
1489 close (fs_fd); 1714 close (fs_fd);
1490#endif 1715#endif
… …
1514#if EV_IDLE_ENABLE 1739#if EV_IDLE_ENABLE
1515 array_free (idle, [i]); 1740 array_free (idle, [i]);
1516#endif 1741#endif
1517 } 1742 }
1518 1743
1519 ev_free (anfds); anfdmax = 0; 1744 ev_free (anfds); anfds = 0; anfdmax = 0;
1520 1745
1521 /* have to use the microsoft-never-gets-it-right macro */ 1746 /* have to use the microsoft-never-gets-it-right macro */
1522 array_free (rfeed, EMPTY); 1747 array_free (rfeed, EMPTY);
1523 array_free (fdchange, EMPTY); 1748 array_free (fdchange, EMPTY);
1524 array_free (timer, EMPTY); 1749 array_free (timer, EMPTY);
… …
1559 1784
1560 if (ev_is_active (&pipe_w)) 1785 if (ev_is_active (&pipe_w))
1561 { 1786 {
1562 /* this "locks" the handlers against writing to the pipe */ 1787 /* this "locks" the handlers against writing to the pipe */
1563 /* while we modify the fd vars */ 1788 /* while we modify the fd vars */
1564 gotsig = 1; 1789 sig_pending = 1;
1565#if EV_ASYNC_ENABLE 1790#if EV_ASYNC_ENABLE
1566 gotasync = 1; 1791 async_pending = 1;
1567#endif 1792#endif
1568 1793
1569 ev_ref (EV_A); 1794 ev_ref (EV_A);
1570 ev_io_stop (EV_A_ &pipe_w); 1795 ev_io_stop (EV_A_ &pipe_w);
1571 1796
… …
1574 close (evfd); 1799 close (evfd);
1575#endif 1800#endif
1576 1801
1577 if (evpipe [0] >= 0) 1802 if (evpipe [0] >= 0)
1578 { 1803 {
1579 close (evpipe [0]); 1804 EV_WIN32_CLOSE_FD (evpipe [0]);
1580 close (evpipe [1]); 1805 EV_WIN32_CLOSE_FD (evpipe [1]);
1581 } 1806 }
1582 1807
1808#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1583 evpipe_init (EV_A); 1809 evpipe_init (EV_A);
1584 /* now iterate over everything, in case we missed something */ 1810 /* now iterate over everything, in case we missed something */
1585 pipecb (EV_A_ &pipe_w, EV_READ); 1811 pipecb (EV_A_ &pipe_w, EV_READ);
1812#endif
1586 } 1813 }
1587 1814
1588 postfork = 0; 1815 postfork = 0;
1589} 1816}
1590 1817
1591#if EV_MULTIPLICITY 1818#if EV_MULTIPLICITY
1592 1819
1593struct ev_loop * 1820struct ev_loop *
1594ev_loop_new (unsigned int flags) 1821ev_loop_new (unsigned int flags)
1595{ 1822{
1596 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));
1597 1824
1598 memset (loop, 0, sizeof (struct ev_loop)); 1825 memset (EV_A, 0, sizeof (struct ev_loop));
1599
1600 loop_init (EV_A_ flags); 1826 loop_init (EV_A_ flags);
1601 1827
1602 if (ev_backend (EV_A)) 1828 if (ev_backend (EV_A))
1603 return loop; 1829 return EV_A;
1604 1830
1605 return 0; 1831 return 0;
1606} 1832}
1607 1833
1608void 1834void
… …
1615void 1841void
1616ev_loop_fork (EV_P) 1842ev_loop_fork (EV_P)
1617{ 1843{
1618 postfork = 1; /* must be in line with ev_default_fork */ 1844 postfork = 1; /* must be in line with ev_default_fork */
1619} 1845}
1846#endif /* multiplicity */
1620 1847
1621#if EV_VERIFY 1848#if EV_VERIFY
1622static void noinline 1849static void noinline
1623verify_watcher (EV_P_ W w) 1850verify_watcher (EV_P_ W w)
1624{ 1851{
… …
1652 verify_watcher (EV_A_ ws [cnt]); 1879 verify_watcher (EV_A_ ws [cnt]);
1653 } 1880 }
1654} 1881}
1655#endif 1882#endif
1656 1883
1884#if EV_FEATURE_API
1657void 1885void
1658ev_loop_verify (EV_P) 1886ev_verify (EV_P)
1659{ 1887{
1660#if EV_VERIFY 1888#if EV_VERIFY
1661 int i; 1889 int i;
1662 WL w; 1890 WL w;
1663 1891
… …
1702#if EV_ASYNC_ENABLE 1930#if EV_ASYNC_ENABLE
1703 assert (asyncmax >= asynccnt); 1931 assert (asyncmax >= asynccnt);
1704 array_verify (EV_A_ (W *)asyncs, asynccnt); 1932 array_verify (EV_A_ (W *)asyncs, asynccnt);
1705#endif 1933#endif
1706 1934
1935#if EV_PREPARE_ENABLE
1707 assert (preparemax >= preparecnt); 1936 assert (preparemax >= preparecnt);
1708 array_verify (EV_A_ (W *)prepares, preparecnt); 1937 array_verify (EV_A_ (W *)prepares, preparecnt);
1938#endif
1709 1939
1940#if EV_CHECK_ENABLE
1710 assert (checkmax >= checkcnt); 1941 assert (checkmax >= checkcnt);
1711 array_verify (EV_A_ (W *)checks, checkcnt); 1942 array_verify (EV_A_ (W *)checks, checkcnt);
1943#endif
1712 1944
1713# if 0 1945# if 0
1946#if EV_CHILD_ENABLE
1714 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)
1715 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1948 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1949#endif
1716# endif 1950# endif
1717#endif 1951#endif
1718} 1952}
1719 1953#endif
1720#endif /* multiplicity */
1721 1954
1722#if EV_MULTIPLICITY 1955#if EV_MULTIPLICITY
1723struct ev_loop * 1956struct ev_loop *
1724ev_default_loop_init (unsigned int flags) 1957ev_default_loop_init (unsigned int flags)
1725#else 1958#else
… …
1728#endif 1961#endif
1729{ 1962{
1730 if (!ev_default_loop_ptr) 1963 if (!ev_default_loop_ptr)
1731 { 1964 {
1732#if EV_MULTIPLICITY 1965#if EV_MULTIPLICITY
1733 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1966 EV_P = ev_default_loop_ptr = &default_loop_struct;
1734#else 1967#else
1735 ev_default_loop_ptr = 1; 1968 ev_default_loop_ptr = 1;
1736#endif 1969#endif
1737 1970
1738 loop_init (EV_A_ flags); 1971 loop_init (EV_A_ flags);
1739 1972
1740 if (ev_backend (EV_A)) 1973 if (ev_backend (EV_A))
1741 { 1974 {
1742#ifndef _WIN32 1975#if EV_CHILD_ENABLE
1743 ev_signal_init (&childev, childcb, SIGCHLD); 1976 ev_signal_init (&childev, childcb, SIGCHLD);
1744 ev_set_priority (&childev, EV_MAXPRI); 1977 ev_set_priority (&childev, EV_MAXPRI);
1745 ev_signal_start (EV_A_ &childev); 1978 ev_signal_start (EV_A_ &childev);
1746 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1979 ev_unref (EV_A); /* child watcher should not keep loop alive */
1747#endif 1980#endif
… …
1755 1988
1756void 1989void
1757ev_default_destroy (void) 1990ev_default_destroy (void)
1758{ 1991{
1759#if EV_MULTIPLICITY 1992#if EV_MULTIPLICITY
1760 struct ev_loop *loop = ev_default_loop_ptr; 1993 EV_P = ev_default_loop_ptr;
1761#endif 1994#endif
1762 1995
1763 ev_default_loop_ptr = 0; 1996 ev_default_loop_ptr = 0;
1764 1997
1765#ifndef _WIN32 1998#if EV_CHILD_ENABLE
1766 ev_ref (EV_A); /* child watcher */ 1999 ev_ref (EV_A); /* child watcher */
1767 ev_signal_stop (EV_A_ &childev); 2000 ev_signal_stop (EV_A_ &childev);
1768#endif 2001#endif
1769 2002
1770 loop_destroy (EV_A); 2003 loop_destroy (EV_A);
… …
1772 2005
1773void 2006void
1774ev_default_fork (void) 2007ev_default_fork (void)
1775{ 2008{
1776#if EV_MULTIPLICITY 2009#if EV_MULTIPLICITY
1777 struct ev_loop *loop = ev_default_loop_ptr; 2010 EV_P = ev_default_loop_ptr;
1778#endif 2011#endif
1779 2012
1780 postfork = 1; /* must be in line with ev_loop_fork */ 2013 postfork = 1; /* must be in line with ev_loop_fork */
1781} 2014}
1782 2015
… …
1786ev_invoke (EV_P_ void *w, int revents) 2019ev_invoke (EV_P_ void *w, int revents)
1787{ 2020{
1788 EV_CB_INVOKE ((W)w, revents); 2021 EV_CB_INVOKE ((W)w, revents);
1789} 2022}
1790 2023
1791void 2024unsigned int
2025ev_pending_count (EV_P)
2026{
2027 int pri;
2028 unsigned int count = 0;
2029
2030 for (pri = NUMPRI; pri--; )
2031 count += pendingcnt [pri];
2032
2033 return count;
2034}
2035
2036void noinline
1792ev_invoke_pending (EV_P) 2037ev_invoke_pending (EV_P)
1793{ 2038{
1794 int pri; 2039 int pri;
1795 2040
1796 for (pri = NUMPRI; pri--; ) 2041 for (pri = NUMPRI; pri--; )
… …
1864 EV_FREQUENT_CHECK; 2109 EV_FREQUENT_CHECK;
1865 feed_reverse (EV_A_ (W)w); 2110 feed_reverse (EV_A_ (W)w);
1866 } 2111 }
1867 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2112 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1868 2113
1869 feed_reverse_done (EV_A_ EV_TIMEOUT); 2114 feed_reverse_done (EV_A_ EV_TIMER);
1870 } 2115 }
1871} 2116}
1872 2117
1873#if EV_PERIODIC_ENABLE 2118#if EV_PERIODIC_ENABLE
1874/* make periodics pending */ 2119/* make periodics pending */
… …
1927 feed_reverse_done (EV_A_ EV_PERIODIC); 2172 feed_reverse_done (EV_A_ EV_PERIODIC);
1928 } 2173 }
1929} 2174}
1930 2175
1931/* simply recalculate all periodics */ 2176/* simply recalculate all periodics */
1932/* 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? */
1933static void noinline 2178static void noinline
1934periodics_reschedule (EV_P) 2179periodics_reschedule (EV_P)
1935{ 2180{
1936 int i; 2181 int i;
1937 2182
… …
1965 ANHE_at_cache (*he); 2210 ANHE_at_cache (*he);
1966 } 2211 }
1967} 2212}
1968 2213
1969/* fetch new monotonic and realtime times from the kernel */ 2214/* fetch new monotonic and realtime times from the kernel */
1970/* also detetc if there was a timejump, and act accordingly */ 2215/* also detect if there was a timejump, and act accordingly */
1971inline_speed void 2216inline_speed void
1972time_update (EV_P_ ev_tstamp max_block) 2217time_update (EV_P_ ev_tstamp max_block)
1973{ 2218{
1974#if EV_USE_MONOTONIC 2219#if EV_USE_MONOTONIC
1975 if (expect_true (have_monotonic)) 2220 if (expect_true (have_monotonic))
… …
2033 mn_now = ev_rt_now; 2278 mn_now = ev_rt_now;
2034 } 2279 }
2035} 2280}
2036 2281
2037void 2282void
2038ev_loop (EV_P_ int flags) 2283ev_run (EV_P_ int flags)
2039{ 2284{
2285#if EV_FEATURE_API
2040 ++loop_depth; 2286 ++loop_depth;
2287#endif
2041 2288
2289 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2290
2042 loop_done = EVUNLOOP_CANCEL; 2291 loop_done = EVBREAK_CANCEL;
2043 2292
2044 invoke_cb (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2293 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2045 2294
2046 do 2295 do
2047 { 2296 {
2048#if EV_VERIFY >= 2 2297#if EV_VERIFY >= 2
2049 ev_loop_verify (EV_A); 2298 ev_verify (EV_A);
2050#endif 2299#endif
2051 2300
2052#ifndef _WIN32 2301#ifndef _WIN32
2053 if (expect_false (curpid)) /* penalise the forking check even more */ 2302 if (expect_false (curpid)) /* penalise the forking check even more */
2054 if (expect_false (getpid () != curpid)) 2303 if (expect_false (getpid () != curpid))
… …
2062 /* we might have forked, so queue fork handlers */ 2311 /* we might have forked, so queue fork handlers */
2063 if (expect_false (postfork)) 2312 if (expect_false (postfork))
2064 if (forkcnt) 2313 if (forkcnt)
2065 { 2314 {
2066 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2315 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2067 invoke_cb (EV_A); 2316 EV_INVOKE_PENDING;
2068 } 2317 }
2069#endif 2318#endif
2070 2319
2320#if EV_PREPARE_ENABLE
2071 /* queue prepare watchers (and execute them) */ 2321 /* queue prepare watchers (and execute them) */
2072 if (expect_false (preparecnt)) 2322 if (expect_false (preparecnt))
2073 { 2323 {
2074 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2324 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2075 invoke_cb (EV_A); 2325 EV_INVOKE_PENDING;
2076 } 2326 }
2327#endif
2328
2329 if (expect_false (loop_done))
2330 break;
2077 2331
2078 /* we might have forked, so reify kernel state if necessary */ 2332 /* we might have forked, so reify kernel state if necessary */
2079 if (expect_false (postfork)) 2333 if (expect_false (postfork))
2080 loop_fork (EV_A); 2334 loop_fork (EV_A);
2081 2335
… …
2085 /* calculate blocking time */ 2339 /* calculate blocking time */
2086 { 2340 {
2087 ev_tstamp waittime = 0.; 2341 ev_tstamp waittime = 0.;
2088 ev_tstamp sleeptime = 0.; 2342 ev_tstamp sleeptime = 0.;
2089 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
2090 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2350 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2091 { 2351 {
2092 /* remember old timestamp for io_blocktime calculation */
2093 ev_tstamp prev_mn_now = mn_now;
2094
2095 /* update time to cancel out callback processing overhead */
2096 time_update (EV_A_ 1e100);
2097
2098 waittime = MAX_BLOCKTIME; 2352 waittime = MAX_BLOCKTIME;
2099 2353
2100 if (timercnt) 2354 if (timercnt)
2101 { 2355 {
2102 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2356 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2129 waittime -= sleeptime; 2383 waittime -= sleeptime;
2130 } 2384 }
2131 } 2385 }
2132 } 2386 }
2133 2387
2388#if EV_FEATURE_API
2134 ++loop_count; 2389 ++loop_count;
2390#endif
2391 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2135 backend_poll (EV_A_ waittime); 2392 backend_poll (EV_A_ waittime);
2393 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2136 2394
2137 /* update ev_rt_now, do magic */ 2395 /* update ev_rt_now, do magic */
2138 time_update (EV_A_ waittime + sleeptime); 2396 time_update (EV_A_ waittime + sleeptime);
2139 } 2397 }
2140 2398
… …
2147#if EV_IDLE_ENABLE 2405#if EV_IDLE_ENABLE
2148 /* queue idle watchers unless other events are pending */ 2406 /* queue idle watchers unless other events are pending */
2149 idle_reify (EV_A); 2407 idle_reify (EV_A);
2150#endif 2408#endif
2151 2409
2410#if EV_CHECK_ENABLE
2152 /* queue check watchers, to be executed first */ 2411 /* queue check watchers, to be executed first */
2153 if (expect_false (checkcnt)) 2412 if (expect_false (checkcnt))
2154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2413 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2414#endif
2155 2415
2156 invoke_cb (EV_A); 2416 EV_INVOKE_PENDING;
2157 } 2417 }
2158 while (expect_true ( 2418 while (expect_true (
2159 activecnt 2419 activecnt
2160 && !loop_done 2420 && !loop_done
2161 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2421 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2162 )); 2422 ));
2163 2423
2164 if (loop_done == EVUNLOOP_ONE) 2424 if (loop_done == EVBREAK_ONE)
2165 loop_done = EVUNLOOP_CANCEL; 2425 loop_done = EVBREAK_CANCEL;
2166 2426
2427#if EV_FEATURE_API
2167 --loop_depth; 2428 --loop_depth;
2429#endif
2168} 2430}
2169 2431
2170void 2432void
2171ev_unloop (EV_P_ int how) 2433ev_break (EV_P_ int how)
2172{ 2434{
2173 loop_done = how; 2435 loop_done = how;
2174} 2436}
2175 2437
2176void 2438void
… …
2223inline_size void 2485inline_size void
2224wlist_del (WL *head, WL elem) 2486wlist_del (WL *head, WL elem)
2225{ 2487{
2226 while (*head) 2488 while (*head)
2227 { 2489 {
2228 if (*head == elem) 2490 if (expect_true (*head == elem))
2229 { 2491 {
2230 *head = elem->next; 2492 *head = elem->next;
2231 return; 2493 break;
2232 } 2494 }
2233 2495
2234 head = &(*head)->next; 2496 head = &(*head)->next;
2235 } 2497 }
2236} 2498}
… …
2296 2558
2297 if (expect_false (ev_is_active (w))) 2559 if (expect_false (ev_is_active (w)))
2298 return; 2560 return;
2299 2561
2300 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2562 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2301 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))));
2302 2564
2303 EV_FREQUENT_CHECK; 2565 EV_FREQUENT_CHECK;
2304 2566
2305 ev_start (EV_A_ (W)w, 1); 2567 ev_start (EV_A_ (W)w, 1);
2306 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2568 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2307 wlist_add (&anfds[fd].head, (WL)w); 2569 wlist_add (&anfds[fd].head, (WL)w);
2308 2570
2309 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2571 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2310 w->events &= ~EV__IOFDSET; 2572 w->events &= ~EV__IOFDSET;
2311 2573
2312 EV_FREQUENT_CHECK; 2574 EV_FREQUENT_CHECK;
2313} 2575}
2314 2576
… …
2324 EV_FREQUENT_CHECK; 2586 EV_FREQUENT_CHECK;
2325 2587
2326 wlist_del (&anfds[w->fd].head, (WL)w); 2588 wlist_del (&anfds[w->fd].head, (WL)w);
2327 ev_stop (EV_A_ (W)w); 2589 ev_stop (EV_A_ (W)w);
2328 2590
2329 fd_change (EV_A_ w->fd, 1); 2591 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2330 2592
2331 EV_FREQUENT_CHECK; 2593 EV_FREQUENT_CHECK;
2332} 2594}
2333 2595
2334void noinline 2596void noinline
… …
2376 timers [active] = timers [timercnt + HEAP0]; 2638 timers [active] = timers [timercnt + HEAP0];
2377 adjustheap (timers, timercnt, active); 2639 adjustheap (timers, timercnt, active);
2378 } 2640 }
2379 } 2641 }
2380 2642
2381 EV_FREQUENT_CHECK;
2382
2383 ev_at (w) -= mn_now; 2643 ev_at (w) -= mn_now;
2384 2644
2385 ev_stop (EV_A_ (W)w); 2645 ev_stop (EV_A_ (W)w);
2646
2647 EV_FREQUENT_CHECK;
2386} 2648}
2387 2649
2388void noinline 2650void noinline
2389ev_timer_again (EV_P_ ev_timer *w) 2651ev_timer_again (EV_P_ ev_timer *w)
2390{ 2652{
… …
2408 } 2670 }
2409 2671
2410 EV_FREQUENT_CHECK; 2672 EV_FREQUENT_CHECK;
2411} 2673}
2412 2674
2675ev_tstamp
2676ev_timer_remaining (EV_P_ ev_timer *w)
2677{
2678 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2679}
2680
2413#if EV_PERIODIC_ENABLE 2681#if EV_PERIODIC_ENABLE
2414void noinline 2682void noinline
2415ev_periodic_start (EV_P_ ev_periodic *w) 2683ev_periodic_start (EV_P_ ev_periodic *w)
2416{ 2684{
2417 if (expect_false (ev_is_active (w))) 2685 if (expect_false (ev_is_active (w)))
… …
2463 periodics [active] = periodics [periodiccnt + HEAP0]; 2731 periodics [active] = periodics [periodiccnt + HEAP0];
2464 adjustheap (periodics, periodiccnt, active); 2732 adjustheap (periodics, periodiccnt, active);
2465 } 2733 }
2466 } 2734 }
2467 2735
2468 EV_FREQUENT_CHECK;
2469
2470 ev_stop (EV_A_ (W)w); 2736 ev_stop (EV_A_ (W)w);
2737
2738 EV_FREQUENT_CHECK;
2471} 2739}
2472 2740
2473void noinline 2741void noinline
2474ev_periodic_again (EV_P_ ev_periodic *w) 2742ev_periodic_again (EV_P_ ev_periodic *w)
2475{ 2743{
… …
2481 2749
2482#ifndef SA_RESTART 2750#ifndef SA_RESTART
2483# define SA_RESTART 0 2751# define SA_RESTART 0
2484#endif 2752#endif
2485 2753
2754#if EV_SIGNAL_ENABLE
2755
2486void noinline 2756void noinline
2487ev_signal_start (EV_P_ ev_signal *w) 2757ev_signal_start (EV_P_ ev_signal *w)
2488{ 2758{
2489#if EV_MULTIPLICITY
2490 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2491#endif
2492 if (expect_false (ev_is_active (w))) 2759 if (expect_false (ev_is_active (w)))
2493 return; 2760 return;
2494 2761
2495 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));
2496 2763
2497 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));
2498 2767
2499 EV_FREQUENT_CHECK; 2768 signals [w->signum - 1].loop = EV_A;
2769#endif
2500 2770
2771 EV_FREQUENT_CHECK;
2772
2773#if EV_USE_SIGNALFD
2774 if (sigfd == -2)
2501 { 2775 {
2502#ifndef _WIN32 2776 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2503 sigset_t full, prev; 2777 if (sigfd < 0 && errno == EINVAL)
2504 sigfillset (&full); 2778 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2505 sigprocmask (SIG_SETMASK, &full, &prev);
2506#endif
2507 2779
2508 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 */
2509 2783
2510#ifndef _WIN32 2784 sigemptyset (&sigfd_set);
2511 sigprocmask (SIG_SETMASK, &prev, 0); 2785
2512#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 }
2513 } 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
2514 2802
2515 ev_start (EV_A_ (W)w, 1); 2803 ev_start (EV_A_ (W)w, 1);
2516 wlist_add (&signals [w->signum - 1].head, (WL)w); 2804 wlist_add (&signals [w->signum - 1].head, (WL)w);
2517 2805
2518 if (!((WL)w)->next) 2806 if (!((WL)w)->next)
2807# if EV_USE_SIGNALFD
2808 if (sigfd < 0) /*TODO*/
2809# endif
2519 { 2810 {
2520#if _WIN32 2811# ifdef _WIN32
2812 evpipe_init (EV_A);
2813
2521 signal (w->signum, ev_sighandler); 2814 signal (w->signum, ev_sighandler);
2522#else 2815# else
2523 struct sigaction sa; 2816 struct sigaction sa;
2817
2818 evpipe_init (EV_A);
2819
2524 sa.sa_handler = ev_sighandler; 2820 sa.sa_handler = ev_sighandler;
2525 sigfillset (&sa.sa_mask); 2821 sigfillset (&sa.sa_mask);
2526 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 */
2527 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);
2528#endif 2828#endif
2529 } 2829 }
2530 2830
2531 EV_FREQUENT_CHECK; 2831 EV_FREQUENT_CHECK;
2532} 2832}
2533 2833
2534void noinline 2834void noinline
… …
2542 2842
2543 wlist_del (&signals [w->signum - 1].head, (WL)w); 2843 wlist_del (&signals [w->signum - 1].head, (WL)w);
2544 ev_stop (EV_A_ (W)w); 2844 ev_stop (EV_A_ (W)w);
2545 2845
2546 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
2547 signal (w->signum, SIG_DFL); 2865 signal (w->signum, SIG_DFL);
2866 }
2548 2867
2549 EV_FREQUENT_CHECK; 2868 EV_FREQUENT_CHECK;
2550} 2869}
2870
2871#endif
2872
2873#if EV_CHILD_ENABLE
2551 2874
2552void 2875void
2553ev_child_start (EV_P_ ev_child *w) 2876ev_child_start (EV_P_ ev_child *w)
2554{ 2877{
2555#if EV_MULTIPLICITY 2878#if EV_MULTIPLICITY
… …
2559 return; 2882 return;
2560 2883
2561 EV_FREQUENT_CHECK; 2884 EV_FREQUENT_CHECK;
2562 2885
2563 ev_start (EV_A_ (W)w, 1); 2886 ev_start (EV_A_ (W)w, 1);
2564 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2887 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2565 2888
2566 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2567} 2890}
2568 2891
2569void 2892void
… …
2573 if (expect_false (!ev_is_active (w))) 2896 if (expect_false (!ev_is_active (w)))
2574 return; 2897 return;
2575 2898
2576 EV_FREQUENT_CHECK; 2899 EV_FREQUENT_CHECK;
2577 2900
2578 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2579 ev_stop (EV_A_ (W)w); 2902 ev_stop (EV_A_ (W)w);
2580 2903
2581 EV_FREQUENT_CHECK; 2904 EV_FREQUENT_CHECK;
2582} 2905}
2906
2907#endif
2583 2908
2584#if EV_STAT_ENABLE 2909#if EV_STAT_ENABLE
2585 2910
2586# ifdef _WIN32 2911# ifdef _WIN32
2587# undef lstat 2912# undef lstat
… …
2593#define MIN_STAT_INTERVAL 0.1074891 2918#define MIN_STAT_INTERVAL 0.1074891
2594 2919
2595static 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);
2596 2921
2597#if EV_USE_INOTIFY 2922#if EV_USE_INOTIFY
2598# 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)
2599 2926
2600static void noinline 2927static void noinline
2601infy_add (EV_P_ ev_stat *w) 2928infy_add (EV_P_ ev_stat *w)
2602{ 2929{
2603 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);
2604 2931
2605 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 */
2606 { 2952 }
2953 else
2954 {
2955 /* can't use inotify, continue to stat */
2607 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2956 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2608 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2609 2957
2610 /* monitor some parent directory for speedup hints */ 2958 /* if path is not there, monitor some parent directory for speedup hints */
2611 /* 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, */
2612 /* but an efficiency issue only */ 2960 /* but an efficiency issue only */
2613 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2961 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2614 { 2962 {
2615 char path [4096]; 2963 char path [4096];
… …
2631 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2979 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2632 } 2980 }
2633 } 2981 }
2634 2982
2635 if (w->wd >= 0) 2983 if (w->wd >= 0)
2636 {
2637 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);
2638 2985
2639 /* now local changes will be tracked by inotify, but remote changes won't */ 2986 /* now re-arm timer, if required */
2640 /* unless the filesystem it known to be local, we therefore still poll */ 2987 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2641 /* also do poll on <2.6.25, but with normal frequency */
2642 struct statfs sfs;
2643
2644 if (fs_2625 && !statfs (w->path, &sfs))
2645 if (sfs.f_type == 0x1373 /* devfs */
2646 || sfs.f_type == 0xEF53 /* ext2/3 */
2647 || sfs.f_type == 0x3153464a /* jfs */
2648 || sfs.f_type == 0x52654973 /* reiser3 */
2649 || sfs.f_type == 0x01021994 /* tempfs */
2650 || sfs.f_type == 0x58465342 /* xfs */)
2651 return;
2652
2653 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2654 ev_timer_again (EV_A_ &w->timer); 2988 ev_timer_again (EV_A_ &w->timer);
2655 } 2989 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2656} 2990}
2657 2991
2658static void noinline 2992static void noinline
2659infy_del (EV_P_ ev_stat *w) 2993infy_del (EV_P_ ev_stat *w)
2660{ 2994{
… …
2663 2997
2664 if (wd < 0) 2998 if (wd < 0)
2665 return; 2999 return;
2666 3000
2667 w->wd = -2; 3001 w->wd = -2;
2668 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3002 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2669 wlist_del (&fs_hash [slot].head, (WL)w); 3003 wlist_del (&fs_hash [slot].head, (WL)w);
2670 3004
2671 /* remove this watcher, if others are watching it, they will rearm */ 3005 /* remove this watcher, if others are watching it, they will rearm */
2672 inotify_rm_watch (fs_fd, wd); 3006 inotify_rm_watch (fs_fd, wd);
2673} 3007}
… …
2675static void noinline 3009static void noinline
2676infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3010infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2677{ 3011{
2678 if (slot < 0) 3012 if (slot < 0)
2679 /* overflow, need to check for all hash slots */ 3013 /* overflow, need to check for all hash slots */
2680 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3014 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2681 infy_wd (EV_A_ slot, wd, ev); 3015 infy_wd (EV_A_ slot, wd, ev);
2682 else 3016 else
2683 { 3017 {
2684 WL w_; 3018 WL w_;
2685 3019
2686 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3020 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2687 { 3021 {
2688 ev_stat *w = (ev_stat *)w_; 3022 ev_stat *w = (ev_stat *)w_;
2689 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 */
2690 3024
2691 if (w->wd == wd || wd == -1) 3025 if (w->wd == wd || wd == -1)
2692 { 3026 {
2693 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3027 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2694 { 3028 {
2695 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);
2696 w->wd = -1; 3030 w->wd = -1;
2697 infy_add (EV_A_ w); /* re-add, no matter what */ 3031 infy_add (EV_A_ w); /* re-add, no matter what */
2698 } 3032 }
2699 3033
2700 stat_timer_cb (EV_A_ &w->timer, 0); 3034 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2705 3039
2706static void 3040static void
2707infy_cb (EV_P_ ev_io *w, int revents) 3041infy_cb (EV_P_ ev_io *w, int revents)
2708{ 3042{
2709 char buf [EV_INOTIFY_BUFSIZE]; 3043 char buf [EV_INOTIFY_BUFSIZE];
2710 struct inotify_event *ev = (struct inotify_event *)buf;
2711 int ofs; 3044 int ofs;
2712 int len = read (fs_fd, buf, sizeof (buf)); 3045 int len = read (fs_fd, buf, sizeof (buf));
2713 3046
2714 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);
2715 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;
2716} 3085}
2717 3086
2718inline_size void 3087inline_size void
2719check_2625 (EV_P) 3088ev_check_2625 (EV_P)
2720{ 3089{
2721 /* kernels < 2.6.25 are borked 3090 /* kernels < 2.6.25 are borked
2722 * 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
2723 */ 3092 */
2724 struct utsname buf; 3093 if (ev_linux_version () < 0x020619)
2725 int major, minor, micro;
2726
2727 if (uname (&buf))
2728 return; 3094 return;
2729 3095
2730 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2731 return;
2732
2733 if (major < 2
2734 || (major == 2 && minor < 6)
2735 || (major == 2 && minor == 6 && micro < 25))
2736 return;
2737
2738 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 ();
2739} 3108}
2740 3109
2741inline_size void 3110inline_size void
2742infy_init (EV_P) 3111infy_init (EV_P)
2743{ 3112{
2744 if (fs_fd != -2) 3113 if (fs_fd != -2)
2745 return; 3114 return;
2746 3115
2747 fs_fd = -1; 3116 fs_fd = -1;
2748 3117
2749 check_2625 (EV_A); 3118 ev_check_2625 (EV_A);
2750 3119
2751 fs_fd = inotify_init (); 3120 fs_fd = infy_newfd ();
2752 3121
2753 if (fs_fd >= 0) 3122 if (fs_fd >= 0)
2754 { 3123 {
3124 fd_intern (fs_fd);
2755 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3125 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2756 ev_set_priority (&fs_w, EV_MAXPRI); 3126 ev_set_priority (&fs_w, EV_MAXPRI);
2757 ev_io_start (EV_A_ &fs_w); 3127 ev_io_start (EV_A_ &fs_w);
3128 ev_unref (EV_A);
2758 } 3129 }
2759} 3130}
2760 3131
2761inline_size void 3132inline_size void
2762infy_fork (EV_P) 3133infy_fork (EV_P)
… …
2764 int slot; 3135 int slot;
2765 3136
2766 if (fs_fd < 0) 3137 if (fs_fd < 0)
2767 return; 3138 return;
2768 3139
3140 ev_ref (EV_A);
3141 ev_io_stop (EV_A_ &fs_w);
2769 close (fs_fd); 3142 close (fs_fd);
2770 fs_fd = inotify_init (); 3143 fs_fd = infy_newfd ();
2771 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
2772 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3153 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2773 { 3154 {
2774 WL w_ = fs_hash [slot].head; 3155 WL w_ = fs_hash [slot].head;
2775 fs_hash [slot].head = 0; 3156 fs_hash [slot].head = 0;
2776 3157
2777 while (w_) 3158 while (w_)
… …
2782 w->wd = -1; 3163 w->wd = -1;
2783 3164
2784 if (fs_fd >= 0) 3165 if (fs_fd >= 0)
2785 infy_add (EV_A_ w); /* re-add, no matter what */ 3166 infy_add (EV_A_ w); /* re-add, no matter what */
2786 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);
2787 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 }
2788 } 3174 }
2789 } 3175 }
2790} 3176}
2791 3177
2792#endif 3178#endif
… …
2809static void noinline 3195static void noinline
2810stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3196stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2811{ 3197{
2812 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3198 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2813 3199
2814 /* we copy this here each the time so that */ 3200 ev_statdata prev = w->attr;
2815 /* prev has the old value when the callback gets invoked */
2816 w->prev = w->attr;
2817 ev_stat_stat (EV_A_ w); 3201 ev_stat_stat (EV_A_ w);
2818 3202
2819 /* 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 */
2820 if ( 3204 if (
2821 w->prev.st_dev != w->attr.st_dev 3205 prev.st_dev != w->attr.st_dev
2822 || w->prev.st_ino != w->attr.st_ino 3206 || prev.st_ino != w->attr.st_ino
2823 || w->prev.st_mode != w->attr.st_mode 3207 || prev.st_mode != w->attr.st_mode
2824 || w->prev.st_nlink != w->attr.st_nlink 3208 || prev.st_nlink != w->attr.st_nlink
2825 || w->prev.st_uid != w->attr.st_uid 3209 || prev.st_uid != w->attr.st_uid
2826 || w->prev.st_gid != w->attr.st_gid 3210 || prev.st_gid != w->attr.st_gid
2827 || w->prev.st_rdev != w->attr.st_rdev 3211 || prev.st_rdev != w->attr.st_rdev
2828 || w->prev.st_size != w->attr.st_size 3212 || prev.st_size != w->attr.st_size
2829 || w->prev.st_atime != w->attr.st_atime 3213 || prev.st_atime != w->attr.st_atime
2830 || w->prev.st_mtime != w->attr.st_mtime 3214 || prev.st_mtime != w->attr.st_mtime
2831 || w->prev.st_ctime != w->attr.st_ctime 3215 || prev.st_ctime != w->attr.st_ctime
2832 ) { 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
2833 #if EV_USE_INOTIFY 3222 #if EV_USE_INOTIFY
2834 if (fs_fd >= 0) 3223 if (fs_fd >= 0)
2835 { 3224 {
2836 infy_del (EV_A_ w); 3225 infy_del (EV_A_ w);
2837 infy_add (EV_A_ w); 3226 infy_add (EV_A_ w);
… …
2862 3251
2863 if (fs_fd >= 0) 3252 if (fs_fd >= 0)
2864 infy_add (EV_A_ w); 3253 infy_add (EV_A_ w);
2865 else 3254 else
2866#endif 3255#endif
3256 {
2867 ev_timer_again (EV_A_ &w->timer); 3257 ev_timer_again (EV_A_ &w->timer);
3258 ev_unref (EV_A);
3259 }
2868 3260
2869 ev_start (EV_A_ (W)w, 1); 3261 ev_start (EV_A_ (W)w, 1);
2870 3262
2871 EV_FREQUENT_CHECK; 3263 EV_FREQUENT_CHECK;
2872} 3264}
… …
2881 EV_FREQUENT_CHECK; 3273 EV_FREQUENT_CHECK;
2882 3274
2883#if EV_USE_INOTIFY 3275#if EV_USE_INOTIFY
2884 infy_del (EV_A_ w); 3276 infy_del (EV_A_ w);
2885#endif 3277#endif
3278
3279 if (ev_is_active (&w->timer))
3280 {
3281 ev_ref (EV_A);
2886 ev_timer_stop (EV_A_ &w->timer); 3282 ev_timer_stop (EV_A_ &w->timer);
3283 }
2887 3284
2888 ev_stop (EV_A_ (W)w); 3285 ev_stop (EV_A_ (W)w);
2889 3286
2890 EV_FREQUENT_CHECK; 3287 EV_FREQUENT_CHECK;
2891} 3288}
… …
2936 3333
2937 EV_FREQUENT_CHECK; 3334 EV_FREQUENT_CHECK;
2938} 3335}
2939#endif 3336#endif
2940 3337
3338#if EV_PREPARE_ENABLE
2941void 3339void
2942ev_prepare_start (EV_P_ ev_prepare *w) 3340ev_prepare_start (EV_P_ ev_prepare *w)
2943{ 3341{
2944 if (expect_false (ev_is_active (w))) 3342 if (expect_false (ev_is_active (w)))
2945 return; 3343 return;
… …
2971 3369
2972 ev_stop (EV_A_ (W)w); 3370 ev_stop (EV_A_ (W)w);
2973 3371
2974 EV_FREQUENT_CHECK; 3372 EV_FREQUENT_CHECK;
2975} 3373}
3374#endif
2976 3375
3376#if EV_CHECK_ENABLE
2977void 3377void
2978ev_check_start (EV_P_ ev_check *w) 3378ev_check_start (EV_P_ ev_check *w)
2979{ 3379{
2980 if (expect_false (ev_is_active (w))) 3380 if (expect_false (ev_is_active (w)))
2981 return; 3381 return;
… …
3007 3407
3008 ev_stop (EV_A_ (W)w); 3408 ev_stop (EV_A_ (W)w);
3009 3409
3010 EV_FREQUENT_CHECK; 3410 EV_FREQUENT_CHECK;
3011} 3411}
3412#endif
3012 3413
3013#if EV_EMBED_ENABLE 3414#if EV_EMBED_ENABLE
3014void noinline 3415void noinline
3015ev_embed_sweep (EV_P_ ev_embed *w) 3416ev_embed_sweep (EV_P_ ev_embed *w)
3016{ 3417{
3017 ev_loop (w->other, EVLOOP_NONBLOCK); 3418 ev_run (w->other, EVRUN_NOWAIT);
3018} 3419}
3019 3420
3020static void 3421static void
3021embed_io_cb (EV_P_ ev_io *io, int revents) 3422embed_io_cb (EV_P_ ev_io *io, int revents)
3022{ 3423{
3023 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3424 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3024 3425
3025 if (ev_cb (w)) 3426 if (ev_cb (w))
3026 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3427 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3027 else 3428 else
3028 ev_loop (w->other, EVLOOP_NONBLOCK); 3429 ev_run (w->other, EVRUN_NOWAIT);
3029} 3430}
3030 3431
3031static void 3432static void
3032embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3433embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3033{ 3434{
3034 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3435 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3035 3436
3036 { 3437 {
3037 struct ev_loop *loop = w->other; 3438 EV_P = w->other;
3038 3439
3039 while (fdchangecnt) 3440 while (fdchangecnt)
3040 { 3441 {
3041 fd_reify (EV_A); 3442 fd_reify (EV_A);
3042 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3443 ev_run (EV_A_ EVRUN_NOWAIT);
3043 } 3444 }
3044 } 3445 }
3045} 3446}
3046 3447
3047static void 3448static void
… …
3050 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));
3051 3452
3052 ev_embed_stop (EV_A_ w); 3453 ev_embed_stop (EV_A_ w);
3053 3454
3054 { 3455 {
3055 struct ev_loop *loop = w->other; 3456 EV_P = w->other;
3056 3457
3057 ev_loop_fork (EV_A); 3458 ev_loop_fork (EV_A);
3058 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3459 ev_run (EV_A_ EVRUN_NOWAIT);
3059 } 3460 }
3060 3461
3061 ev_embed_start (EV_A_ w); 3462 ev_embed_start (EV_A_ w);
3062} 3463}
3063 3464
… …
3074{ 3475{
3075 if (expect_false (ev_is_active (w))) 3476 if (expect_false (ev_is_active (w)))
3076 return; 3477 return;
3077 3478
3078 { 3479 {
3079 struct ev_loop *loop = w->other; 3480 EV_P = w->other;
3080 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 ()));
3081 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);
3082 } 3483 }
3083 3484
3084 EV_FREQUENT_CHECK; 3485 EV_FREQUENT_CHECK;
… …
3111 3512
3112 ev_io_stop (EV_A_ &w->io); 3513 ev_io_stop (EV_A_ &w->io);
3113 ev_prepare_stop (EV_A_ &w->prepare); 3514 ev_prepare_stop (EV_A_ &w->prepare);
3114 ev_fork_stop (EV_A_ &w->fork); 3515 ev_fork_stop (EV_A_ &w->fork);
3115 3516
3517 ev_stop (EV_A_ (W)w);
3518
3116 EV_FREQUENT_CHECK; 3519 EV_FREQUENT_CHECK;
3117} 3520}
3118#endif 3521#endif
3119 3522
3120#if EV_FORK_ENABLE 3523#if EV_FORK_ENABLE
… …
3160ev_async_start (EV_P_ ev_async *w) 3563ev_async_start (EV_P_ ev_async *w)
3161{ 3564{
3162 if (expect_false (ev_is_active (w))) 3565 if (expect_false (ev_is_active (w)))
3163 return; 3566 return;
3164 3567
3568 w->sent = 0;
3569
3165 evpipe_init (EV_A); 3570 evpipe_init (EV_A);
3166 3571
3167 EV_FREQUENT_CHECK; 3572 EV_FREQUENT_CHECK;
3168 3573
3169 ev_start (EV_A_ (W)w, ++asynccnt); 3574 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3196 3601
3197void 3602void
3198ev_async_send (EV_P_ ev_async *w) 3603ev_async_send (EV_P_ ev_async *w)
3199{ 3604{
3200 w->sent = 1; 3605 w->sent = 1;
3201 evpipe_write (EV_A_ &gotasync); 3606 evpipe_write (EV_A_ &async_pending);
3202} 3607}
3203#endif 3608#endif
3204 3609
3205/*****************************************************************************/ 3610/*****************************************************************************/
3206 3611
… …
3246{ 3651{
3247 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));
3248 3653
3249 if (expect_false (!once)) 3654 if (expect_false (!once))
3250 { 3655 {
3251 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3656 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3252 return; 3657 return;
3253 } 3658 }
3254 3659
3255 once->cb = cb; 3660 once->cb = cb;
3256 once->arg = arg; 3661 once->arg = arg;
… …
3343 if (types & EV_ASYNC) 3748 if (types & EV_ASYNC)
3344 for (i = asynccnt; i--; ) 3749 for (i = asynccnt; i--; )
3345 cb (EV_A_ EV_ASYNC, asyncs [i]); 3750 cb (EV_A_ EV_ASYNC, asyncs [i]);
3346#endif 3751#endif
3347 3752
3753#if EV_PREPARE_ENABLE
3348 if (types & EV_PREPARE) 3754 if (types & EV_PREPARE)
3349 for (i = preparecnt; i--; ) 3755 for (i = preparecnt; i--; )
3350#if EV_EMBED_ENABLE 3756# if EV_EMBED_ENABLE
3351 if (ev_cb (prepares [i]) != embed_prepare_cb) 3757 if (ev_cb (prepares [i]) != embed_prepare_cb)
3352#endif 3758# endif
3353 cb (EV_A_ EV_PREPARE, prepares [i]); 3759 cb (EV_A_ EV_PREPARE, prepares [i]);
3760#endif
3354 3761
3762#if EV_CHECK_ENABLE
3355 if (types & EV_CHECK) 3763 if (types & EV_CHECK)
3356 for (i = checkcnt; i--; ) 3764 for (i = checkcnt; i--; )
3357 cb (EV_A_ EV_CHECK, checks [i]); 3765 cb (EV_A_ EV_CHECK, checks [i]);
3766#endif
3358 3767
3768#if EV_SIGNAL_ENABLE
3359 if (types & EV_SIGNAL) 3769 if (types & EV_SIGNAL)
3360 for (i = 0; i < signalmax; ++i) 3770 for (i = 0; i < EV_NSIG - 1; ++i)
3361 for (wl = signals [i].head; wl; ) 3771 for (wl = signals [i].head; wl; )
3362 { 3772 {
3363 wn = wl->next; 3773 wn = wl->next;
3364 cb (EV_A_ EV_SIGNAL, wl); 3774 cb (EV_A_ EV_SIGNAL, wl);
3365 wl = wn; 3775 wl = wn;
3366 } 3776 }
3777#endif
3367 3778
3779#if EV_CHILD_ENABLE
3368 if (types & EV_CHILD) 3780 if (types & EV_CHILD)
3369 for (i = EV_PID_HASHSIZE; i--; ) 3781 for (i = (EV_PID_HASHSIZE); i--; )
3370 for (wl = childs [i]; wl; ) 3782 for (wl = childs [i]; wl; )
3371 { 3783 {
3372 wn = wl->next; 3784 wn = wl->next;
3373 cb (EV_A_ EV_CHILD, wl); 3785 cb (EV_A_ EV_CHILD, wl);
3374 wl = wn; 3786 wl = wn;
3375 } 3787 }
3788#endif
3376/* EV_STAT 0x00001000 /* stat data changed */ 3789/* EV_STAT 0x00001000 /* stat data changed */
3377/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3790/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3378} 3791}
3379#endif 3792#endif
3380 3793
3381#if EV_MULTIPLICITY 3794#if EV_MULTIPLICITY
3382 #include "ev_wrap.h" 3795 #include "ev_wrap.h"
3383#endif 3796#endif
3384 3797
3385#ifdef __cplusplus 3798EV_CPP(})
3386}
3387#endif
3388 3799

Diff Legend

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