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

Comparing libev/ev.c (file contents):
Revision 1.264 by root, Mon Oct 13 23:20:12 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
… …
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
… …
164# endif 187# endif
165#endif 188#endif
166 189
167/* 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 */
168 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
169#ifndef EV_USE_MONOTONIC 227#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 229# define EV_USE_MONOTONIC 1
172# else 230# else
173# define EV_USE_MONOTONIC 0 231# define EV_USE_MONOTONIC 0
174# endif 232# endif
175#endif 233#endif
176 234
177#ifndef EV_USE_REALTIME 235#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 237#endif
180 238
181#ifndef EV_USE_NANOSLEEP 239#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 240# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 241# define EV_USE_NANOSLEEP 1
… …
244# else 302# else
245# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
246# endif 304# endif
247#endif 305#endif
248 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
249#if 0 /* debugging */ 315#if 0 /* debugging */
250# define EV_VERIFY 3 316# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 317# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 318# define EV_HEAP_CACHE_AT 1
253#endif 319#endif
… …
262 328
263#ifndef EV_HEAP_CACHE_AT 329#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 330# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 331#endif
266 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
267/* 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
268 354
269#ifndef CLOCK_MONOTONIC 355#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 356# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 357# define EV_USE_MONOTONIC 0
272#endif 358#endif
… …
287# endif 373# endif
288#endif 374#endif
289 375
290#if EV_USE_INOTIFY 376#if EV_USE_INOTIFY
291# include <sys/utsname.h> 377# include <sys/utsname.h>
378# include <sys/statfs.h>
292# include <sys/inotify.h> 379# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 380/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 381# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 382# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 383# define EV_USE_INOTIFY 0
… …
302#endif 389#endif
303 390
304#if EV_USE_EVENTFD 391#if EV_USE_EVENTFD
305/* 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 */
306# 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
307# ifdef __cplusplus 404# ifdef __cplusplus
308extern "C" { 405extern "C" {
309# endif 406# endif
310int eventfd (unsigned int initval, int flags); 407int eventfd (unsigned int initval, int flags);
311# ifdef __cplusplus 408# ifdef __cplusplus
312} 409}
313# endif 410# endif
314#endif 411#endif
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
315 441
316/**/ 442/**/
317 443
318#if EV_VERIFY >= 3 444#if EV_VERIFY >= 3
319# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 445# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
331 */ 457 */
332#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 458#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
333 459
334#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) */
335#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) */
336/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
337 462
338#if __GNUC__ >= 4 463#if __GNUC__ >= 4
339# define expect(expr,value) __builtin_expect ((expr),(value)) 464# define expect(expr,value) __builtin_expect ((expr),(value))
340# define noinline __attribute__ ((noinline)) 465# define noinline __attribute__ ((noinline))
341#else 466#else
… …
354# define inline_speed static noinline 479# define inline_speed static noinline
355#else 480#else
356# define inline_speed static inline 481# define inline_speed static inline
357#endif 482#endif
358 483
359#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
360#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 489# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
490#endif
361 491
362#define EMPTY /* required for microsofts broken pseudo-c compiler */ 492#define EMPTY /* required for microsofts broken pseudo-c compiler */
363#define EMPTY2(a,b) /* used to suppress some warnings */ 493#define EMPTY2(a,b) /* used to suppress some warnings */
364 494
365typedef ev_watcher *W; 495typedef ev_watcher *W;
… …
367typedef ev_watcher_time *WT; 497typedef ev_watcher_time *WT;
368 498
369#define ev_active(w) ((W)(w))->active 499#define ev_active(w) ((W)(w))->active
370#define ev_at(w) ((WT)(w))->at 500#define ev_at(w) ((WT)(w))->at
371 501
372#if EV_USE_MONOTONIC 502#if EV_USE_REALTIME
373/* 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 */
374/* 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
375static 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)
376#endif 520#endif
377 521
378#ifdef _WIN32 522#ifdef _WIN32
379# include "ev_win32.c" 523# include "ev_win32.c"
380#endif 524#endif
… …
388{ 532{
389 syserr_cb = cb; 533 syserr_cb = cb;
390} 534}
391 535
392static void noinline 536static void noinline
393syserr (const char *msg) 537ev_syserr (const char *msg)
394{ 538{
395 if (!msg) 539 if (!msg)
396 msg = "(libev) system error"; 540 msg = "(libev) system error";
397 541
398 if (syserr_cb) 542 if (syserr_cb)
… …
444#define ev_malloc(size) ev_realloc (0, (size)) 588#define ev_malloc(size) ev_realloc (0, (size))
445#define ev_free(ptr) ev_realloc ((ptr), 0) 589#define ev_free(ptr) ev_realloc ((ptr), 0)
446 590
447/*****************************************************************************/ 591/*****************************************************************************/
448 592
593/* set in reify when reification needed */
594#define EV_ANFD_REIFY 1
595
596/* file descriptor info structure */
449typedef struct 597typedef struct
450{ 598{
451 WL head; 599 WL head;
452 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 */
453 unsigned char reify; 603 unsigned char unused;
604#if EV_USE_EPOLL
605 unsigned int egen; /* generation counter to counter epoll bugs */
606#endif
454#if EV_SELECT_IS_WINSOCKET 607#if EV_SELECT_IS_WINSOCKET
455 SOCKET handle; 608 SOCKET handle;
456#endif 609#endif
457} ANFD; 610} ANFD;
458 611
612/* stores the pending event set for a given watcher */
459typedef struct 613typedef struct
460{ 614{
461 W w; 615 W w;
462 int events; 616 int events; /* the pending event set for the given watcher */
463} ANPENDING; 617} ANPENDING;
464 618
465#if EV_USE_INOTIFY 619#if EV_USE_INOTIFY
466/* hash table entry per inotify-id */ 620/* hash table entry per inotify-id */
467typedef struct 621typedef struct
… …
470} ANFS; 624} ANFS;
471#endif 625#endif
472 626
473/* Heap Entry */ 627/* Heap Entry */
474#if EV_HEAP_CACHE_AT 628#if EV_HEAP_CACHE_AT
629 /* a heap element */
475 typedef struct { 630 typedef struct {
476 ev_tstamp at; 631 ev_tstamp at;
477 WT w; 632 WT w;
478 } ANHE; 633 } ANHE;
479 634
480 #define ANHE_w(he) (he).w /* access watcher, read-write */ 635 #define ANHE_w(he) (he).w /* access watcher, read-write */
481 #define ANHE_at(he) (he).at /* access cached at, read-only */ 636 #define ANHE_at(he) (he).at /* access cached at, read-only */
482 #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 */
483#else 638#else
639 /* a heap element */
484 typedef WT ANHE; 640 typedef WT ANHE;
485 641
486 #define ANHE_w(he) (he) 642 #define ANHE_w(he) (he)
487 #define ANHE_at(he) (he)->at 643 #define ANHE_at(he) (he)->at
488 #define ANHE_at_cache(he) 644 #define ANHE_at_cache(he)
… …
512 668
513 static int ev_default_loop_ptr; 669 static int ev_default_loop_ptr;
514 670
515#endif 671#endif
516 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
517/*****************************************************************************/ 685/*****************************************************************************/
518 686
687#ifndef EV_HAVE_EV_TIME
519ev_tstamp 688ev_tstamp
520ev_time (void) 689ev_time (void)
521{ 690{
522#if EV_USE_REALTIME 691#if EV_USE_REALTIME
692 if (expect_true (have_realtime))
693 {
523 struct timespec ts; 694 struct timespec ts;
524 clock_gettime (CLOCK_REALTIME, &ts); 695 clock_gettime (CLOCK_REALTIME, &ts);
525 return ts.tv_sec + ts.tv_nsec * 1e-9; 696 return ts.tv_sec + ts.tv_nsec * 1e-9;
526#else 697 }
698#endif
699
527 struct timeval tv; 700 struct timeval tv;
528 gettimeofday (&tv, 0); 701 gettimeofday (&tv, 0);
529 return tv.tv_sec + tv.tv_usec * 1e-6; 702 return tv.tv_sec + tv.tv_usec * 1e-6;
530#endif
531} 703}
704#endif
532 705
533ev_tstamp inline_size 706inline_size ev_tstamp
534get_clock (void) 707get_clock (void)
535{ 708{
536#if EV_USE_MONOTONIC 709#if EV_USE_MONOTONIC
537 if (expect_true (have_monotonic)) 710 if (expect_true (have_monotonic))
538 { 711 {
… …
572 745
573 tv.tv_sec = (time_t)delay; 746 tv.tv_sec = (time_t)delay;
574 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 747 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
575 748
576 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 749 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
577 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 750 /* something not guaranteed by newer posix versions, but guaranteed */
578 /* by older ones */ 751 /* by older ones */
579 select (0, 0, 0, 0, &tv); 752 select (0, 0, 0, 0, &tv);
580#endif 753#endif
581 } 754 }
582} 755}
583 756
584/*****************************************************************************/ 757/*****************************************************************************/
585 758
586#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 */
587 760
588int 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
589array_nextsize (int elem, int cur, int cnt) 764array_nextsize (int elem, int cur, int cnt)
590{ 765{
591 int ncur = cur + 1; 766 int ncur = cur + 1;
592 767
593 do 768 do
… …
610array_realloc (int elem, void *base, int *cur, int cnt) 785array_realloc (int elem, void *base, int *cur, int cnt)
611{ 786{
612 *cur = array_nextsize (elem, *cur, cnt); 787 *cur = array_nextsize (elem, *cur, cnt);
613 return ev_realloc (base, elem * *cur); 788 return ev_realloc (base, elem * *cur);
614} 789}
790
791#define array_init_zero(base,count) \
792 memset ((void *)(base), 0, sizeof (*(base)) * (count))
615 793
616#define array_needsize(type,base,cur,cnt,init) \ 794#define array_needsize(type,base,cur,cnt,init) \
617 if (expect_false ((cnt) > (cur))) \ 795 if (expect_false ((cnt) > (cur))) \
618 { \ 796 { \
619 int ocur_ = (cur); \ 797 int ocur_ = (cur); \
… …
631 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 809 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
632 } 810 }
633#endif 811#endif
634 812
635#define array_free(stem, idx) \ 813#define array_free(stem, idx) \
636 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
637 815
638/*****************************************************************************/ 816/*****************************************************************************/
817
818/* dummy callback for pending events */
819static void noinline
820pendingcb (EV_P_ ev_prepare *w, int revents)
821{
822}
639 823
640void noinline 824void noinline
641ev_feed_event (EV_P_ void *w, int revents) 825ev_feed_event (EV_P_ void *w, int revents)
642{ 826{
643 W w_ = (W)w; 827 W w_ = (W)w;
… …
652 pendings [pri][w_->pending - 1].w = w_; 836 pendings [pri][w_->pending - 1].w = w_;
653 pendings [pri][w_->pending - 1].events = revents; 837 pendings [pri][w_->pending - 1].events = revents;
654 } 838 }
655} 839}
656 840
657void 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
658queue_events (EV_P_ W *events, int eventcnt, int type) 857queue_events (EV_P_ W *events, int eventcnt, int type)
659{ 858{
660 int i; 859 int i;
661 860
662 for (i = 0; i < eventcnt; ++i) 861 for (i = 0; i < eventcnt; ++i)
663 ev_feed_event (EV_A_ events [i], type); 862 ev_feed_event (EV_A_ events [i], type);
664} 863}
665 864
666/*****************************************************************************/ 865/*****************************************************************************/
667 866
668void inline_size 867inline_speed void
669anfds_init (ANFD *base, int count)
670{
671 while (count--)
672 {
673 base->head = 0;
674 base->events = EV_NONE;
675 base->reify = 0;
676
677 ++base;
678 }
679}
680
681void inline_speed
682fd_event (EV_P_ int fd, int revents) 868fd_event_nc (EV_P_ int fd, int revents)
683{ 869{
684 ANFD *anfd = anfds + fd; 870 ANFD *anfd = anfds + fd;
685 ev_io *w; 871 ev_io *w;
686 872
687 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)
… …
691 if (ev) 877 if (ev)
692 ev_feed_event (EV_A_ (W)w, ev); 878 ev_feed_event (EV_A_ (W)w, ev);
693 } 879 }
694} 880}
695 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
696void 893void
697ev_feed_fd_event (EV_P_ int fd, int revents) 894ev_feed_fd_event (EV_P_ int fd, int revents)
698{ 895{
699 if (fd >= 0 && fd < anfdmax) 896 if (fd >= 0 && fd < anfdmax)
700 fd_event (EV_A_ fd, revents); 897 fd_event_nc (EV_A_ fd, revents);
701} 898}
702 899
703void inline_size 900/* make sure the external fd watch events are in-sync */
901/* with the kernel/libev internal state */
902inline_size void
704fd_reify (EV_P) 903fd_reify (EV_P)
705{ 904{
706 int i; 905 int i;
707 906
708 for (i = 0; i < fdchangecnt; ++i) 907 for (i = 0; i < fdchangecnt; ++i)
… …
718 917
719#if EV_SELECT_IS_WINSOCKET 918#if EV_SELECT_IS_WINSOCKET
720 if (events) 919 if (events)
721 { 920 {
722 unsigned long arg; 921 unsigned long arg;
723 #ifdef EV_FD_TO_WIN32_HANDLE
724 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 922 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
725 #else
726 anfd->handle = _get_osfhandle (fd);
727 #endif
728 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 923 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
729 } 924 }
730#endif 925#endif
731 926
732 { 927 {
733 unsigned char o_events = anfd->events; 928 unsigned char o_events = anfd->events;
734 unsigned char o_reify = anfd->reify; 929 unsigned char o_reify = anfd->reify;
735 930
736 anfd->reify = 0; 931 anfd->reify = 0;
737 anfd->events = events; 932 anfd->events = events;
738 933
739 if (o_events != events || o_reify & EV_IOFDSET) 934 if (o_events != events || o_reify & EV__IOFDSET)
740 backend_modify (EV_A_ fd, o_events, events); 935 backend_modify (EV_A_ fd, o_events, events);
741 } 936 }
742 } 937 }
743 938
744 fdchangecnt = 0; 939 fdchangecnt = 0;
745} 940}
746 941
747void inline_size 942/* something about the given fd changed */
943inline_size void
748fd_change (EV_P_ int fd, int flags) 944fd_change (EV_P_ int fd, int flags)
749{ 945{
750 unsigned char reify = anfds [fd].reify; 946 unsigned char reify = anfds [fd].reify;
751 anfds [fd].reify |= flags; 947 anfds [fd].reify |= flags;
752 948
… …
756 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 952 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
757 fdchanges [fdchangecnt - 1] = fd; 953 fdchanges [fdchangecnt - 1] = fd;
758 } 954 }
759} 955}
760 956
761void inline_speed 957/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
958inline_speed void
762fd_kill (EV_P_ int fd) 959fd_kill (EV_P_ int fd)
763{ 960{
764 ev_io *w; 961 ev_io *w;
765 962
766 while ((w = (ev_io *)anfds [fd].head)) 963 while ((w = (ev_io *)anfds [fd].head))
… …
768 ev_io_stop (EV_A_ w); 965 ev_io_stop (EV_A_ w);
769 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);
770 } 967 }
771} 968}
772 969
773int inline_size 970/* check whether the given fd is atcually valid, for error recovery */
971inline_size int
774fd_valid (int fd) 972fd_valid (int fd)
775{ 973{
776#ifdef _WIN32 974#ifdef _WIN32
777 return _get_osfhandle (fd) != -1; 975 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
778#else 976#else
779 return fcntl (fd, F_GETFD) != -1; 977 return fcntl (fd, F_GETFD) != -1;
780#endif 978#endif
781} 979}
782 980
… …
800 998
801 for (fd = anfdmax; fd--; ) 999 for (fd = anfdmax; fd--; )
802 if (anfds [fd].events) 1000 if (anfds [fd].events)
803 { 1001 {
804 fd_kill (EV_A_ fd); 1002 fd_kill (EV_A_ fd);
805 return; 1003 break;
806 } 1004 }
807} 1005}
808 1006
809/* 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 */
810static void noinline 1008static void noinline
… …
814 1012
815 for (fd = 0; fd < anfdmax; ++fd) 1013 for (fd = 0; fd < anfdmax; ++fd)
816 if (anfds [fd].events) 1014 if (anfds [fd].events)
817 { 1015 {
818 anfds [fd].events = 0; 1016 anfds [fd].events = 0;
1017 anfds [fd].emask = 0;
819 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1018 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
820 } 1019 }
821} 1020}
822 1021
823/*****************************************************************************/ 1022/*****************************************************************************/
824 1023
… …
840#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1039#define HEAP0 (DHEAP - 1) /* index of first element in heap */
841#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1040#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
842#define UPHEAP_DONE(p,k) ((p) == (k)) 1041#define UPHEAP_DONE(p,k) ((p) == (k))
843 1042
844/* away from the root */ 1043/* away from the root */
845void inline_speed 1044inline_speed void
846downheap (ANHE *heap, int N, int k) 1045downheap (ANHE *heap, int N, int k)
847{ 1046{
848 ANHE he = heap [k]; 1047 ANHE he = heap [k];
849 ANHE *E = heap + N + HEAP0; 1048 ANHE *E = heap + N + HEAP0;
850 1049
… …
890#define HEAP0 1 1089#define HEAP0 1
891#define HPARENT(k) ((k) >> 1) 1090#define HPARENT(k) ((k) >> 1)
892#define UPHEAP_DONE(p,k) (!(p)) 1091#define UPHEAP_DONE(p,k) (!(p))
893 1092
894/* away from the root */ 1093/* away from the root */
895void inline_speed 1094inline_speed void
896downheap (ANHE *heap, int N, int k) 1095downheap (ANHE *heap, int N, int k)
897{ 1096{
898 ANHE he = heap [k]; 1097 ANHE he = heap [k];
899 1098
900 for (;;) 1099 for (;;)
901 { 1100 {
902 int c = k << 1; 1101 int c = k << 1;
903 1102
904 if (c > N + HEAP0 - 1) 1103 if (c >= N + HEAP0)
905 break; 1104 break;
906 1105
907 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])
908 ? 1 : 0; 1107 ? 1 : 0;
909 1108
… …
920 ev_active (ANHE_w (he)) = k; 1119 ev_active (ANHE_w (he)) = k;
921} 1120}
922#endif 1121#endif
923 1122
924/* towards the root */ 1123/* towards the root */
925void inline_speed 1124inline_speed void
926upheap (ANHE *heap, int k) 1125upheap (ANHE *heap, int k)
927{ 1126{
928 ANHE he = heap [k]; 1127 ANHE he = heap [k];
929 1128
930 for (;;) 1129 for (;;)
… …
941 1140
942 heap [k] = he; 1141 heap [k] = he;
943 ev_active (ANHE_w (he)) = k; 1142 ev_active (ANHE_w (he)) = k;
944} 1143}
945 1144
946void inline_size 1145/* move an element suitably so it is in a correct place */
1146inline_size void
947adjustheap (ANHE *heap, int N, int k) 1147adjustheap (ANHE *heap, int N, int k)
948{ 1148{
949 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)]))
950 upheap (heap, k); 1150 upheap (heap, k);
951 else 1151 else
952 downheap (heap, N, k); 1152 downheap (heap, N, k);
953} 1153}
954 1154
955/* 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 */
956void inline_size 1156inline_size void
957reheap (ANHE *heap, int N) 1157reheap (ANHE *heap, int N)
958{ 1158{
959 int i; 1159 int i;
960 1160
961 /* 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 */
… …
964 upheap (heap, i + HEAP0); 1164 upheap (heap, i + HEAP0);
965} 1165}
966 1166
967/*****************************************************************************/ 1167/*****************************************************************************/
968 1168
1169/* associate signal watchers to a signal signal */
969typedef struct 1170typedef struct
970{ 1171{
1172 EV_ATOMIC_T pending;
1173#if EV_MULTIPLICITY
1174 EV_P;
1175#endif
971 WL head; 1176 WL head;
972 EV_ATOMIC_T gotsig;
973} ANSIG; 1177} ANSIG;
974 1178
975static ANSIG *signals; 1179static ANSIG signals [EV_NSIG - 1];
976static int signalmax;
977
978static EV_ATOMIC_T gotsig;
979
980void inline_size
981signals_init (ANSIG *base, int count)
982{
983 while (count--)
984 {
985 base->head = 0;
986 base->gotsig = 0;
987
988 ++base;
989 }
990}
991 1180
992/*****************************************************************************/ 1181/*****************************************************************************/
993 1182
994void inline_speed 1183/* used to prepare libev internal fd's */
1184/* this is not fork-safe */
1185inline_speed void
995fd_intern (int fd) 1186fd_intern (int fd)
996{ 1187{
997#ifdef _WIN32 1188#ifdef _WIN32
998 unsigned long arg = 1; 1189 unsigned long arg = 1;
999 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1190 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1000#else 1191#else
1001 fcntl (fd, F_SETFD, FD_CLOEXEC); 1192 fcntl (fd, F_SETFD, FD_CLOEXEC);
1002 fcntl (fd, F_SETFL, O_NONBLOCK); 1193 fcntl (fd, F_SETFL, O_NONBLOCK);
1003#endif 1194#endif
1004} 1195}
1005 1196
1006static void noinline 1197static void noinline
1007evpipe_init (EV_P) 1198evpipe_init (EV_P)
1008{ 1199{
1009 if (!ev_is_active (&pipeev)) 1200 if (!ev_is_active (&pipe_w))
1010 { 1201 {
1011#if EV_USE_EVENTFD 1202#if EV_USE_EVENTFD
1203 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1204 if (evfd < 0 && errno == EINVAL)
1012 if ((evfd = eventfd (0, 0)) >= 0) 1205 evfd = eventfd (0, 0);
1206
1207 if (evfd >= 0)
1013 { 1208 {
1014 evpipe [0] = -1; 1209 evpipe [0] = -1;
1015 fd_intern (evfd); 1210 fd_intern (evfd); /* doing it twice doesn't hurt */
1016 ev_io_set (&pipeev, evfd, EV_READ); 1211 ev_io_set (&pipe_w, evfd, EV_READ);
1017 } 1212 }
1018 else 1213 else
1019#endif 1214#endif
1020 { 1215 {
1021 while (pipe (evpipe)) 1216 while (pipe (evpipe))
1022 syserr ("(libev) error creating signal/async pipe"); 1217 ev_syserr ("(libev) error creating signal/async pipe");
1023 1218
1024 fd_intern (evpipe [0]); 1219 fd_intern (evpipe [0]);
1025 fd_intern (evpipe [1]); 1220 fd_intern (evpipe [1]);
1026 ev_io_set (&pipeev, evpipe [0], EV_READ); 1221 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1027 } 1222 }
1028 1223
1029 ev_io_start (EV_A_ &pipeev); 1224 ev_io_start (EV_A_ &pipe_w);
1030 ev_unref (EV_A); /* watcher should not keep loop alive */ 1225 ev_unref (EV_A); /* watcher should not keep loop alive */
1031 } 1226 }
1032} 1227}
1033 1228
1034void inline_size 1229inline_size void
1035evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1230evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1036{ 1231{
1037 if (!*flag) 1232 if (!*flag)
1038 { 1233 {
1039 int old_errno = errno; /* save errno because write might clobber it */ 1234 int old_errno = errno; /* save errno because write might clobber it */
… …
1052 1247
1053 errno = old_errno; 1248 errno = old_errno;
1054 } 1249 }
1055} 1250}
1056 1251
1252/* called whenever the libev signal pipe */
1253/* got some events (signal, async) */
1057static void 1254static void
1058pipecb (EV_P_ ev_io *iow, int revents) 1255pipecb (EV_P_ ev_io *iow, int revents)
1059{ 1256{
1257 int i;
1258
1060#if EV_USE_EVENTFD 1259#if EV_USE_EVENTFD
1061 if (evfd >= 0) 1260 if (evfd >= 0)
1062 { 1261 {
1063 uint64_t counter; 1262 uint64_t counter;
1064 read (evfd, &counter, sizeof (uint64_t)); 1263 read (evfd, &counter, sizeof (uint64_t));
… …
1068 { 1267 {
1069 char dummy; 1268 char dummy;
1070 read (evpipe [0], &dummy, 1); 1269 read (evpipe [0], &dummy, 1);
1071 } 1270 }
1072 1271
1073 if (gotsig && ev_is_default_loop (EV_A)) 1272 if (sig_pending)
1074 { 1273 {
1075 int signum; 1274 sig_pending = 0;
1076 gotsig = 0;
1077 1275
1078 for (signum = signalmax; signum--; ) 1276 for (i = EV_NSIG - 1; i--; )
1079 if (signals [signum].gotsig) 1277 if (expect_false (signals [i].pending))
1080 ev_feed_signal_event (EV_A_ signum + 1); 1278 ev_feed_signal_event (EV_A_ i + 1);
1081 } 1279 }
1082 1280
1083#if EV_ASYNC_ENABLE 1281#if EV_ASYNC_ENABLE
1084 if (gotasync) 1282 if (async_pending)
1085 { 1283 {
1086 int i; 1284 async_pending = 0;
1087 gotasync = 0;
1088 1285
1089 for (i = asynccnt; i--; ) 1286 for (i = asynccnt; i--; )
1090 if (asyncs [i]->sent) 1287 if (asyncs [i]->sent)
1091 { 1288 {
1092 asyncs [i]->sent = 0; 1289 asyncs [i]->sent = 0;
… …
1100 1297
1101static void 1298static void
1102ev_sighandler (int signum) 1299ev_sighandler (int signum)
1103{ 1300{
1104#if EV_MULTIPLICITY 1301#if EV_MULTIPLICITY
1105 struct ev_loop *loop = &default_loop_struct; 1302 EV_P = signals [signum - 1].loop;
1106#endif 1303#endif
1107 1304
1108#if _WIN32 1305#ifdef _WIN32
1109 signal (signum, ev_sighandler); 1306 signal (signum, ev_sighandler);
1110#endif 1307#endif
1111 1308
1112 signals [signum - 1].gotsig = 1; 1309 signals [signum - 1].pending = 1;
1113 evpipe_write (EV_A_ &gotsig); 1310 evpipe_write (EV_A_ &sig_pending);
1114} 1311}
1115 1312
1116void noinline 1313void noinline
1117ev_feed_signal_event (EV_P_ int signum) 1314ev_feed_signal_event (EV_P_ int signum)
1118{ 1315{
1119 WL w; 1316 WL w;
1120 1317
1318 if (expect_false (signum <= 0 || signum > EV_NSIG))
1319 return;
1320
1321 --signum;
1322
1121#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1122 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 */
1123#endif 1325 /* or, likely more useful, feeding a signal nobody is waiting for */
1124 1326
1125 --signum; 1327 if (expect_false (signals [signum].loop != EV_A))
1126
1127 if (signum < 0 || signum >= signalmax)
1128 return; 1328 return;
1329#endif
1129 1330
1130 signals [signum].gotsig = 0; 1331 signals [signum].pending = 0;
1131 1332
1132 for (w = signals [signum].head; w; w = w->next) 1333 for (w = signals [signum].head; w; w = w->next)
1133 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1334 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1134} 1335}
1135 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
1136/*****************************************************************************/ 1357/*****************************************************************************/
1137 1358
1138static WL childs [EV_PID_HASHSIZE]; 1359static WL childs [EV_PID_HASHSIZE];
1139 1360
1140#ifndef _WIN32 1361#ifndef _WIN32
… …
1143 1364
1144#ifndef WIFCONTINUED 1365#ifndef WIFCONTINUED
1145# define WIFCONTINUED(status) 0 1366# define WIFCONTINUED(status) 0
1146#endif 1367#endif
1147 1368
1148void inline_speed 1369/* handle a single child status event */
1370inline_speed void
1149child_reap (EV_P_ int chain, int pid, int status) 1371child_reap (EV_P_ int chain, int pid, int status)
1150{ 1372{
1151 ev_child *w; 1373 ev_child *w;
1152 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1374 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1153 1375
… …
1166 1388
1167#ifndef WCONTINUED 1389#ifndef WCONTINUED
1168# define WCONTINUED 0 1390# define WCONTINUED 0
1169#endif 1391#endif
1170 1392
1393/* called on sigchld etc., calls waitpid */
1171static void 1394static void
1172childcb (EV_P_ ev_signal *sw, int revents) 1395childcb (EV_P_ ev_signal *sw, int revents)
1173{ 1396{
1174 int pid, status; 1397 int pid, status;
1175 1398
… …
1256 /* kqueue is borked on everything but netbsd apparently */ 1479 /* kqueue is borked on everything but netbsd apparently */
1257 /* 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 */
1258 flags &= ~EVBACKEND_KQUEUE; 1481 flags &= ~EVBACKEND_KQUEUE;
1259#endif 1482#endif
1260#ifdef __APPLE__ 1483#ifdef __APPLE__
1261 // flags &= ~EVBACKEND_KQUEUE; for documentation 1484 /* only select works correctly on that "unix-certified" platform */
1262 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 */
1263#endif 1487#endif
1264 1488
1265 return flags; 1489 return flags;
1266} 1490}
1267 1491
… …
1281ev_backend (EV_P) 1505ev_backend (EV_P)
1282{ 1506{
1283 return backend; 1507 return backend;
1284} 1508}
1285 1509
1510#if EV_MINIMAL < 2
1286unsigned int 1511unsigned int
1287ev_loop_count (EV_P) 1512ev_loop_count (EV_P)
1288{ 1513{
1289 return loop_count; 1514 return loop_count;
1290} 1515}
1291 1516
1517unsigned int
1518ev_loop_depth (EV_P)
1519{
1520 return loop_depth;
1521}
1522
1292void 1523void
1293ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1294{ 1525{
1295 io_blocktime = interval; 1526 io_blocktime = interval;
1296} 1527}
… …
1299ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1530ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1300{ 1531{
1301 timeout_blocktime = interval; 1532 timeout_blocktime = interval;
1302} 1533}
1303 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 */
1304static void noinline 1560static void noinline
1305loop_init (EV_P_ unsigned int flags) 1561loop_init (EV_P_ unsigned int flags)
1306{ 1562{
1307 if (!backend) 1563 if (!backend)
1308 { 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
1309#if EV_USE_MONOTONIC 1575#if EV_USE_MONOTONIC
1576 if (!have_monotonic)
1310 { 1577 {
1311 struct timespec ts; 1578 struct timespec ts;
1579
1312 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1580 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1313 have_monotonic = 1; 1581 have_monotonic = 1;
1314 } 1582 }
1315#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"));
1316 1595
1317 ev_rt_now = ev_time (); 1596 ev_rt_now = ev_time ();
1318 mn_now = get_clock (); 1597 mn_now = get_clock ();
1319 now_floor = mn_now; 1598 now_floor = mn_now;
1320 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
1321 1603
1322 io_blocktime = 0.; 1604 io_blocktime = 0.;
1323 timeout_blocktime = 0.; 1605 timeout_blocktime = 0.;
1324 backend = 0; 1606 backend = 0;
1325 backend_fd = -1; 1607 backend_fd = -1;
1326 gotasync = 0; 1608 sig_pending = 0;
1609#if EV_ASYNC_ENABLE
1610 async_pending = 0;
1611#endif
1327#if EV_USE_INOTIFY 1612#if EV_USE_INOTIFY
1328 fs_fd = -2; 1613 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1329#endif 1614#endif
1330 1615#if EV_USE_SIGNALFD
1331 /* pid check not overridable via env */ 1616 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1332#ifndef _WIN32
1333 if (flags & EVFLAG_FORKCHECK)
1334 curpid = getpid ();
1335#endif 1617#endif
1336
1337 if (!(flags & EVFLAG_NOENV)
1338 && !enable_secure ()
1339 && getenv ("LIBEV_FLAGS"))
1340 flags = atoi (getenv ("LIBEV_FLAGS"));
1341 1618
1342 if (!(flags & 0x0000ffffU)) 1619 if (!(flags & 0x0000ffffU))
1343 flags |= ev_recommended_backends (); 1620 flags |= ev_recommended_backends ();
1344 1621
1345#if EV_USE_PORT 1622#if EV_USE_PORT
… …
1356#endif 1633#endif
1357#if EV_USE_SELECT 1634#if EV_USE_SELECT
1358 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1635 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1359#endif 1636#endif
1360 1637
1638 ev_prepare_init (&pending_w, pendingcb);
1639
1361 ev_init (&pipeev, pipecb); 1640 ev_init (&pipe_w, pipecb);
1362 ev_set_priority (&pipeev, EV_MAXPRI); 1641 ev_set_priority (&pipe_w, EV_MAXPRI);
1363 } 1642 }
1364} 1643}
1365 1644
1645/* free up a loop structure */
1366static void noinline 1646static void noinline
1367loop_destroy (EV_P) 1647loop_destroy (EV_P)
1368{ 1648{
1369 int i; 1649 int i;
1370 1650
1371 if (ev_is_active (&pipeev)) 1651 if (ev_is_active (&pipe_w))
1372 { 1652 {
1373 ev_ref (EV_A); /* signal watcher */ 1653 /*ev_ref (EV_A);*/
1374 ev_io_stop (EV_A_ &pipeev); 1654 /*ev_io_stop (EV_A_ &pipe_w);*/
1375 1655
1376#if EV_USE_EVENTFD 1656#if EV_USE_EVENTFD
1377 if (evfd >= 0) 1657 if (evfd >= 0)
1378 close (evfd); 1658 close (evfd);
1379#endif 1659#endif
1380 1660
1381 if (evpipe [0] >= 0) 1661 if (evpipe [0] >= 0)
1382 { 1662 {
1383 close (evpipe [0]); 1663 EV_WIN32_CLOSE_FD (evpipe [0]);
1384 close (evpipe [1]); 1664 EV_WIN32_CLOSE_FD (evpipe [1]);
1385 } 1665 }
1386 } 1666 }
1667
1668#if EV_USE_SIGNALFD
1669 if (ev_is_active (&sigfd_w))
1670 close (sigfd);
1671#endif
1387 1672
1388#if EV_USE_INOTIFY 1673#if EV_USE_INOTIFY
1389 if (fs_fd >= 0) 1674 if (fs_fd >= 0)
1390 close (fs_fd); 1675 close (fs_fd);
1391#endif 1676#endif
… …
1415#if EV_IDLE_ENABLE 1700#if EV_IDLE_ENABLE
1416 array_free (idle, [i]); 1701 array_free (idle, [i]);
1417#endif 1702#endif
1418 } 1703 }
1419 1704
1420 ev_free (anfds); anfdmax = 0; 1705 ev_free (anfds); anfds = 0; anfdmax = 0;
1421 1706
1422 /* 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);
1423 array_free (fdchange, EMPTY); 1709 array_free (fdchange, EMPTY);
1424 array_free (timer, EMPTY); 1710 array_free (timer, EMPTY);
1425#if EV_PERIODIC_ENABLE 1711#if EV_PERIODIC_ENABLE
1426 array_free (periodic, EMPTY); 1712 array_free (periodic, EMPTY);
1427#endif 1713#endif
… …
1436 1722
1437 backend = 0; 1723 backend = 0;
1438} 1724}
1439 1725
1440#if EV_USE_INOTIFY 1726#if EV_USE_INOTIFY
1441void inline_size infy_fork (EV_P); 1727inline_size void infy_fork (EV_P);
1442#endif 1728#endif
1443 1729
1444void inline_size 1730inline_size void
1445loop_fork (EV_P) 1731loop_fork (EV_P)
1446{ 1732{
1447#if EV_USE_PORT 1733#if EV_USE_PORT
1448 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1734 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1449#endif 1735#endif
… …
1455#endif 1741#endif
1456#if EV_USE_INOTIFY 1742#if EV_USE_INOTIFY
1457 infy_fork (EV_A); 1743 infy_fork (EV_A);
1458#endif 1744#endif
1459 1745
1460 if (ev_is_active (&pipeev)) 1746 if (ev_is_active (&pipe_w))
1461 { 1747 {
1462 /* this "locks" the handlers against writing to the pipe */ 1748 /* this "locks" the handlers against writing to the pipe */
1463 /* while we modify the fd vars */ 1749 /* while we modify the fd vars */
1464 gotsig = 1; 1750 sig_pending = 1;
1465#if EV_ASYNC_ENABLE 1751#if EV_ASYNC_ENABLE
1466 gotasync = 1; 1752 async_pending = 1;
1467#endif 1753#endif
1468 1754
1469 ev_ref (EV_A); 1755 ev_ref (EV_A);
1470 ev_io_stop (EV_A_ &pipeev); 1756 ev_io_stop (EV_A_ &pipe_w);
1471 1757
1472#if EV_USE_EVENTFD 1758#if EV_USE_EVENTFD
1473 if (evfd >= 0) 1759 if (evfd >= 0)
1474 close (evfd); 1760 close (evfd);
1475#endif 1761#endif
1476 1762
1477 if (evpipe [0] >= 0) 1763 if (evpipe [0] >= 0)
1478 { 1764 {
1479 close (evpipe [0]); 1765 EV_WIN32_CLOSE_FD (evpipe [0]);
1480 close (evpipe [1]); 1766 EV_WIN32_CLOSE_FD (evpipe [1]);
1481 } 1767 }
1482 1768
1483 evpipe_init (EV_A); 1769 evpipe_init (EV_A);
1484 /* now iterate over everything, in case we missed something */ 1770 /* now iterate over everything, in case we missed something */
1485 pipecb (EV_A_ &pipeev, EV_READ); 1771 pipecb (EV_A_ &pipe_w, EV_READ);
1486 } 1772 }
1487 1773
1488 postfork = 0; 1774 postfork = 0;
1489} 1775}
1490 1776
1491#if EV_MULTIPLICITY 1777#if EV_MULTIPLICITY
1492 1778
1493struct ev_loop * 1779struct ev_loop *
1494ev_loop_new (unsigned int flags) 1780ev_loop_new (unsigned int flags)
1495{ 1781{
1496 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));
1497 1783
1498 memset (loop, 0, sizeof (struct ev_loop)); 1784 memset (EV_A, 0, sizeof (struct ev_loop));
1499
1500 loop_init (EV_A_ flags); 1785 loop_init (EV_A_ flags);
1501 1786
1502 if (ev_backend (EV_A)) 1787 if (ev_backend (EV_A))
1503 return loop; 1788 return EV_A;
1504 1789
1505 return 0; 1790 return 0;
1506} 1791}
1507 1792
1508void 1793void
… …
1515void 1800void
1516ev_loop_fork (EV_P) 1801ev_loop_fork (EV_P)
1517{ 1802{
1518 postfork = 1; /* must be in line with ev_default_fork */ 1803 postfork = 1; /* must be in line with ev_default_fork */
1519} 1804}
1805#endif /* multiplicity */
1520 1806
1521#if EV_VERIFY 1807#if EV_VERIFY
1522static void noinline 1808static void noinline
1523verify_watcher (EV_P_ W w) 1809verify_watcher (EV_P_ W w)
1524{ 1810{
1525 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1811 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1526 1812
1527 if (w->pending) 1813 if (w->pending)
1528 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1814 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1529} 1815}
1530 1816
1531static void noinline 1817static void noinline
1532verify_heap (EV_P_ ANHE *heap, int N) 1818verify_heap (EV_P_ ANHE *heap, int N)
1533{ 1819{
1534 int i; 1820 int i;
1535 1821
1536 for (i = HEAP0; i < N + HEAP0; ++i) 1822 for (i = HEAP0; i < N + HEAP0; ++i)
1537 { 1823 {
1538 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1824 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1539 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1825 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1540 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1826 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1541 1827
1542 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1828 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1543 } 1829 }
1544} 1830}
1545 1831
1546static void noinline 1832static void noinline
1547array_verify (EV_P_ W *ws, int cnt) 1833array_verify (EV_P_ W *ws, int cnt)
1548{ 1834{
1549 while (cnt--) 1835 while (cnt--)
1550 { 1836 {
1551 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1837 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1552 verify_watcher (EV_A_ ws [cnt]); 1838 verify_watcher (EV_A_ ws [cnt]);
1553 } 1839 }
1554} 1840}
1555#endif 1841#endif
1556 1842
1843#if EV_MINIMAL < 2
1557void 1844void
1558ev_loop_verify (EV_P) 1845ev_loop_verify (EV_P)
1559{ 1846{
1560#if EV_VERIFY 1847#if EV_VERIFY
1561 int i; 1848 int i;
… …
1563 1850
1564 assert (activecnt >= -1); 1851 assert (activecnt >= -1);
1565 1852
1566 assert (fdchangemax >= fdchangecnt); 1853 assert (fdchangemax >= fdchangecnt);
1567 for (i = 0; i < fdchangecnt; ++i) 1854 for (i = 0; i < fdchangecnt; ++i)
1568 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1855 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1569 1856
1570 assert (anfdmax >= 0); 1857 assert (anfdmax >= 0);
1571 for (i = 0; i < anfdmax; ++i) 1858 for (i = 0; i < anfdmax; ++i)
1572 for (w = anfds [i].head; w; w = w->next) 1859 for (w = anfds [i].head; w; w = w->next)
1573 { 1860 {
1574 verify_watcher (EV_A_ (W)w); 1861 verify_watcher (EV_A_ (W)w);
1575 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1862 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1576 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1863 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1577 } 1864 }
1578 1865
1579 assert (timermax >= timercnt); 1866 assert (timermax >= timercnt);
1580 verify_heap (EV_A_ timers, timercnt); 1867 verify_heap (EV_A_ timers, timercnt);
1581 1868
… …
1610 assert (checkmax >= checkcnt); 1897 assert (checkmax >= checkcnt);
1611 array_verify (EV_A_ (W *)checks, checkcnt); 1898 array_verify (EV_A_ (W *)checks, checkcnt);
1612 1899
1613# if 0 1900# if 0
1614 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1901 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1615 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1902 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1616# endif
1617#endif 1903# endif
1904#endif
1618} 1905}
1619 1906#endif
1620#endif /* multiplicity */
1621 1907
1622#if EV_MULTIPLICITY 1908#if EV_MULTIPLICITY
1623struct ev_loop * 1909struct ev_loop *
1624ev_default_loop_init (unsigned int flags) 1910ev_default_loop_init (unsigned int flags)
1625#else 1911#else
… …
1628#endif 1914#endif
1629{ 1915{
1630 if (!ev_default_loop_ptr) 1916 if (!ev_default_loop_ptr)
1631 { 1917 {
1632#if EV_MULTIPLICITY 1918#if EV_MULTIPLICITY
1633 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1919 EV_P = ev_default_loop_ptr = &default_loop_struct;
1634#else 1920#else
1635 ev_default_loop_ptr = 1; 1921 ev_default_loop_ptr = 1;
1636#endif 1922#endif
1637 1923
1638 loop_init (EV_A_ flags); 1924 loop_init (EV_A_ flags);
… …
1655 1941
1656void 1942void
1657ev_default_destroy (void) 1943ev_default_destroy (void)
1658{ 1944{
1659#if EV_MULTIPLICITY 1945#if EV_MULTIPLICITY
1660 struct ev_loop *loop = ev_default_loop_ptr; 1946 EV_P = ev_default_loop_ptr;
1661#endif 1947#endif
1948
1949 ev_default_loop_ptr = 0;
1662 1950
1663#ifndef _WIN32 1951#ifndef _WIN32
1664 ev_ref (EV_A); /* child watcher */ 1952 ev_ref (EV_A); /* child watcher */
1665 ev_signal_stop (EV_A_ &childev); 1953 ev_signal_stop (EV_A_ &childev);
1666#endif 1954#endif
… …
1670 1958
1671void 1959void
1672ev_default_fork (void) 1960ev_default_fork (void)
1673{ 1961{
1674#if EV_MULTIPLICITY 1962#if EV_MULTIPLICITY
1675 struct ev_loop *loop = ev_default_loop_ptr; 1963 EV_P = ev_default_loop_ptr;
1676#endif 1964#endif
1677 1965
1678 if (backend)
1679 postfork = 1; /* must be in line with ev_loop_fork */ 1966 postfork = 1; /* must be in line with ev_loop_fork */
1680} 1967}
1681 1968
1682/*****************************************************************************/ 1969/*****************************************************************************/
1683 1970
1684void 1971void
1685ev_invoke (EV_P_ void *w, int revents) 1972ev_invoke (EV_P_ void *w, int revents)
1686{ 1973{
1687 EV_CB_INVOKE ((W)w, revents); 1974 EV_CB_INVOKE ((W)w, revents);
1688} 1975}
1689 1976
1690void inline_speed 1977unsigned int
1691call_pending (EV_P) 1978ev_pending_count (EV_P)
1979{
1980 int pri;
1981 unsigned int count = 0;
1982
1983 for (pri = NUMPRI; pri--; )
1984 count += pendingcnt [pri];
1985
1986 return count;
1987}
1988
1989void noinline
1990ev_invoke_pending (EV_P)
1692{ 1991{
1693 int pri; 1992 int pri;
1694 1993
1695 for (pri = NUMPRI; pri--; ) 1994 for (pri = NUMPRI; pri--; )
1696 while (pendingcnt [pri]) 1995 while (pendingcnt [pri])
1697 { 1996 {
1698 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1997 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1699 1998
1700 if (expect_true (p->w))
1701 {
1702 /*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 */
1703 2001
1704 p->w->pending = 0; 2002 p->w->pending = 0;
1705 EV_CB_INVOKE (p->w, p->events); 2003 EV_CB_INVOKE (p->w, p->events);
1706 EV_FREQUENT_CHECK; 2004 EV_FREQUENT_CHECK;
1707 }
1708 } 2005 }
1709} 2006}
1710 2007
1711#if EV_IDLE_ENABLE 2008#if EV_IDLE_ENABLE
1712void inline_size 2009/* make idle watchers pending. this handles the "call-idle */
2010/* only when higher priorities are idle" logic */
2011inline_size void
1713idle_reify (EV_P) 2012idle_reify (EV_P)
1714{ 2013{
1715 if (expect_false (idleall)) 2014 if (expect_false (idleall))
1716 { 2015 {
1717 int pri; 2016 int pri;
… …
1729 } 2028 }
1730 } 2029 }
1731} 2030}
1732#endif 2031#endif
1733 2032
1734void inline_size 2033/* make timers pending */
2034inline_size void
1735timers_reify (EV_P) 2035timers_reify (EV_P)
1736{ 2036{
1737 EV_FREQUENT_CHECK; 2037 EV_FREQUENT_CHECK;
1738 2038
1739 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2039 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1740 { 2040 {
1741 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2041 do
1742
1743 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1744
1745 /* first reschedule or stop timer */
1746 if (w->repeat)
1747 { 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 {
1748 ev_at (w) += w->repeat; 2050 ev_at (w) += w->repeat;
1749 if (ev_at (w) < mn_now) 2051 if (ev_at (w) < mn_now)
1750 ev_at (w) = mn_now; 2052 ev_at (w) = mn_now;
1751 2053
1752 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.));
1753 2055
1754 ANHE_at_cache (timers [HEAP0]); 2056 ANHE_at_cache (timers [HEAP0]);
1755 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);
1756 } 2064 }
1757 else 2065 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1758 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1759 2066
1760 EV_FREQUENT_CHECK;
1761 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2067 feed_reverse_done (EV_A_ EV_TIMEOUT);
1762 } 2068 }
1763} 2069}
1764 2070
1765#if EV_PERIODIC_ENABLE 2071#if EV_PERIODIC_ENABLE
1766void inline_size 2072/* make periodics pending */
2073inline_size void
1767periodics_reify (EV_P) 2074periodics_reify (EV_P)
1768{ 2075{
1769 EV_FREQUENT_CHECK; 2076 EV_FREQUENT_CHECK;
1770 2077
1771 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2078 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1772 { 2079 {
1773 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2080 int feed_count = 0;
1774 2081
1775 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2082 do
1776
1777 /* first reschedule or stop timer */
1778 if (w->reschedule_cb)
1779 { 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 {
1780 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2091 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1781 2092
1782 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));
1783 2094
1784 ANHE_at_cache (periodics [HEAP0]); 2095 ANHE_at_cache (periodics [HEAP0]);
1785 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
2120 EV_FREQUENT_CHECK;
2121 feed_reverse (EV_A_ (W)w);
1786 } 2122 }
1787 else if (w->interval) 2123 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1788 {
1789 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1790 /* if next trigger time is not sufficiently in the future, put it there */
1791 /* this might happen because of floating point inexactness */
1792 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1793 {
1794 ev_at (w) += w->interval;
1795 2124
1796 /* if interval is unreasonably low we might still have a time in the past */
1797 /* so correct this. this will make the periodic very inexact, but the user */
1798 /* has effectively asked to get triggered more often than possible */
1799 if (ev_at (w) < ev_rt_now)
1800 ev_at (w) = ev_rt_now;
1801 }
1802
1803 ANHE_at_cache (periodics [HEAP0]);
1804 downheap (periodics, periodiccnt, HEAP0);
1805 }
1806 else
1807 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1808
1809 EV_FREQUENT_CHECK;
1810 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2125 feed_reverse_done (EV_A_ EV_PERIODIC);
1811 } 2126 }
1812} 2127}
1813 2128
2129/* simply recalculate all periodics */
2130/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1814static void noinline 2131static void noinline
1815periodics_reschedule (EV_P) 2132periodics_reschedule (EV_P)
1816{ 2133{
1817 int i; 2134 int i;
1818 2135
… …
1831 2148
1832 reheap (periodics, periodiccnt); 2149 reheap (periodics, periodiccnt);
1833} 2150}
1834#endif 2151#endif
1835 2152
1836void 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
1837time_update (EV_P_ ev_tstamp max_block) 2170time_update (EV_P_ ev_tstamp max_block)
1838{ 2171{
1839 int i;
1840
1841#if EV_USE_MONOTONIC 2172#if EV_USE_MONOTONIC
1842 if (expect_true (have_monotonic)) 2173 if (expect_true (have_monotonic))
1843 { 2174 {
2175 int i;
1844 ev_tstamp odiff = rtmn_diff; 2176 ev_tstamp odiff = rtmn_diff;
1845 2177
1846 mn_now = get_clock (); 2178 mn_now = get_clock ();
1847 2179
1848 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2180 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1874 ev_rt_now = ev_time (); 2206 ev_rt_now = ev_time ();
1875 mn_now = get_clock (); 2207 mn_now = get_clock ();
1876 now_floor = mn_now; 2208 now_floor = mn_now;
1877 } 2209 }
1878 2210
2211 /* no timer adjustment, as the monotonic clock doesn't jump */
2212 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1879# if EV_PERIODIC_ENABLE 2213# if EV_PERIODIC_ENABLE
1880 periodics_reschedule (EV_A); 2214 periodics_reschedule (EV_A);
1881# endif 2215# endif
1882 /* no timer adjustment, as the monotonic clock doesn't jump */
1883 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1884 } 2216 }
1885 else 2217 else
1886#endif 2218#endif
1887 { 2219 {
1888 ev_rt_now = ev_time (); 2220 ev_rt_now = ev_time ();
1889 2221
1890 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))
1891 { 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);
1892#if EV_PERIODIC_ENABLE 2226#if EV_PERIODIC_ENABLE
1893 periodics_reschedule (EV_A); 2227 periodics_reschedule (EV_A);
1894#endif 2228#endif
1895 /* adjust timers. this is easy, as the offset is the same for all of them */
1896 for (i = 0; i < timercnt; ++i)
1897 {
1898 ANHE *he = timers + i + HEAP0;
1899 ANHE_w (*he)->at += ev_rt_now - mn_now;
1900 ANHE_at_cache (*he);
1901 }
1902 } 2229 }
1903 2230
1904 mn_now = ev_rt_now; 2231 mn_now = ev_rt_now;
1905 } 2232 }
1906} 2233}
1907 2234
1908void 2235void
1909ev_ref (EV_P)
1910{
1911 ++activecnt;
1912}
1913
1914void
1915ev_unref (EV_P)
1916{
1917 --activecnt;
1918}
1919
1920void
1921ev_now_update (EV_P)
1922{
1923 time_update (EV_A_ 1e100);
1924}
1925
1926static int loop_done;
1927
1928void
1929ev_loop (EV_P_ int flags) 2236ev_loop (EV_P_ int flags)
1930{ 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
1931 loop_done = EVUNLOOP_CANCEL; 2244 loop_done = EVUNLOOP_CANCEL;
1932 2245
1933 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 */
1934 2247
1935 do 2248 do
1936 { 2249 {
1937#if EV_VERIFY >= 2 2250#if EV_VERIFY >= 2
1938 ev_loop_verify (EV_A); 2251 ev_loop_verify (EV_A);
… …
1951 /* we might have forked, so queue fork handlers */ 2264 /* we might have forked, so queue fork handlers */
1952 if (expect_false (postfork)) 2265 if (expect_false (postfork))
1953 if (forkcnt) 2266 if (forkcnt)
1954 { 2267 {
1955 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2268 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1956 call_pending (EV_A); 2269 EV_INVOKE_PENDING;
1957 } 2270 }
1958#endif 2271#endif
1959 2272
1960 /* queue prepare watchers (and execute them) */ 2273 /* queue prepare watchers (and execute them) */
1961 if (expect_false (preparecnt)) 2274 if (expect_false (preparecnt))
1962 { 2275 {
1963 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2276 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1964 call_pending (EV_A); 2277 EV_INVOKE_PENDING;
1965 } 2278 }
1966 2279
1967 if (expect_false (!activecnt)) 2280 if (expect_false (loop_done))
1968 break; 2281 break;
1969 2282
1970 /* we might have forked, so reify kernel state if necessary */ 2283 /* we might have forked, so reify kernel state if necessary */
1971 if (expect_false (postfork)) 2284 if (expect_false (postfork))
1972 loop_fork (EV_A); 2285 loop_fork (EV_A);
… …
1979 ev_tstamp waittime = 0.; 2292 ev_tstamp waittime = 0.;
1980 ev_tstamp sleeptime = 0.; 2293 ev_tstamp sleeptime = 0.;
1981 2294
1982 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2295 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1983 { 2296 {
2297 /* remember old timestamp for io_blocktime calculation */
2298 ev_tstamp prev_mn_now = mn_now;
2299
1984 /* update time to cancel out callback processing overhead */ 2300 /* update time to cancel out callback processing overhead */
1985 time_update (EV_A_ 1e100); 2301 time_update (EV_A_ 1e100);
1986 2302
1987 waittime = MAX_BLOCKTIME; 2303 waittime = MAX_BLOCKTIME;
1988 2304
… …
1998 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;
1999 if (waittime > to) waittime = to; 2315 if (waittime > to) waittime = to;
2000 } 2316 }
2001#endif 2317#endif
2002 2318
2319 /* don't let timeouts decrease the waittime below timeout_blocktime */
2003 if (expect_false (waittime < timeout_blocktime)) 2320 if (expect_false (waittime < timeout_blocktime))
2004 waittime = timeout_blocktime; 2321 waittime = timeout_blocktime;
2005 2322
2006 sleeptime = waittime - backend_fudge; 2323 /* extra check because io_blocktime is commonly 0 */
2007
2008 if (expect_true (sleeptime > io_blocktime)) 2324 if (expect_false (io_blocktime))
2009 sleeptime = io_blocktime;
2010
2011 if (sleeptime)
2012 { 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 {
2013 ev_sleep (sleeptime); 2333 ev_sleep (sleeptime);
2014 waittime -= sleeptime; 2334 waittime -= sleeptime;
2335 }
2015 } 2336 }
2016 } 2337 }
2017 2338
2339#if EV_MINIMAL < 2
2018 ++loop_count; 2340 ++loop_count;
2341#endif
2342 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2019 backend_poll (EV_A_ waittime); 2343 backend_poll (EV_A_ waittime);
2344 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2020 2345
2021 /* update ev_rt_now, do magic */ 2346 /* update ev_rt_now, do magic */
2022 time_update (EV_A_ waittime + sleeptime); 2347 time_update (EV_A_ waittime + sleeptime);
2023 } 2348 }
2024 2349
… …
2035 2360
2036 /* queue check watchers, to be executed first */ 2361 /* queue check watchers, to be executed first */
2037 if (expect_false (checkcnt)) 2362 if (expect_false (checkcnt))
2038 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2363 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2039 2364
2040 call_pending (EV_A); 2365 EV_INVOKE_PENDING;
2041 } 2366 }
2042 while (expect_true ( 2367 while (expect_true (
2043 activecnt 2368 activecnt
2044 && !loop_done 2369 && !loop_done
2045 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2370 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2046 )); 2371 ));
2047 2372
2048 if (loop_done == EVUNLOOP_ONE) 2373 if (loop_done == EVUNLOOP_ONE)
2049 loop_done = EVUNLOOP_CANCEL; 2374 loop_done = EVUNLOOP_CANCEL;
2375
2376#if EV_MINIMAL < 2
2377 --loop_depth;
2378#endif
2050} 2379}
2051 2380
2052void 2381void
2053ev_unloop (EV_P_ int how) 2382ev_unloop (EV_P_ int how)
2054{ 2383{
2055 loop_done = how; 2384 loop_done = how;
2056} 2385}
2057 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
2058/*****************************************************************************/ 2424/*****************************************************************************/
2425/* singly-linked list management, used when the expected list length is short */
2059 2426
2060void inline_size 2427inline_size void
2061wlist_add (WL *head, WL elem) 2428wlist_add (WL *head, WL elem)
2062{ 2429{
2063 elem->next = *head; 2430 elem->next = *head;
2064 *head = elem; 2431 *head = elem;
2065} 2432}
2066 2433
2067void inline_size 2434inline_size void
2068wlist_del (WL *head, WL elem) 2435wlist_del (WL *head, WL elem)
2069{ 2436{
2070 while (*head) 2437 while (*head)
2071 { 2438 {
2072 if (*head == elem) 2439 if (expect_true (*head == elem))
2073 { 2440 {
2074 *head = elem->next; 2441 *head = elem->next;
2075 return; 2442 break;
2076 } 2443 }
2077 2444
2078 head = &(*head)->next; 2445 head = &(*head)->next;
2079 } 2446 }
2080} 2447}
2081 2448
2082void inline_speed 2449/* internal, faster, version of ev_clear_pending */
2450inline_speed void
2083clear_pending (EV_P_ W w) 2451clear_pending (EV_P_ W w)
2084{ 2452{
2085 if (w->pending) 2453 if (w->pending)
2086 { 2454 {
2087 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2455 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2088 w->pending = 0; 2456 w->pending = 0;
2089 } 2457 }
2090} 2458}
2091 2459
2092int 2460int
… …
2096 int pending = w_->pending; 2464 int pending = w_->pending;
2097 2465
2098 if (expect_true (pending)) 2466 if (expect_true (pending))
2099 { 2467 {
2100 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2468 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2469 p->w = (W)&pending_w;
2101 w_->pending = 0; 2470 w_->pending = 0;
2102 p->w = 0;
2103 return p->events; 2471 return p->events;
2104 } 2472 }
2105 else 2473 else
2106 return 0; 2474 return 0;
2107} 2475}
2108 2476
2109void inline_size 2477inline_size void
2110pri_adjust (EV_P_ W w) 2478pri_adjust (EV_P_ W w)
2111{ 2479{
2112 int pri = w->priority; 2480 int pri = ev_priority (w);
2113 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2481 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2114 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2482 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2115 w->priority = pri; 2483 ev_set_priority (w, pri);
2116} 2484}
2117 2485
2118void inline_speed 2486inline_speed void
2119ev_start (EV_P_ W w, int active) 2487ev_start (EV_P_ W w, int active)
2120{ 2488{
2121 pri_adjust (EV_A_ w); 2489 pri_adjust (EV_A_ w);
2122 w->active = active; 2490 w->active = active;
2123 ev_ref (EV_A); 2491 ev_ref (EV_A);
2124} 2492}
2125 2493
2126void inline_size 2494inline_size void
2127ev_stop (EV_P_ W w) 2495ev_stop (EV_P_ W w)
2128{ 2496{
2129 ev_unref (EV_A); 2497 ev_unref (EV_A);
2130 w->active = 0; 2498 w->active = 0;
2131} 2499}
… …
2138 int fd = w->fd; 2506 int fd = w->fd;
2139 2507
2140 if (expect_false (ev_is_active (w))) 2508 if (expect_false (ev_is_active (w)))
2141 return; 2509 return;
2142 2510
2143 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))));
2144 2513
2145 EV_FREQUENT_CHECK; 2514 EV_FREQUENT_CHECK;
2146 2515
2147 ev_start (EV_A_ (W)w, 1); 2516 ev_start (EV_A_ (W)w, 1);
2148 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2149 wlist_add (&anfds[fd].head, (WL)w); 2518 wlist_add (&anfds[fd].head, (WL)w);
2150 2519
2151 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2520 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2152 w->events &= ~EV_IOFDSET; 2521 w->events &= ~EV__IOFDSET;
2153 2522
2154 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2155} 2524}
2156 2525
2157void noinline 2526void noinline
… …
2159{ 2528{
2160 clear_pending (EV_A_ (W)w); 2529 clear_pending (EV_A_ (W)w);
2161 if (expect_false (!ev_is_active (w))) 2530 if (expect_false (!ev_is_active (w)))
2162 return; 2531 return;
2163 2532
2164 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));
2165 2534
2166 EV_FREQUENT_CHECK; 2535 EV_FREQUENT_CHECK;
2167 2536
2168 wlist_del (&anfds[w->fd].head, (WL)w); 2537 wlist_del (&anfds[w->fd].head, (WL)w);
2169 ev_stop (EV_A_ (W)w); 2538 ev_stop (EV_A_ (W)w);
… …
2179 if (expect_false (ev_is_active (w))) 2548 if (expect_false (ev_is_active (w)))
2180 return; 2549 return;
2181 2550
2182 ev_at (w) += mn_now; 2551 ev_at (w) += mn_now;
2183 2552
2184 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.));
2185 2554
2186 EV_FREQUENT_CHECK; 2555 EV_FREQUENT_CHECK;
2187 2556
2188 ++timercnt; 2557 ++timercnt;
2189 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2558 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2192 ANHE_at_cache (timers [ev_active (w)]); 2561 ANHE_at_cache (timers [ev_active (w)]);
2193 upheap (timers, ev_active (w)); 2562 upheap (timers, ev_active (w));
2194 2563
2195 EV_FREQUENT_CHECK; 2564 EV_FREQUENT_CHECK;
2196 2565
2197 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2566 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2198} 2567}
2199 2568
2200void noinline 2569void noinline
2201ev_timer_stop (EV_P_ ev_timer *w) 2570ev_timer_stop (EV_P_ ev_timer *w)
2202{ 2571{
… …
2207 EV_FREQUENT_CHECK; 2576 EV_FREQUENT_CHECK;
2208 2577
2209 { 2578 {
2210 int active = ev_active (w); 2579 int active = ev_active (w);
2211 2580
2212 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2581 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2213 2582
2214 --timercnt; 2583 --timercnt;
2215 2584
2216 if (expect_true (active < timercnt + HEAP0)) 2585 if (expect_true (active < timercnt + HEAP0))
2217 { 2586 {
… …
2250 } 2619 }
2251 2620
2252 EV_FREQUENT_CHECK; 2621 EV_FREQUENT_CHECK;
2253} 2622}
2254 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
2255#if EV_PERIODIC_ENABLE 2630#if EV_PERIODIC_ENABLE
2256void noinline 2631void noinline
2257ev_periodic_start (EV_P_ ev_periodic *w) 2632ev_periodic_start (EV_P_ ev_periodic *w)
2258{ 2633{
2259 if (expect_false (ev_is_active (w))) 2634 if (expect_false (ev_is_active (w)))
… …
2261 2636
2262 if (w->reschedule_cb) 2637 if (w->reschedule_cb)
2263 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2638 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2264 else if (w->interval) 2639 else if (w->interval)
2265 { 2640 {
2266 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.));
2267 /* 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 */
2268 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;
2269 } 2644 }
2270 else 2645 else
2271 ev_at (w) = w->offset; 2646 ev_at (w) = w->offset;
… …
2279 ANHE_at_cache (periodics [ev_active (w)]); 2654 ANHE_at_cache (periodics [ev_active (w)]);
2280 upheap (periodics, ev_active (w)); 2655 upheap (periodics, ev_active (w));
2281 2656
2282 EV_FREQUENT_CHECK; 2657 EV_FREQUENT_CHECK;
2283 2658
2284 /*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));*/
2285} 2660}
2286 2661
2287void noinline 2662void noinline
2288ev_periodic_stop (EV_P_ ev_periodic *w) 2663ev_periodic_stop (EV_P_ ev_periodic *w)
2289{ 2664{
… …
2294 EV_FREQUENT_CHECK; 2669 EV_FREQUENT_CHECK;
2295 2670
2296 { 2671 {
2297 int active = ev_active (w); 2672 int active = ev_active (w);
2298 2673
2299 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2674 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2300 2675
2301 --periodiccnt; 2676 --periodiccnt;
2302 2677
2303 if (expect_true (active < periodiccnt + HEAP0)) 2678 if (expect_true (active < periodiccnt + HEAP0))
2304 { 2679 {
… …
2326#endif 2701#endif
2327 2702
2328void noinline 2703void noinline
2329ev_signal_start (EV_P_ ev_signal *w) 2704ev_signal_start (EV_P_ ev_signal *w)
2330{ 2705{
2331#if EV_MULTIPLICITY
2332 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2333#endif
2334 if (expect_false (ev_is_active (w))) 2706 if (expect_false (ev_is_active (w)))
2335 return; 2707 return;
2336 2708
2337 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));
2338 2710
2339 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));
2340 2714
2341 EV_FREQUENT_CHECK; 2715 signals [w->signum - 1].loop = EV_A;
2716#endif
2342 2717
2718 EV_FREQUENT_CHECK;
2719
2720#if EV_USE_SIGNALFD
2721 if (sigfd == -2)
2343 { 2722 {
2344#ifndef _WIN32 2723 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2345 sigset_t full, prev; 2724 if (sigfd < 0 && errno == EINVAL)
2346 sigfillset (&full); 2725 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2347 sigprocmask (SIG_SETMASK, &full, &prev);
2348#endif
2349 2726
2350 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2727 if (sigfd >= 0)
2728 {
2729 fd_intern (sigfd); /* doing it twice will not hurt */
2351 2730
2352#ifndef _WIN32 2731 sigemptyset (&sigfd_set);
2353 sigprocmask (SIG_SETMASK, &prev, 0); 2732
2354#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 }
2355 } 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
2356 2749
2357 ev_start (EV_A_ (W)w, 1); 2750 ev_start (EV_A_ (W)w, 1);
2358 wlist_add (&signals [w->signum - 1].head, (WL)w); 2751 wlist_add (&signals [w->signum - 1].head, (WL)w);
2359 2752
2360 if (!((WL)w)->next) 2753 if (!((WL)w)->next)
2754# if EV_USE_SIGNALFD
2755 if (sigfd < 0) /*TODO*/
2756# endif
2361 { 2757 {
2362#if _WIN32 2758# ifdef _WIN32
2759 evpipe_init (EV_A);
2760
2363 signal (w->signum, ev_sighandler); 2761 signal (w->signum, ev_sighandler);
2364#else 2762# else
2365 struct sigaction sa; 2763 struct sigaction sa;
2764
2765 evpipe_init (EV_A);
2766
2366 sa.sa_handler = ev_sighandler; 2767 sa.sa_handler = ev_sighandler;
2367 sigfillset (&sa.sa_mask); 2768 sigfillset (&sa.sa_mask);
2368 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 */
2369 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);
2370#endif 2775#endif
2371 } 2776 }
2372 2777
2373 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2374} 2779}
2375 2780
2376void noinline 2781void noinline
… …
2384 2789
2385 wlist_del (&signals [w->signum - 1].head, (WL)w); 2790 wlist_del (&signals [w->signum - 1].head, (WL)w);
2386 ev_stop (EV_A_ (W)w); 2791 ev_stop (EV_A_ (W)w);
2387 2792
2388 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
2389 signal (w->signum, SIG_DFL); 2812 signal (w->signum, SIG_DFL);
2813 }
2390 2814
2391 EV_FREQUENT_CHECK; 2815 EV_FREQUENT_CHECK;
2392} 2816}
2393 2817
2394void 2818void
2395ev_child_start (EV_P_ ev_child *w) 2819ev_child_start (EV_P_ ev_child *w)
2396{ 2820{
2397#if EV_MULTIPLICITY 2821#if EV_MULTIPLICITY
2398 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));
2399#endif 2823#endif
2400 if (expect_false (ev_is_active (w))) 2824 if (expect_false (ev_is_active (w)))
2401 return; 2825 return;
2402 2826
2403 EV_FREQUENT_CHECK; 2827 EV_FREQUENT_CHECK;
… …
2428# ifdef _WIN32 2852# ifdef _WIN32
2429# undef lstat 2853# undef lstat
2430# define lstat(a,b) _stati64 (a,b) 2854# define lstat(a,b) _stati64 (a,b)
2431# endif 2855# endif
2432 2856
2433#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 */
2434#define MIN_STAT_INTERVAL 0.1074891 2859#define MIN_STAT_INTERVAL 0.1074891
2435 2860
2436static 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);
2437 2862
2438#if EV_USE_INOTIFY 2863#if EV_USE_INOTIFY
2439# define EV_INOTIFY_BUFSIZE 8192 2864# define EV_INOTIFY_BUFSIZE 8192
… …
2441static void noinline 2866static void noinline
2442infy_add (EV_P_ ev_stat *w) 2867infy_add (EV_P_ ev_stat *w)
2443{ 2868{
2444 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);
2445 2870
2446 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 */
2447 { 2891 }
2448 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;
2449 2896
2450 /* monitor some parent directory for speedup hints */ 2897 /* if path is not there, monitor some parent directory for speedup hints */
2451 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2898 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2452 /* but an efficiency issue only */ 2899 /* but an efficiency issue only */
2453 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2900 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2454 { 2901 {
2455 char path [4096]; 2902 char path [4096];
2456 strcpy (path, w->path); 2903 strcpy (path, w->path);
… …
2460 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2907 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2461 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2908 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2462 2909
2463 char *pend = strrchr (path, '/'); 2910 char *pend = strrchr (path, '/');
2464 2911
2465 if (!pend) 2912 if (!pend || pend == path)
2466 break; /* whoops, no '/', complain to your admin */ 2913 break;
2467 2914
2468 *pend = 0; 2915 *pend = 0;
2469 w->wd = inotify_add_watch (fs_fd, path, mask); 2916 w->wd = inotify_add_watch (fs_fd, path, mask);
2470 } 2917 }
2471 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2918 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2472 } 2919 }
2473 } 2920 }
2474 else
2475 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2476 2921
2477 if (w->wd >= 0) 2922 if (w->wd >= 0)
2478 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);
2479} 2929}
2480 2930
2481static void noinline 2931static void noinline
2482infy_del (EV_P_ ev_stat *w) 2932infy_del (EV_P_ ev_stat *w)
2483{ 2933{
… …
2513 2963
2514 if (w->wd == wd || wd == -1) 2964 if (w->wd == wd || wd == -1)
2515 { 2965 {
2516 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2966 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2517 { 2967 {
2968 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2518 w->wd = -1; 2969 w->wd = -1;
2519 infy_add (EV_A_ w); /* re-add, no matter what */ 2970 infy_add (EV_A_ w); /* re-add, no matter what */
2520 } 2971 }
2521 2972
2522 stat_timer_cb (EV_A_ &w->timer, 0); 2973 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2535 2986
2536 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)
2537 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2988 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2538} 2989}
2539 2990
2540void inline_size 2991inline_size void
2541infy_init (EV_P) 2992check_2625 (EV_P)
2542{ 2993{
2543 if (fs_fd != -2)
2544 return;
2545
2546 /* kernels < 2.6.25 are borked 2994 /* kernels < 2.6.25 are borked
2547 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2995 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2548 */ 2996 */
2549 {
2550 struct utsname buf; 2997 struct utsname buf;
2551 int major, minor, micro; 2998 int major, minor, micro;
2552 2999
2553 fs_fd = -1;
2554
2555 if (uname (&buf)) 3000 if (uname (&buf))
2556 return; 3001 return;
2557 3002
2558 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 3003 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2559 return; 3004 return;
2560 3005
2561 if (major < 2 3006 if (major < 2
2562 || (major == 2 && minor < 6) 3007 || (major == 2 && minor < 6)
2563 || (major == 2 && minor == 6 && micro < 25)) 3008 || (major == 2 && minor == 6 && micro < 25))
2564 return; 3009 return;
2565 }
2566 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
3026infy_init (EV_P)
3027{
3028 if (fs_fd != -2)
3029 return;
3030
3031 fs_fd = -1;
3032
3033 check_2625 (EV_A);
3034
2567 fs_fd = inotify_init (); 3035 fs_fd = infy_newfd ();
2568 3036
2569 if (fs_fd >= 0) 3037 if (fs_fd >= 0)
2570 { 3038 {
3039 fd_intern (fs_fd);
2571 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3040 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2572 ev_set_priority (&fs_w, EV_MAXPRI); 3041 ev_set_priority (&fs_w, EV_MAXPRI);
2573 ev_io_start (EV_A_ &fs_w); 3042 ev_io_start (EV_A_ &fs_w);
3043 ev_unref (EV_A);
2574 } 3044 }
2575} 3045}
2576 3046
2577void inline_size 3047inline_size void
2578infy_fork (EV_P) 3048infy_fork (EV_P)
2579{ 3049{
2580 int slot; 3050 int slot;
2581 3051
2582 if (fs_fd < 0) 3052 if (fs_fd < 0)
2583 return; 3053 return;
2584 3054
3055 ev_ref (EV_A);
3056 ev_io_stop (EV_A_ &fs_w);
2585 close (fs_fd); 3057 close (fs_fd);
2586 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 }
2587 3067
2588 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3068 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2589 { 3069 {
2590 WL w_ = fs_hash [slot].head; 3070 WL w_ = fs_hash [slot].head;
2591 fs_hash [slot].head = 0; 3071 fs_hash [slot].head = 0;
… …
2598 w->wd = -1; 3078 w->wd = -1;
2599 3079
2600 if (fs_fd >= 0) 3080 if (fs_fd >= 0)
2601 infy_add (EV_A_ w); /* re-add, no matter what */ 3081 infy_add (EV_A_ w); /* re-add, no matter what */
2602 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);
2603 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 }
2604 } 3089 }
2605 } 3090 }
2606} 3091}
2607 3092
2608#endif 3093#endif
… …
2625static void noinline 3110static void noinline
2626stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3111stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2627{ 3112{
2628 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3113 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2629 3114
2630 /* we copy this here each the time so that */ 3115 ev_statdata prev = w->attr;
2631 /* prev has the old value when the callback gets invoked */
2632 w->prev = w->attr;
2633 ev_stat_stat (EV_A_ w); 3116 ev_stat_stat (EV_A_ w);
2634 3117
2635 /* 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 */
2636 if ( 3119 if (
2637 w->prev.st_dev != w->attr.st_dev 3120 prev.st_dev != w->attr.st_dev
2638 || w->prev.st_ino != w->attr.st_ino 3121 || prev.st_ino != w->attr.st_ino
2639 || w->prev.st_mode != w->attr.st_mode 3122 || prev.st_mode != w->attr.st_mode
2640 || w->prev.st_nlink != w->attr.st_nlink 3123 || prev.st_nlink != w->attr.st_nlink
2641 || w->prev.st_uid != w->attr.st_uid 3124 || prev.st_uid != w->attr.st_uid
2642 || w->prev.st_gid != w->attr.st_gid 3125 || prev.st_gid != w->attr.st_gid
2643 || w->prev.st_rdev != w->attr.st_rdev 3126 || prev.st_rdev != w->attr.st_rdev
2644 || w->prev.st_size != w->attr.st_size 3127 || prev.st_size != w->attr.st_size
2645 || w->prev.st_atime != w->attr.st_atime 3128 || prev.st_atime != w->attr.st_atime
2646 || w->prev.st_mtime != w->attr.st_mtime 3129 || prev.st_mtime != w->attr.st_mtime
2647 || w->prev.st_ctime != w->attr.st_ctime 3130 || prev.st_ctime != w->attr.st_ctime
2648 ) { 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
2649 #if EV_USE_INOTIFY 3137 #if EV_USE_INOTIFY
2650 if (fs_fd >= 0) 3138 if (fs_fd >= 0)
2651 { 3139 {
2652 infy_del (EV_A_ w); 3140 infy_del (EV_A_ w);
2653 infy_add (EV_A_ w); 3141 infy_add (EV_A_ w);
… …
2663ev_stat_start (EV_P_ ev_stat *w) 3151ev_stat_start (EV_P_ ev_stat *w)
2664{ 3152{
2665 if (expect_false (ev_is_active (w))) 3153 if (expect_false (ev_is_active (w)))
2666 return; 3154 return;
2667 3155
2668 /* since we use memcmp, we need to clear any padding data etc. */
2669 memset (&w->prev, 0, sizeof (ev_statdata));
2670 memset (&w->attr, 0, sizeof (ev_statdata));
2671
2672 ev_stat_stat (EV_A_ w); 3156 ev_stat_stat (EV_A_ w);
2673 3157
3158 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2674 if (w->interval < MIN_STAT_INTERVAL) 3159 w->interval = MIN_STAT_INTERVAL;
2675 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2676 3160
2677 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);
2678 ev_set_priority (&w->timer, ev_priority (w)); 3162 ev_set_priority (&w->timer, ev_priority (w));
2679 3163
2680#if EV_USE_INOTIFY 3164#if EV_USE_INOTIFY
2681 infy_init (EV_A); 3165 infy_init (EV_A);
2682 3166
2683 if (fs_fd >= 0) 3167 if (fs_fd >= 0)
2684 infy_add (EV_A_ w); 3168 infy_add (EV_A_ w);
2685 else 3169 else
2686#endif 3170#endif
3171 {
2687 ev_timer_start (EV_A_ &w->timer); 3172 ev_timer_again (EV_A_ &w->timer);
3173 ev_unref (EV_A);
3174 }
2688 3175
2689 ev_start (EV_A_ (W)w, 1); 3176 ev_start (EV_A_ (W)w, 1);
2690 3177
2691 EV_FREQUENT_CHECK; 3178 EV_FREQUENT_CHECK;
2692} 3179}
… …
2701 EV_FREQUENT_CHECK; 3188 EV_FREQUENT_CHECK;
2702 3189
2703#if EV_USE_INOTIFY 3190#if EV_USE_INOTIFY
2704 infy_del (EV_A_ w); 3191 infy_del (EV_A_ w);
2705#endif 3192#endif
3193
3194 if (ev_is_active (&w->timer))
3195 {
3196 ev_ref (EV_A);
2706 ev_timer_stop (EV_A_ &w->timer); 3197 ev_timer_stop (EV_A_ &w->timer);
3198 }
2707 3199
2708 ev_stop (EV_A_ (W)w); 3200 ev_stop (EV_A_ (W)w);
2709 3201
2710 EV_FREQUENT_CHECK; 3202 EV_FREQUENT_CHECK;
2711} 3203}
… …
2852embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3344embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2853{ 3345{
2854 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3346 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2855 3347
2856 { 3348 {
2857 struct ev_loop *loop = w->other; 3349 EV_P = w->other;
2858 3350
2859 while (fdchangecnt) 3351 while (fdchangecnt)
2860 { 3352 {
2861 fd_reify (EV_A); 3353 fd_reify (EV_A);
2862 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3354 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2867static void 3359static void
2868embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3360embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2869{ 3361{
2870 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3362 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2871 3363
3364 ev_embed_stop (EV_A_ w);
3365
2872 { 3366 {
2873 struct ev_loop *loop = w->other; 3367 EV_P = w->other;
2874 3368
2875 ev_loop_fork (EV_A); 3369 ev_loop_fork (EV_A);
3370 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2876 } 3371 }
3372
3373 ev_embed_start (EV_A_ w);
2877} 3374}
2878 3375
2879#if 0 3376#if 0
2880static void 3377static void
2881embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3378embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2889{ 3386{
2890 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
2891 return; 3388 return;
2892 3389
2893 { 3390 {
2894 struct ev_loop *loop = w->other; 3391 EV_P = w->other;
2895 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 ()));
2896 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);
2897 } 3394 }
2898 3395
2899 EV_FREQUENT_CHECK; 3396 EV_FREQUENT_CHECK;
2900 3397
… …
3011 3508
3012void 3509void
3013ev_async_send (EV_P_ ev_async *w) 3510ev_async_send (EV_P_ ev_async *w)
3014{ 3511{
3015 w->sent = 1; 3512 w->sent = 1;
3016 evpipe_write (EV_A_ &gotasync); 3513 evpipe_write (EV_A_ &async_pending);
3017} 3514}
3018#endif 3515#endif
3019 3516
3020/*****************************************************************************/ 3517/*****************************************************************************/
3021 3518
… …
3083 ev_timer_set (&once->to, timeout, 0.); 3580 ev_timer_set (&once->to, timeout, 0.);
3084 ev_timer_start (EV_A_ &once->to); 3581 ev_timer_start (EV_A_ &once->to);
3085 } 3582 }
3086} 3583}
3087 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
3088#if EV_MULTIPLICITY 3693#if EV_MULTIPLICITY
3089 #include "ev_wrap.h" 3694 #include "ev_wrap.h"
3090#endif 3695#endif
3091 3696
3092#ifdef __cplusplus 3697#ifdef __cplusplus

Diff Legend

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