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

Comparing libev/ev.c (file contents):
Revision 1.255 by root, Mon Jun 9 14:11:30 2008 UTC vs.
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
64# endif
65
52# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
55# endif 69# endif
56# ifndef EV_USE_REALTIME 70# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 71# define EV_USE_REALTIME 0
58# endif 72# endif
59# else 73# else
60# ifndef EV_USE_MONOTONIC 74# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 75# define EV_USE_MONOTONIC 0
62# endif 76# endif
119# else 133# else
120# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
121# endif 135# endif
122# endif 136# endif
123 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
124# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD 147# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
127# else 149# else
128# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
154#ifndef _WIN32 176#ifndef _WIN32
155# include <sys/time.h> 177# include <sys/time.h>
156# include <sys/wait.h> 178# include <sys/wait.h>
157# include <unistd.h> 179# include <unistd.h>
158#else 180#else
181# include <io.h>
159# define WIN32_LEAN_AND_MEAN 182# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 183# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 184# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 185# define EV_SELECT_IS_WINSOCKET 1
163# endif 186# endif
164#endif 187#endif
165 188
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
190
191/* try to deduce the maximum number of signals on this platform */
192/* one some platforms, NSIG is one too large. we do not bother */
193#if defined (EV_NSIG)
194/* use what's provided */
195#elif defined (NSIG)
196# define EV_NSIG (NSIG)
197#elif defined(_NSIG)
198# define EV_NSIG (_NSIG)
199#elif defined (SIGMAX)
200# define EV_NSIG (SIGMAX+1)
201#elif defined (SIG_MAX)
202# define EV_NSIG (SIG_MAX+1)
203#elif defined (_SIG_MAX)
204# define EV_NSIG (_SIG_MAX+1)
205#elif defined (MAXSIG)
206# define EV_NSIG (MAXSIG+1)
207#elif defined (MAX_SIG)
208# define EV_NSIG (MAX_SIG+1)
209#elif defined (SIGARRAYSIZE)
210# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
211#elif defined (_sys_nsig)
212# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
213#else
214# error "unable to find value for NSIG, please report"
215/* to make it compile regardless, just remove the above line */
216# define EV_NSIG 65
217#endif
218
219#ifndef EV_USE_CLOCK_SYSCALL
220# if __linux && __GLIBC__ >= 2
221# define EV_USE_CLOCK_SYSCALL 1
222# else
223# define EV_USE_CLOCK_SYSCALL 0
224# endif
225#endif
167 226
168#ifndef EV_USE_MONOTONIC 227#ifndef EV_USE_MONOTONIC
169# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 228# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
170# define EV_USE_MONOTONIC 1 229# define EV_USE_MONOTONIC 1
171# else 230# else
172# define EV_USE_MONOTONIC 0 231# define EV_USE_MONOTONIC 0
173# endif 232# endif
174#endif 233#endif
175 234
176#ifndef EV_USE_REALTIME 235#ifndef EV_USE_REALTIME
177# define EV_USE_REALTIME 0 236# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
178#endif 237#endif
179 238
180#ifndef EV_USE_NANOSLEEP 239#ifndef EV_USE_NANOSLEEP
181# if _POSIX_C_SOURCE >= 199309L 240# if _POSIX_C_SOURCE >= 199309L
182# define EV_USE_NANOSLEEP 1 241# define EV_USE_NANOSLEEP 1
243# else 302# else
244# define EV_USE_EVENTFD 0 303# define EV_USE_EVENTFD 0
245# endif 304# endif
246#endif 305#endif
247 306
307#ifndef EV_USE_SIGNALFD
308# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
309# define EV_USE_SIGNALFD 1
310# else
311# define EV_USE_SIGNALFD 0
312# endif
313#endif
314
248#if 0 /* debugging */ 315#if 0 /* debugging */
249# define EV_VERIFY 3 316# define EV_VERIFY 3
250# define EV_USE_4HEAP 1 317# define EV_USE_4HEAP 1
251# define EV_HEAP_CACHE_AT 1 318# define EV_HEAP_CACHE_AT 1
252#endif 319#endif
261 328
262#ifndef EV_HEAP_CACHE_AT 329#ifndef EV_HEAP_CACHE_AT
263# define EV_HEAP_CACHE_AT !EV_MINIMAL 330# define EV_HEAP_CACHE_AT !EV_MINIMAL
264#endif 331#endif
265 332
333/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
334/* which makes programs even slower. might work on other unices, too. */
335#if EV_USE_CLOCK_SYSCALL
336# include <syscall.h>
337# ifdef SYS_clock_gettime
338# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
339# undef EV_USE_MONOTONIC
340# define EV_USE_MONOTONIC 1
341# else
342# undef EV_USE_CLOCK_SYSCALL
343# define EV_USE_CLOCK_SYSCALL 0
344# endif
345#endif
346
266/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 347/* this block fixes any misconfiguration where we know we run into trouble otherwise */
267 348
268#ifndef CLOCK_MONOTONIC 349#ifndef CLOCK_MONOTONIC
269# undef EV_USE_MONOTONIC 350# undef EV_USE_MONOTONIC
270# define EV_USE_MONOTONIC 0 351# define EV_USE_MONOTONIC 0
285# include <sys/select.h> 366# include <sys/select.h>
286# endif 367# endif
287#endif 368#endif
288 369
289#if EV_USE_INOTIFY 370#if EV_USE_INOTIFY
371# include <sys/utsname.h>
372# include <sys/statfs.h>
290# include <sys/inotify.h> 373# include <sys/inotify.h>
374/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
375# ifndef IN_DONT_FOLLOW
376# undef EV_USE_INOTIFY
377# define EV_USE_INOTIFY 0
378# endif
291#endif 379#endif
292 380
293#if EV_SELECT_IS_WINSOCKET 381#if EV_SELECT_IS_WINSOCKET
294# include <winsock.h> 382# include <winsock.h>
295#endif 383#endif
296 384
297#if EV_USE_EVENTFD 385#if EV_USE_EVENTFD
298/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 386/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
299# include <stdint.h> 387# include <stdint.h>
388# ifndef EFD_NONBLOCK
389# define EFD_NONBLOCK O_NONBLOCK
390# endif
391# ifndef EFD_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# endif
300# ifdef __cplusplus 394# ifdef __cplusplus
301extern "C" { 395extern "C" {
302# endif 396# endif
303int eventfd (unsigned int initval, int flags); 397int eventfd (unsigned int initval, int flags);
304# ifdef __cplusplus 398# ifdef __cplusplus
305} 399}
306# endif 400# endif
401#endif
402
403#if EV_USE_SIGNALFD
404# include <sys/signalfd.h>
307#endif 405#endif
308 406
309/**/ 407/**/
310 408
311#if EV_VERIFY >= 3 409#if EV_VERIFY >= 3
347# define inline_speed static noinline 445# define inline_speed static noinline
348#else 446#else
349# define inline_speed static inline 447# define inline_speed static inline
350#endif 448#endif
351 449
352#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 450#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
451
452#if EV_MINPRI == EV_MAXPRI
453# define ABSPRI(w) (((W)w), 0)
454#else
353#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 455# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
456#endif
354 457
355#define EMPTY /* required for microsofts broken pseudo-c compiler */ 458#define EMPTY /* required for microsofts broken pseudo-c compiler */
356#define EMPTY2(a,b) /* used to suppress some warnings */ 459#define EMPTY2(a,b) /* used to suppress some warnings */
357 460
358typedef ev_watcher *W; 461typedef ev_watcher *W;
360typedef ev_watcher_time *WT; 463typedef ev_watcher_time *WT;
361 464
362#define ev_active(w) ((W)(w))->active 465#define ev_active(w) ((W)(w))->active
363#define ev_at(w) ((WT)(w))->at 466#define ev_at(w) ((WT)(w))->at
364 467
365#if EV_USE_MONOTONIC 468#if EV_USE_REALTIME
366/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 469/* sig_atomic_t is used to avoid per-thread variables or locking but still */
367/* giving it a reasonably high chance of working on typical architetcures */ 470/* giving it a reasonably high chance of working on typical architetcures */
471static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
472#endif
473
474#if EV_USE_MONOTONIC
368static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 475static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
369#endif 476#endif
370 477
371#ifdef _WIN32 478#ifdef _WIN32
372# include "ev_win32.c" 479# include "ev_win32.c"
381{ 488{
382 syserr_cb = cb; 489 syserr_cb = cb;
383} 490}
384 491
385static void noinline 492static void noinline
386syserr (const char *msg) 493ev_syserr (const char *msg)
387{ 494{
388 if (!msg) 495 if (!msg)
389 msg = "(libev) system error"; 496 msg = "(libev) system error";
390 497
391 if (syserr_cb) 498 if (syserr_cb)
437#define ev_malloc(size) ev_realloc (0, (size)) 544#define ev_malloc(size) ev_realloc (0, (size))
438#define ev_free(ptr) ev_realloc ((ptr), 0) 545#define ev_free(ptr) ev_realloc ((ptr), 0)
439 546
440/*****************************************************************************/ 547/*****************************************************************************/
441 548
549/* set in reify when reification needed */
550#define EV_ANFD_REIFY 1
551
552/* file descriptor info structure */
442typedef struct 553typedef struct
443{ 554{
444 WL head; 555 WL head;
445 unsigned char events; 556 unsigned char events; /* the events watched for */
557 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
558 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
446 unsigned char reify; 559 unsigned char unused;
560#if EV_USE_EPOLL
561 unsigned int egen; /* generation counter to counter epoll bugs */
562#endif
447#if EV_SELECT_IS_WINSOCKET 563#if EV_SELECT_IS_WINSOCKET
448 SOCKET handle; 564 SOCKET handle;
449#endif 565#endif
450} ANFD; 566} ANFD;
451 567
568/* stores the pending event set for a given watcher */
452typedef struct 569typedef struct
453{ 570{
454 W w; 571 W w;
455 int events; 572 int events; /* the pending event set for the given watcher */
456} ANPENDING; 573} ANPENDING;
457 574
458#if EV_USE_INOTIFY 575#if EV_USE_INOTIFY
459/* hash table entry per inotify-id */ 576/* hash table entry per inotify-id */
460typedef struct 577typedef struct
463} ANFS; 580} ANFS;
464#endif 581#endif
465 582
466/* Heap Entry */ 583/* Heap Entry */
467#if EV_HEAP_CACHE_AT 584#if EV_HEAP_CACHE_AT
585 /* a heap element */
468 typedef struct { 586 typedef struct {
469 ev_tstamp at; 587 ev_tstamp at;
470 WT w; 588 WT w;
471 } ANHE; 589 } ANHE;
472 590
473 #define ANHE_w(he) (he).w /* access watcher, read-write */ 591 #define ANHE_w(he) (he).w /* access watcher, read-write */
474 #define ANHE_at(he) (he).at /* access cached at, read-only */ 592 #define ANHE_at(he) (he).at /* access cached at, read-only */
475 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 593 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
476#else 594#else
595 /* a heap element */
477 typedef WT ANHE; 596 typedef WT ANHE;
478 597
479 #define ANHE_w(he) (he) 598 #define ANHE_w(he) (he)
480 #define ANHE_at(he) (he)->at 599 #define ANHE_at(he) (he)->at
481 #define ANHE_at_cache(he) 600 #define ANHE_at_cache(he)
505 624
506 static int ev_default_loop_ptr; 625 static int ev_default_loop_ptr;
507 626
508#endif 627#endif
509 628
629#if EV_MINIMAL < 2
630# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
631# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
632# define EV_INVOKE_PENDING invoke_cb (EV_A)
633#else
634# define EV_RELEASE_CB (void)0
635# define EV_ACQUIRE_CB (void)0
636# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
637#endif
638
639#define EVUNLOOP_RECURSE 0x80
640
510/*****************************************************************************/ 641/*****************************************************************************/
511 642
643#ifndef EV_HAVE_EV_TIME
512ev_tstamp 644ev_tstamp
513ev_time (void) 645ev_time (void)
514{ 646{
515#if EV_USE_REALTIME 647#if EV_USE_REALTIME
648 if (expect_true (have_realtime))
649 {
516 struct timespec ts; 650 struct timespec ts;
517 clock_gettime (CLOCK_REALTIME, &ts); 651 clock_gettime (CLOCK_REALTIME, &ts);
518 return ts.tv_sec + ts.tv_nsec * 1e-9; 652 return ts.tv_sec + ts.tv_nsec * 1e-9;
519#else 653 }
654#endif
655
520 struct timeval tv; 656 struct timeval tv;
521 gettimeofday (&tv, 0); 657 gettimeofday (&tv, 0);
522 return tv.tv_sec + tv.tv_usec * 1e-6; 658 return tv.tv_sec + tv.tv_usec * 1e-6;
523#endif
524} 659}
660#endif
525 661
526ev_tstamp inline_size 662inline_size ev_tstamp
527get_clock (void) 663get_clock (void)
528{ 664{
529#if EV_USE_MONOTONIC 665#if EV_USE_MONOTONIC
530 if (expect_true (have_monotonic)) 666 if (expect_true (have_monotonic))
531 { 667 {
564 struct timeval tv; 700 struct timeval tv;
565 701
566 tv.tv_sec = (time_t)delay; 702 tv.tv_sec = (time_t)delay;
567 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 703 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568 704
705 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
706 /* something not guaranteed by newer posix versions, but guaranteed */
707 /* by older ones */
569 select (0, 0, 0, 0, &tv); 708 select (0, 0, 0, 0, &tv);
570#endif 709#endif
571 } 710 }
572} 711}
573 712
574/*****************************************************************************/ 713/*****************************************************************************/
575 714
576#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 715#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
577 716
578int inline_size 717/* find a suitable new size for the given array, */
718/* hopefully by rounding to a ncie-to-malloc size */
719inline_size int
579array_nextsize (int elem, int cur, int cnt) 720array_nextsize (int elem, int cur, int cnt)
580{ 721{
581 int ncur = cur + 1; 722 int ncur = cur + 1;
582 723
583 do 724 do
600array_realloc (int elem, void *base, int *cur, int cnt) 741array_realloc (int elem, void *base, int *cur, int cnt)
601{ 742{
602 *cur = array_nextsize (elem, *cur, cnt); 743 *cur = array_nextsize (elem, *cur, cnt);
603 return ev_realloc (base, elem * *cur); 744 return ev_realloc (base, elem * *cur);
604} 745}
746
747#define array_init_zero(base,count) \
748 memset ((void *)(base), 0, sizeof (*(base)) * (count))
605 749
606#define array_needsize(type,base,cur,cnt,init) \ 750#define array_needsize(type,base,cur,cnt,init) \
607 if (expect_false ((cnt) > (cur))) \ 751 if (expect_false ((cnt) > (cur))) \
608 { \ 752 { \
609 int ocur_ = (cur); \ 753 int ocur_ = (cur); \
621 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 765 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
622 } 766 }
623#endif 767#endif
624 768
625#define array_free(stem, idx) \ 769#define array_free(stem, idx) \
626 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 770 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
627 771
628/*****************************************************************************/ 772/*****************************************************************************/
773
774/* dummy callback for pending events */
775static void noinline
776pendingcb (EV_P_ ev_prepare *w, int revents)
777{
778}
629 779
630void noinline 780void noinline
631ev_feed_event (EV_P_ void *w, int revents) 781ev_feed_event (EV_P_ void *w, int revents)
632{ 782{
633 W w_ = (W)w; 783 W w_ = (W)w;
642 pendings [pri][w_->pending - 1].w = w_; 792 pendings [pri][w_->pending - 1].w = w_;
643 pendings [pri][w_->pending - 1].events = revents; 793 pendings [pri][w_->pending - 1].events = revents;
644 } 794 }
645} 795}
646 796
647void inline_speed 797inline_speed void
798feed_reverse (EV_P_ W w)
799{
800 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
801 rfeeds [rfeedcnt++] = w;
802}
803
804inline_size void
805feed_reverse_done (EV_P_ int revents)
806{
807 do
808 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
809 while (rfeedcnt);
810}
811
812inline_speed void
648queue_events (EV_P_ W *events, int eventcnt, int type) 813queue_events (EV_P_ W *events, int eventcnt, int type)
649{ 814{
650 int i; 815 int i;
651 816
652 for (i = 0; i < eventcnt; ++i) 817 for (i = 0; i < eventcnt; ++i)
653 ev_feed_event (EV_A_ events [i], type); 818 ev_feed_event (EV_A_ events [i], type);
654} 819}
655 820
656/*****************************************************************************/ 821/*****************************************************************************/
657 822
658void inline_size 823inline_speed void
659anfds_init (ANFD *base, int count)
660{
661 while (count--)
662 {
663 base->head = 0;
664 base->events = EV_NONE;
665 base->reify = 0;
666
667 ++base;
668 }
669}
670
671void inline_speed
672fd_event (EV_P_ int fd, int revents) 824fd_event_nc (EV_P_ int fd, int revents)
673{ 825{
674 ANFD *anfd = anfds + fd; 826 ANFD *anfd = anfds + fd;
675 ev_io *w; 827 ev_io *w;
676 828
677 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 829 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
681 if (ev) 833 if (ev)
682 ev_feed_event (EV_A_ (W)w, ev); 834 ev_feed_event (EV_A_ (W)w, ev);
683 } 835 }
684} 836}
685 837
838/* do not submit kernel events for fds that have reify set */
839/* because that means they changed while we were polling for new events */
840inline_speed void
841fd_event (EV_P_ int fd, int revents)
842{
843 ANFD *anfd = anfds + fd;
844
845 if (expect_true (!anfd->reify))
846 fd_event_nc (EV_A_ fd, revents);
847}
848
686void 849void
687ev_feed_fd_event (EV_P_ int fd, int revents) 850ev_feed_fd_event (EV_P_ int fd, int revents)
688{ 851{
689 if (fd >= 0 && fd < anfdmax) 852 if (fd >= 0 && fd < anfdmax)
690 fd_event (EV_A_ fd, revents); 853 fd_event_nc (EV_A_ fd, revents);
691} 854}
692 855
693void inline_size 856/* make sure the external fd watch events are in-sync */
857/* with the kernel/libev internal state */
858inline_size void
694fd_reify (EV_P) 859fd_reify (EV_P)
695{ 860{
696 int i; 861 int i;
697 862
698 for (i = 0; i < fdchangecnt; ++i) 863 for (i = 0; i < fdchangecnt; ++i)
713 #ifdef EV_FD_TO_WIN32_HANDLE 878 #ifdef EV_FD_TO_WIN32_HANDLE
714 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 879 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
715 #else 880 #else
716 anfd->handle = _get_osfhandle (fd); 881 anfd->handle = _get_osfhandle (fd);
717 #endif 882 #endif
718 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 883 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
719 } 884 }
720#endif 885#endif
721 886
722 { 887 {
723 unsigned char o_events = anfd->events; 888 unsigned char o_events = anfd->events;
724 unsigned char o_reify = anfd->reify; 889 unsigned char o_reify = anfd->reify;
725 890
726 anfd->reify = 0; 891 anfd->reify = 0;
727 anfd->events = events; 892 anfd->events = events;
728 893
729 if (o_events != events || o_reify & EV_IOFDSET) 894 if (o_events != events || o_reify & EV__IOFDSET)
730 backend_modify (EV_A_ fd, o_events, events); 895 backend_modify (EV_A_ fd, o_events, events);
731 } 896 }
732 } 897 }
733 898
734 fdchangecnt = 0; 899 fdchangecnt = 0;
735} 900}
736 901
737void inline_size 902/* something about the given fd changed */
903inline_size void
738fd_change (EV_P_ int fd, int flags) 904fd_change (EV_P_ int fd, int flags)
739{ 905{
740 unsigned char reify = anfds [fd].reify; 906 unsigned char reify = anfds [fd].reify;
741 anfds [fd].reify |= flags; 907 anfds [fd].reify |= flags;
742 908
746 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 912 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
747 fdchanges [fdchangecnt - 1] = fd; 913 fdchanges [fdchangecnt - 1] = fd;
748 } 914 }
749} 915}
750 916
751void inline_speed 917/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
918inline_speed void
752fd_kill (EV_P_ int fd) 919fd_kill (EV_P_ int fd)
753{ 920{
754 ev_io *w; 921 ev_io *w;
755 922
756 while ((w = (ev_io *)anfds [fd].head)) 923 while ((w = (ev_io *)anfds [fd].head))
758 ev_io_stop (EV_A_ w); 925 ev_io_stop (EV_A_ w);
759 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 926 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
760 } 927 }
761} 928}
762 929
763int inline_size 930/* check whether the given fd is atcually valid, for error recovery */
931inline_size int
764fd_valid (int fd) 932fd_valid (int fd)
765{ 933{
766#ifdef _WIN32 934#ifdef _WIN32
767 return _get_osfhandle (fd) != -1; 935 return _get_osfhandle (fd) != -1;
768#else 936#else
804 972
805 for (fd = 0; fd < anfdmax; ++fd) 973 for (fd = 0; fd < anfdmax; ++fd)
806 if (anfds [fd].events) 974 if (anfds [fd].events)
807 { 975 {
808 anfds [fd].events = 0; 976 anfds [fd].events = 0;
977 anfds [fd].emask = 0;
809 fd_change (EV_A_ fd, EV_IOFDSET | 1); 978 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
810 } 979 }
811} 980}
812 981
813/*****************************************************************************/ 982/*****************************************************************************/
814 983
830#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 999#define HEAP0 (DHEAP - 1) /* index of first element in heap */
831#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 1000#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
832#define UPHEAP_DONE(p,k) ((p) == (k)) 1001#define UPHEAP_DONE(p,k) ((p) == (k))
833 1002
834/* away from the root */ 1003/* away from the root */
835void inline_speed 1004inline_speed void
836downheap (ANHE *heap, int N, int k) 1005downheap (ANHE *heap, int N, int k)
837{ 1006{
838 ANHE he = heap [k]; 1007 ANHE he = heap [k];
839 ANHE *E = heap + N + HEAP0; 1008 ANHE *E = heap + N + HEAP0;
840 1009
880#define HEAP0 1 1049#define HEAP0 1
881#define HPARENT(k) ((k) >> 1) 1050#define HPARENT(k) ((k) >> 1)
882#define UPHEAP_DONE(p,k) (!(p)) 1051#define UPHEAP_DONE(p,k) (!(p))
883 1052
884/* away from the root */ 1053/* away from the root */
885void inline_speed 1054inline_speed void
886downheap (ANHE *heap, int N, int k) 1055downheap (ANHE *heap, int N, int k)
887{ 1056{
888 ANHE he = heap [k]; 1057 ANHE he = heap [k];
889 1058
890 for (;;) 1059 for (;;)
910 ev_active (ANHE_w (he)) = k; 1079 ev_active (ANHE_w (he)) = k;
911} 1080}
912#endif 1081#endif
913 1082
914/* towards the root */ 1083/* towards the root */
915void inline_speed 1084inline_speed void
916upheap (ANHE *heap, int k) 1085upheap (ANHE *heap, int k)
917{ 1086{
918 ANHE he = heap [k]; 1087 ANHE he = heap [k];
919 1088
920 for (;;) 1089 for (;;)
931 1100
932 heap [k] = he; 1101 heap [k] = he;
933 ev_active (ANHE_w (he)) = k; 1102 ev_active (ANHE_w (he)) = k;
934} 1103}
935 1104
936void inline_size 1105/* move an element suitably so it is in a correct place */
1106inline_size void
937adjustheap (ANHE *heap, int N, int k) 1107adjustheap (ANHE *heap, int N, int k)
938{ 1108{
939 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1109 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
940 upheap (heap, k); 1110 upheap (heap, k);
941 else 1111 else
942 downheap (heap, N, k); 1112 downheap (heap, N, k);
943} 1113}
944 1114
945/* rebuild the heap: this function is used only once and executed rarely */ 1115/* rebuild the heap: this function is used only once and executed rarely */
946void inline_size 1116inline_size void
947reheap (ANHE *heap, int N) 1117reheap (ANHE *heap, int N)
948{ 1118{
949 int i; 1119 int i;
950 1120
951 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1121 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
954 upheap (heap, i + HEAP0); 1124 upheap (heap, i + HEAP0);
955} 1125}
956 1126
957/*****************************************************************************/ 1127/*****************************************************************************/
958 1128
1129/* associate signal watchers to a signal signal */
959typedef struct 1130typedef struct
960{ 1131{
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
961 WL head; 1135 WL head;
962 EV_ATOMIC_T gotsig; 1136 EV_ATOMIC_T gotsig;
963} ANSIG; 1137} ANSIG;
964 1138
965static ANSIG *signals; 1139static ANSIG signals [EV_NSIG - 1];
966static int signalmax;
967
968static EV_ATOMIC_T gotsig; 1140static EV_ATOMIC_T gotsig;
969 1141
970void inline_size
971signals_init (ANSIG *base, int count)
972{
973 while (count--)
974 {
975 base->head = 0;
976 base->gotsig = 0;
977
978 ++base;
979 }
980}
981
982/*****************************************************************************/ 1142/*****************************************************************************/
983 1143
984void inline_speed 1144/* used to prepare libev internal fd's */
1145/* this is not fork-safe */
1146inline_speed void
985fd_intern (int fd) 1147fd_intern (int fd)
986{ 1148{
987#ifdef _WIN32 1149#ifdef _WIN32
988 unsigned long arg = 1; 1150 unsigned long arg = 1;
989 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1151 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
994} 1156}
995 1157
996static void noinline 1158static void noinline
997evpipe_init (EV_P) 1159evpipe_init (EV_P)
998{ 1160{
999 if (!ev_is_active (&pipeev)) 1161 if (!ev_is_active (&pipe_w))
1000 { 1162 {
1001#if EV_USE_EVENTFD 1163#if EV_USE_EVENTFD
1164 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1165 if (evfd < 0 && errno == EINVAL)
1002 if ((evfd = eventfd (0, 0)) >= 0) 1166 evfd = eventfd (0, 0);
1167
1168 if (evfd >= 0)
1003 { 1169 {
1004 evpipe [0] = -1; 1170 evpipe [0] = -1;
1005 fd_intern (evfd); 1171 fd_intern (evfd); /* doing it twice doesn't hurt */
1006 ev_io_set (&pipeev, evfd, EV_READ); 1172 ev_io_set (&pipe_w, evfd, EV_READ);
1007 } 1173 }
1008 else 1174 else
1009#endif 1175#endif
1010 { 1176 {
1011 while (pipe (evpipe)) 1177 while (pipe (evpipe))
1012 syserr ("(libev) error creating signal/async pipe"); 1178 ev_syserr ("(libev) error creating signal/async pipe");
1013 1179
1014 fd_intern (evpipe [0]); 1180 fd_intern (evpipe [0]);
1015 fd_intern (evpipe [1]); 1181 fd_intern (evpipe [1]);
1016 ev_io_set (&pipeev, evpipe [0], EV_READ); 1182 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1017 } 1183 }
1018 1184
1019 ev_io_start (EV_A_ &pipeev); 1185 ev_io_start (EV_A_ &pipe_w);
1020 ev_unref (EV_A); /* watcher should not keep loop alive */ 1186 ev_unref (EV_A); /* watcher should not keep loop alive */
1021 } 1187 }
1022} 1188}
1023 1189
1024void inline_size 1190inline_size void
1025evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1191evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1026{ 1192{
1027 if (!*flag) 1193 if (!*flag)
1028 { 1194 {
1029 int old_errno = errno; /* save errno because write might clobber it */ 1195 int old_errno = errno; /* save errno because write might clobber it */
1042 1208
1043 errno = old_errno; 1209 errno = old_errno;
1044 } 1210 }
1045} 1211}
1046 1212
1213/* called whenever the libev signal pipe */
1214/* got some events (signal, async) */
1047static void 1215static void
1048pipecb (EV_P_ ev_io *iow, int revents) 1216pipecb (EV_P_ ev_io *iow, int revents)
1049{ 1217{
1050#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
1051 if (evfd >= 0) 1219 if (evfd >= 0)
1063 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (gotsig && ev_is_default_loop (EV_A))
1064 { 1232 {
1065 int signum; 1233 int signum;
1066 gotsig = 0; 1234 gotsig = 0;
1067 1235
1068 for (signum = signalmax; signum--; ) 1236 for (signum = EV_NSIG - 1; signum--; )
1069 if (signals [signum].gotsig) 1237 if (signals [signum].gotsig)
1070 ev_feed_signal_event (EV_A_ signum + 1); 1238 ev_feed_signal_event (EV_A_ signum + 1);
1071 } 1239 }
1072 1240
1073#if EV_ASYNC_ENABLE 1241#if EV_ASYNC_ENABLE
1090 1258
1091static void 1259static void
1092ev_sighandler (int signum) 1260ev_sighandler (int signum)
1093{ 1261{
1094#if EV_MULTIPLICITY 1262#if EV_MULTIPLICITY
1095 struct ev_loop *loop = &default_loop_struct; 1263 EV_P = signals [signum - 1].loop;
1096#endif 1264#endif
1097 1265
1098#if _WIN32 1266#if _WIN32
1099 signal (signum, ev_sighandler); 1267 signal (signum, ev_sighandler);
1100#endif 1268#endif
1107ev_feed_signal_event (EV_P_ int signum) 1275ev_feed_signal_event (EV_P_ int signum)
1108{ 1276{
1109 WL w; 1277 WL w;
1110 1278
1111#if EV_MULTIPLICITY 1279#if EV_MULTIPLICITY
1112 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1280 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1113#endif 1281#endif
1282
1283 if (signum <= 0 || signum > EV_NSIG)
1284 return;
1114 1285
1115 --signum; 1286 --signum;
1116
1117 if (signum < 0 || signum >= signalmax)
1118 return;
1119 1287
1120 signals [signum].gotsig = 0; 1288 signals [signum].gotsig = 0;
1121 1289
1122 for (w = signals [signum].head; w; w = w->next) 1290 for (w = signals [signum].head; w; w = w->next)
1123 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1291 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1124} 1292}
1125 1293
1294#if EV_USE_SIGNALFD
1295static void
1296sigfdcb (EV_P_ ev_io *iow, int revents)
1297{
1298 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1299
1300 for (;;)
1301 {
1302 ssize_t res = read (sigfd, si, sizeof (si));
1303
1304 /* not ISO-C, as res might be -1, but works with SuS */
1305 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1306 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1307
1308 if (res < (ssize_t)sizeof (si))
1309 break;
1310 }
1311}
1312#endif
1313
1126/*****************************************************************************/ 1314/*****************************************************************************/
1127 1315
1128static WL childs [EV_PID_HASHSIZE]; 1316static WL childs [EV_PID_HASHSIZE];
1129 1317
1130#ifndef _WIN32 1318#ifndef _WIN32
1133 1321
1134#ifndef WIFCONTINUED 1322#ifndef WIFCONTINUED
1135# define WIFCONTINUED(status) 0 1323# define WIFCONTINUED(status) 0
1136#endif 1324#endif
1137 1325
1138void inline_speed 1326/* handle a single child status event */
1327inline_speed void
1139child_reap (EV_P_ int chain, int pid, int status) 1328child_reap (EV_P_ int chain, int pid, int status)
1140{ 1329{
1141 ev_child *w; 1330 ev_child *w;
1142 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1331 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1143 1332
1156 1345
1157#ifndef WCONTINUED 1346#ifndef WCONTINUED
1158# define WCONTINUED 0 1347# define WCONTINUED 0
1159#endif 1348#endif
1160 1349
1350/* called on sigchld etc., calls waitpid */
1161static void 1351static void
1162childcb (EV_P_ ev_signal *sw, int revents) 1352childcb (EV_P_ ev_signal *sw, int revents)
1163{ 1353{
1164 int pid, status; 1354 int pid, status;
1165 1355
1246 /* kqueue is borked on everything but netbsd apparently */ 1436 /* kqueue is borked on everything but netbsd apparently */
1247 /* it usually doesn't work correctly on anything but sockets and pipes */ 1437 /* it usually doesn't work correctly on anything but sockets and pipes */
1248 flags &= ~EVBACKEND_KQUEUE; 1438 flags &= ~EVBACKEND_KQUEUE;
1249#endif 1439#endif
1250#ifdef __APPLE__ 1440#ifdef __APPLE__
1251 // flags &= ~EVBACKEND_KQUEUE; for documentation 1441 /* only select works correctly on that "unix-certified" platform */
1252 flags &= ~EVBACKEND_POLL; 1442 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1443 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1253#endif 1444#endif
1254 1445
1255 return flags; 1446 return flags;
1256} 1447}
1257 1448
1271ev_backend (EV_P) 1462ev_backend (EV_P)
1272{ 1463{
1273 return backend; 1464 return backend;
1274} 1465}
1275 1466
1467#if EV_MINIMAL < 2
1276unsigned int 1468unsigned int
1277ev_loop_count (EV_P) 1469ev_loop_count (EV_P)
1278{ 1470{
1279 return loop_count; 1471 return loop_count;
1280} 1472}
1281 1473
1474unsigned int
1475ev_loop_depth (EV_P)
1476{
1477 return loop_depth;
1478}
1479
1282void 1480void
1283ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1481ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1284{ 1482{
1285 io_blocktime = interval; 1483 io_blocktime = interval;
1286} 1484}
1289ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1487ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1290{ 1488{
1291 timeout_blocktime = interval; 1489 timeout_blocktime = interval;
1292} 1490}
1293 1491
1492void
1493ev_set_userdata (EV_P_ void *data)
1494{
1495 userdata = data;
1496}
1497
1498void *
1499ev_userdata (EV_P)
1500{
1501 return userdata;
1502}
1503
1504void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1505{
1506 invoke_cb = invoke_pending_cb;
1507}
1508
1509void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1510{
1511 release_cb = release;
1512 acquire_cb = acquire;
1513}
1514#endif
1515
1516/* initialise a loop structure, must be zero-initialised */
1294static void noinline 1517static void noinline
1295loop_init (EV_P_ unsigned int flags) 1518loop_init (EV_P_ unsigned int flags)
1296{ 1519{
1297 if (!backend) 1520 if (!backend)
1298 { 1521 {
1522#if EV_USE_REALTIME
1523 if (!have_realtime)
1524 {
1525 struct timespec ts;
1526
1527 if (!clock_gettime (CLOCK_REALTIME, &ts))
1528 have_realtime = 1;
1529 }
1530#endif
1531
1299#if EV_USE_MONOTONIC 1532#if EV_USE_MONOTONIC
1533 if (!have_monotonic)
1300 { 1534 {
1301 struct timespec ts; 1535 struct timespec ts;
1536
1302 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1537 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1303 have_monotonic = 1; 1538 have_monotonic = 1;
1304 } 1539 }
1305#endif 1540#endif
1541
1542 /* pid check not overridable via env */
1543#ifndef _WIN32
1544 if (flags & EVFLAG_FORKCHECK)
1545 curpid = getpid ();
1546#endif
1547
1548 if (!(flags & EVFLAG_NOENV)
1549 && !enable_secure ()
1550 && getenv ("LIBEV_FLAGS"))
1551 flags = atoi (getenv ("LIBEV_FLAGS"));
1306 1552
1307 ev_rt_now = ev_time (); 1553 ev_rt_now = ev_time ();
1308 mn_now = get_clock (); 1554 mn_now = get_clock ();
1309 now_floor = mn_now; 1555 now_floor = mn_now;
1310 rtmn_diff = ev_rt_now - mn_now; 1556 rtmn_diff = ev_rt_now - mn_now;
1557#if EV_MINIMAL < 2
1558 invoke_cb = ev_invoke_pending;
1559#endif
1311 1560
1312 io_blocktime = 0.; 1561 io_blocktime = 0.;
1313 timeout_blocktime = 0.; 1562 timeout_blocktime = 0.;
1314 backend = 0; 1563 backend = 0;
1315 backend_fd = -1; 1564 backend_fd = -1;
1316 gotasync = 0; 1565 gotasync = 0;
1317#if EV_USE_INOTIFY 1566#if EV_USE_INOTIFY
1318 fs_fd = -2; 1567 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1319#endif 1568#endif
1320 1569#if EV_USE_SIGNALFD
1321 /* pid check not overridable via env */ 1570 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1322#ifndef _WIN32
1323 if (flags & EVFLAG_FORKCHECK)
1324 curpid = getpid ();
1325#endif 1571#endif
1326
1327 if (!(flags & EVFLAG_NOENV)
1328 && !enable_secure ()
1329 && getenv ("LIBEV_FLAGS"))
1330 flags = atoi (getenv ("LIBEV_FLAGS"));
1331 1572
1332 if (!(flags & 0x0000ffffU)) 1573 if (!(flags & 0x0000ffffU))
1333 flags |= ev_recommended_backends (); 1574 flags |= ev_recommended_backends ();
1334 1575
1335#if EV_USE_PORT 1576#if EV_USE_PORT
1346#endif 1587#endif
1347#if EV_USE_SELECT 1588#if EV_USE_SELECT
1348 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1589 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1349#endif 1590#endif
1350 1591
1592 ev_prepare_init (&pending_w, pendingcb);
1593
1351 ev_init (&pipeev, pipecb); 1594 ev_init (&pipe_w, pipecb);
1352 ev_set_priority (&pipeev, EV_MAXPRI); 1595 ev_set_priority (&pipe_w, EV_MAXPRI);
1353 } 1596 }
1354} 1597}
1355 1598
1599/* free up a loop structure */
1356static void noinline 1600static void noinline
1357loop_destroy (EV_P) 1601loop_destroy (EV_P)
1358{ 1602{
1359 int i; 1603 int i;
1360 1604
1361 if (ev_is_active (&pipeev)) 1605 if (ev_is_active (&pipe_w))
1362 { 1606 {
1363 ev_ref (EV_A); /* signal watcher */ 1607 /*ev_ref (EV_A);*/
1364 ev_io_stop (EV_A_ &pipeev); 1608 /*ev_io_stop (EV_A_ &pipe_w);*/
1365 1609
1366#if EV_USE_EVENTFD 1610#if EV_USE_EVENTFD
1367 if (evfd >= 0) 1611 if (evfd >= 0)
1368 close (evfd); 1612 close (evfd);
1369#endif 1613#endif
1373 close (evpipe [0]); 1617 close (evpipe [0]);
1374 close (evpipe [1]); 1618 close (evpipe [1]);
1375 } 1619 }
1376 } 1620 }
1377 1621
1622#if EV_USE_SIGNALFD
1623 if (ev_is_active (&sigfd_w))
1624 {
1625 /*ev_ref (EV_A);*/
1626 /*ev_io_stop (EV_A_ &sigfd_w);*/
1627
1628 close (sigfd);
1629 }
1630#endif
1631
1378#if EV_USE_INOTIFY 1632#if EV_USE_INOTIFY
1379 if (fs_fd >= 0) 1633 if (fs_fd >= 0)
1380 close (fs_fd); 1634 close (fs_fd);
1381#endif 1635#endif
1382 1636
1405#if EV_IDLE_ENABLE 1659#if EV_IDLE_ENABLE
1406 array_free (idle, [i]); 1660 array_free (idle, [i]);
1407#endif 1661#endif
1408 } 1662 }
1409 1663
1410 ev_free (anfds); anfdmax = 0; 1664 ev_free (anfds); anfds = 0; anfdmax = 0;
1411 1665
1412 /* have to use the microsoft-never-gets-it-right macro */ 1666 /* have to use the microsoft-never-gets-it-right macro */
1667 array_free (rfeed, EMPTY);
1413 array_free (fdchange, EMPTY); 1668 array_free (fdchange, EMPTY);
1414 array_free (timer, EMPTY); 1669 array_free (timer, EMPTY);
1415#if EV_PERIODIC_ENABLE 1670#if EV_PERIODIC_ENABLE
1416 array_free (periodic, EMPTY); 1671 array_free (periodic, EMPTY);
1417#endif 1672#endif
1426 1681
1427 backend = 0; 1682 backend = 0;
1428} 1683}
1429 1684
1430#if EV_USE_INOTIFY 1685#if EV_USE_INOTIFY
1431void inline_size infy_fork (EV_P); 1686inline_size void infy_fork (EV_P);
1432#endif 1687#endif
1433 1688
1434void inline_size 1689inline_size void
1435loop_fork (EV_P) 1690loop_fork (EV_P)
1436{ 1691{
1437#if EV_USE_PORT 1692#if EV_USE_PORT
1438 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1693 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1439#endif 1694#endif
1445#endif 1700#endif
1446#if EV_USE_INOTIFY 1701#if EV_USE_INOTIFY
1447 infy_fork (EV_A); 1702 infy_fork (EV_A);
1448#endif 1703#endif
1449 1704
1450 if (ev_is_active (&pipeev)) 1705 if (ev_is_active (&pipe_w))
1451 { 1706 {
1452 /* this "locks" the handlers against writing to the pipe */ 1707 /* this "locks" the handlers against writing to the pipe */
1453 /* while we modify the fd vars */ 1708 /* while we modify the fd vars */
1454 gotsig = 1; 1709 gotsig = 1;
1455#if EV_ASYNC_ENABLE 1710#if EV_ASYNC_ENABLE
1456 gotasync = 1; 1711 gotasync = 1;
1457#endif 1712#endif
1458 1713
1459 ev_ref (EV_A); 1714 ev_ref (EV_A);
1460 ev_io_stop (EV_A_ &pipeev); 1715 ev_io_stop (EV_A_ &pipe_w);
1461 1716
1462#if EV_USE_EVENTFD 1717#if EV_USE_EVENTFD
1463 if (evfd >= 0) 1718 if (evfd >= 0)
1464 close (evfd); 1719 close (evfd);
1465#endif 1720#endif
1470 close (evpipe [1]); 1725 close (evpipe [1]);
1471 } 1726 }
1472 1727
1473 evpipe_init (EV_A); 1728 evpipe_init (EV_A);
1474 /* now iterate over everything, in case we missed something */ 1729 /* now iterate over everything, in case we missed something */
1475 pipecb (EV_A_ &pipeev, EV_READ); 1730 pipecb (EV_A_ &pipe_w, EV_READ);
1476 } 1731 }
1477 1732
1478 postfork = 0; 1733 postfork = 0;
1479} 1734}
1480 1735
1481#if EV_MULTIPLICITY 1736#if EV_MULTIPLICITY
1482 1737
1483struct ev_loop * 1738struct ev_loop *
1484ev_loop_new (unsigned int flags) 1739ev_loop_new (unsigned int flags)
1485{ 1740{
1486 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1741 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1487 1742
1488 memset (loop, 0, sizeof (struct ev_loop)); 1743 memset (EV_A, 0, sizeof (struct ev_loop));
1489
1490 loop_init (EV_A_ flags); 1744 loop_init (EV_A_ flags);
1491 1745
1492 if (ev_backend (EV_A)) 1746 if (ev_backend (EV_A))
1493 return loop; 1747 return EV_A;
1494 1748
1495 return 0; 1749 return 0;
1496} 1750}
1497 1751
1498void 1752void
1505void 1759void
1506ev_loop_fork (EV_P) 1760ev_loop_fork (EV_P)
1507{ 1761{
1508 postfork = 1; /* must be in line with ev_default_fork */ 1762 postfork = 1; /* must be in line with ev_default_fork */
1509} 1763}
1764#endif /* multiplicity */
1510 1765
1511#if EV_VERIFY 1766#if EV_VERIFY
1512void noinline 1767static void noinline
1513verify_watcher (EV_P_ W w) 1768verify_watcher (EV_P_ W w)
1514{ 1769{
1515 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1770 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516 1771
1517 if (w->pending) 1772 if (w->pending)
1518 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1773 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1519} 1774}
1520 1775
1521static void noinline 1776static void noinline
1522verify_heap (EV_P_ ANHE *heap, int N) 1777verify_heap (EV_P_ ANHE *heap, int N)
1523{ 1778{
1524 int i; 1779 int i;
1525 1780
1526 for (i = HEAP0; i < N + HEAP0; ++i) 1781 for (i = HEAP0; i < N + HEAP0; ++i)
1527 { 1782 {
1528 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1783 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1529 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1784 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1530 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1785 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1531 1786
1532 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1787 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1533 } 1788 }
1534} 1789}
1535 1790
1536static void noinline 1791static void noinline
1537array_verify (EV_P_ W *ws, int cnt) 1792array_verify (EV_P_ W *ws, int cnt)
1538{ 1793{
1539 while (cnt--) 1794 while (cnt--)
1540 { 1795 {
1541 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1796 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1542 verify_watcher (EV_A_ ws [cnt]); 1797 verify_watcher (EV_A_ ws [cnt]);
1543 } 1798 }
1544} 1799}
1545#endif 1800#endif
1546 1801
1802#if EV_MINIMAL < 2
1547void 1803void
1548ev_loop_verify (EV_P) 1804ev_loop_verify (EV_P)
1549{ 1805{
1550#if EV_VERIFY 1806#if EV_VERIFY
1551 int i; 1807 int i;
1553 1809
1554 assert (activecnt >= -1); 1810 assert (activecnt >= -1);
1555 1811
1556 assert (fdchangemax >= fdchangecnt); 1812 assert (fdchangemax >= fdchangecnt);
1557 for (i = 0; i < fdchangecnt; ++i) 1813 for (i = 0; i < fdchangecnt; ++i)
1558 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1814 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1559 1815
1560 assert (anfdmax >= 0); 1816 assert (anfdmax >= 0);
1561 for (i = 0; i < anfdmax; ++i) 1817 for (i = 0; i < anfdmax; ++i)
1562 for (w = anfds [i].head; w; w = w->next) 1818 for (w = anfds [i].head; w; w = w->next)
1563 { 1819 {
1564 verify_watcher (EV_A_ (W)w); 1820 verify_watcher (EV_A_ (W)w);
1565 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1821 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1566 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1822 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1567 } 1823 }
1568 1824
1569 assert (timermax >= timercnt); 1825 assert (timermax >= timercnt);
1570 verify_heap (EV_A_ timers, timercnt); 1826 verify_heap (EV_A_ timers, timercnt);
1571 1827
1600 assert (checkmax >= checkcnt); 1856 assert (checkmax >= checkcnt);
1601 array_verify (EV_A_ (W *)checks, checkcnt); 1857 array_verify (EV_A_ (W *)checks, checkcnt);
1602 1858
1603# if 0 1859# if 0
1604 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1860 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1605 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1861 for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig)
1606# endif 1862# endif
1607#endif 1863#endif
1608} 1864}
1609 1865#endif
1610#endif /* multiplicity */
1611 1866
1612#if EV_MULTIPLICITY 1867#if EV_MULTIPLICITY
1613struct ev_loop * 1868struct ev_loop *
1614ev_default_loop_init (unsigned int flags) 1869ev_default_loop_init (unsigned int flags)
1615#else 1870#else
1618#endif 1873#endif
1619{ 1874{
1620 if (!ev_default_loop_ptr) 1875 if (!ev_default_loop_ptr)
1621 { 1876 {
1622#if EV_MULTIPLICITY 1877#if EV_MULTIPLICITY
1623 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1878 EV_P = ev_default_loop_ptr = &default_loop_struct;
1624#else 1879#else
1625 ev_default_loop_ptr = 1; 1880 ev_default_loop_ptr = 1;
1626#endif 1881#endif
1627 1882
1628 loop_init (EV_A_ flags); 1883 loop_init (EV_A_ flags);
1645 1900
1646void 1901void
1647ev_default_destroy (void) 1902ev_default_destroy (void)
1648{ 1903{
1649#if EV_MULTIPLICITY 1904#if EV_MULTIPLICITY
1650 struct ev_loop *loop = ev_default_loop_ptr; 1905 EV_P = ev_default_loop_ptr;
1651#endif 1906#endif
1907
1908 ev_default_loop_ptr = 0;
1652 1909
1653#ifndef _WIN32 1910#ifndef _WIN32
1654 ev_ref (EV_A); /* child watcher */ 1911 ev_ref (EV_A); /* child watcher */
1655 ev_signal_stop (EV_A_ &childev); 1912 ev_signal_stop (EV_A_ &childev);
1656#endif 1913#endif
1660 1917
1661void 1918void
1662ev_default_fork (void) 1919ev_default_fork (void)
1663{ 1920{
1664#if EV_MULTIPLICITY 1921#if EV_MULTIPLICITY
1665 struct ev_loop *loop = ev_default_loop_ptr; 1922 EV_P = ev_default_loop_ptr;
1666#endif 1923#endif
1667 1924
1668 if (backend)
1669 postfork = 1; /* must be in line with ev_loop_fork */ 1925 postfork = 1; /* must be in line with ev_loop_fork */
1670} 1926}
1671 1927
1672/*****************************************************************************/ 1928/*****************************************************************************/
1673 1929
1674void 1930void
1675ev_invoke (EV_P_ void *w, int revents) 1931ev_invoke (EV_P_ void *w, int revents)
1676{ 1932{
1677 EV_CB_INVOKE ((W)w, revents); 1933 EV_CB_INVOKE ((W)w, revents);
1678} 1934}
1679 1935
1680void inline_speed 1936unsigned int
1681call_pending (EV_P) 1937ev_pending_count (EV_P)
1938{
1939 int pri;
1940 unsigned int count = 0;
1941
1942 for (pri = NUMPRI; pri--; )
1943 count += pendingcnt [pri];
1944
1945 return count;
1946}
1947
1948void noinline
1949ev_invoke_pending (EV_P)
1682{ 1950{
1683 int pri; 1951 int pri;
1684 1952
1685 for (pri = NUMPRI; pri--; ) 1953 for (pri = NUMPRI; pri--; )
1686 while (pendingcnt [pri]) 1954 while (pendingcnt [pri])
1687 { 1955 {
1688 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1956 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1689 1957
1690 if (expect_true (p->w))
1691 {
1692 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1958 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1959 /* ^ this is no longer true, as pending_w could be here */
1693 1960
1694 p->w->pending = 0; 1961 p->w->pending = 0;
1695 EV_CB_INVOKE (p->w, p->events); 1962 EV_CB_INVOKE (p->w, p->events);
1696 EV_FREQUENT_CHECK; 1963 EV_FREQUENT_CHECK;
1697 }
1698 } 1964 }
1699} 1965}
1700 1966
1701#if EV_IDLE_ENABLE 1967#if EV_IDLE_ENABLE
1702void inline_size 1968/* make idle watchers pending. this handles the "call-idle */
1969/* only when higher priorities are idle" logic */
1970inline_size void
1703idle_reify (EV_P) 1971idle_reify (EV_P)
1704{ 1972{
1705 if (expect_false (idleall)) 1973 if (expect_false (idleall))
1706 { 1974 {
1707 int pri; 1975 int pri;
1719 } 1987 }
1720 } 1988 }
1721} 1989}
1722#endif 1990#endif
1723 1991
1724void inline_size 1992/* make timers pending */
1993inline_size void
1725timers_reify (EV_P) 1994timers_reify (EV_P)
1726{ 1995{
1727 EV_FREQUENT_CHECK; 1996 EV_FREQUENT_CHECK;
1728 1997
1729 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1998 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1730 { 1999 {
1731 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 2000 do
1732
1733 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1734
1735 /* first reschedule or stop timer */
1736 if (w->repeat)
1737 { 2001 {
2002 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2003
2004 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2005
2006 /* first reschedule or stop timer */
2007 if (w->repeat)
2008 {
1738 ev_at (w) += w->repeat; 2009 ev_at (w) += w->repeat;
1739 if (ev_at (w) < mn_now) 2010 if (ev_at (w) < mn_now)
1740 ev_at (w) = mn_now; 2011 ev_at (w) = mn_now;
1741 2012
1742 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 2013 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1743 2014
1744 ANHE_at_cache (timers [HEAP0]); 2015 ANHE_at_cache (timers [HEAP0]);
1745 downheap (timers, timercnt, HEAP0); 2016 downheap (timers, timercnt, HEAP0);
2017 }
2018 else
2019 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2020
2021 EV_FREQUENT_CHECK;
2022 feed_reverse (EV_A_ (W)w);
1746 } 2023 }
1747 else 2024 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1748 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1749 2025
1750 EV_FREQUENT_CHECK;
1751 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 2026 feed_reverse_done (EV_A_ EV_TIMEOUT);
1752 } 2027 }
1753} 2028}
1754 2029
1755#if EV_PERIODIC_ENABLE 2030#if EV_PERIODIC_ENABLE
1756void inline_size 2031/* make periodics pending */
2032inline_size void
1757periodics_reify (EV_P) 2033periodics_reify (EV_P)
1758{ 2034{
1759 EV_FREQUENT_CHECK; 2035 EV_FREQUENT_CHECK;
1760 2036
1761 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 2037 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1762 { 2038 {
1763 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 2039 int feed_count = 0;
1764 2040
1765 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 2041 do
1766
1767 /* first reschedule or stop timer */
1768 if (w->reschedule_cb)
1769 { 2042 {
2043 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2044
2045 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2046
2047 /* first reschedule or stop timer */
2048 if (w->reschedule_cb)
2049 {
1770 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2050 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1771 2051
1772 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 2052 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1773 2053
1774 ANHE_at_cache (periodics [HEAP0]); 2054 ANHE_at_cache (periodics [HEAP0]);
1775 downheap (periodics, periodiccnt, HEAP0); 2055 downheap (periodics, periodiccnt, HEAP0);
2056 }
2057 else if (w->interval)
2058 {
2059 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2060 /* if next trigger time is not sufficiently in the future, put it there */
2061 /* this might happen because of floating point inexactness */
2062 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2063 {
2064 ev_at (w) += w->interval;
2065
2066 /* if interval is unreasonably low we might still have a time in the past */
2067 /* so correct this. this will make the periodic very inexact, but the user */
2068 /* has effectively asked to get triggered more often than possible */
2069 if (ev_at (w) < ev_rt_now)
2070 ev_at (w) = ev_rt_now;
2071 }
2072
2073 ANHE_at_cache (periodics [HEAP0]);
2074 downheap (periodics, periodiccnt, HEAP0);
2075 }
2076 else
2077 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2078
2079 EV_FREQUENT_CHECK;
2080 feed_reverse (EV_A_ (W)w);
1776 } 2081 }
1777 else if (w->interval) 2082 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1778 {
1779 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1780 /* if next trigger time is not sufficiently in the future, put it there */
1781 /* this might happen because of floating point inexactness */
1782 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1783 {
1784 ev_at (w) += w->interval;
1785 2083
1786 /* if interval is unreasonably low we might still have a time in the past */
1787 /* so correct this. this will make the periodic very inexact, but the user */
1788 /* has effectively asked to get triggered more often than possible */
1789 if (ev_at (w) < ev_rt_now)
1790 ev_at (w) = ev_rt_now;
1791 }
1792
1793 ANHE_at_cache (periodics [HEAP0]);
1794 downheap (periodics, periodiccnt, HEAP0);
1795 }
1796 else
1797 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1798
1799 EV_FREQUENT_CHECK;
1800 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 2084 feed_reverse_done (EV_A_ EV_PERIODIC);
1801 } 2085 }
1802} 2086}
1803 2087
2088/* simply recalculate all periodics */
2089/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1804static void noinline 2090static void noinline
1805periodics_reschedule (EV_P) 2091periodics_reschedule (EV_P)
1806{ 2092{
1807 int i; 2093 int i;
1808 2094
1821 2107
1822 reheap (periodics, periodiccnt); 2108 reheap (periodics, periodiccnt);
1823} 2109}
1824#endif 2110#endif
1825 2111
1826void inline_speed 2112/* adjust all timers by a given offset */
2113static void noinline
2114timers_reschedule (EV_P_ ev_tstamp adjust)
2115{
2116 int i;
2117
2118 for (i = 0; i < timercnt; ++i)
2119 {
2120 ANHE *he = timers + i + HEAP0;
2121 ANHE_w (*he)->at += adjust;
2122 ANHE_at_cache (*he);
2123 }
2124}
2125
2126/* fetch new monotonic and realtime times from the kernel */
2127/* also detetc if there was a timejump, and act accordingly */
2128inline_speed void
1827time_update (EV_P_ ev_tstamp max_block) 2129time_update (EV_P_ ev_tstamp max_block)
1828{ 2130{
1829 int i;
1830
1831#if EV_USE_MONOTONIC 2131#if EV_USE_MONOTONIC
1832 if (expect_true (have_monotonic)) 2132 if (expect_true (have_monotonic))
1833 { 2133 {
2134 int i;
1834 ev_tstamp odiff = rtmn_diff; 2135 ev_tstamp odiff = rtmn_diff;
1835 2136
1836 mn_now = get_clock (); 2137 mn_now = get_clock ();
1837 2138
1838 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2139 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1864 ev_rt_now = ev_time (); 2165 ev_rt_now = ev_time ();
1865 mn_now = get_clock (); 2166 mn_now = get_clock ();
1866 now_floor = mn_now; 2167 now_floor = mn_now;
1867 } 2168 }
1868 2169
2170 /* no timer adjustment, as the monotonic clock doesn't jump */
2171 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1869# if EV_PERIODIC_ENABLE 2172# if EV_PERIODIC_ENABLE
1870 periodics_reschedule (EV_A); 2173 periodics_reschedule (EV_A);
1871# endif 2174# endif
1872 /* no timer adjustment, as the monotonic clock doesn't jump */
1873 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1874 } 2175 }
1875 else 2176 else
1876#endif 2177#endif
1877 { 2178 {
1878 ev_rt_now = ev_time (); 2179 ev_rt_now = ev_time ();
1879 2180
1880 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2181 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1881 { 2182 {
2183 /* adjust timers. this is easy, as the offset is the same for all of them */
2184 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1882#if EV_PERIODIC_ENABLE 2185#if EV_PERIODIC_ENABLE
1883 periodics_reschedule (EV_A); 2186 periodics_reschedule (EV_A);
1884#endif 2187#endif
1885 /* adjust timers. this is easy, as the offset is the same for all of them */
1886 for (i = 0; i < timercnt; ++i)
1887 {
1888 ANHE *he = timers + i + HEAP0;
1889 ANHE_w (*he)->at += ev_rt_now - mn_now;
1890 ANHE_at_cache (*he);
1891 }
1892 } 2188 }
1893 2189
1894 mn_now = ev_rt_now; 2190 mn_now = ev_rt_now;
1895 } 2191 }
1896} 2192}
1897 2193
1898void 2194void
1899ev_ref (EV_P)
1900{
1901 ++activecnt;
1902}
1903
1904void
1905ev_unref (EV_P)
1906{
1907 --activecnt;
1908}
1909
1910static int loop_done;
1911
1912void
1913ev_loop (EV_P_ int flags) 2195ev_loop (EV_P_ int flags)
1914{ 2196{
2197#if EV_MINIMAL < 2
2198 ++loop_depth;
2199#endif
2200
2201 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2202
1915 loop_done = EVUNLOOP_CANCEL; 2203 loop_done = EVUNLOOP_CANCEL;
1916 2204
1917 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2205 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1918 2206
1919 do 2207 do
1920 { 2208 {
1921#if EV_VERIFY >= 2 2209#if EV_VERIFY >= 2
1922 ev_loop_verify (EV_A); 2210 ev_loop_verify (EV_A);
1935 /* we might have forked, so queue fork handlers */ 2223 /* we might have forked, so queue fork handlers */
1936 if (expect_false (postfork)) 2224 if (expect_false (postfork))
1937 if (forkcnt) 2225 if (forkcnt)
1938 { 2226 {
1939 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2227 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1940 call_pending (EV_A); 2228 EV_INVOKE_PENDING;
1941 } 2229 }
1942#endif 2230#endif
1943 2231
1944 /* queue prepare watchers (and execute them) */ 2232 /* queue prepare watchers (and execute them) */
1945 if (expect_false (preparecnt)) 2233 if (expect_false (preparecnt))
1946 { 2234 {
1947 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2235 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1948 call_pending (EV_A); 2236 EV_INVOKE_PENDING;
1949 } 2237 }
1950 2238
1951 if (expect_false (!activecnt)) 2239 if (expect_false (loop_done))
1952 break; 2240 break;
1953 2241
1954 /* we might have forked, so reify kernel state if necessary */ 2242 /* we might have forked, so reify kernel state if necessary */
1955 if (expect_false (postfork)) 2243 if (expect_false (postfork))
1956 loop_fork (EV_A); 2244 loop_fork (EV_A);
1963 ev_tstamp waittime = 0.; 2251 ev_tstamp waittime = 0.;
1964 ev_tstamp sleeptime = 0.; 2252 ev_tstamp sleeptime = 0.;
1965 2253
1966 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2254 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1967 { 2255 {
2256 /* remember old timestamp for io_blocktime calculation */
2257 ev_tstamp prev_mn_now = mn_now;
2258
1968 /* update time to cancel out callback processing overhead */ 2259 /* update time to cancel out callback processing overhead */
1969 time_update (EV_A_ 1e100); 2260 time_update (EV_A_ 1e100);
1970 2261
1971 waittime = MAX_BLOCKTIME; 2262 waittime = MAX_BLOCKTIME;
1972 2263
1982 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2273 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1983 if (waittime > to) waittime = to; 2274 if (waittime > to) waittime = to;
1984 } 2275 }
1985#endif 2276#endif
1986 2277
2278 /* don't let timeouts decrease the waittime below timeout_blocktime */
1987 if (expect_false (waittime < timeout_blocktime)) 2279 if (expect_false (waittime < timeout_blocktime))
1988 waittime = timeout_blocktime; 2280 waittime = timeout_blocktime;
1989 2281
1990 sleeptime = waittime - backend_fudge; 2282 /* extra check because io_blocktime is commonly 0 */
1991
1992 if (expect_true (sleeptime > io_blocktime)) 2283 if (expect_false (io_blocktime))
1993 sleeptime = io_blocktime;
1994
1995 if (sleeptime)
1996 { 2284 {
2285 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2286
2287 if (sleeptime > waittime - backend_fudge)
2288 sleeptime = waittime - backend_fudge;
2289
2290 if (expect_true (sleeptime > 0.))
2291 {
1997 ev_sleep (sleeptime); 2292 ev_sleep (sleeptime);
1998 waittime -= sleeptime; 2293 waittime -= sleeptime;
2294 }
1999 } 2295 }
2000 } 2296 }
2001 2297
2298#if EV_MINIMAL < 2
2002 ++loop_count; 2299 ++loop_count;
2300#endif
2301 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2003 backend_poll (EV_A_ waittime); 2302 backend_poll (EV_A_ waittime);
2303 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2004 2304
2005 /* update ev_rt_now, do magic */ 2305 /* update ev_rt_now, do magic */
2006 time_update (EV_A_ waittime + sleeptime); 2306 time_update (EV_A_ waittime + sleeptime);
2007 } 2307 }
2008 2308
2019 2319
2020 /* queue check watchers, to be executed first */ 2320 /* queue check watchers, to be executed first */
2021 if (expect_false (checkcnt)) 2321 if (expect_false (checkcnt))
2022 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2322 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2023 2323
2024 call_pending (EV_A); 2324 EV_INVOKE_PENDING;
2025 } 2325 }
2026 while (expect_true ( 2326 while (expect_true (
2027 activecnt 2327 activecnt
2028 && !loop_done 2328 && !loop_done
2029 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2329 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2030 )); 2330 ));
2031 2331
2032 if (loop_done == EVUNLOOP_ONE) 2332 if (loop_done == EVUNLOOP_ONE)
2033 loop_done = EVUNLOOP_CANCEL; 2333 loop_done = EVUNLOOP_CANCEL;
2334
2335#if EV_MINIMAL < 2
2336 --loop_depth;
2337#endif
2034} 2338}
2035 2339
2036void 2340void
2037ev_unloop (EV_P_ int how) 2341ev_unloop (EV_P_ int how)
2038{ 2342{
2039 loop_done = how; 2343 loop_done = how;
2040} 2344}
2041 2345
2346void
2347ev_ref (EV_P)
2348{
2349 ++activecnt;
2350}
2351
2352void
2353ev_unref (EV_P)
2354{
2355 --activecnt;
2356}
2357
2358void
2359ev_now_update (EV_P)
2360{
2361 time_update (EV_A_ 1e100);
2362}
2363
2364void
2365ev_suspend (EV_P)
2366{
2367 ev_now_update (EV_A);
2368}
2369
2370void
2371ev_resume (EV_P)
2372{
2373 ev_tstamp mn_prev = mn_now;
2374
2375 ev_now_update (EV_A);
2376 timers_reschedule (EV_A_ mn_now - mn_prev);
2377#if EV_PERIODIC_ENABLE
2378 /* TODO: really do this? */
2379 periodics_reschedule (EV_A);
2380#endif
2381}
2382
2042/*****************************************************************************/ 2383/*****************************************************************************/
2384/* singly-linked list management, used when the expected list length is short */
2043 2385
2044void inline_size 2386inline_size void
2045wlist_add (WL *head, WL elem) 2387wlist_add (WL *head, WL elem)
2046{ 2388{
2047 elem->next = *head; 2389 elem->next = *head;
2048 *head = elem; 2390 *head = elem;
2049} 2391}
2050 2392
2051void inline_size 2393inline_size void
2052wlist_del (WL *head, WL elem) 2394wlist_del (WL *head, WL elem)
2053{ 2395{
2054 while (*head) 2396 while (*head)
2055 { 2397 {
2056 if (*head == elem) 2398 if (*head == elem)
2061 2403
2062 head = &(*head)->next; 2404 head = &(*head)->next;
2063 } 2405 }
2064} 2406}
2065 2407
2066void inline_speed 2408/* internal, faster, version of ev_clear_pending */
2409inline_speed void
2067clear_pending (EV_P_ W w) 2410clear_pending (EV_P_ W w)
2068{ 2411{
2069 if (w->pending) 2412 if (w->pending)
2070 { 2413 {
2071 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2414 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2072 w->pending = 0; 2415 w->pending = 0;
2073 } 2416 }
2074} 2417}
2075 2418
2076int 2419int
2080 int pending = w_->pending; 2423 int pending = w_->pending;
2081 2424
2082 if (expect_true (pending)) 2425 if (expect_true (pending))
2083 { 2426 {
2084 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2427 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2428 p->w = (W)&pending_w;
2085 w_->pending = 0; 2429 w_->pending = 0;
2086 p->w = 0;
2087 return p->events; 2430 return p->events;
2088 } 2431 }
2089 else 2432 else
2090 return 0; 2433 return 0;
2091} 2434}
2092 2435
2093void inline_size 2436inline_size void
2094pri_adjust (EV_P_ W w) 2437pri_adjust (EV_P_ W w)
2095{ 2438{
2096 int pri = w->priority; 2439 int pri = ev_priority (w);
2097 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2440 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2098 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2441 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2099 w->priority = pri; 2442 ev_set_priority (w, pri);
2100} 2443}
2101 2444
2102void inline_speed 2445inline_speed void
2103ev_start (EV_P_ W w, int active) 2446ev_start (EV_P_ W w, int active)
2104{ 2447{
2105 pri_adjust (EV_A_ w); 2448 pri_adjust (EV_A_ w);
2106 w->active = active; 2449 w->active = active;
2107 ev_ref (EV_A); 2450 ev_ref (EV_A);
2108} 2451}
2109 2452
2110void inline_size 2453inline_size void
2111ev_stop (EV_P_ W w) 2454ev_stop (EV_P_ W w)
2112{ 2455{
2113 ev_unref (EV_A); 2456 ev_unref (EV_A);
2114 w->active = 0; 2457 w->active = 0;
2115} 2458}
2122 int fd = w->fd; 2465 int fd = w->fd;
2123 2466
2124 if (expect_false (ev_is_active (w))) 2467 if (expect_false (ev_is_active (w)))
2125 return; 2468 return;
2126 2469
2127 assert (("ev_io_start called with negative fd", fd >= 0)); 2470 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2128 2472
2129 EV_FREQUENT_CHECK; 2473 EV_FREQUENT_CHECK;
2130 2474
2131 ev_start (EV_A_ (W)w, 1); 2475 ev_start (EV_A_ (W)w, 1);
2132 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2476 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133 wlist_add (&anfds[fd].head, (WL)w); 2477 wlist_add (&anfds[fd].head, (WL)w);
2134 2478
2135 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2479 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2136 w->events &= ~EV_IOFDSET; 2480 w->events &= ~EV__IOFDSET;
2137 2481
2138 EV_FREQUENT_CHECK; 2482 EV_FREQUENT_CHECK;
2139} 2483}
2140 2484
2141void noinline 2485void noinline
2143{ 2487{
2144 clear_pending (EV_A_ (W)w); 2488 clear_pending (EV_A_ (W)w);
2145 if (expect_false (!ev_is_active (w))) 2489 if (expect_false (!ev_is_active (w)))
2146 return; 2490 return;
2147 2491
2148 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2492 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2149 2493
2150 EV_FREQUENT_CHECK; 2494 EV_FREQUENT_CHECK;
2151 2495
2152 wlist_del (&anfds[w->fd].head, (WL)w); 2496 wlist_del (&anfds[w->fd].head, (WL)w);
2153 ev_stop (EV_A_ (W)w); 2497 ev_stop (EV_A_ (W)w);
2163 if (expect_false (ev_is_active (w))) 2507 if (expect_false (ev_is_active (w)))
2164 return; 2508 return;
2165 2509
2166 ev_at (w) += mn_now; 2510 ev_at (w) += mn_now;
2167 2511
2168 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2512 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2169 2513
2170 EV_FREQUENT_CHECK; 2514 EV_FREQUENT_CHECK;
2171 2515
2172 ++timercnt; 2516 ++timercnt;
2173 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2517 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2176 ANHE_at_cache (timers [ev_active (w)]); 2520 ANHE_at_cache (timers [ev_active (w)]);
2177 upheap (timers, ev_active (w)); 2521 upheap (timers, ev_active (w));
2178 2522
2179 EV_FREQUENT_CHECK; 2523 EV_FREQUENT_CHECK;
2180 2524
2181 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2525 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2182} 2526}
2183 2527
2184void noinline 2528void noinline
2185ev_timer_stop (EV_P_ ev_timer *w) 2529ev_timer_stop (EV_P_ ev_timer *w)
2186{ 2530{
2191 EV_FREQUENT_CHECK; 2535 EV_FREQUENT_CHECK;
2192 2536
2193 { 2537 {
2194 int active = ev_active (w); 2538 int active = ev_active (w);
2195 2539
2196 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2540 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2197 2541
2198 --timercnt; 2542 --timercnt;
2199 2543
2200 if (expect_true (active < timercnt + HEAP0)) 2544 if (expect_true (active < timercnt + HEAP0))
2201 { 2545 {
2234 } 2578 }
2235 2579
2236 EV_FREQUENT_CHECK; 2580 EV_FREQUENT_CHECK;
2237} 2581}
2238 2582
2583ev_tstamp
2584ev_timer_remaining (EV_P_ ev_timer *w)
2585{
2586 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2587}
2588
2239#if EV_PERIODIC_ENABLE 2589#if EV_PERIODIC_ENABLE
2240void noinline 2590void noinline
2241ev_periodic_start (EV_P_ ev_periodic *w) 2591ev_periodic_start (EV_P_ ev_periodic *w)
2242{ 2592{
2243 if (expect_false (ev_is_active (w))) 2593 if (expect_false (ev_is_active (w)))
2245 2595
2246 if (w->reschedule_cb) 2596 if (w->reschedule_cb)
2247 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2597 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2248 else if (w->interval) 2598 else if (w->interval)
2249 { 2599 {
2250 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2600 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2251 /* this formula differs from the one in periodic_reify because we do not always round up */ 2601 /* this formula differs from the one in periodic_reify because we do not always round up */
2252 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2602 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2253 } 2603 }
2254 else 2604 else
2255 ev_at (w) = w->offset; 2605 ev_at (w) = w->offset;
2263 ANHE_at_cache (periodics [ev_active (w)]); 2613 ANHE_at_cache (periodics [ev_active (w)]);
2264 upheap (periodics, ev_active (w)); 2614 upheap (periodics, ev_active (w));
2265 2615
2266 EV_FREQUENT_CHECK; 2616 EV_FREQUENT_CHECK;
2267 2617
2268 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2618 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2269} 2619}
2270 2620
2271void noinline 2621void noinline
2272ev_periodic_stop (EV_P_ ev_periodic *w) 2622ev_periodic_stop (EV_P_ ev_periodic *w)
2273{ 2623{
2278 EV_FREQUENT_CHECK; 2628 EV_FREQUENT_CHECK;
2279 2629
2280 { 2630 {
2281 int active = ev_active (w); 2631 int active = ev_active (w);
2282 2632
2283 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2633 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2284 2634
2285 --periodiccnt; 2635 --periodiccnt;
2286 2636
2287 if (expect_true (active < periodiccnt + HEAP0)) 2637 if (expect_true (active < periodiccnt + HEAP0))
2288 { 2638 {
2310#endif 2660#endif
2311 2661
2312void noinline 2662void noinline
2313ev_signal_start (EV_P_ ev_signal *w) 2663ev_signal_start (EV_P_ ev_signal *w)
2314{ 2664{
2315#if EV_MULTIPLICITY
2316 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2317#endif
2318 if (expect_false (ev_is_active (w))) 2665 if (expect_false (ev_is_active (w)))
2319 return; 2666 return;
2320 2667
2321 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2668 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2322 2669
2323 evpipe_init (EV_A); 2670#if EV_MULTIPLICITY
2671 assert (("libev: tried to attach to a signal from two different loops",
2672 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2324 2673
2325 EV_FREQUENT_CHECK; 2674 signals [w->signum - 1].loop = EV_A;
2675#endif
2326 2676
2677 EV_FREQUENT_CHECK;
2678
2679#if EV_USE_SIGNALFD
2680 if (sigfd == -2)
2327 { 2681 {
2328#ifndef _WIN32 2682 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2329 sigset_t full, prev; 2683 if (sigfd < 0 && errno == EINVAL)
2330 sigfillset (&full); 2684 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2331 sigprocmask (SIG_SETMASK, &full, &prev);
2332#endif
2333 2685
2334 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2686 if (sigfd >= 0)
2687 {
2688 fd_intern (sigfd); /* doing it twice will not hurt */
2335 2689
2336#ifndef _WIN32 2690 sigemptyset (&sigfd_set);
2337 sigprocmask (SIG_SETMASK, &prev, 0); 2691
2338#endif 2692 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2693 ev_set_priority (&sigfd_w, EV_MAXPRI);
2694 ev_io_start (EV_A_ &sigfd_w);
2695 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2696 }
2339 } 2697 }
2698
2699 if (sigfd >= 0)
2700 {
2701 /* TODO: check .head */
2702 sigaddset (&sigfd_set, w->signum);
2703 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2704
2705 signalfd (sigfd, &sigfd_set, 0);
2706 }
2707#endif
2340 2708
2341 ev_start (EV_A_ (W)w, 1); 2709 ev_start (EV_A_ (W)w, 1);
2342 wlist_add (&signals [w->signum - 1].head, (WL)w); 2710 wlist_add (&signals [w->signum - 1].head, (WL)w);
2343 2711
2344 if (!((WL)w)->next) 2712 if (!((WL)w)->next)
2713# if EV_USE_SIGNALFD
2714 if (sigfd < 0) /*TODO*/
2715# endif
2345 { 2716 {
2346#if _WIN32 2717# if _WIN32
2347 signal (w->signum, ev_sighandler); 2718 signal (w->signum, ev_sighandler);
2348#else 2719# else
2349 struct sigaction sa; 2720 struct sigaction sa;
2721
2722 evpipe_init (EV_A);
2723
2350 sa.sa_handler = ev_sighandler; 2724 sa.sa_handler = ev_sighandler;
2351 sigfillset (&sa.sa_mask); 2725 sigfillset (&sa.sa_mask);
2352 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2726 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2353 sigaction (w->signum, &sa, 0); 2727 sigaction (w->signum, &sa, 0);
2728
2729 sigemptyset (&sa.sa_mask);
2730 sigaddset (&sa.sa_mask, w->signum);
2731 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2354#endif 2732#endif
2355 } 2733 }
2356 2734
2357 EV_FREQUENT_CHECK; 2735 EV_FREQUENT_CHECK;
2358} 2736}
2359 2737
2360void noinline 2738void noinline
2368 2746
2369 wlist_del (&signals [w->signum - 1].head, (WL)w); 2747 wlist_del (&signals [w->signum - 1].head, (WL)w);
2370 ev_stop (EV_A_ (W)w); 2748 ev_stop (EV_A_ (W)w);
2371 2749
2372 if (!signals [w->signum - 1].head) 2750 if (!signals [w->signum - 1].head)
2751 {
2752 #if EV_MULTIPLICITY
2753 signals [w->signum - 1].loop = 0; /* unattach from signal */
2754 #endif
2755 #if EV_USE_SIGNALFD
2756 if (sigfd >= 0)
2757 {
2758 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2759 sigdelset (&sigfd_set, w->signum);
2760 signalfd (sigfd, &sigfd_set, 0);
2761 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2762 /*TODO: maybe unblock signal? */
2763 }
2764 else
2765 #endif
2373 signal (w->signum, SIG_DFL); 2766 signal (w->signum, SIG_DFL);
2767 }
2374 2768
2375 EV_FREQUENT_CHECK; 2769 EV_FREQUENT_CHECK;
2376} 2770}
2377 2771
2378void 2772void
2379ev_child_start (EV_P_ ev_child *w) 2773ev_child_start (EV_P_ ev_child *w)
2380{ 2774{
2381#if EV_MULTIPLICITY 2775#if EV_MULTIPLICITY
2382 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2776 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2383#endif 2777#endif
2384 if (expect_false (ev_is_active (w))) 2778 if (expect_false (ev_is_active (w)))
2385 return; 2779 return;
2386 2780
2387 EV_FREQUENT_CHECK; 2781 EV_FREQUENT_CHECK;
2412# ifdef _WIN32 2806# ifdef _WIN32
2413# undef lstat 2807# undef lstat
2414# define lstat(a,b) _stati64 (a,b) 2808# define lstat(a,b) _stati64 (a,b)
2415# endif 2809# endif
2416 2810
2417#define DEF_STAT_INTERVAL 5.0074891 2811#define DEF_STAT_INTERVAL 5.0074891
2812#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2418#define MIN_STAT_INTERVAL 0.1074891 2813#define MIN_STAT_INTERVAL 0.1074891
2419 2814
2420static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2815static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2421 2816
2422#if EV_USE_INOTIFY 2817#if EV_USE_INOTIFY
2423# define EV_INOTIFY_BUFSIZE 8192 2818# define EV_INOTIFY_BUFSIZE 8192
2427{ 2822{
2428 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); 2823 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);
2429 2824
2430 if (w->wd < 0) 2825 if (w->wd < 0)
2431 { 2826 {
2827 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2432 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2828 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2433 2829
2434 /* monitor some parent directory for speedup hints */ 2830 /* monitor some parent directory for speedup hints */
2435 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2831 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2436 /* but an efficiency issue only */ 2832 /* but an efficiency issue only */
2437 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2833 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2438 { 2834 {
2439 char path [4096]; 2835 char path [4096];
2440 strcpy (path, w->path); 2836 strcpy (path, w->path);
2444 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2840 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2445 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2841 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2446 2842
2447 char *pend = strrchr (path, '/'); 2843 char *pend = strrchr (path, '/');
2448 2844
2449 if (!pend) 2845 if (!pend || pend == path)
2450 break; /* whoops, no '/', complain to your admin */ 2846 break;
2451 2847
2452 *pend = 0; 2848 *pend = 0;
2453 w->wd = inotify_add_watch (fs_fd, path, mask); 2849 w->wd = inotify_add_watch (fs_fd, path, mask);
2454 } 2850 }
2455 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2851 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2456 } 2852 }
2457 } 2853 }
2458 else
2459 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2460 2854
2461 if (w->wd >= 0) 2855 if (w->wd >= 0)
2856 {
2462 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2858
2859 /* now local changes will be tracked by inotify, but remote changes won't */
2860 /* unless the filesystem it known to be local, we therefore still poll */
2861 /* also do poll on <2.6.25, but with normal frequency */
2862 struct statfs sfs;
2863
2864 if (fs_2625 && !statfs (w->path, &sfs))
2865 if (sfs.f_type == 0x1373 /* devfs */
2866 || sfs.f_type == 0xEF53 /* ext2/3 */
2867 || sfs.f_type == 0x3153464a /* jfs */
2868 || sfs.f_type == 0x52654973 /* reiser3 */
2869 || sfs.f_type == 0x01021994 /* tempfs */
2870 || sfs.f_type == 0x58465342 /* xfs */)
2871 return;
2872
2873 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874 ev_timer_again (EV_A_ &w->timer);
2875 }
2463} 2876}
2464 2877
2465static void noinline 2878static void noinline
2466infy_del (EV_P_ ev_stat *w) 2879infy_del (EV_P_ ev_stat *w)
2467{ 2880{
2481 2894
2482static void noinline 2895static void noinline
2483infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2896infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484{ 2897{
2485 if (slot < 0) 2898 if (slot < 0)
2486 /* overflow, need to check for all hahs slots */ 2899 /* overflow, need to check for all hash slots */
2487 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2900 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488 infy_wd (EV_A_ slot, wd, ev); 2901 infy_wd (EV_A_ slot, wd, ev);
2489 else 2902 else
2490 { 2903 {
2491 WL w_; 2904 WL w_;
2497 2910
2498 if (w->wd == wd || wd == -1) 2911 if (w->wd == wd || wd == -1)
2499 { 2912 {
2500 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2913 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2501 { 2914 {
2915 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2502 w->wd = -1; 2916 w->wd = -1;
2503 infy_add (EV_A_ w); /* re-add, no matter what */ 2917 infy_add (EV_A_ w); /* re-add, no matter what */
2504 } 2918 }
2505 2919
2506 stat_timer_cb (EV_A_ &w->timer, 0); 2920 stat_timer_cb (EV_A_ &w->timer, 0);
2519 2933
2520 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2934 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2521 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2935 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2522} 2936}
2523 2937
2524void inline_size 2938inline_size void
2939check_2625 (EV_P)
2940{
2941 /* kernels < 2.6.25 are borked
2942 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943 */
2944 struct utsname buf;
2945 int major, minor, micro;
2946
2947 if (uname (&buf))
2948 return;
2949
2950 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2951 return;
2952
2953 if (major < 2
2954 || (major == 2 && minor < 6)
2955 || (major == 2 && minor == 6 && micro < 25))
2956 return;
2957
2958 fs_2625 = 1;
2959}
2960
2961inline_size void
2525infy_init (EV_P) 2962infy_init (EV_P)
2526{ 2963{
2527 if (fs_fd != -2) 2964 if (fs_fd != -2)
2528 return; 2965 return;
2966
2967 fs_fd = -1;
2968
2969 check_2625 (EV_A);
2529 2970
2530 fs_fd = inotify_init (); 2971 fs_fd = inotify_init ();
2531 2972
2532 if (fs_fd >= 0) 2973 if (fs_fd >= 0)
2533 { 2974 {
2535 ev_set_priority (&fs_w, EV_MAXPRI); 2976 ev_set_priority (&fs_w, EV_MAXPRI);
2536 ev_io_start (EV_A_ &fs_w); 2977 ev_io_start (EV_A_ &fs_w);
2537 } 2978 }
2538} 2979}
2539 2980
2540void inline_size 2981inline_size void
2541infy_fork (EV_P) 2982infy_fork (EV_P)
2542{ 2983{
2543 int slot; 2984 int slot;
2544 2985
2545 if (fs_fd < 0) 2986 if (fs_fd < 0)
2561 w->wd = -1; 3002 w->wd = -1;
2562 3003
2563 if (fs_fd >= 0) 3004 if (fs_fd >= 0)
2564 infy_add (EV_A_ w); /* re-add, no matter what */ 3005 infy_add (EV_A_ w); /* re-add, no matter what */
2565 else 3006 else
2566 ev_timer_start (EV_A_ &w->timer); 3007 ev_timer_again (EV_A_ &w->timer);
2567 } 3008 }
2568
2569 } 3009 }
2570} 3010}
2571 3011
2572#endif 3012#endif
2573 3013
2609 || w->prev.st_atime != w->attr.st_atime 3049 || w->prev.st_atime != w->attr.st_atime
2610 || w->prev.st_mtime != w->attr.st_mtime 3050 || w->prev.st_mtime != w->attr.st_mtime
2611 || w->prev.st_ctime != w->attr.st_ctime 3051 || w->prev.st_ctime != w->attr.st_ctime
2612 ) { 3052 ) {
2613 #if EV_USE_INOTIFY 3053 #if EV_USE_INOTIFY
3054 if (fs_fd >= 0)
3055 {
2614 infy_del (EV_A_ w); 3056 infy_del (EV_A_ w);
2615 infy_add (EV_A_ w); 3057 infy_add (EV_A_ w);
2616 ev_stat_stat (EV_A_ w); /* avoid race... */ 3058 ev_stat_stat (EV_A_ w); /* avoid race... */
3059 }
2617 #endif 3060 #endif
2618 3061
2619 ev_feed_event (EV_A_ w, EV_STAT); 3062 ev_feed_event (EV_A_ w, EV_STAT);
2620 } 3063 }
2621} 3064}
2624ev_stat_start (EV_P_ ev_stat *w) 3067ev_stat_start (EV_P_ ev_stat *w)
2625{ 3068{
2626 if (expect_false (ev_is_active (w))) 3069 if (expect_false (ev_is_active (w)))
2627 return; 3070 return;
2628 3071
2629 /* since we use memcmp, we need to clear any padding data etc. */
2630 memset (&w->prev, 0, sizeof (ev_statdata));
2631 memset (&w->attr, 0, sizeof (ev_statdata));
2632
2633 ev_stat_stat (EV_A_ w); 3072 ev_stat_stat (EV_A_ w);
2634 3073
3074 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2635 if (w->interval < MIN_STAT_INTERVAL) 3075 w->interval = MIN_STAT_INTERVAL;
2636 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2637 3076
2638 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3077 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2639 ev_set_priority (&w->timer, ev_priority (w)); 3078 ev_set_priority (&w->timer, ev_priority (w));
2640 3079
2641#if EV_USE_INOTIFY 3080#if EV_USE_INOTIFY
2642 infy_init (EV_A); 3081 infy_init (EV_A);
2643 3082
2644 if (fs_fd >= 0) 3083 if (fs_fd >= 0)
2645 infy_add (EV_A_ w); 3084 infy_add (EV_A_ w);
2646 else 3085 else
2647#endif 3086#endif
2648 ev_timer_start (EV_A_ &w->timer); 3087 ev_timer_again (EV_A_ &w->timer);
2649 3088
2650 ev_start (EV_A_ (W)w, 1); 3089 ev_start (EV_A_ (W)w, 1);
2651 3090
2652 EV_FREQUENT_CHECK; 3091 EV_FREQUENT_CHECK;
2653} 3092}
2813embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3252embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2814{ 3253{
2815 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3254 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2816 3255
2817 { 3256 {
2818 struct ev_loop *loop = w->other; 3257 EV_P = w->other;
2819 3258
2820 while (fdchangecnt) 3259 while (fdchangecnt)
2821 { 3260 {
2822 fd_reify (EV_A); 3261 fd_reify (EV_A);
2823 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3262 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2824 } 3263 }
2825 } 3264 }
2826} 3265}
2827 3266
3267static void
3268embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3269{
3270 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3271
3272 ev_embed_stop (EV_A_ w);
3273
3274 {
3275 EV_P = w->other;
3276
3277 ev_loop_fork (EV_A);
3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3279 }
3280
3281 ev_embed_start (EV_A_ w);
3282}
3283
2828#if 0 3284#if 0
2829static void 3285static void
2830embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3286embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2831{ 3287{
2832 ev_idle_stop (EV_A_ idle); 3288 ev_idle_stop (EV_A_ idle);
2838{ 3294{
2839 if (expect_false (ev_is_active (w))) 3295 if (expect_false (ev_is_active (w)))
2840 return; 3296 return;
2841 3297
2842 { 3298 {
2843 struct ev_loop *loop = w->other; 3299 EV_P = w->other;
2844 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3300 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2845 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3301 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2846 } 3302 }
2847 3303
2848 EV_FREQUENT_CHECK; 3304 EV_FREQUENT_CHECK;
2849 3305
2852 3308
2853 ev_prepare_init (&w->prepare, embed_prepare_cb); 3309 ev_prepare_init (&w->prepare, embed_prepare_cb);
2854 ev_set_priority (&w->prepare, EV_MINPRI); 3310 ev_set_priority (&w->prepare, EV_MINPRI);
2855 ev_prepare_start (EV_A_ &w->prepare); 3311 ev_prepare_start (EV_A_ &w->prepare);
2856 3312
3313 ev_fork_init (&w->fork, embed_fork_cb);
3314 ev_fork_start (EV_A_ &w->fork);
3315
2857 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3316 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2858 3317
2859 ev_start (EV_A_ (W)w, 1); 3318 ev_start (EV_A_ (W)w, 1);
2860 3319
2861 EV_FREQUENT_CHECK; 3320 EV_FREQUENT_CHECK;
2868 if (expect_false (!ev_is_active (w))) 3327 if (expect_false (!ev_is_active (w)))
2869 return; 3328 return;
2870 3329
2871 EV_FREQUENT_CHECK; 3330 EV_FREQUENT_CHECK;
2872 3331
2873 ev_io_stop (EV_A_ &w->io); 3332 ev_io_stop (EV_A_ &w->io);
2874 ev_prepare_stop (EV_A_ &w->prepare); 3333 ev_prepare_stop (EV_A_ &w->prepare);
2875 3334 ev_fork_stop (EV_A_ &w->fork);
2876 ev_stop (EV_A_ (W)w);
2877 3335
2878 EV_FREQUENT_CHECK; 3336 EV_FREQUENT_CHECK;
2879} 3337}
2880#endif 3338#endif
2881 3339
2978once_cb (EV_P_ struct ev_once *once, int revents) 3436once_cb (EV_P_ struct ev_once *once, int revents)
2979{ 3437{
2980 void (*cb)(int revents, void *arg) = once->cb; 3438 void (*cb)(int revents, void *arg) = once->cb;
2981 void *arg = once->arg; 3439 void *arg = once->arg;
2982 3440
2983 ev_io_stop (EV_A_ &once->io); 3441 ev_io_stop (EV_A_ &once->io);
2984 ev_timer_stop (EV_A_ &once->to); 3442 ev_timer_stop (EV_A_ &once->to);
2985 ev_free (once); 3443 ev_free (once);
2986 3444
2987 cb (revents, arg); 3445 cb (revents, arg);
2988} 3446}
2989 3447
2990static void 3448static void
2991once_cb_io (EV_P_ ev_io *w, int revents) 3449once_cb_io (EV_P_ ev_io *w, int revents)
2992{ 3450{
2993 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3451 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3452
3453 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2994} 3454}
2995 3455
2996static void 3456static void
2997once_cb_to (EV_P_ ev_timer *w, int revents) 3457once_cb_to (EV_P_ ev_timer *w, int revents)
2998{ 3458{
2999 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3459 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3460
3461 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
3000} 3462}
3001 3463
3002void 3464void
3003ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3465ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
3004{ 3466{
3026 ev_timer_set (&once->to, timeout, 0.); 3488 ev_timer_set (&once->to, timeout, 0.);
3027 ev_timer_start (EV_A_ &once->to); 3489 ev_timer_start (EV_A_ &once->to);
3028 } 3490 }
3029} 3491}
3030 3492
3493/*****************************************************************************/
3494
3495#if EV_WALK_ENABLE
3496void
3497ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3498{
3499 int i, j;
3500 ev_watcher_list *wl, *wn;
3501
3502 if (types & (EV_IO | EV_EMBED))
3503 for (i = 0; i < anfdmax; ++i)
3504 for (wl = anfds [i].head; wl; )
3505 {
3506 wn = wl->next;
3507
3508#if EV_EMBED_ENABLE
3509 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3510 {
3511 if (types & EV_EMBED)
3512 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3513 }
3514 else
3515#endif
3516#if EV_USE_INOTIFY
3517 if (ev_cb ((ev_io *)wl) == infy_cb)
3518 ;
3519 else
3520#endif
3521 if ((ev_io *)wl != &pipe_w)
3522 if (types & EV_IO)
3523 cb (EV_A_ EV_IO, wl);
3524
3525 wl = wn;
3526 }
3527
3528 if (types & (EV_TIMER | EV_STAT))
3529 for (i = timercnt + HEAP0; i-- > HEAP0; )
3530#if EV_STAT_ENABLE
3531 /*TODO: timer is not always active*/
3532 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3533 {
3534 if (types & EV_STAT)
3535 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3536 }
3537 else
3538#endif
3539 if (types & EV_TIMER)
3540 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3541
3542#if EV_PERIODIC_ENABLE
3543 if (types & EV_PERIODIC)
3544 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3545 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3546#endif
3547
3548#if EV_IDLE_ENABLE
3549 if (types & EV_IDLE)
3550 for (j = NUMPRI; i--; )
3551 for (i = idlecnt [j]; i--; )
3552 cb (EV_A_ EV_IDLE, idles [j][i]);
3553#endif
3554
3555#if EV_FORK_ENABLE
3556 if (types & EV_FORK)
3557 for (i = forkcnt; i--; )
3558 if (ev_cb (forks [i]) != embed_fork_cb)
3559 cb (EV_A_ EV_FORK, forks [i]);
3560#endif
3561
3562#if EV_ASYNC_ENABLE
3563 if (types & EV_ASYNC)
3564 for (i = asynccnt; i--; )
3565 cb (EV_A_ EV_ASYNC, asyncs [i]);
3566#endif
3567
3568 if (types & EV_PREPARE)
3569 for (i = preparecnt; i--; )
3570#if EV_EMBED_ENABLE
3571 if (ev_cb (prepares [i]) != embed_prepare_cb)
3572#endif
3573 cb (EV_A_ EV_PREPARE, prepares [i]);
3574
3575 if (types & EV_CHECK)
3576 for (i = checkcnt; i--; )
3577 cb (EV_A_ EV_CHECK, checks [i]);
3578
3579 if (types & EV_SIGNAL)
3580 for (i = 0; i < EV_NSIG - 1; ++i)
3581 for (wl = signals [i].head; wl; )
3582 {
3583 wn = wl->next;
3584 cb (EV_A_ EV_SIGNAL, wl);
3585 wl = wn;
3586 }
3587
3588 if (types & EV_CHILD)
3589 for (i = EV_PID_HASHSIZE; i--; )
3590 for (wl = childs [i]; wl; )
3591 {
3592 wn = wl->next;
3593 cb (EV_A_ EV_CHILD, wl);
3594 wl = wn;
3595 }
3596/* EV_STAT 0x00001000 /* stat data changed */
3597/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3598}
3599#endif
3600
3031#if EV_MULTIPLICITY 3601#if EV_MULTIPLICITY
3032 #include "ev_wrap.h" 3602 #include "ev_wrap.h"
3033#endif 3603#endif
3034 3604
3035#ifdef __cplusplus 3605#ifdef __cplusplus

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines