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

Comparing libev/ev.c (file contents):
Revision 1.249 by root, Wed May 21 23:30:52 2008 UTC vs.
Revision 1.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
240#if 0 /* debugging */ 316#if 0 /* debugging */
241# define EV_VERIFY 1 317# define EV_VERIFY 3
242# define EV_USE_4HEAP 1 318# define EV_USE_4HEAP 1
243# define EV_HEAP_CACHE_AT 1 319# define EV_HEAP_CACHE_AT 1
244#endif 320#endif
245 321
322#ifndef EV_VERIFY
323# define EV_VERIFY !EV_MINIMAL
324#endif
325
246#ifndef EV_USE_4HEAP 326#ifndef EV_USE_4HEAP
247# define EV_USE_4HEAP !EV_MINIMAL 327# define EV_USE_4HEAP !EV_MINIMAL
248#endif 328#endif
249 329
250#ifndef EV_HEAP_CACHE_AT 330#ifndef EV_HEAP_CACHE_AT
251# define EV_HEAP_CACHE_AT !EV_MINIMAL 331# define EV_HEAP_CACHE_AT !EV_MINIMAL
252#endif 332#endif
253 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
254/* 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
255 355
256#ifndef CLOCK_MONOTONIC 356#ifndef CLOCK_MONOTONIC
257# undef EV_USE_MONOTONIC 357# undef EV_USE_MONOTONIC
258# define EV_USE_MONOTONIC 0 358# define EV_USE_MONOTONIC 0
259#endif 359#endif
… …
273# include <sys/select.h> 373# include <sys/select.h>
274# endif 374# endif
275#endif 375#endif
276 376
277#if EV_USE_INOTIFY 377#if EV_USE_INOTIFY
378# include <sys/utsname.h>
379# include <sys/statfs.h>
278# 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
279#endif 386#endif
280 387
281#if EV_SELECT_IS_WINSOCKET 388#if EV_SELECT_IS_WINSOCKET
282# include <winsock.h> 389# include <winsock.h>
283#endif 390#endif
284 391
285#if EV_USE_EVENTFD 392#if EV_USE_EVENTFD
286/* 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 */
287# 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
288# ifdef __cplusplus 405# ifdef __cplusplus
289extern "C" { 406extern "C" {
290# endif 407# endif
291int eventfd (unsigned int initval, int flags); 408int eventfd (unsigned int initval, int flags);
292# ifdef __cplusplus 409# ifdef __cplusplus
293} 410}
294# endif 411# endif
295#endif 412#endif
296 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
297/**/ 443/**/
298 444
299/* EV_VERIFY: enable internal consistency checks
300 * undefined or zero: no verification done or available
301 * 1 or higher: ev_loop_verify function available
302 * 2 or higher: ev_loop_verify is called frequently
303 */
304#if EV_VERIFY >= 1 445#if EV_VERIFY >= 3
305# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 446# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
306#else 447#else
307# define EV_FREQUENT_CHECK do { } while (0) 448# define EV_FREQUENT_CHECK do { } while (0)
308#endif 449#endif
309 450
… …
317 */ 458 */
318#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 459#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
319 460
320#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) */
321#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) */
322/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
323 463
324#if __GNUC__ >= 4 464#if __GNUC__ >= 4
325# define expect(expr,value) __builtin_expect ((expr),(value)) 465# define expect(expr,value) __builtin_expect ((expr),(value))
326# define noinline __attribute__ ((noinline)) 466# define noinline __attribute__ ((noinline))
327#else 467#else
… …
340# define inline_speed static noinline 480# define inline_speed static noinline
341#else 481#else
342# define inline_speed static inline 482# define inline_speed static inline
343#endif 483#endif
344 484
345#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
346#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 490# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
491#endif
347 492
348#define EMPTY /* required for microsofts broken pseudo-c compiler */ 493#define EMPTY /* required for microsofts broken pseudo-c compiler */
349#define EMPTY2(a,b) /* used to suppress some warnings */ 494#define EMPTY2(a,b) /* used to suppress some warnings */
350 495
351typedef ev_watcher *W; 496typedef ev_watcher *W;
… …
353typedef ev_watcher_time *WT; 498typedef ev_watcher_time *WT;
354 499
355#define ev_active(w) ((W)(w))->active 500#define ev_active(w) ((W)(w))->active
356#define ev_at(w) ((WT)(w))->at 501#define ev_at(w) ((WT)(w))->at
357 502
358#if EV_USE_MONOTONIC 503#if EV_USE_REALTIME
359/* 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 */
360/* 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
361static 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)
362#endif 521#endif
363 522
364#ifdef _WIN32 523#ifdef _WIN32
365# include "ev_win32.c" 524# include "ev_win32.c"
366#endif 525#endif
… …
374{ 533{
375 syserr_cb = cb; 534 syserr_cb = cb;
376} 535}
377 536
378static void noinline 537static void noinline
379syserr (const char *msg) 538ev_syserr (const char *msg)
380{ 539{
381 if (!msg) 540 if (!msg)
382 msg = "(libev) system error"; 541 msg = "(libev) system error";
383 542
384 if (syserr_cb) 543 if (syserr_cb)
… …
430#define ev_malloc(size) ev_realloc (0, (size)) 589#define ev_malloc(size) ev_realloc (0, (size))
431#define ev_free(ptr) ev_realloc ((ptr), 0) 590#define ev_free(ptr) ev_realloc ((ptr), 0)
432 591
433/*****************************************************************************/ 592/*****************************************************************************/
434 593
594/* set in reify when reification needed */
595#define EV_ANFD_REIFY 1
596
597/* file descriptor info structure */
435typedef struct 598typedef struct
436{ 599{
437 WL head; 600 WL head;
438 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 */
439 unsigned char reify; 604 unsigned char unused;
605#if EV_USE_EPOLL
606 unsigned int egen; /* generation counter to counter epoll bugs */
607#endif
440#if EV_SELECT_IS_WINSOCKET 608#if EV_SELECT_IS_WINSOCKET
441 SOCKET handle; 609 SOCKET handle;
442#endif 610#endif
443} ANFD; 611} ANFD;
444 612
613/* stores the pending event set for a given watcher */
445typedef struct 614typedef struct
446{ 615{
447 W w; 616 W w;
448 int events; 617 int events; /* the pending event set for the given watcher */
449} ANPENDING; 618} ANPENDING;
450 619
451#if EV_USE_INOTIFY 620#if EV_USE_INOTIFY
452/* hash table entry per inotify-id */ 621/* hash table entry per inotify-id */
453typedef struct 622typedef struct
… …
456} ANFS; 625} ANFS;
457#endif 626#endif
458 627
459/* Heap Entry */ 628/* Heap Entry */
460#if EV_HEAP_CACHE_AT 629#if EV_HEAP_CACHE_AT
630 /* a heap element */
461 typedef struct { 631 typedef struct {
462 ev_tstamp at; 632 ev_tstamp at;
463 WT w; 633 WT w;
464 } ANHE; 634 } ANHE;
465 635
466 #define ANHE_w(he) (he).w /* access watcher, read-write */ 636 #define ANHE_w(he) (he).w /* access watcher, read-write */
467 #define ANHE_at(he) (he).at /* access cached at, read-only */ 637 #define ANHE_at(he) (he).at /* access cached at, read-only */
468 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 638 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
469#else 639#else
640 /* a heap element */
470 typedef WT ANHE; 641 typedef WT ANHE;
471 642
472 #define ANHE_w(he) (he) 643 #define ANHE_w(he) (he)
473 #define ANHE_at(he) (he)->at 644 #define ANHE_at(he) (he)->at
474 #define ANHE_at_cache(he) 645 #define ANHE_at_cache(he)
… …
498 669
499 static int ev_default_loop_ptr; 670 static int ev_default_loop_ptr;
500 671
501#endif 672#endif
502 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
503/*****************************************************************************/ 686/*****************************************************************************/
504 687
688#ifndef EV_HAVE_EV_TIME
505ev_tstamp 689ev_tstamp
506ev_time (void) 690ev_time (void)
507{ 691{
508#if EV_USE_REALTIME 692#if EV_USE_REALTIME
693 if (expect_true (have_realtime))
694 {
509 struct timespec ts; 695 struct timespec ts;
510 clock_gettime (CLOCK_REALTIME, &ts); 696 clock_gettime (CLOCK_REALTIME, &ts);
511 return ts.tv_sec + ts.tv_nsec * 1e-9; 697 return ts.tv_sec + ts.tv_nsec * 1e-9;
512#else 698 }
699#endif
700
513 struct timeval tv; 701 struct timeval tv;
514 gettimeofday (&tv, 0); 702 gettimeofday (&tv, 0);
515 return tv.tv_sec + tv.tv_usec * 1e-6; 703 return tv.tv_sec + tv.tv_usec * 1e-6;
516#endif
517} 704}
705#endif
518 706
519ev_tstamp inline_size 707inline_size ev_tstamp
520get_clock (void) 708get_clock (void)
521{ 709{
522#if EV_USE_MONOTONIC 710#if EV_USE_MONOTONIC
523 if (expect_true (have_monotonic)) 711 if (expect_true (have_monotonic))
524 { 712 {
… …
557 struct timeval tv; 745 struct timeval tv;
558 746
559 tv.tv_sec = (time_t)delay; 747 tv.tv_sec = (time_t)delay;
560 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 748 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
561 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 */
562 select (0, 0, 0, 0, &tv); 753 select (0, 0, 0, 0, &tv);
563#endif 754#endif
564 } 755 }
565} 756}
566 757
567/*****************************************************************************/ 758/*****************************************************************************/
568 759
569#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 */
570 761
571int 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
572array_nextsize (int elem, int cur, int cnt) 765array_nextsize (int elem, int cur, int cnt)
573{ 766{
574 int ncur = cur + 1; 767 int ncur = cur + 1;
575 768
576 do 769 do
… …
593array_realloc (int elem, void *base, int *cur, int cnt) 786array_realloc (int elem, void *base, int *cur, int cnt)
594{ 787{
595 *cur = array_nextsize (elem, *cur, cnt); 788 *cur = array_nextsize (elem, *cur, cnt);
596 return ev_realloc (base, elem * *cur); 789 return ev_realloc (base, elem * *cur);
597} 790}
791
792#define array_init_zero(base,count) \
793 memset ((void *)(base), 0, sizeof (*(base)) * (count))
598 794
599#define array_needsize(type,base,cur,cnt,init) \ 795#define array_needsize(type,base,cur,cnt,init) \
600 if (expect_false ((cnt) > (cur))) \ 796 if (expect_false ((cnt) > (cur))) \
601 { \ 797 { \
602 int ocur_ = (cur); \ 798 int ocur_ = (cur); \
… …
614 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 810 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
615 } 811 }
616#endif 812#endif
617 813
618#define array_free(stem, idx) \ 814#define array_free(stem, idx) \
619 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
620 816
621/*****************************************************************************/ 817/*****************************************************************************/
818
819/* dummy callback for pending events */
820static void noinline
821pendingcb (EV_P_ ev_prepare *w, int revents)
822{
823}
622 824
623void noinline 825void noinline
624ev_feed_event (EV_P_ void *w, int revents) 826ev_feed_event (EV_P_ void *w, int revents)
625{ 827{
626 W w_ = (W)w; 828 W w_ = (W)w;
… …
635 pendings [pri][w_->pending - 1].w = w_; 837 pendings [pri][w_->pending - 1].w = w_;
636 pendings [pri][w_->pending - 1].events = revents; 838 pendings [pri][w_->pending - 1].events = revents;
637 } 839 }
638} 840}
639 841
640void 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
641queue_events (EV_P_ W *events, int eventcnt, int type) 858queue_events (EV_P_ W *events, int eventcnt, int type)
642{ 859{
643 int i; 860 int i;
644 861
645 for (i = 0; i < eventcnt; ++i) 862 for (i = 0; i < eventcnt; ++i)
646 ev_feed_event (EV_A_ events [i], type); 863 ev_feed_event (EV_A_ events [i], type);
647} 864}
648 865
649/*****************************************************************************/ 866/*****************************************************************************/
650 867
651void inline_size 868inline_speed void
652anfds_init (ANFD *base, int count)
653{
654 while (count--)
655 {
656 base->head = 0;
657 base->events = EV_NONE;
658 base->reify = 0;
659
660 ++base;
661 }
662}
663
664void inline_speed
665fd_event (EV_P_ int fd, int revents) 869fd_event_nc (EV_P_ int fd, int revents)
666{ 870{
667 ANFD *anfd = anfds + fd; 871 ANFD *anfd = anfds + fd;
668 ev_io *w; 872 ev_io *w;
669 873
670 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)
… …
674 if (ev) 878 if (ev)
675 ev_feed_event (EV_A_ (W)w, ev); 879 ev_feed_event (EV_A_ (W)w, ev);
676 } 880 }
677} 881}
678 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
679void 894void
680ev_feed_fd_event (EV_P_ int fd, int revents) 895ev_feed_fd_event (EV_P_ int fd, int revents)
681{ 896{
682 if (fd >= 0 && fd < anfdmax) 897 if (fd >= 0 && fd < anfdmax)
683 fd_event (EV_A_ fd, revents); 898 fd_event_nc (EV_A_ fd, revents);
684} 899}
685 900
686void inline_size 901/* make sure the external fd watch events are in-sync */
902/* with the kernel/libev internal state */
903inline_size void
687fd_reify (EV_P) 904fd_reify (EV_P)
688{ 905{
689 int i; 906 int i;
690 907
691 for (i = 0; i < fdchangecnt; ++i) 908 for (i = 0; i < fdchangecnt; ++i)
… …
700 events |= (unsigned char)w->events; 917 events |= (unsigned char)w->events;
701 918
702#if EV_SELECT_IS_WINSOCKET 919#if EV_SELECT_IS_WINSOCKET
703 if (events) 920 if (events)
704 { 921 {
705 unsigned long argp; 922 unsigned long arg;
706 #ifdef EV_FD_TO_WIN32_HANDLE
707 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 923 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
708 #else
709 anfd->handle = _get_osfhandle (fd);
710 #endif
711 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 924 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
712 } 925 }
713#endif 926#endif
714 927
715 { 928 {
716 unsigned char o_events = anfd->events; 929 unsigned char o_events = anfd->events;
717 unsigned char o_reify = anfd->reify; 930 unsigned char o_reify = anfd->reify;
718 931
719 anfd->reify = 0; 932 anfd->reify = 0;
720 anfd->events = events; 933 anfd->events = events;
721 934
722 if (o_events != events || o_reify & EV_IOFDSET) 935 if (o_events != events || o_reify & EV__IOFDSET)
723 backend_modify (EV_A_ fd, o_events, events); 936 backend_modify (EV_A_ fd, o_events, events);
724 } 937 }
725 } 938 }
726 939
727 fdchangecnt = 0; 940 fdchangecnt = 0;
728} 941}
729 942
730void inline_size 943/* something about the given fd changed */
944inline_size void
731fd_change (EV_P_ int fd, int flags) 945fd_change (EV_P_ int fd, int flags)
732{ 946{
733 unsigned char reify = anfds [fd].reify; 947 unsigned char reify = anfds [fd].reify;
734 anfds [fd].reify |= flags; 948 anfds [fd].reify |= flags;
735 949
… …
739 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 953 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
740 fdchanges [fdchangecnt - 1] = fd; 954 fdchanges [fdchangecnt - 1] = fd;
741 } 955 }
742} 956}
743 957
744void inline_speed 958/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
959inline_speed void
745fd_kill (EV_P_ int fd) 960fd_kill (EV_P_ int fd)
746{ 961{
747 ev_io *w; 962 ev_io *w;
748 963
749 while ((w = (ev_io *)anfds [fd].head)) 964 while ((w = (ev_io *)anfds [fd].head))
… …
751 ev_io_stop (EV_A_ w); 966 ev_io_stop (EV_A_ w);
752 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);
753 } 968 }
754} 969}
755 970
756int inline_size 971/* check whether the given fd is atcually valid, for error recovery */
972inline_size int
757fd_valid (int fd) 973fd_valid (int fd)
758{ 974{
759#ifdef _WIN32 975#ifdef _WIN32
760 return _get_osfhandle (fd) != -1; 976 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
761#else 977#else
762 return fcntl (fd, F_GETFD) != -1; 978 return fcntl (fd, F_GETFD) != -1;
763#endif 979#endif
764} 980}
765 981
… …
769{ 985{
770 int fd; 986 int fd;
771 987
772 for (fd = 0; fd < anfdmax; ++fd) 988 for (fd = 0; fd < anfdmax; ++fd)
773 if (anfds [fd].events) 989 if (anfds [fd].events)
774 if (!fd_valid (fd) == -1 && errno == EBADF) 990 if (!fd_valid (fd) && errno == EBADF)
775 fd_kill (EV_A_ fd); 991 fd_kill (EV_A_ fd);
776} 992}
777 993
778/* 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 */
779static void noinline 995static void noinline
… …
783 999
784 for (fd = anfdmax; fd--; ) 1000 for (fd = anfdmax; fd--; )
785 if (anfds [fd].events) 1001 if (anfds [fd].events)
786 { 1002 {
787 fd_kill (EV_A_ fd); 1003 fd_kill (EV_A_ fd);
788 return; 1004 break;
789 } 1005 }
790} 1006}
791 1007
792/* 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 */
793static void noinline 1009static void noinline
… …
797 1013
798 for (fd = 0; fd < anfdmax; ++fd) 1014 for (fd = 0; fd < anfdmax; ++fd)
799 if (anfds [fd].events) 1015 if (anfds [fd].events)
800 { 1016 {
801 anfds [fd].events = 0; 1017 anfds [fd].events = 0;
1018 anfds [fd].emask = 0;
802 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1019 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
803 } 1020 }
804} 1021}
805 1022
806/*****************************************************************************/ 1023/*****************************************************************************/
807 1024
… …
823#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1040#define HEAP0 (DHEAP - 1) /* index of first element in heap */
824#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1041#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
825#define UPHEAP_DONE(p,k) ((p) == (k)) 1042#define UPHEAP_DONE(p,k) ((p) == (k))
826 1043
827/* away from the root */ 1044/* away from the root */
828void inline_speed 1045inline_speed void
829downheap (ANHE *heap, int N, int k) 1046downheap (ANHE *heap, int N, int k)
830{ 1047{
831 ANHE he = heap [k]; 1048 ANHE he = heap [k];
832 ANHE *E = heap + N + HEAP0; 1049 ANHE *E = heap + N + HEAP0;
833 1050
… …
873#define HEAP0 1 1090#define HEAP0 1
874#define HPARENT(k) ((k) >> 1) 1091#define HPARENT(k) ((k) >> 1)
875#define UPHEAP_DONE(p,k) (!(p)) 1092#define UPHEAP_DONE(p,k) (!(p))
876 1093
877/* away from the root */ 1094/* away from the root */
878void inline_speed 1095inline_speed void
879downheap (ANHE *heap, int N, int k) 1096downheap (ANHE *heap, int N, int k)
880{ 1097{
881 ANHE he = heap [k]; 1098 ANHE he = heap [k];
882 1099
883 for (;;) 1100 for (;;)
884 { 1101 {
885 int c = k << 1; 1102 int c = k << 1;
886 1103
887 if (c > N + HEAP0 - 1) 1104 if (c >= N + HEAP0)
888 break; 1105 break;
889 1106
890 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])
891 ? 1 : 0; 1108 ? 1 : 0;
892 1109
… …
903 ev_active (ANHE_w (he)) = k; 1120 ev_active (ANHE_w (he)) = k;
904} 1121}
905#endif 1122#endif
906 1123
907/* towards the root */ 1124/* towards the root */
908void inline_speed 1125inline_speed void
909upheap (ANHE *heap, int k) 1126upheap (ANHE *heap, int k)
910{ 1127{
911 ANHE he = heap [k]; 1128 ANHE he = heap [k];
912 1129
913 for (;;) 1130 for (;;)
… …
924 1141
925 heap [k] = he; 1142 heap [k] = he;
926 ev_active (ANHE_w (he)) = k; 1143 ev_active (ANHE_w (he)) = k;
927} 1144}
928 1145
929void inline_size 1146/* move an element suitably so it is in a correct place */
1147inline_size void
930adjustheap (ANHE *heap, int N, int k) 1148adjustheap (ANHE *heap, int N, int k)
931{ 1149{
932 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)]))
933 upheap (heap, k); 1151 upheap (heap, k);
934 else 1152 else
935 downheap (heap, N, k); 1153 downheap (heap, N, k);
936} 1154}
937 1155
938/* 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 */
939void inline_size 1157inline_size void
940reheap (ANHE *heap, int N) 1158reheap (ANHE *heap, int N)
941{ 1159{
942 int i; 1160 int i;
1161
943 /* 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 */
944 /* 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 */
945 for (i = 0; i < N; ++i) 1164 for (i = 0; i < N; ++i)
946 upheap (heap, i + HEAP0); 1165 upheap (heap, i + HEAP0);
947} 1166}
948 1167
949#if EV_VERIFY
950static void
951checkheap (ANHE *heap, int N)
952{
953 int i;
954
955 for (i = HEAP0; i < N + HEAP0; ++i)
956 {
957 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
958 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
959 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
960 }
961}
962#endif
963
964/*****************************************************************************/ 1168/*****************************************************************************/
965 1169
1170/* associate signal watchers to a signal signal */
966typedef struct 1171typedef struct
967{ 1172{
1173 EV_ATOMIC_T pending;
1174#if EV_MULTIPLICITY
1175 EV_P;
1176#endif
968 WL head; 1177 WL head;
969 EV_ATOMIC_T gotsig;
970} ANSIG; 1178} ANSIG;
971 1179
972static ANSIG *signals; 1180static ANSIG signals [EV_NSIG - 1];
973static int signalmax;
974
975static EV_ATOMIC_T gotsig;
976
977void inline_size
978signals_init (ANSIG *base, int count)
979{
980 while (count--)
981 {
982 base->head = 0;
983 base->gotsig = 0;
984
985 ++base;
986 }
987}
988 1181
989/*****************************************************************************/ 1182/*****************************************************************************/
990 1183
991void inline_speed 1184/* used to prepare libev internal fd's */
1185/* this is not fork-safe */
1186inline_speed void
992fd_intern (int fd) 1187fd_intern (int fd)
993{ 1188{
994#ifdef _WIN32 1189#ifdef _WIN32
995 int arg = 1; 1190 unsigned long arg = 1;
996 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1191 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
997#else 1192#else
998 fcntl (fd, F_SETFD, FD_CLOEXEC); 1193 fcntl (fd, F_SETFD, FD_CLOEXEC);
999 fcntl (fd, F_SETFL, O_NONBLOCK); 1194 fcntl (fd, F_SETFL, O_NONBLOCK);
1000#endif 1195#endif
1001} 1196}
1002 1197
1003static void noinline 1198static void noinline
1004evpipe_init (EV_P) 1199evpipe_init (EV_P)
1005{ 1200{
1006 if (!ev_is_active (&pipeev)) 1201 if (!ev_is_active (&pipe_w))
1007 { 1202 {
1008#if EV_USE_EVENTFD 1203#if EV_USE_EVENTFD
1204 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1205 if (evfd < 0 && errno == EINVAL)
1009 if ((evfd = eventfd (0, 0)) >= 0) 1206 evfd = eventfd (0, 0);
1207
1208 if (evfd >= 0)
1010 { 1209 {
1011 evpipe [0] = -1; 1210 evpipe [0] = -1;
1012 fd_intern (evfd); 1211 fd_intern (evfd); /* doing it twice doesn't hurt */
1013 ev_io_set (&pipeev, evfd, EV_READ); 1212 ev_io_set (&pipe_w, evfd, EV_READ);
1014 } 1213 }
1015 else 1214 else
1016#endif 1215#endif
1017 { 1216 {
1018 while (pipe (evpipe)) 1217 while (pipe (evpipe))
1019 syserr ("(libev) error creating signal/async pipe"); 1218 ev_syserr ("(libev) error creating signal/async pipe");
1020 1219
1021 fd_intern (evpipe [0]); 1220 fd_intern (evpipe [0]);
1022 fd_intern (evpipe [1]); 1221 fd_intern (evpipe [1]);
1023 ev_io_set (&pipeev, evpipe [0], EV_READ); 1222 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1024 } 1223 }
1025 1224
1026 ev_io_start (EV_A_ &pipeev); 1225 ev_io_start (EV_A_ &pipe_w);
1027 ev_unref (EV_A); /* watcher should not keep loop alive */ 1226 ev_unref (EV_A); /* watcher should not keep loop alive */
1028 } 1227 }
1029} 1228}
1030 1229
1031void inline_size 1230inline_size void
1032evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1231evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1033{ 1232{
1034 if (!*flag) 1233 if (!*flag)
1035 { 1234 {
1036 int old_errno = errno; /* save errno because write might clobber it */ 1235 int old_errno = errno; /* save errno because write might clobber it */
… …
1049 1248
1050 errno = old_errno; 1249 errno = old_errno;
1051 } 1250 }
1052} 1251}
1053 1252
1253/* called whenever the libev signal pipe */
1254/* got some events (signal, async) */
1054static void 1255static void
1055pipecb (EV_P_ ev_io *iow, int revents) 1256pipecb (EV_P_ ev_io *iow, int revents)
1056{ 1257{
1258 int i;
1259
1057#if EV_USE_EVENTFD 1260#if EV_USE_EVENTFD
1058 if (evfd >= 0) 1261 if (evfd >= 0)
1059 { 1262 {
1060 uint64_t counter; 1263 uint64_t counter;
1061 read (evfd, &counter, sizeof (uint64_t)); 1264 read (evfd, &counter, sizeof (uint64_t));
… …
1065 { 1268 {
1066 char dummy; 1269 char dummy;
1067 read (evpipe [0], &dummy, 1); 1270 read (evpipe [0], &dummy, 1);
1068 } 1271 }
1069 1272
1070 if (gotsig && ev_is_default_loop (EV_A)) 1273 if (sig_pending)
1071 { 1274 {
1072 int signum; 1275 sig_pending = 0;
1073 gotsig = 0;
1074 1276
1075 for (signum = signalmax; signum--; ) 1277 for (i = EV_NSIG - 1; i--; )
1076 if (signals [signum].gotsig) 1278 if (expect_false (signals [i].pending))
1077 ev_feed_signal_event (EV_A_ signum + 1); 1279 ev_feed_signal_event (EV_A_ i + 1);
1078 } 1280 }
1079 1281
1080#if EV_ASYNC_ENABLE 1282#if EV_ASYNC_ENABLE
1081 if (gotasync) 1283 if (async_pending)
1082 { 1284 {
1083 int i; 1285 async_pending = 0;
1084 gotasync = 0;
1085 1286
1086 for (i = asynccnt; i--; ) 1287 for (i = asynccnt; i--; )
1087 if (asyncs [i]->sent) 1288 if (asyncs [i]->sent)
1088 { 1289 {
1089 asyncs [i]->sent = 0; 1290 asyncs [i]->sent = 0;
… …
1097 1298
1098static void 1299static void
1099ev_sighandler (int signum) 1300ev_sighandler (int signum)
1100{ 1301{
1101#if EV_MULTIPLICITY 1302#if EV_MULTIPLICITY
1102 struct ev_loop *loop = &default_loop_struct; 1303 EV_P = signals [signum - 1].loop;
1103#endif 1304#endif
1104 1305
1105#if _WIN32 1306#ifdef _WIN32
1106 signal (signum, ev_sighandler); 1307 signal (signum, ev_sighandler);
1107#endif 1308#endif
1108 1309
1109 signals [signum - 1].gotsig = 1; 1310 signals [signum - 1].pending = 1;
1110 evpipe_write (EV_A_ &gotsig); 1311 evpipe_write (EV_A_ &sig_pending);
1111} 1312}
1112 1313
1113void noinline 1314void noinline
1114ev_feed_signal_event (EV_P_ int signum) 1315ev_feed_signal_event (EV_P_ int signum)
1115{ 1316{
1116 WL w; 1317 WL w;
1117 1318
1319 if (expect_false (signum <= 0 || signum > EV_NSIG))
1320 return;
1321
1322 --signum;
1323
1118#if EV_MULTIPLICITY 1324#if EV_MULTIPLICITY
1119 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 */
1120#endif 1326 /* or, likely more useful, feeding a signal nobody is waiting for */
1121 1327
1122 --signum; 1328 if (expect_false (signals [signum].loop != EV_A))
1123
1124 if (signum < 0 || signum >= signalmax)
1125 return; 1329 return;
1330#endif
1126 1331
1127 signals [signum].gotsig = 0; 1332 signals [signum].pending = 0;
1128 1333
1129 for (w = signals [signum].head; w; w = w->next) 1334 for (w = signals [signum].head; w; w = w->next)
1130 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1335 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1131} 1336}
1132 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
1133/*****************************************************************************/ 1358/*****************************************************************************/
1134 1359
1135static WL childs [EV_PID_HASHSIZE]; 1360static WL childs [EV_PID_HASHSIZE];
1136 1361
1137#ifndef _WIN32 1362#ifndef _WIN32
… …
1140 1365
1141#ifndef WIFCONTINUED 1366#ifndef WIFCONTINUED
1142# define WIFCONTINUED(status) 0 1367# define WIFCONTINUED(status) 0
1143#endif 1368#endif
1144 1369
1145void inline_speed 1370/* handle a single child status event */
1371inline_speed void
1146child_reap (EV_P_ int chain, int pid, int status) 1372child_reap (EV_P_ int chain, int pid, int status)
1147{ 1373{
1148 ev_child *w; 1374 ev_child *w;
1149 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1375 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1150 1376
… …
1163 1389
1164#ifndef WCONTINUED 1390#ifndef WCONTINUED
1165# define WCONTINUED 0 1391# define WCONTINUED 0
1166#endif 1392#endif
1167 1393
1394/* called on sigchld etc., calls waitpid */
1168static void 1395static void
1169childcb (EV_P_ ev_signal *sw, int revents) 1396childcb (EV_P_ ev_signal *sw, int revents)
1170{ 1397{
1171 int pid, status; 1398 int pid, status;
1172 1399
… …
1253 /* kqueue is borked on everything but netbsd apparently */ 1480 /* kqueue is borked on everything but netbsd apparently */
1254 /* 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 */
1255 flags &= ~EVBACKEND_KQUEUE; 1482 flags &= ~EVBACKEND_KQUEUE;
1256#endif 1483#endif
1257#ifdef __APPLE__ 1484#ifdef __APPLE__
1258 // flags &= ~EVBACKEND_KQUEUE; for documentation 1485 /* only select works correctly on that "unix-certified" platform */
1259 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 */
1260#endif 1488#endif
1261 1489
1262 return flags; 1490 return flags;
1263} 1491}
1264 1492
… …
1278ev_backend (EV_P) 1506ev_backend (EV_P)
1279{ 1507{
1280 return backend; 1508 return backend;
1281} 1509}
1282 1510
1511#if EV_MINIMAL < 2
1283unsigned int 1512unsigned int
1284ev_loop_count (EV_P) 1513ev_loop_count (EV_P)
1285{ 1514{
1286 return loop_count; 1515 return loop_count;
1287} 1516}
1288 1517
1518unsigned int
1519ev_loop_depth (EV_P)
1520{
1521 return loop_depth;
1522}
1523
1289void 1524void
1290ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1525ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1291{ 1526{
1292 io_blocktime = interval; 1527 io_blocktime = interval;
1293} 1528}
… …
1296ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1531ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1297{ 1532{
1298 timeout_blocktime = interval; 1533 timeout_blocktime = interval;
1299} 1534}
1300 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 */
1301static void noinline 1561static void noinline
1302loop_init (EV_P_ unsigned int flags) 1562loop_init (EV_P_ unsigned int flags)
1303{ 1563{
1304 if (!backend) 1564 if (!backend)
1305 { 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
1306#if EV_USE_MONOTONIC 1576#if EV_USE_MONOTONIC
1577 if (!have_monotonic)
1307 { 1578 {
1308 struct timespec ts; 1579 struct timespec ts;
1580
1309 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1581 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1310 have_monotonic = 1; 1582 have_monotonic = 1;
1311 } 1583 }
1312#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"));
1313 1596
1314 ev_rt_now = ev_time (); 1597 ev_rt_now = ev_time ();
1315 mn_now = get_clock (); 1598 mn_now = get_clock ();
1316 now_floor = mn_now; 1599 now_floor = mn_now;
1317 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
1318 1604
1319 io_blocktime = 0.; 1605 io_blocktime = 0.;
1320 timeout_blocktime = 0.; 1606 timeout_blocktime = 0.;
1321 backend = 0; 1607 backend = 0;
1322 backend_fd = -1; 1608 backend_fd = -1;
1323 gotasync = 0; 1609 sig_pending = 0;
1610#if EV_ASYNC_ENABLE
1611 async_pending = 0;
1612#endif
1324#if EV_USE_INOTIFY 1613#if EV_USE_INOTIFY
1325 fs_fd = -2; 1614 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1326#endif 1615#endif
1327 1616#if EV_USE_SIGNALFD
1328 /* pid check not overridable via env */ 1617 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1329#ifndef _WIN32
1330 if (flags & EVFLAG_FORKCHECK)
1331 curpid = getpid ();
1332#endif 1618#endif
1333
1334 if (!(flags & EVFLAG_NOENV)
1335 && !enable_secure ()
1336 && getenv ("LIBEV_FLAGS"))
1337 flags = atoi (getenv ("LIBEV_FLAGS"));
1338 1619
1339 if (!(flags & 0x0000ffffU)) 1620 if (!(flags & 0x0000ffffU))
1340 flags |= ev_recommended_backends (); 1621 flags |= ev_recommended_backends ();
1341 1622
1342#if EV_USE_PORT 1623#if EV_USE_PORT
… …
1353#endif 1634#endif
1354#if EV_USE_SELECT 1635#if EV_USE_SELECT
1355 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1636 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1356#endif 1637#endif
1357 1638
1639 ev_prepare_init (&pending_w, pendingcb);
1640
1358 ev_init (&pipeev, pipecb); 1641 ev_init (&pipe_w, pipecb);
1359 ev_set_priority (&pipeev, EV_MAXPRI); 1642 ev_set_priority (&pipe_w, EV_MAXPRI);
1360 } 1643 }
1361} 1644}
1362 1645
1646/* free up a loop structure */
1363static void noinline 1647static void noinline
1364loop_destroy (EV_P) 1648loop_destroy (EV_P)
1365{ 1649{
1366 int i; 1650 int i;
1367 1651
1368 if (ev_is_active (&pipeev)) 1652 if (ev_is_active (&pipe_w))
1369 { 1653 {
1370 ev_ref (EV_A); /* signal watcher */ 1654 /*ev_ref (EV_A);*/
1371 ev_io_stop (EV_A_ &pipeev); 1655 /*ev_io_stop (EV_A_ &pipe_w);*/
1372 1656
1373#if EV_USE_EVENTFD 1657#if EV_USE_EVENTFD
1374 if (evfd >= 0) 1658 if (evfd >= 0)
1375 close (evfd); 1659 close (evfd);
1376#endif 1660#endif
1377 1661
1378 if (evpipe [0] >= 0) 1662 if (evpipe [0] >= 0)
1379 { 1663 {
1380 close (evpipe [0]); 1664 EV_WIN32_CLOSE_FD (evpipe [0]);
1381 close (evpipe [1]); 1665 EV_WIN32_CLOSE_FD (evpipe [1]);
1382 } 1666 }
1383 } 1667 }
1668
1669#if EV_USE_SIGNALFD
1670 if (ev_is_active (&sigfd_w))
1671 close (sigfd);
1672#endif
1384 1673
1385#if EV_USE_INOTIFY 1674#if EV_USE_INOTIFY
1386 if (fs_fd >= 0) 1675 if (fs_fd >= 0)
1387 close (fs_fd); 1676 close (fs_fd);
1388#endif 1677#endif
… …
1412#if EV_IDLE_ENABLE 1701#if EV_IDLE_ENABLE
1413 array_free (idle, [i]); 1702 array_free (idle, [i]);
1414#endif 1703#endif
1415 } 1704 }
1416 1705
1417 ev_free (anfds); anfdmax = 0; 1706 ev_free (anfds); anfds = 0; anfdmax = 0;
1418 1707
1419 /* 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);
1420 array_free (fdchange, EMPTY); 1710 array_free (fdchange, EMPTY);
1421 array_free (timer, EMPTY); 1711 array_free (timer, EMPTY);
1422#if EV_PERIODIC_ENABLE 1712#if EV_PERIODIC_ENABLE
1423 array_free (periodic, EMPTY); 1713 array_free (periodic, EMPTY);
1424#endif 1714#endif
… …
1433 1723
1434 backend = 0; 1724 backend = 0;
1435} 1725}
1436 1726
1437#if EV_USE_INOTIFY 1727#if EV_USE_INOTIFY
1438void inline_size infy_fork (EV_P); 1728inline_size void infy_fork (EV_P);
1439#endif 1729#endif
1440 1730
1441void inline_size 1731inline_size void
1442loop_fork (EV_P) 1732loop_fork (EV_P)
1443{ 1733{
1444#if EV_USE_PORT 1734#if EV_USE_PORT
1445 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1735 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1446#endif 1736#endif
… …
1452#endif 1742#endif
1453#if EV_USE_INOTIFY 1743#if EV_USE_INOTIFY
1454 infy_fork (EV_A); 1744 infy_fork (EV_A);
1455#endif 1745#endif
1456 1746
1457 if (ev_is_active (&pipeev)) 1747 if (ev_is_active (&pipe_w))
1458 { 1748 {
1459 /* this "locks" the handlers against writing to the pipe */ 1749 /* this "locks" the handlers against writing to the pipe */
1460 /* while we modify the fd vars */ 1750 /* while we modify the fd vars */
1461 gotsig = 1; 1751 sig_pending = 1;
1462#if EV_ASYNC_ENABLE 1752#if EV_ASYNC_ENABLE
1463 gotasync = 1; 1753 async_pending = 1;
1464#endif 1754#endif
1465 1755
1466 ev_ref (EV_A); 1756 ev_ref (EV_A);
1467 ev_io_stop (EV_A_ &pipeev); 1757 ev_io_stop (EV_A_ &pipe_w);
1468 1758
1469#if EV_USE_EVENTFD 1759#if EV_USE_EVENTFD
1470 if (evfd >= 0) 1760 if (evfd >= 0)
1471 close (evfd); 1761 close (evfd);
1472#endif 1762#endif
1473 1763
1474 if (evpipe [0] >= 0) 1764 if (evpipe [0] >= 0)
1475 { 1765 {
1476 close (evpipe [0]); 1766 EV_WIN32_CLOSE_FD (evpipe [0]);
1477 close (evpipe [1]); 1767 EV_WIN32_CLOSE_FD (evpipe [1]);
1478 } 1768 }
1479 1769
1480 evpipe_init (EV_A); 1770 evpipe_init (EV_A);
1481 /* now iterate over everything, in case we missed something */ 1771 /* now iterate over everything, in case we missed something */
1482 pipecb (EV_A_ &pipeev, EV_READ); 1772 pipecb (EV_A_ &pipe_w, EV_READ);
1483 } 1773 }
1484 1774
1485 postfork = 0; 1775 postfork = 0;
1486} 1776}
1487 1777
1488#if EV_MULTIPLICITY 1778#if EV_MULTIPLICITY
1779
1489struct ev_loop * 1780struct ev_loop *
1490ev_loop_new (unsigned int flags) 1781ev_loop_new (unsigned int flags)
1491{ 1782{
1492 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));
1493 1784
1494 memset (loop, 0, sizeof (struct ev_loop)); 1785 memset (EV_A, 0, sizeof (struct ev_loop));
1495
1496 loop_init (EV_A_ flags); 1786 loop_init (EV_A_ flags);
1497 1787
1498 if (ev_backend (EV_A)) 1788 if (ev_backend (EV_A))
1499 return loop; 1789 return EV_A;
1500 1790
1501 return 0; 1791 return 0;
1502} 1792}
1503 1793
1504void 1794void
… …
1511void 1801void
1512ev_loop_fork (EV_P) 1802ev_loop_fork (EV_P)
1513{ 1803{
1514 postfork = 1; /* must be in line with ev_default_fork */ 1804 postfork = 1; /* must be in line with ev_default_fork */
1515} 1805}
1806#endif /* multiplicity */
1516 1807
1517#if EV_VERIFY 1808#if EV_VERIFY
1518static 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
1519array_check (W **ws, int cnt) 1834array_verify (EV_P_ W *ws, int cnt)
1520{ 1835{
1521 while (cnt--) 1836 while (cnt--)
1837 {
1522 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 }
1523} 1841}
1842#endif
1524 1843
1525static void 1844#if EV_MINIMAL < 2
1845void
1526ev_loop_verify (EV_P) 1846ev_loop_verify (EV_P)
1527{ 1847{
1848#if EV_VERIFY
1528 int i; 1849 int i;
1850 WL w;
1529 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);
1530 checkheap (timers, timercnt); 1868 verify_heap (EV_A_ timers, timercnt);
1869
1531#if EV_PERIODIC_ENABLE 1870#if EV_PERIODIC_ENABLE
1871 assert (periodicmax >= periodiccnt);
1532 checkheap (periodics, periodiccnt); 1872 verify_heap (EV_A_ periodics, periodiccnt);
1533#endif 1873#endif
1534 1874
1875 for (i = NUMPRI; i--; )
1876 {
1877 assert (pendingmax [i] >= pendingcnt [i]);
1535#if EV_IDLE_ENABLE 1878#if EV_IDLE_ENABLE
1536 for (i = NUMPRI; i--; ) 1879 assert (idleall >= 0);
1880 assert (idlemax [i] >= idlecnt [i]);
1537 array_check ((W **)idles [i], idlecnt [i]); 1881 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1538#endif 1882#endif
1883 }
1884
1539#if EV_FORK_ENABLE 1885#if EV_FORK_ENABLE
1886 assert (forkmax >= forkcnt);
1540 array_check ((W **)forks, forkcnt); 1887 array_verify (EV_A_ (W *)forks, forkcnt);
1541#endif 1888#endif
1542 array_check ((W **)prepares, preparecnt); 1889
1543 array_check ((W **)checks, checkcnt);
1544#if EV_ASYNC_ENABLE 1890#if EV_ASYNC_ENABLE
1891 assert (asyncmax >= asynccnt);
1545 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)
1546#endif 1904# endif
1547}
1548#endif 1905#endif
1549 1906}
1550#endif 1907#endif
1551 1908
1552#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1553struct ev_loop * 1910struct ev_loop *
1554ev_default_loop_init (unsigned int flags) 1911ev_default_loop_init (unsigned int flags)
… …
1558#endif 1915#endif
1559{ 1916{
1560 if (!ev_default_loop_ptr) 1917 if (!ev_default_loop_ptr)
1561 { 1918 {
1562#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1563 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1920 EV_P = ev_default_loop_ptr = &default_loop_struct;
1564#else 1921#else
1565 ev_default_loop_ptr = 1; 1922 ev_default_loop_ptr = 1;
1566#endif 1923#endif
1567 1924
1568 loop_init (EV_A_ flags); 1925 loop_init (EV_A_ flags);
… …
1585 1942
1586void 1943void
1587ev_default_destroy (void) 1944ev_default_destroy (void)
1588{ 1945{
1589#if EV_MULTIPLICITY 1946#if EV_MULTIPLICITY
1590 struct ev_loop *loop = ev_default_loop_ptr; 1947 EV_P = ev_default_loop_ptr;
1591#endif 1948#endif
1949
1950 ev_default_loop_ptr = 0;
1592 1951
1593#ifndef _WIN32 1952#ifndef _WIN32
1594 ev_ref (EV_A); /* child watcher */ 1953 ev_ref (EV_A); /* child watcher */
1595 ev_signal_stop (EV_A_ &childev); 1954 ev_signal_stop (EV_A_ &childev);
1596#endif 1955#endif
… …
1600 1959
1601void 1960void
1602ev_default_fork (void) 1961ev_default_fork (void)
1603{ 1962{
1604#if EV_MULTIPLICITY 1963#if EV_MULTIPLICITY
1605 struct ev_loop *loop = ev_default_loop_ptr; 1964 EV_P = ev_default_loop_ptr;
1606#endif 1965#endif
1607 1966
1608 if (backend)
1609 postfork = 1; /* must be in line with ev_loop_fork */ 1967 postfork = 1; /* must be in line with ev_loop_fork */
1610} 1968}
1611 1969
1612/*****************************************************************************/ 1970/*****************************************************************************/
1613 1971
1614void 1972void
1615ev_invoke (EV_P_ void *w, int revents) 1973ev_invoke (EV_P_ void *w, int revents)
1616{ 1974{
1617 EV_CB_INVOKE ((W)w, revents); 1975 EV_CB_INVOKE ((W)w, revents);
1618} 1976}
1619 1977
1620void inline_speed 1978unsigned int
1621call_pending (EV_P) 1979ev_pending_count (EV_P)
1622{ 1980{
1623 int pri; 1981 int pri;
1982 unsigned int count = 0;
1624 1983
1625 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;
1626 1994
1627 for (pri = NUMPRI; pri--; ) 1995 for (pri = NUMPRI; pri--; )
1628 while (pendingcnt [pri]) 1996 while (pendingcnt [pri])
1629 { 1997 {
1630 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1998 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1631 1999
1632 if (expect_true (p->w))
1633 {
1634 /*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 */
1635 2002
1636 p->w->pending = 0; 2003 p->w->pending = 0;
1637 EV_CB_INVOKE (p->w, p->events); 2004 EV_CB_INVOKE (p->w, p->events);
1638 } 2005 EV_FREQUENT_CHECK;
1639 } 2006 }
1640
1641 EV_FREQUENT_CHECK;
1642} 2007}
1643 2008
1644#if EV_IDLE_ENABLE 2009#if EV_IDLE_ENABLE
1645void inline_size 2010/* make idle watchers pending. this handles the "call-idle */
2011/* only when higher priorities are idle" logic */
2012inline_size void
1646idle_reify (EV_P) 2013idle_reify (EV_P)
1647{ 2014{
1648 if (expect_false (idleall)) 2015 if (expect_false (idleall))
1649 { 2016 {
1650 int pri; 2017 int pri;
… …
1662 } 2029 }
1663 } 2030 }
1664} 2031}
1665#endif 2032#endif
1666 2033
1667void inline_size 2034/* make timers pending */
2035inline_size void
1668timers_reify (EV_P) 2036timers_reify (EV_P)
1669{ 2037{
1670 EV_FREQUENT_CHECK; 2038 EV_FREQUENT_CHECK;
1671 2039
1672 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2040 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1673 { 2041 {
1674 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2042 do
1675
1676 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1677
1678 /* first reschedule or stop timer */
1679 if (w->repeat)
1680 { 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 {
1681 ev_at (w) += w->repeat; 2051 ev_at (w) += w->repeat;
1682 if (ev_at (w) < mn_now) 2052 if (ev_at (w) < mn_now)
1683 ev_at (w) = mn_now; 2053 ev_at (w) = mn_now;
1684 2054
1685 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.));
1686 2056
1687 ANHE_at_cache (timers [HEAP0]); 2057 ANHE_at_cache (timers [HEAP0]);
1688 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);
1689 } 2065 }
1690 else 2066 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1691 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1692 2067
1693 EV_FREQUENT_CHECK;
1694 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2068 feed_reverse_done (EV_A_ EV_TIMEOUT);
1695 } 2069 }
1696} 2070}
1697 2071
1698#if EV_PERIODIC_ENABLE 2072#if EV_PERIODIC_ENABLE
1699void inline_size 2073/* make periodics pending */
2074inline_size void
1700periodics_reify (EV_P) 2075periodics_reify (EV_P)
1701{ 2076{
1702 EV_FREQUENT_CHECK; 2077 EV_FREQUENT_CHECK;
2078
1703 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2079 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1704 { 2080 {
1705 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2081 int feed_count = 0;
1706 2082
1707 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2083 do
1708
1709 /* first reschedule or stop timer */
1710 if (w->reschedule_cb)
1711 { 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 {
1712 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2092 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1713 2093
1714 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));
1715 2095
1716 ANHE_at_cache (periodics [HEAP0]); 2096 ANHE_at_cache (periodics [HEAP0]);
1717 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
1718 EV_FREQUENT_CHECK; 2121 EV_FREQUENT_CHECK;
2122 feed_reverse (EV_A_ (W)w);
1719 } 2123 }
1720 else if (w->interval) 2124 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1721 {
1722 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1723 /* if next trigger time is not sufficiently in the future, put it there */
1724 /* this might happen because of floating point inexactness */
1725 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1726 {
1727 ev_at (w) += w->interval;
1728 2125
1729 /* if interval is unreasonably low we might still have a time in the past */
1730 /* so correct this. this will make the periodic very inexact, but the user */
1731 /* has effectively asked to get triggered more often than possible */
1732 if (ev_at (w) < ev_rt_now)
1733 ev_at (w) = ev_rt_now;
1734 }
1735
1736 ANHE_at_cache (periodics [HEAP0]);
1737 downheap (periodics, periodiccnt, HEAP0);
1738 }
1739 else
1740 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1741
1742 EV_FREQUENT_CHECK;
1743 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2126 feed_reverse_done (EV_A_ EV_PERIODIC);
1744 } 2127 }
1745} 2128}
1746 2129
2130/* simply recalculate all periodics */
2131/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1747static void noinline 2132static void noinline
1748periodics_reschedule (EV_P) 2133periodics_reschedule (EV_P)
1749{ 2134{
1750 int i; 2135 int i;
1751 2136
… …
1764 2149
1765 reheap (periodics, periodiccnt); 2150 reheap (periodics, periodiccnt);
1766} 2151}
1767#endif 2152#endif
1768 2153
1769void 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
1770time_update (EV_P_ ev_tstamp max_block) 2171time_update (EV_P_ ev_tstamp max_block)
1771{ 2172{
1772 int i;
1773
1774#if EV_USE_MONOTONIC 2173#if EV_USE_MONOTONIC
1775 if (expect_true (have_monotonic)) 2174 if (expect_true (have_monotonic))
1776 { 2175 {
2176 int i;
1777 ev_tstamp odiff = rtmn_diff; 2177 ev_tstamp odiff = rtmn_diff;
1778 2178
1779 mn_now = get_clock (); 2179 mn_now = get_clock ();
1780 2180
1781 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2181 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1807 ev_rt_now = ev_time (); 2207 ev_rt_now = ev_time ();
1808 mn_now = get_clock (); 2208 mn_now = get_clock ();
1809 now_floor = mn_now; 2209 now_floor = mn_now;
1810 } 2210 }
1811 2211
2212 /* no timer adjustment, as the monotonic clock doesn't jump */
2213 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1812# if EV_PERIODIC_ENABLE 2214# if EV_PERIODIC_ENABLE
1813 periodics_reschedule (EV_A); 2215 periodics_reschedule (EV_A);
1814# endif 2216# endif
1815 /* no timer adjustment, as the monotonic clock doesn't jump */
1816 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1817 } 2217 }
1818 else 2218 else
1819#endif 2219#endif
1820 { 2220 {
1821 ev_rt_now = ev_time (); 2221 ev_rt_now = ev_time ();
1822 2222
1823 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))
1824 { 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);
1825#if EV_PERIODIC_ENABLE 2227#if EV_PERIODIC_ENABLE
1826 periodics_reschedule (EV_A); 2228 periodics_reschedule (EV_A);
1827#endif 2229#endif
1828 /* adjust timers. this is easy, as the offset is the same for all of them */
1829 for (i = 0; i < timercnt; ++i)
1830 {
1831 ANHE *he = timers + i + HEAP0;
1832 ANHE_w (*he)->at += ev_rt_now - mn_now;
1833 ANHE_at_cache (*he);
1834 }
1835 } 2230 }
1836 2231
1837 mn_now = ev_rt_now; 2232 mn_now = ev_rt_now;
1838 } 2233 }
1839} 2234}
1840 2235
1841void 2236void
1842ev_ref (EV_P)
1843{
1844 ++activecnt;
1845}
1846
1847void
1848ev_unref (EV_P)
1849{
1850 --activecnt;
1851}
1852
1853static int loop_done;
1854
1855void
1856ev_loop (EV_P_ int flags) 2237ev_loop (EV_P_ int flags)
1857{ 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
1858 loop_done = EVUNLOOP_CANCEL; 2245 loop_done = EVUNLOOP_CANCEL;
1859 2246
1860 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 */
1861 2248
1862 do 2249 do
1863 { 2250 {
2251#if EV_VERIFY >= 2
2252 ev_loop_verify (EV_A);
2253#endif
2254
1864#ifndef _WIN32 2255#ifndef _WIN32
1865 if (expect_false (curpid)) /* penalise the forking check even more */ 2256 if (expect_false (curpid)) /* penalise the forking check even more */
1866 if (expect_false (getpid () != curpid)) 2257 if (expect_false (getpid () != curpid))
1867 { 2258 {
1868 curpid = getpid (); 2259 curpid = getpid ();
… …
1874 /* we might have forked, so queue fork handlers */ 2265 /* we might have forked, so queue fork handlers */
1875 if (expect_false (postfork)) 2266 if (expect_false (postfork))
1876 if (forkcnt) 2267 if (forkcnt)
1877 { 2268 {
1878 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2269 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1879 call_pending (EV_A); 2270 EV_INVOKE_PENDING;
1880 } 2271 }
1881#endif 2272#endif
1882 2273
1883 /* queue prepare watchers (and execute them) */ 2274 /* queue prepare watchers (and execute them) */
1884 if (expect_false (preparecnt)) 2275 if (expect_false (preparecnt))
1885 { 2276 {
1886 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2277 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1887 call_pending (EV_A); 2278 EV_INVOKE_PENDING;
1888 } 2279 }
1889 2280
1890 if (expect_false (!activecnt)) 2281 if (expect_false (loop_done))
1891 break; 2282 break;
1892 2283
1893 /* we might have forked, so reify kernel state if necessary */ 2284 /* we might have forked, so reify kernel state if necessary */
1894 if (expect_false (postfork)) 2285 if (expect_false (postfork))
1895 loop_fork (EV_A); 2286 loop_fork (EV_A);
… …
1902 ev_tstamp waittime = 0.; 2293 ev_tstamp waittime = 0.;
1903 ev_tstamp sleeptime = 0.; 2294 ev_tstamp sleeptime = 0.;
1904 2295
1905 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2296 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1906 { 2297 {
2298 /* remember old timestamp for io_blocktime calculation */
2299 ev_tstamp prev_mn_now = mn_now;
2300
1907 /* update time to cancel out callback processing overhead */ 2301 /* update time to cancel out callback processing overhead */
1908 time_update (EV_A_ 1e100); 2302 time_update (EV_A_ 1e100);
1909 2303
1910 waittime = MAX_BLOCKTIME; 2304 waittime = MAX_BLOCKTIME;
1911 2305
… …
1921 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;
1922 if (waittime > to) waittime = to; 2316 if (waittime > to) waittime = to;
1923 } 2317 }
1924#endif 2318#endif
1925 2319
2320 /* don't let timeouts decrease the waittime below timeout_blocktime */
1926 if (expect_false (waittime < timeout_blocktime)) 2321 if (expect_false (waittime < timeout_blocktime))
1927 waittime = timeout_blocktime; 2322 waittime = timeout_blocktime;
1928 2323
1929 sleeptime = waittime - backend_fudge; 2324 /* extra check because io_blocktime is commonly 0 */
1930
1931 if (expect_true (sleeptime > io_blocktime)) 2325 if (expect_false (io_blocktime))
1932 sleeptime = io_blocktime;
1933
1934 if (sleeptime)
1935 { 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 {
1936 ev_sleep (sleeptime); 2334 ev_sleep (sleeptime);
1937 waittime -= sleeptime; 2335 waittime -= sleeptime;
2336 }
1938 } 2337 }
1939 } 2338 }
1940 2339
2340#if EV_MINIMAL < 2
1941 ++loop_count; 2341 ++loop_count;
2342#endif
2343 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
1942 backend_poll (EV_A_ waittime); 2344 backend_poll (EV_A_ waittime);
2345 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
1943 2346
1944 /* update ev_rt_now, do magic */ 2347 /* update ev_rt_now, do magic */
1945 time_update (EV_A_ waittime + sleeptime); 2348 time_update (EV_A_ waittime + sleeptime);
1946 } 2349 }
1947 2350
… …
1958 2361
1959 /* queue check watchers, to be executed first */ 2362 /* queue check watchers, to be executed first */
1960 if (expect_false (checkcnt)) 2363 if (expect_false (checkcnt))
1961 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2364 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1962 2365
1963 call_pending (EV_A); 2366 EV_INVOKE_PENDING;
1964 } 2367 }
1965 while (expect_true ( 2368 while (expect_true (
1966 activecnt 2369 activecnt
1967 && !loop_done 2370 && !loop_done
1968 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2371 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1969 )); 2372 ));
1970 2373
1971 if (loop_done == EVUNLOOP_ONE) 2374 if (loop_done == EVUNLOOP_ONE)
1972 loop_done = EVUNLOOP_CANCEL; 2375 loop_done = EVUNLOOP_CANCEL;
2376
2377#if EV_MINIMAL < 2
2378 --loop_depth;
2379#endif
1973} 2380}
1974 2381
1975void 2382void
1976ev_unloop (EV_P_ int how) 2383ev_unloop (EV_P_ int how)
1977{ 2384{
1978 loop_done = how; 2385 loop_done = how;
1979} 2386}
1980 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
1981/*****************************************************************************/ 2425/*****************************************************************************/
2426/* singly-linked list management, used when the expected list length is short */
1982 2427
1983void inline_size 2428inline_size void
1984wlist_add (WL *head, WL elem) 2429wlist_add (WL *head, WL elem)
1985{ 2430{
1986 elem->next = *head; 2431 elem->next = *head;
1987 *head = elem; 2432 *head = elem;
1988} 2433}
1989 2434
1990void inline_size 2435inline_size void
1991wlist_del (WL *head, WL elem) 2436wlist_del (WL *head, WL elem)
1992{ 2437{
1993 while (*head) 2438 while (*head)
1994 { 2439 {
1995 if (*head == elem) 2440 if (expect_true (*head == elem))
1996 { 2441 {
1997 *head = elem->next; 2442 *head = elem->next;
1998 return; 2443 break;
1999 } 2444 }
2000 2445
2001 head = &(*head)->next; 2446 head = &(*head)->next;
2002 } 2447 }
2003} 2448}
2004 2449
2005void inline_speed 2450/* internal, faster, version of ev_clear_pending */
2451inline_speed void
2006clear_pending (EV_P_ W w) 2452clear_pending (EV_P_ W w)
2007{ 2453{
2008 if (w->pending) 2454 if (w->pending)
2009 { 2455 {
2010 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2456 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2011 w->pending = 0; 2457 w->pending = 0;
2012 } 2458 }
2013} 2459}
2014 2460
2015int 2461int
… …
2019 int pending = w_->pending; 2465 int pending = w_->pending;
2020 2466
2021 if (expect_true (pending)) 2467 if (expect_true (pending))
2022 { 2468 {
2023 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2469 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2470 p->w = (W)&pending_w;
2024 w_->pending = 0; 2471 w_->pending = 0;
2025 p->w = 0;
2026 return p->events; 2472 return p->events;
2027 } 2473 }
2028 else 2474 else
2029 return 0; 2475 return 0;
2030} 2476}
2031 2477
2032void inline_size 2478inline_size void
2033pri_adjust (EV_P_ W w) 2479pri_adjust (EV_P_ W w)
2034{ 2480{
2035 int pri = w->priority; 2481 int pri = ev_priority (w);
2036 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2482 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2037 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2483 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2038 w->priority = pri; 2484 ev_set_priority (w, pri);
2039} 2485}
2040 2486
2041void inline_speed 2487inline_speed void
2042ev_start (EV_P_ W w, int active) 2488ev_start (EV_P_ W w, int active)
2043{ 2489{
2044 pri_adjust (EV_A_ w); 2490 pri_adjust (EV_A_ w);
2045 w->active = active; 2491 w->active = active;
2046 ev_ref (EV_A); 2492 ev_ref (EV_A);
2047} 2493}
2048 2494
2049void inline_size 2495inline_size void
2050ev_stop (EV_P_ W w) 2496ev_stop (EV_P_ W w)
2051{ 2497{
2052 ev_unref (EV_A); 2498 ev_unref (EV_A);
2053 w->active = 0; 2499 w->active = 0;
2054} 2500}
… …
2061 int fd = w->fd; 2507 int fd = w->fd;
2062 2508
2063 if (expect_false (ev_is_active (w))) 2509 if (expect_false (ev_is_active (w)))
2064 return; 2510 return;
2065 2511
2066 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))));
2067 2514
2068 EV_FREQUENT_CHECK; 2515 EV_FREQUENT_CHECK;
2069 2516
2070 ev_start (EV_A_ (W)w, 1); 2517 ev_start (EV_A_ (W)w, 1);
2071 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2518 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2072 wlist_add (&anfds[fd].head, (WL)w); 2519 wlist_add (&anfds[fd].head, (WL)w);
2073 2520
2074 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2521 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2075 w->events &= ~EV_IOFDSET; 2522 w->events &= ~EV__IOFDSET;
2076 2523
2077 EV_FREQUENT_CHECK; 2524 EV_FREQUENT_CHECK;
2078} 2525}
2079 2526
2080void noinline 2527void noinline
… …
2082{ 2529{
2083 clear_pending (EV_A_ (W)w); 2530 clear_pending (EV_A_ (W)w);
2084 if (expect_false (!ev_is_active (w))) 2531 if (expect_false (!ev_is_active (w)))
2085 return; 2532 return;
2086 2533
2087 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));
2088 2535
2089 EV_FREQUENT_CHECK; 2536 EV_FREQUENT_CHECK;
2090 2537
2091 wlist_del (&anfds[w->fd].head, (WL)w); 2538 wlist_del (&anfds[w->fd].head, (WL)w);
2092 ev_stop (EV_A_ (W)w); 2539 ev_stop (EV_A_ (W)w);
… …
2102 if (expect_false (ev_is_active (w))) 2549 if (expect_false (ev_is_active (w)))
2103 return; 2550 return;
2104 2551
2105 ev_at (w) += mn_now; 2552 ev_at (w) += mn_now;
2106 2553
2107 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.));
2108 2555
2109 EV_FREQUENT_CHECK; 2556 EV_FREQUENT_CHECK;
2110 2557
2111 ++timercnt; 2558 ++timercnt;
2112 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2559 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2115 ANHE_at_cache (timers [ev_active (w)]); 2562 ANHE_at_cache (timers [ev_active (w)]);
2116 upheap (timers, ev_active (w)); 2563 upheap (timers, ev_active (w));
2117 2564
2118 EV_FREQUENT_CHECK; 2565 EV_FREQUENT_CHECK;
2119 2566
2120 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2567 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2121} 2568}
2122 2569
2123void noinline 2570void noinline
2124ev_timer_stop (EV_P_ ev_timer *w) 2571ev_timer_stop (EV_P_ ev_timer *w)
2125{ 2572{
… …
2130 EV_FREQUENT_CHECK; 2577 EV_FREQUENT_CHECK;
2131 2578
2132 { 2579 {
2133 int active = ev_active (w); 2580 int active = ev_active (w);
2134 2581
2135 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2582 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2136 2583
2137 --timercnt; 2584 --timercnt;
2138 2585
2139 if (expect_true (active < timercnt + HEAP0)) 2586 if (expect_true (active < timercnt + HEAP0))
2140 { 2587 {
… …
2173 } 2620 }
2174 2621
2175 EV_FREQUENT_CHECK; 2622 EV_FREQUENT_CHECK;
2176} 2623}
2177 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
2178#if EV_PERIODIC_ENABLE 2631#if EV_PERIODIC_ENABLE
2179void noinline 2632void noinline
2180ev_periodic_start (EV_P_ ev_periodic *w) 2633ev_periodic_start (EV_P_ ev_periodic *w)
2181{ 2634{
2182 if (expect_false (ev_is_active (w))) 2635 if (expect_false (ev_is_active (w)))
… …
2184 2637
2185 if (w->reschedule_cb) 2638 if (w->reschedule_cb)
2186 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2639 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2187 else if (w->interval) 2640 else if (w->interval)
2188 { 2641 {
2189 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.));
2190 /* 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 */
2191 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;
2192 } 2645 }
2193 else 2646 else
2194 ev_at (w) = w->offset; 2647 ev_at (w) = w->offset;
… …
2202 ANHE_at_cache (periodics [ev_active (w)]); 2655 ANHE_at_cache (periodics [ev_active (w)]);
2203 upheap (periodics, ev_active (w)); 2656 upheap (periodics, ev_active (w));
2204 2657
2205 EV_FREQUENT_CHECK; 2658 EV_FREQUENT_CHECK;
2206 2659
2207 /*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));*/
2208} 2661}
2209 2662
2210void noinline 2663void noinline
2211ev_periodic_stop (EV_P_ ev_periodic *w) 2664ev_periodic_stop (EV_P_ ev_periodic *w)
2212{ 2665{
… …
2217 EV_FREQUENT_CHECK; 2670 EV_FREQUENT_CHECK;
2218 2671
2219 { 2672 {
2220 int active = ev_active (w); 2673 int active = ev_active (w);
2221 2674
2222 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2675 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2223 2676
2224 --periodiccnt; 2677 --periodiccnt;
2225 2678
2226 if (expect_true (active < periodiccnt + HEAP0)) 2679 if (expect_true (active < periodiccnt + HEAP0))
2227 { 2680 {
… …
2249#endif 2702#endif
2250 2703
2251void noinline 2704void noinline
2252ev_signal_start (EV_P_ ev_signal *w) 2705ev_signal_start (EV_P_ ev_signal *w)
2253{ 2706{
2254#if EV_MULTIPLICITY
2255 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2256#endif
2257 if (expect_false (ev_is_active (w))) 2707 if (expect_false (ev_is_active (w)))
2258 return; 2708 return;
2259 2709
2260 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));
2261 2711
2262 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));
2263 2715
2264 EV_FREQUENT_CHECK; 2716 signals [w->signum - 1].loop = EV_A;
2717#endif
2265 2718
2719 EV_FREQUENT_CHECK;
2720
2721#if EV_USE_SIGNALFD
2722 if (sigfd == -2)
2266 { 2723 {
2267#ifndef _WIN32 2724 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2268 sigset_t full, prev; 2725 if (sigfd < 0 && errno == EINVAL)
2269 sigfillset (&full); 2726 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2270 sigprocmask (SIG_SETMASK, &full, &prev);
2271#endif
2272 2727
2273 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2728 if (sigfd >= 0)
2729 {
2730 fd_intern (sigfd); /* doing it twice will not hurt */
2274 2731
2275#ifndef _WIN32 2732 sigemptyset (&sigfd_set);
2276 sigprocmask (SIG_SETMASK, &prev, 0); 2733
2277#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 }
2278 } 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
2279 2750
2280 ev_start (EV_A_ (W)w, 1); 2751 ev_start (EV_A_ (W)w, 1);
2281 wlist_add (&signals [w->signum - 1].head, (WL)w); 2752 wlist_add (&signals [w->signum - 1].head, (WL)w);
2282 2753
2283 if (!((WL)w)->next) 2754 if (!((WL)w)->next)
2755# if EV_USE_SIGNALFD
2756 if (sigfd < 0) /*TODO*/
2757# endif
2284 { 2758 {
2285#if _WIN32 2759# ifdef _WIN32
2760 evpipe_init (EV_A);
2761
2286 signal (w->signum, ev_sighandler); 2762 signal (w->signum, ev_sighandler);
2287#else 2763# else
2288 struct sigaction sa; 2764 struct sigaction sa;
2765
2766 evpipe_init (EV_A);
2767
2289 sa.sa_handler = ev_sighandler; 2768 sa.sa_handler = ev_sighandler;
2290 sigfillset (&sa.sa_mask); 2769 sigfillset (&sa.sa_mask);
2291 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 */
2292 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);
2293#endif 2776#endif
2294 } 2777 }
2295 2778
2296 EV_FREQUENT_CHECK; 2779 EV_FREQUENT_CHECK;
2297} 2780}
2298 2781
2299void noinline 2782void noinline
… …
2307 2790
2308 wlist_del (&signals [w->signum - 1].head, (WL)w); 2791 wlist_del (&signals [w->signum - 1].head, (WL)w);
2309 ev_stop (EV_A_ (W)w); 2792 ev_stop (EV_A_ (W)w);
2310 2793
2311 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
2312 signal (w->signum, SIG_DFL); 2813 signal (w->signum, SIG_DFL);
2814 }
2313 2815
2314 EV_FREQUENT_CHECK; 2816 EV_FREQUENT_CHECK;
2315} 2817}
2316 2818
2317void 2819void
2318ev_child_start (EV_P_ ev_child *w) 2820ev_child_start (EV_P_ ev_child *w)
2319{ 2821{
2320#if EV_MULTIPLICITY 2822#if EV_MULTIPLICITY
2321 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));
2322#endif 2824#endif
2323 if (expect_false (ev_is_active (w))) 2825 if (expect_false (ev_is_active (w)))
2324 return; 2826 return;
2325 2827
2326 EV_FREQUENT_CHECK; 2828 EV_FREQUENT_CHECK;
… …
2351# ifdef _WIN32 2853# ifdef _WIN32
2352# undef lstat 2854# undef lstat
2353# define lstat(a,b) _stati64 (a,b) 2855# define lstat(a,b) _stati64 (a,b)
2354# endif 2856# endif
2355 2857
2356#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 */
2357#define MIN_STAT_INTERVAL 0.1074891 2860#define MIN_STAT_INTERVAL 0.1074891
2358 2861
2359static 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);
2360 2863
2361#if EV_USE_INOTIFY 2864#if EV_USE_INOTIFY
2362# 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)
2363 2868
2364static void noinline 2869static void noinline
2365infy_add (EV_P_ ev_stat *w) 2870infy_add (EV_P_ ev_stat *w)
2366{ 2871{
2367 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 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);
2368 2873
2369 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 */
2370 { 2894 }
2371 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;
2372 2899
2373 /* monitor some parent directory for speedup hints */ 2900 /* if path is not there, monitor some parent directory for speedup hints */
2374 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2901 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2375 /* but an efficiency issue only */ 2902 /* but an efficiency issue only */
2376 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2903 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2377 { 2904 {
2378 char path [4096]; 2905 char path [4096];
2379 strcpy (path, w->path); 2906 strcpy (path, w->path);
… …
2383 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2910 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2384 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2911 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2385 2912
2386 char *pend = strrchr (path, '/'); 2913 char *pend = strrchr (path, '/');
2387 2914
2388 if (!pend) 2915 if (!pend || pend == path)
2389 break; /* whoops, no '/', complain to your admin */ 2916 break;
2390 2917
2391 *pend = 0; 2918 *pend = 0;
2392 w->wd = inotify_add_watch (fs_fd, path, mask); 2919 w->wd = inotify_add_watch (fs_fd, path, mask);
2393 } 2920 }
2394 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2921 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2395 } 2922 }
2396 } 2923 }
2397 else
2398 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2399 2924
2400 if (w->wd >= 0) 2925 if (w->wd >= 0)
2401 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);
2402} 2932}
2403 2933
2404static void noinline 2934static void noinline
2405infy_del (EV_P_ ev_stat *w) 2935infy_del (EV_P_ ev_stat *w)
2406{ 2936{
… …
2420 2950
2421static void noinline 2951static void noinline
2422infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2952infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2423{ 2953{
2424 if (slot < 0) 2954 if (slot < 0)
2425 /* overflow, need to check for all hahs slots */ 2955 /* overflow, need to check for all hash slots */
2426 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2956 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2427 infy_wd (EV_A_ slot, wd, ev); 2957 infy_wd (EV_A_ slot, wd, ev);
2428 else 2958 else
2429 { 2959 {
2430 WL w_; 2960 WL w_;
… …
2436 2966
2437 if (w->wd == wd || wd == -1) 2967 if (w->wd == wd || wd == -1)
2438 { 2968 {
2439 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2969 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2440 { 2970 {
2971 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2441 w->wd = -1; 2972 w->wd = -1;
2442 infy_add (EV_A_ w); /* re-add, no matter what */ 2973 infy_add (EV_A_ w); /* re-add, no matter what */
2443 } 2974 }
2444 2975
2445 stat_timer_cb (EV_A_ &w->timer, 0); 2976 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2450 2981
2451static void 2982static void
2452infy_cb (EV_P_ ev_io *w, int revents) 2983infy_cb (EV_P_ ev_io *w, int revents)
2453{ 2984{
2454 char buf [EV_INOTIFY_BUFSIZE]; 2985 char buf [EV_INOTIFY_BUFSIZE];
2455 struct inotify_event *ev = (struct inotify_event *)buf;
2456 int ofs; 2986 int ofs;
2457 int len = read (fs_fd, buf, sizeof (buf)); 2987 int len = read (fs_fd, buf, sizeof (buf));
2458 2988
2459 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);
2460 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 }
2461} 2995}
2462 2996
2463void 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
2464infy_init (EV_P) 3032infy_init (EV_P)
2465{ 3033{
2466 if (fs_fd != -2) 3034 if (fs_fd != -2)
2467 return; 3035 return;
2468 3036
3037 fs_fd = -1;
3038
3039 check_2625 (EV_A);
3040
2469 fs_fd = inotify_init (); 3041 fs_fd = infy_newfd ();
2470 3042
2471 if (fs_fd >= 0) 3043 if (fs_fd >= 0)
2472 { 3044 {
3045 fd_intern (fs_fd);
2473 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3046 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2474 ev_set_priority (&fs_w, EV_MAXPRI); 3047 ev_set_priority (&fs_w, EV_MAXPRI);
2475 ev_io_start (EV_A_ &fs_w); 3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
2476 } 3050 }
2477} 3051}
2478 3052
2479void inline_size 3053inline_size void
2480infy_fork (EV_P) 3054infy_fork (EV_P)
2481{ 3055{
2482 int slot; 3056 int slot;
2483 3057
2484 if (fs_fd < 0) 3058 if (fs_fd < 0)
2485 return; 3059 return;
2486 3060
3061 ev_ref (EV_A);
3062 ev_io_stop (EV_A_ &fs_w);
2487 close (fs_fd); 3063 close (fs_fd);
2488 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 }
2489 3073
2490 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3074 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2491 { 3075 {
2492 WL w_ = fs_hash [slot].head; 3076 WL w_ = fs_hash [slot].head;
2493 fs_hash [slot].head = 0; 3077 fs_hash [slot].head = 0;
… …
2500 w->wd = -1; 3084 w->wd = -1;
2501 3085
2502 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
2503 infy_add (EV_A_ w); /* re-add, no matter what */ 3087 infy_add (EV_A_ w); /* re-add, no matter what */
2504 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);
2505 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 }
2506 } 3095 }
2507
2508 } 3096 }
2509} 3097}
2510 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)
2511#endif 3105#endif
2512 3106
2513void 3107void
2514ev_stat_stat (EV_P_ ev_stat *w) 3108ev_stat_stat (EV_P_ ev_stat *w)
2515{ 3109{
… …
2522static void noinline 3116static void noinline
2523stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3117stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2524{ 3118{
2525 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3119 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2526 3120
2527 /* we copy this here each the time so that */ 3121 ev_statdata prev = w->attr;
2528 /* prev has the old value when the callback gets invoked */
2529 w->prev = w->attr;
2530 ev_stat_stat (EV_A_ w); 3122 ev_stat_stat (EV_A_ w);
2531 3123
2532 /* 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 */
2533 if ( 3125 if (
2534 w->prev.st_dev != w->attr.st_dev 3126 prev.st_dev != w->attr.st_dev
2535 || w->prev.st_ino != w->attr.st_ino 3127 || prev.st_ino != w->attr.st_ino
2536 || w->prev.st_mode != w->attr.st_mode 3128 || prev.st_mode != w->attr.st_mode
2537 || w->prev.st_nlink != w->attr.st_nlink 3129 || prev.st_nlink != w->attr.st_nlink
2538 || w->prev.st_uid != w->attr.st_uid 3130 || prev.st_uid != w->attr.st_uid
2539 || w->prev.st_gid != w->attr.st_gid 3131 || prev.st_gid != w->attr.st_gid
2540 || w->prev.st_rdev != w->attr.st_rdev 3132 || prev.st_rdev != w->attr.st_rdev
2541 || w->prev.st_size != w->attr.st_size 3133 || prev.st_size != w->attr.st_size
2542 || w->prev.st_atime != w->attr.st_atime 3134 || prev.st_atime != w->attr.st_atime
2543 || w->prev.st_mtime != w->attr.st_mtime 3135 || prev.st_mtime != w->attr.st_mtime
2544 || w->prev.st_ctime != w->attr.st_ctime 3136 || prev.st_ctime != w->attr.st_ctime
2545 ) { 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
2546 #if EV_USE_INOTIFY 3143 #if EV_USE_INOTIFY
3144 if (fs_fd >= 0)
3145 {
2547 infy_del (EV_A_ w); 3146 infy_del (EV_A_ w);
2548 infy_add (EV_A_ w); 3147 infy_add (EV_A_ w);
2549 ev_stat_stat (EV_A_ w); /* avoid race... */ 3148 ev_stat_stat (EV_A_ w); /* avoid race... */
3149 }
2550 #endif 3150 #endif
2551 3151
2552 ev_feed_event (EV_A_ w, EV_STAT); 3152 ev_feed_event (EV_A_ w, EV_STAT);
2553 } 3153 }
2554} 3154}
… …
2557ev_stat_start (EV_P_ ev_stat *w) 3157ev_stat_start (EV_P_ ev_stat *w)
2558{ 3158{
2559 if (expect_false (ev_is_active (w))) 3159 if (expect_false (ev_is_active (w)))
2560 return; 3160 return;
2561 3161
2562 /* since we use memcmp, we need to clear any padding data etc. */
2563 memset (&w->prev, 0, sizeof (ev_statdata));
2564 memset (&w->attr, 0, sizeof (ev_statdata));
2565
2566 ev_stat_stat (EV_A_ w); 3162 ev_stat_stat (EV_A_ w);
2567 3163
3164 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2568 if (w->interval < MIN_STAT_INTERVAL) 3165 w->interval = MIN_STAT_INTERVAL;
2569 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2570 3166
2571 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);
2572 ev_set_priority (&w->timer, ev_priority (w)); 3168 ev_set_priority (&w->timer, ev_priority (w));
2573 3169
2574#if EV_USE_INOTIFY 3170#if EV_USE_INOTIFY
2575 infy_init (EV_A); 3171 infy_init (EV_A);
2576 3172
2577 if (fs_fd >= 0) 3173 if (fs_fd >= 0)
2578 infy_add (EV_A_ w); 3174 infy_add (EV_A_ w);
2579 else 3175 else
2580#endif 3176#endif
3177 {
2581 ev_timer_start (EV_A_ &w->timer); 3178 ev_timer_again (EV_A_ &w->timer);
3179 ev_unref (EV_A);
3180 }
2582 3181
2583 ev_start (EV_A_ (W)w, 1); 3182 ev_start (EV_A_ (W)w, 1);
2584 3183
2585 EV_FREQUENT_CHECK; 3184 EV_FREQUENT_CHECK;
2586} 3185}
… …
2595 EV_FREQUENT_CHECK; 3194 EV_FREQUENT_CHECK;
2596 3195
2597#if EV_USE_INOTIFY 3196#if EV_USE_INOTIFY
2598 infy_del (EV_A_ w); 3197 infy_del (EV_A_ w);
2599#endif 3198#endif
3199
3200 if (ev_is_active (&w->timer))
3201 {
3202 ev_ref (EV_A);
2600 ev_timer_stop (EV_A_ &w->timer); 3203 ev_timer_stop (EV_A_ &w->timer);
3204 }
2601 3205
2602 ev_stop (EV_A_ (W)w); 3206 ev_stop (EV_A_ (W)w);
2603 3207
2604 EV_FREQUENT_CHECK; 3208 EV_FREQUENT_CHECK;
2605} 3209}
… …
2746embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3350embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2747{ 3351{
2748 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3352 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2749 3353
2750 { 3354 {
2751 struct ev_loop *loop = w->other; 3355 EV_P = w->other;
2752 3356
2753 while (fdchangecnt) 3357 while (fdchangecnt)
2754 { 3358 {
2755 fd_reify (EV_A); 3359 fd_reify (EV_A);
2756 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3360 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2757 } 3361 }
2758 } 3362 }
2759} 3363}
2760 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
2761#if 0 3382#if 0
2762static void 3383static void
2763embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3384embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2764{ 3385{
2765 ev_idle_stop (EV_A_ idle); 3386 ev_idle_stop (EV_A_ idle);
… …
2771{ 3392{
2772 if (expect_false (ev_is_active (w))) 3393 if (expect_false (ev_is_active (w)))
2773 return; 3394 return;
2774 3395
2775 { 3396 {
2776 struct ev_loop *loop = w->other; 3397 EV_P = w->other;
2777 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 ()));
2778 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);
2779 } 3400 }
2780 3401
2781 EV_FREQUENT_CHECK; 3402 EV_FREQUENT_CHECK;
2782 3403
… …
2785 3406
2786 ev_prepare_init (&w->prepare, embed_prepare_cb); 3407 ev_prepare_init (&w->prepare, embed_prepare_cb);
2787 ev_set_priority (&w->prepare, EV_MINPRI); 3408 ev_set_priority (&w->prepare, EV_MINPRI);
2788 ev_prepare_start (EV_A_ &w->prepare); 3409 ev_prepare_start (EV_A_ &w->prepare);
2789 3410
3411 ev_fork_init (&w->fork, embed_fork_cb);
3412 ev_fork_start (EV_A_ &w->fork);
3413
2790 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3414 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2791 3415
2792 ev_start (EV_A_ (W)w, 1); 3416 ev_start (EV_A_ (W)w, 1);
2793 3417
2794 EV_FREQUENT_CHECK; 3418 EV_FREQUENT_CHECK;
… …
2801 if (expect_false (!ev_is_active (w))) 3425 if (expect_false (!ev_is_active (w)))
2802 return; 3426 return;
2803 3427
2804 EV_FREQUENT_CHECK; 3428 EV_FREQUENT_CHECK;
2805 3429
2806 ev_io_stop (EV_A_ &w->io); 3430 ev_io_stop (EV_A_ &w->io);
2807 ev_prepare_stop (EV_A_ &w->prepare); 3431 ev_prepare_stop (EV_A_ &w->prepare);
2808 3432 ev_fork_stop (EV_A_ &w->fork);
2809 ev_stop (EV_A_ (W)w);
2810 3433
2811 EV_FREQUENT_CHECK; 3434 EV_FREQUENT_CHECK;
2812} 3435}
2813#endif 3436#endif
2814 3437
… …
2891 3514
2892void 3515void
2893ev_async_send (EV_P_ ev_async *w) 3516ev_async_send (EV_P_ ev_async *w)
2894{ 3517{
2895 w->sent = 1; 3518 w->sent = 1;
2896 evpipe_write (EV_A_ &gotasync); 3519 evpipe_write (EV_A_ &async_pending);
2897} 3520}
2898#endif 3521#endif
2899 3522
2900/*****************************************************************************/ 3523/*****************************************************************************/
2901 3524
… …
2911once_cb (EV_P_ struct ev_once *once, int revents) 3534once_cb (EV_P_ struct ev_once *once, int revents)
2912{ 3535{
2913 void (*cb)(int revents, void *arg) = once->cb; 3536 void (*cb)(int revents, void *arg) = once->cb;
2914 void *arg = once->arg; 3537 void *arg = once->arg;
2915 3538
2916 ev_io_stop (EV_A_ &once->io); 3539 ev_io_stop (EV_A_ &once->io);
2917 ev_timer_stop (EV_A_ &once->to); 3540 ev_timer_stop (EV_A_ &once->to);
2918 ev_free (once); 3541 ev_free (once);
2919 3542
2920 cb (revents, arg); 3543 cb (revents, arg);
2921} 3544}
2922 3545
2923static void 3546static void
2924once_cb_io (EV_P_ ev_io *w, int revents) 3547once_cb_io (EV_P_ ev_io *w, int revents)
2925{ 3548{
2926 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));
2927} 3552}
2928 3553
2929static void 3554static void
2930once_cb_to (EV_P_ ev_timer *w, int revents) 3555once_cb_to (EV_P_ ev_timer *w, int revents)
2931{ 3556{
2932 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));
2933} 3560}
2934 3561
2935void 3562void
2936ev_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)
2937{ 3564{
… …
2959 ev_timer_set (&once->to, timeout, 0.); 3586 ev_timer_set (&once->to, timeout, 0.);
2960 ev_timer_start (EV_A_ &once->to); 3587 ev_timer_start (EV_A_ &once->to);
2961 } 3588 }
2962} 3589}
2963 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
2964#if EV_MULTIPLICITY 3699#if EV_MULTIPLICITY
2965 #include "ev_wrap.h" 3700 #include "ev_wrap.h"
2966#endif 3701#endif
2967 3702
2968#ifdef __cplusplus 3703#ifdef __cplusplus

Diff Legend

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