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

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

Diff Legend

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