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

Comparing libev/ev.c (file contents):
Revision 1.251 by root, Thu May 22 03:42:34 2008 UTC vs.
Revision 1.296 by root, Thu Jul 9 09:11:20 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
… …
154#ifndef _WIN32 168#ifndef _WIN32
155# include <sys/time.h> 169# include <sys/time.h>
156# include <sys/wait.h> 170# include <sys/wait.h>
157# include <unistd.h> 171# include <unistd.h>
158#else 172#else
173# include <io.h>
159# define WIN32_LEAN_AND_MEAN 174# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 175# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 176# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 177# define EV_SELECT_IS_WINSOCKET 1
163# endif 178# endif
164#endif 179#endif
165 180
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 181/* this block tries to deduce configuration from header-defined symbols and defaults */
167 182
183#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1
186# else
187# define EV_USE_CLOCK_SYSCALL 0
188# endif
189#endif
190
168#ifndef EV_USE_MONOTONIC 191#ifndef EV_USE_MONOTONIC
192# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
193# define EV_USE_MONOTONIC 1
194# else
169# define EV_USE_MONOTONIC 0 195# define EV_USE_MONOTONIC 0
196# endif
170#endif 197#endif
171 198
172#ifndef EV_USE_REALTIME 199#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 200# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
174#endif 201#endif
175 202
176#ifndef EV_USE_NANOSLEEP 203#ifndef EV_USE_NANOSLEEP
204# if _POSIX_C_SOURCE >= 199309L
205# define EV_USE_NANOSLEEP 1
206# else
177# define EV_USE_NANOSLEEP 0 207# define EV_USE_NANOSLEEP 0
208# endif
178#endif 209#endif
179 210
180#ifndef EV_USE_SELECT 211#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 212# define EV_USE_SELECT 1
182#endif 213#endif
… …
253 284
254#ifndef EV_HEAP_CACHE_AT 285#ifndef EV_HEAP_CACHE_AT
255# define EV_HEAP_CACHE_AT !EV_MINIMAL 286# define EV_HEAP_CACHE_AT !EV_MINIMAL
256#endif 287#endif
257 288
289/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
290/* which makes programs even slower. might work on other unices, too. */
291#if EV_USE_CLOCK_SYSCALL
292# include <syscall.h>
293# ifdef SYS_clock_gettime
294# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
295# undef EV_USE_MONOTONIC
296# define EV_USE_MONOTONIC 1
297# else
298# undef EV_USE_CLOCK_SYSCALL
299# define EV_USE_CLOCK_SYSCALL 0
300# endif
301#endif
302
258/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 303/* this block fixes any misconfiguration where we know we run into trouble otherwise */
259 304
260#ifndef CLOCK_MONOTONIC 305#ifndef CLOCK_MONOTONIC
261# undef EV_USE_MONOTONIC 306# undef EV_USE_MONOTONIC
262# define EV_USE_MONOTONIC 0 307# define EV_USE_MONOTONIC 0
… …
277# include <sys/select.h> 322# include <sys/select.h>
278# endif 323# endif
279#endif 324#endif
280 325
281#if EV_USE_INOTIFY 326#if EV_USE_INOTIFY
327# include <sys/utsname.h>
328# include <sys/statfs.h>
282# include <sys/inotify.h> 329# include <sys/inotify.h>
330/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
331# ifndef IN_DONT_FOLLOW
332# undef EV_USE_INOTIFY
333# define EV_USE_INOTIFY 0
334# endif
283#endif 335#endif
284 336
285#if EV_SELECT_IS_WINSOCKET 337#if EV_SELECT_IS_WINSOCKET
286# include <winsock.h> 338# include <winsock.h>
287#endif 339#endif
… …
339# define inline_speed static noinline 391# define inline_speed static noinline
340#else 392#else
341# define inline_speed static inline 393# define inline_speed static inline
342#endif 394#endif
343 395
344#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
397
398#if EV_MINPRI == EV_MAXPRI
399# define ABSPRI(w) (((W)w), 0)
400#else
345#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 401# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
402#endif
346 403
347#define EMPTY /* required for microsofts broken pseudo-c compiler */ 404#define EMPTY /* required for microsofts broken pseudo-c compiler */
348#define EMPTY2(a,b) /* used to suppress some warnings */ 405#define EMPTY2(a,b) /* used to suppress some warnings */
349 406
350typedef ev_watcher *W; 407typedef ev_watcher *W;
… …
352typedef ev_watcher_time *WT; 409typedef ev_watcher_time *WT;
353 410
354#define ev_active(w) ((W)(w))->active 411#define ev_active(w) ((W)(w))->active
355#define ev_at(w) ((WT)(w))->at 412#define ev_at(w) ((WT)(w))->at
356 413
357#if EV_USE_MONOTONIC 414#if EV_USE_REALTIME
358/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 415/* sig_atomic_t is used to avoid per-thread variables or locking but still */
359/* giving it a reasonably high chance of working on typical architetcures */ 416/* giving it a reasonably high chance of working on typical architetcures */
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif
419
420#if EV_USE_MONOTONIC
360static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
361#endif 422#endif
362 423
363#ifdef _WIN32 424#ifdef _WIN32
364# include "ev_win32.c" 425# include "ev_win32.c"
… …
373{ 434{
374 syserr_cb = cb; 435 syserr_cb = cb;
375} 436}
376 437
377static void noinline 438static void noinline
378syserr (const char *msg) 439ev_syserr (const char *msg)
379{ 440{
380 if (!msg) 441 if (!msg)
381 msg = "(libev) system error"; 442 msg = "(libev) system error";
382 443
383 if (syserr_cb) 444 if (syserr_cb)
… …
429#define ev_malloc(size) ev_realloc (0, (size)) 490#define ev_malloc(size) ev_realloc (0, (size))
430#define ev_free(ptr) ev_realloc ((ptr), 0) 491#define ev_free(ptr) ev_realloc ((ptr), 0)
431 492
432/*****************************************************************************/ 493/*****************************************************************************/
433 494
495/* file descriptor info structure */
434typedef struct 496typedef struct
435{ 497{
436 WL head; 498 WL head;
437 unsigned char events; 499 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */
501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
438 unsigned char reify; 502 unsigned char unused;
503#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif
439#if EV_SELECT_IS_WINSOCKET 506#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 507 SOCKET handle;
441#endif 508#endif
442} ANFD; 509} ANFD;
443 510
511/* stores the pending event set for a given watcher */
444typedef struct 512typedef struct
445{ 513{
446 W w; 514 W w;
447 int events; 515 int events; /* the pending event set for the given watcher */
448} ANPENDING; 516} ANPENDING;
449 517
450#if EV_USE_INOTIFY 518#if EV_USE_INOTIFY
451/* hash table entry per inotify-id */ 519/* hash table entry per inotify-id */
452typedef struct 520typedef struct
… …
455} ANFS; 523} ANFS;
456#endif 524#endif
457 525
458/* Heap Entry */ 526/* Heap Entry */
459#if EV_HEAP_CACHE_AT 527#if EV_HEAP_CACHE_AT
528 /* a heap element */
460 typedef struct { 529 typedef struct {
461 ev_tstamp at; 530 ev_tstamp at;
462 WT w; 531 WT w;
463 } ANHE; 532 } ANHE;
464 533
465 #define ANHE_w(he) (he).w /* access watcher, read-write */ 534 #define ANHE_w(he) (he).w /* access watcher, read-write */
466 #define ANHE_at(he) (he).at /* access cached at, read-only */ 535 #define ANHE_at(he) (he).at /* access cached at, read-only */
467 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 536 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
468#else 537#else
538 /* a heap element */
469 typedef WT ANHE; 539 typedef WT ANHE;
470 540
471 #define ANHE_w(he) (he) 541 #define ANHE_w(he) (he)
472 #define ANHE_at(he) (he)->at 542 #define ANHE_at(he) (he)->at
473 #define ANHE_at_cache(he) 543 #define ANHE_at_cache(he)
… …
499 569
500#endif 570#endif
501 571
502/*****************************************************************************/ 572/*****************************************************************************/
503 573
574#ifndef EV_HAVE_EV_TIME
504ev_tstamp 575ev_tstamp
505ev_time (void) 576ev_time (void)
506{ 577{
507#if EV_USE_REALTIME 578#if EV_USE_REALTIME
579 if (expect_true (have_realtime))
580 {
508 struct timespec ts; 581 struct timespec ts;
509 clock_gettime (CLOCK_REALTIME, &ts); 582 clock_gettime (CLOCK_REALTIME, &ts);
510 return ts.tv_sec + ts.tv_nsec * 1e-9; 583 return ts.tv_sec + ts.tv_nsec * 1e-9;
511#else 584 }
585#endif
586
512 struct timeval tv; 587 struct timeval tv;
513 gettimeofday (&tv, 0); 588 gettimeofday (&tv, 0);
514 return tv.tv_sec + tv.tv_usec * 1e-6; 589 return tv.tv_sec + tv.tv_usec * 1e-6;
515#endif
516} 590}
591#endif
517 592
518ev_tstamp inline_size 593inline_size ev_tstamp
519get_clock (void) 594get_clock (void)
520{ 595{
521#if EV_USE_MONOTONIC 596#if EV_USE_MONOTONIC
522 if (expect_true (have_monotonic)) 597 if (expect_true (have_monotonic))
523 { 598 {
… …
556 struct timeval tv; 631 struct timeval tv;
557 632
558 tv.tv_sec = (time_t)delay; 633 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 635
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */
561 select (0, 0, 0, 0, &tv); 639 select (0, 0, 0, 0, &tv);
562#endif 640#endif
563 } 641 }
564} 642}
565 643
566/*****************************************************************************/ 644/*****************************************************************************/
567 645
568#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 646#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
569 647
570int inline_size 648/* find a suitable new size for the given array, */
649/* hopefully by rounding to a ncie-to-malloc size */
650inline_size int
571array_nextsize (int elem, int cur, int cnt) 651array_nextsize (int elem, int cur, int cnt)
572{ 652{
573 int ncur = cur + 1; 653 int ncur = cur + 1;
574 654
575 do 655 do
… …
592array_realloc (int elem, void *base, int *cur, int cnt) 672array_realloc (int elem, void *base, int *cur, int cnt)
593{ 673{
594 *cur = array_nextsize (elem, *cur, cnt); 674 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 675 return ev_realloc (base, elem * *cur);
596} 676}
677
678#define array_init_zero(base,count) \
679 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 680
598#define array_needsize(type,base,cur,cnt,init) \ 681#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 682 if (expect_false ((cnt) > (cur))) \
600 { \ 683 { \
601 int ocur_ = (cur); \ 684 int ocur_ = (cur); \
… …
613 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 696 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
614 } 697 }
615#endif 698#endif
616 699
617#define array_free(stem, idx) \ 700#define array_free(stem, idx) \
618 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 701 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
619 702
620/*****************************************************************************/ 703/*****************************************************************************/
704
705/* dummy callback for pending events */
706static void noinline
707pendingcb (EV_P_ ev_prepare *w, int revents)
708{
709}
621 710
622void noinline 711void noinline
623ev_feed_event (EV_P_ void *w, int revents) 712ev_feed_event (EV_P_ void *w, int revents)
624{ 713{
625 W w_ = (W)w; 714 W w_ = (W)w;
… …
634 pendings [pri][w_->pending - 1].w = w_; 723 pendings [pri][w_->pending - 1].w = w_;
635 pendings [pri][w_->pending - 1].events = revents; 724 pendings [pri][w_->pending - 1].events = revents;
636 } 725 }
637} 726}
638 727
639void inline_speed 728inline_speed void
729feed_reverse (EV_P_ W w)
730{
731 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
732 rfeeds [rfeedcnt++] = w;
733}
734
735inline_size void
736feed_reverse_done (EV_P_ int revents)
737{
738 do
739 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
740 while (rfeedcnt);
741}
742
743inline_speed void
640queue_events (EV_P_ W *events, int eventcnt, int type) 744queue_events (EV_P_ W *events, int eventcnt, int type)
641{ 745{
642 int i; 746 int i;
643 747
644 for (i = 0; i < eventcnt; ++i) 748 for (i = 0; i < eventcnt; ++i)
645 ev_feed_event (EV_A_ events [i], type); 749 ev_feed_event (EV_A_ events [i], type);
646} 750}
647 751
648/*****************************************************************************/ 752/*****************************************************************************/
649 753
650void inline_size 754inline_speed void
651anfds_init (ANFD *base, int count)
652{
653 while (count--)
654 {
655 base->head = 0;
656 base->events = EV_NONE;
657 base->reify = 0;
658
659 ++base;
660 }
661}
662
663void inline_speed
664fd_event (EV_P_ int fd, int revents) 755fd_event (EV_P_ int fd, int revents)
665{ 756{
666 ANFD *anfd = anfds + fd; 757 ANFD *anfd = anfds + fd;
667 ev_io *w; 758 ev_io *w;
668 759
… …
680{ 771{
681 if (fd >= 0 && fd < anfdmax) 772 if (fd >= 0 && fd < anfdmax)
682 fd_event (EV_A_ fd, revents); 773 fd_event (EV_A_ fd, revents);
683} 774}
684 775
685void inline_size 776/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */
778inline_size void
686fd_reify (EV_P) 779fd_reify (EV_P)
687{ 780{
688 int i; 781 int i;
689 782
690 for (i = 0; i < fdchangecnt; ++i) 783 for (i = 0; i < fdchangecnt; ++i)
… …
699 events |= (unsigned char)w->events; 792 events |= (unsigned char)w->events;
700 793
701#if EV_SELECT_IS_WINSOCKET 794#if EV_SELECT_IS_WINSOCKET
702 if (events) 795 if (events)
703 { 796 {
704 unsigned long argp; 797 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 798 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 800 #else
708 anfd->handle = _get_osfhandle (fd); 801 anfd->handle = _get_osfhandle (fd);
709 #endif 802 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 803 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 804 }
712#endif 805#endif
713 806
714 { 807 {
715 unsigned char o_events = anfd->events; 808 unsigned char o_events = anfd->events;
716 unsigned char o_reify = anfd->reify; 809 unsigned char o_reify = anfd->reify;
717 810
718 anfd->reify = 0; 811 anfd->reify = 0;
719 anfd->events = events; 812 anfd->events = events;
720 813
721 if (o_events != events || o_reify & EV_IOFDSET) 814 if (o_events != events || o_reify & EV__IOFDSET)
722 backend_modify (EV_A_ fd, o_events, events); 815 backend_modify (EV_A_ fd, o_events, events);
723 } 816 }
724 } 817 }
725 818
726 fdchangecnt = 0; 819 fdchangecnt = 0;
727} 820}
728 821
729void inline_size 822/* something about the given fd changed */
823inline_size void
730fd_change (EV_P_ int fd, int flags) 824fd_change (EV_P_ int fd, int flags)
731{ 825{
732 unsigned char reify = anfds [fd].reify; 826 unsigned char reify = anfds [fd].reify;
733 anfds [fd].reify |= flags; 827 anfds [fd].reify |= flags;
734 828
… …
738 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 832 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
739 fdchanges [fdchangecnt - 1] = fd; 833 fdchanges [fdchangecnt - 1] = fd;
740 } 834 }
741} 835}
742 836
743void inline_speed 837/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
838inline_speed void
744fd_kill (EV_P_ int fd) 839fd_kill (EV_P_ int fd)
745{ 840{
746 ev_io *w; 841 ev_io *w;
747 842
748 while ((w = (ev_io *)anfds [fd].head)) 843 while ((w = (ev_io *)anfds [fd].head))
… …
750 ev_io_stop (EV_A_ w); 845 ev_io_stop (EV_A_ w);
751 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 846 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
752 } 847 }
753} 848}
754 849
755int inline_size 850/* check whether the given fd is atcually valid, for error recovery */
851inline_size int
756fd_valid (int fd) 852fd_valid (int fd)
757{ 853{
758#ifdef _WIN32 854#ifdef _WIN32
759 return _get_osfhandle (fd) != -1; 855 return _get_osfhandle (fd) != -1;
760#else 856#else
… …
768{ 864{
769 int fd; 865 int fd;
770 866
771 for (fd = 0; fd < anfdmax; ++fd) 867 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 868 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 869 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 870 fd_kill (EV_A_ fd);
775} 871}
776 872
777/* called on ENOMEM in select/poll to kill some fds and retry */ 873/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 874static void noinline
… …
796 892
797 for (fd = 0; fd < anfdmax; ++fd) 893 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 894 if (anfds [fd].events)
799 { 895 {
800 anfds [fd].events = 0; 896 anfds [fd].events = 0;
897 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 898 fd_change (EV_A_ fd, EV__IOFDSET | 1);
802 } 899 }
803} 900}
804 901
805/*****************************************************************************/ 902/*****************************************************************************/
806 903
… …
822#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 919#define HEAP0 (DHEAP - 1) /* index of first element in heap */
823#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 920#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
824#define UPHEAP_DONE(p,k) ((p) == (k)) 921#define UPHEAP_DONE(p,k) ((p) == (k))
825 922
826/* away from the root */ 923/* away from the root */
827void inline_speed 924inline_speed void
828downheap (ANHE *heap, int N, int k) 925downheap (ANHE *heap, int N, int k)
829{ 926{
830 ANHE he = heap [k]; 927 ANHE he = heap [k];
831 ANHE *E = heap + N + HEAP0; 928 ANHE *E = heap + N + HEAP0;
832 929
… …
872#define HEAP0 1 969#define HEAP0 1
873#define HPARENT(k) ((k) >> 1) 970#define HPARENT(k) ((k) >> 1)
874#define UPHEAP_DONE(p,k) (!(p)) 971#define UPHEAP_DONE(p,k) (!(p))
875 972
876/* away from the root */ 973/* away from the root */
877void inline_speed 974inline_speed void
878downheap (ANHE *heap, int N, int k) 975downheap (ANHE *heap, int N, int k)
879{ 976{
880 ANHE he = heap [k]; 977 ANHE he = heap [k];
881 978
882 for (;;) 979 for (;;)
… …
902 ev_active (ANHE_w (he)) = k; 999 ev_active (ANHE_w (he)) = k;
903} 1000}
904#endif 1001#endif
905 1002
906/* towards the root */ 1003/* towards the root */
907void inline_speed 1004inline_speed void
908upheap (ANHE *heap, int k) 1005upheap (ANHE *heap, int k)
909{ 1006{
910 ANHE he = heap [k]; 1007 ANHE he = heap [k];
911 1008
912 for (;;) 1009 for (;;)
… …
923 1020
924 heap [k] = he; 1021 heap [k] = he;
925 ev_active (ANHE_w (he)) = k; 1022 ev_active (ANHE_w (he)) = k;
926} 1023}
927 1024
928void inline_size 1025/* move an element suitably so it is in a correct place */
1026inline_size void
929adjustheap (ANHE *heap, int N, int k) 1027adjustheap (ANHE *heap, int N, int k)
930{ 1028{
931 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
932 upheap (heap, k); 1030 upheap (heap, k);
933 else 1031 else
934 downheap (heap, N, k); 1032 downheap (heap, N, k);
935} 1033}
936 1034
937/* rebuild the heap: this function is used only once and executed rarely */ 1035/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size 1036inline_size void
939reheap (ANHE *heap, int N) 1037reheap (ANHE *heap, int N)
940{ 1038{
941 int i; 1039 int i;
942 1040
943 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1041 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
… …
946 upheap (heap, i + HEAP0); 1044 upheap (heap, i + HEAP0);
947} 1045}
948 1046
949/*****************************************************************************/ 1047/*****************************************************************************/
950 1048
1049/* associate signal watchers to a signal signal */
951typedef struct 1050typedef struct
952{ 1051{
953 WL head; 1052 WL head;
954 EV_ATOMIC_T gotsig; 1053 EV_ATOMIC_T gotsig;
955} ANSIG; 1054} ANSIG;
… …
957static ANSIG *signals; 1056static ANSIG *signals;
958static int signalmax; 1057static int signalmax;
959 1058
960static EV_ATOMIC_T gotsig; 1059static EV_ATOMIC_T gotsig;
961 1060
962void inline_size
963signals_init (ANSIG *base, int count)
964{
965 while (count--)
966 {
967 base->head = 0;
968 base->gotsig = 0;
969
970 ++base;
971 }
972}
973
974/*****************************************************************************/ 1061/*****************************************************************************/
975 1062
976void inline_speed 1063/* used to prepare libev internal fd's */
1064/* this is not fork-safe */
1065inline_speed void
977fd_intern (int fd) 1066fd_intern (int fd)
978{ 1067{
979#ifdef _WIN32 1068#ifdef _WIN32
980 int arg = 1; 1069 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1070 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 1071#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 1072 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 1073 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 1074#endif
986} 1075}
987 1076
988static void noinline 1077static void noinline
989evpipe_init (EV_P) 1078evpipe_init (EV_P)
990{ 1079{
991 if (!ev_is_active (&pipeev)) 1080 if (!ev_is_active (&pipe_w))
992 { 1081 {
993#if EV_USE_EVENTFD 1082#if EV_USE_EVENTFD
994 if ((evfd = eventfd (0, 0)) >= 0) 1083 if ((evfd = eventfd (0, 0)) >= 0)
995 { 1084 {
996 evpipe [0] = -1; 1085 evpipe [0] = -1;
997 fd_intern (evfd); 1086 fd_intern (evfd);
998 ev_io_set (&pipeev, evfd, EV_READ); 1087 ev_io_set (&pipe_w, evfd, EV_READ);
999 } 1088 }
1000 else 1089 else
1001#endif 1090#endif
1002 { 1091 {
1003 while (pipe (evpipe)) 1092 while (pipe (evpipe))
1004 syserr ("(libev) error creating signal/async pipe"); 1093 ev_syserr ("(libev) error creating signal/async pipe");
1005 1094
1006 fd_intern (evpipe [0]); 1095 fd_intern (evpipe [0]);
1007 fd_intern (evpipe [1]); 1096 fd_intern (evpipe [1]);
1008 ev_io_set (&pipeev, evpipe [0], EV_READ); 1097 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1009 } 1098 }
1010 1099
1011 ev_io_start (EV_A_ &pipeev); 1100 ev_io_start (EV_A_ &pipe_w);
1012 ev_unref (EV_A); /* watcher should not keep loop alive */ 1101 ev_unref (EV_A); /* watcher should not keep loop alive */
1013 } 1102 }
1014} 1103}
1015 1104
1016void inline_size 1105inline_size void
1017evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1106evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1018{ 1107{
1019 if (!*flag) 1108 if (!*flag)
1020 { 1109 {
1021 int old_errno = errno; /* save errno because write might clobber it */ 1110 int old_errno = errno; /* save errno because write might clobber it */
… …
1034 1123
1035 errno = old_errno; 1124 errno = old_errno;
1036 } 1125 }
1037} 1126}
1038 1127
1128/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */
1039static void 1130static void
1040pipecb (EV_P_ ev_io *iow, int revents) 1131pipecb (EV_P_ ev_io *iow, int revents)
1041{ 1132{
1042#if EV_USE_EVENTFD 1133#if EV_USE_EVENTFD
1043 if (evfd >= 0) 1134 if (evfd >= 0)
… …
1099ev_feed_signal_event (EV_P_ int signum) 1190ev_feed_signal_event (EV_P_ int signum)
1100{ 1191{
1101 WL w; 1192 WL w;
1102 1193
1103#if EV_MULTIPLICITY 1194#if EV_MULTIPLICITY
1104 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1105#endif 1196#endif
1106 1197
1107 --signum; 1198 --signum;
1108 1199
1109 if (signum < 0 || signum >= signalmax) 1200 if (signum < 0 || signum >= signalmax)
… …
1125 1216
1126#ifndef WIFCONTINUED 1217#ifndef WIFCONTINUED
1127# define WIFCONTINUED(status) 0 1218# define WIFCONTINUED(status) 0
1128#endif 1219#endif
1129 1220
1130void inline_speed 1221/* handle a single child status event */
1222inline_speed void
1131child_reap (EV_P_ int chain, int pid, int status) 1223child_reap (EV_P_ int chain, int pid, int status)
1132{ 1224{
1133 ev_child *w; 1225 ev_child *w;
1134 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1226 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1135 1227
… …
1148 1240
1149#ifndef WCONTINUED 1241#ifndef WCONTINUED
1150# define WCONTINUED 0 1242# define WCONTINUED 0
1151#endif 1243#endif
1152 1244
1245/* called on sigchld etc., calls waitpid */
1153static void 1246static void
1154childcb (EV_P_ ev_signal *sw, int revents) 1247childcb (EV_P_ ev_signal *sw, int revents)
1155{ 1248{
1156 int pid, status; 1249 int pid, status;
1157 1250
… …
1238 /* kqueue is borked on everything but netbsd apparently */ 1331 /* kqueue is borked on everything but netbsd apparently */
1239 /* it usually doesn't work correctly on anything but sockets and pipes */ 1332 /* it usually doesn't work correctly on anything but sockets and pipes */
1240 flags &= ~EVBACKEND_KQUEUE; 1333 flags &= ~EVBACKEND_KQUEUE;
1241#endif 1334#endif
1242#ifdef __APPLE__ 1335#ifdef __APPLE__
1243 // flags &= ~EVBACKEND_KQUEUE; for documentation 1336 /* only select works correctly on that "unix-certified" platform */
1244 flags &= ~EVBACKEND_POLL; 1337 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1338 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1245#endif 1339#endif
1246 1340
1247 return flags; 1341 return flags;
1248} 1342}
1249 1343
… …
1269ev_loop_count (EV_P) 1363ev_loop_count (EV_P)
1270{ 1364{
1271 return loop_count; 1365 return loop_count;
1272} 1366}
1273 1367
1368unsigned int
1369ev_loop_depth (EV_P)
1370{
1371 return loop_depth;
1372}
1373
1274void 1374void
1275ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1375ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1276{ 1376{
1277 io_blocktime = interval; 1377 io_blocktime = interval;
1278} 1378}
… …
1281ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1282{ 1382{
1283 timeout_blocktime = interval; 1383 timeout_blocktime = interval;
1284} 1384}
1285 1385
1386/* initialise a loop structure, must be zero-initialised */
1286static void noinline 1387static void noinline
1287loop_init (EV_P_ unsigned int flags) 1388loop_init (EV_P_ unsigned int flags)
1288{ 1389{
1289 if (!backend) 1390 if (!backend)
1290 { 1391 {
1392#if EV_USE_REALTIME
1393 if (!have_realtime)
1394 {
1395 struct timespec ts;
1396
1397 if (!clock_gettime (CLOCK_REALTIME, &ts))
1398 have_realtime = 1;
1399 }
1400#endif
1401
1291#if EV_USE_MONOTONIC 1402#if EV_USE_MONOTONIC
1403 if (!have_monotonic)
1292 { 1404 {
1293 struct timespec ts; 1405 struct timespec ts;
1406
1294 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1295 have_monotonic = 1; 1408 have_monotonic = 1;
1296 } 1409 }
1297#endif 1410#endif
1298 1411
1299 ev_rt_now = ev_time (); 1412 ev_rt_now = ev_time ();
1300 mn_now = get_clock (); 1413 mn_now = get_clock ();
1301 now_floor = mn_now; 1414 now_floor = mn_now;
1302 rtmn_diff = ev_rt_now - mn_now; 1415 rtmn_diff = ev_rt_now - mn_now;
1416 invoke_cb = ev_invoke_pending;
1303 1417
1304 io_blocktime = 0.; 1418 io_blocktime = 0.;
1305 timeout_blocktime = 0.; 1419 timeout_blocktime = 0.;
1306 backend = 0; 1420 backend = 0;
1307 backend_fd = -1; 1421 backend_fd = -1;
… …
1338#endif 1452#endif
1339#if EV_USE_SELECT 1453#if EV_USE_SELECT
1340 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1454 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1341#endif 1455#endif
1342 1456
1457 ev_prepare_init (&pending_w, pendingcb);
1458
1343 ev_init (&pipeev, pipecb); 1459 ev_init (&pipe_w, pipecb);
1344 ev_set_priority (&pipeev, EV_MAXPRI); 1460 ev_set_priority (&pipe_w, EV_MAXPRI);
1345 } 1461 }
1346} 1462}
1347 1463
1464/* free up a loop structure */
1348static void noinline 1465static void noinline
1349loop_destroy (EV_P) 1466loop_destroy (EV_P)
1350{ 1467{
1351 int i; 1468 int i;
1352 1469
1353 if (ev_is_active (&pipeev)) 1470 if (ev_is_active (&pipe_w))
1354 { 1471 {
1355 ev_ref (EV_A); /* signal watcher */ 1472 ev_ref (EV_A); /* signal watcher */
1356 ev_io_stop (EV_A_ &pipeev); 1473 ev_io_stop (EV_A_ &pipe_w);
1357 1474
1358#if EV_USE_EVENTFD 1475#if EV_USE_EVENTFD
1359 if (evfd >= 0) 1476 if (evfd >= 0)
1360 close (evfd); 1477 close (evfd);
1361#endif 1478#endif
… …
1400 } 1517 }
1401 1518
1402 ev_free (anfds); anfdmax = 0; 1519 ev_free (anfds); anfdmax = 0;
1403 1520
1404 /* have to use the microsoft-never-gets-it-right macro */ 1521 /* have to use the microsoft-never-gets-it-right macro */
1522 array_free (rfeed, EMPTY);
1405 array_free (fdchange, EMPTY); 1523 array_free (fdchange, EMPTY);
1406 array_free (timer, EMPTY); 1524 array_free (timer, EMPTY);
1407#if EV_PERIODIC_ENABLE 1525#if EV_PERIODIC_ENABLE
1408 array_free (periodic, EMPTY); 1526 array_free (periodic, EMPTY);
1409#endif 1527#endif
… …
1418 1536
1419 backend = 0; 1537 backend = 0;
1420} 1538}
1421 1539
1422#if EV_USE_INOTIFY 1540#if EV_USE_INOTIFY
1423void inline_size infy_fork (EV_P); 1541inline_size void infy_fork (EV_P);
1424#endif 1542#endif
1425 1543
1426void inline_size 1544inline_size void
1427loop_fork (EV_P) 1545loop_fork (EV_P)
1428{ 1546{
1429#if EV_USE_PORT 1547#if EV_USE_PORT
1430 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1548 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1431#endif 1549#endif
… …
1437#endif 1555#endif
1438#if EV_USE_INOTIFY 1556#if EV_USE_INOTIFY
1439 infy_fork (EV_A); 1557 infy_fork (EV_A);
1440#endif 1558#endif
1441 1559
1442 if (ev_is_active (&pipeev)) 1560 if (ev_is_active (&pipe_w))
1443 { 1561 {
1444 /* this "locks" the handlers against writing to the pipe */ 1562 /* this "locks" the handlers against writing to the pipe */
1445 /* while we modify the fd vars */ 1563 /* while we modify the fd vars */
1446 gotsig = 1; 1564 gotsig = 1;
1447#if EV_ASYNC_ENABLE 1565#if EV_ASYNC_ENABLE
1448 gotasync = 1; 1566 gotasync = 1;
1449#endif 1567#endif
1450 1568
1451 ev_ref (EV_A); 1569 ev_ref (EV_A);
1452 ev_io_stop (EV_A_ &pipeev); 1570 ev_io_stop (EV_A_ &pipe_w);
1453 1571
1454#if EV_USE_EVENTFD 1572#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1573 if (evfd >= 0)
1456 close (evfd); 1574 close (evfd);
1457#endif 1575#endif
… …
1462 close (evpipe [1]); 1580 close (evpipe [1]);
1463 } 1581 }
1464 1582
1465 evpipe_init (EV_A); 1583 evpipe_init (EV_A);
1466 /* now iterate over everything, in case we missed something */ 1584 /* now iterate over everything, in case we missed something */
1467 pipecb (EV_A_ &pipeev, EV_READ); 1585 pipecb (EV_A_ &pipe_w, EV_READ);
1468 } 1586 }
1469 1587
1470 postfork = 0; 1588 postfork = 0;
1471} 1589}
1472 1590
… …
1499{ 1617{
1500 postfork = 1; /* must be in line with ev_default_fork */ 1618 postfork = 1; /* must be in line with ev_default_fork */
1501} 1619}
1502 1620
1503#if EV_VERIFY 1621#if EV_VERIFY
1504void noinline 1622static void noinline
1505verify_watcher (EV_P_ W w) 1623verify_watcher (EV_P_ W w)
1506{ 1624{
1507 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1625 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508 1626
1509 if (w->pending) 1627 if (w->pending)
1510 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1628 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1511} 1629}
1512 1630
1513static void noinline 1631static void noinline
1514verify_heap (EV_P_ ANHE *heap, int N) 1632verify_heap (EV_P_ ANHE *heap, int N)
1515{ 1633{
1516 int i; 1634 int i;
1517 1635
1518 for (i = HEAP0; i < N + HEAP0; ++i) 1636 for (i = HEAP0; i < N + HEAP0; ++i)
1519 { 1637 {
1520 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1638 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1521 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1639 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1522 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1640 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1523 1641
1524 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1642 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1525 } 1643 }
1526} 1644}
1527 1645
1528static void noinline 1646static void noinline
1529array_verify (EV_P_ W *ws, int cnt) 1647array_verify (EV_P_ W *ws, int cnt)
1530{ 1648{
1531 while (cnt--) 1649 while (cnt--)
1532 { 1650 {
1533 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1651 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1534 verify_watcher (EV_A_ ws [cnt]); 1652 verify_watcher (EV_A_ ws [cnt]);
1535 } 1653 }
1536} 1654}
1537#endif 1655#endif
1538 1656
… …
1545 1663
1546 assert (activecnt >= -1); 1664 assert (activecnt >= -1);
1547 1665
1548 assert (fdchangemax >= fdchangecnt); 1666 assert (fdchangemax >= fdchangecnt);
1549 for (i = 0; i < fdchangecnt; ++i) 1667 for (i = 0; i < fdchangecnt; ++i)
1550 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1668 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1551 1669
1552 assert (anfdmax >= 0); 1670 assert (anfdmax >= 0);
1553 for (i = 0; i < anfdmax; ++i) 1671 for (i = 0; i < anfdmax; ++i)
1554 for (w = anfds [i].head; w; w = w->next) 1672 for (w = anfds [i].head; w; w = w->next)
1555 { 1673 {
1556 verify_watcher (EV_A_ (W)w); 1674 verify_watcher (EV_A_ (W)w);
1557 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1675 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1558 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1676 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1559 } 1677 }
1560 1678
1561 assert (timermax >= timercnt); 1679 assert (timermax >= timercnt);
1562 verify_heap (EV_A_ timers, timercnt); 1680 verify_heap (EV_A_ timers, timercnt);
1563 1681
… …
1568 1686
1569 for (i = NUMPRI; i--; ) 1687 for (i = NUMPRI; i--; )
1570 { 1688 {
1571 assert (pendingmax [i] >= pendingcnt [i]); 1689 assert (pendingmax [i] >= pendingcnt [i]);
1572#if EV_IDLE_ENABLE 1690#if EV_IDLE_ENABLE
1691 assert (idleall >= 0);
1573 assert (idlemax [i] >= idlecnt [i]); 1692 assert (idlemax [i] >= idlecnt [i]);
1574 array_verify (EV_A_ (W *)idles [i], idlecnt [i]); 1693 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1575#endif 1694#endif
1576 } 1695 }
1577 1696
… …
1639{ 1758{
1640#if EV_MULTIPLICITY 1759#if EV_MULTIPLICITY
1641 struct ev_loop *loop = ev_default_loop_ptr; 1760 struct ev_loop *loop = ev_default_loop_ptr;
1642#endif 1761#endif
1643 1762
1763 ev_default_loop_ptr = 0;
1764
1644#ifndef _WIN32 1765#ifndef _WIN32
1645 ev_ref (EV_A); /* child watcher */ 1766 ev_ref (EV_A); /* child watcher */
1646 ev_signal_stop (EV_A_ &childev); 1767 ev_signal_stop (EV_A_ &childev);
1647#endif 1768#endif
1648 1769
… …
1654{ 1775{
1655#if EV_MULTIPLICITY 1776#if EV_MULTIPLICITY
1656 struct ev_loop *loop = ev_default_loop_ptr; 1777 struct ev_loop *loop = ev_default_loop_ptr;
1657#endif 1778#endif
1658 1779
1659 if (backend)
1660 postfork = 1; /* must be in line with ev_loop_fork */ 1780 postfork = 1; /* must be in line with ev_loop_fork */
1661} 1781}
1662 1782
1663/*****************************************************************************/ 1783/*****************************************************************************/
1664 1784
1665void 1785void
1666ev_invoke (EV_P_ void *w, int revents) 1786ev_invoke (EV_P_ void *w, int revents)
1667{ 1787{
1668 EV_CB_INVOKE ((W)w, revents); 1788 EV_CB_INVOKE ((W)w, revents);
1669} 1789}
1670 1790
1671void inline_speed 1791void
1672call_pending (EV_P) 1792ev_invoke_pending (EV_P)
1673{ 1793{
1674 int pri; 1794 int pri;
1675 1795
1676 for (pri = NUMPRI; pri--; ) 1796 for (pri = NUMPRI; pri--; )
1677 while (pendingcnt [pri]) 1797 while (pendingcnt [pri])
1678 { 1798 {
1679 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1799 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1680 1800
1681 if (expect_true (p->w))
1682 {
1683 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1801 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1802 /* ^ this is no longer true, as pending_w could be here */
1684 1803
1685 p->w->pending = 0; 1804 p->w->pending = 0;
1686 EV_CB_INVOKE (p->w, p->events); 1805 EV_CB_INVOKE (p->w, p->events);
1687 EV_FREQUENT_CHECK; 1806 EV_FREQUENT_CHECK;
1688 }
1689 } 1807 }
1690} 1808}
1691 1809
1692#if EV_IDLE_ENABLE 1810#if EV_IDLE_ENABLE
1693void inline_size 1811/* make idle watchers pending. this handles the "call-idle */
1812/* only when higher priorities are idle" logic */
1813inline_size void
1694idle_reify (EV_P) 1814idle_reify (EV_P)
1695{ 1815{
1696 if (expect_false (idleall)) 1816 if (expect_false (idleall))
1697 { 1817 {
1698 int pri; 1818 int pri;
… …
1710 } 1830 }
1711 } 1831 }
1712} 1832}
1713#endif 1833#endif
1714 1834
1715void inline_size 1835/* make timers pending */
1836inline_size void
1716timers_reify (EV_P) 1837timers_reify (EV_P)
1717{ 1838{
1718 EV_FREQUENT_CHECK; 1839 EV_FREQUENT_CHECK;
1719 1840
1720 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1841 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1721 { 1842 {
1722 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1843 do
1723
1724 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1725
1726 /* first reschedule or stop timer */
1727 if (w->repeat)
1728 { 1844 {
1845 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1846
1847 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1848
1849 /* first reschedule or stop timer */
1850 if (w->repeat)
1851 {
1729 ev_at (w) += w->repeat; 1852 ev_at (w) += w->repeat;
1730 if (ev_at (w) < mn_now) 1853 if (ev_at (w) < mn_now)
1731 ev_at (w) = mn_now; 1854 ev_at (w) = mn_now;
1732 1855
1733 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1856 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1734 1857
1735 ANHE_at_cache (timers [HEAP0]); 1858 ANHE_at_cache (timers [HEAP0]);
1736 downheap (timers, timercnt, HEAP0); 1859 downheap (timers, timercnt, HEAP0);
1860 }
1861 else
1862 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1863
1864 EV_FREQUENT_CHECK;
1865 feed_reverse (EV_A_ (W)w);
1737 } 1866 }
1738 else 1867 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1739 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1740 1868
1741 EV_FREQUENT_CHECK;
1742 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1869 feed_reverse_done (EV_A_ EV_TIMEOUT);
1743 } 1870 }
1744} 1871}
1745 1872
1746#if EV_PERIODIC_ENABLE 1873#if EV_PERIODIC_ENABLE
1747void inline_size 1874/* make periodics pending */
1875inline_size void
1748periodics_reify (EV_P) 1876periodics_reify (EV_P)
1749{ 1877{
1750 EV_FREQUENT_CHECK; 1878 EV_FREQUENT_CHECK;
1751 1879
1752 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1880 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1753 { 1881 {
1754 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1882 int feed_count = 0;
1755 1883
1756 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1884 do
1757
1758 /* first reschedule or stop timer */
1759 if (w->reschedule_cb)
1760 { 1885 {
1886 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1887
1888 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1889
1890 /* first reschedule or stop timer */
1891 if (w->reschedule_cb)
1892 {
1761 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1893 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1762 1894
1763 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1895 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1764 1896
1765 ANHE_at_cache (periodics [HEAP0]); 1897 ANHE_at_cache (periodics [HEAP0]);
1766 downheap (periodics, periodiccnt, HEAP0); 1898 downheap (periodics, periodiccnt, HEAP0);
1899 }
1900 else if (w->interval)
1901 {
1902 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1903 /* if next trigger time is not sufficiently in the future, put it there */
1904 /* this might happen because of floating point inexactness */
1905 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1906 {
1907 ev_at (w) += w->interval;
1908
1909 /* if interval is unreasonably low we might still have a time in the past */
1910 /* so correct this. this will make the periodic very inexact, but the user */
1911 /* has effectively asked to get triggered more often than possible */
1912 if (ev_at (w) < ev_rt_now)
1913 ev_at (w) = ev_rt_now;
1914 }
1915
1916 ANHE_at_cache (periodics [HEAP0]);
1917 downheap (periodics, periodiccnt, HEAP0);
1918 }
1919 else
1920 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1921
1922 EV_FREQUENT_CHECK;
1923 feed_reverse (EV_A_ (W)w);
1767 } 1924 }
1768 else if (w->interval) 1925 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1769 {
1770 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1771 /* if next trigger time is not sufficiently in the future, put it there */
1772 /* this might happen because of floating point inexactness */
1773 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1774 {
1775 ev_at (w) += w->interval;
1776 1926
1777 /* if interval is unreasonably low we might still have a time in the past */
1778 /* so correct this. this will make the periodic very inexact, but the user */
1779 /* has effectively asked to get triggered more often than possible */
1780 if (ev_at (w) < ev_rt_now)
1781 ev_at (w) = ev_rt_now;
1782 }
1783
1784 ANHE_at_cache (periodics [HEAP0]);
1785 downheap (periodics, periodiccnt, HEAP0);
1786 }
1787 else
1788 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1789
1790 EV_FREQUENT_CHECK;
1791 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1927 feed_reverse_done (EV_A_ EV_PERIODIC);
1792 } 1928 }
1793} 1929}
1794 1930
1931/* simply recalculate all periodics */
1932/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1795static void noinline 1933static void noinline
1796periodics_reschedule (EV_P) 1934periodics_reschedule (EV_P)
1797{ 1935{
1798 int i; 1936 int i;
1799 1937
… …
1812 1950
1813 reheap (periodics, periodiccnt); 1951 reheap (periodics, periodiccnt);
1814} 1952}
1815#endif 1953#endif
1816 1954
1817void inline_speed 1955/* adjust all timers by a given offset */
1956static void noinline
1957timers_reschedule (EV_P_ ev_tstamp adjust)
1958{
1959 int i;
1960
1961 for (i = 0; i < timercnt; ++i)
1962 {
1963 ANHE *he = timers + i + HEAP0;
1964 ANHE_w (*he)->at += adjust;
1965 ANHE_at_cache (*he);
1966 }
1967}
1968
1969/* fetch new monotonic and realtime times from the kernel */
1970/* also detetc if there was a timejump, and act accordingly */
1971inline_speed void
1818time_update (EV_P_ ev_tstamp max_block) 1972time_update (EV_P_ ev_tstamp max_block)
1819{ 1973{
1820 int i;
1821
1822#if EV_USE_MONOTONIC 1974#if EV_USE_MONOTONIC
1823 if (expect_true (have_monotonic)) 1975 if (expect_true (have_monotonic))
1824 { 1976 {
1977 int i;
1825 ev_tstamp odiff = rtmn_diff; 1978 ev_tstamp odiff = rtmn_diff;
1826 1979
1827 mn_now = get_clock (); 1980 mn_now = get_clock ();
1828 1981
1829 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 1982 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1855 ev_rt_now = ev_time (); 2008 ev_rt_now = ev_time ();
1856 mn_now = get_clock (); 2009 mn_now = get_clock ();
1857 now_floor = mn_now; 2010 now_floor = mn_now;
1858 } 2011 }
1859 2012
2013 /* no timer adjustment, as the monotonic clock doesn't jump */
2014 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1860# if EV_PERIODIC_ENABLE 2015# if EV_PERIODIC_ENABLE
1861 periodics_reschedule (EV_A); 2016 periodics_reschedule (EV_A);
1862# endif 2017# endif
1863 /* no timer adjustment, as the monotonic clock doesn't jump */
1864 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1865 } 2018 }
1866 else 2019 else
1867#endif 2020#endif
1868 { 2021 {
1869 ev_rt_now = ev_time (); 2022 ev_rt_now = ev_time ();
1870 2023
1871 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2024 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1872 { 2025 {
2026 /* adjust timers. this is easy, as the offset is the same for all of them */
2027 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1873#if EV_PERIODIC_ENABLE 2028#if EV_PERIODIC_ENABLE
1874 periodics_reschedule (EV_A); 2029 periodics_reschedule (EV_A);
1875#endif 2030#endif
1876 /* adjust timers. this is easy, as the offset is the same for all of them */
1877 for (i = 0; i < timercnt; ++i)
1878 {
1879 ANHE *he = timers + i + HEAP0;
1880 ANHE_w (*he)->at += ev_rt_now - mn_now;
1881 ANHE_at_cache (*he);
1882 }
1883 } 2031 }
1884 2032
1885 mn_now = ev_rt_now; 2033 mn_now = ev_rt_now;
1886 } 2034 }
1887} 2035}
1888 2036
1889void 2037void
1890ev_ref (EV_P)
1891{
1892 ++activecnt;
1893}
1894
1895void
1896ev_unref (EV_P)
1897{
1898 --activecnt;
1899}
1900
1901static int loop_done;
1902
1903void
1904ev_loop (EV_P_ int flags) 2038ev_loop (EV_P_ int flags)
1905{ 2039{
2040 ++loop_depth;
2041
1906 loop_done = EVUNLOOP_CANCEL; 2042 loop_done = EVUNLOOP_CANCEL;
1907 2043
1908 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2044 invoke_cb (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1909 2045
1910 do 2046 do
1911 { 2047 {
1912#if EV_VERIFY >= 2 2048#if EV_VERIFY >= 2
1913 ev_loop_verify (EV_A); 2049 ev_loop_verify (EV_A);
… …
1926 /* we might have forked, so queue fork handlers */ 2062 /* we might have forked, so queue fork handlers */
1927 if (expect_false (postfork)) 2063 if (expect_false (postfork))
1928 if (forkcnt) 2064 if (forkcnt)
1929 { 2065 {
1930 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2066 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1931 call_pending (EV_A); 2067 invoke_cb (EV_A);
1932 } 2068 }
1933#endif 2069#endif
1934 2070
1935 /* queue prepare watchers (and execute them) */ 2071 /* queue prepare watchers (and execute them) */
1936 if (expect_false (preparecnt)) 2072 if (expect_false (preparecnt))
1937 { 2073 {
1938 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2074 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1939 call_pending (EV_A); 2075 invoke_cb (EV_A);
1940 } 2076 }
1941
1942 if (expect_false (!activecnt))
1943 break;
1944 2077
1945 /* we might have forked, so reify kernel state if necessary */ 2078 /* we might have forked, so reify kernel state if necessary */
1946 if (expect_false (postfork)) 2079 if (expect_false (postfork))
1947 loop_fork (EV_A); 2080 loop_fork (EV_A);
1948 2081
… …
1954 ev_tstamp waittime = 0.; 2087 ev_tstamp waittime = 0.;
1955 ev_tstamp sleeptime = 0.; 2088 ev_tstamp sleeptime = 0.;
1956 2089
1957 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2090 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1958 { 2091 {
2092 /* remember old timestamp for io_blocktime calculation */
2093 ev_tstamp prev_mn_now = mn_now;
2094
1959 /* update time to cancel out callback processing overhead */ 2095 /* update time to cancel out callback processing overhead */
1960 time_update (EV_A_ 1e100); 2096 time_update (EV_A_ 1e100);
1961 2097
1962 waittime = MAX_BLOCKTIME; 2098 waittime = MAX_BLOCKTIME;
1963 2099
… …
1973 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2109 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1974 if (waittime > to) waittime = to; 2110 if (waittime > to) waittime = to;
1975 } 2111 }
1976#endif 2112#endif
1977 2113
2114 /* don't let timeouts decrease the waittime below timeout_blocktime */
1978 if (expect_false (waittime < timeout_blocktime)) 2115 if (expect_false (waittime < timeout_blocktime))
1979 waittime = timeout_blocktime; 2116 waittime = timeout_blocktime;
1980 2117
1981 sleeptime = waittime - backend_fudge; 2118 /* extra check because io_blocktime is commonly 0 */
1982
1983 if (expect_true (sleeptime > io_blocktime)) 2119 if (expect_false (io_blocktime))
1984 sleeptime = io_blocktime;
1985
1986 if (sleeptime)
1987 { 2120 {
2121 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2122
2123 if (sleeptime > waittime - backend_fudge)
2124 sleeptime = waittime - backend_fudge;
2125
2126 if (expect_true (sleeptime > 0.))
2127 {
1988 ev_sleep (sleeptime); 2128 ev_sleep (sleeptime);
1989 waittime -= sleeptime; 2129 waittime -= sleeptime;
2130 }
1990 } 2131 }
1991 } 2132 }
1992 2133
1993 ++loop_count; 2134 ++loop_count;
1994 backend_poll (EV_A_ waittime); 2135 backend_poll (EV_A_ waittime);
… …
2010 2151
2011 /* queue check watchers, to be executed first */ 2152 /* queue check watchers, to be executed first */
2012 if (expect_false (checkcnt)) 2153 if (expect_false (checkcnt))
2013 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2014 2155
2015 call_pending (EV_A); 2156 invoke_cb (EV_A);
2016 } 2157 }
2017 while (expect_true ( 2158 while (expect_true (
2018 activecnt 2159 activecnt
2019 && !loop_done 2160 && !loop_done
2020 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2161 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2021 )); 2162 ));
2022 2163
2023 if (loop_done == EVUNLOOP_ONE) 2164 if (loop_done == EVUNLOOP_ONE)
2024 loop_done = EVUNLOOP_CANCEL; 2165 loop_done = EVUNLOOP_CANCEL;
2166
2167 --loop_depth;
2025} 2168}
2026 2169
2027void 2170void
2028ev_unloop (EV_P_ int how) 2171ev_unloop (EV_P_ int how)
2029{ 2172{
2030 loop_done = how; 2173 loop_done = how;
2031} 2174}
2032 2175
2176void
2177ev_ref (EV_P)
2178{
2179 ++activecnt;
2180}
2181
2182void
2183ev_unref (EV_P)
2184{
2185 --activecnt;
2186}
2187
2188void
2189ev_now_update (EV_P)
2190{
2191 time_update (EV_A_ 1e100);
2192}
2193
2194void
2195ev_suspend (EV_P)
2196{
2197 ev_now_update (EV_A);
2198}
2199
2200void
2201ev_resume (EV_P)
2202{
2203 ev_tstamp mn_prev = mn_now;
2204
2205 ev_now_update (EV_A);
2206 timers_reschedule (EV_A_ mn_now - mn_prev);
2207#if EV_PERIODIC_ENABLE
2208 /* TODO: really do this? */
2209 periodics_reschedule (EV_A);
2210#endif
2211}
2212
2033/*****************************************************************************/ 2213/*****************************************************************************/
2214/* singly-linked list management, used when the expected list length is short */
2034 2215
2035void inline_size 2216inline_size void
2036wlist_add (WL *head, WL elem) 2217wlist_add (WL *head, WL elem)
2037{ 2218{
2038 elem->next = *head; 2219 elem->next = *head;
2039 *head = elem; 2220 *head = elem;
2040} 2221}
2041 2222
2042void inline_size 2223inline_size void
2043wlist_del (WL *head, WL elem) 2224wlist_del (WL *head, WL elem)
2044{ 2225{
2045 while (*head) 2226 while (*head)
2046 { 2227 {
2047 if (*head == elem) 2228 if (*head == elem)
… …
2052 2233
2053 head = &(*head)->next; 2234 head = &(*head)->next;
2054 } 2235 }
2055} 2236}
2056 2237
2057void inline_speed 2238/* internal, faster, version of ev_clear_pending */
2239inline_speed void
2058clear_pending (EV_P_ W w) 2240clear_pending (EV_P_ W w)
2059{ 2241{
2060 if (w->pending) 2242 if (w->pending)
2061 { 2243 {
2062 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2244 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2063 w->pending = 0; 2245 w->pending = 0;
2064 } 2246 }
2065} 2247}
2066 2248
2067int 2249int
… …
2071 int pending = w_->pending; 2253 int pending = w_->pending;
2072 2254
2073 if (expect_true (pending)) 2255 if (expect_true (pending))
2074 { 2256 {
2075 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2257 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2258 p->w = (W)&pending_w;
2076 w_->pending = 0; 2259 w_->pending = 0;
2077 p->w = 0;
2078 return p->events; 2260 return p->events;
2079 } 2261 }
2080 else 2262 else
2081 return 0; 2263 return 0;
2082} 2264}
2083 2265
2084void inline_size 2266inline_size void
2085pri_adjust (EV_P_ W w) 2267pri_adjust (EV_P_ W w)
2086{ 2268{
2087 int pri = w->priority; 2269 int pri = ev_priority (w);
2088 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2270 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2089 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2271 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2090 w->priority = pri; 2272 ev_set_priority (w, pri);
2091} 2273}
2092 2274
2093void inline_speed 2275inline_speed void
2094ev_start (EV_P_ W w, int active) 2276ev_start (EV_P_ W w, int active)
2095{ 2277{
2096 pri_adjust (EV_A_ w); 2278 pri_adjust (EV_A_ w);
2097 w->active = active; 2279 w->active = active;
2098 ev_ref (EV_A); 2280 ev_ref (EV_A);
2099} 2281}
2100 2282
2101void inline_size 2283inline_size void
2102ev_stop (EV_P_ W w) 2284ev_stop (EV_P_ W w)
2103{ 2285{
2104 ev_unref (EV_A); 2286 ev_unref (EV_A);
2105 w->active = 0; 2287 w->active = 0;
2106} 2288}
… …
2113 int fd = w->fd; 2295 int fd = w->fd;
2114 2296
2115 if (expect_false (ev_is_active (w))) 2297 if (expect_false (ev_is_active (w)))
2116 return; 2298 return;
2117 2299
2118 assert (("ev_io_start called with negative fd", fd >= 0)); 2300 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2301 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2119 2302
2120 EV_FREQUENT_CHECK; 2303 EV_FREQUENT_CHECK;
2121 2304
2122 ev_start (EV_A_ (W)w, 1); 2305 ev_start (EV_A_ (W)w, 1);
2123 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2306 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2124 wlist_add (&anfds[fd].head, (WL)w); 2307 wlist_add (&anfds[fd].head, (WL)w);
2125 2308
2126 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2309 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2127 w->events &= ~EV_IOFDSET; 2310 w->events &= ~EV__IOFDSET;
2128 2311
2129 EV_FREQUENT_CHECK; 2312 EV_FREQUENT_CHECK;
2130} 2313}
2131 2314
2132void noinline 2315void noinline
… …
2134{ 2317{
2135 clear_pending (EV_A_ (W)w); 2318 clear_pending (EV_A_ (W)w);
2136 if (expect_false (!ev_is_active (w))) 2319 if (expect_false (!ev_is_active (w)))
2137 return; 2320 return;
2138 2321
2139 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2322 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2140 2323
2141 EV_FREQUENT_CHECK; 2324 EV_FREQUENT_CHECK;
2142 2325
2143 wlist_del (&anfds[w->fd].head, (WL)w); 2326 wlist_del (&anfds[w->fd].head, (WL)w);
2144 ev_stop (EV_A_ (W)w); 2327 ev_stop (EV_A_ (W)w);
… …
2154 if (expect_false (ev_is_active (w))) 2337 if (expect_false (ev_is_active (w)))
2155 return; 2338 return;
2156 2339
2157 ev_at (w) += mn_now; 2340 ev_at (w) += mn_now;
2158 2341
2159 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2342 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2160 2343
2161 EV_FREQUENT_CHECK; 2344 EV_FREQUENT_CHECK;
2162 2345
2163 ++timercnt; 2346 ++timercnt;
2164 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2347 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
… …
2167 ANHE_at_cache (timers [ev_active (w)]); 2350 ANHE_at_cache (timers [ev_active (w)]);
2168 upheap (timers, ev_active (w)); 2351 upheap (timers, ev_active (w));
2169 2352
2170 EV_FREQUENT_CHECK; 2353 EV_FREQUENT_CHECK;
2171 2354
2172 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2355 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2173} 2356}
2174 2357
2175void noinline 2358void noinline
2176ev_timer_stop (EV_P_ ev_timer *w) 2359ev_timer_stop (EV_P_ ev_timer *w)
2177{ 2360{
… …
2182 EV_FREQUENT_CHECK; 2365 EV_FREQUENT_CHECK;
2183 2366
2184 { 2367 {
2185 int active = ev_active (w); 2368 int active = ev_active (w);
2186 2369
2187 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2370 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2188 2371
2189 --timercnt; 2372 --timercnt;
2190 2373
2191 if (expect_true (active < timercnt + HEAP0)) 2374 if (expect_true (active < timercnt + HEAP0))
2192 { 2375 {
… …
2236 2419
2237 if (w->reschedule_cb) 2420 if (w->reschedule_cb)
2238 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2421 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2239 else if (w->interval) 2422 else if (w->interval)
2240 { 2423 {
2241 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2424 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2242 /* this formula differs from the one in periodic_reify because we do not always round up */ 2425 /* this formula differs from the one in periodic_reify because we do not always round up */
2243 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2426 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2244 } 2427 }
2245 else 2428 else
2246 ev_at (w) = w->offset; 2429 ev_at (w) = w->offset;
… …
2254 ANHE_at_cache (periodics [ev_active (w)]); 2437 ANHE_at_cache (periodics [ev_active (w)]);
2255 upheap (periodics, ev_active (w)); 2438 upheap (periodics, ev_active (w));
2256 2439
2257 EV_FREQUENT_CHECK; 2440 EV_FREQUENT_CHECK;
2258 2441
2259 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2442 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2260} 2443}
2261 2444
2262void noinline 2445void noinline
2263ev_periodic_stop (EV_P_ ev_periodic *w) 2446ev_periodic_stop (EV_P_ ev_periodic *w)
2264{ 2447{
… …
2269 EV_FREQUENT_CHECK; 2452 EV_FREQUENT_CHECK;
2270 2453
2271 { 2454 {
2272 int active = ev_active (w); 2455 int active = ev_active (w);
2273 2456
2274 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2457 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2275 2458
2276 --periodiccnt; 2459 --periodiccnt;
2277 2460
2278 if (expect_true (active < periodiccnt + HEAP0)) 2461 if (expect_true (active < periodiccnt + HEAP0))
2279 { 2462 {
… …
2302 2485
2303void noinline 2486void noinline
2304ev_signal_start (EV_P_ ev_signal *w) 2487ev_signal_start (EV_P_ ev_signal *w)
2305{ 2488{
2306#if EV_MULTIPLICITY 2489#if EV_MULTIPLICITY
2307 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2490 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2308#endif 2491#endif
2309 if (expect_false (ev_is_active (w))) 2492 if (expect_false (ev_is_active (w)))
2310 return; 2493 return;
2311 2494
2312 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2495 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2313 2496
2314 evpipe_init (EV_A); 2497 evpipe_init (EV_A);
2315 2498
2316 EV_FREQUENT_CHECK; 2499 EV_FREQUENT_CHECK;
2317 2500
… …
2320 sigset_t full, prev; 2503 sigset_t full, prev;
2321 sigfillset (&full); 2504 sigfillset (&full);
2322 sigprocmask (SIG_SETMASK, &full, &prev); 2505 sigprocmask (SIG_SETMASK, &full, &prev);
2323#endif 2506#endif
2324 2507
2325 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2508 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2326 2509
2327#ifndef _WIN32 2510#ifndef _WIN32
2328 sigprocmask (SIG_SETMASK, &prev, 0); 2511 sigprocmask (SIG_SETMASK, &prev, 0);
2329#endif 2512#endif
2330 } 2513 }
… …
2368 2551
2369void 2552void
2370ev_child_start (EV_P_ ev_child *w) 2553ev_child_start (EV_P_ ev_child *w)
2371{ 2554{
2372#if EV_MULTIPLICITY 2555#if EV_MULTIPLICITY
2373 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2556 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2374#endif 2557#endif
2375 if (expect_false (ev_is_active (w))) 2558 if (expect_false (ev_is_active (w)))
2376 return; 2559 return;
2377 2560
2378 EV_FREQUENT_CHECK; 2561 EV_FREQUENT_CHECK;
… …
2403# ifdef _WIN32 2586# ifdef _WIN32
2404# undef lstat 2587# undef lstat
2405# define lstat(a,b) _stati64 (a,b) 2588# define lstat(a,b) _stati64 (a,b)
2406# endif 2589# endif
2407 2590
2408#define DEF_STAT_INTERVAL 5.0074891 2591#define DEF_STAT_INTERVAL 5.0074891
2592#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2409#define MIN_STAT_INTERVAL 0.1074891 2593#define MIN_STAT_INTERVAL 0.1074891
2410 2594
2411static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2595static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2412 2596
2413#if EV_USE_INOTIFY 2597#if EV_USE_INOTIFY
2414# define EV_INOTIFY_BUFSIZE 8192 2598# define EV_INOTIFY_BUFSIZE 8192
… …
2418{ 2602{
2419 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); 2603 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);
2420 2604
2421 if (w->wd < 0) 2605 if (w->wd < 0)
2422 { 2606 {
2607 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2423 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2608 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2424 2609
2425 /* monitor some parent directory for speedup hints */ 2610 /* monitor some parent directory for speedup hints */
2426 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2611 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2427 /* but an efficiency issue only */ 2612 /* but an efficiency issue only */
2428 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2613 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2429 { 2614 {
2430 char path [4096]; 2615 char path [4096];
2431 strcpy (path, w->path); 2616 strcpy (path, w->path);
… …
2435 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2620 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2436 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2621 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2437 2622
2438 char *pend = strrchr (path, '/'); 2623 char *pend = strrchr (path, '/');
2439 2624
2440 if (!pend) 2625 if (!pend || pend == path)
2441 break; /* whoops, no '/', complain to your admin */ 2626 break;
2442 2627
2443 *pend = 0; 2628 *pend = 0;
2444 w->wd = inotify_add_watch (fs_fd, path, mask); 2629 w->wd = inotify_add_watch (fs_fd, path, mask);
2445 } 2630 }
2446 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2631 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2447 } 2632 }
2448 } 2633 }
2449 else
2450 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2451 2634
2452 if (w->wd >= 0) 2635 if (w->wd >= 0)
2636 {
2453 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2637 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2638
2639 /* now local changes will be tracked by inotify, but remote changes won't */
2640 /* unless the filesystem it known to be local, we therefore still poll */
2641 /* also do poll on <2.6.25, but with normal frequency */
2642 struct statfs sfs;
2643
2644 if (fs_2625 && !statfs (w->path, &sfs))
2645 if (sfs.f_type == 0x1373 /* devfs */
2646 || sfs.f_type == 0xEF53 /* ext2/3 */
2647 || sfs.f_type == 0x3153464a /* jfs */
2648 || sfs.f_type == 0x52654973 /* reiser3 */
2649 || sfs.f_type == 0x01021994 /* tempfs */
2650 || sfs.f_type == 0x58465342 /* xfs */)
2651 return;
2652
2653 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2654 ev_timer_again (EV_A_ &w->timer);
2655 }
2454} 2656}
2455 2657
2456static void noinline 2658static void noinline
2457infy_del (EV_P_ ev_stat *w) 2659infy_del (EV_P_ ev_stat *w)
2458{ 2660{
… …
2472 2674
2473static void noinline 2675static void noinline
2474infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2676infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2475{ 2677{
2476 if (slot < 0) 2678 if (slot < 0)
2477 /* overflow, need to check for all hahs slots */ 2679 /* overflow, need to check for all hash slots */
2478 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2680 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2479 infy_wd (EV_A_ slot, wd, ev); 2681 infy_wd (EV_A_ slot, wd, ev);
2480 else 2682 else
2481 { 2683 {
2482 WL w_; 2684 WL w_;
… …
2488 2690
2489 if (w->wd == wd || wd == -1) 2691 if (w->wd == wd || wd == -1)
2490 { 2692 {
2491 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2693 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2492 { 2694 {
2695 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2493 w->wd = -1; 2696 w->wd = -1;
2494 infy_add (EV_A_ w); /* re-add, no matter what */ 2697 infy_add (EV_A_ w); /* re-add, no matter what */
2495 } 2698 }
2496 2699
2497 stat_timer_cb (EV_A_ &w->timer, 0); 2700 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2510 2713
2511 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2714 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2512 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2715 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2513} 2716}
2514 2717
2515void inline_size 2718inline_size void
2719check_2625 (EV_P)
2720{
2721 /* kernels < 2.6.25 are borked
2722 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2723 */
2724 struct utsname buf;
2725 int major, minor, micro;
2726
2727 if (uname (&buf))
2728 return;
2729
2730 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2731 return;
2732
2733 if (major < 2
2734 || (major == 2 && minor < 6)
2735 || (major == 2 && minor == 6 && micro < 25))
2736 return;
2737
2738 fs_2625 = 1;
2739}
2740
2741inline_size void
2516infy_init (EV_P) 2742infy_init (EV_P)
2517{ 2743{
2518 if (fs_fd != -2) 2744 if (fs_fd != -2)
2519 return; 2745 return;
2746
2747 fs_fd = -1;
2748
2749 check_2625 (EV_A);
2520 2750
2521 fs_fd = inotify_init (); 2751 fs_fd = inotify_init ();
2522 2752
2523 if (fs_fd >= 0) 2753 if (fs_fd >= 0)
2524 { 2754 {
… …
2526 ev_set_priority (&fs_w, EV_MAXPRI); 2756 ev_set_priority (&fs_w, EV_MAXPRI);
2527 ev_io_start (EV_A_ &fs_w); 2757 ev_io_start (EV_A_ &fs_w);
2528 } 2758 }
2529} 2759}
2530 2760
2531void inline_size 2761inline_size void
2532infy_fork (EV_P) 2762infy_fork (EV_P)
2533{ 2763{
2534 int slot; 2764 int slot;
2535 2765
2536 if (fs_fd < 0) 2766 if (fs_fd < 0)
… …
2552 w->wd = -1; 2782 w->wd = -1;
2553 2783
2554 if (fs_fd >= 0) 2784 if (fs_fd >= 0)
2555 infy_add (EV_A_ w); /* re-add, no matter what */ 2785 infy_add (EV_A_ w); /* re-add, no matter what */
2556 else 2786 else
2557 ev_timer_start (EV_A_ &w->timer); 2787 ev_timer_again (EV_A_ &w->timer);
2558 } 2788 }
2559
2560 } 2789 }
2561} 2790}
2562 2791
2792#endif
2793
2794#ifdef _WIN32
2795# define EV_LSTAT(p,b) _stati64 (p, b)
2796#else
2797# define EV_LSTAT(p,b) lstat (p, b)
2563#endif 2798#endif
2564 2799
2565void 2800void
2566ev_stat_stat (EV_P_ ev_stat *w) 2801ev_stat_stat (EV_P_ ev_stat *w)
2567{ 2802{
… …
2594 || w->prev.st_atime != w->attr.st_atime 2829 || w->prev.st_atime != w->attr.st_atime
2595 || w->prev.st_mtime != w->attr.st_mtime 2830 || w->prev.st_mtime != w->attr.st_mtime
2596 || w->prev.st_ctime != w->attr.st_ctime 2831 || w->prev.st_ctime != w->attr.st_ctime
2597 ) { 2832 ) {
2598 #if EV_USE_INOTIFY 2833 #if EV_USE_INOTIFY
2834 if (fs_fd >= 0)
2835 {
2599 infy_del (EV_A_ w); 2836 infy_del (EV_A_ w);
2600 infy_add (EV_A_ w); 2837 infy_add (EV_A_ w);
2601 ev_stat_stat (EV_A_ w); /* avoid race... */ 2838 ev_stat_stat (EV_A_ w); /* avoid race... */
2839 }
2602 #endif 2840 #endif
2603 2841
2604 ev_feed_event (EV_A_ w, EV_STAT); 2842 ev_feed_event (EV_A_ w, EV_STAT);
2605 } 2843 }
2606} 2844}
… …
2609ev_stat_start (EV_P_ ev_stat *w) 2847ev_stat_start (EV_P_ ev_stat *w)
2610{ 2848{
2611 if (expect_false (ev_is_active (w))) 2849 if (expect_false (ev_is_active (w)))
2612 return; 2850 return;
2613 2851
2614 /* since we use memcmp, we need to clear any padding data etc. */
2615 memset (&w->prev, 0, sizeof (ev_statdata));
2616 memset (&w->attr, 0, sizeof (ev_statdata));
2617
2618 ev_stat_stat (EV_A_ w); 2852 ev_stat_stat (EV_A_ w);
2619 2853
2854 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2620 if (w->interval < MIN_STAT_INTERVAL) 2855 w->interval = MIN_STAT_INTERVAL;
2621 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2622 2856
2623 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2857 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2624 ev_set_priority (&w->timer, ev_priority (w)); 2858 ev_set_priority (&w->timer, ev_priority (w));
2625 2859
2626#if EV_USE_INOTIFY 2860#if EV_USE_INOTIFY
2627 infy_init (EV_A); 2861 infy_init (EV_A);
2628 2862
2629 if (fs_fd >= 0) 2863 if (fs_fd >= 0)
2630 infy_add (EV_A_ w); 2864 infy_add (EV_A_ w);
2631 else 2865 else
2632#endif 2866#endif
2633 ev_timer_start (EV_A_ &w->timer); 2867 ev_timer_again (EV_A_ &w->timer);
2634 2868
2635 ev_start (EV_A_ (W)w, 1); 2869 ev_start (EV_A_ (W)w, 1);
2636 2870
2637 EV_FREQUENT_CHECK; 2871 EV_FREQUENT_CHECK;
2638} 2872}
… …
2808 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3042 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2809 } 3043 }
2810 } 3044 }
2811} 3045}
2812 3046
3047static void
3048embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3049{
3050 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3051
3052 ev_embed_stop (EV_A_ w);
3053
3054 {
3055 struct ev_loop *loop = w->other;
3056
3057 ev_loop_fork (EV_A);
3058 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3059 }
3060
3061 ev_embed_start (EV_A_ w);
3062}
3063
2813#if 0 3064#if 0
2814static void 3065static void
2815embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3066embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2816{ 3067{
2817 ev_idle_stop (EV_A_ idle); 3068 ev_idle_stop (EV_A_ idle);
… …
2824 if (expect_false (ev_is_active (w))) 3075 if (expect_false (ev_is_active (w)))
2825 return; 3076 return;
2826 3077
2827 { 3078 {
2828 struct ev_loop *loop = w->other; 3079 struct ev_loop *loop = w->other;
2829 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3080 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2830 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3081 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2831 } 3082 }
2832 3083
2833 EV_FREQUENT_CHECK; 3084 EV_FREQUENT_CHECK;
2834 3085
… …
2837 3088
2838 ev_prepare_init (&w->prepare, embed_prepare_cb); 3089 ev_prepare_init (&w->prepare, embed_prepare_cb);
2839 ev_set_priority (&w->prepare, EV_MINPRI); 3090 ev_set_priority (&w->prepare, EV_MINPRI);
2840 ev_prepare_start (EV_A_ &w->prepare); 3091 ev_prepare_start (EV_A_ &w->prepare);
2841 3092
3093 ev_fork_init (&w->fork, embed_fork_cb);
3094 ev_fork_start (EV_A_ &w->fork);
3095
2842 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3096 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2843 3097
2844 ev_start (EV_A_ (W)w, 1); 3098 ev_start (EV_A_ (W)w, 1);
2845 3099
2846 EV_FREQUENT_CHECK; 3100 EV_FREQUENT_CHECK;
… …
2853 if (expect_false (!ev_is_active (w))) 3107 if (expect_false (!ev_is_active (w)))
2854 return; 3108 return;
2855 3109
2856 EV_FREQUENT_CHECK; 3110 EV_FREQUENT_CHECK;
2857 3111
2858 ev_io_stop (EV_A_ &w->io); 3112 ev_io_stop (EV_A_ &w->io);
2859 ev_prepare_stop (EV_A_ &w->prepare); 3113 ev_prepare_stop (EV_A_ &w->prepare);
2860 3114 ev_fork_stop (EV_A_ &w->fork);
2861 ev_stop (EV_A_ (W)w);
2862 3115
2863 EV_FREQUENT_CHECK; 3116 EV_FREQUENT_CHECK;
2864} 3117}
2865#endif 3118#endif
2866 3119
… …
2963once_cb (EV_P_ struct ev_once *once, int revents) 3216once_cb (EV_P_ struct ev_once *once, int revents)
2964{ 3217{
2965 void (*cb)(int revents, void *arg) = once->cb; 3218 void (*cb)(int revents, void *arg) = once->cb;
2966 void *arg = once->arg; 3219 void *arg = once->arg;
2967 3220
2968 ev_io_stop (EV_A_ &once->io); 3221 ev_io_stop (EV_A_ &once->io);
2969 ev_timer_stop (EV_A_ &once->to); 3222 ev_timer_stop (EV_A_ &once->to);
2970 ev_free (once); 3223 ev_free (once);
2971 3224
2972 cb (revents, arg); 3225 cb (revents, arg);
2973} 3226}
2974 3227
2975static void 3228static void
2976once_cb_io (EV_P_ ev_io *w, int revents) 3229once_cb_io (EV_P_ ev_io *w, int revents)
2977{ 3230{
2978 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3231 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3232
3233 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2979} 3234}
2980 3235
2981static void 3236static void
2982once_cb_to (EV_P_ ev_timer *w, int revents) 3237once_cb_to (EV_P_ ev_timer *w, int revents)
2983{ 3238{
2984 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3239 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3240
3241 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2985} 3242}
2986 3243
2987void 3244void
2988ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3245ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2989{ 3246{
… …
3011 ev_timer_set (&once->to, timeout, 0.); 3268 ev_timer_set (&once->to, timeout, 0.);
3012 ev_timer_start (EV_A_ &once->to); 3269 ev_timer_start (EV_A_ &once->to);
3013 } 3270 }
3014} 3271}
3015 3272
3273/*****************************************************************************/
3274
3275#if EV_WALK_ENABLE
3276void
3277ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3278{
3279 int i, j;
3280 ev_watcher_list *wl, *wn;
3281
3282 if (types & (EV_IO | EV_EMBED))
3283 for (i = 0; i < anfdmax; ++i)
3284 for (wl = anfds [i].head; wl; )
3285 {
3286 wn = wl->next;
3287
3288#if EV_EMBED_ENABLE
3289 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3290 {
3291 if (types & EV_EMBED)
3292 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3293 }
3294 else
3295#endif
3296#if EV_USE_INOTIFY
3297 if (ev_cb ((ev_io *)wl) == infy_cb)
3298 ;
3299 else
3300#endif
3301 if ((ev_io *)wl != &pipe_w)
3302 if (types & EV_IO)
3303 cb (EV_A_ EV_IO, wl);
3304
3305 wl = wn;
3306 }
3307
3308 if (types & (EV_TIMER | EV_STAT))
3309 for (i = timercnt + HEAP0; i-- > HEAP0; )
3310#if EV_STAT_ENABLE
3311 /*TODO: timer is not always active*/
3312 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3313 {
3314 if (types & EV_STAT)
3315 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3316 }
3317 else
3318#endif
3319 if (types & EV_TIMER)
3320 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3321
3322#if EV_PERIODIC_ENABLE
3323 if (types & EV_PERIODIC)
3324 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3325 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3326#endif
3327
3328#if EV_IDLE_ENABLE
3329 if (types & EV_IDLE)
3330 for (j = NUMPRI; i--; )
3331 for (i = idlecnt [j]; i--; )
3332 cb (EV_A_ EV_IDLE, idles [j][i]);
3333#endif
3334
3335#if EV_FORK_ENABLE
3336 if (types & EV_FORK)
3337 for (i = forkcnt; i--; )
3338 if (ev_cb (forks [i]) != embed_fork_cb)
3339 cb (EV_A_ EV_FORK, forks [i]);
3340#endif
3341
3342#if EV_ASYNC_ENABLE
3343 if (types & EV_ASYNC)
3344 for (i = asynccnt; i--; )
3345 cb (EV_A_ EV_ASYNC, asyncs [i]);
3346#endif
3347
3348 if (types & EV_PREPARE)
3349 for (i = preparecnt; i--; )
3350#if EV_EMBED_ENABLE
3351 if (ev_cb (prepares [i]) != embed_prepare_cb)
3352#endif
3353 cb (EV_A_ EV_PREPARE, prepares [i]);
3354
3355 if (types & EV_CHECK)
3356 for (i = checkcnt; i--; )
3357 cb (EV_A_ EV_CHECK, checks [i]);
3358
3359 if (types & EV_SIGNAL)
3360 for (i = 0; i < signalmax; ++i)
3361 for (wl = signals [i].head; wl; )
3362 {
3363 wn = wl->next;
3364 cb (EV_A_ EV_SIGNAL, wl);
3365 wl = wn;
3366 }
3367
3368 if (types & EV_CHILD)
3369 for (i = EV_PID_HASHSIZE; i--; )
3370 for (wl = childs [i]; wl; )
3371 {
3372 wn = wl->next;
3373 cb (EV_A_ EV_CHILD, wl);
3374 wl = wn;
3375 }
3376/* EV_STAT 0x00001000 /* stat data changed */
3377/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3378}
3379#endif
3380
3016#if EV_MULTIPLICITY 3381#if EV_MULTIPLICITY
3017 #include "ev_wrap.h" 3382 #include "ev_wrap.h"
3018#endif 3383#endif
3019 3384
3020#ifdef __cplusplus 3385#ifdef __cplusplus

Diff Legend

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