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

Comparing libev/ev.c (file contents):
Revision 1.263 by root, Wed Oct 1 18:50:03 2008 UTC vs.
Revision 1.321 by root, Thu Dec 31 06:50:17 2009 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
… …
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
131 153
132#endif 154#endif
133 155
134#include <math.h> 156#include <math.h>
135#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
136#include <fcntl.h> 159#include <fcntl.h>
137#include <stddef.h> 160#include <stddef.h>
138 161
139#include <stdio.h> 162#include <stdio.h>
140 163
… …
164# endif 187# endif
165#endif 188#endif
166 189
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 190/* this block tries to deduce configuration from header-defined symbols and defaults */
168 191
192/* try to deduce the maximum number of signals on this platform */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
219#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1
222# else
223# define EV_USE_CLOCK_SYSCALL 0
224# endif
225#endif
226
169#ifndef EV_USE_MONOTONIC 227#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 229# define EV_USE_MONOTONIC 1
172# else 230# else
173# define EV_USE_MONOTONIC 0 231# define EV_USE_MONOTONIC 0
174# endif 232# endif
175#endif 233#endif
176 234
177#ifndef EV_USE_REALTIME 235#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 237#endif
180 238
181#ifndef EV_USE_NANOSLEEP 239#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 240# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 241# define EV_USE_NANOSLEEP 1
… …
244# else 302# else
245# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
246# endif 304# endif
247#endif 305#endif
248 306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
312# endif
313#endif
314
249#if 0 /* debugging */ 315#if 0 /* debugging */
250# define EV_VERIFY 3 316# define EV_VERIFY 3
251# define EV_USE_4HEAP 1 317# define EV_USE_4HEAP 1
252# define EV_HEAP_CACHE_AT 1 318# define EV_HEAP_CACHE_AT 1
253#endif 319#endif
… …
262 328
263#ifndef EV_HEAP_CACHE_AT 329#ifndef EV_HEAP_CACHE_AT
264# define EV_HEAP_CACHE_AT !EV_MINIMAL 330# define EV_HEAP_CACHE_AT !EV_MINIMAL
265#endif 331#endif
266 332
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL
336# include <syscall.h>
337# ifdef SYS_clock_gettime
338# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
339# undef EV_USE_MONOTONIC
340# define EV_USE_MONOTONIC 1
341# else
342# undef EV_USE_CLOCK_SYSCALL
343# define EV_USE_CLOCK_SYSCALL 0
344# endif
345#endif
346
267/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
268 348
269#ifndef CLOCK_MONOTONIC 349#ifndef CLOCK_MONOTONIC
270# undef EV_USE_MONOTONIC 350# undef EV_USE_MONOTONIC
271# define EV_USE_MONOTONIC 0 351# define EV_USE_MONOTONIC 0
… …
286# include <sys/select.h> 366# include <sys/select.h>
287# endif 367# endif
288#endif 368#endif
289 369
290#if EV_USE_INOTIFY 370#if EV_USE_INOTIFY
371# include <sys/utsname.h>
372# include <sys/statfs.h>
291# include <sys/inotify.h> 373# include <sys/inotify.h>
292/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 374/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
293# ifndef IN_DONT_FOLLOW 375# ifndef IN_DONT_FOLLOW
294# undef EV_USE_INOTIFY 376# undef EV_USE_INOTIFY
295# define EV_USE_INOTIFY 0 377# define EV_USE_INOTIFY 0
… …
301#endif 383#endif
302 384
303#if EV_USE_EVENTFD 385#if EV_USE_EVENTFD
304/* 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 */
305# 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
306# ifdef __cplusplus 398# ifdef __cplusplus
307extern "C" { 399extern "C" {
308# endif 400# endif
309int eventfd (unsigned int initval, int flags); 401int eventfd (unsigned int initval, int flags);
310# ifdef __cplusplus 402# ifdef __cplusplus
311} 403}
312# endif 404# endif
313#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
314 435
315/**/ 436/**/
316 437
317#if EV_VERIFY >= 3 438#if EV_VERIFY >= 3
318# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 439# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
330 */ 451 */
331#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 452#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
332 453
333#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) */
334#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) */
335/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
336 456
337#if __GNUC__ >= 4 457#if __GNUC__ >= 4
338# define expect(expr,value) __builtin_expect ((expr),(value)) 458# define expect(expr,value) __builtin_expect ((expr),(value))
339# define noinline __attribute__ ((noinline)) 459# define noinline __attribute__ ((noinline))
340#else 460#else
… …
353# define inline_speed static noinline 473# define inline_speed static noinline
354#else 474#else
355# define inline_speed static inline 475# define inline_speed static inline
356#endif 476#endif
357 477
358#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
359#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
360 485
361#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
362#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
363 488
364typedef ev_watcher *W; 489typedef ev_watcher *W;
… …
366typedef ev_watcher_time *WT; 491typedef ev_watcher_time *WT;
367 492
368#define ev_active(w) ((W)(w))->active 493#define ev_active(w) ((W)(w))->active
369#define ev_at(w) ((WT)(w))->at 494#define ev_at(w) ((WT)(w))->at
370 495
371#if EV_USE_MONOTONIC 496#if EV_USE_REALTIME
372/* 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 */
373/* 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
374static 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 (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
375#endif 514#endif
376 515
377#ifdef _WIN32 516#ifdef _WIN32
378# include "ev_win32.c" 517# include "ev_win32.c"
379#endif 518#endif
… …
387{ 526{
388 syserr_cb = cb; 527 syserr_cb = cb;
389} 528}
390 529
391static void noinline 530static void noinline
392syserr (const char *msg) 531ev_syserr (const char *msg)
393{ 532{
394 if (!msg) 533 if (!msg)
395 msg = "(libev) system error"; 534 msg = "(libev) system error";
396 535
397 if (syserr_cb) 536 if (syserr_cb)
… …
443#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
444#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
445 584
446/*****************************************************************************/ 585/*****************************************************************************/
447 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
590/* file descriptor info structure */
448typedef struct 591typedef struct
449{ 592{
450 WL head; 593 WL head;
451 unsigned char events; 594 unsigned char events; /* the events watched for */
595 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
452 unsigned char reify; 597 unsigned char unused;
598#if EV_USE_EPOLL
599 unsigned int egen; /* generation counter to counter epoll bugs */
600#endif
453#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
454 SOCKET handle; 602 SOCKET handle;
455#endif 603#endif
456} ANFD; 604} ANFD;
457 605
606/* stores the pending event set for a given watcher */
458typedef struct 607typedef struct
459{ 608{
460 W w; 609 W w;
461 int events; 610 int events; /* the pending event set for the given watcher */
462} ANPENDING; 611} ANPENDING;
463 612
464#if EV_USE_INOTIFY 613#if EV_USE_INOTIFY
465/* hash table entry per inotify-id */ 614/* hash table entry per inotify-id */
466typedef struct 615typedef struct
… …
469} ANFS; 618} ANFS;
470#endif 619#endif
471 620
472/* Heap Entry */ 621/* Heap Entry */
473#if EV_HEAP_CACHE_AT 622#if EV_HEAP_CACHE_AT
623 /* a heap element */
474 typedef struct { 624 typedef struct {
475 ev_tstamp at; 625 ev_tstamp at;
476 WT w; 626 WT w;
477 } ANHE; 627 } ANHE;
478 628
479 #define ANHE_w(he) (he).w /* access watcher, read-write */ 629 #define ANHE_w(he) (he).w /* access watcher, read-write */
480 #define ANHE_at(he) (he).at /* access cached at, read-only */ 630 #define ANHE_at(he) (he).at /* access cached at, read-only */
481 #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 */
482#else 632#else
633 /* a heap element */
483 typedef WT ANHE; 634 typedef WT ANHE;
484 635
485 #define ANHE_w(he) (he) 636 #define ANHE_w(he) (he)
486 #define ANHE_at(he) (he)->at 637 #define ANHE_at(he) (he)->at
487 #define ANHE_at_cache(he) 638 #define ANHE_at_cache(he)
… …
511 662
512 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
513 664
514#endif 665#endif
515 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
516/*****************************************************************************/ 679/*****************************************************************************/
517 680
681#ifndef EV_HAVE_EV_TIME
518ev_tstamp 682ev_tstamp
519ev_time (void) 683ev_time (void)
520{ 684{
521#if EV_USE_REALTIME 685#if EV_USE_REALTIME
686 if (expect_true (have_realtime))
687 {
522 struct timespec ts; 688 struct timespec ts;
523 clock_gettime (CLOCK_REALTIME, &ts); 689 clock_gettime (CLOCK_REALTIME, &ts);
524 return ts.tv_sec + ts.tv_nsec * 1e-9; 690 return ts.tv_sec + ts.tv_nsec * 1e-9;
525#else 691 }
692#endif
693
526 struct timeval tv; 694 struct timeval tv;
527 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
528 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
529#endif
530} 697}
698#endif
531 699
532ev_tstamp inline_size 700inline_size ev_tstamp
533get_clock (void) 701get_clock (void)
534{ 702{
535#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
536 if (expect_true (have_monotonic)) 704 if (expect_true (have_monotonic))
537 { 705 {
… …
571 739
572 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
573 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
574 742
575 /* 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 */
576 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
577 /* by older ones */ 745 /* by older ones */
578 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
579#endif 747#endif
580 } 748 }
581} 749}
582 750
583/*****************************************************************************/ 751/*****************************************************************************/
584 752
585#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 */
586 754
587int 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
588array_nextsize (int elem, int cur, int cnt) 758array_nextsize (int elem, int cur, int cnt)
589{ 759{
590 int ncur = cur + 1; 760 int ncur = cur + 1;
591 761
592 do 762 do
… …
609array_realloc (int elem, void *base, int *cur, int cnt) 779array_realloc (int elem, void *base, int *cur, int cnt)
610{ 780{
611 *cur = array_nextsize (elem, *cur, cnt); 781 *cur = array_nextsize (elem, *cur, cnt);
612 return ev_realloc (base, elem * *cur); 782 return ev_realloc (base, elem * *cur);
613} 783}
784
785#define array_init_zero(base,count) \
786 memset ((void *)(base), 0, sizeof (*(base)) * (count))
614 787
615#define array_needsize(type,base,cur,cnt,init) \ 788#define array_needsize(type,base,cur,cnt,init) \
616 if (expect_false ((cnt) > (cur))) \ 789 if (expect_false ((cnt) > (cur))) \
617 { \ 790 { \
618 int ocur_ = (cur); \ 791 int ocur_ = (cur); \
… …
630 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 803 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
631 } 804 }
632#endif 805#endif
633 806
634#define array_free(stem, idx) \ 807#define array_free(stem, idx) \
635 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
636 809
637/*****************************************************************************/ 810/*****************************************************************************/
811
812/* dummy callback for pending events */
813static void noinline
814pendingcb (EV_P_ ev_prepare *w, int revents)
815{
816}
638 817
639void noinline 818void noinline
640ev_feed_event (EV_P_ void *w, int revents) 819ev_feed_event (EV_P_ void *w, int revents)
641{ 820{
642 W w_ = (W)w; 821 W w_ = (W)w;
… …
651 pendings [pri][w_->pending - 1].w = w_; 830 pendings [pri][w_->pending - 1].w = w_;
652 pendings [pri][w_->pending - 1].events = revents; 831 pendings [pri][w_->pending - 1].events = revents;
653 } 832 }
654} 833}
655 834
656void 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
657queue_events (EV_P_ W *events, int eventcnt, int type) 851queue_events (EV_P_ W *events, int eventcnt, int type)
658{ 852{
659 int i; 853 int i;
660 854
661 for (i = 0; i < eventcnt; ++i) 855 for (i = 0; i < eventcnt; ++i)
662 ev_feed_event (EV_A_ events [i], type); 856 ev_feed_event (EV_A_ events [i], type);
663} 857}
664 858
665/*****************************************************************************/ 859/*****************************************************************************/
666 860
667void inline_size 861inline_speed void
668anfds_init (ANFD *base, int count)
669{
670 while (count--)
671 {
672 base->head = 0;
673 base->events = EV_NONE;
674 base->reify = 0;
675
676 ++base;
677 }
678}
679
680void inline_speed
681fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
682{ 863{
683 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
684 ev_io *w; 865 ev_io *w;
685 866
686 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)
… …
690 if (ev) 871 if (ev)
691 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
692 } 873 }
693} 874}
694 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
695void 887void
696ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
697{ 889{
698 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
699 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
700} 892}
701 893
702void inline_size 894/* make sure the external fd watch events are in-sync */
895/* with the kernel/libev internal state */
896inline_size void
703fd_reify (EV_P) 897fd_reify (EV_P)
704{ 898{
705 int i; 899 int i;
706 900
707 for (i = 0; i < fdchangecnt; ++i) 901 for (i = 0; i < fdchangecnt; ++i)
… …
717 911
718#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
719 if (events) 913 if (events)
720 { 914 {
721 unsigned long arg; 915 unsigned long arg;
722 #ifdef EV_FD_TO_WIN32_HANDLE
723 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
724 #else
725 anfd->handle = _get_osfhandle (fd);
726 #endif
727 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));
728 } 918 }
729#endif 919#endif
730 920
731 { 921 {
732 unsigned char o_events = anfd->events; 922 unsigned char o_events = anfd->events;
733 unsigned char o_reify = anfd->reify; 923 unsigned char o_reify = anfd->reify;
734 924
735 anfd->reify = 0; 925 anfd->reify = 0;
736 anfd->events = events; 926 anfd->events = events;
737 927
738 if (o_events != events || o_reify & EV_IOFDSET) 928 if (o_events != events || o_reify & EV__IOFDSET)
739 backend_modify (EV_A_ fd, o_events, events); 929 backend_modify (EV_A_ fd, o_events, events);
740 } 930 }
741 } 931 }
742 932
743 fdchangecnt = 0; 933 fdchangecnt = 0;
744} 934}
745 935
746void inline_size 936/* something about the given fd changed */
937inline_size void
747fd_change (EV_P_ int fd, int flags) 938fd_change (EV_P_ int fd, int flags)
748{ 939{
749 unsigned char reify = anfds [fd].reify; 940 unsigned char reify = anfds [fd].reify;
750 anfds [fd].reify |= flags; 941 anfds [fd].reify |= flags;
751 942
… …
755 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 946 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
756 fdchanges [fdchangecnt - 1] = fd; 947 fdchanges [fdchangecnt - 1] = fd;
757 } 948 }
758} 949}
759 950
760void inline_speed 951/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
952inline_speed void
761fd_kill (EV_P_ int fd) 953fd_kill (EV_P_ int fd)
762{ 954{
763 ev_io *w; 955 ev_io *w;
764 956
765 while ((w = (ev_io *)anfds [fd].head)) 957 while ((w = (ev_io *)anfds [fd].head))
… …
767 ev_io_stop (EV_A_ w); 959 ev_io_stop (EV_A_ w);
768 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);
769 } 961 }
770} 962}
771 963
772int inline_size 964/* check whether the given fd is atcually valid, for error recovery */
965inline_size int
773fd_valid (int fd) 966fd_valid (int fd)
774{ 967{
775#ifdef _WIN32 968#ifdef _WIN32
776 return _get_osfhandle (fd) != -1; 969 return _get_osfhandle (fd) != -1;
777#else 970#else
… …
799 992
800 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
801 if (anfds [fd].events) 994 if (anfds [fd].events)
802 { 995 {
803 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
804 return; 997 break;
805 } 998 }
806} 999}
807 1000
808/* 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 */
809static void noinline 1002static void noinline
… …
813 1006
814 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
815 if (anfds [fd].events) 1008 if (anfds [fd].events)
816 { 1009 {
817 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
1011 anfds [fd].emask = 0;
818 fd_change (EV_A_ fd, EV_IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
819 } 1013 }
820} 1014}
821 1015
822/*****************************************************************************/ 1016/*****************************************************************************/
823 1017
… …
839#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 1033#define HEAP0 (DHEAP - 1) /* index of first element in heap */
840#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1034#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
841#define UPHEAP_DONE(p,k) ((p) == (k)) 1035#define UPHEAP_DONE(p,k) ((p) == (k))
842 1036
843/* away from the root */ 1037/* away from the root */
844void inline_speed 1038inline_speed void
845downheap (ANHE *heap, int N, int k) 1039downheap (ANHE *heap, int N, int k)
846{ 1040{
847 ANHE he = heap [k]; 1041 ANHE he = heap [k];
848 ANHE *E = heap + N + HEAP0; 1042 ANHE *E = heap + N + HEAP0;
849 1043
… …
889#define HEAP0 1 1083#define HEAP0 1
890#define HPARENT(k) ((k) >> 1) 1084#define HPARENT(k) ((k) >> 1)
891#define UPHEAP_DONE(p,k) (!(p)) 1085#define UPHEAP_DONE(p,k) (!(p))
892 1086
893/* away from the root */ 1087/* away from the root */
894void inline_speed 1088inline_speed void
895downheap (ANHE *heap, int N, int k) 1089downheap (ANHE *heap, int N, int k)
896{ 1090{
897 ANHE he = heap [k]; 1091 ANHE he = heap [k];
898 1092
899 for (;;) 1093 for (;;)
900 { 1094 {
901 int c = k << 1; 1095 int c = k << 1;
902 1096
903 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
904 break; 1098 break;
905 1099
906 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])
907 ? 1 : 0; 1101 ? 1 : 0;
908 1102
… …
919 ev_active (ANHE_w (he)) = k; 1113 ev_active (ANHE_w (he)) = k;
920} 1114}
921#endif 1115#endif
922 1116
923/* towards the root */ 1117/* towards the root */
924void inline_speed 1118inline_speed void
925upheap (ANHE *heap, int k) 1119upheap (ANHE *heap, int k)
926{ 1120{
927 ANHE he = heap [k]; 1121 ANHE he = heap [k];
928 1122
929 for (;;) 1123 for (;;)
… …
940 1134
941 heap [k] = he; 1135 heap [k] = he;
942 ev_active (ANHE_w (he)) = k; 1136 ev_active (ANHE_w (he)) = k;
943} 1137}
944 1138
945void inline_size 1139/* move an element suitably so it is in a correct place */
1140inline_size void
946adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
947{ 1142{
948 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)]))
949 upheap (heap, k); 1144 upheap (heap, k);
950 else 1145 else
951 downheap (heap, N, k); 1146 downheap (heap, N, k);
952} 1147}
953 1148
954/* 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 */
955void inline_size 1150inline_size void
956reheap (ANHE *heap, int N) 1151reheap (ANHE *heap, int N)
957{ 1152{
958 int i; 1153 int i;
959 1154
960 /* 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 */
… …
963 upheap (heap, i + HEAP0); 1158 upheap (heap, i + HEAP0);
964} 1159}
965 1160
966/*****************************************************************************/ 1161/*****************************************************************************/
967 1162
1163/* associate signal watchers to a signal signal */
968typedef struct 1164typedef struct
969{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
970 WL head; 1170 WL head;
971 EV_ATOMIC_T gotsig;
972} ANSIG; 1171} ANSIG;
973 1172
974static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
975static int signalmax;
976
977static EV_ATOMIC_T gotsig;
978
979void inline_size
980signals_init (ANSIG *base, int count)
981{
982 while (count--)
983 {
984 base->head = 0;
985 base->gotsig = 0;
986
987 ++base;
988 }
989}
990 1174
991/*****************************************************************************/ 1175/*****************************************************************************/
992 1176
993void inline_speed 1177/* used to prepare libev internal fd's */
1178/* this is not fork-safe */
1179inline_speed void
994fd_intern (int fd) 1180fd_intern (int fd)
995{ 1181{
996#ifdef _WIN32 1182#ifdef _WIN32
997 unsigned long arg = 1; 1183 unsigned long arg = 1;
998 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1184 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
… …
1003} 1189}
1004 1190
1005static void noinline 1191static void noinline
1006evpipe_init (EV_P) 1192evpipe_init (EV_P)
1007{ 1193{
1008 if (!ev_is_active (&pipeev)) 1194 if (!ev_is_active (&pipe_w))
1009 { 1195 {
1010#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1011 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1012 { 1202 {
1013 evpipe [0] = -1; 1203 evpipe [0] = -1;
1014 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1015 ev_io_set (&pipeev, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1016 } 1206 }
1017 else 1207 else
1018#endif 1208#endif
1019 { 1209 {
1020 while (pipe (evpipe)) 1210 while (pipe (evpipe))
1021 syserr ("(libev) error creating signal/async pipe"); 1211 ev_syserr ("(libev) error creating signal/async pipe");
1022 1212
1023 fd_intern (evpipe [0]); 1213 fd_intern (evpipe [0]);
1024 fd_intern (evpipe [1]); 1214 fd_intern (evpipe [1]);
1025 ev_io_set (&pipeev, evpipe [0], EV_READ); 1215 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1026 } 1216 }
1027 1217
1028 ev_io_start (EV_A_ &pipeev); 1218 ev_io_start (EV_A_ &pipe_w);
1029 ev_unref (EV_A); /* watcher should not keep loop alive */ 1219 ev_unref (EV_A); /* watcher should not keep loop alive */
1030 } 1220 }
1031} 1221}
1032 1222
1033void inline_size 1223inline_size void
1034evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1224evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1035{ 1225{
1036 if (!*flag) 1226 if (!*flag)
1037 { 1227 {
1038 int old_errno = errno; /* save errno because write might clobber it */ 1228 int old_errno = errno; /* save errno because write might clobber it */
… …
1051 1241
1052 errno = old_errno; 1242 errno = old_errno;
1053 } 1243 }
1054} 1244}
1055 1245
1246/* called whenever the libev signal pipe */
1247/* got some events (signal, async) */
1056static void 1248static void
1057pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1058{ 1250{
1251 int i;
1252
1059#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1060 if (evfd >= 0) 1254 if (evfd >= 0)
1061 { 1255 {
1062 uint64_t counter; 1256 uint64_t counter;
1063 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
… …
1067 { 1261 {
1068 char dummy; 1262 char dummy;
1069 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1070 } 1264 }
1071 1265
1072 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1073 { 1267 {
1074 int signum; 1268 sig_pending = 0;
1075 gotsig = 0;
1076 1269
1077 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1078 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1079 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1080 } 1273 }
1081 1274
1082#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1083 if (gotasync) 1276 if (async_pending)
1084 { 1277 {
1085 int i; 1278 async_pending = 0;
1086 gotasync = 0;
1087 1279
1088 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1089 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1090 { 1282 {
1091 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
… …
1099 1291
1100static void 1292static void
1101ev_sighandler (int signum) 1293ev_sighandler (int signum)
1102{ 1294{
1103#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1104 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1105#endif 1297#endif
1106 1298
1107#if _WIN32 1299#if _WIN32
1108 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1109#endif 1301#endif
1110 1302
1111 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1112 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1113} 1305}
1114 1306
1115void noinline 1307void noinline
1116ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1117{ 1309{
1118 WL w; 1310 WL w;
1119 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1120#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1121 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 */
1122#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1123 1320
1124 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1125
1126 if (signum < 0 || signum >= signalmax)
1127 return; 1322 return;
1323#endif
1128 1324
1129 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1130 1326
1131 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1132 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1133} 1329}
1134 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
1135/*****************************************************************************/ 1351/*****************************************************************************/
1136 1352
1137static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1138 1354
1139#ifndef _WIN32 1355#ifndef _WIN32
… …
1142 1358
1143#ifndef WIFCONTINUED 1359#ifndef WIFCONTINUED
1144# define WIFCONTINUED(status) 0 1360# define WIFCONTINUED(status) 0
1145#endif 1361#endif
1146 1362
1147void inline_speed 1363/* handle a single child status event */
1364inline_speed void
1148child_reap (EV_P_ int chain, int pid, int status) 1365child_reap (EV_P_ int chain, int pid, int status)
1149{ 1366{
1150 ev_child *w; 1367 ev_child *w;
1151 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1368 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1152 1369
… …
1165 1382
1166#ifndef WCONTINUED 1383#ifndef WCONTINUED
1167# define WCONTINUED 0 1384# define WCONTINUED 0
1168#endif 1385#endif
1169 1386
1387/* called on sigchld etc., calls waitpid */
1170static void 1388static void
1171childcb (EV_P_ ev_signal *sw, int revents) 1389childcb (EV_P_ ev_signal *sw, int revents)
1172{ 1390{
1173 int pid, status; 1391 int pid, status;
1174 1392
… …
1255 /* kqueue is borked on everything but netbsd apparently */ 1473 /* kqueue is borked on everything but netbsd apparently */
1256 /* 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 */
1257 flags &= ~EVBACKEND_KQUEUE; 1475 flags &= ~EVBACKEND_KQUEUE;
1258#endif 1476#endif
1259#ifdef __APPLE__ 1477#ifdef __APPLE__
1260 // flags &= ~EVBACKEND_KQUEUE; for documentation 1478 /* only select works correctly on that "unix-certified" platform */
1261 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 */
1262#endif 1481#endif
1263 1482
1264 return flags; 1483 return flags;
1265} 1484}
1266 1485
… …
1280ev_backend (EV_P) 1499ev_backend (EV_P)
1281{ 1500{
1282 return backend; 1501 return backend;
1283} 1502}
1284 1503
1504#if EV_MINIMAL < 2
1285unsigned int 1505unsigned int
1286ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1287{ 1507{
1288 return loop_count; 1508 return loop_count;
1289} 1509}
1290 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1291void 1517void
1292ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1293{ 1519{
1294 io_blocktime = interval; 1520 io_blocktime = interval;
1295} 1521}
… …
1298ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1299{ 1525{
1300 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1301} 1527}
1302 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 */
1303static void noinline 1554static void noinline
1304loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1305{ 1556{
1306 if (!backend) 1557 if (!backend)
1307 { 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
1308#if EV_USE_MONOTONIC 1569#if EV_USE_MONOTONIC
1570 if (!have_monotonic)
1309 { 1571 {
1310 struct timespec ts; 1572 struct timespec ts;
1573
1311 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1312 have_monotonic = 1; 1575 have_monotonic = 1;
1313 } 1576 }
1314#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"));
1315 1589
1316 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1317 mn_now = get_clock (); 1591 mn_now = get_clock ();
1318 now_floor = mn_now; 1592 now_floor = mn_now;
1319 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
1320 1597
1321 io_blocktime = 0.; 1598 io_blocktime = 0.;
1322 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1323 backend = 0; 1600 backend = 0;
1324 backend_fd = -1; 1601 backend_fd = -1;
1325 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1326#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1327 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1328#endif 1608#endif
1329 1609#if EV_USE_SIGNALFD
1330 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1331#ifndef _WIN32
1332 if (flags & EVFLAG_FORKCHECK)
1333 curpid = getpid ();
1334#endif 1611#endif
1335
1336 if (!(flags & EVFLAG_NOENV)
1337 && !enable_secure ()
1338 && getenv ("LIBEV_FLAGS"))
1339 flags = atoi (getenv ("LIBEV_FLAGS"));
1340 1612
1341 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1342 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1343 1615
1344#if EV_USE_PORT 1616#if EV_USE_PORT
… …
1355#endif 1627#endif
1356#if EV_USE_SELECT 1628#if EV_USE_SELECT
1357 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1629 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1358#endif 1630#endif
1359 1631
1632 ev_prepare_init (&pending_w, pendingcb);
1633
1360 ev_init (&pipeev, pipecb); 1634 ev_init (&pipe_w, pipecb);
1361 ev_set_priority (&pipeev, EV_MAXPRI); 1635 ev_set_priority (&pipe_w, EV_MAXPRI);
1362 } 1636 }
1363} 1637}
1364 1638
1639/* free up a loop structure */
1365static void noinline 1640static void noinline
1366loop_destroy (EV_P) 1641loop_destroy (EV_P)
1367{ 1642{
1368 int i; 1643 int i;
1369 1644
1370 if (ev_is_active (&pipeev)) 1645 if (ev_is_active (&pipe_w))
1371 { 1646 {
1372 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1373 ev_io_stop (EV_A_ &pipeev); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1374 1649
1375#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1376 if (evfd >= 0) 1651 if (evfd >= 0)
1377 close (evfd); 1652 close (evfd);
1378#endif 1653#endif
1379 1654
1380 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1381 { 1656 {
1382 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1383 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1384 } 1659 }
1385 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 close (sigfd);
1665#endif
1386 1666
1387#if EV_USE_INOTIFY 1667#if EV_USE_INOTIFY
1388 if (fs_fd >= 0) 1668 if (fs_fd >= 0)
1389 close (fs_fd); 1669 close (fs_fd);
1390#endif 1670#endif
… …
1414#if EV_IDLE_ENABLE 1694#if EV_IDLE_ENABLE
1415 array_free (idle, [i]); 1695 array_free (idle, [i]);
1416#endif 1696#endif
1417 } 1697 }
1418 1698
1419 ev_free (anfds); anfdmax = 0; 1699 ev_free (anfds); anfds = 0; anfdmax = 0;
1420 1700
1421 /* 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);
1422 array_free (fdchange, EMPTY); 1703 array_free (fdchange, EMPTY);
1423 array_free (timer, EMPTY); 1704 array_free (timer, EMPTY);
1424#if EV_PERIODIC_ENABLE 1705#if EV_PERIODIC_ENABLE
1425 array_free (periodic, EMPTY); 1706 array_free (periodic, EMPTY);
1426#endif 1707#endif
… …
1435 1716
1436 backend = 0; 1717 backend = 0;
1437} 1718}
1438 1719
1439#if EV_USE_INOTIFY 1720#if EV_USE_INOTIFY
1440void inline_size infy_fork (EV_P); 1721inline_size void infy_fork (EV_P);
1441#endif 1722#endif
1442 1723
1443void inline_size 1724inline_size void
1444loop_fork (EV_P) 1725loop_fork (EV_P)
1445{ 1726{
1446#if EV_USE_PORT 1727#if EV_USE_PORT
1447 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1728 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1448#endif 1729#endif
… …
1454#endif 1735#endif
1455#if EV_USE_INOTIFY 1736#if EV_USE_INOTIFY
1456 infy_fork (EV_A); 1737 infy_fork (EV_A);
1457#endif 1738#endif
1458 1739
1459 if (ev_is_active (&pipeev)) 1740 if (ev_is_active (&pipe_w))
1460 { 1741 {
1461 /* this "locks" the handlers against writing to the pipe */ 1742 /* this "locks" the handlers against writing to the pipe */
1462 /* while we modify the fd vars */ 1743 /* while we modify the fd vars */
1463 gotsig = 1; 1744 sig_pending = 1;
1464#if EV_ASYNC_ENABLE 1745#if EV_ASYNC_ENABLE
1465 gotasync = 1; 1746 async_pending = 1;
1466#endif 1747#endif
1467 1748
1468 ev_ref (EV_A); 1749 ev_ref (EV_A);
1469 ev_io_stop (EV_A_ &pipeev); 1750 ev_io_stop (EV_A_ &pipe_w);
1470 1751
1471#if EV_USE_EVENTFD 1752#if EV_USE_EVENTFD
1472 if (evfd >= 0) 1753 if (evfd >= 0)
1473 close (evfd); 1754 close (evfd);
1474#endif 1755#endif
1475 1756
1476 if (evpipe [0] >= 0) 1757 if (evpipe [0] >= 0)
1477 { 1758 {
1478 close (evpipe [0]); 1759 EV_WIN32_CLOSE_FD (evpipe [0]);
1479 close (evpipe [1]); 1760 EV_WIN32_CLOSE_FD (evpipe [1]);
1480 } 1761 }
1481 1762
1482 evpipe_init (EV_A); 1763 evpipe_init (EV_A);
1483 /* now iterate over everything, in case we missed something */ 1764 /* now iterate over everything, in case we missed something */
1484 pipecb (EV_A_ &pipeev, EV_READ); 1765 pipecb (EV_A_ &pipe_w, EV_READ);
1485 } 1766 }
1486 1767
1487 postfork = 0; 1768 postfork = 0;
1488} 1769}
1489 1770
1490#if EV_MULTIPLICITY 1771#if EV_MULTIPLICITY
1491 1772
1492struct ev_loop * 1773struct ev_loop *
1493ev_loop_new (unsigned int flags) 1774ev_loop_new (unsigned int flags)
1494{ 1775{
1495 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));
1496 1777
1497 memset (loop, 0, sizeof (struct ev_loop)); 1778 memset (EV_A, 0, sizeof (struct ev_loop));
1498
1499 loop_init (EV_A_ flags); 1779 loop_init (EV_A_ flags);
1500 1780
1501 if (ev_backend (EV_A)) 1781 if (ev_backend (EV_A))
1502 return loop; 1782 return EV_A;
1503 1783
1504 return 0; 1784 return 0;
1505} 1785}
1506 1786
1507void 1787void
… …
1514void 1794void
1515ev_loop_fork (EV_P) 1795ev_loop_fork (EV_P)
1516{ 1796{
1517 postfork = 1; /* must be in line with ev_default_fork */ 1797 postfork = 1; /* must be in line with ev_default_fork */
1518} 1798}
1799#endif /* multiplicity */
1519 1800
1520#if EV_VERIFY 1801#if EV_VERIFY
1521static void noinline 1802static void noinline
1522verify_watcher (EV_P_ W w) 1803verify_watcher (EV_P_ W w)
1523{ 1804{
1524 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1805 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1525 1806
1526 if (w->pending) 1807 if (w->pending)
1527 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));
1528} 1809}
1529 1810
1530static void noinline 1811static void noinline
1531verify_heap (EV_P_ ANHE *heap, int N) 1812verify_heap (EV_P_ ANHE *heap, int N)
1532{ 1813{
1533 int i; 1814 int i;
1534 1815
1535 for (i = HEAP0; i < N + HEAP0; ++i) 1816 for (i = HEAP0; i < N + HEAP0; ++i)
1536 { 1817 {
1537 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));
1538 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])));
1539 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]))));
1540 1821
1541 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1822 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1542 } 1823 }
1543} 1824}
1544 1825
1545static void noinline 1826static void noinline
1546array_verify (EV_P_ W *ws, int cnt) 1827array_verify (EV_P_ W *ws, int cnt)
1547{ 1828{
1548 while (cnt--) 1829 while (cnt--)
1549 { 1830 {
1550 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1831 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1551 verify_watcher (EV_A_ ws [cnt]); 1832 verify_watcher (EV_A_ ws [cnt]);
1552 } 1833 }
1553} 1834}
1554#endif 1835#endif
1555 1836
1837#if EV_MINIMAL < 2
1556void 1838void
1557ev_loop_verify (EV_P) 1839ev_loop_verify (EV_P)
1558{ 1840{
1559#if EV_VERIFY 1841#if EV_VERIFY
1560 int i; 1842 int i;
… …
1562 1844
1563 assert (activecnt >= -1); 1845 assert (activecnt >= -1);
1564 1846
1565 assert (fdchangemax >= fdchangecnt); 1847 assert (fdchangemax >= fdchangecnt);
1566 for (i = 0; i < fdchangecnt; ++i) 1848 for (i = 0; i < fdchangecnt; ++i)
1567 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1849 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1568 1850
1569 assert (anfdmax >= 0); 1851 assert (anfdmax >= 0);
1570 for (i = 0; i < anfdmax; ++i) 1852 for (i = 0; i < anfdmax; ++i)
1571 for (w = anfds [i].head; w; w = w->next) 1853 for (w = anfds [i].head; w; w = w->next)
1572 { 1854 {
1573 verify_watcher (EV_A_ (W)w); 1855 verify_watcher (EV_A_ (W)w);
1574 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1856 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1575 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));
1576 } 1858 }
1577 1859
1578 assert (timermax >= timercnt); 1860 assert (timermax >= timercnt);
1579 verify_heap (EV_A_ timers, timercnt); 1861 verify_heap (EV_A_ timers, timercnt);
1580 1862
… …
1609 assert (checkmax >= checkcnt); 1891 assert (checkmax >= checkcnt);
1610 array_verify (EV_A_ (W *)checks, checkcnt); 1892 array_verify (EV_A_ (W *)checks, checkcnt);
1611 1893
1612# if 0 1894# if 0
1613 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)
1614 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1896 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1615# endif
1616#endif 1897# endif
1898#endif
1617} 1899}
1618 1900#endif
1619#endif /* multiplicity */
1620 1901
1621#if EV_MULTIPLICITY 1902#if EV_MULTIPLICITY
1622struct ev_loop * 1903struct ev_loop *
1623ev_default_loop_init (unsigned int flags) 1904ev_default_loop_init (unsigned int flags)
1624#else 1905#else
… …
1627#endif 1908#endif
1628{ 1909{
1629 if (!ev_default_loop_ptr) 1910 if (!ev_default_loop_ptr)
1630 { 1911 {
1631#if EV_MULTIPLICITY 1912#if EV_MULTIPLICITY
1632 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1913 EV_P = ev_default_loop_ptr = &default_loop_struct;
1633#else 1914#else
1634 ev_default_loop_ptr = 1; 1915 ev_default_loop_ptr = 1;
1635#endif 1916#endif
1636 1917
1637 loop_init (EV_A_ flags); 1918 loop_init (EV_A_ flags);
… …
1654 1935
1655void 1936void
1656ev_default_destroy (void) 1937ev_default_destroy (void)
1657{ 1938{
1658#if EV_MULTIPLICITY 1939#if EV_MULTIPLICITY
1659 struct ev_loop *loop = ev_default_loop_ptr; 1940 EV_P = ev_default_loop_ptr;
1660#endif 1941#endif
1942
1943 ev_default_loop_ptr = 0;
1661 1944
1662#ifndef _WIN32 1945#ifndef _WIN32
1663 ev_ref (EV_A); /* child watcher */ 1946 ev_ref (EV_A); /* child watcher */
1664 ev_signal_stop (EV_A_ &childev); 1947 ev_signal_stop (EV_A_ &childev);
1665#endif 1948#endif
… …
1669 1952
1670void 1953void
1671ev_default_fork (void) 1954ev_default_fork (void)
1672{ 1955{
1673#if EV_MULTIPLICITY 1956#if EV_MULTIPLICITY
1674 struct ev_loop *loop = ev_default_loop_ptr; 1957 EV_P = ev_default_loop_ptr;
1675#endif 1958#endif
1676 1959
1677 if (backend)
1678 postfork = 1; /* must be in line with ev_loop_fork */ 1960 postfork = 1; /* must be in line with ev_loop_fork */
1679} 1961}
1680 1962
1681/*****************************************************************************/ 1963/*****************************************************************************/
1682 1964
1683void 1965void
1684ev_invoke (EV_P_ void *w, int revents) 1966ev_invoke (EV_P_ void *w, int revents)
1685{ 1967{
1686 EV_CB_INVOKE ((W)w, revents); 1968 EV_CB_INVOKE ((W)w, revents);
1687} 1969}
1688 1970
1689void inline_speed 1971unsigned int
1690call_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)
1691{ 1985{
1692 int pri; 1986 int pri;
1693 1987
1694 for (pri = NUMPRI; pri--; ) 1988 for (pri = NUMPRI; pri--; )
1695 while (pendingcnt [pri]) 1989 while (pendingcnt [pri])
1696 { 1990 {
1697 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1991 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1698 1992
1699 if (expect_true (p->w))
1700 {
1701 /*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 */
1702 1995
1703 p->w->pending = 0; 1996 p->w->pending = 0;
1704 EV_CB_INVOKE (p->w, p->events); 1997 EV_CB_INVOKE (p->w, p->events);
1705 EV_FREQUENT_CHECK; 1998 EV_FREQUENT_CHECK;
1706 }
1707 } 1999 }
1708} 2000}
1709 2001
1710#if EV_IDLE_ENABLE 2002#if EV_IDLE_ENABLE
1711void inline_size 2003/* make idle watchers pending. this handles the "call-idle */
2004/* only when higher priorities are idle" logic */
2005inline_size void
1712idle_reify (EV_P) 2006idle_reify (EV_P)
1713{ 2007{
1714 if (expect_false (idleall)) 2008 if (expect_false (idleall))
1715 { 2009 {
1716 int pri; 2010 int pri;
… …
1728 } 2022 }
1729 } 2023 }
1730} 2024}
1731#endif 2025#endif
1732 2026
1733void inline_size 2027/* make timers pending */
2028inline_size void
1734timers_reify (EV_P) 2029timers_reify (EV_P)
1735{ 2030{
1736 EV_FREQUENT_CHECK; 2031 EV_FREQUENT_CHECK;
1737 2032
1738 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 2033 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1739 { 2034 {
1740 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2035 do
1741
1742 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1743
1744 /* first reschedule or stop timer */
1745 if (w->repeat)
1746 { 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 {
1747 ev_at (w) += w->repeat; 2044 ev_at (w) += w->repeat;
1748 if (ev_at (w) < mn_now) 2045 if (ev_at (w) < mn_now)
1749 ev_at (w) = mn_now; 2046 ev_at (w) = mn_now;
1750 2047
1751 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.));
1752 2049
1753 ANHE_at_cache (timers [HEAP0]); 2050 ANHE_at_cache (timers [HEAP0]);
1754 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);
1755 } 2058 }
1756 else 2059 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1757 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1758 2060
1759 EV_FREQUENT_CHECK;
1760 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2061 feed_reverse_done (EV_A_ EV_TIMEOUT);
1761 } 2062 }
1762} 2063}
1763 2064
1764#if EV_PERIODIC_ENABLE 2065#if EV_PERIODIC_ENABLE
1765void inline_size 2066/* make periodics pending */
2067inline_size void
1766periodics_reify (EV_P) 2068periodics_reify (EV_P)
1767{ 2069{
1768 EV_FREQUENT_CHECK; 2070 EV_FREQUENT_CHECK;
1769 2071
1770 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2072 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1771 { 2073 {
1772 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2074 int feed_count = 0;
1773 2075
1774 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2076 do
1775
1776 /* first reschedule or stop timer */
1777 if (w->reschedule_cb)
1778 { 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 {
1779 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2085 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1780 2086
1781 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));
1782 2088
1783 ANHE_at_cache (periodics [HEAP0]); 2089 ANHE_at_cache (periodics [HEAP0]);
1784 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);
1785 } 2116 }
1786 else if (w->interval) 2117 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1787 {
1788 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1789 /* if next trigger time is not sufficiently in the future, put it there */
1790 /* this might happen because of floating point inexactness */
1791 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1792 {
1793 ev_at (w) += w->interval;
1794 2118
1795 /* if interval is unreasonably low we might still have a time in the past */
1796 /* so correct this. this will make the periodic very inexact, but the user */
1797 /* has effectively asked to get triggered more often than possible */
1798 if (ev_at (w) < ev_rt_now)
1799 ev_at (w) = ev_rt_now;
1800 }
1801
1802 ANHE_at_cache (periodics [HEAP0]);
1803 downheap (periodics, periodiccnt, HEAP0);
1804 }
1805 else
1806 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1807
1808 EV_FREQUENT_CHECK;
1809 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2119 feed_reverse_done (EV_A_ EV_PERIODIC);
1810 } 2120 }
1811} 2121}
1812 2122
2123/* simply recalculate all periodics */
2124/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1813static void noinline 2125static void noinline
1814periodics_reschedule (EV_P) 2126periodics_reschedule (EV_P)
1815{ 2127{
1816 int i; 2128 int i;
1817 2129
… …
1830 2142
1831 reheap (periodics, periodiccnt); 2143 reheap (periodics, periodiccnt);
1832} 2144}
1833#endif 2145#endif
1834 2146
1835void 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 detetc if there was a timejump, and act accordingly */
2163inline_speed void
1836time_update (EV_P_ ev_tstamp max_block) 2164time_update (EV_P_ ev_tstamp max_block)
1837{ 2165{
1838 int i;
1839
1840#if EV_USE_MONOTONIC 2166#if EV_USE_MONOTONIC
1841 if (expect_true (have_monotonic)) 2167 if (expect_true (have_monotonic))
1842 { 2168 {
2169 int i;
1843 ev_tstamp odiff = rtmn_diff; 2170 ev_tstamp odiff = rtmn_diff;
1844 2171
1845 mn_now = get_clock (); 2172 mn_now = get_clock ();
1846 2173
1847 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2174 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1873 ev_rt_now = ev_time (); 2200 ev_rt_now = ev_time ();
1874 mn_now = get_clock (); 2201 mn_now = get_clock ();
1875 now_floor = mn_now; 2202 now_floor = mn_now;
1876 } 2203 }
1877 2204
2205 /* no timer adjustment, as the monotonic clock doesn't jump */
2206 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1878# if EV_PERIODIC_ENABLE 2207# if EV_PERIODIC_ENABLE
1879 periodics_reschedule (EV_A); 2208 periodics_reschedule (EV_A);
1880# endif 2209# endif
1881 /* no timer adjustment, as the monotonic clock doesn't jump */
1882 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1883 } 2210 }
1884 else 2211 else
1885#endif 2212#endif
1886 { 2213 {
1887 ev_rt_now = ev_time (); 2214 ev_rt_now = ev_time ();
1888 2215
1889 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))
1890 { 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);
1891#if EV_PERIODIC_ENABLE 2220#if EV_PERIODIC_ENABLE
1892 periodics_reschedule (EV_A); 2221 periodics_reschedule (EV_A);
1893#endif 2222#endif
1894 /* adjust timers. this is easy, as the offset is the same for all of them */
1895 for (i = 0; i < timercnt; ++i)
1896 {
1897 ANHE *he = timers + i + HEAP0;
1898 ANHE_w (*he)->at += ev_rt_now - mn_now;
1899 ANHE_at_cache (*he);
1900 }
1901 } 2223 }
1902 2224
1903 mn_now = ev_rt_now; 2225 mn_now = ev_rt_now;
1904 } 2226 }
1905} 2227}
1906 2228
1907void 2229void
1908ev_ref (EV_P)
1909{
1910 ++activecnt;
1911}
1912
1913void
1914ev_unref (EV_P)
1915{
1916 --activecnt;
1917}
1918
1919void
1920ev_now_update (EV_P)
1921{
1922 time_update (EV_A_ 1e100);
1923}
1924
1925static int loop_done;
1926
1927void
1928ev_loop (EV_P_ int flags) 2230ev_loop (EV_P_ int flags)
1929{ 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
1930 loop_done = EVUNLOOP_CANCEL; 2238 loop_done = EVUNLOOP_CANCEL;
1931 2239
1932 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 */
1933 2241
1934 do 2242 do
1935 { 2243 {
1936#if EV_VERIFY >= 2 2244#if EV_VERIFY >= 2
1937 ev_loop_verify (EV_A); 2245 ev_loop_verify (EV_A);
… …
1950 /* we might have forked, so queue fork handlers */ 2258 /* we might have forked, so queue fork handlers */
1951 if (expect_false (postfork)) 2259 if (expect_false (postfork))
1952 if (forkcnt) 2260 if (forkcnt)
1953 { 2261 {
1954 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2262 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1955 call_pending (EV_A); 2263 EV_INVOKE_PENDING;
1956 } 2264 }
1957#endif 2265#endif
1958 2266
1959 /* queue prepare watchers (and execute them) */ 2267 /* queue prepare watchers (and execute them) */
1960 if (expect_false (preparecnt)) 2268 if (expect_false (preparecnt))
1961 { 2269 {
1962 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2270 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1963 call_pending (EV_A); 2271 EV_INVOKE_PENDING;
1964 } 2272 }
1965 2273
1966 if (expect_false (!activecnt)) 2274 if (expect_false (loop_done))
1967 break; 2275 break;
1968 2276
1969 /* we might have forked, so reify kernel state if necessary */ 2277 /* we might have forked, so reify kernel state if necessary */
1970 if (expect_false (postfork)) 2278 if (expect_false (postfork))
1971 loop_fork (EV_A); 2279 loop_fork (EV_A);
… …
1978 ev_tstamp waittime = 0.; 2286 ev_tstamp waittime = 0.;
1979 ev_tstamp sleeptime = 0.; 2287 ev_tstamp sleeptime = 0.;
1980 2288
1981 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2289 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1982 { 2290 {
2291 /* remember old timestamp for io_blocktime calculation */
2292 ev_tstamp prev_mn_now = mn_now;
2293
1983 /* update time to cancel out callback processing overhead */ 2294 /* update time to cancel out callback processing overhead */
1984 time_update (EV_A_ 1e100); 2295 time_update (EV_A_ 1e100);
1985 2296
1986 waittime = MAX_BLOCKTIME; 2297 waittime = MAX_BLOCKTIME;
1987 2298
… …
1997 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;
1998 if (waittime > to) waittime = to; 2309 if (waittime > to) waittime = to;
1999 } 2310 }
2000#endif 2311#endif
2001 2312
2313 /* don't let timeouts decrease the waittime below timeout_blocktime */
2002 if (expect_false (waittime < timeout_blocktime)) 2314 if (expect_false (waittime < timeout_blocktime))
2003 waittime = timeout_blocktime; 2315 waittime = timeout_blocktime;
2004 2316
2005 sleeptime = waittime - backend_fudge; 2317 /* extra check because io_blocktime is commonly 0 */
2006
2007 if (expect_true (sleeptime > io_blocktime)) 2318 if (expect_false (io_blocktime))
2008 sleeptime = io_blocktime;
2009
2010 if (sleeptime)
2011 { 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 {
2012 ev_sleep (sleeptime); 2327 ev_sleep (sleeptime);
2013 waittime -= sleeptime; 2328 waittime -= sleeptime;
2329 }
2014 } 2330 }
2015 } 2331 }
2016 2332
2333#if EV_MINIMAL < 2
2017 ++loop_count; 2334 ++loop_count;
2335#endif
2336 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2018 backend_poll (EV_A_ waittime); 2337 backend_poll (EV_A_ waittime);
2338 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2019 2339
2020 /* update ev_rt_now, do magic */ 2340 /* update ev_rt_now, do magic */
2021 time_update (EV_A_ waittime + sleeptime); 2341 time_update (EV_A_ waittime + sleeptime);
2022 } 2342 }
2023 2343
… …
2034 2354
2035 /* queue check watchers, to be executed first */ 2355 /* queue check watchers, to be executed first */
2036 if (expect_false (checkcnt)) 2356 if (expect_false (checkcnt))
2037 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2357 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2038 2358
2039 call_pending (EV_A); 2359 EV_INVOKE_PENDING;
2040 } 2360 }
2041 while (expect_true ( 2361 while (expect_true (
2042 activecnt 2362 activecnt
2043 && !loop_done 2363 && !loop_done
2044 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2364 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2045 )); 2365 ));
2046 2366
2047 if (loop_done == EVUNLOOP_ONE) 2367 if (loop_done == EVUNLOOP_ONE)
2048 loop_done = EVUNLOOP_CANCEL; 2368 loop_done = EVUNLOOP_CANCEL;
2369
2370#if EV_MINIMAL < 2
2371 --loop_depth;
2372#endif
2049} 2373}
2050 2374
2051void 2375void
2052ev_unloop (EV_P_ int how) 2376ev_unloop (EV_P_ int how)
2053{ 2377{
2054 loop_done = how; 2378 loop_done = how;
2055} 2379}
2056 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
2057/*****************************************************************************/ 2418/*****************************************************************************/
2419/* singly-linked list management, used when the expected list length is short */
2058 2420
2059void inline_size 2421inline_size void
2060wlist_add (WL *head, WL elem) 2422wlist_add (WL *head, WL elem)
2061{ 2423{
2062 elem->next = *head; 2424 elem->next = *head;
2063 *head = elem; 2425 *head = elem;
2064} 2426}
2065 2427
2066void inline_size 2428inline_size void
2067wlist_del (WL *head, WL elem) 2429wlist_del (WL *head, WL elem)
2068{ 2430{
2069 while (*head) 2431 while (*head)
2070 { 2432 {
2071 if (*head == elem) 2433 if (expect_true (*head == elem))
2072 { 2434 {
2073 *head = elem->next; 2435 *head = elem->next;
2074 return; 2436 break;
2075 } 2437 }
2076 2438
2077 head = &(*head)->next; 2439 head = &(*head)->next;
2078 } 2440 }
2079} 2441}
2080 2442
2081void inline_speed 2443/* internal, faster, version of ev_clear_pending */
2444inline_speed void
2082clear_pending (EV_P_ W w) 2445clear_pending (EV_P_ W w)
2083{ 2446{
2084 if (w->pending) 2447 if (w->pending)
2085 { 2448 {
2086 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2449 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2087 w->pending = 0; 2450 w->pending = 0;
2088 } 2451 }
2089} 2452}
2090 2453
2091int 2454int
… …
2095 int pending = w_->pending; 2458 int pending = w_->pending;
2096 2459
2097 if (expect_true (pending)) 2460 if (expect_true (pending))
2098 { 2461 {
2099 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2462 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2463 p->w = (W)&pending_w;
2100 w_->pending = 0; 2464 w_->pending = 0;
2101 p->w = 0;
2102 return p->events; 2465 return p->events;
2103 } 2466 }
2104 else 2467 else
2105 return 0; 2468 return 0;
2106} 2469}
2107 2470
2108void inline_size 2471inline_size void
2109pri_adjust (EV_P_ W w) 2472pri_adjust (EV_P_ W w)
2110{ 2473{
2111 int pri = w->priority; 2474 int pri = ev_priority (w);
2112 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2475 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2113 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2476 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2114 w->priority = pri; 2477 ev_set_priority (w, pri);
2115} 2478}
2116 2479
2117void inline_speed 2480inline_speed void
2118ev_start (EV_P_ W w, int active) 2481ev_start (EV_P_ W w, int active)
2119{ 2482{
2120 pri_adjust (EV_A_ w); 2483 pri_adjust (EV_A_ w);
2121 w->active = active; 2484 w->active = active;
2122 ev_ref (EV_A); 2485 ev_ref (EV_A);
2123} 2486}
2124 2487
2125void inline_size 2488inline_size void
2126ev_stop (EV_P_ W w) 2489ev_stop (EV_P_ W w)
2127{ 2490{
2128 ev_unref (EV_A); 2491 ev_unref (EV_A);
2129 w->active = 0; 2492 w->active = 0;
2130} 2493}
… …
2137 int fd = w->fd; 2500 int fd = w->fd;
2138 2501
2139 if (expect_false (ev_is_active (w))) 2502 if (expect_false (ev_is_active (w)))
2140 return; 2503 return;
2141 2504
2142 assert (("ev_io_start called with negative fd", fd >= 0)); 2505 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2506 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2143 2507
2144 EV_FREQUENT_CHECK; 2508 EV_FREQUENT_CHECK;
2145 2509
2146 ev_start (EV_A_ (W)w, 1); 2510 ev_start (EV_A_ (W)w, 1);
2147 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2148 wlist_add (&anfds[fd].head, (WL)w); 2512 wlist_add (&anfds[fd].head, (WL)w);
2149 2513
2150 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2514 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2151 w->events &= ~EV_IOFDSET; 2515 w->events &= ~EV__IOFDSET;
2152 2516
2153 EV_FREQUENT_CHECK; 2517 EV_FREQUENT_CHECK;
2154} 2518}
2155 2519
2156void noinline 2520void noinline
… …
2158{ 2522{
2159 clear_pending (EV_A_ (W)w); 2523 clear_pending (EV_A_ (W)w);
2160 if (expect_false (!ev_is_active (w))) 2524 if (expect_false (!ev_is_active (w)))
2161 return; 2525 return;
2162 2526
2163 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));
2164 2528
2165 EV_FREQUENT_CHECK; 2529 EV_FREQUENT_CHECK;
2166 2530
2167 wlist_del (&anfds[w->fd].head, (WL)w); 2531 wlist_del (&anfds[w->fd].head, (WL)w);
2168 ev_stop (EV_A_ (W)w); 2532 ev_stop (EV_A_ (W)w);
… …
2178 if (expect_false (ev_is_active (w))) 2542 if (expect_false (ev_is_active (w)))
2179 return; 2543 return;
2180 2544
2181 ev_at (w) += mn_now; 2545 ev_at (w) += mn_now;
2182 2546
2183 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.));
2184 2548
2185 EV_FREQUENT_CHECK; 2549 EV_FREQUENT_CHECK;
2186 2550
2187 ++timercnt; 2551 ++timercnt;
2188 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2552 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2191 ANHE_at_cache (timers [ev_active (w)]); 2555 ANHE_at_cache (timers [ev_active (w)]);
2192 upheap (timers, ev_active (w)); 2556 upheap (timers, ev_active (w));
2193 2557
2194 EV_FREQUENT_CHECK; 2558 EV_FREQUENT_CHECK;
2195 2559
2196 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2560 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2197} 2561}
2198 2562
2199void noinline 2563void noinline
2200ev_timer_stop (EV_P_ ev_timer *w) 2564ev_timer_stop (EV_P_ ev_timer *w)
2201{ 2565{
… …
2206 EV_FREQUENT_CHECK; 2570 EV_FREQUENT_CHECK;
2207 2571
2208 { 2572 {
2209 int active = ev_active (w); 2573 int active = ev_active (w);
2210 2574
2211 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2575 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2212 2576
2213 --timercnt; 2577 --timercnt;
2214 2578
2215 if (expect_true (active < timercnt + HEAP0)) 2579 if (expect_true (active < timercnt + HEAP0))
2216 { 2580 {
… …
2249 } 2613 }
2250 2614
2251 EV_FREQUENT_CHECK; 2615 EV_FREQUENT_CHECK;
2252} 2616}
2253 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
2254#if EV_PERIODIC_ENABLE 2624#if EV_PERIODIC_ENABLE
2255void noinline 2625void noinline
2256ev_periodic_start (EV_P_ ev_periodic *w) 2626ev_periodic_start (EV_P_ ev_periodic *w)
2257{ 2627{
2258 if (expect_false (ev_is_active (w))) 2628 if (expect_false (ev_is_active (w)))
… …
2260 2630
2261 if (w->reschedule_cb) 2631 if (w->reschedule_cb)
2262 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2632 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2263 else if (w->interval) 2633 else if (w->interval)
2264 { 2634 {
2265 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.));
2266 /* 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 */
2267 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;
2268 } 2638 }
2269 else 2639 else
2270 ev_at (w) = w->offset; 2640 ev_at (w) = w->offset;
… …
2278 ANHE_at_cache (periodics [ev_active (w)]); 2648 ANHE_at_cache (periodics [ev_active (w)]);
2279 upheap (periodics, ev_active (w)); 2649 upheap (periodics, ev_active (w));
2280 2650
2281 EV_FREQUENT_CHECK; 2651 EV_FREQUENT_CHECK;
2282 2652
2283 /*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));*/
2284} 2654}
2285 2655
2286void noinline 2656void noinline
2287ev_periodic_stop (EV_P_ ev_periodic *w) 2657ev_periodic_stop (EV_P_ ev_periodic *w)
2288{ 2658{
… …
2293 EV_FREQUENT_CHECK; 2663 EV_FREQUENT_CHECK;
2294 2664
2295 { 2665 {
2296 int active = ev_active (w); 2666 int active = ev_active (w);
2297 2667
2298 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2668 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2299 2669
2300 --periodiccnt; 2670 --periodiccnt;
2301 2671
2302 if (expect_true (active < periodiccnt + HEAP0)) 2672 if (expect_true (active < periodiccnt + HEAP0))
2303 { 2673 {
… …
2325#endif 2695#endif
2326 2696
2327void noinline 2697void noinline
2328ev_signal_start (EV_P_ ev_signal *w) 2698ev_signal_start (EV_P_ ev_signal *w)
2329{ 2699{
2330#if EV_MULTIPLICITY
2331 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2332#endif
2333 if (expect_false (ev_is_active (w))) 2700 if (expect_false (ev_is_active (w)))
2334 return; 2701 return;
2335 2702
2336 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));
2337 2704
2338 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));
2339 2708
2340 EV_FREQUENT_CHECK; 2709 signals [w->signum - 1].loop = EV_A;
2710#endif
2341 2711
2712 EV_FREQUENT_CHECK;
2713
2714#if EV_USE_SIGNALFD
2715 if (sigfd == -2)
2342 { 2716 {
2343#ifndef _WIN32 2717 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2344 sigset_t full, prev; 2718 if (sigfd < 0 && errno == EINVAL)
2345 sigfillset (&full); 2719 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2346 sigprocmask (SIG_SETMASK, &full, &prev);
2347#endif
2348 2720
2349 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2721 if (sigfd >= 0)
2722 {
2723 fd_intern (sigfd); /* doing it twice will not hurt */
2350 2724
2351#ifndef _WIN32 2725 sigemptyset (&sigfd_set);
2352 sigprocmask (SIG_SETMASK, &prev, 0); 2726
2353#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 }
2354 } 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
2355 2743
2356 ev_start (EV_A_ (W)w, 1); 2744 ev_start (EV_A_ (W)w, 1);
2357 wlist_add (&signals [w->signum - 1].head, (WL)w); 2745 wlist_add (&signals [w->signum - 1].head, (WL)w);
2358 2746
2359 if (!((WL)w)->next) 2747 if (!((WL)w)->next)
2748# if EV_USE_SIGNALFD
2749 if (sigfd < 0) /*TODO*/
2750# endif
2360 { 2751 {
2361#if _WIN32 2752# if _WIN32
2753 evpipe_init (EV_A);
2754
2362 signal (w->signum, ev_sighandler); 2755 signal (w->signum, ev_sighandler);
2363#else 2756# else
2364 struct sigaction sa; 2757 struct sigaction sa;
2758
2759 evpipe_init (EV_A);
2760
2365 sa.sa_handler = ev_sighandler; 2761 sa.sa_handler = ev_sighandler;
2366 sigfillset (&sa.sa_mask); 2762 sigfillset (&sa.sa_mask);
2367 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 */
2368 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);
2369#endif 2769#endif
2370 } 2770 }
2371 2771
2372 EV_FREQUENT_CHECK; 2772 EV_FREQUENT_CHECK;
2373} 2773}
2374 2774
2375void noinline 2775void noinline
… …
2383 2783
2384 wlist_del (&signals [w->signum - 1].head, (WL)w); 2784 wlist_del (&signals [w->signum - 1].head, (WL)w);
2385 ev_stop (EV_A_ (W)w); 2785 ev_stop (EV_A_ (W)w);
2386 2786
2387 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
2388 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2389 2808
2390 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2391} 2810}
2392 2811
2393void 2812void
2394ev_child_start (EV_P_ ev_child *w) 2813ev_child_start (EV_P_ ev_child *w)
2395{ 2814{
2396#if EV_MULTIPLICITY 2815#if EV_MULTIPLICITY
2397 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));
2398#endif 2817#endif
2399 if (expect_false (ev_is_active (w))) 2818 if (expect_false (ev_is_active (w)))
2400 return; 2819 return;
2401 2820
2402 EV_FREQUENT_CHECK; 2821 EV_FREQUENT_CHECK;
… …
2427# ifdef _WIN32 2846# ifdef _WIN32
2428# undef lstat 2847# undef lstat
2429# define lstat(a,b) _stati64 (a,b) 2848# define lstat(a,b) _stati64 (a,b)
2430# endif 2849# endif
2431 2850
2432#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 */
2433#define MIN_STAT_INTERVAL 0.1074891 2853#define MIN_STAT_INTERVAL 0.1074891
2434 2854
2435static 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);
2436 2856
2437#if EV_USE_INOTIFY 2857#if EV_USE_INOTIFY
2438# define EV_INOTIFY_BUFSIZE 8192 2858# define EV_INOTIFY_BUFSIZE 8192
… …
2440static void noinline 2860static void noinline
2441infy_add (EV_P_ ev_stat *w) 2861infy_add (EV_P_ ev_stat *w)
2442{ 2862{
2443 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);
2444 2864
2445 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 */
2446 { 2885 }
2447 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;
2448 2890
2449 /* monitor some parent directory for speedup hints */ 2891 /* if path is not there, monitor some parent directory for speedup hints */
2450 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2892 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2451 /* but an efficiency issue only */ 2893 /* but an efficiency issue only */
2452 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2894 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2453 { 2895 {
2454 char path [4096]; 2896 char path [4096];
2455 strcpy (path, w->path); 2897 strcpy (path, w->path);
… …
2459 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2901 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2460 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2902 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2461 2903
2462 char *pend = strrchr (path, '/'); 2904 char *pend = strrchr (path, '/');
2463 2905
2464 if (!pend) 2906 if (!pend || pend == path)
2465 break; /* whoops, no '/', complain to your admin */ 2907 break;
2466 2908
2467 *pend = 0; 2909 *pend = 0;
2468 w->wd = inotify_add_watch (fs_fd, path, mask); 2910 w->wd = inotify_add_watch (fs_fd, path, mask);
2469 } 2911 }
2470 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2912 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2471 } 2913 }
2472 } 2914 }
2473 else
2474 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2475 2915
2476 if (w->wd >= 0) 2916 if (w->wd >= 0)
2477 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);
2478} 2923}
2479 2924
2480static void noinline 2925static void noinline
2481infy_del (EV_P_ ev_stat *w) 2926infy_del (EV_P_ ev_stat *w)
2482{ 2927{
… …
2496 2941
2497static void noinline 2942static void noinline
2498infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2943infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2499{ 2944{
2500 if (slot < 0) 2945 if (slot < 0)
2501 /* overflow, need to check for all hahs slots */ 2946 /* overflow, need to check for all hash slots */
2502 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2947 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2503 infy_wd (EV_A_ slot, wd, ev); 2948 infy_wd (EV_A_ slot, wd, ev);
2504 else 2949 else
2505 { 2950 {
2506 WL w_; 2951 WL w_;
… …
2512 2957
2513 if (w->wd == wd || wd == -1) 2958 if (w->wd == wd || wd == -1)
2514 { 2959 {
2515 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2960 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2516 { 2961 {
2962 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2517 w->wd = -1; 2963 w->wd = -1;
2518 infy_add (EV_A_ w); /* re-add, no matter what */ 2964 infy_add (EV_A_ w); /* re-add, no matter what */
2519 } 2965 }
2520 2966
2521 stat_timer_cb (EV_A_ &w->timer, 0); 2967 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2534 2980
2535 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)
2536 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2982 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2537} 2983}
2538 2984
2539void inline_size 2985inline_size void
2986check_2625 (EV_P)
2987{
2988 /* kernels < 2.6.25 are borked
2989 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2990 */
2991 struct utsname buf;
2992 int major, minor, micro;
2993
2994 if (uname (&buf))
2995 return;
2996
2997 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2998 return;
2999
3000 if (major < 2
3001 || (major == 2 && minor < 6)
3002 || (major == 2 && minor == 6 && micro < 25))
3003 return;
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
2540infy_init (EV_P) 3020infy_init (EV_P)
2541{ 3021{
2542 if (fs_fd != -2) 3022 if (fs_fd != -2)
2543 return; 3023 return;
2544 3024
3025 fs_fd = -1;
3026
3027 check_2625 (EV_A);
3028
2545 fs_fd = inotify_init (); 3029 fs_fd = infy_newfd ();
2546 3030
2547 if (fs_fd >= 0) 3031 if (fs_fd >= 0)
2548 { 3032 {
3033 fd_intern (fs_fd);
2549 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3034 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2550 ev_set_priority (&fs_w, EV_MAXPRI); 3035 ev_set_priority (&fs_w, EV_MAXPRI);
2551 ev_io_start (EV_A_ &fs_w); 3036 ev_io_start (EV_A_ &fs_w);
3037 ev_unref (EV_A);
2552 } 3038 }
2553} 3039}
2554 3040
2555void inline_size 3041inline_size void
2556infy_fork (EV_P) 3042infy_fork (EV_P)
2557{ 3043{
2558 int slot; 3044 int slot;
2559 3045
2560 if (fs_fd < 0) 3046 if (fs_fd < 0)
2561 return; 3047 return;
2562 3048
3049 ev_ref (EV_A);
3050 ev_io_stop (EV_A_ &fs_w);
2563 close (fs_fd); 3051 close (fs_fd);
2564 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 }
2565 3061
2566 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3062 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2567 { 3063 {
2568 WL w_ = fs_hash [slot].head; 3064 WL w_ = fs_hash [slot].head;
2569 fs_hash [slot].head = 0; 3065 fs_hash [slot].head = 0;
… …
2576 w->wd = -1; 3072 w->wd = -1;
2577 3073
2578 if (fs_fd >= 0) 3074 if (fs_fd >= 0)
2579 infy_add (EV_A_ w); /* re-add, no matter what */ 3075 infy_add (EV_A_ w); /* re-add, no matter what */
2580 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);
2581 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 }
2582 } 3083 }
2583
2584 } 3084 }
2585} 3085}
2586 3086
2587#endif 3087#endif
2588 3088
… …
2604static void noinline 3104static void noinline
2605stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3105stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2606{ 3106{
2607 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3107 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2608 3108
2609 /* we copy this here each the time so that */ 3109 ev_statdata prev = w->attr;
2610 /* prev has the old value when the callback gets invoked */
2611 w->prev = w->attr;
2612 ev_stat_stat (EV_A_ w); 3110 ev_stat_stat (EV_A_ w);
2613 3111
2614 /* 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 */
2615 if ( 3113 if (
2616 w->prev.st_dev != w->attr.st_dev 3114 prev.st_dev != w->attr.st_dev
2617 || w->prev.st_ino != w->attr.st_ino 3115 || prev.st_ino != w->attr.st_ino
2618 || w->prev.st_mode != w->attr.st_mode 3116 || prev.st_mode != w->attr.st_mode
2619 || w->prev.st_nlink != w->attr.st_nlink 3117 || prev.st_nlink != w->attr.st_nlink
2620 || w->prev.st_uid != w->attr.st_uid 3118 || prev.st_uid != w->attr.st_uid
2621 || w->prev.st_gid != w->attr.st_gid 3119 || prev.st_gid != w->attr.st_gid
2622 || w->prev.st_rdev != w->attr.st_rdev 3120 || prev.st_rdev != w->attr.st_rdev
2623 || w->prev.st_size != w->attr.st_size 3121 || prev.st_size != w->attr.st_size
2624 || w->prev.st_atime != w->attr.st_atime 3122 || prev.st_atime != w->attr.st_atime
2625 || w->prev.st_mtime != w->attr.st_mtime 3123 || prev.st_mtime != w->attr.st_mtime
2626 || w->prev.st_ctime != w->attr.st_ctime 3124 || prev.st_ctime != w->attr.st_ctime
2627 ) { 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
2628 #if EV_USE_INOTIFY 3131 #if EV_USE_INOTIFY
3132 if (fs_fd >= 0)
3133 {
2629 infy_del (EV_A_ w); 3134 infy_del (EV_A_ w);
2630 infy_add (EV_A_ w); 3135 infy_add (EV_A_ w);
2631 ev_stat_stat (EV_A_ w); /* avoid race... */ 3136 ev_stat_stat (EV_A_ w); /* avoid race... */
3137 }
2632 #endif 3138 #endif
2633 3139
2634 ev_feed_event (EV_A_ w, EV_STAT); 3140 ev_feed_event (EV_A_ w, EV_STAT);
2635 } 3141 }
2636} 3142}
… …
2639ev_stat_start (EV_P_ ev_stat *w) 3145ev_stat_start (EV_P_ ev_stat *w)
2640{ 3146{
2641 if (expect_false (ev_is_active (w))) 3147 if (expect_false (ev_is_active (w)))
2642 return; 3148 return;
2643 3149
2644 /* since we use memcmp, we need to clear any padding data etc. */
2645 memset (&w->prev, 0, sizeof (ev_statdata));
2646 memset (&w->attr, 0, sizeof (ev_statdata));
2647
2648 ev_stat_stat (EV_A_ w); 3150 ev_stat_stat (EV_A_ w);
2649 3151
3152 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2650 if (w->interval < MIN_STAT_INTERVAL) 3153 w->interval = MIN_STAT_INTERVAL;
2651 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2652 3154
2653 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);
2654 ev_set_priority (&w->timer, ev_priority (w)); 3156 ev_set_priority (&w->timer, ev_priority (w));
2655 3157
2656#if EV_USE_INOTIFY 3158#if EV_USE_INOTIFY
2657 infy_init (EV_A); 3159 infy_init (EV_A);
2658 3160
2659 if (fs_fd >= 0) 3161 if (fs_fd >= 0)
2660 infy_add (EV_A_ w); 3162 infy_add (EV_A_ w);
2661 else 3163 else
2662#endif 3164#endif
3165 {
2663 ev_timer_start (EV_A_ &w->timer); 3166 ev_timer_again (EV_A_ &w->timer);
3167 ev_unref (EV_A);
3168 }
2664 3169
2665 ev_start (EV_A_ (W)w, 1); 3170 ev_start (EV_A_ (W)w, 1);
2666 3171
2667 EV_FREQUENT_CHECK; 3172 EV_FREQUENT_CHECK;
2668} 3173}
… …
2677 EV_FREQUENT_CHECK; 3182 EV_FREQUENT_CHECK;
2678 3183
2679#if EV_USE_INOTIFY 3184#if EV_USE_INOTIFY
2680 infy_del (EV_A_ w); 3185 infy_del (EV_A_ w);
2681#endif 3186#endif
3187
3188 if (ev_is_active (&w->timer))
3189 {
3190 ev_ref (EV_A);
2682 ev_timer_stop (EV_A_ &w->timer); 3191 ev_timer_stop (EV_A_ &w->timer);
3192 }
2683 3193
2684 ev_stop (EV_A_ (W)w); 3194 ev_stop (EV_A_ (W)w);
2685 3195
2686 EV_FREQUENT_CHECK; 3196 EV_FREQUENT_CHECK;
2687} 3197}
… …
2828embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3338embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2829{ 3339{
2830 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3340 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2831 3341
2832 { 3342 {
2833 struct ev_loop *loop = w->other; 3343 EV_P = w->other;
2834 3344
2835 while (fdchangecnt) 3345 while (fdchangecnt)
2836 { 3346 {
2837 fd_reify (EV_A); 3347 fd_reify (EV_A);
2838 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3348 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
2843static void 3353static void
2844embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 3354embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2845{ 3355{
2846 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));
2847 3357
3358 ev_embed_stop (EV_A_ w);
3359
2848 { 3360 {
2849 struct ev_loop *loop = w->other; 3361 EV_P = w->other;
2850 3362
2851 ev_loop_fork (EV_A); 3363 ev_loop_fork (EV_A);
3364 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2852 } 3365 }
3366
3367 ev_embed_start (EV_A_ w);
2853} 3368}
2854 3369
2855#if 0 3370#if 0
2856static void 3371static void
2857embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3372embed_idle_cb (EV_P_ ev_idle *idle, int revents)
… …
2865{ 3380{
2866 if (expect_false (ev_is_active (w))) 3381 if (expect_false (ev_is_active (w)))
2867 return; 3382 return;
2868 3383
2869 { 3384 {
2870 struct ev_loop *loop = w->other; 3385 EV_P = w->other;
2871 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 ()));
2872 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);
2873 } 3388 }
2874 3389
2875 EV_FREQUENT_CHECK; 3390 EV_FREQUENT_CHECK;
2876 3391
… …
2987 3502
2988void 3503void
2989ev_async_send (EV_P_ ev_async *w) 3504ev_async_send (EV_P_ ev_async *w)
2990{ 3505{
2991 w->sent = 1; 3506 w->sent = 1;
2992 evpipe_write (EV_A_ &gotasync); 3507 evpipe_write (EV_A_ &async_pending);
2993} 3508}
2994#endif 3509#endif
2995 3510
2996/*****************************************************************************/ 3511/*****************************************************************************/
2997 3512
… …
3059 ev_timer_set (&once->to, timeout, 0.); 3574 ev_timer_set (&once->to, timeout, 0.);
3060 ev_timer_start (EV_A_ &once->to); 3575 ev_timer_start (EV_A_ &once->to);
3061 } 3576 }
3062} 3577}
3063 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
3064#if EV_MULTIPLICITY 3687#if EV_MULTIPLICITY
3065 #include "ev_wrap.h" 3688 #include "ev_wrap.h"
3066#endif 3689#endif
3067 3690
3068#ifdef __cplusplus 3691#ifdef __cplusplus

Diff Legend

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