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

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

Diff Legend

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