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

Comparing libev/ev.c (file contents):
Revision 1.248 by root, Wed May 21 23:25:21 2008 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 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 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 *
… …
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
… …
96# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
97# endif 111# endif
98# endif 112# endif
99 113
100# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
101# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
102# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
103# else 117# else
104# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
105# endif 119# endif
106# endif 120# endif
… …
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
129# endif 151# endif
130# endif 152# endif
131 153
132#endif 154#endif
133 155
134#include <math.h> 156#include <math.h>
135#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
136#include <fcntl.h> 159#include <fcntl.h>
137#include <stddef.h> 160#include <stddef.h>
138 161
139#include <stdio.h> 162#include <stdio.h>
140 163
141#include <assert.h> 164#include <assert.h>
142#include <errno.h> 165#include <errno.h>
143#include <sys/types.h> 166#include <sys/types.h>
144#include <time.h> 167#include <time.h>
168#include <limits.h>
145 169
146#include <signal.h> 170#include <signal.h>
147 171
148#ifdef EV_H 172#ifdef EV_H
149# include EV_H 173# include EV_H
… …
154#ifndef _WIN32 178#ifndef _WIN32
155# include <sys/time.h> 179# include <sys/time.h>
156# include <sys/wait.h> 180# include <sys/wait.h>
157# include <unistd.h> 181# include <unistd.h>
158#else 182#else
183# include <io.h>
159# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 185# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
163# endif 188# endif
164#endif 189#endif
165 190
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 191/* this block tries to deduce configuration from header-defined symbols and defaults */
167 192
193/* try to deduce the maximum number of signals on this platform */
194#if defined (EV_NSIG)
195/* use what's provided */
196#elif defined (NSIG)
197# define EV_NSIG (NSIG)
198#elif defined(_NSIG)
199# define EV_NSIG (_NSIG)
200#elif defined (SIGMAX)
201# define EV_NSIG (SIGMAX+1)
202#elif defined (SIG_MAX)
203# define EV_NSIG (SIG_MAX+1)
204#elif defined (_SIG_MAX)
205# define EV_NSIG (_SIG_MAX+1)
206#elif defined (MAXSIG)
207# define EV_NSIG (MAXSIG+1)
208#elif defined (MAX_SIG)
209# define EV_NSIG (MAX_SIG+1)
210#elif defined (SIGARRAYSIZE)
211# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
212#elif defined (_sys_nsig)
213# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
214#else
215# error "unable to find value for NSIG, please report"
216/* to make it compile regardless, just remove the above line */
217# define EV_NSIG 65
218#endif
219
220#ifndef EV_USE_CLOCK_SYSCALL
221# if __linux && __GLIBC__ >= 2
222# define EV_USE_CLOCK_SYSCALL 1
223# else
224# define EV_USE_CLOCK_SYSCALL 0
225# endif
226#endif
227
168#ifndef EV_USE_MONOTONIC 228#ifndef EV_USE_MONOTONIC
229# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
230# define EV_USE_MONOTONIC 1
231# else
169# define EV_USE_MONOTONIC 0 232# define EV_USE_MONOTONIC 0
233# endif
170#endif 234#endif
171 235
172#ifndef EV_USE_REALTIME 236#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 237# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
174#endif 238#endif
175 239
176#ifndef EV_USE_NANOSLEEP 240#ifndef EV_USE_NANOSLEEP
241# if _POSIX_C_SOURCE >= 199309L
242# define EV_USE_NANOSLEEP 1
243# else
177# define EV_USE_NANOSLEEP 0 244# define EV_USE_NANOSLEEP 0
245# endif
178#endif 246#endif
179 247
180#ifndef EV_USE_SELECT 248#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 249# define EV_USE_SELECT 1
182#endif 250#endif
… …
235# else 303# else
236# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
237# endif 305# endif
238#endif 306#endif
239 307
308#ifndef EV_USE_SIGNALFD
309# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
310# define EV_USE_SIGNALFD 1
311# else
312# define EV_USE_SIGNALFD 0
313# endif
314#endif
315
316#if 0 /* debugging */
317# define EV_VERIFY 3
318# define EV_USE_4HEAP 1
319# define EV_HEAP_CACHE_AT 1
320#endif
321
322#ifndef EV_VERIFY
323# define EV_VERIFY !EV_MINIMAL
324#endif
325
240#ifndef EV_USE_4HEAP 326#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL 327# define EV_USE_4HEAP !EV_MINIMAL
242#endif 328#endif
243 329
244#ifndef EV_HEAP_CACHE_AT 330#ifndef EV_HEAP_CACHE_AT
245# define EV_HEAP_CACHE_AT !EV_MINIMAL 331# define EV_HEAP_CACHE_AT !EV_MINIMAL
246#endif 332#endif
247 333
334/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
335/* which makes programs even slower. might work on other unices, too. */
336#if EV_USE_CLOCK_SYSCALL
337# include <syscall.h>
338# ifdef SYS_clock_gettime
339# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
340# undef EV_USE_MONOTONIC
341# define EV_USE_MONOTONIC 1
342# else
343# undef EV_USE_CLOCK_SYSCALL
344# define EV_USE_CLOCK_SYSCALL 0
345# endif
346#endif
347
248/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 348/* this block fixes any misconfiguration where we know we run into trouble otherwise */
349
350#ifdef _AIX
351/* AIX has a completely broken poll.h header */
352# undef EV_USE_POLL
353# define EV_USE_POLL 0
354#endif
249 355
250#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
251# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
252# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
253#endif 359#endif
… …
267# include <sys/select.h> 373# include <sys/select.h>
268# endif 374# endif
269#endif 375#endif
270 376
271#if EV_USE_INOTIFY 377#if EV_USE_INOTIFY
378# include <sys/utsname.h>
379# include <sys/statfs.h>
272# include <sys/inotify.h> 380# include <sys/inotify.h>
381/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
382# ifndef IN_DONT_FOLLOW
383# undef EV_USE_INOTIFY
384# define EV_USE_INOTIFY 0
385# endif
273#endif 386#endif
274 387
275#if EV_SELECT_IS_WINSOCKET 388#if EV_SELECT_IS_WINSOCKET
276# include <winsock.h> 389# include <winsock.h>
277#endif 390#endif
278 391
279#if EV_USE_EVENTFD 392#if EV_USE_EVENTFD
280/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 393/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
281# include <stdint.h> 394# include <stdint.h>
395# ifndef EFD_NONBLOCK
396# define EFD_NONBLOCK O_NONBLOCK
397# endif
398# ifndef EFD_CLOEXEC
399# ifdef O_CLOEXEC
400# define EFD_CLOEXEC O_CLOEXEC
401# else
402# define EFD_CLOEXEC 02000000
403# endif
404# endif
282# ifdef __cplusplus 405# ifdef __cplusplus
283extern "C" { 406extern "C" {
284# endif 407# endif
285int eventfd (unsigned int initval, int flags); 408int (eventfd) (unsigned int initval, int flags);
286# ifdef __cplusplus 409# ifdef __cplusplus
287} 410}
288# endif 411# endif
289#endif 412#endif
290 413
414#if EV_USE_SIGNALFD
415/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
416# include <stdint.h>
417# ifndef SFD_NONBLOCK
418# define SFD_NONBLOCK O_NONBLOCK
419# endif
420# ifndef SFD_CLOEXEC
421# ifdef O_CLOEXEC
422# define SFD_CLOEXEC O_CLOEXEC
423# else
424# define SFD_CLOEXEC 02000000
425# endif
426# endif
427# ifdef __cplusplus
428extern "C" {
429# endif
430int signalfd (int fd, const sigset_t *mask, int flags);
431
432struct signalfd_siginfo
433{
434 uint32_t ssi_signo;
435 char pad[128 - sizeof (uint32_t)];
436};
437# ifdef __cplusplus
438}
439# endif
440#endif
441
442
291/**/ 443/**/
292 444
293/* undefined or zero: no verification done or available */
294/* 1 or higher: ev_loop_verify function available */
295/* 2 or higher: ev_loop_verify is called frequently */
296#define EV_VERIFY 1
297
298#if EV_VERIFY > 1 445#if EV_VERIFY >= 3
299# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
300#else 447#else
301# define EV_FREQUENT_CHECK do { } while (0) 448# define EV_FREQUENT_CHECK do { } while (0)
302#endif 449#endif
303 450
… …
311 */ 458 */
312#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
313 460
314#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 461#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
315#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 462#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
316/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
317 463
318#if __GNUC__ >= 4 464#if __GNUC__ >= 4
319# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
320# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
321#else 467#else
… …
334# define inline_speed static noinline 480# define inline_speed static noinline
335#else 481#else
336# define inline_speed static inline 482# define inline_speed static inline
337#endif 483#endif
338 484
339#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 485#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
486
487#if EV_MINPRI == EV_MAXPRI
488# define ABSPRI(w) (((W)w), 0)
489#else
340#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 490# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
491#endif
341 492
342#define EMPTY /* required for microsofts broken pseudo-c compiler */ 493#define EMPTY /* required for microsofts broken pseudo-c compiler */
343#define EMPTY2(a,b) /* used to suppress some warnings */ 494#define EMPTY2(a,b) /* used to suppress some warnings */
344 495
345typedef ev_watcher *W; 496typedef ev_watcher *W;
… …
347typedef ev_watcher_time *WT; 498typedef ev_watcher_time *WT;
348 499
349#define ev_active(w) ((W)(w))->active 500#define ev_active(w) ((W)(w))->active
350#define ev_at(w) ((WT)(w))->at 501#define ev_at(w) ((WT)(w))->at
351 502
352#if EV_USE_MONOTONIC 503#if EV_USE_REALTIME
353/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 504/* sig_atomic_t is used to avoid per-thread variables or locking but still */
354/* giving it a reasonably high chance of working on typical architetcures */ 505/* giving it a reasonably high chance of working on typical architetcures */
506static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
507#endif
508
509#if EV_USE_MONOTONIC
355static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 510static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
511#endif
512
513#ifndef EV_FD_TO_WIN32_HANDLE
514# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
515#endif
516#ifndef EV_WIN32_HANDLE_TO_FD
517# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
518#endif
519#ifndef EV_WIN32_CLOSE_FD
520# define EV_WIN32_CLOSE_FD(fd) close (fd)
356#endif 521#endif
357 522
358#ifdef _WIN32 523#ifdef _WIN32
359# include "ev_win32.c" 524# include "ev_win32.c"
360#endif 525#endif
… …
368{ 533{
369 syserr_cb = cb; 534 syserr_cb = cb;
370} 535}
371 536
372static void noinline 537static void noinline
373syserr (const char *msg) 538ev_syserr (const char *msg)
374{ 539{
375 if (!msg) 540 if (!msg)
376 msg = "(libev) system error"; 541 msg = "(libev) system error";
377 542
378 if (syserr_cb) 543 if (syserr_cb)
379 syserr_cb (msg); 544 syserr_cb (msg);
380 else 545 else
381 { 546 {
547#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg));
552 write (STDERR_FILENO, "\n", 1);
553#else
382 perror (msg); 554 perror (msg);
555#endif
383 abort (); 556 abort ();
384 } 557 }
385} 558}
386 559
387static void * 560static void *
… …
412{ 585{
413 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
414 587
415 if (!ptr && size) 588 if (!ptr && size)
416 { 589 {
590#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else
417 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
418 abort (); 596 abort ();
419 } 597 }
420 598
421 return ptr; 599 return ptr;
422} 600}
… …
424#define ev_malloc(size) ev_realloc (0, (size)) 602#define ev_malloc(size) ev_realloc (0, (size))
425#define ev_free(ptr) ev_realloc ((ptr), 0) 603#define ev_free(ptr) ev_realloc ((ptr), 0)
426 604
427/*****************************************************************************/ 605/*****************************************************************************/
428 606
607/* set in reify when reification needed */
608#define EV_ANFD_REIFY 1
609
610/* file descriptor info structure */
429typedef struct 611typedef struct
430{ 612{
431 WL head; 613 WL head;
432 unsigned char events; 614 unsigned char events; /* the events watched for */
615 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
616 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
433 unsigned char reify; 617 unsigned char unused;
618#if EV_USE_EPOLL
619 unsigned int egen; /* generation counter to counter epoll bugs */
620#endif
434#if EV_SELECT_IS_WINSOCKET 621#if EV_SELECT_IS_WINSOCKET
435 SOCKET handle; 622 SOCKET handle;
436#endif 623#endif
437} ANFD; 624} ANFD;
438 625
626/* stores the pending event set for a given watcher */
439typedef struct 627typedef struct
440{ 628{
441 W w; 629 W w;
442 int events; 630 int events; /* the pending event set for the given watcher */
443} ANPENDING; 631} ANPENDING;
444 632
445#if EV_USE_INOTIFY 633#if EV_USE_INOTIFY
446/* hash table entry per inotify-id */ 634/* hash table entry per inotify-id */
447typedef struct 635typedef struct
… …
450} ANFS; 638} ANFS;
451#endif 639#endif
452 640
453/* Heap Entry */ 641/* Heap Entry */
454#if EV_HEAP_CACHE_AT 642#if EV_HEAP_CACHE_AT
643 /* a heap element */
455 typedef struct { 644 typedef struct {
456 ev_tstamp at; 645 ev_tstamp at;
457 WT w; 646 WT w;
458 } ANHE; 647 } ANHE;
459 648
460 #define ANHE_w(he) (he).w /* access watcher, read-write */ 649 #define ANHE_w(he) (he).w /* access watcher, read-write */
461 #define ANHE_at(he) (he).at /* access cached at, read-only */ 650 #define ANHE_at(he) (he).at /* access cached at, read-only */
462 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 651 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
463#else 652#else
653 /* a heap element */
464 typedef WT ANHE; 654 typedef WT ANHE;
465 655
466 #define ANHE_w(he) (he) 656 #define ANHE_w(he) (he)
467 #define ANHE_at(he) (he)->at 657 #define ANHE_at(he) (he)->at
468 #define ANHE_at_cache(he) 658 #define ANHE_at_cache(he)
… …
492 682
493 static int ev_default_loop_ptr; 683 static int ev_default_loop_ptr;
494 684
495#endif 685#endif
496 686
687#if EV_MINIMAL < 2
688# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
689# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
690# define EV_INVOKE_PENDING invoke_cb (EV_A)
691#else
692# define EV_RELEASE_CB (void)0
693# define EV_ACQUIRE_CB (void)0
694# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
695#endif
696
697#define EVUNLOOP_RECURSE 0x80
698
497/*****************************************************************************/ 699/*****************************************************************************/
498 700
701#ifndef EV_HAVE_EV_TIME
499ev_tstamp 702ev_tstamp
500ev_time (void) 703ev_time (void)
501{ 704{
502#if EV_USE_REALTIME 705#if EV_USE_REALTIME
706 if (expect_true (have_realtime))
707 {
503 struct timespec ts; 708 struct timespec ts;
504 clock_gettime (CLOCK_REALTIME, &ts); 709 clock_gettime (CLOCK_REALTIME, &ts);
505 return ts.tv_sec + ts.tv_nsec * 1e-9; 710 return ts.tv_sec + ts.tv_nsec * 1e-9;
506#else 711 }
712#endif
713
507 struct timeval tv; 714 struct timeval tv;
508 gettimeofday (&tv, 0); 715 gettimeofday (&tv, 0);
509 return tv.tv_sec + tv.tv_usec * 1e-6; 716 return tv.tv_sec + tv.tv_usec * 1e-6;
510#endif
511} 717}
718#endif
512 719
513ev_tstamp inline_size 720inline_size ev_tstamp
514get_clock (void) 721get_clock (void)
515{ 722{
516#if EV_USE_MONOTONIC 723#if EV_USE_MONOTONIC
517 if (expect_true (have_monotonic)) 724 if (expect_true (have_monotonic))
518 { 725 {
… …
551 struct timeval tv; 758 struct timeval tv;
552 759
553 tv.tv_sec = (time_t)delay; 760 tv.tv_sec = (time_t)delay;
554 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
555 762
763 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
764 /* something not guaranteed by newer posix versions, but guaranteed */
765 /* by older ones */
556 select (0, 0, 0, 0, &tv); 766 select (0, 0, 0, 0, &tv);
557#endif 767#endif
558 } 768 }
559} 769}
560 770
561/*****************************************************************************/ 771/*****************************************************************************/
562 772
563#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 773#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
564 774
565int inline_size 775/* find a suitable new size for the given array, */
776/* hopefully by rounding to a ncie-to-malloc size */
777inline_size int
566array_nextsize (int elem, int cur, int cnt) 778array_nextsize (int elem, int cur, int cnt)
567{ 779{
568 int ncur = cur + 1; 780 int ncur = cur + 1;
569 781
570 do 782 do
… …
587array_realloc (int elem, void *base, int *cur, int cnt) 799array_realloc (int elem, void *base, int *cur, int cnt)
588{ 800{
589 *cur = array_nextsize (elem, *cur, cnt); 801 *cur = array_nextsize (elem, *cur, cnt);
590 return ev_realloc (base, elem * *cur); 802 return ev_realloc (base, elem * *cur);
591} 803}
804
805#define array_init_zero(base,count) \
806 memset ((void *)(base), 0, sizeof (*(base)) * (count))
592 807
593#define array_needsize(type,base,cur,cnt,init) \ 808#define array_needsize(type,base,cur,cnt,init) \
594 if (expect_false ((cnt) > (cur))) \ 809 if (expect_false ((cnt) > (cur))) \
595 { \ 810 { \
596 int ocur_ = (cur); \ 811 int ocur_ = (cur); \
… …
608 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 823 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
609 } 824 }
610#endif 825#endif
611 826
612#define array_free(stem, idx) \ 827#define array_free(stem, idx) \
613 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 828 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
614 829
615/*****************************************************************************/ 830/*****************************************************************************/
831
832/* dummy callback for pending events */
833static void noinline
834pendingcb (EV_P_ ev_prepare *w, int revents)
835{
836}
616 837
617void noinline 838void noinline
618ev_feed_event (EV_P_ void *w, int revents) 839ev_feed_event (EV_P_ void *w, int revents)
619{ 840{
620 W w_ = (W)w; 841 W w_ = (W)w;
… …
629 pendings [pri][w_->pending - 1].w = w_; 850 pendings [pri][w_->pending - 1].w = w_;
630 pendings [pri][w_->pending - 1].events = revents; 851 pendings [pri][w_->pending - 1].events = revents;
631 } 852 }
632} 853}
633 854
634void inline_speed 855inline_speed void
856feed_reverse (EV_P_ W w)
857{
858 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
859 rfeeds [rfeedcnt++] = w;
860}
861
862inline_size void
863feed_reverse_done (EV_P_ int revents)
864{
865 do
866 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
867 while (rfeedcnt);
868}
869
870inline_speed void
635queue_events (EV_P_ W *events, int eventcnt, int type) 871queue_events (EV_P_ W *events, int eventcnt, int type)
636{ 872{
637 int i; 873 int i;
638 874
639 for (i = 0; i < eventcnt; ++i) 875 for (i = 0; i < eventcnt; ++i)
640 ev_feed_event (EV_A_ events [i], type); 876 ev_feed_event (EV_A_ events [i], type);
641} 877}
642 878
643/*****************************************************************************/ 879/*****************************************************************************/
644 880
645void inline_size 881inline_speed void
646anfds_init (ANFD *base, int count)
647{
648 while (count--)
649 {
650 base->head = 0;
651 base->events = EV_NONE;
652 base->reify = 0;
653
654 ++base;
655 }
656}
657
658void inline_speed
659fd_event (EV_P_ int fd, int revents) 882fd_event_nc (EV_P_ int fd, int revents)
660{ 883{
661 ANFD *anfd = anfds + fd; 884 ANFD *anfd = anfds + fd;
662 ev_io *w; 885 ev_io *w;
663 886
664 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 887 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
668 if (ev) 891 if (ev)
669 ev_feed_event (EV_A_ (W)w, ev); 892 ev_feed_event (EV_A_ (W)w, ev);
670 } 893 }
671} 894}
672 895
896/* do not submit kernel events for fds that have reify set */
897/* because that means they changed while we were polling for new events */
898inline_speed void
899fd_event (EV_P_ int fd, int revents)
900{
901 ANFD *anfd = anfds + fd;
902
903 if (expect_true (!anfd->reify))
904 fd_event_nc (EV_A_ fd, revents);
905}
906
673void 907void
674ev_feed_fd_event (EV_P_ int fd, int revents) 908ev_feed_fd_event (EV_P_ int fd, int revents)
675{ 909{
676 if (fd >= 0 && fd < anfdmax) 910 if (fd >= 0 && fd < anfdmax)
677 fd_event (EV_A_ fd, revents); 911 fd_event_nc (EV_A_ fd, revents);
678} 912}
679 913
680void inline_size 914/* make sure the external fd watch events are in-sync */
915/* with the kernel/libev internal state */
916inline_size void
681fd_reify (EV_P) 917fd_reify (EV_P)
682{ 918{
683 int i; 919 int i;
684 920
685 for (i = 0; i < fdchangecnt; ++i) 921 for (i = 0; i < fdchangecnt; ++i)
… …
694 events |= (unsigned char)w->events; 930 events |= (unsigned char)w->events;
695 931
696#if EV_SELECT_IS_WINSOCKET 932#if EV_SELECT_IS_WINSOCKET
697 if (events) 933 if (events)
698 { 934 {
699 unsigned long argp; 935 unsigned long arg;
700 #ifdef EV_FD_TO_WIN32_HANDLE
701 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
702 #else
703 anfd->handle = _get_osfhandle (fd);
704 #endif
705 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
706 } 938 }
707#endif 939#endif
708 940
709 { 941 {
710 unsigned char o_events = anfd->events; 942 unsigned char o_events = anfd->events;
711 unsigned char o_reify = anfd->reify; 943 unsigned char o_reify = anfd->reify;
712 944
713 anfd->reify = 0; 945 anfd->reify = 0;
714 anfd->events = events; 946 anfd->events = events;
715 947
716 if (o_events != events || o_reify & EV_IOFDSET) 948 if (o_events != events || o_reify & EV__IOFDSET)
717 backend_modify (EV_A_ fd, o_events, events); 949 backend_modify (EV_A_ fd, o_events, events);
718 } 950 }
719 } 951 }
720 952
721 fdchangecnt = 0; 953 fdchangecnt = 0;
722} 954}
723 955
724void inline_size 956/* something about the given fd changed */
957inline_size void
725fd_change (EV_P_ int fd, int flags) 958fd_change (EV_P_ int fd, int flags)
726{ 959{
727 unsigned char reify = anfds [fd].reify; 960 unsigned char reify = anfds [fd].reify;
728 anfds [fd].reify |= flags; 961 anfds [fd].reify |= flags;
729 962
… …
733 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 966 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
734 fdchanges [fdchangecnt - 1] = fd; 967 fdchanges [fdchangecnt - 1] = fd;
735 } 968 }
736} 969}
737 970
738void inline_speed 971/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
972inline_speed void
739fd_kill (EV_P_ int fd) 973fd_kill (EV_P_ int fd)
740{ 974{
741 ev_io *w; 975 ev_io *w;
742 976
743 while ((w = (ev_io *)anfds [fd].head)) 977 while ((w = (ev_io *)anfds [fd].head))
… …
745 ev_io_stop (EV_A_ w); 979 ev_io_stop (EV_A_ w);
746 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 980 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
747 } 981 }
748} 982}
749 983
750int inline_size 984/* check whether the given fd is atcually valid, for error recovery */
985inline_size int
751fd_valid (int fd) 986fd_valid (int fd)
752{ 987{
753#ifdef _WIN32 988#ifdef _WIN32
754 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
755#else 990#else
756 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
757#endif 992#endif
758} 993}
759 994
… …
763{ 998{
764 int fd; 999 int fd;
765 1000
766 for (fd = 0; fd < anfdmax; ++fd) 1001 for (fd = 0; fd < anfdmax; ++fd)
767 if (anfds [fd].events) 1002 if (anfds [fd].events)
768 if (!fd_valid (fd) == -1 && errno == EBADF) 1003 if (!fd_valid (fd) && errno == EBADF)
769 fd_kill (EV_A_ fd); 1004 fd_kill (EV_A_ fd);
770} 1005}
771 1006
772/* called on ENOMEM in select/poll to kill some fds and retry */ 1007/* called on ENOMEM in select/poll to kill some fds and retry */
773static void noinline 1008static void noinline
… …
777 1012
778 for (fd = anfdmax; fd--; ) 1013 for (fd = anfdmax; fd--; )
779 if (anfds [fd].events) 1014 if (anfds [fd].events)
780 { 1015 {
781 fd_kill (EV_A_ fd); 1016 fd_kill (EV_A_ fd);
782 return; 1017 break;
783 } 1018 }
784} 1019}
785 1020
786/* usually called after fork if backend needs to re-arm all fds from scratch */ 1021/* usually called after fork if backend needs to re-arm all fds from scratch */
787static void noinline 1022static void noinline
… …
791 1026
792 for (fd = 0; fd < anfdmax; ++fd) 1027 for (fd = 0; fd < anfdmax; ++fd)
793 if (anfds [fd].events) 1028 if (anfds [fd].events)
794 { 1029 {
795 anfds [fd].events = 0; 1030 anfds [fd].events = 0;
1031 anfds [fd].emask = 0;
796 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
797 } 1033 }
798} 1034}
799 1035
800/*****************************************************************************/ 1036/*****************************************************************************/
801 1037
… …
817#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1053#define HEAP0 (DHEAP - 1) /* index of first element in heap */
818#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1054#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
819#define UPHEAP_DONE(p,k) ((p) == (k)) 1055#define UPHEAP_DONE(p,k) ((p) == (k))
820 1056
821/* away from the root */ 1057/* away from the root */
822void inline_speed 1058inline_speed void
823downheap (ANHE *heap, int N, int k) 1059downheap (ANHE *heap, int N, int k)
824{ 1060{
825 ANHE he = heap [k]; 1061 ANHE he = heap [k];
826 ANHE *E = heap + N + HEAP0; 1062 ANHE *E = heap + N + HEAP0;
827 1063
… …
867#define HEAP0 1 1103#define HEAP0 1
868#define HPARENT(k) ((k) >> 1) 1104#define HPARENT(k) ((k) >> 1)
869#define UPHEAP_DONE(p,k) (!(p)) 1105#define UPHEAP_DONE(p,k) (!(p))
870 1106
871/* away from the root */ 1107/* away from the root */
872void inline_speed 1108inline_speed void
873downheap (ANHE *heap, int N, int k) 1109downheap (ANHE *heap, int N, int k)
874{ 1110{
875 ANHE he = heap [k]; 1111 ANHE he = heap [k];
876 1112
877 for (;;) 1113 for (;;)
878 { 1114 {
879 int c = k << 1; 1115 int c = k << 1;
880 1116
881 if (c > N + HEAP0 - 1) 1117 if (c >= N + HEAP0)
882 break; 1118 break;
883 1119
884 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1120 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
885 ? 1 : 0; 1121 ? 1 : 0;
886 1122
… …
897 ev_active (ANHE_w (he)) = k; 1133 ev_active (ANHE_w (he)) = k;
898} 1134}
899#endif 1135#endif
900 1136
901/* towards the root */ 1137/* towards the root */
902void inline_speed 1138inline_speed void
903upheap (ANHE *heap, int k) 1139upheap (ANHE *heap, int k)
904{ 1140{
905 ANHE he = heap [k]; 1141 ANHE he = heap [k];
906 1142
907 for (;;) 1143 for (;;)
… …
918 1154
919 heap [k] = he; 1155 heap [k] = he;
920 ev_active (ANHE_w (he)) = k; 1156 ev_active (ANHE_w (he)) = k;
921} 1157}
922 1158
923void inline_size 1159/* move an element suitably so it is in a correct place */
1160inline_size void
924adjustheap (ANHE *heap, int N, int k) 1161adjustheap (ANHE *heap, int N, int k)
925{ 1162{
926 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1163 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
927 upheap (heap, k); 1164 upheap (heap, k);
928 else 1165 else
929 downheap (heap, N, k); 1166 downheap (heap, N, k);
930} 1167}
931 1168
932/* rebuild the heap: this function is used only once and executed rarely */ 1169/* rebuild the heap: this function is used only once and executed rarely */
933void inline_size 1170inline_size void
934reheap (ANHE *heap, int N) 1171reheap (ANHE *heap, int N)
935{ 1172{
936 int i; 1173 int i;
1174
937 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1175 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
938 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */ 1176 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
939 for (i = 0; i < N; ++i) 1177 for (i = 0; i < N; ++i)
940 upheap (heap, i + HEAP0); 1178 upheap (heap, i + HEAP0);
941} 1179}
942 1180
943#if EV_VERIFY
944static void
945checkheap (ANHE *heap, int N)
946{
947 int i;
948
949 for (i = HEAP0; i < N + HEAP0; ++i)
950 {
951 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
952 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
953 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
954 }
955}
956#endif
957
958/*****************************************************************************/ 1181/*****************************************************************************/
959 1182
1183/* associate signal watchers to a signal signal */
960typedef struct 1184typedef struct
961{ 1185{
1186 EV_ATOMIC_T pending;
1187#if EV_MULTIPLICITY
1188 EV_P;
1189#endif
962 WL head; 1190 WL head;
963 EV_ATOMIC_T gotsig;
964} ANSIG; 1191} ANSIG;
965 1192
966static ANSIG *signals; 1193static ANSIG signals [EV_NSIG - 1];
967static int signalmax;
968
969static EV_ATOMIC_T gotsig;
970
971void inline_size
972signals_init (ANSIG *base, int count)
973{
974 while (count--)
975 {
976 base->head = 0;
977 base->gotsig = 0;
978
979 ++base;
980 }
981}
982 1194
983/*****************************************************************************/ 1195/*****************************************************************************/
984 1196
985void inline_speed 1197/* used to prepare libev internal fd's */
1198/* this is not fork-safe */
1199inline_speed void
986fd_intern (int fd) 1200fd_intern (int fd)
987{ 1201{
988#ifdef _WIN32 1202#ifdef _WIN32
989 int arg = 1; 1203 unsigned long arg = 1;
990 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
991#else 1205#else
992 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
993 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
994#endif 1208#endif
995} 1209}
996 1210
997static void noinline 1211static void noinline
998evpipe_init (EV_P) 1212evpipe_init (EV_P)
999{ 1213{
1000 if (!ev_is_active (&pipeev)) 1214 if (!ev_is_active (&pipe_w))
1001 { 1215 {
1002#if EV_USE_EVENTFD 1216#if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL)
1003 if ((evfd = eventfd (0, 0)) >= 0) 1219 evfd = eventfd (0, 0);
1220
1221 if (evfd >= 0)
1004 { 1222 {
1005 evpipe [0] = -1; 1223 evpipe [0] = -1;
1006 fd_intern (evfd); 1224 fd_intern (evfd); /* doing it twice doesn't hurt */
1007 ev_io_set (&pipeev, evfd, EV_READ); 1225 ev_io_set (&pipe_w, evfd, EV_READ);
1008 } 1226 }
1009 else 1227 else
1010#endif 1228#endif
1011 { 1229 {
1012 while (pipe (evpipe)) 1230 while (pipe (evpipe))
1013 syserr ("(libev) error creating signal/async pipe"); 1231 ev_syserr ("(libev) error creating signal/async pipe");
1014 1232
1015 fd_intern (evpipe [0]); 1233 fd_intern (evpipe [0]);
1016 fd_intern (evpipe [1]); 1234 fd_intern (evpipe [1]);
1017 ev_io_set (&pipeev, evpipe [0], EV_READ); 1235 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1018 } 1236 }
1019 1237
1020 ev_io_start (EV_A_ &pipeev); 1238 ev_io_start (EV_A_ &pipe_w);
1021 ev_unref (EV_A); /* watcher should not keep loop alive */ 1239 ev_unref (EV_A); /* watcher should not keep loop alive */
1022 } 1240 }
1023} 1241}
1024 1242
1025void inline_size 1243inline_size void
1026evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1244evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1027{ 1245{
1028 if (!*flag) 1246 if (!*flag)
1029 { 1247 {
1030 int old_errno = errno; /* save errno because write might clobber it */ 1248 int old_errno = errno; /* save errno because write might clobber it */
… …
1043 1261
1044 errno = old_errno; 1262 errno = old_errno;
1045 } 1263 }
1046} 1264}
1047 1265
1266/* called whenever the libev signal pipe */
1267/* got some events (signal, async) */
1048static void 1268static void
1049pipecb (EV_P_ ev_io *iow, int revents) 1269pipecb (EV_P_ ev_io *iow, int revents)
1050{ 1270{
1271 int i;
1272
1051#if EV_USE_EVENTFD 1273#if EV_USE_EVENTFD
1052 if (evfd >= 0) 1274 if (evfd >= 0)
1053 { 1275 {
1054 uint64_t counter; 1276 uint64_t counter;
1055 read (evfd, &counter, sizeof (uint64_t)); 1277 read (evfd, &counter, sizeof (uint64_t));
… …
1059 { 1281 {
1060 char dummy; 1282 char dummy;
1061 read (evpipe [0], &dummy, 1); 1283 read (evpipe [0], &dummy, 1);
1062 } 1284 }
1063 1285
1064 if (gotsig && ev_is_default_loop (EV_A)) 1286 if (sig_pending)
1065 { 1287 {
1066 int signum; 1288 sig_pending = 0;
1067 gotsig = 0;
1068 1289
1069 for (signum = signalmax; signum--; ) 1290 for (i = EV_NSIG - 1; i--; )
1070 if (signals [signum].gotsig) 1291 if (expect_false (signals [i].pending))
1071 ev_feed_signal_event (EV_A_ signum + 1); 1292 ev_feed_signal_event (EV_A_ i + 1);
1072 } 1293 }
1073 1294
1074#if EV_ASYNC_ENABLE 1295#if EV_ASYNC_ENABLE
1075 if (gotasync) 1296 if (async_pending)
1076 { 1297 {
1077 int i; 1298 async_pending = 0;
1078 gotasync = 0;
1079 1299
1080 for (i = asynccnt; i--; ) 1300 for (i = asynccnt; i--; )
1081 if (asyncs [i]->sent) 1301 if (asyncs [i]->sent)
1082 { 1302 {
1083 asyncs [i]->sent = 0; 1303 asyncs [i]->sent = 0;
… …
1091 1311
1092static void 1312static void
1093ev_sighandler (int signum) 1313ev_sighandler (int signum)
1094{ 1314{
1095#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1096 struct ev_loop *loop = &default_loop_struct; 1316 EV_P = signals [signum - 1].loop;
1097#endif 1317#endif
1098 1318
1099#if _WIN32 1319#ifdef _WIN32
1100 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1101#endif 1321#endif
1102 1322
1103 signals [signum - 1].gotsig = 1; 1323 signals [signum - 1].pending = 1;
1104 evpipe_write (EV_A_ &gotsig); 1324 evpipe_write (EV_A_ &sig_pending);
1105} 1325}
1106 1326
1107void noinline 1327void noinline
1108ev_feed_signal_event (EV_P_ int signum) 1328ev_feed_signal_event (EV_P_ int signum)
1109{ 1329{
1110 WL w; 1330 WL w;
1111 1331
1332 if (expect_false (signum <= 0 || signum > EV_NSIG))
1333 return;
1334
1335 --signum;
1336
1112#if EV_MULTIPLICITY 1337#if EV_MULTIPLICITY
1113 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1338 /* it is permissible to try to feed a signal to the wrong loop */
1114#endif 1339 /* or, likely more useful, feeding a signal nobody is waiting for */
1115 1340
1116 --signum; 1341 if (expect_false (signals [signum].loop != EV_A))
1117
1118 if (signum < 0 || signum >= signalmax)
1119 return; 1342 return;
1343#endif
1120 1344
1121 signals [signum].gotsig = 0; 1345 signals [signum].pending = 0;
1122 1346
1123 for (w = signals [signum].head; w; w = w->next) 1347 for (w = signals [signum].head; w; w = w->next)
1124 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1348 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1125} 1349}
1126 1350
1351#if EV_USE_SIGNALFD
1352static void
1353sigfdcb (EV_P_ ev_io *iow, int revents)
1354{
1355 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1356
1357 for (;;)
1358 {
1359 ssize_t res = read (sigfd, si, sizeof (si));
1360
1361 /* not ISO-C, as res might be -1, but works with SuS */
1362 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1363 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1364
1365 if (res < (ssize_t)sizeof (si))
1366 break;
1367 }
1368}
1369#endif
1370
1127/*****************************************************************************/ 1371/*****************************************************************************/
1128 1372
1129static WL childs [EV_PID_HASHSIZE]; 1373static WL childs [EV_PID_HASHSIZE];
1130 1374
1131#ifndef _WIN32 1375#ifndef _WIN32
… …
1134 1378
1135#ifndef WIFCONTINUED 1379#ifndef WIFCONTINUED
1136# define WIFCONTINUED(status) 0 1380# define WIFCONTINUED(status) 0
1137#endif 1381#endif
1138 1382
1139void inline_speed 1383/* handle a single child status event */
1384inline_speed void
1140child_reap (EV_P_ int chain, int pid, int status) 1385child_reap (EV_P_ int chain, int pid, int status)
1141{ 1386{
1142 ev_child *w; 1387 ev_child *w;
1143 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1388 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1144 1389
… …
1157 1402
1158#ifndef WCONTINUED 1403#ifndef WCONTINUED
1159# define WCONTINUED 0 1404# define WCONTINUED 0
1160#endif 1405#endif
1161 1406
1407/* called on sigchld etc., calls waitpid */
1162static void 1408static void
1163childcb (EV_P_ ev_signal *sw, int revents) 1409childcb (EV_P_ ev_signal *sw, int revents)
1164{ 1410{
1165 int pid, status; 1411 int pid, status;
1166 1412
… …
1247 /* kqueue is borked on everything but netbsd apparently */ 1493 /* kqueue is borked on everything but netbsd apparently */
1248 /* it usually doesn't work correctly on anything but sockets and pipes */ 1494 /* it usually doesn't work correctly on anything but sockets and pipes */
1249 flags &= ~EVBACKEND_KQUEUE; 1495 flags &= ~EVBACKEND_KQUEUE;
1250#endif 1496#endif
1251#ifdef __APPLE__ 1497#ifdef __APPLE__
1252 // flags &= ~EVBACKEND_KQUEUE; for documentation 1498 /* only select works correctly on that "unix-certified" platform */
1253 flags &= ~EVBACKEND_POLL; 1499 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1500 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1254#endif 1501#endif
1255 1502
1256 return flags; 1503 return flags;
1257} 1504}
1258 1505
… …
1272ev_backend (EV_P) 1519ev_backend (EV_P)
1273{ 1520{
1274 return backend; 1521 return backend;
1275} 1522}
1276 1523
1524#if EV_MINIMAL < 2
1277unsigned int 1525unsigned int
1278ev_loop_count (EV_P) 1526ev_loop_count (EV_P)
1279{ 1527{
1280 return loop_count; 1528 return loop_count;
1281} 1529}
1282 1530
1531unsigned int
1532ev_loop_depth (EV_P)
1533{
1534 return loop_depth;
1535}
1536
1283void 1537void
1284ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1538ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1539{
1286 io_blocktime = interval; 1540 io_blocktime = interval;
1287} 1541}
… …
1290ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1544ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1291{ 1545{
1292 timeout_blocktime = interval; 1546 timeout_blocktime = interval;
1293} 1547}
1294 1548
1549void
1550ev_set_userdata (EV_P_ void *data)
1551{
1552 userdata = data;
1553}
1554
1555void *
1556ev_userdata (EV_P)
1557{
1558 return userdata;
1559}
1560
1561void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1562{
1563 invoke_cb = invoke_pending_cb;
1564}
1565
1566void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1567{
1568 release_cb = release;
1569 acquire_cb = acquire;
1570}
1571#endif
1572
1573/* initialise a loop structure, must be zero-initialised */
1295static void noinline 1574static void noinline
1296loop_init (EV_P_ unsigned int flags) 1575loop_init (EV_P_ unsigned int flags)
1297{ 1576{
1298 if (!backend) 1577 if (!backend)
1299 { 1578 {
1579#if EV_USE_REALTIME
1580 if (!have_realtime)
1581 {
1582 struct timespec ts;
1583
1584 if (!clock_gettime (CLOCK_REALTIME, &ts))
1585 have_realtime = 1;
1586 }
1587#endif
1588
1300#if EV_USE_MONOTONIC 1589#if EV_USE_MONOTONIC
1590 if (!have_monotonic)
1301 { 1591 {
1302 struct timespec ts; 1592 struct timespec ts;
1593
1303 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1594 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1304 have_monotonic = 1; 1595 have_monotonic = 1;
1305 } 1596 }
1306#endif 1597#endif
1598
1599 /* pid check not overridable via env */
1600#ifndef _WIN32
1601 if (flags & EVFLAG_FORKCHECK)
1602 curpid = getpid ();
1603#endif
1604
1605 if (!(flags & EVFLAG_NOENV)
1606 && !enable_secure ()
1607 && getenv ("LIBEV_FLAGS"))
1608 flags = atoi (getenv ("LIBEV_FLAGS"));
1307 1609
1308 ev_rt_now = ev_time (); 1610 ev_rt_now = ev_time ();
1309 mn_now = get_clock (); 1611 mn_now = get_clock ();
1310 now_floor = mn_now; 1612 now_floor = mn_now;
1311 rtmn_diff = ev_rt_now - mn_now; 1613 rtmn_diff = ev_rt_now - mn_now;
1614#if EV_MINIMAL < 2
1615 invoke_cb = ev_invoke_pending;
1616#endif
1312 1617
1313 io_blocktime = 0.; 1618 io_blocktime = 0.;
1314 timeout_blocktime = 0.; 1619 timeout_blocktime = 0.;
1315 backend = 0; 1620 backend = 0;
1316 backend_fd = -1; 1621 backend_fd = -1;
1317 gotasync = 0; 1622 sig_pending = 0;
1623#if EV_ASYNC_ENABLE
1624 async_pending = 0;
1625#endif
1318#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1319 fs_fd = -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1320#endif 1628#endif
1321 1629#if EV_USE_SIGNALFD
1322 /* pid check not overridable via env */ 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1323#ifndef _WIN32
1324 if (flags & EVFLAG_FORKCHECK)
1325 curpid = getpid ();
1326#endif 1631#endif
1327
1328 if (!(flags & EVFLAG_NOENV)
1329 && !enable_secure ()
1330 && getenv ("LIBEV_FLAGS"))
1331 flags = atoi (getenv ("LIBEV_FLAGS"));
1332 1632
1333 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1334 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1335 1635
1336#if EV_USE_PORT 1636#if EV_USE_PORT
… …
1347#endif 1647#endif
1348#if EV_USE_SELECT 1648#if EV_USE_SELECT
1349 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1649 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1350#endif 1650#endif
1351 1651
1652 ev_prepare_init (&pending_w, pendingcb);
1653
1352 ev_init (&pipeev, pipecb); 1654 ev_init (&pipe_w, pipecb);
1353 ev_set_priority (&pipeev, EV_MAXPRI); 1655 ev_set_priority (&pipe_w, EV_MAXPRI);
1354 } 1656 }
1355} 1657}
1356 1658
1659/* free up a loop structure */
1357static void noinline 1660static void noinline
1358loop_destroy (EV_P) 1661loop_destroy (EV_P)
1359{ 1662{
1360 int i; 1663 int i;
1361 1664
1362 if (ev_is_active (&pipeev)) 1665 if (ev_is_active (&pipe_w))
1363 { 1666 {
1364 ev_ref (EV_A); /* signal watcher */ 1667 /*ev_ref (EV_A);*/
1365 ev_io_stop (EV_A_ &pipeev); 1668 /*ev_io_stop (EV_A_ &pipe_w);*/
1366 1669
1367#if EV_USE_EVENTFD 1670#if EV_USE_EVENTFD
1368 if (evfd >= 0) 1671 if (evfd >= 0)
1369 close (evfd); 1672 close (evfd);
1370#endif 1673#endif
1371 1674
1372 if (evpipe [0] >= 0) 1675 if (evpipe [0] >= 0)
1373 { 1676 {
1374 close (evpipe [0]); 1677 EV_WIN32_CLOSE_FD (evpipe [0]);
1375 close (evpipe [1]); 1678 EV_WIN32_CLOSE_FD (evpipe [1]);
1376 } 1679 }
1377 } 1680 }
1681
1682#if EV_USE_SIGNALFD
1683 if (ev_is_active (&sigfd_w))
1684 close (sigfd);
1685#endif
1378 1686
1379#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1380 if (fs_fd >= 0) 1688 if (fs_fd >= 0)
1381 close (fs_fd); 1689 close (fs_fd);
1382#endif 1690#endif
… …
1406#if EV_IDLE_ENABLE 1714#if EV_IDLE_ENABLE
1407 array_free (idle, [i]); 1715 array_free (idle, [i]);
1408#endif 1716#endif
1409 } 1717 }
1410 1718
1411 ev_free (anfds); anfdmax = 0; 1719 ev_free (anfds); anfds = 0; anfdmax = 0;
1412 1720
1413 /* have to use the microsoft-never-gets-it-right macro */ 1721 /* have to use the microsoft-never-gets-it-right macro */
1722 array_free (rfeed, EMPTY);
1414 array_free (fdchange, EMPTY); 1723 array_free (fdchange, EMPTY);
1415 array_free (timer, EMPTY); 1724 array_free (timer, EMPTY);
1416#if EV_PERIODIC_ENABLE 1725#if EV_PERIODIC_ENABLE
1417 array_free (periodic, EMPTY); 1726 array_free (periodic, EMPTY);
1418#endif 1727#endif
… …
1427 1736
1428 backend = 0; 1737 backend = 0;
1429} 1738}
1430 1739
1431#if EV_USE_INOTIFY 1740#if EV_USE_INOTIFY
1432void inline_size infy_fork (EV_P); 1741inline_size void infy_fork (EV_P);
1433#endif 1742#endif
1434 1743
1435void inline_size 1744inline_size void
1436loop_fork (EV_P) 1745loop_fork (EV_P)
1437{ 1746{
1438#if EV_USE_PORT 1747#if EV_USE_PORT
1439 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1748 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1440#endif 1749#endif
… …
1446#endif 1755#endif
1447#if EV_USE_INOTIFY 1756#if EV_USE_INOTIFY
1448 infy_fork (EV_A); 1757 infy_fork (EV_A);
1449#endif 1758#endif
1450 1759
1451 if (ev_is_active (&pipeev)) 1760 if (ev_is_active (&pipe_w))
1452 { 1761 {
1453 /* this "locks" the handlers against writing to the pipe */ 1762 /* this "locks" the handlers against writing to the pipe */
1454 /* while we modify the fd vars */ 1763 /* while we modify the fd vars */
1455 gotsig = 1; 1764 sig_pending = 1;
1456#if EV_ASYNC_ENABLE 1765#if EV_ASYNC_ENABLE
1457 gotasync = 1; 1766 async_pending = 1;
1458#endif 1767#endif
1459 1768
1460 ev_ref (EV_A); 1769 ev_ref (EV_A);
1461 ev_io_stop (EV_A_ &pipeev); 1770 ev_io_stop (EV_A_ &pipe_w);
1462 1771
1463#if EV_USE_EVENTFD 1772#if EV_USE_EVENTFD
1464 if (evfd >= 0) 1773 if (evfd >= 0)
1465 close (evfd); 1774 close (evfd);
1466#endif 1775#endif
1467 1776
1468 if (evpipe [0] >= 0) 1777 if (evpipe [0] >= 0)
1469 { 1778 {
1470 close (evpipe [0]); 1779 EV_WIN32_CLOSE_FD (evpipe [0]);
1471 close (evpipe [1]); 1780 EV_WIN32_CLOSE_FD (evpipe [1]);
1472 } 1781 }
1473 1782
1474 evpipe_init (EV_A); 1783 evpipe_init (EV_A);
1475 /* now iterate over everything, in case we missed something */ 1784 /* now iterate over everything, in case we missed something */
1476 pipecb (EV_A_ &pipeev, EV_READ); 1785 pipecb (EV_A_ &pipe_w, EV_READ);
1477 } 1786 }
1478 1787
1479 postfork = 0; 1788 postfork = 0;
1480} 1789}
1481 1790
1482#if EV_MULTIPLICITY 1791#if EV_MULTIPLICITY
1792
1483struct ev_loop * 1793struct ev_loop *
1484ev_loop_new (unsigned int flags) 1794ev_loop_new (unsigned int flags)
1485{ 1795{
1486 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1796 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1487 1797
1488 memset (loop, 0, sizeof (struct ev_loop)); 1798 memset (EV_A, 0, sizeof (struct ev_loop));
1489
1490 loop_init (EV_A_ flags); 1799 loop_init (EV_A_ flags);
1491 1800
1492 if (ev_backend (EV_A)) 1801 if (ev_backend (EV_A))
1493 return loop; 1802 return EV_A;
1494 1803
1495 return 0; 1804 return 0;
1496} 1805}
1497 1806
1498void 1807void
… …
1505void 1814void
1506ev_loop_fork (EV_P) 1815ev_loop_fork (EV_P)
1507{ 1816{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1817 postfork = 1; /* must be in line with ev_default_fork */
1509} 1818}
1819#endif /* multiplicity */
1510 1820
1511#if EV_VERIFY 1821#if EV_VERIFY
1512static void 1822static void noinline
1823verify_watcher (EV_P_ W w)
1824{
1825 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1826
1827 if (w->pending)
1828 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1829}
1830
1831static void noinline
1832verify_heap (EV_P_ ANHE *heap, int N)
1833{
1834 int i;
1835
1836 for (i = HEAP0; i < N + HEAP0; ++i)
1837 {
1838 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1839 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1840 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1841
1842 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1843 }
1844}
1845
1846static void noinline
1513array_check (W **ws, int cnt) 1847array_verify (EV_P_ W *ws, int cnt)
1514{ 1848{
1515 while (cnt--) 1849 while (cnt--)
1850 {
1516 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1851 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1852 verify_watcher (EV_A_ ws [cnt]);
1853 }
1517} 1854}
1855#endif
1518 1856
1519static void 1857#if EV_MINIMAL < 2
1858void
1520ev_loop_verify (EV_P) 1859ev_loop_verify (EV_P)
1521{ 1860{
1861#if EV_VERIFY
1522 int i; 1862 int i;
1863 WL w;
1523 1864
1865 assert (activecnt >= -1);
1866
1867 assert (fdchangemax >= fdchangecnt);
1868 for (i = 0; i < fdchangecnt; ++i)
1869 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1870
1871 assert (anfdmax >= 0);
1872 for (i = 0; i < anfdmax; ++i)
1873 for (w = anfds [i].head; w; w = w->next)
1874 {
1875 verify_watcher (EV_A_ (W)w);
1876 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1877 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1878 }
1879
1880 assert (timermax >= timercnt);
1524 checkheap (timers, timercnt); 1881 verify_heap (EV_A_ timers, timercnt);
1882
1525#if EV_PERIODIC_ENABLE 1883#if EV_PERIODIC_ENABLE
1884 assert (periodicmax >= periodiccnt);
1526 checkheap (periodics, periodiccnt); 1885 verify_heap (EV_A_ periodics, periodiccnt);
1527#endif 1886#endif
1528 1887
1888 for (i = NUMPRI; i--; )
1889 {
1890 assert (pendingmax [i] >= pendingcnt [i]);
1529#if EV_IDLE_ENABLE 1891#if EV_IDLE_ENABLE
1530 for (i = NUMPRI; i--; ) 1892 assert (idleall >= 0);
1893 assert (idlemax [i] >= idlecnt [i]);
1531 array_check ((W **)idles [i], idlecnt [i]); 1894 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1532#endif 1895#endif
1896 }
1897
1533#if EV_FORK_ENABLE 1898#if EV_FORK_ENABLE
1899 assert (forkmax >= forkcnt);
1534 array_check ((W **)forks, forkcnt); 1900 array_verify (EV_A_ (W *)forks, forkcnt);
1535#endif 1901#endif
1536 array_check ((W **)prepares, preparecnt); 1902
1537 array_check ((W **)checks, checkcnt);
1538#if EV_ASYNC_ENABLE 1903#if EV_ASYNC_ENABLE
1904 assert (asyncmax >= asynccnt);
1539 array_check ((W **)asyncs, asynccnt); 1905 array_verify (EV_A_ (W *)asyncs, asynccnt);
1906#endif
1907
1908 assert (preparemax >= preparecnt);
1909 array_verify (EV_A_ (W *)prepares, preparecnt);
1910
1911 assert (checkmax >= checkcnt);
1912 array_verify (EV_A_ (W *)checks, checkcnt);
1913
1914# if 0
1915 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1540#endif 1917# endif
1541}
1542#endif 1918#endif
1543 1919}
1544#endif 1920#endif
1545 1921
1546#if EV_MULTIPLICITY 1922#if EV_MULTIPLICITY
1547struct ev_loop * 1923struct ev_loop *
1548ev_default_loop_init (unsigned int flags) 1924ev_default_loop_init (unsigned int flags)
… …
1552#endif 1928#endif
1553{ 1929{
1554 if (!ev_default_loop_ptr) 1930 if (!ev_default_loop_ptr)
1555 { 1931 {
1556#if EV_MULTIPLICITY 1932#if EV_MULTIPLICITY
1557 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1933 EV_P = ev_default_loop_ptr = &default_loop_struct;
1558#else 1934#else
1559 ev_default_loop_ptr = 1; 1935 ev_default_loop_ptr = 1;
1560#endif 1936#endif
1561 1937
1562 loop_init (EV_A_ flags); 1938 loop_init (EV_A_ flags);
… …
1579 1955
1580void 1956void
1581ev_default_destroy (void) 1957ev_default_destroy (void)
1582{ 1958{
1583#if EV_MULTIPLICITY 1959#if EV_MULTIPLICITY
1584 struct ev_loop *loop = ev_default_loop_ptr; 1960 EV_P = ev_default_loop_ptr;
1585#endif 1961#endif
1962
1963 ev_default_loop_ptr = 0;
1586 1964
1587#ifndef _WIN32 1965#ifndef _WIN32
1588 ev_ref (EV_A); /* child watcher */ 1966 ev_ref (EV_A); /* child watcher */
1589 ev_signal_stop (EV_A_ &childev); 1967 ev_signal_stop (EV_A_ &childev);
1590#endif 1968#endif
… …
1594 1972
1595void 1973void
1596ev_default_fork (void) 1974ev_default_fork (void)
1597{ 1975{
1598#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1599 struct ev_loop *loop = ev_default_loop_ptr; 1977 EV_P = ev_default_loop_ptr;
1600#endif 1978#endif
1601 1979
1602 if (backend)
1603 postfork = 1; /* must be in line with ev_loop_fork */ 1980 postfork = 1; /* must be in line with ev_loop_fork */
1604} 1981}
1605 1982
1606/*****************************************************************************/ 1983/*****************************************************************************/
1607 1984
1608void 1985void
1609ev_invoke (EV_P_ void *w, int revents) 1986ev_invoke (EV_P_ void *w, int revents)
1610{ 1987{
1611 EV_CB_INVOKE ((W)w, revents); 1988 EV_CB_INVOKE ((W)w, revents);
1612} 1989}
1613 1990
1614void inline_speed 1991unsigned int
1615call_pending (EV_P) 1992ev_pending_count (EV_P)
1616{ 1993{
1617 int pri; 1994 int pri;
1995 unsigned int count = 0;
1618 1996
1619 EV_FREQUENT_CHECK; 1997 for (pri = NUMPRI; pri--; )
1998 count += pendingcnt [pri];
1999
2000 return count;
2001}
2002
2003void noinline
2004ev_invoke_pending (EV_P)
2005{
2006 int pri;
1620 2007
1621 for (pri = NUMPRI; pri--; ) 2008 for (pri = NUMPRI; pri--; )
1622 while (pendingcnt [pri]) 2009 while (pendingcnt [pri])
1623 { 2010 {
1624 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2011 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1625 2012
1626 if (expect_true (p->w))
1627 {
1628 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 2013 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2014 /* ^ this is no longer true, as pending_w could be here */
1629 2015
1630 p->w->pending = 0; 2016 p->w->pending = 0;
1631 EV_CB_INVOKE (p->w, p->events); 2017 EV_CB_INVOKE (p->w, p->events);
1632 } 2018 EV_FREQUENT_CHECK;
1633 } 2019 }
1634
1635 EV_FREQUENT_CHECK;
1636} 2020}
1637 2021
1638#if EV_IDLE_ENABLE 2022#if EV_IDLE_ENABLE
1639void inline_size 2023/* make idle watchers pending. this handles the "call-idle */
2024/* only when higher priorities are idle" logic */
2025inline_size void
1640idle_reify (EV_P) 2026idle_reify (EV_P)
1641{ 2027{
1642 if (expect_false (idleall)) 2028 if (expect_false (idleall))
1643 { 2029 {
1644 int pri; 2030 int pri;
… …
1656 } 2042 }
1657 } 2043 }
1658} 2044}
1659#endif 2045#endif
1660 2046
1661void inline_size 2047/* make timers pending */
2048inline_size void
1662timers_reify (EV_P) 2049timers_reify (EV_P)
1663{ 2050{
1664 EV_FREQUENT_CHECK; 2051 EV_FREQUENT_CHECK;
1665 2052
1666 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2053 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1667 { 2054 {
1668 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2055 do
1669
1670 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1671
1672 /* first reschedule or stop timer */
1673 if (w->repeat)
1674 { 2056 {
2057 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2058
2059 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2060
2061 /* first reschedule or stop timer */
2062 if (w->repeat)
2063 {
1675 ev_at (w) += w->repeat; 2064 ev_at (w) += w->repeat;
1676 if (ev_at (w) < mn_now) 2065 if (ev_at (w) < mn_now)
1677 ev_at (w) = mn_now; 2066 ev_at (w) = mn_now;
1678 2067
1679 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2068 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1680 2069
1681 ANHE_at_cache (timers [HEAP0]); 2070 ANHE_at_cache (timers [HEAP0]);
1682 downheap (timers, timercnt, HEAP0); 2071 downheap (timers, timercnt, HEAP0);
2072 }
2073 else
2074 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2075
2076 EV_FREQUENT_CHECK;
2077 feed_reverse (EV_A_ (W)w);
1683 } 2078 }
1684 else 2079 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1685 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1686 2080
1687 EV_FREQUENT_CHECK;
1688 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2081 feed_reverse_done (EV_A_ EV_TIMEOUT);
1689 } 2082 }
1690} 2083}
1691 2084
1692#if EV_PERIODIC_ENABLE 2085#if EV_PERIODIC_ENABLE
1693void inline_size 2086/* make periodics pending */
2087inline_size void
1694periodics_reify (EV_P) 2088periodics_reify (EV_P)
1695{ 2089{
1696 EV_FREQUENT_CHECK; 2090 EV_FREQUENT_CHECK;
2091
1697 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2092 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1698 { 2093 {
1699 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2094 int feed_count = 0;
1700 2095
1701 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2096 do
1702
1703 /* first reschedule or stop timer */
1704 if (w->reschedule_cb)
1705 { 2097 {
2098 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2099
2100 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2101
2102 /* first reschedule or stop timer */
2103 if (w->reschedule_cb)
2104 {
1706 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2105 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1707 2106
1708 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2107 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1709 2108
1710 ANHE_at_cache (periodics [HEAP0]); 2109 ANHE_at_cache (periodics [HEAP0]);
1711 downheap (periodics, periodiccnt, HEAP0); 2110 downheap (periodics, periodiccnt, HEAP0);
2111 }
2112 else if (w->interval)
2113 {
2114 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2115 /* if next trigger time is not sufficiently in the future, put it there */
2116 /* this might happen because of floating point inexactness */
2117 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2118 {
2119 ev_at (w) += w->interval;
2120
2121 /* if interval is unreasonably low we might still have a time in the past */
2122 /* so correct this. this will make the periodic very inexact, but the user */
2123 /* has effectively asked to get triggered more often than possible */
2124 if (ev_at (w) < ev_rt_now)
2125 ev_at (w) = ev_rt_now;
2126 }
2127
2128 ANHE_at_cache (periodics [HEAP0]);
2129 downheap (periodics, periodiccnt, HEAP0);
2130 }
2131 else
2132 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2133
1712 EV_FREQUENT_CHECK; 2134 EV_FREQUENT_CHECK;
2135 feed_reverse (EV_A_ (W)w);
1713 } 2136 }
1714 else if (w->interval) 2137 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1715 {
1716 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1717 /* if next trigger time is not sufficiently in the future, put it there */
1718 /* this might happen because of floating point inexactness */
1719 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1720 {
1721 ev_at (w) += w->interval;
1722 2138
1723 /* if interval is unreasonably low we might still have a time in the past */
1724 /* so correct this. this will make the periodic very inexact, but the user */
1725 /* has effectively asked to get triggered more often than possible */
1726 if (ev_at (w) < ev_rt_now)
1727 ev_at (w) = ev_rt_now;
1728 }
1729
1730 ANHE_at_cache (periodics [HEAP0]);
1731 downheap (periodics, periodiccnt, HEAP0);
1732 }
1733 else
1734 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1735
1736 EV_FREQUENT_CHECK;
1737 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2139 feed_reverse_done (EV_A_ EV_PERIODIC);
1738 } 2140 }
1739} 2141}
1740 2142
2143/* simply recalculate all periodics */
2144/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1741static void noinline 2145static void noinline
1742periodics_reschedule (EV_P) 2146periodics_reschedule (EV_P)
1743{ 2147{
1744 int i; 2148 int i;
1745 2149
… …
1758 2162
1759 reheap (periodics, periodiccnt); 2163 reheap (periodics, periodiccnt);
1760} 2164}
1761#endif 2165#endif
1762 2166
1763void inline_speed 2167/* adjust all timers by a given offset */
2168static void noinline
2169timers_reschedule (EV_P_ ev_tstamp adjust)
2170{
2171 int i;
2172
2173 for (i = 0; i < timercnt; ++i)
2174 {
2175 ANHE *he = timers + i + HEAP0;
2176 ANHE_w (*he)->at += adjust;
2177 ANHE_at_cache (*he);
2178 }
2179}
2180
2181/* fetch new monotonic and realtime times from the kernel */
2182/* also detect if there was a timejump, and act accordingly */
2183inline_speed void
1764time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
1765{ 2185{
1766 int i;
1767
1768#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
1769 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
1770 { 2188 {
2189 int i;
1771 ev_tstamp odiff = rtmn_diff; 2190 ev_tstamp odiff = rtmn_diff;
1772 2191
1773 mn_now = get_clock (); 2192 mn_now = get_clock ();
1774 2193
1775 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2194 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1801 ev_rt_now = ev_time (); 2220 ev_rt_now = ev_time ();
1802 mn_now = get_clock (); 2221 mn_now = get_clock ();
1803 now_floor = mn_now; 2222 now_floor = mn_now;
1804 } 2223 }
1805 2224
2225 /* no timer adjustment, as the monotonic clock doesn't jump */
2226 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1806# if EV_PERIODIC_ENABLE 2227# if EV_PERIODIC_ENABLE
1807 periodics_reschedule (EV_A); 2228 periodics_reschedule (EV_A);
1808# endif 2229# endif
1809 /* no timer adjustment, as the monotonic clock doesn't jump */
1810 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1811 } 2230 }
1812 else 2231 else
1813#endif 2232#endif
1814 { 2233 {
1815 ev_rt_now = ev_time (); 2234 ev_rt_now = ev_time ();
1816 2235
1817 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2236 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1818 { 2237 {
2238 /* adjust timers. this is easy, as the offset is the same for all of them */
2239 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1819#if EV_PERIODIC_ENABLE 2240#if EV_PERIODIC_ENABLE
1820 periodics_reschedule (EV_A); 2241 periodics_reschedule (EV_A);
1821#endif 2242#endif
1822 /* adjust timers. this is easy, as the offset is the same for all of them */
1823 for (i = 0; i < timercnt; ++i)
1824 {
1825 ANHE *he = timers + i + HEAP0;
1826 ANHE_w (*he)->at += ev_rt_now - mn_now;
1827 ANHE_at_cache (*he);
1828 }
1829 } 2243 }
1830 2244
1831 mn_now = ev_rt_now; 2245 mn_now = ev_rt_now;
1832 } 2246 }
1833} 2247}
1834 2248
1835void 2249void
1836ev_ref (EV_P)
1837{
1838 ++activecnt;
1839}
1840
1841void
1842ev_unref (EV_P)
1843{
1844 --activecnt;
1845}
1846
1847static int loop_done;
1848
1849void
1850ev_loop (EV_P_ int flags) 2250ev_loop (EV_P_ int flags)
1851{ 2251{
2252#if EV_MINIMAL < 2
2253 ++loop_depth;
2254#endif
2255
2256 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2257
1852 loop_done = EVUNLOOP_CANCEL; 2258 loop_done = EVUNLOOP_CANCEL;
1853 2259
1854 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2260 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1855 2261
1856 do 2262 do
1857 { 2263 {
2264#if EV_VERIFY >= 2
2265 ev_loop_verify (EV_A);
2266#endif
2267
1858#ifndef _WIN32 2268#ifndef _WIN32
1859 if (expect_false (curpid)) /* penalise the forking check even more */ 2269 if (expect_false (curpid)) /* penalise the forking check even more */
1860 if (expect_false (getpid () != curpid)) 2270 if (expect_false (getpid () != curpid))
1861 { 2271 {
1862 curpid = getpid (); 2272 curpid = getpid ();
… …
1868 /* we might have forked, so queue fork handlers */ 2278 /* we might have forked, so queue fork handlers */
1869 if (expect_false (postfork)) 2279 if (expect_false (postfork))
1870 if (forkcnt) 2280 if (forkcnt)
1871 { 2281 {
1872 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1873 call_pending (EV_A); 2283 EV_INVOKE_PENDING;
1874 } 2284 }
1875#endif 2285#endif
1876 2286
1877 /* queue prepare watchers (and execute them) */ 2287 /* queue prepare watchers (and execute them) */
1878 if (expect_false (preparecnt)) 2288 if (expect_false (preparecnt))
1879 { 2289 {
1880 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1881 call_pending (EV_A); 2291 EV_INVOKE_PENDING;
1882 } 2292 }
1883 2293
1884 if (expect_false (!activecnt)) 2294 if (expect_false (loop_done))
1885 break; 2295 break;
1886 2296
1887 /* we might have forked, so reify kernel state if necessary */ 2297 /* we might have forked, so reify kernel state if necessary */
1888 if (expect_false (postfork)) 2298 if (expect_false (postfork))
1889 loop_fork (EV_A); 2299 loop_fork (EV_A);
… …
1896 ev_tstamp waittime = 0.; 2306 ev_tstamp waittime = 0.;
1897 ev_tstamp sleeptime = 0.; 2307 ev_tstamp sleeptime = 0.;
1898 2308
1899 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2309 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1900 { 2310 {
2311 /* remember old timestamp for io_blocktime calculation */
2312 ev_tstamp prev_mn_now = mn_now;
2313
1901 /* update time to cancel out callback processing overhead */ 2314 /* update time to cancel out callback processing overhead */
1902 time_update (EV_A_ 1e100); 2315 time_update (EV_A_ 1e100);
1903 2316
1904 waittime = MAX_BLOCKTIME; 2317 waittime = MAX_BLOCKTIME;
1905 2318
… …
1915 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2328 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1916 if (waittime > to) waittime = to; 2329 if (waittime > to) waittime = to;
1917 } 2330 }
1918#endif 2331#endif
1919 2332
2333 /* don't let timeouts decrease the waittime below timeout_blocktime */
1920 if (expect_false (waittime < timeout_blocktime)) 2334 if (expect_false (waittime < timeout_blocktime))
1921 waittime = timeout_blocktime; 2335 waittime = timeout_blocktime;
1922 2336
1923 sleeptime = waittime - backend_fudge; 2337 /* extra check because io_blocktime is commonly 0 */
1924
1925 if (expect_true (sleeptime > io_blocktime)) 2338 if (expect_false (io_blocktime))
1926 sleeptime = io_blocktime;
1927
1928 if (sleeptime)
1929 { 2339 {
2340 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2341
2342 if (sleeptime > waittime - backend_fudge)
2343 sleeptime = waittime - backend_fudge;
2344
2345 if (expect_true (sleeptime > 0.))
2346 {
1930 ev_sleep (sleeptime); 2347 ev_sleep (sleeptime);
1931 waittime -= sleeptime; 2348 waittime -= sleeptime;
2349 }
1932 } 2350 }
1933 } 2351 }
1934 2352
2353#if EV_MINIMAL < 2
1935 ++loop_count; 2354 ++loop_count;
2355#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
1936 backend_poll (EV_A_ waittime); 2357 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
1937 2359
1938 /* update ev_rt_now, do magic */ 2360 /* update ev_rt_now, do magic */
1939 time_update (EV_A_ waittime + sleeptime); 2361 time_update (EV_A_ waittime + sleeptime);
1940 } 2362 }
1941 2363
… …
1952 2374
1953 /* queue check watchers, to be executed first */ 2375 /* queue check watchers, to be executed first */
1954 if (expect_false (checkcnt)) 2376 if (expect_false (checkcnt))
1955 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1956 2378
1957 call_pending (EV_A); 2379 EV_INVOKE_PENDING;
1958 } 2380 }
1959 while (expect_true ( 2381 while (expect_true (
1960 activecnt 2382 activecnt
1961 && !loop_done 2383 && !loop_done
1962 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1963 )); 2385 ));
1964 2386
1965 if (loop_done == EVUNLOOP_ONE) 2387 if (loop_done == EVUNLOOP_ONE)
1966 loop_done = EVUNLOOP_CANCEL; 2388 loop_done = EVUNLOOP_CANCEL;
2389
2390#if EV_MINIMAL < 2
2391 --loop_depth;
2392#endif
1967} 2393}
1968 2394
1969void 2395void
1970ev_unloop (EV_P_ int how) 2396ev_unloop (EV_P_ int how)
1971{ 2397{
1972 loop_done = how; 2398 loop_done = how;
1973} 2399}
1974 2400
2401void
2402ev_ref (EV_P)
2403{
2404 ++activecnt;
2405}
2406
2407void
2408ev_unref (EV_P)
2409{
2410 --activecnt;
2411}
2412
2413void
2414ev_now_update (EV_P)
2415{
2416 time_update (EV_A_ 1e100);
2417}
2418
2419void
2420ev_suspend (EV_P)
2421{
2422 ev_now_update (EV_A);
2423}
2424
2425void
2426ev_resume (EV_P)
2427{
2428 ev_tstamp mn_prev = mn_now;
2429
2430 ev_now_update (EV_A);
2431 timers_reschedule (EV_A_ mn_now - mn_prev);
2432#if EV_PERIODIC_ENABLE
2433 /* TODO: really do this? */
2434 periodics_reschedule (EV_A);
2435#endif
2436}
2437
1975/*****************************************************************************/ 2438/*****************************************************************************/
2439/* singly-linked list management, used when the expected list length is short */
1976 2440
1977void inline_size 2441inline_size void
1978wlist_add (WL *head, WL elem) 2442wlist_add (WL *head, WL elem)
1979{ 2443{
1980 elem->next = *head; 2444 elem->next = *head;
1981 *head = elem; 2445 *head = elem;
1982} 2446}
1983 2447
1984void inline_size 2448inline_size void
1985wlist_del (WL *head, WL elem) 2449wlist_del (WL *head, WL elem)
1986{ 2450{
1987 while (*head) 2451 while (*head)
1988 { 2452 {
1989 if (*head == elem) 2453 if (expect_true (*head == elem))
1990 { 2454 {
1991 *head = elem->next; 2455 *head = elem->next;
1992 return; 2456 break;
1993 } 2457 }
1994 2458
1995 head = &(*head)->next; 2459 head = &(*head)->next;
1996 } 2460 }
1997} 2461}
1998 2462
1999void inline_speed 2463/* internal, faster, version of ev_clear_pending */
2464inline_speed void
2000clear_pending (EV_P_ W w) 2465clear_pending (EV_P_ W w)
2001{ 2466{
2002 if (w->pending) 2467 if (w->pending)
2003 { 2468 {
2004 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2469 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2005 w->pending = 0; 2470 w->pending = 0;
2006 } 2471 }
2007} 2472}
2008 2473
2009int 2474int
… …
2013 int pending = w_->pending; 2478 int pending = w_->pending;
2014 2479
2015 if (expect_true (pending)) 2480 if (expect_true (pending))
2016 { 2481 {
2017 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2482 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2483 p->w = (W)&pending_w;
2018 w_->pending = 0; 2484 w_->pending = 0;
2019 p->w = 0;
2020 return p->events; 2485 return p->events;
2021 } 2486 }
2022 else 2487 else
2023 return 0; 2488 return 0;
2024} 2489}
2025 2490
2026void inline_size 2491inline_size void
2027pri_adjust (EV_P_ W w) 2492pri_adjust (EV_P_ W w)
2028{ 2493{
2029 int pri = w->priority; 2494 int pri = ev_priority (w);
2030 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2495 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2031 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2496 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2032 w->priority = pri; 2497 ev_set_priority (w, pri);
2033} 2498}
2034 2499
2035void inline_speed 2500inline_speed void
2036ev_start (EV_P_ W w, int active) 2501ev_start (EV_P_ W w, int active)
2037{ 2502{
2038 pri_adjust (EV_A_ w); 2503 pri_adjust (EV_A_ w);
2039 w->active = active; 2504 w->active = active;
2040 ev_ref (EV_A); 2505 ev_ref (EV_A);
2041} 2506}
2042 2507
2043void inline_size 2508inline_size void
2044ev_stop (EV_P_ W w) 2509ev_stop (EV_P_ W w)
2045{ 2510{
2046 ev_unref (EV_A); 2511 ev_unref (EV_A);
2047 w->active = 0; 2512 w->active = 0;
2048} 2513}
… …
2055 int fd = w->fd; 2520 int fd = w->fd;
2056 2521
2057 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2058 return; 2523 return;
2059 2524
2060 assert (("ev_io_start called with negative fd", fd >= 0)); 2525 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2061 2527
2062 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2063 2529
2064 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2065 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2066 wlist_add (&anfds[fd].head, (WL)w); 2532 wlist_add (&anfds[fd].head, (WL)w);
2067 2533
2068 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2534 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2069 w->events &= ~EV_IOFDSET; 2535 w->events &= ~EV__IOFDSET;
2070 2536
2071 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2072} 2538}
2073 2539
2074void noinline 2540void noinline
… …
2076{ 2542{
2077 clear_pending (EV_A_ (W)w); 2543 clear_pending (EV_A_ (W)w);
2078 if (expect_false (!ev_is_active (w))) 2544 if (expect_false (!ev_is_active (w)))
2079 return; 2545 return;
2080 2546
2081 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2547 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2082 2548
2083 EV_FREQUENT_CHECK; 2549 EV_FREQUENT_CHECK;
2084 2550
2085 wlist_del (&anfds[w->fd].head, (WL)w); 2551 wlist_del (&anfds[w->fd].head, (WL)w);
2086 ev_stop (EV_A_ (W)w); 2552 ev_stop (EV_A_ (W)w);
… …
2096 if (expect_false (ev_is_active (w))) 2562 if (expect_false (ev_is_active (w)))
2097 return; 2563 return;
2098 2564
2099 ev_at (w) += mn_now; 2565 ev_at (w) += mn_now;
2100 2566
2101 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2567 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2102 2568
2103 EV_FREQUENT_CHECK; 2569 EV_FREQUENT_CHECK;
2104 2570
2105 ++timercnt; 2571 ++timercnt;
2106 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2572 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2109 ANHE_at_cache (timers [ev_active (w)]); 2575 ANHE_at_cache (timers [ev_active (w)]);
2110 upheap (timers, ev_active (w)); 2576 upheap (timers, ev_active (w));
2111 2577
2112 EV_FREQUENT_CHECK; 2578 EV_FREQUENT_CHECK;
2113 2579
2114 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2580 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2115} 2581}
2116 2582
2117void noinline 2583void noinline
2118ev_timer_stop (EV_P_ ev_timer *w) 2584ev_timer_stop (EV_P_ ev_timer *w)
2119{ 2585{
… …
2124 EV_FREQUENT_CHECK; 2590 EV_FREQUENT_CHECK;
2125 2591
2126 { 2592 {
2127 int active = ev_active (w); 2593 int active = ev_active (w);
2128 2594
2129 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2595 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2130 2596
2131 --timercnt; 2597 --timercnt;
2132 2598
2133 if (expect_true (active < timercnt + HEAP0)) 2599 if (expect_true (active < timercnt + HEAP0))
2134 { 2600 {
2135 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2136 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2137 } 2603 }
2138 } 2604 }
2139 2605
2140 EV_FREQUENT_CHECK;
2141
2142 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2143 2607
2144 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2145} 2611}
2146 2612
2147void noinline 2613void noinline
2148ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2149{ 2615{
… …
2167 } 2633 }
2168 2634
2169 EV_FREQUENT_CHECK; 2635 EV_FREQUENT_CHECK;
2170} 2636}
2171 2637
2638ev_tstamp
2639ev_timer_remaining (EV_P_ ev_timer *w)
2640{
2641 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2642}
2643
2172#if EV_PERIODIC_ENABLE 2644#if EV_PERIODIC_ENABLE
2173void noinline 2645void noinline
2174ev_periodic_start (EV_P_ ev_periodic *w) 2646ev_periodic_start (EV_P_ ev_periodic *w)
2175{ 2647{
2176 if (expect_false (ev_is_active (w))) 2648 if (expect_false (ev_is_active (w)))
… …
2178 2650
2179 if (w->reschedule_cb) 2651 if (w->reschedule_cb)
2180 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2652 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2181 else if (w->interval) 2653 else if (w->interval)
2182 { 2654 {
2183 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2655 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2184 /* this formula differs from the one in periodic_reify because we do not always round up */ 2656 /* this formula differs from the one in periodic_reify because we do not always round up */
2185 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2657 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2186 } 2658 }
2187 else 2659 else
2188 ev_at (w) = w->offset; 2660 ev_at (w) = w->offset;
… …
2196 ANHE_at_cache (periodics [ev_active (w)]); 2668 ANHE_at_cache (periodics [ev_active (w)]);
2197 upheap (periodics, ev_active (w)); 2669 upheap (periodics, ev_active (w));
2198 2670
2199 EV_FREQUENT_CHECK; 2671 EV_FREQUENT_CHECK;
2200 2672
2201 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2673 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2202} 2674}
2203 2675
2204void noinline 2676void noinline
2205ev_periodic_stop (EV_P_ ev_periodic *w) 2677ev_periodic_stop (EV_P_ ev_periodic *w)
2206{ 2678{
… …
2211 EV_FREQUENT_CHECK; 2683 EV_FREQUENT_CHECK;
2212 2684
2213 { 2685 {
2214 int active = ev_active (w); 2686 int active = ev_active (w);
2215 2687
2216 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2688 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2217 2689
2218 --periodiccnt; 2690 --periodiccnt;
2219 2691
2220 if (expect_true (active < periodiccnt + HEAP0)) 2692 if (expect_true (active < periodiccnt + HEAP0))
2221 { 2693 {
2222 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2223 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2224 } 2696 }
2225 } 2697 }
2226 2698
2227 EV_FREQUENT_CHECK;
2228
2229 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2230} 2702}
2231 2703
2232void noinline 2704void noinline
2233ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2234{ 2706{
… …
2243#endif 2715#endif
2244 2716
2245void noinline 2717void noinline
2246ev_signal_start (EV_P_ ev_signal *w) 2718ev_signal_start (EV_P_ ev_signal *w)
2247{ 2719{
2248#if EV_MULTIPLICITY
2249 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2250#endif
2251 if (expect_false (ev_is_active (w))) 2720 if (expect_false (ev_is_active (w)))
2252 return; 2721 return;
2253 2722
2254 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2723 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2255 2724
2256 evpipe_init (EV_A); 2725#if EV_MULTIPLICITY
2726 assert (("libev: a signal must not be attached to two different loops",
2727 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2257 2728
2258 EV_FREQUENT_CHECK; 2729 signals [w->signum - 1].loop = EV_A;
2730#endif
2259 2731
2732 EV_FREQUENT_CHECK;
2733
2734#if EV_USE_SIGNALFD
2735 if (sigfd == -2)
2260 { 2736 {
2261#ifndef _WIN32 2737 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2262 sigset_t full, prev; 2738 if (sigfd < 0 && errno == EINVAL)
2263 sigfillset (&full); 2739 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2264 sigprocmask (SIG_SETMASK, &full, &prev);
2265#endif
2266 2740
2267 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2741 if (sigfd >= 0)
2742 {
2743 fd_intern (sigfd); /* doing it twice will not hurt */
2268 2744
2269#ifndef _WIN32 2745 sigemptyset (&sigfd_set);
2270 sigprocmask (SIG_SETMASK, &prev, 0); 2746
2271#endif 2747 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2748 ev_set_priority (&sigfd_w, EV_MAXPRI);
2749 ev_io_start (EV_A_ &sigfd_w);
2750 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2751 }
2272 } 2752 }
2753
2754 if (sigfd >= 0)
2755 {
2756 /* TODO: check .head */
2757 sigaddset (&sigfd_set, w->signum);
2758 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2759
2760 signalfd (sigfd, &sigfd_set, 0);
2761 }
2762#endif
2273 2763
2274 ev_start (EV_A_ (W)w, 1); 2764 ev_start (EV_A_ (W)w, 1);
2275 wlist_add (&signals [w->signum - 1].head, (WL)w); 2765 wlist_add (&signals [w->signum - 1].head, (WL)w);
2276 2766
2277 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2768# if EV_USE_SIGNALFD
2769 if (sigfd < 0) /*TODO*/
2770# endif
2278 { 2771 {
2279#if _WIN32 2772# ifdef _WIN32
2773 evpipe_init (EV_A);
2774
2280 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2281#else 2776# else
2282 struct sigaction sa; 2777 struct sigaction sa;
2778
2779 evpipe_init (EV_A);
2780
2283 sa.sa_handler = ev_sighandler; 2781 sa.sa_handler = ev_sighandler;
2284 sigfillset (&sa.sa_mask); 2782 sigfillset (&sa.sa_mask);
2285 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2783 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2286 sigaction (w->signum, &sa, 0); 2784 sigaction (w->signum, &sa, 0);
2785
2786 sigemptyset (&sa.sa_mask);
2787 sigaddset (&sa.sa_mask, w->signum);
2788 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2287#endif 2789#endif
2288 } 2790 }
2289 2791
2290 EV_FREQUENT_CHECK; 2792 EV_FREQUENT_CHECK;
2291} 2793}
2292 2794
2293void noinline 2795void noinline
… …
2301 2803
2302 wlist_del (&signals [w->signum - 1].head, (WL)w); 2804 wlist_del (&signals [w->signum - 1].head, (WL)w);
2303 ev_stop (EV_A_ (W)w); 2805 ev_stop (EV_A_ (W)w);
2304 2806
2305 if (!signals [w->signum - 1].head) 2807 if (!signals [w->signum - 1].head)
2808 {
2809#if EV_MULTIPLICITY
2810 signals [w->signum - 1].loop = 0; /* unattach from signal */
2811#endif
2812#if EV_USE_SIGNALFD
2813 if (sigfd >= 0)
2814 {
2815 sigset_t ss;
2816
2817 sigemptyset (&ss);
2818 sigaddset (&ss, w->signum);
2819 sigdelset (&sigfd_set, w->signum);
2820
2821 signalfd (sigfd, &sigfd_set, 0);
2822 sigprocmask (SIG_UNBLOCK, &ss, 0);
2823 }
2824 else
2825#endif
2306 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2827 }
2307 2828
2308 EV_FREQUENT_CHECK; 2829 EV_FREQUENT_CHECK;
2309} 2830}
2310 2831
2311void 2832void
2312ev_child_start (EV_P_ ev_child *w) 2833ev_child_start (EV_P_ ev_child *w)
2313{ 2834{
2314#if EV_MULTIPLICITY 2835#if EV_MULTIPLICITY
2315 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2836 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2316#endif 2837#endif
2317 if (expect_false (ev_is_active (w))) 2838 if (expect_false (ev_is_active (w)))
2318 return; 2839 return;
2319 2840
2320 EV_FREQUENT_CHECK; 2841 EV_FREQUENT_CHECK;
… …
2345# ifdef _WIN32 2866# ifdef _WIN32
2346# undef lstat 2867# undef lstat
2347# define lstat(a,b) _stati64 (a,b) 2868# define lstat(a,b) _stati64 (a,b)
2348# endif 2869# endif
2349 2870
2350#define DEF_STAT_INTERVAL 5.0074891 2871#define DEF_STAT_INTERVAL 5.0074891
2872#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2351#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2352 2874
2353static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2875static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2354 2876
2355#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2356# define EV_INOTIFY_BUFSIZE 8192 2878
2879/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2880# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2357 2881
2358static void noinline 2882static void noinline
2359infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2360{ 2884{
2361 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); 2885 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);
2362 2886
2363 if (w->wd < 0) 2887 if (w->wd >= 0)
2888 {
2889 struct statfs sfs;
2890
2891 /* now local changes will be tracked by inotify, but remote changes won't */
2892 /* unless the filesystem is known to be local, we therefore still poll */
2893 /* also do poll on <2.6.25, but with normal frequency */
2894
2895 if (!fs_2625)
2896 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2897 else if (!statfs (w->path, &sfs)
2898 && (sfs.f_type == 0x1373 /* devfs */
2899 || sfs.f_type == 0xEF53 /* ext2/3 */
2900 || sfs.f_type == 0x3153464a /* jfs */
2901 || sfs.f_type == 0x52654973 /* reiser3 */
2902 || sfs.f_type == 0x01021994 /* tempfs */
2903 || sfs.f_type == 0x58465342 /* xfs */))
2904 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2905 else
2906 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2364 { 2907 }
2365 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2908 else
2909 {
2910 /* can't use inotify, continue to stat */
2911 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2366 2912
2367 /* monitor some parent directory for speedup hints */ 2913 /* if path is not there, monitor some parent directory for speedup hints */
2368 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2914 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2369 /* but an efficiency issue only */ 2915 /* but an efficiency issue only */
2370 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2916 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2371 { 2917 {
2372 char path [4096]; 2918 char path [4096];
2373 strcpy (path, w->path); 2919 strcpy (path, w->path);
… …
2377 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2923 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2378 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2924 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2379 2925
2380 char *pend = strrchr (path, '/'); 2926 char *pend = strrchr (path, '/');
2381 2927
2382 if (!pend) 2928 if (!pend || pend == path)
2383 break; /* whoops, no '/', complain to your admin */ 2929 break;
2384 2930
2385 *pend = 0; 2931 *pend = 0;
2386 w->wd = inotify_add_watch (fs_fd, path, mask); 2932 w->wd = inotify_add_watch (fs_fd, path, mask);
2387 } 2933 }
2388 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2389 } 2935 }
2390 } 2936 }
2391 else
2392 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2393 2937
2394 if (w->wd >= 0) 2938 if (w->wd >= 0)
2395 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2939 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2940
2941 /* now re-arm timer, if required */
2942 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2943 ev_timer_again (EV_A_ &w->timer);
2944 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2396} 2945}
2397 2946
2398static void noinline 2947static void noinline
2399infy_del (EV_P_ ev_stat *w) 2948infy_del (EV_P_ ev_stat *w)
2400{ 2949{
… …
2414 2963
2415static void noinline 2964static void noinline
2416infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2965infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2417{ 2966{
2418 if (slot < 0) 2967 if (slot < 0)
2419 /* overflow, need to check for all hahs slots */ 2968 /* overflow, need to check for all hash slots */
2420 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2969 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2421 infy_wd (EV_A_ slot, wd, ev); 2970 infy_wd (EV_A_ slot, wd, ev);
2422 else 2971 else
2423 { 2972 {
2424 WL w_; 2973 WL w_;
… …
2430 2979
2431 if (w->wd == wd || wd == -1) 2980 if (w->wd == wd || wd == -1)
2432 { 2981 {
2433 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2982 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2434 { 2983 {
2984 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2435 w->wd = -1; 2985 w->wd = -1;
2436 infy_add (EV_A_ w); /* re-add, no matter what */ 2986 infy_add (EV_A_ w); /* re-add, no matter what */
2437 } 2987 }
2438 2988
2439 stat_timer_cb (EV_A_ &w->timer, 0); 2989 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2444 2994
2445static void 2995static void
2446infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2447{ 2997{
2448 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2449 struct inotify_event *ev = (struct inotify_event *)buf;
2450 int ofs; 2999 int ofs;
2451 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2452 3001
2453 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3002 for (ofs = 0; ofs < len; )
3003 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2454 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3005 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len;
3007 }
2455} 3008}
2456 3009
2457void inline_size 3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
3040}
3041
3042inline_size void
3043ev_check_2625 (EV_P)
3044{
3045 /* kernels < 2.6.25 are borked
3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3047 */
3048 if (ev_linux_version () < 0x020619)
3049 return;
3050
3051 fs_2625 = 1;
3052}
3053
3054inline_size int
3055infy_newfd (void)
3056{
3057#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3058 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3059 if (fd >= 0)
3060 return fd;
3061#endif
3062 return inotify_init ();
3063}
3064
3065inline_size void
2458infy_init (EV_P) 3066infy_init (EV_P)
2459{ 3067{
2460 if (fs_fd != -2) 3068 if (fs_fd != -2)
2461 return; 3069 return;
2462 3070
3071 fs_fd = -1;
3072
3073 ev_check_2625 (EV_A);
3074
2463 fs_fd = inotify_init (); 3075 fs_fd = infy_newfd ();
2464 3076
2465 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
2466 { 3078 {
3079 fd_intern (fs_fd);
2467 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3080 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2468 ev_set_priority (&fs_w, EV_MAXPRI); 3081 ev_set_priority (&fs_w, EV_MAXPRI);
2469 ev_io_start (EV_A_ &fs_w); 3082 ev_io_start (EV_A_ &fs_w);
3083 ev_unref (EV_A);
2470 } 3084 }
2471} 3085}
2472 3086
2473void inline_size 3087inline_size void
2474infy_fork (EV_P) 3088infy_fork (EV_P)
2475{ 3089{
2476 int slot; 3090 int slot;
2477 3091
2478 if (fs_fd < 0) 3092 if (fs_fd < 0)
2479 return; 3093 return;
2480 3094
3095 ev_ref (EV_A);
3096 ev_io_stop (EV_A_ &fs_w);
2481 close (fs_fd); 3097 close (fs_fd);
2482 fs_fd = inotify_init (); 3098 fs_fd = infy_newfd ();
3099
3100 if (fs_fd >= 0)
3101 {
3102 fd_intern (fs_fd);
3103 ev_io_set (&fs_w, fs_fd, EV_READ);
3104 ev_io_start (EV_A_ &fs_w);
3105 ev_unref (EV_A);
3106 }
2483 3107
2484 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2485 { 3109 {
2486 WL w_ = fs_hash [slot].head; 3110 WL w_ = fs_hash [slot].head;
2487 fs_hash [slot].head = 0; 3111 fs_hash [slot].head = 0;
… …
2494 w->wd = -1; 3118 w->wd = -1;
2495 3119
2496 if (fs_fd >= 0) 3120 if (fs_fd >= 0)
2497 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2498 else 3122 else
3123 {
3124 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3125 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2499 ev_timer_start (EV_A_ &w->timer); 3126 ev_timer_again (EV_A_ &w->timer);
3127 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3128 }
2500 } 3129 }
2501
2502 } 3130 }
2503} 3131}
2504 3132
3133#endif
3134
3135#ifdef _WIN32
3136# define EV_LSTAT(p,b) _stati64 (p, b)
3137#else
3138# define EV_LSTAT(p,b) lstat (p, b)
2505#endif 3139#endif
2506 3140
2507void 3141void
2508ev_stat_stat (EV_P_ ev_stat *w) 3142ev_stat_stat (EV_P_ ev_stat *w)
2509{ 3143{
… …
2516static void noinline 3150static void noinline
2517stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3151stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2518{ 3152{
2519 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3153 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2520 3154
2521 /* we copy this here each the time so that */ 3155 ev_statdata prev = w->attr;
2522 /* prev has the old value when the callback gets invoked */
2523 w->prev = w->attr;
2524 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
2525 3157
2526 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3158 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2527 if ( 3159 if (
2528 w->prev.st_dev != w->attr.st_dev 3160 prev.st_dev != w->attr.st_dev
2529 || w->prev.st_ino != w->attr.st_ino 3161 || prev.st_ino != w->attr.st_ino
2530 || w->prev.st_mode != w->attr.st_mode 3162 || prev.st_mode != w->attr.st_mode
2531 || w->prev.st_nlink != w->attr.st_nlink 3163 || prev.st_nlink != w->attr.st_nlink
2532 || w->prev.st_uid != w->attr.st_uid 3164 || prev.st_uid != w->attr.st_uid
2533 || w->prev.st_gid != w->attr.st_gid 3165 || prev.st_gid != w->attr.st_gid
2534 || w->prev.st_rdev != w->attr.st_rdev 3166 || prev.st_rdev != w->attr.st_rdev
2535 || w->prev.st_size != w->attr.st_size 3167 || prev.st_size != w->attr.st_size
2536 || w->prev.st_atime != w->attr.st_atime 3168 || prev.st_atime != w->attr.st_atime
2537 || w->prev.st_mtime != w->attr.st_mtime 3169 || prev.st_mtime != w->attr.st_mtime
2538 || w->prev.st_ctime != w->attr.st_ctime 3170 || prev.st_ctime != w->attr.st_ctime
2539 ) { 3171 ) {
3172 /* we only update w->prev on actual differences */
3173 /* in case we test more often than invoke the callback, */
3174 /* to ensure that prev is always different to attr */
3175 w->prev = prev;
3176
2540 #if EV_USE_INOTIFY 3177 #if EV_USE_INOTIFY
3178 if (fs_fd >= 0)
3179 {
2541 infy_del (EV_A_ w); 3180 infy_del (EV_A_ w);
2542 infy_add (EV_A_ w); 3181 infy_add (EV_A_ w);
2543 ev_stat_stat (EV_A_ w); /* avoid race... */ 3182 ev_stat_stat (EV_A_ w); /* avoid race... */
3183 }
2544 #endif 3184 #endif
2545 3185
2546 ev_feed_event (EV_A_ w, EV_STAT); 3186 ev_feed_event (EV_A_ w, EV_STAT);
2547 } 3187 }
2548} 3188}
… …
2551ev_stat_start (EV_P_ ev_stat *w) 3191ev_stat_start (EV_P_ ev_stat *w)
2552{ 3192{
2553 if (expect_false (ev_is_active (w))) 3193 if (expect_false (ev_is_active (w)))
2554 return; 3194 return;
2555 3195
2556 /* since we use memcmp, we need to clear any padding data etc. */
2557 memset (&w->prev, 0, sizeof (ev_statdata));
2558 memset (&w->attr, 0, sizeof (ev_statdata));
2559
2560 ev_stat_stat (EV_A_ w); 3196 ev_stat_stat (EV_A_ w);
2561 3197
3198 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2562 if (w->interval < MIN_STAT_INTERVAL) 3199 w->interval = MIN_STAT_INTERVAL;
2563 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2564 3200
2565 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3201 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2566 ev_set_priority (&w->timer, ev_priority (w)); 3202 ev_set_priority (&w->timer, ev_priority (w));
2567 3203
2568#if EV_USE_INOTIFY 3204#if EV_USE_INOTIFY
2569 infy_init (EV_A); 3205 infy_init (EV_A);
2570 3206
2571 if (fs_fd >= 0) 3207 if (fs_fd >= 0)
2572 infy_add (EV_A_ w); 3208 infy_add (EV_A_ w);
2573 else 3209 else
2574#endif 3210#endif
3211 {
2575 ev_timer_start (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 ev_unref (EV_A);
3214 }
2576 3215
2577 ev_start (EV_A_ (W)w, 1); 3216 ev_start (EV_A_ (W)w, 1);
2578 3217
2579 EV_FREQUENT_CHECK; 3218 EV_FREQUENT_CHECK;
2580} 3219}
… …
2589 EV_FREQUENT_CHECK; 3228 EV_FREQUENT_CHECK;
2590 3229
2591#if EV_USE_INOTIFY 3230#if EV_USE_INOTIFY
2592 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
2593#endif 3232#endif
3233
3234 if (ev_is_active (&w->timer))
3235 {
3236 ev_ref (EV_A);
2594 ev_timer_stop (EV_A_ &w->timer); 3237 ev_timer_stop (EV_A_ &w->timer);
3238 }
2595 3239
2596 ev_stop (EV_A_ (W)w); 3240 ev_stop (EV_A_ (W)w);
2597 3241
2598 EV_FREQUENT_CHECK; 3242 EV_FREQUENT_CHECK;
2599} 3243}
… …
2740embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2741{ 3385{
2742 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3386 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2743 3387
2744 { 3388 {
2745 struct ev_loop *loop = w->other; 3389 EV_P = w->other;
2746 3390
2747 while (fdchangecnt) 3391 while (fdchangecnt)
2748 { 3392 {
2749 fd_reify (EV_A); 3393 fd_reify (EV_A);
2750 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3394 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2751 } 3395 }
2752 } 3396 }
2753} 3397}
2754 3398
3399static void
3400embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3401{
3402 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3403
3404 ev_embed_stop (EV_A_ w);
3405
3406 {
3407 EV_P = w->other;
3408
3409 ev_loop_fork (EV_A);
3410 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3411 }
3412
3413 ev_embed_start (EV_A_ w);
3414}
3415
2755#if 0 3416#if 0
2756static void 3417static void
2757embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3418embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2758{ 3419{
2759 ev_idle_stop (EV_A_ idle); 3420 ev_idle_stop (EV_A_ idle);
… …
2765{ 3426{
2766 if (expect_false (ev_is_active (w))) 3427 if (expect_false (ev_is_active (w)))
2767 return; 3428 return;
2768 3429
2769 { 3430 {
2770 struct ev_loop *loop = w->other; 3431 EV_P = w->other;
2771 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3432 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2772 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3433 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2773 } 3434 }
2774 3435
2775 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
2776 3437
… …
2779 3440
2780 ev_prepare_init (&w->prepare, embed_prepare_cb); 3441 ev_prepare_init (&w->prepare, embed_prepare_cb);
2781 ev_set_priority (&w->prepare, EV_MINPRI); 3442 ev_set_priority (&w->prepare, EV_MINPRI);
2782 ev_prepare_start (EV_A_ &w->prepare); 3443 ev_prepare_start (EV_A_ &w->prepare);
2783 3444
3445 ev_fork_init (&w->fork, embed_fork_cb);
3446 ev_fork_start (EV_A_ &w->fork);
3447
2784 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3448 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2785 3449
2786 ev_start (EV_A_ (W)w, 1); 3450 ev_start (EV_A_ (W)w, 1);
2787 3451
2788 EV_FREQUENT_CHECK; 3452 EV_FREQUENT_CHECK;
… …
2795 if (expect_false (!ev_is_active (w))) 3459 if (expect_false (!ev_is_active (w)))
2796 return; 3460 return;
2797 3461
2798 EV_FREQUENT_CHECK; 3462 EV_FREQUENT_CHECK;
2799 3463
2800 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
2801 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
3466 ev_fork_stop (EV_A_ &w->fork);
2802 3467
2803 ev_stop (EV_A_ (W)w); 3468 ev_stop (EV_A_ (W)w);
2804 3469
2805 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
2806} 3471}
… …
2885 3550
2886void 3551void
2887ev_async_send (EV_P_ ev_async *w) 3552ev_async_send (EV_P_ ev_async *w)
2888{ 3553{
2889 w->sent = 1; 3554 w->sent = 1;
2890 evpipe_write (EV_A_ &gotasync); 3555 evpipe_write (EV_A_ &async_pending);
2891} 3556}
2892#endif 3557#endif
2893 3558
2894/*****************************************************************************/ 3559/*****************************************************************************/
2895 3560
… …
2905once_cb (EV_P_ struct ev_once *once, int revents) 3570once_cb (EV_P_ struct ev_once *once, int revents)
2906{ 3571{
2907 void (*cb)(int revents, void *arg) = once->cb; 3572 void (*cb)(int revents, void *arg) = once->cb;
2908 void *arg = once->arg; 3573 void *arg = once->arg;
2909 3574
2910 ev_io_stop (EV_A_ &once->io); 3575 ev_io_stop (EV_A_ &once->io);
2911 ev_timer_stop (EV_A_ &once->to); 3576 ev_timer_stop (EV_A_ &once->to);
2912 ev_free (once); 3577 ev_free (once);
2913 3578
2914 cb (revents, arg); 3579 cb (revents, arg);
2915} 3580}
2916 3581
2917static void 3582static void
2918once_cb_io (EV_P_ ev_io *w, int revents) 3583once_cb_io (EV_P_ ev_io *w, int revents)
2919{ 3584{
2920 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3585 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3586
3587 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2921} 3588}
2922 3589
2923static void 3590static void
2924once_cb_to (EV_P_ ev_timer *w, int revents) 3591once_cb_to (EV_P_ ev_timer *w, int revents)
2925{ 3592{
2926 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3593 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3594
3595 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2927} 3596}
2928 3597
2929void 3598void
2930ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3599ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2931{ 3600{
… …
2953 ev_timer_set (&once->to, timeout, 0.); 3622 ev_timer_set (&once->to, timeout, 0.);
2954 ev_timer_start (EV_A_ &once->to); 3623 ev_timer_start (EV_A_ &once->to);
2955 } 3624 }
2956} 3625}
2957 3626
3627/*****************************************************************************/
3628
3629#if EV_WALK_ENABLE
3630void
3631ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3632{
3633 int i, j;
3634 ev_watcher_list *wl, *wn;
3635
3636 if (types & (EV_IO | EV_EMBED))
3637 for (i = 0; i < anfdmax; ++i)
3638 for (wl = anfds [i].head; wl; )
3639 {
3640 wn = wl->next;
3641
3642#if EV_EMBED_ENABLE
3643 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3644 {
3645 if (types & EV_EMBED)
3646 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3647 }
3648 else
3649#endif
3650#if EV_USE_INOTIFY
3651 if (ev_cb ((ev_io *)wl) == infy_cb)
3652 ;
3653 else
3654#endif
3655 if ((ev_io *)wl != &pipe_w)
3656 if (types & EV_IO)
3657 cb (EV_A_ EV_IO, wl);
3658
3659 wl = wn;
3660 }
3661
3662 if (types & (EV_TIMER | EV_STAT))
3663 for (i = timercnt + HEAP0; i-- > HEAP0; )
3664#if EV_STAT_ENABLE
3665 /*TODO: timer is not always active*/
3666 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3667 {
3668 if (types & EV_STAT)
3669 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3670 }
3671 else
3672#endif
3673 if (types & EV_TIMER)
3674 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3675
3676#if EV_PERIODIC_ENABLE
3677 if (types & EV_PERIODIC)
3678 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3679 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3680#endif
3681
3682#if EV_IDLE_ENABLE
3683 if (types & EV_IDLE)
3684 for (j = NUMPRI; i--; )
3685 for (i = idlecnt [j]; i--; )
3686 cb (EV_A_ EV_IDLE, idles [j][i]);
3687#endif
3688
3689#if EV_FORK_ENABLE
3690 if (types & EV_FORK)
3691 for (i = forkcnt; i--; )
3692 if (ev_cb (forks [i]) != embed_fork_cb)
3693 cb (EV_A_ EV_FORK, forks [i]);
3694#endif
3695
3696#if EV_ASYNC_ENABLE
3697 if (types & EV_ASYNC)
3698 for (i = asynccnt; i--; )
3699 cb (EV_A_ EV_ASYNC, asyncs [i]);
3700#endif
3701
3702 if (types & EV_PREPARE)
3703 for (i = preparecnt; i--; )
3704#if EV_EMBED_ENABLE
3705 if (ev_cb (prepares [i]) != embed_prepare_cb)
3706#endif
3707 cb (EV_A_ EV_PREPARE, prepares [i]);
3708
3709 if (types & EV_CHECK)
3710 for (i = checkcnt; i--; )
3711 cb (EV_A_ EV_CHECK, checks [i]);
3712
3713 if (types & EV_SIGNAL)
3714 for (i = 0; i < EV_NSIG - 1; ++i)
3715 for (wl = signals [i].head; wl; )
3716 {
3717 wn = wl->next;
3718 cb (EV_A_ EV_SIGNAL, wl);
3719 wl = wn;
3720 }
3721
3722 if (types & EV_CHILD)
3723 for (i = EV_PID_HASHSIZE; i--; )
3724 for (wl = childs [i]; wl; )
3725 {
3726 wn = wl->next;
3727 cb (EV_A_ EV_CHILD, wl);
3728 wl = wn;
3729 }
3730/* EV_STAT 0x00001000 /* stat data changed */
3731/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3732}
3733#endif
3734
2958#if EV_MULTIPLICITY 3735#if EV_MULTIPLICITY
2959 #include "ev_wrap.h" 3736 #include "ev_wrap.h"
2960#endif 3737#endif
2961 3738
2962#ifdef __cplusplus 3739#ifdef __cplusplus

Diff Legend

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