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

Comparing libev/ev.c (file contents):
Revision 1.250 by root, Thu May 22 02:44:57 2008 UTC vs.
Revision 1.328 by root, Sun Feb 14 19:23:19 2010 UTC

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

Diff Legend

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