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

Comparing libev/ev.c (file contents):
Revision 1.261 by root, Mon Sep 29 03:31:14 2008 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 2010 UTC

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

Diff Legend

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