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

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

Diff Legend

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