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

Comparing libev/ev.c (file contents):
Revision 1.285 by root, Wed Apr 15 19:35:53 2009 UTC vs.
Revision 1.341 by root, Tue Mar 16 20:48:29 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 *
… …
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
… …
77# endif 79# endif
78# endif 80# endif
79 81
80# ifndef EV_USE_NANOSLEEP 82# ifndef EV_USE_NANOSLEEP
81# if HAVE_NANOSLEEP 83# if HAVE_NANOSLEEP
82# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
83# else 85# else
84# define EV_USE_NANOSLEEP 0 86# define EV_USE_NANOSLEEP 0
85# endif 87# endif
86# endif 88# endif
87 89
88# ifndef EV_USE_SELECT 90# ifndef EV_USE_SELECT
89# if HAVE_SELECT && HAVE_SYS_SELECT_H 91# if HAVE_SELECT && HAVE_SYS_SELECT_H
90# define EV_USE_SELECT 1 92# define EV_USE_SELECT EV_FEATURE_BACKENDS
91# else 93# else
92# define EV_USE_SELECT 0 94# define EV_USE_SELECT 0
93# endif 95# endif
94# endif 96# endif
95 97
96# ifndef EV_USE_POLL 98# ifndef EV_USE_POLL
97# if HAVE_POLL && HAVE_POLL_H 99# if HAVE_POLL && HAVE_POLL_H
98# define EV_USE_POLL 1 100# define EV_USE_POLL EV_FEATURE_BACKENDS
99# else 101# else
100# define EV_USE_POLL 0 102# define EV_USE_POLL 0
101# endif 103# endif
102# endif 104# endif
103 105
104# ifndef EV_USE_EPOLL 106# ifndef EV_USE_EPOLL
105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# define EV_USE_EPOLL 1 108# define EV_USE_EPOLL EV_FEATURE_BACKENDS
107# else 109# else
108# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
109# endif 111# endif
110# endif 112# endif
111 113
112# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
115# else 117# else
116# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
117# endif 119# endif
118# endif 120# endif
119 121
120# ifndef EV_USE_PORT 122# ifndef EV_USE_PORT
121# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
122# define EV_USE_PORT 1 124# define EV_USE_PORT EV_FEATURE_BACKENDS
123# else 125# else
124# define EV_USE_PORT 0 126# define EV_USE_PORT 0
125# endif 127# endif
126# endif 128# endif
127 129
128# ifndef EV_USE_INOTIFY 130# ifndef EV_USE_INOTIFY
129# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
130# define EV_USE_INOTIFY 1 132# define EV_USE_INOTIFY EV_FEATURE_OS
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD EV_FEATURE_OS
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD EV_FEATURE_OS
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
141# endif 151# endif
142# endif 152# endif
143 153
144#endif 154#endif
145 155
146#include <math.h> 156#include <math.h>
147#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
148#include <fcntl.h> 159#include <fcntl.h>
149#include <stddef.h> 160#include <stddef.h>
150 161
151#include <stdio.h> 162#include <stdio.h>
152 163
153#include <assert.h> 164#include <assert.h>
154#include <errno.h> 165#include <errno.h>
155#include <sys/types.h> 166#include <sys/types.h>
156#include <time.h> 167#include <time.h>
168#include <limits.h>
157 169
158#include <signal.h> 170#include <signal.h>
159 171
160#ifdef EV_H 172#ifdef EV_H
161# include EV_H 173# include EV_H
… …
172# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 185# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
176# endif 188# endif
189# undef EV_AVOID_STDIO
177#endif 190#endif
178 191
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line, */
218/* but consider reporting it, too! :) */
219# define EV_NSIG 65
220#endif
180 221
181#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
184# else 225# else
185# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
186# endif 227# endif
187#endif 228#endif
188 229
189#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
192# else 233# else
193# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
194# endif 235# endif
195#endif 236#endif
196 237
… …
198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
199#endif 240#endif
200 241
201#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
204# else 245# else
205# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
206# endif 247# endif
207#endif 248#endif
208 249
209#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
210# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
211#endif 252#endif
212 253
213#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
214# ifdef _WIN32 255# ifdef _WIN32
215# define EV_USE_POLL 0 256# define EV_USE_POLL 0
216# else 257# else
217# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
218# endif 259# endif
219#endif 260#endif
220 261
221#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
222# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
223# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
224# else 265# else
225# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
226# endif 267# endif
227#endif 268#endif
228 269
… …
234# define EV_USE_PORT 0 275# define EV_USE_PORT 0
235#endif 276#endif
236 277
237#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
238# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
239# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
240# else 281# else
241# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
242# endif 283# endif
243#endif 284#endif
244 285
245#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
246# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
247# define EV_PID_HASHSIZE 1
248# else
249# define EV_PID_HASHSIZE 16
250# endif
251#endif 288#endif
252 289
253#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
254# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
255# define EV_INOTIFY_HASHSIZE 1
256# else
257# define EV_INOTIFY_HASHSIZE 16
258# endif
259#endif 292#endif
260 293
261#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
262# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
263# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
264# else 297# else
265# define EV_USE_EVENTFD 0 298# define EV_USE_EVENTFD 0
299# endif
300#endif
301
302#ifndef EV_USE_SIGNALFD
303# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
304# define EV_USE_SIGNALFD EV_FEATURE_OS
305# else
306# define EV_USE_SIGNALFD 0
266# endif 307# endif
267#endif 308#endif
268 309
269#if 0 /* debugging */ 310#if 0 /* debugging */
270# define EV_VERIFY 3 311# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
273#endif 314#endif
274 315
275#ifndef EV_VERIFY 316#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
277#endif 318#endif
278 319
279#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
281#endif 322#endif
282 323
283#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
326#endif
327
328/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
329/* which makes programs even slower. might work on other unices, too. */
330#if EV_USE_CLOCK_SYSCALL
331# include <syscall.h>
332# ifdef SYS_clock_gettime
333# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
334# undef EV_USE_MONOTONIC
335# define EV_USE_MONOTONIC 1
336# else
337# undef EV_USE_CLOCK_SYSCALL
338# define EV_USE_CLOCK_SYSCALL 0
339# endif
285#endif 340#endif
286 341
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 342/* this block fixes any misconfiguration where we know we run into trouble otherwise */
343
344#ifdef _AIX
345/* AIX has a completely broken poll.h header */
346# undef EV_USE_POLL
347# define EV_USE_POLL 0
348#endif
288 349
289#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
292#endif 353#endif
… …
320 381
321#if EV_SELECT_IS_WINSOCKET 382#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 383# include <winsock.h>
323#endif 384#endif
324 385
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 386#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 387/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 388# include <stdint.h>
389# ifndef EFD_NONBLOCK
390# define EFD_NONBLOCK O_NONBLOCK
391# endif
392# ifndef EFD_CLOEXEC
393# ifdef O_CLOEXEC
394# define EFD_CLOEXEC O_CLOEXEC
395# else
396# define EFD_CLOEXEC 02000000
397# endif
398# endif
337# ifdef __cplusplus 399# ifdef __cplusplus
338extern "C" { 400extern "C" {
339# endif 401# endif
340int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
341# ifdef __cplusplus 403# ifdef __cplusplus
342} 404}
343# endif 405# endif
344#endif 406#endif
345 407
408#if EV_USE_SIGNALFD
409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h>
411# ifndef SFD_NONBLOCK
412# define SFD_NONBLOCK O_NONBLOCK
413# endif
414# ifndef SFD_CLOEXEC
415# ifdef O_CLOEXEC
416# define SFD_CLOEXEC O_CLOEXEC
417# else
418# define SFD_CLOEXEC 02000000
419# endif
420# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags);
425
426struct signalfd_siginfo
427{
428 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)];
430};
431# ifdef __cplusplus
432}
433# endif
434#endif
435
436
346/**/ 437/**/
347 438
348#if EV_VERIFY >= 3 439#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 440# define EV_FREQUENT_CHECK ev_verify (EV_A)
350#else 441#else
351# define EV_FREQUENT_CHECK do { } while (0) 442# define EV_FREQUENT_CHECK do { } while (0)
352#endif 443#endif
353 444
354/* 445/*
… …
361 */ 452 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 454
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 455#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 456#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 457
368#if __GNUC__ >= 4 458#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 459# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 460# define noinline __attribute__ ((noinline))
371#else 461#else
… …
378 468
379#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
380#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
381#define inline_size static inline 471#define inline_size static inline
382 472
383#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
384# define inline_speed static noinline 476# define inline_speed static noinline
477#endif
478
479#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
480
481#if EV_MINPRI == EV_MAXPRI
482# define ABSPRI(w) (((W)w), 0)
385#else 483#else
386# define inline_speed static inline
387#endif
388
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 484# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
485#endif
391 486
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 487#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 488#define EMPTY2(a,b) /* used to suppress some warnings */
394 489
395typedef ev_watcher *W; 490typedef ev_watcher *W;
… …
407 502
408#if EV_USE_MONOTONIC 503#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 505#endif
411 506
507#ifndef EV_FD_TO_WIN32_HANDLE
508# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
509#endif
510#ifndef EV_WIN32_HANDLE_TO_FD
511# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
512#endif
513#ifndef EV_WIN32_CLOSE_FD
514# define EV_WIN32_CLOSE_FD(fd) close (fd)
515#endif
516
412#ifdef _WIN32 517#ifdef _WIN32
413# include "ev_win32.c" 518# include "ev_win32.c"
414#endif 519#endif
415 520
416/*****************************************************************************/ 521/*****************************************************************************/
522
523#if EV_AVOID_STDIO
524static void noinline
525ev_printerr (const char *msg)
526{
527 write (STDERR_FILENO, msg, strlen (msg));
528}
529#endif
417 530
418static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
419 532
420void 533void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
… …
431 544
432 if (syserr_cb) 545 if (syserr_cb)
433 syserr_cb (msg); 546 syserr_cb (msg);
434 else 547 else
435 { 548 {
549#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg);
553 ev_printerr (": ");
554 ev_printerr (err);
555 ev_printerr ("\n");
556#else
436 perror (msg); 557 perror (msg);
558#endif
437 abort (); 559 abort ();
438 } 560 }
439} 561}
440 562
441static void * 563static void *
442ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
443{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
444 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 570 * implement realloc (x, 0) (as required by both ansi c-89 and
446 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
447 */ 572 */
448 573
449 if (size) 574 if (size)
450 return realloc (ptr, size); 575 return realloc (ptr, size);
451 576
452 free (ptr); 577 free (ptr);
453 return 0; 578 return 0;
579#endif
454} 580}
455 581
456static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
457 583
458void 584void
… …
466{ 592{
467 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
468 594
469 if (!ptr && size) 595 if (!ptr && size)
470 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
472 abort (); 602 abort ();
473 } 603 }
474 604
475 return ptr; 605 return ptr;
476} 606}
… …
478#define ev_malloc(size) ev_realloc (0, (size)) 608#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 609#define ev_free(ptr) ev_realloc ((ptr), 0)
480 610
481/*****************************************************************************/ 611/*****************************************************************************/
482 612
613/* set in reify when reification needed */
614#define EV_ANFD_REIFY 1
615
616/* file descriptor info structure */
483typedef struct 617typedef struct
484{ 618{
485 WL head; 619 WL head;
486 unsigned char events; 620 unsigned char events; /* the events watched for */
487 unsigned char reify; 621 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 622 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 623 unsigned char unused;
490#if EV_USE_EPOLL 624#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 625 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 626#endif
493#if EV_SELECT_IS_WINSOCKET 627#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 628 SOCKET handle;
495#endif 629#endif
496} ANFD; 630} ANFD;
497 631
632/* stores the pending event set for a given watcher */
498typedef struct 633typedef struct
499{ 634{
500 W w; 635 W w;
501 int events; 636 int events; /* the pending event set for the given watcher */
502} ANPENDING; 637} ANPENDING;
503 638
504#if EV_USE_INOTIFY 639#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 640/* hash table entry per inotify-id */
506typedef struct 641typedef struct
… …
509} ANFS; 644} ANFS;
510#endif 645#endif
511 646
512/* Heap Entry */ 647/* Heap Entry */
513#if EV_HEAP_CACHE_AT 648#if EV_HEAP_CACHE_AT
649 /* a heap element */
514 typedef struct { 650 typedef struct {
515 ev_tstamp at; 651 ev_tstamp at;
516 WT w; 652 WT w;
517 } ANHE; 653 } ANHE;
518 654
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 655 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 656 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 657 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 658#else
659 /* a heap element */
523 typedef WT ANHE; 660 typedef WT ANHE;
524 661
525 #define ANHE_w(he) (he) 662 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 663 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 664 #define ANHE_at_cache(he)
… …
551 688
552 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
553 690
554#endif 691#endif
555 692
693#if EV_FEATURE_API
694# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
695# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
696# define EV_INVOKE_PENDING invoke_cb (EV_A)
697#else
698# define EV_RELEASE_CB (void)0
699# define EV_ACQUIRE_CB (void)0
700# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
701#endif
702
703#define EVUNLOOP_RECURSE 0x80
704
556/*****************************************************************************/ 705/*****************************************************************************/
557 706
707#ifndef EV_HAVE_EV_TIME
558ev_tstamp 708ev_tstamp
559ev_time (void) 709ev_time (void)
560{ 710{
561#if EV_USE_REALTIME 711#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 712 if (expect_true (have_realtime))
… …
569 719
570 struct timeval tv; 720 struct timeval tv;
571 gettimeofday (&tv, 0); 721 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 722 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 723}
724#endif
574 725
575inline_size ev_tstamp 726inline_size ev_tstamp
576get_clock (void) 727get_clock (void)
577{ 728{
578#if EV_USE_MONOTONIC 729#if EV_USE_MONOTONIC
… …
614 765
615 tv.tv_sec = (time_t)delay; 766 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 767 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 768
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 771 /* by older ones */
621 select (0, 0, 0, 0, &tv); 772 select (0, 0, 0, 0, &tv);
622#endif 773#endif
623 } 774 }
624} 775}
625 776
626/*****************************************************************************/ 777/*****************************************************************************/
627 778
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 779#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 780
781/* find a suitable new size for the given array, */
782/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 783inline_size int
631array_nextsize (int elem, int cur, int cnt) 784array_nextsize (int elem, int cur, int cnt)
632{ 785{
633 int ncur = cur + 1; 786 int ncur = cur + 1;
634 787
… …
680#define array_free(stem, idx) \ 833#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 834 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 835
683/*****************************************************************************/ 836/*****************************************************************************/
684 837
838/* dummy callback for pending events */
839static void noinline
840pendingcb (EV_P_ ev_prepare *w, int revents)
841{
842}
843
685void noinline 844void noinline
686ev_feed_event (EV_P_ void *w, int revents) 845ev_feed_event (EV_P_ void *w, int revents)
687{ 846{
688 W w_ = (W)w; 847 W w_ = (W)w;
689 int pri = ABSPRI (w_); 848 int pri = ABSPRI (w_);
… …
724} 883}
725 884
726/*****************************************************************************/ 885/*****************************************************************************/
727 886
728inline_speed void 887inline_speed void
729fd_event (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
730{ 889{
731 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
732 ev_io *w; 891 ev_io *w;
733 892
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 893 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
738 if (ev) 897 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 898 ev_feed_event (EV_A_ (W)w, ev);
740 } 899 }
741} 900}
742 901
902/* do not submit kernel events for fds that have reify set */
903/* because that means they changed while we were polling for new events */
904inline_speed void
905fd_event (EV_P_ int fd, int revents)
906{
907 ANFD *anfd = anfds + fd;
908
909 if (expect_true (!anfd->reify))
910 fd_event_nocheck (EV_A_ fd, revents);
911}
912
743void 913void
744ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 915{
746 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
748} 918}
749 919
920/* make sure the external fd watch events are in-sync */
921/* with the kernel/libev internal state */
750inline_size void 922inline_size void
751fd_reify (EV_P) 923fd_reify (EV_P)
752{ 924{
753 int i; 925 int i;
754 926
… …
765 937
766#if EV_SELECT_IS_WINSOCKET 938#if EV_SELECT_IS_WINSOCKET
767 if (events) 939 if (events)
768 { 940 {
769 unsigned long arg; 941 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
776 } 944 }
777#endif 945#endif
778 946
779 { 947 {
… …
789 } 957 }
790 958
791 fdchangecnt = 0; 959 fdchangecnt = 0;
792} 960}
793 961
962/* something about the given fd changed */
794inline_size void 963inline_size void
795fd_change (EV_P_ int fd, int flags) 964fd_change (EV_P_ int fd, int flags)
796{ 965{
797 unsigned char reify = anfds [fd].reify; 966 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 967 anfds [fd].reify |= flags;
… …
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 972 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 973 fdchanges [fdchangecnt - 1] = fd;
805 } 974 }
806} 975}
807 976
977/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 978inline_speed void
809fd_kill (EV_P_ int fd) 979fd_kill (EV_P_ int fd)
810{ 980{
811 ev_io *w; 981 ev_io *w;
812 982
… …
815 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 986 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 987 }
818} 988}
819 989
990/* check whether the given fd is actually valid, for error recovery */
820inline_size int 991inline_size int
821fd_valid (int fd) 992fd_valid (int fd)
822{ 993{
823#ifdef _WIN32 994#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 996#else
826 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
827#endif 998#endif
828} 999}
829 1000
… …
847 1018
848 for (fd = anfdmax; fd--; ) 1019 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1020 if (anfds [fd].events)
850 { 1021 {
851 fd_kill (EV_A_ fd); 1022 fd_kill (EV_A_ fd);
852 return; 1023 break;
853 } 1024 }
854} 1025}
855 1026
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1027/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1028static void noinline
… …
862 for (fd = 0; fd < anfdmax; ++fd) 1033 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1034 if (anfds [fd].events)
864 { 1035 {
865 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1039 }
1040}
1041
1042/* used to prepare libev internal fd's */
1043/* this is not fork-safe */
1044inline_speed void
1045fd_intern (int fd)
1046{
1047#ifdef _WIN32
1048 unsigned long arg = 1;
1049 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1050#else
1051 fcntl (fd, F_SETFD, FD_CLOEXEC);
1052 fcntl (fd, F_SETFL, O_NONBLOCK);
1053#endif
869} 1054}
870 1055
871/*****************************************************************************/ 1056/*****************************************************************************/
872 1057
873/* 1058/*
… …
947 1132
948 for (;;) 1133 for (;;)
949 { 1134 {
950 int c = k << 1; 1135 int c = k << 1;
951 1136
952 if (c > N + HEAP0 - 1) 1137 if (c >= N + HEAP0)
953 break; 1138 break;
954 1139
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1140 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1141 ? 1 : 0;
957 1142
… …
989 1174
990 heap [k] = he; 1175 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1176 ev_active (ANHE_w (he)) = k;
992} 1177}
993 1178
1179/* move an element suitably so it is in a correct place */
994inline_size void 1180inline_size void
995adjustheap (ANHE *heap, int N, int k) 1181adjustheap (ANHE *heap, int N, int k)
996{ 1182{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1183 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1184 upheap (heap, k);
999 else 1185 else
1000 downheap (heap, N, k); 1186 downheap (heap, N, k);
1001} 1187}
1002 1188
… …
1012 upheap (heap, i + HEAP0); 1198 upheap (heap, i + HEAP0);
1013} 1199}
1014 1200
1015/*****************************************************************************/ 1201/*****************************************************************************/
1016 1202
1203/* associate signal watchers to a signal signal */
1017typedef struct 1204typedef struct
1018{ 1205{
1206 EV_ATOMIC_T pending;
1207#if EV_MULTIPLICITY
1208 EV_P;
1209#endif
1019 WL head; 1210 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1211} ANSIG;
1022 1212
1023static ANSIG *signals; 1213static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1214
1028/*****************************************************************************/ 1215/*****************************************************************************/
1029 1216
1030inline_speed void 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1031fd_intern (int fd)
1032{
1033#ifdef _WIN32
1034 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1036#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif
1040}
1041 1218
1042static void noinline 1219static void noinline
1043evpipe_init (EV_P) 1220evpipe_init (EV_P)
1044{ 1221{
1045 if (!ev_is_active (&pipeev)) 1222 if (!ev_is_active (&pipe_w))
1046 { 1223 {
1047#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1226 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1227 evfd = eventfd (0, 0);
1228
1229 if (evfd >= 0)
1049 { 1230 {
1050 evpipe [0] = -1; 1231 evpipe [0] = -1;
1051 fd_intern (evfd); 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1234 }
1054 else 1235 else
1055#endif 1236# endif
1056 { 1237 {
1057 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1059 1240
1060 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1242 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1243 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1244 }
1064 1245
1065 ev_io_start (EV_A_ &pipeev); 1246 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1247 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1248 }
1068} 1249}
1069 1250
1070inline_size void 1251inline_size void
1071evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1072{ 1253{
1073 if (!*flag) 1254 if (!*flag)
1074 { 1255 {
1075 int old_errno = errno; /* save errno because write might clobber it */ 1256 int old_errno = errno; /* save errno because write might clobber it */
1257 char dummy;
1076 1258
1077 *flag = 1; 1259 *flag = 1;
1078 1260
1079#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1080 if (evfd >= 0) 1262 if (evfd >= 0)
… …
1082 uint64_t counter = 1; 1264 uint64_t counter = 1;
1083 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1084 } 1266 }
1085 else 1267 else
1086#endif 1268#endif
1087 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1088 1270
1089 errno = old_errno; 1271 errno = old_errno;
1090 } 1272 }
1091} 1273}
1092 1274
1275/* called whenever the libev signal pipe */
1276/* got some events (signal, async) */
1093static void 1277static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1279{
1280 int i;
1281
1096#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1283 if (evfd >= 0)
1098 { 1284 {
1099 uint64_t counter; 1285 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
… …
1104 { 1290 {
1105 char dummy; 1291 char dummy;
1106 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1107 } 1293 }
1108 1294
1109 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1110 { 1296 {
1111 int signum; 1297 sig_pending = 0;
1112 gotsig = 0;
1113 1298
1114 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1302 }
1118 1303
1119#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1120 if (gotasync) 1305 if (async_pending)
1121 { 1306 {
1122 int i; 1307 async_pending = 0;
1123 gotasync = 0;
1124 1308
1125 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1127 { 1311 {
1128 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
… …
1136 1320
1137static void 1321static void
1138ev_sighandler (int signum) 1322ev_sighandler (int signum)
1139{ 1323{
1140#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1142#endif 1326#endif
1143 1327
1144#if _WIN32 1328#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1146#endif 1330#endif
1147 1331
1148 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1150} 1334}
1151 1335
1152void noinline 1336void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1154{ 1338{
1155 WL w; 1339 WL w;
1156 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1157#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1347 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1349
1161 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1351 return;
1352#endif
1165 1353
1166 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1167 1355
1168 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1358}
1171 1359
1360#if EV_USE_SIGNALFD
1361static void
1362sigfdcb (EV_P_ ev_io *iow, int revents)
1363{
1364 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1365
1366 for (;;)
1367 {
1368 ssize_t res = read (sigfd, si, sizeof (si));
1369
1370 /* not ISO-C, as res might be -1, but works with SuS */
1371 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1372 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1373
1374 if (res < (ssize_t)sizeof (si))
1375 break;
1376 }
1377}
1378#endif
1379
1380#endif
1381
1172/*****************************************************************************/ 1382/*****************************************************************************/
1173 1383
1384#if EV_CHILD_ENABLE
1174static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1175
1176#ifndef _WIN32
1177 1386
1178static ev_signal childev; 1387static ev_signal childev;
1179 1388
1180#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
1182#endif 1391#endif
1183 1392
1393/* handle a single child status event */
1184inline_speed void 1394inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1186{ 1396{
1187 ev_child *w; 1397 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1189 1399
1190 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1400 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1191 { 1401 {
1192 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1193 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1194 { 1404 {
1195 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1405 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
… …
1202 1412
1203#ifndef WCONTINUED 1413#ifndef WCONTINUED
1204# define WCONTINUED 0 1414# define WCONTINUED 0
1205#endif 1415#endif
1206 1416
1417/* called on sigchld etc., calls waitpid */
1207static void 1418static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1419childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1420{
1210 int pid, status; 1421 int pid, status;
1211 1422
… …
1219 /* make sure we are called again until all children have been reaped */ 1430 /* make sure we are called again until all children have been reaped */
1220 /* we need to do it this way so that the callback gets called before we continue */ 1431 /* we need to do it this way so that the callback gets called before we continue */
1221 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1222 1433
1223 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1224 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1225 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1436 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1226} 1437}
1227 1438
1228#endif 1439#endif
1229 1440
… …
1318ev_backend (EV_P) 1529ev_backend (EV_P)
1319{ 1530{
1320 return backend; 1531 return backend;
1321} 1532}
1322 1533
1534#if EV_FEATURE_API
1323unsigned int 1535unsigned int
1324ev_loop_count (EV_P) 1536ev_iteration (EV_P)
1325{ 1537{
1326 return loop_count; 1538 return loop_count;
1327} 1539}
1328 1540
1541unsigned int
1542ev_depth (EV_P)
1543{
1544 return loop_depth;
1545}
1546
1329void 1547void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1548ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1549{
1332 io_blocktime = interval; 1550 io_blocktime = interval;
1333} 1551}
… …
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1554ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1555{
1338 timeout_blocktime = interval; 1556 timeout_blocktime = interval;
1339} 1557}
1340 1558
1559void
1560ev_set_userdata (EV_P_ void *data)
1561{
1562 userdata = data;
1563}
1564
1565void *
1566ev_userdata (EV_P)
1567{
1568 return userdata;
1569}
1570
1571void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1572{
1573 invoke_cb = invoke_pending_cb;
1574}
1575
1576void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1577{
1578 release_cb = release;
1579 acquire_cb = acquire;
1580}
1581#endif
1582
1583/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1584static void noinline
1342loop_init (EV_P_ unsigned int flags) 1585loop_init (EV_P_ unsigned int flags)
1343{ 1586{
1344 if (!backend) 1587 if (!backend)
1345 { 1588 {
… …
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1604 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1605 have_monotonic = 1;
1363 } 1606 }
1364#endif 1607#endif
1365 1608
1609 /* pid check not overridable via env */
1610#ifndef _WIN32
1611 if (flags & EVFLAG_FORKCHECK)
1612 curpid = getpid ();
1613#endif
1614
1615 if (!(flags & EVFLAG_NOENV)
1616 && !enable_secure ()
1617 && getenv ("LIBEV_FLAGS"))
1618 flags = atoi (getenv ("LIBEV_FLAGS"));
1619
1366 ev_rt_now = ev_time (); 1620 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1621 mn_now = get_clock ();
1368 now_floor = mn_now; 1622 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1623 rtmn_diff = ev_rt_now - mn_now;
1624#if EV_FEATURE_API
1625 invoke_cb = ev_invoke_pending;
1626#endif
1370 1627
1371 io_blocktime = 0.; 1628 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1629 timeout_blocktime = 0.;
1373 backend = 0; 1630 backend = 0;
1374 backend_fd = -1; 1631 backend_fd = -1;
1375 gotasync = 0; 1632 sig_pending = 0;
1633#if EV_ASYNC_ENABLE
1634 async_pending = 0;
1635#endif
1376#if EV_USE_INOTIFY 1636#if EV_USE_INOTIFY
1377 fs_fd = -2; 1637 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1638#endif
1379 1639#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1640 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1641#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1642
1391 if (!(flags & 0x0000ffffU)) 1643 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1644 flags |= ev_recommended_backends ();
1393 1645
1394#if EV_USE_PORT 1646#if EV_USE_PORT
… …
1405#endif 1657#endif
1406#if EV_USE_SELECT 1658#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1659 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1660#endif
1409 1661
1662 ev_prepare_init (&pending_w, pendingcb);
1663
1664#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1410 ev_init (&pipeev, pipecb); 1665 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1666 ev_set_priority (&pipe_w, EV_MAXPRI);
1667#endif
1412 } 1668 }
1413} 1669}
1414 1670
1671/* free up a loop structure */
1415static void noinline 1672static void noinline
1416loop_destroy (EV_P) 1673loop_destroy (EV_P)
1417{ 1674{
1418 int i; 1675 int i;
1419 1676
1420 if (ev_is_active (&pipeev)) 1677 if (ev_is_active (&pipe_w))
1421 { 1678 {
1422 ev_ref (EV_A); /* signal watcher */ 1679 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1680 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1681
1425#if EV_USE_EVENTFD 1682#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1683 if (evfd >= 0)
1427 close (evfd); 1684 close (evfd);
1428#endif 1685#endif
1429 1686
1430 if (evpipe [0] >= 0) 1687 if (evpipe [0] >= 0)
1431 { 1688 {
1432 close (evpipe [0]); 1689 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1690 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1691 }
1435 } 1692 }
1693
1694#if EV_USE_SIGNALFD
1695 if (ev_is_active (&sigfd_w))
1696 close (sigfd);
1697#endif
1436 1698
1437#if EV_USE_INOTIFY 1699#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1700 if (fs_fd >= 0)
1439 close (fs_fd); 1701 close (fs_fd);
1440#endif 1702#endif
… …
1464#if EV_IDLE_ENABLE 1726#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1727 array_free (idle, [i]);
1466#endif 1728#endif
1467 } 1729 }
1468 1730
1469 ev_free (anfds); anfdmax = 0; 1731 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1732
1471 /* have to use the microsoft-never-gets-it-right macro */ 1733 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1734 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1735 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1736 array_free (timer, EMPTY);
… …
1505#endif 1767#endif
1506#if EV_USE_INOTIFY 1768#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1769 infy_fork (EV_A);
1508#endif 1770#endif
1509 1771
1510 if (ev_is_active (&pipeev)) 1772 if (ev_is_active (&pipe_w))
1511 { 1773 {
1512 /* this "locks" the handlers against writing to the pipe */ 1774 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1775 /* while we modify the fd vars */
1514 gotsig = 1; 1776 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1777#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1778 async_pending = 1;
1517#endif 1779#endif
1518 1780
1519 ev_ref (EV_A); 1781 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1782 ev_io_stop (EV_A_ &pipe_w);
1521 1783
1522#if EV_USE_EVENTFD 1784#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1785 if (evfd >= 0)
1524 close (evfd); 1786 close (evfd);
1525#endif 1787#endif
1526 1788
1527 if (evpipe [0] >= 0) 1789 if (evpipe [0] >= 0)
1528 { 1790 {
1529 close (evpipe [0]); 1791 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1792 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1793 }
1532 1794
1795#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1533 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1799#endif
1536 } 1800 }
1537 1801
1538 postfork = 0; 1802 postfork = 0;
1539} 1803}
1540 1804
1541#if EV_MULTIPLICITY 1805#if EV_MULTIPLICITY
1542 1806
1543struct ev_loop * 1807struct ev_loop *
1544ev_loop_new (unsigned int flags) 1808ev_loop_new (unsigned int flags)
1545{ 1809{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1810 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1811
1548 memset (loop, 0, sizeof (struct ev_loop)); 1812 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1813 loop_init (EV_A_ flags);
1551 1814
1552 if (ev_backend (EV_A)) 1815 if (ev_backend (EV_A))
1553 return loop; 1816 return EV_A;
1554 1817
1555 return 0; 1818 return 0;
1556} 1819}
1557 1820
1558void 1821void
… …
1565void 1828void
1566ev_loop_fork (EV_P) 1829ev_loop_fork (EV_P)
1567{ 1830{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1831 postfork = 1; /* must be in line with ev_default_fork */
1569} 1832}
1833#endif /* multiplicity */
1570 1834
1571#if EV_VERIFY 1835#if EV_VERIFY
1572static void noinline 1836static void noinline
1573verify_watcher (EV_P_ W w) 1837verify_watcher (EV_P_ W w)
1574{ 1838{
… …
1602 verify_watcher (EV_A_ ws [cnt]); 1866 verify_watcher (EV_A_ ws [cnt]);
1603 } 1867 }
1604} 1868}
1605#endif 1869#endif
1606 1870
1871#if EV_FEATURE_API
1607void 1872void
1608ev_loop_verify (EV_P) 1873ev_verify (EV_P)
1609{ 1874{
1610#if EV_VERIFY 1875#if EV_VERIFY
1611 int i; 1876 int i;
1612 WL w; 1877 WL w;
1613 1878
… …
1652#if EV_ASYNC_ENABLE 1917#if EV_ASYNC_ENABLE
1653 assert (asyncmax >= asynccnt); 1918 assert (asyncmax >= asynccnt);
1654 array_verify (EV_A_ (W *)asyncs, asynccnt); 1919 array_verify (EV_A_ (W *)asyncs, asynccnt);
1655#endif 1920#endif
1656 1921
1922#if EV_PREPARE_ENABLE
1657 assert (preparemax >= preparecnt); 1923 assert (preparemax >= preparecnt);
1658 array_verify (EV_A_ (W *)prepares, preparecnt); 1924 array_verify (EV_A_ (W *)prepares, preparecnt);
1925#endif
1659 1926
1927#if EV_CHECK_ENABLE
1660 assert (checkmax >= checkcnt); 1928 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1929 array_verify (EV_A_ (W *)checks, checkcnt);
1930#endif
1662 1931
1663# if 0 1932# if 0
1933#if EV_CHILD_ENABLE
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1934 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1935 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif 1936#endif
1667#endif 1937# endif
1938#endif
1668} 1939}
1669 1940#endif
1670#endif /* multiplicity */
1671 1941
1672#if EV_MULTIPLICITY 1942#if EV_MULTIPLICITY
1673struct ev_loop * 1943struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1944ev_default_loop_init (unsigned int flags)
1675#else 1945#else
… …
1678#endif 1948#endif
1679{ 1949{
1680 if (!ev_default_loop_ptr) 1950 if (!ev_default_loop_ptr)
1681 { 1951 {
1682#if EV_MULTIPLICITY 1952#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1953 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1954#else
1685 ev_default_loop_ptr = 1; 1955 ev_default_loop_ptr = 1;
1686#endif 1956#endif
1687 1957
1688 loop_init (EV_A_ flags); 1958 loop_init (EV_A_ flags);
1689 1959
1690 if (ev_backend (EV_A)) 1960 if (ev_backend (EV_A))
1691 { 1961 {
1692#ifndef _WIN32 1962#if EV_CHILD_ENABLE
1693 ev_signal_init (&childev, childcb, SIGCHLD); 1963 ev_signal_init (&childev, childcb, SIGCHLD);
1694 ev_set_priority (&childev, EV_MAXPRI); 1964 ev_set_priority (&childev, EV_MAXPRI);
1695 ev_signal_start (EV_A_ &childev); 1965 ev_signal_start (EV_A_ &childev);
1696 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1966 ev_unref (EV_A); /* child watcher should not keep loop alive */
1697#endif 1967#endif
… …
1705 1975
1706void 1976void
1707ev_default_destroy (void) 1977ev_default_destroy (void)
1708{ 1978{
1709#if EV_MULTIPLICITY 1979#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1980 EV_P = ev_default_loop_ptr;
1711#endif 1981#endif
1712 1982
1713 ev_default_loop_ptr = 0; 1983 ev_default_loop_ptr = 0;
1714 1984
1715#ifndef _WIN32 1985#if EV_CHILD_ENABLE
1716 ev_ref (EV_A); /* child watcher */ 1986 ev_ref (EV_A); /* child watcher */
1717 ev_signal_stop (EV_A_ &childev); 1987 ev_signal_stop (EV_A_ &childev);
1718#endif 1988#endif
1719 1989
1720 loop_destroy (EV_A); 1990 loop_destroy (EV_A);
… …
1722 1992
1723void 1993void
1724ev_default_fork (void) 1994ev_default_fork (void)
1725{ 1995{
1726#if EV_MULTIPLICITY 1996#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1997 EV_P = ev_default_loop_ptr;
1728#endif 1998#endif
1729 1999
1730 postfork = 1; /* must be in line with ev_loop_fork */ 2000 postfork = 1; /* must be in line with ev_loop_fork */
1731} 2001}
1732 2002
… …
1736ev_invoke (EV_P_ void *w, int revents) 2006ev_invoke (EV_P_ void *w, int revents)
1737{ 2007{
1738 EV_CB_INVOKE ((W)w, revents); 2008 EV_CB_INVOKE ((W)w, revents);
1739} 2009}
1740 2010
1741inline_speed void 2011unsigned int
1742call_pending (EV_P) 2012ev_pending_count (EV_P)
2013{
2014 int pri;
2015 unsigned int count = 0;
2016
2017 for (pri = NUMPRI; pri--; )
2018 count += pendingcnt [pri];
2019
2020 return count;
2021}
2022
2023void noinline
2024ev_invoke_pending (EV_P)
1743{ 2025{
1744 int pri; 2026 int pri;
1745 2027
1746 for (pri = NUMPRI; pri--; ) 2028 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2029 while (pendingcnt [pri])
1748 { 2030 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2031 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2032
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2033 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2034 /* ^ this is no longer true, as pending_w could be here */
1754 2035
1755 p->w->pending = 0; 2036 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2037 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2038 EV_FREQUENT_CHECK;
1758 }
1759 } 2039 }
1760} 2040}
1761 2041
1762#if EV_IDLE_ENABLE 2042#if EV_IDLE_ENABLE
2043/* make idle watchers pending. this handles the "call-idle */
2044/* only when higher priorities are idle" logic */
1763inline_size void 2045inline_size void
1764idle_reify (EV_P) 2046idle_reify (EV_P)
1765{ 2047{
1766 if (expect_false (idleall)) 2048 if (expect_false (idleall))
1767 { 2049 {
… …
1780 } 2062 }
1781 } 2063 }
1782} 2064}
1783#endif 2065#endif
1784 2066
2067/* make timers pending */
1785inline_size void 2068inline_size void
1786timers_reify (EV_P) 2069timers_reify (EV_P)
1787{ 2070{
1788 EV_FREQUENT_CHECK; 2071 EV_FREQUENT_CHECK;
1789 2072
… …
1813 EV_FREQUENT_CHECK; 2096 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w); 2097 feed_reverse (EV_A_ (W)w);
1815 } 2098 }
1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2099 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1817 2100
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2101 feed_reverse_done (EV_A_ EV_TIMER);
1819 } 2102 }
1820} 2103}
1821 2104
1822#if EV_PERIODIC_ENABLE 2105#if EV_PERIODIC_ENABLE
2106/* make periodics pending */
1823inline_size void 2107inline_size void
1824periodics_reify (EV_P) 2108periodics_reify (EV_P)
1825{ 2109{
1826 EV_FREQUENT_CHECK; 2110 EV_FREQUENT_CHECK;
1827 2111
… …
1874 2158
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2159 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2160 }
1877} 2161}
1878 2162
2163/* simply recalculate all periodics */
2164/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2165static void noinline
1880periodics_reschedule (EV_P) 2166periodics_reschedule (EV_P)
1881{ 2167{
1882 int i; 2168 int i;
1883 2169
… …
1896 2182
1897 reheap (periodics, periodiccnt); 2183 reheap (periodics, periodiccnt);
1898} 2184}
1899#endif 2185#endif
1900 2186
2187/* adjust all timers by a given offset */
1901static void noinline 2188static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust) 2189timers_reschedule (EV_P_ ev_tstamp adjust)
1903{ 2190{
1904 int i; 2191 int i;
1905 2192
… …
1909 ANHE_w (*he)->at += adjust; 2196 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he); 2197 ANHE_at_cache (*he);
1911 } 2198 }
1912} 2199}
1913 2200
2201/* fetch new monotonic and realtime times from the kernel */
2202/* also detect if there was a timejump, and act accordingly */
1914inline_speed void 2203inline_speed void
1915time_update (EV_P_ ev_tstamp max_block) 2204time_update (EV_P_ ev_tstamp max_block)
1916{ 2205{
1917 int i;
1918
1919#if EV_USE_MONOTONIC 2206#if EV_USE_MONOTONIC
1920 if (expect_true (have_monotonic)) 2207 if (expect_true (have_monotonic))
1921 { 2208 {
2209 int i;
1922 ev_tstamp odiff = rtmn_diff; 2210 ev_tstamp odiff = rtmn_diff;
1923 2211
1924 mn_now = get_clock (); 2212 mn_now = get_clock ();
1925 2213
1926 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2214 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1976 2264
1977 mn_now = ev_rt_now; 2265 mn_now = ev_rt_now;
1978 } 2266 }
1979} 2267}
1980 2268
1981static int loop_done;
1982
1983void 2269void
1984ev_loop (EV_P_ int flags) 2270ev_loop (EV_P_ int flags)
1985{ 2271{
2272#if EV_FEATURE_API
2273 ++loop_depth;
2274#endif
2275
2276 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2277
1986 loop_done = EVUNLOOP_CANCEL; 2278 loop_done = EVUNLOOP_CANCEL;
1987 2279
1988 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2280 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1989 2281
1990 do 2282 do
1991 { 2283 {
1992#if EV_VERIFY >= 2 2284#if EV_VERIFY >= 2
1993 ev_loop_verify (EV_A); 2285 ev_verify (EV_A);
1994#endif 2286#endif
1995 2287
1996#ifndef _WIN32 2288#ifndef _WIN32
1997 if (expect_false (curpid)) /* penalise the forking check even more */ 2289 if (expect_false (curpid)) /* penalise the forking check even more */
1998 if (expect_false (getpid () != curpid)) 2290 if (expect_false (getpid () != curpid))
… …
2006 /* we might have forked, so queue fork handlers */ 2298 /* we might have forked, so queue fork handlers */
2007 if (expect_false (postfork)) 2299 if (expect_false (postfork))
2008 if (forkcnt) 2300 if (forkcnt)
2009 { 2301 {
2010 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2302 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2011 call_pending (EV_A); 2303 EV_INVOKE_PENDING;
2012 } 2304 }
2013#endif 2305#endif
2014 2306
2307#if EV_PREPARE_ENABLE
2015 /* queue prepare watchers (and execute them) */ 2308 /* queue prepare watchers (and execute them) */
2016 if (expect_false (preparecnt)) 2309 if (expect_false (preparecnt))
2017 { 2310 {
2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2311 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2019 call_pending (EV_A); 2312 EV_INVOKE_PENDING;
2020 } 2313 }
2314#endif
2315
2316 if (expect_false (loop_done))
2317 break;
2021 2318
2022 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
2023 if (expect_false (postfork)) 2320 if (expect_false (postfork))
2024 loop_fork (EV_A); 2321 loop_fork (EV_A);
2025 2322
… …
2031 ev_tstamp waittime = 0.; 2328 ev_tstamp waittime = 0.;
2032 ev_tstamp sleeptime = 0.; 2329 ev_tstamp sleeptime = 0.;
2033 2330
2034 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2035 { 2332 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
2036 /* update time to cancel out callback processing overhead */ 2336 /* update time to cancel out callback processing overhead */
2037 time_update (EV_A_ 1e100); 2337 time_update (EV_A_ 1e100);
2338
2339 waittime = MAX_BLOCKTIME;
2038 2340
2039 if (timercnt) 2341 if (timercnt)
2040 { 2342 {
2041 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2343 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2042 if (waittime > to) waittime = to; 2344 if (waittime > to) waittime = to;
… …
2048 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2350 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2049 if (waittime > to) waittime = to; 2351 if (waittime > to) waittime = to;
2050 } 2352 }
2051#endif 2353#endif
2052 2354
2355 /* don't let timeouts decrease the waittime below timeout_blocktime */
2053 if (expect_false (waittime < timeout_blocktime)) 2356 if (expect_false (waittime < timeout_blocktime))
2054 waittime = timeout_blocktime; 2357 waittime = timeout_blocktime;
2055 2358
2056 sleeptime = waittime - backend_fudge; 2359 /* extra check because io_blocktime is commonly 0 */
2057
2058 if (expect_true (sleeptime > io_blocktime)) 2360 if (expect_false (io_blocktime))
2059 sleeptime = io_blocktime;
2060
2061 if (sleeptime)
2062 { 2361 {
2362 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2363
2364 if (sleeptime > waittime - backend_fudge)
2365 sleeptime = waittime - backend_fudge;
2366
2367 if (expect_true (sleeptime > 0.))
2368 {
2063 ev_sleep (sleeptime); 2369 ev_sleep (sleeptime);
2064 waittime -= sleeptime; 2370 waittime -= sleeptime;
2371 }
2065 } 2372 }
2066 } 2373 }
2067 2374
2375#if EV_FEATURE_API
2068 ++loop_count; 2376 ++loop_count;
2377#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2069 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2070 2381
2071 /* update ev_rt_now, do magic */ 2382 /* update ev_rt_now, do magic */
2072 time_update (EV_A_ waittime + sleeptime); 2383 time_update (EV_A_ waittime + sleeptime);
2073 } 2384 }
2074 2385
… …
2081#if EV_IDLE_ENABLE 2392#if EV_IDLE_ENABLE
2082 /* queue idle watchers unless other events are pending */ 2393 /* queue idle watchers unless other events are pending */
2083 idle_reify (EV_A); 2394 idle_reify (EV_A);
2084#endif 2395#endif
2085 2396
2397#if EV_CHECK_ENABLE
2086 /* queue check watchers, to be executed first */ 2398 /* queue check watchers, to be executed first */
2087 if (expect_false (checkcnt)) 2399 if (expect_false (checkcnt))
2088 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2400 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2401#endif
2089 2402
2090 call_pending (EV_A); 2403 EV_INVOKE_PENDING;
2091 } 2404 }
2092 while (expect_true ( 2405 while (expect_true (
2093 activecnt 2406 activecnt
2094 && !loop_done 2407 && !loop_done
2095 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2408 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2096 )); 2409 ));
2097 2410
2098 if (loop_done == EVUNLOOP_ONE) 2411 if (loop_done == EVUNLOOP_ONE)
2099 loop_done = EVUNLOOP_CANCEL; 2412 loop_done = EVUNLOOP_CANCEL;
2413
2414#if EV_FEATURE_API
2415 --loop_depth;
2416#endif
2100} 2417}
2101 2418
2102void 2419void
2103ev_unloop (EV_P_ int how) 2420ev_unloop (EV_P_ int how)
2104{ 2421{
… …
2133ev_resume (EV_P) 2450ev_resume (EV_P)
2134{ 2451{
2135 ev_tstamp mn_prev = mn_now; 2452 ev_tstamp mn_prev = mn_now;
2136 2453
2137 ev_now_update (EV_A); 2454 ev_now_update (EV_A);
2138 printf ("update %f\n", mn_now - mn_prev);//D
2139 timers_reschedule (EV_A_ mn_now - mn_prev); 2455 timers_reschedule (EV_A_ mn_now - mn_prev);
2456#if EV_PERIODIC_ENABLE
2457 /* TODO: really do this? */
2140 periodics_reschedule (EV_A); 2458 periodics_reschedule (EV_A);
2459#endif
2141} 2460}
2142 2461
2143/*****************************************************************************/ 2462/*****************************************************************************/
2463/* singly-linked list management, used when the expected list length is short */
2144 2464
2145inline_size void 2465inline_size void
2146wlist_add (WL *head, WL elem) 2466wlist_add (WL *head, WL elem)
2147{ 2467{
2148 elem->next = *head; 2468 elem->next = *head;
… …
2152inline_size void 2472inline_size void
2153wlist_del (WL *head, WL elem) 2473wlist_del (WL *head, WL elem)
2154{ 2474{
2155 while (*head) 2475 while (*head)
2156 { 2476 {
2157 if (*head == elem) 2477 if (expect_true (*head == elem))
2158 { 2478 {
2159 *head = elem->next; 2479 *head = elem->next;
2160 return; 2480 break;
2161 } 2481 }
2162 2482
2163 head = &(*head)->next; 2483 head = &(*head)->next;
2164 } 2484 }
2165} 2485}
2166 2486
2487/* internal, faster, version of ev_clear_pending */
2167inline_speed void 2488inline_speed void
2168clear_pending (EV_P_ W w) 2489clear_pending (EV_P_ W w)
2169{ 2490{
2170 if (w->pending) 2491 if (w->pending)
2171 { 2492 {
2172 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2493 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2173 w->pending = 0; 2494 w->pending = 0;
2174 } 2495 }
2175} 2496}
2176 2497
2177int 2498int
… …
2181 int pending = w_->pending; 2502 int pending = w_->pending;
2182 2503
2183 if (expect_true (pending)) 2504 if (expect_true (pending))
2184 { 2505 {
2185 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2506 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2507 p->w = (W)&pending_w;
2186 w_->pending = 0; 2508 w_->pending = 0;
2187 p->w = 0;
2188 return p->events; 2509 return p->events;
2189 } 2510 }
2190 else 2511 else
2191 return 0; 2512 return 0;
2192} 2513}
2193 2514
2194inline_size void 2515inline_size void
2195pri_adjust (EV_P_ W w) 2516pri_adjust (EV_P_ W w)
2196{ 2517{
2197 int pri = w->priority; 2518 int pri = ev_priority (w);
2198 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2519 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2199 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2520 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2200 w->priority = pri; 2521 ev_set_priority (w, pri);
2201} 2522}
2202 2523
2203inline_speed void 2524inline_speed void
2204ev_start (EV_P_ W w, int active) 2525ev_start (EV_P_ W w, int active)
2205{ 2526{
… …
2224 2545
2225 if (expect_false (ev_is_active (w))) 2546 if (expect_false (ev_is_active (w)))
2226 return; 2547 return;
2227 2548
2228 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2549 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2229 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2550 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2230 2551
2231 EV_FREQUENT_CHECK; 2552 EV_FREQUENT_CHECK;
2232 2553
2233 ev_start (EV_A_ (W)w, 1); 2554 ev_start (EV_A_ (W)w, 1);
2234 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2555 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2235 wlist_add (&anfds[fd].head, (WL)w); 2556 wlist_add (&anfds[fd].head, (WL)w);
2236 2557
2237 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2558 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2238 w->events &= ~EV__IOFDSET; 2559 w->events &= ~EV__IOFDSET;
2239 2560
2240 EV_FREQUENT_CHECK; 2561 EV_FREQUENT_CHECK;
2241} 2562}
2242 2563
… …
2304 timers [active] = timers [timercnt + HEAP0]; 2625 timers [active] = timers [timercnt + HEAP0];
2305 adjustheap (timers, timercnt, active); 2626 adjustheap (timers, timercnt, active);
2306 } 2627 }
2307 } 2628 }
2308 2629
2309 EV_FREQUENT_CHECK;
2310
2311 ev_at (w) -= mn_now; 2630 ev_at (w) -= mn_now;
2312 2631
2313 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633
2634 EV_FREQUENT_CHECK;
2314} 2635}
2315 2636
2316void noinline 2637void noinline
2317ev_timer_again (EV_P_ ev_timer *w) 2638ev_timer_again (EV_P_ ev_timer *w)
2318{ 2639{
… …
2336 } 2657 }
2337 2658
2338 EV_FREQUENT_CHECK; 2659 EV_FREQUENT_CHECK;
2339} 2660}
2340 2661
2662ev_tstamp
2663ev_timer_remaining (EV_P_ ev_timer *w)
2664{
2665 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2666}
2667
2341#if EV_PERIODIC_ENABLE 2668#if EV_PERIODIC_ENABLE
2342void noinline 2669void noinline
2343ev_periodic_start (EV_P_ ev_periodic *w) 2670ev_periodic_start (EV_P_ ev_periodic *w)
2344{ 2671{
2345 if (expect_false (ev_is_active (w))) 2672 if (expect_false (ev_is_active (w)))
… …
2391 periodics [active] = periodics [periodiccnt + HEAP0]; 2718 periodics [active] = periodics [periodiccnt + HEAP0];
2392 adjustheap (periodics, periodiccnt, active); 2719 adjustheap (periodics, periodiccnt, active);
2393 } 2720 }
2394 } 2721 }
2395 2722
2396 EV_FREQUENT_CHECK;
2397
2398 ev_stop (EV_A_ (W)w); 2723 ev_stop (EV_A_ (W)w);
2724
2725 EV_FREQUENT_CHECK;
2399} 2726}
2400 2727
2401void noinline 2728void noinline
2402ev_periodic_again (EV_P_ ev_periodic *w) 2729ev_periodic_again (EV_P_ ev_periodic *w)
2403{ 2730{
… …
2409 2736
2410#ifndef SA_RESTART 2737#ifndef SA_RESTART
2411# define SA_RESTART 0 2738# define SA_RESTART 0
2412#endif 2739#endif
2413 2740
2741#if EV_SIGNAL_ENABLE
2742
2414void noinline 2743void noinline
2415ev_signal_start (EV_P_ ev_signal *w) 2744ev_signal_start (EV_P_ ev_signal *w)
2416{ 2745{
2417#if EV_MULTIPLICITY
2418 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2419#endif
2420 if (expect_false (ev_is_active (w))) 2746 if (expect_false (ev_is_active (w)))
2421 return; 2747 return;
2422 2748
2423 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2749 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2424 2750
2425 evpipe_init (EV_A); 2751#if EV_MULTIPLICITY
2752 assert (("libev: a signal must not be attached to two different loops",
2753 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2426 2754
2427 EV_FREQUENT_CHECK; 2755 signals [w->signum - 1].loop = EV_A;
2756#endif
2428 2757
2758 EV_FREQUENT_CHECK;
2759
2760#if EV_USE_SIGNALFD
2761 if (sigfd == -2)
2429 { 2762 {
2430#ifndef _WIN32 2763 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2431 sigset_t full, prev; 2764 if (sigfd < 0 && errno == EINVAL)
2432 sigfillset (&full); 2765 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2433 sigprocmask (SIG_SETMASK, &full, &prev);
2434#endif
2435 2766
2436 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2767 if (sigfd >= 0)
2768 {
2769 fd_intern (sigfd); /* doing it twice will not hurt */
2437 2770
2438#ifndef _WIN32 2771 sigemptyset (&sigfd_set);
2439 sigprocmask (SIG_SETMASK, &prev, 0); 2772
2440#endif 2773 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2774 ev_set_priority (&sigfd_w, EV_MAXPRI);
2775 ev_io_start (EV_A_ &sigfd_w);
2776 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2777 }
2441 } 2778 }
2779
2780 if (sigfd >= 0)
2781 {
2782 /* TODO: check .head */
2783 sigaddset (&sigfd_set, w->signum);
2784 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2785
2786 signalfd (sigfd, &sigfd_set, 0);
2787 }
2788#endif
2442 2789
2443 ev_start (EV_A_ (W)w, 1); 2790 ev_start (EV_A_ (W)w, 1);
2444 wlist_add (&signals [w->signum - 1].head, (WL)w); 2791 wlist_add (&signals [w->signum - 1].head, (WL)w);
2445 2792
2446 if (!((WL)w)->next) 2793 if (!((WL)w)->next)
2794# if EV_USE_SIGNALFD
2795 if (sigfd < 0) /*TODO*/
2796# endif
2447 { 2797 {
2448#if _WIN32 2798# ifdef _WIN32
2799 evpipe_init (EV_A);
2800
2449 signal (w->signum, ev_sighandler); 2801 signal (w->signum, ev_sighandler);
2450#else 2802# else
2451 struct sigaction sa; 2803 struct sigaction sa;
2804
2805 evpipe_init (EV_A);
2806
2452 sa.sa_handler = ev_sighandler; 2807 sa.sa_handler = ev_sighandler;
2453 sigfillset (&sa.sa_mask); 2808 sigfillset (&sa.sa_mask);
2454 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2809 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2455 sigaction (w->signum, &sa, 0); 2810 sigaction (w->signum, &sa, 0);
2811
2812 sigemptyset (&sa.sa_mask);
2813 sigaddset (&sa.sa_mask, w->signum);
2814 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2456#endif 2815#endif
2457 } 2816 }
2458 2817
2459 EV_FREQUENT_CHECK; 2818 EV_FREQUENT_CHECK;
2460} 2819}
2461 2820
2462void noinline 2821void noinline
… …
2470 2829
2471 wlist_del (&signals [w->signum - 1].head, (WL)w); 2830 wlist_del (&signals [w->signum - 1].head, (WL)w);
2472 ev_stop (EV_A_ (W)w); 2831 ev_stop (EV_A_ (W)w);
2473 2832
2474 if (!signals [w->signum - 1].head) 2833 if (!signals [w->signum - 1].head)
2834 {
2835#if EV_MULTIPLICITY
2836 signals [w->signum - 1].loop = 0; /* unattach from signal */
2837#endif
2838#if EV_USE_SIGNALFD
2839 if (sigfd >= 0)
2840 {
2841 sigset_t ss;
2842
2843 sigemptyset (&ss);
2844 sigaddset (&ss, w->signum);
2845 sigdelset (&sigfd_set, w->signum);
2846
2847 signalfd (sigfd, &sigfd_set, 0);
2848 sigprocmask (SIG_UNBLOCK, &ss, 0);
2849 }
2850 else
2851#endif
2475 signal (w->signum, SIG_DFL); 2852 signal (w->signum, SIG_DFL);
2853 }
2476 2854
2477 EV_FREQUENT_CHECK; 2855 EV_FREQUENT_CHECK;
2478} 2856}
2857
2858#endif
2859
2860#if EV_CHILD_ENABLE
2479 2861
2480void 2862void
2481ev_child_start (EV_P_ ev_child *w) 2863ev_child_start (EV_P_ ev_child *w)
2482{ 2864{
2483#if EV_MULTIPLICITY 2865#if EV_MULTIPLICITY
… …
2487 return; 2869 return;
2488 2870
2489 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2490 2872
2491 ev_start (EV_A_ (W)w, 1); 2873 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2874 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2493 2875
2494 EV_FREQUENT_CHECK; 2876 EV_FREQUENT_CHECK;
2495} 2877}
2496 2878
2497void 2879void
… …
2501 if (expect_false (!ev_is_active (w))) 2883 if (expect_false (!ev_is_active (w)))
2502 return; 2884 return;
2503 2885
2504 EV_FREQUENT_CHECK; 2886 EV_FREQUENT_CHECK;
2505 2887
2506 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2888 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2507 ev_stop (EV_A_ (W)w); 2889 ev_stop (EV_A_ (W)w);
2508 2890
2509 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2510} 2892}
2893
2894#endif
2511 2895
2512#if EV_STAT_ENABLE 2896#if EV_STAT_ENABLE
2513 2897
2514# ifdef _WIN32 2898# ifdef _WIN32
2515# undef lstat 2899# undef lstat
… …
2521#define MIN_STAT_INTERVAL 0.1074891 2905#define MIN_STAT_INTERVAL 0.1074891
2522 2906
2523static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2907static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2524 2908
2525#if EV_USE_INOTIFY 2909#if EV_USE_INOTIFY
2526# define EV_INOTIFY_BUFSIZE 8192 2910
2911/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2912# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2527 2913
2528static void noinline 2914static void noinline
2529infy_add (EV_P_ ev_stat *w) 2915infy_add (EV_P_ ev_stat *w)
2530{ 2916{
2531 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); 2917 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);
2532 2918
2533 if (w->wd < 0) 2919 if (w->wd >= 0)
2920 {
2921 struct statfs sfs;
2922
2923 /* now local changes will be tracked by inotify, but remote changes won't */
2924 /* unless the filesystem is known to be local, we therefore still poll */
2925 /* also do poll on <2.6.25, but with normal frequency */
2926
2927 if (!fs_2625)
2928 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2929 else if (!statfs (w->path, &sfs)
2930 && (sfs.f_type == 0x1373 /* devfs */
2931 || sfs.f_type == 0xEF53 /* ext2/3 */
2932 || sfs.f_type == 0x3153464a /* jfs */
2933 || sfs.f_type == 0x52654973 /* reiser3 */
2934 || sfs.f_type == 0x01021994 /* tempfs */
2935 || sfs.f_type == 0x58465342 /* xfs */))
2936 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2937 else
2938 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2534 { 2939 }
2940 else
2941 {
2942 /* can't use inotify, continue to stat */
2535 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2943 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2536 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2537 2944
2538 /* monitor some parent directory for speedup hints */ 2945 /* if path is not there, monitor some parent directory for speedup hints */
2539 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2946 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2540 /* but an efficiency issue only */ 2947 /* but an efficiency issue only */
2541 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2948 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2542 { 2949 {
2543 char path [4096]; 2950 char path [4096];
… …
2559 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2966 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2560 } 2967 }
2561 } 2968 }
2562 2969
2563 if (w->wd >= 0) 2970 if (w->wd >= 0)
2564 {
2565 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2971 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2566 2972
2567 /* now local changes will be tracked by inotify, but remote changes won't */ 2973 /* now re-arm timer, if required */
2568 /* unless the filesystem it known to be local, we therefore still poll */ 2974 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2569 /* also do poll on <2.6.25, but with normal frequency */
2570 struct statfs sfs;
2571
2572 if (fs_2625 && !statfs (w->path, &sfs))
2573 if (sfs.f_type == 0x1373 /* devfs */
2574 || sfs.f_type == 0xEF53 /* ext2/3 */
2575 || sfs.f_type == 0x3153464a /* jfs */
2576 || sfs.f_type == 0x52654973 /* reiser3 */
2577 || sfs.f_type == 0x01021994 /* tempfs */
2578 || sfs.f_type == 0x58465342 /* xfs */)
2579 return;
2580
2581 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2582 ev_timer_again (EV_A_ &w->timer); 2975 ev_timer_again (EV_A_ &w->timer);
2583 } 2976 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2584} 2977}
2585 2978
2586static void noinline 2979static void noinline
2587infy_del (EV_P_ ev_stat *w) 2980infy_del (EV_P_ ev_stat *w)
2588{ 2981{
… …
2591 2984
2592 if (wd < 0) 2985 if (wd < 0)
2593 return; 2986 return;
2594 2987
2595 w->wd = -2; 2988 w->wd = -2;
2596 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2989 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2597 wlist_del (&fs_hash [slot].head, (WL)w); 2990 wlist_del (&fs_hash [slot].head, (WL)w);
2598 2991
2599 /* remove this watcher, if others are watching it, they will rearm */ 2992 /* remove this watcher, if others are watching it, they will rearm */
2600 inotify_rm_watch (fs_fd, wd); 2993 inotify_rm_watch (fs_fd, wd);
2601} 2994}
… …
2603static void noinline 2996static void noinline
2604infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2997infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2605{ 2998{
2606 if (slot < 0) 2999 if (slot < 0)
2607 /* overflow, need to check for all hash slots */ 3000 /* overflow, need to check for all hash slots */
2608 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3001 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2609 infy_wd (EV_A_ slot, wd, ev); 3002 infy_wd (EV_A_ slot, wd, ev);
2610 else 3003 else
2611 { 3004 {
2612 WL w_; 3005 WL w_;
2613 3006
2614 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3007 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2615 { 3008 {
2616 ev_stat *w = (ev_stat *)w_; 3009 ev_stat *w = (ev_stat *)w_;
2617 w_ = w_->next; /* lets us remove this watcher and all before it */ 3010 w_ = w_->next; /* lets us remove this watcher and all before it */
2618 3011
2619 if (w->wd == wd || wd == -1) 3012 if (w->wd == wd || wd == -1)
2620 { 3013 {
2621 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3014 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2622 { 3015 {
2623 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3016 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2624 w->wd = -1; 3017 w->wd = -1;
2625 infy_add (EV_A_ w); /* re-add, no matter what */ 3018 infy_add (EV_A_ w); /* re-add, no matter what */
2626 } 3019 }
2627 3020
2628 stat_timer_cb (EV_A_ &w->timer, 0); 3021 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2633 3026
2634static void 3027static void
2635infy_cb (EV_P_ ev_io *w, int revents) 3028infy_cb (EV_P_ ev_io *w, int revents)
2636{ 3029{
2637 char buf [EV_INOTIFY_BUFSIZE]; 3030 char buf [EV_INOTIFY_BUFSIZE];
2638 struct inotify_event *ev = (struct inotify_event *)buf;
2639 int ofs; 3031 int ofs;
2640 int len = read (fs_fd, buf, sizeof (buf)); 3032 int len = read (fs_fd, buf, sizeof (buf));
2641 3033
2642 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3034 for (ofs = 0; ofs < len; )
3035 {
3036 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2643 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3037 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3038 ofs += sizeof (struct inotify_event) + ev->len;
3039 }
3040}
3041
3042inline_size unsigned int
3043ev_linux_version (void)
3044{
3045 struct utsname buf;
3046 unsigned int v;
3047 int i;
3048 char *p = buf.release;
3049
3050 if (uname (&buf))
3051 return 0;
3052
3053 for (i = 3+1; --i; )
3054 {
3055 unsigned int c = 0;
3056
3057 for (;;)
3058 {
3059 if (*p >= '0' && *p <= '9')
3060 c = c * 10 + *p++ - '0';
3061 else
3062 {
3063 p += *p == '.';
3064 break;
3065 }
3066 }
3067
3068 v = (v << 8) | c;
3069 }
3070
3071 return v;
2644} 3072}
2645 3073
2646inline_size void 3074inline_size void
2647check_2625 (EV_P) 3075ev_check_2625 (EV_P)
2648{ 3076{
2649 /* kernels < 2.6.25 are borked 3077 /* kernels < 2.6.25 are borked
2650 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3078 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2651 */ 3079 */
2652 struct utsname buf; 3080 if (ev_linux_version () < 0x020619)
2653 int major, minor, micro;
2654
2655 if (uname (&buf))
2656 return; 3081 return;
2657 3082
2658 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2659 return;
2660
2661 if (major < 2
2662 || (major == 2 && minor < 6)
2663 || (major == 2 && minor == 6 && micro < 25))
2664 return;
2665
2666 fs_2625 = 1; 3083 fs_2625 = 1;
3084}
3085
3086inline_size int
3087infy_newfd (void)
3088{
3089#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3090 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3091 if (fd >= 0)
3092 return fd;
3093#endif
3094 return inotify_init ();
2667} 3095}
2668 3096
2669inline_size void 3097inline_size void
2670infy_init (EV_P) 3098infy_init (EV_P)
2671{ 3099{
2672 if (fs_fd != -2) 3100 if (fs_fd != -2)
2673 return; 3101 return;
2674 3102
2675 fs_fd = -1; 3103 fs_fd = -1;
2676 3104
2677 check_2625 (EV_A); 3105 ev_check_2625 (EV_A);
2678 3106
2679 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
2680 3108
2681 if (fs_fd >= 0) 3109 if (fs_fd >= 0)
2682 { 3110 {
3111 fd_intern (fs_fd);
2683 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3112 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2684 ev_set_priority (&fs_w, EV_MAXPRI); 3113 ev_set_priority (&fs_w, EV_MAXPRI);
2685 ev_io_start (EV_A_ &fs_w); 3114 ev_io_start (EV_A_ &fs_w);
3115 ev_unref (EV_A);
2686 } 3116 }
2687} 3117}
2688 3118
2689inline_size void 3119inline_size void
2690infy_fork (EV_P) 3120infy_fork (EV_P)
… …
2692 int slot; 3122 int slot;
2693 3123
2694 if (fs_fd < 0) 3124 if (fs_fd < 0)
2695 return; 3125 return;
2696 3126
3127 ev_ref (EV_A);
3128 ev_io_stop (EV_A_ &fs_w);
2697 close (fs_fd); 3129 close (fs_fd);
2698 fs_fd = inotify_init (); 3130 fs_fd = infy_newfd ();
2699 3131
3132 if (fs_fd >= 0)
3133 {
3134 fd_intern (fs_fd);
3135 ev_io_set (&fs_w, fs_fd, EV_READ);
3136 ev_io_start (EV_A_ &fs_w);
3137 ev_unref (EV_A);
3138 }
3139
2700 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3140 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2701 { 3141 {
2702 WL w_ = fs_hash [slot].head; 3142 WL w_ = fs_hash [slot].head;
2703 fs_hash [slot].head = 0; 3143 fs_hash [slot].head = 0;
2704 3144
2705 while (w_) 3145 while (w_)
… …
2710 w->wd = -1; 3150 w->wd = -1;
2711 3151
2712 if (fs_fd >= 0) 3152 if (fs_fd >= 0)
2713 infy_add (EV_A_ w); /* re-add, no matter what */ 3153 infy_add (EV_A_ w); /* re-add, no matter what */
2714 else 3154 else
3155 {
3156 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3157 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2715 ev_timer_again (EV_A_ &w->timer); 3158 ev_timer_again (EV_A_ &w->timer);
3159 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3160 }
2716 } 3161 }
2717 } 3162 }
2718} 3163}
2719 3164
2720#endif 3165#endif
… …
2737static void noinline 3182static void noinline
2738stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3183stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2739{ 3184{
2740 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3185 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2741 3186
2742 /* we copy this here each the time so that */ 3187 ev_statdata prev = w->attr;
2743 /* prev has the old value when the callback gets invoked */
2744 w->prev = w->attr;
2745 ev_stat_stat (EV_A_ w); 3188 ev_stat_stat (EV_A_ w);
2746 3189
2747 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3190 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2748 if ( 3191 if (
2749 w->prev.st_dev != w->attr.st_dev 3192 prev.st_dev != w->attr.st_dev
2750 || w->prev.st_ino != w->attr.st_ino 3193 || prev.st_ino != w->attr.st_ino
2751 || w->prev.st_mode != w->attr.st_mode 3194 || prev.st_mode != w->attr.st_mode
2752 || w->prev.st_nlink != w->attr.st_nlink 3195 || prev.st_nlink != w->attr.st_nlink
2753 || w->prev.st_uid != w->attr.st_uid 3196 || prev.st_uid != w->attr.st_uid
2754 || w->prev.st_gid != w->attr.st_gid 3197 || prev.st_gid != w->attr.st_gid
2755 || w->prev.st_rdev != w->attr.st_rdev 3198 || prev.st_rdev != w->attr.st_rdev
2756 || w->prev.st_size != w->attr.st_size 3199 || prev.st_size != w->attr.st_size
2757 || w->prev.st_atime != w->attr.st_atime 3200 || prev.st_atime != w->attr.st_atime
2758 || w->prev.st_mtime != w->attr.st_mtime 3201 || prev.st_mtime != w->attr.st_mtime
2759 || w->prev.st_ctime != w->attr.st_ctime 3202 || prev.st_ctime != w->attr.st_ctime
2760 ) { 3203 ) {
3204 /* we only update w->prev on actual differences */
3205 /* in case we test more often than invoke the callback, */
3206 /* to ensure that prev is always different to attr */
3207 w->prev = prev;
3208
2761 #if EV_USE_INOTIFY 3209 #if EV_USE_INOTIFY
2762 if (fs_fd >= 0) 3210 if (fs_fd >= 0)
2763 { 3211 {
2764 infy_del (EV_A_ w); 3212 infy_del (EV_A_ w);
2765 infy_add (EV_A_ w); 3213 infy_add (EV_A_ w);
… …
2790 3238
2791 if (fs_fd >= 0) 3239 if (fs_fd >= 0)
2792 infy_add (EV_A_ w); 3240 infy_add (EV_A_ w);
2793 else 3241 else
2794#endif 3242#endif
3243 {
2795 ev_timer_again (EV_A_ &w->timer); 3244 ev_timer_again (EV_A_ &w->timer);
3245 ev_unref (EV_A);
3246 }
2796 3247
2797 ev_start (EV_A_ (W)w, 1); 3248 ev_start (EV_A_ (W)w, 1);
2798 3249
2799 EV_FREQUENT_CHECK; 3250 EV_FREQUENT_CHECK;
2800} 3251}
… …
2809 EV_FREQUENT_CHECK; 3260 EV_FREQUENT_CHECK;
2810 3261
2811#if EV_USE_INOTIFY 3262#if EV_USE_INOTIFY
2812 infy_del (EV_A_ w); 3263 infy_del (EV_A_ w);
2813#endif 3264#endif
3265
3266 if (ev_is_active (&w->timer))
3267 {
3268 ev_ref (EV_A);
2814 ev_timer_stop (EV_A_ &w->timer); 3269 ev_timer_stop (EV_A_ &w->timer);
3270 }
2815 3271
2816 ev_stop (EV_A_ (W)w); 3272 ev_stop (EV_A_ (W)w);
2817 3273
2818 EV_FREQUENT_CHECK; 3274 EV_FREQUENT_CHECK;
2819} 3275}
… …
2864 3320
2865 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
2866} 3322}
2867#endif 3323#endif
2868 3324
3325#if EV_PREPARE_ENABLE
2869void 3326void
2870ev_prepare_start (EV_P_ ev_prepare *w) 3327ev_prepare_start (EV_P_ ev_prepare *w)
2871{ 3328{
2872 if (expect_false (ev_is_active (w))) 3329 if (expect_false (ev_is_active (w)))
2873 return; 3330 return;
… …
2899 3356
2900 ev_stop (EV_A_ (W)w); 3357 ev_stop (EV_A_ (W)w);
2901 3358
2902 EV_FREQUENT_CHECK; 3359 EV_FREQUENT_CHECK;
2903} 3360}
3361#endif
2904 3362
3363#if EV_CHECK_ENABLE
2905void 3364void
2906ev_check_start (EV_P_ ev_check *w) 3365ev_check_start (EV_P_ ev_check *w)
2907{ 3366{
2908 if (expect_false (ev_is_active (w))) 3367 if (expect_false (ev_is_active (w)))
2909 return; 3368 return;
… …
2935 3394
2936 ev_stop (EV_A_ (W)w); 3395 ev_stop (EV_A_ (W)w);
2937 3396
2938 EV_FREQUENT_CHECK; 3397 EV_FREQUENT_CHECK;
2939} 3398}
3399#endif
2940 3400
2941#if EV_EMBED_ENABLE 3401#if EV_EMBED_ENABLE
2942void noinline 3402void noinline
2943ev_embed_sweep (EV_P_ ev_embed *w) 3403ev_embed_sweep (EV_P_ ev_embed *w)
2944{ 3404{
… …
2960embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3420embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2961{ 3421{
2962 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3422 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2963 3423
2964 { 3424 {
2965 struct ev_loop *loop = w->other; 3425 EV_P = w->other;
2966 3426
2967 while (fdchangecnt) 3427 while (fdchangecnt)
2968 { 3428 {
2969 fd_reify (EV_A); 3429 fd_reify (EV_A);
2970 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3430 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2978 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3438 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2979 3439
2980 ev_embed_stop (EV_A_ w); 3440 ev_embed_stop (EV_A_ w);
2981 3441
2982 { 3442 {
2983 struct ev_loop *loop = w->other; 3443 EV_P = w->other;
2984 3444
2985 ev_loop_fork (EV_A); 3445 ev_loop_fork (EV_A);
2986 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3446 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2987 } 3447 }
2988 3448
… …
3002{ 3462{
3003 if (expect_false (ev_is_active (w))) 3463 if (expect_false (ev_is_active (w)))
3004 return; 3464 return;
3005 3465
3006 { 3466 {
3007 struct ev_loop *loop = w->other; 3467 EV_P = w->other;
3008 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3468 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3009 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3469 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3010 } 3470 }
3011 3471
3012 EV_FREQUENT_CHECK; 3472 EV_FREQUENT_CHECK;
… …
3039 3499
3040 ev_io_stop (EV_A_ &w->io); 3500 ev_io_stop (EV_A_ &w->io);
3041 ev_prepare_stop (EV_A_ &w->prepare); 3501 ev_prepare_stop (EV_A_ &w->prepare);
3042 ev_fork_stop (EV_A_ &w->fork); 3502 ev_fork_stop (EV_A_ &w->fork);
3043 3503
3504 ev_stop (EV_A_ (W)w);
3505
3044 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3045} 3507}
3046#endif 3508#endif
3047 3509
3048#if EV_FORK_ENABLE 3510#if EV_FORK_ENABLE
… …
3124 3586
3125void 3587void
3126ev_async_send (EV_P_ ev_async *w) 3588ev_async_send (EV_P_ ev_async *w)
3127{ 3589{
3128 w->sent = 1; 3590 w->sent = 1;
3129 evpipe_write (EV_A_ &gotasync); 3591 evpipe_write (EV_A_ &async_pending);
3130} 3592}
3131#endif 3593#endif
3132 3594
3133/*****************************************************************************/ 3595/*****************************************************************************/
3134 3596
… …
3174{ 3636{
3175 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3637 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3176 3638
3177 if (expect_false (!once)) 3639 if (expect_false (!once))
3178 { 3640 {
3179 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3641 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3180 return; 3642 return;
3181 } 3643 }
3182 3644
3183 once->cb = cb; 3645 once->cb = cb;
3184 once->arg = arg; 3646 once->arg = arg;
… …
3198 } 3660 }
3199} 3661}
3200 3662
3201/*****************************************************************************/ 3663/*****************************************************************************/
3202 3664
3203#if 0 3665#if EV_WALK_ENABLE
3204void 3666void
3205ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3667ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3206{ 3668{
3207 int i, j; 3669 int i, j;
3208 ev_watcher_list *wl, *wn; 3670 ev_watcher_list *wl, *wn;
… …
3224#if EV_USE_INOTIFY 3686#if EV_USE_INOTIFY
3225 if (ev_cb ((ev_io *)wl) == infy_cb) 3687 if (ev_cb ((ev_io *)wl) == infy_cb)
3226 ; 3688 ;
3227 else 3689 else
3228#endif 3690#endif
3229 if ((ev_io *)wl != &pipeev) 3691 if ((ev_io *)wl != &pipe_w)
3230 if (types & EV_IO) 3692 if (types & EV_IO)
3231 cb (EV_A_ EV_IO, wl); 3693 cb (EV_A_ EV_IO, wl);
3232 3694
3233 wl = wn; 3695 wl = wn;
3234 } 3696 }
… …
3271 if (types & EV_ASYNC) 3733 if (types & EV_ASYNC)
3272 for (i = asynccnt; i--; ) 3734 for (i = asynccnt; i--; )
3273 cb (EV_A_ EV_ASYNC, asyncs [i]); 3735 cb (EV_A_ EV_ASYNC, asyncs [i]);
3274#endif 3736#endif
3275 3737
3738#if EV_PREPARE_ENABLE
3276 if (types & EV_PREPARE) 3739 if (types & EV_PREPARE)
3277 for (i = preparecnt; i--; ) 3740 for (i = preparecnt; i--; )
3278#if EV_EMBED_ENABLE 3741# if EV_EMBED_ENABLE
3279 if (ev_cb (prepares [i]) != embed_prepare_cb) 3742 if (ev_cb (prepares [i]) != embed_prepare_cb)
3280#endif 3743# endif
3281 cb (EV_A_ EV_PREPARE, prepares [i]); 3744 cb (EV_A_ EV_PREPARE, prepares [i]);
3745#endif
3282 3746
3747#if EV_CHECK_ENABLE
3283 if (types & EV_CHECK) 3748 if (types & EV_CHECK)
3284 for (i = checkcnt; i--; ) 3749 for (i = checkcnt; i--; )
3285 cb (EV_A_ EV_CHECK, checks [i]); 3750 cb (EV_A_ EV_CHECK, checks [i]);
3751#endif
3286 3752
3753#if EV_SIGNAL_ENABLE
3287 if (types & EV_SIGNAL) 3754 if (types & EV_SIGNAL)
3288 for (i = 0; i < signalmax; ++i) 3755 for (i = 0; i < EV_NSIG - 1; ++i)
3289 for (wl = signals [i].head; wl; ) 3756 for (wl = signals [i].head; wl; )
3290 { 3757 {
3291 wn = wl->next; 3758 wn = wl->next;
3292 cb (EV_A_ EV_SIGNAL, wl); 3759 cb (EV_A_ EV_SIGNAL, wl);
3293 wl = wn; 3760 wl = wn;
3294 } 3761 }
3762#endif
3295 3763
3764#if EV_CHILD_ENABLE
3296 if (types & EV_CHILD) 3765 if (types & EV_CHILD)
3297 for (i = EV_PID_HASHSIZE; i--; ) 3766 for (i = (EV_PID_HASHSIZE); i--; )
3298 for (wl = childs [i]; wl; ) 3767 for (wl = childs [i]; wl; )
3299 { 3768 {
3300 wn = wl->next; 3769 wn = wl->next;
3301 cb (EV_A_ EV_CHILD, wl); 3770 cb (EV_A_ EV_CHILD, wl);
3302 wl = wn; 3771 wl = wn;
3303 } 3772 }
3773#endif
3304/* EV_STAT 0x00001000 /* stat data changed */ 3774/* EV_STAT 0x00001000 /* stat data changed */
3305/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3775/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3306} 3776}
3307#endif 3777#endif
3308 3778

Diff Legend

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