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

Comparing libev/ev.c (file contents):
Revision 1.292 by root, Mon Jun 29 07:22:56 2009 UTC vs.
Revision 1.342 by root, Mon Mar 29 12:40:57 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 326#endif
288 327
289/* 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, */
290/* which makes programs even slower. might work on other unices, too. */ 329/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL 330#if EV_USE_CLOCK_SYSCALL
… …
300# endif 339# endif
301#endif 340#endif
302 341
303/* 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 */
304 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
305#ifndef CLOCK_MONOTONIC 350#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 351# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 352# define EV_USE_MONOTONIC 0
308#endif 353#endif
309 354
… …
339#endif 384#endif
340 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
569#ifndef EV_HAVE_EV_TIME 707#ifndef EV_HAVE_EV_TIME
570ev_tstamp 708ev_tstamp
571ev_time (void) 709ev_time (void)
… …
627 765
628 tv.tv_sec = (time_t)delay; 766 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 767 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 768
631 /* 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 */
632 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 770 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 771 /* by older ones */
634 select (0, 0, 0, 0, &tv); 772 select (0, 0, 0, 0, &tv);
635#endif 773#endif
636 } 774 }
637} 775}
… …
745} 883}
746 884
747/*****************************************************************************/ 885/*****************************************************************************/
748 886
749inline_speed void 887inline_speed void
750fd_event (EV_P_ int fd, int revents) 888fd_event_nocheck (EV_P_ int fd, int revents)
751{ 889{
752 ANFD *anfd = anfds + fd; 890 ANFD *anfd = anfds + fd;
753 ev_io *w; 891 ev_io *w;
754 892
755 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)
… …
759 if (ev) 897 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 898 ev_feed_event (EV_A_ (W)w, ev);
761 } 899 }
762} 900}
763 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
764void 913void
765ev_feed_fd_event (EV_P_ int fd, int revents) 914ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 915{
767 if (fd >= 0 && fd < anfdmax) 916 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 917 fd_event_nocheck (EV_A_ fd, revents);
769} 918}
770 919
771/* make sure the external fd watch events are in-sync */ 920/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 921/* with the kernel/libev internal state */
773inline_size void 922inline_size void
… …
788 937
789#if EV_SELECT_IS_WINSOCKET 938#if EV_SELECT_IS_WINSOCKET
790 if (events) 939 if (events)
791 { 940 {
792 unsigned long arg; 941 unsigned long arg;
793 #ifdef EV_FD_TO_WIN32_HANDLE
794 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
795 #else
796 anfd->handle = _get_osfhandle (fd);
797 #endif
798 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
799 } 944 }
800#endif 945#endif
801 946
802 { 947 {
… …
840 ev_io_stop (EV_A_ w); 985 ev_io_stop (EV_A_ w);
841 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);
842 } 987 }
843} 988}
844 989
845/* check whether the given fd is atcually valid, for error recovery */ 990/* check whether the given fd is actually valid, for error recovery */
846inline_size int 991inline_size int
847fd_valid (int fd) 992fd_valid (int fd)
848{ 993{
849#ifdef _WIN32 994#ifdef _WIN32
850 return _get_osfhandle (fd) != -1; 995 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
851#else 996#else
852 return fcntl (fd, F_GETFD) != -1; 997 return fcntl (fd, F_GETFD) != -1;
853#endif 998#endif
854} 999}
855 1000
… …
873 1018
874 for (fd = anfdmax; fd--; ) 1019 for (fd = anfdmax; fd--; )
875 if (anfds [fd].events) 1020 if (anfds [fd].events)
876 { 1021 {
877 fd_kill (EV_A_ fd); 1022 fd_kill (EV_A_ fd);
878 return; 1023 break;
879 } 1024 }
880} 1025}
881 1026
882/* 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 */
883static void noinline 1028static void noinline
… …
888 for (fd = 0; fd < anfdmax; ++fd) 1033 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 1034 if (anfds [fd].events)
890 { 1035 {
891 anfds [fd].events = 0; 1036 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 1037 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1038 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 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
895} 1054}
896 1055
897/*****************************************************************************/ 1056/*****************************************************************************/
898 1057
899/* 1058/*
… …
973 1132
974 for (;;) 1133 for (;;)
975 { 1134 {
976 int c = k << 1; 1135 int c = k << 1;
977 1136
978 if (c > N + HEAP0 - 1) 1137 if (c >= N + HEAP0)
979 break; 1138 break;
980 1139
981 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])
982 ? 1 : 0; 1141 ? 1 : 0;
983 1142
… …
1019 1178
1020/* move an element suitably so it is in a correct place */ 1179/* move an element suitably so it is in a correct place */
1021inline_size void 1180inline_size void
1022adjustheap (ANHE *heap, int N, int k) 1181adjustheap (ANHE *heap, int N, int k)
1023{ 1182{
1024 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)]))
1025 upheap (heap, k); 1184 upheap (heap, k);
1026 else 1185 else
1027 downheap (heap, N, k); 1186 downheap (heap, N, k);
1028} 1187}
1029 1188
… …
1042/*****************************************************************************/ 1201/*****************************************************************************/
1043 1202
1044/* associate signal watchers to a signal signal */ 1203/* associate signal watchers to a signal signal */
1045typedef struct 1204typedef struct
1046{ 1205{
1206 EV_ATOMIC_T pending;
1207#if EV_MULTIPLICITY
1208 EV_P;
1209#endif
1047 WL head; 1210 WL head;
1048 EV_ATOMIC_T gotsig;
1049} ANSIG; 1211} ANSIG;
1050 1212
1051static ANSIG *signals; 1213static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig;
1055 1214
1056/*****************************************************************************/ 1215/*****************************************************************************/
1057 1216
1058/* used to prepare libev internal fd's */ 1217#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1059/* this is not fork-safe */
1060inline_speed void
1061fd_intern (int fd)
1062{
1063#ifdef _WIN32
1064 unsigned long arg = 1;
1065 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
1066#else
1067 fcntl (fd, F_SETFD, FD_CLOEXEC);
1068 fcntl (fd, F_SETFL, O_NONBLOCK);
1069#endif
1070}
1071 1218
1072static void noinline 1219static void noinline
1073evpipe_init (EV_P) 1220evpipe_init (EV_P)
1074{ 1221{
1075 if (!ev_is_active (&pipe_w)) 1222 if (!ev_is_active (&pipe_w))
1076 { 1223 {
1077#if EV_USE_EVENTFD 1224# if EV_USE_EVENTFD
1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1226 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1227 evfd = eventfd (0, 0);
1228
1229 if (evfd >= 0)
1079 { 1230 {
1080 evpipe [0] = -1; 1231 evpipe [0] = -1;
1081 fd_intern (evfd); 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1234 }
1084 else 1235 else
1085#endif 1236# endif
1086 { 1237 {
1087 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1088 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1089 1240
1090 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
… …
1101evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1252evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1102{ 1253{
1103 if (!*flag) 1254 if (!*flag)
1104 { 1255 {
1105 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;
1106 1258
1107 *flag = 1; 1259 *flag = 1;
1108 1260
1109#if EV_USE_EVENTFD 1261#if EV_USE_EVENTFD
1110 if (evfd >= 0) 1262 if (evfd >= 0)
… …
1112 uint64_t counter = 1; 1264 uint64_t counter = 1;
1113 write (evfd, &counter, sizeof (uint64_t)); 1265 write (evfd, &counter, sizeof (uint64_t));
1114 } 1266 }
1115 else 1267 else
1116#endif 1268#endif
1117 write (evpipe [1], &old_errno, 1); 1269 write (evpipe [1], &dummy, 1);
1118 1270
1119 errno = old_errno; 1271 errno = old_errno;
1120 } 1272 }
1121} 1273}
1122 1274
1123/* called whenever the libev signal pipe */ 1275/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */ 1276/* got some events (signal, async) */
1125static void 1277static void
1126pipecb (EV_P_ ev_io *iow, int revents) 1278pipecb (EV_P_ ev_io *iow, int revents)
1127{ 1279{
1280 int i;
1281
1128#if EV_USE_EVENTFD 1282#if EV_USE_EVENTFD
1129 if (evfd >= 0) 1283 if (evfd >= 0)
1130 { 1284 {
1131 uint64_t counter; 1285 uint64_t counter;
1132 read (evfd, &counter, sizeof (uint64_t)); 1286 read (evfd, &counter, sizeof (uint64_t));
… …
1136 { 1290 {
1137 char dummy; 1291 char dummy;
1138 read (evpipe [0], &dummy, 1); 1292 read (evpipe [0], &dummy, 1);
1139 } 1293 }
1140 1294
1141 if (gotsig && ev_is_default_loop (EV_A)) 1295 if (sig_pending)
1142 { 1296 {
1143 int signum; 1297 sig_pending = 0;
1144 gotsig = 0;
1145 1298
1146 for (signum = signalmax; signum--; ) 1299 for (i = EV_NSIG - 1; i--; )
1147 if (signals [signum].gotsig) 1300 if (expect_false (signals [i].pending))
1148 ev_feed_signal_event (EV_A_ signum + 1); 1301 ev_feed_signal_event (EV_A_ i + 1);
1149 } 1302 }
1150 1303
1151#if EV_ASYNC_ENABLE 1304#if EV_ASYNC_ENABLE
1152 if (gotasync) 1305 if (async_pending)
1153 { 1306 {
1154 int i; 1307 async_pending = 0;
1155 gotasync = 0;
1156 1308
1157 for (i = asynccnt; i--; ) 1309 for (i = asynccnt; i--; )
1158 if (asyncs [i]->sent) 1310 if (asyncs [i]->sent)
1159 { 1311 {
1160 asyncs [i]->sent = 0; 1312 asyncs [i]->sent = 0;
… …
1168 1320
1169static void 1321static void
1170ev_sighandler (int signum) 1322ev_sighandler (int signum)
1171{ 1323{
1172#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1325 EV_P = signals [signum - 1].loop;
1174#endif 1326#endif
1175 1327
1176#if _WIN32 1328#ifdef _WIN32
1177 signal (signum, ev_sighandler); 1329 signal (signum, ev_sighandler);
1178#endif 1330#endif
1179 1331
1180 signals [signum - 1].gotsig = 1; 1332 signals [signum - 1].pending = 1;
1181 evpipe_write (EV_A_ &gotsig); 1333 evpipe_write (EV_A_ &sig_pending);
1182} 1334}
1183 1335
1184void noinline 1336void noinline
1185ev_feed_signal_event (EV_P_ int signum) 1337ev_feed_signal_event (EV_P_ int signum)
1186{ 1338{
1187 WL w; 1339 WL w;
1188 1340
1341 if (expect_false (signum <= 0 || signum > EV_NSIG))
1342 return;
1343
1344 --signum;
1345
1189#if EV_MULTIPLICITY 1346#if EV_MULTIPLICITY
1190 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 */
1191#endif 1348 /* or, likely more useful, feeding a signal nobody is waiting for */
1192 1349
1193 --signum; 1350 if (expect_false (signals [signum].loop != EV_A))
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return; 1351 return;
1352#endif
1197 1353
1198 signals [signum].gotsig = 0; 1354 signals [signum].pending = 0;
1199 1355
1200 for (w = signals [signum].head; w; w = w->next) 1356 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1357 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 1358}
1203 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
1204/*****************************************************************************/ 1382/*****************************************************************************/
1205 1383
1384#if EV_CHILD_ENABLE
1206static WL childs [EV_PID_HASHSIZE]; 1385static WL childs [EV_PID_HASHSIZE];
1207
1208#ifndef _WIN32
1209 1386
1210static ev_signal childev; 1387static ev_signal childev;
1211 1388
1212#ifndef WIFCONTINUED 1389#ifndef WIFCONTINUED
1213# define WIFCONTINUED(status) 0 1390# define WIFCONTINUED(status) 0
… …
1218child_reap (EV_P_ int chain, int pid, int status) 1395child_reap (EV_P_ int chain, int pid, int status)
1219{ 1396{
1220 ev_child *w; 1397 ev_child *w;
1221 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1398 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1222 1399
1223 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)
1224 { 1401 {
1225 if ((w->pid == pid || !w->pid) 1402 if ((w->pid == pid || !w->pid)
1226 && (!traced || (w->flags & 1))) 1403 && (!traced || (w->flags & 1)))
1227 { 1404 {
1228 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 */
… …
1253 /* 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 */
1254 /* 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 */
1255 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1432 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1256 1433
1257 child_reap (EV_A_ pid, pid, status); 1434 child_reap (EV_A_ pid, pid, status);
1258 if (EV_PID_HASHSIZE > 1) 1435 if ((EV_PID_HASHSIZE) > 1)
1259 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 */
1260} 1437}
1261 1438
1262#endif 1439#endif
1263 1440
… …
1330#ifdef __APPLE__ 1507#ifdef __APPLE__
1331 /* only select works correctly on that "unix-certified" platform */ 1508 /* only select works correctly on that "unix-certified" platform */
1332 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1509 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1333 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1510 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1334#endif 1511#endif
1512#ifdef __FreeBSD__
1513 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1514#endif
1335 1515
1336 return flags; 1516 return flags;
1337} 1517}
1338 1518
1339unsigned int 1519unsigned int
… …
1352ev_backend (EV_P) 1532ev_backend (EV_P)
1353{ 1533{
1354 return backend; 1534 return backend;
1355} 1535}
1356 1536
1537#if EV_FEATURE_API
1357unsigned int 1538unsigned int
1358ev_loop_count (EV_P) 1539ev_iteration (EV_P)
1359{ 1540{
1360 return loop_count; 1541 return loop_count;
1361} 1542}
1362 1543
1544unsigned int
1545ev_depth (EV_P)
1546{
1547 return loop_depth;
1548}
1549
1363void 1550void
1364ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1551ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1365{ 1552{
1366 io_blocktime = interval; 1553 io_blocktime = interval;
1367} 1554}
… …
1369void 1556void
1370ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1557ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1371{ 1558{
1372 timeout_blocktime = interval; 1559 timeout_blocktime = interval;
1373} 1560}
1561
1562void
1563ev_set_userdata (EV_P_ void *data)
1564{
1565 userdata = data;
1566}
1567
1568void *
1569ev_userdata (EV_P)
1570{
1571 return userdata;
1572}
1573
1574void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1575{
1576 invoke_cb = invoke_pending_cb;
1577}
1578
1579void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1580{
1581 release_cb = release;
1582 acquire_cb = acquire;
1583}
1584#endif
1374 1585
1375/* initialise a loop structure, must be zero-initialised */ 1586/* initialise a loop structure, must be zero-initialised */
1376static void noinline 1587static void noinline
1377loop_init (EV_P_ unsigned int flags) 1588loop_init (EV_P_ unsigned int flags)
1378{ 1589{
… …
1396 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1607 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1397 have_monotonic = 1; 1608 have_monotonic = 1;
1398 } 1609 }
1399#endif 1610#endif
1400 1611
1612 /* pid check not overridable via env */
1613#ifndef _WIN32
1614 if (flags & EVFLAG_FORKCHECK)
1615 curpid = getpid ();
1616#endif
1617
1618 if (!(flags & EVFLAG_NOENV)
1619 && !enable_secure ()
1620 && getenv ("LIBEV_FLAGS"))
1621 flags = atoi (getenv ("LIBEV_FLAGS"));
1622
1401 ev_rt_now = ev_time (); 1623 ev_rt_now = ev_time ();
1402 mn_now = get_clock (); 1624 mn_now = get_clock ();
1403 now_floor = mn_now; 1625 now_floor = mn_now;
1404 rtmn_diff = ev_rt_now - mn_now; 1626 rtmn_diff = ev_rt_now - mn_now;
1627#if EV_FEATURE_API
1628 invoke_cb = ev_invoke_pending;
1629#endif
1405 1630
1406 io_blocktime = 0.; 1631 io_blocktime = 0.;
1407 timeout_blocktime = 0.; 1632 timeout_blocktime = 0.;
1408 backend = 0; 1633 backend = 0;
1409 backend_fd = -1; 1634 backend_fd = -1;
1410 gotasync = 0; 1635 sig_pending = 0;
1636#if EV_ASYNC_ENABLE
1637 async_pending = 0;
1638#endif
1411#if EV_USE_INOTIFY 1639#if EV_USE_INOTIFY
1412 fs_fd = -2; 1640 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1413#endif 1641#endif
1414 1642#if EV_USE_SIGNALFD
1415 /* pid check not overridable via env */ 1643 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1416#ifndef _WIN32
1417 if (flags & EVFLAG_FORKCHECK)
1418 curpid = getpid ();
1419#endif 1644#endif
1420
1421 if (!(flags & EVFLAG_NOENV)
1422 && !enable_secure ()
1423 && getenv ("LIBEV_FLAGS"))
1424 flags = atoi (getenv ("LIBEV_FLAGS"));
1425 1645
1426 if (!(flags & 0x0000ffffU)) 1646 if (!(flags & 0x0000ffffU))
1427 flags |= ev_recommended_backends (); 1647 flags |= ev_recommended_backends ();
1428 1648
1429#if EV_USE_PORT 1649#if EV_USE_PORT
… …
1442 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1662 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1443#endif 1663#endif
1444 1664
1445 ev_prepare_init (&pending_w, pendingcb); 1665 ev_prepare_init (&pending_w, pendingcb);
1446 1666
1667#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1447 ev_init (&pipe_w, pipecb); 1668 ev_init (&pipe_w, pipecb);
1448 ev_set_priority (&pipe_w, EV_MAXPRI); 1669 ev_set_priority (&pipe_w, EV_MAXPRI);
1670#endif
1449 } 1671 }
1450} 1672}
1451 1673
1452/* free up a loop structure */ 1674/* free up a loop structure */
1453static void noinline 1675static void noinline
… …
1455{ 1677{
1456 int i; 1678 int i;
1457 1679
1458 if (ev_is_active (&pipe_w)) 1680 if (ev_is_active (&pipe_w))
1459 { 1681 {
1460 ev_ref (EV_A); /* signal watcher */ 1682 /*ev_ref (EV_A);*/
1461 ev_io_stop (EV_A_ &pipe_w); 1683 /*ev_io_stop (EV_A_ &pipe_w);*/
1462 1684
1463#if EV_USE_EVENTFD 1685#if EV_USE_EVENTFD
1464 if (evfd >= 0) 1686 if (evfd >= 0)
1465 close (evfd); 1687 close (evfd);
1466#endif 1688#endif
1467 1689
1468 if (evpipe [0] >= 0) 1690 if (evpipe [0] >= 0)
1469 { 1691 {
1470 close (evpipe [0]); 1692 EV_WIN32_CLOSE_FD (evpipe [0]);
1471 close (evpipe [1]); 1693 EV_WIN32_CLOSE_FD (evpipe [1]);
1472 } 1694 }
1473 } 1695 }
1696
1697#if EV_USE_SIGNALFD
1698 if (ev_is_active (&sigfd_w))
1699 close (sigfd);
1700#endif
1474 1701
1475#if EV_USE_INOTIFY 1702#if EV_USE_INOTIFY
1476 if (fs_fd >= 0) 1703 if (fs_fd >= 0)
1477 close (fs_fd); 1704 close (fs_fd);
1478#endif 1705#endif
… …
1502#if EV_IDLE_ENABLE 1729#if EV_IDLE_ENABLE
1503 array_free (idle, [i]); 1730 array_free (idle, [i]);
1504#endif 1731#endif
1505 } 1732 }
1506 1733
1507 ev_free (anfds); anfdmax = 0; 1734 ev_free (anfds); anfds = 0; anfdmax = 0;
1508 1735
1509 /* have to use the microsoft-never-gets-it-right macro */ 1736 /* have to use the microsoft-never-gets-it-right macro */
1510 array_free (rfeed, EMPTY); 1737 array_free (rfeed, EMPTY);
1511 array_free (fdchange, EMPTY); 1738 array_free (fdchange, EMPTY);
1512 array_free (timer, EMPTY); 1739 array_free (timer, EMPTY);
… …
1547 1774
1548 if (ev_is_active (&pipe_w)) 1775 if (ev_is_active (&pipe_w))
1549 { 1776 {
1550 /* this "locks" the handlers against writing to the pipe */ 1777 /* this "locks" the handlers against writing to the pipe */
1551 /* while we modify the fd vars */ 1778 /* while we modify the fd vars */
1552 gotsig = 1; 1779 sig_pending = 1;
1553#if EV_ASYNC_ENABLE 1780#if EV_ASYNC_ENABLE
1554 gotasync = 1; 1781 async_pending = 1;
1555#endif 1782#endif
1556 1783
1557 ev_ref (EV_A); 1784 ev_ref (EV_A);
1558 ev_io_stop (EV_A_ &pipe_w); 1785 ev_io_stop (EV_A_ &pipe_w);
1559 1786
… …
1562 close (evfd); 1789 close (evfd);
1563#endif 1790#endif
1564 1791
1565 if (evpipe [0] >= 0) 1792 if (evpipe [0] >= 0)
1566 { 1793 {
1567 close (evpipe [0]); 1794 EV_WIN32_CLOSE_FD (evpipe [0]);
1568 close (evpipe [1]); 1795 EV_WIN32_CLOSE_FD (evpipe [1]);
1569 } 1796 }
1570 1797
1798#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1571 evpipe_init (EV_A); 1799 evpipe_init (EV_A);
1572 /* now iterate over everything, in case we missed something */ 1800 /* now iterate over everything, in case we missed something */
1573 pipecb (EV_A_ &pipe_w, EV_READ); 1801 pipecb (EV_A_ &pipe_w, EV_READ);
1802#endif
1574 } 1803 }
1575 1804
1576 postfork = 0; 1805 postfork = 0;
1577} 1806}
1578 1807
1579#if EV_MULTIPLICITY 1808#if EV_MULTIPLICITY
1580 1809
1581struct ev_loop * 1810struct ev_loop *
1582ev_loop_new (unsigned int flags) 1811ev_loop_new (unsigned int flags)
1583{ 1812{
1584 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1813 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1585 1814
1586 memset (loop, 0, sizeof (struct ev_loop)); 1815 memset (EV_A, 0, sizeof (struct ev_loop));
1587
1588 loop_init (EV_A_ flags); 1816 loop_init (EV_A_ flags);
1589 1817
1590 if (ev_backend (EV_A)) 1818 if (ev_backend (EV_A))
1591 return loop; 1819 return EV_A;
1592 1820
1593 return 0; 1821 return 0;
1594} 1822}
1595 1823
1596void 1824void
… …
1603void 1831void
1604ev_loop_fork (EV_P) 1832ev_loop_fork (EV_P)
1605{ 1833{
1606 postfork = 1; /* must be in line with ev_default_fork */ 1834 postfork = 1; /* must be in line with ev_default_fork */
1607} 1835}
1836#endif /* multiplicity */
1608 1837
1609#if EV_VERIFY 1838#if EV_VERIFY
1610static void noinline 1839static void noinline
1611verify_watcher (EV_P_ W w) 1840verify_watcher (EV_P_ W w)
1612{ 1841{
… …
1640 verify_watcher (EV_A_ ws [cnt]); 1869 verify_watcher (EV_A_ ws [cnt]);
1641 } 1870 }
1642} 1871}
1643#endif 1872#endif
1644 1873
1874#if EV_FEATURE_API
1645void 1875void
1646ev_loop_verify (EV_P) 1876ev_verify (EV_P)
1647{ 1877{
1648#if EV_VERIFY 1878#if EV_VERIFY
1649 int i; 1879 int i;
1650 WL w; 1880 WL w;
1651 1881
… …
1690#if EV_ASYNC_ENABLE 1920#if EV_ASYNC_ENABLE
1691 assert (asyncmax >= asynccnt); 1921 assert (asyncmax >= asynccnt);
1692 array_verify (EV_A_ (W *)asyncs, asynccnt); 1922 array_verify (EV_A_ (W *)asyncs, asynccnt);
1693#endif 1923#endif
1694 1924
1925#if EV_PREPARE_ENABLE
1695 assert (preparemax >= preparecnt); 1926 assert (preparemax >= preparecnt);
1696 array_verify (EV_A_ (W *)prepares, preparecnt); 1927 array_verify (EV_A_ (W *)prepares, preparecnt);
1928#endif
1697 1929
1930#if EV_CHECK_ENABLE
1698 assert (checkmax >= checkcnt); 1931 assert (checkmax >= checkcnt);
1699 array_verify (EV_A_ (W *)checks, checkcnt); 1932 array_verify (EV_A_ (W *)checks, checkcnt);
1933#endif
1700 1934
1701# if 0 1935# if 0
1936#if EV_CHILD_ENABLE
1702 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1937 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1703 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1938 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1704# endif 1939#endif
1705#endif 1940# endif
1941#endif
1706} 1942}
1707 1943#endif
1708#endif /* multiplicity */
1709 1944
1710#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1711struct ev_loop * 1946struct ev_loop *
1712ev_default_loop_init (unsigned int flags) 1947ev_default_loop_init (unsigned int flags)
1713#else 1948#else
… …
1716#endif 1951#endif
1717{ 1952{
1718 if (!ev_default_loop_ptr) 1953 if (!ev_default_loop_ptr)
1719 { 1954 {
1720#if EV_MULTIPLICITY 1955#if EV_MULTIPLICITY
1721 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1956 EV_P = ev_default_loop_ptr = &default_loop_struct;
1722#else 1957#else
1723 ev_default_loop_ptr = 1; 1958 ev_default_loop_ptr = 1;
1724#endif 1959#endif
1725 1960
1726 loop_init (EV_A_ flags); 1961 loop_init (EV_A_ flags);
1727 1962
1728 if (ev_backend (EV_A)) 1963 if (ev_backend (EV_A))
1729 { 1964 {
1730#ifndef _WIN32 1965#if EV_CHILD_ENABLE
1731 ev_signal_init (&childev, childcb, SIGCHLD); 1966 ev_signal_init (&childev, childcb, SIGCHLD);
1732 ev_set_priority (&childev, EV_MAXPRI); 1967 ev_set_priority (&childev, EV_MAXPRI);
1733 ev_signal_start (EV_A_ &childev); 1968 ev_signal_start (EV_A_ &childev);
1734 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1969 ev_unref (EV_A); /* child watcher should not keep loop alive */
1735#endif 1970#endif
… …
1743 1978
1744void 1979void
1745ev_default_destroy (void) 1980ev_default_destroy (void)
1746{ 1981{
1747#if EV_MULTIPLICITY 1982#if EV_MULTIPLICITY
1748 struct ev_loop *loop = ev_default_loop_ptr; 1983 EV_P = ev_default_loop_ptr;
1749#endif 1984#endif
1750 1985
1751 ev_default_loop_ptr = 0; 1986 ev_default_loop_ptr = 0;
1752 1987
1753#ifndef _WIN32 1988#if EV_CHILD_ENABLE
1754 ev_ref (EV_A); /* child watcher */ 1989 ev_ref (EV_A); /* child watcher */
1755 ev_signal_stop (EV_A_ &childev); 1990 ev_signal_stop (EV_A_ &childev);
1756#endif 1991#endif
1757 1992
1758 loop_destroy (EV_A); 1993 loop_destroy (EV_A);
… …
1760 1995
1761void 1996void
1762ev_default_fork (void) 1997ev_default_fork (void)
1763{ 1998{
1764#if EV_MULTIPLICITY 1999#if EV_MULTIPLICITY
1765 struct ev_loop *loop = ev_default_loop_ptr; 2000 EV_P = ev_default_loop_ptr;
1766#endif 2001#endif
1767 2002
1768 postfork = 1; /* must be in line with ev_loop_fork */ 2003 postfork = 1; /* must be in line with ev_loop_fork */
1769} 2004}
1770 2005
… …
1774ev_invoke (EV_P_ void *w, int revents) 2009ev_invoke (EV_P_ void *w, int revents)
1775{ 2010{
1776 EV_CB_INVOKE ((W)w, revents); 2011 EV_CB_INVOKE ((W)w, revents);
1777} 2012}
1778 2013
1779inline_speed void 2014unsigned int
1780call_pending (EV_P) 2015ev_pending_count (EV_P)
2016{
2017 int pri;
2018 unsigned int count = 0;
2019
2020 for (pri = NUMPRI; pri--; )
2021 count += pendingcnt [pri];
2022
2023 return count;
2024}
2025
2026void noinline
2027ev_invoke_pending (EV_P)
1781{ 2028{
1782 int pri; 2029 int pri;
1783 2030
1784 for (pri = NUMPRI; pri--; ) 2031 for (pri = NUMPRI; pri--; )
1785 while (pendingcnt [pri]) 2032 while (pendingcnt [pri])
… …
1852 EV_FREQUENT_CHECK; 2099 EV_FREQUENT_CHECK;
1853 feed_reverse (EV_A_ (W)w); 2100 feed_reverse (EV_A_ (W)w);
1854 } 2101 }
1855 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2102 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1856 2103
1857 feed_reverse_done (EV_A_ EV_TIMEOUT); 2104 feed_reverse_done (EV_A_ EV_TIMER);
1858 } 2105 }
1859} 2106}
1860 2107
1861#if EV_PERIODIC_ENABLE 2108#if EV_PERIODIC_ENABLE
1862/* make periodics pending */ 2109/* make periodics pending */
… …
1953 ANHE_at_cache (*he); 2200 ANHE_at_cache (*he);
1954 } 2201 }
1955} 2202}
1956 2203
1957/* fetch new monotonic and realtime times from the kernel */ 2204/* fetch new monotonic and realtime times from the kernel */
1958/* also detetc if there was a timejump, and act accordingly */ 2205/* also detect if there was a timejump, and act accordingly */
1959inline_speed void 2206inline_speed void
1960time_update (EV_P_ ev_tstamp max_block) 2207time_update (EV_P_ ev_tstamp max_block)
1961{ 2208{
1962#if EV_USE_MONOTONIC 2209#if EV_USE_MONOTONIC
1963 if (expect_true (have_monotonic)) 2210 if (expect_true (have_monotonic))
… …
2020 2267
2021 mn_now = ev_rt_now; 2268 mn_now = ev_rt_now;
2022 } 2269 }
2023} 2270}
2024 2271
2025static int loop_done;
2026
2027void 2272void
2028ev_loop (EV_P_ int flags) 2273ev_loop (EV_P_ int flags)
2029{ 2274{
2275#if EV_FEATURE_API
2276 ++loop_depth;
2277#endif
2278
2279 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2280
2030 loop_done = EVUNLOOP_CANCEL; 2281 loop_done = EVUNLOOP_CANCEL;
2031 2282
2032 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2283 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2033 2284
2034 do 2285 do
2035 { 2286 {
2036#if EV_VERIFY >= 2 2287#if EV_VERIFY >= 2
2037 ev_loop_verify (EV_A); 2288 ev_verify (EV_A);
2038#endif 2289#endif
2039 2290
2040#ifndef _WIN32 2291#ifndef _WIN32
2041 if (expect_false (curpid)) /* penalise the forking check even more */ 2292 if (expect_false (curpid)) /* penalise the forking check even more */
2042 if (expect_false (getpid () != curpid)) 2293 if (expect_false (getpid () != curpid))
… …
2050 /* we might have forked, so queue fork handlers */ 2301 /* we might have forked, so queue fork handlers */
2051 if (expect_false (postfork)) 2302 if (expect_false (postfork))
2052 if (forkcnt) 2303 if (forkcnt)
2053 { 2304 {
2054 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2305 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2055 call_pending (EV_A); 2306 EV_INVOKE_PENDING;
2056 } 2307 }
2057#endif 2308#endif
2058 2309
2310#if EV_PREPARE_ENABLE
2059 /* queue prepare watchers (and execute them) */ 2311 /* queue prepare watchers (and execute them) */
2060 if (expect_false (preparecnt)) 2312 if (expect_false (preparecnt))
2061 { 2313 {
2062 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2314 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2063 call_pending (EV_A); 2315 EV_INVOKE_PENDING;
2064 } 2316 }
2317#endif
2318
2319 if (expect_false (loop_done))
2320 break;
2065 2321
2066 /* we might have forked, so reify kernel state if necessary */ 2322 /* we might have forked, so reify kernel state if necessary */
2067 if (expect_false (postfork)) 2323 if (expect_false (postfork))
2068 loop_fork (EV_A); 2324 loop_fork (EV_A);
2069 2325
… …
2075 ev_tstamp waittime = 0.; 2331 ev_tstamp waittime = 0.;
2076 ev_tstamp sleeptime = 0.; 2332 ev_tstamp sleeptime = 0.;
2077 2333
2078 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2334 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2079 { 2335 {
2336 /* remember old timestamp for io_blocktime calculation */
2337 ev_tstamp prev_mn_now = mn_now;
2338
2080 /* update time to cancel out callback processing overhead */ 2339 /* update time to cancel out callback processing overhead */
2081 time_update (EV_A_ 1e100); 2340 time_update (EV_A_ 1e100);
2082 2341
2083 waittime = MAX_BLOCKTIME; 2342 waittime = MAX_BLOCKTIME;
2084 2343
… …
2094 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2353 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2095 if (waittime > to) waittime = to; 2354 if (waittime > to) waittime = to;
2096 } 2355 }
2097#endif 2356#endif
2098 2357
2358 /* don't let timeouts decrease the waittime below timeout_blocktime */
2099 if (expect_false (waittime < timeout_blocktime)) 2359 if (expect_false (waittime < timeout_blocktime))
2100 waittime = timeout_blocktime; 2360 waittime = timeout_blocktime;
2101 2361
2102 sleeptime = waittime - backend_fudge; 2362 /* extra check because io_blocktime is commonly 0 */
2103
2104 if (expect_true (sleeptime > io_blocktime)) 2363 if (expect_false (io_blocktime))
2105 sleeptime = io_blocktime;
2106
2107 if (sleeptime)
2108 { 2364 {
2365 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2366
2367 if (sleeptime > waittime - backend_fudge)
2368 sleeptime = waittime - backend_fudge;
2369
2370 if (expect_true (sleeptime > 0.))
2371 {
2109 ev_sleep (sleeptime); 2372 ev_sleep (sleeptime);
2110 waittime -= sleeptime; 2373 waittime -= sleeptime;
2374 }
2111 } 2375 }
2112 } 2376 }
2113 2377
2378#if EV_FEATURE_API
2114 ++loop_count; 2379 ++loop_count;
2380#endif
2381 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2115 backend_poll (EV_A_ waittime); 2382 backend_poll (EV_A_ waittime);
2383 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2116 2384
2117 /* update ev_rt_now, do magic */ 2385 /* update ev_rt_now, do magic */
2118 time_update (EV_A_ waittime + sleeptime); 2386 time_update (EV_A_ waittime + sleeptime);
2119 } 2387 }
2120 2388
… …
2127#if EV_IDLE_ENABLE 2395#if EV_IDLE_ENABLE
2128 /* queue idle watchers unless other events are pending */ 2396 /* queue idle watchers unless other events are pending */
2129 idle_reify (EV_A); 2397 idle_reify (EV_A);
2130#endif 2398#endif
2131 2399
2400#if EV_CHECK_ENABLE
2132 /* queue check watchers, to be executed first */ 2401 /* queue check watchers, to be executed first */
2133 if (expect_false (checkcnt)) 2402 if (expect_false (checkcnt))
2134 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2403 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2404#endif
2135 2405
2136 call_pending (EV_A); 2406 EV_INVOKE_PENDING;
2137 } 2407 }
2138 while (expect_true ( 2408 while (expect_true (
2139 activecnt 2409 activecnt
2140 && !loop_done 2410 && !loop_done
2141 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2411 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2142 )); 2412 ));
2143 2413
2144 if (loop_done == EVUNLOOP_ONE) 2414 if (loop_done == EVUNLOOP_ONE)
2145 loop_done = EVUNLOOP_CANCEL; 2415 loop_done = EVUNLOOP_CANCEL;
2416
2417#if EV_FEATURE_API
2418 --loop_depth;
2419#endif
2146} 2420}
2147 2421
2148void 2422void
2149ev_unloop (EV_P_ int how) 2423ev_unloop (EV_P_ int how)
2150{ 2424{
… …
2201inline_size void 2475inline_size void
2202wlist_del (WL *head, WL elem) 2476wlist_del (WL *head, WL elem)
2203{ 2477{
2204 while (*head) 2478 while (*head)
2205 { 2479 {
2206 if (*head == elem) 2480 if (expect_true (*head == elem))
2207 { 2481 {
2208 *head = elem->next; 2482 *head = elem->next;
2209 return; 2483 break;
2210 } 2484 }
2211 2485
2212 head = &(*head)->next; 2486 head = &(*head)->next;
2213 } 2487 }
2214} 2488}
… …
2242} 2516}
2243 2517
2244inline_size void 2518inline_size void
2245pri_adjust (EV_P_ W w) 2519pri_adjust (EV_P_ W w)
2246{ 2520{
2247 int pri = w->priority; 2521 int pri = ev_priority (w);
2248 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2522 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2249 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2523 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2250 w->priority = pri; 2524 ev_set_priority (w, pri);
2251} 2525}
2252 2526
2253inline_speed void 2527inline_speed void
2254ev_start (EV_P_ W w, int active) 2528ev_start (EV_P_ W w, int active)
2255{ 2529{
… …
2274 2548
2275 if (expect_false (ev_is_active (w))) 2549 if (expect_false (ev_is_active (w)))
2276 return; 2550 return;
2277 2551
2278 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2552 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2279 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2553 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2280 2554
2281 EV_FREQUENT_CHECK; 2555 EV_FREQUENT_CHECK;
2282 2556
2283 ev_start (EV_A_ (W)w, 1); 2557 ev_start (EV_A_ (W)w, 1);
2284 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2558 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2285 wlist_add (&anfds[fd].head, (WL)w); 2559 wlist_add (&anfds[fd].head, (WL)w);
2286 2560
2287 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2561 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2288 w->events &= ~EV__IOFDSET; 2562 w->events &= ~EV__IOFDSET;
2289 2563
2290 EV_FREQUENT_CHECK; 2564 EV_FREQUENT_CHECK;
2291} 2565}
2292 2566
… …
2354 timers [active] = timers [timercnt + HEAP0]; 2628 timers [active] = timers [timercnt + HEAP0];
2355 adjustheap (timers, timercnt, active); 2629 adjustheap (timers, timercnt, active);
2356 } 2630 }
2357 } 2631 }
2358 2632
2359 EV_FREQUENT_CHECK;
2360
2361 ev_at (w) -= mn_now; 2633 ev_at (w) -= mn_now;
2362 2634
2363 ev_stop (EV_A_ (W)w); 2635 ev_stop (EV_A_ (W)w);
2636
2637 EV_FREQUENT_CHECK;
2364} 2638}
2365 2639
2366void noinline 2640void noinline
2367ev_timer_again (EV_P_ ev_timer *w) 2641ev_timer_again (EV_P_ ev_timer *w)
2368{ 2642{
… …
2386 } 2660 }
2387 2661
2388 EV_FREQUENT_CHECK; 2662 EV_FREQUENT_CHECK;
2389} 2663}
2390 2664
2665ev_tstamp
2666ev_timer_remaining (EV_P_ ev_timer *w)
2667{
2668 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2669}
2670
2391#if EV_PERIODIC_ENABLE 2671#if EV_PERIODIC_ENABLE
2392void noinline 2672void noinline
2393ev_periodic_start (EV_P_ ev_periodic *w) 2673ev_periodic_start (EV_P_ ev_periodic *w)
2394{ 2674{
2395 if (expect_false (ev_is_active (w))) 2675 if (expect_false (ev_is_active (w)))
… …
2441 periodics [active] = periodics [periodiccnt + HEAP0]; 2721 periodics [active] = periodics [periodiccnt + HEAP0];
2442 adjustheap (periodics, periodiccnt, active); 2722 adjustheap (periodics, periodiccnt, active);
2443 } 2723 }
2444 } 2724 }
2445 2725
2446 EV_FREQUENT_CHECK;
2447
2448 ev_stop (EV_A_ (W)w); 2726 ev_stop (EV_A_ (W)w);
2727
2728 EV_FREQUENT_CHECK;
2449} 2729}
2450 2730
2451void noinline 2731void noinline
2452ev_periodic_again (EV_P_ ev_periodic *w) 2732ev_periodic_again (EV_P_ ev_periodic *w)
2453{ 2733{
… …
2459 2739
2460#ifndef SA_RESTART 2740#ifndef SA_RESTART
2461# define SA_RESTART 0 2741# define SA_RESTART 0
2462#endif 2742#endif
2463 2743
2744#if EV_SIGNAL_ENABLE
2745
2464void noinline 2746void noinline
2465ev_signal_start (EV_P_ ev_signal *w) 2747ev_signal_start (EV_P_ ev_signal *w)
2466{ 2748{
2467#if EV_MULTIPLICITY
2468 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2469#endif
2470 if (expect_false (ev_is_active (w))) 2749 if (expect_false (ev_is_active (w)))
2471 return; 2750 return;
2472 2751
2473 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2752 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2474 2753
2475 evpipe_init (EV_A); 2754#if EV_MULTIPLICITY
2755 assert (("libev: a signal must not be attached to two different loops",
2756 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2476 2757
2477 EV_FREQUENT_CHECK; 2758 signals [w->signum - 1].loop = EV_A;
2759#endif
2478 2760
2761 EV_FREQUENT_CHECK;
2762
2763#if EV_USE_SIGNALFD
2764 if (sigfd == -2)
2479 { 2765 {
2480#ifndef _WIN32 2766 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2481 sigset_t full, prev; 2767 if (sigfd < 0 && errno == EINVAL)
2482 sigfillset (&full); 2768 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2483 sigprocmask (SIG_SETMASK, &full, &prev);
2484#endif
2485 2769
2486 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2770 if (sigfd >= 0)
2771 {
2772 fd_intern (sigfd); /* doing it twice will not hurt */
2487 2773
2488#ifndef _WIN32 2774 sigemptyset (&sigfd_set);
2489 sigprocmask (SIG_SETMASK, &prev, 0); 2775
2490#endif 2776 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2777 ev_set_priority (&sigfd_w, EV_MAXPRI);
2778 ev_io_start (EV_A_ &sigfd_w);
2779 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2780 }
2491 } 2781 }
2782
2783 if (sigfd >= 0)
2784 {
2785 /* TODO: check .head */
2786 sigaddset (&sigfd_set, w->signum);
2787 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2788
2789 signalfd (sigfd, &sigfd_set, 0);
2790 }
2791#endif
2492 2792
2493 ev_start (EV_A_ (W)w, 1); 2793 ev_start (EV_A_ (W)w, 1);
2494 wlist_add (&signals [w->signum - 1].head, (WL)w); 2794 wlist_add (&signals [w->signum - 1].head, (WL)w);
2495 2795
2496 if (!((WL)w)->next) 2796 if (!((WL)w)->next)
2797# if EV_USE_SIGNALFD
2798 if (sigfd < 0) /*TODO*/
2799# endif
2497 { 2800 {
2498#if _WIN32 2801# ifdef _WIN32
2802 evpipe_init (EV_A);
2803
2499 signal (w->signum, ev_sighandler); 2804 signal (w->signum, ev_sighandler);
2500#else 2805# else
2501 struct sigaction sa; 2806 struct sigaction sa;
2807
2808 evpipe_init (EV_A);
2809
2502 sa.sa_handler = ev_sighandler; 2810 sa.sa_handler = ev_sighandler;
2503 sigfillset (&sa.sa_mask); 2811 sigfillset (&sa.sa_mask);
2504 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2812 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2505 sigaction (w->signum, &sa, 0); 2813 sigaction (w->signum, &sa, 0);
2814
2815 sigemptyset (&sa.sa_mask);
2816 sigaddset (&sa.sa_mask, w->signum);
2817 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2506#endif 2818#endif
2507 } 2819 }
2508 2820
2509 EV_FREQUENT_CHECK; 2821 EV_FREQUENT_CHECK;
2510} 2822}
2511 2823
2512void noinline 2824void noinline
… …
2520 2832
2521 wlist_del (&signals [w->signum - 1].head, (WL)w); 2833 wlist_del (&signals [w->signum - 1].head, (WL)w);
2522 ev_stop (EV_A_ (W)w); 2834 ev_stop (EV_A_ (W)w);
2523 2835
2524 if (!signals [w->signum - 1].head) 2836 if (!signals [w->signum - 1].head)
2837 {
2838#if EV_MULTIPLICITY
2839 signals [w->signum - 1].loop = 0; /* unattach from signal */
2840#endif
2841#if EV_USE_SIGNALFD
2842 if (sigfd >= 0)
2843 {
2844 sigset_t ss;
2845
2846 sigemptyset (&ss);
2847 sigaddset (&ss, w->signum);
2848 sigdelset (&sigfd_set, w->signum);
2849
2850 signalfd (sigfd, &sigfd_set, 0);
2851 sigprocmask (SIG_UNBLOCK, &ss, 0);
2852 }
2853 else
2854#endif
2525 signal (w->signum, SIG_DFL); 2855 signal (w->signum, SIG_DFL);
2856 }
2526 2857
2527 EV_FREQUENT_CHECK; 2858 EV_FREQUENT_CHECK;
2528} 2859}
2860
2861#endif
2862
2863#if EV_CHILD_ENABLE
2529 2864
2530void 2865void
2531ev_child_start (EV_P_ ev_child *w) 2866ev_child_start (EV_P_ ev_child *w)
2532{ 2867{
2533#if EV_MULTIPLICITY 2868#if EV_MULTIPLICITY
… …
2537 return; 2872 return;
2538 2873
2539 EV_FREQUENT_CHECK; 2874 EV_FREQUENT_CHECK;
2540 2875
2541 ev_start (EV_A_ (W)w, 1); 2876 ev_start (EV_A_ (W)w, 1);
2542 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2877 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2543 2878
2544 EV_FREQUENT_CHECK; 2879 EV_FREQUENT_CHECK;
2545} 2880}
2546 2881
2547void 2882void
… …
2551 if (expect_false (!ev_is_active (w))) 2886 if (expect_false (!ev_is_active (w)))
2552 return; 2887 return;
2553 2888
2554 EV_FREQUENT_CHECK; 2889 EV_FREQUENT_CHECK;
2555 2890
2556 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2891 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2557 ev_stop (EV_A_ (W)w); 2892 ev_stop (EV_A_ (W)w);
2558 2893
2559 EV_FREQUENT_CHECK; 2894 EV_FREQUENT_CHECK;
2560} 2895}
2896
2897#endif
2561 2898
2562#if EV_STAT_ENABLE 2899#if EV_STAT_ENABLE
2563 2900
2564# ifdef _WIN32 2901# ifdef _WIN32
2565# undef lstat 2902# undef lstat
… …
2571#define MIN_STAT_INTERVAL 0.1074891 2908#define MIN_STAT_INTERVAL 0.1074891
2572 2909
2573static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2910static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2574 2911
2575#if EV_USE_INOTIFY 2912#if EV_USE_INOTIFY
2576# define EV_INOTIFY_BUFSIZE 8192 2913
2914/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2915# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2577 2916
2578static void noinline 2917static void noinline
2579infy_add (EV_P_ ev_stat *w) 2918infy_add (EV_P_ ev_stat *w)
2580{ 2919{
2581 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); 2920 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);
2582 2921
2583 if (w->wd < 0) 2922 if (w->wd >= 0)
2923 {
2924 struct statfs sfs;
2925
2926 /* now local changes will be tracked by inotify, but remote changes won't */
2927 /* unless the filesystem is known to be local, we therefore still poll */
2928 /* also do poll on <2.6.25, but with normal frequency */
2929
2930 if (!fs_2625)
2931 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2932 else if (!statfs (w->path, &sfs)
2933 && (sfs.f_type == 0x1373 /* devfs */
2934 || sfs.f_type == 0xEF53 /* ext2/3 */
2935 || sfs.f_type == 0x3153464a /* jfs */
2936 || sfs.f_type == 0x52654973 /* reiser3 */
2937 || sfs.f_type == 0x01021994 /* tempfs */
2938 || sfs.f_type == 0x58465342 /* xfs */))
2939 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2940 else
2941 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2584 { 2942 }
2943 else
2944 {
2945 /* can't use inotify, continue to stat */
2585 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2946 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2586 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2587 2947
2588 /* monitor some parent directory for speedup hints */ 2948 /* if path is not there, monitor some parent directory for speedup hints */
2589 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2949 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2590 /* but an efficiency issue only */ 2950 /* but an efficiency issue only */
2591 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2951 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2592 { 2952 {
2593 char path [4096]; 2953 char path [4096];
… …
2609 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2969 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2610 } 2970 }
2611 } 2971 }
2612 2972
2613 if (w->wd >= 0) 2973 if (w->wd >= 0)
2614 {
2615 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2974 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2616 2975
2617 /* now local changes will be tracked by inotify, but remote changes won't */ 2976 /* now re-arm timer, if required */
2618 /* unless the filesystem it known to be local, we therefore still poll */ 2977 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2619 /* also do poll on <2.6.25, but with normal frequency */
2620 struct statfs sfs;
2621
2622 if (fs_2625 && !statfs (w->path, &sfs))
2623 if (sfs.f_type == 0x1373 /* devfs */
2624 || sfs.f_type == 0xEF53 /* ext2/3 */
2625 || sfs.f_type == 0x3153464a /* jfs */
2626 || sfs.f_type == 0x52654973 /* reiser3 */
2627 || sfs.f_type == 0x01021994 /* tempfs */
2628 || sfs.f_type == 0x58465342 /* xfs */)
2629 return;
2630
2631 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2632 ev_timer_again (EV_A_ &w->timer); 2978 ev_timer_again (EV_A_ &w->timer);
2633 } 2979 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2634} 2980}
2635 2981
2636static void noinline 2982static void noinline
2637infy_del (EV_P_ ev_stat *w) 2983infy_del (EV_P_ ev_stat *w)
2638{ 2984{
… …
2641 2987
2642 if (wd < 0) 2988 if (wd < 0)
2643 return; 2989 return;
2644 2990
2645 w->wd = -2; 2991 w->wd = -2;
2646 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 2992 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2647 wlist_del (&fs_hash [slot].head, (WL)w); 2993 wlist_del (&fs_hash [slot].head, (WL)w);
2648 2994
2649 /* remove this watcher, if others are watching it, they will rearm */ 2995 /* remove this watcher, if others are watching it, they will rearm */
2650 inotify_rm_watch (fs_fd, wd); 2996 inotify_rm_watch (fs_fd, wd);
2651} 2997}
… …
2653static void noinline 2999static void noinline
2654infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3000infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2655{ 3001{
2656 if (slot < 0) 3002 if (slot < 0)
2657 /* overflow, need to check for all hash slots */ 3003 /* overflow, need to check for all hash slots */
2658 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3004 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2659 infy_wd (EV_A_ slot, wd, ev); 3005 infy_wd (EV_A_ slot, wd, ev);
2660 else 3006 else
2661 { 3007 {
2662 WL w_; 3008 WL w_;
2663 3009
2664 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3010 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2665 { 3011 {
2666 ev_stat *w = (ev_stat *)w_; 3012 ev_stat *w = (ev_stat *)w_;
2667 w_ = w_->next; /* lets us remove this watcher and all before it */ 3013 w_ = w_->next; /* lets us remove this watcher and all before it */
2668 3014
2669 if (w->wd == wd || wd == -1) 3015 if (w->wd == wd || wd == -1)
2670 { 3016 {
2671 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3017 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2672 { 3018 {
2673 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3019 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2674 w->wd = -1; 3020 w->wd = -1;
2675 infy_add (EV_A_ w); /* re-add, no matter what */ 3021 infy_add (EV_A_ w); /* re-add, no matter what */
2676 } 3022 }
2677 3023
2678 stat_timer_cb (EV_A_ &w->timer, 0); 3024 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2683 3029
2684static void 3030static void
2685infy_cb (EV_P_ ev_io *w, int revents) 3031infy_cb (EV_P_ ev_io *w, int revents)
2686{ 3032{
2687 char buf [EV_INOTIFY_BUFSIZE]; 3033 char buf [EV_INOTIFY_BUFSIZE];
2688 struct inotify_event *ev = (struct inotify_event *)buf;
2689 int ofs; 3034 int ofs;
2690 int len = read (fs_fd, buf, sizeof (buf)); 3035 int len = read (fs_fd, buf, sizeof (buf));
2691 3036
2692 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3037 for (ofs = 0; ofs < len; )
3038 {
3039 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2693 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3040 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3041 ofs += sizeof (struct inotify_event) + ev->len;
3042 }
3043}
3044
3045inline_size unsigned int
3046ev_linux_version (void)
3047{
3048 struct utsname buf;
3049 unsigned int v;
3050 int i;
3051 char *p = buf.release;
3052
3053 if (uname (&buf))
3054 return 0;
3055
3056 for (i = 3+1; --i; )
3057 {
3058 unsigned int c = 0;
3059
3060 for (;;)
3061 {
3062 if (*p >= '0' && *p <= '9')
3063 c = c * 10 + *p++ - '0';
3064 else
3065 {
3066 p += *p == '.';
3067 break;
3068 }
3069 }
3070
3071 v = (v << 8) | c;
3072 }
3073
3074 return v;
2694} 3075}
2695 3076
2696inline_size void 3077inline_size void
2697check_2625 (EV_P) 3078ev_check_2625 (EV_P)
2698{ 3079{
2699 /* kernels < 2.6.25 are borked 3080 /* kernels < 2.6.25 are borked
2700 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3081 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2701 */ 3082 */
2702 struct utsname buf; 3083 if (ev_linux_version () < 0x020619)
2703 int major, minor, micro;
2704
2705 if (uname (&buf))
2706 return; 3084 return;
2707 3085
2708 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2709 return;
2710
2711 if (major < 2
2712 || (major == 2 && minor < 6)
2713 || (major == 2 && minor == 6 && micro < 25))
2714 return;
2715
2716 fs_2625 = 1; 3086 fs_2625 = 1;
3087}
3088
3089inline_size int
3090infy_newfd (void)
3091{
3092#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3093 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3094 if (fd >= 0)
3095 return fd;
3096#endif
3097 return inotify_init ();
2717} 3098}
2718 3099
2719inline_size void 3100inline_size void
2720infy_init (EV_P) 3101infy_init (EV_P)
2721{ 3102{
2722 if (fs_fd != -2) 3103 if (fs_fd != -2)
2723 return; 3104 return;
2724 3105
2725 fs_fd = -1; 3106 fs_fd = -1;
2726 3107
2727 check_2625 (EV_A); 3108 ev_check_2625 (EV_A);
2728 3109
2729 fs_fd = inotify_init (); 3110 fs_fd = infy_newfd ();
2730 3111
2731 if (fs_fd >= 0) 3112 if (fs_fd >= 0)
2732 { 3113 {
3114 fd_intern (fs_fd);
2733 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3115 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2734 ev_set_priority (&fs_w, EV_MAXPRI); 3116 ev_set_priority (&fs_w, EV_MAXPRI);
2735 ev_io_start (EV_A_ &fs_w); 3117 ev_io_start (EV_A_ &fs_w);
3118 ev_unref (EV_A);
2736 } 3119 }
2737} 3120}
2738 3121
2739inline_size void 3122inline_size void
2740infy_fork (EV_P) 3123infy_fork (EV_P)
… …
2742 int slot; 3125 int slot;
2743 3126
2744 if (fs_fd < 0) 3127 if (fs_fd < 0)
2745 return; 3128 return;
2746 3129
3130 ev_ref (EV_A);
3131 ev_io_stop (EV_A_ &fs_w);
2747 close (fs_fd); 3132 close (fs_fd);
2748 fs_fd = inotify_init (); 3133 fs_fd = infy_newfd ();
2749 3134
3135 if (fs_fd >= 0)
3136 {
3137 fd_intern (fs_fd);
3138 ev_io_set (&fs_w, fs_fd, EV_READ);
3139 ev_io_start (EV_A_ &fs_w);
3140 ev_unref (EV_A);
3141 }
3142
2750 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3143 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2751 { 3144 {
2752 WL w_ = fs_hash [slot].head; 3145 WL w_ = fs_hash [slot].head;
2753 fs_hash [slot].head = 0; 3146 fs_hash [slot].head = 0;
2754 3147
2755 while (w_) 3148 while (w_)
… …
2760 w->wd = -1; 3153 w->wd = -1;
2761 3154
2762 if (fs_fd >= 0) 3155 if (fs_fd >= 0)
2763 infy_add (EV_A_ w); /* re-add, no matter what */ 3156 infy_add (EV_A_ w); /* re-add, no matter what */
2764 else 3157 else
3158 {
3159 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3160 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2765 ev_timer_again (EV_A_ &w->timer); 3161 ev_timer_again (EV_A_ &w->timer);
3162 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3163 }
2766 } 3164 }
2767 } 3165 }
2768} 3166}
2769 3167
2770#endif 3168#endif
… …
2787static void noinline 3185static void noinline
2788stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3186stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2789{ 3187{
2790 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3188 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2791 3189
2792 /* we copy this here each the time so that */ 3190 ev_statdata prev = w->attr;
2793 /* prev has the old value when the callback gets invoked */
2794 w->prev = w->attr;
2795 ev_stat_stat (EV_A_ w); 3191 ev_stat_stat (EV_A_ w);
2796 3192
2797 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3193 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2798 if ( 3194 if (
2799 w->prev.st_dev != w->attr.st_dev 3195 prev.st_dev != w->attr.st_dev
2800 || w->prev.st_ino != w->attr.st_ino 3196 || prev.st_ino != w->attr.st_ino
2801 || w->prev.st_mode != w->attr.st_mode 3197 || prev.st_mode != w->attr.st_mode
2802 || w->prev.st_nlink != w->attr.st_nlink 3198 || prev.st_nlink != w->attr.st_nlink
2803 || w->prev.st_uid != w->attr.st_uid 3199 || prev.st_uid != w->attr.st_uid
2804 || w->prev.st_gid != w->attr.st_gid 3200 || prev.st_gid != w->attr.st_gid
2805 || w->prev.st_rdev != w->attr.st_rdev 3201 || prev.st_rdev != w->attr.st_rdev
2806 || w->prev.st_size != w->attr.st_size 3202 || prev.st_size != w->attr.st_size
2807 || w->prev.st_atime != w->attr.st_atime 3203 || prev.st_atime != w->attr.st_atime
2808 || w->prev.st_mtime != w->attr.st_mtime 3204 || prev.st_mtime != w->attr.st_mtime
2809 || w->prev.st_ctime != w->attr.st_ctime 3205 || prev.st_ctime != w->attr.st_ctime
2810 ) { 3206 ) {
3207 /* we only update w->prev on actual differences */
3208 /* in case we test more often than invoke the callback, */
3209 /* to ensure that prev is always different to attr */
3210 w->prev = prev;
3211
2811 #if EV_USE_INOTIFY 3212 #if EV_USE_INOTIFY
2812 if (fs_fd >= 0) 3213 if (fs_fd >= 0)
2813 { 3214 {
2814 infy_del (EV_A_ w); 3215 infy_del (EV_A_ w);
2815 infy_add (EV_A_ w); 3216 infy_add (EV_A_ w);
… …
2840 3241
2841 if (fs_fd >= 0) 3242 if (fs_fd >= 0)
2842 infy_add (EV_A_ w); 3243 infy_add (EV_A_ w);
2843 else 3244 else
2844#endif 3245#endif
3246 {
2845 ev_timer_again (EV_A_ &w->timer); 3247 ev_timer_again (EV_A_ &w->timer);
3248 ev_unref (EV_A);
3249 }
2846 3250
2847 ev_start (EV_A_ (W)w, 1); 3251 ev_start (EV_A_ (W)w, 1);
2848 3252
2849 EV_FREQUENT_CHECK; 3253 EV_FREQUENT_CHECK;
2850} 3254}
… …
2859 EV_FREQUENT_CHECK; 3263 EV_FREQUENT_CHECK;
2860 3264
2861#if EV_USE_INOTIFY 3265#if EV_USE_INOTIFY
2862 infy_del (EV_A_ w); 3266 infy_del (EV_A_ w);
2863#endif 3267#endif
3268
3269 if (ev_is_active (&w->timer))
3270 {
3271 ev_ref (EV_A);
2864 ev_timer_stop (EV_A_ &w->timer); 3272 ev_timer_stop (EV_A_ &w->timer);
3273 }
2865 3274
2866 ev_stop (EV_A_ (W)w); 3275 ev_stop (EV_A_ (W)w);
2867 3276
2868 EV_FREQUENT_CHECK; 3277 EV_FREQUENT_CHECK;
2869} 3278}
… …
2914 3323
2915 EV_FREQUENT_CHECK; 3324 EV_FREQUENT_CHECK;
2916} 3325}
2917#endif 3326#endif
2918 3327
3328#if EV_PREPARE_ENABLE
2919void 3329void
2920ev_prepare_start (EV_P_ ev_prepare *w) 3330ev_prepare_start (EV_P_ ev_prepare *w)
2921{ 3331{
2922 if (expect_false (ev_is_active (w))) 3332 if (expect_false (ev_is_active (w)))
2923 return; 3333 return;
… …
2949 3359
2950 ev_stop (EV_A_ (W)w); 3360 ev_stop (EV_A_ (W)w);
2951 3361
2952 EV_FREQUENT_CHECK; 3362 EV_FREQUENT_CHECK;
2953} 3363}
3364#endif
2954 3365
3366#if EV_CHECK_ENABLE
2955void 3367void
2956ev_check_start (EV_P_ ev_check *w) 3368ev_check_start (EV_P_ ev_check *w)
2957{ 3369{
2958 if (expect_false (ev_is_active (w))) 3370 if (expect_false (ev_is_active (w)))
2959 return; 3371 return;
… …
2985 3397
2986 ev_stop (EV_A_ (W)w); 3398 ev_stop (EV_A_ (W)w);
2987 3399
2988 EV_FREQUENT_CHECK; 3400 EV_FREQUENT_CHECK;
2989} 3401}
3402#endif
2990 3403
2991#if EV_EMBED_ENABLE 3404#if EV_EMBED_ENABLE
2992void noinline 3405void noinline
2993ev_embed_sweep (EV_P_ ev_embed *w) 3406ev_embed_sweep (EV_P_ ev_embed *w)
2994{ 3407{
… …
3010embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3423embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3011{ 3424{
3012 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3425 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3013 3426
3014 { 3427 {
3015 struct ev_loop *loop = w->other; 3428 EV_P = w->other;
3016 3429
3017 while (fdchangecnt) 3430 while (fdchangecnt)
3018 { 3431 {
3019 fd_reify (EV_A); 3432 fd_reify (EV_A);
3020 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3433 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3028 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3441 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3029 3442
3030 ev_embed_stop (EV_A_ w); 3443 ev_embed_stop (EV_A_ w);
3031 3444
3032 { 3445 {
3033 struct ev_loop *loop = w->other; 3446 EV_P = w->other;
3034 3447
3035 ev_loop_fork (EV_A); 3448 ev_loop_fork (EV_A);
3036 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3449 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3037 } 3450 }
3038 3451
… …
3052{ 3465{
3053 if (expect_false (ev_is_active (w))) 3466 if (expect_false (ev_is_active (w)))
3054 return; 3467 return;
3055 3468
3056 { 3469 {
3057 struct ev_loop *loop = w->other; 3470 EV_P = w->other;
3058 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3471 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3059 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3472 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3060 } 3473 }
3061 3474
3062 EV_FREQUENT_CHECK; 3475 EV_FREQUENT_CHECK;
… …
3089 3502
3090 ev_io_stop (EV_A_ &w->io); 3503 ev_io_stop (EV_A_ &w->io);
3091 ev_prepare_stop (EV_A_ &w->prepare); 3504 ev_prepare_stop (EV_A_ &w->prepare);
3092 ev_fork_stop (EV_A_ &w->fork); 3505 ev_fork_stop (EV_A_ &w->fork);
3093 3506
3507 ev_stop (EV_A_ (W)w);
3508
3094 EV_FREQUENT_CHECK; 3509 EV_FREQUENT_CHECK;
3095} 3510}
3096#endif 3511#endif
3097 3512
3098#if EV_FORK_ENABLE 3513#if EV_FORK_ENABLE
… …
3174 3589
3175void 3590void
3176ev_async_send (EV_P_ ev_async *w) 3591ev_async_send (EV_P_ ev_async *w)
3177{ 3592{
3178 w->sent = 1; 3593 w->sent = 1;
3179 evpipe_write (EV_A_ &gotasync); 3594 evpipe_write (EV_A_ &async_pending);
3180} 3595}
3181#endif 3596#endif
3182 3597
3183/*****************************************************************************/ 3598/*****************************************************************************/
3184 3599
… …
3224{ 3639{
3225 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3640 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3226 3641
3227 if (expect_false (!once)) 3642 if (expect_false (!once))
3228 { 3643 {
3229 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3644 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3230 return; 3645 return;
3231 } 3646 }
3232 3647
3233 once->cb = cb; 3648 once->cb = cb;
3234 once->arg = arg; 3649 once->arg = arg;
… …
3321 if (types & EV_ASYNC) 3736 if (types & EV_ASYNC)
3322 for (i = asynccnt; i--; ) 3737 for (i = asynccnt; i--; )
3323 cb (EV_A_ EV_ASYNC, asyncs [i]); 3738 cb (EV_A_ EV_ASYNC, asyncs [i]);
3324#endif 3739#endif
3325 3740
3741#if EV_PREPARE_ENABLE
3326 if (types & EV_PREPARE) 3742 if (types & EV_PREPARE)
3327 for (i = preparecnt; i--; ) 3743 for (i = preparecnt; i--; )
3328#if EV_EMBED_ENABLE 3744# if EV_EMBED_ENABLE
3329 if (ev_cb (prepares [i]) != embed_prepare_cb) 3745 if (ev_cb (prepares [i]) != embed_prepare_cb)
3330#endif 3746# endif
3331 cb (EV_A_ EV_PREPARE, prepares [i]); 3747 cb (EV_A_ EV_PREPARE, prepares [i]);
3748#endif
3332 3749
3750#if EV_CHECK_ENABLE
3333 if (types & EV_CHECK) 3751 if (types & EV_CHECK)
3334 for (i = checkcnt; i--; ) 3752 for (i = checkcnt; i--; )
3335 cb (EV_A_ EV_CHECK, checks [i]); 3753 cb (EV_A_ EV_CHECK, checks [i]);
3754#endif
3336 3755
3756#if EV_SIGNAL_ENABLE
3337 if (types & EV_SIGNAL) 3757 if (types & EV_SIGNAL)
3338 for (i = 0; i < signalmax; ++i) 3758 for (i = 0; i < EV_NSIG - 1; ++i)
3339 for (wl = signals [i].head; wl; ) 3759 for (wl = signals [i].head; wl; )
3340 { 3760 {
3341 wn = wl->next; 3761 wn = wl->next;
3342 cb (EV_A_ EV_SIGNAL, wl); 3762 cb (EV_A_ EV_SIGNAL, wl);
3343 wl = wn; 3763 wl = wn;
3344 } 3764 }
3765#endif
3345 3766
3767#if EV_CHILD_ENABLE
3346 if (types & EV_CHILD) 3768 if (types & EV_CHILD)
3347 for (i = EV_PID_HASHSIZE; i--; ) 3769 for (i = (EV_PID_HASHSIZE); i--; )
3348 for (wl = childs [i]; wl; ) 3770 for (wl = childs [i]; wl; )
3349 { 3771 {
3350 wn = wl->next; 3772 wn = wl->next;
3351 cb (EV_A_ EV_CHILD, wl); 3773 cb (EV_A_ EV_CHILD, wl);
3352 wl = wn; 3774 wl = wn;
3353 } 3775 }
3776#endif
3354/* EV_STAT 0x00001000 /* stat data changed */ 3777/* EV_STAT 0x00001000 /* stat data changed */
3355/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3778/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3356} 3779}
3357#endif 3780#endif
3358 3781

Diff Legend

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