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

Comparing libev/ev.c (file contents):
Revision 1.269 by root, Wed Oct 29 06:32:48 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
… …
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
… …
164# endif 188# endif
165#endif 189#endif
166 190
167/* 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 */
168 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
169#ifndef EV_USE_MONOTONIC 228#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 229# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 230# define EV_USE_MONOTONIC 1
172# else 231# else
173# define EV_USE_MONOTONIC 0 232# define EV_USE_MONOTONIC 0
174# endif 233# endif
175#endif 234#endif
176 235
177#ifndef EV_USE_REALTIME 236#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 237# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 238#endif
180 239
181#ifndef EV_USE_NANOSLEEP 240#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 241# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 242# define EV_USE_NANOSLEEP 1
… …
244# else 303# else
245# define EV_USE_EVENTFD 0 304# define EV_USE_EVENTFD 0
246# endif 305# endif
247#endif 306#endif
248 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
249#if 0 /* debugging */ 316#if 0 /* debugging */
250# define EV_VERIFY 3 317# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 318# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 319# define EV_HEAP_CACHE_AT 1
253#endif 320#endif
… …
262 329
263#ifndef EV_HEAP_CACHE_AT 330#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 331# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 332#endif
266 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
267/* 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
268 355
269#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
272#endif 359#endif
… …
287# endif 374# endif
288#endif 375#endif
289 376
290#if EV_USE_INOTIFY 377#if EV_USE_INOTIFY
291# include <sys/utsname.h> 378# include <sys/utsname.h>
379# include <sys/statfs.h>
292# include <sys/inotify.h> 380# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 381/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 382# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 383# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 384# define EV_USE_INOTIFY 0
… …
302#endif 390#endif
303 391
304#if EV_USE_EVENTFD 392#if EV_USE_EVENTFD
305/* 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 */
306# 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
307# ifdef __cplusplus 405# ifdef __cplusplus
308extern "C" { 406extern "C" {
309# endif 407# endif
310int eventfd (unsigned int initval, int flags); 408int (eventfd) (unsigned int initval, int flags);
311# ifdef __cplusplus 409# ifdef __cplusplus
312} 410}
313# endif 411# endif
314#endif 412#endif
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
315 442
316/**/ 443/**/
317 444
318#if EV_VERIFY >= 3 445#if EV_VERIFY >= 3
319# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
331 */ 458 */
332#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
333 460
334#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) */
335#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) */
336/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
337 463
338#if __GNUC__ >= 4 464#if __GNUC__ >= 4
339# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
340# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
341#else 467#else
… …
354# define inline_speed static noinline 480# define inline_speed static noinline
355#else 481#else
356# define inline_speed static inline 482# define inline_speed static inline
357#endif 483#endif
358 484
359#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
360#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 490# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
491#endif
361 492
362#define EMPTY /* required for microsofts broken pseudo-c compiler */ 493#define EMPTY /* required for microsofts broken pseudo-c compiler */
363#define EMPTY2(a,b) /* used to suppress some warnings */ 494#define EMPTY2(a,b) /* used to suppress some warnings */
364 495
365typedef ev_watcher *W; 496typedef ev_watcher *W;
… …
367typedef ev_watcher_time *WT; 498typedef ev_watcher_time *WT;
368 499
369#define ev_active(w) ((W)(w))->active 500#define ev_active(w) ((W)(w))->active
370#define ev_at(w) ((WT)(w))->at 501#define ev_at(w) ((WT)(w))->at
371 502
372#if EV_USE_MONOTONIC 503#if EV_USE_REALTIME
373/* 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 */
374/* 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
375static 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)
376#endif 521#endif
377 522
378#ifdef _WIN32 523#ifdef _WIN32
379# include "ev_win32.c" 524# include "ev_win32.c"
380#endif 525#endif
… …
397 542
398 if (syserr_cb) 543 if (syserr_cb)
399 syserr_cb (msg); 544 syserr_cb (msg);
400 else 545 else
401 { 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
402 perror (msg); 554 perror (msg);
555#endif
403 abort (); 556 abort ();
404 } 557 }
405} 558}
406 559
407static void * 560static void *
… …
432{ 585{
433 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
434 587
435 if (!ptr && size) 588 if (!ptr && size)
436 { 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
437 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
438 abort (); 596 abort ();
439 } 597 }
440 598
441 return ptr; 599 return ptr;
442} 600}
… …
444#define ev_malloc(size) ev_realloc (0, (size)) 602#define ev_malloc(size) ev_realloc (0, (size))
445#define ev_free(ptr) ev_realloc ((ptr), 0) 603#define ev_free(ptr) ev_realloc ((ptr), 0)
446 604
447/*****************************************************************************/ 605/*****************************************************************************/
448 606
607/* set in reify when reification needed */
608#define EV_ANFD_REIFY 1
609
610/* file descriptor info structure */
449typedef struct 611typedef struct
450{ 612{
451 WL head; 613 WL head;
452 unsigned char events; 614 unsigned char events; /* the events watched for */
453 unsigned char reify; 615 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 616 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused; 617 unsigned char unused;
456#if EV_USE_EPOLL 618#if EV_USE_EPOLL
457 unsigned int egen; /* generation counter to counter epoll bugs */ 619 unsigned int egen; /* generation counter to counter epoll bugs */
458#endif 620#endif
459#if EV_SELECT_IS_WINSOCKET 621#if EV_SELECT_IS_WINSOCKET
460 SOCKET handle; 622 SOCKET handle;
461#endif 623#endif
462} ANFD; 624} ANFD;
463 625
626/* stores the pending event set for a given watcher */
464typedef struct 627typedef struct
465{ 628{
466 W w; 629 W w;
467 int events; 630 int events; /* the pending event set for the given watcher */
468} ANPENDING; 631} ANPENDING;
469 632
470#if EV_USE_INOTIFY 633#if EV_USE_INOTIFY
471/* hash table entry per inotify-id */ 634/* hash table entry per inotify-id */
472typedef struct 635typedef struct
… …
475} ANFS; 638} ANFS;
476#endif 639#endif
477 640
478/* Heap Entry */ 641/* Heap Entry */
479#if EV_HEAP_CACHE_AT 642#if EV_HEAP_CACHE_AT
643 /* a heap element */
480 typedef struct { 644 typedef struct {
481 ev_tstamp at; 645 ev_tstamp at;
482 WT w; 646 WT w;
483 } ANHE; 647 } ANHE;
484 648
485 #define ANHE_w(he) (he).w /* access watcher, read-write */ 649 #define ANHE_w(he) (he).w /* access watcher, read-write */
486 #define ANHE_at(he) (he).at /* access cached at, read-only */ 650 #define ANHE_at(he) (he).at /* access cached at, read-only */
487 #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 */
488#else 652#else
653 /* a heap element */
489 typedef WT ANHE; 654 typedef WT ANHE;
490 655
491 #define ANHE_w(he) (he) 656 #define ANHE_w(he) (he)
492 #define ANHE_at(he) (he)->at 657 #define ANHE_at(he) (he)->at
493 #define ANHE_at_cache(he) 658 #define ANHE_at_cache(he)
… …
517 682
518 static int ev_default_loop_ptr; 683 static int ev_default_loop_ptr;
519 684
520#endif 685#endif
521 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
522/*****************************************************************************/ 699/*****************************************************************************/
523 700
701#ifndef EV_HAVE_EV_TIME
524ev_tstamp 702ev_tstamp
525ev_time (void) 703ev_time (void)
526{ 704{
527#if EV_USE_REALTIME 705#if EV_USE_REALTIME
706 if (expect_true (have_realtime))
707 {
528 struct timespec ts; 708 struct timespec ts;
529 clock_gettime (CLOCK_REALTIME, &ts); 709 clock_gettime (CLOCK_REALTIME, &ts);
530 return ts.tv_sec + ts.tv_nsec * 1e-9; 710 return ts.tv_sec + ts.tv_nsec * 1e-9;
531#else 711 }
712#endif
713
532 struct timeval tv; 714 struct timeval tv;
533 gettimeofday (&tv, 0); 715 gettimeofday (&tv, 0);
534 return tv.tv_sec + tv.tv_usec * 1e-6; 716 return tv.tv_sec + tv.tv_usec * 1e-6;
535#endif
536} 717}
718#endif
537 719
538ev_tstamp inline_size 720inline_size ev_tstamp
539get_clock (void) 721get_clock (void)
540{ 722{
541#if EV_USE_MONOTONIC 723#if EV_USE_MONOTONIC
542 if (expect_true (have_monotonic)) 724 if (expect_true (have_monotonic))
543 { 725 {
… …
577 759
578 tv.tv_sec = (time_t)delay; 760 tv.tv_sec = (time_t)delay;
579 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 761 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
580 762
581 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 763 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
582 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 764 /* something not guaranteed by newer posix versions, but guaranteed */
583 /* by older ones */ 765 /* by older ones */
584 select (0, 0, 0, 0, &tv); 766 select (0, 0, 0, 0, &tv);
585#endif 767#endif
586 } 768 }
587} 769}
588 770
589/*****************************************************************************/ 771/*****************************************************************************/
590 772
591#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 */
592 774
593int 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
594array_nextsize (int elem, int cur, int cnt) 778array_nextsize (int elem, int cur, int cnt)
595{ 779{
596 int ncur = cur + 1; 780 int ncur = cur + 1;
597 781
598 do 782 do
… …
639 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 823 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
640 } 824 }
641#endif 825#endif
642 826
643#define array_free(stem, idx) \ 827#define array_free(stem, idx) \
644 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
645 829
646/*****************************************************************************/ 830/*****************************************************************************/
831
832/* dummy callback for pending events */
833static void noinline
834pendingcb (EV_P_ ev_prepare *w, int revents)
835{
836}
647 837
648void noinline 838void noinline
649ev_feed_event (EV_P_ void *w, int revents) 839ev_feed_event (EV_P_ void *w, int revents)
650{ 840{
651 W w_ = (W)w; 841 W w_ = (W)w;
… …
660 pendings [pri][w_->pending - 1].w = w_; 850 pendings [pri][w_->pending - 1].w = w_;
661 pendings [pri][w_->pending - 1].events = revents; 851 pendings [pri][w_->pending - 1].events = revents;
662 } 852 }
663} 853}
664 854
665void 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
666queue_events (EV_P_ W *events, int eventcnt, int type) 871queue_events (EV_P_ W *events, int eventcnt, int type)
667{ 872{
668 int i; 873 int i;
669 874
670 for (i = 0; i < eventcnt; ++i) 875 for (i = 0; i < eventcnt; ++i)
671 ev_feed_event (EV_A_ events [i], type); 876 ev_feed_event (EV_A_ events [i], type);
672} 877}
673 878
674/*****************************************************************************/ 879/*****************************************************************************/
675 880
676void inline_speed 881inline_speed void
677fd_event (EV_P_ int fd, int revents) 882fd_event_nc (EV_P_ int fd, int revents)
678{ 883{
679 ANFD *anfd = anfds + fd; 884 ANFD *anfd = anfds + fd;
680 ev_io *w; 885 ev_io *w;
681 886
682 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)
… …
686 if (ev) 891 if (ev)
687 ev_feed_event (EV_A_ (W)w, ev); 892 ev_feed_event (EV_A_ (W)w, ev);
688 } 893 }
689} 894}
690 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
691void 907void
692ev_feed_fd_event (EV_P_ int fd, int revents) 908ev_feed_fd_event (EV_P_ int fd, int revents)
693{ 909{
694 if (fd >= 0 && fd < anfdmax) 910 if (fd >= 0 && fd < anfdmax)
695 fd_event (EV_A_ fd, revents); 911 fd_event_nc (EV_A_ fd, revents);
696} 912}
697 913
698void inline_size 914/* make sure the external fd watch events are in-sync */
915/* with the kernel/libev internal state */
916inline_size void
699fd_reify (EV_P) 917fd_reify (EV_P)
700{ 918{
701 int i; 919 int i;
702 920
703 for (i = 0; i < fdchangecnt; ++i) 921 for (i = 0; i < fdchangecnt; ++i)
… …
713 931
714#if EV_SELECT_IS_WINSOCKET 932#if EV_SELECT_IS_WINSOCKET
715 if (events) 933 if (events)
716 { 934 {
717 unsigned long arg; 935 unsigned long arg;
718 #ifdef EV_FD_TO_WIN32_HANDLE
719 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 936 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
720 #else
721 anfd->handle = _get_osfhandle (fd);
722 #endif
723 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 937 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
724 } 938 }
725#endif 939#endif
726 940
727 { 941 {
728 unsigned char o_events = anfd->events; 942 unsigned char o_events = anfd->events;
729 unsigned char o_reify = anfd->reify; 943 unsigned char o_reify = anfd->reify;
730 944
731 anfd->reify = 0; 945 anfd->reify = 0;
732 anfd->events = events; 946 anfd->events = events;
733 947
734 if (o_events != events || o_reify & EV_IOFDSET) 948 if (o_events != events || o_reify & EV__IOFDSET)
735 backend_modify (EV_A_ fd, o_events, events); 949 backend_modify (EV_A_ fd, o_events, events);
736 } 950 }
737 } 951 }
738 952
739 fdchangecnt = 0; 953 fdchangecnt = 0;
740} 954}
741 955
742void inline_size 956/* something about the given fd changed */
957inline_size void
743fd_change (EV_P_ int fd, int flags) 958fd_change (EV_P_ int fd, int flags)
744{ 959{
745 unsigned char reify = anfds [fd].reify; 960 unsigned char reify = anfds [fd].reify;
746 anfds [fd].reify |= flags; 961 anfds [fd].reify |= flags;
747 962
… …
751 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 966 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
752 fdchanges [fdchangecnt - 1] = fd; 967 fdchanges [fdchangecnt - 1] = fd;
753 } 968 }
754} 969}
755 970
756void inline_speed 971/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
972inline_speed void
757fd_kill (EV_P_ int fd) 973fd_kill (EV_P_ int fd)
758{ 974{
759 ev_io *w; 975 ev_io *w;
760 976
761 while ((w = (ev_io *)anfds [fd].head)) 977 while ((w = (ev_io *)anfds [fd].head))
… …
763 ev_io_stop (EV_A_ w); 979 ev_io_stop (EV_A_ w);
764 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);
765 } 981 }
766} 982}
767 983
768int inline_size 984/* check whether the given fd is atcually valid, for error recovery */
985inline_size int
769fd_valid (int fd) 986fd_valid (int fd)
770{ 987{
771#ifdef _WIN32 988#ifdef _WIN32
772 return _get_osfhandle (fd) != -1; 989 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
773#else 990#else
774 return fcntl (fd, F_GETFD) != -1; 991 return fcntl (fd, F_GETFD) != -1;
775#endif 992#endif
776} 993}
777 994
… …
795 1012
796 for (fd = anfdmax; fd--; ) 1013 for (fd = anfdmax; fd--; )
797 if (anfds [fd].events) 1014 if (anfds [fd].events)
798 { 1015 {
799 fd_kill (EV_A_ fd); 1016 fd_kill (EV_A_ fd);
800 return; 1017 break;
801 } 1018 }
802} 1019}
803 1020
804/* 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 */
805static void noinline 1022static void noinline
… …
810 for (fd = 0; fd < anfdmax; ++fd) 1027 for (fd = 0; fd < anfdmax; ++fd)
811 if (anfds [fd].events) 1028 if (anfds [fd].events)
812 { 1029 {
813 anfds [fd].events = 0; 1030 anfds [fd].events = 0;
814 anfds [fd].emask = 0; 1031 anfds [fd].emask = 0;
815 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1032 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
816 } 1033 }
817} 1034}
818 1035
819/*****************************************************************************/ 1036/*****************************************************************************/
820 1037
… …
836#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1053#define HEAP0 (DHEAP - 1) /* index of first element in heap */
837#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1054#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
838#define UPHEAP_DONE(p,k) ((p) == (k)) 1055#define UPHEAP_DONE(p,k) ((p) == (k))
839 1056
840/* away from the root */ 1057/* away from the root */
841void inline_speed 1058inline_speed void
842downheap (ANHE *heap, int N, int k) 1059downheap (ANHE *heap, int N, int k)
843{ 1060{
844 ANHE he = heap [k]; 1061 ANHE he = heap [k];
845 ANHE *E = heap + N + HEAP0; 1062 ANHE *E = heap + N + HEAP0;
846 1063
… …
886#define HEAP0 1 1103#define HEAP0 1
887#define HPARENT(k) ((k) >> 1) 1104#define HPARENT(k) ((k) >> 1)
888#define UPHEAP_DONE(p,k) (!(p)) 1105#define UPHEAP_DONE(p,k) (!(p))
889 1106
890/* away from the root */ 1107/* away from the root */
891void inline_speed 1108inline_speed void
892downheap (ANHE *heap, int N, int k) 1109downheap (ANHE *heap, int N, int k)
893{ 1110{
894 ANHE he = heap [k]; 1111 ANHE he = heap [k];
895 1112
896 for (;;) 1113 for (;;)
897 { 1114 {
898 int c = k << 1; 1115 int c = k << 1;
899 1116
900 if (c > N + HEAP0 - 1) 1117 if (c >= N + HEAP0)
901 break; 1118 break;
902 1119
903 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])
904 ? 1 : 0; 1121 ? 1 : 0;
905 1122
… …
916 ev_active (ANHE_w (he)) = k; 1133 ev_active (ANHE_w (he)) = k;
917} 1134}
918#endif 1135#endif
919 1136
920/* towards the root */ 1137/* towards the root */
921void inline_speed 1138inline_speed void
922upheap (ANHE *heap, int k) 1139upheap (ANHE *heap, int k)
923{ 1140{
924 ANHE he = heap [k]; 1141 ANHE he = heap [k];
925 1142
926 for (;;) 1143 for (;;)
… …
937 1154
938 heap [k] = he; 1155 heap [k] = he;
939 ev_active (ANHE_w (he)) = k; 1156 ev_active (ANHE_w (he)) = k;
940} 1157}
941 1158
942void inline_size 1159/* move an element suitably so it is in a correct place */
1160inline_size void
943adjustheap (ANHE *heap, int N, int k) 1161adjustheap (ANHE *heap, int N, int k)
944{ 1162{
945 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)]))
946 upheap (heap, k); 1164 upheap (heap, k);
947 else 1165 else
948 downheap (heap, N, k); 1166 downheap (heap, N, k);
949} 1167}
950 1168
951/* 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 */
952void inline_size 1170inline_size void
953reheap (ANHE *heap, int N) 1171reheap (ANHE *heap, int N)
954{ 1172{
955 int i; 1173 int i;
956 1174
957 /* 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 */
… …
960 upheap (heap, i + HEAP0); 1178 upheap (heap, i + HEAP0);
961} 1179}
962 1180
963/*****************************************************************************/ 1181/*****************************************************************************/
964 1182
1183/* associate signal watchers to a signal signal */
965typedef struct 1184typedef struct
966{ 1185{
1186 EV_ATOMIC_T pending;
1187#if EV_MULTIPLICITY
1188 EV_P;
1189#endif
967 WL head; 1190 WL head;
968 EV_ATOMIC_T gotsig;
969} ANSIG; 1191} ANSIG;
970 1192
971static ANSIG *signals; 1193static ANSIG signals [EV_NSIG - 1];
972static int signalmax;
973
974static EV_ATOMIC_T gotsig;
975 1194
976/*****************************************************************************/ 1195/*****************************************************************************/
977 1196
978void inline_speed 1197/* used to prepare libev internal fd's */
1198/* this is not fork-safe */
1199inline_speed void
979fd_intern (int fd) 1200fd_intern (int fd)
980{ 1201{
981#ifdef _WIN32 1202#ifdef _WIN32
982 unsigned long arg = 1; 1203 unsigned long arg = 1;
983 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1204 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
984#else 1205#else
985 fcntl (fd, F_SETFD, FD_CLOEXEC); 1206 fcntl (fd, F_SETFD, FD_CLOEXEC);
986 fcntl (fd, F_SETFL, O_NONBLOCK); 1207 fcntl (fd, F_SETFL, O_NONBLOCK);
987#endif 1208#endif
988} 1209}
989 1210
990static void noinline 1211static void noinline
991evpipe_init (EV_P) 1212evpipe_init (EV_P)
992{ 1213{
993 if (!ev_is_active (&pipeev)) 1214 if (!ev_is_active (&pipe_w))
994 { 1215 {
995#if EV_USE_EVENTFD 1216#if EV_USE_EVENTFD
1217 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1218 if (evfd < 0 && errno == EINVAL)
996 if ((evfd = eventfd (0, 0)) >= 0) 1219 evfd = eventfd (0, 0);
1220
1221 if (evfd >= 0)
997 { 1222 {
998 evpipe [0] = -1; 1223 evpipe [0] = -1;
999 fd_intern (evfd); 1224 fd_intern (evfd); /* doing it twice doesn't hurt */
1000 ev_io_set (&pipeev, evfd, EV_READ); 1225 ev_io_set (&pipe_w, evfd, EV_READ);
1001 } 1226 }
1002 else 1227 else
1003#endif 1228#endif
1004 { 1229 {
1005 while (pipe (evpipe)) 1230 while (pipe (evpipe))
1006 ev_syserr ("(libev) error creating signal/async pipe"); 1231 ev_syserr ("(libev) error creating signal/async pipe");
1007 1232
1008 fd_intern (evpipe [0]); 1233 fd_intern (evpipe [0]);
1009 fd_intern (evpipe [1]); 1234 fd_intern (evpipe [1]);
1010 ev_io_set (&pipeev, evpipe [0], EV_READ); 1235 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1011 } 1236 }
1012 1237
1013 ev_io_start (EV_A_ &pipeev); 1238 ev_io_start (EV_A_ &pipe_w);
1014 ev_unref (EV_A); /* watcher should not keep loop alive */ 1239 ev_unref (EV_A); /* watcher should not keep loop alive */
1015 } 1240 }
1016} 1241}
1017 1242
1018void inline_size 1243inline_size void
1019evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1244evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1020{ 1245{
1021 if (!*flag) 1246 if (!*flag)
1022 { 1247 {
1023 int old_errno = errno; /* save errno because write might clobber it */ 1248 int old_errno = errno; /* save errno because write might clobber it */
… …
1036 1261
1037 errno = old_errno; 1262 errno = old_errno;
1038 } 1263 }
1039} 1264}
1040 1265
1266/* called whenever the libev signal pipe */
1267/* got some events (signal, async) */
1041static void 1268static void
1042pipecb (EV_P_ ev_io *iow, int revents) 1269pipecb (EV_P_ ev_io *iow, int revents)
1043{ 1270{
1271 int i;
1272
1044#if EV_USE_EVENTFD 1273#if EV_USE_EVENTFD
1045 if (evfd >= 0) 1274 if (evfd >= 0)
1046 { 1275 {
1047 uint64_t counter; 1276 uint64_t counter;
1048 read (evfd, &counter, sizeof (uint64_t)); 1277 read (evfd, &counter, sizeof (uint64_t));
… …
1052 { 1281 {
1053 char dummy; 1282 char dummy;
1054 read (evpipe [0], &dummy, 1); 1283 read (evpipe [0], &dummy, 1);
1055 } 1284 }
1056 1285
1057 if (gotsig && ev_is_default_loop (EV_A)) 1286 if (sig_pending)
1058 { 1287 {
1059 int signum; 1288 sig_pending = 0;
1060 gotsig = 0;
1061 1289
1062 for (signum = signalmax; signum--; ) 1290 for (i = EV_NSIG - 1; i--; )
1063 if (signals [signum].gotsig) 1291 if (expect_false (signals [i].pending))
1064 ev_feed_signal_event (EV_A_ signum + 1); 1292 ev_feed_signal_event (EV_A_ i + 1);
1065 } 1293 }
1066 1294
1067#if EV_ASYNC_ENABLE 1295#if EV_ASYNC_ENABLE
1068 if (gotasync) 1296 if (async_pending)
1069 { 1297 {
1070 int i; 1298 async_pending = 0;
1071 gotasync = 0;
1072 1299
1073 for (i = asynccnt; i--; ) 1300 for (i = asynccnt; i--; )
1074 if (asyncs [i]->sent) 1301 if (asyncs [i]->sent)
1075 { 1302 {
1076 asyncs [i]->sent = 0; 1303 asyncs [i]->sent = 0;
… …
1084 1311
1085static void 1312static void
1086ev_sighandler (int signum) 1313ev_sighandler (int signum)
1087{ 1314{
1088#if EV_MULTIPLICITY 1315#if EV_MULTIPLICITY
1089 struct ev_loop *loop = &default_loop_struct; 1316 EV_P = signals [signum - 1].loop;
1090#endif 1317#endif
1091 1318
1092#if _WIN32 1319#ifdef _WIN32
1093 signal (signum, ev_sighandler); 1320 signal (signum, ev_sighandler);
1094#endif 1321#endif
1095 1322
1096 signals [signum - 1].gotsig = 1; 1323 signals [signum - 1].pending = 1;
1097 evpipe_write (EV_A_ &gotsig); 1324 evpipe_write (EV_A_ &sig_pending);
1098} 1325}
1099 1326
1100void noinline 1327void noinline
1101ev_feed_signal_event (EV_P_ int signum) 1328ev_feed_signal_event (EV_P_ int signum)
1102{ 1329{
1103 WL w; 1330 WL w;
1104 1331
1332 if (expect_false (signum <= 0 || signum > EV_NSIG))
1333 return;
1334
1335 --signum;
1336
1105#if EV_MULTIPLICITY 1337#if EV_MULTIPLICITY
1106 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 */
1107#endif 1339 /* or, likely more useful, feeding a signal nobody is waiting for */
1108 1340
1109 --signum; 1341 if (expect_false (signals [signum].loop != EV_A))
1110
1111 if (signum < 0 || signum >= signalmax)
1112 return; 1342 return;
1343#endif
1113 1344
1114 signals [signum].gotsig = 0; 1345 signals [signum].pending = 0;
1115 1346
1116 for (w = signals [signum].head; w; w = w->next) 1347 for (w = signals [signum].head; w; w = w->next)
1117 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1348 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1118} 1349}
1119 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
1120/*****************************************************************************/ 1371/*****************************************************************************/
1121 1372
1122static WL childs [EV_PID_HASHSIZE]; 1373static WL childs [EV_PID_HASHSIZE];
1123 1374
1124#ifndef _WIN32 1375#ifndef _WIN32
… …
1127 1378
1128#ifndef WIFCONTINUED 1379#ifndef WIFCONTINUED
1129# define WIFCONTINUED(status) 0 1380# define WIFCONTINUED(status) 0
1130#endif 1381#endif
1131 1382
1132void inline_speed 1383/* handle a single child status event */
1384inline_speed void
1133child_reap (EV_P_ int chain, int pid, int status) 1385child_reap (EV_P_ int chain, int pid, int status)
1134{ 1386{
1135 ev_child *w; 1387 ev_child *w;
1136 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1388 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1137 1389
… …
1150 1402
1151#ifndef WCONTINUED 1403#ifndef WCONTINUED
1152# define WCONTINUED 0 1404# define WCONTINUED 0
1153#endif 1405#endif
1154 1406
1407/* called on sigchld etc., calls waitpid */
1155static void 1408static void
1156childcb (EV_P_ ev_signal *sw, int revents) 1409childcb (EV_P_ ev_signal *sw, int revents)
1157{ 1410{
1158 int pid, status; 1411 int pid, status;
1159 1412
… …
1240 /* kqueue is borked on everything but netbsd apparently */ 1493 /* kqueue is borked on everything but netbsd apparently */
1241 /* 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 */
1242 flags &= ~EVBACKEND_KQUEUE; 1495 flags &= ~EVBACKEND_KQUEUE;
1243#endif 1496#endif
1244#ifdef __APPLE__ 1497#ifdef __APPLE__
1245 // flags &= ~EVBACKEND_KQUEUE; for documentation 1498 /* only select works correctly on that "unix-certified" platform */
1246 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 */
1247#endif 1501#endif
1248 1502
1249 return flags; 1503 return flags;
1250} 1504}
1251 1505
… …
1265ev_backend (EV_P) 1519ev_backend (EV_P)
1266{ 1520{
1267 return backend; 1521 return backend;
1268} 1522}
1269 1523
1524#if EV_MINIMAL < 2
1270unsigned int 1525unsigned int
1271ev_loop_count (EV_P) 1526ev_loop_count (EV_P)
1272{ 1527{
1273 return loop_count; 1528 return loop_count;
1274} 1529}
1275 1530
1531unsigned int
1532ev_loop_depth (EV_P)
1533{
1534 return loop_depth;
1535}
1536
1276void 1537void
1277ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1538ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1278{ 1539{
1279 io_blocktime = interval; 1540 io_blocktime = interval;
1280} 1541}
… …
1283ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1544ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1284{ 1545{
1285 timeout_blocktime = interval; 1546 timeout_blocktime = interval;
1286} 1547}
1287 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 */
1288static void noinline 1574static void noinline
1289loop_init (EV_P_ unsigned int flags) 1575loop_init (EV_P_ unsigned int flags)
1290{ 1576{
1291 if (!backend) 1577 if (!backend)
1292 { 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
1293#if EV_USE_MONOTONIC 1589#if EV_USE_MONOTONIC
1590 if (!have_monotonic)
1294 { 1591 {
1295 struct timespec ts; 1592 struct timespec ts;
1593
1296 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1594 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1297 have_monotonic = 1; 1595 have_monotonic = 1;
1298 } 1596 }
1299#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"));
1300 1609
1301 ev_rt_now = ev_time (); 1610 ev_rt_now = ev_time ();
1302 mn_now = get_clock (); 1611 mn_now = get_clock ();
1303 now_floor = mn_now; 1612 now_floor = mn_now;
1304 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
1305 1617
1306 io_blocktime = 0.; 1618 io_blocktime = 0.;
1307 timeout_blocktime = 0.; 1619 timeout_blocktime = 0.;
1308 backend = 0; 1620 backend = 0;
1309 backend_fd = -1; 1621 backend_fd = -1;
1310 gotasync = 0; 1622 sig_pending = 0;
1623#if EV_ASYNC_ENABLE
1624 async_pending = 0;
1625#endif
1311#if EV_USE_INOTIFY 1626#if EV_USE_INOTIFY
1312 fs_fd = -2; 1627 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1313#endif 1628#endif
1314 1629#if EV_USE_SIGNALFD
1315 /* pid check not overridable via env */ 1630 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1316#ifndef _WIN32
1317 if (flags & EVFLAG_FORKCHECK)
1318 curpid = getpid ();
1319#endif 1631#endif
1320
1321 if (!(flags & EVFLAG_NOENV)
1322 && !enable_secure ()
1323 && getenv ("LIBEV_FLAGS"))
1324 flags = atoi (getenv ("LIBEV_FLAGS"));
1325 1632
1326 if (!(flags & 0x0000ffffU)) 1633 if (!(flags & 0x0000ffffU))
1327 flags |= ev_recommended_backends (); 1634 flags |= ev_recommended_backends ();
1328 1635
1329#if EV_USE_PORT 1636#if EV_USE_PORT
… …
1340#endif 1647#endif
1341#if EV_USE_SELECT 1648#if EV_USE_SELECT
1342 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1649 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1343#endif 1650#endif
1344 1651
1652 ev_prepare_init (&pending_w, pendingcb);
1653
1345 ev_init (&pipeev, pipecb); 1654 ev_init (&pipe_w, pipecb);
1346 ev_set_priority (&pipeev, EV_MAXPRI); 1655 ev_set_priority (&pipe_w, EV_MAXPRI);
1347 } 1656 }
1348} 1657}
1349 1658
1659/* free up a loop structure */
1350static void noinline 1660static void noinline
1351loop_destroy (EV_P) 1661loop_destroy (EV_P)
1352{ 1662{
1353 int i; 1663 int i;
1354 1664
1355 if (ev_is_active (&pipeev)) 1665 if (ev_is_active (&pipe_w))
1356 { 1666 {
1357 ev_ref (EV_A); /* signal watcher */ 1667 /*ev_ref (EV_A);*/
1358 ev_io_stop (EV_A_ &pipeev); 1668 /*ev_io_stop (EV_A_ &pipe_w);*/
1359 1669
1360#if EV_USE_EVENTFD 1670#if EV_USE_EVENTFD
1361 if (evfd >= 0) 1671 if (evfd >= 0)
1362 close (evfd); 1672 close (evfd);
1363#endif 1673#endif
1364 1674
1365 if (evpipe [0] >= 0) 1675 if (evpipe [0] >= 0)
1366 { 1676 {
1367 close (evpipe [0]); 1677 EV_WIN32_CLOSE_FD (evpipe [0]);
1368 close (evpipe [1]); 1678 EV_WIN32_CLOSE_FD (evpipe [1]);
1369 } 1679 }
1370 } 1680 }
1681
1682#if EV_USE_SIGNALFD
1683 if (ev_is_active (&sigfd_w))
1684 close (sigfd);
1685#endif
1371 1686
1372#if EV_USE_INOTIFY 1687#if EV_USE_INOTIFY
1373 if (fs_fd >= 0) 1688 if (fs_fd >= 0)
1374 close (fs_fd); 1689 close (fs_fd);
1375#endif 1690#endif
… …
1399#if EV_IDLE_ENABLE 1714#if EV_IDLE_ENABLE
1400 array_free (idle, [i]); 1715 array_free (idle, [i]);
1401#endif 1716#endif
1402 } 1717 }
1403 1718
1404 ev_free (anfds); anfdmax = 0; 1719 ev_free (anfds); anfds = 0; anfdmax = 0;
1405 1720
1406 /* 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);
1407 array_free (fdchange, EMPTY); 1723 array_free (fdchange, EMPTY);
1408 array_free (timer, EMPTY); 1724 array_free (timer, EMPTY);
1409#if EV_PERIODIC_ENABLE 1725#if EV_PERIODIC_ENABLE
1410 array_free (periodic, EMPTY); 1726 array_free (periodic, EMPTY);
1411#endif 1727#endif
… …
1420 1736
1421 backend = 0; 1737 backend = 0;
1422} 1738}
1423 1739
1424#if EV_USE_INOTIFY 1740#if EV_USE_INOTIFY
1425void inline_size infy_fork (EV_P); 1741inline_size void infy_fork (EV_P);
1426#endif 1742#endif
1427 1743
1428void inline_size 1744inline_size void
1429loop_fork (EV_P) 1745loop_fork (EV_P)
1430{ 1746{
1431#if EV_USE_PORT 1747#if EV_USE_PORT
1432 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1748 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1433#endif 1749#endif
… …
1439#endif 1755#endif
1440#if EV_USE_INOTIFY 1756#if EV_USE_INOTIFY
1441 infy_fork (EV_A); 1757 infy_fork (EV_A);
1442#endif 1758#endif
1443 1759
1444 if (ev_is_active (&pipeev)) 1760 if (ev_is_active (&pipe_w))
1445 { 1761 {
1446 /* this "locks" the handlers against writing to the pipe */ 1762 /* this "locks" the handlers against writing to the pipe */
1447 /* while we modify the fd vars */ 1763 /* while we modify the fd vars */
1448 gotsig = 1; 1764 sig_pending = 1;
1449#if EV_ASYNC_ENABLE 1765#if EV_ASYNC_ENABLE
1450 gotasync = 1; 1766 async_pending = 1;
1451#endif 1767#endif
1452 1768
1453 ev_ref (EV_A); 1769 ev_ref (EV_A);
1454 ev_io_stop (EV_A_ &pipeev); 1770 ev_io_stop (EV_A_ &pipe_w);
1455 1771
1456#if EV_USE_EVENTFD 1772#if EV_USE_EVENTFD
1457 if (evfd >= 0) 1773 if (evfd >= 0)
1458 close (evfd); 1774 close (evfd);
1459#endif 1775#endif
1460 1776
1461 if (evpipe [0] >= 0) 1777 if (evpipe [0] >= 0)
1462 { 1778 {
1463 close (evpipe [0]); 1779 EV_WIN32_CLOSE_FD (evpipe [0]);
1464 close (evpipe [1]); 1780 EV_WIN32_CLOSE_FD (evpipe [1]);
1465 } 1781 }
1466 1782
1467 evpipe_init (EV_A); 1783 evpipe_init (EV_A);
1468 /* now iterate over everything, in case we missed something */ 1784 /* now iterate over everything, in case we missed something */
1469 pipecb (EV_A_ &pipeev, EV_READ); 1785 pipecb (EV_A_ &pipe_w, EV_READ);
1470 } 1786 }
1471 1787
1472 postfork = 0; 1788 postfork = 0;
1473} 1789}
1474 1790
1475#if EV_MULTIPLICITY 1791#if EV_MULTIPLICITY
1476 1792
1477struct ev_loop * 1793struct ev_loop *
1478ev_loop_new (unsigned int flags) 1794ev_loop_new (unsigned int flags)
1479{ 1795{
1480 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));
1481 1797
1482 memset (loop, 0, sizeof (struct ev_loop)); 1798 memset (EV_A, 0, sizeof (struct ev_loop));
1483
1484 loop_init (EV_A_ flags); 1799 loop_init (EV_A_ flags);
1485 1800
1486 if (ev_backend (EV_A)) 1801 if (ev_backend (EV_A))
1487 return loop; 1802 return EV_A;
1488 1803
1489 return 0; 1804 return 0;
1490} 1805}
1491 1806
1492void 1807void
… …
1499void 1814void
1500ev_loop_fork (EV_P) 1815ev_loop_fork (EV_P)
1501{ 1816{
1502 postfork = 1; /* must be in line with ev_default_fork */ 1817 postfork = 1; /* must be in line with ev_default_fork */
1503} 1818}
1819#endif /* multiplicity */
1504 1820
1505#if EV_VERIFY 1821#if EV_VERIFY
1506static void noinline 1822static void noinline
1507verify_watcher (EV_P_ W w) 1823verify_watcher (EV_P_ W w)
1508{ 1824{
1509 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1825 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1510 1826
1511 if (w->pending) 1827 if (w->pending)
1512 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1828 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1513} 1829}
1514 1830
1515static void noinline 1831static void noinline
1516verify_heap (EV_P_ ANHE *heap, int N) 1832verify_heap (EV_P_ ANHE *heap, int N)
1517{ 1833{
1518 int i; 1834 int i;
1519 1835
1520 for (i = HEAP0; i < N + HEAP0; ++i) 1836 for (i = HEAP0; i < N + HEAP0; ++i)
1521 { 1837 {
1522 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1838 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1523 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1839 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1524 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1840 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1525 1841
1526 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1842 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1527 } 1843 }
1528} 1844}
1529 1845
1530static void noinline 1846static void noinline
1531array_verify (EV_P_ W *ws, int cnt) 1847array_verify (EV_P_ W *ws, int cnt)
1532{ 1848{
1533 while (cnt--) 1849 while (cnt--)
1534 { 1850 {
1535 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1851 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1536 verify_watcher (EV_A_ ws [cnt]); 1852 verify_watcher (EV_A_ ws [cnt]);
1537 } 1853 }
1538} 1854}
1539#endif 1855#endif
1540 1856
1857#if EV_MINIMAL < 2
1541void 1858void
1542ev_loop_verify (EV_P) 1859ev_loop_verify (EV_P)
1543{ 1860{
1544#if EV_VERIFY 1861#if EV_VERIFY
1545 int i; 1862 int i;
… …
1547 1864
1548 assert (activecnt >= -1); 1865 assert (activecnt >= -1);
1549 1866
1550 assert (fdchangemax >= fdchangecnt); 1867 assert (fdchangemax >= fdchangecnt);
1551 for (i = 0; i < fdchangecnt; ++i) 1868 for (i = 0; i < fdchangecnt; ++i)
1552 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1869 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1553 1870
1554 assert (anfdmax >= 0); 1871 assert (anfdmax >= 0);
1555 for (i = 0; i < anfdmax; ++i) 1872 for (i = 0; i < anfdmax; ++i)
1556 for (w = anfds [i].head; w; w = w->next) 1873 for (w = anfds [i].head; w; w = w->next)
1557 { 1874 {
1558 verify_watcher (EV_A_ (W)w); 1875 verify_watcher (EV_A_ (W)w);
1559 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1876 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1560 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1877 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1561 } 1878 }
1562 1879
1563 assert (timermax >= timercnt); 1880 assert (timermax >= timercnt);
1564 verify_heap (EV_A_ timers, timercnt); 1881 verify_heap (EV_A_ timers, timercnt);
1565 1882
… …
1594 assert (checkmax >= checkcnt); 1911 assert (checkmax >= checkcnt);
1595 array_verify (EV_A_ (W *)checks, checkcnt); 1912 array_verify (EV_A_ (W *)checks, checkcnt);
1596 1913
1597# if 0 1914# if 0
1598 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1915 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1599 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1916 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1600# endif
1601#endif 1917# endif
1918#endif
1602} 1919}
1603 1920#endif
1604#endif /* multiplicity */
1605 1921
1606#if EV_MULTIPLICITY 1922#if EV_MULTIPLICITY
1607struct ev_loop * 1923struct ev_loop *
1608ev_default_loop_init (unsigned int flags) 1924ev_default_loop_init (unsigned int flags)
1609#else 1925#else
… …
1612#endif 1928#endif
1613{ 1929{
1614 if (!ev_default_loop_ptr) 1930 if (!ev_default_loop_ptr)
1615 { 1931 {
1616#if EV_MULTIPLICITY 1932#if EV_MULTIPLICITY
1617 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1933 EV_P = ev_default_loop_ptr = &default_loop_struct;
1618#else 1934#else
1619 ev_default_loop_ptr = 1; 1935 ev_default_loop_ptr = 1;
1620#endif 1936#endif
1621 1937
1622 loop_init (EV_A_ flags); 1938 loop_init (EV_A_ flags);
… …
1639 1955
1640void 1956void
1641ev_default_destroy (void) 1957ev_default_destroy (void)
1642{ 1958{
1643#if EV_MULTIPLICITY 1959#if EV_MULTIPLICITY
1644 struct ev_loop *loop = ev_default_loop_ptr; 1960 EV_P = ev_default_loop_ptr;
1645#endif 1961#endif
1646 1962
1647 ev_default_loop_ptr = 0; 1963 ev_default_loop_ptr = 0;
1648 1964
1649#ifndef _WIN32 1965#ifndef _WIN32
… …
1656 1972
1657void 1973void
1658ev_default_fork (void) 1974ev_default_fork (void)
1659{ 1975{
1660#if EV_MULTIPLICITY 1976#if EV_MULTIPLICITY
1661 struct ev_loop *loop = ev_default_loop_ptr; 1977 EV_P = ev_default_loop_ptr;
1662#endif 1978#endif
1663 1979
1664 ev_loop_fork (EV_A); 1980 postfork = 1; /* must be in line with ev_loop_fork */
1665} 1981}
1666 1982
1667/*****************************************************************************/ 1983/*****************************************************************************/
1668 1984
1669void 1985void
1670ev_invoke (EV_P_ void *w, int revents) 1986ev_invoke (EV_P_ void *w, int revents)
1671{ 1987{
1672 EV_CB_INVOKE ((W)w, revents); 1988 EV_CB_INVOKE ((W)w, revents);
1673} 1989}
1674 1990
1675void inline_speed 1991unsigned int
1676call_pending (EV_P) 1992ev_pending_count (EV_P)
1993{
1994 int pri;
1995 unsigned int count = 0;
1996
1997 for (pri = NUMPRI; pri--; )
1998 count += pendingcnt [pri];
1999
2000 return count;
2001}
2002
2003void noinline
2004ev_invoke_pending (EV_P)
1677{ 2005{
1678 int pri; 2006 int pri;
1679 2007
1680 for (pri = NUMPRI; pri--; ) 2008 for (pri = NUMPRI; pri--; )
1681 while (pendingcnt [pri]) 2009 while (pendingcnt [pri])
1682 { 2010 {
1683 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2011 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1684 2012
1685 if (expect_true (p->w))
1686 {
1687 /*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 */
1688 2015
1689 p->w->pending = 0; 2016 p->w->pending = 0;
1690 EV_CB_INVOKE (p->w, p->events); 2017 EV_CB_INVOKE (p->w, p->events);
1691 EV_FREQUENT_CHECK; 2018 EV_FREQUENT_CHECK;
1692 }
1693 } 2019 }
1694} 2020}
1695 2021
1696#if EV_IDLE_ENABLE 2022#if EV_IDLE_ENABLE
1697void inline_size 2023/* make idle watchers pending. this handles the "call-idle */
2024/* only when higher priorities are idle" logic */
2025inline_size void
1698idle_reify (EV_P) 2026idle_reify (EV_P)
1699{ 2027{
1700 if (expect_false (idleall)) 2028 if (expect_false (idleall))
1701 { 2029 {
1702 int pri; 2030 int pri;
… …
1714 } 2042 }
1715 } 2043 }
1716} 2044}
1717#endif 2045#endif
1718 2046
1719void inline_size 2047/* make timers pending */
2048inline_size void
1720timers_reify (EV_P) 2049timers_reify (EV_P)
1721{ 2050{
1722 EV_FREQUENT_CHECK; 2051 EV_FREQUENT_CHECK;
1723 2052
1724 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2053 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1725 { 2054 {
1726 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2055 do
1727
1728 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1729
1730 /* first reschedule or stop timer */
1731 if (w->repeat)
1732 { 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 {
1733 ev_at (w) += w->repeat; 2064 ev_at (w) += w->repeat;
1734 if (ev_at (w) < mn_now) 2065 if (ev_at (w) < mn_now)
1735 ev_at (w) = mn_now; 2066 ev_at (w) = mn_now;
1736 2067
1737 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.));
1738 2069
1739 ANHE_at_cache (timers [HEAP0]); 2070 ANHE_at_cache (timers [HEAP0]);
1740 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);
1741 } 2078 }
1742 else 2079 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1743 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1744 2080
1745 EV_FREQUENT_CHECK;
1746 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2081 feed_reverse_done (EV_A_ EV_TIMEOUT);
1747 } 2082 }
1748} 2083}
1749 2084
1750#if EV_PERIODIC_ENABLE 2085#if EV_PERIODIC_ENABLE
1751void inline_size 2086/* make periodics pending */
2087inline_size void
1752periodics_reify (EV_P) 2088periodics_reify (EV_P)
1753{ 2089{
1754 EV_FREQUENT_CHECK; 2090 EV_FREQUENT_CHECK;
1755 2091
1756 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2092 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1757 { 2093 {
1758 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2094 int feed_count = 0;
1759 2095
1760 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2096 do
1761
1762 /* first reschedule or stop timer */
1763 if (w->reschedule_cb)
1764 { 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 {
1765 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2105 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1766 2106
1767 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));
1768 2108
1769 ANHE_at_cache (periodics [HEAP0]); 2109 ANHE_at_cache (periodics [HEAP0]);
1770 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
2134 EV_FREQUENT_CHECK;
2135 feed_reverse (EV_A_ (W)w);
1771 } 2136 }
1772 else if (w->interval) 2137 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1773 {
1774 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1775 /* if next trigger time is not sufficiently in the future, put it there */
1776 /* this might happen because of floating point inexactness */
1777 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1778 {
1779 ev_at (w) += w->interval;
1780 2138
1781 /* if interval is unreasonably low we might still have a time in the past */
1782 /* so correct this. this will make the periodic very inexact, but the user */
1783 /* has effectively asked to get triggered more often than possible */
1784 if (ev_at (w) < ev_rt_now)
1785 ev_at (w) = ev_rt_now;
1786 }
1787
1788 ANHE_at_cache (periodics [HEAP0]);
1789 downheap (periodics, periodiccnt, HEAP0);
1790 }
1791 else
1792 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1793
1794 EV_FREQUENT_CHECK;
1795 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2139 feed_reverse_done (EV_A_ EV_PERIODIC);
1796 } 2140 }
1797} 2141}
1798 2142
2143/* simply recalculate all periodics */
2144/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1799static void noinline 2145static void noinline
1800periodics_reschedule (EV_P) 2146periodics_reschedule (EV_P)
1801{ 2147{
1802 int i; 2148 int i;
1803 2149
… …
1816 2162
1817 reheap (periodics, periodiccnt); 2163 reheap (periodics, periodiccnt);
1818} 2164}
1819#endif 2165#endif
1820 2166
1821void 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
1822time_update (EV_P_ ev_tstamp max_block) 2184time_update (EV_P_ ev_tstamp max_block)
1823{ 2185{
1824 int i;
1825
1826#if EV_USE_MONOTONIC 2186#if EV_USE_MONOTONIC
1827 if (expect_true (have_monotonic)) 2187 if (expect_true (have_monotonic))
1828 { 2188 {
2189 int i;
1829 ev_tstamp odiff = rtmn_diff; 2190 ev_tstamp odiff = rtmn_diff;
1830 2191
1831 mn_now = get_clock (); 2192 mn_now = get_clock ();
1832 2193
1833 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2194 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1859 ev_rt_now = ev_time (); 2220 ev_rt_now = ev_time ();
1860 mn_now = get_clock (); 2221 mn_now = get_clock ();
1861 now_floor = mn_now; 2222 now_floor = mn_now;
1862 } 2223 }
1863 2224
2225 /* no timer adjustment, as the monotonic clock doesn't jump */
2226 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1864# if EV_PERIODIC_ENABLE 2227# if EV_PERIODIC_ENABLE
1865 periodics_reschedule (EV_A); 2228 periodics_reschedule (EV_A);
1866# endif 2229# endif
1867 /* no timer adjustment, as the monotonic clock doesn't jump */
1868 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1869 } 2230 }
1870 else 2231 else
1871#endif 2232#endif
1872 { 2233 {
1873 ev_rt_now = ev_time (); 2234 ev_rt_now = ev_time ();
1874 2235
1875 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))
1876 { 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);
1877#if EV_PERIODIC_ENABLE 2240#if EV_PERIODIC_ENABLE
1878 periodics_reschedule (EV_A); 2241 periodics_reschedule (EV_A);
1879#endif 2242#endif
1880 /* adjust timers. this is easy, as the offset is the same for all of them */
1881 for (i = 0; i < timercnt; ++i)
1882 {
1883 ANHE *he = timers + i + HEAP0;
1884 ANHE_w (*he)->at += ev_rt_now - mn_now;
1885 ANHE_at_cache (*he);
1886 }
1887 } 2243 }
1888 2244
1889 mn_now = ev_rt_now; 2245 mn_now = ev_rt_now;
1890 } 2246 }
1891} 2247}
1892 2248
1893void 2249void
1894ev_ref (EV_P)
1895{
1896 ++activecnt;
1897}
1898
1899void
1900ev_unref (EV_P)
1901{
1902 --activecnt;
1903}
1904
1905void
1906ev_now_update (EV_P)
1907{
1908 time_update (EV_A_ 1e100);
1909}
1910
1911static int loop_done;
1912
1913void
1914ev_loop (EV_P_ int flags) 2250ev_loop (EV_P_ int flags)
1915{ 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
1916 loop_done = EVUNLOOP_CANCEL; 2258 loop_done = EVUNLOOP_CANCEL;
1917 2259
1918 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 */
1919 2261
1920 do 2262 do
1921 { 2263 {
1922#if EV_VERIFY >= 2 2264#if EV_VERIFY >= 2
1923 ev_loop_verify (EV_A); 2265 ev_loop_verify (EV_A);
… …
1936 /* we might have forked, so queue fork handlers */ 2278 /* we might have forked, so queue fork handlers */
1937 if (expect_false (postfork)) 2279 if (expect_false (postfork))
1938 if (forkcnt) 2280 if (forkcnt)
1939 { 2281 {
1940 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2282 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1941 call_pending (EV_A); 2283 EV_INVOKE_PENDING;
1942 } 2284 }
1943#endif 2285#endif
1944 2286
1945 /* queue prepare watchers (and execute them) */ 2287 /* queue prepare watchers (and execute them) */
1946 if (expect_false (preparecnt)) 2288 if (expect_false (preparecnt))
1947 { 2289 {
1948 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2290 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1949 call_pending (EV_A); 2291 EV_INVOKE_PENDING;
1950 } 2292 }
1951 2293
1952 if (expect_false (!activecnt)) 2294 if (expect_false (loop_done))
1953 break; 2295 break;
1954 2296
1955 /* we might have forked, so reify kernel state if necessary */ 2297 /* we might have forked, so reify kernel state if necessary */
1956 if (expect_false (postfork)) 2298 if (expect_false (postfork))
1957 loop_fork (EV_A); 2299 loop_fork (EV_A);
… …
1964 ev_tstamp waittime = 0.; 2306 ev_tstamp waittime = 0.;
1965 ev_tstamp sleeptime = 0.; 2307 ev_tstamp sleeptime = 0.;
1966 2308
1967 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2309 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1968 { 2310 {
2311 /* remember old timestamp for io_blocktime calculation */
2312 ev_tstamp prev_mn_now = mn_now;
2313
1969 /* update time to cancel out callback processing overhead */ 2314 /* update time to cancel out callback processing overhead */
1970 time_update (EV_A_ 1e100); 2315 time_update (EV_A_ 1e100);
1971 2316
1972 waittime = MAX_BLOCKTIME; 2317 waittime = MAX_BLOCKTIME;
1973 2318
… …
1983 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;
1984 if (waittime > to) waittime = to; 2329 if (waittime > to) waittime = to;
1985 } 2330 }
1986#endif 2331#endif
1987 2332
2333 /* don't let timeouts decrease the waittime below timeout_blocktime */
1988 if (expect_false (waittime < timeout_blocktime)) 2334 if (expect_false (waittime < timeout_blocktime))
1989 waittime = timeout_blocktime; 2335 waittime = timeout_blocktime;
1990 2336
1991 sleeptime = waittime - backend_fudge; 2337 /* extra check because io_blocktime is commonly 0 */
1992
1993 if (expect_true (sleeptime > io_blocktime)) 2338 if (expect_false (io_blocktime))
1994 sleeptime = io_blocktime;
1995
1996 if (sleeptime)
1997 { 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 {
1998 ev_sleep (sleeptime); 2347 ev_sleep (sleeptime);
1999 waittime -= sleeptime; 2348 waittime -= sleeptime;
2349 }
2000 } 2350 }
2001 } 2351 }
2002 2352
2353#if EV_MINIMAL < 2
2003 ++loop_count; 2354 ++loop_count;
2355#endif
2356 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2004 backend_poll (EV_A_ waittime); 2357 backend_poll (EV_A_ waittime);
2358 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2005 2359
2006 /* update ev_rt_now, do magic */ 2360 /* update ev_rt_now, do magic */
2007 time_update (EV_A_ waittime + sleeptime); 2361 time_update (EV_A_ waittime + sleeptime);
2008 } 2362 }
2009 2363
… …
2020 2374
2021 /* queue check watchers, to be executed first */ 2375 /* queue check watchers, to be executed first */
2022 if (expect_false (checkcnt)) 2376 if (expect_false (checkcnt))
2023 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2377 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2024 2378
2025 call_pending (EV_A); 2379 EV_INVOKE_PENDING;
2026 } 2380 }
2027 while (expect_true ( 2381 while (expect_true (
2028 activecnt 2382 activecnt
2029 && !loop_done 2383 && !loop_done
2030 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2384 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2031 )); 2385 ));
2032 2386
2033 if (loop_done == EVUNLOOP_ONE) 2387 if (loop_done == EVUNLOOP_ONE)
2034 loop_done = EVUNLOOP_CANCEL; 2388 loop_done = EVUNLOOP_CANCEL;
2389
2390#if EV_MINIMAL < 2
2391 --loop_depth;
2392#endif
2035} 2393}
2036 2394
2037void 2395void
2038ev_unloop (EV_P_ int how) 2396ev_unloop (EV_P_ int how)
2039{ 2397{
2040 loop_done = how; 2398 loop_done = how;
2041} 2399}
2042 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
2043/*****************************************************************************/ 2438/*****************************************************************************/
2439/* singly-linked list management, used when the expected list length is short */
2044 2440
2045void inline_size 2441inline_size void
2046wlist_add (WL *head, WL elem) 2442wlist_add (WL *head, WL elem)
2047{ 2443{
2048 elem->next = *head; 2444 elem->next = *head;
2049 *head = elem; 2445 *head = elem;
2050} 2446}
2051 2447
2052void inline_size 2448inline_size void
2053wlist_del (WL *head, WL elem) 2449wlist_del (WL *head, WL elem)
2054{ 2450{
2055 while (*head) 2451 while (*head)
2056 { 2452 {
2057 if (*head == elem) 2453 if (expect_true (*head == elem))
2058 { 2454 {
2059 *head = elem->next; 2455 *head = elem->next;
2060 return; 2456 break;
2061 } 2457 }
2062 2458
2063 head = &(*head)->next; 2459 head = &(*head)->next;
2064 } 2460 }
2065} 2461}
2066 2462
2067void inline_speed 2463/* internal, faster, version of ev_clear_pending */
2464inline_speed void
2068clear_pending (EV_P_ W w) 2465clear_pending (EV_P_ W w)
2069{ 2466{
2070 if (w->pending) 2467 if (w->pending)
2071 { 2468 {
2072 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2469 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2073 w->pending = 0; 2470 w->pending = 0;
2074 } 2471 }
2075} 2472}
2076 2473
2077int 2474int
… …
2081 int pending = w_->pending; 2478 int pending = w_->pending;
2082 2479
2083 if (expect_true (pending)) 2480 if (expect_true (pending))
2084 { 2481 {
2085 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2482 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2483 p->w = (W)&pending_w;
2086 w_->pending = 0; 2484 w_->pending = 0;
2087 p->w = 0;
2088 return p->events; 2485 return p->events;
2089 } 2486 }
2090 else 2487 else
2091 return 0; 2488 return 0;
2092} 2489}
2093 2490
2094void inline_size 2491inline_size void
2095pri_adjust (EV_P_ W w) 2492pri_adjust (EV_P_ W w)
2096{ 2493{
2097 int pri = w->priority; 2494 int pri = ev_priority (w);
2098 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2495 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2099 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2496 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2100 w->priority = pri; 2497 ev_set_priority (w, pri);
2101} 2498}
2102 2499
2103void inline_speed 2500inline_speed void
2104ev_start (EV_P_ W w, int active) 2501ev_start (EV_P_ W w, int active)
2105{ 2502{
2106 pri_adjust (EV_A_ w); 2503 pri_adjust (EV_A_ w);
2107 w->active = active; 2504 w->active = active;
2108 ev_ref (EV_A); 2505 ev_ref (EV_A);
2109} 2506}
2110 2507
2111void inline_size 2508inline_size void
2112ev_stop (EV_P_ W w) 2509ev_stop (EV_P_ W w)
2113{ 2510{
2114 ev_unref (EV_A); 2511 ev_unref (EV_A);
2115 w->active = 0; 2512 w->active = 0;
2116} 2513}
… …
2123 int fd = w->fd; 2520 int fd = w->fd;
2124 2521
2125 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2126 return; 2523 return;
2127 2524
2128 assert (("ev_io_start called with negative fd", fd >= 0)); 2525 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2129 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2130 2527
2131 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2132 2529
2133 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2134 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2135 wlist_add (&anfds[fd].head, (WL)w); 2532 wlist_add (&anfds[fd].head, (WL)w);
2136 2533
2137 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2534 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2138 w->events &= ~EV_IOFDSET; 2535 w->events &= ~EV__IOFDSET;
2139 2536
2140 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2141} 2538}
2142 2539
2143void noinline 2540void noinline
… …
2145{ 2542{
2146 clear_pending (EV_A_ (W)w); 2543 clear_pending (EV_A_ (W)w);
2147 if (expect_false (!ev_is_active (w))) 2544 if (expect_false (!ev_is_active (w)))
2148 return; 2545 return;
2149 2546
2150 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));
2151 2548
2152 EV_FREQUENT_CHECK; 2549 EV_FREQUENT_CHECK;
2153 2550
2154 wlist_del (&anfds[w->fd].head, (WL)w); 2551 wlist_del (&anfds[w->fd].head, (WL)w);
2155 ev_stop (EV_A_ (W)w); 2552 ev_stop (EV_A_ (W)w);
… …
2165 if (expect_false (ev_is_active (w))) 2562 if (expect_false (ev_is_active (w)))
2166 return; 2563 return;
2167 2564
2168 ev_at (w) += mn_now; 2565 ev_at (w) += mn_now;
2169 2566
2170 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.));
2171 2568
2172 EV_FREQUENT_CHECK; 2569 EV_FREQUENT_CHECK;
2173 2570
2174 ++timercnt; 2571 ++timercnt;
2175 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2572 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2178 ANHE_at_cache (timers [ev_active (w)]); 2575 ANHE_at_cache (timers [ev_active (w)]);
2179 upheap (timers, ev_active (w)); 2576 upheap (timers, ev_active (w));
2180 2577
2181 EV_FREQUENT_CHECK; 2578 EV_FREQUENT_CHECK;
2182 2579
2183 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2580 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2184} 2581}
2185 2582
2186void noinline 2583void noinline
2187ev_timer_stop (EV_P_ ev_timer *w) 2584ev_timer_stop (EV_P_ ev_timer *w)
2188{ 2585{
… …
2193 EV_FREQUENT_CHECK; 2590 EV_FREQUENT_CHECK;
2194 2591
2195 { 2592 {
2196 int active = ev_active (w); 2593 int active = ev_active (w);
2197 2594
2198 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2595 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2199 2596
2200 --timercnt; 2597 --timercnt;
2201 2598
2202 if (expect_true (active < timercnt + HEAP0)) 2599 if (expect_true (active < timercnt + HEAP0))
2203 { 2600 {
2204 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2205 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2206 } 2603 }
2207 } 2604 }
2208 2605
2209 EV_FREQUENT_CHECK;
2210
2211 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2212 2607
2213 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2214} 2611}
2215 2612
2216void noinline 2613void noinline
2217ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2218{ 2615{
… …
2236 } 2633 }
2237 2634
2238 EV_FREQUENT_CHECK; 2635 EV_FREQUENT_CHECK;
2239} 2636}
2240 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
2241#if EV_PERIODIC_ENABLE 2644#if EV_PERIODIC_ENABLE
2242void noinline 2645void noinline
2243ev_periodic_start (EV_P_ ev_periodic *w) 2646ev_periodic_start (EV_P_ ev_periodic *w)
2244{ 2647{
2245 if (expect_false (ev_is_active (w))) 2648 if (expect_false (ev_is_active (w)))
… …
2247 2650
2248 if (w->reschedule_cb) 2651 if (w->reschedule_cb)
2249 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2652 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2250 else if (w->interval) 2653 else if (w->interval)
2251 { 2654 {
2252 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.));
2253 /* 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 */
2254 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;
2255 } 2658 }
2256 else 2659 else
2257 ev_at (w) = w->offset; 2660 ev_at (w) = w->offset;
… …
2265 ANHE_at_cache (periodics [ev_active (w)]); 2668 ANHE_at_cache (periodics [ev_active (w)]);
2266 upheap (periodics, ev_active (w)); 2669 upheap (periodics, ev_active (w));
2267 2670
2268 EV_FREQUENT_CHECK; 2671 EV_FREQUENT_CHECK;
2269 2672
2270 /*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));*/
2271} 2674}
2272 2675
2273void noinline 2676void noinline
2274ev_periodic_stop (EV_P_ ev_periodic *w) 2677ev_periodic_stop (EV_P_ ev_periodic *w)
2275{ 2678{
… …
2280 EV_FREQUENT_CHECK; 2683 EV_FREQUENT_CHECK;
2281 2684
2282 { 2685 {
2283 int active = ev_active (w); 2686 int active = ev_active (w);
2284 2687
2285 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2688 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2286 2689
2287 --periodiccnt; 2690 --periodiccnt;
2288 2691
2289 if (expect_true (active < periodiccnt + HEAP0)) 2692 if (expect_true (active < periodiccnt + HEAP0))
2290 { 2693 {
2291 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2292 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2293 } 2696 }
2294 } 2697 }
2295 2698
2296 EV_FREQUENT_CHECK;
2297
2298 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2299} 2702}
2300 2703
2301void noinline 2704void noinline
2302ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2303{ 2706{
… …
2312#endif 2715#endif
2313 2716
2314void noinline 2717void noinline
2315ev_signal_start (EV_P_ ev_signal *w) 2718ev_signal_start (EV_P_ ev_signal *w)
2316{ 2719{
2317#if EV_MULTIPLICITY
2318 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2319#endif
2320 if (expect_false (ev_is_active (w))) 2720 if (expect_false (ev_is_active (w)))
2321 return; 2721 return;
2322 2722
2323 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));
2324 2724
2325 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));
2326 2728
2327 EV_FREQUENT_CHECK; 2729 signals [w->signum - 1].loop = EV_A;
2730#endif
2328 2731
2732 EV_FREQUENT_CHECK;
2733
2734#if EV_USE_SIGNALFD
2735 if (sigfd == -2)
2329 { 2736 {
2330#ifndef _WIN32 2737 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2331 sigset_t full, prev; 2738 if (sigfd < 0 && errno == EINVAL)
2332 sigfillset (&full); 2739 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2333 sigprocmask (SIG_SETMASK, &full, &prev);
2334#endif
2335 2740
2336 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2741 if (sigfd >= 0)
2742 {
2743 fd_intern (sigfd); /* doing it twice will not hurt */
2337 2744
2338#ifndef _WIN32 2745 sigemptyset (&sigfd_set);
2339 sigprocmask (SIG_SETMASK, &prev, 0); 2746
2340#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 }
2341 } 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
2342 2763
2343 ev_start (EV_A_ (W)w, 1); 2764 ev_start (EV_A_ (W)w, 1);
2344 wlist_add (&signals [w->signum - 1].head, (WL)w); 2765 wlist_add (&signals [w->signum - 1].head, (WL)w);
2345 2766
2346 if (!((WL)w)->next) 2767 if (!((WL)w)->next)
2768# if EV_USE_SIGNALFD
2769 if (sigfd < 0) /*TODO*/
2770# endif
2347 { 2771 {
2348#if _WIN32 2772# ifdef _WIN32
2773 evpipe_init (EV_A);
2774
2349 signal (w->signum, ev_sighandler); 2775 signal (w->signum, ev_sighandler);
2350#else 2776# else
2351 struct sigaction sa; 2777 struct sigaction sa;
2778
2779 evpipe_init (EV_A);
2780
2352 sa.sa_handler = ev_sighandler; 2781 sa.sa_handler = ev_sighandler;
2353 sigfillset (&sa.sa_mask); 2782 sigfillset (&sa.sa_mask);
2354 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 */
2355 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);
2356#endif 2789#endif
2357 } 2790 }
2358 2791
2359 EV_FREQUENT_CHECK; 2792 EV_FREQUENT_CHECK;
2360} 2793}
2361 2794
2362void noinline 2795void noinline
… …
2370 2803
2371 wlist_del (&signals [w->signum - 1].head, (WL)w); 2804 wlist_del (&signals [w->signum - 1].head, (WL)w);
2372 ev_stop (EV_A_ (W)w); 2805 ev_stop (EV_A_ (W)w);
2373 2806
2374 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
2375 signal (w->signum, SIG_DFL); 2826 signal (w->signum, SIG_DFL);
2827 }
2376 2828
2377 EV_FREQUENT_CHECK; 2829 EV_FREQUENT_CHECK;
2378} 2830}
2379 2831
2380void 2832void
2381ev_child_start (EV_P_ ev_child *w) 2833ev_child_start (EV_P_ ev_child *w)
2382{ 2834{
2383#if EV_MULTIPLICITY 2835#if EV_MULTIPLICITY
2384 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));
2385#endif 2837#endif
2386 if (expect_false (ev_is_active (w))) 2838 if (expect_false (ev_is_active (w)))
2387 return; 2839 return;
2388 2840
2389 EV_FREQUENT_CHECK; 2841 EV_FREQUENT_CHECK;
… …
2414# ifdef _WIN32 2866# ifdef _WIN32
2415# undef lstat 2867# undef lstat
2416# define lstat(a,b) _stati64 (a,b) 2868# define lstat(a,b) _stati64 (a,b)
2417# endif 2869# endif
2418 2870
2419#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 */
2420#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2421 2874
2422static 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);
2423 2876
2424#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2425# 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)
2426 2881
2427static void noinline 2882static void noinline
2428infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2429{ 2884{
2430 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);
2431 2886
2432 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 */
2433 { 2907 }
2434 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;
2435 2912
2436 /* monitor some parent directory for speedup hints */ 2913 /* if path is not there, monitor some parent directory for speedup hints */
2437 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2914 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2438 /* but an efficiency issue only */ 2915 /* but an efficiency issue only */
2439 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2916 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2440 { 2917 {
2441 char path [4096]; 2918 char path [4096];
2442 strcpy (path, w->path); 2919 strcpy (path, w->path);
… …
2446 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2923 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2447 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2924 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2448 2925
2449 char *pend = strrchr (path, '/'); 2926 char *pend = strrchr (path, '/');
2450 2927
2451 if (!pend) 2928 if (!pend || pend == path)
2452 break; /* whoops, no '/', complain to your admin */ 2929 break;
2453 2930
2454 *pend = 0; 2931 *pend = 0;
2455 w->wd = inotify_add_watch (fs_fd, path, mask); 2932 w->wd = inotify_add_watch (fs_fd, path, mask);
2456 } 2933 }
2457 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2934 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2458 } 2935 }
2459 } 2936 }
2460 else
2461 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2462 2937
2463 if (w->wd >= 0) 2938 if (w->wd >= 0)
2464 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);
2465} 2945}
2466 2946
2467static void noinline 2947static void noinline
2468infy_del (EV_P_ ev_stat *w) 2948infy_del (EV_P_ ev_stat *w)
2469{ 2949{
… …
2499 2979
2500 if (w->wd == wd || wd == -1) 2980 if (w->wd == wd || wd == -1)
2501 { 2981 {
2502 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2982 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2503 { 2983 {
2984 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2504 w->wd = -1; 2985 w->wd = -1;
2505 infy_add (EV_A_ w); /* re-add, no matter what */ 2986 infy_add (EV_A_ w); /* re-add, no matter what */
2506 } 2987 }
2507 2988
2508 stat_timer_cb (EV_A_ &w->timer, 0); 2989 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2513 2994
2514static void 2995static void
2515infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2516{ 2997{
2517 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2518 struct inotify_event *ev = (struct inotify_event *)buf;
2519 int ofs; 2999 int ofs;
2520 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2521 3001
2522 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);
2523 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 }
2524} 3008}
2525 3009
2526void inline_size 3010inline_size unsigned int
2527infy_init (EV_P) 3011ev_linux_version (void)
2528{ 3012{
2529 if (fs_fd != -2) 3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
2530 return; 3019 return 0;
2531 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{
2532 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2533 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2534 */ 3047 */
2535 { 3048 if (ev_linux_version () < 0x020619)
2536 struct utsname buf; 3049 return;
2537 int major, minor, micro;
2538 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
3066infy_init (EV_P)
3067{
3068 if (fs_fd != -2)
3069 return;
3070
2539 fs_fd = -1; 3071 fs_fd = -1;
2540 3072
2541 if (uname (&buf)) 3073 ev_check_2625 (EV_A);
2542 return;
2543 3074
2544 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2545 return;
2546
2547 if (major < 2
2548 || (major == 2 && minor < 6)
2549 || (major == 2 && minor == 6 && micro < 25))
2550 return;
2551 }
2552
2553 fs_fd = inotify_init (); 3075 fs_fd = infy_newfd ();
2554 3076
2555 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
2556 { 3078 {
3079 fd_intern (fs_fd);
2557 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3080 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2558 ev_set_priority (&fs_w, EV_MAXPRI); 3081 ev_set_priority (&fs_w, EV_MAXPRI);
2559 ev_io_start (EV_A_ &fs_w); 3082 ev_io_start (EV_A_ &fs_w);
3083 ev_unref (EV_A);
2560 } 3084 }
2561} 3085}
2562 3086
2563void inline_size 3087inline_size void
2564infy_fork (EV_P) 3088infy_fork (EV_P)
2565{ 3089{
2566 int slot; 3090 int slot;
2567 3091
2568 if (fs_fd < 0) 3092 if (fs_fd < 0)
2569 return; 3093 return;
2570 3094
3095 ev_ref (EV_A);
3096 ev_io_stop (EV_A_ &fs_w);
2571 close (fs_fd); 3097 close (fs_fd);
2572 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 }
2573 3107
2574 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3108 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2575 { 3109 {
2576 WL w_ = fs_hash [slot].head; 3110 WL w_ = fs_hash [slot].head;
2577 fs_hash [slot].head = 0; 3111 fs_hash [slot].head = 0;
… …
2584 w->wd = -1; 3118 w->wd = -1;
2585 3119
2586 if (fs_fd >= 0) 3120 if (fs_fd >= 0)
2587 infy_add (EV_A_ w); /* re-add, no matter what */ 3121 infy_add (EV_A_ w); /* re-add, no matter what */
2588 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);
2589 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 }
2590 } 3129 }
2591 } 3130 }
2592} 3131}
2593 3132
2594#endif 3133#endif
… …
2611static void noinline 3150static void noinline
2612stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3151stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2613{ 3152{
2614 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3153 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2615 3154
2616 /* we copy this here each the time so that */ 3155 ev_statdata prev = w->attr;
2617 /* prev has the old value when the callback gets invoked */
2618 w->prev = w->attr;
2619 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
2620 3157
2621 /* 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 */
2622 if ( 3159 if (
2623 w->prev.st_dev != w->attr.st_dev 3160 prev.st_dev != w->attr.st_dev
2624 || w->prev.st_ino != w->attr.st_ino 3161 || prev.st_ino != w->attr.st_ino
2625 || w->prev.st_mode != w->attr.st_mode 3162 || prev.st_mode != w->attr.st_mode
2626 || w->prev.st_nlink != w->attr.st_nlink 3163 || prev.st_nlink != w->attr.st_nlink
2627 || w->prev.st_uid != w->attr.st_uid 3164 || prev.st_uid != w->attr.st_uid
2628 || w->prev.st_gid != w->attr.st_gid 3165 || prev.st_gid != w->attr.st_gid
2629 || w->prev.st_rdev != w->attr.st_rdev 3166 || prev.st_rdev != w->attr.st_rdev
2630 || w->prev.st_size != w->attr.st_size 3167 || prev.st_size != w->attr.st_size
2631 || w->prev.st_atime != w->attr.st_atime 3168 || prev.st_atime != w->attr.st_atime
2632 || w->prev.st_mtime != w->attr.st_mtime 3169 || prev.st_mtime != w->attr.st_mtime
2633 || w->prev.st_ctime != w->attr.st_ctime 3170 || prev.st_ctime != w->attr.st_ctime
2634 ) { 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
2635 #if EV_USE_INOTIFY 3177 #if EV_USE_INOTIFY
2636 if (fs_fd >= 0) 3178 if (fs_fd >= 0)
2637 { 3179 {
2638 infy_del (EV_A_ w); 3180 infy_del (EV_A_ w);
2639 infy_add (EV_A_ w); 3181 infy_add (EV_A_ w);
… …
2649ev_stat_start (EV_P_ ev_stat *w) 3191ev_stat_start (EV_P_ ev_stat *w)
2650{ 3192{
2651 if (expect_false (ev_is_active (w))) 3193 if (expect_false (ev_is_active (w)))
2652 return; 3194 return;
2653 3195
2654 /* since we use memcmp, we need to clear any padding data etc. */
2655 memset (&w->prev, 0, sizeof (ev_statdata));
2656 memset (&w->attr, 0, sizeof (ev_statdata));
2657
2658 ev_stat_stat (EV_A_ w); 3196 ev_stat_stat (EV_A_ w);
2659 3197
3198 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2660 if (w->interval < MIN_STAT_INTERVAL) 3199 w->interval = MIN_STAT_INTERVAL;
2661 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2662 3200
2663 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);
2664 ev_set_priority (&w->timer, ev_priority (w)); 3202 ev_set_priority (&w->timer, ev_priority (w));
2665 3203
2666#if EV_USE_INOTIFY 3204#if EV_USE_INOTIFY
2667 infy_init (EV_A); 3205 infy_init (EV_A);
2668 3206
2669 if (fs_fd >= 0) 3207 if (fs_fd >= 0)
2670 infy_add (EV_A_ w); 3208 infy_add (EV_A_ w);
2671 else 3209 else
2672#endif 3210#endif
3211 {
2673 ev_timer_start (EV_A_ &w->timer); 3212 ev_timer_again (EV_A_ &w->timer);
3213 ev_unref (EV_A);
3214 }
2674 3215
2675 ev_start (EV_A_ (W)w, 1); 3216 ev_start (EV_A_ (W)w, 1);
2676 3217
2677 EV_FREQUENT_CHECK; 3218 EV_FREQUENT_CHECK;
2678} 3219}
… …
2687 EV_FREQUENT_CHECK; 3228 EV_FREQUENT_CHECK;
2688 3229
2689#if EV_USE_INOTIFY 3230#if EV_USE_INOTIFY
2690 infy_del (EV_A_ w); 3231 infy_del (EV_A_ w);
2691#endif 3232#endif
3233
3234 if (ev_is_active (&w->timer))
3235 {
3236 ev_ref (EV_A);
2692 ev_timer_stop (EV_A_ &w->timer); 3237 ev_timer_stop (EV_A_ &w->timer);
3238 }
2693 3239
2694 ev_stop (EV_A_ (W)w); 3240 ev_stop (EV_A_ (W)w);
2695 3241
2696 EV_FREQUENT_CHECK; 3242 EV_FREQUENT_CHECK;
2697} 3243}
… …
2838embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3384embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2839{ 3385{
2840 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3386 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2841 3387
2842 { 3388 {
2843 struct ev_loop *loop = w->other; 3389 EV_P = w->other;
2844 3390
2845 while (fdchangecnt) 3391 while (fdchangecnt)
2846 { 3392 {
2847 fd_reify (EV_A); 3393 fd_reify (EV_A);
2848 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3394 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2853static void 3399static void
2854embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3400embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2855{ 3401{
2856 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3402 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2857 3403
3404 ev_embed_stop (EV_A_ w);
3405
2858 { 3406 {
2859 struct ev_loop *loop = w->other; 3407 EV_P = w->other;
2860 3408
2861 ev_loop_fork (EV_A); 3409 ev_loop_fork (EV_A);
3410 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2862 } 3411 }
3412
3413 ev_embed_start (EV_A_ w);
2863} 3414}
2864 3415
2865#if 0 3416#if 0
2866static void 3417static void
2867embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3418embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2875{ 3426{
2876 if (expect_false (ev_is_active (w))) 3427 if (expect_false (ev_is_active (w)))
2877 return; 3428 return;
2878 3429
2879 { 3430 {
2880 struct ev_loop *loop = w->other; 3431 EV_P = w->other;
2881 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 ()));
2882 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);
2883 } 3434 }
2884 3435
2885 EV_FREQUENT_CHECK; 3436 EV_FREQUENT_CHECK;
2886 3437
… …
2912 3463
2913 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
2914 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
2915 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
2916 3467
3468 ev_stop (EV_A_ (W)w);
3469
2917 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
2918} 3471}
2919#endif 3472#endif
2920 3473
2921#if EV_FORK_ENABLE 3474#if EV_FORK_ENABLE
… …
2997 3550
2998void 3551void
2999ev_async_send (EV_P_ ev_async *w) 3552ev_async_send (EV_P_ ev_async *w)
3000{ 3553{
3001 w->sent = 1; 3554 w->sent = 1;
3002 evpipe_write (EV_A_ &gotasync); 3555 evpipe_write (EV_A_ &async_pending);
3003} 3556}
3004#endif 3557#endif
3005 3558
3006/*****************************************************************************/ 3559/*****************************************************************************/
3007 3560
… …
3069 ev_timer_set (&once->to, timeout, 0.); 3622 ev_timer_set (&once->to, timeout, 0.);
3070 ev_timer_start (EV_A_ &once->to); 3623 ev_timer_start (EV_A_ &once->to);
3071 } 3624 }
3072} 3625}
3073 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
3074#if EV_MULTIPLICITY 3735#if EV_MULTIPLICITY
3075 #include "ev_wrap.h" 3736 #include "ev_wrap.h"
3076#endif 3737#endif
3077 3738
3078#ifdef __cplusplus 3739#ifdef __cplusplus

Diff Legend

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