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

Comparing libev/ev.c (file contents):
Revision 1.290 by root, Mon Jun 29 04:41:34 2009 UTC vs.
Revision 1.340 by root, Tue Mar 16 20:39: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 *
… …
79# endif 79# endif
80# endif 80# endif
81 81
82# ifndef EV_USE_NANOSLEEP 82# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP 83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# else 85# else
86# define EV_USE_NANOSLEEP 0 86# define EV_USE_NANOSLEEP 0
87# endif 87# endif
88# endif 88# endif
89 89
90# ifndef EV_USE_SELECT 90# ifndef EV_USE_SELECT
91# if HAVE_SELECT && HAVE_SYS_SELECT_H 91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT 1 92# define EV_USE_SELECT EV_FEATURE_BACKENDS
93# else 93# else
94# define EV_USE_SELECT 0 94# define EV_USE_SELECT 0
95# endif 95# endif
96# endif 96# endif
97 97
98# ifndef EV_USE_POLL 98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H 99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1 100# define EV_USE_POLL EV_FEATURE_BACKENDS
101# else 101# else
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif 103# endif
104# endif 104# endif
105 105
106# ifndef EV_USE_EPOLL 106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
108# define EV_USE_EPOLL 1 108# define EV_USE_EPOLL EV_FEATURE_BACKENDS
109# else 109# else
110# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
111# endif 111# endif
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
117# else 117# else
118# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
119# endif 119# endif
120# endif 120# endif
121 121
122# ifndef EV_USE_PORT 122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1 124# define EV_USE_PORT EV_FEATURE_BACKENDS
125# else 125# else
126# define EV_USE_PORT 0 126# define EV_USE_PORT 0
127# endif 127# endif
128# endif 128# endif
129 129
130# ifndef EV_USE_INOTIFY 130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1 132# define EV_USE_INOTIFY EV_FEATURE_OS
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 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
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD EV_FEATURE_OS
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
143# endif 151# endif
144# endif 152# endif
145 153
146#endif 154#endif
147 155
148#include <math.h> 156#include <math.h>
149#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
150#include <fcntl.h> 159#include <fcntl.h>
151#include <stddef.h> 160#include <stddef.h>
152 161
153#include <stdio.h> 162#include <stdio.h>
154 163
155#include <assert.h> 164#include <assert.h>
156#include <errno.h> 165#include <errno.h>
157#include <sys/types.h> 166#include <sys/types.h>
158#include <time.h> 167#include <time.h>
168#include <limits.h>
159 169
160#include <signal.h> 170#include <signal.h>
161 171
162#ifdef EV_H 172#ifdef EV_H
163# include EV_H 173# include EV_H
… …
174# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 185# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
178# endif 188# endif
189# undef EV_AVOID_STDIO
179#endif 190#endif
180 191
181/* 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
182 221
183#ifndef EV_USE_CLOCK_SYSCALL 222#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 223# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 224# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 225# else
187# define EV_USE_CLOCK_SYSCALL 0 226# define EV_USE_CLOCK_SYSCALL 0
188# endif 227# endif
189#endif 228#endif
190 229
191#ifndef EV_USE_MONOTONIC 230#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 231# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 232# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 233# else
195# define EV_USE_MONOTONIC 0 234# define EV_USE_MONOTONIC 0
196# endif 235# endif
197#endif 236#endif
198 237
… …
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 239# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 240#endif
202 241
203#ifndef EV_USE_NANOSLEEP 242#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 243# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 244# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 245# else
207# define EV_USE_NANOSLEEP 0 246# define EV_USE_NANOSLEEP 0
208# endif 247# endif
209#endif 248#endif
210 249
211#ifndef EV_USE_SELECT 250#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 251# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 252#endif
214 253
215#ifndef EV_USE_POLL 254#ifndef EV_USE_POLL
216# ifdef _WIN32 255# ifdef _WIN32
217# define EV_USE_POLL 0 256# define EV_USE_POLL 0
218# else 257# else
219# define EV_USE_POLL 1 258# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 259# endif
221#endif 260#endif
222 261
223#ifndef EV_USE_EPOLL 262#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 263# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 264# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 265# else
227# define EV_USE_EPOLL 0 266# define EV_USE_EPOLL 0
228# endif 267# endif
229#endif 268#endif
230 269
… …
236# define EV_USE_PORT 0 275# define EV_USE_PORT 0
237#endif 276#endif
238 277
239#ifndef EV_USE_INOTIFY 278#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 279# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 280# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 281# else
243# define EV_USE_INOTIFY 0 282# define EV_USE_INOTIFY 0
244# endif 283# endif
245#endif 284#endif
246 285
247#ifndef EV_PID_HASHSIZE 286#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 287# define EV_PID_HASHSIZE EV_FEATURE_DATA ? 16 : 1
249# define EV_PID_HASHSIZE 1
250# else
251# define EV_PID_HASHSIZE 16
252# endif
253#endif 288#endif
254 289
255#ifndef EV_INOTIFY_HASHSIZE 290#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 291# define EV_INOTIFY_HASHSIZE EV_FEATURE_DATA ? 16 : 1
257# define EV_INOTIFY_HASHSIZE 1
258# else
259# define EV_INOTIFY_HASHSIZE 16
260# endif
261#endif 292#endif
262 293
263#ifndef EV_USE_EVENTFD 294#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 295# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 296# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 297# else
267# 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
268# endif 307# endif
269#endif 308#endif
270 309
271#if 0 /* debugging */ 310#if 0 /* debugging */
272# define EV_VERIFY 3 311# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 312# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 313# define EV_HEAP_CACHE_AT 1
275#endif 314#endif
276 315
277#ifndef EV_VERIFY 316#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 317# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 318#endif
280 319
281#ifndef EV_USE_4HEAP 320#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 321# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 322#endif
284 323
285#ifndef EV_HEAP_CACHE_AT 324#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 325# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif
288
289/* this block fixes any misconfiguration where we know we run into trouble otherwise */
290
291#ifndef CLOCK_MONOTONIC
292# undef EV_USE_MONOTONIC
293# define EV_USE_MONOTONIC 0
294#endif
295
296#ifndef CLOCK_REALTIME
297# undef EV_USE_REALTIME
298# define EV_USE_REALTIME 0
299#endif
300
301#if !EV_STAT_ENABLE
302# undef EV_USE_INOTIFY
303# define EV_USE_INOTIFY 0
304#endif
305
306#if !EV_USE_NANOSLEEP
307# ifndef _WIN32
308# include <sys/select.h>
309# endif
310#endif
311
312#if EV_USE_INOTIFY
313# include <sys/utsname.h>
314# include <sys/statfs.h>
315# include <sys/inotify.h>
316/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
317# ifndef IN_DONT_FOLLOW
318# undef EV_USE_INOTIFY
319# define EV_USE_INOTIFY 0
320# endif
321#endif
322
323#if EV_SELECT_IS_WINSOCKET
324# include <winsock.h>
325#endif 326#endif
326 327
327/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 328/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
328/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
329#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
… …
336# undef EV_USE_CLOCK_SYSCALL 337# undef EV_USE_CLOCK_SYSCALL
337# define EV_USE_CLOCK_SYSCALL 0 338# define EV_USE_CLOCK_SYSCALL 0
338# endif 339# endif
339#endif 340#endif
340 341
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
349
350#ifndef CLOCK_MONOTONIC
351# undef EV_USE_MONOTONIC
352# define EV_USE_MONOTONIC 0
353#endif
354
355#ifndef CLOCK_REALTIME
356# undef EV_USE_REALTIME
357# define EV_USE_REALTIME 0
358#endif
359
360#if !EV_STAT_ENABLE
361# undef EV_USE_INOTIFY
362# define EV_USE_INOTIFY 0
363#endif
364
365#if !EV_USE_NANOSLEEP
366# ifndef _WIN32
367# include <sys/select.h>
368# endif
369#endif
370
371#if EV_USE_INOTIFY
372# include <sys/utsname.h>
373# include <sys/statfs.h>
374# include <sys/inotify.h>
375/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
376# ifndef IN_DONT_FOLLOW
377# undef EV_USE_INOTIFY
378# define EV_USE_INOTIFY 0
379# endif
380#endif
381
382#if EV_SELECT_IS_WINSOCKET
383# include <winsock.h>
384#endif
385
341#if EV_USE_EVENTFD 386#if EV_USE_EVENTFD
342/* 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 */
343# 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
344# ifdef __cplusplus 399# ifdef __cplusplus
345extern "C" { 400extern "C" {
346# endif 401# endif
347int eventfd (unsigned int initval, int flags); 402int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 403# ifdef __cplusplus
349} 404}
350# endif 405# endif
351#endif 406#endif
352 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
353/**/ 437/**/
354 438
355#if EV_VERIFY >= 3 439#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 440# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 441#else
358# define EV_FREQUENT_CHECK do { } while (0) 442# define EV_FREQUENT_CHECK do { } while (0)
359#endif 443#endif
360 444
361/* 445/*
… …
368 */ 452 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 454
371#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) */
372#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) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 457
375#if __GNUC__ >= 4 458#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 459# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 460# define noinline __attribute__ ((noinline))
378#else 461#else
… …
385 468
386#define expect_false(expr) expect ((expr) != 0, 0) 469#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 470#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 471#define inline_size static inline
389 472
390#if EV_MINIMAL 473#if EV_FEATURE_CODE
474# define inline_speed static inline
475#else
391# 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)
392#else 483#else
393# define inline_speed static inline
394#endif
395
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 484# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
485#endif
398 486
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 487#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 488#define EMPTY2(a,b) /* used to suppress some warnings */
401 489
402typedef ev_watcher *W; 490typedef ev_watcher *W;
… …
414 502
415#if EV_USE_MONOTONIC 503#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 505#endif
418 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
419#ifdef _WIN32 517#ifdef _WIN32
420# include "ev_win32.c" 518# include "ev_win32.c"
421#endif 519#endif
422 520
423/*****************************************************************************/ 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
424 530
425static void (*syserr_cb)(const char *msg); 531static void (*syserr_cb)(const char *msg);
426 532
427void 533void
428ev_set_syserr_cb (void (*cb)(const char *msg)) 534ev_set_syserr_cb (void (*cb)(const char *msg))
… …
438 544
439 if (syserr_cb) 545 if (syserr_cb)
440 syserr_cb (msg); 546 syserr_cb (msg);
441 else 547 else
442 { 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
443 perror (msg); 557 perror (msg);
558#endif
444 abort (); 559 abort ();
445 } 560 }
446} 561}
447 562
448static void * 563static void *
449ev_realloc_emul (void *ptr, long size) 564ev_realloc_emul (void *ptr, long size)
450{ 565{
566#if __GLIBC__
567 return realloc (ptr, size);
568#else
451 /* some systems, notably openbsd and darwin, fail to properly 569 /* some systems, notably openbsd and darwin, fail to properly
452 * 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
453 * the single unix specification, so work around them here. 571 * the single unix specification, so work around them here.
454 */ 572 */
455 573
456 if (size) 574 if (size)
457 return realloc (ptr, size); 575 return realloc (ptr, size);
458 576
459 free (ptr); 577 free (ptr);
460 return 0; 578 return 0;
579#endif
461} 580}
462 581
463static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 582static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
464 583
465void 584void
… …
473{ 592{
474 ptr = alloc (ptr, size); 593 ptr = alloc (ptr, size);
475 594
476 if (!ptr && size) 595 if (!ptr && size)
477 { 596 {
597#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n");
599#else
478 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
601#endif
479 abort (); 602 abort ();
480 } 603 }
481 604
482 return ptr; 605 return ptr;
483} 606}
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 608#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 609#define ev_free(ptr) ev_realloc ((ptr), 0)
487 610
488/*****************************************************************************/ 611/*****************************************************************************/
489 612
613/* set in reify when reification needed */
614#define EV_ANFD_REIFY 1
615
490/* file descriptor info structure */ 616/* file descriptor info structure */
491typedef struct 617typedef struct
492{ 618{
493 WL head; 619 WL head;
494 unsigned char events; /* the events watched for */ 620 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 621 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 622 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 623 unsigned char unused;
498#if EV_USE_EPOLL 624#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 625 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 626#endif
… …
562 688
563 static int ev_default_loop_ptr; 689 static int ev_default_loop_ptr;
564 690
565#endif 691#endif
566 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
567/*****************************************************************************/ 705/*****************************************************************************/
568 706
707#ifndef EV_HAVE_EV_TIME
569ev_tstamp 708ev_tstamp
570ev_time (void) 709ev_time (void)
571{ 710{
572#if EV_USE_REALTIME 711#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 712 if (expect_true (have_realtime))
… …
580 719
581 struct timeval tv; 720 struct timeval tv;
582 gettimeofday (&tv, 0); 721 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 722 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 723}
724#endif
585 725
586inline_size ev_tstamp 726inline_size ev_tstamp
587get_clock (void) 727get_clock (void)
588{ 728{
589#if EV_USE_MONOTONIC 729#if EV_USE_MONOTONIC
… …
625 765
626 tv.tv_sec = (time_t)delay; 766 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 767 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 768
629 /* 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 */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 771 /* by older ones */
632 select (0, 0, 0, 0, &tv); 772 select (0, 0, 0, 0, &tv);
633#endif 773#endif
634 } 774 }
635} 775}
… …
743} 883}
744 884
745/*****************************************************************************/ 885/*****************************************************************************/
746 886
747inline_speed void 887inline_speed void
748fd_event (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
749{ 889{
750 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
751 ev_io *w; 891 ev_io *w;
752 892
753 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)
… …
757 if (ev) 897 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 898 ev_feed_event (EV_A_ (W)w, ev);
759 } 899 }
760} 900}
761 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
762void 913void
763ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 915{
765 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
767} 918}
768 919
769/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
771inline_size void 922inline_size void
… …
786 937
787#if EV_SELECT_IS_WINSOCKET 938#if EV_SELECT_IS_WINSOCKET
788 if (events) 939 if (events)
789 { 940 {
790 unsigned long arg; 941 unsigned long arg;
791 #ifdef EV_FD_TO_WIN32_HANDLE
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
793 #else
794 anfd->handle = _get_osfhandle (fd);
795 #endif
796 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));
797 } 944 }
798#endif 945#endif
799 946
800 { 947 {
… …
838 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
839 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);
840 } 987 }
841} 988}
842 989
843/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
844inline_size int 991inline_size int
845fd_valid (int fd) 992fd_valid (int fd)
846{ 993{
847#ifdef _WIN32 994#ifdef _WIN32
848 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
849#else 996#else
850 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
851#endif 998#endif
852} 999}
853 1000
… …
871 1018
872 for (fd = anfdmax; fd--; ) 1019 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 1020 if (anfds [fd].events)
874 { 1021 {
875 fd_kill (EV_A_ fd); 1022 fd_kill (EV_A_ fd);
876 return; 1023 break;
877 } 1024 }
878} 1025}
879 1026
880/* 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 */
881static void noinline 1028static void noinline
… …
886 for (fd = 0; fd < anfdmax; ++fd) 1033 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 1034 if (anfds [fd].events)
888 { 1035 {
889 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 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
893} 1054}
894 1055
895/*****************************************************************************/ 1056/*****************************************************************************/
896 1057
897/* 1058/*
… …
971 1132
972 for (;;) 1133 for (;;)
973 { 1134 {
974 int c = k << 1; 1135 int c = k << 1;
975 1136
976 if (c > N + HEAP0 - 1) 1137 if (c >= N + HEAP0)
977 break; 1138 break;
978 1139
979 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])
980 ? 1 : 0; 1141 ? 1 : 0;
981 1142
… …
1017 1178
1018/* move an element suitably so it is in a correct place */ 1179/* move an element suitably so it is in a correct place */
1019inline_size void 1180inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1181adjustheap (ANHE *heap, int N, int k)
1021{ 1182{
1022 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)]))
1023 upheap (heap, k); 1184 upheap (heap, k);
1024 else 1185 else
1025 downheap (heap, N, k); 1186 downheap (heap, N, k);
1026} 1187}
1027 1188
… …
1040/*****************************************************************************/ 1201/*****************************************************************************/
1041 1202
1042/* associate signal watchers to a signal signal */ 1203/* associate signal watchers to a signal signal */
1043typedef struct 1204typedef struct
1044{ 1205{
1206 EV_ATOMIC_T pending;
1207#if EV_MULTIPLICITY
1208 EV_P;
1209#endif
1045 WL head; 1210 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1211} ANSIG;
1048 1212
1049static ANSIG *signals; 1213static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1214
1054/*****************************************************************************/ 1215/*****************************************************************************/
1055 1216
1056/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1057/* this is not fork-safe */
1058inline_speed void
1059fd_intern (int fd)
1060{
1061#ifdef _WIN32
1062 unsigned long arg = 1;
1063 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1064#else
1065 fcntl (fd, F_SETFD, FD_CLOEXEC);
1066 fcntl (fd, F_SETFL, O_NONBLOCK);
1067#endif
1068}
1069 1218
1070static void noinline 1219static void noinline
1071evpipe_init (EV_P) 1220evpipe_init (EV_P)
1072{ 1221{
1073 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1074 { 1223 {
1075#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1226 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1227 evfd = eventfd (0, 0);
1228
1229 if (evfd >= 0)
1077 { 1230 {
1078 evpipe [0] = -1; 1231 evpipe [0] = -1;
1079 fd_intern (evfd); 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1234 }
1082 else 1235 else
1083#endif 1236# endif
1084 { 1237 {
1085 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1086 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1087 1240
1088 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
… …
1099evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1100{ 1253{
1101 if (!*flag) 1254 if (!*flag)
1102 { 1255 {
1103 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;
1104 1258
1105 *flag = 1; 1259 *flag = 1;
1106 1260
1107#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1108 if (evfd >= 0) 1262 if (evfd >= 0)
… …
1110 uint64_t counter = 1; 1264 uint64_t counter = 1;
1111 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1112 } 1266 }
1113 else 1267 else
1114#endif 1268#endif
1115 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1116 1270
1117 errno = old_errno; 1271 errno = old_errno;
1118 } 1272 }
1119} 1273}
1120 1274
1121/* called whenever the libev signal pipe */ 1275/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1276/* got some events (signal, async) */
1123static void 1277static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1279{
1280 int i;
1281
1126#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1283 if (evfd >= 0)
1128 { 1284 {
1129 uint64_t counter; 1285 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
… …
1134 { 1290 {
1135 char dummy; 1291 char dummy;
1136 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1137 } 1293 }
1138 1294
1139 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1140 { 1296 {
1141 int signum; 1297 sig_pending = 0;
1142 gotsig = 0;
1143 1298
1144 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1302 }
1148 1303
1149#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1150 if (gotasync) 1305 if (async_pending)
1151 { 1306 {
1152 int i; 1307 async_pending = 0;
1153 gotasync = 0;
1154 1308
1155 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1157 { 1311 {
1158 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
… …
1166 1320
1167static void 1321static void
1168ev_sighandler (int signum) 1322ev_sighandler (int signum)
1169{ 1323{
1170#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1172#endif 1326#endif
1173 1327
1174#if _WIN32 1328#ifdef _WIN32
1175 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1176#endif 1330#endif
1177 1331
1178 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1180} 1334}
1181 1335
1182void noinline 1336void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1184{ 1338{
1185 WL w; 1339 WL w;
1186 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1187#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1188 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 */
1189#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1349
1191 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1351 return;
1352#endif
1195 1353
1196 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1197 1355
1198 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 1358}
1201 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
1202/*****************************************************************************/ 1382/*****************************************************************************/
1203 1383
1384#if EV_CHILD_ENABLE
1204static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1205
1206#ifndef _WIN32
1207 1386
1208static ev_signal childev; 1387static ev_signal childev;
1209 1388
1210#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1211# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
… …
1216child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1217{ 1396{
1218 ev_child *w; 1397 ev_child *w;
1219 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1220 1399
1221 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)
1222 { 1401 {
1223 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1224 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1225 { 1404 {
1226 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 */
… …
1251 /* 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 */
1252 /* 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 */
1253 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1254 1433
1255 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1256 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1257 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 */
1258} 1437}
1259 1438
1260#endif 1439#endif
1261 1440
… …
1350ev_backend (EV_P) 1529ev_backend (EV_P)
1351{ 1530{
1352 return backend; 1531 return backend;
1353} 1532}
1354 1533
1534#if EV_FEATURE_API
1355unsigned int 1535unsigned int
1356ev_loop_count (EV_P) 1536ev_iteration (EV_P)
1357{ 1537{
1358 return loop_count; 1538 return loop_count;
1359} 1539}
1360 1540
1541unsigned int
1542ev_depth (EV_P)
1543{
1544 return loop_depth;
1545}
1546
1361void 1547void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1548ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1549{
1364 io_blocktime = interval; 1550 io_blocktime = interval;
1365} 1551}
… …
1367void 1553void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1554ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1555{
1370 timeout_blocktime = interval; 1556 timeout_blocktime = interval;
1371} 1557}
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
1372 1582
1373/* initialise a loop structure, must be zero-initialised */ 1583/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1584static void noinline
1375loop_init (EV_P_ unsigned int flags) 1585loop_init (EV_P_ unsigned int flags)
1376{ 1586{
… …
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1604 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1605 have_monotonic = 1;
1396 } 1606 }
1397#endif 1607#endif
1398 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
1399 ev_rt_now = ev_time (); 1620 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1621 mn_now = get_clock ();
1401 now_floor = mn_now; 1622 now_floor = mn_now;
1402 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
1403 1627
1404 io_blocktime = 0.; 1628 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1629 timeout_blocktime = 0.;
1406 backend = 0; 1630 backend = 0;
1407 backend_fd = -1; 1631 backend_fd = -1;
1408 gotasync = 0; 1632 sig_pending = 0;
1633#if EV_ASYNC_ENABLE
1634 async_pending = 0;
1635#endif
1409#if EV_USE_INOTIFY 1636#if EV_USE_INOTIFY
1410 fs_fd = -2; 1637 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1638#endif
1412 1639#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1640 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1641#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1642
1424 if (!(flags & 0x0000ffffU)) 1643 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1644 flags |= ev_recommended_backends ();
1426 1645
1427#if EV_USE_PORT 1646#if EV_USE_PORT
… …
1440 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1659 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1441#endif 1660#endif
1442 1661
1443 ev_prepare_init (&pending_w, pendingcb); 1662 ev_prepare_init (&pending_w, pendingcb);
1444 1663
1664#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1445 ev_init (&pipe_w, pipecb); 1665 ev_init (&pipe_w, pipecb);
1446 ev_set_priority (&pipe_w, EV_MAXPRI); 1666 ev_set_priority (&pipe_w, EV_MAXPRI);
1667#endif
1447 } 1668 }
1448} 1669}
1449 1670
1450/* free up a loop structure */ 1671/* free up a loop structure */
1451static void noinline 1672static void noinline
… …
1453{ 1674{
1454 int i; 1675 int i;
1455 1676
1456 if (ev_is_active (&pipe_w)) 1677 if (ev_is_active (&pipe_w))
1457 { 1678 {
1458 ev_ref (EV_A); /* signal watcher */ 1679 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1680 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1681
1461#if EV_USE_EVENTFD 1682#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1683 if (evfd >= 0)
1463 close (evfd); 1684 close (evfd);
1464#endif 1685#endif
1465 1686
1466 if (evpipe [0] >= 0) 1687 if (evpipe [0] >= 0)
1467 { 1688 {
1468 close (evpipe [0]); 1689 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1690 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1691 }
1471 } 1692 }
1693
1694#if EV_USE_SIGNALFD
1695 if (ev_is_active (&sigfd_w))
1696 close (sigfd);
1697#endif
1472 1698
1473#if EV_USE_INOTIFY 1699#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1700 if (fs_fd >= 0)
1475 close (fs_fd); 1701 close (fs_fd);
1476#endif 1702#endif
… …
1500#if EV_IDLE_ENABLE 1726#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1727 array_free (idle, [i]);
1502#endif 1728#endif
1503 } 1729 }
1504 1730
1505 ev_free (anfds); anfdmax = 0; 1731 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1732
1507 /* have to use the microsoft-never-gets-it-right macro */ 1733 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1734 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1735 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1736 array_free (timer, EMPTY);
… …
1545 1771
1546 if (ev_is_active (&pipe_w)) 1772 if (ev_is_active (&pipe_w))
1547 { 1773 {
1548 /* this "locks" the handlers against writing to the pipe */ 1774 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1775 /* while we modify the fd vars */
1550 gotsig = 1; 1776 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1777#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1778 async_pending = 1;
1553#endif 1779#endif
1554 1780
1555 ev_ref (EV_A); 1781 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1782 ev_io_stop (EV_A_ &pipe_w);
1557 1783
… …
1560 close (evfd); 1786 close (evfd);
1561#endif 1787#endif
1562 1788
1563 if (evpipe [0] >= 0) 1789 if (evpipe [0] >= 0)
1564 { 1790 {
1565 close (evpipe [0]); 1791 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 1792 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 1793 }
1568 1794
1795#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1569 evpipe_init (EV_A); 1796 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 1797 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 1798 pipecb (EV_A_ &pipe_w, EV_READ);
1799#endif
1572 } 1800 }
1573 1801
1574 postfork = 0; 1802 postfork = 0;
1575} 1803}
1576 1804
1577#if EV_MULTIPLICITY 1805#if EV_MULTIPLICITY
1578 1806
1579struct ev_loop * 1807struct ev_loop *
1580ev_loop_new (unsigned int flags) 1808ev_loop_new (unsigned int flags)
1581{ 1809{
1582 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));
1583 1811
1584 memset (loop, 0, sizeof (struct ev_loop)); 1812 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1813 loop_init (EV_A_ flags);
1587 1814
1588 if (ev_backend (EV_A)) 1815 if (ev_backend (EV_A))
1589 return loop; 1816 return EV_A;
1590 1817
1591 return 0; 1818 return 0;
1592} 1819}
1593 1820
1594void 1821void
… …
1601void 1828void
1602ev_loop_fork (EV_P) 1829ev_loop_fork (EV_P)
1603{ 1830{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1831 postfork = 1; /* must be in line with ev_default_fork */
1605} 1832}
1833#endif /* multiplicity */
1606 1834
1607#if EV_VERIFY 1835#if EV_VERIFY
1608static void noinline 1836static void noinline
1609verify_watcher (EV_P_ W w) 1837verify_watcher (EV_P_ W w)
1610{ 1838{
… …
1638 verify_watcher (EV_A_ ws [cnt]); 1866 verify_watcher (EV_A_ ws [cnt]);
1639 } 1867 }
1640} 1868}
1641#endif 1869#endif
1642 1870
1871#if EV_FEATURE_API
1643void 1872void
1644ev_loop_verify (EV_P) 1873ev_verify (EV_P)
1645{ 1874{
1646#if EV_VERIFY 1875#if EV_VERIFY
1647 int i; 1876 int i;
1648 WL w; 1877 WL w;
1649 1878
… …
1688#if EV_ASYNC_ENABLE 1917#if EV_ASYNC_ENABLE
1689 assert (asyncmax >= asynccnt); 1918 assert (asyncmax >= asynccnt);
1690 array_verify (EV_A_ (W *)asyncs, asynccnt); 1919 array_verify (EV_A_ (W *)asyncs, asynccnt);
1691#endif 1920#endif
1692 1921
1922#if EV_PREPARE_ENABLE
1693 assert (preparemax >= preparecnt); 1923 assert (preparemax >= preparecnt);
1694 array_verify (EV_A_ (W *)prepares, preparecnt); 1924 array_verify (EV_A_ (W *)prepares, preparecnt);
1925#endif
1695 1926
1927#if EV_CHECK_ENABLE
1696 assert (checkmax >= checkcnt); 1928 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1929 array_verify (EV_A_ (W *)checks, checkcnt);
1930#endif
1698 1931
1699# if 0 1932# if 0
1933#if EV_CHILD_ENABLE
1700 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)
1701 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1935 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1702# endif 1936#endif
1703#endif 1937# endif
1938#endif
1704} 1939}
1705 1940#endif
1706#endif /* multiplicity */
1707 1941
1708#if EV_MULTIPLICITY 1942#if EV_MULTIPLICITY
1709struct ev_loop * 1943struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1944ev_default_loop_init (unsigned int flags)
1711#else 1945#else
… …
1714#endif 1948#endif
1715{ 1949{
1716 if (!ev_default_loop_ptr) 1950 if (!ev_default_loop_ptr)
1717 { 1951 {
1718#if EV_MULTIPLICITY 1952#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1953 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 1954#else
1721 ev_default_loop_ptr = 1; 1955 ev_default_loop_ptr = 1;
1722#endif 1956#endif
1723 1957
1724 loop_init (EV_A_ flags); 1958 loop_init (EV_A_ flags);
1725 1959
1726 if (ev_backend (EV_A)) 1960 if (ev_backend (EV_A))
1727 { 1961 {
1728#ifndef _WIN32 1962#if EV_CHILD_ENABLE
1729 ev_signal_init (&childev, childcb, SIGCHLD); 1963 ev_signal_init (&childev, childcb, SIGCHLD);
1730 ev_set_priority (&childev, EV_MAXPRI); 1964 ev_set_priority (&childev, EV_MAXPRI);
1731 ev_signal_start (EV_A_ &childev); 1965 ev_signal_start (EV_A_ &childev);
1732 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1966 ev_unref (EV_A); /* child watcher should not keep loop alive */
1733#endif 1967#endif
… …
1741 1975
1742void 1976void
1743ev_default_destroy (void) 1977ev_default_destroy (void)
1744{ 1978{
1745#if EV_MULTIPLICITY 1979#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 1980 EV_P = ev_default_loop_ptr;
1747#endif 1981#endif
1748 1982
1749 ev_default_loop_ptr = 0; 1983 ev_default_loop_ptr = 0;
1750 1984
1751#ifndef _WIN32 1985#if EV_CHILD_ENABLE
1752 ev_ref (EV_A); /* child watcher */ 1986 ev_ref (EV_A); /* child watcher */
1753 ev_signal_stop (EV_A_ &childev); 1987 ev_signal_stop (EV_A_ &childev);
1754#endif 1988#endif
1755 1989
1756 loop_destroy (EV_A); 1990 loop_destroy (EV_A);
… …
1758 1992
1759void 1993void
1760ev_default_fork (void) 1994ev_default_fork (void)
1761{ 1995{
1762#if EV_MULTIPLICITY 1996#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 1997 EV_P = ev_default_loop_ptr;
1764#endif 1998#endif
1765 1999
1766 postfork = 1; /* must be in line with ev_loop_fork */ 2000 postfork = 1; /* must be in line with ev_loop_fork */
1767} 2001}
1768 2002
… …
1772ev_invoke (EV_P_ void *w, int revents) 2006ev_invoke (EV_P_ void *w, int revents)
1773{ 2007{
1774 EV_CB_INVOKE ((W)w, revents); 2008 EV_CB_INVOKE ((W)w, revents);
1775} 2009}
1776 2010
1777inline_speed void 2011unsigned int
1778call_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)
1779{ 2025{
1780 int pri; 2026 int pri;
1781 2027
1782 for (pri = NUMPRI; pri--; ) 2028 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 2029 while (pendingcnt [pri])
… …
1951 ANHE_at_cache (*he); 2197 ANHE_at_cache (*he);
1952 } 2198 }
1953} 2199}
1954 2200
1955/* fetch new monotonic and realtime times from the kernel */ 2201/* fetch new monotonic and realtime times from the kernel */
1956/* also detetc if there was a timejump, and act accordingly */ 2202/* also detect if there was a timejump, and act accordingly */
1957inline_speed void 2203inline_speed void
1958time_update (EV_P_ ev_tstamp max_block) 2204time_update (EV_P_ ev_tstamp max_block)
1959{ 2205{
1960#if EV_USE_MONOTONIC 2206#if EV_USE_MONOTONIC
1961 if (expect_true (have_monotonic)) 2207 if (expect_true (have_monotonic))
… …
2018 2264
2019 mn_now = ev_rt_now; 2265 mn_now = ev_rt_now;
2020 } 2266 }
2021} 2267}
2022 2268
2023static int loop_done;
2024
2025void 2269void
2026ev_loop (EV_P_ int flags) 2270ev_loop (EV_P_ int flags)
2027{ 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
2028 loop_done = EVUNLOOP_CANCEL; 2278 loop_done = EVUNLOOP_CANCEL;
2029 2279
2030 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 */
2031 2281
2032 do 2282 do
2033 { 2283 {
2034#if EV_VERIFY >= 2 2284#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2285 ev_verify (EV_A);
2036#endif 2286#endif
2037 2287
2038#ifndef _WIN32 2288#ifndef _WIN32
2039 if (expect_false (curpid)) /* penalise the forking check even more */ 2289 if (expect_false (curpid)) /* penalise the forking check even more */
2040 if (expect_false (getpid () != curpid)) 2290 if (expect_false (getpid () != curpid))
… …
2048 /* we might have forked, so queue fork handlers */ 2298 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2299 if (expect_false (postfork))
2050 if (forkcnt) 2300 if (forkcnt)
2051 { 2301 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2302 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2303 EV_INVOKE_PENDING;
2054 } 2304 }
2055#endif 2305#endif
2056 2306
2307#if EV_PREPARE_ENABLE
2057 /* queue prepare watchers (and execute them) */ 2308 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2309 if (expect_false (preparecnt))
2059 { 2310 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2311 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2312 EV_INVOKE_PENDING;
2062 } 2313 }
2314#endif
2315
2316 if (expect_false (loop_done))
2317 break;
2063 2318
2064 /* we might have forked, so reify kernel state if necessary */ 2319 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2320 if (expect_false (postfork))
2066 loop_fork (EV_A); 2321 loop_fork (EV_A);
2067 2322
… …
2073 ev_tstamp waittime = 0.; 2328 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2329 ev_tstamp sleeptime = 0.;
2075 2330
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2332 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
2078 /* update time to cancel out callback processing overhead */ 2336 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2337 time_update (EV_A_ 1e100);
2080 2338
2081 waittime = MAX_BLOCKTIME; 2339 waittime = MAX_BLOCKTIME;
2082 2340
… …
2092 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;
2093 if (waittime > to) waittime = to; 2351 if (waittime > to) waittime = to;
2094 } 2352 }
2095#endif 2353#endif
2096 2354
2355 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2356 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2357 waittime = timeout_blocktime;
2099 2358
2100 sleeptime = waittime - backend_fudge; 2359 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2360 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 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 {
2107 ev_sleep (sleeptime); 2369 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2370 waittime -= sleeptime;
2371 }
2109 } 2372 }
2110 } 2373 }
2111 2374
2375#if EV_FEATURE_API
2112 ++loop_count; 2376 ++loop_count;
2377#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2379 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2381
2115 /* update ev_rt_now, do magic */ 2382 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2383 time_update (EV_A_ waittime + sleeptime);
2117 } 2384 }
2118 2385
… …
2125#if EV_IDLE_ENABLE 2392#if EV_IDLE_ENABLE
2126 /* queue idle watchers unless other events are pending */ 2393 /* queue idle watchers unless other events are pending */
2127 idle_reify (EV_A); 2394 idle_reify (EV_A);
2128#endif 2395#endif
2129 2396
2397#if EV_CHECK_ENABLE
2130 /* queue check watchers, to be executed first */ 2398 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2399 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2400 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2401#endif
2133 2402
2134 call_pending (EV_A); 2403 EV_INVOKE_PENDING;
2135 } 2404 }
2136 while (expect_true ( 2405 while (expect_true (
2137 activecnt 2406 activecnt
2138 && !loop_done 2407 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2408 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2409 ));
2141 2410
2142 if (loop_done == EVUNLOOP_ONE) 2411 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2412 loop_done = EVUNLOOP_CANCEL;
2413
2414#if EV_FEATURE_API
2415 --loop_depth;
2416#endif
2144} 2417}
2145 2418
2146void 2419void
2147ev_unloop (EV_P_ int how) 2420ev_unloop (EV_P_ int how)
2148{ 2421{
… …
2199inline_size void 2472inline_size void
2200wlist_del (WL *head, WL elem) 2473wlist_del (WL *head, WL elem)
2201{ 2474{
2202 while (*head) 2475 while (*head)
2203 { 2476 {
2204 if (*head == elem) 2477 if (expect_true (*head == elem))
2205 { 2478 {
2206 *head = elem->next; 2479 *head = elem->next;
2207 return; 2480 break;
2208 } 2481 }
2209 2482
2210 head = &(*head)->next; 2483 head = &(*head)->next;
2211 } 2484 }
2212} 2485}
… …
2240} 2513}
2241 2514
2242inline_size void 2515inline_size void
2243pri_adjust (EV_P_ W w) 2516pri_adjust (EV_P_ W w)
2244{ 2517{
2245 int pri = w->priority; 2518 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2519 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2520 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2521 ev_set_priority (w, pri);
2249} 2522}
2250 2523
2251inline_speed void 2524inline_speed void
2252ev_start (EV_P_ W w, int active) 2525ev_start (EV_P_ W w, int active)
2253{ 2526{
… …
2272 2545
2273 if (expect_false (ev_is_active (w))) 2546 if (expect_false (ev_is_active (w)))
2274 return; 2547 return;
2275 2548
2276 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2549 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2277 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))));
2278 2551
2279 EV_FREQUENT_CHECK; 2552 EV_FREQUENT_CHECK;
2280 2553
2281 ev_start (EV_A_ (W)w, 1); 2554 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2555 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2556 wlist_add (&anfds[fd].head, (WL)w);
2284 2557
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2558 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2559 w->events &= ~EV__IOFDSET;
2287 2560
2288 EV_FREQUENT_CHECK; 2561 EV_FREQUENT_CHECK;
2289} 2562}
2290 2563
… …
2352 timers [active] = timers [timercnt + HEAP0]; 2625 timers [active] = timers [timercnt + HEAP0];
2353 adjustheap (timers, timercnt, active); 2626 adjustheap (timers, timercnt, active);
2354 } 2627 }
2355 } 2628 }
2356 2629
2357 EV_FREQUENT_CHECK;
2358
2359 ev_at (w) -= mn_now; 2630 ev_at (w) -= mn_now;
2360 2631
2361 ev_stop (EV_A_ (W)w); 2632 ev_stop (EV_A_ (W)w);
2633
2634 EV_FREQUENT_CHECK;
2362} 2635}
2363 2636
2364void noinline 2637void noinline
2365ev_timer_again (EV_P_ ev_timer *w) 2638ev_timer_again (EV_P_ ev_timer *w)
2366{ 2639{
… …
2384 } 2657 }
2385 2658
2386 EV_FREQUENT_CHECK; 2659 EV_FREQUENT_CHECK;
2387} 2660}
2388 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
2389#if EV_PERIODIC_ENABLE 2668#if EV_PERIODIC_ENABLE
2390void noinline 2669void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2670ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2671{
2393 if (expect_false (ev_is_active (w))) 2672 if (expect_false (ev_is_active (w)))
… …
2439 periodics [active] = periodics [periodiccnt + HEAP0]; 2718 periodics [active] = periodics [periodiccnt + HEAP0];
2440 adjustheap (periodics, periodiccnt, active); 2719 adjustheap (periodics, periodiccnt, active);
2441 } 2720 }
2442 } 2721 }
2443 2722
2444 EV_FREQUENT_CHECK;
2445
2446 ev_stop (EV_A_ (W)w); 2723 ev_stop (EV_A_ (W)w);
2724
2725 EV_FREQUENT_CHECK;
2447} 2726}
2448 2727
2449void noinline 2728void noinline
2450ev_periodic_again (EV_P_ ev_periodic *w) 2729ev_periodic_again (EV_P_ ev_periodic *w)
2451{ 2730{
… …
2457 2736
2458#ifndef SA_RESTART 2737#ifndef SA_RESTART
2459# define SA_RESTART 0 2738# define SA_RESTART 0
2460#endif 2739#endif
2461 2740
2741#if EV_SIGNAL_ENABLE
2742
2462void noinline 2743void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2744ev_signal_start (EV_P_ ev_signal *w)
2464{ 2745{
2465#if EV_MULTIPLICITY
2466 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2467#endif
2468 if (expect_false (ev_is_active (w))) 2746 if (expect_false (ev_is_active (w)))
2469 return; 2747 return;
2470 2748
2471 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));
2472 2750
2473 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));
2474 2754
2475 EV_FREQUENT_CHECK; 2755 signals [w->signum - 1].loop = EV_A;
2756#endif
2476 2757
2758 EV_FREQUENT_CHECK;
2759
2760#if EV_USE_SIGNALFD
2761 if (sigfd == -2)
2477 { 2762 {
2478#ifndef _WIN32 2763 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2764 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2765 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2766
2484 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 */
2485 2770
2486#ifndef _WIN32 2771 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2772
2488#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 }
2489 } 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
2490 2789
2491 ev_start (EV_A_ (W)w, 1); 2790 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2791 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2792
2494 if (!((WL)w)->next) 2793 if (!((WL)w)->next)
2794# if EV_USE_SIGNALFD
2795 if (sigfd < 0) /*TODO*/
2796# endif
2495 { 2797 {
2496#if _WIN32 2798# ifdef _WIN32
2799 evpipe_init (EV_A);
2800
2497 signal (w->signum, ev_sighandler); 2801 signal (w->signum, ev_sighandler);
2498#else 2802# else
2499 struct sigaction sa; 2803 struct sigaction sa;
2804
2805 evpipe_init (EV_A);
2806
2500 sa.sa_handler = ev_sighandler; 2807 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2808 sigfillset (&sa.sa_mask);
2502 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 */
2503 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);
2504#endif 2815#endif
2505 } 2816 }
2506 2817
2507 EV_FREQUENT_CHECK; 2818 EV_FREQUENT_CHECK;
2508} 2819}
2509 2820
2510void noinline 2821void noinline
… …
2518 2829
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2830 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2831 ev_stop (EV_A_ (W)w);
2521 2832
2522 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
2523 signal (w->signum, SIG_DFL); 2852 signal (w->signum, SIG_DFL);
2853 }
2524 2854
2525 EV_FREQUENT_CHECK; 2855 EV_FREQUENT_CHECK;
2526} 2856}
2857
2858#endif
2859
2860#if EV_CHILD_ENABLE
2527 2861
2528void 2862void
2529ev_child_start (EV_P_ ev_child *w) 2863ev_child_start (EV_P_ ev_child *w)
2530{ 2864{
2531#if EV_MULTIPLICITY 2865#if EV_MULTIPLICITY
… …
2535 return; 2869 return;
2536 2870
2537 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2538 2872
2539 ev_start (EV_A_ (W)w, 1); 2873 ev_start (EV_A_ (W)w, 1);
2540 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2874 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2541 2875
2542 EV_FREQUENT_CHECK; 2876 EV_FREQUENT_CHECK;
2543} 2877}
2544 2878
2545void 2879void
… …
2549 if (expect_false (!ev_is_active (w))) 2883 if (expect_false (!ev_is_active (w)))
2550 return; 2884 return;
2551 2885
2552 EV_FREQUENT_CHECK; 2886 EV_FREQUENT_CHECK;
2553 2887
2554 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2888 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2555 ev_stop (EV_A_ (W)w); 2889 ev_stop (EV_A_ (W)w);
2556 2890
2557 EV_FREQUENT_CHECK; 2891 EV_FREQUENT_CHECK;
2558} 2892}
2893
2894#endif
2559 2895
2560#if EV_STAT_ENABLE 2896#if EV_STAT_ENABLE
2561 2897
2562# ifdef _WIN32 2898# ifdef _WIN32
2563# undef lstat 2899# undef lstat
… …
2569#define MIN_STAT_INTERVAL 0.1074891 2905#define MIN_STAT_INTERVAL 0.1074891
2570 2906
2571static 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);
2572 2908
2573#if EV_USE_INOTIFY 2909#if EV_USE_INOTIFY
2574# 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)
2575 2913
2576static void noinline 2914static void noinline
2577infy_add (EV_P_ ev_stat *w) 2915infy_add (EV_P_ ev_stat *w)
2578{ 2916{
2579 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);
2580 2918
2581 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 */
2582 { 2939 }
2940 else
2941 {
2942 /* can't use inotify, continue to stat */
2583 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2943 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2584 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2585 2944
2586 /* monitor some parent directory for speedup hints */ 2945 /* if path is not there, monitor some parent directory for speedup hints */
2587 /* 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, */
2588 /* but an efficiency issue only */ 2947 /* but an efficiency issue only */
2589 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2948 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2590 { 2949 {
2591 char path [4096]; 2950 char path [4096];
… …
2607 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2966 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2608 } 2967 }
2609 } 2968 }
2610 2969
2611 if (w->wd >= 0) 2970 if (w->wd >= 0)
2612 {
2613 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);
2614 2972
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 2973 /* now re-arm timer, if required */
2616 /* unless the filesystem it known to be local, we therefore still poll */ 2974 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2617 /* also do poll on <2.6.25, but with normal frequency */
2618 struct statfs sfs;
2619
2620 if (fs_2625 && !statfs (w->path, &sfs))
2621 if (sfs.f_type == 0x1373 /* devfs */
2622 || sfs.f_type == 0xEF53 /* ext2/3 */
2623 || sfs.f_type == 0x3153464a /* jfs */
2624 || sfs.f_type == 0x52654973 /* reiser3 */
2625 || sfs.f_type == 0x01021994 /* tempfs */
2626 || sfs.f_type == 0x58465342 /* xfs */)
2627 return;
2628
2629 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2630 ev_timer_again (EV_A_ &w->timer); 2975 ev_timer_again (EV_A_ &w->timer);
2631 } 2976 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2632} 2977}
2633 2978
2634static void noinline 2979static void noinline
2635infy_del (EV_P_ ev_stat *w) 2980infy_del (EV_P_ ev_stat *w)
2636{ 2981{
… …
2639 2984
2640 if (wd < 0) 2985 if (wd < 0)
2641 return; 2986 return;
2642 2987
2643 w->wd = -2; 2988 w->wd = -2;
2644 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2989 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2645 wlist_del (&fs_hash [slot].head, (WL)w); 2990 wlist_del (&fs_hash [slot].head, (WL)w);
2646 2991
2647 /* remove this watcher, if others are watching it, they will rearm */ 2992 /* remove this watcher, if others are watching it, they will rearm */
2648 inotify_rm_watch (fs_fd, wd); 2993 inotify_rm_watch (fs_fd, wd);
2649} 2994}
… …
2651static void noinline 2996static void noinline
2652infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2997infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2653{ 2998{
2654 if (slot < 0) 2999 if (slot < 0)
2655 /* overflow, need to check for all hash slots */ 3000 /* overflow, need to check for all hash slots */
2656 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3001 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2657 infy_wd (EV_A_ slot, wd, ev); 3002 infy_wd (EV_A_ slot, wd, ev);
2658 else 3003 else
2659 { 3004 {
2660 WL w_; 3005 WL w_;
2661 3006
2662 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3007 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2663 { 3008 {
2664 ev_stat *w = (ev_stat *)w_; 3009 ev_stat *w = (ev_stat *)w_;
2665 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 */
2666 3011
2667 if (w->wd == wd || wd == -1) 3012 if (w->wd == wd || wd == -1)
2668 { 3013 {
2669 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3014 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2670 { 3015 {
2671 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);
2672 w->wd = -1; 3017 w->wd = -1;
2673 infy_add (EV_A_ w); /* re-add, no matter what */ 3018 infy_add (EV_A_ w); /* re-add, no matter what */
2674 } 3019 }
2675 3020
2676 stat_timer_cb (EV_A_ &w->timer, 0); 3021 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2681 3026
2682static void 3027static void
2683infy_cb (EV_P_ ev_io *w, int revents) 3028infy_cb (EV_P_ ev_io *w, int revents)
2684{ 3029{
2685 char buf [EV_INOTIFY_BUFSIZE]; 3030 char buf [EV_INOTIFY_BUFSIZE];
2686 struct inotify_event *ev = (struct inotify_event *)buf;
2687 int ofs; 3031 int ofs;
2688 int len = read (fs_fd, buf, sizeof (buf)); 3032 int len = read (fs_fd, buf, sizeof (buf));
2689 3033
2690 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);
2691 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;
2692} 3072}
2693 3073
2694inline_size void 3074inline_size void
2695check_2625 (EV_P) 3075ev_check_2625 (EV_P)
2696{ 3076{
2697 /* kernels < 2.6.25 are borked 3077 /* kernels < 2.6.25 are borked
2698 * 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
2699 */ 3079 */
2700 struct utsname buf; 3080 if (ev_linux_version () < 0x020619)
2701 int major, minor, micro;
2702
2703 if (uname (&buf))
2704 return; 3081 return;
2705 3082
2706 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2707 return;
2708
2709 if (major < 2
2710 || (major == 2 && minor < 6)
2711 || (major == 2 && minor == 6 && micro < 25))
2712 return;
2713
2714 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 ();
2715} 3095}
2716 3096
2717inline_size void 3097inline_size void
2718infy_init (EV_P) 3098infy_init (EV_P)
2719{ 3099{
2720 if (fs_fd != -2) 3100 if (fs_fd != -2)
2721 return; 3101 return;
2722 3102
2723 fs_fd = -1; 3103 fs_fd = -1;
2724 3104
2725 check_2625 (EV_A); 3105 ev_check_2625 (EV_A);
2726 3106
2727 fs_fd = inotify_init (); 3107 fs_fd = infy_newfd ();
2728 3108
2729 if (fs_fd >= 0) 3109 if (fs_fd >= 0)
2730 { 3110 {
3111 fd_intern (fs_fd);
2731 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3112 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2732 ev_set_priority (&fs_w, EV_MAXPRI); 3113 ev_set_priority (&fs_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &fs_w); 3114 ev_io_start (EV_A_ &fs_w);
3115 ev_unref (EV_A);
2734 } 3116 }
2735} 3117}
2736 3118
2737inline_size void 3119inline_size void
2738infy_fork (EV_P) 3120infy_fork (EV_P)
… …
2740 int slot; 3122 int slot;
2741 3123
2742 if (fs_fd < 0) 3124 if (fs_fd < 0)
2743 return; 3125 return;
2744 3126
3127 ev_ref (EV_A);
3128 ev_io_stop (EV_A_ &fs_w);
2745 close (fs_fd); 3129 close (fs_fd);
2746 fs_fd = inotify_init (); 3130 fs_fd = infy_newfd ();
2747 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
2748 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3140 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2749 { 3141 {
2750 WL w_ = fs_hash [slot].head; 3142 WL w_ = fs_hash [slot].head;
2751 fs_hash [slot].head = 0; 3143 fs_hash [slot].head = 0;
2752 3144
2753 while (w_) 3145 while (w_)
… …
2758 w->wd = -1; 3150 w->wd = -1;
2759 3151
2760 if (fs_fd >= 0) 3152 if (fs_fd >= 0)
2761 infy_add (EV_A_ w); /* re-add, no matter what */ 3153 infy_add (EV_A_ w); /* re-add, no matter what */
2762 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);
2763 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 }
2764 } 3161 }
2765 } 3162 }
2766} 3163}
2767 3164
2768#endif 3165#endif
… …
2785static void noinline 3182static void noinline
2786stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3183stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2787{ 3184{
2788 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3185 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2789 3186
2790 /* we copy this here each the time so that */ 3187 ev_statdata prev = w->attr;
2791 /* prev has the old value when the callback gets invoked */
2792 w->prev = w->attr;
2793 ev_stat_stat (EV_A_ w); 3188 ev_stat_stat (EV_A_ w);
2794 3189
2795 /* 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 */
2796 if ( 3191 if (
2797 w->prev.st_dev != w->attr.st_dev 3192 prev.st_dev != w->attr.st_dev
2798 || w->prev.st_ino != w->attr.st_ino 3193 || prev.st_ino != w->attr.st_ino
2799 || w->prev.st_mode != w->attr.st_mode 3194 || prev.st_mode != w->attr.st_mode
2800 || w->prev.st_nlink != w->attr.st_nlink 3195 || prev.st_nlink != w->attr.st_nlink
2801 || w->prev.st_uid != w->attr.st_uid 3196 || prev.st_uid != w->attr.st_uid
2802 || w->prev.st_gid != w->attr.st_gid 3197 || prev.st_gid != w->attr.st_gid
2803 || w->prev.st_rdev != w->attr.st_rdev 3198 || prev.st_rdev != w->attr.st_rdev
2804 || w->prev.st_size != w->attr.st_size 3199 || prev.st_size != w->attr.st_size
2805 || w->prev.st_atime != w->attr.st_atime 3200 || prev.st_atime != w->attr.st_atime
2806 || w->prev.st_mtime != w->attr.st_mtime 3201 || prev.st_mtime != w->attr.st_mtime
2807 || w->prev.st_ctime != w->attr.st_ctime 3202 || prev.st_ctime != w->attr.st_ctime
2808 ) { 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
2809 #if EV_USE_INOTIFY 3209 #if EV_USE_INOTIFY
2810 if (fs_fd >= 0) 3210 if (fs_fd >= 0)
2811 { 3211 {
2812 infy_del (EV_A_ w); 3212 infy_del (EV_A_ w);
2813 infy_add (EV_A_ w); 3213 infy_add (EV_A_ w);
… …
2838 3238
2839 if (fs_fd >= 0) 3239 if (fs_fd >= 0)
2840 infy_add (EV_A_ w); 3240 infy_add (EV_A_ w);
2841 else 3241 else
2842#endif 3242#endif
3243 {
2843 ev_timer_again (EV_A_ &w->timer); 3244 ev_timer_again (EV_A_ &w->timer);
3245 ev_unref (EV_A);
3246 }
2844 3247
2845 ev_start (EV_A_ (W)w, 1); 3248 ev_start (EV_A_ (W)w, 1);
2846 3249
2847 EV_FREQUENT_CHECK; 3250 EV_FREQUENT_CHECK;
2848} 3251}
… …
2857 EV_FREQUENT_CHECK; 3260 EV_FREQUENT_CHECK;
2858 3261
2859#if EV_USE_INOTIFY 3262#if EV_USE_INOTIFY
2860 infy_del (EV_A_ w); 3263 infy_del (EV_A_ w);
2861#endif 3264#endif
3265
3266 if (ev_is_active (&w->timer))
3267 {
3268 ev_ref (EV_A);
2862 ev_timer_stop (EV_A_ &w->timer); 3269 ev_timer_stop (EV_A_ &w->timer);
3270 }
2863 3271
2864 ev_stop (EV_A_ (W)w); 3272 ev_stop (EV_A_ (W)w);
2865 3273
2866 EV_FREQUENT_CHECK; 3274 EV_FREQUENT_CHECK;
2867} 3275}
… …
2912 3320
2913 EV_FREQUENT_CHECK; 3321 EV_FREQUENT_CHECK;
2914} 3322}
2915#endif 3323#endif
2916 3324
3325#if EV_PREPARE_ENABLE
2917void 3326void
2918ev_prepare_start (EV_P_ ev_prepare *w) 3327ev_prepare_start (EV_P_ ev_prepare *w)
2919{ 3328{
2920 if (expect_false (ev_is_active (w))) 3329 if (expect_false (ev_is_active (w)))
2921 return; 3330 return;
… …
2947 3356
2948 ev_stop (EV_A_ (W)w); 3357 ev_stop (EV_A_ (W)w);
2949 3358
2950 EV_FREQUENT_CHECK; 3359 EV_FREQUENT_CHECK;
2951} 3360}
3361#endif
2952 3362
3363#if EV_CHECK_ENABLE
2953void 3364void
2954ev_check_start (EV_P_ ev_check *w) 3365ev_check_start (EV_P_ ev_check *w)
2955{ 3366{
2956 if (expect_false (ev_is_active (w))) 3367 if (expect_false (ev_is_active (w)))
2957 return; 3368 return;
… …
2983 3394
2984 ev_stop (EV_A_ (W)w); 3395 ev_stop (EV_A_ (W)w);
2985 3396
2986 EV_FREQUENT_CHECK; 3397 EV_FREQUENT_CHECK;
2987} 3398}
3399#endif
2988 3400
2989#if EV_EMBED_ENABLE 3401#if EV_EMBED_ENABLE
2990void noinline 3402void noinline
2991ev_embed_sweep (EV_P_ ev_embed *w) 3403ev_embed_sweep (EV_P_ ev_embed *w)
2992{ 3404{
… …
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3420embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3421{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3422 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3423
3012 { 3424 {
3013 struct ev_loop *loop = w->other; 3425 EV_P = w->other;
3014 3426
3015 while (fdchangecnt) 3427 while (fdchangecnt)
3016 { 3428 {
3017 fd_reify (EV_A); 3429 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3430 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3026 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));
3027 3439
3028 ev_embed_stop (EV_A_ w); 3440 ev_embed_stop (EV_A_ w);
3029 3441
3030 { 3442 {
3031 struct ev_loop *loop = w->other; 3443 EV_P = w->other;
3032 3444
3033 ev_loop_fork (EV_A); 3445 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3446 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3035 } 3447 }
3036 3448
… …
3050{ 3462{
3051 if (expect_false (ev_is_active (w))) 3463 if (expect_false (ev_is_active (w)))
3052 return; 3464 return;
3053 3465
3054 { 3466 {
3055 struct ev_loop *loop = w->other; 3467 EV_P = w->other;
3056 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 ()));
3057 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);
3058 } 3470 }
3059 3471
3060 EV_FREQUENT_CHECK; 3472 EV_FREQUENT_CHECK;
… …
3087 3499
3088 ev_io_stop (EV_A_ &w->io); 3500 ev_io_stop (EV_A_ &w->io);
3089 ev_prepare_stop (EV_A_ &w->prepare); 3501 ev_prepare_stop (EV_A_ &w->prepare);
3090 ev_fork_stop (EV_A_ &w->fork); 3502 ev_fork_stop (EV_A_ &w->fork);
3091 3503
3504 ev_stop (EV_A_ (W)w);
3505
3092 EV_FREQUENT_CHECK; 3506 EV_FREQUENT_CHECK;
3093} 3507}
3094#endif 3508#endif
3095 3509
3096#if EV_FORK_ENABLE 3510#if EV_FORK_ENABLE
… …
3172 3586
3173void 3587void
3174ev_async_send (EV_P_ ev_async *w) 3588ev_async_send (EV_P_ ev_async *w)
3175{ 3589{
3176 w->sent = 1; 3590 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3591 evpipe_write (EV_A_ &async_pending);
3178} 3592}
3179#endif 3593#endif
3180 3594
3181/*****************************************************************************/ 3595/*****************************************************************************/
3182 3596
… …
3319 if (types & EV_ASYNC) 3733 if (types & EV_ASYNC)
3320 for (i = asynccnt; i--; ) 3734 for (i = asynccnt; i--; )
3321 cb (EV_A_ EV_ASYNC, asyncs [i]); 3735 cb (EV_A_ EV_ASYNC, asyncs [i]);
3322#endif 3736#endif
3323 3737
3738#if EV_PREPARE_ENABLE
3324 if (types & EV_PREPARE) 3739 if (types & EV_PREPARE)
3325 for (i = preparecnt; i--; ) 3740 for (i = preparecnt; i--; )
3326#if EV_EMBED_ENABLE 3741# if EV_EMBED_ENABLE
3327 if (ev_cb (prepares [i]) != embed_prepare_cb) 3742 if (ev_cb (prepares [i]) != embed_prepare_cb)
3328#endif 3743# endif
3329 cb (EV_A_ EV_PREPARE, prepares [i]); 3744 cb (EV_A_ EV_PREPARE, prepares [i]);
3745#endif
3330 3746
3747#if EV_CHECK_ENABLE
3331 if (types & EV_CHECK) 3748 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3749 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3750 cb (EV_A_ EV_CHECK, checks [i]);
3751#endif
3334 3752
3753#if EV_SIGNAL_ENABLE
3335 if (types & EV_SIGNAL) 3754 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3755 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3756 for (wl = signals [i].head; wl; )
3338 { 3757 {
3339 wn = wl->next; 3758 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3759 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3760 wl = wn;
3342 } 3761 }
3762#endif
3343 3763
3764#if EV_CHILD_ENABLE
3344 if (types & EV_CHILD) 3765 if (types & EV_CHILD)
3345 for (i = EV_PID_HASHSIZE; i--; ) 3766 for (i = (EV_PID_HASHSIZE); i--; )
3346 for (wl = childs [i]; wl; ) 3767 for (wl = childs [i]; wl; )
3347 { 3768 {
3348 wn = wl->next; 3769 wn = wl->next;
3349 cb (EV_A_ EV_CHILD, wl); 3770 cb (EV_A_ EV_CHILD, wl);
3350 wl = wn; 3771 wl = wn;
3351 } 3772 }
3773#endif
3352/* EV_STAT 0x00001000 /* stat data changed */ 3774/* EV_STAT 0x00001000 /* stat data changed */
3353/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3775/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3354} 3776}
3355#endif 3777#endif
3356 3778

Diff Legend

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