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.325 by root, Sun Jan 24 12:31:55 2010 UTC

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

Diff Legend

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