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

Diff Legend

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