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

Comparing libev/ev.c (file contents):
Revision 1.297 by root, Fri Jul 10 00:36:21 2009 UTC vs.
Revision 1.349 by sf-exg, Fri Oct 15 22:59:59 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 94# endif
95# else
96# undef EV_USE_SELECT
97# define EV_USE_SELECT 0
88# endif 98# endif
89 99
100# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 101# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 102# define EV_USE_POLL EV_FEATURE_BACKENDS
92# define EV_USE_SELECT 1
93# else
94# define EV_USE_SELECT 0
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# define EV_USE_POLL 0 106# define EV_USE_POLL 0
103# endif
104# endif 107# endif
105 108
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 110# ifndef EV_USE_EPOLL
109# else 111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
110# define EV_USE_EPOLL 0
111# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
112# endif 116# endif
113 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# ifndef EV_USE_KQUEUE 119# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
116# define EV_USE_KQUEUE 1
117# else
118# define EV_USE_KQUEUE 0
119# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
120# endif 125# endif
121 126
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 128# ifndef EV_USE_PORT
125# else 129# define EV_USE_PORT EV_FEATURE_BACKENDS
126# define EV_USE_PORT 0
127# endif 130# endif
131# else
132# undef EV_USE_PORT
133# define EV_USE_PORT 0
128# endif 134# endif
129 135
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 137# ifndef EV_USE_INOTIFY
133# else
134# define EV_USE_INOTIFY 0 138# define EV_USE_INOTIFY EV_FEATURE_OS
135# endif 139# endif
140# else
141# undef EV_USE_INOTIFY
142# define EV_USE_INOTIFY 0
136# endif 143# endif
137 144
145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_SIGNALFD
139# if HAVE_EVENTFD 147# define EV_USE_SIGNALFD EV_FEATURE_OS
140# define EV_USE_EVENTFD 1
141# else
142# define EV_USE_EVENTFD 0
143# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
152# endif
153
154# if HAVE_EVENTFD
155# ifndef EV_USE_EVENTFD
156# define EV_USE_EVENTFD EV_FEATURE_OS
157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
144# endif 161# endif
145 162
146#endif 163#endif
147 164
148#include <math.h> 165#include <math.h>
149#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
150#include <fcntl.h> 168#include <fcntl.h>
151#include <stddef.h> 169#include <stddef.h>
152 170
153#include <stdio.h> 171#include <stdio.h>
154 172
155#include <assert.h> 173#include <assert.h>
156#include <errno.h> 174#include <errno.h>
157#include <sys/types.h> 175#include <sys/types.h>
158#include <time.h> 176#include <time.h>
177#include <limits.h>
159 178
160#include <signal.h> 179#include <signal.h>
161 180
162#ifdef EV_H 181#ifdef EV_H
163# include EV_H 182# include EV_H
… …
174# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 194# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
178# endif 197# endif
198# undef EV_AVOID_STDIO
179#endif 199#endif
200
201/* OS X, in its infinite idiocy, actually HARDCODES
202 * a limit of 1024 into their select. Where people have brains,
203 * OS X engineers apparently have a vacuum. Or maybe they were
204 * ordered to have a vacuum, or they do anything for money.
205 * This might help. Or not.
206 */
207#define _DARWIN_UNLIMITED_SELECT 1
180 208
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 209/* this block tries to deduce configuration from header-defined symbols and defaults */
210
211/* try to deduce the maximum number of signals on this platform */
212#if defined (EV_NSIG)
213/* use what's provided */
214#elif defined (NSIG)
215# define EV_NSIG (NSIG)
216#elif defined(_NSIG)
217# define EV_NSIG (_NSIG)
218#elif defined (SIGMAX)
219# define EV_NSIG (SIGMAX+1)
220#elif defined (SIG_MAX)
221# define EV_NSIG (SIG_MAX+1)
222#elif defined (_SIG_MAX)
223# define EV_NSIG (_SIG_MAX+1)
224#elif defined (MAXSIG)
225# define EV_NSIG (MAXSIG+1)
226#elif defined (MAX_SIG)
227# define EV_NSIG (MAX_SIG+1)
228#elif defined (SIGARRAYSIZE)
229# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
230#elif defined (_sys_nsig)
231# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
232#else
233# error "unable to find value for NSIG, please report"
234/* to make it compile regardless, just remove the above line, */
235/* but consider reporting it, too! :) */
236# define EV_NSIG 65
237#endif
182 238
183#ifndef EV_USE_CLOCK_SYSCALL 239#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 240# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 241# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 242# else
187# define EV_USE_CLOCK_SYSCALL 0 243# define EV_USE_CLOCK_SYSCALL 0
188# endif 244# endif
189#endif 245#endif
190 246
191#ifndef EV_USE_MONOTONIC 247#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 248# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 249# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 250# else
195# define EV_USE_MONOTONIC 0 251# define EV_USE_MONOTONIC 0
196# endif 252# endif
197#endif 253#endif
198 254
… …
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 256# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 257#endif
202 258
203#ifndef EV_USE_NANOSLEEP 259#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 260# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 261# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 262# else
207# define EV_USE_NANOSLEEP 0 263# define EV_USE_NANOSLEEP 0
208# endif 264# endif
209#endif 265#endif
210 266
211#ifndef EV_USE_SELECT 267#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 268# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 269#endif
214 270
215#ifndef EV_USE_POLL 271#ifndef EV_USE_POLL
216# ifdef _WIN32 272# ifdef _WIN32
217# define EV_USE_POLL 0 273# define EV_USE_POLL 0
218# else 274# else
219# define EV_USE_POLL 1 275# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 276# endif
221#endif 277#endif
222 278
223#ifndef EV_USE_EPOLL 279#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 280# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 281# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 282# else
227# define EV_USE_EPOLL 0 283# define EV_USE_EPOLL 0
228# endif 284# endif
229#endif 285#endif
230 286
… …
236# define EV_USE_PORT 0 292# define EV_USE_PORT 0
237#endif 293#endif
238 294
239#ifndef EV_USE_INOTIFY 295#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 296# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 297# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 298# else
243# define EV_USE_INOTIFY 0 299# define EV_USE_INOTIFY 0
244# endif 300# endif
245#endif 301#endif
246 302
247#ifndef EV_PID_HASHSIZE 303#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 304# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
249# define EV_PID_HASHSIZE 1
250# else
251# define EV_PID_HASHSIZE 16
252# endif
253#endif 305#endif
254 306
255#ifndef EV_INOTIFY_HASHSIZE 307#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 308# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_INOTIFY_HASHSIZE 1
258# else
259# define EV_INOTIFY_HASHSIZE 16
260# endif
261#endif 309#endif
262 310
263#ifndef EV_USE_EVENTFD 311#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 313# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 314# else
267# define EV_USE_EVENTFD 0 315# define EV_USE_EVENTFD 0
316# endif
317#endif
318
319#ifndef EV_USE_SIGNALFD
320# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
321# define EV_USE_SIGNALFD EV_FEATURE_OS
322# else
323# define EV_USE_SIGNALFD 0
268# endif 324# endif
269#endif 325#endif
270 326
271#if 0 /* debugging */ 327#if 0 /* debugging */
272# define EV_VERIFY 3 328# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 329# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 330# define EV_HEAP_CACHE_AT 1
275#endif 331#endif
276 332
277#ifndef EV_VERIFY 333#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 334# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 335#endif
280 336
281#ifndef EV_USE_4HEAP 337#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 338# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 339#endif
284 340
285#ifndef EV_HEAP_CACHE_AT 341#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 342# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif 343#endif
288 344
289/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 345/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
290/* which makes programs even slower. might work on other unices, too. */ 346/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL 347#if EV_USE_CLOCK_SYSCALL
… …
300# endif 356# endif
301#endif 357#endif
302 358
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 359/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 360
361#ifdef _AIX
362/* AIX has a completely broken poll.h header */
363# undef EV_USE_POLL
364# define EV_USE_POLL 0
365#endif
366
305#ifndef CLOCK_MONOTONIC 367#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 368# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 369# define EV_USE_MONOTONIC 0
308#endif 370#endif
309 371
… …
339#endif 401#endif
340 402
341#if EV_USE_EVENTFD 403#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 404/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 405# include <stdint.h>
406# ifndef EFD_NONBLOCK
407# define EFD_NONBLOCK O_NONBLOCK
408# endif
409# ifndef EFD_CLOEXEC
410# ifdef O_CLOEXEC
411# define EFD_CLOEXEC O_CLOEXEC
412# else
413# define EFD_CLOEXEC 02000000
414# endif
415# endif
344# ifdef __cplusplus 416# ifdef __cplusplus
345extern "C" { 417extern "C" {
346# endif 418# endif
347int eventfd (unsigned int initval, int flags); 419int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 420# ifdef __cplusplus
349} 421}
350# endif 422# endif
351#endif 423#endif
352 424
425#if EV_USE_SIGNALFD
426/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
427# include <stdint.h>
428# ifndef SFD_NONBLOCK
429# define SFD_NONBLOCK O_NONBLOCK
430# endif
431# ifndef SFD_CLOEXEC
432# ifdef O_CLOEXEC
433# define SFD_CLOEXEC O_CLOEXEC
434# else
435# define SFD_CLOEXEC 02000000
436# endif
437# endif
438# ifdef __cplusplus
439extern "C" {
440# endif
441int signalfd (int fd, const sigset_t *mask, int flags);
442
443struct signalfd_siginfo
444{
445 uint32_t ssi_signo;
446 char pad[128 - sizeof (uint32_t)];
447};
448# ifdef __cplusplus
449}
450# endif
451#endif
452
353/**/ 453/**/
354 454
355#if EV_VERIFY >= 3 455#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 456# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 457#else
358# define EV_FREQUENT_CHECK do { } while (0) 458# define EV_FREQUENT_CHECK do { } while (0)
359#endif 459#endif
360 460
361/* 461/*
… …
368 */ 468 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 469#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 470
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 471#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) */ 472#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 */ 473
474#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
475#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
374 476
375#if __GNUC__ >= 4 477#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 478# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 479# define noinline __attribute__ ((noinline))
378#else 480#else
… …
385 487
386#define expect_false(expr) expect ((expr) != 0, 0) 488#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 489#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 490#define inline_size static inline
389 491
390#if EV_MINIMAL 492#if EV_FEATURE_CODE
493# define inline_speed static inline
494#else
391# define inline_speed static noinline 495# define inline_speed static noinline
392#else
393# define inline_speed static inline
394#endif 496#endif
395 497
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 498#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397 499
398#if EV_MINPRI == EV_MAXPRI 500#if EV_MINPRI == EV_MAXPRI
… …
411#define ev_active(w) ((W)(w))->active 513#define ev_active(w) ((W)(w))->active
412#define ev_at(w) ((WT)(w))->at 514#define ev_at(w) ((WT)(w))->at
413 515
414#if EV_USE_REALTIME 516#if EV_USE_REALTIME
415/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 517/* 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 */ 518/* giving it a reasonably high chance of working on typical architectures */
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 519static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif 520#endif
419 521
420#if EV_USE_MONOTONIC 522#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 523static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 524#endif
423 525
526#ifndef EV_FD_TO_WIN32_HANDLE
527# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
528#endif
529#ifndef EV_WIN32_HANDLE_TO_FD
530# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
531#endif
532#ifndef EV_WIN32_CLOSE_FD
533# define EV_WIN32_CLOSE_FD(fd) close (fd)
534#endif
535
424#ifdef _WIN32 536#ifdef _WIN32
425# include "ev_win32.c" 537# include "ev_win32.c"
426#endif 538#endif
427 539
428/*****************************************************************************/ 540/*****************************************************************************/
541
542#if EV_AVOID_STDIO
543static void noinline
544ev_printerr (const char *msg)
545{
546 write (STDERR_FILENO, msg, strlen (msg));
547}
548#endif
429 549
430static void (*syserr_cb)(const char *msg); 550static void (*syserr_cb)(const char *msg);
431 551
432void 552void
433ev_set_syserr_cb (void (*cb)(const char *msg)) 553ev_set_syserr_cb (void (*cb)(const char *msg))
… …
443 563
444 if (syserr_cb) 564 if (syserr_cb)
445 syserr_cb (msg); 565 syserr_cb (msg);
446 else 566 else
447 { 567 {
568#if EV_AVOID_STDIO
569 const char *err = strerror (errno);
570
571 ev_printerr (msg);
572 ev_printerr (": ");
573 ev_printerr (err);
574 ev_printerr ("\n");
575#else
448 perror (msg); 576 perror (msg);
577#endif
449 abort (); 578 abort ();
450 } 579 }
451} 580}
452 581
453static void * 582static void *
454ev_realloc_emul (void *ptr, long size) 583ev_realloc_emul (void *ptr, long size)
455{ 584{
585#if __GLIBC__
586 return realloc (ptr, size);
587#else
456 /* some systems, notably openbsd and darwin, fail to properly 588 /* some systems, notably openbsd and darwin, fail to properly
457 * implement realloc (x, 0) (as required by both ansi c-98 and 589 * implement realloc (x, 0) (as required by both ansi c-89 and
458 * the single unix specification, so work around them here. 590 * the single unix specification, so work around them here.
459 */ 591 */
460 592
461 if (size) 593 if (size)
462 return realloc (ptr, size); 594 return realloc (ptr, size);
463 595
464 free (ptr); 596 free (ptr);
465 return 0; 597 return 0;
598#endif
466} 599}
467 600
468static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 601static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
469 602
470void 603void
… …
478{ 611{
479 ptr = alloc (ptr, size); 612 ptr = alloc (ptr, size);
480 613
481 if (!ptr && size) 614 if (!ptr && size)
482 { 615 {
616#if EV_AVOID_STDIO
617 ev_printerr ("libev: memory allocation failed, aborting.\n");
618#else
483 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 619 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
620#endif
484 abort (); 621 abort ();
485 } 622 }
486 623
487 return ptr; 624 return ptr;
488} 625}
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 627#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 628#define ev_free(ptr) ev_realloc ((ptr), 0)
492 629
493/*****************************************************************************/ 630/*****************************************************************************/
494 631
632/* set in reify when reification needed */
633#define EV_ANFD_REIFY 1
634
495/* file descriptor info structure */ 635/* file descriptor info structure */
496typedef struct 636typedef struct
497{ 637{
498 WL head; 638 WL head;
499 unsigned char events; /* the events watched for */ 639 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 640 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 */ 641 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 642 unsigned char unused;
503#if EV_USE_EPOLL 643#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 644 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 645#endif
… …
567 707
568 static int ev_default_loop_ptr; 708 static int ev_default_loop_ptr;
569 709
570#endif 710#endif
571 711
572#if EV_MINIMAL < 2 712#if EV_FEATURE_API
573# define EV_SUSPEND_CB if (expect_false (suspend_cb)) suspend_cb (EV_A)
574# define EV_RESUME_CB if (expect_false (resume_cb )) resume_cb (EV_A) 713# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
714# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
575# define EV_INVOKE_PENDING invoke_cb (EV_A) 715# define EV_INVOKE_PENDING invoke_cb (EV_A)
576#else 716#else
577# define EV_SUSPEND_CB (void)0
578# define EV_RESUME_CB (void)0 717# define EV_RELEASE_CB (void)0
718# define EV_ACQUIRE_CB (void)0
579# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 719# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
580#endif 720#endif
721
722#define EVUNLOOP_RECURSE 0x80
581 723
582/*****************************************************************************/ 724/*****************************************************************************/
583 725
584#ifndef EV_HAVE_EV_TIME 726#ifndef EV_HAVE_EV_TIME
585ev_tstamp 727ev_tstamp
… …
629 if (delay > 0.) 771 if (delay > 0.)
630 { 772 {
631#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
632 struct timespec ts; 774 struct timespec ts;
633 775
634 ts.tv_sec = (time_t)delay; 776 EV_TS_SET (ts, delay);
635 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
636
637 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
638#elif defined(_WIN32) 778#elif defined(_WIN32)
639 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
640#else 780#else
641 struct timeval tv; 781 struct timeval tv;
642 782
643 tv.tv_sec = (time_t)delay;
644 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
645
646 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 783 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
647 /* somehting not guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
648 /* by older ones */ 785 /* by older ones */
786 EV_TV_SET (tv, delay);
649 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
650#endif 788#endif
651 } 789 }
652} 790}
653 791
654/*****************************************************************************/ 792/*****************************************************************************/
655 793
656#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 794#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
657 795
658/* find a suitable new size for the given array, */ 796/* find a suitable new size for the given array, */
659/* hopefully by rounding to a ncie-to-malloc size */ 797/* hopefully by rounding to a nice-to-malloc size */
660inline_size int 798inline_size int
661array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
662{ 800{
663 int ncur = cur + 1; 801 int ncur = cur + 1;
664 802
… …
760} 898}
761 899
762/*****************************************************************************/ 900/*****************************************************************************/
763 901
764inline_speed void 902inline_speed void
765fd_event (EV_P_ int fd, int revents) 903fd_event_nocheck (EV_P_ int fd, int revents)
766{ 904{
767 ANFD *anfd = anfds + fd; 905 ANFD *anfd = anfds + fd;
768 ev_io *w; 906 ev_io *w;
769 907
770 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 908 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
774 if (ev) 912 if (ev)
775 ev_feed_event (EV_A_ (W)w, ev); 913 ev_feed_event (EV_A_ (W)w, ev);
776 } 914 }
777} 915}
778 916
917/* do not submit kernel events for fds that have reify set */
918/* because that means they changed while we were polling for new events */
919inline_speed void
920fd_event (EV_P_ int fd, int revents)
921{
922 ANFD *anfd = anfds + fd;
923
924 if (expect_true (!anfd->reify))
925 fd_event_nocheck (EV_A_ fd, revents);
926}
927
779void 928void
780ev_feed_fd_event (EV_P_ int fd, int revents) 929ev_feed_fd_event (EV_P_ int fd, int revents)
781{ 930{
782 if (fd >= 0 && fd < anfdmax) 931 if (fd >= 0 && fd < anfdmax)
783 fd_event (EV_A_ fd, revents); 932 fd_event_nocheck (EV_A_ fd, revents);
784} 933}
785 934
786/* make sure the external fd watch events are in-sync */ 935/* make sure the external fd watch events are in-sync */
787/* with the kernel/libev internal state */ 936/* with the kernel/libev internal state */
788inline_size void 937inline_size void
… …
803 952
804#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
805 if (events) 954 if (events)
806 { 955 {
807 unsigned long arg; 956 unsigned long arg;
808 #ifdef EV_FD_TO_WIN32_HANDLE
809 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
810 #else
811 anfd->handle = _get_osfhandle (fd);
812 #endif
813 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
814 } 959 }
815#endif 960#endif
816 961
817 { 962 {
… …
855 ev_io_stop (EV_A_ w); 1000 ev_io_stop (EV_A_ w);
856 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1001 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
857 } 1002 }
858} 1003}
859 1004
860/* check whether the given fd is atcually valid, for error recovery */ 1005/* check whether the given fd is actually valid, for error recovery */
861inline_size int 1006inline_size int
862fd_valid (int fd) 1007fd_valid (int fd)
863{ 1008{
864#ifdef _WIN32 1009#ifdef _WIN32
865 return _get_osfhandle (fd) != -1; 1010 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
866#else 1011#else
867 return fcntl (fd, F_GETFD) != -1; 1012 return fcntl (fd, F_GETFD) != -1;
868#endif 1013#endif
869} 1014}
870 1015
… …
888 1033
889 for (fd = anfdmax; fd--; ) 1034 for (fd = anfdmax; fd--; )
890 if (anfds [fd].events) 1035 if (anfds [fd].events)
891 { 1036 {
892 fd_kill (EV_A_ fd); 1037 fd_kill (EV_A_ fd);
893 return; 1038 break;
894 } 1039 }
895} 1040}
896 1041
897/* usually called after fork if backend needs to re-arm all fds from scratch */ 1042/* usually called after fork if backend needs to re-arm all fds from scratch */
898static void noinline 1043static void noinline
… …
903 for (fd = 0; fd < anfdmax; ++fd) 1048 for (fd = 0; fd < anfdmax; ++fd)
904 if (anfds [fd].events) 1049 if (anfds [fd].events)
905 { 1050 {
906 anfds [fd].events = 0; 1051 anfds [fd].events = 0;
907 anfds [fd].emask = 0; 1052 anfds [fd].emask = 0;
908 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1053 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
909 } 1054 }
910} 1055}
911 1056
1057/* used to prepare libev internal fd's */
1058/* this is not fork-safe */
1059inline_speed void
1060fd_intern (int fd)
1061{
1062#ifdef _WIN32
1063 unsigned long arg = 1;
1064 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1065#else
1066 fcntl (fd, F_SETFD, FD_CLOEXEC);
1067 fcntl (fd, F_SETFL, O_NONBLOCK);
1068#endif
1069}
1070
912/*****************************************************************************/ 1071/*****************************************************************************/
913 1072
914/* 1073/*
915 * the heap functions want a real array index. array index 0 uis guaranteed to not 1074 * the heap functions want a real array index. array index 0 is guaranteed to not
916 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1075 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
917 * the branching factor of the d-tree. 1076 * the branching factor of the d-tree.
918 */ 1077 */
919 1078
920/* 1079/*
… …
988 1147
989 for (;;) 1148 for (;;)
990 { 1149 {
991 int c = k << 1; 1150 int c = k << 1;
992 1151
993 if (c > N + HEAP0 - 1) 1152 if (c >= N + HEAP0)
994 break; 1153 break;
995 1154
996 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1155 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
997 ? 1 : 0; 1156 ? 1 : 0;
998 1157
… …
1034 1193
1035/* move an element suitably so it is in a correct place */ 1194/* move an element suitably so it is in a correct place */
1036inline_size void 1195inline_size void
1037adjustheap (ANHE *heap, int N, int k) 1196adjustheap (ANHE *heap, int N, int k)
1038{ 1197{
1039 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1198 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1040 upheap (heap, k); 1199 upheap (heap, k);
1041 else 1200 else
1042 downheap (heap, N, k); 1201 downheap (heap, N, k);
1043} 1202}
1044 1203
… …
1057/*****************************************************************************/ 1216/*****************************************************************************/
1058 1217
1059/* associate signal watchers to a signal signal */ 1218/* associate signal watchers to a signal signal */
1060typedef struct 1219typedef struct
1061{ 1220{
1221 EV_ATOMIC_T pending;
1222#if EV_MULTIPLICITY
1223 EV_P;
1224#endif
1062 WL head; 1225 WL head;
1063 EV_ATOMIC_T gotsig;
1064} ANSIG; 1226} ANSIG;
1065 1227
1066static ANSIG *signals; 1228static ANSIG signals [EV_NSIG - 1];
1067static int signalmax;
1068
1069static EV_ATOMIC_T gotsig;
1070 1229
1071/*****************************************************************************/ 1230/*****************************************************************************/
1072 1231
1073/* used to prepare libev internal fd's */ 1232#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1074/* this is not fork-safe */
1075inline_speed void
1076fd_intern (int fd)
1077{
1078#ifdef _WIN32
1079 unsigned long arg = 1;
1080 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1081#else
1082 fcntl (fd, F_SETFD, FD_CLOEXEC);
1083 fcntl (fd, F_SETFL, O_NONBLOCK);
1084#endif
1085}
1086 1233
1087static void noinline 1234static void noinline
1088evpipe_init (EV_P) 1235evpipe_init (EV_P)
1089{ 1236{
1090 if (!ev_is_active (&pipe_w)) 1237 if (!ev_is_active (&pipe_w))
1091 { 1238 {
1092#if EV_USE_EVENTFD 1239# if EV_USE_EVENTFD
1240 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1241 if (evfd < 0 && errno == EINVAL)
1093 if ((evfd = eventfd (0, 0)) >= 0) 1242 evfd = eventfd (0, 0);
1243
1244 if (evfd >= 0)
1094 { 1245 {
1095 evpipe [0] = -1; 1246 evpipe [0] = -1;
1096 fd_intern (evfd); 1247 fd_intern (evfd); /* doing it twice doesn't hurt */
1097 ev_io_set (&pipe_w, evfd, EV_READ); 1248 ev_io_set (&pipe_w, evfd, EV_READ);
1098 } 1249 }
1099 else 1250 else
1100#endif 1251# endif
1101 { 1252 {
1102 while (pipe (evpipe)) 1253 while (pipe (evpipe))
1103 ev_syserr ("(libev) error creating signal/async pipe"); 1254 ev_syserr ("(libev) error creating signal/async pipe");
1104 1255
1105 fd_intern (evpipe [0]); 1256 fd_intern (evpipe [0]);
… …
1116evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1267evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1117{ 1268{
1118 if (!*flag) 1269 if (!*flag)
1119 { 1270 {
1120 int old_errno = errno; /* save errno because write might clobber it */ 1271 int old_errno = errno; /* save errno because write might clobber it */
1272 char dummy;
1121 1273
1122 *flag = 1; 1274 *flag = 1;
1123 1275
1124#if EV_USE_EVENTFD 1276#if EV_USE_EVENTFD
1125 if (evfd >= 0) 1277 if (evfd >= 0)
… …
1127 uint64_t counter = 1; 1279 uint64_t counter = 1;
1128 write (evfd, &counter, sizeof (uint64_t)); 1280 write (evfd, &counter, sizeof (uint64_t));
1129 } 1281 }
1130 else 1282 else
1131#endif 1283#endif
1284 /* win32 people keep sending patches that change this write() to send() */
1285 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1286 /* so when you think this write should be a send instead, please find out */
1287 /* where your send() is from - it's definitely not the microsoft send, and */
1288 /* tell me. thank you. */
1132 write (evpipe [1], &old_errno, 1); 1289 write (evpipe [1], &dummy, 1);
1133 1290
1134 errno = old_errno; 1291 errno = old_errno;
1135 } 1292 }
1136} 1293}
1137 1294
1138/* called whenever the libev signal pipe */ 1295/* called whenever the libev signal pipe */
1139/* got some events (signal, async) */ 1296/* got some events (signal, async) */
1140static void 1297static void
1141pipecb (EV_P_ ev_io *iow, int revents) 1298pipecb (EV_P_ ev_io *iow, int revents)
1142{ 1299{
1300 int i;
1301
1143#if EV_USE_EVENTFD 1302#if EV_USE_EVENTFD
1144 if (evfd >= 0) 1303 if (evfd >= 0)
1145 { 1304 {
1146 uint64_t counter; 1305 uint64_t counter;
1147 read (evfd, &counter, sizeof (uint64_t)); 1306 read (evfd, &counter, sizeof (uint64_t));
1148 } 1307 }
1149 else 1308 else
1150#endif 1309#endif
1151 { 1310 {
1152 char dummy; 1311 char dummy;
1312 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1153 read (evpipe [0], &dummy, 1); 1313 read (evpipe [0], &dummy, 1);
1154 } 1314 }
1155 1315
1156 if (gotsig && ev_is_default_loop (EV_A)) 1316 if (sig_pending)
1157 { 1317 {
1158 int signum; 1318 sig_pending = 0;
1159 gotsig = 0;
1160 1319
1161 for (signum = signalmax; signum--; ) 1320 for (i = EV_NSIG - 1; i--; )
1162 if (signals [signum].gotsig) 1321 if (expect_false (signals [i].pending))
1163 ev_feed_signal_event (EV_A_ signum + 1); 1322 ev_feed_signal_event (EV_A_ i + 1);
1164 } 1323 }
1165 1324
1166#if EV_ASYNC_ENABLE 1325#if EV_ASYNC_ENABLE
1167 if (gotasync) 1326 if (async_pending)
1168 { 1327 {
1169 int i; 1328 async_pending = 0;
1170 gotasync = 0;
1171 1329
1172 for (i = asynccnt; i--; ) 1330 for (i = asynccnt; i--; )
1173 if (asyncs [i]->sent) 1331 if (asyncs [i]->sent)
1174 { 1332 {
1175 asyncs [i]->sent = 0; 1333 asyncs [i]->sent = 0;
… …
1183 1341
1184static void 1342static void
1185ev_sighandler (int signum) 1343ev_sighandler (int signum)
1186{ 1344{
1187#if EV_MULTIPLICITY 1345#if EV_MULTIPLICITY
1188 struct ev_loop *loop = &default_loop_struct; 1346 EV_P = signals [signum - 1].loop;
1189#endif 1347#endif
1190 1348
1191#if _WIN32 1349#ifdef _WIN32
1192 signal (signum, ev_sighandler); 1350 signal (signum, ev_sighandler);
1193#endif 1351#endif
1194 1352
1195 signals [signum - 1].gotsig = 1; 1353 signals [signum - 1].pending = 1;
1196 evpipe_write (EV_A_ &gotsig); 1354 evpipe_write (EV_A_ &sig_pending);
1197} 1355}
1198 1356
1199void noinline 1357void noinline
1200ev_feed_signal_event (EV_P_ int signum) 1358ev_feed_signal_event (EV_P_ int signum)
1201{ 1359{
1202 WL w; 1360 WL w;
1203 1361
1362 if (expect_false (signum <= 0 || signum > EV_NSIG))
1363 return;
1364
1365 --signum;
1366
1204#if EV_MULTIPLICITY 1367#if EV_MULTIPLICITY
1205 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1368 /* it is permissible to try to feed a signal to the wrong loop */
1206#endif 1369 /* or, likely more useful, feeding a signal nobody is waiting for */
1207 1370
1208 --signum; 1371 if (expect_false (signals [signum].loop != EV_A))
1209
1210 if (signum < 0 || signum >= signalmax)
1211 return; 1372 return;
1373#endif
1212 1374
1213 signals [signum].gotsig = 0; 1375 signals [signum].pending = 0;
1214 1376
1215 for (w = signals [signum].head; w; w = w->next) 1377 for (w = signals [signum].head; w; w = w->next)
1216 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1378 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1217} 1379}
1218 1380
1381#if EV_USE_SIGNALFD
1382static void
1383sigfdcb (EV_P_ ev_io *iow, int revents)
1384{
1385 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1386
1387 for (;;)
1388 {
1389 ssize_t res = read (sigfd, si, sizeof (si));
1390
1391 /* not ISO-C, as res might be -1, but works with SuS */
1392 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1393 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1394
1395 if (res < (ssize_t)sizeof (si))
1396 break;
1397 }
1398}
1399#endif
1400
1401#endif
1402
1219/*****************************************************************************/ 1403/*****************************************************************************/
1220 1404
1405#if EV_CHILD_ENABLE
1221static WL childs [EV_PID_HASHSIZE]; 1406static WL childs [EV_PID_HASHSIZE];
1222
1223#ifndef _WIN32
1224 1407
1225static ev_signal childev; 1408static ev_signal childev;
1226 1409
1227#ifndef WIFCONTINUED 1410#ifndef WIFCONTINUED
1228# define WIFCONTINUED(status) 0 1411# define WIFCONTINUED(status) 0
… …
1233child_reap (EV_P_ int chain, int pid, int status) 1416child_reap (EV_P_ int chain, int pid, int status)
1234{ 1417{
1235 ev_child *w; 1418 ev_child *w;
1236 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1419 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1237 1420
1238 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1421 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1239 { 1422 {
1240 if ((w->pid == pid || !w->pid) 1423 if ((w->pid == pid || !w->pid)
1241 && (!traced || (w->flags & 1))) 1424 && (!traced || (w->flags & 1)))
1242 { 1425 {
1243 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1426 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1268 /* make sure we are called again until all children have been reaped */ 1451 /* make sure we are called again until all children have been reaped */
1269 /* we need to do it this way so that the callback gets called before we continue */ 1452 /* we need to do it this way so that the callback gets called before we continue */
1270 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1453 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1271 1454
1272 child_reap (EV_A_ pid, pid, status); 1455 child_reap (EV_A_ pid, pid, status);
1273 if (EV_PID_HASHSIZE > 1) 1456 if ((EV_PID_HASHSIZE) > 1)
1274 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1457 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1275} 1458}
1276 1459
1277#endif 1460#endif
1278 1461
… …
1345#ifdef __APPLE__ 1528#ifdef __APPLE__
1346 /* only select works correctly on that "unix-certified" platform */ 1529 /* only select works correctly on that "unix-certified" platform */
1347 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1530 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1348 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1531 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1349#endif 1532#endif
1533#ifdef __FreeBSD__
1534 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1535#endif
1350 1536
1351 return flags; 1537 return flags;
1352} 1538}
1353 1539
1354unsigned int 1540unsigned int
… …
1367ev_backend (EV_P) 1553ev_backend (EV_P)
1368{ 1554{
1369 return backend; 1555 return backend;
1370} 1556}
1371 1557
1372#if EV_MINIMAL < 2 1558#if EV_FEATURE_API
1373unsigned int 1559unsigned int
1374ev_loop_count (EV_P) 1560ev_iteration (EV_P)
1375{ 1561{
1376 return loop_count; 1562 return loop_count;
1377} 1563}
1378 1564
1379unsigned int 1565unsigned int
1380ev_loop_depth (EV_P) 1566ev_depth (EV_P)
1381{ 1567{
1382 return loop_depth; 1568 return loop_depth;
1383} 1569}
1384 1570
1385void 1571void
… …
1409void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1595void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1410{ 1596{
1411 invoke_cb = invoke_pending_cb; 1597 invoke_cb = invoke_pending_cb;
1412} 1598}
1413 1599
1414void ev_set_blocking_cb (EV_P_ void (*suspend_cb_)(EV_P), void (*resume_cb_)(EV_P)) 1600void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1415{ 1601{
1416 suspend_cb = suspend_cb_; 1602 release_cb = release;
1417 resume_cb = resume_cb_; 1603 acquire_cb = acquire;
1418} 1604}
1419#endif 1605#endif
1420 1606
1421/* initialise a loop structure, must be zero-initialised */ 1607/* initialise a loop structure, must be zero-initialised */
1422static void noinline 1608static void noinline
… …
1442 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1628 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1443 have_monotonic = 1; 1629 have_monotonic = 1;
1444 } 1630 }
1445#endif 1631#endif
1446 1632
1633 /* pid check not overridable via env */
1634#ifndef _WIN32
1635 if (flags & EVFLAG_FORKCHECK)
1636 curpid = getpid ();
1637#endif
1638
1639 if (!(flags & EVFLAG_NOENV)
1640 && !enable_secure ()
1641 && getenv ("LIBEV_FLAGS"))
1642 flags = atoi (getenv ("LIBEV_FLAGS"));
1643
1447 ev_rt_now = ev_time (); 1644 ev_rt_now = ev_time ();
1448 mn_now = get_clock (); 1645 mn_now = get_clock ();
1449 now_floor = mn_now; 1646 now_floor = mn_now;
1450 rtmn_diff = ev_rt_now - mn_now; 1647 rtmn_diff = ev_rt_now - mn_now;
1451#if EV_MINIMAL < 2 1648#if EV_FEATURE_API
1452 invoke_cb = ev_invoke_pending; 1649 invoke_cb = ev_invoke_pending;
1453#endif 1650#endif
1454 1651
1455 io_blocktime = 0.; 1652 io_blocktime = 0.;
1456 timeout_blocktime = 0.; 1653 timeout_blocktime = 0.;
1457 backend = 0; 1654 backend = 0;
1458 backend_fd = -1; 1655 backend_fd = -1;
1459 gotasync = 0; 1656 sig_pending = 0;
1657#if EV_ASYNC_ENABLE
1658 async_pending = 0;
1659#endif
1460#if EV_USE_INOTIFY 1660#if EV_USE_INOTIFY
1461 fs_fd = -2; 1661 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1462#endif 1662#endif
1463 1663#if EV_USE_SIGNALFD
1464 /* pid check not overridable via env */ 1664 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1465#ifndef _WIN32
1466 if (flags & EVFLAG_FORKCHECK)
1467 curpid = getpid ();
1468#endif 1665#endif
1469
1470 if (!(flags & EVFLAG_NOENV)
1471 && !enable_secure ()
1472 && getenv ("LIBEV_FLAGS"))
1473 flags = atoi (getenv ("LIBEV_FLAGS"));
1474 1666
1475 if (!(flags & 0x0000ffffU)) 1667 if (!(flags & 0x0000ffffU))
1476 flags |= ev_recommended_backends (); 1668 flags |= ev_recommended_backends ();
1477 1669
1478#if EV_USE_PORT 1670#if EV_USE_PORT
… …
1491 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1683 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1492#endif 1684#endif
1493 1685
1494 ev_prepare_init (&pending_w, pendingcb); 1686 ev_prepare_init (&pending_w, pendingcb);
1495 1687
1688#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1496 ev_init (&pipe_w, pipecb); 1689 ev_init (&pipe_w, pipecb);
1497 ev_set_priority (&pipe_w, EV_MAXPRI); 1690 ev_set_priority (&pipe_w, EV_MAXPRI);
1691#endif
1498 } 1692 }
1499} 1693}
1500 1694
1501/* free up a loop structure */ 1695/* free up a loop structure */
1502static void noinline 1696static void noinline
… …
1504{ 1698{
1505 int i; 1699 int i;
1506 1700
1507 if (ev_is_active (&pipe_w)) 1701 if (ev_is_active (&pipe_w))
1508 { 1702 {
1509 ev_ref (EV_A); /* signal watcher */ 1703 /*ev_ref (EV_A);*/
1510 ev_io_stop (EV_A_ &pipe_w); 1704 /*ev_io_stop (EV_A_ &pipe_w);*/
1511 1705
1512#if EV_USE_EVENTFD 1706#if EV_USE_EVENTFD
1513 if (evfd >= 0) 1707 if (evfd >= 0)
1514 close (evfd); 1708 close (evfd);
1515#endif 1709#endif
1516 1710
1517 if (evpipe [0] >= 0) 1711 if (evpipe [0] >= 0)
1518 { 1712 {
1519 close (evpipe [0]); 1713 EV_WIN32_CLOSE_FD (evpipe [0]);
1520 close (evpipe [1]); 1714 EV_WIN32_CLOSE_FD (evpipe [1]);
1521 } 1715 }
1522 } 1716 }
1717
1718#if EV_USE_SIGNALFD
1719 if (ev_is_active (&sigfd_w))
1720 close (sigfd);
1721#endif
1523 1722
1524#if EV_USE_INOTIFY 1723#if EV_USE_INOTIFY
1525 if (fs_fd >= 0) 1724 if (fs_fd >= 0)
1526 close (fs_fd); 1725 close (fs_fd);
1527#endif 1726#endif
… …
1551#if EV_IDLE_ENABLE 1750#if EV_IDLE_ENABLE
1552 array_free (idle, [i]); 1751 array_free (idle, [i]);
1553#endif 1752#endif
1554 } 1753 }
1555 1754
1556 ev_free (anfds); anfdmax = 0; 1755 ev_free (anfds); anfds = 0; anfdmax = 0;
1557 1756
1558 /* have to use the microsoft-never-gets-it-right macro */ 1757 /* have to use the microsoft-never-gets-it-right macro */
1559 array_free (rfeed, EMPTY); 1758 array_free (rfeed, EMPTY);
1560 array_free (fdchange, EMPTY); 1759 array_free (fdchange, EMPTY);
1561 array_free (timer, EMPTY); 1760 array_free (timer, EMPTY);
… …
1596 1795
1597 if (ev_is_active (&pipe_w)) 1796 if (ev_is_active (&pipe_w))
1598 { 1797 {
1599 /* this "locks" the handlers against writing to the pipe */ 1798 /* this "locks" the handlers against writing to the pipe */
1600 /* while we modify the fd vars */ 1799 /* while we modify the fd vars */
1601 gotsig = 1; 1800 sig_pending = 1;
1602#if EV_ASYNC_ENABLE 1801#if EV_ASYNC_ENABLE
1603 gotasync = 1; 1802 async_pending = 1;
1604#endif 1803#endif
1605 1804
1606 ev_ref (EV_A); 1805 ev_ref (EV_A);
1607 ev_io_stop (EV_A_ &pipe_w); 1806 ev_io_stop (EV_A_ &pipe_w);
1608 1807
… …
1611 close (evfd); 1810 close (evfd);
1612#endif 1811#endif
1613 1812
1614 if (evpipe [0] >= 0) 1813 if (evpipe [0] >= 0)
1615 { 1814 {
1616 close (evpipe [0]); 1815 EV_WIN32_CLOSE_FD (evpipe [0]);
1617 close (evpipe [1]); 1816 EV_WIN32_CLOSE_FD (evpipe [1]);
1618 } 1817 }
1619 1818
1819#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1620 evpipe_init (EV_A); 1820 evpipe_init (EV_A);
1621 /* now iterate over everything, in case we missed something */ 1821 /* now iterate over everything, in case we missed something */
1622 pipecb (EV_A_ &pipe_w, EV_READ); 1822 pipecb (EV_A_ &pipe_w, EV_READ);
1823#endif
1623 } 1824 }
1624 1825
1625 postfork = 0; 1826 postfork = 0;
1626} 1827}
1627 1828
1628#if EV_MULTIPLICITY 1829#if EV_MULTIPLICITY
1629 1830
1630struct ev_loop * 1831struct ev_loop *
1631ev_loop_new (unsigned int flags) 1832ev_loop_new (unsigned int flags)
1632{ 1833{
1633 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1834 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1634 1835
1635 memset (loop, 0, sizeof (struct ev_loop)); 1836 memset (EV_A, 0, sizeof (struct ev_loop));
1636
1637 loop_init (EV_A_ flags); 1837 loop_init (EV_A_ flags);
1638 1838
1639 if (ev_backend (EV_A)) 1839 if (ev_backend (EV_A))
1640 return loop; 1840 return EV_A;
1641 1841
1642 return 0; 1842 return 0;
1643} 1843}
1644 1844
1645void 1845void
… …
1690 verify_watcher (EV_A_ ws [cnt]); 1890 verify_watcher (EV_A_ ws [cnt]);
1691 } 1891 }
1692} 1892}
1693#endif 1893#endif
1694 1894
1695#if EV_MINIMAL < 2 1895#if EV_FEATURE_API
1696void 1896void
1697ev_loop_verify (EV_P) 1897ev_verify (EV_P)
1698{ 1898{
1699#if EV_VERIFY 1899#if EV_VERIFY
1700 int i; 1900 int i;
1701 WL w; 1901 WL w;
1702 1902
… …
1741#if EV_ASYNC_ENABLE 1941#if EV_ASYNC_ENABLE
1742 assert (asyncmax >= asynccnt); 1942 assert (asyncmax >= asynccnt);
1743 array_verify (EV_A_ (W *)asyncs, asynccnt); 1943 array_verify (EV_A_ (W *)asyncs, asynccnt);
1744#endif 1944#endif
1745 1945
1946#if EV_PREPARE_ENABLE
1746 assert (preparemax >= preparecnt); 1947 assert (preparemax >= preparecnt);
1747 array_verify (EV_A_ (W *)prepares, preparecnt); 1948 array_verify (EV_A_ (W *)prepares, preparecnt);
1949#endif
1748 1950
1951#if EV_CHECK_ENABLE
1749 assert (checkmax >= checkcnt); 1952 assert (checkmax >= checkcnt);
1750 array_verify (EV_A_ (W *)checks, checkcnt); 1953 array_verify (EV_A_ (W *)checks, checkcnt);
1954#endif
1751 1955
1752# if 0 1956# if 0
1957#if EV_CHILD_ENABLE
1753 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1958 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1754 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1959 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1960#endif
1755# endif 1961# endif
1756#endif 1962#endif
1757} 1963}
1758#endif 1964#endif
1759 1965
… …
1766#endif 1972#endif
1767{ 1973{
1768 if (!ev_default_loop_ptr) 1974 if (!ev_default_loop_ptr)
1769 { 1975 {
1770#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1977 EV_P = ev_default_loop_ptr = &default_loop_struct;
1772#else 1978#else
1773 ev_default_loop_ptr = 1; 1979 ev_default_loop_ptr = 1;
1774#endif 1980#endif
1775 1981
1776 loop_init (EV_A_ flags); 1982 loop_init (EV_A_ flags);
1777 1983
1778 if (ev_backend (EV_A)) 1984 if (ev_backend (EV_A))
1779 { 1985 {
1780#ifndef _WIN32 1986#if EV_CHILD_ENABLE
1781 ev_signal_init (&childev, childcb, SIGCHLD); 1987 ev_signal_init (&childev, childcb, SIGCHLD);
1782 ev_set_priority (&childev, EV_MAXPRI); 1988 ev_set_priority (&childev, EV_MAXPRI);
1783 ev_signal_start (EV_A_ &childev); 1989 ev_signal_start (EV_A_ &childev);
1784 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1990 ev_unref (EV_A); /* child watcher should not keep loop alive */
1785#endif 1991#endif
… …
1793 1999
1794void 2000void
1795ev_default_destroy (void) 2001ev_default_destroy (void)
1796{ 2002{
1797#if EV_MULTIPLICITY 2003#if EV_MULTIPLICITY
1798 struct ev_loop *loop = ev_default_loop_ptr; 2004 EV_P = ev_default_loop_ptr;
1799#endif 2005#endif
1800 2006
1801 ev_default_loop_ptr = 0; 2007 ev_default_loop_ptr = 0;
1802 2008
1803#ifndef _WIN32 2009#if EV_CHILD_ENABLE
1804 ev_ref (EV_A); /* child watcher */ 2010 ev_ref (EV_A); /* child watcher */
1805 ev_signal_stop (EV_A_ &childev); 2011 ev_signal_stop (EV_A_ &childev);
1806#endif 2012#endif
1807 2013
1808 loop_destroy (EV_A); 2014 loop_destroy (EV_A);
… …
1810 2016
1811void 2017void
1812ev_default_fork (void) 2018ev_default_fork (void)
1813{ 2019{
1814#if EV_MULTIPLICITY 2020#if EV_MULTIPLICITY
1815 struct ev_loop *loop = ev_default_loop_ptr; 2021 EV_P = ev_default_loop_ptr;
1816#endif 2022#endif
1817 2023
1818 postfork = 1; /* must be in line with ev_loop_fork */ 2024 postfork = 1; /* must be in line with ev_loop_fork */
1819} 2025}
1820 2026
… …
1822 2028
1823void 2029void
1824ev_invoke (EV_P_ void *w, int revents) 2030ev_invoke (EV_P_ void *w, int revents)
1825{ 2031{
1826 EV_CB_INVOKE ((W)w, revents); 2032 EV_CB_INVOKE ((W)w, revents);
2033}
2034
2035unsigned int
2036ev_pending_count (EV_P)
2037{
2038 int pri;
2039 unsigned int count = 0;
2040
2041 for (pri = NUMPRI; pri--; )
2042 count += pendingcnt [pri];
2043
2044 return count;
1827} 2045}
1828 2046
1829void noinline 2047void noinline
1830ev_invoke_pending (EV_P) 2048ev_invoke_pending (EV_P)
1831{ 2049{
… …
1902 EV_FREQUENT_CHECK; 2120 EV_FREQUENT_CHECK;
1903 feed_reverse (EV_A_ (W)w); 2121 feed_reverse (EV_A_ (W)w);
1904 } 2122 }
1905 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2123 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1906 2124
1907 feed_reverse_done (EV_A_ EV_TIMEOUT); 2125 feed_reverse_done (EV_A_ EV_TIMER);
1908 } 2126 }
1909} 2127}
1910 2128
1911#if EV_PERIODIC_ENABLE 2129#if EV_PERIODIC_ENABLE
1912/* make periodics pending */ 2130/* make periodics pending */
… …
1965 feed_reverse_done (EV_A_ EV_PERIODIC); 2183 feed_reverse_done (EV_A_ EV_PERIODIC);
1966 } 2184 }
1967} 2185}
1968 2186
1969/* simply recalculate all periodics */ 2187/* simply recalculate all periodics */
1970/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2188/* TODO: maybe ensure that at least one event happens when jumping forward? */
1971static void noinline 2189static void noinline
1972periodics_reschedule (EV_P) 2190periodics_reschedule (EV_P)
1973{ 2191{
1974 int i; 2192 int i;
1975 2193
… …
2003 ANHE_at_cache (*he); 2221 ANHE_at_cache (*he);
2004 } 2222 }
2005} 2223}
2006 2224
2007/* fetch new monotonic and realtime times from the kernel */ 2225/* fetch new monotonic and realtime times from the kernel */
2008/* also detetc if there was a timejump, and act accordingly */ 2226/* also detect if there was a timejump, and act accordingly */
2009inline_speed void 2227inline_speed void
2010time_update (EV_P_ ev_tstamp max_block) 2228time_update (EV_P_ ev_tstamp max_block)
2011{ 2229{
2012#if EV_USE_MONOTONIC 2230#if EV_USE_MONOTONIC
2013 if (expect_true (have_monotonic)) 2231 if (expect_true (have_monotonic))
… …
2073} 2291}
2074 2292
2075void 2293void
2076ev_loop (EV_P_ int flags) 2294ev_loop (EV_P_ int flags)
2077{ 2295{
2078#if EV_MINIMAL < 2 2296#if EV_FEATURE_API
2079 ++loop_depth; 2297 ++loop_depth;
2080#endif 2298#endif
2081 2299
2300 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2301
2082 loop_done = EVUNLOOP_CANCEL; 2302 loop_done = EVUNLOOP_CANCEL;
2083 2303
2084 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2304 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2085 2305
2086 do 2306 do
2087 { 2307 {
2088#if EV_VERIFY >= 2 2308#if EV_VERIFY >= 2
2089 ev_loop_verify (EV_A); 2309 ev_verify (EV_A);
2090#endif 2310#endif
2091 2311
2092#ifndef _WIN32 2312#ifndef _WIN32
2093 if (expect_false (curpid)) /* penalise the forking check even more */ 2313 if (expect_false (curpid)) /* penalise the forking check even more */
2094 if (expect_false (getpid () != curpid)) 2314 if (expect_false (getpid () != curpid))
… …
2106 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2326 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2107 EV_INVOKE_PENDING; 2327 EV_INVOKE_PENDING;
2108 } 2328 }
2109#endif 2329#endif
2110 2330
2331#if EV_PREPARE_ENABLE
2111 /* queue prepare watchers (and execute them) */ 2332 /* queue prepare watchers (and execute them) */
2112 if (expect_false (preparecnt)) 2333 if (expect_false (preparecnt))
2113 { 2334 {
2114 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2335 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2115 EV_INVOKE_PENDING; 2336 EV_INVOKE_PENDING;
2116 } 2337 }
2338#endif
2339
2340 if (expect_false (loop_done))
2341 break;
2117 2342
2118 /* we might have forked, so reify kernel state if necessary */ 2343 /* we might have forked, so reify kernel state if necessary */
2119 if (expect_false (postfork)) 2344 if (expect_false (postfork))
2120 loop_fork (EV_A); 2345 loop_fork (EV_A);
2121 2346
… …
2169 waittime -= sleeptime; 2394 waittime -= sleeptime;
2170 } 2395 }
2171 } 2396 }
2172 } 2397 }
2173 2398
2174#if EV_MINIMAL < 2 2399#if EV_FEATURE_API
2175 ++loop_count; 2400 ++loop_count;
2176#endif 2401#endif
2402 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2177 backend_poll (EV_A_ waittime); 2403 backend_poll (EV_A_ waittime);
2404 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2178 2405
2179 /* update ev_rt_now, do magic */ 2406 /* update ev_rt_now, do magic */
2180 time_update (EV_A_ waittime + sleeptime); 2407 time_update (EV_A_ waittime + sleeptime);
2181 } 2408 }
2182 2409
… …
2189#if EV_IDLE_ENABLE 2416#if EV_IDLE_ENABLE
2190 /* queue idle watchers unless other events are pending */ 2417 /* queue idle watchers unless other events are pending */
2191 idle_reify (EV_A); 2418 idle_reify (EV_A);
2192#endif 2419#endif
2193 2420
2421#if EV_CHECK_ENABLE
2194 /* queue check watchers, to be executed first */ 2422 /* queue check watchers, to be executed first */
2195 if (expect_false (checkcnt)) 2423 if (expect_false (checkcnt))
2196 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2424 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2425#endif
2197 2426
2198 EV_INVOKE_PENDING; 2427 EV_INVOKE_PENDING;
2199 } 2428 }
2200 while (expect_true ( 2429 while (expect_true (
2201 activecnt 2430 activecnt
… …
2204 )); 2433 ));
2205 2434
2206 if (loop_done == EVUNLOOP_ONE) 2435 if (loop_done == EVUNLOOP_ONE)
2207 loop_done = EVUNLOOP_CANCEL; 2436 loop_done = EVUNLOOP_CANCEL;
2208 2437
2209#if EV_MINIMAL < 2 2438#if EV_FEATURE_API
2210 --loop_depth; 2439 --loop_depth;
2211#endif 2440#endif
2212} 2441}
2213 2442
2214void 2443void
… …
2267inline_size void 2496inline_size void
2268wlist_del (WL *head, WL elem) 2497wlist_del (WL *head, WL elem)
2269{ 2498{
2270 while (*head) 2499 while (*head)
2271 { 2500 {
2272 if (*head == elem) 2501 if (expect_true (*head == elem))
2273 { 2502 {
2274 *head = elem->next; 2503 *head = elem->next;
2275 return; 2504 break;
2276 } 2505 }
2277 2506
2278 head = &(*head)->next; 2507 head = &(*head)->next;
2279 } 2508 }
2280} 2509}
… …
2340 2569
2341 if (expect_false (ev_is_active (w))) 2570 if (expect_false (ev_is_active (w)))
2342 return; 2571 return;
2343 2572
2344 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2573 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2345 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2574 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2346 2575
2347 EV_FREQUENT_CHECK; 2576 EV_FREQUENT_CHECK;
2348 2577
2349 ev_start (EV_A_ (W)w, 1); 2578 ev_start (EV_A_ (W)w, 1);
2350 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2579 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2351 wlist_add (&anfds[fd].head, (WL)w); 2580 wlist_add (&anfds[fd].head, (WL)w);
2352 2581
2353 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2582 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2354 w->events &= ~EV__IOFDSET; 2583 w->events &= ~EV__IOFDSET;
2355 2584
2356 EV_FREQUENT_CHECK; 2585 EV_FREQUENT_CHECK;
2357} 2586}
2358 2587
… …
2420 timers [active] = timers [timercnt + HEAP0]; 2649 timers [active] = timers [timercnt + HEAP0];
2421 adjustheap (timers, timercnt, active); 2650 adjustheap (timers, timercnt, active);
2422 } 2651 }
2423 } 2652 }
2424 2653
2425 EV_FREQUENT_CHECK;
2426
2427 ev_at (w) -= mn_now; 2654 ev_at (w) -= mn_now;
2428 2655
2429 ev_stop (EV_A_ (W)w); 2656 ev_stop (EV_A_ (W)w);
2657
2658 EV_FREQUENT_CHECK;
2430} 2659}
2431 2660
2432void noinline 2661void noinline
2433ev_timer_again (EV_P_ ev_timer *w) 2662ev_timer_again (EV_P_ ev_timer *w)
2434{ 2663{
… …
2452 } 2681 }
2453 2682
2454 EV_FREQUENT_CHECK; 2683 EV_FREQUENT_CHECK;
2455} 2684}
2456 2685
2686ev_tstamp
2687ev_timer_remaining (EV_P_ ev_timer *w)
2688{
2689 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2690}
2691
2457#if EV_PERIODIC_ENABLE 2692#if EV_PERIODIC_ENABLE
2458void noinline 2693void noinline
2459ev_periodic_start (EV_P_ ev_periodic *w) 2694ev_periodic_start (EV_P_ ev_periodic *w)
2460{ 2695{
2461 if (expect_false (ev_is_active (w))) 2696 if (expect_false (ev_is_active (w)))
… …
2507 periodics [active] = periodics [periodiccnt + HEAP0]; 2742 periodics [active] = periodics [periodiccnt + HEAP0];
2508 adjustheap (periodics, periodiccnt, active); 2743 adjustheap (periodics, periodiccnt, active);
2509 } 2744 }
2510 } 2745 }
2511 2746
2512 EV_FREQUENT_CHECK;
2513
2514 ev_stop (EV_A_ (W)w); 2747 ev_stop (EV_A_ (W)w);
2748
2749 EV_FREQUENT_CHECK;
2515} 2750}
2516 2751
2517void noinline 2752void noinline
2518ev_periodic_again (EV_P_ ev_periodic *w) 2753ev_periodic_again (EV_P_ ev_periodic *w)
2519{ 2754{
… …
2525 2760
2526#ifndef SA_RESTART 2761#ifndef SA_RESTART
2527# define SA_RESTART 0 2762# define SA_RESTART 0
2528#endif 2763#endif
2529 2764
2765#if EV_SIGNAL_ENABLE
2766
2530void noinline 2767void noinline
2531ev_signal_start (EV_P_ ev_signal *w) 2768ev_signal_start (EV_P_ ev_signal *w)
2532{ 2769{
2533#if EV_MULTIPLICITY
2534 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2535#endif
2536 if (expect_false (ev_is_active (w))) 2770 if (expect_false (ev_is_active (w)))
2537 return; 2771 return;
2538 2772
2539 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2773 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2540 2774
2541 evpipe_init (EV_A); 2775#if EV_MULTIPLICITY
2776 assert (("libev: a signal must not be attached to two different loops",
2777 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2542 2778
2543 EV_FREQUENT_CHECK; 2779 signals [w->signum - 1].loop = EV_A;
2780#endif
2544 2781
2782 EV_FREQUENT_CHECK;
2783
2784#if EV_USE_SIGNALFD
2785 if (sigfd == -2)
2545 { 2786 {
2546#ifndef _WIN32 2787 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2547 sigset_t full, prev; 2788 if (sigfd < 0 && errno == EINVAL)
2548 sigfillset (&full); 2789 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2549 sigprocmask (SIG_SETMASK, &full, &prev);
2550#endif
2551 2790
2552 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2791 if (sigfd >= 0)
2792 {
2793 fd_intern (sigfd); /* doing it twice will not hurt */
2553 2794
2554#ifndef _WIN32 2795 sigemptyset (&sigfd_set);
2555 sigprocmask (SIG_SETMASK, &prev, 0); 2796
2556#endif 2797 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2798 ev_set_priority (&sigfd_w, EV_MAXPRI);
2799 ev_io_start (EV_A_ &sigfd_w);
2800 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2801 }
2557 } 2802 }
2803
2804 if (sigfd >= 0)
2805 {
2806 /* TODO: check .head */
2807 sigaddset (&sigfd_set, w->signum);
2808 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2809
2810 signalfd (sigfd, &sigfd_set, 0);
2811 }
2812#endif
2558 2813
2559 ev_start (EV_A_ (W)w, 1); 2814 ev_start (EV_A_ (W)w, 1);
2560 wlist_add (&signals [w->signum - 1].head, (WL)w); 2815 wlist_add (&signals [w->signum - 1].head, (WL)w);
2561 2816
2562 if (!((WL)w)->next) 2817 if (!((WL)w)->next)
2818# if EV_USE_SIGNALFD
2819 if (sigfd < 0) /*TODO*/
2820# endif
2563 { 2821 {
2564#if _WIN32 2822# ifdef _WIN32
2823 evpipe_init (EV_A);
2824
2565 signal (w->signum, ev_sighandler); 2825 signal (w->signum, ev_sighandler);
2566#else 2826# else
2567 struct sigaction sa; 2827 struct sigaction sa;
2828
2829 evpipe_init (EV_A);
2830
2568 sa.sa_handler = ev_sighandler; 2831 sa.sa_handler = ev_sighandler;
2569 sigfillset (&sa.sa_mask); 2832 sigfillset (&sa.sa_mask);
2570 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2833 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2571 sigaction (w->signum, &sa, 0); 2834 sigaction (w->signum, &sa, 0);
2835
2836 sigemptyset (&sa.sa_mask);
2837 sigaddset (&sa.sa_mask, w->signum);
2838 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2572#endif 2839#endif
2573 } 2840 }
2574 2841
2575 EV_FREQUENT_CHECK; 2842 EV_FREQUENT_CHECK;
2576} 2843}
2577 2844
2578void noinline 2845void noinline
… …
2586 2853
2587 wlist_del (&signals [w->signum - 1].head, (WL)w); 2854 wlist_del (&signals [w->signum - 1].head, (WL)w);
2588 ev_stop (EV_A_ (W)w); 2855 ev_stop (EV_A_ (W)w);
2589 2856
2590 if (!signals [w->signum - 1].head) 2857 if (!signals [w->signum - 1].head)
2858 {
2859#if EV_MULTIPLICITY
2860 signals [w->signum - 1].loop = 0; /* unattach from signal */
2861#endif
2862#if EV_USE_SIGNALFD
2863 if (sigfd >= 0)
2864 {
2865 sigset_t ss;
2866
2867 sigemptyset (&ss);
2868 sigaddset (&ss, w->signum);
2869 sigdelset (&sigfd_set, w->signum);
2870
2871 signalfd (sigfd, &sigfd_set, 0);
2872 sigprocmask (SIG_UNBLOCK, &ss, 0);
2873 }
2874 else
2875#endif
2591 signal (w->signum, SIG_DFL); 2876 signal (w->signum, SIG_DFL);
2877 }
2592 2878
2593 EV_FREQUENT_CHECK; 2879 EV_FREQUENT_CHECK;
2594} 2880}
2881
2882#endif
2883
2884#if EV_CHILD_ENABLE
2595 2885
2596void 2886void
2597ev_child_start (EV_P_ ev_child *w) 2887ev_child_start (EV_P_ ev_child *w)
2598{ 2888{
2599#if EV_MULTIPLICITY 2889#if EV_MULTIPLICITY
… …
2603 return; 2893 return;
2604 2894
2605 EV_FREQUENT_CHECK; 2895 EV_FREQUENT_CHECK;
2606 2896
2607 ev_start (EV_A_ (W)w, 1); 2897 ev_start (EV_A_ (W)w, 1);
2608 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2898 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2609 2899
2610 EV_FREQUENT_CHECK; 2900 EV_FREQUENT_CHECK;
2611} 2901}
2612 2902
2613void 2903void
… …
2617 if (expect_false (!ev_is_active (w))) 2907 if (expect_false (!ev_is_active (w)))
2618 return; 2908 return;
2619 2909
2620 EV_FREQUENT_CHECK; 2910 EV_FREQUENT_CHECK;
2621 2911
2622 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2912 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2623 ev_stop (EV_A_ (W)w); 2913 ev_stop (EV_A_ (W)w);
2624 2914
2625 EV_FREQUENT_CHECK; 2915 EV_FREQUENT_CHECK;
2626} 2916}
2917
2918#endif
2627 2919
2628#if EV_STAT_ENABLE 2920#if EV_STAT_ENABLE
2629 2921
2630# ifdef _WIN32 2922# ifdef _WIN32
2631# undef lstat 2923# undef lstat
… …
2637#define MIN_STAT_INTERVAL 0.1074891 2929#define MIN_STAT_INTERVAL 0.1074891
2638 2930
2639static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2931static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2640 2932
2641#if EV_USE_INOTIFY 2933#if EV_USE_INOTIFY
2642# define EV_INOTIFY_BUFSIZE 8192 2934
2935/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2936# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2643 2937
2644static void noinline 2938static void noinline
2645infy_add (EV_P_ ev_stat *w) 2939infy_add (EV_P_ ev_stat *w)
2646{ 2940{
2647 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); 2941 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);
2648 2942
2649 if (w->wd < 0) 2943 if (w->wd >= 0)
2944 {
2945 struct statfs sfs;
2946
2947 /* now local changes will be tracked by inotify, but remote changes won't */
2948 /* unless the filesystem is known to be local, we therefore still poll */
2949 /* also do poll on <2.6.25, but with normal frequency */
2950
2951 if (!fs_2625)
2952 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2953 else if (!statfs (w->path, &sfs)
2954 && (sfs.f_type == 0x1373 /* devfs */
2955 || sfs.f_type == 0xEF53 /* ext2/3 */
2956 || sfs.f_type == 0x3153464a /* jfs */
2957 || sfs.f_type == 0x52654973 /* reiser3 */
2958 || sfs.f_type == 0x01021994 /* tempfs */
2959 || sfs.f_type == 0x58465342 /* xfs */))
2960 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2961 else
2962 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2650 { 2963 }
2964 else
2965 {
2966 /* can't use inotify, continue to stat */
2651 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2967 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2652 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2653 2968
2654 /* monitor some parent directory for speedup hints */ 2969 /* if path is not there, monitor some parent directory for speedup hints */
2655 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2970 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2656 /* but an efficiency issue only */ 2971 /* but an efficiency issue only */
2657 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2972 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2658 { 2973 {
2659 char path [4096]; 2974 char path [4096];
… …
2675 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2990 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2676 } 2991 }
2677 } 2992 }
2678 2993
2679 if (w->wd >= 0) 2994 if (w->wd >= 0)
2680 {
2681 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2995 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2682 2996
2683 /* now local changes will be tracked by inotify, but remote changes won't */ 2997 /* now re-arm timer, if required */
2684 /* unless the filesystem it known to be local, we therefore still poll */ 2998 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2685 /* also do poll on <2.6.25, but with normal frequency */
2686 struct statfs sfs;
2687
2688 if (fs_2625 && !statfs (w->path, &sfs))
2689 if (sfs.f_type == 0x1373 /* devfs */
2690 || sfs.f_type == 0xEF53 /* ext2/3 */
2691 || sfs.f_type == 0x3153464a /* jfs */
2692 || sfs.f_type == 0x52654973 /* reiser3 */
2693 || sfs.f_type == 0x01021994 /* tempfs */
2694 || sfs.f_type == 0x58465342 /* xfs */)
2695 return;
2696
2697 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2698 ev_timer_again (EV_A_ &w->timer); 2999 ev_timer_again (EV_A_ &w->timer);
2699 } 3000 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2700} 3001}
2701 3002
2702static void noinline 3003static void noinline
2703infy_del (EV_P_ ev_stat *w) 3004infy_del (EV_P_ ev_stat *w)
2704{ 3005{
… …
2707 3008
2708 if (wd < 0) 3009 if (wd < 0)
2709 return; 3010 return;
2710 3011
2711 w->wd = -2; 3012 w->wd = -2;
2712 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3013 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2713 wlist_del (&fs_hash [slot].head, (WL)w); 3014 wlist_del (&fs_hash [slot].head, (WL)w);
2714 3015
2715 /* remove this watcher, if others are watching it, they will rearm */ 3016 /* remove this watcher, if others are watching it, they will rearm */
2716 inotify_rm_watch (fs_fd, wd); 3017 inotify_rm_watch (fs_fd, wd);
2717} 3018}
… …
2719static void noinline 3020static void noinline
2720infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3021infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2721{ 3022{
2722 if (slot < 0) 3023 if (slot < 0)
2723 /* overflow, need to check for all hash slots */ 3024 /* overflow, need to check for all hash slots */
2724 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3025 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2725 infy_wd (EV_A_ slot, wd, ev); 3026 infy_wd (EV_A_ slot, wd, ev);
2726 else 3027 else
2727 { 3028 {
2728 WL w_; 3029 WL w_;
2729 3030
2730 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3031 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2731 { 3032 {
2732 ev_stat *w = (ev_stat *)w_; 3033 ev_stat *w = (ev_stat *)w_;
2733 w_ = w_->next; /* lets us remove this watcher and all before it */ 3034 w_ = w_->next; /* lets us remove this watcher and all before it */
2734 3035
2735 if (w->wd == wd || wd == -1) 3036 if (w->wd == wd || wd == -1)
2736 { 3037 {
2737 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3038 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2738 { 3039 {
2739 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3040 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2740 w->wd = -1; 3041 w->wd = -1;
2741 infy_add (EV_A_ w); /* re-add, no matter what */ 3042 infy_add (EV_A_ w); /* re-add, no matter what */
2742 } 3043 }
2743 3044
2744 stat_timer_cb (EV_A_ &w->timer, 0); 3045 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2749 3050
2750static void 3051static void
2751infy_cb (EV_P_ ev_io *w, int revents) 3052infy_cb (EV_P_ ev_io *w, int revents)
2752{ 3053{
2753 char buf [EV_INOTIFY_BUFSIZE]; 3054 char buf [EV_INOTIFY_BUFSIZE];
2754 struct inotify_event *ev = (struct inotify_event *)buf;
2755 int ofs; 3055 int ofs;
2756 int len = read (fs_fd, buf, sizeof (buf)); 3056 int len = read (fs_fd, buf, sizeof (buf));
2757 3057
2758 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3058 for (ofs = 0; ofs < len; )
3059 {
3060 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2759 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3061 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3062 ofs += sizeof (struct inotify_event) + ev->len;
3063 }
3064}
3065
3066inline_size unsigned int
3067ev_linux_version (void)
3068{
3069 struct utsname buf;
3070 unsigned int v;
3071 int i;
3072 char *p = buf.release;
3073
3074 if (uname (&buf))
3075 return 0;
3076
3077 for (i = 3+1; --i; )
3078 {
3079 unsigned int c = 0;
3080
3081 for (;;)
3082 {
3083 if (*p >= '0' && *p <= '9')
3084 c = c * 10 + *p++ - '0';
3085 else
3086 {
3087 p += *p == '.';
3088 break;
3089 }
3090 }
3091
3092 v = (v << 8) | c;
3093 }
3094
3095 return v;
2760} 3096}
2761 3097
2762inline_size void 3098inline_size void
2763check_2625 (EV_P) 3099ev_check_2625 (EV_P)
2764{ 3100{
2765 /* kernels < 2.6.25 are borked 3101 /* kernels < 2.6.25 are borked
2766 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3102 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2767 */ 3103 */
2768 struct utsname buf; 3104 if (ev_linux_version () < 0x020619)
2769 int major, minor, micro;
2770
2771 if (uname (&buf))
2772 return; 3105 return;
2773 3106
2774 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2775 return;
2776
2777 if (major < 2
2778 || (major == 2 && minor < 6)
2779 || (major == 2 && minor == 6 && micro < 25))
2780 return;
2781
2782 fs_2625 = 1; 3107 fs_2625 = 1;
3108}
3109
3110inline_size int
3111infy_newfd (void)
3112{
3113#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3114 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3115 if (fd >= 0)
3116 return fd;
3117#endif
3118 return inotify_init ();
2783} 3119}
2784 3120
2785inline_size void 3121inline_size void
2786infy_init (EV_P) 3122infy_init (EV_P)
2787{ 3123{
2788 if (fs_fd != -2) 3124 if (fs_fd != -2)
2789 return; 3125 return;
2790 3126
2791 fs_fd = -1; 3127 fs_fd = -1;
2792 3128
2793 check_2625 (EV_A); 3129 ev_check_2625 (EV_A);
2794 3130
2795 fs_fd = inotify_init (); 3131 fs_fd = infy_newfd ();
2796 3132
2797 if (fs_fd >= 0) 3133 if (fs_fd >= 0)
2798 { 3134 {
3135 fd_intern (fs_fd);
2799 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3136 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2800 ev_set_priority (&fs_w, EV_MAXPRI); 3137 ev_set_priority (&fs_w, EV_MAXPRI);
2801 ev_io_start (EV_A_ &fs_w); 3138 ev_io_start (EV_A_ &fs_w);
3139 ev_unref (EV_A);
2802 } 3140 }
2803} 3141}
2804 3142
2805inline_size void 3143inline_size void
2806infy_fork (EV_P) 3144infy_fork (EV_P)
… …
2808 int slot; 3146 int slot;
2809 3147
2810 if (fs_fd < 0) 3148 if (fs_fd < 0)
2811 return; 3149 return;
2812 3150
3151 ev_ref (EV_A);
3152 ev_io_stop (EV_A_ &fs_w);
2813 close (fs_fd); 3153 close (fs_fd);
2814 fs_fd = inotify_init (); 3154 fs_fd = infy_newfd ();
2815 3155
3156 if (fs_fd >= 0)
3157 {
3158 fd_intern (fs_fd);
3159 ev_io_set (&fs_w, fs_fd, EV_READ);
3160 ev_io_start (EV_A_ &fs_w);
3161 ev_unref (EV_A);
3162 }
3163
2816 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3164 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2817 { 3165 {
2818 WL w_ = fs_hash [slot].head; 3166 WL w_ = fs_hash [slot].head;
2819 fs_hash [slot].head = 0; 3167 fs_hash [slot].head = 0;
2820 3168
2821 while (w_) 3169 while (w_)
… …
2826 w->wd = -1; 3174 w->wd = -1;
2827 3175
2828 if (fs_fd >= 0) 3176 if (fs_fd >= 0)
2829 infy_add (EV_A_ w); /* re-add, no matter what */ 3177 infy_add (EV_A_ w); /* re-add, no matter what */
2830 else 3178 else
3179 {
3180 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3181 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2831 ev_timer_again (EV_A_ &w->timer); 3182 ev_timer_again (EV_A_ &w->timer);
3183 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3184 }
2832 } 3185 }
2833 } 3186 }
2834} 3187}
2835 3188
2836#endif 3189#endif
… …
2853static void noinline 3206static void noinline
2854stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3207stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2855{ 3208{
2856 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3209 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2857 3210
2858 /* we copy this here each the time so that */ 3211 ev_statdata prev = w->attr;
2859 /* prev has the old value when the callback gets invoked */
2860 w->prev = w->attr;
2861 ev_stat_stat (EV_A_ w); 3212 ev_stat_stat (EV_A_ w);
2862 3213
2863 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3214 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2864 if ( 3215 if (
2865 w->prev.st_dev != w->attr.st_dev 3216 prev.st_dev != w->attr.st_dev
2866 || w->prev.st_ino != w->attr.st_ino 3217 || prev.st_ino != w->attr.st_ino
2867 || w->prev.st_mode != w->attr.st_mode 3218 || prev.st_mode != w->attr.st_mode
2868 || w->prev.st_nlink != w->attr.st_nlink 3219 || prev.st_nlink != w->attr.st_nlink
2869 || w->prev.st_uid != w->attr.st_uid 3220 || prev.st_uid != w->attr.st_uid
2870 || w->prev.st_gid != w->attr.st_gid 3221 || prev.st_gid != w->attr.st_gid
2871 || w->prev.st_rdev != w->attr.st_rdev 3222 || prev.st_rdev != w->attr.st_rdev
2872 || w->prev.st_size != w->attr.st_size 3223 || prev.st_size != w->attr.st_size
2873 || w->prev.st_atime != w->attr.st_atime 3224 || prev.st_atime != w->attr.st_atime
2874 || w->prev.st_mtime != w->attr.st_mtime 3225 || prev.st_mtime != w->attr.st_mtime
2875 || w->prev.st_ctime != w->attr.st_ctime 3226 || prev.st_ctime != w->attr.st_ctime
2876 ) { 3227 ) {
3228 /* we only update w->prev on actual differences */
3229 /* in case we test more often than invoke the callback, */
3230 /* to ensure that prev is always different to attr */
3231 w->prev = prev;
3232
2877 #if EV_USE_INOTIFY 3233 #if EV_USE_INOTIFY
2878 if (fs_fd >= 0) 3234 if (fs_fd >= 0)
2879 { 3235 {
2880 infy_del (EV_A_ w); 3236 infy_del (EV_A_ w);
2881 infy_add (EV_A_ w); 3237 infy_add (EV_A_ w);
… …
2906 3262
2907 if (fs_fd >= 0) 3263 if (fs_fd >= 0)
2908 infy_add (EV_A_ w); 3264 infy_add (EV_A_ w);
2909 else 3265 else
2910#endif 3266#endif
3267 {
2911 ev_timer_again (EV_A_ &w->timer); 3268 ev_timer_again (EV_A_ &w->timer);
3269 ev_unref (EV_A);
3270 }
2912 3271
2913 ev_start (EV_A_ (W)w, 1); 3272 ev_start (EV_A_ (W)w, 1);
2914 3273
2915 EV_FREQUENT_CHECK; 3274 EV_FREQUENT_CHECK;
2916} 3275}
… …
2925 EV_FREQUENT_CHECK; 3284 EV_FREQUENT_CHECK;
2926 3285
2927#if EV_USE_INOTIFY 3286#if EV_USE_INOTIFY
2928 infy_del (EV_A_ w); 3287 infy_del (EV_A_ w);
2929#endif 3288#endif
3289
3290 if (ev_is_active (&w->timer))
3291 {
3292 ev_ref (EV_A);
2930 ev_timer_stop (EV_A_ &w->timer); 3293 ev_timer_stop (EV_A_ &w->timer);
3294 }
2931 3295
2932 ev_stop (EV_A_ (W)w); 3296 ev_stop (EV_A_ (W)w);
2933 3297
2934 EV_FREQUENT_CHECK; 3298 EV_FREQUENT_CHECK;
2935} 3299}
… …
2980 3344
2981 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
2982} 3346}
2983#endif 3347#endif
2984 3348
3349#if EV_PREPARE_ENABLE
2985void 3350void
2986ev_prepare_start (EV_P_ ev_prepare *w) 3351ev_prepare_start (EV_P_ ev_prepare *w)
2987{ 3352{
2988 if (expect_false (ev_is_active (w))) 3353 if (expect_false (ev_is_active (w)))
2989 return; 3354 return;
… …
3015 3380
3016 ev_stop (EV_A_ (W)w); 3381 ev_stop (EV_A_ (W)w);
3017 3382
3018 EV_FREQUENT_CHECK; 3383 EV_FREQUENT_CHECK;
3019} 3384}
3385#endif
3020 3386
3387#if EV_CHECK_ENABLE
3021void 3388void
3022ev_check_start (EV_P_ ev_check *w) 3389ev_check_start (EV_P_ ev_check *w)
3023{ 3390{
3024 if (expect_false (ev_is_active (w))) 3391 if (expect_false (ev_is_active (w)))
3025 return; 3392 return;
… …
3051 3418
3052 ev_stop (EV_A_ (W)w); 3419 ev_stop (EV_A_ (W)w);
3053 3420
3054 EV_FREQUENT_CHECK; 3421 EV_FREQUENT_CHECK;
3055} 3422}
3423#endif
3056 3424
3057#if EV_EMBED_ENABLE 3425#if EV_EMBED_ENABLE
3058void noinline 3426void noinline
3059ev_embed_sweep (EV_P_ ev_embed *w) 3427ev_embed_sweep (EV_P_ ev_embed *w)
3060{ 3428{
… …
3076embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3444embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3077{ 3445{
3078 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3446 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3079 3447
3080 { 3448 {
3081 struct ev_loop *loop = w->other; 3449 EV_P = w->other;
3082 3450
3083 while (fdchangecnt) 3451 while (fdchangecnt)
3084 { 3452 {
3085 fd_reify (EV_A); 3453 fd_reify (EV_A);
3086 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3454 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3094 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3462 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3095 3463
3096 ev_embed_stop (EV_A_ w); 3464 ev_embed_stop (EV_A_ w);
3097 3465
3098 { 3466 {
3099 struct ev_loop *loop = w->other; 3467 EV_P = w->other;
3100 3468
3101 ev_loop_fork (EV_A); 3469 ev_loop_fork (EV_A);
3102 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3470 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3103 } 3471 }
3104 3472
… …
3118{ 3486{
3119 if (expect_false (ev_is_active (w))) 3487 if (expect_false (ev_is_active (w)))
3120 return; 3488 return;
3121 3489
3122 { 3490 {
3123 struct ev_loop *loop = w->other; 3491 EV_P = w->other;
3124 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3492 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3125 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3493 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3126 } 3494 }
3127 3495
3128 EV_FREQUENT_CHECK; 3496 EV_FREQUENT_CHECK;
… …
3155 3523
3156 ev_io_stop (EV_A_ &w->io); 3524 ev_io_stop (EV_A_ &w->io);
3157 ev_prepare_stop (EV_A_ &w->prepare); 3525 ev_prepare_stop (EV_A_ &w->prepare);
3158 ev_fork_stop (EV_A_ &w->fork); 3526 ev_fork_stop (EV_A_ &w->fork);
3159 3527
3528 ev_stop (EV_A_ (W)w);
3529
3160 EV_FREQUENT_CHECK; 3530 EV_FREQUENT_CHECK;
3161} 3531}
3162#endif 3532#endif
3163 3533
3164#if EV_FORK_ENABLE 3534#if EV_FORK_ENABLE
… …
3240 3610
3241void 3611void
3242ev_async_send (EV_P_ ev_async *w) 3612ev_async_send (EV_P_ ev_async *w)
3243{ 3613{
3244 w->sent = 1; 3614 w->sent = 1;
3245 evpipe_write (EV_A_ &gotasync); 3615 evpipe_write (EV_A_ &async_pending);
3246} 3616}
3247#endif 3617#endif
3248 3618
3249/*****************************************************************************/ 3619/*****************************************************************************/
3250 3620
… …
3290{ 3660{
3291 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3661 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3292 3662
3293 if (expect_false (!once)) 3663 if (expect_false (!once))
3294 { 3664 {
3295 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3665 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3296 return; 3666 return;
3297 } 3667 }
3298 3668
3299 once->cb = cb; 3669 once->cb = cb;
3300 once->arg = arg; 3670 once->arg = arg;
… …
3387 if (types & EV_ASYNC) 3757 if (types & EV_ASYNC)
3388 for (i = asynccnt; i--; ) 3758 for (i = asynccnt; i--; )
3389 cb (EV_A_ EV_ASYNC, asyncs [i]); 3759 cb (EV_A_ EV_ASYNC, asyncs [i]);
3390#endif 3760#endif
3391 3761
3762#if EV_PREPARE_ENABLE
3392 if (types & EV_PREPARE) 3763 if (types & EV_PREPARE)
3393 for (i = preparecnt; i--; ) 3764 for (i = preparecnt; i--; )
3394#if EV_EMBED_ENABLE 3765# if EV_EMBED_ENABLE
3395 if (ev_cb (prepares [i]) != embed_prepare_cb) 3766 if (ev_cb (prepares [i]) != embed_prepare_cb)
3396#endif 3767# endif
3397 cb (EV_A_ EV_PREPARE, prepares [i]); 3768 cb (EV_A_ EV_PREPARE, prepares [i]);
3769#endif
3398 3770
3771#if EV_CHECK_ENABLE
3399 if (types & EV_CHECK) 3772 if (types & EV_CHECK)
3400 for (i = checkcnt; i--; ) 3773 for (i = checkcnt; i--; )
3401 cb (EV_A_ EV_CHECK, checks [i]); 3774 cb (EV_A_ EV_CHECK, checks [i]);
3775#endif
3402 3776
3777#if EV_SIGNAL_ENABLE
3403 if (types & EV_SIGNAL) 3778 if (types & EV_SIGNAL)
3404 for (i = 0; i < signalmax; ++i) 3779 for (i = 0; i < EV_NSIG - 1; ++i)
3405 for (wl = signals [i].head; wl; ) 3780 for (wl = signals [i].head; wl; )
3406 { 3781 {
3407 wn = wl->next; 3782 wn = wl->next;
3408 cb (EV_A_ EV_SIGNAL, wl); 3783 cb (EV_A_ EV_SIGNAL, wl);
3409 wl = wn; 3784 wl = wn;
3410 } 3785 }
3786#endif
3411 3787
3788#if EV_CHILD_ENABLE
3412 if (types & EV_CHILD) 3789 if (types & EV_CHILD)
3413 for (i = EV_PID_HASHSIZE; i--; ) 3790 for (i = (EV_PID_HASHSIZE); i--; )
3414 for (wl = childs [i]; wl; ) 3791 for (wl = childs [i]; wl; )
3415 { 3792 {
3416 wn = wl->next; 3793 wn = wl->next;
3417 cb (EV_A_ EV_CHILD, wl); 3794 cb (EV_A_ EV_CHILD, wl);
3418 wl = wn; 3795 wl = wn;
3419 } 3796 }
3797#endif
3420/* EV_STAT 0x00001000 /* stat data changed */ 3798/* EV_STAT 0x00001000 /* stat data changed */
3421/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3799/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3422} 3800}
3423#endif 3801#endif
3424 3802

Diff Legend

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