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

Comparing libev/ev.c (file contents):
Revision 1.228 by root, Fri May 2 08:07:37 2008 UTC vs.
Revision 1.307 by root, Sun Jul 19 07:20:41 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
129# endif 151# endif
130# endif 152# endif
131 153
132#endif 154#endif
133 155
134#include <math.h> 156#include <math.h>
135#include <stdlib.h> 157#include <stdlib.h>
136#include <fcntl.h> 158#include <fcntl.h>
… …
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 */
167 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
218#ifndef EV_USE_CLOCK_SYSCALL
219# if __linux && __GLIBC__ >= 2
220# define EV_USE_CLOCK_SYSCALL 1
221# else
222# define EV_USE_CLOCK_SYSCALL 0
223# endif
224#endif
225
168#ifndef EV_USE_MONOTONIC 226#ifndef EV_USE_MONOTONIC
227# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
228# define EV_USE_MONOTONIC 1
229# else
169# define EV_USE_MONOTONIC 0 230# define EV_USE_MONOTONIC 0
231# endif
170#endif 232#endif
171 233
172#ifndef EV_USE_REALTIME 234#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 235# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
174#endif 236#endif
175 237
176#ifndef EV_USE_NANOSLEEP 238#ifndef EV_USE_NANOSLEEP
239# if _POSIX_C_SOURCE >= 199309L
240# define EV_USE_NANOSLEEP 1
241# else
177# define EV_USE_NANOSLEEP 0 242# define EV_USE_NANOSLEEP 0
243# endif
178#endif 244#endif
179 245
180#ifndef EV_USE_SELECT 246#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 247# define EV_USE_SELECT 1
182#endif 248#endif
… …
235# else 301# else
236# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
237# endif 303# endif
238#endif 304#endif
239 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
314#if 0 /* debugging */
315# define EV_VERIFY 3
316# define EV_USE_4HEAP 1
317# define EV_HEAP_CACHE_AT 1
318#endif
319
320#ifndef EV_VERIFY
321# define EV_VERIFY !EV_MINIMAL
322#endif
323
324#ifndef EV_USE_4HEAP
325# define EV_USE_4HEAP !EV_MINIMAL
326#endif
327
328#ifndef EV_HEAP_CACHE_AT
329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
344#endif
345
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 347
242#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
243# undef EV_USE_MONOTONIC 349# undef EV_USE_MONOTONIC
244# define EV_USE_MONOTONIC 0 350# define EV_USE_MONOTONIC 0
… …
259# include <sys/select.h> 365# include <sys/select.h>
260# endif 366# endif
261#endif 367#endif
262 368
263#if EV_USE_INOTIFY 369#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h>
264# include <sys/inotify.h> 372# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY
376# define EV_USE_INOTIFY 0
377# endif
265#endif 378#endif
266 379
267#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
268# include <winsock.h> 381# include <winsock.h>
269#endif 382#endif
270 383
271#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# define EFD_CLOEXEC O_CLOEXEC
392# endif
274# ifdef __cplusplus 393# ifdef __cplusplus
275extern "C" { 394extern "C" {
276# endif 395# endif
277int eventfd (unsigned int initval, int flags); 396int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus 397# ifdef __cplusplus
279} 398}
280# endif 399# endif
281#endif 400#endif
282 401
402#if EV_USE_SIGNALFD
403# include <sys/signalfd.h>
404#endif
405
283/**/ 406/**/
407
408#if EV_VERIFY >= 3
409# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
410#else
411# define EV_FREQUENT_CHECK do { } while (0)
412#endif
284 413
285/* 414/*
286 * This is used to avoid floating point rounding problems. 415 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 416 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 417 * to ensure progress, time-wise, even when rounding
… …
315# define inline_speed static noinline 444# define inline_speed static noinline
316#else 445#else
317# define inline_speed static inline 446# define inline_speed static inline
318#endif 447#endif
319 448
320#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 449#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
450
451#if EV_MINPRI == EV_MAXPRI
452# define ABSPRI(w) (((W)w), 0)
453#else
321#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 454# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
455#endif
322 456
323#define EMPTY /* required for microsofts broken pseudo-c compiler */ 457#define EMPTY /* required for microsofts broken pseudo-c compiler */
324#define EMPTY2(a,b) /* used to suppress some warnings */ 458#define EMPTY2(a,b) /* used to suppress some warnings */
325 459
326typedef ev_watcher *W; 460typedef ev_watcher *W;
327typedef ev_watcher_list *WL; 461typedef ev_watcher_list *WL;
328typedef ev_watcher_time *WT; 462typedef ev_watcher_time *WT;
329 463
464#define ev_active(w) ((W)(w))->active
330#define ev_at(w) ((WT)(w))->at 465#define ev_at(w) ((WT)(w))->at
331 466
332#if EV_USE_MONOTONIC 467#if EV_USE_REALTIME
333/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 468/* sig_atomic_t is used to avoid per-thread variables or locking but still */
334/* giving it a reasonably high chance of working on typical architetcures */ 469/* giving it a reasonably high chance of working on typical architetcures */
470static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
471#endif
472
473#if EV_USE_MONOTONIC
335static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 474static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
336#endif 475#endif
337 476
338#ifdef _WIN32 477#ifdef _WIN32
339# include "ev_win32.c" 478# include "ev_win32.c"
… …
348{ 487{
349 syserr_cb = cb; 488 syserr_cb = cb;
350} 489}
351 490
352static void noinline 491static void noinline
353syserr (const char *msg) 492ev_syserr (const char *msg)
354{ 493{
355 if (!msg) 494 if (!msg)
356 msg = "(libev) system error"; 495 msg = "(libev) system error";
357 496
358 if (syserr_cb) 497 if (syserr_cb)
… …
404#define ev_malloc(size) ev_realloc (0, (size)) 543#define ev_malloc(size) ev_realloc (0, (size))
405#define ev_free(ptr) ev_realloc ((ptr), 0) 544#define ev_free(ptr) ev_realloc ((ptr), 0)
406 545
407/*****************************************************************************/ 546/*****************************************************************************/
408 547
548/* set in reify when reification needed */
549#define EV_ANFD_REIFY 1
550
551/* file descriptor info structure */
409typedef struct 552typedef struct
410{ 553{
411 WL head; 554 WL head;
412 unsigned char events; 555 unsigned char events; /* the events watched for */
556 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
557 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
413 unsigned char reify; 558 unsigned char unused;
559#if EV_USE_EPOLL
560 unsigned int egen; /* generation counter to counter epoll bugs */
561#endif
414#if EV_SELECT_IS_WINSOCKET 562#if EV_SELECT_IS_WINSOCKET
415 SOCKET handle; 563 SOCKET handle;
416#endif 564#endif
417} ANFD; 565} ANFD;
418 566
567/* stores the pending event set for a given watcher */
419typedef struct 568typedef struct
420{ 569{
421 W w; 570 W w;
422 int events; 571 int events; /* the pending event set for the given watcher */
423} ANPENDING; 572} ANPENDING;
424 573
425#if EV_USE_INOTIFY 574#if EV_USE_INOTIFY
575/* hash table entry per inotify-id */
426typedef struct 576typedef struct
427{ 577{
428 WL head; 578 WL head;
429} ANFS; 579} ANFS;
580#endif
581
582/* Heap Entry */
583#if EV_HEAP_CACHE_AT
584 /* a heap element */
585 typedef struct {
586 ev_tstamp at;
587 WT w;
588 } ANHE;
589
590 #define ANHE_w(he) (he).w /* access watcher, read-write */
591 #define ANHE_at(he) (he).at /* access cached at, read-only */
592 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
593#else
594 /* a heap element */
595 typedef WT ANHE;
596
597 #define ANHE_w(he) (he)
598 #define ANHE_at(he) (he)->at
599 #define ANHE_at_cache(he)
430#endif 600#endif
431 601
432#if EV_MULTIPLICITY 602#if EV_MULTIPLICITY
433 603
434 struct ev_loop 604 struct ev_loop
… …
453 623
454 static int ev_default_loop_ptr; 624 static int ev_default_loop_ptr;
455 625
456#endif 626#endif
457 627
628#if EV_MINIMAL < 2
629# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
630# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
631# define EV_INVOKE_PENDING invoke_cb (EV_A)
632#else
633# define EV_RELEASE_CB (void)0
634# define EV_ACQUIRE_CB (void)0
635# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
636#endif
637
638#define EVUNLOOP_RECURSE 0x80
639
458/*****************************************************************************/ 640/*****************************************************************************/
459 641
642#ifndef EV_HAVE_EV_TIME
460ev_tstamp 643ev_tstamp
461ev_time (void) 644ev_time (void)
462{ 645{
463#if EV_USE_REALTIME 646#if EV_USE_REALTIME
647 if (expect_true (have_realtime))
648 {
464 struct timespec ts; 649 struct timespec ts;
465 clock_gettime (CLOCK_REALTIME, &ts); 650 clock_gettime (CLOCK_REALTIME, &ts);
466 return ts.tv_sec + ts.tv_nsec * 1e-9; 651 return ts.tv_sec + ts.tv_nsec * 1e-9;
467#else 652 }
653#endif
654
468 struct timeval tv; 655 struct timeval tv;
469 gettimeofday (&tv, 0); 656 gettimeofday (&tv, 0);
470 return tv.tv_sec + tv.tv_usec * 1e-6; 657 return tv.tv_sec + tv.tv_usec * 1e-6;
471#endif
472} 658}
659#endif
473 660
474ev_tstamp inline_size 661inline_size ev_tstamp
475get_clock (void) 662get_clock (void)
476{ 663{
477#if EV_USE_MONOTONIC 664#if EV_USE_MONOTONIC
478 if (expect_true (have_monotonic)) 665 if (expect_true (have_monotonic))
479 { 666 {
… …
512 struct timeval tv; 699 struct timeval tv;
513 700
514 tv.tv_sec = (time_t)delay; 701 tv.tv_sec = (time_t)delay;
515 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 702 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
516 703
704 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
705 /* something not guaranteed by newer posix versions, but guaranteed */
706 /* by older ones */
517 select (0, 0, 0, 0, &tv); 707 select (0, 0, 0, 0, &tv);
518#endif 708#endif
519 } 709 }
520} 710}
521 711
522/*****************************************************************************/ 712/*****************************************************************************/
523 713
524int inline_size 714#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
715
716/* find a suitable new size for the given array, */
717/* hopefully by rounding to a ncie-to-malloc size */
718inline_size int
525array_nextsize (int elem, int cur, int cnt) 719array_nextsize (int elem, int cur, int cnt)
526{ 720{
527 int ncur = cur + 1; 721 int ncur = cur + 1;
528 722
529 do 723 do
530 ncur <<= 1; 724 ncur <<= 1;
531 while (cnt > ncur); 725 while (cnt > ncur);
532 726
533 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 727 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
534 if (elem * ncur > 4096) 728 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
535 { 729 {
536 ncur *= elem; 730 ncur *= elem;
537 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 731 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
538 ncur = ncur - sizeof (void *) * 4; 732 ncur = ncur - sizeof (void *) * 4;
539 ncur /= elem; 733 ncur /= elem;
540 } 734 }
541 735
542 return ncur; 736 return ncur;
… …
546array_realloc (int elem, void *base, int *cur, int cnt) 740array_realloc (int elem, void *base, int *cur, int cnt)
547{ 741{
548 *cur = array_nextsize (elem, *cur, cnt); 742 *cur = array_nextsize (elem, *cur, cnt);
549 return ev_realloc (base, elem * *cur); 743 return ev_realloc (base, elem * *cur);
550} 744}
745
746#define array_init_zero(base,count) \
747 memset ((void *)(base), 0, sizeof (*(base)) * (count))
551 748
552#define array_needsize(type,base,cur,cnt,init) \ 749#define array_needsize(type,base,cur,cnt,init) \
553 if (expect_false ((cnt) > (cur))) \ 750 if (expect_false ((cnt) > (cur))) \
554 { \ 751 { \
555 int ocur_ = (cur); \ 752 int ocur_ = (cur); \
… …
567 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 764 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
568 } 765 }
569#endif 766#endif
570 767
571#define array_free(stem, idx) \ 768#define array_free(stem, idx) \
572 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 769 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
573 770
574/*****************************************************************************/ 771/*****************************************************************************/
772
773/* dummy callback for pending events */
774static void noinline
775pendingcb (EV_P_ ev_prepare *w, int revents)
776{
777}
575 778
576void noinline 779void noinline
577ev_feed_event (EV_P_ void *w, int revents) 780ev_feed_event (EV_P_ void *w, int revents)
578{ 781{
579 W w_ = (W)w; 782 W w_ = (W)w;
… …
588 pendings [pri][w_->pending - 1].w = w_; 791 pendings [pri][w_->pending - 1].w = w_;
589 pendings [pri][w_->pending - 1].events = revents; 792 pendings [pri][w_->pending - 1].events = revents;
590 } 793 }
591} 794}
592 795
593void inline_speed 796inline_speed void
797feed_reverse (EV_P_ W w)
798{
799 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
800 rfeeds [rfeedcnt++] = w;
801}
802
803inline_size void
804feed_reverse_done (EV_P_ int revents)
805{
806 do
807 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
808 while (rfeedcnt);
809}
810
811inline_speed void
594queue_events (EV_P_ W *events, int eventcnt, int type) 812queue_events (EV_P_ W *events, int eventcnt, int type)
595{ 813{
596 int i; 814 int i;
597 815
598 for (i = 0; i < eventcnt; ++i) 816 for (i = 0; i < eventcnt; ++i)
599 ev_feed_event (EV_A_ events [i], type); 817 ev_feed_event (EV_A_ events [i], type);
600} 818}
601 819
602/*****************************************************************************/ 820/*****************************************************************************/
603 821
604void inline_size 822inline_speed void
605anfds_init (ANFD *base, int count)
606{
607 while (count--)
608 {
609 base->head = 0;
610 base->events = EV_NONE;
611 base->reify = 0;
612
613 ++base;
614 }
615}
616
617void inline_speed
618fd_event (EV_P_ int fd, int revents) 823fd_event_nc (EV_P_ int fd, int revents)
619{ 824{
620 ANFD *anfd = anfds + fd; 825 ANFD *anfd = anfds + fd;
621 ev_io *w; 826 ev_io *w;
622 827
623 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 828 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
627 if (ev) 832 if (ev)
628 ev_feed_event (EV_A_ (W)w, ev); 833 ev_feed_event (EV_A_ (W)w, ev);
629 } 834 }
630} 835}
631 836
837/* do not submit kernel events for fds that have reify set */
838/* because that means they changed while we were polling for new events */
839inline_speed void
840fd_event (EV_P_ int fd, int revents)
841{
842 ANFD *anfd = anfds + fd;
843
844 if (expect_true (!anfd->reify))
845 fd_event_nc (EV_A_ fd, revents);
846}
847
632void 848void
633ev_feed_fd_event (EV_P_ int fd, int revents) 849ev_feed_fd_event (EV_P_ int fd, int revents)
634{ 850{
635 if (fd >= 0 && fd < anfdmax) 851 if (fd >= 0 && fd < anfdmax)
636 fd_event (EV_A_ fd, revents); 852 fd_event_nc (EV_A_ fd, revents);
637} 853}
638 854
639void inline_size 855/* make sure the external fd watch events are in-sync */
856/* with the kernel/libev internal state */
857inline_size void
640fd_reify (EV_P) 858fd_reify (EV_P)
641{ 859{
642 int i; 860 int i;
643 861
644 for (i = 0; i < fdchangecnt; ++i) 862 for (i = 0; i < fdchangecnt; ++i)
… …
653 events |= (unsigned char)w->events; 871 events |= (unsigned char)w->events;
654 872
655#if EV_SELECT_IS_WINSOCKET 873#if EV_SELECT_IS_WINSOCKET
656 if (events) 874 if (events)
657 { 875 {
658 unsigned long argp; 876 unsigned long arg;
659 #ifdef EV_FD_TO_WIN32_HANDLE 877 #ifdef EV_FD_TO_WIN32_HANDLE
660 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 878 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
661 #else 879 #else
662 anfd->handle = _get_osfhandle (fd); 880 anfd->handle = _get_osfhandle (fd);
663 #endif 881 #endif
664 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 882 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
665 } 883 }
666#endif 884#endif
667 885
668 { 886 {
669 unsigned char o_events = anfd->events; 887 unsigned char o_events = anfd->events;
670 unsigned char o_reify = anfd->reify; 888 unsigned char o_reify = anfd->reify;
671 889
672 anfd->reify = 0; 890 anfd->reify = 0;
673 anfd->events = events; 891 anfd->events = events;
674 892
675 if (o_events != events || o_reify & EV_IOFDSET) 893 if (o_events != events || o_reify & EV__IOFDSET)
676 backend_modify (EV_A_ fd, o_events, events); 894 backend_modify (EV_A_ fd, o_events, events);
677 } 895 }
678 } 896 }
679 897
680 fdchangecnt = 0; 898 fdchangecnt = 0;
681} 899}
682 900
683void inline_size 901/* something about the given fd changed */
902inline_size void
684fd_change (EV_P_ int fd, int flags) 903fd_change (EV_P_ int fd, int flags)
685{ 904{
686 unsigned char reify = anfds [fd].reify; 905 unsigned char reify = anfds [fd].reify;
687 anfds [fd].reify |= flags; 906 anfds [fd].reify |= flags;
688 907
… …
692 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 911 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
693 fdchanges [fdchangecnt - 1] = fd; 912 fdchanges [fdchangecnt - 1] = fd;
694 } 913 }
695} 914}
696 915
697void inline_speed 916/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
917inline_speed void
698fd_kill (EV_P_ int fd) 918fd_kill (EV_P_ int fd)
699{ 919{
700 ev_io *w; 920 ev_io *w;
701 921
702 while ((w = (ev_io *)anfds [fd].head)) 922 while ((w = (ev_io *)anfds [fd].head))
… …
704 ev_io_stop (EV_A_ w); 924 ev_io_stop (EV_A_ w);
705 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 925 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
706 } 926 }
707} 927}
708 928
709int inline_size 929/* check whether the given fd is atcually valid, for error recovery */
930inline_size int
710fd_valid (int fd) 931fd_valid (int fd)
711{ 932{
712#ifdef _WIN32 933#ifdef _WIN32
713 return _get_osfhandle (fd) != -1; 934 return _get_osfhandle (fd) != -1;
714#else 935#else
… …
722{ 943{
723 int fd; 944 int fd;
724 945
725 for (fd = 0; fd < anfdmax; ++fd) 946 for (fd = 0; fd < anfdmax; ++fd)
726 if (anfds [fd].events) 947 if (anfds [fd].events)
727 if (!fd_valid (fd) == -1 && errno == EBADF) 948 if (!fd_valid (fd) && errno == EBADF)
728 fd_kill (EV_A_ fd); 949 fd_kill (EV_A_ fd);
729} 950}
730 951
731/* called on ENOMEM in select/poll to kill some fds and retry */ 952/* called on ENOMEM in select/poll to kill some fds and retry */
732static void noinline 953static void noinline
… …
736 957
737 for (fd = anfdmax; fd--; ) 958 for (fd = anfdmax; fd--; )
738 if (anfds [fd].events) 959 if (anfds [fd].events)
739 { 960 {
740 fd_kill (EV_A_ fd); 961 fd_kill (EV_A_ fd);
741 return; 962 break;
742 } 963 }
743} 964}
744 965
745/* usually called after fork if backend needs to re-arm all fds from scratch */ 966/* usually called after fork if backend needs to re-arm all fds from scratch */
746static void noinline 967static void noinline
… …
750 971
751 for (fd = 0; fd < anfdmax; ++fd) 972 for (fd = 0; fd < anfdmax; ++fd)
752 if (anfds [fd].events) 973 if (anfds [fd].events)
753 { 974 {
754 anfds [fd].events = 0; 975 anfds [fd].events = 0;
976 anfds [fd].emask = 0;
755 fd_change (EV_A_ fd, EV_IOFDSET | 1); 977 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
756 } 978 }
757} 979}
758 980
759/*****************************************************************************/ 981/*****************************************************************************/
760 982
983/*
984 * the heap functions want a real array index. array index 0 uis guaranteed to not
985 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
986 * the branching factor of the d-tree.
987 */
988
989/*
990 * at the moment we allow libev the luxury of two heaps,
991 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
992 * which is more cache-efficient.
993 * the difference is about 5% with 50000+ watchers.
994 */
995#if EV_USE_4HEAP
996
997#define DHEAP 4
998#define HEAP0 (DHEAP - 1) /* index of first element in heap */
999#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
1000#define UPHEAP_DONE(p,k) ((p) == (k))
1001
1002/* away from the root */
1003inline_speed void
1004downheap (ANHE *heap, int N, int k)
1005{
1006 ANHE he = heap [k];
1007 ANHE *E = heap + N + HEAP0;
1008
1009 for (;;)
1010 {
1011 ev_tstamp minat;
1012 ANHE *minpos;
1013 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
1014
1015 /* find minimum child */
1016 if (expect_true (pos + DHEAP - 1 < E))
1017 {
1018 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
1019 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
1020 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
1021 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
1022 }
1023 else if (pos < E)
1024 {
1025 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
1026 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
1027 if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
1028 if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
1029 }
1030 else
1031 break;
1032
1033 if (ANHE_at (he) <= minat)
1034 break;
1035
1036 heap [k] = *minpos;
1037 ev_active (ANHE_w (*minpos)) = k;
1038
1039 k = minpos - heap;
1040 }
1041
1042 heap [k] = he;
1043 ev_active (ANHE_w (he)) = k;
1044}
1045
1046#else /* 4HEAP */
1047
1048#define HEAP0 1
1049#define HPARENT(k) ((k) >> 1)
1050#define UPHEAP_DONE(p,k) (!(p))
1051
1052/* away from the root */
1053inline_speed void
1054downheap (ANHE *heap, int N, int k)
1055{
1056 ANHE he = heap [k];
1057
1058 for (;;)
1059 {
1060 int c = k << 1;
1061
1062 if (c > N + HEAP0 - 1)
1063 break;
1064
1065 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1066 ? 1 : 0;
1067
1068 if (ANHE_at (he) <= ANHE_at (heap [c]))
1069 break;
1070
1071 heap [k] = heap [c];
1072 ev_active (ANHE_w (heap [k])) = k;
1073
1074 k = c;
1075 }
1076
1077 heap [k] = he;
1078 ev_active (ANHE_w (he)) = k;
1079}
1080#endif
1081
761/* towards the root */ 1082/* towards the root */
762void inline_speed 1083inline_speed void
763upheap (WT *heap, int k) 1084upheap (ANHE *heap, int k)
764{ 1085{
765 WT w = heap [k]; 1086 ANHE he = heap [k];
766 1087
767 for (;;) 1088 for (;;)
768 { 1089 {
769 int p = k >> 1; 1090 int p = HPARENT (k);
770 1091
771 /* maybe we could use a dummy element at heap [0]? */ 1092 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
772 if (!p || heap [p]->at <= w->at)
773 break; 1093 break;
774 1094
775 heap [k] = heap [p]; 1095 heap [k] = heap [p];
776 ((W)heap [k])->active = k; 1096 ev_active (ANHE_w (heap [k])) = k;
777 k = p; 1097 k = p;
778 } 1098 }
779 1099
780 heap [k] = w; 1100 heap [k] = he;
781 ((W)heap [k])->active = k; 1101 ev_active (ANHE_w (he)) = k;
782} 1102}
783 1103
784/* away from the root */ 1104/* move an element suitably so it is in a correct place */
785void inline_speed 1105inline_size void
786downheap (WT *heap, int N, int k)
787{
788 WT w = heap [k];
789
790 for (;;)
791 {
792 int c = k << 1;
793
794 if (c > N)
795 break;
796
797 c += c < N && heap [c]->at > heap [c + 1]->at
798 ? 1 : 0;
799
800 if (w->at <= heap [c]->at)
801 break;
802
803 heap [k] = heap [c];
804 ((W)heap [k])->active = k;
805
806 k = c;
807 }
808
809 heap [k] = w;
810 ((W)heap [k])->active = k;
811}
812
813void inline_size
814adjustheap (WT *heap, int N, int k) 1106adjustheap (ANHE *heap, int N, int k)
815{ 1107{
1108 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
816 upheap (heap, k); 1109 upheap (heap, k);
1110 else
817 downheap (heap, N, k); 1111 downheap (heap, N, k);
1112}
1113
1114/* rebuild the heap: this function is used only once and executed rarely */
1115inline_size void
1116reheap (ANHE *heap, int N)
1117{
1118 int i;
1119
1120 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
1121 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
1122 for (i = 0; i < N; ++i)
1123 upheap (heap, i + HEAP0);
818} 1124}
819 1125
820/*****************************************************************************/ 1126/*****************************************************************************/
821 1127
1128/* associate signal watchers to a signal signal */
822typedef struct 1129typedef struct
823{ 1130{
1131 EV_ATOMIC_T pending;
1132#if EV_MULTIPLICITY
1133 EV_P;
1134#endif
824 WL head; 1135 WL head;
825 EV_ATOMIC_T gotsig;
826} ANSIG; 1136} ANSIG;
827 1137
828static ANSIG *signals; 1138static ANSIG signals [EV_NSIG - 1];
829static int signalmax;
830
831static EV_ATOMIC_T gotsig;
832
833void inline_size
834signals_init (ANSIG *base, int count)
835{
836 while (count--)
837 {
838 base->head = 0;
839 base->gotsig = 0;
840
841 ++base;
842 }
843}
844 1139
845/*****************************************************************************/ 1140/*****************************************************************************/
846 1141
847void inline_speed 1142/* used to prepare libev internal fd's */
1143/* this is not fork-safe */
1144inline_speed void
848fd_intern (int fd) 1145fd_intern (int fd)
849{ 1146{
850#ifdef _WIN32 1147#ifdef _WIN32
851 int arg = 1; 1148 unsigned long arg = 1;
852 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1149 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
853#else 1150#else
854 fcntl (fd, F_SETFD, FD_CLOEXEC); 1151 fcntl (fd, F_SETFD, FD_CLOEXEC);
855 fcntl (fd, F_SETFL, O_NONBLOCK); 1152 fcntl (fd, F_SETFL, O_NONBLOCK);
856#endif 1153#endif
857} 1154}
858 1155
859static void noinline 1156static void noinline
860evpipe_init (EV_P) 1157evpipe_init (EV_P)
861{ 1158{
862 if (!ev_is_active (&pipeev)) 1159 if (!ev_is_active (&pipe_w))
863 { 1160 {
864#if EV_USE_EVENTFD 1161#if EV_USE_EVENTFD
1162 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1163 if (evfd < 0 && errno == EINVAL)
865 if ((evfd = eventfd (0, 0)) >= 0) 1164 evfd = eventfd (0, 0);
1165
1166 if (evfd >= 0)
866 { 1167 {
867 evpipe [0] = -1; 1168 evpipe [0] = -1;
868 fd_intern (evfd); 1169 fd_intern (evfd); /* doing it twice doesn't hurt */
869 ev_io_set (&pipeev, evfd, EV_READ); 1170 ev_io_set (&pipe_w, evfd, EV_READ);
870 } 1171 }
871 else 1172 else
872#endif 1173#endif
873 { 1174 {
874 while (pipe (evpipe)) 1175 while (pipe (evpipe))
875 syserr ("(libev) error creating signal/async pipe"); 1176 ev_syserr ("(libev) error creating signal/async pipe");
876 1177
877 fd_intern (evpipe [0]); 1178 fd_intern (evpipe [0]);
878 fd_intern (evpipe [1]); 1179 fd_intern (evpipe [1]);
879 ev_io_set (&pipeev, evpipe [0], EV_READ); 1180 ev_io_set (&pipe_w, evpipe [0], EV_READ);
880 } 1181 }
881 1182
882 ev_io_start (EV_A_ &pipeev); 1183 ev_io_start (EV_A_ &pipe_w);
883 ev_unref (EV_A); /* watcher should not keep loop alive */ 1184 ev_unref (EV_A); /* watcher should not keep loop alive */
884 } 1185 }
885} 1186}
886 1187
887void inline_size 1188inline_size void
888evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1189evpipe_write (EV_P_ EV_ATOMIC_T *flag)
889{ 1190{
890 if (!*flag) 1191 if (!*flag)
891 { 1192 {
892 int old_errno = errno; /* save errno because write might clobber it */ 1193 int old_errno = errno; /* save errno because write might clobber it */
… …
905 1206
906 errno = old_errno; 1207 errno = old_errno;
907 } 1208 }
908} 1209}
909 1210
1211/* called whenever the libev signal pipe */
1212/* got some events (signal, async) */
910static void 1213static void
911pipecb (EV_P_ ev_io *iow, int revents) 1214pipecb (EV_P_ ev_io *iow, int revents)
912{ 1215{
1216 int i;
1217
913#if EV_USE_EVENTFD 1218#if EV_USE_EVENTFD
914 if (evfd >= 0) 1219 if (evfd >= 0)
915 { 1220 {
916 uint64_t counter = 1; 1221 uint64_t counter;
917 read (evfd, &counter, sizeof (uint64_t)); 1222 read (evfd, &counter, sizeof (uint64_t));
918 } 1223 }
919 else 1224 else
920#endif 1225#endif
921 { 1226 {
922 char dummy; 1227 char dummy;
923 read (evpipe [0], &dummy, 1); 1228 read (evpipe [0], &dummy, 1);
924 } 1229 }
925 1230
926 if (gotsig && ev_is_default_loop (EV_A)) 1231 if (sig_pending)
927 { 1232 {
928 int signum; 1233 sig_pending = 0;
929 gotsig = 0;
930 1234
931 for (signum = signalmax; signum--; ) 1235 for (i = EV_NSIG - 1; i--; )
932 if (signals [signum].gotsig) 1236 if (expect_false (signals [i].pending))
933 ev_feed_signal_event (EV_A_ signum + 1); 1237 ev_feed_signal_event (EV_A_ i + 1);
934 } 1238 }
935 1239
936#if EV_ASYNC_ENABLE 1240#if EV_ASYNC_ENABLE
937 if (gotasync) 1241 if (async_pending)
938 { 1242 {
939 int i; 1243 async_pending = 0;
940 gotasync = 0;
941 1244
942 for (i = asynccnt; i--; ) 1245 for (i = asynccnt; i--; )
943 if (asyncs [i]->sent) 1246 if (asyncs [i]->sent)
944 { 1247 {
945 asyncs [i]->sent = 0; 1248 asyncs [i]->sent = 0;
… …
953 1256
954static void 1257static void
955ev_sighandler (int signum) 1258ev_sighandler (int signum)
956{ 1259{
957#if EV_MULTIPLICITY 1260#if EV_MULTIPLICITY
958 struct ev_loop *loop = &default_loop_struct; 1261 EV_P = signals [signum - 1].loop;
959#endif 1262#endif
960 1263
961#if _WIN32 1264#if _WIN32
962 signal (signum, ev_sighandler); 1265 signal (signum, ev_sighandler);
963#endif 1266#endif
964 1267
965 signals [signum - 1].gotsig = 1; 1268 signals [signum - 1].pending = 1;
966 evpipe_write (EV_A_ &gotsig); 1269 evpipe_write (EV_A_ &sig_pending);
967} 1270}
968 1271
969void noinline 1272void noinline
970ev_feed_signal_event (EV_P_ int signum) 1273ev_feed_signal_event (EV_P_ int signum)
971{ 1274{
972 WL w; 1275 WL w;
973 1276
1277 if (expect_false (signum <= 0 || signum > EV_NSIG))
1278 return;
1279
1280 --signum;
1281
974#if EV_MULTIPLICITY 1282#if EV_MULTIPLICITY
975 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1283 /* it is permissible to try to feed a signal to the wrong loop */
976#endif 1284 /* or, likely more useful, feeding a signal nobody is waiting for */
977 1285
978 --signum; 1286 if (expect_false (signals [signum].loop != EV_A))
979
980 if (signum < 0 || signum >= signalmax)
981 return; 1287 return;
1288#endif
982 1289
983 signals [signum].gotsig = 0; 1290 signals [signum].pending = 0;
984 1291
985 for (w = signals [signum].head; w; w = w->next) 1292 for (w = signals [signum].head; w; w = w->next)
986 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1293 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
987} 1294}
988 1295
1296#if EV_USE_SIGNALFD
1297static void
1298sigfdcb (EV_P_ ev_io *iow, int revents)
1299{
1300 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1301
1302 for (;;)
1303 {
1304 ssize_t res = read (sigfd, si, sizeof (si));
1305
1306 /* not ISO-C, as res might be -1, but works with SuS */
1307 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1308 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1309
1310 if (res < (ssize_t)sizeof (si))
1311 break;
1312 }
1313}
1314#endif
1315
989/*****************************************************************************/ 1316/*****************************************************************************/
990 1317
991static WL childs [EV_PID_HASHSIZE]; 1318static WL childs [EV_PID_HASHSIZE];
992 1319
993#ifndef _WIN32 1320#ifndef _WIN32
… …
996 1323
997#ifndef WIFCONTINUED 1324#ifndef WIFCONTINUED
998# define WIFCONTINUED(status) 0 1325# define WIFCONTINUED(status) 0
999#endif 1326#endif
1000 1327
1001void inline_speed 1328/* handle a single child status event */
1329inline_speed void
1002child_reap (EV_P_ int chain, int pid, int status) 1330child_reap (EV_P_ int chain, int pid, int status)
1003{ 1331{
1004 ev_child *w; 1332 ev_child *w;
1005 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1333 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1006 1334
… …
1019 1347
1020#ifndef WCONTINUED 1348#ifndef WCONTINUED
1021# define WCONTINUED 0 1349# define WCONTINUED 0
1022#endif 1350#endif
1023 1351
1352/* called on sigchld etc., calls waitpid */
1024static void 1353static void
1025childcb (EV_P_ ev_signal *sw, int revents) 1354childcb (EV_P_ ev_signal *sw, int revents)
1026{ 1355{
1027 int pid, status; 1356 int pid, status;
1028 1357
… …
1109 /* kqueue is borked on everything but netbsd apparently */ 1438 /* kqueue is borked on everything but netbsd apparently */
1110 /* it usually doesn't work correctly on anything but sockets and pipes */ 1439 /* it usually doesn't work correctly on anything but sockets and pipes */
1111 flags &= ~EVBACKEND_KQUEUE; 1440 flags &= ~EVBACKEND_KQUEUE;
1112#endif 1441#endif
1113#ifdef __APPLE__ 1442#ifdef __APPLE__
1114 // flags &= ~EVBACKEND_KQUEUE; for documentation 1443 /* only select works correctly on that "unix-certified" platform */
1115 flags &= ~EVBACKEND_POLL; 1444 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1445 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1116#endif 1446#endif
1117 1447
1118 return flags; 1448 return flags;
1119} 1449}
1120 1450
… …
1134ev_backend (EV_P) 1464ev_backend (EV_P)
1135{ 1465{
1136 return backend; 1466 return backend;
1137} 1467}
1138 1468
1469#if EV_MINIMAL < 2
1139unsigned int 1470unsigned int
1140ev_loop_count (EV_P) 1471ev_loop_count (EV_P)
1141{ 1472{
1142 return loop_count; 1473 return loop_count;
1143} 1474}
1144 1475
1476unsigned int
1477ev_loop_depth (EV_P)
1478{
1479 return loop_depth;
1480}
1481
1145void 1482void
1146ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1483ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1147{ 1484{
1148 io_blocktime = interval; 1485 io_blocktime = interval;
1149} 1486}
… …
1152ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1489ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1153{ 1490{
1154 timeout_blocktime = interval; 1491 timeout_blocktime = interval;
1155} 1492}
1156 1493
1494void
1495ev_set_userdata (EV_P_ void *data)
1496{
1497 userdata = data;
1498}
1499
1500void *
1501ev_userdata (EV_P)
1502{
1503 return userdata;
1504}
1505
1506void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1507{
1508 invoke_cb = invoke_pending_cb;
1509}
1510
1511void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1512{
1513 release_cb = release;
1514 acquire_cb = acquire;
1515}
1516#endif
1517
1518/* initialise a loop structure, must be zero-initialised */
1157static void noinline 1519static void noinline
1158loop_init (EV_P_ unsigned int flags) 1520loop_init (EV_P_ unsigned int flags)
1159{ 1521{
1160 if (!backend) 1522 if (!backend)
1161 { 1523 {
1524#if EV_USE_REALTIME
1525 if (!have_realtime)
1526 {
1527 struct timespec ts;
1528
1529 if (!clock_gettime (CLOCK_REALTIME, &ts))
1530 have_realtime = 1;
1531 }
1532#endif
1533
1162#if EV_USE_MONOTONIC 1534#if EV_USE_MONOTONIC
1535 if (!have_monotonic)
1163 { 1536 {
1164 struct timespec ts; 1537 struct timespec ts;
1538
1165 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1166 have_monotonic = 1; 1540 have_monotonic = 1;
1167 } 1541 }
1168#endif 1542#endif
1543
1544 /* pid check not overridable via env */
1545#ifndef _WIN32
1546 if (flags & EVFLAG_FORKCHECK)
1547 curpid = getpid ();
1548#endif
1549
1550 if (!(flags & EVFLAG_NOENV)
1551 && !enable_secure ()
1552 && getenv ("LIBEV_FLAGS"))
1553 flags = atoi (getenv ("LIBEV_FLAGS"));
1169 1554
1170 ev_rt_now = ev_time (); 1555 ev_rt_now = ev_time ();
1171 mn_now = get_clock (); 1556 mn_now = get_clock ();
1172 now_floor = mn_now; 1557 now_floor = mn_now;
1173 rtmn_diff = ev_rt_now - mn_now; 1558 rtmn_diff = ev_rt_now - mn_now;
1559#if EV_MINIMAL < 2
1560 invoke_cb = ev_invoke_pending;
1561#endif
1174 1562
1175 io_blocktime = 0.; 1563 io_blocktime = 0.;
1176 timeout_blocktime = 0.; 1564 timeout_blocktime = 0.;
1177 backend = 0; 1565 backend = 0;
1178 backend_fd = -1; 1566 backend_fd = -1;
1179 gotasync = 0; 1567 sig_pending = 0;
1568#if EV_ASYNC_ENABLE
1569 async_pending = 0;
1570#endif
1180#if EV_USE_INOTIFY 1571#if EV_USE_INOTIFY
1181 fs_fd = -2; 1572 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1182#endif 1573#endif
1183 1574#if EV_USE_SIGNALFD
1184 /* pid check not overridable via env */ 1575 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1185#ifndef _WIN32
1186 if (flags & EVFLAG_FORKCHECK)
1187 curpid = getpid ();
1188#endif 1576#endif
1189
1190 if (!(flags & EVFLAG_NOENV)
1191 && !enable_secure ()
1192 && getenv ("LIBEV_FLAGS"))
1193 flags = atoi (getenv ("LIBEV_FLAGS"));
1194 1577
1195 if (!(flags & 0x0000ffffU)) 1578 if (!(flags & 0x0000ffffU))
1196 flags |= ev_recommended_backends (); 1579 flags |= ev_recommended_backends ();
1197 1580
1198#if EV_USE_PORT 1581#if EV_USE_PORT
… …
1209#endif 1592#endif
1210#if EV_USE_SELECT 1593#if EV_USE_SELECT
1211 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1594 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1212#endif 1595#endif
1213 1596
1597 ev_prepare_init (&pending_w, pendingcb);
1598
1214 ev_init (&pipeev, pipecb); 1599 ev_init (&pipe_w, pipecb);
1215 ev_set_priority (&pipeev, EV_MAXPRI); 1600 ev_set_priority (&pipe_w, EV_MAXPRI);
1216 } 1601 }
1217} 1602}
1218 1603
1604/* free up a loop structure */
1219static void noinline 1605static void noinline
1220loop_destroy (EV_P) 1606loop_destroy (EV_P)
1221{ 1607{
1222 int i; 1608 int i;
1223 1609
1224 if (ev_is_active (&pipeev)) 1610 if (ev_is_active (&pipe_w))
1225 { 1611 {
1226 ev_ref (EV_A); /* signal watcher */ 1612 /*ev_ref (EV_A);*/
1227 ev_io_stop (EV_A_ &pipeev); 1613 /*ev_io_stop (EV_A_ &pipe_w);*/
1228 1614
1229#if EV_USE_EVENTFD 1615#if EV_USE_EVENTFD
1230 if (evfd >= 0) 1616 if (evfd >= 0)
1231 close (evfd); 1617 close (evfd);
1232#endif 1618#endif
… …
1236 close (evpipe [0]); 1622 close (evpipe [0]);
1237 close (evpipe [1]); 1623 close (evpipe [1]);
1238 } 1624 }
1239 } 1625 }
1240 1626
1627#if EV_USE_SIGNALFD
1628 if (ev_is_active (&sigfd_w))
1629 {
1630 /*ev_ref (EV_A);*/
1631 /*ev_io_stop (EV_A_ &sigfd_w);*/
1632
1633 close (sigfd);
1634 }
1635#endif
1636
1241#if EV_USE_INOTIFY 1637#if EV_USE_INOTIFY
1242 if (fs_fd >= 0) 1638 if (fs_fd >= 0)
1243 close (fs_fd); 1639 close (fs_fd);
1244#endif 1640#endif
1245 1641
… …
1268#if EV_IDLE_ENABLE 1664#if EV_IDLE_ENABLE
1269 array_free (idle, [i]); 1665 array_free (idle, [i]);
1270#endif 1666#endif
1271 } 1667 }
1272 1668
1273 ev_free (anfds); anfdmax = 0; 1669 ev_free (anfds); anfds = 0; anfdmax = 0;
1274 1670
1275 /* have to use the microsoft-never-gets-it-right macro */ 1671 /* have to use the microsoft-never-gets-it-right macro */
1672 array_free (rfeed, EMPTY);
1276 array_free (fdchange, EMPTY); 1673 array_free (fdchange, EMPTY);
1277 array_free (timer, EMPTY); 1674 array_free (timer, EMPTY);
1278#if EV_PERIODIC_ENABLE 1675#if EV_PERIODIC_ENABLE
1279 array_free (periodic, EMPTY); 1676 array_free (periodic, EMPTY);
1280#endif 1677#endif
… …
1289 1686
1290 backend = 0; 1687 backend = 0;
1291} 1688}
1292 1689
1293#if EV_USE_INOTIFY 1690#if EV_USE_INOTIFY
1294void inline_size infy_fork (EV_P); 1691inline_size void infy_fork (EV_P);
1295#endif 1692#endif
1296 1693
1297void inline_size 1694inline_size void
1298loop_fork (EV_P) 1695loop_fork (EV_P)
1299{ 1696{
1300#if EV_USE_PORT 1697#if EV_USE_PORT
1301 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1698 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1302#endif 1699#endif
… …
1308#endif 1705#endif
1309#if EV_USE_INOTIFY 1706#if EV_USE_INOTIFY
1310 infy_fork (EV_A); 1707 infy_fork (EV_A);
1311#endif 1708#endif
1312 1709
1313 if (ev_is_active (&pipeev)) 1710 if (ev_is_active (&pipe_w))
1314 { 1711 {
1315 /* this "locks" the handlers against writing to the pipe */ 1712 /* this "locks" the handlers against writing to the pipe */
1316 /* while we modify the fd vars */ 1713 /* while we modify the fd vars */
1317 gotsig = 1; 1714 sig_pending = 1;
1318#if EV_ASYNC_ENABLE 1715#if EV_ASYNC_ENABLE
1319 gotasync = 1; 1716 async_pending = 1;
1320#endif 1717#endif
1321 1718
1322 ev_ref (EV_A); 1719 ev_ref (EV_A);
1323 ev_io_stop (EV_A_ &pipeev); 1720 ev_io_stop (EV_A_ &pipe_w);
1324 1721
1325#if EV_USE_EVENTFD 1722#if EV_USE_EVENTFD
1326 if (evfd >= 0) 1723 if (evfd >= 0)
1327 close (evfd); 1724 close (evfd);
1328#endif 1725#endif
… …
1333 close (evpipe [1]); 1730 close (evpipe [1]);
1334 } 1731 }
1335 1732
1336 evpipe_init (EV_A); 1733 evpipe_init (EV_A);
1337 /* now iterate over everything, in case we missed something */ 1734 /* now iterate over everything, in case we missed something */
1338 pipecb (EV_A_ &pipeev, EV_READ); 1735 pipecb (EV_A_ &pipe_w, EV_READ);
1339 } 1736 }
1340 1737
1341 postfork = 0; 1738 postfork = 0;
1342} 1739}
1343 1740
1344#if EV_MULTIPLICITY 1741#if EV_MULTIPLICITY
1742
1345struct ev_loop * 1743struct ev_loop *
1346ev_loop_new (unsigned int flags) 1744ev_loop_new (unsigned int flags)
1347{ 1745{
1348 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1746 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1349 1747
1350 memset (loop, 0, sizeof (struct ev_loop)); 1748 memset (EV_A, 0, sizeof (struct ev_loop));
1351
1352 loop_init (EV_A_ flags); 1749 loop_init (EV_A_ flags);
1353 1750
1354 if (ev_backend (EV_A)) 1751 if (ev_backend (EV_A))
1355 return loop; 1752 return EV_A;
1356 1753
1357 return 0; 1754 return 0;
1358} 1755}
1359 1756
1360void 1757void
… …
1367void 1764void
1368ev_loop_fork (EV_P) 1765ev_loop_fork (EV_P)
1369{ 1766{
1370 postfork = 1; /* must be in line with ev_default_fork */ 1767 postfork = 1; /* must be in line with ev_default_fork */
1371} 1768}
1769#endif /* multiplicity */
1372 1770
1771#if EV_VERIFY
1772static void noinline
1773verify_watcher (EV_P_ W w)
1774{
1775 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1776
1777 if (w->pending)
1778 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1779}
1780
1781static void noinline
1782verify_heap (EV_P_ ANHE *heap, int N)
1783{
1784 int i;
1785
1786 for (i = HEAP0; i < N + HEAP0; ++i)
1787 {
1788 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1789 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1790 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1791
1792 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1793 }
1794}
1795
1796static void noinline
1797array_verify (EV_P_ W *ws, int cnt)
1798{
1799 while (cnt--)
1800 {
1801 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1802 verify_watcher (EV_A_ ws [cnt]);
1803 }
1804}
1805#endif
1806
1807#if EV_MINIMAL < 2
1808void
1809ev_loop_verify (EV_P)
1810{
1811#if EV_VERIFY
1812 int i;
1813 WL w;
1814
1815 assert (activecnt >= -1);
1816
1817 assert (fdchangemax >= fdchangecnt);
1818 for (i = 0; i < fdchangecnt; ++i)
1819 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1820
1821 assert (anfdmax >= 0);
1822 for (i = 0; i < anfdmax; ++i)
1823 for (w = anfds [i].head; w; w = w->next)
1824 {
1825 verify_watcher (EV_A_ (W)w);
1826 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1827 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1828 }
1829
1830 assert (timermax >= timercnt);
1831 verify_heap (EV_A_ timers, timercnt);
1832
1833#if EV_PERIODIC_ENABLE
1834 assert (periodicmax >= periodiccnt);
1835 verify_heap (EV_A_ periodics, periodiccnt);
1836#endif
1837
1838 for (i = NUMPRI; i--; )
1839 {
1840 assert (pendingmax [i] >= pendingcnt [i]);
1841#if EV_IDLE_ENABLE
1842 assert (idleall >= 0);
1843 assert (idlemax [i] >= idlecnt [i]);
1844 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1845#endif
1846 }
1847
1848#if EV_FORK_ENABLE
1849 assert (forkmax >= forkcnt);
1850 array_verify (EV_A_ (W *)forks, forkcnt);
1851#endif
1852
1853#if EV_ASYNC_ENABLE
1854 assert (asyncmax >= asynccnt);
1855 array_verify (EV_A_ (W *)asyncs, asynccnt);
1856#endif
1857
1858 assert (preparemax >= preparecnt);
1859 array_verify (EV_A_ (W *)prepares, preparecnt);
1860
1861 assert (checkmax >= checkcnt);
1862 array_verify (EV_A_ (W *)checks, checkcnt);
1863
1864# if 0
1865 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1866 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1867# endif
1868#endif
1869}
1373#endif 1870#endif
1374 1871
1375#if EV_MULTIPLICITY 1872#if EV_MULTIPLICITY
1376struct ev_loop * 1873struct ev_loop *
1377ev_default_loop_init (unsigned int flags) 1874ev_default_loop_init (unsigned int flags)
… …
1381#endif 1878#endif
1382{ 1879{
1383 if (!ev_default_loop_ptr) 1880 if (!ev_default_loop_ptr)
1384 { 1881 {
1385#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1386 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1883 EV_P = ev_default_loop_ptr = &default_loop_struct;
1387#else 1884#else
1388 ev_default_loop_ptr = 1; 1885 ev_default_loop_ptr = 1;
1389#endif 1886#endif
1390 1887
1391 loop_init (EV_A_ flags); 1888 loop_init (EV_A_ flags);
… …
1408 1905
1409void 1906void
1410ev_default_destroy (void) 1907ev_default_destroy (void)
1411{ 1908{
1412#if EV_MULTIPLICITY 1909#if EV_MULTIPLICITY
1413 struct ev_loop *loop = ev_default_loop_ptr; 1910 EV_P = ev_default_loop_ptr;
1414#endif 1911#endif
1912
1913 ev_default_loop_ptr = 0;
1415 1914
1416#ifndef _WIN32 1915#ifndef _WIN32
1417 ev_ref (EV_A); /* child watcher */ 1916 ev_ref (EV_A); /* child watcher */
1418 ev_signal_stop (EV_A_ &childev); 1917 ev_signal_stop (EV_A_ &childev);
1419#endif 1918#endif
… …
1423 1922
1424void 1923void
1425ev_default_fork (void) 1924ev_default_fork (void)
1426{ 1925{
1427#if EV_MULTIPLICITY 1926#if EV_MULTIPLICITY
1428 struct ev_loop *loop = ev_default_loop_ptr; 1927 EV_P = ev_default_loop_ptr;
1429#endif 1928#endif
1430 1929
1431 if (backend)
1432 postfork = 1; /* must be in line with ev_loop_fork */ 1930 postfork = 1; /* must be in line with ev_loop_fork */
1433} 1931}
1434 1932
1435/*****************************************************************************/ 1933/*****************************************************************************/
1436 1934
1437void 1935void
1438ev_invoke (EV_P_ void *w, int revents) 1936ev_invoke (EV_P_ void *w, int revents)
1439{ 1937{
1440 EV_CB_INVOKE ((W)w, revents); 1938 EV_CB_INVOKE ((W)w, revents);
1441} 1939}
1442 1940
1443void inline_speed 1941unsigned int
1444call_pending (EV_P) 1942ev_pending_count (EV_P)
1943{
1944 int pri;
1945 unsigned int count = 0;
1946
1947 for (pri = NUMPRI; pri--; )
1948 count += pendingcnt [pri];
1949
1950 return count;
1951}
1952
1953void noinline
1954ev_invoke_pending (EV_P)
1445{ 1955{
1446 int pri; 1956 int pri;
1447 1957
1448 for (pri = NUMPRI; pri--; ) 1958 for (pri = NUMPRI; pri--; )
1449 while (pendingcnt [pri]) 1959 while (pendingcnt [pri])
1450 { 1960 {
1451 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1961 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1452 1962
1453 if (expect_true (p->w))
1454 {
1455 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1963 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1964 /* ^ this is no longer true, as pending_w could be here */
1456 1965
1457 p->w->pending = 0; 1966 p->w->pending = 0;
1458 EV_CB_INVOKE (p->w, p->events); 1967 EV_CB_INVOKE (p->w, p->events);
1459 } 1968 EV_FREQUENT_CHECK;
1460 } 1969 }
1461} 1970}
1462 1971
1463void inline_size
1464timers_reify (EV_P)
1465{
1466 while (timercnt && ev_at (timers [1]) <= mn_now)
1467 {
1468 ev_timer *w = (ev_timer *)timers [1];
1469
1470 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1471
1472 /* first reschedule or stop timer */
1473 if (w->repeat)
1474 {
1475 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1476
1477 ev_at (w) += w->repeat;
1478 if (ev_at (w) < mn_now)
1479 ev_at (w) = mn_now;
1480
1481 downheap (timers, timercnt, 1);
1482 }
1483 else
1484 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1485
1486 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1487 }
1488}
1489
1490#if EV_PERIODIC_ENABLE
1491void inline_size
1492periodics_reify (EV_P)
1493{
1494 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1495 {
1496 ev_periodic *w = (ev_periodic *)periodics [1];
1497
1498 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1499
1500 /* first reschedule or stop timer */
1501 if (w->reschedule_cb)
1502 {
1503 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1504 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1505 downheap (periodics, periodiccnt, 1);
1506 }
1507 else if (w->interval)
1508 {
1509 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1510 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1511 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1512 downheap (periodics, periodiccnt, 1);
1513 }
1514 else
1515 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1516
1517 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1518 }
1519}
1520
1521static void noinline
1522periodics_reschedule (EV_P)
1523{
1524 int i;
1525
1526 /* adjust periodics after time jump */
1527 for (i = 0; i < periodiccnt; ++i)
1528 {
1529 ev_periodic *w = (ev_periodic *)periodics [i];
1530
1531 if (w->reschedule_cb)
1532 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1533 else if (w->interval)
1534 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1535 }
1536
1537 /* now rebuild the heap */
1538 for (i = periodiccnt >> 1; i--; )
1539 downheap (periodics, periodiccnt, i);
1540}
1541#endif
1542
1543#if EV_IDLE_ENABLE 1972#if EV_IDLE_ENABLE
1544void inline_size 1973/* make idle watchers pending. this handles the "call-idle */
1974/* only when higher priorities are idle" logic */
1975inline_size void
1545idle_reify (EV_P) 1976idle_reify (EV_P)
1546{ 1977{
1547 if (expect_false (idleall)) 1978 if (expect_false (idleall))
1548 { 1979 {
1549 int pri; 1980 int pri;
… …
1561 } 1992 }
1562 } 1993 }
1563} 1994}
1564#endif 1995#endif
1565 1996
1566void inline_speed 1997/* make timers pending */
1998inline_size void
1999timers_reify (EV_P)
2000{
2001 EV_FREQUENT_CHECK;
2002
2003 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
2004 {
2005 do
2006 {
2007 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
2008
2009 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
2010
2011 /* first reschedule or stop timer */
2012 if (w->repeat)
2013 {
2014 ev_at (w) += w->repeat;
2015 if (ev_at (w) < mn_now)
2016 ev_at (w) = mn_now;
2017
2018 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
2019
2020 ANHE_at_cache (timers [HEAP0]);
2021 downheap (timers, timercnt, HEAP0);
2022 }
2023 else
2024 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
2025
2026 EV_FREQUENT_CHECK;
2027 feed_reverse (EV_A_ (W)w);
2028 }
2029 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2030
2031 feed_reverse_done (EV_A_ EV_TIMEOUT);
2032 }
2033}
2034
2035#if EV_PERIODIC_ENABLE
2036/* make periodics pending */
2037inline_size void
2038periodics_reify (EV_P)
2039{
2040 EV_FREQUENT_CHECK;
2041
2042 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
2043 {
2044 int feed_count = 0;
2045
2046 do
2047 {
2048 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
2049
2050 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
2051
2052 /* first reschedule or stop timer */
2053 if (w->reschedule_cb)
2054 {
2055 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2056
2057 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
2058
2059 ANHE_at_cache (periodics [HEAP0]);
2060 downheap (periodics, periodiccnt, HEAP0);
2061 }
2062 else if (w->interval)
2063 {
2064 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2065 /* if next trigger time is not sufficiently in the future, put it there */
2066 /* this might happen because of floating point inexactness */
2067 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2068 {
2069 ev_at (w) += w->interval;
2070
2071 /* if interval is unreasonably low we might still have a time in the past */
2072 /* so correct this. this will make the periodic very inexact, but the user */
2073 /* has effectively asked to get triggered more often than possible */
2074 if (ev_at (w) < ev_rt_now)
2075 ev_at (w) = ev_rt_now;
2076 }
2077
2078 ANHE_at_cache (periodics [HEAP0]);
2079 downheap (periodics, periodiccnt, HEAP0);
2080 }
2081 else
2082 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2083
2084 EV_FREQUENT_CHECK;
2085 feed_reverse (EV_A_ (W)w);
2086 }
2087 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
2088
2089 feed_reverse_done (EV_A_ EV_PERIODIC);
2090 }
2091}
2092
2093/* simply recalculate all periodics */
2094/* TODO: maybe ensure that at leats one event happens when jumping forward? */
2095static void noinline
2096periodics_reschedule (EV_P)
2097{
2098 int i;
2099
2100 /* adjust periodics after time jump */
2101 for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
2102 {
2103 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
2104
2105 if (w->reschedule_cb)
2106 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2107 else if (w->interval)
2108 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2109
2110 ANHE_at_cache (periodics [i]);
2111 }
2112
2113 reheap (periodics, periodiccnt);
2114}
2115#endif
2116
2117/* adjust all timers by a given offset */
2118static void noinline
2119timers_reschedule (EV_P_ ev_tstamp adjust)
2120{
2121 int i;
2122
2123 for (i = 0; i < timercnt; ++i)
2124 {
2125 ANHE *he = timers + i + HEAP0;
2126 ANHE_w (*he)->at += adjust;
2127 ANHE_at_cache (*he);
2128 }
2129}
2130
2131/* fetch new monotonic and realtime times from the kernel */
2132/* also detetc if there was a timejump, and act accordingly */
2133inline_speed void
1567time_update (EV_P_ ev_tstamp max_block) 2134time_update (EV_P_ ev_tstamp max_block)
1568{ 2135{
1569 int i;
1570
1571#if EV_USE_MONOTONIC 2136#if EV_USE_MONOTONIC
1572 if (expect_true (have_monotonic)) 2137 if (expect_true (have_monotonic))
1573 { 2138 {
2139 int i;
1574 ev_tstamp odiff = rtmn_diff; 2140 ev_tstamp odiff = rtmn_diff;
1575 2141
1576 mn_now = get_clock (); 2142 mn_now = get_clock ();
1577 2143
1578 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2144 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
… …
1596 */ 2162 */
1597 for (i = 4; --i; ) 2163 for (i = 4; --i; )
1598 { 2164 {
1599 rtmn_diff = ev_rt_now - mn_now; 2165 rtmn_diff = ev_rt_now - mn_now;
1600 2166
1601 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 2167 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1602 return; /* all is well */ 2168 return; /* all is well */
1603 2169
1604 ev_rt_now = ev_time (); 2170 ev_rt_now = ev_time ();
1605 mn_now = get_clock (); 2171 mn_now = get_clock ();
1606 now_floor = mn_now; 2172 now_floor = mn_now;
1607 } 2173 }
1608 2174
2175 /* no timer adjustment, as the monotonic clock doesn't jump */
2176 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1609# if EV_PERIODIC_ENABLE 2177# if EV_PERIODIC_ENABLE
1610 periodics_reschedule (EV_A); 2178 periodics_reschedule (EV_A);
1611# endif 2179# endif
1612 /* no timer adjustment, as the monotonic clock doesn't jump */
1613 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1614 } 2180 }
1615 else 2181 else
1616#endif 2182#endif
1617 { 2183 {
1618 ev_rt_now = ev_time (); 2184 ev_rt_now = ev_time ();
1619 2185
1620 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2186 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1621 { 2187 {
2188 /* adjust timers. this is easy, as the offset is the same for all of them */
2189 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1622#if EV_PERIODIC_ENABLE 2190#if EV_PERIODIC_ENABLE
1623 periodics_reschedule (EV_A); 2191 periodics_reschedule (EV_A);
1624#endif 2192#endif
1625 /* adjust timers. this is easy, as the offset is the same for all of them */
1626 for (i = 1; i <= timercnt; ++i)
1627 ev_at (timers [i]) += ev_rt_now - mn_now;
1628 } 2193 }
1629 2194
1630 mn_now = ev_rt_now; 2195 mn_now = ev_rt_now;
1631 } 2196 }
1632} 2197}
1633 2198
1634void 2199void
1635ev_ref (EV_P)
1636{
1637 ++activecnt;
1638}
1639
1640void
1641ev_unref (EV_P)
1642{
1643 --activecnt;
1644}
1645
1646static int loop_done;
1647
1648void
1649ev_loop (EV_P_ int flags) 2200ev_loop (EV_P_ int flags)
1650{ 2201{
2202#if EV_MINIMAL < 2
2203 ++loop_depth;
2204#endif
2205
2206 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2207
1651 loop_done = EVUNLOOP_CANCEL; 2208 loop_done = EVUNLOOP_CANCEL;
1652 2209
1653 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2210 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1654 2211
1655 do 2212 do
1656 { 2213 {
2214#if EV_VERIFY >= 2
2215 ev_loop_verify (EV_A);
2216#endif
2217
1657#ifndef _WIN32 2218#ifndef _WIN32
1658 if (expect_false (curpid)) /* penalise the forking check even more */ 2219 if (expect_false (curpid)) /* penalise the forking check even more */
1659 if (expect_false (getpid () != curpid)) 2220 if (expect_false (getpid () != curpid))
1660 { 2221 {
1661 curpid = getpid (); 2222 curpid = getpid ();
… …
1667 /* we might have forked, so queue fork handlers */ 2228 /* we might have forked, so queue fork handlers */
1668 if (expect_false (postfork)) 2229 if (expect_false (postfork))
1669 if (forkcnt) 2230 if (forkcnt)
1670 { 2231 {
1671 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2232 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1672 call_pending (EV_A); 2233 EV_INVOKE_PENDING;
1673 } 2234 }
1674#endif 2235#endif
1675 2236
1676 /* queue prepare watchers (and execute them) */ 2237 /* queue prepare watchers (and execute them) */
1677 if (expect_false (preparecnt)) 2238 if (expect_false (preparecnt))
1678 { 2239 {
1679 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2240 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1680 call_pending (EV_A); 2241 EV_INVOKE_PENDING;
1681 } 2242 }
1682 2243
1683 if (expect_false (!activecnt)) 2244 if (expect_false (loop_done))
1684 break; 2245 break;
1685 2246
1686 /* we might have forked, so reify kernel state if necessary */ 2247 /* we might have forked, so reify kernel state if necessary */
1687 if (expect_false (postfork)) 2248 if (expect_false (postfork))
1688 loop_fork (EV_A); 2249 loop_fork (EV_A);
… …
1695 ev_tstamp waittime = 0.; 2256 ev_tstamp waittime = 0.;
1696 ev_tstamp sleeptime = 0.; 2257 ev_tstamp sleeptime = 0.;
1697 2258
1698 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2259 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1699 { 2260 {
2261 /* remember old timestamp for io_blocktime calculation */
2262 ev_tstamp prev_mn_now = mn_now;
2263
1700 /* update time to cancel out callback processing overhead */ 2264 /* update time to cancel out callback processing overhead */
1701 time_update (EV_A_ 1e100); 2265 time_update (EV_A_ 1e100);
1702 2266
1703 waittime = MAX_BLOCKTIME; 2267 waittime = MAX_BLOCKTIME;
1704 2268
1705 if (timercnt) 2269 if (timercnt)
1706 { 2270 {
1707 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge; 2271 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
1708 if (waittime > to) waittime = to; 2272 if (waittime > to) waittime = to;
1709 } 2273 }
1710 2274
1711#if EV_PERIODIC_ENABLE 2275#if EV_PERIODIC_ENABLE
1712 if (periodiccnt) 2276 if (periodiccnt)
1713 { 2277 {
1714 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge; 2278 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1715 if (waittime > to) waittime = to; 2279 if (waittime > to) waittime = to;
1716 } 2280 }
1717#endif 2281#endif
1718 2282
2283 /* don't let timeouts decrease the waittime below timeout_blocktime */
1719 if (expect_false (waittime < timeout_blocktime)) 2284 if (expect_false (waittime < timeout_blocktime))
1720 waittime = timeout_blocktime; 2285 waittime = timeout_blocktime;
1721 2286
1722 sleeptime = waittime - backend_fudge; 2287 /* extra check because io_blocktime is commonly 0 */
1723
1724 if (expect_true (sleeptime > io_blocktime)) 2288 if (expect_false (io_blocktime))
1725 sleeptime = io_blocktime;
1726
1727 if (sleeptime)
1728 { 2289 {
2290 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2291
2292 if (sleeptime > waittime - backend_fudge)
2293 sleeptime = waittime - backend_fudge;
2294
2295 if (expect_true (sleeptime > 0.))
2296 {
1729 ev_sleep (sleeptime); 2297 ev_sleep (sleeptime);
1730 waittime -= sleeptime; 2298 waittime -= sleeptime;
2299 }
1731 } 2300 }
1732 } 2301 }
1733 2302
2303#if EV_MINIMAL < 2
1734 ++loop_count; 2304 ++loop_count;
2305#endif
2306 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
1735 backend_poll (EV_A_ waittime); 2307 backend_poll (EV_A_ waittime);
2308 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
1736 2309
1737 /* update ev_rt_now, do magic */ 2310 /* update ev_rt_now, do magic */
1738 time_update (EV_A_ waittime + sleeptime); 2311 time_update (EV_A_ waittime + sleeptime);
1739 } 2312 }
1740 2313
… …
1751 2324
1752 /* queue check watchers, to be executed first */ 2325 /* queue check watchers, to be executed first */
1753 if (expect_false (checkcnt)) 2326 if (expect_false (checkcnt))
1754 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2327 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1755 2328
1756 call_pending (EV_A); 2329 EV_INVOKE_PENDING;
1757 } 2330 }
1758 while (expect_true ( 2331 while (expect_true (
1759 activecnt 2332 activecnt
1760 && !loop_done 2333 && !loop_done
1761 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2334 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1762 )); 2335 ));
1763 2336
1764 if (loop_done == EVUNLOOP_ONE) 2337 if (loop_done == EVUNLOOP_ONE)
1765 loop_done = EVUNLOOP_CANCEL; 2338 loop_done = EVUNLOOP_CANCEL;
2339
2340#if EV_MINIMAL < 2
2341 --loop_depth;
2342#endif
1766} 2343}
1767 2344
1768void 2345void
1769ev_unloop (EV_P_ int how) 2346ev_unloop (EV_P_ int how)
1770{ 2347{
1771 loop_done = how; 2348 loop_done = how;
1772} 2349}
1773 2350
2351void
2352ev_ref (EV_P)
2353{
2354 ++activecnt;
2355}
2356
2357void
2358ev_unref (EV_P)
2359{
2360 --activecnt;
2361}
2362
2363void
2364ev_now_update (EV_P)
2365{
2366 time_update (EV_A_ 1e100);
2367}
2368
2369void
2370ev_suspend (EV_P)
2371{
2372 ev_now_update (EV_A);
2373}
2374
2375void
2376ev_resume (EV_P)
2377{
2378 ev_tstamp mn_prev = mn_now;
2379
2380 ev_now_update (EV_A);
2381 timers_reschedule (EV_A_ mn_now - mn_prev);
2382#if EV_PERIODIC_ENABLE
2383 /* TODO: really do this? */
2384 periodics_reschedule (EV_A);
2385#endif
2386}
2387
1774/*****************************************************************************/ 2388/*****************************************************************************/
2389/* singly-linked list management, used when the expected list length is short */
1775 2390
1776void inline_size 2391inline_size void
1777wlist_add (WL *head, WL elem) 2392wlist_add (WL *head, WL elem)
1778{ 2393{
1779 elem->next = *head; 2394 elem->next = *head;
1780 *head = elem; 2395 *head = elem;
1781} 2396}
1782 2397
1783void inline_size 2398inline_size void
1784wlist_del (WL *head, WL elem) 2399wlist_del (WL *head, WL elem)
1785{ 2400{
1786 while (*head) 2401 while (*head)
1787 { 2402 {
1788 if (*head == elem) 2403 if (expect_true (*head == elem))
1789 { 2404 {
1790 *head = elem->next; 2405 *head = elem->next;
1791 return; 2406 break;
1792 } 2407 }
1793 2408
1794 head = &(*head)->next; 2409 head = &(*head)->next;
1795 } 2410 }
1796} 2411}
1797 2412
1798void inline_speed 2413/* internal, faster, version of ev_clear_pending */
2414inline_speed void
1799clear_pending (EV_P_ W w) 2415clear_pending (EV_P_ W w)
1800{ 2416{
1801 if (w->pending) 2417 if (w->pending)
1802 { 2418 {
1803 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2419 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
1804 w->pending = 0; 2420 w->pending = 0;
1805 } 2421 }
1806} 2422}
1807 2423
1808int 2424int
… …
1812 int pending = w_->pending; 2428 int pending = w_->pending;
1813 2429
1814 if (expect_true (pending)) 2430 if (expect_true (pending))
1815 { 2431 {
1816 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2432 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2433 p->w = (W)&pending_w;
1817 w_->pending = 0; 2434 w_->pending = 0;
1818 p->w = 0;
1819 return p->events; 2435 return p->events;
1820 } 2436 }
1821 else 2437 else
1822 return 0; 2438 return 0;
1823} 2439}
1824 2440
1825void inline_size 2441inline_size void
1826pri_adjust (EV_P_ W w) 2442pri_adjust (EV_P_ W w)
1827{ 2443{
1828 int pri = w->priority; 2444 int pri = ev_priority (w);
1829 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2445 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1830 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2446 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1831 w->priority = pri; 2447 ev_set_priority (w, pri);
1832} 2448}
1833 2449
1834void inline_speed 2450inline_speed void
1835ev_start (EV_P_ W w, int active) 2451ev_start (EV_P_ W w, int active)
1836{ 2452{
1837 pri_adjust (EV_A_ w); 2453 pri_adjust (EV_A_ w);
1838 w->active = active; 2454 w->active = active;
1839 ev_ref (EV_A); 2455 ev_ref (EV_A);
1840} 2456}
1841 2457
1842void inline_size 2458inline_size void
1843ev_stop (EV_P_ W w) 2459ev_stop (EV_P_ W w)
1844{ 2460{
1845 ev_unref (EV_A); 2461 ev_unref (EV_A);
1846 w->active = 0; 2462 w->active = 0;
1847} 2463}
… …
1854 int fd = w->fd; 2470 int fd = w->fd;
1855 2471
1856 if (expect_false (ev_is_active (w))) 2472 if (expect_false (ev_is_active (w)))
1857 return; 2473 return;
1858 2474
1859 assert (("ev_io_start called with negative fd", fd >= 0)); 2475 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2476 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2477
2478 EV_FREQUENT_CHECK;
1860 2479
1861 ev_start (EV_A_ (W)w, 1); 2480 ev_start (EV_A_ (W)w, 1);
1862 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2481 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1863 wlist_add (&anfds[fd].head, (WL)w); 2482 wlist_add (&anfds[fd].head, (WL)w);
1864 2483
1865 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2484 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
1866 w->events &= ~EV_IOFDSET; 2485 w->events &= ~EV__IOFDSET;
2486
2487 EV_FREQUENT_CHECK;
1867} 2488}
1868 2489
1869void noinline 2490void noinline
1870ev_io_stop (EV_P_ ev_io *w) 2491ev_io_stop (EV_P_ ev_io *w)
1871{ 2492{
1872 clear_pending (EV_A_ (W)w); 2493 clear_pending (EV_A_ (W)w);
1873 if (expect_false (!ev_is_active (w))) 2494 if (expect_false (!ev_is_active (w)))
1874 return; 2495 return;
1875 2496
1876 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2497 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2498
2499 EV_FREQUENT_CHECK;
1877 2500
1878 wlist_del (&anfds[w->fd].head, (WL)w); 2501 wlist_del (&anfds[w->fd].head, (WL)w);
1879 ev_stop (EV_A_ (W)w); 2502 ev_stop (EV_A_ (W)w);
1880 2503
1881 fd_change (EV_A_ w->fd, 1); 2504 fd_change (EV_A_ w->fd, 1);
2505
2506 EV_FREQUENT_CHECK;
1882} 2507}
1883 2508
1884void noinline 2509void noinline
1885ev_timer_start (EV_P_ ev_timer *w) 2510ev_timer_start (EV_P_ ev_timer *w)
1886{ 2511{
1887 if (expect_false (ev_is_active (w))) 2512 if (expect_false (ev_is_active (w)))
1888 return; 2513 return;
1889 2514
1890 ev_at (w) += mn_now; 2515 ev_at (w) += mn_now;
1891 2516
1892 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2517 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1893 2518
2519 EV_FREQUENT_CHECK;
2520
2521 ++timercnt;
1894 ev_start (EV_A_ (W)w, ++timercnt); 2522 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
1895 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2); 2523 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
1896 timers [timercnt] = (WT)w; 2524 ANHE_w (timers [ev_active (w)]) = (WT)w;
2525 ANHE_at_cache (timers [ev_active (w)]);
1897 upheap (timers, timercnt); 2526 upheap (timers, ev_active (w));
1898 2527
2528 EV_FREQUENT_CHECK;
2529
1899 /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/ 2530 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
1900} 2531}
1901 2532
1902void noinline 2533void noinline
1903ev_timer_stop (EV_P_ ev_timer *w) 2534ev_timer_stop (EV_P_ ev_timer *w)
1904{ 2535{
1905 clear_pending (EV_A_ (W)w); 2536 clear_pending (EV_A_ (W)w);
1906 if (expect_false (!ev_is_active (w))) 2537 if (expect_false (!ev_is_active (w)))
1907 return; 2538 return;
1908 2539
1909 assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w)); 2540 EV_FREQUENT_CHECK;
1910 2541
1911 { 2542 {
1912 int active = ((W)w)->active; 2543 int active = ev_active (w);
1913 2544
2545 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2546
2547 --timercnt;
2548
1914 if (expect_true (active < timercnt)) 2549 if (expect_true (active < timercnt + HEAP0))
1915 { 2550 {
1916 timers [active] = timers [timercnt]; 2551 timers [active] = timers [timercnt + HEAP0];
1917 adjustheap (timers, timercnt, active); 2552 adjustheap (timers, timercnt, active);
1918 } 2553 }
1919
1920 --timercnt;
1921 } 2554 }
2555
2556 EV_FREQUENT_CHECK;
1922 2557
1923 ev_at (w) -= mn_now; 2558 ev_at (w) -= mn_now;
1924 2559
1925 ev_stop (EV_A_ (W)w); 2560 ev_stop (EV_A_ (W)w);
1926} 2561}
1927 2562
1928void noinline 2563void noinline
1929ev_timer_again (EV_P_ ev_timer *w) 2564ev_timer_again (EV_P_ ev_timer *w)
1930{ 2565{
2566 EV_FREQUENT_CHECK;
2567
1931 if (ev_is_active (w)) 2568 if (ev_is_active (w))
1932 { 2569 {
1933 if (w->repeat) 2570 if (w->repeat)
1934 { 2571 {
1935 ev_at (w) = mn_now + w->repeat; 2572 ev_at (w) = mn_now + w->repeat;
2573 ANHE_at_cache (timers [ev_active (w)]);
1936 adjustheap (timers, timercnt, ((W)w)->active); 2574 adjustheap (timers, timercnt, ev_active (w));
1937 } 2575 }
1938 else 2576 else
1939 ev_timer_stop (EV_A_ w); 2577 ev_timer_stop (EV_A_ w);
1940 } 2578 }
1941 else if (w->repeat) 2579 else if (w->repeat)
1942 { 2580 {
1943 w->at = w->repeat; 2581 ev_at (w) = w->repeat;
1944 ev_timer_start (EV_A_ w); 2582 ev_timer_start (EV_A_ w);
1945 } 2583 }
2584
2585 EV_FREQUENT_CHECK;
2586}
2587
2588ev_tstamp
2589ev_timer_remaining (EV_P_ ev_timer *w)
2590{
2591 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
1946} 2592}
1947 2593
1948#if EV_PERIODIC_ENABLE 2594#if EV_PERIODIC_ENABLE
1949void noinline 2595void noinline
1950ev_periodic_start (EV_P_ ev_periodic *w) 2596ev_periodic_start (EV_P_ ev_periodic *w)
… …
1954 2600
1955 if (w->reschedule_cb) 2601 if (w->reschedule_cb)
1956 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2602 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1957 else if (w->interval) 2603 else if (w->interval)
1958 { 2604 {
1959 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2605 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
1960 /* this formula differs from the one in periodic_reify because we do not always round up */ 2606 /* this formula differs from the one in periodic_reify because we do not always round up */
1961 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2607 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1962 } 2608 }
1963 else 2609 else
1964 ev_at (w) = w->offset; 2610 ev_at (w) = w->offset;
1965 2611
2612 EV_FREQUENT_CHECK;
2613
2614 ++periodiccnt;
1966 ev_start (EV_A_ (W)w, ++periodiccnt); 2615 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
1967 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2); 2616 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
1968 periodics [periodiccnt] = (WT)w; 2617 ANHE_w (periodics [ev_active (w)]) = (WT)w;
1969 upheap (periodics, periodiccnt); 2618 ANHE_at_cache (periodics [ev_active (w)]);
2619 upheap (periodics, ev_active (w));
1970 2620
2621 EV_FREQUENT_CHECK;
2622
1971 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2623 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
1972} 2624}
1973 2625
1974void noinline 2626void noinline
1975ev_periodic_stop (EV_P_ ev_periodic *w) 2627ev_periodic_stop (EV_P_ ev_periodic *w)
1976{ 2628{
1977 clear_pending (EV_A_ (W)w); 2629 clear_pending (EV_A_ (W)w);
1978 if (expect_false (!ev_is_active (w))) 2630 if (expect_false (!ev_is_active (w)))
1979 return; 2631 return;
1980 2632
1981 assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w)); 2633 EV_FREQUENT_CHECK;
1982 2634
1983 { 2635 {
1984 int active = ((W)w)->active; 2636 int active = ev_active (w);
1985 2637
2638 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2639
2640 --periodiccnt;
2641
1986 if (expect_true (active < periodiccnt)) 2642 if (expect_true (active < periodiccnt + HEAP0))
1987 { 2643 {
1988 periodics [active] = periodics [periodiccnt]; 2644 periodics [active] = periodics [periodiccnt + HEAP0];
1989 adjustheap (periodics, periodiccnt, active); 2645 adjustheap (periodics, periodiccnt, active);
1990 } 2646 }
1991
1992 --periodiccnt;
1993 } 2647 }
2648
2649 EV_FREQUENT_CHECK;
1994 2650
1995 ev_stop (EV_A_ (W)w); 2651 ev_stop (EV_A_ (W)w);
1996} 2652}
1997 2653
1998void noinline 2654void noinline
… …
2009#endif 2665#endif
2010 2666
2011void noinline 2667void noinline
2012ev_signal_start (EV_P_ ev_signal *w) 2668ev_signal_start (EV_P_ ev_signal *w)
2013{ 2669{
2014#if EV_MULTIPLICITY
2015 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2016#endif
2017 if (expect_false (ev_is_active (w))) 2670 if (expect_false (ev_is_active (w)))
2018 return; 2671 return;
2019 2672
2020 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2673 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2021 2674
2022 evpipe_init (EV_A); 2675#if EV_MULTIPLICITY
2676 assert (("libev: tried to attach to a signal from two different loops",
2677 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2023 2678
2679 signals [w->signum - 1].loop = EV_A;
2680#endif
2681
2682 EV_FREQUENT_CHECK;
2683
2684#if EV_USE_SIGNALFD
2685 if (sigfd == -2)
2024 { 2686 {
2025#ifndef _WIN32 2687 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2026 sigset_t full, prev; 2688 if (sigfd < 0 && errno == EINVAL)
2027 sigfillset (&full); 2689 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2028 sigprocmask (SIG_SETMASK, &full, &prev);
2029#endif
2030 2690
2031 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2691 if (sigfd >= 0)
2692 {
2693 fd_intern (sigfd); /* doing it twice will not hurt */
2032 2694
2033#ifndef _WIN32 2695 sigemptyset (&sigfd_set);
2034 sigprocmask (SIG_SETMASK, &prev, 0); 2696
2035#endif 2697 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2698 ev_set_priority (&sigfd_w, EV_MAXPRI);
2699 ev_io_start (EV_A_ &sigfd_w);
2700 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2701 }
2036 } 2702 }
2703
2704 if (sigfd >= 0)
2705 {
2706 /* TODO: check .head */
2707 sigaddset (&sigfd_set, w->signum);
2708 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2709
2710 signalfd (sigfd, &sigfd_set, 0);
2711 }
2712#endif
2037 2713
2038 ev_start (EV_A_ (W)w, 1); 2714 ev_start (EV_A_ (W)w, 1);
2039 wlist_add (&signals [w->signum - 1].head, (WL)w); 2715 wlist_add (&signals [w->signum - 1].head, (WL)w);
2040 2716
2041 if (!((WL)w)->next) 2717 if (!((WL)w)->next)
2718# if EV_USE_SIGNALFD
2719 if (sigfd < 0) /*TODO*/
2720# endif
2042 { 2721 {
2043#if _WIN32 2722# if _WIN32
2044 signal (w->signum, ev_sighandler); 2723 signal (w->signum, ev_sighandler);
2045#else 2724# else
2046 struct sigaction sa; 2725 struct sigaction sa;
2726
2727 evpipe_init (EV_A);
2728
2047 sa.sa_handler = ev_sighandler; 2729 sa.sa_handler = ev_sighandler;
2048 sigfillset (&sa.sa_mask); 2730 sigfillset (&sa.sa_mask);
2049 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2731 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2050 sigaction (w->signum, &sa, 0); 2732 sigaction (w->signum, &sa, 0);
2733
2734 sigemptyset (&sa.sa_mask);
2735 sigaddset (&sa.sa_mask, w->signum);
2736 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2051#endif 2737#endif
2052 } 2738 }
2739
2740 EV_FREQUENT_CHECK;
2053} 2741}
2054 2742
2055void noinline 2743void noinline
2056ev_signal_stop (EV_P_ ev_signal *w) 2744ev_signal_stop (EV_P_ ev_signal *w)
2057{ 2745{
2058 clear_pending (EV_A_ (W)w); 2746 clear_pending (EV_A_ (W)w);
2059 if (expect_false (!ev_is_active (w))) 2747 if (expect_false (!ev_is_active (w)))
2060 return; 2748 return;
2061 2749
2750 EV_FREQUENT_CHECK;
2751
2062 wlist_del (&signals [w->signum - 1].head, (WL)w); 2752 wlist_del (&signals [w->signum - 1].head, (WL)w);
2063 ev_stop (EV_A_ (W)w); 2753 ev_stop (EV_A_ (W)w);
2064 2754
2065 if (!signals [w->signum - 1].head) 2755 if (!signals [w->signum - 1].head)
2756 {
2757#if EV_MULTIPLICITY
2758 signals [w->signum - 1].loop = 0; /* unattach from signal */
2759#endif
2760#if EV_USE_SIGNALFD
2761 if (sigfd >= 0)
2762 {
2763 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2764 sigdelset (&sigfd_set, w->signum);
2765 signalfd (sigfd, &sigfd_set, 0);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2767 /*TODO: maybe unblock signal? */
2768 }
2769 else
2770#endif
2066 signal (w->signum, SIG_DFL); 2771 signal (w->signum, SIG_DFL);
2772 }
2773
2774 EV_FREQUENT_CHECK;
2067} 2775}
2068 2776
2069void 2777void
2070ev_child_start (EV_P_ ev_child *w) 2778ev_child_start (EV_P_ ev_child *w)
2071{ 2779{
2072#if EV_MULTIPLICITY 2780#if EV_MULTIPLICITY
2073 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2781 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2074#endif 2782#endif
2075 if (expect_false (ev_is_active (w))) 2783 if (expect_false (ev_is_active (w)))
2076 return; 2784 return;
2077 2785
2786 EV_FREQUENT_CHECK;
2787
2078 ev_start (EV_A_ (W)w, 1); 2788 ev_start (EV_A_ (W)w, 1);
2079 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2789 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2790
2791 EV_FREQUENT_CHECK;
2080} 2792}
2081 2793
2082void 2794void
2083ev_child_stop (EV_P_ ev_child *w) 2795ev_child_stop (EV_P_ ev_child *w)
2084{ 2796{
2085 clear_pending (EV_A_ (W)w); 2797 clear_pending (EV_A_ (W)w);
2086 if (expect_false (!ev_is_active (w))) 2798 if (expect_false (!ev_is_active (w)))
2087 return; 2799 return;
2088 2800
2801 EV_FREQUENT_CHECK;
2802
2089 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2803 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2090 ev_stop (EV_A_ (W)w); 2804 ev_stop (EV_A_ (W)w);
2805
2806 EV_FREQUENT_CHECK;
2091} 2807}
2092 2808
2093#if EV_STAT_ENABLE 2809#if EV_STAT_ENABLE
2094 2810
2095# ifdef _WIN32 2811# ifdef _WIN32
2096# undef lstat 2812# undef lstat
2097# define lstat(a,b) _stati64 (a,b) 2813# define lstat(a,b) _stati64 (a,b)
2098# endif 2814# endif
2099 2815
2100#define DEF_STAT_INTERVAL 5.0074891 2816#define DEF_STAT_INTERVAL 5.0074891
2817#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2101#define MIN_STAT_INTERVAL 0.1074891 2818#define MIN_STAT_INTERVAL 0.1074891
2102 2819
2103static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2820static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2104 2821
2105#if EV_USE_INOTIFY 2822#if EV_USE_INOTIFY
2106# define EV_INOTIFY_BUFSIZE 8192 2823# define EV_INOTIFY_BUFSIZE 8192
… …
2110{ 2827{
2111 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); 2828 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);
2112 2829
2113 if (w->wd < 0) 2830 if (w->wd < 0)
2114 { 2831 {
2832 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2115 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2833 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2116 2834
2117 /* monitor some parent directory for speedup hints */ 2835 /* monitor some parent directory for speedup hints */
2836 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2837 /* but an efficiency issue only */
2118 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2838 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2119 { 2839 {
2120 char path [4096]; 2840 char path [4096];
2121 strcpy (path, w->path); 2841 strcpy (path, w->path);
2122 2842
… …
2125 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2845 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2126 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2846 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2127 2847
2128 char *pend = strrchr (path, '/'); 2848 char *pend = strrchr (path, '/');
2129 2849
2130 if (!pend) 2850 if (!pend || pend == path)
2131 break; /* whoops, no '/', complain to your admin */ 2851 break;
2132 2852
2133 *pend = 0; 2853 *pend = 0;
2134 w->wd = inotify_add_watch (fs_fd, path, mask); 2854 w->wd = inotify_add_watch (fs_fd, path, mask);
2135 } 2855 }
2136 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2856 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2137 } 2857 }
2138 } 2858 }
2139 else
2140 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2141 2859
2142 if (w->wd >= 0) 2860 if (w->wd >= 0)
2861 {
2143 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2862 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2863
2864 /* now local changes will be tracked by inotify, but remote changes won't */
2865 /* unless the filesystem it known to be local, we therefore still poll */
2866 /* also do poll on <2.6.25, but with normal frequency */
2867 struct statfs sfs;
2868
2869 if (fs_2625 && !statfs (w->path, &sfs))
2870 if (sfs.f_type == 0x1373 /* devfs */
2871 || sfs.f_type == 0xEF53 /* ext2/3 */
2872 || sfs.f_type == 0x3153464a /* jfs */
2873 || sfs.f_type == 0x52654973 /* reiser3 */
2874 || sfs.f_type == 0x01021994 /* tempfs */
2875 || sfs.f_type == 0x58465342 /* xfs */)
2876 return;
2877
2878 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2879 ev_timer_again (EV_A_ &w->timer);
2880 }
2144} 2881}
2145 2882
2146static void noinline 2883static void noinline
2147infy_del (EV_P_ ev_stat *w) 2884infy_del (EV_P_ ev_stat *w)
2148{ 2885{
… …
2162 2899
2163static void noinline 2900static void noinline
2164infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2901infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2165{ 2902{
2166 if (slot < 0) 2903 if (slot < 0)
2167 /* overflow, need to check for all hahs slots */ 2904 /* overflow, need to check for all hash slots */
2168 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2905 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2169 infy_wd (EV_A_ slot, wd, ev); 2906 infy_wd (EV_A_ slot, wd, ev);
2170 else 2907 else
2171 { 2908 {
2172 WL w_; 2909 WL w_;
… …
2178 2915
2179 if (w->wd == wd || wd == -1) 2916 if (w->wd == wd || wd == -1)
2180 { 2917 {
2181 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2918 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2182 { 2919 {
2920 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2183 w->wd = -1; 2921 w->wd = -1;
2184 infy_add (EV_A_ w); /* re-add, no matter what */ 2922 infy_add (EV_A_ w); /* re-add, no matter what */
2185 } 2923 }
2186 2924
2187 stat_timer_cb (EV_A_ &w->timer, 0); 2925 stat_timer_cb (EV_A_ &w->timer, 0);
… …
2200 2938
2201 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2939 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2202 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2940 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2203} 2941}
2204 2942
2205void inline_size 2943inline_size void
2944check_2625 (EV_P)
2945{
2946 /* kernels < 2.6.25 are borked
2947 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2948 */
2949 struct utsname buf;
2950 int major, minor, micro;
2951
2952 if (uname (&buf))
2953 return;
2954
2955 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2956 return;
2957
2958 if (major < 2
2959 || (major == 2 && minor < 6)
2960 || (major == 2 && minor == 6 && micro < 25))
2961 return;
2962
2963 fs_2625 = 1;
2964}
2965
2966inline_size void
2206infy_init (EV_P) 2967infy_init (EV_P)
2207{ 2968{
2208 if (fs_fd != -2) 2969 if (fs_fd != -2)
2209 return; 2970 return;
2971
2972 fs_fd = -1;
2973
2974 check_2625 (EV_A);
2210 2975
2211 fs_fd = inotify_init (); 2976 fs_fd = inotify_init ();
2212 2977
2213 if (fs_fd >= 0) 2978 if (fs_fd >= 0)
2214 { 2979 {
… …
2216 ev_set_priority (&fs_w, EV_MAXPRI); 2981 ev_set_priority (&fs_w, EV_MAXPRI);
2217 ev_io_start (EV_A_ &fs_w); 2982 ev_io_start (EV_A_ &fs_w);
2218 } 2983 }
2219} 2984}
2220 2985
2221void inline_size 2986inline_size void
2222infy_fork (EV_P) 2987infy_fork (EV_P)
2223{ 2988{
2224 int slot; 2989 int slot;
2225 2990
2226 if (fs_fd < 0) 2991 if (fs_fd < 0)
… …
2242 w->wd = -1; 3007 w->wd = -1;
2243 3008
2244 if (fs_fd >= 0) 3009 if (fs_fd >= 0)
2245 infy_add (EV_A_ w); /* re-add, no matter what */ 3010 infy_add (EV_A_ w); /* re-add, no matter what */
2246 else 3011 else
2247 ev_timer_start (EV_A_ &w->timer); 3012 ev_timer_again (EV_A_ &w->timer);
2248 } 3013 }
2249
2250 } 3014 }
2251} 3015}
2252 3016
3017#endif
3018
3019#ifdef _WIN32
3020# define EV_LSTAT(p,b) _stati64 (p, b)
3021#else
3022# define EV_LSTAT(p,b) lstat (p, b)
2253#endif 3023#endif
2254 3024
2255void 3025void
2256ev_stat_stat (EV_P_ ev_stat *w) 3026ev_stat_stat (EV_P_ ev_stat *w)
2257{ 3027{
… …
2284 || w->prev.st_atime != w->attr.st_atime 3054 || w->prev.st_atime != w->attr.st_atime
2285 || w->prev.st_mtime != w->attr.st_mtime 3055 || w->prev.st_mtime != w->attr.st_mtime
2286 || w->prev.st_ctime != w->attr.st_ctime 3056 || w->prev.st_ctime != w->attr.st_ctime
2287 ) { 3057 ) {
2288 #if EV_USE_INOTIFY 3058 #if EV_USE_INOTIFY
3059 if (fs_fd >= 0)
3060 {
2289 infy_del (EV_A_ w); 3061 infy_del (EV_A_ w);
2290 infy_add (EV_A_ w); 3062 infy_add (EV_A_ w);
2291 ev_stat_stat (EV_A_ w); /* avoid race... */ 3063 ev_stat_stat (EV_A_ w); /* avoid race... */
3064 }
2292 #endif 3065 #endif
2293 3066
2294 ev_feed_event (EV_A_ w, EV_STAT); 3067 ev_feed_event (EV_A_ w, EV_STAT);
2295 } 3068 }
2296} 3069}
… …
2299ev_stat_start (EV_P_ ev_stat *w) 3072ev_stat_start (EV_P_ ev_stat *w)
2300{ 3073{
2301 if (expect_false (ev_is_active (w))) 3074 if (expect_false (ev_is_active (w)))
2302 return; 3075 return;
2303 3076
2304 /* since we use memcmp, we need to clear any padding data etc. */
2305 memset (&w->prev, 0, sizeof (ev_statdata));
2306 memset (&w->attr, 0, sizeof (ev_statdata));
2307
2308 ev_stat_stat (EV_A_ w); 3077 ev_stat_stat (EV_A_ w);
2309 3078
3079 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2310 if (w->interval < MIN_STAT_INTERVAL) 3080 w->interval = MIN_STAT_INTERVAL;
2311 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2312 3081
2313 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 3082 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2314 ev_set_priority (&w->timer, ev_priority (w)); 3083 ev_set_priority (&w->timer, ev_priority (w));
2315 3084
2316#if EV_USE_INOTIFY 3085#if EV_USE_INOTIFY
2317 infy_init (EV_A); 3086 infy_init (EV_A);
2318 3087
2319 if (fs_fd >= 0) 3088 if (fs_fd >= 0)
2320 infy_add (EV_A_ w); 3089 infy_add (EV_A_ w);
2321 else 3090 else
2322#endif 3091#endif
2323 ev_timer_start (EV_A_ &w->timer); 3092 ev_timer_again (EV_A_ &w->timer);
2324 3093
2325 ev_start (EV_A_ (W)w, 1); 3094 ev_start (EV_A_ (W)w, 1);
3095
3096 EV_FREQUENT_CHECK;
2326} 3097}
2327 3098
2328void 3099void
2329ev_stat_stop (EV_P_ ev_stat *w) 3100ev_stat_stop (EV_P_ ev_stat *w)
2330{ 3101{
2331 clear_pending (EV_A_ (W)w); 3102 clear_pending (EV_A_ (W)w);
2332 if (expect_false (!ev_is_active (w))) 3103 if (expect_false (!ev_is_active (w)))
2333 return; 3104 return;
2334 3105
3106 EV_FREQUENT_CHECK;
3107
2335#if EV_USE_INOTIFY 3108#if EV_USE_INOTIFY
2336 infy_del (EV_A_ w); 3109 infy_del (EV_A_ w);
2337#endif 3110#endif
2338 ev_timer_stop (EV_A_ &w->timer); 3111 ev_timer_stop (EV_A_ &w->timer);
2339 3112
2340 ev_stop (EV_A_ (W)w); 3113 ev_stop (EV_A_ (W)w);
3114
3115 EV_FREQUENT_CHECK;
2341} 3116}
2342#endif 3117#endif
2343 3118
2344#if EV_IDLE_ENABLE 3119#if EV_IDLE_ENABLE
2345void 3120void
… …
2347{ 3122{
2348 if (expect_false (ev_is_active (w))) 3123 if (expect_false (ev_is_active (w)))
2349 return; 3124 return;
2350 3125
2351 pri_adjust (EV_A_ (W)w); 3126 pri_adjust (EV_A_ (W)w);
3127
3128 EV_FREQUENT_CHECK;
2352 3129
2353 { 3130 {
2354 int active = ++idlecnt [ABSPRI (w)]; 3131 int active = ++idlecnt [ABSPRI (w)];
2355 3132
2356 ++idleall; 3133 ++idleall;
2357 ev_start (EV_A_ (W)w, active); 3134 ev_start (EV_A_ (W)w, active);
2358 3135
2359 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 3136 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2360 idles [ABSPRI (w)][active - 1] = w; 3137 idles [ABSPRI (w)][active - 1] = w;
2361 } 3138 }
3139
3140 EV_FREQUENT_CHECK;
2362} 3141}
2363 3142
2364void 3143void
2365ev_idle_stop (EV_P_ ev_idle *w) 3144ev_idle_stop (EV_P_ ev_idle *w)
2366{ 3145{
2367 clear_pending (EV_A_ (W)w); 3146 clear_pending (EV_A_ (W)w);
2368 if (expect_false (!ev_is_active (w))) 3147 if (expect_false (!ev_is_active (w)))
2369 return; 3148 return;
2370 3149
3150 EV_FREQUENT_CHECK;
3151
2371 { 3152 {
2372 int active = ((W)w)->active; 3153 int active = ev_active (w);
2373 3154
2374 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 3155 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2375 ((W)idles [ABSPRI (w)][active - 1])->active = active; 3156 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2376 3157
2377 ev_stop (EV_A_ (W)w); 3158 ev_stop (EV_A_ (W)w);
2378 --idleall; 3159 --idleall;
2379 } 3160 }
3161
3162 EV_FREQUENT_CHECK;
2380} 3163}
2381#endif 3164#endif
2382 3165
2383void 3166void
2384ev_prepare_start (EV_P_ ev_prepare *w) 3167ev_prepare_start (EV_P_ ev_prepare *w)
2385{ 3168{
2386 if (expect_false (ev_is_active (w))) 3169 if (expect_false (ev_is_active (w)))
2387 return; 3170 return;
3171
3172 EV_FREQUENT_CHECK;
2388 3173
2389 ev_start (EV_A_ (W)w, ++preparecnt); 3174 ev_start (EV_A_ (W)w, ++preparecnt);
2390 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 3175 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2391 prepares [preparecnt - 1] = w; 3176 prepares [preparecnt - 1] = w;
3177
3178 EV_FREQUENT_CHECK;
2392} 3179}
2393 3180
2394void 3181void
2395ev_prepare_stop (EV_P_ ev_prepare *w) 3182ev_prepare_stop (EV_P_ ev_prepare *w)
2396{ 3183{
2397 clear_pending (EV_A_ (W)w); 3184 clear_pending (EV_A_ (W)w);
2398 if (expect_false (!ev_is_active (w))) 3185 if (expect_false (!ev_is_active (w)))
2399 return; 3186 return;
2400 3187
3188 EV_FREQUENT_CHECK;
3189
2401 { 3190 {
2402 int active = ((W)w)->active; 3191 int active = ev_active (w);
3192
2403 prepares [active - 1] = prepares [--preparecnt]; 3193 prepares [active - 1] = prepares [--preparecnt];
2404 ((W)prepares [active - 1])->active = active; 3194 ev_active (prepares [active - 1]) = active;
2405 } 3195 }
2406 3196
2407 ev_stop (EV_A_ (W)w); 3197 ev_stop (EV_A_ (W)w);
3198
3199 EV_FREQUENT_CHECK;
2408} 3200}
2409 3201
2410void 3202void
2411ev_check_start (EV_P_ ev_check *w) 3203ev_check_start (EV_P_ ev_check *w)
2412{ 3204{
2413 if (expect_false (ev_is_active (w))) 3205 if (expect_false (ev_is_active (w)))
2414 return; 3206 return;
3207
3208 EV_FREQUENT_CHECK;
2415 3209
2416 ev_start (EV_A_ (W)w, ++checkcnt); 3210 ev_start (EV_A_ (W)w, ++checkcnt);
2417 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 3211 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2418 checks [checkcnt - 1] = w; 3212 checks [checkcnt - 1] = w;
3213
3214 EV_FREQUENT_CHECK;
2419} 3215}
2420 3216
2421void 3217void
2422ev_check_stop (EV_P_ ev_check *w) 3218ev_check_stop (EV_P_ ev_check *w)
2423{ 3219{
2424 clear_pending (EV_A_ (W)w); 3220 clear_pending (EV_A_ (W)w);
2425 if (expect_false (!ev_is_active (w))) 3221 if (expect_false (!ev_is_active (w)))
2426 return; 3222 return;
2427 3223
3224 EV_FREQUENT_CHECK;
3225
2428 { 3226 {
2429 int active = ((W)w)->active; 3227 int active = ev_active (w);
3228
2430 checks [active - 1] = checks [--checkcnt]; 3229 checks [active - 1] = checks [--checkcnt];
2431 ((W)checks [active - 1])->active = active; 3230 ev_active (checks [active - 1]) = active;
2432 } 3231 }
2433 3232
2434 ev_stop (EV_A_ (W)w); 3233 ev_stop (EV_A_ (W)w);
3234
3235 EV_FREQUENT_CHECK;
2435} 3236}
2436 3237
2437#if EV_EMBED_ENABLE 3238#if EV_EMBED_ENABLE
2438void noinline 3239void noinline
2439ev_embed_sweep (EV_P_ ev_embed *w) 3240ev_embed_sweep (EV_P_ ev_embed *w)
… …
2456embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3257embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2457{ 3258{
2458 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3259 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2459 3260
2460 { 3261 {
2461 struct ev_loop *loop = w->other; 3262 EV_P = w->other;
2462 3263
2463 while (fdchangecnt) 3264 while (fdchangecnt)
2464 { 3265 {
2465 fd_reify (EV_A); 3266 fd_reify (EV_A);
2466 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3267 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2467 } 3268 }
2468 } 3269 }
2469} 3270}
2470 3271
3272static void
3273embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3274{
3275 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3276
3277 ev_embed_stop (EV_A_ w);
3278
3279 {
3280 EV_P = w->other;
3281
3282 ev_loop_fork (EV_A);
3283 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3284 }
3285
3286 ev_embed_start (EV_A_ w);
3287}
3288
2471#if 0 3289#if 0
2472static void 3290static void
2473embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3291embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2474{ 3292{
2475 ev_idle_stop (EV_A_ idle); 3293 ev_idle_stop (EV_A_ idle);
… …
2481{ 3299{
2482 if (expect_false (ev_is_active (w))) 3300 if (expect_false (ev_is_active (w)))
2483 return; 3301 return;
2484 3302
2485 { 3303 {
2486 struct ev_loop *loop = w->other; 3304 EV_P = w->other;
2487 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3305 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2488 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3306 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2489 } 3307 }
3308
3309 EV_FREQUENT_CHECK;
2490 3310
2491 ev_set_priority (&w->io, ev_priority (w)); 3311 ev_set_priority (&w->io, ev_priority (w));
2492 ev_io_start (EV_A_ &w->io); 3312 ev_io_start (EV_A_ &w->io);
2493 3313
2494 ev_prepare_init (&w->prepare, embed_prepare_cb); 3314 ev_prepare_init (&w->prepare, embed_prepare_cb);
2495 ev_set_priority (&w->prepare, EV_MINPRI); 3315 ev_set_priority (&w->prepare, EV_MINPRI);
2496 ev_prepare_start (EV_A_ &w->prepare); 3316 ev_prepare_start (EV_A_ &w->prepare);
2497 3317
3318 ev_fork_init (&w->fork, embed_fork_cb);
3319 ev_fork_start (EV_A_ &w->fork);
3320
2498 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3321 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2499 3322
2500 ev_start (EV_A_ (W)w, 1); 3323 ev_start (EV_A_ (W)w, 1);
3324
3325 EV_FREQUENT_CHECK;
2501} 3326}
2502 3327
2503void 3328void
2504ev_embed_stop (EV_P_ ev_embed *w) 3329ev_embed_stop (EV_P_ ev_embed *w)
2505{ 3330{
2506 clear_pending (EV_A_ (W)w); 3331 clear_pending (EV_A_ (W)w);
2507 if (expect_false (!ev_is_active (w))) 3332 if (expect_false (!ev_is_active (w)))
2508 return; 3333 return;
2509 3334
3335 EV_FREQUENT_CHECK;
3336
2510 ev_io_stop (EV_A_ &w->io); 3337 ev_io_stop (EV_A_ &w->io);
2511 ev_prepare_stop (EV_A_ &w->prepare); 3338 ev_prepare_stop (EV_A_ &w->prepare);
3339 ev_fork_stop (EV_A_ &w->fork);
2512 3340
2513 ev_stop (EV_A_ (W)w); 3341 EV_FREQUENT_CHECK;
2514} 3342}
2515#endif 3343#endif
2516 3344
2517#if EV_FORK_ENABLE 3345#if EV_FORK_ENABLE
2518void 3346void
2519ev_fork_start (EV_P_ ev_fork *w) 3347ev_fork_start (EV_P_ ev_fork *w)
2520{ 3348{
2521 if (expect_false (ev_is_active (w))) 3349 if (expect_false (ev_is_active (w)))
2522 return; 3350 return;
3351
3352 EV_FREQUENT_CHECK;
2523 3353
2524 ev_start (EV_A_ (W)w, ++forkcnt); 3354 ev_start (EV_A_ (W)w, ++forkcnt);
2525 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 3355 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2526 forks [forkcnt - 1] = w; 3356 forks [forkcnt - 1] = w;
3357
3358 EV_FREQUENT_CHECK;
2527} 3359}
2528 3360
2529void 3361void
2530ev_fork_stop (EV_P_ ev_fork *w) 3362ev_fork_stop (EV_P_ ev_fork *w)
2531{ 3363{
2532 clear_pending (EV_A_ (W)w); 3364 clear_pending (EV_A_ (W)w);
2533 if (expect_false (!ev_is_active (w))) 3365 if (expect_false (!ev_is_active (w)))
2534 return; 3366 return;
2535 3367
3368 EV_FREQUENT_CHECK;
3369
2536 { 3370 {
2537 int active = ((W)w)->active; 3371 int active = ev_active (w);
3372
2538 forks [active - 1] = forks [--forkcnt]; 3373 forks [active - 1] = forks [--forkcnt];
2539 ((W)forks [active - 1])->active = active; 3374 ev_active (forks [active - 1]) = active;
2540 } 3375 }
2541 3376
2542 ev_stop (EV_A_ (W)w); 3377 ev_stop (EV_A_ (W)w);
3378
3379 EV_FREQUENT_CHECK;
2543} 3380}
2544#endif 3381#endif
2545 3382
2546#if EV_ASYNC_ENABLE 3383#if EV_ASYNC_ENABLE
2547void 3384void
… …
2549{ 3386{
2550 if (expect_false (ev_is_active (w))) 3387 if (expect_false (ev_is_active (w)))
2551 return; 3388 return;
2552 3389
2553 evpipe_init (EV_A); 3390 evpipe_init (EV_A);
3391
3392 EV_FREQUENT_CHECK;
2554 3393
2555 ev_start (EV_A_ (W)w, ++asynccnt); 3394 ev_start (EV_A_ (W)w, ++asynccnt);
2556 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 3395 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2557 asyncs [asynccnt - 1] = w; 3396 asyncs [asynccnt - 1] = w;
3397
3398 EV_FREQUENT_CHECK;
2558} 3399}
2559 3400
2560void 3401void
2561ev_async_stop (EV_P_ ev_async *w) 3402ev_async_stop (EV_P_ ev_async *w)
2562{ 3403{
2563 clear_pending (EV_A_ (W)w); 3404 clear_pending (EV_A_ (W)w);
2564 if (expect_false (!ev_is_active (w))) 3405 if (expect_false (!ev_is_active (w)))
2565 return; 3406 return;
2566 3407
3408 EV_FREQUENT_CHECK;
3409
2567 { 3410 {
2568 int active = ((W)w)->active; 3411 int active = ev_active (w);
3412
2569 asyncs [active - 1] = asyncs [--asynccnt]; 3413 asyncs [active - 1] = asyncs [--asynccnt];
2570 ((W)asyncs [active - 1])->active = active; 3414 ev_active (asyncs [active - 1]) = active;
2571 } 3415 }
2572 3416
2573 ev_stop (EV_A_ (W)w); 3417 ev_stop (EV_A_ (W)w);
3418
3419 EV_FREQUENT_CHECK;
2574} 3420}
2575 3421
2576void 3422void
2577ev_async_send (EV_P_ ev_async *w) 3423ev_async_send (EV_P_ ev_async *w)
2578{ 3424{
2579 w->sent = 1; 3425 w->sent = 1;
2580 evpipe_write (EV_A_ &gotasync); 3426 evpipe_write (EV_A_ &async_pending);
2581} 3427}
2582#endif 3428#endif
2583 3429
2584/*****************************************************************************/ 3430/*****************************************************************************/
2585 3431
… …
2595once_cb (EV_P_ struct ev_once *once, int revents) 3441once_cb (EV_P_ struct ev_once *once, int revents)
2596{ 3442{
2597 void (*cb)(int revents, void *arg) = once->cb; 3443 void (*cb)(int revents, void *arg) = once->cb;
2598 void *arg = once->arg; 3444 void *arg = once->arg;
2599 3445
2600 ev_io_stop (EV_A_ &once->io); 3446 ev_io_stop (EV_A_ &once->io);
2601 ev_timer_stop (EV_A_ &once->to); 3447 ev_timer_stop (EV_A_ &once->to);
2602 ev_free (once); 3448 ev_free (once);
2603 3449
2604 cb (revents, arg); 3450 cb (revents, arg);
2605} 3451}
2606 3452
2607static void 3453static void
2608once_cb_io (EV_P_ ev_io *w, int revents) 3454once_cb_io (EV_P_ ev_io *w, int revents)
2609{ 3455{
2610 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3456 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3457
3458 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2611} 3459}
2612 3460
2613static void 3461static void
2614once_cb_to (EV_P_ ev_timer *w, int revents) 3462once_cb_to (EV_P_ ev_timer *w, int revents)
2615{ 3463{
2616 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3464 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3465
3466 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2617} 3467}
2618 3468
2619void 3469void
2620ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3470ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2621{ 3471{
… …
2643 ev_timer_set (&once->to, timeout, 0.); 3493 ev_timer_set (&once->to, timeout, 0.);
2644 ev_timer_start (EV_A_ &once->to); 3494 ev_timer_start (EV_A_ &once->to);
2645 } 3495 }
2646} 3496}
2647 3497
3498/*****************************************************************************/
3499
3500#if EV_WALK_ENABLE
3501void
3502ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3503{
3504 int i, j;
3505 ev_watcher_list *wl, *wn;
3506
3507 if (types & (EV_IO | EV_EMBED))
3508 for (i = 0; i < anfdmax; ++i)
3509 for (wl = anfds [i].head; wl; )
3510 {
3511 wn = wl->next;
3512
3513#if EV_EMBED_ENABLE
3514 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3515 {
3516 if (types & EV_EMBED)
3517 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3518 }
3519 else
3520#endif
3521#if EV_USE_INOTIFY
3522 if (ev_cb ((ev_io *)wl) == infy_cb)
3523 ;
3524 else
3525#endif
3526 if ((ev_io *)wl != &pipe_w)
3527 if (types & EV_IO)
3528 cb (EV_A_ EV_IO, wl);
3529
3530 wl = wn;
3531 }
3532
3533 if (types & (EV_TIMER | EV_STAT))
3534 for (i = timercnt + HEAP0; i-- > HEAP0; )
3535#if EV_STAT_ENABLE
3536 /*TODO: timer is not always active*/
3537 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3538 {
3539 if (types & EV_STAT)
3540 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3541 }
3542 else
3543#endif
3544 if (types & EV_TIMER)
3545 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3546
3547#if EV_PERIODIC_ENABLE
3548 if (types & EV_PERIODIC)
3549 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3550 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3551#endif
3552
3553#if EV_IDLE_ENABLE
3554 if (types & EV_IDLE)
3555 for (j = NUMPRI; i--; )
3556 for (i = idlecnt [j]; i--; )
3557 cb (EV_A_ EV_IDLE, idles [j][i]);
3558#endif
3559
3560#if EV_FORK_ENABLE
3561 if (types & EV_FORK)
3562 for (i = forkcnt; i--; )
3563 if (ev_cb (forks [i]) != embed_fork_cb)
3564 cb (EV_A_ EV_FORK, forks [i]);
3565#endif
3566
3567#if EV_ASYNC_ENABLE
3568 if (types & EV_ASYNC)
3569 for (i = asynccnt; i--; )
3570 cb (EV_A_ EV_ASYNC, asyncs [i]);
3571#endif
3572
3573 if (types & EV_PREPARE)
3574 for (i = preparecnt; i--; )
3575#if EV_EMBED_ENABLE
3576 if (ev_cb (prepares [i]) != embed_prepare_cb)
3577#endif
3578 cb (EV_A_ EV_PREPARE, prepares [i]);
3579
3580 if (types & EV_CHECK)
3581 for (i = checkcnt; i--; )
3582 cb (EV_A_ EV_CHECK, checks [i]);
3583
3584 if (types & EV_SIGNAL)
3585 for (i = 0; i < EV_NSIG - 1; ++i)
3586 for (wl = signals [i].head; wl; )
3587 {
3588 wn = wl->next;
3589 cb (EV_A_ EV_SIGNAL, wl);
3590 wl = wn;
3591 }
3592
3593 if (types & EV_CHILD)
3594 for (i = EV_PID_HASHSIZE; i--; )
3595 for (wl = childs [i]; wl; )
3596 {
3597 wn = wl->next;
3598 cb (EV_A_ EV_CHILD, wl);
3599 wl = wn;
3600 }
3601/* EV_STAT 0x00001000 /* stat data changed */
3602/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3603}
3604#endif
3605
2648#if EV_MULTIPLICITY 3606#if EV_MULTIPLICITY
2649 #include "ev_wrap.h" 3607 #include "ev_wrap.h"
2650#endif 3608#endif
2651 3609
2652#ifdef __cplusplus 3610#ifdef __cplusplus

Diff Legend

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