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

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

Diff Legend

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