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.324 by root, Sat Jan 23 20:15:57 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
… …
260# define EV_USE_4HEAP !EV_MINIMAL 326# define EV_USE_4HEAP !EV_MINIMAL
261#endif 327#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
331#endif
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
265#endif 345#endif
266 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 */
268 348
269#ifndef CLOCK_MONOTONIC 349#ifndef CLOCK_MONOTONIC
… …
303#endif 383#endif
304 384
305#if EV_USE_EVENTFD 385#if EV_USE_EVENTFD
306/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 386/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
307# include <stdint.h> 387# include <stdint.h>
388# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK
390# endif
391# ifndef EFD_CLOEXEC
392# ifdef O_CLOEXEC
393# define EFD_CLOEXEC O_CLOEXEC
394# else
395# define EFD_CLOEXEC 02000000
396# endif
397# endif
308# ifdef __cplusplus 398# ifdef __cplusplus
309extern "C" { 399extern "C" {
310# endif 400# endif
311int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
312# ifdef __cplusplus 402# ifdef __cplusplus
313} 403}
314# endif 404# endif
315#endif 405#endif
406
407#if EV_USE_SIGNALFD
408/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
409# include <stdint.h>
410# ifndef SFD_NONBLOCK
411# define SFD_NONBLOCK O_NONBLOCK
412# endif
413# ifndef SFD_CLOEXEC
414# ifdef O_CLOEXEC
415# define SFD_CLOEXEC O_CLOEXEC
416# else
417# define SFD_CLOEXEC 02000000
418# endif
419# endif
420# ifdef __cplusplus
421extern "C" {
422# endif
423int signalfd (int fd, const sigset_t *mask, int flags);
424
425struct signalfd_siginfo
426{
427 uint32_t ssi_signo;
428 char pad[128 - sizeof (uint32_t)];
429};
430# ifdef __cplusplus
431}
432# endif
433#endif
434
316 435
317/**/ 436/**/
318 437
319#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
320# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
332 */ 451 */
333#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
334 453
335#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 454#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) */ 455#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 456
339#if __GNUC__ >= 4 457#if __GNUC__ >= 4
340# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
341# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
342#else 460#else
… …
355# define inline_speed static noinline 473# define inline_speed static noinline
356#else 474#else
357# define inline_speed static inline 475# define inline_speed static inline
358#endif 476#endif
359 477
360#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479
480#if EV_MINPRI == EV_MAXPRI
481# define ABSPRI(w) (((W)w), 0)
482#else
361#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
362 485
363#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
364#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
365 488
366typedef ev_watcher *W; 489typedef ev_watcher *W;
… …
368typedef ev_watcher_time *WT; 491typedef ev_watcher_time *WT;
369 492
370#define ev_active(w) ((W)(w))->active 493#define ev_active(w) ((W)(w))->active
371#define ev_at(w) ((WT)(w))->at 494#define ev_at(w) ((WT)(w))->at
372 495
373#if EV_USE_MONOTONIC 496#if EV_USE_REALTIME
374/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 497/* 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 */ 498/* giving it a reasonably high chance of working on typical architetcures */
499static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
500#endif
501
502#if EV_USE_MONOTONIC
376static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
504#endif
505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
377#endif 514#endif
378 515
379#ifdef _WIN32 516#ifdef _WIN32
380# include "ev_win32.c" 517# include "ev_win32.c"
381#endif 518#endif
… …
445#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
446#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
447 584
448/*****************************************************************************/ 585/*****************************************************************************/
449 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
590/* file descriptor info structure */
450typedef struct 591typedef struct
451{ 592{
452 WL head; 593 WL head;
453 unsigned char events; 594 unsigned char events; /* the events watched for */
454 unsigned char reify; 595 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 */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
456 unsigned char unused; 597 unsigned char unused;
457#if EV_USE_EPOLL 598#if EV_USE_EPOLL
458 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
459#endif 600#endif
460#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
461 SOCKET handle; 602 SOCKET handle;
462#endif 603#endif
463} ANFD; 604} ANFD;
464 605
606/* stores the pending event set for a given watcher */
465typedef struct 607typedef struct
466{ 608{
467 W w; 609 W w;
468 int events; 610 int events; /* the pending event set for the given watcher */
469} ANPENDING; 611} ANPENDING;
470 612
471#if EV_USE_INOTIFY 613#if EV_USE_INOTIFY
472/* hash table entry per inotify-id */ 614/* hash table entry per inotify-id */
473typedef struct 615typedef struct
… …
476} ANFS; 618} ANFS;
477#endif 619#endif
478 620
479/* Heap Entry */ 621/* Heap Entry */
480#if EV_HEAP_CACHE_AT 622#if EV_HEAP_CACHE_AT
623 /* a heap element */
481 typedef struct { 624 typedef struct {
482 ev_tstamp at; 625 ev_tstamp at;
483 WT w; 626 WT w;
484 } ANHE; 627 } ANHE;
485 628
486 #define ANHE_w(he) (he).w /* access watcher, read-write */ 629 #define ANHE_w(he) (he).w /* access watcher, read-write */
487 #define ANHE_at(he) (he).at /* access cached at, read-only */ 630 #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 */ 631 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
489#else 632#else
633 /* a heap element */
490 typedef WT ANHE; 634 typedef WT ANHE;
491 635
492 #define ANHE_w(he) (he) 636 #define ANHE_w(he) (he)
493 #define ANHE_at(he) (he)->at 637 #define ANHE_at(he) (he)->at
494 #define ANHE_at_cache(he) 638 #define ANHE_at_cache(he)
… …
518 662
519 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
520 664
521#endif 665#endif
522 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
523/*****************************************************************************/ 679/*****************************************************************************/
524 680
681#ifndef EV_HAVE_EV_TIME
525ev_tstamp 682ev_tstamp
526ev_time (void) 683ev_time (void)
527{ 684{
528#if EV_USE_REALTIME 685#if EV_USE_REALTIME
686 if (expect_true (have_realtime))
687 {
529 struct timespec ts; 688 struct timespec ts;
530 clock_gettime (CLOCK_REALTIME, &ts); 689 clock_gettime (CLOCK_REALTIME, &ts);
531 return ts.tv_sec + ts.tv_nsec * 1e-9; 690 return ts.tv_sec + ts.tv_nsec * 1e-9;
532#else 691 }
692#endif
693
533 struct timeval tv; 694 struct timeval tv;
534 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
535 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
536#endif
537} 697}
698#endif
538 699
539ev_tstamp inline_size 700inline_size ev_tstamp
540get_clock (void) 701get_clock (void)
541{ 702{
542#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
543 if (expect_true (have_monotonic)) 704 if (expect_true (have_monotonic))
544 { 705 {
… …
578 739
579 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
580 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
581 742
582 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
583 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
584 /* by older ones */ 745 /* by older ones */
585 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
586#endif 747#endif
587 } 748 }
588} 749}
589 750
590/*****************************************************************************/ 751/*****************************************************************************/
591 752
592#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 753#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
593 754
594int inline_size 755/* find a suitable new size for the given array, */
756/* hopefully by rounding to a ncie-to-malloc size */
757inline_size int
595array_nextsize (int elem, int cur, int cnt) 758array_nextsize (int elem, int cur, int cnt)
596{ 759{
597 int ncur = cur + 1; 760 int ncur = cur + 1;
598 761
599 do 762 do
… …
640 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 803 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
641 } 804 }
642#endif 805#endif
643 806
644#define array_free(stem, idx) \ 807#define array_free(stem, idx) \
645 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 808 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
646 809
647/*****************************************************************************/ 810/*****************************************************************************/
811
812/* dummy callback for pending events */
813static void noinline
814pendingcb (EV_P_ ev_prepare *w, int revents)
815{
816}
648 817
649void noinline 818void noinline
650ev_feed_event (EV_P_ void *w, int revents) 819ev_feed_event (EV_P_ void *w, int revents)
651{ 820{
652 W w_ = (W)w; 821 W w_ = (W)w;
… …
661 pendings [pri][w_->pending - 1].w = w_; 830 pendings [pri][w_->pending - 1].w = w_;
662 pendings [pri][w_->pending - 1].events = revents; 831 pendings [pri][w_->pending - 1].events = revents;
663 } 832 }
664} 833}
665 834
666void inline_speed 835inline_speed void
836feed_reverse (EV_P_ W w)
837{
838 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
839 rfeeds [rfeedcnt++] = w;
840}
841
842inline_size void
843feed_reverse_done (EV_P_ int revents)
844{
845 do
846 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
847 while (rfeedcnt);
848}
849
850inline_speed void
667queue_events (EV_P_ W *events, int eventcnt, int type) 851queue_events (EV_P_ W *events, int eventcnt, int type)
668{ 852{
669 int i; 853 int i;
670 854
671 for (i = 0; i < eventcnt; ++i) 855 for (i = 0; i < eventcnt; ++i)
672 ev_feed_event (EV_A_ events [i], type); 856 ev_feed_event (EV_A_ events [i], type);
673} 857}
674 858
675/*****************************************************************************/ 859/*****************************************************************************/
676 860
677void inline_speed 861inline_speed void
678fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
679{ 863{
680 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
681 ev_io *w; 865 ev_io *w;
682 866
683 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
687 if (ev) 871 if (ev)
688 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
689 } 873 }
690} 874}
691 875
876/* do not submit kernel events for fds that have reify set */
877/* because that means they changed while we were polling for new events */
878inline_speed void
879fd_event (EV_P_ int fd, int revents)
880{
881 ANFD *anfd = anfds + fd;
882
883 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents);
885}
886
692void 887void
693ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
694{ 889{
695 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
696 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
697} 892}
698 893
699void inline_size 894/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */
896inline_size void
700fd_reify (EV_P) 897fd_reify (EV_P)
701{ 898{
702 int i; 899 int i;
703 900
704 for (i = 0; i < fdchangecnt; ++i) 901 for (i = 0; i < fdchangecnt; ++i)
… …
714 911
715#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
716 if (events) 913 if (events)
717 { 914 {
718 unsigned long arg; 915 unsigned long arg;
719 #ifdef EV_FD_TO_WIN32_HANDLE
720 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 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)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
725 } 918 }
726#endif 919#endif
727 920
728 { 921 {
729 unsigned char o_events = anfd->events; 922 unsigned char o_events = anfd->events;
730 unsigned char o_reify = anfd->reify; 923 unsigned char o_reify = anfd->reify;
731 924
732 anfd->reify = 0; 925 anfd->reify = 0;
733 anfd->events = events; 926 anfd->events = events;
734 927
735 if (o_events != events || o_reify & EV_IOFDSET) 928 if (o_events != events || o_reify & EV__IOFDSET)
736 backend_modify (EV_A_ fd, o_events, events); 929 backend_modify (EV_A_ fd, o_events, events);
737 } 930 }
738 } 931 }
739 932
740 fdchangecnt = 0; 933 fdchangecnt = 0;
741} 934}
742 935
743void inline_size 936/* something about the given fd changed */
937inline_size void
744fd_change (EV_P_ int fd, int flags) 938fd_change (EV_P_ int fd, int flags)
745{ 939{
746 unsigned char reify = anfds [fd].reify; 940 unsigned char reify = anfds [fd].reify;
747 anfds [fd].reify |= flags; 941 anfds [fd].reify |= flags;
748 942
… …
752 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 946 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
753 fdchanges [fdchangecnt - 1] = fd; 947 fdchanges [fdchangecnt - 1] = fd;
754 } 948 }
755} 949}
756 950
757void inline_speed 951/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
952inline_speed void
758fd_kill (EV_P_ int fd) 953fd_kill (EV_P_ int fd)
759{ 954{
760 ev_io *w; 955 ev_io *w;
761 956
762 while ((w = (ev_io *)anfds [fd].head)) 957 while ((w = (ev_io *)anfds [fd].head))
… …
764 ev_io_stop (EV_A_ w); 959 ev_io_stop (EV_A_ w);
765 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 960 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
766 } 961 }
767} 962}
768 963
769int inline_size 964/* check whether the given fd is atcually valid, for error recovery */
965inline_size int
770fd_valid (int fd) 966fd_valid (int fd)
771{ 967{
772#ifdef _WIN32 968#ifdef _WIN32
773 return _get_osfhandle (fd) != -1; 969 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
774#else 970#else
775 return fcntl (fd, F_GETFD) != -1; 971 return fcntl (fd, F_GETFD) != -1;
776#endif 972#endif
777} 973}
778 974
… …
796 992
797 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
798 if (anfds [fd].events) 994 if (anfds [fd].events)
799 { 995 {
800 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
801 return; 997 break;
802 } 998 }
803} 999}
804 1000
805/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
806static void noinline 1002static void noinline
… …
811 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
812 if (anfds [fd].events) 1008 if (anfds [fd].events)
813 { 1009 {
814 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
815 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
816 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
817 } 1013 }
818} 1014}
819 1015
820/*****************************************************************************/ 1016/*****************************************************************************/
821 1017
… …
837#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1033#define HEAP0 (DHEAP - 1) /* index of first element in heap */
838#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1034#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
839#define UPHEAP_DONE(p,k) ((p) == (k)) 1035#define UPHEAP_DONE(p,k) ((p) == (k))
840 1036
841/* away from the root */ 1037/* away from the root */
842void inline_speed 1038inline_speed void
843downheap (ANHE *heap, int N, int k) 1039downheap (ANHE *heap, int N, int k)
844{ 1040{
845 ANHE he = heap [k]; 1041 ANHE he = heap [k];
846 ANHE *E = heap + N + HEAP0; 1042 ANHE *E = heap + N + HEAP0;
847 1043
… …
887#define HEAP0 1 1083#define HEAP0 1
888#define HPARENT(k) ((k) >> 1) 1084#define HPARENT(k) ((k) >> 1)
889#define UPHEAP_DONE(p,k) (!(p)) 1085#define UPHEAP_DONE(p,k) (!(p))
890 1086
891/* away from the root */ 1087/* away from the root */
892void inline_speed 1088inline_speed void
893downheap (ANHE *heap, int N, int k) 1089downheap (ANHE *heap, int N, int k)
894{ 1090{
895 ANHE he = heap [k]; 1091 ANHE he = heap [k];
896 1092
897 for (;;) 1093 for (;;)
898 { 1094 {
899 int c = k << 1; 1095 int c = k << 1;
900 1096
901 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
902 break; 1098 break;
903 1099
904 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
905 ? 1 : 0; 1101 ? 1 : 0;
906 1102
… …
917 ev_active (ANHE_w (he)) = k; 1113 ev_active (ANHE_w (he)) = k;
918} 1114}
919#endif 1115#endif
920 1116
921/* towards the root */ 1117/* towards the root */
922void inline_speed 1118inline_speed void
923upheap (ANHE *heap, int k) 1119upheap (ANHE *heap, int k)
924{ 1120{
925 ANHE he = heap [k]; 1121 ANHE he = heap [k];
926 1122
927 for (;;) 1123 for (;;)
… …
938 1134
939 heap [k] = he; 1135 heap [k] = he;
940 ev_active (ANHE_w (he)) = k; 1136 ev_active (ANHE_w (he)) = k;
941} 1137}
942 1138
943void inline_size 1139/* move an element suitably so it is in a correct place */
1140inline_size void
944adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
945{ 1142{
946 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
947 upheap (heap, k); 1144 upheap (heap, k);
948 else 1145 else
949 downheap (heap, N, k); 1146 downheap (heap, N, k);
950} 1147}
951 1148
952/* rebuild the heap: this function is used only once and executed rarely */ 1149/* rebuild the heap: this function is used only once and executed rarely */
953void inline_size 1150inline_size void
954reheap (ANHE *heap, int N) 1151reheap (ANHE *heap, int N)
955{ 1152{
956 int i; 1153 int i;
957 1154
958 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1155 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
961 upheap (heap, i + HEAP0); 1158 upheap (heap, i + HEAP0);
962} 1159}
963 1160
964/*****************************************************************************/ 1161/*****************************************************************************/
965 1162
1163/* associate signal watchers to a signal signal */
966typedef struct 1164typedef struct
967{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
968 WL head; 1170 WL head;
969 EV_ATOMIC_T gotsig;
970} ANSIG; 1171} ANSIG;
971 1172
972static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
973static int signalmax;
974
975static EV_ATOMIC_T gotsig;
976 1174
977/*****************************************************************************/ 1175/*****************************************************************************/
978 1176
979void inline_speed 1177/* used to prepare libev internal fd's */
1178/* this is not fork-safe */
1179inline_speed void
980fd_intern (int fd) 1180fd_intern (int fd)
981{ 1181{
982#ifdef _WIN32 1182#ifdef _WIN32
983 unsigned long arg = 1; 1183 unsigned long arg = 1;
984 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
985#else 1185#else
986 fcntl (fd, F_SETFD, FD_CLOEXEC); 1186 fcntl (fd, F_SETFD, FD_CLOEXEC);
987 fcntl (fd, F_SETFL, O_NONBLOCK); 1187 fcntl (fd, F_SETFL, O_NONBLOCK);
988#endif 1188#endif
989} 1189}
990 1190
991static void noinline 1191static void noinline
992evpipe_init (EV_P) 1192evpipe_init (EV_P)
993{ 1193{
994 if (!ev_is_active (&pipeev)) 1194 if (!ev_is_active (&pipe_w))
995 { 1195 {
996#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
997 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
998 { 1202 {
999 evpipe [0] = -1; 1203 evpipe [0] = -1;
1000 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1001 ev_io_set (&pipeev, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1002 } 1206 }
1003 else 1207 else
1004#endif 1208#endif
1005 { 1209 {
1006 while (pipe (evpipe)) 1210 while (pipe (evpipe))
1007 ev_syserr ("(libev) error creating signal/async pipe"); 1211 ev_syserr ("(libev) error creating signal/async pipe");
1008 1212
1009 fd_intern (evpipe [0]); 1213 fd_intern (evpipe [0]);
1010 fd_intern (evpipe [1]); 1214 fd_intern (evpipe [1]);
1011 ev_io_set (&pipeev, evpipe [0], EV_READ); 1215 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1012 } 1216 }
1013 1217
1014 ev_io_start (EV_A_ &pipeev); 1218 ev_io_start (EV_A_ &pipe_w);
1015 ev_unref (EV_A); /* watcher should not keep loop alive */ 1219 ev_unref (EV_A); /* watcher should not keep loop alive */
1016 } 1220 }
1017} 1221}
1018 1222
1019void inline_size 1223inline_size void
1020evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1224evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1021{ 1225{
1022 if (!*flag) 1226 if (!*flag)
1023 { 1227 {
1024 int old_errno = errno; /* save errno because write might clobber it */ 1228 int old_errno = errno; /* save errno because write might clobber it */
… …
1037 1241
1038 errno = old_errno; 1242 errno = old_errno;
1039 } 1243 }
1040} 1244}
1041 1245
1246/* called whenever the libev signal pipe */
1247/* got some events (signal, async) */
1042static void 1248static void
1043pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1044{ 1250{
1251 int i;
1252
1045#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1046 if (evfd >= 0) 1254 if (evfd >= 0)
1047 { 1255 {
1048 uint64_t counter; 1256 uint64_t counter;
1049 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
… …
1053 { 1261 {
1054 char dummy; 1262 char dummy;
1055 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1056 } 1264 }
1057 1265
1058 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1059 { 1267 {
1060 int signum; 1268 sig_pending = 0;
1061 gotsig = 0;
1062 1269
1063 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1064 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1065 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1066 } 1273 }
1067 1274
1068#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1069 if (gotasync) 1276 if (async_pending)
1070 { 1277 {
1071 int i; 1278 async_pending = 0;
1072 gotasync = 0;
1073 1279
1074 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1075 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1076 { 1282 {
1077 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
… …
1085 1291
1086static void 1292static void
1087ev_sighandler (int signum) 1293ev_sighandler (int signum)
1088{ 1294{
1089#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1090 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1091#endif 1297#endif
1092 1298
1093#if _WIN32 1299#ifdef _WIN32
1094 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1095#endif 1301#endif
1096 1302
1097 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1098 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1099} 1305}
1100 1306
1101void noinline 1307void noinline
1102ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1103{ 1309{
1104 WL w; 1310 WL w;
1105 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1106#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1107 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1108#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1109 1320
1110 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1111
1112 if (signum < 0 || signum >= signalmax)
1113 return; 1322 return;
1323#endif
1114 1324
1115 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1116 1326
1117 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1118 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1119} 1329}
1120 1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1350
1121/*****************************************************************************/ 1351/*****************************************************************************/
1122 1352
1123static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1124 1354
1125#ifndef _WIN32 1355#ifndef _WIN32
… …
1128 1358
1129#ifndef WIFCONTINUED 1359#ifndef WIFCONTINUED
1130# define WIFCONTINUED(status) 0 1360# define WIFCONTINUED(status) 0
1131#endif 1361#endif
1132 1362
1133void inline_speed 1363/* handle a single child status event */
1364inline_speed void
1134child_reap (EV_P_ int chain, int pid, int status) 1365child_reap (EV_P_ int chain, int pid, int status)
1135{ 1366{
1136 ev_child *w; 1367 ev_child *w;
1137 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1138 1369
… …
1151 1382
1152#ifndef WCONTINUED 1383#ifndef WCONTINUED
1153# define WCONTINUED 0 1384# define WCONTINUED 0
1154#endif 1385#endif
1155 1386
1387/* called on sigchld etc., calls waitpid */
1156static void 1388static void
1157childcb (EV_P_ ev_signal *sw, int revents) 1389childcb (EV_P_ ev_signal *sw, int revents)
1158{ 1390{
1159 int pid, status; 1391 int pid, status;
1160 1392
… …
1241 /* kqueue is borked on everything but netbsd apparently */ 1473 /* kqueue is borked on everything but netbsd apparently */
1242 /* it usually doesn't work correctly on anything but sockets and pipes */ 1474 /* it usually doesn't work correctly on anything but sockets and pipes */
1243 flags &= ~EVBACKEND_KQUEUE; 1475 flags &= ~EVBACKEND_KQUEUE;
1244#endif 1476#endif
1245#ifdef __APPLE__ 1477#ifdef __APPLE__
1246 // flags &= ~EVBACKEND_KQUEUE; for documentation 1478 /* only select works correctly on that "unix-certified" platform */
1247 flags &= ~EVBACKEND_POLL; 1479 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1480 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1248#endif 1481#endif
1249 1482
1250 return flags; 1483 return flags;
1251} 1484}
1252 1485
… …
1266ev_backend (EV_P) 1499ev_backend (EV_P)
1267{ 1500{
1268 return backend; 1501 return backend;
1269} 1502}
1270 1503
1504#if EV_MINIMAL < 2
1271unsigned int 1505unsigned int
1272ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1273{ 1507{
1274 return loop_count; 1508 return loop_count;
1275} 1509}
1276 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1277void 1517void
1278ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1279{ 1519{
1280 io_blocktime = interval; 1520 io_blocktime = interval;
1281} 1521}
… …
1284ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1285{ 1525{
1286 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1287} 1527}
1288 1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1552
1553/* initialise a loop structure, must be zero-initialised */
1289static void noinline 1554static void noinline
1290loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1291{ 1556{
1292 if (!backend) 1557 if (!backend)
1293 { 1558 {
1559#if EV_USE_REALTIME
1560 if (!have_realtime)
1561 {
1562 struct timespec ts;
1563
1564 if (!clock_gettime (CLOCK_REALTIME, &ts))
1565 have_realtime = 1;
1566 }
1567#endif
1568
1294#if EV_USE_MONOTONIC 1569#if EV_USE_MONOTONIC
1570 if (!have_monotonic)
1295 { 1571 {
1296 struct timespec ts; 1572 struct timespec ts;
1573
1297 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1298 have_monotonic = 1; 1575 have_monotonic = 1;
1299 } 1576 }
1300#endif 1577#endif
1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1301 1589
1302 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1303 mn_now = get_clock (); 1591 mn_now = get_clock ();
1304 now_floor = mn_now; 1592 now_floor = mn_now;
1305 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1595 invoke_cb = ev_invoke_pending;
1596#endif
1306 1597
1307 io_blocktime = 0.; 1598 io_blocktime = 0.;
1308 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1309 backend = 0; 1600 backend = 0;
1310 backend_fd = -1; 1601 backend_fd = -1;
1311 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1312#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1313 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1314#endif 1608#endif
1315 1609#if EV_USE_SIGNALFD
1316 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1317#ifndef _WIN32
1318 if (flags & EVFLAG_FORKCHECK)
1319 curpid = getpid ();
1320#endif 1611#endif
1321
1322 if (!(flags & EVFLAG_NOENV)
1323 && !enable_secure ()
1324 && getenv ("LIBEV_FLAGS"))
1325 flags = atoi (getenv ("LIBEV_FLAGS"));
1326 1612
1327 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1328 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1329 1615
1330#if EV_USE_PORT 1616#if EV_USE_PORT
… …
1341#endif 1627#endif
1342#if EV_USE_SELECT 1628#if EV_USE_SELECT
1343 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1344#endif 1630#endif
1345 1631
1632 ev_prepare_init (&pending_w, pendingcb);
1633
1346 ev_init (&pipeev, pipecb); 1634 ev_init (&pipe_w, pipecb);
1347 ev_set_priority (&pipeev, EV_MAXPRI); 1635 ev_set_priority (&pipe_w, EV_MAXPRI);
1348 } 1636 }
1349} 1637}
1350 1638
1639/* free up a loop structure */
1351static void noinline 1640static void noinline
1352loop_destroy (EV_P) 1641loop_destroy (EV_P)
1353{ 1642{
1354 int i; 1643 int i;
1355 1644
1356 if (ev_is_active (&pipeev)) 1645 if (ev_is_active (&pipe_w))
1357 { 1646 {
1358 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1359 ev_io_stop (EV_A_ &pipeev); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1360 1649
1361#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1362 if (evfd >= 0) 1651 if (evfd >= 0)
1363 close (evfd); 1652 close (evfd);
1364#endif 1653#endif
1365 1654
1366 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1367 { 1656 {
1368 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1369 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1370 } 1659 }
1371 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 close (sigfd);
1665#endif
1372 1666
1373#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1374 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1375 close (fs_fd); 1669 close (fs_fd);
1376#endif 1670#endif
… …
1400#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1401 array_free (idle, [i]); 1695 array_free (idle, [i]);
1402#endif 1696#endif
1403 } 1697 }
1404 1698
1405 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1406 1700
1407 /* have to use the microsoft-never-gets-it-right macro */ 1701 /* have to use the microsoft-never-gets-it-right macro */
1702 array_free (rfeed, EMPTY);
1408 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1409 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
1410#if EV_PERIODIC_ENABLE 1705#if EV_PERIODIC_ENABLE
1411 array_free (periodic, EMPTY); 1706 array_free (periodic, EMPTY);
1412#endif 1707#endif
… …
1421 1716
1422 backend = 0; 1717 backend = 0;
1423} 1718}
1424 1719
1425#if EV_USE_INOTIFY 1720#if EV_USE_INOTIFY
1426void inline_size infy_fork (EV_P); 1721inline_size void infy_fork (EV_P);
1427#endif 1722#endif
1428 1723
1429void inline_size 1724inline_size void
1430loop_fork (EV_P) 1725loop_fork (EV_P)
1431{ 1726{
1432#if EV_USE_PORT 1727#if EV_USE_PORT
1433 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1728 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1434#endif 1729#endif
… …
1440#endif 1735#endif
1441#if EV_USE_INOTIFY 1736#if EV_USE_INOTIFY
1442 infy_fork (EV_A); 1737 infy_fork (EV_A);
1443#endif 1738#endif
1444 1739
1445 if (ev_is_active (&pipeev)) 1740 if (ev_is_active (&pipe_w))
1446 { 1741 {
1447 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1448 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1449 gotsig = 1; 1744 sig_pending = 1;
1450#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1451 gotasync = 1; 1746 async_pending = 1;
1452#endif 1747#endif
1453 1748
1454 ev_ref (EV_A); 1749 ev_ref (EV_A);
1455 ev_io_stop (EV_A_ &pipeev); 1750 ev_io_stop (EV_A_ &pipe_w);
1456 1751
1457#if EV_USE_EVENTFD 1752#if EV_USE_EVENTFD
1458 if (evfd >= 0) 1753 if (evfd >= 0)
1459 close (evfd); 1754 close (evfd);
1460#endif 1755#endif
1461 1756
1462 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1463 { 1758 {
1464 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1465 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1466 } 1761 }
1467 1762
1468 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1469 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1470 pipecb (EV_A_ &pipeev, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
1471 } 1766 }
1472 1767
1473 postfork = 0; 1768 postfork = 0;
1474} 1769}
1475 1770
1476#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1477 1772
1478struct ev_loop * 1773struct ev_loop *
1479ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1480{ 1775{
1481 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1776 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1482 1777
1483 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1484
1485 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1486 1780
1487 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1488 return loop; 1782 return EV_A;
1489 1783
1490 return 0; 1784 return 0;
1491} 1785}
1492 1786
1493void 1787void
… …
1500void 1794void
1501ev_loop_fork (EV_P) 1795ev_loop_fork (EV_P)
1502{ 1796{
1503 postfork = 1; /* must be in line with ev_default_fork */ 1797 postfork = 1; /* must be in line with ev_default_fork */
1504} 1798}
1799#endif /* multiplicity */
1505 1800
1506#if EV_VERIFY 1801#if EV_VERIFY
1507static void noinline 1802static void noinline
1508verify_watcher (EV_P_ W w) 1803verify_watcher (EV_P_ W w)
1509{ 1804{
1510 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1805 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1511 1806
1512 if (w->pending) 1807 if (w->pending)
1513 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1808 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1514} 1809}
1515 1810
1516static void noinline 1811static void noinline
1517verify_heap (EV_P_ ANHE *heap, int N) 1812verify_heap (EV_P_ ANHE *heap, int N)
1518{ 1813{
1519 int i; 1814 int i;
1520 1815
1521 for (i = HEAP0; i < N + HEAP0; ++i) 1816 for (i = HEAP0; i < N + HEAP0; ++i)
1522 { 1817 {
1523 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1818 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]))); 1819 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])))); 1820 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1526 1821
1527 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1822 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1528 } 1823 }
1529} 1824}
1530 1825
1531static void noinline 1826static void noinline
1532array_verify (EV_P_ W *ws, int cnt) 1827array_verify (EV_P_ W *ws, int cnt)
1533{ 1828{
1534 while (cnt--) 1829 while (cnt--)
1535 { 1830 {
1536 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1831 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1537 verify_watcher (EV_A_ ws [cnt]); 1832 verify_watcher (EV_A_ ws [cnt]);
1538 } 1833 }
1539} 1834}
1540#endif 1835#endif
1541 1836
1837#if EV_MINIMAL < 2
1542void 1838void
1543ev_loop_verify (EV_P) 1839ev_loop_verify (EV_P)
1544{ 1840{
1545#if EV_VERIFY 1841#if EV_VERIFY
1546 int i; 1842 int i;
… …
1548 1844
1549 assert (activecnt >= -1); 1845 assert (activecnt >= -1);
1550 1846
1551 assert (fdchangemax >= fdchangecnt); 1847 assert (fdchangemax >= fdchangecnt);
1552 for (i = 0; i < fdchangecnt; ++i) 1848 for (i = 0; i < fdchangecnt; ++i)
1553 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1849 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1554 1850
1555 assert (anfdmax >= 0); 1851 assert (anfdmax >= 0);
1556 for (i = 0; i < anfdmax; ++i) 1852 for (i = 0; i < anfdmax; ++i)
1557 for (w = anfds [i].head; w; w = w->next) 1853 for (w = anfds [i].head; w; w = w->next)
1558 { 1854 {
1559 verify_watcher (EV_A_ (W)w); 1855 verify_watcher (EV_A_ (W)w);
1560 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1856 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)); 1857 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1562 } 1858 }
1563 1859
1564 assert (timermax >= timercnt); 1860 assert (timermax >= timercnt);
1565 verify_heap (EV_A_ timers, timercnt); 1861 verify_heap (EV_A_ timers, timercnt);
1566 1862
… …
1595 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1596 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1597 1893
1598# if 0 1894# if 0
1599 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1895 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) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1601# endif
1602#endif 1897# endif
1898#endif
1603} 1899}
1604 1900#endif
1605#endif /* multiplicity */
1606 1901
1607#if EV_MULTIPLICITY 1902#if EV_MULTIPLICITY
1608struct ev_loop * 1903struct ev_loop *
1609ev_default_loop_init (unsigned int flags) 1904ev_default_loop_init (unsigned int flags)
1610#else 1905#else
… …
1613#endif 1908#endif
1614{ 1909{
1615 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1616 { 1911 {
1617#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1618 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1619#else 1914#else
1620 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1621#endif 1916#endif
1622 1917
1623 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
… …
1640 1935
1641void 1936void
1642ev_default_destroy (void) 1937ev_default_destroy (void)
1643{ 1938{
1644#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1645 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1646#endif 1941#endif
1647 1942
1648 ev_default_loop_ptr = 0; 1943 ev_default_loop_ptr = 0;
1649 1944
1650#ifndef _WIN32 1945#ifndef _WIN32
… …
1657 1952
1658void 1953void
1659ev_default_fork (void) 1954ev_default_fork (void)
1660{ 1955{
1661#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1662 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1663#endif 1958#endif
1664 1959
1665 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1666} 1961}
1667 1962
… …
1671ev_invoke (EV_P_ void *w, int revents) 1966ev_invoke (EV_P_ void *w, int revents)
1672{ 1967{
1673 EV_CB_INVOKE ((W)w, revents); 1968 EV_CB_INVOKE ((W)w, revents);
1674} 1969}
1675 1970
1676void inline_speed 1971unsigned int
1677call_pending (EV_P) 1972ev_pending_count (EV_P)
1973{
1974 int pri;
1975 unsigned int count = 0;
1976
1977 for (pri = NUMPRI; pri--; )
1978 count += pendingcnt [pri];
1979
1980 return count;
1981}
1982
1983void noinline
1984ev_invoke_pending (EV_P)
1678{ 1985{
1679 int pri; 1986 int pri;
1680 1987
1681 for (pri = NUMPRI; pri--; ) 1988 for (pri = NUMPRI; pri--; )
1682 while (pendingcnt [pri]) 1989 while (pendingcnt [pri])
1683 { 1990 {
1684 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1991 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1685 1992
1686 if (expect_true (p->w))
1687 {
1688 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1993 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1994 /* ^ this is no longer true, as pending_w could be here */
1689 1995
1690 p->w->pending = 0; 1996 p->w->pending = 0;
1691 EV_CB_INVOKE (p->w, p->events); 1997 EV_CB_INVOKE (p->w, p->events);
1692 EV_FREQUENT_CHECK; 1998 EV_FREQUENT_CHECK;
1693 }
1694 } 1999 }
1695} 2000}
1696 2001
1697#if EV_IDLE_ENABLE 2002#if EV_IDLE_ENABLE
1698void inline_size 2003/* make idle watchers pending. this handles the "call-idle */
2004/* only when higher priorities are idle" logic */
2005inline_size void
1699idle_reify (EV_P) 2006idle_reify (EV_P)
1700{ 2007{
1701 if (expect_false (idleall)) 2008 if (expect_false (idleall))
1702 { 2009 {
1703 int pri; 2010 int pri;
… …
1715 } 2022 }
1716 } 2023 }
1717} 2024}
1718#endif 2025#endif
1719 2026
1720void inline_size 2027/* make timers pending */
2028inline_size void
1721timers_reify (EV_P) 2029timers_reify (EV_P)
1722{ 2030{
1723 EV_FREQUENT_CHECK; 2031 EV_FREQUENT_CHECK;
1724 2032
1725 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2033 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1726 { 2034 {
1727 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2035 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 { 2036 {
2037 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2038
2039 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2040
2041 /* first reschedule or stop timer */
2042 if (w->repeat)
2043 {
1734 ev_at (w) += w->repeat; 2044 ev_at (w) += w->repeat;
1735 if (ev_at (w) < mn_now) 2045 if (ev_at (w) < mn_now)
1736 ev_at (w) = mn_now; 2046 ev_at (w) = mn_now;
1737 2047
1738 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2048 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1739 2049
1740 ANHE_at_cache (timers [HEAP0]); 2050 ANHE_at_cache (timers [HEAP0]);
1741 downheap (timers, timercnt, HEAP0); 2051 downheap (timers, timercnt, HEAP0);
2052 }
2053 else
2054 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2055
2056 EV_FREQUENT_CHECK;
2057 feed_reverse (EV_A_ (W)w);
1742 } 2058 }
1743 else 2059 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1744 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1745 2060
1746 EV_FREQUENT_CHECK;
1747 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2061 feed_reverse_done (EV_A_ EV_TIMEOUT);
1748 } 2062 }
1749} 2063}
1750 2064
1751#if EV_PERIODIC_ENABLE 2065#if EV_PERIODIC_ENABLE
1752void inline_size 2066/* make periodics pending */
2067inline_size void
1753periodics_reify (EV_P) 2068periodics_reify (EV_P)
1754{ 2069{
1755 EV_FREQUENT_CHECK; 2070 EV_FREQUENT_CHECK;
1756 2071
1757 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2072 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1758 { 2073 {
1759 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2074 int feed_count = 0;
1760 2075
1761 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2076 do
1762
1763 /* first reschedule or stop timer */
1764 if (w->reschedule_cb)
1765 { 2077 {
2078 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2079
2080 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2081
2082 /* first reschedule or stop timer */
2083 if (w->reschedule_cb)
2084 {
1766 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2085 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1767 2086
1768 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2087 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1769 2088
1770 ANHE_at_cache (periodics [HEAP0]); 2089 ANHE_at_cache (periodics [HEAP0]);
1771 downheap (periodics, periodiccnt, HEAP0); 2090 downheap (periodics, periodiccnt, HEAP0);
2091 }
2092 else if (w->interval)
2093 {
2094 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2095 /* if next trigger time is not sufficiently in the future, put it there */
2096 /* this might happen because of floating point inexactness */
2097 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2098 {
2099 ev_at (w) += w->interval;
2100
2101 /* if interval is unreasonably low we might still have a time in the past */
2102 /* so correct this. this will make the periodic very inexact, but the user */
2103 /* has effectively asked to get triggered more often than possible */
2104 if (ev_at (w) < ev_rt_now)
2105 ev_at (w) = ev_rt_now;
2106 }
2107
2108 ANHE_at_cache (periodics [HEAP0]);
2109 downheap (periodics, periodiccnt, HEAP0);
2110 }
2111 else
2112 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2113
2114 EV_FREQUENT_CHECK;
2115 feed_reverse (EV_A_ (W)w);
1772 } 2116 }
1773 else if (w->interval) 2117 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 2118
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); 2119 feed_reverse_done (EV_A_ EV_PERIODIC);
1797 } 2120 }
1798} 2121}
1799 2122
2123/* simply recalculate all periodics */
2124/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1800static void noinline 2125static void noinline
1801periodics_reschedule (EV_P) 2126periodics_reschedule (EV_P)
1802{ 2127{
1803 int i; 2128 int i;
1804 2129
… …
1817 2142
1818 reheap (periodics, periodiccnt); 2143 reheap (periodics, periodiccnt);
1819} 2144}
1820#endif 2145#endif
1821 2146
1822void inline_speed 2147/* adjust all timers by a given offset */
2148static void noinline
2149timers_reschedule (EV_P_ ev_tstamp adjust)
2150{
2151 int i;
2152
2153 for (i = 0; i < timercnt; ++i)
2154 {
2155 ANHE *he = timers + i + HEAP0;
2156 ANHE_w (*he)->at += adjust;
2157 ANHE_at_cache (*he);
2158 }
2159}
2160
2161/* fetch new monotonic and realtime times from the kernel */
2162/* also detect if there was a timejump, and act accordingly */
2163inline_speed void
1823time_update (EV_P_ ev_tstamp max_block) 2164time_update (EV_P_ ev_tstamp max_block)
1824{ 2165{
1825 int i;
1826
1827#if EV_USE_MONOTONIC 2166#if EV_USE_MONOTONIC
1828 if (expect_true (have_monotonic)) 2167 if (expect_true (have_monotonic))
1829 { 2168 {
2169 int i;
1830 ev_tstamp odiff = rtmn_diff; 2170 ev_tstamp odiff = rtmn_diff;
1831 2171
1832 mn_now = get_clock (); 2172 mn_now = get_clock ();
1833 2173
1834 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2174 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1860 ev_rt_now = ev_time (); 2200 ev_rt_now = ev_time ();
1861 mn_now = get_clock (); 2201 mn_now = get_clock ();
1862 now_floor = mn_now; 2202 now_floor = mn_now;
1863 } 2203 }
1864 2204
2205 /* no timer adjustment, as the monotonic clock doesn't jump */
2206 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865# if EV_PERIODIC_ENABLE 2207# if EV_PERIODIC_ENABLE
1866 periodics_reschedule (EV_A); 2208 periodics_reschedule (EV_A);
1867# endif 2209# endif
1868 /* no timer adjustment, as the monotonic clock doesn't jump */
1869 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1870 } 2210 }
1871 else 2211 else
1872#endif 2212#endif
1873 { 2213 {
1874 ev_rt_now = ev_time (); 2214 ev_rt_now = ev_time ();
1875 2215
1876 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2216 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1877 { 2217 {
2218 /* adjust timers. this is easy, as the offset is the same for all of them */
2219 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1878#if EV_PERIODIC_ENABLE 2220#if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2221 periodics_reschedule (EV_A);
1880#endif 2222#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 } 2223 }
1889 2224
1890 mn_now = ev_rt_now; 2225 mn_now = ev_rt_now;
1891 } 2226 }
1892} 2227}
1893 2228
1894void 2229void
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) 2230ev_loop (EV_P_ int flags)
1916{ 2231{
2232#if EV_MINIMAL < 2
2233 ++loop_depth;
2234#endif
2235
2236 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2237
1917 loop_done = EVUNLOOP_CANCEL; 2238 loop_done = EVUNLOOP_CANCEL;
1918 2239
1919 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2240 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1920 2241
1921 do 2242 do
1922 { 2243 {
1923#if EV_VERIFY >= 2 2244#if EV_VERIFY >= 2
1924 ev_loop_verify (EV_A); 2245 ev_loop_verify (EV_A);
… …
1937 /* we might have forked, so queue fork handlers */ 2258 /* we might have forked, so queue fork handlers */
1938 if (expect_false (postfork)) 2259 if (expect_false (postfork))
1939 if (forkcnt) 2260 if (forkcnt)
1940 { 2261 {
1941 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1942 call_pending (EV_A); 2263 EV_INVOKE_PENDING;
1943 } 2264 }
1944#endif 2265#endif
1945 2266
1946 /* queue prepare watchers (and execute them) */ 2267 /* queue prepare watchers (and execute them) */
1947 if (expect_false (preparecnt)) 2268 if (expect_false (preparecnt))
1948 { 2269 {
1949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1950 call_pending (EV_A); 2271 EV_INVOKE_PENDING;
1951 } 2272 }
1952 2273
1953 if (expect_false (!activecnt)) 2274 if (expect_false (loop_done))
1954 break; 2275 break;
1955 2276
1956 /* we might have forked, so reify kernel state if necessary */ 2277 /* we might have forked, so reify kernel state if necessary */
1957 if (expect_false (postfork)) 2278 if (expect_false (postfork))
1958 loop_fork (EV_A); 2279 loop_fork (EV_A);
… …
1965 ev_tstamp waittime = 0.; 2286 ev_tstamp waittime = 0.;
1966 ev_tstamp sleeptime = 0.; 2287 ev_tstamp sleeptime = 0.;
1967 2288
1968 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2289 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1969 { 2290 {
2291 /* remember old timestamp for io_blocktime calculation */
2292 ev_tstamp prev_mn_now = mn_now;
2293
1970 /* update time to cancel out callback processing overhead */ 2294 /* update time to cancel out callback processing overhead */
1971 time_update (EV_A_ 1e100); 2295 time_update (EV_A_ 1e100);
1972 2296
1973 waittime = MAX_BLOCKTIME; 2297 waittime = MAX_BLOCKTIME;
1974 2298
… …
1984 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2308 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1985 if (waittime > to) waittime = to; 2309 if (waittime > to) waittime = to;
1986 } 2310 }
1987#endif 2311#endif
1988 2312
2313 /* don't let timeouts decrease the waittime below timeout_blocktime */
1989 if (expect_false (waittime < timeout_blocktime)) 2314 if (expect_false (waittime < timeout_blocktime))
1990 waittime = timeout_blocktime; 2315 waittime = timeout_blocktime;
1991 2316
1992 sleeptime = waittime - backend_fudge; 2317 /* extra check because io_blocktime is commonly 0 */
1993
1994 if (expect_true (sleeptime > io_blocktime)) 2318 if (expect_false (io_blocktime))
1995 sleeptime = io_blocktime;
1996
1997 if (sleeptime)
1998 { 2319 {
2320 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2321
2322 if (sleeptime > waittime - backend_fudge)
2323 sleeptime = waittime - backend_fudge;
2324
2325 if (expect_true (sleeptime > 0.))
2326 {
1999 ev_sleep (sleeptime); 2327 ev_sleep (sleeptime);
2000 waittime -= sleeptime; 2328 waittime -= sleeptime;
2329 }
2001 } 2330 }
2002 } 2331 }
2003 2332
2333#if EV_MINIMAL < 2
2004 ++loop_count; 2334 ++loop_count;
2335#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2005 backend_poll (EV_A_ waittime); 2337 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2006 2339
2007 /* update ev_rt_now, do magic */ 2340 /* update ev_rt_now, do magic */
2008 time_update (EV_A_ waittime + sleeptime); 2341 time_update (EV_A_ waittime + sleeptime);
2009 } 2342 }
2010 2343
… …
2021 2354
2022 /* queue check watchers, to be executed first */ 2355 /* queue check watchers, to be executed first */
2023 if (expect_false (checkcnt)) 2356 if (expect_false (checkcnt))
2024 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2025 2358
2026 call_pending (EV_A); 2359 EV_INVOKE_PENDING;
2027 } 2360 }
2028 while (expect_true ( 2361 while (expect_true (
2029 activecnt 2362 activecnt
2030 && !loop_done 2363 && !loop_done
2031 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2364 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2032 )); 2365 ));
2033 2366
2034 if (loop_done == EVUNLOOP_ONE) 2367 if (loop_done == EVUNLOOP_ONE)
2035 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVUNLOOP_CANCEL;
2369
2370#if EV_MINIMAL < 2
2371 --loop_depth;
2372#endif
2036} 2373}
2037 2374
2038void 2375void
2039ev_unloop (EV_P_ int how) 2376ev_unloop (EV_P_ int how)
2040{ 2377{
2041 loop_done = how; 2378 loop_done = how;
2042} 2379}
2043 2380
2381void
2382ev_ref (EV_P)
2383{
2384 ++activecnt;
2385}
2386
2387void
2388ev_unref (EV_P)
2389{
2390 --activecnt;
2391}
2392
2393void
2394ev_now_update (EV_P)
2395{
2396 time_update (EV_A_ 1e100);
2397}
2398
2399void
2400ev_suspend (EV_P)
2401{
2402 ev_now_update (EV_A);
2403}
2404
2405void
2406ev_resume (EV_P)
2407{
2408 ev_tstamp mn_prev = mn_now;
2409
2410 ev_now_update (EV_A);
2411 timers_reschedule (EV_A_ mn_now - mn_prev);
2412#if EV_PERIODIC_ENABLE
2413 /* TODO: really do this? */
2414 periodics_reschedule (EV_A);
2415#endif
2416}
2417
2044/*****************************************************************************/ 2418/*****************************************************************************/
2419/* singly-linked list management, used when the expected list length is short */
2045 2420
2046void inline_size 2421inline_size void
2047wlist_add (WL *head, WL elem) 2422wlist_add (WL *head, WL elem)
2048{ 2423{
2049 elem->next = *head; 2424 elem->next = *head;
2050 *head = elem; 2425 *head = elem;
2051} 2426}
2052 2427
2053void inline_size 2428inline_size void
2054wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2055{ 2430{
2056 while (*head) 2431 while (*head)
2057 { 2432 {
2058 if (*head == elem) 2433 if (expect_true (*head == elem))
2059 { 2434 {
2060 *head = elem->next; 2435 *head = elem->next;
2061 return; 2436 break;
2062 } 2437 }
2063 2438
2064 head = &(*head)->next; 2439 head = &(*head)->next;
2065 } 2440 }
2066} 2441}
2067 2442
2068void inline_speed 2443/* internal, faster, version of ev_clear_pending */
2444inline_speed void
2069clear_pending (EV_P_ W w) 2445clear_pending (EV_P_ W w)
2070{ 2446{
2071 if (w->pending) 2447 if (w->pending)
2072 { 2448 {
2073 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2449 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2074 w->pending = 0; 2450 w->pending = 0;
2075 } 2451 }
2076} 2452}
2077 2453
2078int 2454int
… …
2082 int pending = w_->pending; 2458 int pending = w_->pending;
2083 2459
2084 if (expect_true (pending)) 2460 if (expect_true (pending))
2085 { 2461 {
2086 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2462 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2463 p->w = (W)&pending_w;
2087 w_->pending = 0; 2464 w_->pending = 0;
2088 p->w = 0;
2089 return p->events; 2465 return p->events;
2090 } 2466 }
2091 else 2467 else
2092 return 0; 2468 return 0;
2093} 2469}
2094 2470
2095void inline_size 2471inline_size void
2096pri_adjust (EV_P_ W w) 2472pri_adjust (EV_P_ W w)
2097{ 2473{
2098 int pri = w->priority; 2474 int pri = ev_priority (w);
2099 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2475 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2100 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2476 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2101 w->priority = pri; 2477 ev_set_priority (w, pri);
2102} 2478}
2103 2479
2104void inline_speed 2480inline_speed void
2105ev_start (EV_P_ W w, int active) 2481ev_start (EV_P_ W w, int active)
2106{ 2482{
2107 pri_adjust (EV_A_ w); 2483 pri_adjust (EV_A_ w);
2108 w->active = active; 2484 w->active = active;
2109 ev_ref (EV_A); 2485 ev_ref (EV_A);
2110} 2486}
2111 2487
2112void inline_size 2488inline_size void
2113ev_stop (EV_P_ W w) 2489ev_stop (EV_P_ W w)
2114{ 2490{
2115 ev_unref (EV_A); 2491 ev_unref (EV_A);
2116 w->active = 0; 2492 w->active = 0;
2117} 2493}
… …
2124 int fd = w->fd; 2500 int fd = w->fd;
2125 2501
2126 if (expect_false (ev_is_active (w))) 2502 if (expect_false (ev_is_active (w)))
2127 return; 2503 return;
2128 2504
2129 assert (("ev_io_start called with negative fd", fd >= 0)); 2505 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)))); 2506 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2131 2507
2132 EV_FREQUENT_CHECK; 2508 EV_FREQUENT_CHECK;
2133 2509
2134 ev_start (EV_A_ (W)w, 1); 2510 ev_start (EV_A_ (W)w, 1);
2135 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2136 wlist_add (&anfds[fd].head, (WL)w); 2512 wlist_add (&anfds[fd].head, (WL)w);
2137 2513
2138 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2514 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2139 w->events &= ~EV_IOFDSET; 2515 w->events &= ~EV__IOFDSET;
2140 2516
2141 EV_FREQUENT_CHECK; 2517 EV_FREQUENT_CHECK;
2142} 2518}
2143 2519
2144void noinline 2520void noinline
… …
2146{ 2522{
2147 clear_pending (EV_A_ (W)w); 2523 clear_pending (EV_A_ (W)w);
2148 if (expect_false (!ev_is_active (w))) 2524 if (expect_false (!ev_is_active (w)))
2149 return; 2525 return;
2150 2526
2151 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2527 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2152 2528
2153 EV_FREQUENT_CHECK; 2529 EV_FREQUENT_CHECK;
2154 2530
2155 wlist_del (&anfds[w->fd].head, (WL)w); 2531 wlist_del (&anfds[w->fd].head, (WL)w);
2156 ev_stop (EV_A_ (W)w); 2532 ev_stop (EV_A_ (W)w);
… …
2166 if (expect_false (ev_is_active (w))) 2542 if (expect_false (ev_is_active (w)))
2167 return; 2543 return;
2168 2544
2169 ev_at (w) += mn_now; 2545 ev_at (w) += mn_now;
2170 2546
2171 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2547 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2172 2548
2173 EV_FREQUENT_CHECK; 2549 EV_FREQUENT_CHECK;
2174 2550
2175 ++timercnt; 2551 ++timercnt;
2176 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2552 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2179 ANHE_at_cache (timers [ev_active (w)]); 2555 ANHE_at_cache (timers [ev_active (w)]);
2180 upheap (timers, ev_active (w)); 2556 upheap (timers, ev_active (w));
2181 2557
2182 EV_FREQUENT_CHECK; 2558 EV_FREQUENT_CHECK;
2183 2559
2184 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2560 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2185} 2561}
2186 2562
2187void noinline 2563void noinline
2188ev_timer_stop (EV_P_ ev_timer *w) 2564ev_timer_stop (EV_P_ ev_timer *w)
2189{ 2565{
… …
2194 EV_FREQUENT_CHECK; 2570 EV_FREQUENT_CHECK;
2195 2571
2196 { 2572 {
2197 int active = ev_active (w); 2573 int active = ev_active (w);
2198 2574
2199 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2575 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2200 2576
2201 --timercnt; 2577 --timercnt;
2202 2578
2203 if (expect_true (active < timercnt + HEAP0)) 2579 if (expect_true (active < timercnt + HEAP0))
2204 { 2580 {
… …
2237 } 2613 }
2238 2614
2239 EV_FREQUENT_CHECK; 2615 EV_FREQUENT_CHECK;
2240} 2616}
2241 2617
2618ev_tstamp
2619ev_timer_remaining (EV_P_ ev_timer *w)
2620{
2621 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2622}
2623
2242#if EV_PERIODIC_ENABLE 2624#if EV_PERIODIC_ENABLE
2243void noinline 2625void noinline
2244ev_periodic_start (EV_P_ ev_periodic *w) 2626ev_periodic_start (EV_P_ ev_periodic *w)
2245{ 2627{
2246 if (expect_false (ev_is_active (w))) 2628 if (expect_false (ev_is_active (w)))
… …
2248 2630
2249 if (w->reschedule_cb) 2631 if (w->reschedule_cb)
2250 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2632 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2251 else if (w->interval) 2633 else if (w->interval)
2252 { 2634 {
2253 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2635 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 */ 2636 /* 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; 2637 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2256 } 2638 }
2257 else 2639 else
2258 ev_at (w) = w->offset; 2640 ev_at (w) = w->offset;
… …
2266 ANHE_at_cache (periodics [ev_active (w)]); 2648 ANHE_at_cache (periodics [ev_active (w)]);
2267 upheap (periodics, ev_active (w)); 2649 upheap (periodics, ev_active (w));
2268 2650
2269 EV_FREQUENT_CHECK; 2651 EV_FREQUENT_CHECK;
2270 2652
2271 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2653 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2272} 2654}
2273 2655
2274void noinline 2656void noinline
2275ev_periodic_stop (EV_P_ ev_periodic *w) 2657ev_periodic_stop (EV_P_ ev_periodic *w)
2276{ 2658{
… …
2281 EV_FREQUENT_CHECK; 2663 EV_FREQUENT_CHECK;
2282 2664
2283 { 2665 {
2284 int active = ev_active (w); 2666 int active = ev_active (w);
2285 2667
2286 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2668 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2287 2669
2288 --periodiccnt; 2670 --periodiccnt;
2289 2671
2290 if (expect_true (active < periodiccnt + HEAP0)) 2672 if (expect_true (active < periodiccnt + HEAP0))
2291 { 2673 {
… …
2313#endif 2695#endif
2314 2696
2315void noinline 2697void noinline
2316ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2317{ 2699{
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))) 2700 if (expect_false (ev_is_active (w)))
2322 return; 2701 return;
2323 2702
2324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2703 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2325 2704
2326 evpipe_init (EV_A); 2705#if EV_MULTIPLICITY
2706 assert (("libev: a signal must not be attached to two different loops",
2707 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2327 2708
2328 EV_FREQUENT_CHECK; 2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2329 2711
2712 EV_FREQUENT_CHECK;
2713
2714#if EV_USE_SIGNALFD
2715 if (sigfd == -2)
2330 { 2716 {
2331#ifndef _WIN32 2717 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2332 sigset_t full, prev; 2718 if (sigfd < 0 && errno == EINVAL)
2333 sigfillset (&full); 2719 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2334 sigprocmask (SIG_SETMASK, &full, &prev);
2335#endif
2336 2720
2337 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2721 if (sigfd >= 0)
2722 {
2723 fd_intern (sigfd); /* doing it twice will not hurt */
2338 2724
2339#ifndef _WIN32 2725 sigemptyset (&sigfd_set);
2340 sigprocmask (SIG_SETMASK, &prev, 0); 2726
2341#endif 2727 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2728 ev_set_priority (&sigfd_w, EV_MAXPRI);
2729 ev_io_start (EV_A_ &sigfd_w);
2730 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2731 }
2342 } 2732 }
2733
2734 if (sigfd >= 0)
2735 {
2736 /* TODO: check .head */
2737 sigaddset (&sigfd_set, w->signum);
2738 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2739
2740 signalfd (sigfd, &sigfd_set, 0);
2741 }
2742#endif
2343 2743
2344 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2345 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2346 2746
2347 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2348 { 2751 {
2349#if _WIN32 2752# ifdef _WIN32
2753 evpipe_init (EV_A);
2754
2350 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2351#else 2756# else
2352 struct sigaction sa; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2353 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2354 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2355 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2763 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2356 sigaction (w->signum, &sa, 0); 2764 sigaction (w->signum, &sa, 0);
2765
2766 sigemptyset (&sa.sa_mask);
2767 sigaddset (&sa.sa_mask, w->signum);
2768 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2357#endif 2769#endif
2358 } 2770 }
2359 2771
2360 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2361} 2773}
2362 2774
2363void noinline 2775void noinline
… …
2371 2783
2372 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2373 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2374 2786
2375 if (!signals [w->signum - 1].head) 2787 if (!signals [w->signum - 1].head)
2788 {
2789#if EV_MULTIPLICITY
2790 signals [w->signum - 1].loop = 0; /* unattach from signal */
2791#endif
2792#if EV_USE_SIGNALFD
2793 if (sigfd >= 0)
2794 {
2795 sigset_t ss;
2796
2797 sigemptyset (&ss);
2798 sigaddset (&ss, w->signum);
2799 sigdelset (&sigfd_set, w->signum);
2800
2801 signalfd (sigfd, &sigfd_set, 0);
2802 sigprocmask (SIG_UNBLOCK, &ss, 0);
2803 }
2804 else
2805#endif
2376 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2377 2808
2378 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2379} 2810}
2380 2811
2381void 2812void
2382ev_child_start (EV_P_ ev_child *w) 2813ev_child_start (EV_P_ ev_child *w)
2383{ 2814{
2384#if EV_MULTIPLICITY 2815#if EV_MULTIPLICITY
2385 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2816 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2386#endif 2817#endif
2387 if (expect_false (ev_is_active (w))) 2818 if (expect_false (ev_is_active (w)))
2388 return; 2819 return;
2389 2820
2390 EV_FREQUENT_CHECK; 2821 EV_FREQUENT_CHECK;
… …
2415# ifdef _WIN32 2846# ifdef _WIN32
2416# undef lstat 2847# undef lstat
2417# define lstat(a,b) _stati64 (a,b) 2848# define lstat(a,b) _stati64 (a,b)
2418# endif 2849# endif
2419 2850
2420#define DEF_STAT_INTERVAL 5.0074891 2851#define DEF_STAT_INTERVAL 5.0074891
2852#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2421#define MIN_STAT_INTERVAL 0.1074891 2853#define MIN_STAT_INTERVAL 0.1074891
2422 2854
2423static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2424 2856
2425#if EV_USE_INOTIFY 2857#if EV_USE_INOTIFY
2426# define EV_INOTIFY_BUFSIZE 8192 2858# define EV_INOTIFY_BUFSIZE 8192
… …
2428static void noinline 2860static void noinline
2429infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2430{ 2862{
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); 2863 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 2864
2433 if (w->wd < 0) 2865 if (w->wd >= 0)
2866 {
2867 struct statfs sfs;
2868
2869 /* now local changes will be tracked by inotify, but remote changes won't */
2870 /* unless the filesystem is known to be local, we therefore still poll */
2871 /* also do poll on <2.6.25, but with normal frequency */
2872
2873 if (!fs_2625)
2874 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2875 else if (!statfs (w->path, &sfs)
2876 && (sfs.f_type == 0x1373 /* devfs */
2877 || sfs.f_type == 0xEF53 /* ext2/3 */
2878 || sfs.f_type == 0x3153464a /* jfs */
2879 || sfs.f_type == 0x52654973 /* reiser3 */
2880 || sfs.f_type == 0x01021994 /* tempfs */
2881 || sfs.f_type == 0x58465342 /* xfs */))
2882 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2883 else
2884 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2434 { 2885 }
2435 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2886 else
2887 {
2888 /* can't use inotify, continue to stat */
2889 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2436 2890
2437 /* monitor some parent directory for speedup hints */ 2891 /* 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, */ 2892 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2439 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2440 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2441 { 2895 {
2442 char path [4096]; 2896 char path [4096];
… …
2447 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2901 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2448 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2902 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2449 2903
2450 char *pend = strrchr (path, '/'); 2904 char *pend = strrchr (path, '/');
2451 2905
2452 if (!pend) 2906 if (!pend || pend == path)
2453 break; /* whoops, no '/', complain to your admin */ 2907 break;
2454 2908
2455 *pend = 0; 2909 *pend = 0;
2456 w->wd = inotify_add_watch (fs_fd, path, mask); 2910 w->wd = inotify_add_watch (fs_fd, path, mask);
2457 } 2911 }
2458 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2459 } 2913 }
2460 } 2914 }
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 2915
2465 if (w->wd >= 0) 2916 if (w->wd >= 0)
2466 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2917 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2918
2919 /* now re-arm timer, if required */
2920 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2921 ev_timer_again (EV_A_ &w->timer);
2922 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2467} 2923}
2468 2924
2469static void noinline 2925static void noinline
2470infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2471{ 2927{
… …
2501 2957
2502 if (w->wd == wd || wd == -1) 2958 if (w->wd == wd || wd == -1)
2503 { 2959 {
2504 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2960 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2505 { 2961 {
2962 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2506 w->wd = -1; 2963 w->wd = -1;
2507 infy_add (EV_A_ w); /* re-add, no matter what */ 2964 infy_add (EV_A_ w); /* re-add, no matter what */
2508 } 2965 }
2509 2966
2510 stat_timer_cb (EV_A_ &w->timer, 0); 2967 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2523 2980
2524 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2981 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2525 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2982 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2526} 2983}
2527 2984
2528void inline_size 2985inline_size void
2529infy_init (EV_P) 2986check_2625 (EV_P)
2530{ 2987{
2531 if (fs_fd != -2)
2532 return;
2533
2534 /* kernels < 2.6.25 are borked 2988 /* kernels < 2.6.25 are borked
2535 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2989 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2536 */ 2990 */
2537 {
2538 struct utsname buf; 2991 struct utsname buf;
2539 int major, minor, micro; 2992 int major, minor, micro;
2540 2993
2541 fs_fd = -1;
2542
2543 if (uname (&buf)) 2994 if (uname (&buf))
2544 return; 2995 return;
2545 2996
2546 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2997 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2547 return; 2998 return;
2548 2999
2549 if (major < 2 3000 if (major < 2
2550 || (major == 2 && minor < 6) 3001 || (major == 2 && minor < 6)
2551 || (major == 2 && minor == 6 && micro < 25)) 3002 || (major == 2 && minor == 6 && micro < 25))
2552 return; 3003 return;
2553 }
2554 3004
3005 fs_2625 = 1;
3006}
3007
3008inline_size int
3009infy_newfd (void)
3010{
3011#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3012 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3013 if (fd >= 0)
3014 return fd;
3015#endif
3016 return inotify_init ();
3017}
3018
3019inline_size void
3020infy_init (EV_P)
3021{
3022 if (fs_fd != -2)
3023 return;
3024
3025 fs_fd = -1;
3026
3027 check_2625 (EV_A);
3028
2555 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2556 3030
2557 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2558 { 3032 {
3033 fd_intern (fs_fd);
2559 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2560 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2561 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2562 } 3038 }
2563} 3039}
2564 3040
2565void inline_size 3041inline_size void
2566infy_fork (EV_P) 3042infy_fork (EV_P)
2567{ 3043{
2568 int slot; 3044 int slot;
2569 3045
2570 if (fs_fd < 0) 3046 if (fs_fd < 0)
2571 return; 3047 return;
2572 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
2573 close (fs_fd); 3051 close (fs_fd);
2574 fs_fd = inotify_init (); 3052 fs_fd = infy_newfd ();
3053
3054 if (fs_fd >= 0)
3055 {
3056 fd_intern (fs_fd);
3057 ev_io_set (&fs_w, fs_fd, EV_READ);
3058 ev_io_start (EV_A_ &fs_w);
3059 ev_unref (EV_A);
3060 }
2575 3061
2576 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2577 { 3063 {
2578 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
2579 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
… …
2586 w->wd = -1; 3072 w->wd = -1;
2587 3073
2588 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
2589 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
2590 else 3076 else
3077 {
3078 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3079 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2591 ev_timer_start (EV_A_ &w->timer); 3080 ev_timer_again (EV_A_ &w->timer);
3081 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3082 }
2592 } 3083 }
2593 } 3084 }
2594} 3085}
2595 3086
2596#endif 3087#endif
… …
2613static void noinline 3104static void noinline
2614stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2615{ 3106{
2616 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2617 3108
2618 /* we copy this here each the time so that */ 3109 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); 3110 ev_stat_stat (EV_A_ w);
2622 3111
2623 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3112 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2624 if ( 3113 if (
2625 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
2626 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
2627 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
2628 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
2629 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
2630 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
2631 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
2632 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
2633 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
2634 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
2635 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
2636 ) { 3125 ) {
3126 /* we only update w->prev on actual differences */
3127 /* in case we test more often than invoke the callback, */
3128 /* to ensure that prev is always different to attr */
3129 w->prev = prev;
3130
2637 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
2638 if (fs_fd >= 0) 3132 if (fs_fd >= 0)
2639 { 3133 {
2640 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
2641 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
… …
2651ev_stat_start (EV_P_ ev_stat *w) 3145ev_stat_start (EV_P_ ev_stat *w)
2652{ 3146{
2653 if (expect_false (ev_is_active (w))) 3147 if (expect_false (ev_is_active (w)))
2654 return; 3148 return;
2655 3149
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); 3150 ev_stat_stat (EV_A_ w);
2661 3151
3152 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2662 if (w->interval < MIN_STAT_INTERVAL) 3153 w->interval = MIN_STAT_INTERVAL;
2663 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2664 3154
2665 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3155 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)); 3156 ev_set_priority (&w->timer, ev_priority (w));
2667 3157
2668#if EV_USE_INOTIFY 3158#if EV_USE_INOTIFY
2669 infy_init (EV_A); 3159 infy_init (EV_A);
2670 3160
2671 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
2672 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
2673 else 3163 else
2674#endif 3164#endif
3165 {
2675 ev_timer_start (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
2676 3169
2677 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
2678 3171
2679 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
2680} 3173}
… …
2689 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
2690 3183
2691#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
2692 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
2693#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
2694 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
2695 3193
2696 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
2697 3195
2698 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
2699} 3197}
… …
2840embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3338embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2841{ 3339{
2842 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3340 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2843 3341
2844 { 3342 {
2845 struct ev_loop *loop = w->other; 3343 EV_P = w->other;
2846 3344
2847 while (fdchangecnt) 3345 while (fdchangecnt)
2848 { 3346 {
2849 fd_reify (EV_A); 3347 fd_reify (EV_A);
2850 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3348 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2855static void 3353static void
2856embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3354embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2857{ 3355{
2858 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3356 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2859 3357
3358 ev_embed_stop (EV_A_ w);
3359
2860 { 3360 {
2861 struct ev_loop *loop = w->other; 3361 EV_P = w->other;
2862 3362
2863 ev_loop_fork (EV_A); 3363 ev_loop_fork (EV_A);
3364 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2864 } 3365 }
3366
3367 ev_embed_start (EV_A_ w);
2865} 3368}
2866 3369
2867#if 0 3370#if 0
2868static void 3371static void
2869embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3372embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2877{ 3380{
2878 if (expect_false (ev_is_active (w))) 3381 if (expect_false (ev_is_active (w)))
2879 return; 3382 return;
2880 3383
2881 { 3384 {
2882 struct ev_loop *loop = w->other; 3385 EV_P = w->other;
2883 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3386 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); 3387 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2885 } 3388 }
2886 3389
2887 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
2888 3391
… …
2999 3502
3000void 3503void
3001ev_async_send (EV_P_ ev_async *w) 3504ev_async_send (EV_P_ ev_async *w)
3002{ 3505{
3003 w->sent = 1; 3506 w->sent = 1;
3004 evpipe_write (EV_A_ &gotasync); 3507 evpipe_write (EV_A_ &async_pending);
3005} 3508}
3006#endif 3509#endif
3007 3510
3008/*****************************************************************************/ 3511/*****************************************************************************/
3009 3512
… …
3071 ev_timer_set (&once->to, timeout, 0.); 3574 ev_timer_set (&once->to, timeout, 0.);
3072 ev_timer_start (EV_A_ &once->to); 3575 ev_timer_start (EV_A_ &once->to);
3073 } 3576 }
3074} 3577}
3075 3578
3579/*****************************************************************************/
3580
3581#if EV_WALK_ENABLE
3582void
3583ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3584{
3585 int i, j;
3586 ev_watcher_list *wl, *wn;
3587
3588 if (types & (EV_IO | EV_EMBED))
3589 for (i = 0; i < anfdmax; ++i)
3590 for (wl = anfds [i].head; wl; )
3591 {
3592 wn = wl->next;
3593
3594#if EV_EMBED_ENABLE
3595 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3596 {
3597 if (types & EV_EMBED)
3598 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3599 }
3600 else
3601#endif
3602#if EV_USE_INOTIFY
3603 if (ev_cb ((ev_io *)wl) == infy_cb)
3604 ;
3605 else
3606#endif
3607 if ((ev_io *)wl != &pipe_w)
3608 if (types & EV_IO)
3609 cb (EV_A_ EV_IO, wl);
3610
3611 wl = wn;
3612 }
3613
3614 if (types & (EV_TIMER | EV_STAT))
3615 for (i = timercnt + HEAP0; i-- > HEAP0; )
3616#if EV_STAT_ENABLE
3617 /*TODO: timer is not always active*/
3618 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3619 {
3620 if (types & EV_STAT)
3621 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3622 }
3623 else
3624#endif
3625 if (types & EV_TIMER)
3626 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3627
3628#if EV_PERIODIC_ENABLE
3629 if (types & EV_PERIODIC)
3630 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3631 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3632#endif
3633
3634#if EV_IDLE_ENABLE
3635 if (types & EV_IDLE)
3636 for (j = NUMPRI; i--; )
3637 for (i = idlecnt [j]; i--; )
3638 cb (EV_A_ EV_IDLE, idles [j][i]);
3639#endif
3640
3641#if EV_FORK_ENABLE
3642 if (types & EV_FORK)
3643 for (i = forkcnt; i--; )
3644 if (ev_cb (forks [i]) != embed_fork_cb)
3645 cb (EV_A_ EV_FORK, forks [i]);
3646#endif
3647
3648#if EV_ASYNC_ENABLE
3649 if (types & EV_ASYNC)
3650 for (i = asynccnt; i--; )
3651 cb (EV_A_ EV_ASYNC, asyncs [i]);
3652#endif
3653
3654 if (types & EV_PREPARE)
3655 for (i = preparecnt; i--; )
3656#if EV_EMBED_ENABLE
3657 if (ev_cb (prepares [i]) != embed_prepare_cb)
3658#endif
3659 cb (EV_A_ EV_PREPARE, prepares [i]);
3660
3661 if (types & EV_CHECK)
3662 for (i = checkcnt; i--; )
3663 cb (EV_A_ EV_CHECK, checks [i]);
3664
3665 if (types & EV_SIGNAL)
3666 for (i = 0; i < EV_NSIG - 1; ++i)
3667 for (wl = signals [i].head; wl; )
3668 {
3669 wn = wl->next;
3670 cb (EV_A_ EV_SIGNAL, wl);
3671 wl = wn;
3672 }
3673
3674 if (types & EV_CHILD)
3675 for (i = EV_PID_HASHSIZE; i--; )
3676 for (wl = childs [i]; wl; )
3677 {
3678 wn = wl->next;
3679 cb (EV_A_ EV_CHILD, wl);
3680 wl = wn;
3681 }
3682/* EV_STAT 0x00001000 /* stat data changed */
3683/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3684}
3685#endif
3686
3076#if EV_MULTIPLICITY 3687#if EV_MULTIPLICITY
3077 #include "ev_wrap.h" 3688 #include "ev_wrap.h"
3078#endif 3689#endif
3079 3690
3080#ifdef __cplusplus 3691#ifdef __cplusplus

Diff Legend

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