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

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

Diff Legend

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