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

Comparing libev/ev.c (file contents):
Revision 1.252 by root, Thu May 22 03:43:32 2008 UTC vs.
Revision 1.293 by root, Mon Jun 29 18:46:52 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
352typedef ev_watcher_time *WT; 404typedef ev_watcher_time *WT;
353 405
354#define ev_active(w) ((W)(w))->active 406#define ev_active(w) ((W)(w))->active
355#define ev_at(w) ((WT)(w))->at 407#define ev_at(w) ((WT)(w))->at
356 408
357#if EV_USE_MONOTONIC 409#if EV_USE_REALTIME
358/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 410/* 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 */ 411/* giving it a reasonably high chance of working on typical architetcures */
412static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
413#endif
414
415#if EV_USE_MONOTONIC
360static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
361#endif 417#endif
362 418
363#ifdef _WIN32 419#ifdef _WIN32
364# include "ev_win32.c" 420# include "ev_win32.c"
373{ 429{
374 syserr_cb = cb; 430 syserr_cb = cb;
375} 431}
376 432
377static void noinline 433static void noinline
378syserr (const char *msg) 434ev_syserr (const char *msg)
379{ 435{
380 if (!msg) 436 if (!msg)
381 msg = "(libev) system error"; 437 msg = "(libev) system error";
382 438
383 if (syserr_cb) 439 if (syserr_cb)
429#define ev_malloc(size) ev_realloc (0, (size)) 485#define ev_malloc(size) ev_realloc (0, (size))
430#define ev_free(ptr) ev_realloc ((ptr), 0) 486#define ev_free(ptr) ev_realloc ((ptr), 0)
431 487
432/*****************************************************************************/ 488/*****************************************************************************/
433 489
490/* file descriptor info structure */
434typedef struct 491typedef struct
435{ 492{
436 WL head; 493 WL head;
437 unsigned char events; 494 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */
496 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
438 unsigned char reify; 497 unsigned char unused;
498#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif
439#if EV_SELECT_IS_WINSOCKET 501#if EV_SELECT_IS_WINSOCKET
440 SOCKET handle; 502 SOCKET handle;
441#endif 503#endif
442} ANFD; 504} ANFD;
443 505
506/* stores the pending event set for a given watcher */
444typedef struct 507typedef struct
445{ 508{
446 W w; 509 W w;
447 int events; 510 int events; /* the pending event set for the given watcher */
448} ANPENDING; 511} ANPENDING;
449 512
450#if EV_USE_INOTIFY 513#if EV_USE_INOTIFY
451/* hash table entry per inotify-id */ 514/* hash table entry per inotify-id */
452typedef struct 515typedef struct
455} ANFS; 518} ANFS;
456#endif 519#endif
457 520
458/* Heap Entry */ 521/* Heap Entry */
459#if EV_HEAP_CACHE_AT 522#if EV_HEAP_CACHE_AT
523 /* a heap element */
460 typedef struct { 524 typedef struct {
461 ev_tstamp at; 525 ev_tstamp at;
462 WT w; 526 WT w;
463 } ANHE; 527 } ANHE;
464 528
465 #define ANHE_w(he) (he).w /* access watcher, read-write */ 529 #define ANHE_w(he) (he).w /* access watcher, read-write */
466 #define ANHE_at(he) (he).at /* access cached at, read-only */ 530 #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 */ 531 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
468#else 532#else
533 /* a heap element */
469 typedef WT ANHE; 534 typedef WT ANHE;
470 535
471 #define ANHE_w(he) (he) 536 #define ANHE_w(he) (he)
472 #define ANHE_at(he) (he)->at 537 #define ANHE_at(he) (he)->at
473 #define ANHE_at_cache(he) 538 #define ANHE_at_cache(he)
499 564
500#endif 565#endif
501 566
502/*****************************************************************************/ 567/*****************************************************************************/
503 568
569#ifndef EV_HAVE_EV_TIME
504ev_tstamp 570ev_tstamp
505ev_time (void) 571ev_time (void)
506{ 572{
507#if EV_USE_REALTIME 573#if EV_USE_REALTIME
574 if (expect_true (have_realtime))
575 {
508 struct timespec ts; 576 struct timespec ts;
509 clock_gettime (CLOCK_REALTIME, &ts); 577 clock_gettime (CLOCK_REALTIME, &ts);
510 return ts.tv_sec + ts.tv_nsec * 1e-9; 578 return ts.tv_sec + ts.tv_nsec * 1e-9;
511#else 579 }
580#endif
581
512 struct timeval tv; 582 struct timeval tv;
513 gettimeofday (&tv, 0); 583 gettimeofday (&tv, 0);
514 return tv.tv_sec + tv.tv_usec * 1e-6; 584 return tv.tv_sec + tv.tv_usec * 1e-6;
515#endif
516} 585}
586#endif
517 587
518ev_tstamp inline_size 588inline_size ev_tstamp
519get_clock (void) 589get_clock (void)
520{ 590{
521#if EV_USE_MONOTONIC 591#if EV_USE_MONOTONIC
522 if (expect_true (have_monotonic)) 592 if (expect_true (have_monotonic))
523 { 593 {
556 struct timeval tv; 626 struct timeval tv;
557 627
558 tv.tv_sec = (time_t)delay; 628 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 630
631 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
632 /* somehting not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */
561 select (0, 0, 0, 0, &tv); 634 select (0, 0, 0, 0, &tv);
562#endif 635#endif
563 } 636 }
564} 637}
565 638
566/*****************************************************************************/ 639/*****************************************************************************/
567 640
568#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 641#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
569 642
570int inline_size 643/* find a suitable new size for the given array, */
644/* hopefully by rounding to a ncie-to-malloc size */
645inline_size int
571array_nextsize (int elem, int cur, int cnt) 646array_nextsize (int elem, int cur, int cnt)
572{ 647{
573 int ncur = cur + 1; 648 int ncur = cur + 1;
574 649
575 do 650 do
592array_realloc (int elem, void *base, int *cur, int cnt) 667array_realloc (int elem, void *base, int *cur, int cnt)
593{ 668{
594 *cur = array_nextsize (elem, *cur, cnt); 669 *cur = array_nextsize (elem, *cur, cnt);
595 return ev_realloc (base, elem * *cur); 670 return ev_realloc (base, elem * *cur);
596} 671}
672
673#define array_init_zero(base,count) \
674 memset ((void *)(base), 0, sizeof (*(base)) * (count))
597 675
598#define array_needsize(type,base,cur,cnt,init) \ 676#define array_needsize(type,base,cur,cnt,init) \
599 if (expect_false ((cnt) > (cur))) \ 677 if (expect_false ((cnt) > (cur))) \
600 { \ 678 { \
601 int ocur_ = (cur); \ 679 int ocur_ = (cur); \
613 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 691 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
614 } 692 }
615#endif 693#endif
616 694
617#define array_free(stem, idx) \ 695#define array_free(stem, idx) \
618 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 696 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
619 697
620/*****************************************************************************/ 698/*****************************************************************************/
699
700/* dummy callback for pending events */
701static void noinline
702pendingcb (EV_P_ ev_prepare *w, int revents)
703{
704}
621 705
622void noinline 706void noinline
623ev_feed_event (EV_P_ void *w, int revents) 707ev_feed_event (EV_P_ void *w, int revents)
624{ 708{
625 W w_ = (W)w; 709 W w_ = (W)w;
634 pendings [pri][w_->pending - 1].w = w_; 718 pendings [pri][w_->pending - 1].w = w_;
635 pendings [pri][w_->pending - 1].events = revents; 719 pendings [pri][w_->pending - 1].events = revents;
636 } 720 }
637} 721}
638 722
639void inline_speed 723inline_speed void
724feed_reverse (EV_P_ W w)
725{
726 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
727 rfeeds [rfeedcnt++] = w;
728}
729
730inline_size void
731feed_reverse_done (EV_P_ int revents)
732{
733 do
734 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
735 while (rfeedcnt);
736}
737
738inline_speed void
640queue_events (EV_P_ W *events, int eventcnt, int type) 739queue_events (EV_P_ W *events, int eventcnt, int type)
641{ 740{
642 int i; 741 int i;
643 742
644 for (i = 0; i < eventcnt; ++i) 743 for (i = 0; i < eventcnt; ++i)
645 ev_feed_event (EV_A_ events [i], type); 744 ev_feed_event (EV_A_ events [i], type);
646} 745}
647 746
648/*****************************************************************************/ 747/*****************************************************************************/
649 748
650void inline_size 749inline_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) 750fd_event (EV_P_ int fd, int revents)
665{ 751{
666 ANFD *anfd = anfds + fd; 752 ANFD *anfd = anfds + fd;
667 ev_io *w; 753 ev_io *w;
668 754
680{ 766{
681 if (fd >= 0 && fd < anfdmax) 767 if (fd >= 0 && fd < anfdmax)
682 fd_event (EV_A_ fd, revents); 768 fd_event (EV_A_ fd, revents);
683} 769}
684 770
685void inline_size 771/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */
773inline_size void
686fd_reify (EV_P) 774fd_reify (EV_P)
687{ 775{
688 int i; 776 int i;
689 777
690 for (i = 0; i < fdchangecnt; ++i) 778 for (i = 0; i < fdchangecnt; ++i)
699 events |= (unsigned char)w->events; 787 events |= (unsigned char)w->events;
700 788
701#if EV_SELECT_IS_WINSOCKET 789#if EV_SELECT_IS_WINSOCKET
702 if (events) 790 if (events)
703 { 791 {
704 unsigned long argp; 792 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 793 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 794 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 795 #else
708 anfd->handle = _get_osfhandle (fd); 796 anfd->handle = _get_osfhandle (fd);
709 #endif 797 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 798 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 799 }
712#endif 800#endif
713 801
714 { 802 {
715 unsigned char o_events = anfd->events; 803 unsigned char o_events = anfd->events;
716 unsigned char o_reify = anfd->reify; 804 unsigned char o_reify = anfd->reify;
717 805
718 anfd->reify = 0; 806 anfd->reify = 0;
719 anfd->events = events; 807 anfd->events = events;
720 808
721 if (o_events != events || o_reify & EV_IOFDSET) 809 if (o_events != events || o_reify & EV__IOFDSET)
722 backend_modify (EV_A_ fd, o_events, events); 810 backend_modify (EV_A_ fd, o_events, events);
723 } 811 }
724 } 812 }
725 813
726 fdchangecnt = 0; 814 fdchangecnt = 0;
727} 815}
728 816
729void inline_size 817/* something about the given fd changed */
818inline_size void
730fd_change (EV_P_ int fd, int flags) 819fd_change (EV_P_ int fd, int flags)
731{ 820{
732 unsigned char reify = anfds [fd].reify; 821 unsigned char reify = anfds [fd].reify;
733 anfds [fd].reify |= flags; 822 anfds [fd].reify |= flags;
734 823
738 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 827 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
739 fdchanges [fdchangecnt - 1] = fd; 828 fdchanges [fdchangecnt - 1] = fd;
740 } 829 }
741} 830}
742 831
743void inline_speed 832/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
833inline_speed void
744fd_kill (EV_P_ int fd) 834fd_kill (EV_P_ int fd)
745{ 835{
746 ev_io *w; 836 ev_io *w;
747 837
748 while ((w = (ev_io *)anfds [fd].head)) 838 while ((w = (ev_io *)anfds [fd].head))
750 ev_io_stop (EV_A_ w); 840 ev_io_stop (EV_A_ w);
751 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 841 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
752 } 842 }
753} 843}
754 844
755int inline_size 845/* check whether the given fd is atcually valid, for error recovery */
846inline_size int
756fd_valid (int fd) 847fd_valid (int fd)
757{ 848{
758#ifdef _WIN32 849#ifdef _WIN32
759 return _get_osfhandle (fd) != -1; 850 return _get_osfhandle (fd) != -1;
760#else 851#else
768{ 859{
769 int fd; 860 int fd;
770 861
771 for (fd = 0; fd < anfdmax; ++fd) 862 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 863 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 864 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 865 fd_kill (EV_A_ fd);
775} 866}
776 867
777/* called on ENOMEM in select/poll to kill some fds and retry */ 868/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 869static void noinline
796 887
797 for (fd = 0; fd < anfdmax; ++fd) 888 for (fd = 0; fd < anfdmax; ++fd)
798 if (anfds [fd].events) 889 if (anfds [fd].events)
799 { 890 {
800 anfds [fd].events = 0; 891 anfds [fd].events = 0;
892 anfds [fd].emask = 0;
801 fd_change (EV_A_ fd, EV_IOFDSET | 1); 893 fd_change (EV_A_ fd, EV__IOFDSET | 1);
802 } 894 }
803} 895}
804 896
805/*****************************************************************************/ 897/*****************************************************************************/
806 898
822#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 914#define HEAP0 (DHEAP - 1) /* index of first element in heap */
823#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 915#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
824#define UPHEAP_DONE(p,k) ((p) == (k)) 916#define UPHEAP_DONE(p,k) ((p) == (k))
825 917
826/* away from the root */ 918/* away from the root */
827void inline_speed 919inline_speed void
828downheap (ANHE *heap, int N, int k) 920downheap (ANHE *heap, int N, int k)
829{ 921{
830 ANHE he = heap [k]; 922 ANHE he = heap [k];
831 ANHE *E = heap + N + HEAP0; 923 ANHE *E = heap + N + HEAP0;
832 924
872#define HEAP0 1 964#define HEAP0 1
873#define HPARENT(k) ((k) >> 1) 965#define HPARENT(k) ((k) >> 1)
874#define UPHEAP_DONE(p,k) (!(p)) 966#define UPHEAP_DONE(p,k) (!(p))
875 967
876/* away from the root */ 968/* away from the root */
877void inline_speed 969inline_speed void
878downheap (ANHE *heap, int N, int k) 970downheap (ANHE *heap, int N, int k)
879{ 971{
880 ANHE he = heap [k]; 972 ANHE he = heap [k];
881 973
882 for (;;) 974 for (;;)
902 ev_active (ANHE_w (he)) = k; 994 ev_active (ANHE_w (he)) = k;
903} 995}
904#endif 996#endif
905 997
906/* towards the root */ 998/* towards the root */
907void inline_speed 999inline_speed void
908upheap (ANHE *heap, int k) 1000upheap (ANHE *heap, int k)
909{ 1001{
910 ANHE he = heap [k]; 1002 ANHE he = heap [k];
911 1003
912 for (;;) 1004 for (;;)
923 1015
924 heap [k] = he; 1016 heap [k] = he;
925 ev_active (ANHE_w (he)) = k; 1017 ev_active (ANHE_w (he)) = k;
926} 1018}
927 1019
928void inline_size 1020/* move an element suitably so it is in a correct place */
1021inline_size void
929adjustheap (ANHE *heap, int N, int k) 1022adjustheap (ANHE *heap, int N, int k)
930{ 1023{
931 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1024 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
932 upheap (heap, k); 1025 upheap (heap, k);
933 else 1026 else
934 downheap (heap, N, k); 1027 downheap (heap, N, k);
935} 1028}
936 1029
937/* rebuild the heap: this function is used only once and executed rarely */ 1030/* rebuild the heap: this function is used only once and executed rarely */
938void inline_size 1031inline_size void
939reheap (ANHE *heap, int N) 1032reheap (ANHE *heap, int N)
940{ 1033{
941 int i; 1034 int i;
942 1035
943 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1036 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
946 upheap (heap, i + HEAP0); 1039 upheap (heap, i + HEAP0);
947} 1040}
948 1041
949/*****************************************************************************/ 1042/*****************************************************************************/
950 1043
1044/* associate signal watchers to a signal signal */
951typedef struct 1045typedef struct
952{ 1046{
953 WL head; 1047 WL head;
954 EV_ATOMIC_T gotsig; 1048 EV_ATOMIC_T gotsig;
955} ANSIG; 1049} ANSIG;
957static ANSIG *signals; 1051static ANSIG *signals;
958static int signalmax; 1052static int signalmax;
959 1053
960static EV_ATOMIC_T gotsig; 1054static EV_ATOMIC_T gotsig;
961 1055
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/*****************************************************************************/ 1056/*****************************************************************************/
975 1057
976void inline_speed 1058/* used to prepare libev internal fd's */
1059/* this is not fork-safe */
1060inline_speed void
977fd_intern (int fd) 1061fd_intern (int fd)
978{ 1062{
979#ifdef _WIN32 1063#ifdef _WIN32
980 int arg = 1; 1064 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1065 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 1066#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 1067 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 1068 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 1069#endif
986} 1070}
987 1071
988static void noinline 1072static void noinline
989evpipe_init (EV_P) 1073evpipe_init (EV_P)
990{ 1074{
991 if (!ev_is_active (&pipeev)) 1075 if (!ev_is_active (&pipe_w))
992 { 1076 {
993#if EV_USE_EVENTFD 1077#if EV_USE_EVENTFD
994 if ((evfd = eventfd (0, 0)) >= 0) 1078 if ((evfd = eventfd (0, 0)) >= 0)
995 { 1079 {
996 evpipe [0] = -1; 1080 evpipe [0] = -1;
997 fd_intern (evfd); 1081 fd_intern (evfd);
998 ev_io_set (&pipeev, evfd, EV_READ); 1082 ev_io_set (&pipe_w, evfd, EV_READ);
999 } 1083 }
1000 else 1084 else
1001#endif 1085#endif
1002 { 1086 {
1003 while (pipe (evpipe)) 1087 while (pipe (evpipe))
1004 syserr ("(libev) error creating signal/async pipe"); 1088 ev_syserr ("(libev) error creating signal/async pipe");
1005 1089
1006 fd_intern (evpipe [0]); 1090 fd_intern (evpipe [0]);
1007 fd_intern (evpipe [1]); 1091 fd_intern (evpipe [1]);
1008 ev_io_set (&pipeev, evpipe [0], EV_READ); 1092 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1009 } 1093 }
1010 1094
1011 ev_io_start (EV_A_ &pipeev); 1095 ev_io_start (EV_A_ &pipe_w);
1012 ev_unref (EV_A); /* watcher should not keep loop alive */ 1096 ev_unref (EV_A); /* watcher should not keep loop alive */
1013 } 1097 }
1014} 1098}
1015 1099
1016void inline_size 1100inline_size void
1017evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1101evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1018{ 1102{
1019 if (!*flag) 1103 if (!*flag)
1020 { 1104 {
1021 int old_errno = errno; /* save errno because write might clobber it */ 1105 int old_errno = errno; /* save errno because write might clobber it */
1034 1118
1035 errno = old_errno; 1119 errno = old_errno;
1036 } 1120 }
1037} 1121}
1038 1122
1123/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */
1039static void 1125static void
1040pipecb (EV_P_ ev_io *iow, int revents) 1126pipecb (EV_P_ ev_io *iow, int revents)
1041{ 1127{
1042#if EV_USE_EVENTFD 1128#if EV_USE_EVENTFD
1043 if (evfd >= 0) 1129 if (evfd >= 0)
1099ev_feed_signal_event (EV_P_ int signum) 1185ev_feed_signal_event (EV_P_ int signum)
1100{ 1186{
1101 WL w; 1187 WL w;
1102 1188
1103#if EV_MULTIPLICITY 1189#if EV_MULTIPLICITY
1104 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1190 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1105#endif 1191#endif
1106 1192
1107 --signum; 1193 --signum;
1108 1194
1109 if (signum < 0 || signum >= signalmax) 1195 if (signum < 0 || signum >= signalmax)
1125 1211
1126#ifndef WIFCONTINUED 1212#ifndef WIFCONTINUED
1127# define WIFCONTINUED(status) 0 1213# define WIFCONTINUED(status) 0
1128#endif 1214#endif
1129 1215
1130void inline_speed 1216/* handle a single child status event */
1217inline_speed void
1131child_reap (EV_P_ int chain, int pid, int status) 1218child_reap (EV_P_ int chain, int pid, int status)
1132{ 1219{
1133 ev_child *w; 1220 ev_child *w;
1134 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1221 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1135 1222
1148 1235
1149#ifndef WCONTINUED 1236#ifndef WCONTINUED
1150# define WCONTINUED 0 1237# define WCONTINUED 0
1151#endif 1238#endif
1152 1239
1240/* called on sigchld etc., calls waitpid */
1153static void 1241static void
1154childcb (EV_P_ ev_signal *sw, int revents) 1242childcb (EV_P_ ev_signal *sw, int revents)
1155{ 1243{
1156 int pid, status; 1244 int pid, status;
1157 1245
1238 /* kqueue is borked on everything but netbsd apparently */ 1326 /* kqueue is borked on everything but netbsd apparently */
1239 /* it usually doesn't work correctly on anything but sockets and pipes */ 1327 /* it usually doesn't work correctly on anything but sockets and pipes */
1240 flags &= ~EVBACKEND_KQUEUE; 1328 flags &= ~EVBACKEND_KQUEUE;
1241#endif 1329#endif
1242#ifdef __APPLE__ 1330#ifdef __APPLE__
1243 // flags &= ~EVBACKEND_KQUEUE; for documentation 1331 /* only select works correctly on that "unix-certified" platform */
1244 flags &= ~EVBACKEND_POLL; 1332 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1333 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1245#endif 1334#endif
1246 1335
1247 return flags; 1336 return flags;
1248} 1337}
1249 1338
1281ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1370ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1282{ 1371{
1283 timeout_blocktime = interval; 1372 timeout_blocktime = interval;
1284} 1373}
1285 1374
1375/* initialise a loop structure, must be zero-initialised */
1286static void noinline 1376static void noinline
1287loop_init (EV_P_ unsigned int flags) 1377loop_init (EV_P_ unsigned int flags)
1288{ 1378{
1289 if (!backend) 1379 if (!backend)
1290 { 1380 {
1381#if EV_USE_REALTIME
1382 if (!have_realtime)
1383 {
1384 struct timespec ts;
1385
1386 if (!clock_gettime (CLOCK_REALTIME, &ts))
1387 have_realtime = 1;
1388 }
1389#endif
1390
1291#if EV_USE_MONOTONIC 1391#if EV_USE_MONOTONIC
1392 if (!have_monotonic)
1292 { 1393 {
1293 struct timespec ts; 1394 struct timespec ts;
1395
1294 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1396 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1295 have_monotonic = 1; 1397 have_monotonic = 1;
1296 } 1398 }
1297#endif 1399#endif
1298 1400
1299 ev_rt_now = ev_time (); 1401 ev_rt_now = ev_time ();
1300 mn_now = get_clock (); 1402 mn_now = get_clock ();
1301 now_floor = mn_now; 1403 now_floor = mn_now;
1338#endif 1440#endif
1339#if EV_USE_SELECT 1441#if EV_USE_SELECT
1340 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1442 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1341#endif 1443#endif
1342 1444
1445 ev_prepare_init (&pending_w, pendingcb);
1446
1343 ev_init (&pipeev, pipecb); 1447 ev_init (&pipe_w, pipecb);
1344 ev_set_priority (&pipeev, EV_MAXPRI); 1448 ev_set_priority (&pipe_w, EV_MAXPRI);
1345 } 1449 }
1346} 1450}
1347 1451
1452/* free up a loop structure */
1348static void noinline 1453static void noinline
1349loop_destroy (EV_P) 1454loop_destroy (EV_P)
1350{ 1455{
1351 int i; 1456 int i;
1352 1457
1353 if (ev_is_active (&pipeev)) 1458 if (ev_is_active (&pipe_w))
1354 { 1459 {
1355 ev_ref (EV_A); /* signal watcher */ 1460 ev_ref (EV_A); /* signal watcher */
1356 ev_io_stop (EV_A_ &pipeev); 1461 ev_io_stop (EV_A_ &pipe_w);
1357 1462
1358#if EV_USE_EVENTFD 1463#if EV_USE_EVENTFD
1359 if (evfd >= 0) 1464 if (evfd >= 0)
1360 close (evfd); 1465 close (evfd);
1361#endif 1466#endif
1400 } 1505 }
1401 1506
1402 ev_free (anfds); anfdmax = 0; 1507 ev_free (anfds); anfdmax = 0;
1403 1508
1404 /* have to use the microsoft-never-gets-it-right macro */ 1509 /* have to use the microsoft-never-gets-it-right macro */
1510 array_free (rfeed, EMPTY);
1405 array_free (fdchange, EMPTY); 1511 array_free (fdchange, EMPTY);
1406 array_free (timer, EMPTY); 1512 array_free (timer, EMPTY);
1407#if EV_PERIODIC_ENABLE 1513#if EV_PERIODIC_ENABLE
1408 array_free (periodic, EMPTY); 1514 array_free (periodic, EMPTY);
1409#endif 1515#endif
1418 1524
1419 backend = 0; 1525 backend = 0;
1420} 1526}
1421 1527
1422#if EV_USE_INOTIFY 1528#if EV_USE_INOTIFY
1423void inline_size infy_fork (EV_P); 1529inline_size void infy_fork (EV_P);
1424#endif 1530#endif
1425 1531
1426void inline_size 1532inline_size void
1427loop_fork (EV_P) 1533loop_fork (EV_P)
1428{ 1534{
1429#if EV_USE_PORT 1535#if EV_USE_PORT
1430 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1536 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1431#endif 1537#endif
1437#endif 1543#endif
1438#if EV_USE_INOTIFY 1544#if EV_USE_INOTIFY
1439 infy_fork (EV_A); 1545 infy_fork (EV_A);
1440#endif 1546#endif
1441 1547
1442 if (ev_is_active (&pipeev)) 1548 if (ev_is_active (&pipe_w))
1443 { 1549 {
1444 /* this "locks" the handlers against writing to the pipe */ 1550 /* this "locks" the handlers against writing to the pipe */
1445 /* while we modify the fd vars */ 1551 /* while we modify the fd vars */
1446 gotsig = 1; 1552 gotsig = 1;
1447#if EV_ASYNC_ENABLE 1553#if EV_ASYNC_ENABLE
1448 gotasync = 1; 1554 gotasync = 1;
1449#endif 1555#endif
1450 1556
1451 ev_ref (EV_A); 1557 ev_ref (EV_A);
1452 ev_io_stop (EV_A_ &pipeev); 1558 ev_io_stop (EV_A_ &pipe_w);
1453 1559
1454#if EV_USE_EVENTFD 1560#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1561 if (evfd >= 0)
1456 close (evfd); 1562 close (evfd);
1457#endif 1563#endif
1462 close (evpipe [1]); 1568 close (evpipe [1]);
1463 } 1569 }
1464 1570
1465 evpipe_init (EV_A); 1571 evpipe_init (EV_A);
1466 /* now iterate over everything, in case we missed something */ 1572 /* now iterate over everything, in case we missed something */
1467 pipecb (EV_A_ &pipeev, EV_READ); 1573 pipecb (EV_A_ &pipe_w, EV_READ);
1468 } 1574 }
1469 1575
1470 postfork = 0; 1576 postfork = 0;
1471} 1577}
1472 1578
1499{ 1605{
1500 postfork = 1; /* must be in line with ev_default_fork */ 1606 postfork = 1; /* must be in line with ev_default_fork */
1501} 1607}
1502 1608
1503#if EV_VERIFY 1609#if EV_VERIFY
1504void noinline 1610static void noinline
1505verify_watcher (EV_P_ W w) 1611verify_watcher (EV_P_ W w)
1506{ 1612{
1507 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1613 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1508 1614
1509 if (w->pending) 1615 if (w->pending)
1510 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1616 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1511} 1617}
1512 1618
1513static void noinline 1619static void noinline
1514verify_heap (EV_P_ ANHE *heap, int N) 1620verify_heap (EV_P_ ANHE *heap, int N)
1515{ 1621{
1516 int i; 1622 int i;
1517 1623
1518 for (i = HEAP0; i < N + HEAP0; ++i) 1624 for (i = HEAP0; i < N + HEAP0; ++i)
1519 { 1625 {
1520 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1626 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]))); 1627 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])))); 1628 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1523 1629
1524 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1630 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1525 } 1631 }
1526} 1632}
1527 1633
1528static void noinline 1634static void noinline
1529array_verify (EV_P_ W *ws, int cnt) 1635array_verify (EV_P_ W *ws, int cnt)
1530{ 1636{
1531 while (cnt--) 1637 while (cnt--)
1532 { 1638 {
1533 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1639 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1534 verify_watcher (EV_A_ ws [cnt]); 1640 verify_watcher (EV_A_ ws [cnt]);
1535 } 1641 }
1536} 1642}
1537#endif 1643#endif
1538 1644
1545 1651
1546 assert (activecnt >= -1); 1652 assert (activecnt >= -1);
1547 1653
1548 assert (fdchangemax >= fdchangecnt); 1654 assert (fdchangemax >= fdchangecnt);
1549 for (i = 0; i < fdchangecnt; ++i) 1655 for (i = 0; i < fdchangecnt; ++i)
1550 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1656 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1551 1657
1552 assert (anfdmax >= 0); 1658 assert (anfdmax >= 0);
1553 for (i = 0; i < anfdmax; ++i) 1659 for (i = 0; i < anfdmax; ++i)
1554 for (w = anfds [i].head; w; w = w->next) 1660 for (w = anfds [i].head; w; w = w->next)
1555 { 1661 {
1556 verify_watcher (EV_A_ (W)w); 1662 verify_watcher (EV_A_ (W)w);
1557 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1663 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)); 1664 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1559 } 1665 }
1560 1666
1561 assert (timermax >= timercnt); 1667 assert (timermax >= timercnt);
1562 verify_heap (EV_A_ timers, timercnt); 1668 verify_heap (EV_A_ timers, timercnt);
1563 1669
1640{ 1746{
1641#if EV_MULTIPLICITY 1747#if EV_MULTIPLICITY
1642 struct ev_loop *loop = ev_default_loop_ptr; 1748 struct ev_loop *loop = ev_default_loop_ptr;
1643#endif 1749#endif
1644 1750
1751 ev_default_loop_ptr = 0;
1752
1645#ifndef _WIN32 1753#ifndef _WIN32
1646 ev_ref (EV_A); /* child watcher */ 1754 ev_ref (EV_A); /* child watcher */
1647 ev_signal_stop (EV_A_ &childev); 1755 ev_signal_stop (EV_A_ &childev);
1648#endif 1756#endif
1649 1757
1655{ 1763{
1656#if EV_MULTIPLICITY 1764#if EV_MULTIPLICITY
1657 struct ev_loop *loop = ev_default_loop_ptr; 1765 struct ev_loop *loop = ev_default_loop_ptr;
1658#endif 1766#endif
1659 1767
1660 if (backend)
1661 postfork = 1; /* must be in line with ev_loop_fork */ 1768 postfork = 1; /* must be in line with ev_loop_fork */
1662} 1769}
1663 1770
1664/*****************************************************************************/ 1771/*****************************************************************************/
1665 1772
1666void 1773void
1667ev_invoke (EV_P_ void *w, int revents) 1774ev_invoke (EV_P_ void *w, int revents)
1668{ 1775{
1669 EV_CB_INVOKE ((W)w, revents); 1776 EV_CB_INVOKE ((W)w, revents);
1670} 1777}
1671 1778
1672void inline_speed 1779inline_speed void
1673call_pending (EV_P) 1780call_pending (EV_P)
1674{ 1781{
1675 int pri; 1782 int pri;
1676 1783
1677 for (pri = NUMPRI; pri--; ) 1784 for (pri = NUMPRI; pri--; )
1678 while (pendingcnt [pri]) 1785 while (pendingcnt [pri])
1679 { 1786 {
1680 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1787 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1681 1788
1682 if (expect_true (p->w))
1683 {
1684 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1789 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1790 /* ^ this is no longer true, as pending_w could be here */
1685 1791
1686 p->w->pending = 0; 1792 p->w->pending = 0;
1687 EV_CB_INVOKE (p->w, p->events); 1793 EV_CB_INVOKE (p->w, p->events);
1688 EV_FREQUENT_CHECK; 1794 EV_FREQUENT_CHECK;
1689 }
1690 } 1795 }
1691} 1796}
1692 1797
1693#if EV_IDLE_ENABLE 1798#if EV_IDLE_ENABLE
1694void inline_size 1799/* make idle watchers pending. this handles the "call-idle */
1800/* only when higher priorities are idle" logic */
1801inline_size void
1695idle_reify (EV_P) 1802idle_reify (EV_P)
1696{ 1803{
1697 if (expect_false (idleall)) 1804 if (expect_false (idleall))
1698 { 1805 {
1699 int pri; 1806 int pri;
1711 } 1818 }
1712 } 1819 }
1713} 1820}
1714#endif 1821#endif
1715 1822
1716void inline_size 1823/* make timers pending */
1824inline_size void
1717timers_reify (EV_P) 1825timers_reify (EV_P)
1718{ 1826{
1719 EV_FREQUENT_CHECK; 1827 EV_FREQUENT_CHECK;
1720 1828
1721 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1829 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1722 { 1830 {
1723 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1831 do
1724
1725 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1726
1727 /* first reschedule or stop timer */
1728 if (w->repeat)
1729 { 1832 {
1833 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1834
1835 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1836
1837 /* first reschedule or stop timer */
1838 if (w->repeat)
1839 {
1730 ev_at (w) += w->repeat; 1840 ev_at (w) += w->repeat;
1731 if (ev_at (w) < mn_now) 1841 if (ev_at (w) < mn_now)
1732 ev_at (w) = mn_now; 1842 ev_at (w) = mn_now;
1733 1843
1734 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1844 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1735 1845
1736 ANHE_at_cache (timers [HEAP0]); 1846 ANHE_at_cache (timers [HEAP0]);
1737 downheap (timers, timercnt, HEAP0); 1847 downheap (timers, timercnt, HEAP0);
1848 }
1849 else
1850 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1851
1852 EV_FREQUENT_CHECK;
1853 feed_reverse (EV_A_ (W)w);
1738 } 1854 }
1739 else 1855 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1740 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1741 1856
1742 EV_FREQUENT_CHECK;
1743 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1857 feed_reverse_done (EV_A_ EV_TIMEOUT);
1744 } 1858 }
1745} 1859}
1746 1860
1747#if EV_PERIODIC_ENABLE 1861#if EV_PERIODIC_ENABLE
1748void inline_size 1862/* make periodics pending */
1863inline_size void
1749periodics_reify (EV_P) 1864periodics_reify (EV_P)
1750{ 1865{
1751 EV_FREQUENT_CHECK; 1866 EV_FREQUENT_CHECK;
1752 1867
1753 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1868 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1754 { 1869 {
1755 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1870 int feed_count = 0;
1756 1871
1757 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1872 do
1758
1759 /* first reschedule or stop timer */
1760 if (w->reschedule_cb)
1761 { 1873 {
1874 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1875
1876 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1877
1878 /* first reschedule or stop timer */
1879 if (w->reschedule_cb)
1880 {
1762 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1881 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1763 1882
1764 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1883 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1765 1884
1766 ANHE_at_cache (periodics [HEAP0]); 1885 ANHE_at_cache (periodics [HEAP0]);
1767 downheap (periodics, periodiccnt, HEAP0); 1886 downheap (periodics, periodiccnt, HEAP0);
1887 }
1888 else if (w->interval)
1889 {
1890 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1891 /* if next trigger time is not sufficiently in the future, put it there */
1892 /* this might happen because of floating point inexactness */
1893 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1894 {
1895 ev_at (w) += w->interval;
1896
1897 /* if interval is unreasonably low we might still have a time in the past */
1898 /* so correct this. this will make the periodic very inexact, but the user */
1899 /* has effectively asked to get triggered more often than possible */
1900 if (ev_at (w) < ev_rt_now)
1901 ev_at (w) = ev_rt_now;
1902 }
1903
1904 ANHE_at_cache (periodics [HEAP0]);
1905 downheap (periodics, periodiccnt, HEAP0);
1906 }
1907 else
1908 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1909
1910 EV_FREQUENT_CHECK;
1911 feed_reverse (EV_A_ (W)w);
1768 } 1912 }
1769 else if (w->interval) 1913 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1770 {
1771 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1772 /* if next trigger time is not sufficiently in the future, put it there */
1773 /* this might happen because of floating point inexactness */
1774 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1775 {
1776 ev_at (w) += w->interval;
1777 1914
1778 /* if interval is unreasonably low we might still have a time in the past */
1779 /* so correct this. this will make the periodic very inexact, but the user */
1780 /* has effectively asked to get triggered more often than possible */
1781 if (ev_at (w) < ev_rt_now)
1782 ev_at (w) = ev_rt_now;
1783 }
1784
1785 ANHE_at_cache (periodics [HEAP0]);
1786 downheap (periodics, periodiccnt, HEAP0);
1787 }
1788 else
1789 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1790
1791 EV_FREQUENT_CHECK;
1792 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1915 feed_reverse_done (EV_A_ EV_PERIODIC);
1793 } 1916 }
1794} 1917}
1795 1918
1919/* simply recalculate all periodics */
1920/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1796static void noinline 1921static void noinline
1797periodics_reschedule (EV_P) 1922periodics_reschedule (EV_P)
1798{ 1923{
1799 int i; 1924 int i;
1800 1925
1813 1938
1814 reheap (periodics, periodiccnt); 1939 reheap (periodics, periodiccnt);
1815} 1940}
1816#endif 1941#endif
1817 1942
1818void inline_speed 1943/* adjust all timers by a given offset */
1944static void noinline
1945timers_reschedule (EV_P_ ev_tstamp adjust)
1946{
1947 int i;
1948
1949 for (i = 0; i < timercnt; ++i)
1950 {
1951 ANHE *he = timers + i + HEAP0;
1952 ANHE_w (*he)->at += adjust;
1953 ANHE_at_cache (*he);
1954 }
1955}
1956
1957/* fetch new monotonic and realtime times from the kernel */
1958/* also detetc if there was a timejump, and act accordingly */
1959inline_speed void
1819time_update (EV_P_ ev_tstamp max_block) 1960time_update (EV_P_ ev_tstamp max_block)
1820{ 1961{
1821 int i;
1822
1823#if EV_USE_MONOTONIC 1962#if EV_USE_MONOTONIC
1824 if (expect_true (have_monotonic)) 1963 if (expect_true (have_monotonic))
1825 { 1964 {
1965 int i;
1826 ev_tstamp odiff = rtmn_diff; 1966 ev_tstamp odiff = rtmn_diff;
1827 1967
1828 mn_now = get_clock (); 1968 mn_now = get_clock ();
1829 1969
1830 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 1970 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1856 ev_rt_now = ev_time (); 1996 ev_rt_now = ev_time ();
1857 mn_now = get_clock (); 1997 mn_now = get_clock ();
1858 now_floor = mn_now; 1998 now_floor = mn_now;
1859 } 1999 }
1860 2000
2001 /* no timer adjustment, as the monotonic clock doesn't jump */
2002 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1861# if EV_PERIODIC_ENABLE 2003# if EV_PERIODIC_ENABLE
1862 periodics_reschedule (EV_A); 2004 periodics_reschedule (EV_A);
1863# endif 2005# endif
1864 /* no timer adjustment, as the monotonic clock doesn't jump */
1865 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1866 } 2006 }
1867 else 2007 else
1868#endif 2008#endif
1869 { 2009 {
1870 ev_rt_now = ev_time (); 2010 ev_rt_now = ev_time ();
1871 2011
1872 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2012 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1873 { 2013 {
2014 /* adjust timers. this is easy, as the offset is the same for all of them */
2015 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1874#if EV_PERIODIC_ENABLE 2016#if EV_PERIODIC_ENABLE
1875 periodics_reschedule (EV_A); 2017 periodics_reschedule (EV_A);
1876#endif 2018#endif
1877 /* adjust timers. this is easy, as the offset is the same for all of them */
1878 for (i = 0; i < timercnt; ++i)
1879 {
1880 ANHE *he = timers + i + HEAP0;
1881 ANHE_w (*he)->at += ev_rt_now - mn_now;
1882 ANHE_at_cache (*he);
1883 }
1884 } 2019 }
1885 2020
1886 mn_now = ev_rt_now; 2021 mn_now = ev_rt_now;
1887 } 2022 }
1888}
1889
1890void
1891ev_ref (EV_P)
1892{
1893 ++activecnt;
1894}
1895
1896void
1897ev_unref (EV_P)
1898{
1899 --activecnt;
1900} 2023}
1901 2024
1902static int loop_done; 2025static int loop_done;
1903 2026
1904void 2027void
1938 { 2061 {
1939 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2062 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1940 call_pending (EV_A); 2063 call_pending (EV_A);
1941 } 2064 }
1942 2065
1943 if (expect_false (!activecnt))
1944 break;
1945
1946 /* we might have forked, so reify kernel state if necessary */ 2066 /* we might have forked, so reify kernel state if necessary */
1947 if (expect_false (postfork)) 2067 if (expect_false (postfork))
1948 loop_fork (EV_A); 2068 loop_fork (EV_A);
1949 2069
1950 /* update fd-related kernel structures */ 2070 /* update fd-related kernel structures */
1955 ev_tstamp waittime = 0.; 2075 ev_tstamp waittime = 0.;
1956 ev_tstamp sleeptime = 0.; 2076 ev_tstamp sleeptime = 0.;
1957 2077
1958 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2078 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1959 { 2079 {
2080 /* remember old timestamp for io_blocktime calculation */
2081 ev_tstamp prev_mn_now = mn_now;
2082
1960 /* update time to cancel out callback processing overhead */ 2083 /* update time to cancel out callback processing overhead */
1961 time_update (EV_A_ 1e100); 2084 time_update (EV_A_ 1e100);
1962 2085
1963 waittime = MAX_BLOCKTIME; 2086 waittime = MAX_BLOCKTIME;
1964 2087
1974 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2097 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1975 if (waittime > to) waittime = to; 2098 if (waittime > to) waittime = to;
1976 } 2099 }
1977#endif 2100#endif
1978 2101
2102 /* don't let timeouts decrease the waittime below timeout_blocktime */
1979 if (expect_false (waittime < timeout_blocktime)) 2103 if (expect_false (waittime < timeout_blocktime))
1980 waittime = timeout_blocktime; 2104 waittime = timeout_blocktime;
1981 2105
1982 sleeptime = waittime - backend_fudge; 2106 /* extra check because io_blocktime is commonly 0 */
1983
1984 if (expect_true (sleeptime > io_blocktime)) 2107 if (expect_false (io_blocktime))
1985 sleeptime = io_blocktime;
1986
1987 if (sleeptime)
1988 { 2108 {
2109 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2110
2111 if (sleeptime > waittime - backend_fudge)
2112 sleeptime = waittime - backend_fudge;
2113
2114 if (expect_true (sleeptime > 0.))
2115 {
1989 ev_sleep (sleeptime); 2116 ev_sleep (sleeptime);
1990 waittime -= sleeptime; 2117 waittime -= sleeptime;
2118 }
1991 } 2119 }
1992 } 2120 }
1993 2121
1994 ++loop_count; 2122 ++loop_count;
1995 backend_poll (EV_A_ waittime); 2123 backend_poll (EV_A_ waittime);
2029ev_unloop (EV_P_ int how) 2157ev_unloop (EV_P_ int how)
2030{ 2158{
2031 loop_done = how; 2159 loop_done = how;
2032} 2160}
2033 2161
2162void
2163ev_ref (EV_P)
2164{
2165 ++activecnt;
2166}
2167
2168void
2169ev_unref (EV_P)
2170{
2171 --activecnt;
2172}
2173
2174void
2175ev_now_update (EV_P)
2176{
2177 time_update (EV_A_ 1e100);
2178}
2179
2180void
2181ev_suspend (EV_P)
2182{
2183 ev_now_update (EV_A);
2184}
2185
2186void
2187ev_resume (EV_P)
2188{
2189 ev_tstamp mn_prev = mn_now;
2190
2191 ev_now_update (EV_A);
2192 timers_reschedule (EV_A_ mn_now - mn_prev);
2193#if EV_PERIODIC_ENABLE
2194 /* TODO: really do this? */
2195 periodics_reschedule (EV_A);
2196#endif
2197}
2198
2034/*****************************************************************************/ 2199/*****************************************************************************/
2200/* singly-linked list management, used when the expected list length is short */
2035 2201
2036void inline_size 2202inline_size void
2037wlist_add (WL *head, WL elem) 2203wlist_add (WL *head, WL elem)
2038{ 2204{
2039 elem->next = *head; 2205 elem->next = *head;
2040 *head = elem; 2206 *head = elem;
2041} 2207}
2042 2208
2043void inline_size 2209inline_size void
2044wlist_del (WL *head, WL elem) 2210wlist_del (WL *head, WL elem)
2045{ 2211{
2046 while (*head) 2212 while (*head)
2047 { 2213 {
2048 if (*head == elem) 2214 if (*head == elem)
2053 2219
2054 head = &(*head)->next; 2220 head = &(*head)->next;
2055 } 2221 }
2056} 2222}
2057 2223
2058void inline_speed 2224/* internal, faster, version of ev_clear_pending */
2225inline_speed void
2059clear_pending (EV_P_ W w) 2226clear_pending (EV_P_ W w)
2060{ 2227{
2061 if (w->pending) 2228 if (w->pending)
2062 { 2229 {
2063 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2230 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2064 w->pending = 0; 2231 w->pending = 0;
2065 } 2232 }
2066} 2233}
2067 2234
2068int 2235int
2072 int pending = w_->pending; 2239 int pending = w_->pending;
2073 2240
2074 if (expect_true (pending)) 2241 if (expect_true (pending))
2075 { 2242 {
2076 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2243 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2244 p->w = (W)&pending_w;
2077 w_->pending = 0; 2245 w_->pending = 0;
2078 p->w = 0;
2079 return p->events; 2246 return p->events;
2080 } 2247 }
2081 else 2248 else
2082 return 0; 2249 return 0;
2083} 2250}
2084 2251
2085void inline_size 2252inline_size void
2086pri_adjust (EV_P_ W w) 2253pri_adjust (EV_P_ W w)
2087{ 2254{
2088 int pri = w->priority; 2255 int pri = w->priority;
2089 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2256 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2090 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2257 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2091 w->priority = pri; 2258 w->priority = pri;
2092} 2259}
2093 2260
2094void inline_speed 2261inline_speed void
2095ev_start (EV_P_ W w, int active) 2262ev_start (EV_P_ W w, int active)
2096{ 2263{
2097 pri_adjust (EV_A_ w); 2264 pri_adjust (EV_A_ w);
2098 w->active = active; 2265 w->active = active;
2099 ev_ref (EV_A); 2266 ev_ref (EV_A);
2100} 2267}
2101 2268
2102void inline_size 2269inline_size void
2103ev_stop (EV_P_ W w) 2270ev_stop (EV_P_ W w)
2104{ 2271{
2105 ev_unref (EV_A); 2272 ev_unref (EV_A);
2106 w->active = 0; 2273 w->active = 0;
2107} 2274}
2114 int fd = w->fd; 2281 int fd = w->fd;
2115 2282
2116 if (expect_false (ev_is_active (w))) 2283 if (expect_false (ev_is_active (w)))
2117 return; 2284 return;
2118 2285
2119 assert (("ev_io_start called with negative fd", fd >= 0)); 2286 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2287 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2120 2288
2121 EV_FREQUENT_CHECK; 2289 EV_FREQUENT_CHECK;
2122 2290
2123 ev_start (EV_A_ (W)w, 1); 2291 ev_start (EV_A_ (W)w, 1);
2124 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2292 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2125 wlist_add (&anfds[fd].head, (WL)w); 2293 wlist_add (&anfds[fd].head, (WL)w);
2126 2294
2127 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2295 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2128 w->events &= ~EV_IOFDSET; 2296 w->events &= ~EV__IOFDSET;
2129 2297
2130 EV_FREQUENT_CHECK; 2298 EV_FREQUENT_CHECK;
2131} 2299}
2132 2300
2133void noinline 2301void noinline
2135{ 2303{
2136 clear_pending (EV_A_ (W)w); 2304 clear_pending (EV_A_ (W)w);
2137 if (expect_false (!ev_is_active (w))) 2305 if (expect_false (!ev_is_active (w)))
2138 return; 2306 return;
2139 2307
2140 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2308 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2141 2309
2142 EV_FREQUENT_CHECK; 2310 EV_FREQUENT_CHECK;
2143 2311
2144 wlist_del (&anfds[w->fd].head, (WL)w); 2312 wlist_del (&anfds[w->fd].head, (WL)w);
2145 ev_stop (EV_A_ (W)w); 2313 ev_stop (EV_A_ (W)w);
2155 if (expect_false (ev_is_active (w))) 2323 if (expect_false (ev_is_active (w)))
2156 return; 2324 return;
2157 2325
2158 ev_at (w) += mn_now; 2326 ev_at (w) += mn_now;
2159 2327
2160 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2328 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2161 2329
2162 EV_FREQUENT_CHECK; 2330 EV_FREQUENT_CHECK;
2163 2331
2164 ++timercnt; 2332 ++timercnt;
2165 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2333 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2168 ANHE_at_cache (timers [ev_active (w)]); 2336 ANHE_at_cache (timers [ev_active (w)]);
2169 upheap (timers, ev_active (w)); 2337 upheap (timers, ev_active (w));
2170 2338
2171 EV_FREQUENT_CHECK; 2339 EV_FREQUENT_CHECK;
2172 2340
2173 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2341 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2174} 2342}
2175 2343
2176void noinline 2344void noinline
2177ev_timer_stop (EV_P_ ev_timer *w) 2345ev_timer_stop (EV_P_ ev_timer *w)
2178{ 2346{
2183 EV_FREQUENT_CHECK; 2351 EV_FREQUENT_CHECK;
2184 2352
2185 { 2353 {
2186 int active = ev_active (w); 2354 int active = ev_active (w);
2187 2355
2188 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2356 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2189 2357
2190 --timercnt; 2358 --timercnt;
2191 2359
2192 if (expect_true (active < timercnt + HEAP0)) 2360 if (expect_true (active < timercnt + HEAP0))
2193 { 2361 {
2237 2405
2238 if (w->reschedule_cb) 2406 if (w->reschedule_cb)
2239 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2407 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2240 else if (w->interval) 2408 else if (w->interval)
2241 { 2409 {
2242 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2410 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2243 /* this formula differs from the one in periodic_reify because we do not always round up */ 2411 /* this formula differs from the one in periodic_reify because we do not always round up */
2244 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2412 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2245 } 2413 }
2246 else 2414 else
2247 ev_at (w) = w->offset; 2415 ev_at (w) = w->offset;
2255 ANHE_at_cache (periodics [ev_active (w)]); 2423 ANHE_at_cache (periodics [ev_active (w)]);
2256 upheap (periodics, ev_active (w)); 2424 upheap (periodics, ev_active (w));
2257 2425
2258 EV_FREQUENT_CHECK; 2426 EV_FREQUENT_CHECK;
2259 2427
2260 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2428 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2261} 2429}
2262 2430
2263void noinline 2431void noinline
2264ev_periodic_stop (EV_P_ ev_periodic *w) 2432ev_periodic_stop (EV_P_ ev_periodic *w)
2265{ 2433{
2270 EV_FREQUENT_CHECK; 2438 EV_FREQUENT_CHECK;
2271 2439
2272 { 2440 {
2273 int active = ev_active (w); 2441 int active = ev_active (w);
2274 2442
2275 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2443 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2276 2444
2277 --periodiccnt; 2445 --periodiccnt;
2278 2446
2279 if (expect_true (active < periodiccnt + HEAP0)) 2447 if (expect_true (active < periodiccnt + HEAP0))
2280 { 2448 {
2303 2471
2304void noinline 2472void noinline
2305ev_signal_start (EV_P_ ev_signal *w) 2473ev_signal_start (EV_P_ ev_signal *w)
2306{ 2474{
2307#if EV_MULTIPLICITY 2475#if EV_MULTIPLICITY
2308 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2476 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2309#endif 2477#endif
2310 if (expect_false (ev_is_active (w))) 2478 if (expect_false (ev_is_active (w)))
2311 return; 2479 return;
2312 2480
2313 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2481 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2314 2482
2315 evpipe_init (EV_A); 2483 evpipe_init (EV_A);
2316 2484
2317 EV_FREQUENT_CHECK; 2485 EV_FREQUENT_CHECK;
2318 2486
2321 sigset_t full, prev; 2489 sigset_t full, prev;
2322 sigfillset (&full); 2490 sigfillset (&full);
2323 sigprocmask (SIG_SETMASK, &full, &prev); 2491 sigprocmask (SIG_SETMASK, &full, &prev);
2324#endif 2492#endif
2325 2493
2326 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2494 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2327 2495
2328#ifndef _WIN32 2496#ifndef _WIN32
2329 sigprocmask (SIG_SETMASK, &prev, 0); 2497 sigprocmask (SIG_SETMASK, &prev, 0);
2330#endif 2498#endif
2331 } 2499 }
2369 2537
2370void 2538void
2371ev_child_start (EV_P_ ev_child *w) 2539ev_child_start (EV_P_ ev_child *w)
2372{ 2540{
2373#if EV_MULTIPLICITY 2541#if EV_MULTIPLICITY
2374 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2542 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2375#endif 2543#endif
2376 if (expect_false (ev_is_active (w))) 2544 if (expect_false (ev_is_active (w)))
2377 return; 2545 return;
2378 2546
2379 EV_FREQUENT_CHECK; 2547 EV_FREQUENT_CHECK;
2404# ifdef _WIN32 2572# ifdef _WIN32
2405# undef lstat 2573# undef lstat
2406# define lstat(a,b) _stati64 (a,b) 2574# define lstat(a,b) _stati64 (a,b)
2407# endif 2575# endif
2408 2576
2409#define DEF_STAT_INTERVAL 5.0074891 2577#define DEF_STAT_INTERVAL 5.0074891
2578#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2410#define MIN_STAT_INTERVAL 0.1074891 2579#define MIN_STAT_INTERVAL 0.1074891
2411 2580
2412static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2581static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2413 2582
2414#if EV_USE_INOTIFY 2583#if EV_USE_INOTIFY
2415# define EV_INOTIFY_BUFSIZE 8192 2584# define EV_INOTIFY_BUFSIZE 8192
2419{ 2588{
2420 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); 2589 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);
2421 2590
2422 if (w->wd < 0) 2591 if (w->wd < 0)
2423 { 2592 {
2593 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2424 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2594 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2425 2595
2426 /* monitor some parent directory for speedup hints */ 2596 /* monitor some parent directory for speedup hints */
2427 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2597 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2428 /* but an efficiency issue only */ 2598 /* but an efficiency issue only */
2429 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2599 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2430 { 2600 {
2431 char path [4096]; 2601 char path [4096];
2432 strcpy (path, w->path); 2602 strcpy (path, w->path);
2436 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2606 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2437 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2607 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2438 2608
2439 char *pend = strrchr (path, '/'); 2609 char *pend = strrchr (path, '/');
2440 2610
2441 if (!pend) 2611 if (!pend || pend == path)
2442 break; /* whoops, no '/', complain to your admin */ 2612 break;
2443 2613
2444 *pend = 0; 2614 *pend = 0;
2445 w->wd = inotify_add_watch (fs_fd, path, mask); 2615 w->wd = inotify_add_watch (fs_fd, path, mask);
2446 } 2616 }
2447 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2617 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2448 } 2618 }
2449 } 2619 }
2450 else
2451 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2452 2620
2453 if (w->wd >= 0) 2621 if (w->wd >= 0)
2622 {
2454 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2623 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2624
2625 /* now local changes will be tracked by inotify, but remote changes won't */
2626 /* unless the filesystem it known to be local, we therefore still poll */
2627 /* also do poll on <2.6.25, but with normal frequency */
2628 struct statfs sfs;
2629
2630 if (fs_2625 && !statfs (w->path, &sfs))
2631 if (sfs.f_type == 0x1373 /* devfs */
2632 || sfs.f_type == 0xEF53 /* ext2/3 */
2633 || sfs.f_type == 0x3153464a /* jfs */
2634 || sfs.f_type == 0x52654973 /* reiser3 */
2635 || sfs.f_type == 0x01021994 /* tempfs */
2636 || sfs.f_type == 0x58465342 /* xfs */)
2637 return;
2638
2639 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2640 ev_timer_again (EV_A_ &w->timer);
2641 }
2455} 2642}
2456 2643
2457static void noinline 2644static void noinline
2458infy_del (EV_P_ ev_stat *w) 2645infy_del (EV_P_ ev_stat *w)
2459{ 2646{
2473 2660
2474static void noinline 2661static void noinline
2475infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2662infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2476{ 2663{
2477 if (slot < 0) 2664 if (slot < 0)
2478 /* overflow, need to check for all hahs slots */ 2665 /* overflow, need to check for all hash slots */
2479 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2666 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2480 infy_wd (EV_A_ slot, wd, ev); 2667 infy_wd (EV_A_ slot, wd, ev);
2481 else 2668 else
2482 { 2669 {
2483 WL w_; 2670 WL w_;
2489 2676
2490 if (w->wd == wd || wd == -1) 2677 if (w->wd == wd || wd == -1)
2491 { 2678 {
2492 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2679 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2493 { 2680 {
2681 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2494 w->wd = -1; 2682 w->wd = -1;
2495 infy_add (EV_A_ w); /* re-add, no matter what */ 2683 infy_add (EV_A_ w); /* re-add, no matter what */
2496 } 2684 }
2497 2685
2498 stat_timer_cb (EV_A_ &w->timer, 0); 2686 stat_timer_cb (EV_A_ &w->timer, 0);
2511 2699
2512 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2700 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2513 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2701 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2514} 2702}
2515 2703
2516void inline_size 2704inline_size void
2705check_2625 (EV_P)
2706{
2707 /* kernels < 2.6.25 are borked
2708 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2709 */
2710 struct utsname buf;
2711 int major, minor, micro;
2712
2713 if (uname (&buf))
2714 return;
2715
2716 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2717 return;
2718
2719 if (major < 2
2720 || (major == 2 && minor < 6)
2721 || (major == 2 && minor == 6 && micro < 25))
2722 return;
2723
2724 fs_2625 = 1;
2725}
2726
2727inline_size void
2517infy_init (EV_P) 2728infy_init (EV_P)
2518{ 2729{
2519 if (fs_fd != -2) 2730 if (fs_fd != -2)
2520 return; 2731 return;
2732
2733 fs_fd = -1;
2734
2735 check_2625 (EV_A);
2521 2736
2522 fs_fd = inotify_init (); 2737 fs_fd = inotify_init ();
2523 2738
2524 if (fs_fd >= 0) 2739 if (fs_fd >= 0)
2525 { 2740 {
2527 ev_set_priority (&fs_w, EV_MAXPRI); 2742 ev_set_priority (&fs_w, EV_MAXPRI);
2528 ev_io_start (EV_A_ &fs_w); 2743 ev_io_start (EV_A_ &fs_w);
2529 } 2744 }
2530} 2745}
2531 2746
2532void inline_size 2747inline_size void
2533infy_fork (EV_P) 2748infy_fork (EV_P)
2534{ 2749{
2535 int slot; 2750 int slot;
2536 2751
2537 if (fs_fd < 0) 2752 if (fs_fd < 0)
2553 w->wd = -1; 2768 w->wd = -1;
2554 2769
2555 if (fs_fd >= 0) 2770 if (fs_fd >= 0)
2556 infy_add (EV_A_ w); /* re-add, no matter what */ 2771 infy_add (EV_A_ w); /* re-add, no matter what */
2557 else 2772 else
2558 ev_timer_start (EV_A_ &w->timer); 2773 ev_timer_again (EV_A_ &w->timer);
2559 } 2774 }
2560
2561 } 2775 }
2562} 2776}
2563 2777
2778#endif
2779
2780#ifdef _WIN32
2781# define EV_LSTAT(p,b) _stati64 (p, b)
2782#else
2783# define EV_LSTAT(p,b) lstat (p, b)
2564#endif 2784#endif
2565 2785
2566void 2786void
2567ev_stat_stat (EV_P_ ev_stat *w) 2787ev_stat_stat (EV_P_ ev_stat *w)
2568{ 2788{
2595 || w->prev.st_atime != w->attr.st_atime 2815 || w->prev.st_atime != w->attr.st_atime
2596 || w->prev.st_mtime != w->attr.st_mtime 2816 || w->prev.st_mtime != w->attr.st_mtime
2597 || w->prev.st_ctime != w->attr.st_ctime 2817 || w->prev.st_ctime != w->attr.st_ctime
2598 ) { 2818 ) {
2599 #if EV_USE_INOTIFY 2819 #if EV_USE_INOTIFY
2820 if (fs_fd >= 0)
2821 {
2600 infy_del (EV_A_ w); 2822 infy_del (EV_A_ w);
2601 infy_add (EV_A_ w); 2823 infy_add (EV_A_ w);
2602 ev_stat_stat (EV_A_ w); /* avoid race... */ 2824 ev_stat_stat (EV_A_ w); /* avoid race... */
2825 }
2603 #endif 2826 #endif
2604 2827
2605 ev_feed_event (EV_A_ w, EV_STAT); 2828 ev_feed_event (EV_A_ w, EV_STAT);
2606 } 2829 }
2607} 2830}
2610ev_stat_start (EV_P_ ev_stat *w) 2833ev_stat_start (EV_P_ ev_stat *w)
2611{ 2834{
2612 if (expect_false (ev_is_active (w))) 2835 if (expect_false (ev_is_active (w)))
2613 return; 2836 return;
2614 2837
2615 /* since we use memcmp, we need to clear any padding data etc. */
2616 memset (&w->prev, 0, sizeof (ev_statdata));
2617 memset (&w->attr, 0, sizeof (ev_statdata));
2618
2619 ev_stat_stat (EV_A_ w); 2838 ev_stat_stat (EV_A_ w);
2620 2839
2840 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2621 if (w->interval < MIN_STAT_INTERVAL) 2841 w->interval = MIN_STAT_INTERVAL;
2622 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2623 2842
2624 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2843 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2625 ev_set_priority (&w->timer, ev_priority (w)); 2844 ev_set_priority (&w->timer, ev_priority (w));
2626 2845
2627#if EV_USE_INOTIFY 2846#if EV_USE_INOTIFY
2628 infy_init (EV_A); 2847 infy_init (EV_A);
2629 2848
2630 if (fs_fd >= 0) 2849 if (fs_fd >= 0)
2631 infy_add (EV_A_ w); 2850 infy_add (EV_A_ w);
2632 else 2851 else
2633#endif 2852#endif
2634 ev_timer_start (EV_A_ &w->timer); 2853 ev_timer_again (EV_A_ &w->timer);
2635 2854
2636 ev_start (EV_A_ (W)w, 1); 2855 ev_start (EV_A_ (W)w, 1);
2637 2856
2638 EV_FREQUENT_CHECK; 2857 EV_FREQUENT_CHECK;
2639} 2858}
2809 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3028 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2810 } 3029 }
2811 } 3030 }
2812} 3031}
2813 3032
3033static void
3034embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3035{
3036 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3037
3038 ev_embed_stop (EV_A_ w);
3039
3040 {
3041 struct ev_loop *loop = w->other;
3042
3043 ev_loop_fork (EV_A);
3044 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3045 }
3046
3047 ev_embed_start (EV_A_ w);
3048}
3049
2814#if 0 3050#if 0
2815static void 3051static void
2816embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3052embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2817{ 3053{
2818 ev_idle_stop (EV_A_ idle); 3054 ev_idle_stop (EV_A_ idle);
2825 if (expect_false (ev_is_active (w))) 3061 if (expect_false (ev_is_active (w)))
2826 return; 3062 return;
2827 3063
2828 { 3064 {
2829 struct ev_loop *loop = w->other; 3065 struct ev_loop *loop = w->other;
2830 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3066 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2831 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3067 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2832 } 3068 }
2833 3069
2834 EV_FREQUENT_CHECK; 3070 EV_FREQUENT_CHECK;
2835 3071
2838 3074
2839 ev_prepare_init (&w->prepare, embed_prepare_cb); 3075 ev_prepare_init (&w->prepare, embed_prepare_cb);
2840 ev_set_priority (&w->prepare, EV_MINPRI); 3076 ev_set_priority (&w->prepare, EV_MINPRI);
2841 ev_prepare_start (EV_A_ &w->prepare); 3077 ev_prepare_start (EV_A_ &w->prepare);
2842 3078
3079 ev_fork_init (&w->fork, embed_fork_cb);
3080 ev_fork_start (EV_A_ &w->fork);
3081
2843 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3082 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2844 3083
2845 ev_start (EV_A_ (W)w, 1); 3084 ev_start (EV_A_ (W)w, 1);
2846 3085
2847 EV_FREQUENT_CHECK; 3086 EV_FREQUENT_CHECK;
2854 if (expect_false (!ev_is_active (w))) 3093 if (expect_false (!ev_is_active (w)))
2855 return; 3094 return;
2856 3095
2857 EV_FREQUENT_CHECK; 3096 EV_FREQUENT_CHECK;
2858 3097
2859 ev_io_stop (EV_A_ &w->io); 3098 ev_io_stop (EV_A_ &w->io);
2860 ev_prepare_stop (EV_A_ &w->prepare); 3099 ev_prepare_stop (EV_A_ &w->prepare);
2861 3100 ev_fork_stop (EV_A_ &w->fork);
2862 ev_stop (EV_A_ (W)w);
2863 3101
2864 EV_FREQUENT_CHECK; 3102 EV_FREQUENT_CHECK;
2865} 3103}
2866#endif 3104#endif
2867 3105
2964once_cb (EV_P_ struct ev_once *once, int revents) 3202once_cb (EV_P_ struct ev_once *once, int revents)
2965{ 3203{
2966 void (*cb)(int revents, void *arg) = once->cb; 3204 void (*cb)(int revents, void *arg) = once->cb;
2967 void *arg = once->arg; 3205 void *arg = once->arg;
2968 3206
2969 ev_io_stop (EV_A_ &once->io); 3207 ev_io_stop (EV_A_ &once->io);
2970 ev_timer_stop (EV_A_ &once->to); 3208 ev_timer_stop (EV_A_ &once->to);
2971 ev_free (once); 3209 ev_free (once);
2972 3210
2973 cb (revents, arg); 3211 cb (revents, arg);
2974} 3212}
2975 3213
2976static void 3214static void
2977once_cb_io (EV_P_ ev_io *w, int revents) 3215once_cb_io (EV_P_ ev_io *w, int revents)
2978{ 3216{
2979 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3217 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3218
3219 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2980} 3220}
2981 3221
2982static void 3222static void
2983once_cb_to (EV_P_ ev_timer *w, int revents) 3223once_cb_to (EV_P_ ev_timer *w, int revents)
2984{ 3224{
2985 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3225 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3226
3227 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2986} 3228}
2987 3229
2988void 3230void
2989ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3231ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2990{ 3232{
3012 ev_timer_set (&once->to, timeout, 0.); 3254 ev_timer_set (&once->to, timeout, 0.);
3013 ev_timer_start (EV_A_ &once->to); 3255 ev_timer_start (EV_A_ &once->to);
3014 } 3256 }
3015} 3257}
3016 3258
3259/*****************************************************************************/
3260
3261#if EV_WALK_ENABLE
3262void
3263ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3264{
3265 int i, j;
3266 ev_watcher_list *wl, *wn;
3267
3268 if (types & (EV_IO | EV_EMBED))
3269 for (i = 0; i < anfdmax; ++i)
3270 for (wl = anfds [i].head; wl; )
3271 {
3272 wn = wl->next;
3273
3274#if EV_EMBED_ENABLE
3275 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3276 {
3277 if (types & EV_EMBED)
3278 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3279 }
3280 else
3281#endif
3282#if EV_USE_INOTIFY
3283 if (ev_cb ((ev_io *)wl) == infy_cb)
3284 ;
3285 else
3286#endif
3287 if ((ev_io *)wl != &pipe_w)
3288 if (types & EV_IO)
3289 cb (EV_A_ EV_IO, wl);
3290
3291 wl = wn;
3292 }
3293
3294 if (types & (EV_TIMER | EV_STAT))
3295 for (i = timercnt + HEAP0; i-- > HEAP0; )
3296#if EV_STAT_ENABLE
3297 /*TODO: timer is not always active*/
3298 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3299 {
3300 if (types & EV_STAT)
3301 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3302 }
3303 else
3304#endif
3305 if (types & EV_TIMER)
3306 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3307
3308#if EV_PERIODIC_ENABLE
3309 if (types & EV_PERIODIC)
3310 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3311 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3312#endif
3313
3314#if EV_IDLE_ENABLE
3315 if (types & EV_IDLE)
3316 for (j = NUMPRI; i--; )
3317 for (i = idlecnt [j]; i--; )
3318 cb (EV_A_ EV_IDLE, idles [j][i]);
3319#endif
3320
3321#if EV_FORK_ENABLE
3322 if (types & EV_FORK)
3323 for (i = forkcnt; i--; )
3324 if (ev_cb (forks [i]) != embed_fork_cb)
3325 cb (EV_A_ EV_FORK, forks [i]);
3326#endif
3327
3328#if EV_ASYNC_ENABLE
3329 if (types & EV_ASYNC)
3330 for (i = asynccnt; i--; )
3331 cb (EV_A_ EV_ASYNC, asyncs [i]);
3332#endif
3333
3334 if (types & EV_PREPARE)
3335 for (i = preparecnt; i--; )
3336#if EV_EMBED_ENABLE
3337 if (ev_cb (prepares [i]) != embed_prepare_cb)
3338#endif
3339 cb (EV_A_ EV_PREPARE, prepares [i]);
3340
3341 if (types & EV_CHECK)
3342 for (i = checkcnt; i--; )
3343 cb (EV_A_ EV_CHECK, checks [i]);
3344
3345 if (types & EV_SIGNAL)
3346 for (i = 0; i < signalmax; ++i)
3347 for (wl = signals [i].head; wl; )
3348 {
3349 wn = wl->next;
3350 cb (EV_A_ EV_SIGNAL, wl);
3351 wl = wn;
3352 }
3353
3354 if (types & EV_CHILD)
3355 for (i = EV_PID_HASHSIZE; i--; )
3356 for (wl = childs [i]; wl; )
3357 {
3358 wn = wl->next;
3359 cb (EV_A_ EV_CHILD, wl);
3360 wl = wn;
3361 }
3362/* EV_STAT 0x00001000 /* stat data changed */
3363/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3364}
3365#endif
3366
3017#if EV_MULTIPLICITY 3367#if EV_MULTIPLICITY
3018 #include "ev_wrap.h" 3368 #include "ev_wrap.h"
3019#endif 3369#endif
3020 3370
3021#ifdef __cplusplus 3371#ifdef __cplusplus

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines