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

Comparing libev/ev.c (file contents):
Revision 1.244 by root, Tue May 20 23:49:41 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
240#ifndef EV_USE_4HEAP 325#ifndef EV_USE_4HEAP
241# define EV_USE_4HEAP !EV_MINIMAL 326# define EV_USE_4HEAP !EV_MINIMAL
242#endif 327#endif
243 328
244#ifndef EV_HEAP_CACHE_AT 329#ifndef EV_HEAP_CACHE_AT
245# define EV_HEAP_CACHE_AT !EV_MINIMAL 330# define EV_HEAP_CACHE_AT !EV_MINIMAL
246#endif 331#endif
247 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
248/* 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
249 354
250#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
251# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
252# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
253#endif 358#endif
… …
267# include <sys/select.h> 372# include <sys/select.h>
268# endif 373# endif
269#endif 374#endif
270 375
271#if EV_USE_INOTIFY 376#if EV_USE_INOTIFY
377# include <sys/utsname.h>
378# include <sys/statfs.h>
272# 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
273#endif 385#endif
274 386
275#if EV_SELECT_IS_WINSOCKET 387#if EV_SELECT_IS_WINSOCKET
276# include <winsock.h> 388# include <winsock.h>
277#endif 389#endif
278 390
279#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
280/* 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 */
281# 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
282# ifdef __cplusplus 404# ifdef __cplusplus
283extern "C" { 405extern "C" {
284# endif 406# endif
285int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
286# ifdef __cplusplus 408# ifdef __cplusplus
287} 409}
288# endif 410# endif
289#endif 411#endif
290 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
291/**/ 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
292 449
293/* 450/*
294 * This is used to avoid floating point rounding problems. 451 * This is used to avoid floating point rounding problems.
295 * It is added to ev_rt_now when scheduling periodics 452 * It is added to ev_rt_now when scheduling periodics
296 * to ensure progress, time-wise, even when rounding 453 * to ensure progress, time-wise, even when rounding
… …
300 */ 457 */
301#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
302 459
303#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) */
304#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) */
305/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
306 462
307#if __GNUC__ >= 4 463#if __GNUC__ >= 4
308# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
309# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
310#else 466#else
… …
323# define inline_speed static noinline 479# define inline_speed static noinline
324#else 480#else
325# define inline_speed static inline 481# define inline_speed static inline
326#endif 482#endif
327 483
328#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
329#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 489# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
490#endif
330 491
331#define EMPTY /* required for microsofts broken pseudo-c compiler */ 492#define EMPTY /* required for microsofts broken pseudo-c compiler */
332#define EMPTY2(a,b) /* used to suppress some warnings */ 493#define EMPTY2(a,b) /* used to suppress some warnings */
333 494
334typedef ev_watcher *W; 495typedef ev_watcher *W;
… …
336typedef ev_watcher_time *WT; 497typedef ev_watcher_time *WT;
337 498
338#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
339#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
340 501
341#if EV_USE_MONOTONIC 502#if EV_USE_REALTIME
342/* 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 */
343/* 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
344static 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)
345#endif 520#endif
346 521
347#ifdef _WIN32 522#ifdef _WIN32
348# include "ev_win32.c" 523# include "ev_win32.c"
349#endif 524#endif
… …
357{ 532{
358 syserr_cb = cb; 533 syserr_cb = cb;
359} 534}
360 535
361static void noinline 536static void noinline
362syserr (const char *msg) 537ev_syserr (const char *msg)
363{ 538{
364 if (!msg) 539 if (!msg)
365 msg = "(libev) system error"; 540 msg = "(libev) system error";
366 541
367 if (syserr_cb) 542 if (syserr_cb)
… …
413#define ev_malloc(size) ev_realloc (0, (size)) 588#define ev_malloc(size) ev_realloc (0, (size))
414#define ev_free(ptr) ev_realloc ((ptr), 0) 589#define ev_free(ptr) ev_realloc ((ptr), 0)
415 590
416/*****************************************************************************/ 591/*****************************************************************************/
417 592
593/* set in reify when reification needed */
594#define EV_ANFD_REIFY 1
595
596/* file descriptor info structure */
418typedef struct 597typedef struct
419{ 598{
420 WL head; 599 WL head;
421 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 */
422 unsigned char reify; 603 unsigned char unused;
604#if EV_USE_EPOLL
605 unsigned int egen; /* generation counter to counter epoll bugs */
606#endif
423#if EV_SELECT_IS_WINSOCKET 607#if EV_SELECT_IS_WINSOCKET
424 SOCKET handle; 608 SOCKET handle;
425#endif 609#endif
426} ANFD; 610} ANFD;
427 611
612/* stores the pending event set for a given watcher */
428typedef struct 613typedef struct
429{ 614{
430 W w; 615 W w;
431 int events; 616 int events; /* the pending event set for the given watcher */
432} ANPENDING; 617} ANPENDING;
433 618
434#if EV_USE_INOTIFY 619#if EV_USE_INOTIFY
435/* hash table entry per inotify-id */ 620/* hash table entry per inotify-id */
436typedef struct 621typedef struct
… …
439} ANFS; 624} ANFS;
440#endif 625#endif
441 626
442/* Heap Entry */ 627/* Heap Entry */
443#if EV_HEAP_CACHE_AT 628#if EV_HEAP_CACHE_AT
629 /* a heap element */
444 typedef struct { 630 typedef struct {
445 ev_tstamp at; 631 ev_tstamp at;
446 WT w; 632 WT w;
447 } ANHE; 633 } ANHE;
448 634
449 #define ANHE_w(he) (he).w /* access watcher, read-write */ 635 #define ANHE_w(he) (he).w /* access watcher, read-write */
450 #define ANHE_at(he) (he).at /* access cached at, read-only */ 636 #define ANHE_at(he) (he).at /* access cached at, read-only */
451 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */ 637 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
452#else 638#else
639 /* a heap element */
453 typedef WT ANHE; 640 typedef WT ANHE;
454 641
455 #define ANHE_w(he) (he) 642 #define ANHE_w(he) (he)
456 #define ANHE_at(he) (he)->at 643 #define ANHE_at(he) (he)->at
457 #define ANHE_at_set(he) 644 #define ANHE_at_cache(he)
458#endif 645#endif
459 646
460#if EV_MULTIPLICITY 647#if EV_MULTIPLICITY
461 648
462 struct ev_loop 649 struct ev_loop
… …
481 668
482 static int ev_default_loop_ptr; 669 static int ev_default_loop_ptr;
483 670
484#endif 671#endif
485 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
486/*****************************************************************************/ 685/*****************************************************************************/
487 686
687#ifndef EV_HAVE_EV_TIME
488ev_tstamp 688ev_tstamp
489ev_time (void) 689ev_time (void)
490{ 690{
491#if EV_USE_REALTIME 691#if EV_USE_REALTIME
692 if (expect_true (have_realtime))
693 {
492 struct timespec ts; 694 struct timespec ts;
493 clock_gettime (CLOCK_REALTIME, &ts); 695 clock_gettime (CLOCK_REALTIME, &ts);
494 return ts.tv_sec + ts.tv_nsec * 1e-9; 696 return ts.tv_sec + ts.tv_nsec * 1e-9;
495#else 697 }
698#endif
699
496 struct timeval tv; 700 struct timeval tv;
497 gettimeofday (&tv, 0); 701 gettimeofday (&tv, 0);
498 return tv.tv_sec + tv.tv_usec * 1e-6; 702 return tv.tv_sec + tv.tv_usec * 1e-6;
499#endif
500} 703}
704#endif
501 705
502ev_tstamp inline_size 706inline_size ev_tstamp
503get_clock (void) 707get_clock (void)
504{ 708{
505#if EV_USE_MONOTONIC 709#if EV_USE_MONOTONIC
506 if (expect_true (have_monotonic)) 710 if (expect_true (have_monotonic))
507 { 711 {
… …
540 struct timeval tv; 744 struct timeval tv;
541 745
542 tv.tv_sec = (time_t)delay; 746 tv.tv_sec = (time_t)delay;
543 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 747 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
544 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 */
545 select (0, 0, 0, 0, &tv); 752 select (0, 0, 0, 0, &tv);
546#endif 753#endif
547 } 754 }
548} 755}
549 756
550/*****************************************************************************/ 757/*****************************************************************************/
551 758
552#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 759#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
553 760
554int inline_size 761/* find a suitable new size for the given array, */
762/* hopefully by rounding to a ncie-to-malloc size */
763inline_size int
555array_nextsize (int elem, int cur, int cnt) 764array_nextsize (int elem, int cur, int cnt)
556{ 765{
557 int ncur = cur + 1; 766 int ncur = cur + 1;
558 767
559 do 768 do
… …
576array_realloc (int elem, void *base, int *cur, int cnt) 785array_realloc (int elem, void *base, int *cur, int cnt)
577{ 786{
578 *cur = array_nextsize (elem, *cur, cnt); 787 *cur = array_nextsize (elem, *cur, cnt);
579 return ev_realloc (base, elem * *cur); 788 return ev_realloc (base, elem * *cur);
580} 789}
790
791#define array_init_zero(base,count) \
792 memset ((void *)(base), 0, sizeof (*(base)) * (count))
581 793
582#define array_needsize(type,base,cur,cnt,init) \ 794#define array_needsize(type,base,cur,cnt,init) \
583 if (expect_false ((cnt) > (cur))) \ 795 if (expect_false ((cnt) > (cur))) \
584 { \ 796 { \
585 int ocur_ = (cur); \ 797 int ocur_ = (cur); \
… …
597 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 809 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
598 } 810 }
599#endif 811#endif
600 812
601#define array_free(stem, idx) \ 813#define array_free(stem, idx) \
602 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
603 815
604/*****************************************************************************/ 816/*****************************************************************************/
817
818/* dummy callback for pending events */
819static void noinline
820pendingcb (EV_P_ ev_prepare *w, int revents)
821{
822}
605 823
606void noinline 824void noinline
607ev_feed_event (EV_P_ void *w, int revents) 825ev_feed_event (EV_P_ void *w, int revents)
608{ 826{
609 W w_ = (W)w; 827 W w_ = (W)w;
… …
618 pendings [pri][w_->pending - 1].w = w_; 836 pendings [pri][w_->pending - 1].w = w_;
619 pendings [pri][w_->pending - 1].events = revents; 837 pendings [pri][w_->pending - 1].events = revents;
620 } 838 }
621} 839}
622 840
623void 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
624queue_events (EV_P_ W *events, int eventcnt, int type) 857queue_events (EV_P_ W *events, int eventcnt, int type)
625{ 858{
626 int i; 859 int i;
627 860
628 for (i = 0; i < eventcnt; ++i) 861 for (i = 0; i < eventcnt; ++i)
629 ev_feed_event (EV_A_ events [i], type); 862 ev_feed_event (EV_A_ events [i], type);
630} 863}
631 864
632/*****************************************************************************/ 865/*****************************************************************************/
633 866
634void inline_size 867inline_speed void
635anfds_init (ANFD *base, int count)
636{
637 while (count--)
638 {
639 base->head = 0;
640 base->events = EV_NONE;
641 base->reify = 0;
642
643 ++base;
644 }
645}
646
647void inline_speed
648fd_event (EV_P_ int fd, int revents) 868fd_event_nc (EV_P_ int fd, int revents)
649{ 869{
650 ANFD *anfd = anfds + fd; 870 ANFD *anfd = anfds + fd;
651 ev_io *w; 871 ev_io *w;
652 872
653 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)
… …
657 if (ev) 877 if (ev)
658 ev_feed_event (EV_A_ (W)w, ev); 878 ev_feed_event (EV_A_ (W)w, ev);
659 } 879 }
660} 880}
661 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
662void 893void
663ev_feed_fd_event (EV_P_ int fd, int revents) 894ev_feed_fd_event (EV_P_ int fd, int revents)
664{ 895{
665 if (fd >= 0 && fd < anfdmax) 896 if (fd >= 0 && fd < anfdmax)
666 fd_event (EV_A_ fd, revents); 897 fd_event_nc (EV_A_ fd, revents);
667} 898}
668 899
669void inline_size 900/* make sure the external fd watch events are in-sync */
901/* with the kernel/libev internal state */
902inline_size void
670fd_reify (EV_P) 903fd_reify (EV_P)
671{ 904{
672 int i; 905 int i;
673 906
674 for (i = 0; i < fdchangecnt; ++i) 907 for (i = 0; i < fdchangecnt; ++i)
… …
683 events |= (unsigned char)w->events; 916 events |= (unsigned char)w->events;
684 917
685#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
686 if (events) 919 if (events)
687 { 920 {
688 unsigned long argp; 921 unsigned long arg;
689 #ifdef EV_FD_TO_WIN32_HANDLE
690 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
691 #else
692 anfd->handle = _get_osfhandle (fd);
693 #endif
694 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));
695 } 924 }
696#endif 925#endif
697 926
698 { 927 {
699 unsigned char o_events = anfd->events; 928 unsigned char o_events = anfd->events;
700 unsigned char o_reify = anfd->reify; 929 unsigned char o_reify = anfd->reify;
701 930
702 anfd->reify = 0; 931 anfd->reify = 0;
703 anfd->events = events; 932 anfd->events = events;
704 933
705 if (o_events != events || o_reify & EV_IOFDSET) 934 if (o_events != events || o_reify & EV__IOFDSET)
706 backend_modify (EV_A_ fd, o_events, events); 935 backend_modify (EV_A_ fd, o_events, events);
707 } 936 }
708 } 937 }
709 938
710 fdchangecnt = 0; 939 fdchangecnt = 0;
711} 940}
712 941
713void inline_size 942/* something about the given fd changed */
943inline_size void
714fd_change (EV_P_ int fd, int flags) 944fd_change (EV_P_ int fd, int flags)
715{ 945{
716 unsigned char reify = anfds [fd].reify; 946 unsigned char reify = anfds [fd].reify;
717 anfds [fd].reify |= flags; 947 anfds [fd].reify |= flags;
718 948
… …
722 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 952 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
723 fdchanges [fdchangecnt - 1] = fd; 953 fdchanges [fdchangecnt - 1] = fd;
724 } 954 }
725} 955}
726 956
727void inline_speed 957/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
958inline_speed void
728fd_kill (EV_P_ int fd) 959fd_kill (EV_P_ int fd)
729{ 960{
730 ev_io *w; 961 ev_io *w;
731 962
732 while ((w = (ev_io *)anfds [fd].head)) 963 while ((w = (ev_io *)anfds [fd].head))
… …
734 ev_io_stop (EV_A_ w); 965 ev_io_stop (EV_A_ w);
735 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);
736 } 967 }
737} 968}
738 969
739int inline_size 970/* check whether the given fd is atcually valid, for error recovery */
971inline_size int
740fd_valid (int fd) 972fd_valid (int fd)
741{ 973{
742#ifdef _WIN32 974#ifdef _WIN32
743 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
744#else 976#else
745 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
746#endif 978#endif
747} 979}
748 980
… …
752{ 984{
753 int fd; 985 int fd;
754 986
755 for (fd = 0; fd < anfdmax; ++fd) 987 for (fd = 0; fd < anfdmax; ++fd)
756 if (anfds [fd].events) 988 if (anfds [fd].events)
757 if (!fd_valid (fd) == -1 && errno == EBADF) 989 if (!fd_valid (fd) && errno == EBADF)
758 fd_kill (EV_A_ fd); 990 fd_kill (EV_A_ fd);
759} 991}
760 992
761/* 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 */
762static void noinline 994static void noinline
… …
766 998
767 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
768 if (anfds [fd].events) 1000 if (anfds [fd].events)
769 { 1001 {
770 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
771 return; 1003 break;
772 } 1004 }
773} 1005}
774 1006
775/* 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 */
776static void noinline 1008static void noinline
… …
780 1012
781 for (fd = 0; fd < anfdmax; ++fd) 1013 for (fd = 0; fd < anfdmax; ++fd)
782 if (anfds [fd].events) 1014 if (anfds [fd].events)
783 { 1015 {
784 anfds [fd].events = 0; 1016 anfds [fd].events = 0;
1017 anfds [fd].emask = 0;
785 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1018 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
786 } 1019 }
787} 1020}
788 1021
789/*****************************************************************************/ 1022/*****************************************************************************/
790 1023
… …
802 */ 1035 */
803#if EV_USE_4HEAP 1036#if EV_USE_4HEAP
804 1037
805#define DHEAP 4 1038#define DHEAP 4
806#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1039#define HEAP0 (DHEAP - 1) /* index of first element in heap */
807 1040#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
808/* towards the root */ 1041#define UPHEAP_DONE(p,k) ((p) == (k))
809void inline_speed
810upheap (ANHE *heap, int k)
811{
812 ANHE he = heap [k];
813
814 for (;;)
815 {
816 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
817
818 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
819 break;
820
821 heap [k] = heap [p];
822 ev_active (ANHE_w (heap [k])) = k;
823 k = p;
824 }
825
826 ev_active (ANHE_w (he)) = k;
827 heap [k] = he;
828}
829 1042
830/* away from the root */ 1043/* away from the root */
831void inline_speed 1044inline_speed void
832downheap (ANHE *heap, int N, int k) 1045downheap (ANHE *heap, int N, int k)
833{ 1046{
834 ANHE he = heap [k]; 1047 ANHE he = heap [k];
835 ANHE *E = heap + N + HEAP0; 1048 ANHE *E = heap + N + HEAP0;
836 1049
837 for (;;) 1050 for (;;)
838 { 1051 {
839 ev_tstamp minat; 1052 ev_tstamp minat;
840 ANHE *minpos; 1053 ANHE *minpos;
841 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 1054 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
842 1055
843 // find minimum child 1056 /* find minimum child */
844 if (expect_true (pos + DHEAP - 1 < E)) 1057 if (expect_true (pos + DHEAP - 1 < E))
845 { 1058 {
846 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 1059 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
847 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 1060 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
848 if (ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos)); 1061 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
849 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos)); 1062 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
850 } 1063 }
851 else if (pos < E) 1064 else if (pos < E)
852 { 1065 {
853 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 1066 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
854 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 1067 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
… …
859 break; 1072 break;
860 1073
861 if (ANHE_at (he) <= minat) 1074 if (ANHE_at (he) <= minat)
862 break; 1075 break;
863 1076
1077 heap [k] = *minpos;
864 ev_active (ANHE_w (*minpos)) = k; 1078 ev_active (ANHE_w (*minpos)) = k;
865 heap [k] = *minpos;
866 1079
867 k = minpos - heap; 1080 k = minpos - heap;
868 } 1081 }
869 1082
1083 heap [k] = he;
870 ev_active (ANHE_w (he)) = k; 1084 ev_active (ANHE_w (he)) = k;
871 heap [k] = he;
872} 1085}
873 1086
874#else // 4HEAP 1087#else /* 4HEAP */
875 1088
876#define HEAP0 1 1089#define HEAP0 1
1090#define HPARENT(k) ((k) >> 1)
1091#define UPHEAP_DONE(p,k) (!(p))
877 1092
878/* towards the root */ 1093/* away from the root */
879void inline_speed 1094inline_speed void
880upheap (ANHE *heap, int k) 1095downheap (ANHE *heap, int N, int k)
881{ 1096{
882 ANHE he = heap [k]; 1097 ANHE he = heap [k];
883 1098
884 for (;;) 1099 for (;;)
885 { 1100 {
886 int p = k >> 1; 1101 int c = k << 1;
887 1102
888 /* maybe we could use a dummy element at heap [0]? */ 1103 if (c >= N + HEAP0)
889 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
890 break; 1104 break;
891 1105
892 heap [k] = heap [p];
893 ev_active (ANHE_w (heap [k])) = k;
894 k = p;
895 }
896
897 heap [k] = he;
898 ev_active (ANHE_w (heap [k])) = k;
899}
900
901/* away from the root */
902void inline_speed
903downheap (ANHE *heap, int N, int k)
904{
905 ANHE he = heap [k];
906
907 for (;;)
908 {
909 int c = k << 1;
910
911 if (c > N)
912 break;
913
914 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1106 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
915 ? 1 : 0; 1107 ? 1 : 0;
916 1108
917 if (ANHE_at (he) <= ANHE_at (heap [c])) 1109 if (ANHE_at (he) <= ANHE_at (heap [c]))
918 break; 1110 break;
919 1111
… …
926 heap [k] = he; 1118 heap [k] = he;
927 ev_active (ANHE_w (he)) = k; 1119 ev_active (ANHE_w (he)) = k;
928} 1120}
929#endif 1121#endif
930 1122
931void inline_size 1123/* towards the root */
1124inline_speed void
1125upheap (ANHE *heap, int k)
1126{
1127 ANHE he = heap [k];
1128
1129 for (;;)
1130 {
1131 int p = HPARENT (k);
1132
1133 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
1134 break;
1135
1136 heap [k] = heap [p];
1137 ev_active (ANHE_w (heap [k])) = k;
1138 k = p;
1139 }
1140
1141 heap [k] = he;
1142 ev_active (ANHE_w (he)) = k;
1143}
1144
1145/* move an element suitably so it is in a correct place */
1146inline_size void
932adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
933{ 1148{
1149 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
934 upheap (heap, k); 1150 upheap (heap, k);
1151 else
935 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);
936} 1165}
937 1166
938/*****************************************************************************/ 1167/*****************************************************************************/
939 1168
1169/* associate signal watchers to a signal signal */
940typedef struct 1170typedef struct
941{ 1171{
1172 EV_ATOMIC_T pending;
1173#if EV_MULTIPLICITY
1174 EV_P;
1175#endif
942 WL head; 1176 WL head;
943 EV_ATOMIC_T gotsig;
944} ANSIG; 1177} ANSIG;
945 1178
946static ANSIG *signals; 1179static ANSIG signals [EV_NSIG - 1];
947static int signalmax;
948
949static EV_ATOMIC_T gotsig;
950
951void inline_size
952signals_init (ANSIG *base, int count)
953{
954 while (count--)
955 {
956 base->head = 0;
957 base->gotsig = 0;
958
959 ++base;
960 }
961}
962 1180
963/*****************************************************************************/ 1181/*****************************************************************************/
964 1182
965void inline_speed 1183/* used to prepare libev internal fd's */
1184/* this is not fork-safe */
1185inline_speed void
966fd_intern (int fd) 1186fd_intern (int fd)
967{ 1187{
968#ifdef _WIN32 1188#ifdef _WIN32
969 int arg = 1; 1189 unsigned long arg = 1;
970 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
971#else 1191#else
972 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
973 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
974#endif 1194#endif
975} 1195}
976 1196
977static void noinline 1197static void noinline
978evpipe_init (EV_P) 1198evpipe_init (EV_P)
979{ 1199{
980 if (!ev_is_active (&pipeev)) 1200 if (!ev_is_active (&pipe_w))
981 { 1201 {
982#if EV_USE_EVENTFD 1202#if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL)
983 if ((evfd = eventfd (0, 0)) >= 0) 1205 evfd = eventfd (0, 0);
1206
1207 if (evfd >= 0)
984 { 1208 {
985 evpipe [0] = -1; 1209 evpipe [0] = -1;
986 fd_intern (evfd); 1210 fd_intern (evfd); /* doing it twice doesn't hurt */
987 ev_io_set (&pipeev, evfd, EV_READ); 1211 ev_io_set (&pipe_w, evfd, EV_READ);
988 } 1212 }
989 else 1213 else
990#endif 1214#endif
991 { 1215 {
992 while (pipe (evpipe)) 1216 while (pipe (evpipe))
993 syserr ("(libev) error creating signal/async pipe"); 1217 ev_syserr ("(libev) error creating signal/async pipe");
994 1218
995 fd_intern (evpipe [0]); 1219 fd_intern (evpipe [0]);
996 fd_intern (evpipe [1]); 1220 fd_intern (evpipe [1]);
997 ev_io_set (&pipeev, evpipe [0], EV_READ); 1221 ev_io_set (&pipe_w, evpipe [0], EV_READ);
998 } 1222 }
999 1223
1000 ev_io_start (EV_A_ &pipeev); 1224 ev_io_start (EV_A_ &pipe_w);
1001 ev_unref (EV_A); /* watcher should not keep loop alive */ 1225 ev_unref (EV_A); /* watcher should not keep loop alive */
1002 } 1226 }
1003} 1227}
1004 1228
1005void inline_size 1229inline_size void
1006evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1230evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1007{ 1231{
1008 if (!*flag) 1232 if (!*flag)
1009 { 1233 {
1010 int old_errno = errno; /* save errno because write might clobber it */ 1234 int old_errno = errno; /* save errno because write might clobber it */
… …
1023 1247
1024 errno = old_errno; 1248 errno = old_errno;
1025 } 1249 }
1026} 1250}
1027 1251
1252/* called whenever the libev signal pipe */
1253/* got some events (signal, async) */
1028static void 1254static void
1029pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1030{ 1256{
1257 int i;
1258
1031#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1032 if (evfd >= 0) 1260 if (evfd >= 0)
1033 { 1261 {
1034 uint64_t counter; 1262 uint64_t counter;
1035 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
… …
1039 { 1267 {
1040 char dummy; 1268 char dummy;
1041 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1042 } 1270 }
1043 1271
1044 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1045 { 1273 {
1046 int signum; 1274 sig_pending = 0;
1047 gotsig = 0;
1048 1275
1049 for (signum = signalmax; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1050 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1051 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1052 } 1279 }
1053 1280
1054#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1055 if (gotasync) 1282 if (async_pending)
1056 { 1283 {
1057 int i; 1284 async_pending = 0;
1058 gotasync = 0;
1059 1285
1060 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1061 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1062 { 1288 {
1063 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
… …
1071 1297
1072static void 1298static void
1073ev_sighandler (int signum) 1299ev_sighandler (int signum)
1074{ 1300{
1075#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1076 struct ev_loop *loop = &default_loop_struct; 1302 EV_P = signals [signum - 1].loop;
1077#endif 1303#endif
1078 1304
1079#if _WIN32 1305#ifdef _WIN32
1080 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1081#endif 1307#endif
1082 1308
1083 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1084 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1085} 1311}
1086 1312
1087void noinline 1313void noinline
1088ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1089{ 1315{
1090 WL w; 1316 WL w;
1091 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1092#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1093 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 */
1094#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1095 1326
1096 --signum; 1327 if (expect_false (signals [signum].loop != EV_A))
1097
1098 if (signum < 0 || signum >= signalmax)
1099 return; 1328 return;
1329#endif
1100 1330
1101 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1102 1332
1103 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1104 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1105} 1335}
1106 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
1107/*****************************************************************************/ 1357/*****************************************************************************/
1108 1358
1109static WL childs [EV_PID_HASHSIZE]; 1359static WL childs [EV_PID_HASHSIZE];
1110 1360
1111#ifndef _WIN32 1361#ifndef _WIN32
… …
1114 1364
1115#ifndef WIFCONTINUED 1365#ifndef WIFCONTINUED
1116# define WIFCONTINUED(status) 0 1366# define WIFCONTINUED(status) 0
1117#endif 1367#endif
1118 1368
1119void inline_speed 1369/* handle a single child status event */
1370inline_speed void
1120child_reap (EV_P_ int chain, int pid, int status) 1371child_reap (EV_P_ int chain, int pid, int status)
1121{ 1372{
1122 ev_child *w; 1373 ev_child *w;
1123 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1374 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1124 1375
… …
1137 1388
1138#ifndef WCONTINUED 1389#ifndef WCONTINUED
1139# define WCONTINUED 0 1390# define WCONTINUED 0
1140#endif 1391#endif
1141 1392
1393/* called on sigchld etc., calls waitpid */
1142static void 1394static void
1143childcb (EV_P_ ev_signal *sw, int revents) 1395childcb (EV_P_ ev_signal *sw, int revents)
1144{ 1396{
1145 int pid, status; 1397 int pid, status;
1146 1398
… …
1227 /* kqueue is borked on everything but netbsd apparently */ 1479 /* kqueue is borked on everything but netbsd apparently */
1228 /* 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 */
1229 flags &= ~EVBACKEND_KQUEUE; 1481 flags &= ~EVBACKEND_KQUEUE;
1230#endif 1482#endif
1231#ifdef __APPLE__ 1483#ifdef __APPLE__
1232 // flags &= ~EVBACKEND_KQUEUE; for documentation 1484 /* only select works correctly on that "unix-certified" platform */
1233 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 */
1234#endif 1487#endif
1235 1488
1236 return flags; 1489 return flags;
1237} 1490}
1238 1491
… …
1252ev_backend (EV_P) 1505ev_backend (EV_P)
1253{ 1506{
1254 return backend; 1507 return backend;
1255} 1508}
1256 1509
1510#if EV_MINIMAL < 2
1257unsigned int 1511unsigned int
1258ev_loop_count (EV_P) 1512ev_loop_count (EV_P)
1259{ 1513{
1260 return loop_count; 1514 return loop_count;
1261} 1515}
1262 1516
1517unsigned int
1518ev_loop_depth (EV_P)
1519{
1520 return loop_depth;
1521}
1522
1263void 1523void
1264ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1265{ 1525{
1266 io_blocktime = interval; 1526 io_blocktime = interval;
1267} 1527}
… …
1270ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1530ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1271{ 1531{
1272 timeout_blocktime = interval; 1532 timeout_blocktime = interval;
1273} 1533}
1274 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 */
1275static void noinline 1560static void noinline
1276loop_init (EV_P_ unsigned int flags) 1561loop_init (EV_P_ unsigned int flags)
1277{ 1562{
1278 if (!backend) 1563 if (!backend)
1279 { 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
1280#if EV_USE_MONOTONIC 1575#if EV_USE_MONOTONIC
1576 if (!have_monotonic)
1281 { 1577 {
1282 struct timespec ts; 1578 struct timespec ts;
1579
1283 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1580 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1284 have_monotonic = 1; 1581 have_monotonic = 1;
1285 } 1582 }
1286#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"));
1287 1595
1288 ev_rt_now = ev_time (); 1596 ev_rt_now = ev_time ();
1289 mn_now = get_clock (); 1597 mn_now = get_clock ();
1290 now_floor = mn_now; 1598 now_floor = mn_now;
1291 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
1292 1603
1293 io_blocktime = 0.; 1604 io_blocktime = 0.;
1294 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1295 backend = 0; 1606 backend = 0;
1296 backend_fd = -1; 1607 backend_fd = -1;
1297 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1298#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1299 fs_fd = -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1300#endif 1614#endif
1301 1615#if EV_USE_SIGNALFD
1302 /* pid check not overridable via env */ 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1303#ifndef _WIN32
1304 if (flags & EVFLAG_FORKCHECK)
1305 curpid = getpid ();
1306#endif 1617#endif
1307
1308 if (!(flags & EVFLAG_NOENV)
1309 && !enable_secure ()
1310 && getenv ("LIBEV_FLAGS"))
1311 flags = atoi (getenv ("LIBEV_FLAGS"));
1312 1618
1313 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1314 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1315 1621
1316#if EV_USE_PORT 1622#if EV_USE_PORT
… …
1327#endif 1633#endif
1328#if EV_USE_SELECT 1634#if EV_USE_SELECT
1329 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1635 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1330#endif 1636#endif
1331 1637
1638 ev_prepare_init (&pending_w, pendingcb);
1639
1332 ev_init (&pipeev, pipecb); 1640 ev_init (&pipe_w, pipecb);
1333 ev_set_priority (&pipeev, EV_MAXPRI); 1641 ev_set_priority (&pipe_w, EV_MAXPRI);
1334 } 1642 }
1335} 1643}
1336 1644
1645/* free up a loop structure */
1337static void noinline 1646static void noinline
1338loop_destroy (EV_P) 1647loop_destroy (EV_P)
1339{ 1648{
1340 int i; 1649 int i;
1341 1650
1342 if (ev_is_active (&pipeev)) 1651 if (ev_is_active (&pipe_w))
1343 { 1652 {
1344 ev_ref (EV_A); /* signal watcher */ 1653 /*ev_ref (EV_A);*/
1345 ev_io_stop (EV_A_ &pipeev); 1654 /*ev_io_stop (EV_A_ &pipe_w);*/
1346 1655
1347#if EV_USE_EVENTFD 1656#if EV_USE_EVENTFD
1348 if (evfd >= 0) 1657 if (evfd >= 0)
1349 close (evfd); 1658 close (evfd);
1350#endif 1659#endif
1351 1660
1352 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1353 { 1662 {
1354 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1355 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1356 } 1665 }
1357 } 1666 }
1667
1668#if EV_USE_SIGNALFD
1669 if (ev_is_active (&sigfd_w))
1670 close (sigfd);
1671#endif
1358 1672
1359#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1360 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1361 close (fs_fd); 1675 close (fs_fd);
1362#endif 1676#endif
… …
1386#if EV_IDLE_ENABLE 1700#if EV_IDLE_ENABLE
1387 array_free (idle, [i]); 1701 array_free (idle, [i]);
1388#endif 1702#endif
1389 } 1703 }
1390 1704
1391 ev_free (anfds); anfdmax = 0; 1705 ev_free (anfds); anfds = 0; anfdmax = 0;
1392 1706
1393 /* 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);
1394 array_free (fdchange, EMPTY); 1709 array_free (fdchange, EMPTY);
1395 array_free (timer, EMPTY); 1710 array_free (timer, EMPTY);
1396#if EV_PERIODIC_ENABLE 1711#if EV_PERIODIC_ENABLE
1397 array_free (periodic, EMPTY); 1712 array_free (periodic, EMPTY);
1398#endif 1713#endif
… …
1407 1722
1408 backend = 0; 1723 backend = 0;
1409} 1724}
1410 1725
1411#if EV_USE_INOTIFY 1726#if EV_USE_INOTIFY
1412void inline_size infy_fork (EV_P); 1727inline_size void infy_fork (EV_P);
1413#endif 1728#endif
1414 1729
1415void inline_size 1730inline_size void
1416loop_fork (EV_P) 1731loop_fork (EV_P)
1417{ 1732{
1418#if EV_USE_PORT 1733#if EV_USE_PORT
1419 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1734 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1420#endif 1735#endif
… …
1426#endif 1741#endif
1427#if EV_USE_INOTIFY 1742#if EV_USE_INOTIFY
1428 infy_fork (EV_A); 1743 infy_fork (EV_A);
1429#endif 1744#endif
1430 1745
1431 if (ev_is_active (&pipeev)) 1746 if (ev_is_active (&pipe_w))
1432 { 1747 {
1433 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1434 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1435 gotsig = 1; 1750 sig_pending = 1;
1436#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1437 gotasync = 1; 1752 async_pending = 1;
1438#endif 1753#endif
1439 1754
1440 ev_ref (EV_A); 1755 ev_ref (EV_A);
1441 ev_io_stop (EV_A_ &pipeev); 1756 ev_io_stop (EV_A_ &pipe_w);
1442 1757
1443#if EV_USE_EVENTFD 1758#if EV_USE_EVENTFD
1444 if (evfd >= 0) 1759 if (evfd >= 0)
1445 close (evfd); 1760 close (evfd);
1446#endif 1761#endif
1447 1762
1448 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1449 { 1764 {
1450 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1451 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1452 } 1767 }
1453 1768
1454 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1455 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1456 pipecb (EV_A_ &pipeev, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
1457 } 1772 }
1458 1773
1459 postfork = 0; 1774 postfork = 0;
1460} 1775}
1461 1776
1462#if EV_MULTIPLICITY 1777#if EV_MULTIPLICITY
1778
1463struct ev_loop * 1779struct ev_loop *
1464ev_loop_new (unsigned int flags) 1780ev_loop_new (unsigned int flags)
1465{ 1781{
1466 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));
1467 1783
1468 memset (loop, 0, sizeof (struct ev_loop)); 1784 memset (EV_A, 0, sizeof (struct ev_loop));
1469
1470 loop_init (EV_A_ flags); 1785 loop_init (EV_A_ flags);
1471 1786
1472 if (ev_backend (EV_A)) 1787 if (ev_backend (EV_A))
1473 return loop; 1788 return EV_A;
1474 1789
1475 return 0; 1790 return 0;
1476} 1791}
1477 1792
1478void 1793void
… …
1484 1799
1485void 1800void
1486ev_loop_fork (EV_P) 1801ev_loop_fork (EV_P)
1487{ 1802{
1488 postfork = 1; /* must be in line with ev_default_fork */ 1803 postfork = 1; /* must be in line with ev_default_fork */
1804}
1805#endif /* multiplicity */
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
1489} 1905}
1490#endif 1906#endif
1491 1907
1492#if EV_MULTIPLICITY 1908#if EV_MULTIPLICITY
1493struct ev_loop * 1909struct ev_loop *
… …
1498#endif 1914#endif
1499{ 1915{
1500 if (!ev_default_loop_ptr) 1916 if (!ev_default_loop_ptr)
1501 { 1917 {
1502#if EV_MULTIPLICITY 1918#if EV_MULTIPLICITY
1503 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1919 EV_P = ev_default_loop_ptr = &default_loop_struct;
1504#else 1920#else
1505 ev_default_loop_ptr = 1; 1921 ev_default_loop_ptr = 1;
1506#endif 1922#endif
1507 1923
1508 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
… …
1525 1941
1526void 1942void
1527ev_default_destroy (void) 1943ev_default_destroy (void)
1528{ 1944{
1529#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1530 struct ev_loop *loop = ev_default_loop_ptr; 1946 EV_P = ev_default_loop_ptr;
1531#endif 1947#endif
1948
1949 ev_default_loop_ptr = 0;
1532 1950
1533#ifndef _WIN32 1951#ifndef _WIN32
1534 ev_ref (EV_A); /* child watcher */ 1952 ev_ref (EV_A); /* child watcher */
1535 ev_signal_stop (EV_A_ &childev); 1953 ev_signal_stop (EV_A_ &childev);
1536#endif 1954#endif
… …
1540 1958
1541void 1959void
1542ev_default_fork (void) 1960ev_default_fork (void)
1543{ 1961{
1544#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1545 struct ev_loop *loop = ev_default_loop_ptr; 1963 EV_P = ev_default_loop_ptr;
1546#endif 1964#endif
1547 1965
1548 if (backend)
1549 postfork = 1; /* must be in line with ev_loop_fork */ 1966 postfork = 1; /* must be in line with ev_loop_fork */
1550} 1967}
1551 1968
1552/*****************************************************************************/ 1969/*****************************************************************************/
1553 1970
1554void 1971void
1555ev_invoke (EV_P_ void *w, int revents) 1972ev_invoke (EV_P_ void *w, int revents)
1556{ 1973{
1557 EV_CB_INVOKE ((W)w, revents); 1974 EV_CB_INVOKE ((W)w, revents);
1558} 1975}
1559 1976
1560void inline_speed 1977unsigned int
1561call_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)
1562{ 1991{
1563 int pri; 1992 int pri;
1564 1993
1565 for (pri = NUMPRI; pri--; ) 1994 for (pri = NUMPRI; pri--; )
1566 while (pendingcnt [pri]) 1995 while (pendingcnt [pri])
1567 { 1996 {
1568 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1997 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1569 1998
1570 if (expect_true (p->w))
1571 {
1572 /*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 */
1573 2001
1574 p->w->pending = 0; 2002 p->w->pending = 0;
1575 EV_CB_INVOKE (p->w, p->events); 2003 EV_CB_INVOKE (p->w, p->events);
1576 } 2004 EV_FREQUENT_CHECK;
1577 } 2005 }
1578} 2006}
1579 2007
1580#if EV_IDLE_ENABLE 2008#if EV_IDLE_ENABLE
1581void inline_size 2009/* make idle watchers pending. this handles the "call-idle */
2010/* only when higher priorities are idle" logic */
2011inline_size void
1582idle_reify (EV_P) 2012idle_reify (EV_P)
1583{ 2013{
1584 if (expect_false (idleall)) 2014 if (expect_false (idleall))
1585 { 2015 {
1586 int pri; 2016 int pri;
… …
1598 } 2028 }
1599 } 2029 }
1600} 2030}
1601#endif 2031#endif
1602 2032
1603void inline_size 2033/* make timers pending */
2034inline_size void
1604timers_reify (EV_P) 2035timers_reify (EV_P)
1605{ 2036{
2037 EV_FREQUENT_CHECK;
2038
1606 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2039 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1607 { 2040 {
1608 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2041 do
1609
1610 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1611
1612 /* first reschedule or stop timer */
1613 if (w->repeat)
1614 { 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 {
1615 ev_at (w) += w->repeat; 2050 ev_at (w) += w->repeat;
1616 if (ev_at (w) < mn_now) 2051 if (ev_at (w) < mn_now)
1617 ev_at (w) = mn_now; 2052 ev_at (w) = mn_now;
1618 2053
1619 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2054 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1620 2055
1621 ANHE_at_set (timers [HEAP0]); 2056 ANHE_at_cache (timers [HEAP0]);
1622 downheap (timers, timercnt, 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);
1623 } 2064 }
1624 else 2065 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1625 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1626 2066
1627 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2067 feed_reverse_done (EV_A_ EV_TIMEOUT);
1628 } 2068 }
1629} 2069}
1630 2070
1631#if EV_PERIODIC_ENABLE 2071#if EV_PERIODIC_ENABLE
1632void inline_size 2072/* make periodics pending */
2073inline_size void
1633periodics_reify (EV_P) 2074periodics_reify (EV_P)
1634{ 2075{
2076 EV_FREQUENT_CHECK;
2077
1635 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2078 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1636 { 2079 {
1637 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2080 int feed_count = 0;
1638 2081
1639 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2082 do
1640
1641 /* first reschedule or stop timer */
1642 if (w->reschedule_cb)
1643 { 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 {
1644 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2091 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1645 2092
1646 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2093 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1647 2094
1648 ANHE_at_set (periodics [HEAP0]); 2095 ANHE_at_cache (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, 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);
1650 } 2122 }
1651 else if (w->interval) 2123 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1652 {
1653 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1654 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1655 2124
1656 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) >= ev_rt_now));
1657
1658 ANHE_at_set (periodics [HEAP0]);
1659 downheap (periodics, periodiccnt, HEAP0);
1660 }
1661 else
1662 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1663
1664 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2125 feed_reverse_done (EV_A_ EV_PERIODIC);
1665 } 2126 }
1666} 2127}
1667 2128
2129/* simply recalculate all periodics */
2130/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1668static void noinline 2131static void noinline
1669periodics_reschedule (EV_P) 2132periodics_reschedule (EV_P)
1670{ 2133{
1671 int i; 2134 int i;
1672 2135
… …
1678 if (w->reschedule_cb) 2141 if (w->reschedule_cb)
1679 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2142 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1680 else if (w->interval) 2143 else if (w->interval)
1681 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2144 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1682 2145
1683 ANHE_at_set (periodics [i]); 2146 ANHE_at_cache (periodics [i]);
1684 } 2147 }
1685 2148
1686 /* we don't use floyds algorithm, uphead is simpler and is more cache-efficient */ 2149 reheap (periodics, periodiccnt);
1687 /* also, this is easy and corretc for both 2-heaps and 4-heaps */ 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
1688 for (i = 0; i < periodiccnt; ++i) 2159 for (i = 0; i < timercnt; ++i)
1689 upheap (periodics, i + HEAP0); 2160 {
2161 ANHE *he = timers + i + HEAP0;
2162 ANHE_w (*he)->at += adjust;
2163 ANHE_at_cache (*he);
2164 }
1690} 2165}
1691#endif
1692 2166
1693void inline_speed 2167/* fetch new monotonic and realtime times from the kernel */
2168/* also detect if there was a timejump, and act accordingly */
2169inline_speed void
1694time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
1695{ 2171{
1696 int i;
1697
1698#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
1699 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
1700 { 2174 {
2175 int i;
1701 ev_tstamp odiff = rtmn_diff; 2176 ev_tstamp odiff = rtmn_diff;
1702 2177
1703 mn_now = get_clock (); 2178 mn_now = get_clock ();
1704 2179
1705 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2180 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1731 ev_rt_now = ev_time (); 2206 ev_rt_now = ev_time ();
1732 mn_now = get_clock (); 2207 mn_now = get_clock ();
1733 now_floor = mn_now; 2208 now_floor = mn_now;
1734 } 2209 }
1735 2210
2211 /* no timer adjustment, as the monotonic clock doesn't jump */
2212 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1736# if EV_PERIODIC_ENABLE 2213# if EV_PERIODIC_ENABLE
1737 periodics_reschedule (EV_A); 2214 periodics_reschedule (EV_A);
1738# endif 2215# endif
1739 /* no timer adjustment, as the monotonic clock doesn't jump */
1740 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1741 } 2216 }
1742 else 2217 else
1743#endif 2218#endif
1744 { 2219 {
1745 ev_rt_now = ev_time (); 2220 ev_rt_now = ev_time ();
1746 2221
1747 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))
1748 { 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);
1749#if EV_PERIODIC_ENABLE 2226#if EV_PERIODIC_ENABLE
1750 periodics_reschedule (EV_A); 2227 periodics_reschedule (EV_A);
1751#endif 2228#endif
1752 /* adjust timers. this is easy, as the offset is the same for all of them */
1753 for (i = 0; i < timercnt; ++i)
1754 {
1755 ANHE *he = timers + i + HEAP0;
1756 ANHE_w (*he)->at += ev_rt_now - mn_now;
1757 ANHE_at_set (*he);
1758 }
1759 } 2229 }
1760 2230
1761 mn_now = ev_rt_now; 2231 mn_now = ev_rt_now;
1762 } 2232 }
1763} 2233}
1764 2234
1765void 2235void
1766ev_ref (EV_P)
1767{
1768 ++activecnt;
1769}
1770
1771void
1772ev_unref (EV_P)
1773{
1774 --activecnt;
1775}
1776
1777static int loop_done;
1778
1779void
1780ev_loop (EV_P_ int flags) 2236ev_loop (EV_P_ int flags)
1781{ 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
1782 loop_done = EVUNLOOP_CANCEL; 2244 loop_done = EVUNLOOP_CANCEL;
1783 2245
1784 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 */
1785 2247
1786 do 2248 do
1787 { 2249 {
2250#if EV_VERIFY >= 2
2251 ev_loop_verify (EV_A);
2252#endif
2253
1788#ifndef _WIN32 2254#ifndef _WIN32
1789 if (expect_false (curpid)) /* penalise the forking check even more */ 2255 if (expect_false (curpid)) /* penalise the forking check even more */
1790 if (expect_false (getpid () != curpid)) 2256 if (expect_false (getpid () != curpid))
1791 { 2257 {
1792 curpid = getpid (); 2258 curpid = getpid ();
… …
1798 /* we might have forked, so queue fork handlers */ 2264 /* we might have forked, so queue fork handlers */
1799 if (expect_false (postfork)) 2265 if (expect_false (postfork))
1800 if (forkcnt) 2266 if (forkcnt)
1801 { 2267 {
1802 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2268 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1803 call_pending (EV_A); 2269 EV_INVOKE_PENDING;
1804 } 2270 }
1805#endif 2271#endif
1806 2272
1807 /* queue prepare watchers (and execute them) */ 2273 /* queue prepare watchers (and execute them) */
1808 if (expect_false (preparecnt)) 2274 if (expect_false (preparecnt))
1809 { 2275 {
1810 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2276 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1811 call_pending (EV_A); 2277 EV_INVOKE_PENDING;
1812 } 2278 }
1813 2279
1814 if (expect_false (!activecnt)) 2280 if (expect_false (loop_done))
1815 break; 2281 break;
1816 2282
1817 /* we might have forked, so reify kernel state if necessary */ 2283 /* we might have forked, so reify kernel state if necessary */
1818 if (expect_false (postfork)) 2284 if (expect_false (postfork))
1819 loop_fork (EV_A); 2285 loop_fork (EV_A);
… …
1826 ev_tstamp waittime = 0.; 2292 ev_tstamp waittime = 0.;
1827 ev_tstamp sleeptime = 0.; 2293 ev_tstamp sleeptime = 0.;
1828 2294
1829 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2295 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1830 { 2296 {
2297 /* remember old timestamp for io_blocktime calculation */
2298 ev_tstamp prev_mn_now = mn_now;
2299
1831 /* update time to cancel out callback processing overhead */ 2300 /* update time to cancel out callback processing overhead */
1832 time_update (EV_A_ 1e100); 2301 time_update (EV_A_ 1e100);
1833 2302
1834 waittime = MAX_BLOCKTIME; 2303 waittime = MAX_BLOCKTIME;
1835 2304
… …
1845 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2314 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1846 if (waittime > to) waittime = to; 2315 if (waittime > to) waittime = to;
1847 } 2316 }
1848#endif 2317#endif
1849 2318
2319 /* don't let timeouts decrease the waittime below timeout_blocktime */
1850 if (expect_false (waittime < timeout_blocktime)) 2320 if (expect_false (waittime < timeout_blocktime))
1851 waittime = timeout_blocktime; 2321 waittime = timeout_blocktime;
1852 2322
1853 sleeptime = waittime - backend_fudge; 2323 /* extra check because io_blocktime is commonly 0 */
1854
1855 if (expect_true (sleeptime > io_blocktime)) 2324 if (expect_false (io_blocktime))
1856 sleeptime = io_blocktime;
1857
1858 if (sleeptime)
1859 { 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 {
1860 ev_sleep (sleeptime); 2333 ev_sleep (sleeptime);
1861 waittime -= sleeptime; 2334 waittime -= sleeptime;
2335 }
1862 } 2336 }
1863 } 2337 }
1864 2338
2339#if EV_MINIMAL < 2
1865 ++loop_count; 2340 ++loop_count;
2341#endif
2342 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
1866 backend_poll (EV_A_ waittime); 2343 backend_poll (EV_A_ waittime);
2344 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
1867 2345
1868 /* update ev_rt_now, do magic */ 2346 /* update ev_rt_now, do magic */
1869 time_update (EV_A_ waittime + sleeptime); 2347 time_update (EV_A_ waittime + sleeptime);
1870 } 2348 }
1871 2349
… …
1882 2360
1883 /* queue check watchers, to be executed first */ 2361 /* queue check watchers, to be executed first */
1884 if (expect_false (checkcnt)) 2362 if (expect_false (checkcnt))
1885 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2363 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1886 2364
1887 call_pending (EV_A); 2365 EV_INVOKE_PENDING;
1888 } 2366 }
1889 while (expect_true ( 2367 while (expect_true (
1890 activecnt 2368 activecnt
1891 && !loop_done 2369 && !loop_done
1892 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2370 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1893 )); 2371 ));
1894 2372
1895 if (loop_done == EVUNLOOP_ONE) 2373 if (loop_done == EVUNLOOP_ONE)
1896 loop_done = EVUNLOOP_CANCEL; 2374 loop_done = EVUNLOOP_CANCEL;
2375
2376#if EV_MINIMAL < 2
2377 --loop_depth;
2378#endif
1897} 2379}
1898 2380
1899void 2381void
1900ev_unloop (EV_P_ int how) 2382ev_unloop (EV_P_ int how)
1901{ 2383{
1902 loop_done = how; 2384 loop_done = how;
1903} 2385}
1904 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
1905/*****************************************************************************/ 2424/*****************************************************************************/
2425/* singly-linked list management, used when the expected list length is short */
1906 2426
1907void inline_size 2427inline_size void
1908wlist_add (WL *head, WL elem) 2428wlist_add (WL *head, WL elem)
1909{ 2429{
1910 elem->next = *head; 2430 elem->next = *head;
1911 *head = elem; 2431 *head = elem;
1912} 2432}
1913 2433
1914void inline_size 2434inline_size void
1915wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
1916{ 2436{
1917 while (*head) 2437 while (*head)
1918 { 2438 {
1919 if (*head == elem) 2439 if (expect_true (*head == elem))
1920 { 2440 {
1921 *head = elem->next; 2441 *head = elem->next;
1922 return; 2442 break;
1923 } 2443 }
1924 2444
1925 head = &(*head)->next; 2445 head = &(*head)->next;
1926 } 2446 }
1927} 2447}
1928 2448
1929void inline_speed 2449/* internal, faster, version of ev_clear_pending */
2450inline_speed void
1930clear_pending (EV_P_ W w) 2451clear_pending (EV_P_ W w)
1931{ 2452{
1932 if (w->pending) 2453 if (w->pending)
1933 { 2454 {
1934 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2455 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
1935 w->pending = 0; 2456 w->pending = 0;
1936 } 2457 }
1937} 2458}
1938 2459
1939int 2460int
… …
1943 int pending = w_->pending; 2464 int pending = w_->pending;
1944 2465
1945 if (expect_true (pending)) 2466 if (expect_true (pending))
1946 { 2467 {
1947 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2468 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2469 p->w = (W)&pending_w;
1948 w_->pending = 0; 2470 w_->pending = 0;
1949 p->w = 0;
1950 return p->events; 2471 return p->events;
1951 } 2472 }
1952 else 2473 else
1953 return 0; 2474 return 0;
1954} 2475}
1955 2476
1956void inline_size 2477inline_size void
1957pri_adjust (EV_P_ W w) 2478pri_adjust (EV_P_ W w)
1958{ 2479{
1959 int pri = w->priority; 2480 int pri = ev_priority (w);
1960 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2481 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1961 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2482 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1962 w->priority = pri; 2483 ev_set_priority (w, pri);
1963} 2484}
1964 2485
1965void inline_speed 2486inline_speed void
1966ev_start (EV_P_ W w, int active) 2487ev_start (EV_P_ W w, int active)
1967{ 2488{
1968 pri_adjust (EV_A_ w); 2489 pri_adjust (EV_A_ w);
1969 w->active = active; 2490 w->active = active;
1970 ev_ref (EV_A); 2491 ev_ref (EV_A);
1971} 2492}
1972 2493
1973void inline_size 2494inline_size void
1974ev_stop (EV_P_ W w) 2495ev_stop (EV_P_ W w)
1975{ 2496{
1976 ev_unref (EV_A); 2497 ev_unref (EV_A);
1977 w->active = 0; 2498 w->active = 0;
1978} 2499}
… …
1985 int fd = w->fd; 2506 int fd = w->fd;
1986 2507
1987 if (expect_false (ev_is_active (w))) 2508 if (expect_false (ev_is_active (w)))
1988 return; 2509 return;
1989 2510
1990 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;
1991 2515
1992 ev_start (EV_A_ (W)w, 1); 2516 ev_start (EV_A_ (W)w, 1);
1993 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1994 wlist_add (&anfds[fd].head, (WL)w); 2518 wlist_add (&anfds[fd].head, (WL)w);
1995 2519
1996 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2520 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
1997 w->events &= ~EV_IOFDSET; 2521 w->events &= ~EV__IOFDSET;
2522
2523 EV_FREQUENT_CHECK;
1998} 2524}
1999 2525
2000void noinline 2526void noinline
2001ev_io_stop (EV_P_ ev_io *w) 2527ev_io_stop (EV_P_ ev_io *w)
2002{ 2528{
2003 clear_pending (EV_A_ (W)w); 2529 clear_pending (EV_A_ (W)w);
2004 if (expect_false (!ev_is_active (w))) 2530 if (expect_false (!ev_is_active (w)))
2005 return; 2531 return;
2006 2532
2007 assert (("ev_io_stop 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;
2008 2536
2009 wlist_del (&anfds[w->fd].head, (WL)w); 2537 wlist_del (&anfds[w->fd].head, (WL)w);
2010 ev_stop (EV_A_ (W)w); 2538 ev_stop (EV_A_ (W)w);
2011 2539
2012 fd_change (EV_A_ w->fd, 1); 2540 fd_change (EV_A_ w->fd, 1);
2541
2542 EV_FREQUENT_CHECK;
2013} 2543}
2014 2544
2015void noinline 2545void noinline
2016ev_timer_start (EV_P_ ev_timer *w) 2546ev_timer_start (EV_P_ ev_timer *w)
2017{ 2547{
2018 if (expect_false (ev_is_active (w))) 2548 if (expect_false (ev_is_active (w)))
2019 return; 2549 return;
2020 2550
2021 ev_at (w) += mn_now; 2551 ev_at (w) += mn_now;
2022 2552
2023 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.));
2024 2554
2555 EV_FREQUENT_CHECK;
2556
2557 ++timercnt;
2025 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2558 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2026 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2559 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2027 ANHE_w (timers [ev_active (w)]) = (WT)w; 2560 ANHE_w (timers [ev_active (w)]) = (WT)w;
2028 ANHE_at_set (timers [ev_active (w)]); 2561 ANHE_at_cache (timers [ev_active (w)]);
2029 upheap (timers, ev_active (w)); 2562 upheap (timers, ev_active (w));
2030 2563
2564 EV_FREQUENT_CHECK;
2565
2031 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2566 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2032} 2567}
2033 2568
2034void noinline 2569void noinline
2035ev_timer_stop (EV_P_ ev_timer *w) 2570ev_timer_stop (EV_P_ ev_timer *w)
2036{ 2571{
2037 clear_pending (EV_A_ (W)w); 2572 clear_pending (EV_A_ (W)w);
2038 if (expect_false (!ev_is_active (w))) 2573 if (expect_false (!ev_is_active (w)))
2039 return; 2574 return;
2040 2575
2576 EV_FREQUENT_CHECK;
2577
2041 { 2578 {
2042 int active = ev_active (w); 2579 int active = ev_active (w);
2043 2580
2044 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2581 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2045 2582
2583 --timercnt;
2584
2046 if (expect_true (active < timercnt + HEAP0 - 1)) 2585 if (expect_true (active < timercnt + HEAP0))
2047 { 2586 {
2048 timers [active] = timers [timercnt + HEAP0 - 1]; 2587 timers [active] = timers [timercnt + HEAP0];
2049 adjustheap (timers, timercnt, active); 2588 adjustheap (timers, timercnt, active);
2050 } 2589 }
2051
2052 --timercnt;
2053 } 2590 }
2591
2592 EV_FREQUENT_CHECK;
2054 2593
2055 ev_at (w) -= mn_now; 2594 ev_at (w) -= mn_now;
2056 2595
2057 ev_stop (EV_A_ (W)w); 2596 ev_stop (EV_A_ (W)w);
2058} 2597}
2059 2598
2060void noinline 2599void noinline
2061ev_timer_again (EV_P_ ev_timer *w) 2600ev_timer_again (EV_P_ ev_timer *w)
2062{ 2601{
2602 EV_FREQUENT_CHECK;
2603
2063 if (ev_is_active (w)) 2604 if (ev_is_active (w))
2064 { 2605 {
2065 if (w->repeat) 2606 if (w->repeat)
2066 { 2607 {
2067 ev_at (w) = mn_now + w->repeat; 2608 ev_at (w) = mn_now + w->repeat;
2068 ANHE_at_set (timers [ev_active (w)]); 2609 ANHE_at_cache (timers [ev_active (w)]);
2069 adjustheap (timers, timercnt, ev_active (w)); 2610 adjustheap (timers, timercnt, ev_active (w));
2070 } 2611 }
2071 else 2612 else
2072 ev_timer_stop (EV_A_ w); 2613 ev_timer_stop (EV_A_ w);
2073 } 2614 }
2074 else if (w->repeat) 2615 else if (w->repeat)
2075 { 2616 {
2076 ev_at (w) = w->repeat; 2617 ev_at (w) = w->repeat;
2077 ev_timer_start (EV_A_ w); 2618 ev_timer_start (EV_A_ w);
2078 } 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.);
2079} 2628}
2080 2629
2081#if EV_PERIODIC_ENABLE 2630#if EV_PERIODIC_ENABLE
2082void noinline 2631void noinline
2083ev_periodic_start (EV_P_ ev_periodic *w) 2632ev_periodic_start (EV_P_ ev_periodic *w)
… …
2087 2636
2088 if (w->reschedule_cb) 2637 if (w->reschedule_cb)
2089 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2638 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2090 else if (w->interval) 2639 else if (w->interval)
2091 { 2640 {
2092 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.));
2093 /* 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 */
2094 ev_at (w) = 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;
2095 } 2644 }
2096 else 2645 else
2097 ev_at (w) = w->offset; 2646 ev_at (w) = w->offset;
2098 2647
2648 EV_FREQUENT_CHECK;
2649
2650 ++periodiccnt;
2099 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2651 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2100 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2652 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2101 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2653 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2102 ANHE_at_set (periodics [ev_active (w)]); 2654 ANHE_at_cache (periodics [ev_active (w)]);
2103 upheap (periodics, ev_active (w)); 2655 upheap (periodics, ev_active (w));
2104 2656
2657 EV_FREQUENT_CHECK;
2658
2105 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2659 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2106} 2660}
2107 2661
2108void noinline 2662void noinline
2109ev_periodic_stop (EV_P_ ev_periodic *w) 2663ev_periodic_stop (EV_P_ ev_periodic *w)
2110{ 2664{
2111 clear_pending (EV_A_ (W)w); 2665 clear_pending (EV_A_ (W)w);
2112 if (expect_false (!ev_is_active (w))) 2666 if (expect_false (!ev_is_active (w)))
2113 return; 2667 return;
2114 2668
2669 EV_FREQUENT_CHECK;
2670
2115 { 2671 {
2116 int active = ev_active (w); 2672 int active = ev_active (w);
2117 2673
2118 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2674 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2119 2675
2676 --periodiccnt;
2677
2120 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2678 if (expect_true (active < periodiccnt + HEAP0))
2121 { 2679 {
2122 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2680 periodics [active] = periodics [periodiccnt + HEAP0];
2123 adjustheap (periodics, periodiccnt, active); 2681 adjustheap (periodics, periodiccnt, active);
2124 } 2682 }
2125
2126 --periodiccnt;
2127 } 2683 }
2684
2685 EV_FREQUENT_CHECK;
2128 2686
2129 ev_stop (EV_A_ (W)w); 2687 ev_stop (EV_A_ (W)w);
2130} 2688}
2131 2689
2132void noinline 2690void noinline
… …
2143#endif 2701#endif
2144 2702
2145void noinline 2703void noinline
2146ev_signal_start (EV_P_ ev_signal *w) 2704ev_signal_start (EV_P_ ev_signal *w)
2147{ 2705{
2148#if EV_MULTIPLICITY
2149 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2150#endif
2151 if (expect_false (ev_is_active (w))) 2706 if (expect_false (ev_is_active (w)))
2152 return; 2707 return;
2153 2708
2154 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));
2155 2710
2156 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));
2157 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)
2158 { 2722 {
2159#ifndef _WIN32 2723 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2160 sigset_t full, prev; 2724 if (sigfd < 0 && errno == EINVAL)
2161 sigfillset (&full); 2725 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2162 sigprocmask (SIG_SETMASK, &full, &prev);
2163#endif
2164 2726
2165 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2727 if (sigfd >= 0)
2728 {
2729 fd_intern (sigfd); /* doing it twice will not hurt */
2166 2730
2167#ifndef _WIN32 2731 sigemptyset (&sigfd_set);
2168 sigprocmask (SIG_SETMASK, &prev, 0); 2732
2169#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 }
2170 } 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
2171 2749
2172 ev_start (EV_A_ (W)w, 1); 2750 ev_start (EV_A_ (W)w, 1);
2173 wlist_add (&signals [w->signum - 1].head, (WL)w); 2751 wlist_add (&signals [w->signum - 1].head, (WL)w);
2174 2752
2175 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2754# if EV_USE_SIGNALFD
2755 if (sigfd < 0) /*TODO*/
2756# endif
2176 { 2757 {
2177#if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2178 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2179#else 2762# else
2180 struct sigaction sa; 2763 struct sigaction sa;
2764
2765 evpipe_init (EV_A);
2766
2181 sa.sa_handler = ev_sighandler; 2767 sa.sa_handler = ev_sighandler;
2182 sigfillset (&sa.sa_mask); 2768 sigfillset (&sa.sa_mask);
2183 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 */
2184 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);
2185#endif 2775#endif
2186 } 2776 }
2777
2778 EV_FREQUENT_CHECK;
2187} 2779}
2188 2780
2189void noinline 2781void noinline
2190ev_signal_stop (EV_P_ ev_signal *w) 2782ev_signal_stop (EV_P_ ev_signal *w)
2191{ 2783{
2192 clear_pending (EV_A_ (W)w); 2784 clear_pending (EV_A_ (W)w);
2193 if (expect_false (!ev_is_active (w))) 2785 if (expect_false (!ev_is_active (w)))
2194 return; 2786 return;
2195 2787
2788 EV_FREQUENT_CHECK;
2789
2196 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2197 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2198 2792
2199 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
2200 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2813 }
2814
2815 EV_FREQUENT_CHECK;
2201} 2816}
2202 2817
2203void 2818void
2204ev_child_start (EV_P_ ev_child *w) 2819ev_child_start (EV_P_ ev_child *w)
2205{ 2820{
2206#if EV_MULTIPLICITY 2821#if EV_MULTIPLICITY
2207 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));
2208#endif 2823#endif
2209 if (expect_false (ev_is_active (w))) 2824 if (expect_false (ev_is_active (w)))
2210 return; 2825 return;
2211 2826
2827 EV_FREQUENT_CHECK;
2828
2212 ev_start (EV_A_ (W)w, 1); 2829 ev_start (EV_A_ (W)w, 1);
2213 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;
2214} 2833}
2215 2834
2216void 2835void
2217ev_child_stop (EV_P_ ev_child *w) 2836ev_child_stop (EV_P_ ev_child *w)
2218{ 2837{
2219 clear_pending (EV_A_ (W)w); 2838 clear_pending (EV_A_ (W)w);
2220 if (expect_false (!ev_is_active (w))) 2839 if (expect_false (!ev_is_active (w)))
2221 return; 2840 return;
2222 2841
2842 EV_FREQUENT_CHECK;
2843
2223 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2844 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2224 ev_stop (EV_A_ (W)w); 2845 ev_stop (EV_A_ (W)w);
2846
2847 EV_FREQUENT_CHECK;
2225} 2848}
2226 2849
2227#if EV_STAT_ENABLE 2850#if EV_STAT_ENABLE
2228 2851
2229# ifdef _WIN32 2852# ifdef _WIN32
2230# undef lstat 2853# undef lstat
2231# define lstat(a,b) _stati64 (a,b) 2854# define lstat(a,b) _stati64 (a,b)
2232# endif 2855# endif
2233 2856
2234#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 */
2235#define MIN_STAT_INTERVAL 0.1074891 2859#define MIN_STAT_INTERVAL 0.1074891
2236 2860
2237static 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);
2238 2862
2239#if EV_USE_INOTIFY 2863#if EV_USE_INOTIFY
2240# define EV_INOTIFY_BUFSIZE 8192 2864# define EV_INOTIFY_BUFSIZE 8192
… …
2242static void noinline 2866static void noinline
2243infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2244{ 2868{
2245 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);
2246 2870
2247 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 */
2248 { 2891 }
2249 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;
2250 2896
2251 /* monitor some parent directory for speedup hints */ 2897 /* if path is not there, monitor some parent directory for speedup hints */
2252 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2253 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2254 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2255 { 2901 {
2256 char path [4096]; 2902 char path [4096];
2257 strcpy (path, w->path); 2903 strcpy (path, w->path);
… …
2261 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2907 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2262 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2908 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2263 2909
2264 char *pend = strrchr (path, '/'); 2910 char *pend = strrchr (path, '/');
2265 2911
2266 if (!pend) 2912 if (!pend || pend == path)
2267 break; /* whoops, no '/', complain to your admin */ 2913 break;
2268 2914
2269 *pend = 0; 2915 *pend = 0;
2270 w->wd = inotify_add_watch (fs_fd, path, mask); 2916 w->wd = inotify_add_watch (fs_fd, path, mask);
2271 } 2917 }
2272 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2273 } 2919 }
2274 } 2920 }
2275 else
2276 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2277 2921
2278 if (w->wd >= 0) 2922 if (w->wd >= 0)
2279 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);
2280} 2929}
2281 2930
2282static void noinline 2931static void noinline
2283infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2284{ 2933{
… …
2298 2947
2299static void noinline 2948static void noinline
2300infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2949infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2301{ 2950{
2302 if (slot < 0) 2951 if (slot < 0)
2303 /* overflow, need to check for all hahs slots */ 2952 /* overflow, need to check for all hash slots */
2304 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2953 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2305 infy_wd (EV_A_ slot, wd, ev); 2954 infy_wd (EV_A_ slot, wd, ev);
2306 else 2955 else
2307 { 2956 {
2308 WL w_; 2957 WL w_;
… …
2314 2963
2315 if (w->wd == wd || wd == -1) 2964 if (w->wd == wd || wd == -1)
2316 { 2965 {
2317 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2966 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2318 { 2967 {
2968 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2319 w->wd = -1; 2969 w->wd = -1;
2320 infy_add (EV_A_ w); /* re-add, no matter what */ 2970 infy_add (EV_A_ w); /* re-add, no matter what */
2321 } 2971 }
2322 2972
2323 stat_timer_cb (EV_A_ &w->timer, 0); 2973 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2336 2986
2337 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)
2338 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2988 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2339} 2989}
2340 2990
2341void 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
2342infy_init (EV_P) 3026infy_init (EV_P)
2343{ 3027{
2344 if (fs_fd != -2) 3028 if (fs_fd != -2)
2345 return; 3029 return;
2346 3030
3031 fs_fd = -1;
3032
3033 check_2625 (EV_A);
3034
2347 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2348 3036
2349 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2350 { 3038 {
3039 fd_intern (fs_fd);
2351 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2352 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2353 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2354 } 3044 }
2355} 3045}
2356 3046
2357void inline_size 3047inline_size void
2358infy_fork (EV_P) 3048infy_fork (EV_P)
2359{ 3049{
2360 int slot; 3050 int slot;
2361 3051
2362 if (fs_fd < 0) 3052 if (fs_fd < 0)
2363 return; 3053 return;
2364 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2365 close (fs_fd); 3057 close (fs_fd);
2366 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 }
2367 3067
2368 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2369 { 3069 {
2370 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
2371 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
… …
2378 w->wd = -1; 3078 w->wd = -1;
2379 3079
2380 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
2381 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
2382 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);
2383 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 }
2384 } 3089 }
2385
2386 } 3090 }
2387} 3091}
2388 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)
2389#endif 3099#endif
2390 3100
2391void 3101void
2392ev_stat_stat (EV_P_ ev_stat *w) 3102ev_stat_stat (EV_P_ ev_stat *w)
2393{ 3103{
… …
2400static void noinline 3110static void noinline
2401stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2402{ 3112{
2403 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2404 3114
2405 /* we copy this here each the time so that */ 3115 ev_statdata prev = w->attr;
2406 /* prev has the old value when the callback gets invoked */
2407 w->prev = w->attr;
2408 ev_stat_stat (EV_A_ w); 3116 ev_stat_stat (EV_A_ w);
2409 3117
2410 /* 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 */
2411 if ( 3119 if (
2412 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
2413 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
2414 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
2415 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
2416 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
2417 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
2418 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
2419 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
2420 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
2421 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
2422 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
2423 ) { 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
2424 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
3138 if (fs_fd >= 0)
3139 {
2425 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
2426 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
2427 ev_stat_stat (EV_A_ w); /* avoid race... */ 3142 ev_stat_stat (EV_A_ w); /* avoid race... */
3143 }
2428 #endif 3144 #endif
2429 3145
2430 ev_feed_event (EV_A_ w, EV_STAT); 3146 ev_feed_event (EV_A_ w, EV_STAT);
2431 } 3147 }
2432} 3148}
… …
2435ev_stat_start (EV_P_ ev_stat *w) 3151ev_stat_start (EV_P_ ev_stat *w)
2436{ 3152{
2437 if (expect_false (ev_is_active (w))) 3153 if (expect_false (ev_is_active (w)))
2438 return; 3154 return;
2439 3155
2440 /* since we use memcmp, we need to clear any padding data etc. */
2441 memset (&w->prev, 0, sizeof (ev_statdata));
2442 memset (&w->attr, 0, sizeof (ev_statdata));
2443
2444 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
2445 3157
3158 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2446 if (w->interval < MIN_STAT_INTERVAL) 3159 w->interval = MIN_STAT_INTERVAL;
2447 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2448 3160
2449 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);
2450 ev_set_priority (&w->timer, ev_priority (w)); 3162 ev_set_priority (&w->timer, ev_priority (w));
2451 3163
2452#if EV_USE_INOTIFY 3164#if EV_USE_INOTIFY
2453 infy_init (EV_A); 3165 infy_init (EV_A);
2454 3166
2455 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
2456 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
2457 else 3169 else
2458#endif 3170#endif
3171 {
2459 ev_timer_start (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
2460 3175
2461 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
3177
3178 EV_FREQUENT_CHECK;
2462} 3179}
2463 3180
2464void 3181void
2465ev_stat_stop (EV_P_ ev_stat *w) 3182ev_stat_stop (EV_P_ ev_stat *w)
2466{ 3183{
2467 clear_pending (EV_A_ (W)w); 3184 clear_pending (EV_A_ (W)w);
2468 if (expect_false (!ev_is_active (w))) 3185 if (expect_false (!ev_is_active (w)))
2469 return; 3186 return;
2470 3187
3188 EV_FREQUENT_CHECK;
3189
2471#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
2472 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
2473#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
2474 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
2475 3199
2476 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
3201
3202 EV_FREQUENT_CHECK;
2477} 3203}
2478#endif 3204#endif
2479 3205
2480#if EV_IDLE_ENABLE 3206#if EV_IDLE_ENABLE
2481void 3207void
… …
2483{ 3209{
2484 if (expect_false (ev_is_active (w))) 3210 if (expect_false (ev_is_active (w)))
2485 return; 3211 return;
2486 3212
2487 pri_adjust (EV_A_ (W)w); 3213 pri_adjust (EV_A_ (W)w);
3214
3215 EV_FREQUENT_CHECK;
2488 3216
2489 { 3217 {
2490 int active = ++idlecnt [ABSPRI (w)]; 3218 int active = ++idlecnt [ABSPRI (w)];
2491 3219
2492 ++idleall; 3220 ++idleall;
2493 ev_start (EV_A_ (W)w, active); 3221 ev_start (EV_A_ (W)w, active);
2494 3222
2495 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);
2496 idles [ABSPRI (w)][active - 1] = w; 3224 idles [ABSPRI (w)][active - 1] = w;
2497 } 3225 }
3226
3227 EV_FREQUENT_CHECK;
2498} 3228}
2499 3229
2500void 3230void
2501ev_idle_stop (EV_P_ ev_idle *w) 3231ev_idle_stop (EV_P_ ev_idle *w)
2502{ 3232{
2503 clear_pending (EV_A_ (W)w); 3233 clear_pending (EV_A_ (W)w);
2504 if (expect_false (!ev_is_active (w))) 3234 if (expect_false (!ev_is_active (w)))
2505 return; 3235 return;
2506 3236
3237 EV_FREQUENT_CHECK;
3238
2507 { 3239 {
2508 int active = ev_active (w); 3240 int active = ev_active (w);
2509 3241
2510 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 3242 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2511 ev_active (idles [ABSPRI (w)][active - 1]) = active; 3243 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2512 3244
2513 ev_stop (EV_A_ (W)w); 3245 ev_stop (EV_A_ (W)w);
2514 --idleall; 3246 --idleall;
2515 } 3247 }
3248
3249 EV_FREQUENT_CHECK;
2516} 3250}
2517#endif 3251#endif
2518 3252
2519void 3253void
2520ev_prepare_start (EV_P_ ev_prepare *w) 3254ev_prepare_start (EV_P_ ev_prepare *w)
2521{ 3255{
2522 if (expect_false (ev_is_active (w))) 3256 if (expect_false (ev_is_active (w)))
2523 return; 3257 return;
3258
3259 EV_FREQUENT_CHECK;
2524 3260
2525 ev_start (EV_A_ (W)w, ++preparecnt); 3261 ev_start (EV_A_ (W)w, ++preparecnt);
2526 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 3262 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2527 prepares [preparecnt - 1] = w; 3263 prepares [preparecnt - 1] = w;
3264
3265 EV_FREQUENT_CHECK;
2528} 3266}
2529 3267
2530void 3268void
2531ev_prepare_stop (EV_P_ ev_prepare *w) 3269ev_prepare_stop (EV_P_ ev_prepare *w)
2532{ 3270{
2533 clear_pending (EV_A_ (W)w); 3271 clear_pending (EV_A_ (W)w);
2534 if (expect_false (!ev_is_active (w))) 3272 if (expect_false (!ev_is_active (w)))
2535 return; 3273 return;
2536 3274
3275 EV_FREQUENT_CHECK;
3276
2537 { 3277 {
2538 int active = ev_active (w); 3278 int active = ev_active (w);
2539 3279
2540 prepares [active - 1] = prepares [--preparecnt]; 3280 prepares [active - 1] = prepares [--preparecnt];
2541 ev_active (prepares [active - 1]) = active; 3281 ev_active (prepares [active - 1]) = active;
2542 } 3282 }
2543 3283
2544 ev_stop (EV_A_ (W)w); 3284 ev_stop (EV_A_ (W)w);
3285
3286 EV_FREQUENT_CHECK;
2545} 3287}
2546 3288
2547void 3289void
2548ev_check_start (EV_P_ ev_check *w) 3290ev_check_start (EV_P_ ev_check *w)
2549{ 3291{
2550 if (expect_false (ev_is_active (w))) 3292 if (expect_false (ev_is_active (w)))
2551 return; 3293 return;
3294
3295 EV_FREQUENT_CHECK;
2552 3296
2553 ev_start (EV_A_ (W)w, ++checkcnt); 3297 ev_start (EV_A_ (W)w, ++checkcnt);
2554 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 3298 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2555 checks [checkcnt - 1] = w; 3299 checks [checkcnt - 1] = w;
3300
3301 EV_FREQUENT_CHECK;
2556} 3302}
2557 3303
2558void 3304void
2559ev_check_stop (EV_P_ ev_check *w) 3305ev_check_stop (EV_P_ ev_check *w)
2560{ 3306{
2561 clear_pending (EV_A_ (W)w); 3307 clear_pending (EV_A_ (W)w);
2562 if (expect_false (!ev_is_active (w))) 3308 if (expect_false (!ev_is_active (w)))
2563 return; 3309 return;
2564 3310
3311 EV_FREQUENT_CHECK;
3312
2565 { 3313 {
2566 int active = ev_active (w); 3314 int active = ev_active (w);
2567 3315
2568 checks [active - 1] = checks [--checkcnt]; 3316 checks [active - 1] = checks [--checkcnt];
2569 ev_active (checks [active - 1]) = active; 3317 ev_active (checks [active - 1]) = active;
2570 } 3318 }
2571 3319
2572 ev_stop (EV_A_ (W)w); 3320 ev_stop (EV_A_ (W)w);
3321
3322 EV_FREQUENT_CHECK;
2573} 3323}
2574 3324
2575#if EV_EMBED_ENABLE 3325#if EV_EMBED_ENABLE
2576void noinline 3326void noinline
2577ev_embed_sweep (EV_P_ ev_embed *w) 3327ev_embed_sweep (EV_P_ ev_embed *w)
… …
2594embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2595{ 3345{
2596 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2597 3347
2598 { 3348 {
2599 struct ev_loop *loop = w->other; 3349 EV_P = w->other;
2600 3350
2601 while (fdchangecnt) 3351 while (fdchangecnt)
2602 { 3352 {
2603 fd_reify (EV_A); 3353 fd_reify (EV_A);
2604 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2605 } 3355 }
2606 } 3356 }
2607} 3357}
2608 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
2609#if 0 3376#if 0
2610static void 3377static void
2611embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3378embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2612{ 3379{
2613 ev_idle_stop (EV_A_ idle); 3380 ev_idle_stop (EV_A_ idle);
… …
2619{ 3386{
2620 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
2621 return; 3388 return;
2622 3389
2623 { 3390 {
2624 struct ev_loop *loop = w->other; 3391 EV_P = w->other;
2625 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 ()));
2626 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);
2627 } 3394 }
3395
3396 EV_FREQUENT_CHECK;
2628 3397
2629 ev_set_priority (&w->io, ev_priority (w)); 3398 ev_set_priority (&w->io, ev_priority (w));
2630 ev_io_start (EV_A_ &w->io); 3399 ev_io_start (EV_A_ &w->io);
2631 3400
2632 ev_prepare_init (&w->prepare, embed_prepare_cb); 3401 ev_prepare_init (&w->prepare, embed_prepare_cb);
2633 ev_set_priority (&w->prepare, EV_MINPRI); 3402 ev_set_priority (&w->prepare, EV_MINPRI);
2634 ev_prepare_start (EV_A_ &w->prepare); 3403 ev_prepare_start (EV_A_ &w->prepare);
2635 3404
3405 ev_fork_init (&w->fork, embed_fork_cb);
3406 ev_fork_start (EV_A_ &w->fork);
3407
2636 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3408 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2637 3409
2638 ev_start (EV_A_ (W)w, 1); 3410 ev_start (EV_A_ (W)w, 1);
3411
3412 EV_FREQUENT_CHECK;
2639} 3413}
2640 3414
2641void 3415void
2642ev_embed_stop (EV_P_ ev_embed *w) 3416ev_embed_stop (EV_P_ ev_embed *w)
2643{ 3417{
2644 clear_pending (EV_A_ (W)w); 3418 clear_pending (EV_A_ (W)w);
2645 if (expect_false (!ev_is_active (w))) 3419 if (expect_false (!ev_is_active (w)))
2646 return; 3420 return;
2647 3421
3422 EV_FREQUENT_CHECK;
3423
2648 ev_io_stop (EV_A_ &w->io); 3424 ev_io_stop (EV_A_ &w->io);
2649 ev_prepare_stop (EV_A_ &w->prepare); 3425 ev_prepare_stop (EV_A_ &w->prepare);
3426 ev_fork_stop (EV_A_ &w->fork);
2650 3427
2651 ev_stop (EV_A_ (W)w); 3428 EV_FREQUENT_CHECK;
2652} 3429}
2653#endif 3430#endif
2654 3431
2655#if EV_FORK_ENABLE 3432#if EV_FORK_ENABLE
2656void 3433void
2657ev_fork_start (EV_P_ ev_fork *w) 3434ev_fork_start (EV_P_ ev_fork *w)
2658{ 3435{
2659 if (expect_false (ev_is_active (w))) 3436 if (expect_false (ev_is_active (w)))
2660 return; 3437 return;
3438
3439 EV_FREQUENT_CHECK;
2661 3440
2662 ev_start (EV_A_ (W)w, ++forkcnt); 3441 ev_start (EV_A_ (W)w, ++forkcnt);
2663 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 3442 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2664 forks [forkcnt - 1] = w; 3443 forks [forkcnt - 1] = w;
3444
3445 EV_FREQUENT_CHECK;
2665} 3446}
2666 3447
2667void 3448void
2668ev_fork_stop (EV_P_ ev_fork *w) 3449ev_fork_stop (EV_P_ ev_fork *w)
2669{ 3450{
2670 clear_pending (EV_A_ (W)w); 3451 clear_pending (EV_A_ (W)w);
2671 if (expect_false (!ev_is_active (w))) 3452 if (expect_false (!ev_is_active (w)))
2672 return; 3453 return;
2673 3454
3455 EV_FREQUENT_CHECK;
3456
2674 { 3457 {
2675 int active = ev_active (w); 3458 int active = ev_active (w);
2676 3459
2677 forks [active - 1] = forks [--forkcnt]; 3460 forks [active - 1] = forks [--forkcnt];
2678 ev_active (forks [active - 1]) = active; 3461 ev_active (forks [active - 1]) = active;
2679 } 3462 }
2680 3463
2681 ev_stop (EV_A_ (W)w); 3464 ev_stop (EV_A_ (W)w);
3465
3466 EV_FREQUENT_CHECK;
2682} 3467}
2683#endif 3468#endif
2684 3469
2685#if EV_ASYNC_ENABLE 3470#if EV_ASYNC_ENABLE
2686void 3471void
… …
2688{ 3473{
2689 if (expect_false (ev_is_active (w))) 3474 if (expect_false (ev_is_active (w)))
2690 return; 3475 return;
2691 3476
2692 evpipe_init (EV_A); 3477 evpipe_init (EV_A);
3478
3479 EV_FREQUENT_CHECK;
2693 3480
2694 ev_start (EV_A_ (W)w, ++asynccnt); 3481 ev_start (EV_A_ (W)w, ++asynccnt);
2695 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 3482 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2696 asyncs [asynccnt - 1] = w; 3483 asyncs [asynccnt - 1] = w;
3484
3485 EV_FREQUENT_CHECK;
2697} 3486}
2698 3487
2699void 3488void
2700ev_async_stop (EV_P_ ev_async *w) 3489ev_async_stop (EV_P_ ev_async *w)
2701{ 3490{
2702 clear_pending (EV_A_ (W)w); 3491 clear_pending (EV_A_ (W)w);
2703 if (expect_false (!ev_is_active (w))) 3492 if (expect_false (!ev_is_active (w)))
2704 return; 3493 return;
2705 3494
3495 EV_FREQUENT_CHECK;
3496
2706 { 3497 {
2707 int active = ev_active (w); 3498 int active = ev_active (w);
2708 3499
2709 asyncs [active - 1] = asyncs [--asynccnt]; 3500 asyncs [active - 1] = asyncs [--asynccnt];
2710 ev_active (asyncs [active - 1]) = active; 3501 ev_active (asyncs [active - 1]) = active;
2711 } 3502 }
2712 3503
2713 ev_stop (EV_A_ (W)w); 3504 ev_stop (EV_A_ (W)w);
3505
3506 EV_FREQUENT_CHECK;
2714} 3507}
2715 3508
2716void 3509void
2717ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
2718{ 3511{
2719 w->sent = 1; 3512 w->sent = 1;
2720 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
2721} 3514}
2722#endif 3515#endif
2723 3516
2724/*****************************************************************************/ 3517/*****************************************************************************/
2725 3518
… …
2735once_cb (EV_P_ struct ev_once *once, int revents) 3528once_cb (EV_P_ struct ev_once *once, int revents)
2736{ 3529{
2737 void (*cb)(int revents, void *arg) = once->cb; 3530 void (*cb)(int revents, void *arg) = once->cb;
2738 void *arg = once->arg; 3531 void *arg = once->arg;
2739 3532
2740 ev_io_stop (EV_A_ &once->io); 3533 ev_io_stop (EV_A_ &once->io);
2741 ev_timer_stop (EV_A_ &once->to); 3534 ev_timer_stop (EV_A_ &once->to);
2742 ev_free (once); 3535 ev_free (once);
2743 3536
2744 cb (revents, arg); 3537 cb (revents, arg);
2745} 3538}
2746 3539
2747static void 3540static void
2748once_cb_io (EV_P_ ev_io *w, int revents) 3541once_cb_io (EV_P_ ev_io *w, int revents)
2749{ 3542{
2750 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));
2751} 3546}
2752 3547
2753static void 3548static void
2754once_cb_to (EV_P_ ev_timer *w, int revents) 3549once_cb_to (EV_P_ ev_timer *w, int revents)
2755{ 3550{
2756 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));
2757} 3554}
2758 3555
2759void 3556void
2760ev_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)
2761{ 3558{
… …
2783 ev_timer_set (&once->to, timeout, 0.); 3580 ev_timer_set (&once->to, timeout, 0.);
2784 ev_timer_start (EV_A_ &once->to); 3581 ev_timer_start (EV_A_ &once->to);
2785 } 3582 }
2786} 3583}
2787 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
2788#if EV_MULTIPLICITY 3693#if EV_MULTIPLICITY
2789 #include "ev_wrap.h" 3694 #include "ev_wrap.h"
2790#endif 3695#endif
2791 3696
2792#ifdef __cplusplus 3697#ifdef __cplusplus

Diff Legend

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