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

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

Diff Legend

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