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

Comparing libev/ev.c (file contents):
Revision 1.295 by root, Wed Jul 8 04:29:31 2009 UTC vs.
Revision 1.353 by root, Thu Oct 21 12:32:47 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
712#if EV_FEATURE_API
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)
715# define EV_INVOKE_PENDING invoke_cb (EV_A)
716#else
717# define EV_RELEASE_CB (void)0
718# define EV_ACQUIRE_CB (void)0
719# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
720#endif
721
722#define EVBREAK_RECURSE 0x80
723
572/*****************************************************************************/ 724/*****************************************************************************/
573 725
574#ifndef EV_HAVE_EV_TIME 726#ifndef EV_HAVE_EV_TIME
575ev_tstamp 727ev_tstamp
576ev_time (void) 728ev_time (void)
… …
619 if (delay > 0.) 771 if (delay > 0.)
620 { 772 {
621#if EV_USE_NANOSLEEP 773#if EV_USE_NANOSLEEP
622 struct timespec ts; 774 struct timespec ts;
623 775
624 ts.tv_sec = (time_t)delay; 776 EV_TS_SET (ts, delay);
625 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
626
627 nanosleep (&ts, 0); 777 nanosleep (&ts, 0);
628#elif defined(_WIN32) 778#elif defined(_WIN32)
629 Sleep ((unsigned long)(delay * 1e3)); 779 Sleep ((unsigned long)(delay * 1e3));
630#else 780#else
631 struct timeval tv; 781 struct timeval tv;
632 782
633 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 783 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 784 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 785 /* by older ones */
786 EV_TV_SET (tv, delay);
639 select (0, 0, 0, 0, &tv); 787 select (0, 0, 0, 0, &tv);
640#endif 788#endif
641 } 789 }
642} 790}
643 791
644/*****************************************************************************/ 792/*****************************************************************************/
645 793
646#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 */
647 795
648/* find a suitable new size for the given array, */ 796/* find a suitable new size for the given array, */
649/* hopefully by rounding to a ncie-to-malloc size */ 797/* hopefully by rounding to a nice-to-malloc size */
650inline_size int 798inline_size int
651array_nextsize (int elem, int cur, int cnt) 799array_nextsize (int elem, int cur, int cnt)
652{ 800{
653 int ncur = cur + 1; 801 int ncur = cur + 1;
654 802
… …
750} 898}
751 899
752/*****************************************************************************/ 900/*****************************************************************************/
753 901
754inline_speed void 902inline_speed void
755fd_event (EV_P_ int fd, int revents) 903fd_event_nocheck (EV_P_ int fd, int revents)
756{ 904{
757 ANFD *anfd = anfds + fd; 905 ANFD *anfd = anfds + fd;
758 ev_io *w; 906 ev_io *w;
759 907
760 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)
… …
764 if (ev) 912 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 913 ev_feed_event (EV_A_ (W)w, ev);
766 } 914 }
767} 915}
768 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
769void 928void
770ev_feed_fd_event (EV_P_ int fd, int revents) 929ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 930{
772 if (fd >= 0 && fd < anfdmax) 931 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 932 fd_event_nocheck (EV_A_ fd, revents);
774} 933}
775 934
776/* make sure the external fd watch events are in-sync */ 935/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 936/* with the kernel/libev internal state */
778inline_size void 937inline_size void
… …
784 { 943 {
785 int fd = fdchanges [i]; 944 int fd = fdchanges [i];
786 ANFD *anfd = anfds + fd; 945 ANFD *anfd = anfds + fd;
787 ev_io *w; 946 ev_io *w;
788 947
789 unsigned char events = 0; 948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
790 950
791 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 951 anfd->reify = 0;
792 events |= (unsigned char)w->events;
793 952
794#if EV_SELECT_IS_WINSOCKET 953#if EV_SELECT_IS_WINSOCKET
795 if (events) 954 if (o_reify & EV__IOFDSET)
796 { 955 {
797 unsigned long arg; 956 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 957 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
800 #else
801 anfd->handle = _get_osfhandle (fd);
802 #endif
803 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 958 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
804 } 959 }
805#endif 960#endif
806 961
962 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
807 { 963 {
808 unsigned char o_events = anfd->events;
809 unsigned char o_reify = anfd->reify;
810
811 anfd->reify = 0;
812 anfd->events = events; 964 anfd->events = 0;
813 965
814 if (o_events != events || o_reify & EV__IOFDSET) 966 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
967 anfd->events |= (unsigned char)w->events;
968
969 if (o_events != anfd->events)
970 o_reify = EV__IOFDSET; /* actually |= */
971 }
972
973 if (o_reify & EV__IOFDSET)
815 backend_modify (EV_A_ fd, o_events, events); 974 backend_modify (EV_A_ fd, o_events, anfd->events);
816 }
817 } 975 }
818 976
819 fdchangecnt = 0; 977 fdchangecnt = 0;
820} 978}
821 979
… …
845 ev_io_stop (EV_A_ w); 1003 ev_io_stop (EV_A_ w);
846 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1004 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
847 } 1005 }
848} 1006}
849 1007
850/* check whether the given fd is atcually valid, for error recovery */ 1008/* check whether the given fd is actually valid, for error recovery */
851inline_size int 1009inline_size int
852fd_valid (int fd) 1010fd_valid (int fd)
853{ 1011{
854#ifdef _WIN32 1012#ifdef _WIN32
855 return _get_osfhandle (fd) != -1; 1013 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
856#else 1014#else
857 return fcntl (fd, F_GETFD) != -1; 1015 return fcntl (fd, F_GETFD) != -1;
858#endif 1016#endif
859} 1017}
860 1018
… …
878 1036
879 for (fd = anfdmax; fd--; ) 1037 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 1038 if (anfds [fd].events)
881 { 1039 {
882 fd_kill (EV_A_ fd); 1040 fd_kill (EV_A_ fd);
883 return; 1041 break;
884 } 1042 }
885} 1043}
886 1044
887/* usually called after fork if backend needs to re-arm all fds from scratch */ 1045/* usually called after fork if backend needs to re-arm all fds from scratch */
888static void noinline 1046static void noinline
… …
893 for (fd = 0; fd < anfdmax; ++fd) 1051 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 1052 if (anfds [fd].events)
895 { 1053 {
896 anfds [fd].events = 0; 1054 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 1055 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1056 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 1057 }
900} 1058}
901 1059
1060/* used to prepare libev internal fd's */
1061/* this is not fork-safe */
1062inline_speed void
1063fd_intern (int fd)
1064{
1065#ifdef _WIN32
1066 unsigned long arg = 1;
1067 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1068#else
1069 fcntl (fd, F_SETFD, FD_CLOEXEC);
1070 fcntl (fd, F_SETFL, O_NONBLOCK);
1071#endif
1072}
1073
902/*****************************************************************************/ 1074/*****************************************************************************/
903 1075
904/* 1076/*
905 * the heap functions want a real array index. array index 0 uis guaranteed to not 1077 * the heap functions want a real array index. array index 0 is guaranteed to not
906 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1078 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
907 * the branching factor of the d-tree. 1079 * the branching factor of the d-tree.
908 */ 1080 */
909 1081
910/* 1082/*
… …
978 1150
979 for (;;) 1151 for (;;)
980 { 1152 {
981 int c = k << 1; 1153 int c = k << 1;
982 1154
983 if (c > N + HEAP0 - 1) 1155 if (c >= N + HEAP0)
984 break; 1156 break;
985 1157
986 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1158 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
987 ? 1 : 0; 1159 ? 1 : 0;
988 1160
… …
1024 1196
1025/* move an element suitably so it is in a correct place */ 1197/* move an element suitably so it is in a correct place */
1026inline_size void 1198inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1199adjustheap (ANHE *heap, int N, int k)
1028{ 1200{
1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1201 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1030 upheap (heap, k); 1202 upheap (heap, k);
1031 else 1203 else
1032 downheap (heap, N, k); 1204 downheap (heap, N, k);
1033} 1205}
1034 1206
… …
1047/*****************************************************************************/ 1219/*****************************************************************************/
1048 1220
1049/* associate signal watchers to a signal signal */ 1221/* associate signal watchers to a signal signal */
1050typedef struct 1222typedef struct
1051{ 1223{
1224 EV_ATOMIC_T pending;
1225#if EV_MULTIPLICITY
1226 EV_P;
1227#endif
1052 WL head; 1228 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1229} ANSIG;
1055 1230
1056static ANSIG *signals; 1231static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1232
1061/*****************************************************************************/ 1233/*****************************************************************************/
1062 1234
1063/* used to prepare libev internal fd's */ 1235#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1064/* this is not fork-safe */
1065inline_speed void
1066fd_intern (int fd)
1067{
1068#ifdef _WIN32
1069 unsigned long arg = 1;
1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1071#else
1072 fcntl (fd, F_SETFD, FD_CLOEXEC);
1073 fcntl (fd, F_SETFL, O_NONBLOCK);
1074#endif
1075}
1076 1236
1077static void noinline 1237static void noinline
1078evpipe_init (EV_P) 1238evpipe_init (EV_P)
1079{ 1239{
1080 if (!ev_is_active (&pipe_w)) 1240 if (!ev_is_active (&pipe_w))
1081 { 1241 {
1082#if EV_USE_EVENTFD 1242# if EV_USE_EVENTFD
1243 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1244 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1245 evfd = eventfd (0, 0);
1246
1247 if (evfd >= 0)
1084 { 1248 {
1085 evpipe [0] = -1; 1249 evpipe [0] = -1;
1086 fd_intern (evfd); 1250 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1251 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1252 }
1089 else 1253 else
1090#endif 1254# endif
1091 { 1255 {
1092 while (pipe (evpipe)) 1256 while (pipe (evpipe))
1093 ev_syserr ("(libev) error creating signal/async pipe"); 1257 ev_syserr ("(libev) error creating signal/async pipe");
1094 1258
1095 fd_intern (evpipe [0]); 1259 fd_intern (evpipe [0]);
… …
1106evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1270evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1107{ 1271{
1108 if (!*flag) 1272 if (!*flag)
1109 { 1273 {
1110 int old_errno = errno; /* save errno because write might clobber it */ 1274 int old_errno = errno; /* save errno because write might clobber it */
1275 char dummy;
1111 1276
1112 *flag = 1; 1277 *flag = 1;
1113 1278
1114#if EV_USE_EVENTFD 1279#if EV_USE_EVENTFD
1115 if (evfd >= 0) 1280 if (evfd >= 0)
… …
1117 uint64_t counter = 1; 1282 uint64_t counter = 1;
1118 write (evfd, &counter, sizeof (uint64_t)); 1283 write (evfd, &counter, sizeof (uint64_t));
1119 } 1284 }
1120 else 1285 else
1121#endif 1286#endif
1287 /* win32 people keep sending patches that change this write() to send() */
1288 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1289 /* so when you think this write should be a send instead, please find out */
1290 /* where your send() is from - it's definitely not the microsoft send, and */
1291 /* tell me. thank you. */
1122 write (evpipe [1], &old_errno, 1); 1292 write (evpipe [1], &dummy, 1);
1123 1293
1124 errno = old_errno; 1294 errno = old_errno;
1125 } 1295 }
1126} 1296}
1127 1297
1128/* called whenever the libev signal pipe */ 1298/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1299/* got some events (signal, async) */
1130static void 1300static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1301pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1302{
1303 int i;
1304
1133#if EV_USE_EVENTFD 1305#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1306 if (evfd >= 0)
1135 { 1307 {
1136 uint64_t counter; 1308 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1309 read (evfd, &counter, sizeof (uint64_t));
1138 } 1310 }
1139 else 1311 else
1140#endif 1312#endif
1141 { 1313 {
1142 char dummy; 1314 char dummy;
1315 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1143 read (evpipe [0], &dummy, 1); 1316 read (evpipe [0], &dummy, 1);
1144 } 1317 }
1145 1318
1146 if (gotsig && ev_is_default_loop (EV_A)) 1319 if (sig_pending)
1147 { 1320 {
1148 int signum; 1321 sig_pending = 0;
1149 gotsig = 0;
1150 1322
1151 for (signum = signalmax; signum--; ) 1323 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1324 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1325 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1326 }
1155 1327
1156#if EV_ASYNC_ENABLE 1328#if EV_ASYNC_ENABLE
1157 if (gotasync) 1329 if (async_pending)
1158 { 1330 {
1159 int i; 1331 async_pending = 0;
1160 gotasync = 0;
1161 1332
1162 for (i = asynccnt; i--; ) 1333 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1334 if (asyncs [i]->sent)
1164 { 1335 {
1165 asyncs [i]->sent = 0; 1336 asyncs [i]->sent = 0;
… …
1173 1344
1174static void 1345static void
1175ev_sighandler (int signum) 1346ev_sighandler (int signum)
1176{ 1347{
1177#if EV_MULTIPLICITY 1348#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1349 EV_P = signals [signum - 1].loop;
1179#endif 1350#endif
1180 1351
1181#if _WIN32 1352#ifdef _WIN32
1182 signal (signum, ev_sighandler); 1353 signal (signum, ev_sighandler);
1183#endif 1354#endif
1184 1355
1185 signals [signum - 1].gotsig = 1; 1356 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1357 evpipe_write (EV_A_ &sig_pending);
1187} 1358}
1188 1359
1189void noinline 1360void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1361ev_feed_signal_event (EV_P_ int signum)
1191{ 1362{
1192 WL w; 1363 WL w;
1193 1364
1365 if (expect_false (signum <= 0 || signum > EV_NSIG))
1366 return;
1367
1368 --signum;
1369
1194#if EV_MULTIPLICITY 1370#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1371 /* it is permissible to try to feed a signal to the wrong loop */
1196#endif 1372 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1373
1198 --signum; 1374 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1375 return;
1376#endif
1202 1377
1203 signals [signum].gotsig = 0; 1378 signals [signum].pending = 0;
1204 1379
1205 for (w = signals [signum].head; w; w = w->next) 1380 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1381 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1382}
1208 1383
1384#if EV_USE_SIGNALFD
1385static void
1386sigfdcb (EV_P_ ev_io *iow, int revents)
1387{
1388 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1389
1390 for (;;)
1391 {
1392 ssize_t res = read (sigfd, si, sizeof (si));
1393
1394 /* not ISO-C, as res might be -1, but works with SuS */
1395 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1396 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1397
1398 if (res < (ssize_t)sizeof (si))
1399 break;
1400 }
1401}
1402#endif
1403
1404#endif
1405
1209/*****************************************************************************/ 1406/*****************************************************************************/
1210 1407
1408#if EV_CHILD_ENABLE
1211static WL childs [EV_PID_HASHSIZE]; 1409static WL childs [EV_PID_HASHSIZE];
1212
1213#ifndef _WIN32
1214 1410
1215static ev_signal childev; 1411static ev_signal childev;
1216 1412
1217#ifndef WIFCONTINUED 1413#ifndef WIFCONTINUED
1218# define WIFCONTINUED(status) 0 1414# define WIFCONTINUED(status) 0
… …
1223child_reap (EV_P_ int chain, int pid, int status) 1419child_reap (EV_P_ int chain, int pid, int status)
1224{ 1420{
1225 ev_child *w; 1421 ev_child *w;
1226 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1422 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1227 1423
1228 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1424 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1229 { 1425 {
1230 if ((w->pid == pid || !w->pid) 1426 if ((w->pid == pid || !w->pid)
1231 && (!traced || (w->flags & 1))) 1427 && (!traced || (w->flags & 1)))
1232 { 1428 {
1233 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1429 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1258 /* make sure we are called again until all children have been reaped */ 1454 /* make sure we are called again until all children have been reaped */
1259 /* we need to do it this way so that the callback gets called before we continue */ 1455 /* we need to do it this way so that the callback gets called before we continue */
1260 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1456 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1261 1457
1262 child_reap (EV_A_ pid, pid, status); 1458 child_reap (EV_A_ pid, pid, status);
1263 if (EV_PID_HASHSIZE > 1) 1459 if ((EV_PID_HASHSIZE) > 1)
1264 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1460 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1265} 1461}
1266 1462
1267#endif 1463#endif
1268 1464
… …
1335#ifdef __APPLE__ 1531#ifdef __APPLE__
1336 /* only select works correctly on that "unix-certified" platform */ 1532 /* only select works correctly on that "unix-certified" platform */
1337 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1533 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1338 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1534 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1339#endif 1535#endif
1536#ifdef __FreeBSD__
1537 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1538#endif
1340 1539
1341 return flags; 1540 return flags;
1342} 1541}
1343 1542
1344unsigned int 1543unsigned int
… …
1357ev_backend (EV_P) 1556ev_backend (EV_P)
1358{ 1557{
1359 return backend; 1558 return backend;
1360} 1559}
1361 1560
1561#if EV_FEATURE_API
1362unsigned int 1562unsigned int
1363ev_loop_count (EV_P) 1563ev_iteration (EV_P)
1364{ 1564{
1365 return loop_count; 1565 return loop_count;
1366} 1566}
1367 1567
1368unsigned int 1568unsigned int
1369ev_loop_depth (EV_P) 1569ev_depth (EV_P)
1370{ 1570{
1371 return loop_depth; 1571 return loop_depth;
1372} 1572}
1373 1573
1374void 1574void
… …
1380void 1580void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1581ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1582{
1383 timeout_blocktime = interval; 1583 timeout_blocktime = interval;
1384} 1584}
1585
1586void
1587ev_set_userdata (EV_P_ void *data)
1588{
1589 userdata = data;
1590}
1591
1592void *
1593ev_userdata (EV_P)
1594{
1595 return userdata;
1596}
1597
1598void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1599{
1600 invoke_cb = invoke_pending_cb;
1601}
1602
1603void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1604{
1605 release_cb = release;
1606 acquire_cb = acquire;
1607}
1608#endif
1385 1609
1386/* initialise a loop structure, must be zero-initialised */ 1610/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1611static void noinline
1388loop_init (EV_P_ unsigned int flags) 1612loop_init (EV_P_ unsigned int flags)
1389{ 1613{
… …
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1631 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1632 have_monotonic = 1;
1409 } 1633 }
1410#endif 1634#endif
1411 1635
1636 /* pid check not overridable via env */
1637#ifndef _WIN32
1638 if (flags & EVFLAG_FORKCHECK)
1639 curpid = getpid ();
1640#endif
1641
1642 if (!(flags & EVFLAG_NOENV)
1643 && !enable_secure ()
1644 && getenv ("LIBEV_FLAGS"))
1645 flags = atoi (getenv ("LIBEV_FLAGS"));
1646
1412 ev_rt_now = ev_time (); 1647 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1648 mn_now = get_clock ();
1414 now_floor = mn_now; 1649 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1650 rtmn_diff = ev_rt_now - mn_now;
1651#if EV_FEATURE_API
1652 invoke_cb = ev_invoke_pending;
1653#endif
1416 1654
1417 io_blocktime = 0.; 1655 io_blocktime = 0.;
1418 timeout_blocktime = 0.; 1656 timeout_blocktime = 0.;
1419 backend = 0; 1657 backend = 0;
1420 backend_fd = -1; 1658 backend_fd = -1;
1421 gotasync = 0; 1659 sig_pending = 0;
1660#if EV_ASYNC_ENABLE
1661 async_pending = 0;
1662#endif
1422#if EV_USE_INOTIFY 1663#if EV_USE_INOTIFY
1423 fs_fd = -2; 1664 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1424#endif 1665#endif
1425 1666#if EV_USE_SIGNALFD
1426 /* pid check not overridable via env */ 1667 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1427#ifndef _WIN32
1428 if (flags & EVFLAG_FORKCHECK)
1429 curpid = getpid ();
1430#endif 1668#endif
1431
1432 if (!(flags & EVFLAG_NOENV)
1433 && !enable_secure ()
1434 && getenv ("LIBEV_FLAGS"))
1435 flags = atoi (getenv ("LIBEV_FLAGS"));
1436 1669
1437 if (!(flags & 0x0000ffffU)) 1670 if (!(flags & 0x0000ffffU))
1438 flags |= ev_recommended_backends (); 1671 flags |= ev_recommended_backends ();
1439 1672
1440#if EV_USE_PORT 1673#if EV_USE_PORT
… …
1453 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1686 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1454#endif 1687#endif
1455 1688
1456 ev_prepare_init (&pending_w, pendingcb); 1689 ev_prepare_init (&pending_w, pendingcb);
1457 1690
1691#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1458 ev_init (&pipe_w, pipecb); 1692 ev_init (&pipe_w, pipecb);
1459 ev_set_priority (&pipe_w, EV_MAXPRI); 1693 ev_set_priority (&pipe_w, EV_MAXPRI);
1694#endif
1460 } 1695 }
1461} 1696}
1462 1697
1463/* free up a loop structure */ 1698/* free up a loop structure */
1464static void noinline 1699static void noinline
… …
1466{ 1701{
1467 int i; 1702 int i;
1468 1703
1469 if (ev_is_active (&pipe_w)) 1704 if (ev_is_active (&pipe_w))
1470 { 1705 {
1471 ev_ref (EV_A); /* signal watcher */ 1706 /*ev_ref (EV_A);*/
1472 ev_io_stop (EV_A_ &pipe_w); 1707 /*ev_io_stop (EV_A_ &pipe_w);*/
1473 1708
1474#if EV_USE_EVENTFD 1709#if EV_USE_EVENTFD
1475 if (evfd >= 0) 1710 if (evfd >= 0)
1476 close (evfd); 1711 close (evfd);
1477#endif 1712#endif
1478 1713
1479 if (evpipe [0] >= 0) 1714 if (evpipe [0] >= 0)
1480 { 1715 {
1481 close (evpipe [0]); 1716 EV_WIN32_CLOSE_FD (evpipe [0]);
1482 close (evpipe [1]); 1717 EV_WIN32_CLOSE_FD (evpipe [1]);
1483 } 1718 }
1484 } 1719 }
1720
1721#if EV_USE_SIGNALFD
1722 if (ev_is_active (&sigfd_w))
1723 close (sigfd);
1724#endif
1485 1725
1486#if EV_USE_INOTIFY 1726#if EV_USE_INOTIFY
1487 if (fs_fd >= 0) 1727 if (fs_fd >= 0)
1488 close (fs_fd); 1728 close (fs_fd);
1489#endif 1729#endif
… …
1513#if EV_IDLE_ENABLE 1753#if EV_IDLE_ENABLE
1514 array_free (idle, [i]); 1754 array_free (idle, [i]);
1515#endif 1755#endif
1516 } 1756 }
1517 1757
1518 ev_free (anfds); anfdmax = 0; 1758 ev_free (anfds); anfds = 0; anfdmax = 0;
1519 1759
1520 /* have to use the microsoft-never-gets-it-right macro */ 1760 /* have to use the microsoft-never-gets-it-right macro */
1521 array_free (rfeed, EMPTY); 1761 array_free (rfeed, EMPTY);
1522 array_free (fdchange, EMPTY); 1762 array_free (fdchange, EMPTY);
1523 array_free (timer, EMPTY); 1763 array_free (timer, EMPTY);
… …
1558 1798
1559 if (ev_is_active (&pipe_w)) 1799 if (ev_is_active (&pipe_w))
1560 { 1800 {
1561 /* this "locks" the handlers against writing to the pipe */ 1801 /* this "locks" the handlers against writing to the pipe */
1562 /* while we modify the fd vars */ 1802 /* while we modify the fd vars */
1563 gotsig = 1; 1803 sig_pending = 1;
1564#if EV_ASYNC_ENABLE 1804#if EV_ASYNC_ENABLE
1565 gotasync = 1; 1805 async_pending = 1;
1566#endif 1806#endif
1567 1807
1568 ev_ref (EV_A); 1808 ev_ref (EV_A);
1569 ev_io_stop (EV_A_ &pipe_w); 1809 ev_io_stop (EV_A_ &pipe_w);
1570 1810
… …
1573 close (evfd); 1813 close (evfd);
1574#endif 1814#endif
1575 1815
1576 if (evpipe [0] >= 0) 1816 if (evpipe [0] >= 0)
1577 { 1817 {
1578 close (evpipe [0]); 1818 EV_WIN32_CLOSE_FD (evpipe [0]);
1579 close (evpipe [1]); 1819 EV_WIN32_CLOSE_FD (evpipe [1]);
1580 } 1820 }
1581 1821
1822#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1582 evpipe_init (EV_A); 1823 evpipe_init (EV_A);
1583 /* now iterate over everything, in case we missed something */ 1824 /* now iterate over everything, in case we missed something */
1584 pipecb (EV_A_ &pipe_w, EV_READ); 1825 pipecb (EV_A_ &pipe_w, EV_READ);
1826#endif
1585 } 1827 }
1586 1828
1587 postfork = 0; 1829 postfork = 0;
1588} 1830}
1589 1831
1590#if EV_MULTIPLICITY 1832#if EV_MULTIPLICITY
1591 1833
1592struct ev_loop * 1834struct ev_loop *
1593ev_loop_new (unsigned int flags) 1835ev_loop_new (unsigned int flags)
1594{ 1836{
1595 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1837 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1596 1838
1597 memset (loop, 0, sizeof (struct ev_loop)); 1839 memset (EV_A, 0, sizeof (struct ev_loop));
1598
1599 loop_init (EV_A_ flags); 1840 loop_init (EV_A_ flags);
1600 1841
1601 if (ev_backend (EV_A)) 1842 if (ev_backend (EV_A))
1602 return loop; 1843 return EV_A;
1603 1844
1604 return 0; 1845 return 0;
1605} 1846}
1606 1847
1607void 1848void
… …
1614void 1855void
1615ev_loop_fork (EV_P) 1856ev_loop_fork (EV_P)
1616{ 1857{
1617 postfork = 1; /* must be in line with ev_default_fork */ 1858 postfork = 1; /* must be in line with ev_default_fork */
1618} 1859}
1860#endif /* multiplicity */
1619 1861
1620#if EV_VERIFY 1862#if EV_VERIFY
1621static void noinline 1863static void noinline
1622verify_watcher (EV_P_ W w) 1864verify_watcher (EV_P_ W w)
1623{ 1865{
… …
1651 verify_watcher (EV_A_ ws [cnt]); 1893 verify_watcher (EV_A_ ws [cnt]);
1652 } 1894 }
1653} 1895}
1654#endif 1896#endif
1655 1897
1898#if EV_FEATURE_API
1656void 1899void
1657ev_loop_verify (EV_P) 1900ev_verify (EV_P)
1658{ 1901{
1659#if EV_VERIFY 1902#if EV_VERIFY
1660 int i; 1903 int i;
1661 WL w; 1904 WL w;
1662 1905
… …
1701#if EV_ASYNC_ENABLE 1944#if EV_ASYNC_ENABLE
1702 assert (asyncmax >= asynccnt); 1945 assert (asyncmax >= asynccnt);
1703 array_verify (EV_A_ (W *)asyncs, asynccnt); 1946 array_verify (EV_A_ (W *)asyncs, asynccnt);
1704#endif 1947#endif
1705 1948
1949#if EV_PREPARE_ENABLE
1706 assert (preparemax >= preparecnt); 1950 assert (preparemax >= preparecnt);
1707 array_verify (EV_A_ (W *)prepares, preparecnt); 1951 array_verify (EV_A_ (W *)prepares, preparecnt);
1952#endif
1708 1953
1954#if EV_CHECK_ENABLE
1709 assert (checkmax >= checkcnt); 1955 assert (checkmax >= checkcnt);
1710 array_verify (EV_A_ (W *)checks, checkcnt); 1956 array_verify (EV_A_ (W *)checks, checkcnt);
1957#endif
1711 1958
1712# if 0 1959# if 0
1960#if EV_CHILD_ENABLE
1713 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1961 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1714 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1962 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1963#endif
1715# endif 1964# endif
1716#endif 1965#endif
1717} 1966}
1718 1967#endif
1719#endif /* multiplicity */
1720 1968
1721#if EV_MULTIPLICITY 1969#if EV_MULTIPLICITY
1722struct ev_loop * 1970struct ev_loop *
1723ev_default_loop_init (unsigned int flags) 1971ev_default_loop_init (unsigned int flags)
1724#else 1972#else
… …
1727#endif 1975#endif
1728{ 1976{
1729 if (!ev_default_loop_ptr) 1977 if (!ev_default_loop_ptr)
1730 { 1978 {
1731#if EV_MULTIPLICITY 1979#if EV_MULTIPLICITY
1732 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1980 EV_P = ev_default_loop_ptr = &default_loop_struct;
1733#else 1981#else
1734 ev_default_loop_ptr = 1; 1982 ev_default_loop_ptr = 1;
1735#endif 1983#endif
1736 1984
1737 loop_init (EV_A_ flags); 1985 loop_init (EV_A_ flags);
1738 1986
1739 if (ev_backend (EV_A)) 1987 if (ev_backend (EV_A))
1740 { 1988 {
1741#ifndef _WIN32 1989#if EV_CHILD_ENABLE
1742 ev_signal_init (&childev, childcb, SIGCHLD); 1990 ev_signal_init (&childev, childcb, SIGCHLD);
1743 ev_set_priority (&childev, EV_MAXPRI); 1991 ev_set_priority (&childev, EV_MAXPRI);
1744 ev_signal_start (EV_A_ &childev); 1992 ev_signal_start (EV_A_ &childev);
1745 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1993 ev_unref (EV_A); /* child watcher should not keep loop alive */
1746#endif 1994#endif
… …
1754 2002
1755void 2003void
1756ev_default_destroy (void) 2004ev_default_destroy (void)
1757{ 2005{
1758#if EV_MULTIPLICITY 2006#if EV_MULTIPLICITY
1759 struct ev_loop *loop = ev_default_loop_ptr; 2007 EV_P = ev_default_loop_ptr;
1760#endif 2008#endif
1761 2009
1762 ev_default_loop_ptr = 0; 2010 ev_default_loop_ptr = 0;
1763 2011
1764#ifndef _WIN32 2012#if EV_CHILD_ENABLE
1765 ev_ref (EV_A); /* child watcher */ 2013 ev_ref (EV_A); /* child watcher */
1766 ev_signal_stop (EV_A_ &childev); 2014 ev_signal_stop (EV_A_ &childev);
1767#endif 2015#endif
1768 2016
1769 loop_destroy (EV_A); 2017 loop_destroy (EV_A);
… …
1771 2019
1772void 2020void
1773ev_default_fork (void) 2021ev_default_fork (void)
1774{ 2022{
1775#if EV_MULTIPLICITY 2023#if EV_MULTIPLICITY
1776 struct ev_loop *loop = ev_default_loop_ptr; 2024 EV_P = ev_default_loop_ptr;
1777#endif 2025#endif
1778 2026
1779 postfork = 1; /* must be in line with ev_loop_fork */ 2027 postfork = 1; /* must be in line with ev_loop_fork */
1780} 2028}
1781 2029
… …
1785ev_invoke (EV_P_ void *w, int revents) 2033ev_invoke (EV_P_ void *w, int revents)
1786{ 2034{
1787 EV_CB_INVOKE ((W)w, revents); 2035 EV_CB_INVOKE ((W)w, revents);
1788} 2036}
1789 2037
1790inline_speed void 2038unsigned int
1791call_pending (EV_P) 2039ev_pending_count (EV_P)
2040{
2041 int pri;
2042 unsigned int count = 0;
2043
2044 for (pri = NUMPRI; pri--; )
2045 count += pendingcnt [pri];
2046
2047 return count;
2048}
2049
2050void noinline
2051ev_invoke_pending (EV_P)
1792{ 2052{
1793 int pri; 2053 int pri;
1794 2054
1795 for (pri = NUMPRI; pri--; ) 2055 for (pri = NUMPRI; pri--; )
1796 while (pendingcnt [pri]) 2056 while (pendingcnt [pri])
… …
1863 EV_FREQUENT_CHECK; 2123 EV_FREQUENT_CHECK;
1864 feed_reverse (EV_A_ (W)w); 2124 feed_reverse (EV_A_ (W)w);
1865 } 2125 }
1866 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2126 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1867 2127
1868 feed_reverse_done (EV_A_ EV_TIMEOUT); 2128 feed_reverse_done (EV_A_ EV_TIMER);
1869 } 2129 }
1870} 2130}
1871 2131
1872#if EV_PERIODIC_ENABLE 2132#if EV_PERIODIC_ENABLE
1873/* make periodics pending */ 2133/* make periodics pending */
… …
1926 feed_reverse_done (EV_A_ EV_PERIODIC); 2186 feed_reverse_done (EV_A_ EV_PERIODIC);
1927 } 2187 }
1928} 2188}
1929 2189
1930/* simply recalculate all periodics */ 2190/* simply recalculate all periodics */
1931/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2191/* TODO: maybe ensure that at least one event happens when jumping forward? */
1932static void noinline 2192static void noinline
1933periodics_reschedule (EV_P) 2193periodics_reschedule (EV_P)
1934{ 2194{
1935 int i; 2195 int i;
1936 2196
… …
1964 ANHE_at_cache (*he); 2224 ANHE_at_cache (*he);
1965 } 2225 }
1966} 2226}
1967 2227
1968/* fetch new monotonic and realtime times from the kernel */ 2228/* fetch new monotonic and realtime times from the kernel */
1969/* also detetc if there was a timejump, and act accordingly */ 2229/* also detect if there was a timejump, and act accordingly */
1970inline_speed void 2230inline_speed void
1971time_update (EV_P_ ev_tstamp max_block) 2231time_update (EV_P_ ev_tstamp max_block)
1972{ 2232{
1973#if EV_USE_MONOTONIC 2233#if EV_USE_MONOTONIC
1974 if (expect_true (have_monotonic)) 2234 if (expect_true (have_monotonic))
… …
2032 mn_now = ev_rt_now; 2292 mn_now = ev_rt_now;
2033 } 2293 }
2034} 2294}
2035 2295
2036void 2296void
2037ev_loop (EV_P_ int flags) 2297ev_run (EV_P_ int flags)
2038{ 2298{
2299#if EV_FEATURE_API
2039 ++loop_depth; 2300 ++loop_depth;
2301#endif
2040 2302
2303 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2304
2041 loop_done = EVUNLOOP_CANCEL; 2305 loop_done = EVBREAK_CANCEL;
2042 2306
2043 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2307 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2044 2308
2045 do 2309 do
2046 { 2310 {
2047#if EV_VERIFY >= 2 2311#if EV_VERIFY >= 2
2048 ev_loop_verify (EV_A); 2312 ev_verify (EV_A);
2049#endif 2313#endif
2050 2314
2051#ifndef _WIN32 2315#ifndef _WIN32
2052 if (expect_false (curpid)) /* penalise the forking check even more */ 2316 if (expect_false (curpid)) /* penalise the forking check even more */
2053 if (expect_false (getpid () != curpid)) 2317 if (expect_false (getpid () != curpid))
… …
2061 /* we might have forked, so queue fork handlers */ 2325 /* we might have forked, so queue fork handlers */
2062 if (expect_false (postfork)) 2326 if (expect_false (postfork))
2063 if (forkcnt) 2327 if (forkcnt)
2064 { 2328 {
2065 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2329 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2066 call_pending (EV_A); 2330 EV_INVOKE_PENDING;
2067 } 2331 }
2068#endif 2332#endif
2069 2333
2334#if EV_PREPARE_ENABLE
2070 /* queue prepare watchers (and execute them) */ 2335 /* queue prepare watchers (and execute them) */
2071 if (expect_false (preparecnt)) 2336 if (expect_false (preparecnt))
2072 { 2337 {
2073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2338 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2074 call_pending (EV_A); 2339 EV_INVOKE_PENDING;
2075 } 2340 }
2341#endif
2342
2343 if (expect_false (loop_done))
2344 break;
2076 2345
2077 /* we might have forked, so reify kernel state if necessary */ 2346 /* we might have forked, so reify kernel state if necessary */
2078 if (expect_false (postfork)) 2347 if (expect_false (postfork))
2079 loop_fork (EV_A); 2348 loop_fork (EV_A);
2080 2349
… …
2084 /* calculate blocking time */ 2353 /* calculate blocking time */
2085 { 2354 {
2086 ev_tstamp waittime = 0.; 2355 ev_tstamp waittime = 0.;
2087 ev_tstamp sleeptime = 0.; 2356 ev_tstamp sleeptime = 0.;
2088 2357
2358 /* remember old timestamp for io_blocktime calculation */
2359 ev_tstamp prev_mn_now = mn_now;
2360
2361 /* update time to cancel out callback processing overhead */
2362 time_update (EV_A_ 1e100);
2363
2089 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2364 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2090 { 2365 {
2091 /* remember old timestamp for io_blocktime calculation */
2092 ev_tstamp prev_mn_now = mn_now;
2093
2094 /* update time to cancel out callback processing overhead */
2095 time_update (EV_A_ 1e100);
2096
2097 waittime = MAX_BLOCKTIME; 2366 waittime = MAX_BLOCKTIME;
2098 2367
2099 if (timercnt) 2368 if (timercnt)
2100 { 2369 {
2101 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2370 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2128 waittime -= sleeptime; 2397 waittime -= sleeptime;
2129 } 2398 }
2130 } 2399 }
2131 } 2400 }
2132 2401
2402#if EV_FEATURE_API
2133 ++loop_count; 2403 ++loop_count;
2404#endif
2405 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2134 backend_poll (EV_A_ waittime); 2406 backend_poll (EV_A_ waittime);
2407 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2135 2408
2136 /* update ev_rt_now, do magic */ 2409 /* update ev_rt_now, do magic */
2137 time_update (EV_A_ waittime + sleeptime); 2410 time_update (EV_A_ waittime + sleeptime);
2138 } 2411 }
2139 2412
… …
2146#if EV_IDLE_ENABLE 2419#if EV_IDLE_ENABLE
2147 /* queue idle watchers unless other events are pending */ 2420 /* queue idle watchers unless other events are pending */
2148 idle_reify (EV_A); 2421 idle_reify (EV_A);
2149#endif 2422#endif
2150 2423
2424#if EV_CHECK_ENABLE
2151 /* queue check watchers, to be executed first */ 2425 /* queue check watchers, to be executed first */
2152 if (expect_false (checkcnt)) 2426 if (expect_false (checkcnt))
2153 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2427 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2428#endif
2154 2429
2155 call_pending (EV_A); 2430 EV_INVOKE_PENDING;
2156 } 2431 }
2157 while (expect_true ( 2432 while (expect_true (
2158 activecnt 2433 activecnt
2159 && !loop_done 2434 && !loop_done
2160 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2435 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2161 )); 2436 ));
2162 2437
2163 if (loop_done == EVUNLOOP_ONE) 2438 if (loop_done == EVBREAK_ONE)
2164 loop_done = EVUNLOOP_CANCEL; 2439 loop_done = EVBREAK_CANCEL;
2165 2440
2441#if EV_FEATURE_API
2166 --loop_depth; 2442 --loop_depth;
2443#endif
2167} 2444}
2168 2445
2169void 2446void
2170ev_unloop (EV_P_ int how) 2447ev_break (EV_P_ int how)
2171{ 2448{
2172 loop_done = how; 2449 loop_done = how;
2173} 2450}
2174 2451
2175void 2452void
… …
2222inline_size void 2499inline_size void
2223wlist_del (WL *head, WL elem) 2500wlist_del (WL *head, WL elem)
2224{ 2501{
2225 while (*head) 2502 while (*head)
2226 { 2503 {
2227 if (*head == elem) 2504 if (expect_true (*head == elem))
2228 { 2505 {
2229 *head = elem->next; 2506 *head = elem->next;
2230 return; 2507 break;
2231 } 2508 }
2232 2509
2233 head = &(*head)->next; 2510 head = &(*head)->next;
2234 } 2511 }
2235} 2512}
… …
2295 2572
2296 if (expect_false (ev_is_active (w))) 2573 if (expect_false (ev_is_active (w)))
2297 return; 2574 return;
2298 2575
2299 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2576 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2300 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2577 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2301 2578
2302 EV_FREQUENT_CHECK; 2579 EV_FREQUENT_CHECK;
2303 2580
2304 ev_start (EV_A_ (W)w, 1); 2581 ev_start (EV_A_ (W)w, 1);
2305 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2582 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2306 wlist_add (&anfds[fd].head, (WL)w); 2583 wlist_add (&anfds[fd].head, (WL)w);
2307 2584
2308 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2585 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2309 w->events &= ~EV__IOFDSET; 2586 w->events &= ~EV__IOFDSET;
2310 2587
2311 EV_FREQUENT_CHECK; 2588 EV_FREQUENT_CHECK;
2312} 2589}
2313 2590
… …
2323 EV_FREQUENT_CHECK; 2600 EV_FREQUENT_CHECK;
2324 2601
2325 wlist_del (&anfds[w->fd].head, (WL)w); 2602 wlist_del (&anfds[w->fd].head, (WL)w);
2326 ev_stop (EV_A_ (W)w); 2603 ev_stop (EV_A_ (W)w);
2327 2604
2328 fd_change (EV_A_ w->fd, 1); 2605 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2329 2606
2330 EV_FREQUENT_CHECK; 2607 EV_FREQUENT_CHECK;
2331} 2608}
2332 2609
2333void noinline 2610void noinline
… …
2375 timers [active] = timers [timercnt + HEAP0]; 2652 timers [active] = timers [timercnt + HEAP0];
2376 adjustheap (timers, timercnt, active); 2653 adjustheap (timers, timercnt, active);
2377 } 2654 }
2378 } 2655 }
2379 2656
2380 EV_FREQUENT_CHECK;
2381
2382 ev_at (w) -= mn_now; 2657 ev_at (w) -= mn_now;
2383 2658
2384 ev_stop (EV_A_ (W)w); 2659 ev_stop (EV_A_ (W)w);
2660
2661 EV_FREQUENT_CHECK;
2385} 2662}
2386 2663
2387void noinline 2664void noinline
2388ev_timer_again (EV_P_ ev_timer *w) 2665ev_timer_again (EV_P_ ev_timer *w)
2389{ 2666{
… …
2407 } 2684 }
2408 2685
2409 EV_FREQUENT_CHECK; 2686 EV_FREQUENT_CHECK;
2410} 2687}
2411 2688
2689ev_tstamp
2690ev_timer_remaining (EV_P_ ev_timer *w)
2691{
2692 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2693}
2694
2412#if EV_PERIODIC_ENABLE 2695#if EV_PERIODIC_ENABLE
2413void noinline 2696void noinline
2414ev_periodic_start (EV_P_ ev_periodic *w) 2697ev_periodic_start (EV_P_ ev_periodic *w)
2415{ 2698{
2416 if (expect_false (ev_is_active (w))) 2699 if (expect_false (ev_is_active (w)))
… …
2462 periodics [active] = periodics [periodiccnt + HEAP0]; 2745 periodics [active] = periodics [periodiccnt + HEAP0];
2463 adjustheap (periodics, periodiccnt, active); 2746 adjustheap (periodics, periodiccnt, active);
2464 } 2747 }
2465 } 2748 }
2466 2749
2467 EV_FREQUENT_CHECK;
2468
2469 ev_stop (EV_A_ (W)w); 2750 ev_stop (EV_A_ (W)w);
2751
2752 EV_FREQUENT_CHECK;
2470} 2753}
2471 2754
2472void noinline 2755void noinline
2473ev_periodic_again (EV_P_ ev_periodic *w) 2756ev_periodic_again (EV_P_ ev_periodic *w)
2474{ 2757{
… …
2480 2763
2481#ifndef SA_RESTART 2764#ifndef SA_RESTART
2482# define SA_RESTART 0 2765# define SA_RESTART 0
2483#endif 2766#endif
2484 2767
2768#if EV_SIGNAL_ENABLE
2769
2485void noinline 2770void noinline
2486ev_signal_start (EV_P_ ev_signal *w) 2771ev_signal_start (EV_P_ ev_signal *w)
2487{ 2772{
2488#if EV_MULTIPLICITY
2489 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2490#endif
2491 if (expect_false (ev_is_active (w))) 2773 if (expect_false (ev_is_active (w)))
2492 return; 2774 return;
2493 2775
2494 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2776 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2495 2777
2496 evpipe_init (EV_A); 2778#if EV_MULTIPLICITY
2779 assert (("libev: a signal must not be attached to two different loops",
2780 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2497 2781
2498 EV_FREQUENT_CHECK; 2782 signals [w->signum - 1].loop = EV_A;
2783#endif
2499 2784
2785 EV_FREQUENT_CHECK;
2786
2787#if EV_USE_SIGNALFD
2788 if (sigfd == -2)
2500 { 2789 {
2501#ifndef _WIN32 2790 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2502 sigset_t full, prev; 2791 if (sigfd < 0 && errno == EINVAL)
2503 sigfillset (&full); 2792 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2504 sigprocmask (SIG_SETMASK, &full, &prev);
2505#endif
2506 2793
2507 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2794 if (sigfd >= 0)
2795 {
2796 fd_intern (sigfd); /* doing it twice will not hurt */
2508 2797
2509#ifndef _WIN32 2798 sigemptyset (&sigfd_set);
2510 sigprocmask (SIG_SETMASK, &prev, 0); 2799
2511#endif 2800 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2801 ev_set_priority (&sigfd_w, EV_MAXPRI);
2802 ev_io_start (EV_A_ &sigfd_w);
2803 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2804 }
2512 } 2805 }
2806
2807 if (sigfd >= 0)
2808 {
2809 /* TODO: check .head */
2810 sigaddset (&sigfd_set, w->signum);
2811 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2812
2813 signalfd (sigfd, &sigfd_set, 0);
2814 }
2815#endif
2513 2816
2514 ev_start (EV_A_ (W)w, 1); 2817 ev_start (EV_A_ (W)w, 1);
2515 wlist_add (&signals [w->signum - 1].head, (WL)w); 2818 wlist_add (&signals [w->signum - 1].head, (WL)w);
2516 2819
2517 if (!((WL)w)->next) 2820 if (!((WL)w)->next)
2821# if EV_USE_SIGNALFD
2822 if (sigfd < 0) /*TODO*/
2823# endif
2518 { 2824 {
2519#if _WIN32 2825# ifdef _WIN32
2826 evpipe_init (EV_A);
2827
2520 signal (w->signum, ev_sighandler); 2828 signal (w->signum, ev_sighandler);
2521#else 2829# else
2522 struct sigaction sa; 2830 struct sigaction sa;
2831
2832 evpipe_init (EV_A);
2833
2523 sa.sa_handler = ev_sighandler; 2834 sa.sa_handler = ev_sighandler;
2524 sigfillset (&sa.sa_mask); 2835 sigfillset (&sa.sa_mask);
2525 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2836 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2526 sigaction (w->signum, &sa, 0); 2837 sigaction (w->signum, &sa, 0);
2838
2839 sigemptyset (&sa.sa_mask);
2840 sigaddset (&sa.sa_mask, w->signum);
2841 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2527#endif 2842#endif
2528 } 2843 }
2529 2844
2530 EV_FREQUENT_CHECK; 2845 EV_FREQUENT_CHECK;
2531} 2846}
2532 2847
2533void noinline 2848void noinline
… …
2541 2856
2542 wlist_del (&signals [w->signum - 1].head, (WL)w); 2857 wlist_del (&signals [w->signum - 1].head, (WL)w);
2543 ev_stop (EV_A_ (W)w); 2858 ev_stop (EV_A_ (W)w);
2544 2859
2545 if (!signals [w->signum - 1].head) 2860 if (!signals [w->signum - 1].head)
2861 {
2862#if EV_MULTIPLICITY
2863 signals [w->signum - 1].loop = 0; /* unattach from signal */
2864#endif
2865#if EV_USE_SIGNALFD
2866 if (sigfd >= 0)
2867 {
2868 sigset_t ss;
2869
2870 sigemptyset (&ss);
2871 sigaddset (&ss, w->signum);
2872 sigdelset (&sigfd_set, w->signum);
2873
2874 signalfd (sigfd, &sigfd_set, 0);
2875 sigprocmask (SIG_UNBLOCK, &ss, 0);
2876 }
2877 else
2878#endif
2546 signal (w->signum, SIG_DFL); 2879 signal (w->signum, SIG_DFL);
2880 }
2547 2881
2548 EV_FREQUENT_CHECK; 2882 EV_FREQUENT_CHECK;
2549} 2883}
2884
2885#endif
2886
2887#if EV_CHILD_ENABLE
2550 2888
2551void 2889void
2552ev_child_start (EV_P_ ev_child *w) 2890ev_child_start (EV_P_ ev_child *w)
2553{ 2891{
2554#if EV_MULTIPLICITY 2892#if EV_MULTIPLICITY
… …
2558 return; 2896 return;
2559 2897
2560 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2561 2899
2562 ev_start (EV_A_ (W)w, 1); 2900 ev_start (EV_A_ (W)w, 1);
2563 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2901 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2564 2902
2565 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2566} 2904}
2567 2905
2568void 2906void
… …
2572 if (expect_false (!ev_is_active (w))) 2910 if (expect_false (!ev_is_active (w)))
2573 return; 2911 return;
2574 2912
2575 EV_FREQUENT_CHECK; 2913 EV_FREQUENT_CHECK;
2576 2914
2577 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2915 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2578 ev_stop (EV_A_ (W)w); 2916 ev_stop (EV_A_ (W)w);
2579 2917
2580 EV_FREQUENT_CHECK; 2918 EV_FREQUENT_CHECK;
2581} 2919}
2920
2921#endif
2582 2922
2583#if EV_STAT_ENABLE 2923#if EV_STAT_ENABLE
2584 2924
2585# ifdef _WIN32 2925# ifdef _WIN32
2586# undef lstat 2926# undef lstat
… …
2592#define MIN_STAT_INTERVAL 0.1074891 2932#define MIN_STAT_INTERVAL 0.1074891
2593 2933
2594static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2934static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2595 2935
2596#if EV_USE_INOTIFY 2936#if EV_USE_INOTIFY
2597# define EV_INOTIFY_BUFSIZE 8192 2937
2938/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2939# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2598 2940
2599static void noinline 2941static void noinline
2600infy_add (EV_P_ ev_stat *w) 2942infy_add (EV_P_ ev_stat *w)
2601{ 2943{
2602 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); 2944 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);
2603 2945
2604 if (w->wd < 0) 2946 if (w->wd >= 0)
2947 {
2948 struct statfs sfs;
2949
2950 /* now local changes will be tracked by inotify, but remote changes won't */
2951 /* unless the filesystem is known to be local, we therefore still poll */
2952 /* also do poll on <2.6.25, but with normal frequency */
2953
2954 if (!fs_2625)
2955 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2956 else if (!statfs (w->path, &sfs)
2957 && (sfs.f_type == 0x1373 /* devfs */
2958 || sfs.f_type == 0xEF53 /* ext2/3 */
2959 || sfs.f_type == 0x3153464a /* jfs */
2960 || sfs.f_type == 0x52654973 /* reiser3 */
2961 || sfs.f_type == 0x01021994 /* tempfs */
2962 || sfs.f_type == 0x58465342 /* xfs */))
2963 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2964 else
2965 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2605 { 2966 }
2967 else
2968 {
2969 /* can't use inotify, continue to stat */
2606 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2970 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2607 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2608 2971
2609 /* monitor some parent directory for speedup hints */ 2972 /* if path is not there, monitor some parent directory for speedup hints */
2610 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2973 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2611 /* but an efficiency issue only */ 2974 /* but an efficiency issue only */
2612 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2975 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2613 { 2976 {
2614 char path [4096]; 2977 char path [4096];
… …
2630 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2993 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2631 } 2994 }
2632 } 2995 }
2633 2996
2634 if (w->wd >= 0) 2997 if (w->wd >= 0)
2635 {
2636 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2998 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2637 2999
2638 /* now local changes will be tracked by inotify, but remote changes won't */ 3000 /* now re-arm timer, if required */
2639 /* unless the filesystem it known to be local, we therefore still poll */ 3001 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2640 /* also do poll on <2.6.25, but with normal frequency */
2641 struct statfs sfs;
2642
2643 if (fs_2625 && !statfs (w->path, &sfs))
2644 if (sfs.f_type == 0x1373 /* devfs */
2645 || sfs.f_type == 0xEF53 /* ext2/3 */
2646 || sfs.f_type == 0x3153464a /* jfs */
2647 || sfs.f_type == 0x52654973 /* reiser3 */
2648 || sfs.f_type == 0x01021994 /* tempfs */
2649 || sfs.f_type == 0x58465342 /* xfs */)
2650 return;
2651
2652 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2653 ev_timer_again (EV_A_ &w->timer); 3002 ev_timer_again (EV_A_ &w->timer);
2654 } 3003 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2655} 3004}
2656 3005
2657static void noinline 3006static void noinline
2658infy_del (EV_P_ ev_stat *w) 3007infy_del (EV_P_ ev_stat *w)
2659{ 3008{
… …
2662 3011
2663 if (wd < 0) 3012 if (wd < 0)
2664 return; 3013 return;
2665 3014
2666 w->wd = -2; 3015 w->wd = -2;
2667 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3016 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2668 wlist_del (&fs_hash [slot].head, (WL)w); 3017 wlist_del (&fs_hash [slot].head, (WL)w);
2669 3018
2670 /* remove this watcher, if others are watching it, they will rearm */ 3019 /* remove this watcher, if others are watching it, they will rearm */
2671 inotify_rm_watch (fs_fd, wd); 3020 inotify_rm_watch (fs_fd, wd);
2672} 3021}
… …
2674static void noinline 3023static void noinline
2675infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3024infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2676{ 3025{
2677 if (slot < 0) 3026 if (slot < 0)
2678 /* overflow, need to check for all hash slots */ 3027 /* overflow, need to check for all hash slots */
2679 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3028 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2680 infy_wd (EV_A_ slot, wd, ev); 3029 infy_wd (EV_A_ slot, wd, ev);
2681 else 3030 else
2682 { 3031 {
2683 WL w_; 3032 WL w_;
2684 3033
2685 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3034 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2686 { 3035 {
2687 ev_stat *w = (ev_stat *)w_; 3036 ev_stat *w = (ev_stat *)w_;
2688 w_ = w_->next; /* lets us remove this watcher and all before it */ 3037 w_ = w_->next; /* lets us remove this watcher and all before it */
2689 3038
2690 if (w->wd == wd || wd == -1) 3039 if (w->wd == wd || wd == -1)
2691 { 3040 {
2692 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3041 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2693 { 3042 {
2694 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3043 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2695 w->wd = -1; 3044 w->wd = -1;
2696 infy_add (EV_A_ w); /* re-add, no matter what */ 3045 infy_add (EV_A_ w); /* re-add, no matter what */
2697 } 3046 }
2698 3047
2699 stat_timer_cb (EV_A_ &w->timer, 0); 3048 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2704 3053
2705static void 3054static void
2706infy_cb (EV_P_ ev_io *w, int revents) 3055infy_cb (EV_P_ ev_io *w, int revents)
2707{ 3056{
2708 char buf [EV_INOTIFY_BUFSIZE]; 3057 char buf [EV_INOTIFY_BUFSIZE];
2709 struct inotify_event *ev = (struct inotify_event *)buf;
2710 int ofs; 3058 int ofs;
2711 int len = read (fs_fd, buf, sizeof (buf)); 3059 int len = read (fs_fd, buf, sizeof (buf));
2712 3060
2713 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3061 for (ofs = 0; ofs < len; )
3062 {
3063 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2714 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3064 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3065 ofs += sizeof (struct inotify_event) + ev->len;
3066 }
3067}
3068
3069inline_size unsigned int
3070ev_linux_version (void)
3071{
3072 struct utsname buf;
3073 unsigned int v;
3074 int i;
3075 char *p = buf.release;
3076
3077 if (uname (&buf))
3078 return 0;
3079
3080 for (i = 3+1; --i; )
3081 {
3082 unsigned int c = 0;
3083
3084 for (;;)
3085 {
3086 if (*p >= '0' && *p <= '9')
3087 c = c * 10 + *p++ - '0';
3088 else
3089 {
3090 p += *p == '.';
3091 break;
3092 }
3093 }
3094
3095 v = (v << 8) | c;
3096 }
3097
3098 return v;
2715} 3099}
2716 3100
2717inline_size void 3101inline_size void
2718check_2625 (EV_P) 3102ev_check_2625 (EV_P)
2719{ 3103{
2720 /* kernels < 2.6.25 are borked 3104 /* kernels < 2.6.25 are borked
2721 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3105 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2722 */ 3106 */
2723 struct utsname buf; 3107 if (ev_linux_version () < 0x020619)
2724 int major, minor, micro;
2725
2726 if (uname (&buf))
2727 return; 3108 return;
2728 3109
2729 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2730 return;
2731
2732 if (major < 2
2733 || (major == 2 && minor < 6)
2734 || (major == 2 && minor == 6 && micro < 25))
2735 return;
2736
2737 fs_2625 = 1; 3110 fs_2625 = 1;
3111}
3112
3113inline_size int
3114infy_newfd (void)
3115{
3116#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3117 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3118 if (fd >= 0)
3119 return fd;
3120#endif
3121 return inotify_init ();
2738} 3122}
2739 3123
2740inline_size void 3124inline_size void
2741infy_init (EV_P) 3125infy_init (EV_P)
2742{ 3126{
2743 if (fs_fd != -2) 3127 if (fs_fd != -2)
2744 return; 3128 return;
2745 3129
2746 fs_fd = -1; 3130 fs_fd = -1;
2747 3131
2748 check_2625 (EV_A); 3132 ev_check_2625 (EV_A);
2749 3133
2750 fs_fd = inotify_init (); 3134 fs_fd = infy_newfd ();
2751 3135
2752 if (fs_fd >= 0) 3136 if (fs_fd >= 0)
2753 { 3137 {
3138 fd_intern (fs_fd);
2754 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3139 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2755 ev_set_priority (&fs_w, EV_MAXPRI); 3140 ev_set_priority (&fs_w, EV_MAXPRI);
2756 ev_io_start (EV_A_ &fs_w); 3141 ev_io_start (EV_A_ &fs_w);
3142 ev_unref (EV_A);
2757 } 3143 }
2758} 3144}
2759 3145
2760inline_size void 3146inline_size void
2761infy_fork (EV_P) 3147infy_fork (EV_P)
… …
2763 int slot; 3149 int slot;
2764 3150
2765 if (fs_fd < 0) 3151 if (fs_fd < 0)
2766 return; 3152 return;
2767 3153
3154 ev_ref (EV_A);
3155 ev_io_stop (EV_A_ &fs_w);
2768 close (fs_fd); 3156 close (fs_fd);
2769 fs_fd = inotify_init (); 3157 fs_fd = infy_newfd ();
2770 3158
3159 if (fs_fd >= 0)
3160 {
3161 fd_intern (fs_fd);
3162 ev_io_set (&fs_w, fs_fd, EV_READ);
3163 ev_io_start (EV_A_ &fs_w);
3164 ev_unref (EV_A);
3165 }
3166
2771 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3167 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2772 { 3168 {
2773 WL w_ = fs_hash [slot].head; 3169 WL w_ = fs_hash [slot].head;
2774 fs_hash [slot].head = 0; 3170 fs_hash [slot].head = 0;
2775 3171
2776 while (w_) 3172 while (w_)
… …
2781 w->wd = -1; 3177 w->wd = -1;
2782 3178
2783 if (fs_fd >= 0) 3179 if (fs_fd >= 0)
2784 infy_add (EV_A_ w); /* re-add, no matter what */ 3180 infy_add (EV_A_ w); /* re-add, no matter what */
2785 else 3181 else
3182 {
3183 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3184 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2786 ev_timer_again (EV_A_ &w->timer); 3185 ev_timer_again (EV_A_ &w->timer);
3186 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3187 }
2787 } 3188 }
2788 } 3189 }
2789} 3190}
2790 3191
2791#endif 3192#endif
… …
2808static void noinline 3209static void noinline
2809stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3210stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2810{ 3211{
2811 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3212 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2812 3213
2813 /* we copy this here each the time so that */ 3214 ev_statdata prev = w->attr;
2814 /* prev has the old value when the callback gets invoked */
2815 w->prev = w->attr;
2816 ev_stat_stat (EV_A_ w); 3215 ev_stat_stat (EV_A_ w);
2817 3216
2818 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3217 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2819 if ( 3218 if (
2820 w->prev.st_dev != w->attr.st_dev 3219 prev.st_dev != w->attr.st_dev
2821 || w->prev.st_ino != w->attr.st_ino 3220 || prev.st_ino != w->attr.st_ino
2822 || w->prev.st_mode != w->attr.st_mode 3221 || prev.st_mode != w->attr.st_mode
2823 || w->prev.st_nlink != w->attr.st_nlink 3222 || prev.st_nlink != w->attr.st_nlink
2824 || w->prev.st_uid != w->attr.st_uid 3223 || prev.st_uid != w->attr.st_uid
2825 || w->prev.st_gid != w->attr.st_gid 3224 || prev.st_gid != w->attr.st_gid
2826 || w->prev.st_rdev != w->attr.st_rdev 3225 || prev.st_rdev != w->attr.st_rdev
2827 || w->prev.st_size != w->attr.st_size 3226 || prev.st_size != w->attr.st_size
2828 || w->prev.st_atime != w->attr.st_atime 3227 || prev.st_atime != w->attr.st_atime
2829 || w->prev.st_mtime != w->attr.st_mtime 3228 || prev.st_mtime != w->attr.st_mtime
2830 || w->prev.st_ctime != w->attr.st_ctime 3229 || prev.st_ctime != w->attr.st_ctime
2831 ) { 3230 ) {
3231 /* we only update w->prev on actual differences */
3232 /* in case we test more often than invoke the callback, */
3233 /* to ensure that prev is always different to attr */
3234 w->prev = prev;
3235
2832 #if EV_USE_INOTIFY 3236 #if EV_USE_INOTIFY
2833 if (fs_fd >= 0) 3237 if (fs_fd >= 0)
2834 { 3238 {
2835 infy_del (EV_A_ w); 3239 infy_del (EV_A_ w);
2836 infy_add (EV_A_ w); 3240 infy_add (EV_A_ w);
… …
2861 3265
2862 if (fs_fd >= 0) 3266 if (fs_fd >= 0)
2863 infy_add (EV_A_ w); 3267 infy_add (EV_A_ w);
2864 else 3268 else
2865#endif 3269#endif
3270 {
2866 ev_timer_again (EV_A_ &w->timer); 3271 ev_timer_again (EV_A_ &w->timer);
3272 ev_unref (EV_A);
3273 }
2867 3274
2868 ev_start (EV_A_ (W)w, 1); 3275 ev_start (EV_A_ (W)w, 1);
2869 3276
2870 EV_FREQUENT_CHECK; 3277 EV_FREQUENT_CHECK;
2871} 3278}
… …
2880 EV_FREQUENT_CHECK; 3287 EV_FREQUENT_CHECK;
2881 3288
2882#if EV_USE_INOTIFY 3289#if EV_USE_INOTIFY
2883 infy_del (EV_A_ w); 3290 infy_del (EV_A_ w);
2884#endif 3291#endif
3292
3293 if (ev_is_active (&w->timer))
3294 {
3295 ev_ref (EV_A);
2885 ev_timer_stop (EV_A_ &w->timer); 3296 ev_timer_stop (EV_A_ &w->timer);
3297 }
2886 3298
2887 ev_stop (EV_A_ (W)w); 3299 ev_stop (EV_A_ (W)w);
2888 3300
2889 EV_FREQUENT_CHECK; 3301 EV_FREQUENT_CHECK;
2890} 3302}
… …
2935 3347
2936 EV_FREQUENT_CHECK; 3348 EV_FREQUENT_CHECK;
2937} 3349}
2938#endif 3350#endif
2939 3351
3352#if EV_PREPARE_ENABLE
2940void 3353void
2941ev_prepare_start (EV_P_ ev_prepare *w) 3354ev_prepare_start (EV_P_ ev_prepare *w)
2942{ 3355{
2943 if (expect_false (ev_is_active (w))) 3356 if (expect_false (ev_is_active (w)))
2944 return; 3357 return;
… …
2970 3383
2971 ev_stop (EV_A_ (W)w); 3384 ev_stop (EV_A_ (W)w);
2972 3385
2973 EV_FREQUENT_CHECK; 3386 EV_FREQUENT_CHECK;
2974} 3387}
3388#endif
2975 3389
3390#if EV_CHECK_ENABLE
2976void 3391void
2977ev_check_start (EV_P_ ev_check *w) 3392ev_check_start (EV_P_ ev_check *w)
2978{ 3393{
2979 if (expect_false (ev_is_active (w))) 3394 if (expect_false (ev_is_active (w)))
2980 return; 3395 return;
… …
3006 3421
3007 ev_stop (EV_A_ (W)w); 3422 ev_stop (EV_A_ (W)w);
3008 3423
3009 EV_FREQUENT_CHECK; 3424 EV_FREQUENT_CHECK;
3010} 3425}
3426#endif
3011 3427
3012#if EV_EMBED_ENABLE 3428#if EV_EMBED_ENABLE
3013void noinline 3429void noinline
3014ev_embed_sweep (EV_P_ ev_embed *w) 3430ev_embed_sweep (EV_P_ ev_embed *w)
3015{ 3431{
3016 ev_loop (w->other, EVLOOP_NONBLOCK); 3432 ev_run (w->other, EVRUN_NOWAIT);
3017} 3433}
3018 3434
3019static void 3435static void
3020embed_io_cb (EV_P_ ev_io *io, int revents) 3436embed_io_cb (EV_P_ ev_io *io, int revents)
3021{ 3437{
3022 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3438 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3023 3439
3024 if (ev_cb (w)) 3440 if (ev_cb (w))
3025 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3441 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3026 else 3442 else
3027 ev_loop (w->other, EVLOOP_NONBLOCK); 3443 ev_run (w->other, EVRUN_NOWAIT);
3028} 3444}
3029 3445
3030static void 3446static void
3031embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3447embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3032{ 3448{
3033 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3449 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3034 3450
3035 { 3451 {
3036 struct ev_loop *loop = w->other; 3452 EV_P = w->other;
3037 3453
3038 while (fdchangecnt) 3454 while (fdchangecnt)
3039 { 3455 {
3040 fd_reify (EV_A); 3456 fd_reify (EV_A);
3041 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3457 ev_run (EV_A_ EVRUN_NOWAIT);
3042 } 3458 }
3043 } 3459 }
3044} 3460}
3045 3461
3046static void 3462static void
… …
3049 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3465 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3050 3466
3051 ev_embed_stop (EV_A_ w); 3467 ev_embed_stop (EV_A_ w);
3052 3468
3053 { 3469 {
3054 struct ev_loop *loop = w->other; 3470 EV_P = w->other;
3055 3471
3056 ev_loop_fork (EV_A); 3472 ev_loop_fork (EV_A);
3057 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3473 ev_run (EV_A_ EVRUN_NOWAIT);
3058 } 3474 }
3059 3475
3060 ev_embed_start (EV_A_ w); 3476 ev_embed_start (EV_A_ w);
3061} 3477}
3062 3478
… …
3073{ 3489{
3074 if (expect_false (ev_is_active (w))) 3490 if (expect_false (ev_is_active (w)))
3075 return; 3491 return;
3076 3492
3077 { 3493 {
3078 struct ev_loop *loop = w->other; 3494 EV_P = w->other;
3079 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3495 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3080 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3496 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3081 } 3497 }
3082 3498
3083 EV_FREQUENT_CHECK; 3499 EV_FREQUENT_CHECK;
… …
3110 3526
3111 ev_io_stop (EV_A_ &w->io); 3527 ev_io_stop (EV_A_ &w->io);
3112 ev_prepare_stop (EV_A_ &w->prepare); 3528 ev_prepare_stop (EV_A_ &w->prepare);
3113 ev_fork_stop (EV_A_ &w->fork); 3529 ev_fork_stop (EV_A_ &w->fork);
3114 3530
3531 ev_stop (EV_A_ (W)w);
3532
3115 EV_FREQUENT_CHECK; 3533 EV_FREQUENT_CHECK;
3116} 3534}
3117#endif 3535#endif
3118 3536
3119#if EV_FORK_ENABLE 3537#if EV_FORK_ENABLE
… …
3159ev_async_start (EV_P_ ev_async *w) 3577ev_async_start (EV_P_ ev_async *w)
3160{ 3578{
3161 if (expect_false (ev_is_active (w))) 3579 if (expect_false (ev_is_active (w)))
3162 return; 3580 return;
3163 3581
3582 w->sent = 0;
3583
3164 evpipe_init (EV_A); 3584 evpipe_init (EV_A);
3165 3585
3166 EV_FREQUENT_CHECK; 3586 EV_FREQUENT_CHECK;
3167 3587
3168 ev_start (EV_A_ (W)w, ++asynccnt); 3588 ev_start (EV_A_ (W)w, ++asynccnt);
… …
3195 3615
3196void 3616void
3197ev_async_send (EV_P_ ev_async *w) 3617ev_async_send (EV_P_ ev_async *w)
3198{ 3618{
3199 w->sent = 1; 3619 w->sent = 1;
3200 evpipe_write (EV_A_ &gotasync); 3620 evpipe_write (EV_A_ &async_pending);
3201} 3621}
3202#endif 3622#endif
3203 3623
3204/*****************************************************************************/ 3624/*****************************************************************************/
3205 3625
… …
3245{ 3665{
3246 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3666 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3247 3667
3248 if (expect_false (!once)) 3668 if (expect_false (!once))
3249 { 3669 {
3250 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3670 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3251 return; 3671 return;
3252 } 3672 }
3253 3673
3254 once->cb = cb; 3674 once->cb = cb;
3255 once->arg = arg; 3675 once->arg = arg;
… …
3342 if (types & EV_ASYNC) 3762 if (types & EV_ASYNC)
3343 for (i = asynccnt; i--; ) 3763 for (i = asynccnt; i--; )
3344 cb (EV_A_ EV_ASYNC, asyncs [i]); 3764 cb (EV_A_ EV_ASYNC, asyncs [i]);
3345#endif 3765#endif
3346 3766
3767#if EV_PREPARE_ENABLE
3347 if (types & EV_PREPARE) 3768 if (types & EV_PREPARE)
3348 for (i = preparecnt; i--; ) 3769 for (i = preparecnt; i--; )
3349#if EV_EMBED_ENABLE 3770# if EV_EMBED_ENABLE
3350 if (ev_cb (prepares [i]) != embed_prepare_cb) 3771 if (ev_cb (prepares [i]) != embed_prepare_cb)
3351#endif 3772# endif
3352 cb (EV_A_ EV_PREPARE, prepares [i]); 3773 cb (EV_A_ EV_PREPARE, prepares [i]);
3774#endif
3353 3775
3776#if EV_CHECK_ENABLE
3354 if (types & EV_CHECK) 3777 if (types & EV_CHECK)
3355 for (i = checkcnt; i--; ) 3778 for (i = checkcnt; i--; )
3356 cb (EV_A_ EV_CHECK, checks [i]); 3779 cb (EV_A_ EV_CHECK, checks [i]);
3780#endif
3357 3781
3782#if EV_SIGNAL_ENABLE
3358 if (types & EV_SIGNAL) 3783 if (types & EV_SIGNAL)
3359 for (i = 0; i < signalmax; ++i) 3784 for (i = 0; i < EV_NSIG - 1; ++i)
3360 for (wl = signals [i].head; wl; ) 3785 for (wl = signals [i].head; wl; )
3361 { 3786 {
3362 wn = wl->next; 3787 wn = wl->next;
3363 cb (EV_A_ EV_SIGNAL, wl); 3788 cb (EV_A_ EV_SIGNAL, wl);
3364 wl = wn; 3789 wl = wn;
3365 } 3790 }
3791#endif
3366 3792
3793#if EV_CHILD_ENABLE
3367 if (types & EV_CHILD) 3794 if (types & EV_CHILD)
3368 for (i = EV_PID_HASHSIZE; i--; ) 3795 for (i = (EV_PID_HASHSIZE); i--; )
3369 for (wl = childs [i]; wl; ) 3796 for (wl = childs [i]; wl; )
3370 { 3797 {
3371 wn = wl->next; 3798 wn = wl->next;
3372 cb (EV_A_ EV_CHILD, wl); 3799 cb (EV_A_ EV_CHILD, wl);
3373 wl = wn; 3800 wl = wn;
3374 } 3801 }
3802#endif
3375/* EV_STAT 0x00001000 /* stat data changed */ 3803/* EV_STAT 0x00001000 /* stat data changed */
3376/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3804/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3377} 3805}
3378#endif 3806#endif
3379 3807

Diff Legend

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