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

Comparing libev/ev.c (file contents):
Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC vs.
Revision 1.345 by sf-exg, Sat Jul 31 22:33:26 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
494#endif
495
496#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
497
498#if EV_MINPRI == EV_MAXPRI
499# define ABSPRI(w) (((W)w), 0)
392#else 500#else
393# define inline_speed static inline
394#endif
395
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 501# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
502#endif
398 503
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 504#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 505#define EMPTY2(a,b) /* used to suppress some warnings */
401 506
402typedef ev_watcher *W; 507typedef ev_watcher *W;
… …
406#define ev_active(w) ((W)(w))->active 511#define ev_active(w) ((W)(w))->active
407#define ev_at(w) ((WT)(w))->at 512#define ev_at(w) ((WT)(w))->at
408 513
409#if EV_USE_REALTIME 514#if EV_USE_REALTIME
410/* 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 */
411/* giving it a reasonably high chance of working on typical architetcures */ 516/* giving it a reasonably high chance of working on typical architectures */
412static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 517static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
413#endif 518#endif
414 519
415#if EV_USE_MONOTONIC 520#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 521static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 522#endif
418 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
419#ifdef _WIN32 534#ifdef _WIN32
420# include "ev_win32.c" 535# include "ev_win32.c"
421#endif 536#endif
422 537
423/*****************************************************************************/ 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
424 547
425static void (*syserr_cb)(const char *msg); 548static void (*syserr_cb)(const char *msg);
426 549
427void 550void
428ev_set_syserr_cb (void (*cb)(const char *msg)) 551ev_set_syserr_cb (void (*cb)(const char *msg))
… …
438 561
439 if (syserr_cb) 562 if (syserr_cb)
440 syserr_cb (msg); 563 syserr_cb (msg);
441 else 564 else
442 { 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
443 perror (msg); 574 perror (msg);
575#endif
444 abort (); 576 abort ();
445 } 577 }
446} 578}
447 579
448static void * 580static void *
449ev_realloc_emul (void *ptr, long size) 581ev_realloc_emul (void *ptr, long size)
450{ 582{
583#if __GLIBC__
584 return realloc (ptr, size);
585#else
451 /* some systems, notably openbsd and darwin, fail to properly 586 /* some systems, notably openbsd and darwin, fail to properly
452 * 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
453 * the single unix specification, so work around them here. 588 * the single unix specification, so work around them here.
454 */ 589 */
455 590
456 if (size) 591 if (size)
457 return realloc (ptr, size); 592 return realloc (ptr, size);
458 593
459 free (ptr); 594 free (ptr);
460 return 0; 595 return 0;
596#endif
461} 597}
462 598
463static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 599static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
464 600
465void 601void
… …
473{ 609{
474 ptr = alloc (ptr, size); 610 ptr = alloc (ptr, size);
475 611
476 if (!ptr && size) 612 if (!ptr && size)
477 { 613 {
614#if EV_AVOID_STDIO
615 ev_printerr ("libev: memory allocation failed, aborting.\n");
616#else
478 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 617 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
618#endif
479 abort (); 619 abort ();
480 } 620 }
481 621
482 return ptr; 622 return ptr;
483} 623}
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 625#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 626#define ev_free(ptr) ev_realloc ((ptr), 0)
487 627
488/*****************************************************************************/ 628/*****************************************************************************/
489 629
630/* set in reify when reification needed */
631#define EV_ANFD_REIFY 1
632
490/* file descriptor info structure */ 633/* file descriptor info structure */
491typedef struct 634typedef struct
492{ 635{
493 WL head; 636 WL head;
494 unsigned char events; /* the events watched for */ 637 unsigned char events; /* the events watched for */
495 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) */
496 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 */
497 unsigned char unused; 640 unsigned char unused;
498#if EV_USE_EPOLL 641#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 642 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 643#endif
… …
562 705
563 static int ev_default_loop_ptr; 706 static int ev_default_loop_ptr;
564 707
565#endif 708#endif
566 709
710#if EV_FEATURE_API
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)
713# define EV_INVOKE_PENDING invoke_cb (EV_A)
714#else
715# define EV_RELEASE_CB (void)0
716# define EV_ACQUIRE_CB (void)0
717# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
718#endif
719
720#define EVUNLOOP_RECURSE 0x80
721
567/*****************************************************************************/ 722/*****************************************************************************/
568 723
569#ifndef EV_HAVE_EV_TIME 724#ifndef EV_HAVE_EV_TIME
570ev_tstamp 725ev_tstamp
571ev_time (void) 726ev_time (void)
… …
627 782
628 tv.tv_sec = (time_t)delay; 783 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 784 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 785
631 /* 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 */
632 /* somehting not guaranteed by newer posix versions, but guaranteed */ 787 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 788 /* by older ones */
634 select (0, 0, 0, 0, &tv); 789 select (0, 0, 0, 0, &tv);
635#endif 790#endif
636 } 791 }
637} 792}
… …
639/*****************************************************************************/ 794/*****************************************************************************/
640 795
641#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 */
642 797
643/* find a suitable new size for the given array, */ 798/* find a suitable new size for the given array, */
644/* hopefully by rounding to a ncie-to-malloc size */ 799/* hopefully by rounding to a nice-to-malloc size */
645inline_size int 800inline_size int
646array_nextsize (int elem, int cur, int cnt) 801array_nextsize (int elem, int cur, int cnt)
647{ 802{
648 int ncur = cur + 1; 803 int ncur = cur + 1;
649 804
… …
745} 900}
746 901
747/*****************************************************************************/ 902/*****************************************************************************/
748 903
749inline_speed void 904inline_speed void
750fd_event (EV_P_ int fd, int revents) 905fd_event_nocheck (EV_P_ int fd, int revents)
751{ 906{
752 ANFD *anfd = anfds + fd; 907 ANFD *anfd = anfds + fd;
753 ev_io *w; 908 ev_io *w;
754 909
755 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)
… …
759 if (ev) 914 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 915 ev_feed_event (EV_A_ (W)w, ev);
761 } 916 }
762} 917}
763 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
764void 930void
765ev_feed_fd_event (EV_P_ int fd, int revents) 931ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 932{
767 if (fd >= 0 && fd < anfdmax) 933 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 934 fd_event_nocheck (EV_A_ fd, revents);
769} 935}
770 936
771/* make sure the external fd watch events are in-sync */ 937/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 938/* with the kernel/libev internal state */
773inline_size void 939inline_size void
… …
788 954
789#if EV_SELECT_IS_WINSOCKET 955#if EV_SELECT_IS_WINSOCKET
790 if (events) 956 if (events)
791 { 957 {
792 unsigned long arg; 958 unsigned long arg;
793 #ifdef EV_FD_TO_WIN32_HANDLE
794 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 959 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
795 #else
796 anfd->handle = _get_osfhandle (fd);
797 #endif
798 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 960 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
799 } 961 }
800#endif 962#endif
801 963
802 { 964 {
… …
840 ev_io_stop (EV_A_ w); 1002 ev_io_stop (EV_A_ w);
841 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);
842 } 1004 }
843} 1005}
844 1006
845/* check whether the given fd is atcually valid, for error recovery */ 1007/* check whether the given fd is actually valid, for error recovery */
846inline_size int 1008inline_size int
847fd_valid (int fd) 1009fd_valid (int fd)
848{ 1010{
849#ifdef _WIN32 1011#ifdef _WIN32
850 return _get_osfhandle (fd) != -1; 1012 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
851#else 1013#else
852 return fcntl (fd, F_GETFD) != -1; 1014 return fcntl (fd, F_GETFD) != -1;
853#endif 1015#endif
854} 1016}
855 1017
… …
873 1035
874 for (fd = anfdmax; fd--; ) 1036 for (fd = anfdmax; fd--; )
875 if (anfds [fd].events) 1037 if (anfds [fd].events)
876 { 1038 {
877 fd_kill (EV_A_ fd); 1039 fd_kill (EV_A_ fd);
878 return; 1040 break;
879 } 1041 }
880} 1042}
881 1043
882/* 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 */
883static void noinline 1045static void noinline
… …
888 for (fd = 0; fd < anfdmax; ++fd) 1050 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 1051 if (anfds [fd].events)
890 { 1052 {
891 anfds [fd].events = 0; 1053 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 1054 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1055 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 1056 }
895} 1057}
896 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
897/*****************************************************************************/ 1073/*****************************************************************************/
898 1074
899/* 1075/*
900 * 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
901 * 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
902 * the branching factor of the d-tree. 1078 * the branching factor of the d-tree.
903 */ 1079 */
904 1080
905/* 1081/*
… …
973 1149
974 for (;;) 1150 for (;;)
975 { 1151 {
976 int c = k << 1; 1152 int c = k << 1;
977 1153
978 if (c > N + HEAP0 - 1) 1154 if (c >= N + HEAP0)
979 break; 1155 break;
980 1156
981 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])
982 ? 1 : 0; 1158 ? 1 : 0;
983 1159
… …
1019 1195
1020/* move an element suitably so it is in a correct place */ 1196/* move an element suitably so it is in a correct place */
1021inline_size void 1197inline_size void
1022adjustheap (ANHE *heap, int N, int k) 1198adjustheap (ANHE *heap, int N, int k)
1023{ 1199{
1024 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)]))
1025 upheap (heap, k); 1201 upheap (heap, k);
1026 else 1202 else
1027 downheap (heap, N, k); 1203 downheap (heap, N, k);
1028} 1204}
1029 1205
… …
1042/*****************************************************************************/ 1218/*****************************************************************************/
1043 1219
1044/* associate signal watchers to a signal signal */ 1220/* associate signal watchers to a signal signal */
1045typedef struct 1221typedef struct
1046{ 1222{
1223 EV_ATOMIC_T pending;
1224#if EV_MULTIPLICITY
1225 EV_P;
1226#endif
1047 WL head; 1227 WL head;
1048 EV_ATOMIC_T gotsig;
1049} ANSIG; 1228} ANSIG;
1050 1229
1051static ANSIG *signals; 1230static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig;
1055 1231
1056/*****************************************************************************/ 1232/*****************************************************************************/
1057 1233
1058/* used to prepare libev internal fd's */ 1234#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1059/* this is not fork-safe */
1060inline_speed void
1061fd_intern (int fd)
1062{
1063#ifdef _WIN32
1064 unsigned long arg = 1;
1065 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1066#else
1067 fcntl (fd, F_SETFD, FD_CLOEXEC);
1068 fcntl (fd, F_SETFL, O_NONBLOCK);
1069#endif
1070}
1071 1235
1072static void noinline 1236static void noinline
1073evpipe_init (EV_P) 1237evpipe_init (EV_P)
1074{ 1238{
1075 if (!ev_is_active (&pipe_w)) 1239 if (!ev_is_active (&pipe_w))
1076 { 1240 {
1077#if EV_USE_EVENTFD 1241# if EV_USE_EVENTFD
1242 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1243 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1244 evfd = eventfd (0, 0);
1245
1246 if (evfd >= 0)
1079 { 1247 {
1080 evpipe [0] = -1; 1248 evpipe [0] = -1;
1081 fd_intern (evfd); 1249 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1250 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1251 }
1084 else 1252 else
1085#endif 1253# endif
1086 { 1254 {
1087 while (pipe (evpipe)) 1255 while (pipe (evpipe))
1088 ev_syserr ("(libev) error creating signal/async pipe"); 1256 ev_syserr ("(libev) error creating signal/async pipe");
1089 1257
1090 fd_intern (evpipe [0]); 1258 fd_intern (evpipe [0]);
… …
1101evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1269evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1102{ 1270{
1103 if (!*flag) 1271 if (!*flag)
1104 { 1272 {
1105 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;
1106 1275
1107 *flag = 1; 1276 *flag = 1;
1108 1277
1109#if EV_USE_EVENTFD 1278#if EV_USE_EVENTFD
1110 if (evfd >= 0) 1279 if (evfd >= 0)
… …
1112 uint64_t counter = 1; 1281 uint64_t counter = 1;
1113 write (evfd, &counter, sizeof (uint64_t)); 1282 write (evfd, &counter, sizeof (uint64_t));
1114 } 1283 }
1115 else 1284 else
1116#endif 1285#endif
1117 write (evpipe [1], &old_errno, 1); 1286 write (evpipe [1], &dummy, 1);
1118 1287
1119 errno = old_errno; 1288 errno = old_errno;
1120 } 1289 }
1121} 1290}
1122 1291
1123/* called whenever the libev signal pipe */ 1292/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */ 1293/* got some events (signal, async) */
1125static void 1294static void
1126pipecb (EV_P_ ev_io *iow, int revents) 1295pipecb (EV_P_ ev_io *iow, int revents)
1127{ 1296{
1297 int i;
1298
1128#if EV_USE_EVENTFD 1299#if EV_USE_EVENTFD
1129 if (evfd >= 0) 1300 if (evfd >= 0)
1130 { 1301 {
1131 uint64_t counter; 1302 uint64_t counter;
1132 read (evfd, &counter, sizeof (uint64_t)); 1303 read (evfd, &counter, sizeof (uint64_t));
… …
1136 { 1307 {
1137 char dummy; 1308 char dummy;
1138 read (evpipe [0], &dummy, 1); 1309 read (evpipe [0], &dummy, 1);
1139 } 1310 }
1140 1311
1141 if (gotsig && ev_is_default_loop (EV_A)) 1312 if (sig_pending)
1142 { 1313 {
1143 int signum; 1314 sig_pending = 0;
1144 gotsig = 0;
1145 1315
1146 for (signum = signalmax; signum--; ) 1316 for (i = EV_NSIG - 1; i--; )
1147 if (signals [signum].gotsig) 1317 if (expect_false (signals [i].pending))
1148 ev_feed_signal_event (EV_A_ signum + 1); 1318 ev_feed_signal_event (EV_A_ i + 1);
1149 } 1319 }
1150 1320
1151#if EV_ASYNC_ENABLE 1321#if EV_ASYNC_ENABLE
1152 if (gotasync) 1322 if (async_pending)
1153 { 1323 {
1154 int i; 1324 async_pending = 0;
1155 gotasync = 0;
1156 1325
1157 for (i = asynccnt; i--; ) 1326 for (i = asynccnt; i--; )
1158 if (asyncs [i]->sent) 1327 if (asyncs [i]->sent)
1159 { 1328 {
1160 asyncs [i]->sent = 0; 1329 asyncs [i]->sent = 0;
… …
1168 1337
1169static void 1338static void
1170ev_sighandler (int signum) 1339ev_sighandler (int signum)
1171{ 1340{
1172#if EV_MULTIPLICITY 1341#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1342 EV_P = signals [signum - 1].loop;
1174#endif 1343#endif
1175 1344
1176#if _WIN32 1345#ifdef _WIN32
1177 signal (signum, ev_sighandler); 1346 signal (signum, ev_sighandler);
1178#endif 1347#endif
1179 1348
1180 signals [signum - 1].gotsig = 1; 1349 signals [signum - 1].pending = 1;
1181 evpipe_write (EV_A_ &gotsig); 1350 evpipe_write (EV_A_ &sig_pending);
1182} 1351}
1183 1352
1184void noinline 1353void noinline
1185ev_feed_signal_event (EV_P_ int signum) 1354ev_feed_signal_event (EV_P_ int signum)
1186{ 1355{
1187 WL w; 1356 WL w;
1188 1357
1358 if (expect_false (signum <= 0 || signum > EV_NSIG))
1359 return;
1360
1361 --signum;
1362
1189#if EV_MULTIPLICITY 1363#if EV_MULTIPLICITY
1190 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1364 /* it is permissible to try to feed a signal to the wrong loop */
1191#endif 1365 /* or, likely more useful, feeding a signal nobody is waiting for */
1192 1366
1193 --signum; 1367 if (expect_false (signals [signum].loop != EV_A))
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return; 1368 return;
1369#endif
1197 1370
1198 signals [signum].gotsig = 0; 1371 signals [signum].pending = 0;
1199 1372
1200 for (w = signals [signum].head; w; w = w->next) 1373 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1374 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 1375}
1203 1376
1377#if EV_USE_SIGNALFD
1378static void
1379sigfdcb (EV_P_ ev_io *iow, int revents)
1380{
1381 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1382
1383 for (;;)
1384 {
1385 ssize_t res = read (sigfd, si, sizeof (si));
1386
1387 /* not ISO-C, as res might be -1, but works with SuS */
1388 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1389 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1390
1391 if (res < (ssize_t)sizeof (si))
1392 break;
1393 }
1394}
1395#endif
1396
1397#endif
1398
1204/*****************************************************************************/ 1399/*****************************************************************************/
1205 1400
1401#if EV_CHILD_ENABLE
1206static WL childs [EV_PID_HASHSIZE]; 1402static WL childs [EV_PID_HASHSIZE];
1207
1208#ifndef _WIN32
1209 1403
1210static ev_signal childev; 1404static ev_signal childev;
1211 1405
1212#ifndef WIFCONTINUED 1406#ifndef WIFCONTINUED
1213# define WIFCONTINUED(status) 0 1407# define WIFCONTINUED(status) 0
… …
1218child_reap (EV_P_ int chain, int pid, int status) 1412child_reap (EV_P_ int chain, int pid, int status)
1219{ 1413{
1220 ev_child *w; 1414 ev_child *w;
1221 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1415 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1222 1416
1223 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1417 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1224 { 1418 {
1225 if ((w->pid == pid || !w->pid) 1419 if ((w->pid == pid || !w->pid)
1226 && (!traced || (w->flags & 1))) 1420 && (!traced || (w->flags & 1)))
1227 { 1421 {
1228 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1422 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1253 /* make sure we are called again until all children have been reaped */ 1447 /* make sure we are called again until all children have been reaped */
1254 /* we need to do it this way so that the callback gets called before we continue */ 1448 /* we need to do it this way so that the callback gets called before we continue */
1255 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1449 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1256 1450
1257 child_reap (EV_A_ pid, pid, status); 1451 child_reap (EV_A_ pid, pid, status);
1258 if (EV_PID_HASHSIZE > 1) 1452 if ((EV_PID_HASHSIZE) > 1)
1259 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1453 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1260} 1454}
1261 1455
1262#endif 1456#endif
1263 1457
… …
1330#ifdef __APPLE__ 1524#ifdef __APPLE__
1331 /* only select works correctly on that "unix-certified" platform */ 1525 /* only select works correctly on that "unix-certified" platform */
1332 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1526 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1333 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1527 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1334#endif 1528#endif
1529#ifdef __FreeBSD__
1530 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1531#endif
1335 1532
1336 return flags; 1533 return flags;
1337} 1534}
1338 1535
1339unsigned int 1536unsigned int
… …
1352ev_backend (EV_P) 1549ev_backend (EV_P)
1353{ 1550{
1354 return backend; 1551 return backend;
1355} 1552}
1356 1553
1554#if EV_FEATURE_API
1357unsigned int 1555unsigned int
1358ev_loop_count (EV_P) 1556ev_iteration (EV_P)
1359{ 1557{
1360 return loop_count; 1558 return loop_count;
1361} 1559}
1362 1560
1363unsigned int 1561unsigned int
1364ev_loop_depth (EV_P) 1562ev_depth (EV_P)
1365{ 1563{
1366 return loop_depth; 1564 return loop_depth;
1367} 1565}
1368 1566
1369void 1567void
… …
1375void 1573void
1376ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1574ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1377{ 1575{
1378 timeout_blocktime = interval; 1576 timeout_blocktime = interval;
1379} 1577}
1578
1579void
1580ev_set_userdata (EV_P_ void *data)
1581{
1582 userdata = data;
1583}
1584
1585void *
1586ev_userdata (EV_P)
1587{
1588 return userdata;
1589}
1590
1591void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1592{
1593 invoke_cb = invoke_pending_cb;
1594}
1595
1596void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1597{
1598 release_cb = release;
1599 acquire_cb = acquire;
1600}
1601#endif
1380 1602
1381/* initialise a loop structure, must be zero-initialised */ 1603/* initialise a loop structure, must be zero-initialised */
1382static void noinline 1604static void noinline
1383loop_init (EV_P_ unsigned int flags) 1605loop_init (EV_P_ unsigned int flags)
1384{ 1606{
… …
1402 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1624 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1403 have_monotonic = 1; 1625 have_monotonic = 1;
1404 } 1626 }
1405#endif 1627#endif
1406 1628
1629 /* pid check not overridable via env */
1630#ifndef _WIN32
1631 if (flags & EVFLAG_FORKCHECK)
1632 curpid = getpid ();
1633#endif
1634
1635 if (!(flags & EVFLAG_NOENV)
1636 && !enable_secure ()
1637 && getenv ("LIBEV_FLAGS"))
1638 flags = atoi (getenv ("LIBEV_FLAGS"));
1639
1407 ev_rt_now = ev_time (); 1640 ev_rt_now = ev_time ();
1408 mn_now = get_clock (); 1641 mn_now = get_clock ();
1409 now_floor = mn_now; 1642 now_floor = mn_now;
1410 rtmn_diff = ev_rt_now - mn_now; 1643 rtmn_diff = ev_rt_now - mn_now;
1644#if EV_FEATURE_API
1645 invoke_cb = ev_invoke_pending;
1646#endif
1411 1647
1412 io_blocktime = 0.; 1648 io_blocktime = 0.;
1413 timeout_blocktime = 0.; 1649 timeout_blocktime = 0.;
1414 backend = 0; 1650 backend = 0;
1415 backend_fd = -1; 1651 backend_fd = -1;
1416 gotasync = 0; 1652 sig_pending = 0;
1653#if EV_ASYNC_ENABLE
1654 async_pending = 0;
1655#endif
1417#if EV_USE_INOTIFY 1656#if EV_USE_INOTIFY
1418 fs_fd = -2; 1657 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1419#endif 1658#endif
1420 1659#if EV_USE_SIGNALFD
1421 /* pid check not overridable via env */ 1660 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1422#ifndef _WIN32
1423 if (flags & EVFLAG_FORKCHECK)
1424 curpid = getpid ();
1425#endif 1661#endif
1426
1427 if (!(flags & EVFLAG_NOENV)
1428 && !enable_secure ()
1429 && getenv ("LIBEV_FLAGS"))
1430 flags = atoi (getenv ("LIBEV_FLAGS"));
1431 1662
1432 if (!(flags & 0x0000ffffU)) 1663 if (!(flags & 0x0000ffffU))
1433 flags |= ev_recommended_backends (); 1664 flags |= ev_recommended_backends ();
1434 1665
1435#if EV_USE_PORT 1666#if EV_USE_PORT
… …
1448 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1679 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1449#endif 1680#endif
1450 1681
1451 ev_prepare_init (&pending_w, pendingcb); 1682 ev_prepare_init (&pending_w, pendingcb);
1452 1683
1684#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1453 ev_init (&pipe_w, pipecb); 1685 ev_init (&pipe_w, pipecb);
1454 ev_set_priority (&pipe_w, EV_MAXPRI); 1686 ev_set_priority (&pipe_w, EV_MAXPRI);
1687#endif
1455 } 1688 }
1456} 1689}
1457 1690
1458/* free up a loop structure */ 1691/* free up a loop structure */
1459static void noinline 1692static void noinline
… …
1461{ 1694{
1462 int i; 1695 int i;
1463 1696
1464 if (ev_is_active (&pipe_w)) 1697 if (ev_is_active (&pipe_w))
1465 { 1698 {
1466 ev_ref (EV_A); /* signal watcher */ 1699 /*ev_ref (EV_A);*/
1467 ev_io_stop (EV_A_ &pipe_w); 1700 /*ev_io_stop (EV_A_ &pipe_w);*/
1468 1701
1469#if EV_USE_EVENTFD 1702#if EV_USE_EVENTFD
1470 if (evfd >= 0) 1703 if (evfd >= 0)
1471 close (evfd); 1704 close (evfd);
1472#endif 1705#endif
1473 1706
1474 if (evpipe [0] >= 0) 1707 if (evpipe [0] >= 0)
1475 { 1708 {
1476 close (evpipe [0]); 1709 EV_WIN32_CLOSE_FD (evpipe [0]);
1477 close (evpipe [1]); 1710 EV_WIN32_CLOSE_FD (evpipe [1]);
1478 } 1711 }
1479 } 1712 }
1713
1714#if EV_USE_SIGNALFD
1715 if (ev_is_active (&sigfd_w))
1716 close (sigfd);
1717#endif
1480 1718
1481#if EV_USE_INOTIFY 1719#if EV_USE_INOTIFY
1482 if (fs_fd >= 0) 1720 if (fs_fd >= 0)
1483 close (fs_fd); 1721 close (fs_fd);
1484#endif 1722#endif
… …
1508#if EV_IDLE_ENABLE 1746#if EV_IDLE_ENABLE
1509 array_free (idle, [i]); 1747 array_free (idle, [i]);
1510#endif 1748#endif
1511 } 1749 }
1512 1750
1513 ev_free (anfds); anfdmax = 0; 1751 ev_free (anfds); anfds = 0; anfdmax = 0;
1514 1752
1515 /* have to use the microsoft-never-gets-it-right macro */ 1753 /* have to use the microsoft-never-gets-it-right macro */
1516 array_free (rfeed, EMPTY); 1754 array_free (rfeed, EMPTY);
1517 array_free (fdchange, EMPTY); 1755 array_free (fdchange, EMPTY);
1518 array_free (timer, EMPTY); 1756 array_free (timer, EMPTY);
… …
1553 1791
1554 if (ev_is_active (&pipe_w)) 1792 if (ev_is_active (&pipe_w))
1555 { 1793 {
1556 /* this "locks" the handlers against writing to the pipe */ 1794 /* this "locks" the handlers against writing to the pipe */
1557 /* while we modify the fd vars */ 1795 /* while we modify the fd vars */
1558 gotsig = 1; 1796 sig_pending = 1;
1559#if EV_ASYNC_ENABLE 1797#if EV_ASYNC_ENABLE
1560 gotasync = 1; 1798 async_pending = 1;
1561#endif 1799#endif
1562 1800
1563 ev_ref (EV_A); 1801 ev_ref (EV_A);
1564 ev_io_stop (EV_A_ &pipe_w); 1802 ev_io_stop (EV_A_ &pipe_w);
1565 1803
… …
1568 close (evfd); 1806 close (evfd);
1569#endif 1807#endif
1570 1808
1571 if (evpipe [0] >= 0) 1809 if (evpipe [0] >= 0)
1572 { 1810 {
1573 close (evpipe [0]); 1811 EV_WIN32_CLOSE_FD (evpipe [0]);
1574 close (evpipe [1]); 1812 EV_WIN32_CLOSE_FD (evpipe [1]);
1575 } 1813 }
1576 1814
1815#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1577 evpipe_init (EV_A); 1816 evpipe_init (EV_A);
1578 /* now iterate over everything, in case we missed something */ 1817 /* now iterate over everything, in case we missed something */
1579 pipecb (EV_A_ &pipe_w, EV_READ); 1818 pipecb (EV_A_ &pipe_w, EV_READ);
1819#endif
1580 } 1820 }
1581 1821
1582 postfork = 0; 1822 postfork = 0;
1583} 1823}
1584 1824
1585#if EV_MULTIPLICITY 1825#if EV_MULTIPLICITY
1586 1826
1587struct ev_loop * 1827struct ev_loop *
1588ev_loop_new (unsigned int flags) 1828ev_loop_new (unsigned int flags)
1589{ 1829{
1590 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1830 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1591 1831
1592 memset (loop, 0, sizeof (struct ev_loop)); 1832 memset (EV_A, 0, sizeof (struct ev_loop));
1593
1594 loop_init (EV_A_ flags); 1833 loop_init (EV_A_ flags);
1595 1834
1596 if (ev_backend (EV_A)) 1835 if (ev_backend (EV_A))
1597 return loop; 1836 return EV_A;
1598 1837
1599 return 0; 1838 return 0;
1600} 1839}
1601 1840
1602void 1841void
… …
1609void 1848void
1610ev_loop_fork (EV_P) 1849ev_loop_fork (EV_P)
1611{ 1850{
1612 postfork = 1; /* must be in line with ev_default_fork */ 1851 postfork = 1; /* must be in line with ev_default_fork */
1613} 1852}
1853#endif /* multiplicity */
1614 1854
1615#if EV_VERIFY 1855#if EV_VERIFY
1616static void noinline 1856static void noinline
1617verify_watcher (EV_P_ W w) 1857verify_watcher (EV_P_ W w)
1618{ 1858{
… …
1646 verify_watcher (EV_A_ ws [cnt]); 1886 verify_watcher (EV_A_ ws [cnt]);
1647 } 1887 }
1648} 1888}
1649#endif 1889#endif
1650 1890
1891#if EV_FEATURE_API
1651void 1892void
1652ev_loop_verify (EV_P) 1893ev_verify (EV_P)
1653{ 1894{
1654#if EV_VERIFY 1895#if EV_VERIFY
1655 int i; 1896 int i;
1656 WL w; 1897 WL w;
1657 1898
… …
1696#if EV_ASYNC_ENABLE 1937#if EV_ASYNC_ENABLE
1697 assert (asyncmax >= asynccnt); 1938 assert (asyncmax >= asynccnt);
1698 array_verify (EV_A_ (W *)asyncs, asynccnt); 1939 array_verify (EV_A_ (W *)asyncs, asynccnt);
1699#endif 1940#endif
1700 1941
1942#if EV_PREPARE_ENABLE
1701 assert (preparemax >= preparecnt); 1943 assert (preparemax >= preparecnt);
1702 array_verify (EV_A_ (W *)prepares, preparecnt); 1944 array_verify (EV_A_ (W *)prepares, preparecnt);
1945#endif
1703 1946
1947#if EV_CHECK_ENABLE
1704 assert (checkmax >= checkcnt); 1948 assert (checkmax >= checkcnt);
1705 array_verify (EV_A_ (W *)checks, checkcnt); 1949 array_verify (EV_A_ (W *)checks, checkcnt);
1950#endif
1706 1951
1707# if 0 1952# if 0
1953#if EV_CHILD_ENABLE
1708 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1954 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1709 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1955 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1956#endif
1710# endif 1957# endif
1711#endif 1958#endif
1712} 1959}
1713 1960#endif
1714#endif /* multiplicity */
1715 1961
1716#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1717struct ev_loop * 1963struct ev_loop *
1718ev_default_loop_init (unsigned int flags) 1964ev_default_loop_init (unsigned int flags)
1719#else 1965#else
… …
1722#endif 1968#endif
1723{ 1969{
1724 if (!ev_default_loop_ptr) 1970 if (!ev_default_loop_ptr)
1725 { 1971 {
1726#if EV_MULTIPLICITY 1972#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1973 EV_P = ev_default_loop_ptr = &default_loop_struct;
1728#else 1974#else
1729 ev_default_loop_ptr = 1; 1975 ev_default_loop_ptr = 1;
1730#endif 1976#endif
1731 1977
1732 loop_init (EV_A_ flags); 1978 loop_init (EV_A_ flags);
1733 1979
1734 if (ev_backend (EV_A)) 1980 if (ev_backend (EV_A))
1735 { 1981 {
1736#ifndef _WIN32 1982#if EV_CHILD_ENABLE
1737 ev_signal_init (&childev, childcb, SIGCHLD); 1983 ev_signal_init (&childev, childcb, SIGCHLD);
1738 ev_set_priority (&childev, EV_MAXPRI); 1984 ev_set_priority (&childev, EV_MAXPRI);
1739 ev_signal_start (EV_A_ &childev); 1985 ev_signal_start (EV_A_ &childev);
1740 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1986 ev_unref (EV_A); /* child watcher should not keep loop alive */
1741#endif 1987#endif
… …
1749 1995
1750void 1996void
1751ev_default_destroy (void) 1997ev_default_destroy (void)
1752{ 1998{
1753#if EV_MULTIPLICITY 1999#if EV_MULTIPLICITY
1754 struct ev_loop *loop = ev_default_loop_ptr; 2000 EV_P = ev_default_loop_ptr;
1755#endif 2001#endif
1756 2002
1757 ev_default_loop_ptr = 0; 2003 ev_default_loop_ptr = 0;
1758 2004
1759#ifndef _WIN32 2005#if EV_CHILD_ENABLE
1760 ev_ref (EV_A); /* child watcher */ 2006 ev_ref (EV_A); /* child watcher */
1761 ev_signal_stop (EV_A_ &childev); 2007 ev_signal_stop (EV_A_ &childev);
1762#endif 2008#endif
1763 2009
1764 loop_destroy (EV_A); 2010 loop_destroy (EV_A);
… …
1766 2012
1767void 2013void
1768ev_default_fork (void) 2014ev_default_fork (void)
1769{ 2015{
1770#if EV_MULTIPLICITY 2016#if EV_MULTIPLICITY
1771 struct ev_loop *loop = ev_default_loop_ptr; 2017 EV_P = ev_default_loop_ptr;
1772#endif 2018#endif
1773 2019
1774 postfork = 1; /* must be in line with ev_loop_fork */ 2020 postfork = 1; /* must be in line with ev_loop_fork */
1775} 2021}
1776 2022
… …
1780ev_invoke (EV_P_ void *w, int revents) 2026ev_invoke (EV_P_ void *w, int revents)
1781{ 2027{
1782 EV_CB_INVOKE ((W)w, revents); 2028 EV_CB_INVOKE ((W)w, revents);
1783} 2029}
1784 2030
1785inline_speed void 2031unsigned int
1786call_pending (EV_P) 2032ev_pending_count (EV_P)
2033{
2034 int pri;
2035 unsigned int count = 0;
2036
2037 for (pri = NUMPRI; pri--; )
2038 count += pendingcnt [pri];
2039
2040 return count;
2041}
2042
2043void noinline
2044ev_invoke_pending (EV_P)
1787{ 2045{
1788 int pri; 2046 int pri;
1789 2047
1790 for (pri = NUMPRI; pri--; ) 2048 for (pri = NUMPRI; pri--; )
1791 while (pendingcnt [pri]) 2049 while (pendingcnt [pri])
… …
1858 EV_FREQUENT_CHECK; 2116 EV_FREQUENT_CHECK;
1859 feed_reverse (EV_A_ (W)w); 2117 feed_reverse (EV_A_ (W)w);
1860 } 2118 }
1861 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2119 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1862 2120
1863 feed_reverse_done (EV_A_ EV_TIMEOUT); 2121 feed_reverse_done (EV_A_ EV_TIMER);
1864 } 2122 }
1865} 2123}
1866 2124
1867#if EV_PERIODIC_ENABLE 2125#if EV_PERIODIC_ENABLE
1868/* make periodics pending */ 2126/* make periodics pending */
… …
1921 feed_reverse_done (EV_A_ EV_PERIODIC); 2179 feed_reverse_done (EV_A_ EV_PERIODIC);
1922 } 2180 }
1923} 2181}
1924 2182
1925/* simply recalculate all periodics */ 2183/* simply recalculate all periodics */
1926/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2184/* TODO: maybe ensure that at least one event happens when jumping forward? */
1927static void noinline 2185static void noinline
1928periodics_reschedule (EV_P) 2186periodics_reschedule (EV_P)
1929{ 2187{
1930 int i; 2188 int i;
1931 2189
… …
1959 ANHE_at_cache (*he); 2217 ANHE_at_cache (*he);
1960 } 2218 }
1961} 2219}
1962 2220
1963/* fetch new monotonic and realtime times from the kernel */ 2221/* fetch new monotonic and realtime times from the kernel */
1964/* also detetc if there was a timejump, and act accordingly */ 2222/* also detect if there was a timejump, and act accordingly */
1965inline_speed void 2223inline_speed void
1966time_update (EV_P_ ev_tstamp max_block) 2224time_update (EV_P_ ev_tstamp max_block)
1967{ 2225{
1968#if EV_USE_MONOTONIC 2226#if EV_USE_MONOTONIC
1969 if (expect_true (have_monotonic)) 2227 if (expect_true (have_monotonic))
… …
2029} 2287}
2030 2288
2031void 2289void
2032ev_loop (EV_P_ int flags) 2290ev_loop (EV_P_ int flags)
2033{ 2291{
2292#if EV_FEATURE_API
2034 ++loop_depth; 2293 ++loop_depth;
2294#endif
2295
2296 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2035 2297
2036 loop_done = EVUNLOOP_CANCEL; 2298 loop_done = EVUNLOOP_CANCEL;
2037 2299
2038 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2300 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2039 2301
2040 do 2302 do
2041 { 2303 {
2042#if EV_VERIFY >= 2 2304#if EV_VERIFY >= 2
2043 ev_loop_verify (EV_A); 2305 ev_verify (EV_A);
2044#endif 2306#endif
2045 2307
2046#ifndef _WIN32 2308#ifndef _WIN32
2047 if (expect_false (curpid)) /* penalise the forking check even more */ 2309 if (expect_false (curpid)) /* penalise the forking check even more */
2048 if (expect_false (getpid () != curpid)) 2310 if (expect_false (getpid () != curpid))
… …
2056 /* we might have forked, so queue fork handlers */ 2318 /* we might have forked, so queue fork handlers */
2057 if (expect_false (postfork)) 2319 if (expect_false (postfork))
2058 if (forkcnt) 2320 if (forkcnt)
2059 { 2321 {
2060 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2322 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2061 call_pending (EV_A); 2323 EV_INVOKE_PENDING;
2062 } 2324 }
2063#endif 2325#endif
2064 2326
2327#if EV_PREPARE_ENABLE
2065 /* queue prepare watchers (and execute them) */ 2328 /* queue prepare watchers (and execute them) */
2066 if (expect_false (preparecnt)) 2329 if (expect_false (preparecnt))
2067 { 2330 {
2068 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2331 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2069 call_pending (EV_A); 2332 EV_INVOKE_PENDING;
2070 } 2333 }
2334#endif
2335
2336 if (expect_false (loop_done))
2337 break;
2071 2338
2072 /* we might have forked, so reify kernel state if necessary */ 2339 /* we might have forked, so reify kernel state if necessary */
2073 if (expect_false (postfork)) 2340 if (expect_false (postfork))
2074 loop_fork (EV_A); 2341 loop_fork (EV_A);
2075 2342
… …
2123 waittime -= sleeptime; 2390 waittime -= sleeptime;
2124 } 2391 }
2125 } 2392 }
2126 } 2393 }
2127 2394
2395#if EV_FEATURE_API
2128 ++loop_count; 2396 ++loop_count;
2397#endif
2398 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2129 backend_poll (EV_A_ waittime); 2399 backend_poll (EV_A_ waittime);
2400 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2130 2401
2131 /* update ev_rt_now, do magic */ 2402 /* update ev_rt_now, do magic */
2132 time_update (EV_A_ waittime + sleeptime); 2403 time_update (EV_A_ waittime + sleeptime);
2133 } 2404 }
2134 2405
… …
2141#if EV_IDLE_ENABLE 2412#if EV_IDLE_ENABLE
2142 /* queue idle watchers unless other events are pending */ 2413 /* queue idle watchers unless other events are pending */
2143 idle_reify (EV_A); 2414 idle_reify (EV_A);
2144#endif 2415#endif
2145 2416
2417#if EV_CHECK_ENABLE
2146 /* queue check watchers, to be executed first */ 2418 /* queue check watchers, to be executed first */
2147 if (expect_false (checkcnt)) 2419 if (expect_false (checkcnt))
2148 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2420 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2421#endif
2149 2422
2150 call_pending (EV_A); 2423 EV_INVOKE_PENDING;
2151 } 2424 }
2152 while (expect_true ( 2425 while (expect_true (
2153 activecnt 2426 activecnt
2154 && !loop_done 2427 && !loop_done
2155 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2428 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2156 )); 2429 ));
2157 2430
2158 if (loop_done == EVUNLOOP_ONE) 2431 if (loop_done == EVUNLOOP_ONE)
2159 loop_done = EVUNLOOP_CANCEL; 2432 loop_done = EVUNLOOP_CANCEL;
2160 2433
2434#if EV_FEATURE_API
2161 --loop_depth; 2435 --loop_depth;
2436#endif
2162} 2437}
2163 2438
2164void 2439void
2165ev_unloop (EV_P_ int how) 2440ev_unloop (EV_P_ int how)
2166{ 2441{
… …
2217inline_size void 2492inline_size void
2218wlist_del (WL *head, WL elem) 2493wlist_del (WL *head, WL elem)
2219{ 2494{
2220 while (*head) 2495 while (*head)
2221 { 2496 {
2222 if (*head == elem) 2497 if (expect_true (*head == elem))
2223 { 2498 {
2224 *head = elem->next; 2499 *head = elem->next;
2225 return; 2500 break;
2226 } 2501 }
2227 2502
2228 head = &(*head)->next; 2503 head = &(*head)->next;
2229 } 2504 }
2230} 2505}
… …
2258} 2533}
2259 2534
2260inline_size void 2535inline_size void
2261pri_adjust (EV_P_ W w) 2536pri_adjust (EV_P_ W w)
2262{ 2537{
2263 int pri = w->priority; 2538 int pri = ev_priority (w);
2264 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2539 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2265 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2540 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2266 w->priority = pri; 2541 ev_set_priority (w, pri);
2267} 2542}
2268 2543
2269inline_speed void 2544inline_speed void
2270ev_start (EV_P_ W w, int active) 2545ev_start (EV_P_ W w, int active)
2271{ 2546{
… …
2290 2565
2291 if (expect_false (ev_is_active (w))) 2566 if (expect_false (ev_is_active (w)))
2292 return; 2567 return;
2293 2568
2294 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2569 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2295 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2570 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2296 2571
2297 EV_FREQUENT_CHECK; 2572 EV_FREQUENT_CHECK;
2298 2573
2299 ev_start (EV_A_ (W)w, 1); 2574 ev_start (EV_A_ (W)w, 1);
2300 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2575 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2301 wlist_add (&anfds[fd].head, (WL)w); 2576 wlist_add (&anfds[fd].head, (WL)w);
2302 2577
2303 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2578 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2304 w->events &= ~EV__IOFDSET; 2579 w->events &= ~EV__IOFDSET;
2305 2580
2306 EV_FREQUENT_CHECK; 2581 EV_FREQUENT_CHECK;
2307} 2582}
2308 2583
… …
2370 timers [active] = timers [timercnt + HEAP0]; 2645 timers [active] = timers [timercnt + HEAP0];
2371 adjustheap (timers, timercnt, active); 2646 adjustheap (timers, timercnt, active);
2372 } 2647 }
2373 } 2648 }
2374 2649
2375 EV_FREQUENT_CHECK;
2376
2377 ev_at (w) -= mn_now; 2650 ev_at (w) -= mn_now;
2378 2651
2379 ev_stop (EV_A_ (W)w); 2652 ev_stop (EV_A_ (W)w);
2653
2654 EV_FREQUENT_CHECK;
2380} 2655}
2381 2656
2382void noinline 2657void noinline
2383ev_timer_again (EV_P_ ev_timer *w) 2658ev_timer_again (EV_P_ ev_timer *w)
2384{ 2659{
… …
2402 } 2677 }
2403 2678
2404 EV_FREQUENT_CHECK; 2679 EV_FREQUENT_CHECK;
2405} 2680}
2406 2681
2682ev_tstamp
2683ev_timer_remaining (EV_P_ ev_timer *w)
2684{
2685 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2686}
2687
2407#if EV_PERIODIC_ENABLE 2688#if EV_PERIODIC_ENABLE
2408void noinline 2689void noinline
2409ev_periodic_start (EV_P_ ev_periodic *w) 2690ev_periodic_start (EV_P_ ev_periodic *w)
2410{ 2691{
2411 if (expect_false (ev_is_active (w))) 2692 if (expect_false (ev_is_active (w)))
… …
2457 periodics [active] = periodics [periodiccnt + HEAP0]; 2738 periodics [active] = periodics [periodiccnt + HEAP0];
2458 adjustheap (periodics, periodiccnt, active); 2739 adjustheap (periodics, periodiccnt, active);
2459 } 2740 }
2460 } 2741 }
2461 2742
2462 EV_FREQUENT_CHECK;
2463
2464 ev_stop (EV_A_ (W)w); 2743 ev_stop (EV_A_ (W)w);
2744
2745 EV_FREQUENT_CHECK;
2465} 2746}
2466 2747
2467void noinline 2748void noinline
2468ev_periodic_again (EV_P_ ev_periodic *w) 2749ev_periodic_again (EV_P_ ev_periodic *w)
2469{ 2750{
… …
2475 2756
2476#ifndef SA_RESTART 2757#ifndef SA_RESTART
2477# define SA_RESTART 0 2758# define SA_RESTART 0
2478#endif 2759#endif
2479 2760
2761#if EV_SIGNAL_ENABLE
2762
2480void noinline 2763void noinline
2481ev_signal_start (EV_P_ ev_signal *w) 2764ev_signal_start (EV_P_ ev_signal *w)
2482{ 2765{
2483#if EV_MULTIPLICITY
2484 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2485#endif
2486 if (expect_false (ev_is_active (w))) 2766 if (expect_false (ev_is_active (w)))
2487 return; 2767 return;
2488 2768
2489 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2769 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2490 2770
2491 evpipe_init (EV_A); 2771#if EV_MULTIPLICITY
2772 assert (("libev: a signal must not be attached to two different loops",
2773 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2492 2774
2493 EV_FREQUENT_CHECK; 2775 signals [w->signum - 1].loop = EV_A;
2776#endif
2494 2777
2778 EV_FREQUENT_CHECK;
2779
2780#if EV_USE_SIGNALFD
2781 if (sigfd == -2)
2495 { 2782 {
2496#ifndef _WIN32 2783 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2497 sigset_t full, prev; 2784 if (sigfd < 0 && errno == EINVAL)
2498 sigfillset (&full); 2785 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2499 sigprocmask (SIG_SETMASK, &full, &prev);
2500#endif
2501 2786
2502 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2787 if (sigfd >= 0)
2788 {
2789 fd_intern (sigfd); /* doing it twice will not hurt */
2503 2790
2504#ifndef _WIN32 2791 sigemptyset (&sigfd_set);
2505 sigprocmask (SIG_SETMASK, &prev, 0); 2792
2506#endif 2793 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2794 ev_set_priority (&sigfd_w, EV_MAXPRI);
2795 ev_io_start (EV_A_ &sigfd_w);
2796 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2797 }
2507 } 2798 }
2799
2800 if (sigfd >= 0)
2801 {
2802 /* TODO: check .head */
2803 sigaddset (&sigfd_set, w->signum);
2804 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2805
2806 signalfd (sigfd, &sigfd_set, 0);
2807 }
2808#endif
2508 2809
2509 ev_start (EV_A_ (W)w, 1); 2810 ev_start (EV_A_ (W)w, 1);
2510 wlist_add (&signals [w->signum - 1].head, (WL)w); 2811 wlist_add (&signals [w->signum - 1].head, (WL)w);
2511 2812
2512 if (!((WL)w)->next) 2813 if (!((WL)w)->next)
2814# if EV_USE_SIGNALFD
2815 if (sigfd < 0) /*TODO*/
2816# endif
2513 { 2817 {
2514#if _WIN32 2818# ifdef _WIN32
2819 evpipe_init (EV_A);
2820
2515 signal (w->signum, ev_sighandler); 2821 signal (w->signum, ev_sighandler);
2516#else 2822# else
2517 struct sigaction sa; 2823 struct sigaction sa;
2824
2825 evpipe_init (EV_A);
2826
2518 sa.sa_handler = ev_sighandler; 2827 sa.sa_handler = ev_sighandler;
2519 sigfillset (&sa.sa_mask); 2828 sigfillset (&sa.sa_mask);
2520 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2829 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2521 sigaction (w->signum, &sa, 0); 2830 sigaction (w->signum, &sa, 0);
2831
2832 sigemptyset (&sa.sa_mask);
2833 sigaddset (&sa.sa_mask, w->signum);
2834 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2522#endif 2835#endif
2523 } 2836 }
2524 2837
2525 EV_FREQUENT_CHECK; 2838 EV_FREQUENT_CHECK;
2526} 2839}
2527 2840
2528void noinline 2841void noinline
… …
2536 2849
2537 wlist_del (&signals [w->signum - 1].head, (WL)w); 2850 wlist_del (&signals [w->signum - 1].head, (WL)w);
2538 ev_stop (EV_A_ (W)w); 2851 ev_stop (EV_A_ (W)w);
2539 2852
2540 if (!signals [w->signum - 1].head) 2853 if (!signals [w->signum - 1].head)
2854 {
2855#if EV_MULTIPLICITY
2856 signals [w->signum - 1].loop = 0; /* unattach from signal */
2857#endif
2858#if EV_USE_SIGNALFD
2859 if (sigfd >= 0)
2860 {
2861 sigset_t ss;
2862
2863 sigemptyset (&ss);
2864 sigaddset (&ss, w->signum);
2865 sigdelset (&sigfd_set, w->signum);
2866
2867 signalfd (sigfd, &sigfd_set, 0);
2868 sigprocmask (SIG_UNBLOCK, &ss, 0);
2869 }
2870 else
2871#endif
2541 signal (w->signum, SIG_DFL); 2872 signal (w->signum, SIG_DFL);
2873 }
2542 2874
2543 EV_FREQUENT_CHECK; 2875 EV_FREQUENT_CHECK;
2544} 2876}
2877
2878#endif
2879
2880#if EV_CHILD_ENABLE
2545 2881
2546void 2882void
2547ev_child_start (EV_P_ ev_child *w) 2883ev_child_start (EV_P_ ev_child *w)
2548{ 2884{
2549#if EV_MULTIPLICITY 2885#if EV_MULTIPLICITY
… …
2553 return; 2889 return;
2554 2890
2555 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2556 2892
2557 ev_start (EV_A_ (W)w, 1); 2893 ev_start (EV_A_ (W)w, 1);
2558 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2894 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2559 2895
2560 EV_FREQUENT_CHECK; 2896 EV_FREQUENT_CHECK;
2561} 2897}
2562 2898
2563void 2899void
… …
2567 if (expect_false (!ev_is_active (w))) 2903 if (expect_false (!ev_is_active (w)))
2568 return; 2904 return;
2569 2905
2570 EV_FREQUENT_CHECK; 2906 EV_FREQUENT_CHECK;
2571 2907
2572 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2908 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2573 ev_stop (EV_A_ (W)w); 2909 ev_stop (EV_A_ (W)w);
2574 2910
2575 EV_FREQUENT_CHECK; 2911 EV_FREQUENT_CHECK;
2576} 2912}
2913
2914#endif
2577 2915
2578#if EV_STAT_ENABLE 2916#if EV_STAT_ENABLE
2579 2917
2580# ifdef _WIN32 2918# ifdef _WIN32
2581# undef lstat 2919# undef lstat
… …
2587#define MIN_STAT_INTERVAL 0.1074891 2925#define MIN_STAT_INTERVAL 0.1074891
2588 2926
2589static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2927static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2590 2928
2591#if EV_USE_INOTIFY 2929#if EV_USE_INOTIFY
2592# define EV_INOTIFY_BUFSIZE 8192 2930
2931/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2932# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2593 2933
2594static void noinline 2934static void noinline
2595infy_add (EV_P_ ev_stat *w) 2935infy_add (EV_P_ ev_stat *w)
2596{ 2936{
2597 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2937 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2598 2938
2599 if (w->wd < 0) 2939 if (w->wd >= 0)
2940 {
2941 struct statfs sfs;
2942
2943 /* now local changes will be tracked by inotify, but remote changes won't */
2944 /* unless the filesystem is known to be local, we therefore still poll */
2945 /* also do poll on <2.6.25, but with normal frequency */
2946
2947 if (!fs_2625)
2948 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2949 else if (!statfs (w->path, &sfs)
2950 && (sfs.f_type == 0x1373 /* devfs */
2951 || sfs.f_type == 0xEF53 /* ext2/3 */
2952 || sfs.f_type == 0x3153464a /* jfs */
2953 || sfs.f_type == 0x52654973 /* reiser3 */
2954 || sfs.f_type == 0x01021994 /* tempfs */
2955 || sfs.f_type == 0x58465342 /* xfs */))
2956 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2957 else
2958 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2600 { 2959 }
2960 else
2961 {
2962 /* can't use inotify, continue to stat */
2601 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2963 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2602 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2603 2964
2604 /* monitor some parent directory for speedup hints */ 2965 /* if path is not there, monitor some parent directory for speedup hints */
2605 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2966 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2606 /* but an efficiency issue only */ 2967 /* but an efficiency issue only */
2607 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2968 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2608 { 2969 {
2609 char path [4096]; 2970 char path [4096];
… …
2625 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2986 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2626 } 2987 }
2627 } 2988 }
2628 2989
2629 if (w->wd >= 0) 2990 if (w->wd >= 0)
2630 {
2631 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2991 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2632 2992
2633 /* now local changes will be tracked by inotify, but remote changes won't */ 2993 /* now re-arm timer, if required */
2634 /* unless the filesystem it known to be local, we therefore still poll */ 2994 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2635 /* also do poll on <2.6.25, but with normal frequency */
2636 struct statfs sfs;
2637
2638 if (fs_2625 && !statfs (w->path, &sfs))
2639 if (sfs.f_type == 0x1373 /* devfs */
2640 || sfs.f_type == 0xEF53 /* ext2/3 */
2641 || sfs.f_type == 0x3153464a /* jfs */
2642 || sfs.f_type == 0x52654973 /* reiser3 */
2643 || sfs.f_type == 0x01021994 /* tempfs */
2644 || sfs.f_type == 0x58465342 /* xfs */)
2645 return;
2646
2647 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2648 ev_timer_again (EV_A_ &w->timer); 2995 ev_timer_again (EV_A_ &w->timer);
2649 } 2996 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2650} 2997}
2651 2998
2652static void noinline 2999static void noinline
2653infy_del (EV_P_ ev_stat *w) 3000infy_del (EV_P_ ev_stat *w)
2654{ 3001{
… …
2657 3004
2658 if (wd < 0) 3005 if (wd < 0)
2659 return; 3006 return;
2660 3007
2661 w->wd = -2; 3008 w->wd = -2;
2662 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3009 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2663 wlist_del (&fs_hash [slot].head, (WL)w); 3010 wlist_del (&fs_hash [slot].head, (WL)w);
2664 3011
2665 /* remove this watcher, if others are watching it, they will rearm */ 3012 /* remove this watcher, if others are watching it, they will rearm */
2666 inotify_rm_watch (fs_fd, wd); 3013 inotify_rm_watch (fs_fd, wd);
2667} 3014}
… …
2669static void noinline 3016static void noinline
2670infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3017infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2671{ 3018{
2672 if (slot < 0) 3019 if (slot < 0)
2673 /* overflow, need to check for all hash slots */ 3020 /* overflow, need to check for all hash slots */
2674 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3021 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2675 infy_wd (EV_A_ slot, wd, ev); 3022 infy_wd (EV_A_ slot, wd, ev);
2676 else 3023 else
2677 { 3024 {
2678 WL w_; 3025 WL w_;
2679 3026
2680 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3027 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2681 { 3028 {
2682 ev_stat *w = (ev_stat *)w_; 3029 ev_stat *w = (ev_stat *)w_;
2683 w_ = w_->next; /* lets us remove this watcher and all before it */ 3030 w_ = w_->next; /* lets us remove this watcher and all before it */
2684 3031
2685 if (w->wd == wd || wd == -1) 3032 if (w->wd == wd || wd == -1)
2686 { 3033 {
2687 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3034 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2688 { 3035 {
2689 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3036 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2690 w->wd = -1; 3037 w->wd = -1;
2691 infy_add (EV_A_ w); /* re-add, no matter what */ 3038 infy_add (EV_A_ w); /* re-add, no matter what */
2692 } 3039 }
2693 3040
2694 stat_timer_cb (EV_A_ &w->timer, 0); 3041 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2699 3046
2700static void 3047static void
2701infy_cb (EV_P_ ev_io *w, int revents) 3048infy_cb (EV_P_ ev_io *w, int revents)
2702{ 3049{
2703 char buf [EV_INOTIFY_BUFSIZE]; 3050 char buf [EV_INOTIFY_BUFSIZE];
2704 struct inotify_event *ev = (struct inotify_event *)buf;
2705 int ofs; 3051 int ofs;
2706 int len = read (fs_fd, buf, sizeof (buf)); 3052 int len = read (fs_fd, buf, sizeof (buf));
2707 3053
2708 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3054 for (ofs = 0; ofs < len; )
3055 {
3056 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2709 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3057 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3058 ofs += sizeof (struct inotify_event) + ev->len;
3059 }
3060}
3061
3062inline_size unsigned int
3063ev_linux_version (void)
3064{
3065 struct utsname buf;
3066 unsigned int v;
3067 int i;
3068 char *p = buf.release;
3069
3070 if (uname (&buf))
3071 return 0;
3072
3073 for (i = 3+1; --i; )
3074 {
3075 unsigned int c = 0;
3076
3077 for (;;)
3078 {
3079 if (*p >= '0' && *p <= '9')
3080 c = c * 10 + *p++ - '0';
3081 else
3082 {
3083 p += *p == '.';
3084 break;
3085 }
3086 }
3087
3088 v = (v << 8) | c;
3089 }
3090
3091 return v;
2710} 3092}
2711 3093
2712inline_size void 3094inline_size void
2713check_2625 (EV_P) 3095ev_check_2625 (EV_P)
2714{ 3096{
2715 /* kernels < 2.6.25 are borked 3097 /* kernels < 2.6.25 are borked
2716 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3098 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2717 */ 3099 */
2718 struct utsname buf; 3100 if (ev_linux_version () < 0x020619)
2719 int major, minor, micro;
2720
2721 if (uname (&buf))
2722 return; 3101 return;
2723 3102
2724 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2725 return;
2726
2727 if (major < 2
2728 || (major == 2 && minor < 6)
2729 || (major == 2 && minor == 6 && micro < 25))
2730 return;
2731
2732 fs_2625 = 1; 3103 fs_2625 = 1;
3104}
3105
3106inline_size int
3107infy_newfd (void)
3108{
3109#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3110 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3111 if (fd >= 0)
3112 return fd;
3113#endif
3114 return inotify_init ();
2733} 3115}
2734 3116
2735inline_size void 3117inline_size void
2736infy_init (EV_P) 3118infy_init (EV_P)
2737{ 3119{
2738 if (fs_fd != -2) 3120 if (fs_fd != -2)
2739 return; 3121 return;
2740 3122
2741 fs_fd = -1; 3123 fs_fd = -1;
2742 3124
2743 check_2625 (EV_A); 3125 ev_check_2625 (EV_A);
2744 3126
2745 fs_fd = inotify_init (); 3127 fs_fd = infy_newfd ();
2746 3128
2747 if (fs_fd >= 0) 3129 if (fs_fd >= 0)
2748 { 3130 {
3131 fd_intern (fs_fd);
2749 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3132 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2750 ev_set_priority (&fs_w, EV_MAXPRI); 3133 ev_set_priority (&fs_w, EV_MAXPRI);
2751 ev_io_start (EV_A_ &fs_w); 3134 ev_io_start (EV_A_ &fs_w);
3135 ev_unref (EV_A);
2752 } 3136 }
2753} 3137}
2754 3138
2755inline_size void 3139inline_size void
2756infy_fork (EV_P) 3140infy_fork (EV_P)
… …
2758 int slot; 3142 int slot;
2759 3143
2760 if (fs_fd < 0) 3144 if (fs_fd < 0)
2761 return; 3145 return;
2762 3146
3147 ev_ref (EV_A);
3148 ev_io_stop (EV_A_ &fs_w);
2763 close (fs_fd); 3149 close (fs_fd);
2764 fs_fd = inotify_init (); 3150 fs_fd = infy_newfd ();
2765 3151
3152 if (fs_fd >= 0)
3153 {
3154 fd_intern (fs_fd);
3155 ev_io_set (&fs_w, fs_fd, EV_READ);
3156 ev_io_start (EV_A_ &fs_w);
3157 ev_unref (EV_A);
3158 }
3159
2766 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3160 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2767 { 3161 {
2768 WL w_ = fs_hash [slot].head; 3162 WL w_ = fs_hash [slot].head;
2769 fs_hash [slot].head = 0; 3163 fs_hash [slot].head = 0;
2770 3164
2771 while (w_) 3165 while (w_)
… …
2776 w->wd = -1; 3170 w->wd = -1;
2777 3171
2778 if (fs_fd >= 0) 3172 if (fs_fd >= 0)
2779 infy_add (EV_A_ w); /* re-add, no matter what */ 3173 infy_add (EV_A_ w); /* re-add, no matter what */
2780 else 3174 else
3175 {
3176 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3177 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2781 ev_timer_again (EV_A_ &w->timer); 3178 ev_timer_again (EV_A_ &w->timer);
3179 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3180 }
2782 } 3181 }
2783 } 3182 }
2784} 3183}
2785 3184
2786#endif 3185#endif
… …
2803static void noinline 3202static void noinline
2804stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3203stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2805{ 3204{
2806 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3205 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2807 3206
2808 /* we copy this here each the time so that */ 3207 ev_statdata prev = w->attr;
2809 /* prev has the old value when the callback gets invoked */
2810 w->prev = w->attr;
2811 ev_stat_stat (EV_A_ w); 3208 ev_stat_stat (EV_A_ w);
2812 3209
2813 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3210 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2814 if ( 3211 if (
2815 w->prev.st_dev != w->attr.st_dev 3212 prev.st_dev != w->attr.st_dev
2816 || w->prev.st_ino != w->attr.st_ino 3213 || prev.st_ino != w->attr.st_ino
2817 || w->prev.st_mode != w->attr.st_mode 3214 || prev.st_mode != w->attr.st_mode
2818 || w->prev.st_nlink != w->attr.st_nlink 3215 || prev.st_nlink != w->attr.st_nlink
2819 || w->prev.st_uid != w->attr.st_uid 3216 || prev.st_uid != w->attr.st_uid
2820 || w->prev.st_gid != w->attr.st_gid 3217 || prev.st_gid != w->attr.st_gid
2821 || w->prev.st_rdev != w->attr.st_rdev 3218 || prev.st_rdev != w->attr.st_rdev
2822 || w->prev.st_size != w->attr.st_size 3219 || prev.st_size != w->attr.st_size
2823 || w->prev.st_atime != w->attr.st_atime 3220 || prev.st_atime != w->attr.st_atime
2824 || w->prev.st_mtime != w->attr.st_mtime 3221 || prev.st_mtime != w->attr.st_mtime
2825 || w->prev.st_ctime != w->attr.st_ctime 3222 || prev.st_ctime != w->attr.st_ctime
2826 ) { 3223 ) {
3224 /* we only update w->prev on actual differences */
3225 /* in case we test more often than invoke the callback, */
3226 /* to ensure that prev is always different to attr */
3227 w->prev = prev;
3228
2827 #if EV_USE_INOTIFY 3229 #if EV_USE_INOTIFY
2828 if (fs_fd >= 0) 3230 if (fs_fd >= 0)
2829 { 3231 {
2830 infy_del (EV_A_ w); 3232 infy_del (EV_A_ w);
2831 infy_add (EV_A_ w); 3233 infy_add (EV_A_ w);
… …
2856 3258
2857 if (fs_fd >= 0) 3259 if (fs_fd >= 0)
2858 infy_add (EV_A_ w); 3260 infy_add (EV_A_ w);
2859 else 3261 else
2860#endif 3262#endif
3263 {
2861 ev_timer_again (EV_A_ &w->timer); 3264 ev_timer_again (EV_A_ &w->timer);
3265 ev_unref (EV_A);
3266 }
2862 3267
2863 ev_start (EV_A_ (W)w, 1); 3268 ev_start (EV_A_ (W)w, 1);
2864 3269
2865 EV_FREQUENT_CHECK; 3270 EV_FREQUENT_CHECK;
2866} 3271}
… …
2875 EV_FREQUENT_CHECK; 3280 EV_FREQUENT_CHECK;
2876 3281
2877#if EV_USE_INOTIFY 3282#if EV_USE_INOTIFY
2878 infy_del (EV_A_ w); 3283 infy_del (EV_A_ w);
2879#endif 3284#endif
3285
3286 if (ev_is_active (&w->timer))
3287 {
3288 ev_ref (EV_A);
2880 ev_timer_stop (EV_A_ &w->timer); 3289 ev_timer_stop (EV_A_ &w->timer);
3290 }
2881 3291
2882 ev_stop (EV_A_ (W)w); 3292 ev_stop (EV_A_ (W)w);
2883 3293
2884 EV_FREQUENT_CHECK; 3294 EV_FREQUENT_CHECK;
2885} 3295}
… …
2930 3340
2931 EV_FREQUENT_CHECK; 3341 EV_FREQUENT_CHECK;
2932} 3342}
2933#endif 3343#endif
2934 3344
3345#if EV_PREPARE_ENABLE
2935void 3346void
2936ev_prepare_start (EV_P_ ev_prepare *w) 3347ev_prepare_start (EV_P_ ev_prepare *w)
2937{ 3348{
2938 if (expect_false (ev_is_active (w))) 3349 if (expect_false (ev_is_active (w)))
2939 return; 3350 return;
… …
2965 3376
2966 ev_stop (EV_A_ (W)w); 3377 ev_stop (EV_A_ (W)w);
2967 3378
2968 EV_FREQUENT_CHECK; 3379 EV_FREQUENT_CHECK;
2969} 3380}
3381#endif
2970 3382
3383#if EV_CHECK_ENABLE
2971void 3384void
2972ev_check_start (EV_P_ ev_check *w) 3385ev_check_start (EV_P_ ev_check *w)
2973{ 3386{
2974 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
2975 return; 3388 return;
… …
3001 3414
3002 ev_stop (EV_A_ (W)w); 3415 ev_stop (EV_A_ (W)w);
3003 3416
3004 EV_FREQUENT_CHECK; 3417 EV_FREQUENT_CHECK;
3005} 3418}
3419#endif
3006 3420
3007#if EV_EMBED_ENABLE 3421#if EV_EMBED_ENABLE
3008void noinline 3422void noinline
3009ev_embed_sweep (EV_P_ ev_embed *w) 3423ev_embed_sweep (EV_P_ ev_embed *w)
3010{ 3424{
… …
3026embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3440embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3027{ 3441{
3028 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3442 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3029 3443
3030 { 3444 {
3031 struct ev_loop *loop = w->other; 3445 EV_P = w->other;
3032 3446
3033 while (fdchangecnt) 3447 while (fdchangecnt)
3034 { 3448 {
3035 fd_reify (EV_A); 3449 fd_reify (EV_A);
3036 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3450 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3044 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3458 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3045 3459
3046 ev_embed_stop (EV_A_ w); 3460 ev_embed_stop (EV_A_ w);
3047 3461
3048 { 3462 {
3049 struct ev_loop *loop = w->other; 3463 EV_P = w->other;
3050 3464
3051 ev_loop_fork (EV_A); 3465 ev_loop_fork (EV_A);
3052 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3466 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3053 } 3467 }
3054 3468
… …
3068{ 3482{
3069 if (expect_false (ev_is_active (w))) 3483 if (expect_false (ev_is_active (w)))
3070 return; 3484 return;
3071 3485
3072 { 3486 {
3073 struct ev_loop *loop = w->other; 3487 EV_P = w->other;
3074 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3488 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3075 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3489 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3076 } 3490 }
3077 3491
3078 EV_FREQUENT_CHECK; 3492 EV_FREQUENT_CHECK;
… …
3105 3519
3106 ev_io_stop (EV_A_ &w->io); 3520 ev_io_stop (EV_A_ &w->io);
3107 ev_prepare_stop (EV_A_ &w->prepare); 3521 ev_prepare_stop (EV_A_ &w->prepare);
3108 ev_fork_stop (EV_A_ &w->fork); 3522 ev_fork_stop (EV_A_ &w->fork);
3109 3523
3524 ev_stop (EV_A_ (W)w);
3525
3110 EV_FREQUENT_CHECK; 3526 EV_FREQUENT_CHECK;
3111} 3527}
3112#endif 3528#endif
3113 3529
3114#if EV_FORK_ENABLE 3530#if EV_FORK_ENABLE
… …
3190 3606
3191void 3607void
3192ev_async_send (EV_P_ ev_async *w) 3608ev_async_send (EV_P_ ev_async *w)
3193{ 3609{
3194 w->sent = 1; 3610 w->sent = 1;
3195 evpipe_write (EV_A_ &gotasync); 3611 evpipe_write (EV_A_ &async_pending);
3196} 3612}
3197#endif 3613#endif
3198 3614
3199/*****************************************************************************/ 3615/*****************************************************************************/
3200 3616
… …
3240{ 3656{
3241 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3657 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3242 3658
3243 if (expect_false (!once)) 3659 if (expect_false (!once))
3244 { 3660 {
3245 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3661 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3246 return; 3662 return;
3247 } 3663 }
3248 3664
3249 once->cb = cb; 3665 once->cb = cb;
3250 once->arg = arg; 3666 once->arg = arg;
… …
3337 if (types & EV_ASYNC) 3753 if (types & EV_ASYNC)
3338 for (i = asynccnt; i--; ) 3754 for (i = asynccnt; i--; )
3339 cb (EV_A_ EV_ASYNC, asyncs [i]); 3755 cb (EV_A_ EV_ASYNC, asyncs [i]);
3340#endif 3756#endif
3341 3757
3758#if EV_PREPARE_ENABLE
3342 if (types & EV_PREPARE) 3759 if (types & EV_PREPARE)
3343 for (i = preparecnt; i--; ) 3760 for (i = preparecnt; i--; )
3344#if EV_EMBED_ENABLE 3761# if EV_EMBED_ENABLE
3345 if (ev_cb (prepares [i]) != embed_prepare_cb) 3762 if (ev_cb (prepares [i]) != embed_prepare_cb)
3346#endif 3763# endif
3347 cb (EV_A_ EV_PREPARE, prepares [i]); 3764 cb (EV_A_ EV_PREPARE, prepares [i]);
3765#endif
3348 3766
3767#if EV_CHECK_ENABLE
3349 if (types & EV_CHECK) 3768 if (types & EV_CHECK)
3350 for (i = checkcnt; i--; ) 3769 for (i = checkcnt; i--; )
3351 cb (EV_A_ EV_CHECK, checks [i]); 3770 cb (EV_A_ EV_CHECK, checks [i]);
3771#endif
3352 3772
3773#if EV_SIGNAL_ENABLE
3353 if (types & EV_SIGNAL) 3774 if (types & EV_SIGNAL)
3354 for (i = 0; i < signalmax; ++i) 3775 for (i = 0; i < EV_NSIG - 1; ++i)
3355 for (wl = signals [i].head; wl; ) 3776 for (wl = signals [i].head; wl; )
3356 { 3777 {
3357 wn = wl->next; 3778 wn = wl->next;
3358 cb (EV_A_ EV_SIGNAL, wl); 3779 cb (EV_A_ EV_SIGNAL, wl);
3359 wl = wn; 3780 wl = wn;
3360 } 3781 }
3782#endif
3361 3783
3784#if EV_CHILD_ENABLE
3362 if (types & EV_CHILD) 3785 if (types & EV_CHILD)
3363 for (i = EV_PID_HASHSIZE; i--; ) 3786 for (i = (EV_PID_HASHSIZE); i--; )
3364 for (wl = childs [i]; wl; ) 3787 for (wl = childs [i]; wl; )
3365 { 3788 {
3366 wn = wl->next; 3789 wn = wl->next;
3367 cb (EV_A_ EV_CHILD, wl); 3790 cb (EV_A_ EV_CHILD, wl);
3368 wl = wn; 3791 wl = wn;
3369 } 3792 }
3793#endif
3370/* EV_STAT 0x00001000 /* stat data changed */ 3794/* EV_STAT 0x00001000 /* stat data changed */
3371/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3795/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3372} 3796}
3373#endif 3797#endif
3374 3798

Diff Legend

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