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.343 by root, Fri Apr 2 21:03:46 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
77# ifndef EV_USE_REALTIME 77# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 78# define EV_USE_REALTIME 0
79# endif 79# endif
80# endif 80# endif
81 81
82# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 83# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP 1 84# define EV_USE_NANOSLEEP EV_FEATURE_OS
85# endif
85# else 86# else
87# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 88# define EV_USE_NANOSLEEP 0
89# endif
90
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# ifndef EV_USE_SELECT
93# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 94# endif
88# endif
89
90# ifndef EV_USE_SELECT
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT 1
93# else 95# else
96# undef EV_USE_SELECT
94# define EV_USE_SELECT 0 97# define EV_USE_SELECT 0
98# endif
99
100# if HAVE_POLL && HAVE_POLL_H
101# ifndef EV_USE_POLL
102# define EV_USE_POLL EV_FEATURE_BACKENDS
95# endif 103# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL 1
101# else 104# else
105# undef EV_USE_POLL
102# define EV_USE_POLL 0 106# define EV_USE_POLL 0
107# endif
108
109# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
110# ifndef EV_USE_EPOLL
111# define EV_USE_EPOLL EV_FEATURE_BACKENDS
103# endif 112# endif
113# else
114# undef EV_USE_EPOLL
115# define EV_USE_EPOLL 0
104# endif 116# endif
105 117
118# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
106# ifndef EV_USE_EPOLL 119# ifndef EV_USE_KQUEUE
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 120# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
108# define EV_USE_EPOLL 1
109# else
110# define EV_USE_EPOLL 0
111# endif 121# endif
122# else
123# undef EV_USE_KQUEUE
124# define EV_USE_KQUEUE 0
112# endif 125# endif
113 126
114# ifndef EV_USE_KQUEUE 127# if HAVE_PORT_H && HAVE_PORT_CREATE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 128# ifndef EV_USE_PORT
116# define EV_USE_KQUEUE 1 129# define EV_USE_PORT EV_FEATURE_BACKENDS
117# else
118# define EV_USE_KQUEUE 0
119# endif 130# endif
120# endif
121
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# define EV_USE_PORT 1
125# else 131# else
132# undef EV_USE_PORT
126# define EV_USE_PORT 0 133# define EV_USE_PORT 0
134# endif
135
136# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
137# ifndef EV_USE_INOTIFY
138# define EV_USE_INOTIFY EV_FEATURE_OS
127# endif 139# endif
128# endif
129
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
132# define EV_USE_INOTIFY 1
133# else 140# else
141# undef EV_USE_INOTIFY
134# define EV_USE_INOTIFY 0 142# define EV_USE_INOTIFY 0
143# endif
144
145# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
146# ifndef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD EV_FEATURE_OS
135# endif 148# endif
149# else
150# undef EV_USE_SIGNALFD
151# define EV_USE_SIGNALFD 0
136# endif 152# endif
137 153
154# if HAVE_EVENTFD
138# ifndef EV_USE_EVENTFD 155# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 156# define EV_USE_EVENTFD EV_FEATURE_OS
141# else
142# define EV_USE_EVENTFD 0
143# endif 157# endif
158# else
159# undef EV_USE_EVENTFD
160# define EV_USE_EVENTFD 0
144# endif 161# endif
145 162
146#endif 163#endif
147 164
148#include <math.h> 165#include <math.h>
149#include <stdlib.h> 166#include <stdlib.h>
167#include <string.h>
150#include <fcntl.h> 168#include <fcntl.h>
151#include <stddef.h> 169#include <stddef.h>
152 170
153#include <stdio.h> 171#include <stdio.h>
154 172
155#include <assert.h> 173#include <assert.h>
156#include <errno.h> 174#include <errno.h>
157#include <sys/types.h> 175#include <sys/types.h>
158#include <time.h> 176#include <time.h>
177#include <limits.h>
159 178
160#include <signal.h> 179#include <signal.h>
161 180
162#ifdef EV_H 181#ifdef EV_H
163# include EV_H 182# include EV_H
… …
174# define WIN32_LEAN_AND_MEAN 193# define WIN32_LEAN_AND_MEAN
175# include <windows.h> 194# include <windows.h>
176# ifndef EV_SELECT_IS_WINSOCKET 195# ifndef EV_SELECT_IS_WINSOCKET
177# define EV_SELECT_IS_WINSOCKET 1 196# define EV_SELECT_IS_WINSOCKET 1
178# endif 197# endif
198# undef EV_AVOID_STDIO
179#endif 199#endif
180 200
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 201/* this block tries to deduce configuration from header-defined symbols and defaults */
202
203/* try to deduce the maximum number of signals on this platform */
204#if defined (EV_NSIG)
205/* use what's provided */
206#elif defined (NSIG)
207# define EV_NSIG (NSIG)
208#elif defined(_NSIG)
209# define EV_NSIG (_NSIG)
210#elif defined (SIGMAX)
211# define EV_NSIG (SIGMAX+1)
212#elif defined (SIG_MAX)
213# define EV_NSIG (SIG_MAX+1)
214#elif defined (_SIG_MAX)
215# define EV_NSIG (_SIG_MAX+1)
216#elif defined (MAXSIG)
217# define EV_NSIG (MAXSIG+1)
218#elif defined (MAX_SIG)
219# define EV_NSIG (MAX_SIG+1)
220#elif defined (SIGARRAYSIZE)
221# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
222#elif defined (_sys_nsig)
223# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
224#else
225# error "unable to find value for NSIG, please report"
226/* to make it compile regardless, just remove the above line, */
227/* but consider reporting it, too! :) */
228# define EV_NSIG 65
229#endif
182 230
183#ifndef EV_USE_CLOCK_SYSCALL 231#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 232# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 233# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
186# else 234# else
187# define EV_USE_CLOCK_SYSCALL 0 235# define EV_USE_CLOCK_SYSCALL 0
188# endif 236# endif
189#endif 237#endif
190 238
191#ifndef EV_USE_MONOTONIC 239#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 240# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1 241# define EV_USE_MONOTONIC EV_FEATURE_OS
194# else 242# else
195# define EV_USE_MONOTONIC 0 243# define EV_USE_MONOTONIC 0
196# endif 244# endif
197#endif 245#endif
198 246
… …
200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL 248# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
201#endif 249#endif
202 250
203#ifndef EV_USE_NANOSLEEP 251#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L 252# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1 253# define EV_USE_NANOSLEEP EV_FEATURE_OS
206# else 254# else
207# define EV_USE_NANOSLEEP 0 255# define EV_USE_NANOSLEEP 0
208# endif 256# endif
209#endif 257#endif
210 258
211#ifndef EV_USE_SELECT 259#ifndef EV_USE_SELECT
212# define EV_USE_SELECT 1 260# define EV_USE_SELECT EV_FEATURE_BACKENDS
213#endif 261#endif
214 262
215#ifndef EV_USE_POLL 263#ifndef EV_USE_POLL
216# ifdef _WIN32 264# ifdef _WIN32
217# define EV_USE_POLL 0 265# define EV_USE_POLL 0
218# else 266# else
219# define EV_USE_POLL 1 267# define EV_USE_POLL EV_FEATURE_BACKENDS
220# endif 268# endif
221#endif 269#endif
222 270
223#ifndef EV_USE_EPOLL 271#ifndef EV_USE_EPOLL
224# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 272# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
225# define EV_USE_EPOLL 1 273# define EV_USE_EPOLL EV_FEATURE_BACKENDS
226# else 274# else
227# define EV_USE_EPOLL 0 275# define EV_USE_EPOLL 0
228# endif 276# endif
229#endif 277#endif
230 278
… …
236# define EV_USE_PORT 0 284# define EV_USE_PORT 0
237#endif 285#endif
238 286
239#ifndef EV_USE_INOTIFY 287#ifndef EV_USE_INOTIFY
240# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4)) 288# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
241# define EV_USE_INOTIFY 1 289# define EV_USE_INOTIFY EV_FEATURE_OS
242# else 290# else
243# define EV_USE_INOTIFY 0 291# define EV_USE_INOTIFY 0
244# endif 292# endif
245#endif 293#endif
246 294
247#ifndef EV_PID_HASHSIZE 295#ifndef EV_PID_HASHSIZE
248# if EV_MINIMAL 296# 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 297#endif
254 298
255#ifndef EV_INOTIFY_HASHSIZE 299#ifndef EV_INOTIFY_HASHSIZE
256# if EV_MINIMAL 300# 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 301#endif
262 302
263#ifndef EV_USE_EVENTFD 303#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 304# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 305# define EV_USE_EVENTFD EV_FEATURE_OS
266# else 306# else
267# define EV_USE_EVENTFD 0 307# define EV_USE_EVENTFD 0
308# endif
309#endif
310
311#ifndef EV_USE_SIGNALFD
312# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
313# define EV_USE_SIGNALFD EV_FEATURE_OS
314# else
315# define EV_USE_SIGNALFD 0
268# endif 316# endif
269#endif 317#endif
270 318
271#if 0 /* debugging */ 319#if 0 /* debugging */
272# define EV_VERIFY 3 320# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 321# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 322# define EV_HEAP_CACHE_AT 1
275#endif 323#endif
276 324
277#ifndef EV_VERIFY 325#ifndef EV_VERIFY
278# define EV_VERIFY !EV_MINIMAL 326# define EV_VERIFY (EV_FEATURE_API ? 1 : 0)
279#endif 327#endif
280 328
281#ifndef EV_USE_4HEAP 329#ifndef EV_USE_4HEAP
282# define EV_USE_4HEAP !EV_MINIMAL 330# define EV_USE_4HEAP EV_FEATURE_DATA
283#endif 331#endif
284 332
285#ifndef EV_HEAP_CACHE_AT 333#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 334# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
287#endif 335#endif
288 336
289/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 337/* 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. */ 338/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL 339#if EV_USE_CLOCK_SYSCALL
… …
300# endif 348# endif
301#endif 349#endif
302 350
303/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 351/* this block fixes any misconfiguration where we know we run into trouble otherwise */
304 352
353#ifdef _AIX
354/* AIX has a completely broken poll.h header */
355# undef EV_USE_POLL
356# define EV_USE_POLL 0
357#endif
358
305#ifndef CLOCK_MONOTONIC 359#ifndef CLOCK_MONOTONIC
306# undef EV_USE_MONOTONIC 360# undef EV_USE_MONOTONIC
307# define EV_USE_MONOTONIC 0 361# define EV_USE_MONOTONIC 0
308#endif 362#endif
309 363
… …
339#endif 393#endif
340 394
341#if EV_USE_EVENTFD 395#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 396/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 397# include <stdint.h>
398# ifndef EFD_NONBLOCK
399# define EFD_NONBLOCK O_NONBLOCK
400# endif
401# ifndef EFD_CLOEXEC
402# ifdef O_CLOEXEC
403# define EFD_CLOEXEC O_CLOEXEC
404# else
405# define EFD_CLOEXEC 02000000
406# endif
407# endif
344# ifdef __cplusplus 408# ifdef __cplusplus
345extern "C" { 409extern "C" {
346# endif 410# endif
347int eventfd (unsigned int initval, int flags); 411int (eventfd) (unsigned int initval, int flags);
348# ifdef __cplusplus 412# ifdef __cplusplus
349} 413}
350# endif 414# endif
351#endif 415#endif
352 416
417#if EV_USE_SIGNALFD
418/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
419# include <stdint.h>
420# ifndef SFD_NONBLOCK
421# define SFD_NONBLOCK O_NONBLOCK
422# endif
423# ifndef SFD_CLOEXEC
424# ifdef O_CLOEXEC
425# define SFD_CLOEXEC O_CLOEXEC
426# else
427# define SFD_CLOEXEC 02000000
428# endif
429# endif
430# ifdef __cplusplus
431extern "C" {
432# endif
433int signalfd (int fd, const sigset_t *mask, int flags);
434
435struct signalfd_siginfo
436{
437 uint32_t ssi_signo;
438 char pad[128 - sizeof (uint32_t)];
439};
440# ifdef __cplusplus
441}
442# endif
443#endif
444
445
353/**/ 446/**/
354 447
355#if EV_VERIFY >= 3 448#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 449# define EV_FREQUENT_CHECK ev_verify (EV_A)
357#else 450#else
358# define EV_FREQUENT_CHECK do { } while (0) 451# define EV_FREQUENT_CHECK do { } while (0)
359#endif 452#endif
360 453
361/* 454/*
… …
368 */ 461 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 462#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 463
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 464#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) */ 465#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 466
375#if __GNUC__ >= 4 467#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 468# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 469# define noinline __attribute__ ((noinline))
378#else 470#else
… …
385 477
386#define expect_false(expr) expect ((expr) != 0, 0) 478#define expect_false(expr) expect ((expr) != 0, 0)
387#define expect_true(expr) expect ((expr) != 0, 1) 479#define expect_true(expr) expect ((expr) != 0, 1)
388#define inline_size static inline 480#define inline_size static inline
389 481
390#if EV_MINIMAL 482#if EV_FEATURE_CODE
483# define inline_speed static inline
484#else
391# define inline_speed static noinline 485# define inline_speed static noinline
486#endif
487
488#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
489
490#if EV_MINPRI == EV_MAXPRI
491# define ABSPRI(w) (((W)w), 0)
392#else 492#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) 493# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
494#endif
398 495
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 496#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 497#define EMPTY2(a,b) /* used to suppress some warnings */
401 498
402typedef ev_watcher *W; 499typedef ev_watcher *W;
… …
414 511
415#if EV_USE_MONOTONIC 512#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 513static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 514#endif
418 515
516#ifndef EV_FD_TO_WIN32_HANDLE
517# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
518#endif
519#ifndef EV_WIN32_HANDLE_TO_FD
520# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
521#endif
522#ifndef EV_WIN32_CLOSE_FD
523# define EV_WIN32_CLOSE_FD(fd) close (fd)
524#endif
525
419#ifdef _WIN32 526#ifdef _WIN32
420# include "ev_win32.c" 527# include "ev_win32.c"
421#endif 528#endif
422 529
423/*****************************************************************************/ 530/*****************************************************************************/
531
532#if EV_AVOID_STDIO
533static void noinline
534ev_printerr (const char *msg)
535{
536 write (STDERR_FILENO, msg, strlen (msg));
537}
538#endif
424 539
425static void (*syserr_cb)(const char *msg); 540static void (*syserr_cb)(const char *msg);
426 541
427void 542void
428ev_set_syserr_cb (void (*cb)(const char *msg)) 543ev_set_syserr_cb (void (*cb)(const char *msg))
… …
438 553
439 if (syserr_cb) 554 if (syserr_cb)
440 syserr_cb (msg); 555 syserr_cb (msg);
441 else 556 else
442 { 557 {
558#if EV_AVOID_STDIO
559 const char *err = strerror (errno);
560
561 ev_printerr (msg);
562 ev_printerr (": ");
563 ev_printerr (err);
564 ev_printerr ("\n");
565#else
443 perror (msg); 566 perror (msg);
567#endif
444 abort (); 568 abort ();
445 } 569 }
446} 570}
447 571
448static void * 572static void *
449ev_realloc_emul (void *ptr, long size) 573ev_realloc_emul (void *ptr, long size)
450{ 574{
575#if __GLIBC__
576 return realloc (ptr, size);
577#else
451 /* some systems, notably openbsd and darwin, fail to properly 578 /* some systems, notably openbsd and darwin, fail to properly
452 * implement realloc (x, 0) (as required by both ansi c-98 and 579 * implement realloc (x, 0) (as required by both ansi c-89 and
453 * the single unix specification, so work around them here. 580 * the single unix specification, so work around them here.
454 */ 581 */
455 582
456 if (size) 583 if (size)
457 return realloc (ptr, size); 584 return realloc (ptr, size);
458 585
459 free (ptr); 586 free (ptr);
460 return 0; 587 return 0;
588#endif
461} 589}
462 590
463static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 591static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
464 592
465void 593void
… …
473{ 601{
474 ptr = alloc (ptr, size); 602 ptr = alloc (ptr, size);
475 603
476 if (!ptr && size) 604 if (!ptr && size)
477 { 605 {
606#if EV_AVOID_STDIO
607 ev_printerr ("libev: memory allocation failed, aborting.\n");
608#else
478 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 609 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
610#endif
479 abort (); 611 abort ();
480 } 612 }
481 613
482 return ptr; 614 return ptr;
483} 615}
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 617#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 618#define ev_free(ptr) ev_realloc ((ptr), 0)
487 619
488/*****************************************************************************/ 620/*****************************************************************************/
489 621
622/* set in reify when reification needed */
623#define EV_ANFD_REIFY 1
624
490/* file descriptor info structure */ 625/* file descriptor info structure */
491typedef struct 626typedef struct
492{ 627{
493 WL head; 628 WL head;
494 unsigned char events; /* the events watched for */ 629 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 630 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 */ 631 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 632 unsigned char unused;
498#if EV_USE_EPOLL 633#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 634 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 635#endif
… …
562 697
563 static int ev_default_loop_ptr; 698 static int ev_default_loop_ptr;
564 699
565#endif 700#endif
566 701
702#if EV_FEATURE_API
703# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
704# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
705# define EV_INVOKE_PENDING invoke_cb (EV_A)
706#else
707# define EV_RELEASE_CB (void)0
708# define EV_ACQUIRE_CB (void)0
709# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
710#endif
711
712#define EVUNLOOP_RECURSE 0x80
713
567/*****************************************************************************/ 714/*****************************************************************************/
568 715
569#ifndef EV_HAVE_EV_TIME 716#ifndef EV_HAVE_EV_TIME
570ev_tstamp 717ev_tstamp
571ev_time (void) 718ev_time (void)
… …
627 774
628 tv.tv_sec = (time_t)delay; 775 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 776 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 777
631 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 778 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
632 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 779 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 780 /* by older ones */
634 select (0, 0, 0, 0, &tv); 781 select (0, 0, 0, 0, &tv);
635#endif 782#endif
636 } 783 }
637} 784}
… …
745} 892}
746 893
747/*****************************************************************************/ 894/*****************************************************************************/
748 895
749inline_speed void 896inline_speed void
750fd_event (EV_P_ int fd, int revents) 897fd_event_nocheck (EV_P_ int fd, int revents)
751{ 898{
752 ANFD *anfd = anfds + fd; 899 ANFD *anfd = anfds + fd;
753 ev_io *w; 900 ev_io *w;
754 901
755 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 902 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
759 if (ev) 906 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 907 ev_feed_event (EV_A_ (W)w, ev);
761 } 908 }
762} 909}
763 910
911/* do not submit kernel events for fds that have reify set */
912/* because that means they changed while we were polling for new events */
913inline_speed void
914fd_event (EV_P_ int fd, int revents)
915{
916 ANFD *anfd = anfds + fd;
917
918 if (expect_true (!anfd->reify))
919 fd_event_nocheck (EV_A_ fd, revents);
920}
921
764void 922void
765ev_feed_fd_event (EV_P_ int fd, int revents) 923ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 924{
767 if (fd >= 0 && fd < anfdmax) 925 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 926 fd_event_nocheck (EV_A_ fd, revents);
769} 927}
770 928
771/* make sure the external fd watch events are in-sync */ 929/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 930/* with the kernel/libev internal state */
773inline_size void 931inline_size void
… …
788 946
789#if EV_SELECT_IS_WINSOCKET 947#if EV_SELECT_IS_WINSOCKET
790 if (events) 948 if (events)
791 { 949 {
792 unsigned long arg; 950 unsigned long arg;
793 #ifdef EV_FD_TO_WIN32_HANDLE
794 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 951 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)); 952 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
799 } 953 }
800#endif 954#endif
801 955
802 { 956 {
… …
840 ev_io_stop (EV_A_ w); 994 ev_io_stop (EV_A_ w);
841 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 995 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
842 } 996 }
843} 997}
844 998
845/* check whether the given fd is atcually valid, for error recovery */ 999/* check whether the given fd is actually valid, for error recovery */
846inline_size int 1000inline_size int
847fd_valid (int fd) 1001fd_valid (int fd)
848{ 1002{
849#ifdef _WIN32 1003#ifdef _WIN32
850 return _get_osfhandle (fd) != -1; 1004 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
851#else 1005#else
852 return fcntl (fd, F_GETFD) != -1; 1006 return fcntl (fd, F_GETFD) != -1;
853#endif 1007#endif
854} 1008}
855 1009
… …
873 1027
874 for (fd = anfdmax; fd--; ) 1028 for (fd = anfdmax; fd--; )
875 if (anfds [fd].events) 1029 if (anfds [fd].events)
876 { 1030 {
877 fd_kill (EV_A_ fd); 1031 fd_kill (EV_A_ fd);
878 return; 1032 break;
879 } 1033 }
880} 1034}
881 1035
882/* usually called after fork if backend needs to re-arm all fds from scratch */ 1036/* usually called after fork if backend needs to re-arm all fds from scratch */
883static void noinline 1037static void noinline
… …
888 for (fd = 0; fd < anfdmax; ++fd) 1042 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 1043 if (anfds [fd].events)
890 { 1044 {
891 anfds [fd].events = 0; 1045 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 1046 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1047 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 1048 }
1049}
1050
1051/* used to prepare libev internal fd's */
1052/* this is not fork-safe */
1053inline_speed void
1054fd_intern (int fd)
1055{
1056#ifdef _WIN32
1057 unsigned long arg = 1;
1058 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1059#else
1060 fcntl (fd, F_SETFD, FD_CLOEXEC);
1061 fcntl (fd, F_SETFL, O_NONBLOCK);
1062#endif
895} 1063}
896 1064
897/*****************************************************************************/ 1065/*****************************************************************************/
898 1066
899/* 1067/*
… …
973 1141
974 for (;;) 1142 for (;;)
975 { 1143 {
976 int c = k << 1; 1144 int c = k << 1;
977 1145
978 if (c > N + HEAP0 - 1) 1146 if (c >= N + HEAP0)
979 break; 1147 break;
980 1148
981 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1149 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
982 ? 1 : 0; 1150 ? 1 : 0;
983 1151
… …
1019 1187
1020/* move an element suitably so it is in a correct place */ 1188/* move an element suitably so it is in a correct place */
1021inline_size void 1189inline_size void
1022adjustheap (ANHE *heap, int N, int k) 1190adjustheap (ANHE *heap, int N, int k)
1023{ 1191{
1024 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1192 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1025 upheap (heap, k); 1193 upheap (heap, k);
1026 else 1194 else
1027 downheap (heap, N, k); 1195 downheap (heap, N, k);
1028} 1196}
1029 1197
… …
1042/*****************************************************************************/ 1210/*****************************************************************************/
1043 1211
1044/* associate signal watchers to a signal signal */ 1212/* associate signal watchers to a signal signal */
1045typedef struct 1213typedef struct
1046{ 1214{
1215 EV_ATOMIC_T pending;
1216#if EV_MULTIPLICITY
1217 EV_P;
1218#endif
1047 WL head; 1219 WL head;
1048 EV_ATOMIC_T gotsig;
1049} ANSIG; 1220} ANSIG;
1050 1221
1051static ANSIG *signals; 1222static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig;
1055 1223
1056/*****************************************************************************/ 1224/*****************************************************************************/
1057 1225
1058/* used to prepare libev internal fd's */ 1226#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 1227
1072static void noinline 1228static void noinline
1073evpipe_init (EV_P) 1229evpipe_init (EV_P)
1074{ 1230{
1075 if (!ev_is_active (&pipe_w)) 1231 if (!ev_is_active (&pipe_w))
1076 { 1232 {
1077#if EV_USE_EVENTFD 1233# if EV_USE_EVENTFD
1234 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1235 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1236 evfd = eventfd (0, 0);
1237
1238 if (evfd >= 0)
1079 { 1239 {
1080 evpipe [0] = -1; 1240 evpipe [0] = -1;
1081 fd_intern (evfd); 1241 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1242 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1243 }
1084 else 1244 else
1085#endif 1245# endif
1086 { 1246 {
1087 while (pipe (evpipe)) 1247 while (pipe (evpipe))
1088 ev_syserr ("(libev) error creating signal/async pipe"); 1248 ev_syserr ("(libev) error creating signal/async pipe");
1089 1249
1090 fd_intern (evpipe [0]); 1250 fd_intern (evpipe [0]);
… …
1101evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1261evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1102{ 1262{
1103 if (!*flag) 1263 if (!*flag)
1104 { 1264 {
1105 int old_errno = errno; /* save errno because write might clobber it */ 1265 int old_errno = errno; /* save errno because write might clobber it */
1266 char dummy;
1106 1267
1107 *flag = 1; 1268 *flag = 1;
1108 1269
1109#if EV_USE_EVENTFD 1270#if EV_USE_EVENTFD
1110 if (evfd >= 0) 1271 if (evfd >= 0)
… …
1112 uint64_t counter = 1; 1273 uint64_t counter = 1;
1113 write (evfd, &counter, sizeof (uint64_t)); 1274 write (evfd, &counter, sizeof (uint64_t));
1114 } 1275 }
1115 else 1276 else
1116#endif 1277#endif
1117 write (evpipe [1], &old_errno, 1); 1278 write (evpipe [1], &dummy, 1);
1118 1279
1119 errno = old_errno; 1280 errno = old_errno;
1120 } 1281 }
1121} 1282}
1122 1283
1123/* called whenever the libev signal pipe */ 1284/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */ 1285/* got some events (signal, async) */
1125static void 1286static void
1126pipecb (EV_P_ ev_io *iow, int revents) 1287pipecb (EV_P_ ev_io *iow, int revents)
1127{ 1288{
1289 int i;
1290
1128#if EV_USE_EVENTFD 1291#if EV_USE_EVENTFD
1129 if (evfd >= 0) 1292 if (evfd >= 0)
1130 { 1293 {
1131 uint64_t counter; 1294 uint64_t counter;
1132 read (evfd, &counter, sizeof (uint64_t)); 1295 read (evfd, &counter, sizeof (uint64_t));
… …
1136 { 1299 {
1137 char dummy; 1300 char dummy;
1138 read (evpipe [0], &dummy, 1); 1301 read (evpipe [0], &dummy, 1);
1139 } 1302 }
1140 1303
1141 if (gotsig && ev_is_default_loop (EV_A)) 1304 if (sig_pending)
1142 { 1305 {
1143 int signum; 1306 sig_pending = 0;
1144 gotsig = 0;
1145 1307
1146 for (signum = signalmax; signum--; ) 1308 for (i = EV_NSIG - 1; i--; )
1147 if (signals [signum].gotsig) 1309 if (expect_false (signals [i].pending))
1148 ev_feed_signal_event (EV_A_ signum + 1); 1310 ev_feed_signal_event (EV_A_ i + 1);
1149 } 1311 }
1150 1312
1151#if EV_ASYNC_ENABLE 1313#if EV_ASYNC_ENABLE
1152 if (gotasync) 1314 if (async_pending)
1153 { 1315 {
1154 int i; 1316 async_pending = 0;
1155 gotasync = 0;
1156 1317
1157 for (i = asynccnt; i--; ) 1318 for (i = asynccnt; i--; )
1158 if (asyncs [i]->sent) 1319 if (asyncs [i]->sent)
1159 { 1320 {
1160 asyncs [i]->sent = 0; 1321 asyncs [i]->sent = 0;
… …
1168 1329
1169static void 1330static void
1170ev_sighandler (int signum) 1331ev_sighandler (int signum)
1171{ 1332{
1172#if EV_MULTIPLICITY 1333#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1334 EV_P = signals [signum - 1].loop;
1174#endif 1335#endif
1175 1336
1176#if _WIN32 1337#ifdef _WIN32
1177 signal (signum, ev_sighandler); 1338 signal (signum, ev_sighandler);
1178#endif 1339#endif
1179 1340
1180 signals [signum - 1].gotsig = 1; 1341 signals [signum - 1].pending = 1;
1181 evpipe_write (EV_A_ &gotsig); 1342 evpipe_write (EV_A_ &sig_pending);
1182} 1343}
1183 1344
1184void noinline 1345void noinline
1185ev_feed_signal_event (EV_P_ int signum) 1346ev_feed_signal_event (EV_P_ int signum)
1186{ 1347{
1187 WL w; 1348 WL w;
1188 1349
1350 if (expect_false (signum <= 0 || signum > EV_NSIG))
1351 return;
1352
1353 --signum;
1354
1189#if EV_MULTIPLICITY 1355#if EV_MULTIPLICITY
1190 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1356 /* it is permissible to try to feed a signal to the wrong loop */
1191#endif 1357 /* or, likely more useful, feeding a signal nobody is waiting for */
1192 1358
1193 --signum; 1359 if (expect_false (signals [signum].loop != EV_A))
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return; 1360 return;
1361#endif
1197 1362
1198 signals [signum].gotsig = 0; 1363 signals [signum].pending = 0;
1199 1364
1200 for (w = signals [signum].head; w; w = w->next) 1365 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1366 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 1367}
1203 1368
1369#if EV_USE_SIGNALFD
1370static void
1371sigfdcb (EV_P_ ev_io *iow, int revents)
1372{
1373 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1374
1375 for (;;)
1376 {
1377 ssize_t res = read (sigfd, si, sizeof (si));
1378
1379 /* not ISO-C, as res might be -1, but works with SuS */
1380 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1381 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1382
1383 if (res < (ssize_t)sizeof (si))
1384 break;
1385 }
1386}
1387#endif
1388
1389#endif
1390
1204/*****************************************************************************/ 1391/*****************************************************************************/
1205 1392
1393#if EV_CHILD_ENABLE
1206static WL childs [EV_PID_HASHSIZE]; 1394static WL childs [EV_PID_HASHSIZE];
1207
1208#ifndef _WIN32
1209 1395
1210static ev_signal childev; 1396static ev_signal childev;
1211 1397
1212#ifndef WIFCONTINUED 1398#ifndef WIFCONTINUED
1213# define WIFCONTINUED(status) 0 1399# define WIFCONTINUED(status) 0
… …
1218child_reap (EV_P_ int chain, int pid, int status) 1404child_reap (EV_P_ int chain, int pid, int status)
1219{ 1405{
1220 ev_child *w; 1406 ev_child *w;
1221 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1407 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1222 1408
1223 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1409 for (w = (ev_child *)childs [chain & ((EV_PID_HASHSIZE) - 1)]; w; w = (ev_child *)((WL)w)->next)
1224 { 1410 {
1225 if ((w->pid == pid || !w->pid) 1411 if ((w->pid == pid || !w->pid)
1226 && (!traced || (w->flags & 1))) 1412 && (!traced || (w->flags & 1)))
1227 { 1413 {
1228 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */ 1414 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 */ 1439 /* 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 */ 1440 /* 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); 1441 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
1256 1442
1257 child_reap (EV_A_ pid, pid, status); 1443 child_reap (EV_A_ pid, pid, status);
1258 if (EV_PID_HASHSIZE > 1) 1444 if ((EV_PID_HASHSIZE) > 1)
1259 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1445 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
1260} 1446}
1261 1447
1262#endif 1448#endif
1263 1449
… …
1330#ifdef __APPLE__ 1516#ifdef __APPLE__
1331 /* only select works correctly on that "unix-certified" platform */ 1517 /* only select works correctly on that "unix-certified" platform */
1332 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1518 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1333 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1519 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1334#endif 1520#endif
1521#ifdef __FreeBSD__
1522 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1523#endif
1335 1524
1336 return flags; 1525 return flags;
1337} 1526}
1338 1527
1339unsigned int 1528unsigned int
… …
1352ev_backend (EV_P) 1541ev_backend (EV_P)
1353{ 1542{
1354 return backend; 1543 return backend;
1355} 1544}
1356 1545
1546#if EV_FEATURE_API
1357unsigned int 1547unsigned int
1358ev_loop_count (EV_P) 1548ev_iteration (EV_P)
1359{ 1549{
1360 return loop_count; 1550 return loop_count;
1361} 1551}
1362 1552
1553unsigned int
1554ev_depth (EV_P)
1555{
1556 return loop_depth;
1557}
1558
1363void 1559void
1364ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1560ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1365{ 1561{
1366 io_blocktime = interval; 1562 io_blocktime = interval;
1367} 1563}
… …
1369void 1565void
1370ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1566ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1371{ 1567{
1372 timeout_blocktime = interval; 1568 timeout_blocktime = interval;
1373} 1569}
1570
1571void
1572ev_set_userdata (EV_P_ void *data)
1573{
1574 userdata = data;
1575}
1576
1577void *
1578ev_userdata (EV_P)
1579{
1580 return userdata;
1581}
1582
1583void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1584{
1585 invoke_cb = invoke_pending_cb;
1586}
1587
1588void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1589{
1590 release_cb = release;
1591 acquire_cb = acquire;
1592}
1593#endif
1374 1594
1375/* initialise a loop structure, must be zero-initialised */ 1595/* initialise a loop structure, must be zero-initialised */
1376static void noinline 1596static void noinline
1377loop_init (EV_P_ unsigned int flags) 1597loop_init (EV_P_ unsigned int flags)
1378{ 1598{
… …
1396 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1616 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1397 have_monotonic = 1; 1617 have_monotonic = 1;
1398 } 1618 }
1399#endif 1619#endif
1400 1620
1621 /* pid check not overridable via env */
1622#ifndef _WIN32
1623 if (flags & EVFLAG_FORKCHECK)
1624 curpid = getpid ();
1625#endif
1626
1627 if (!(flags & EVFLAG_NOENV)
1628 && !enable_secure ()
1629 && getenv ("LIBEV_FLAGS"))
1630 flags = atoi (getenv ("LIBEV_FLAGS"));
1631
1401 ev_rt_now = ev_time (); 1632 ev_rt_now = ev_time ();
1402 mn_now = get_clock (); 1633 mn_now = get_clock ();
1403 now_floor = mn_now; 1634 now_floor = mn_now;
1404 rtmn_diff = ev_rt_now - mn_now; 1635 rtmn_diff = ev_rt_now - mn_now;
1636#if EV_FEATURE_API
1637 invoke_cb = ev_invoke_pending;
1638#endif
1405 1639
1406 io_blocktime = 0.; 1640 io_blocktime = 0.;
1407 timeout_blocktime = 0.; 1641 timeout_blocktime = 0.;
1408 backend = 0; 1642 backend = 0;
1409 backend_fd = -1; 1643 backend_fd = -1;
1410 gotasync = 0; 1644 sig_pending = 0;
1645#if EV_ASYNC_ENABLE
1646 async_pending = 0;
1647#endif
1411#if EV_USE_INOTIFY 1648#if EV_USE_INOTIFY
1412 fs_fd = -2; 1649 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1413#endif 1650#endif
1414 1651#if EV_USE_SIGNALFD
1415 /* pid check not overridable via env */ 1652 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1416#ifndef _WIN32
1417 if (flags & EVFLAG_FORKCHECK)
1418 curpid = getpid ();
1419#endif 1653#endif
1420
1421 if (!(flags & EVFLAG_NOENV)
1422 && !enable_secure ()
1423 && getenv ("LIBEV_FLAGS"))
1424 flags = atoi (getenv ("LIBEV_FLAGS"));
1425 1654
1426 if (!(flags & 0x0000ffffU)) 1655 if (!(flags & 0x0000ffffU))
1427 flags |= ev_recommended_backends (); 1656 flags |= ev_recommended_backends ();
1428 1657
1429#if EV_USE_PORT 1658#if EV_USE_PORT
… …
1442 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1671 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1443#endif 1672#endif
1444 1673
1445 ev_prepare_init (&pending_w, pendingcb); 1674 ev_prepare_init (&pending_w, pendingcb);
1446 1675
1676#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1447 ev_init (&pipe_w, pipecb); 1677 ev_init (&pipe_w, pipecb);
1448 ev_set_priority (&pipe_w, EV_MAXPRI); 1678 ev_set_priority (&pipe_w, EV_MAXPRI);
1679#endif
1449 } 1680 }
1450} 1681}
1451 1682
1452/* free up a loop structure */ 1683/* free up a loop structure */
1453static void noinline 1684static void noinline
… …
1455{ 1686{
1456 int i; 1687 int i;
1457 1688
1458 if (ev_is_active (&pipe_w)) 1689 if (ev_is_active (&pipe_w))
1459 { 1690 {
1460 ev_ref (EV_A); /* signal watcher */ 1691 /*ev_ref (EV_A);*/
1461 ev_io_stop (EV_A_ &pipe_w); 1692 /*ev_io_stop (EV_A_ &pipe_w);*/
1462 1693
1463#if EV_USE_EVENTFD 1694#if EV_USE_EVENTFD
1464 if (evfd >= 0) 1695 if (evfd >= 0)
1465 close (evfd); 1696 close (evfd);
1466#endif 1697#endif
1467 1698
1468 if (evpipe [0] >= 0) 1699 if (evpipe [0] >= 0)
1469 { 1700 {
1470 close (evpipe [0]); 1701 EV_WIN32_CLOSE_FD (evpipe [0]);
1471 close (evpipe [1]); 1702 EV_WIN32_CLOSE_FD (evpipe [1]);
1472 } 1703 }
1473 } 1704 }
1705
1706#if EV_USE_SIGNALFD
1707 if (ev_is_active (&sigfd_w))
1708 close (sigfd);
1709#endif
1474 1710
1475#if EV_USE_INOTIFY 1711#if EV_USE_INOTIFY
1476 if (fs_fd >= 0) 1712 if (fs_fd >= 0)
1477 close (fs_fd); 1713 close (fs_fd);
1478#endif 1714#endif
… …
1502#if EV_IDLE_ENABLE 1738#if EV_IDLE_ENABLE
1503 array_free (idle, [i]); 1739 array_free (idle, [i]);
1504#endif 1740#endif
1505 } 1741 }
1506 1742
1507 ev_free (anfds); anfdmax = 0; 1743 ev_free (anfds); anfds = 0; anfdmax = 0;
1508 1744
1509 /* have to use the microsoft-never-gets-it-right macro */ 1745 /* have to use the microsoft-never-gets-it-right macro */
1510 array_free (rfeed, EMPTY); 1746 array_free (rfeed, EMPTY);
1511 array_free (fdchange, EMPTY); 1747 array_free (fdchange, EMPTY);
1512 array_free (timer, EMPTY); 1748 array_free (timer, EMPTY);
… …
1547 1783
1548 if (ev_is_active (&pipe_w)) 1784 if (ev_is_active (&pipe_w))
1549 { 1785 {
1550 /* this "locks" the handlers against writing to the pipe */ 1786 /* this "locks" the handlers against writing to the pipe */
1551 /* while we modify the fd vars */ 1787 /* while we modify the fd vars */
1552 gotsig = 1; 1788 sig_pending = 1;
1553#if EV_ASYNC_ENABLE 1789#if EV_ASYNC_ENABLE
1554 gotasync = 1; 1790 async_pending = 1;
1555#endif 1791#endif
1556 1792
1557 ev_ref (EV_A); 1793 ev_ref (EV_A);
1558 ev_io_stop (EV_A_ &pipe_w); 1794 ev_io_stop (EV_A_ &pipe_w);
1559 1795
… …
1562 close (evfd); 1798 close (evfd);
1563#endif 1799#endif
1564 1800
1565 if (evpipe [0] >= 0) 1801 if (evpipe [0] >= 0)
1566 { 1802 {
1567 close (evpipe [0]); 1803 EV_WIN32_CLOSE_FD (evpipe [0]);
1568 close (evpipe [1]); 1804 EV_WIN32_CLOSE_FD (evpipe [1]);
1569 } 1805 }
1570 1806
1807#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1571 evpipe_init (EV_A); 1808 evpipe_init (EV_A);
1572 /* now iterate over everything, in case we missed something */ 1809 /* now iterate over everything, in case we missed something */
1573 pipecb (EV_A_ &pipe_w, EV_READ); 1810 pipecb (EV_A_ &pipe_w, EV_READ);
1811#endif
1574 } 1812 }
1575 1813
1576 postfork = 0; 1814 postfork = 0;
1577} 1815}
1578 1816
1579#if EV_MULTIPLICITY 1817#if EV_MULTIPLICITY
1580 1818
1581struct ev_loop * 1819struct ev_loop *
1582ev_loop_new (unsigned int flags) 1820ev_loop_new (unsigned int flags)
1583{ 1821{
1584 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1822 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1585 1823
1586 memset (loop, 0, sizeof (struct ev_loop)); 1824 memset (EV_A, 0, sizeof (struct ev_loop));
1587
1588 loop_init (EV_A_ flags); 1825 loop_init (EV_A_ flags);
1589 1826
1590 if (ev_backend (EV_A)) 1827 if (ev_backend (EV_A))
1591 return loop; 1828 return EV_A;
1592 1829
1593 return 0; 1830 return 0;
1594} 1831}
1595 1832
1596void 1833void
… …
1603void 1840void
1604ev_loop_fork (EV_P) 1841ev_loop_fork (EV_P)
1605{ 1842{
1606 postfork = 1; /* must be in line with ev_default_fork */ 1843 postfork = 1; /* must be in line with ev_default_fork */
1607} 1844}
1845#endif /* multiplicity */
1608 1846
1609#if EV_VERIFY 1847#if EV_VERIFY
1610static void noinline 1848static void noinline
1611verify_watcher (EV_P_ W w) 1849verify_watcher (EV_P_ W w)
1612{ 1850{
… …
1640 verify_watcher (EV_A_ ws [cnt]); 1878 verify_watcher (EV_A_ ws [cnt]);
1641 } 1879 }
1642} 1880}
1643#endif 1881#endif
1644 1882
1883#if EV_FEATURE_API
1645void 1884void
1646ev_loop_verify (EV_P) 1885ev_verify (EV_P)
1647{ 1886{
1648#if EV_VERIFY 1887#if EV_VERIFY
1649 int i; 1888 int i;
1650 WL w; 1889 WL w;
1651 1890
… …
1690#if EV_ASYNC_ENABLE 1929#if EV_ASYNC_ENABLE
1691 assert (asyncmax >= asynccnt); 1930 assert (asyncmax >= asynccnt);
1692 array_verify (EV_A_ (W *)asyncs, asynccnt); 1931 array_verify (EV_A_ (W *)asyncs, asynccnt);
1693#endif 1932#endif
1694 1933
1934#if EV_PREPARE_ENABLE
1695 assert (preparemax >= preparecnt); 1935 assert (preparemax >= preparecnt);
1696 array_verify (EV_A_ (W *)prepares, preparecnt); 1936 array_verify (EV_A_ (W *)prepares, preparecnt);
1937#endif
1697 1938
1939#if EV_CHECK_ENABLE
1698 assert (checkmax >= checkcnt); 1940 assert (checkmax >= checkcnt);
1699 array_verify (EV_A_ (W *)checks, checkcnt); 1941 array_verify (EV_A_ (W *)checks, checkcnt);
1942#endif
1700 1943
1701# if 0 1944# if 0
1945#if EV_CHILD_ENABLE
1702 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1946 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) 1947 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1704# endif 1948#endif
1705#endif 1949# endif
1950#endif
1706} 1951}
1707 1952#endif
1708#endif /* multiplicity */
1709 1953
1710#if EV_MULTIPLICITY 1954#if EV_MULTIPLICITY
1711struct ev_loop * 1955struct ev_loop *
1712ev_default_loop_init (unsigned int flags) 1956ev_default_loop_init (unsigned int flags)
1713#else 1957#else
… …
1716#endif 1960#endif
1717{ 1961{
1718 if (!ev_default_loop_ptr) 1962 if (!ev_default_loop_ptr)
1719 { 1963 {
1720#if EV_MULTIPLICITY 1964#if EV_MULTIPLICITY
1721 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1965 EV_P = ev_default_loop_ptr = &default_loop_struct;
1722#else 1966#else
1723 ev_default_loop_ptr = 1; 1967 ev_default_loop_ptr = 1;
1724#endif 1968#endif
1725 1969
1726 loop_init (EV_A_ flags); 1970 loop_init (EV_A_ flags);
1727 1971
1728 if (ev_backend (EV_A)) 1972 if (ev_backend (EV_A))
1729 { 1973 {
1730#ifndef _WIN32 1974#if EV_CHILD_ENABLE
1731 ev_signal_init (&childev, childcb, SIGCHLD); 1975 ev_signal_init (&childev, childcb, SIGCHLD);
1732 ev_set_priority (&childev, EV_MAXPRI); 1976 ev_set_priority (&childev, EV_MAXPRI);
1733 ev_signal_start (EV_A_ &childev); 1977 ev_signal_start (EV_A_ &childev);
1734 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1978 ev_unref (EV_A); /* child watcher should not keep loop alive */
1735#endif 1979#endif
… …
1743 1987
1744void 1988void
1745ev_default_destroy (void) 1989ev_default_destroy (void)
1746{ 1990{
1747#if EV_MULTIPLICITY 1991#if EV_MULTIPLICITY
1748 struct ev_loop *loop = ev_default_loop_ptr; 1992 EV_P = ev_default_loop_ptr;
1749#endif 1993#endif
1750 1994
1751 ev_default_loop_ptr = 0; 1995 ev_default_loop_ptr = 0;
1752 1996
1753#ifndef _WIN32 1997#if EV_CHILD_ENABLE
1754 ev_ref (EV_A); /* child watcher */ 1998 ev_ref (EV_A); /* child watcher */
1755 ev_signal_stop (EV_A_ &childev); 1999 ev_signal_stop (EV_A_ &childev);
1756#endif 2000#endif
1757 2001
1758 loop_destroy (EV_A); 2002 loop_destroy (EV_A);
… …
1760 2004
1761void 2005void
1762ev_default_fork (void) 2006ev_default_fork (void)
1763{ 2007{
1764#if EV_MULTIPLICITY 2008#if EV_MULTIPLICITY
1765 struct ev_loop *loop = ev_default_loop_ptr; 2009 EV_P = ev_default_loop_ptr;
1766#endif 2010#endif
1767 2011
1768 postfork = 1; /* must be in line with ev_loop_fork */ 2012 postfork = 1; /* must be in line with ev_loop_fork */
1769} 2013}
1770 2014
… …
1774ev_invoke (EV_P_ void *w, int revents) 2018ev_invoke (EV_P_ void *w, int revents)
1775{ 2019{
1776 EV_CB_INVOKE ((W)w, revents); 2020 EV_CB_INVOKE ((W)w, revents);
1777} 2021}
1778 2022
1779inline_speed void 2023unsigned int
1780call_pending (EV_P) 2024ev_pending_count (EV_P)
2025{
2026 int pri;
2027 unsigned int count = 0;
2028
2029 for (pri = NUMPRI; pri--; )
2030 count += pendingcnt [pri];
2031
2032 return count;
2033}
2034
2035void noinline
2036ev_invoke_pending (EV_P)
1781{ 2037{
1782 int pri; 2038 int pri;
1783 2039
1784 for (pri = NUMPRI; pri--; ) 2040 for (pri = NUMPRI; pri--; )
1785 while (pendingcnt [pri]) 2041 while (pendingcnt [pri])
… …
1852 EV_FREQUENT_CHECK; 2108 EV_FREQUENT_CHECK;
1853 feed_reverse (EV_A_ (W)w); 2109 feed_reverse (EV_A_ (W)w);
1854 } 2110 }
1855 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2111 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1856 2112
1857 feed_reverse_done (EV_A_ EV_TIMEOUT); 2113 feed_reverse_done (EV_A_ EV_TIMER);
1858 } 2114 }
1859} 2115}
1860 2116
1861#if EV_PERIODIC_ENABLE 2117#if EV_PERIODIC_ENABLE
1862/* make periodics pending */ 2118/* make periodics pending */
… …
1953 ANHE_at_cache (*he); 2209 ANHE_at_cache (*he);
1954 } 2210 }
1955} 2211}
1956 2212
1957/* fetch new monotonic and realtime times from the kernel */ 2213/* fetch new monotonic and realtime times from the kernel */
1958/* also detetc if there was a timejump, and act accordingly */ 2214/* also detect if there was a timejump, and act accordingly */
1959inline_speed void 2215inline_speed void
1960time_update (EV_P_ ev_tstamp max_block) 2216time_update (EV_P_ ev_tstamp max_block)
1961{ 2217{
1962#if EV_USE_MONOTONIC 2218#if EV_USE_MONOTONIC
1963 if (expect_true (have_monotonic)) 2219 if (expect_true (have_monotonic))
… …
2020 2276
2021 mn_now = ev_rt_now; 2277 mn_now = ev_rt_now;
2022 } 2278 }
2023} 2279}
2024 2280
2025static int loop_done;
2026
2027void 2281void
2028ev_loop (EV_P_ int flags) 2282ev_loop (EV_P_ int flags)
2029{ 2283{
2284#if EV_FEATURE_API
2285 ++loop_depth;
2286#endif
2287
2288 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2289
2030 loop_done = EVUNLOOP_CANCEL; 2290 loop_done = EVUNLOOP_CANCEL;
2031 2291
2032 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2292 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2033 2293
2034 do 2294 do
2035 { 2295 {
2036#if EV_VERIFY >= 2 2296#if EV_VERIFY >= 2
2037 ev_loop_verify (EV_A); 2297 ev_verify (EV_A);
2038#endif 2298#endif
2039 2299
2040#ifndef _WIN32 2300#ifndef _WIN32
2041 if (expect_false (curpid)) /* penalise the forking check even more */ 2301 if (expect_false (curpid)) /* penalise the forking check even more */
2042 if (expect_false (getpid () != curpid)) 2302 if (expect_false (getpid () != curpid))
… …
2050 /* we might have forked, so queue fork handlers */ 2310 /* we might have forked, so queue fork handlers */
2051 if (expect_false (postfork)) 2311 if (expect_false (postfork))
2052 if (forkcnt) 2312 if (forkcnt)
2053 { 2313 {
2054 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2314 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2055 call_pending (EV_A); 2315 EV_INVOKE_PENDING;
2056 } 2316 }
2057#endif 2317#endif
2058 2318
2319#if EV_PREPARE_ENABLE
2059 /* queue prepare watchers (and execute them) */ 2320 /* queue prepare watchers (and execute them) */
2060 if (expect_false (preparecnt)) 2321 if (expect_false (preparecnt))
2061 { 2322 {
2062 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2323 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2063 call_pending (EV_A); 2324 EV_INVOKE_PENDING;
2064 } 2325 }
2326#endif
2327
2328 if (expect_false (loop_done))
2329 break;
2065 2330
2066 /* we might have forked, so reify kernel state if necessary */ 2331 /* we might have forked, so reify kernel state if necessary */
2067 if (expect_false (postfork)) 2332 if (expect_false (postfork))
2068 loop_fork (EV_A); 2333 loop_fork (EV_A);
2069 2334
… …
2075 ev_tstamp waittime = 0.; 2340 ev_tstamp waittime = 0.;
2076 ev_tstamp sleeptime = 0.; 2341 ev_tstamp sleeptime = 0.;
2077 2342
2078 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2343 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2079 { 2344 {
2345 /* remember old timestamp for io_blocktime calculation */
2346 ev_tstamp prev_mn_now = mn_now;
2347
2080 /* update time to cancel out callback processing overhead */ 2348 /* update time to cancel out callback processing overhead */
2081 time_update (EV_A_ 1e100); 2349 time_update (EV_A_ 1e100);
2082 2350
2083 waittime = MAX_BLOCKTIME; 2351 waittime = MAX_BLOCKTIME;
2084 2352
… …
2094 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2362 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2095 if (waittime > to) waittime = to; 2363 if (waittime > to) waittime = to;
2096 } 2364 }
2097#endif 2365#endif
2098 2366
2367 /* don't let timeouts decrease the waittime below timeout_blocktime */
2099 if (expect_false (waittime < timeout_blocktime)) 2368 if (expect_false (waittime < timeout_blocktime))
2100 waittime = timeout_blocktime; 2369 waittime = timeout_blocktime;
2101 2370
2102 sleeptime = waittime - backend_fudge; 2371 /* extra check because io_blocktime is commonly 0 */
2103
2104 if (expect_true (sleeptime > io_blocktime)) 2372 if (expect_false (io_blocktime))
2105 sleeptime = io_blocktime;
2106
2107 if (sleeptime)
2108 { 2373 {
2374 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2375
2376 if (sleeptime > waittime - backend_fudge)
2377 sleeptime = waittime - backend_fudge;
2378
2379 if (expect_true (sleeptime > 0.))
2380 {
2109 ev_sleep (sleeptime); 2381 ev_sleep (sleeptime);
2110 waittime -= sleeptime; 2382 waittime -= sleeptime;
2383 }
2111 } 2384 }
2112 } 2385 }
2113 2386
2387#if EV_FEATURE_API
2114 ++loop_count; 2388 ++loop_count;
2389#endif
2390 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2115 backend_poll (EV_A_ waittime); 2391 backend_poll (EV_A_ waittime);
2392 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2116 2393
2117 /* update ev_rt_now, do magic */ 2394 /* update ev_rt_now, do magic */
2118 time_update (EV_A_ waittime + sleeptime); 2395 time_update (EV_A_ waittime + sleeptime);
2119 } 2396 }
2120 2397
… …
2127#if EV_IDLE_ENABLE 2404#if EV_IDLE_ENABLE
2128 /* queue idle watchers unless other events are pending */ 2405 /* queue idle watchers unless other events are pending */
2129 idle_reify (EV_A); 2406 idle_reify (EV_A);
2130#endif 2407#endif
2131 2408
2409#if EV_CHECK_ENABLE
2132 /* queue check watchers, to be executed first */ 2410 /* queue check watchers, to be executed first */
2133 if (expect_false (checkcnt)) 2411 if (expect_false (checkcnt))
2134 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2412 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2413#endif
2135 2414
2136 call_pending (EV_A); 2415 EV_INVOKE_PENDING;
2137 } 2416 }
2138 while (expect_true ( 2417 while (expect_true (
2139 activecnt 2418 activecnt
2140 && !loop_done 2419 && !loop_done
2141 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2420 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2142 )); 2421 ));
2143 2422
2144 if (loop_done == EVUNLOOP_ONE) 2423 if (loop_done == EVUNLOOP_ONE)
2145 loop_done = EVUNLOOP_CANCEL; 2424 loop_done = EVUNLOOP_CANCEL;
2425
2426#if EV_FEATURE_API
2427 --loop_depth;
2428#endif
2146} 2429}
2147 2430
2148void 2431void
2149ev_unloop (EV_P_ int how) 2432ev_unloop (EV_P_ int how)
2150{ 2433{
… …
2201inline_size void 2484inline_size void
2202wlist_del (WL *head, WL elem) 2485wlist_del (WL *head, WL elem)
2203{ 2486{
2204 while (*head) 2487 while (*head)
2205 { 2488 {
2206 if (*head == elem) 2489 if (expect_true (*head == elem))
2207 { 2490 {
2208 *head = elem->next; 2491 *head = elem->next;
2209 return; 2492 break;
2210 } 2493 }
2211 2494
2212 head = &(*head)->next; 2495 head = &(*head)->next;
2213 } 2496 }
2214} 2497}
… …
2242} 2525}
2243 2526
2244inline_size void 2527inline_size void
2245pri_adjust (EV_P_ W w) 2528pri_adjust (EV_P_ W w)
2246{ 2529{
2247 int pri = w->priority; 2530 int pri = ev_priority (w);
2248 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2531 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2249 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2532 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2250 w->priority = pri; 2533 ev_set_priority (w, pri);
2251} 2534}
2252 2535
2253inline_speed void 2536inline_speed void
2254ev_start (EV_P_ W w, int active) 2537ev_start (EV_P_ W w, int active)
2255{ 2538{
… …
2274 2557
2275 if (expect_false (ev_is_active (w))) 2558 if (expect_false (ev_is_active (w)))
2276 return; 2559 return;
2277 2560
2278 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2561 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)))); 2562 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2280 2563
2281 EV_FREQUENT_CHECK; 2564 EV_FREQUENT_CHECK;
2282 2565
2283 ev_start (EV_A_ (W)w, 1); 2566 ev_start (EV_A_ (W)w, 1);
2284 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2567 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2285 wlist_add (&anfds[fd].head, (WL)w); 2568 wlist_add (&anfds[fd].head, (WL)w);
2286 2569
2287 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2570 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2288 w->events &= ~EV__IOFDSET; 2571 w->events &= ~EV__IOFDSET;
2289 2572
2290 EV_FREQUENT_CHECK; 2573 EV_FREQUENT_CHECK;
2291} 2574}
2292 2575
… …
2354 timers [active] = timers [timercnt + HEAP0]; 2637 timers [active] = timers [timercnt + HEAP0];
2355 adjustheap (timers, timercnt, active); 2638 adjustheap (timers, timercnt, active);
2356 } 2639 }
2357 } 2640 }
2358 2641
2359 EV_FREQUENT_CHECK;
2360
2361 ev_at (w) -= mn_now; 2642 ev_at (w) -= mn_now;
2362 2643
2363 ev_stop (EV_A_ (W)w); 2644 ev_stop (EV_A_ (W)w);
2645
2646 EV_FREQUENT_CHECK;
2364} 2647}
2365 2648
2366void noinline 2649void noinline
2367ev_timer_again (EV_P_ ev_timer *w) 2650ev_timer_again (EV_P_ ev_timer *w)
2368{ 2651{
… …
2386 } 2669 }
2387 2670
2388 EV_FREQUENT_CHECK; 2671 EV_FREQUENT_CHECK;
2389} 2672}
2390 2673
2674ev_tstamp
2675ev_timer_remaining (EV_P_ ev_timer *w)
2676{
2677 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2678}
2679
2391#if EV_PERIODIC_ENABLE 2680#if EV_PERIODIC_ENABLE
2392void noinline 2681void noinline
2393ev_periodic_start (EV_P_ ev_periodic *w) 2682ev_periodic_start (EV_P_ ev_periodic *w)
2394{ 2683{
2395 if (expect_false (ev_is_active (w))) 2684 if (expect_false (ev_is_active (w)))
… …
2441 periodics [active] = periodics [periodiccnt + HEAP0]; 2730 periodics [active] = periodics [periodiccnt + HEAP0];
2442 adjustheap (periodics, periodiccnt, active); 2731 adjustheap (periodics, periodiccnt, active);
2443 } 2732 }
2444 } 2733 }
2445 2734
2446 EV_FREQUENT_CHECK;
2447
2448 ev_stop (EV_A_ (W)w); 2735 ev_stop (EV_A_ (W)w);
2736
2737 EV_FREQUENT_CHECK;
2449} 2738}
2450 2739
2451void noinline 2740void noinline
2452ev_periodic_again (EV_P_ ev_periodic *w) 2741ev_periodic_again (EV_P_ ev_periodic *w)
2453{ 2742{
… …
2459 2748
2460#ifndef SA_RESTART 2749#ifndef SA_RESTART
2461# define SA_RESTART 0 2750# define SA_RESTART 0
2462#endif 2751#endif
2463 2752
2753#if EV_SIGNAL_ENABLE
2754
2464void noinline 2755void noinline
2465ev_signal_start (EV_P_ ev_signal *w) 2756ev_signal_start (EV_P_ ev_signal *w)
2466{ 2757{
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))) 2758 if (expect_false (ev_is_active (w)))
2471 return; 2759 return;
2472 2760
2473 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2761 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2474 2762
2475 evpipe_init (EV_A); 2763#if EV_MULTIPLICITY
2764 assert (("libev: a signal must not be attached to two different loops",
2765 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2476 2766
2477 EV_FREQUENT_CHECK; 2767 signals [w->signum - 1].loop = EV_A;
2768#endif
2478 2769
2770 EV_FREQUENT_CHECK;
2771
2772#if EV_USE_SIGNALFD
2773 if (sigfd == -2)
2479 { 2774 {
2480#ifndef _WIN32 2775 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2481 sigset_t full, prev; 2776 if (sigfd < 0 && errno == EINVAL)
2482 sigfillset (&full); 2777 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2483 sigprocmask (SIG_SETMASK, &full, &prev);
2484#endif
2485 2778
2486 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2779 if (sigfd >= 0)
2780 {
2781 fd_intern (sigfd); /* doing it twice will not hurt */
2487 2782
2488#ifndef _WIN32 2783 sigemptyset (&sigfd_set);
2489 sigprocmask (SIG_SETMASK, &prev, 0); 2784
2490#endif 2785 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2786 ev_set_priority (&sigfd_w, EV_MAXPRI);
2787 ev_io_start (EV_A_ &sigfd_w);
2788 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2789 }
2491 } 2790 }
2791
2792 if (sigfd >= 0)
2793 {
2794 /* TODO: check .head */
2795 sigaddset (&sigfd_set, w->signum);
2796 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2797
2798 signalfd (sigfd, &sigfd_set, 0);
2799 }
2800#endif
2492 2801
2493 ev_start (EV_A_ (W)w, 1); 2802 ev_start (EV_A_ (W)w, 1);
2494 wlist_add (&signals [w->signum - 1].head, (WL)w); 2803 wlist_add (&signals [w->signum - 1].head, (WL)w);
2495 2804
2496 if (!((WL)w)->next) 2805 if (!((WL)w)->next)
2806# if EV_USE_SIGNALFD
2807 if (sigfd < 0) /*TODO*/
2808# endif
2497 { 2809 {
2498#if _WIN32 2810# ifdef _WIN32
2811 evpipe_init (EV_A);
2812
2499 signal (w->signum, ev_sighandler); 2813 signal (w->signum, ev_sighandler);
2500#else 2814# else
2501 struct sigaction sa; 2815 struct sigaction sa;
2816
2817 evpipe_init (EV_A);
2818
2502 sa.sa_handler = ev_sighandler; 2819 sa.sa_handler = ev_sighandler;
2503 sigfillset (&sa.sa_mask); 2820 sigfillset (&sa.sa_mask);
2504 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2821 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2505 sigaction (w->signum, &sa, 0); 2822 sigaction (w->signum, &sa, 0);
2823
2824 sigemptyset (&sa.sa_mask);
2825 sigaddset (&sa.sa_mask, w->signum);
2826 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2506#endif 2827#endif
2507 } 2828 }
2508 2829
2509 EV_FREQUENT_CHECK; 2830 EV_FREQUENT_CHECK;
2510} 2831}
2511 2832
2512void noinline 2833void noinline
… …
2520 2841
2521 wlist_del (&signals [w->signum - 1].head, (WL)w); 2842 wlist_del (&signals [w->signum - 1].head, (WL)w);
2522 ev_stop (EV_A_ (W)w); 2843 ev_stop (EV_A_ (W)w);
2523 2844
2524 if (!signals [w->signum - 1].head) 2845 if (!signals [w->signum - 1].head)
2846 {
2847#if EV_MULTIPLICITY
2848 signals [w->signum - 1].loop = 0; /* unattach from signal */
2849#endif
2850#if EV_USE_SIGNALFD
2851 if (sigfd >= 0)
2852 {
2853 sigset_t ss;
2854
2855 sigemptyset (&ss);
2856 sigaddset (&ss, w->signum);
2857 sigdelset (&sigfd_set, w->signum);
2858
2859 signalfd (sigfd, &sigfd_set, 0);
2860 sigprocmask (SIG_UNBLOCK, &ss, 0);
2861 }
2862 else
2863#endif
2525 signal (w->signum, SIG_DFL); 2864 signal (w->signum, SIG_DFL);
2865 }
2526 2866
2527 EV_FREQUENT_CHECK; 2867 EV_FREQUENT_CHECK;
2528} 2868}
2869
2870#endif
2871
2872#if EV_CHILD_ENABLE
2529 2873
2530void 2874void
2531ev_child_start (EV_P_ ev_child *w) 2875ev_child_start (EV_P_ ev_child *w)
2532{ 2876{
2533#if EV_MULTIPLICITY 2877#if EV_MULTIPLICITY
… …
2537 return; 2881 return;
2538 2882
2539 EV_FREQUENT_CHECK; 2883 EV_FREQUENT_CHECK;
2540 2884
2541 ev_start (EV_A_ (W)w, 1); 2885 ev_start (EV_A_ (W)w, 1);
2542 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2886 wlist_add (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2543 2887
2544 EV_FREQUENT_CHECK; 2888 EV_FREQUENT_CHECK;
2545} 2889}
2546 2890
2547void 2891void
… …
2551 if (expect_false (!ev_is_active (w))) 2895 if (expect_false (!ev_is_active (w)))
2552 return; 2896 return;
2553 2897
2554 EV_FREQUENT_CHECK; 2898 EV_FREQUENT_CHECK;
2555 2899
2556 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2900 wlist_del (&childs [w->pid & ((EV_PID_HASHSIZE) - 1)], (WL)w);
2557 ev_stop (EV_A_ (W)w); 2901 ev_stop (EV_A_ (W)w);
2558 2902
2559 EV_FREQUENT_CHECK; 2903 EV_FREQUENT_CHECK;
2560} 2904}
2905
2906#endif
2561 2907
2562#if EV_STAT_ENABLE 2908#if EV_STAT_ENABLE
2563 2909
2564# ifdef _WIN32 2910# ifdef _WIN32
2565# undef lstat 2911# undef lstat
… …
2571#define MIN_STAT_INTERVAL 0.1074891 2917#define MIN_STAT_INTERVAL 0.1074891
2572 2918
2573static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2919static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2574 2920
2575#if EV_USE_INOTIFY 2921#if EV_USE_INOTIFY
2576# define EV_INOTIFY_BUFSIZE 8192 2922
2923/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2924# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2577 2925
2578static void noinline 2926static void noinline
2579infy_add (EV_P_ ev_stat *w) 2927infy_add (EV_P_ ev_stat *w)
2580{ 2928{
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); 2929 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 2930
2583 if (w->wd < 0) 2931 if (w->wd >= 0)
2932 {
2933 struct statfs sfs;
2934
2935 /* now local changes will be tracked by inotify, but remote changes won't */
2936 /* unless the filesystem is known to be local, we therefore still poll */
2937 /* also do poll on <2.6.25, but with normal frequency */
2938
2939 if (!fs_2625)
2940 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2941 else if (!statfs (w->path, &sfs)
2942 && (sfs.f_type == 0x1373 /* devfs */
2943 || sfs.f_type == 0xEF53 /* ext2/3 */
2944 || sfs.f_type == 0x3153464a /* jfs */
2945 || sfs.f_type == 0x52654973 /* reiser3 */
2946 || sfs.f_type == 0x01021994 /* tempfs */
2947 || sfs.f_type == 0x58465342 /* xfs */))
2948 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2949 else
2950 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2584 { 2951 }
2952 else
2953 {
2954 /* can't use inotify, continue to stat */
2585 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2955 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 2956
2588 /* monitor some parent directory for speedup hints */ 2957 /* 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, */ 2958 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2590 /* but an efficiency issue only */ 2959 /* but an efficiency issue only */
2591 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2960 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2592 { 2961 {
2593 char path [4096]; 2962 char path [4096];
… …
2609 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2978 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2610 } 2979 }
2611 } 2980 }
2612 2981
2613 if (w->wd >= 0) 2982 if (w->wd >= 0)
2614 {
2615 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2983 wlist_add (&fs_hash [w->wd & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2616 2984
2617 /* now local changes will be tracked by inotify, but remote changes won't */ 2985 /* now re-arm timer, if required */
2618 /* unless the filesystem it known to be local, we therefore still poll */ 2986 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); 2987 ev_timer_again (EV_A_ &w->timer);
2633 } 2988 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2634} 2989}
2635 2990
2636static void noinline 2991static void noinline
2637infy_del (EV_P_ ev_stat *w) 2992infy_del (EV_P_ ev_stat *w)
2638{ 2993{
… …
2641 2996
2642 if (wd < 0) 2997 if (wd < 0)
2643 return; 2998 return;
2644 2999
2645 w->wd = -2; 3000 w->wd = -2;
2646 slot = wd & (EV_INOTIFY_HASHSIZE - 1); 3001 slot = wd & ((EV_INOTIFY_HASHSIZE) - 1);
2647 wlist_del (&fs_hash [slot].head, (WL)w); 3002 wlist_del (&fs_hash [slot].head, (WL)w);
2648 3003
2649 /* remove this watcher, if others are watching it, they will rearm */ 3004 /* remove this watcher, if others are watching it, they will rearm */
2650 inotify_rm_watch (fs_fd, wd); 3005 inotify_rm_watch (fs_fd, wd);
2651} 3006}
… …
2653static void noinline 3008static void noinline
2654infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 3009infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2655{ 3010{
2656 if (slot < 0) 3011 if (slot < 0)
2657 /* overflow, need to check for all hash slots */ 3012 /* overflow, need to check for all hash slots */
2658 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3013 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2659 infy_wd (EV_A_ slot, wd, ev); 3014 infy_wd (EV_A_ slot, wd, ev);
2660 else 3015 else
2661 { 3016 {
2662 WL w_; 3017 WL w_;
2663 3018
2664 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; ) 3019 for (w_ = fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head; w_; )
2665 { 3020 {
2666 ev_stat *w = (ev_stat *)w_; 3021 ev_stat *w = (ev_stat *)w_;
2667 w_ = w_->next; /* lets us remove this watcher and all before it */ 3022 w_ = w_->next; /* lets us remove this watcher and all before it */
2668 3023
2669 if (w->wd == wd || wd == -1) 3024 if (w->wd == wd || wd == -1)
2670 { 3025 {
2671 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 3026 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2672 { 3027 {
2673 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 3028 wlist_del (&fs_hash [slot & ((EV_INOTIFY_HASHSIZE) - 1)].head, (WL)w);
2674 w->wd = -1; 3029 w->wd = -1;
2675 infy_add (EV_A_ w); /* re-add, no matter what */ 3030 infy_add (EV_A_ w); /* re-add, no matter what */
2676 } 3031 }
2677 3032
2678 stat_timer_cb (EV_A_ &w->timer, 0); 3033 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2683 3038
2684static void 3039static void
2685infy_cb (EV_P_ ev_io *w, int revents) 3040infy_cb (EV_P_ ev_io *w, int revents)
2686{ 3041{
2687 char buf [EV_INOTIFY_BUFSIZE]; 3042 char buf [EV_INOTIFY_BUFSIZE];
2688 struct inotify_event *ev = (struct inotify_event *)buf;
2689 int ofs; 3043 int ofs;
2690 int len = read (fs_fd, buf, sizeof (buf)); 3044 int len = read (fs_fd, buf, sizeof (buf));
2691 3045
2692 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3046 for (ofs = 0; ofs < len; )
3047 {
3048 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2693 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3049 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3050 ofs += sizeof (struct inotify_event) + ev->len;
3051 }
3052}
3053
3054inline_size unsigned int
3055ev_linux_version (void)
3056{
3057 struct utsname buf;
3058 unsigned int v;
3059 int i;
3060 char *p = buf.release;
3061
3062 if (uname (&buf))
3063 return 0;
3064
3065 for (i = 3+1; --i; )
3066 {
3067 unsigned int c = 0;
3068
3069 for (;;)
3070 {
3071 if (*p >= '0' && *p <= '9')
3072 c = c * 10 + *p++ - '0';
3073 else
3074 {
3075 p += *p == '.';
3076 break;
3077 }
3078 }
3079
3080 v = (v << 8) | c;
3081 }
3082
3083 return v;
2694} 3084}
2695 3085
2696inline_size void 3086inline_size void
2697check_2625 (EV_P) 3087ev_check_2625 (EV_P)
2698{ 3088{
2699 /* kernels < 2.6.25 are borked 3089 /* kernels < 2.6.25 are borked
2700 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3090 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2701 */ 3091 */
2702 struct utsname buf; 3092 if (ev_linux_version () < 0x020619)
2703 int major, minor, micro;
2704
2705 if (uname (&buf))
2706 return; 3093 return;
2707 3094
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; 3095 fs_2625 = 1;
3096}
3097
3098inline_size int
3099infy_newfd (void)
3100{
3101#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3102 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3103 if (fd >= 0)
3104 return fd;
3105#endif
3106 return inotify_init ();
2717} 3107}
2718 3108
2719inline_size void 3109inline_size void
2720infy_init (EV_P) 3110infy_init (EV_P)
2721{ 3111{
2722 if (fs_fd != -2) 3112 if (fs_fd != -2)
2723 return; 3113 return;
2724 3114
2725 fs_fd = -1; 3115 fs_fd = -1;
2726 3116
2727 check_2625 (EV_A); 3117 ev_check_2625 (EV_A);
2728 3118
2729 fs_fd = inotify_init (); 3119 fs_fd = infy_newfd ();
2730 3120
2731 if (fs_fd >= 0) 3121 if (fs_fd >= 0)
2732 { 3122 {
3123 fd_intern (fs_fd);
2733 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3124 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2734 ev_set_priority (&fs_w, EV_MAXPRI); 3125 ev_set_priority (&fs_w, EV_MAXPRI);
2735 ev_io_start (EV_A_ &fs_w); 3126 ev_io_start (EV_A_ &fs_w);
3127 ev_unref (EV_A);
2736 } 3128 }
2737} 3129}
2738 3130
2739inline_size void 3131inline_size void
2740infy_fork (EV_P) 3132infy_fork (EV_P)
… …
2742 int slot; 3134 int slot;
2743 3135
2744 if (fs_fd < 0) 3136 if (fs_fd < 0)
2745 return; 3137 return;
2746 3138
3139 ev_ref (EV_A);
3140 ev_io_stop (EV_A_ &fs_w);
2747 close (fs_fd); 3141 close (fs_fd);
2748 fs_fd = inotify_init (); 3142 fs_fd = infy_newfd ();
2749 3143
3144 if (fs_fd >= 0)
3145 {
3146 fd_intern (fs_fd);
3147 ev_io_set (&fs_w, fs_fd, EV_READ);
3148 ev_io_start (EV_A_ &fs_w);
3149 ev_unref (EV_A);
3150 }
3151
2750 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3152 for (slot = 0; slot < (EV_INOTIFY_HASHSIZE); ++slot)
2751 { 3153 {
2752 WL w_ = fs_hash [slot].head; 3154 WL w_ = fs_hash [slot].head;
2753 fs_hash [slot].head = 0; 3155 fs_hash [slot].head = 0;
2754 3156
2755 while (w_) 3157 while (w_)
… …
2760 w->wd = -1; 3162 w->wd = -1;
2761 3163
2762 if (fs_fd >= 0) 3164 if (fs_fd >= 0)
2763 infy_add (EV_A_ w); /* re-add, no matter what */ 3165 infy_add (EV_A_ w); /* re-add, no matter what */
2764 else 3166 else
3167 {
3168 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3169 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2765 ev_timer_again (EV_A_ &w->timer); 3170 ev_timer_again (EV_A_ &w->timer);
3171 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3172 }
2766 } 3173 }
2767 } 3174 }
2768} 3175}
2769 3176
2770#endif 3177#endif
… …
2787static void noinline 3194static void noinline
2788stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3195stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2789{ 3196{
2790 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3197 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2791 3198
2792 /* we copy this here each the time so that */ 3199 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); 3200 ev_stat_stat (EV_A_ w);
2796 3201
2797 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3202 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2798 if ( 3203 if (
2799 w->prev.st_dev != w->attr.st_dev 3204 prev.st_dev != w->attr.st_dev
2800 || w->prev.st_ino != w->attr.st_ino 3205 || prev.st_ino != w->attr.st_ino
2801 || w->prev.st_mode != w->attr.st_mode 3206 || prev.st_mode != w->attr.st_mode
2802 || w->prev.st_nlink != w->attr.st_nlink 3207 || prev.st_nlink != w->attr.st_nlink
2803 || w->prev.st_uid != w->attr.st_uid 3208 || prev.st_uid != w->attr.st_uid
2804 || w->prev.st_gid != w->attr.st_gid 3209 || prev.st_gid != w->attr.st_gid
2805 || w->prev.st_rdev != w->attr.st_rdev 3210 || prev.st_rdev != w->attr.st_rdev
2806 || w->prev.st_size != w->attr.st_size 3211 || prev.st_size != w->attr.st_size
2807 || w->prev.st_atime != w->attr.st_atime 3212 || prev.st_atime != w->attr.st_atime
2808 || w->prev.st_mtime != w->attr.st_mtime 3213 || prev.st_mtime != w->attr.st_mtime
2809 || w->prev.st_ctime != w->attr.st_ctime 3214 || prev.st_ctime != w->attr.st_ctime
2810 ) { 3215 ) {
3216 /* we only update w->prev on actual differences */
3217 /* in case we test more often than invoke the callback, */
3218 /* to ensure that prev is always different to attr */
3219 w->prev = prev;
3220
2811 #if EV_USE_INOTIFY 3221 #if EV_USE_INOTIFY
2812 if (fs_fd >= 0) 3222 if (fs_fd >= 0)
2813 { 3223 {
2814 infy_del (EV_A_ w); 3224 infy_del (EV_A_ w);
2815 infy_add (EV_A_ w); 3225 infy_add (EV_A_ w);
… …
2840 3250
2841 if (fs_fd >= 0) 3251 if (fs_fd >= 0)
2842 infy_add (EV_A_ w); 3252 infy_add (EV_A_ w);
2843 else 3253 else
2844#endif 3254#endif
3255 {
2845 ev_timer_again (EV_A_ &w->timer); 3256 ev_timer_again (EV_A_ &w->timer);
3257 ev_unref (EV_A);
3258 }
2846 3259
2847 ev_start (EV_A_ (W)w, 1); 3260 ev_start (EV_A_ (W)w, 1);
2848 3261
2849 EV_FREQUENT_CHECK; 3262 EV_FREQUENT_CHECK;
2850} 3263}
… …
2859 EV_FREQUENT_CHECK; 3272 EV_FREQUENT_CHECK;
2860 3273
2861#if EV_USE_INOTIFY 3274#if EV_USE_INOTIFY
2862 infy_del (EV_A_ w); 3275 infy_del (EV_A_ w);
2863#endif 3276#endif
3277
3278 if (ev_is_active (&w->timer))
3279 {
3280 ev_ref (EV_A);
2864 ev_timer_stop (EV_A_ &w->timer); 3281 ev_timer_stop (EV_A_ &w->timer);
3282 }
2865 3283
2866 ev_stop (EV_A_ (W)w); 3284 ev_stop (EV_A_ (W)w);
2867 3285
2868 EV_FREQUENT_CHECK; 3286 EV_FREQUENT_CHECK;
2869} 3287}
… …
2914 3332
2915 EV_FREQUENT_CHECK; 3333 EV_FREQUENT_CHECK;
2916} 3334}
2917#endif 3335#endif
2918 3336
3337#if EV_PREPARE_ENABLE
2919void 3338void
2920ev_prepare_start (EV_P_ ev_prepare *w) 3339ev_prepare_start (EV_P_ ev_prepare *w)
2921{ 3340{
2922 if (expect_false (ev_is_active (w))) 3341 if (expect_false (ev_is_active (w)))
2923 return; 3342 return;
… …
2949 3368
2950 ev_stop (EV_A_ (W)w); 3369 ev_stop (EV_A_ (W)w);
2951 3370
2952 EV_FREQUENT_CHECK; 3371 EV_FREQUENT_CHECK;
2953} 3372}
3373#endif
2954 3374
3375#if EV_CHECK_ENABLE
2955void 3376void
2956ev_check_start (EV_P_ ev_check *w) 3377ev_check_start (EV_P_ ev_check *w)
2957{ 3378{
2958 if (expect_false (ev_is_active (w))) 3379 if (expect_false (ev_is_active (w)))
2959 return; 3380 return;
… …
2985 3406
2986 ev_stop (EV_A_ (W)w); 3407 ev_stop (EV_A_ (W)w);
2987 3408
2988 EV_FREQUENT_CHECK; 3409 EV_FREQUENT_CHECK;
2989} 3410}
3411#endif
2990 3412
2991#if EV_EMBED_ENABLE 3413#if EV_EMBED_ENABLE
2992void noinline 3414void noinline
2993ev_embed_sweep (EV_P_ ev_embed *w) 3415ev_embed_sweep (EV_P_ ev_embed *w)
2994{ 3416{
… …
3010embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3432embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3011{ 3433{
3012 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3434 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3013 3435
3014 { 3436 {
3015 struct ev_loop *loop = w->other; 3437 EV_P = w->other;
3016 3438
3017 while (fdchangecnt) 3439 while (fdchangecnt)
3018 { 3440 {
3019 fd_reify (EV_A); 3441 fd_reify (EV_A);
3020 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3442 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3028 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3450 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3029 3451
3030 ev_embed_stop (EV_A_ w); 3452 ev_embed_stop (EV_A_ w);
3031 3453
3032 { 3454 {
3033 struct ev_loop *loop = w->other; 3455 EV_P = w->other;
3034 3456
3035 ev_loop_fork (EV_A); 3457 ev_loop_fork (EV_A);
3036 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3458 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3037 } 3459 }
3038 3460
… …
3052{ 3474{
3053 if (expect_false (ev_is_active (w))) 3475 if (expect_false (ev_is_active (w)))
3054 return; 3476 return;
3055 3477
3056 { 3478 {
3057 struct ev_loop *loop = w->other; 3479 EV_P = w->other;
3058 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3480 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); 3481 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3060 } 3482 }
3061 3483
3062 EV_FREQUENT_CHECK; 3484 EV_FREQUENT_CHECK;
… …
3089 3511
3090 ev_io_stop (EV_A_ &w->io); 3512 ev_io_stop (EV_A_ &w->io);
3091 ev_prepare_stop (EV_A_ &w->prepare); 3513 ev_prepare_stop (EV_A_ &w->prepare);
3092 ev_fork_stop (EV_A_ &w->fork); 3514 ev_fork_stop (EV_A_ &w->fork);
3093 3515
3516 ev_stop (EV_A_ (W)w);
3517
3094 EV_FREQUENT_CHECK; 3518 EV_FREQUENT_CHECK;
3095} 3519}
3096#endif 3520#endif
3097 3521
3098#if EV_FORK_ENABLE 3522#if EV_FORK_ENABLE
… …
3174 3598
3175void 3599void
3176ev_async_send (EV_P_ ev_async *w) 3600ev_async_send (EV_P_ ev_async *w)
3177{ 3601{
3178 w->sent = 1; 3602 w->sent = 1;
3179 evpipe_write (EV_A_ &gotasync); 3603 evpipe_write (EV_A_ &async_pending);
3180} 3604}
3181#endif 3605#endif
3182 3606
3183/*****************************************************************************/ 3607/*****************************************************************************/
3184 3608
… …
3224{ 3648{
3225 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3649 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3226 3650
3227 if (expect_false (!once)) 3651 if (expect_false (!once))
3228 { 3652 {
3229 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3653 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3230 return; 3654 return;
3231 } 3655 }
3232 3656
3233 once->cb = cb; 3657 once->cb = cb;
3234 once->arg = arg; 3658 once->arg = arg;
… …
3321 if (types & EV_ASYNC) 3745 if (types & EV_ASYNC)
3322 for (i = asynccnt; i--; ) 3746 for (i = asynccnt; i--; )
3323 cb (EV_A_ EV_ASYNC, asyncs [i]); 3747 cb (EV_A_ EV_ASYNC, asyncs [i]);
3324#endif 3748#endif
3325 3749
3750#if EV_PREPARE_ENABLE
3326 if (types & EV_PREPARE) 3751 if (types & EV_PREPARE)
3327 for (i = preparecnt; i--; ) 3752 for (i = preparecnt; i--; )
3328#if EV_EMBED_ENABLE 3753# if EV_EMBED_ENABLE
3329 if (ev_cb (prepares [i]) != embed_prepare_cb) 3754 if (ev_cb (prepares [i]) != embed_prepare_cb)
3330#endif 3755# endif
3331 cb (EV_A_ EV_PREPARE, prepares [i]); 3756 cb (EV_A_ EV_PREPARE, prepares [i]);
3757#endif
3332 3758
3759#if EV_CHECK_ENABLE
3333 if (types & EV_CHECK) 3760 if (types & EV_CHECK)
3334 for (i = checkcnt; i--; ) 3761 for (i = checkcnt; i--; )
3335 cb (EV_A_ EV_CHECK, checks [i]); 3762 cb (EV_A_ EV_CHECK, checks [i]);
3763#endif
3336 3764
3765#if EV_SIGNAL_ENABLE
3337 if (types & EV_SIGNAL) 3766 if (types & EV_SIGNAL)
3338 for (i = 0; i < signalmax; ++i) 3767 for (i = 0; i < EV_NSIG - 1; ++i)
3339 for (wl = signals [i].head; wl; ) 3768 for (wl = signals [i].head; wl; )
3340 { 3769 {
3341 wn = wl->next; 3770 wn = wl->next;
3342 cb (EV_A_ EV_SIGNAL, wl); 3771 cb (EV_A_ EV_SIGNAL, wl);
3343 wl = wn; 3772 wl = wn;
3344 } 3773 }
3774#endif
3345 3775
3776#if EV_CHILD_ENABLE
3346 if (types & EV_CHILD) 3777 if (types & EV_CHILD)
3347 for (i = EV_PID_HASHSIZE; i--; ) 3778 for (i = (EV_PID_HASHSIZE); i--; )
3348 for (wl = childs [i]; wl; ) 3779 for (wl = childs [i]; wl; )
3349 { 3780 {
3350 wn = wl->next; 3781 wn = wl->next;
3351 cb (EV_A_ EV_CHILD, wl); 3782 cb (EV_A_ EV_CHILD, wl);
3352 wl = wn; 3783 wl = wn;
3353 } 3784 }
3785#endif
3354/* EV_STAT 0x00001000 /* stat data changed */ 3786/* EV_STAT 0x00001000 /* stat data changed */
3355/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */ 3787/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3356} 3788}
3357#endif 3789#endif
3358 3790

Diff Legend

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