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

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

Diff Legend

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