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

Comparing libev/ev.c (file contents):
Revision 1.242 by root, Fri May 9 14:07:19 2008 UTC vs.
Revision 1.289 by root, Sat Jun 6 11:13:16 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# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 69# define EV_USE_REALTIME 0
58# endif 70# endif
59# else 71# else
60# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
62# endif 74# endif
126# define EV_USE_EVENTFD 1 138# define EV_USE_EVENTFD 1
127# else 139# else
128# define EV_USE_EVENTFD 0 140# define EV_USE_EVENTFD 0
129# endif 141# endif
130# endif 142# endif
131 143
132#endif 144#endif
133 145
134#include <math.h> 146#include <math.h>
135#include <stdlib.h> 147#include <stdlib.h>
136#include <fcntl.h> 148#include <fcntl.h>
154#ifndef _WIN32 166#ifndef _WIN32
155# include <sys/time.h> 167# include <sys/time.h>
156# include <sys/wait.h> 168# include <sys/wait.h>
157# include <unistd.h> 169# include <unistd.h>
158#else 170#else
171# include <io.h>
159# define WIN32_LEAN_AND_MEAN 172# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 173# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 174# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 175# define EV_SELECT_IS_WINSOCKET 1
163# endif 176# endif
164#endif 177#endif
165 178
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
167 180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
188
168#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
191# define EV_USE_MONOTONIC 1
192# else
169# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
194# endif
170#endif 195#endif
171 196
172#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
174#endif 199#endif
175 200
176#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
202# if _POSIX_C_SOURCE >= 199309L
203# define EV_USE_NANOSLEEP 1
204# else
177# define EV_USE_NANOSLEEP 0 205# define EV_USE_NANOSLEEP 0
206# endif
178#endif 207#endif
179 208
180#ifndef EV_USE_SELECT 209#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 210# define EV_USE_SELECT 1
182#endif 211#endif
235# else 264# else
236# define EV_USE_EVENTFD 0 265# define EV_USE_EVENTFD 0
237# endif 266# endif
238#endif 267#endif
239 268
269#if 0 /* debugging */
270# define EV_VERIFY 3
271# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1
273#endif
274
275#ifndef EV_VERIFY
276# define EV_VERIFY !EV_MINIMAL
277#endif
278
279#ifndef EV_USE_4HEAP
280# define EV_USE_4HEAP !EV_MINIMAL
281#endif
282
283#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif
286
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 287/* this block fixes any misconfiguration where we know we run into trouble otherwise */
241 288
242#ifndef CLOCK_MONOTONIC 289#ifndef CLOCK_MONOTONIC
243# undef EV_USE_MONOTONIC 290# undef EV_USE_MONOTONIC
244# define EV_USE_MONOTONIC 0 291# define EV_USE_MONOTONIC 0
259# include <sys/select.h> 306# include <sys/select.h>
260# endif 307# endif
261#endif 308#endif
262 309
263#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
311# include <sys/utsname.h>
312# include <sys/statfs.h>
264# include <sys/inotify.h> 313# include <sys/inotify.h>
314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
315# ifndef IN_DONT_FOLLOW
316# undef EV_USE_INOTIFY
317# define EV_USE_INOTIFY 0
318# endif
265#endif 319#endif
266 320
267#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
268# include <winsock.h> 322# include <winsock.h>
323#endif
324
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
269#endif 332#endif
270 333
271#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h> 336# include <stdint.h>
279} 342}
280# endif 343# endif
281#endif 344#endif
282 345
283/**/ 346/**/
347
348#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
350#else
351# define EV_FREQUENT_CHECK do { } while (0)
352#endif
284 353
285/* 354/*
286 * This is used to avoid floating point rounding problems. 355 * This is used to avoid floating point rounding problems.
287 * It is added to ev_rt_now when scheduling periodics 356 * It is added to ev_rt_now when scheduling periodics
288 * to ensure progress, time-wise, even when rounding 357 * to ensure progress, time-wise, even when rounding
328typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
329 398
330#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
332 401
333#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
334/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 403/* 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 */ 404/* giving it a reasonably high chance of working on typical architetcures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif
407
408#if EV_USE_MONOTONIC
336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif 410#endif
338 411
339#ifdef _WIN32 412#ifdef _WIN32
340# include "ev_win32.c" 413# include "ev_win32.c"
349{ 422{
350 syserr_cb = cb; 423 syserr_cb = cb;
351} 424}
352 425
353static void noinline 426static void noinline
354syserr (const char *msg) 427ev_syserr (const char *msg)
355{ 428{
356 if (!msg) 429 if (!msg)
357 msg = "(libev) system error"; 430 msg = "(libev) system error";
358 431
359 if (syserr_cb) 432 if (syserr_cb)
405#define ev_malloc(size) ev_realloc (0, (size)) 478#define ev_malloc(size) ev_realloc (0, (size))
406#define ev_free(ptr) ev_realloc ((ptr), 0) 479#define ev_free(ptr) ev_realloc ((ptr), 0)
407 480
408/*****************************************************************************/ 481/*****************************************************************************/
409 482
483/* file descriptor info structure */
410typedef struct 484typedef struct
411{ 485{
412 WL head; 486 WL head;
413 unsigned char events; 487 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */
489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
414 unsigned char reify; 490 unsigned char unused;
491#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif
415#if EV_SELECT_IS_WINSOCKET 494#if EV_SELECT_IS_WINSOCKET
416 SOCKET handle; 495 SOCKET handle;
417#endif 496#endif
418} ANFD; 497} ANFD;
419 498
499/* stores the pending event set for a given watcher */
420typedef struct 500typedef struct
421{ 501{
422 W w; 502 W w;
423 int events; 503 int events; /* the pending event set for the given watcher */
424} ANPENDING; 504} ANPENDING;
425 505
426#if EV_USE_INOTIFY 506#if EV_USE_INOTIFY
427/* hash table entry per inotify-id */ 507/* hash table entry per inotify-id */
428typedef struct 508typedef struct
430 WL head; 510 WL head;
431} ANFS; 511} ANFS;
432#endif 512#endif
433 513
434/* Heap Entry */ 514/* Heap Entry */
435#define EV_HEAP_CACHE_AT 0
436#if EV_HEAP_CACHE_AT 515#if EV_HEAP_CACHE_AT
516 /* a heap element */
437 typedef struct { 517 typedef struct {
518 ev_tstamp at;
438 WT w; 519 WT w;
439 ev_tstamp at;
440 } ANHE; 520 } ANHE;
441 521
442 #define ANHE_w(he) (he).w /* access watcher, read-write */ 522 #define ANHE_w(he) (he).w /* access watcher, read-write */
443 #define ANHE_at(he) (he).at /* access cached at, read-only */ 523 #define ANHE_at(he) (he).at /* access cached at, read-only */
444 #define ANHE_at_set(he) (he).at = (he).w->at /* update at from watcher */ 524 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
445#else 525#else
526 /* a heap element */
446 typedef WT ANHE; 527 typedef WT ANHE;
447 528
448 #define ANHE_w(he) (he) 529 #define ANHE_w(he) (he)
449 #define ANHE_at(he) (he)->at 530 #define ANHE_at(he) (he)->at
450 #define ANHE_at_set(he) 531 #define ANHE_at_cache(he)
451#endif 532#endif
452 533
453#if EV_MULTIPLICITY 534#if EV_MULTIPLICITY
454 535
455 struct ev_loop 536 struct ev_loop
480 561
481ev_tstamp 562ev_tstamp
482ev_time (void) 563ev_time (void)
483{ 564{
484#if EV_USE_REALTIME 565#if EV_USE_REALTIME
566 if (expect_true (have_realtime))
567 {
485 struct timespec ts; 568 struct timespec ts;
486 clock_gettime (CLOCK_REALTIME, &ts); 569 clock_gettime (CLOCK_REALTIME, &ts);
487 return ts.tv_sec + ts.tv_nsec * 1e-9; 570 return ts.tv_sec + ts.tv_nsec * 1e-9;
488#else 571 }
572#endif
573
489 struct timeval tv; 574 struct timeval tv;
490 gettimeofday (&tv, 0); 575 gettimeofday (&tv, 0);
491 return tv.tv_sec + tv.tv_usec * 1e-6; 576 return tv.tv_sec + tv.tv_usec * 1e-6;
492#endif
493} 577}
494 578
495ev_tstamp inline_size 579inline_size ev_tstamp
496get_clock (void) 580get_clock (void)
497{ 581{
498#if EV_USE_MONOTONIC 582#if EV_USE_MONOTONIC
499 if (expect_true (have_monotonic)) 583 if (expect_true (have_monotonic))
500 { 584 {
533 struct timeval tv; 617 struct timeval tv;
534 618
535 tv.tv_sec = (time_t)delay; 619 tv.tv_sec = (time_t)delay;
536 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
537 621
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */
538 select (0, 0, 0, 0, &tv); 625 select (0, 0, 0, 0, &tv);
539#endif 626#endif
540 } 627 }
541} 628}
542 629
543/*****************************************************************************/ 630/*****************************************************************************/
544 631
545#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 632#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
546 633
547int inline_size 634/* find a suitable new size for the given array, */
635/* hopefully by rounding to a ncie-to-malloc size */
636inline_size int
548array_nextsize (int elem, int cur, int cnt) 637array_nextsize (int elem, int cur, int cnt)
549{ 638{
550 int ncur = cur + 1; 639 int ncur = cur + 1;
551 640
552 do 641 do
569array_realloc (int elem, void *base, int *cur, int cnt) 658array_realloc (int elem, void *base, int *cur, int cnt)
570{ 659{
571 *cur = array_nextsize (elem, *cur, cnt); 660 *cur = array_nextsize (elem, *cur, cnt);
572 return ev_realloc (base, elem * *cur); 661 return ev_realloc (base, elem * *cur);
573} 662}
663
664#define array_init_zero(base,count) \
665 memset ((void *)(base), 0, sizeof (*(base)) * (count))
574 666
575#define array_needsize(type,base,cur,cnt,init) \ 667#define array_needsize(type,base,cur,cnt,init) \
576 if (expect_false ((cnt) > (cur))) \ 668 if (expect_false ((cnt) > (cur))) \
577 { \ 669 { \
578 int ocur_ = (cur); \ 670 int ocur_ = (cur); \
590 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 682 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
591 } 683 }
592#endif 684#endif
593 685
594#define array_free(stem, idx) \ 686#define array_free(stem, idx) \
595 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 687 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
596 688
597/*****************************************************************************/ 689/*****************************************************************************/
690
691/* dummy callback for pending events */
692static void noinline
693pendingcb (EV_P_ ev_prepare *w, int revents)
694{
695}
598 696
599void noinline 697void noinline
600ev_feed_event (EV_P_ void *w, int revents) 698ev_feed_event (EV_P_ void *w, int revents)
601{ 699{
602 W w_ = (W)w; 700 W w_ = (W)w;
611 pendings [pri][w_->pending - 1].w = w_; 709 pendings [pri][w_->pending - 1].w = w_;
612 pendings [pri][w_->pending - 1].events = revents; 710 pendings [pri][w_->pending - 1].events = revents;
613 } 711 }
614} 712}
615 713
616void inline_speed 714inline_speed void
715feed_reverse (EV_P_ W w)
716{
717 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
718 rfeeds [rfeedcnt++] = w;
719}
720
721inline_size void
722feed_reverse_done (EV_P_ int revents)
723{
724 do
725 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
726 while (rfeedcnt);
727}
728
729inline_speed void
617queue_events (EV_P_ W *events, int eventcnt, int type) 730queue_events (EV_P_ W *events, int eventcnt, int type)
618{ 731{
619 int i; 732 int i;
620 733
621 for (i = 0; i < eventcnt; ++i) 734 for (i = 0; i < eventcnt; ++i)
622 ev_feed_event (EV_A_ events [i], type); 735 ev_feed_event (EV_A_ events [i], type);
623} 736}
624 737
625/*****************************************************************************/ 738/*****************************************************************************/
626 739
627void inline_size 740inline_speed void
628anfds_init (ANFD *base, int count)
629{
630 while (count--)
631 {
632 base->head = 0;
633 base->events = EV_NONE;
634 base->reify = 0;
635
636 ++base;
637 }
638}
639
640void inline_speed
641fd_event (EV_P_ int fd, int revents) 741fd_event (EV_P_ int fd, int revents)
642{ 742{
643 ANFD *anfd = anfds + fd; 743 ANFD *anfd = anfds + fd;
644 ev_io *w; 744 ev_io *w;
645 745
657{ 757{
658 if (fd >= 0 && fd < anfdmax) 758 if (fd >= 0 && fd < anfdmax)
659 fd_event (EV_A_ fd, revents); 759 fd_event (EV_A_ fd, revents);
660} 760}
661 761
662void inline_size 762/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */
764inline_size void
663fd_reify (EV_P) 765fd_reify (EV_P)
664{ 766{
665 int i; 767 int i;
666 768
667 for (i = 0; i < fdchangecnt; ++i) 769 for (i = 0; i < fdchangecnt; ++i)
676 events |= (unsigned char)w->events; 778 events |= (unsigned char)w->events;
677 779
678#if EV_SELECT_IS_WINSOCKET 780#if EV_SELECT_IS_WINSOCKET
679 if (events) 781 if (events)
680 { 782 {
681 unsigned long argp; 783 unsigned long arg;
682 #ifdef EV_FD_TO_WIN32_HANDLE 784 #ifdef EV_FD_TO_WIN32_HANDLE
683 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
684 #else 786 #else
685 anfd->handle = _get_osfhandle (fd); 787 anfd->handle = _get_osfhandle (fd);
686 #endif 788 #endif
687 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 789 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
688 } 790 }
689#endif 791#endif
690 792
691 { 793 {
692 unsigned char o_events = anfd->events; 794 unsigned char o_events = anfd->events;
693 unsigned char o_reify = anfd->reify; 795 unsigned char o_reify = anfd->reify;
694 796
695 anfd->reify = 0; 797 anfd->reify = 0;
696 anfd->events = events; 798 anfd->events = events;
697 799
698 if (o_events != events || o_reify & EV_IOFDSET) 800 if (o_events != events || o_reify & EV__IOFDSET)
699 backend_modify (EV_A_ fd, o_events, events); 801 backend_modify (EV_A_ fd, o_events, events);
700 } 802 }
701 } 803 }
702 804
703 fdchangecnt = 0; 805 fdchangecnt = 0;
704} 806}
705 807
706void inline_size 808/* something about the given fd changed */
809inline_size void
707fd_change (EV_P_ int fd, int flags) 810fd_change (EV_P_ int fd, int flags)
708{ 811{
709 unsigned char reify = anfds [fd].reify; 812 unsigned char reify = anfds [fd].reify;
710 anfds [fd].reify |= flags; 813 anfds [fd].reify |= flags;
711 814
715 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 818 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
716 fdchanges [fdchangecnt - 1] = fd; 819 fdchanges [fdchangecnt - 1] = fd;
717 } 820 }
718} 821}
719 822
720void inline_speed 823/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
824inline_speed void
721fd_kill (EV_P_ int fd) 825fd_kill (EV_P_ int fd)
722{ 826{
723 ev_io *w; 827 ev_io *w;
724 828
725 while ((w = (ev_io *)anfds [fd].head)) 829 while ((w = (ev_io *)anfds [fd].head))
727 ev_io_stop (EV_A_ w); 831 ev_io_stop (EV_A_ w);
728 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 832 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
729 } 833 }
730} 834}
731 835
732int inline_size 836/* check whether the given fd is atcually valid, for error recovery */
837inline_size int
733fd_valid (int fd) 838fd_valid (int fd)
734{ 839{
735#ifdef _WIN32 840#ifdef _WIN32
736 return _get_osfhandle (fd) != -1; 841 return _get_osfhandle (fd) != -1;
737#else 842#else
745{ 850{
746 int fd; 851 int fd;
747 852
748 for (fd = 0; fd < anfdmax; ++fd) 853 for (fd = 0; fd < anfdmax; ++fd)
749 if (anfds [fd].events) 854 if (anfds [fd].events)
750 if (!fd_valid (fd) == -1 && errno == EBADF) 855 if (!fd_valid (fd) && errno == EBADF)
751 fd_kill (EV_A_ fd); 856 fd_kill (EV_A_ fd);
752} 857}
753 858
754/* called on ENOMEM in select/poll to kill some fds and retry */ 859/* called on ENOMEM in select/poll to kill some fds and retry */
755static void noinline 860static void noinline
773 878
774 for (fd = 0; fd < anfdmax; ++fd) 879 for (fd = 0; fd < anfdmax; ++fd)
775 if (anfds [fd].events) 880 if (anfds [fd].events)
776 { 881 {
777 anfds [fd].events = 0; 882 anfds [fd].events = 0;
883 anfds [fd].emask = 0;
778 fd_change (EV_A_ fd, EV_IOFDSET | 1); 884 fd_change (EV_A_ fd, EV__IOFDSET | 1);
779 } 885 }
780} 886}
781 887
782/*****************************************************************************/ 888/*****************************************************************************/
783 889
791 * at the moment we allow libev the luxury of two heaps, 897 * at the moment we allow libev the luxury of two heaps,
792 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap 898 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
793 * which is more cache-efficient. 899 * which is more cache-efficient.
794 * the difference is about 5% with 50000+ watchers. 900 * the difference is about 5% with 50000+ watchers.
795 */ 901 */
796#define EV_USE_4HEAP !EV_MINIMAL
797#if EV_USE_4HEAP 902#if EV_USE_4HEAP
798 903
799#define DHEAP 4 904#define DHEAP 4
800#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 905#define HEAP0 (DHEAP - 1) /* index of first element in heap */
801 906#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
802/* towards the root */ 907#define UPHEAP_DONE(p,k) ((p) == (k))
803void inline_speed
804upheap (ANHE *heap, int k)
805{
806 ANHE he = heap [k];
807
808 for (;;)
809 {
810 int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
811
812 if (p == k || ANHE_at (heap [p]) <= ANHE_at (he))
813 break;
814
815 heap [k] = heap [p];
816 ev_active (ANHE_w (heap [k])) = k;
817 k = p;
818 }
819
820 ev_active (ANHE_w (he)) = k;
821 heap [k] = he;
822}
823 908
824/* away from the root */ 909/* away from the root */
825void inline_speed 910inline_speed void
826downheap (ANHE *heap, int N, int k) 911downheap (ANHE *heap, int N, int k)
827{ 912{
828 ANHE he = heap [k]; 913 ANHE he = heap [k];
829 ANHE *E = heap + N + HEAP0; 914 ANHE *E = heap + N + HEAP0;
830 915
831 for (;;) 916 for (;;)
832 { 917 {
833 ev_tstamp minat; 918 ev_tstamp minat;
834 ANHE *minpos; 919 ANHE *minpos;
835 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0; 920 ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
836 921
837 // find minimum child 922 /* find minimum child */
838 if (expect_true (pos + DHEAP - 1 < E)) 923 if (expect_true (pos + DHEAP - 1 < E))
839 { 924 {
840 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 925 /* fast path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
841 if (ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 926 if ( ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
842 if (ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos)); 927 if ( ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
843 if (ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos)); 928 if ( ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
844 } 929 }
845 else if (pos < E) 930 else if (pos < E)
846 { 931 {
847 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos)); 932 /* slow path */ (minpos = pos + 0), (minat = ANHE_at (*minpos));
848 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos)); 933 if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
853 break; 938 break;
854 939
855 if (ANHE_at (he) <= minat) 940 if (ANHE_at (he) <= minat)
856 break; 941 break;
857 942
943 heap [k] = *minpos;
858 ev_active (ANHE_w (*minpos)) = k; 944 ev_active (ANHE_w (*minpos)) = k;
859 heap [k] = *minpos;
860 945
861 k = minpos - heap; 946 k = minpos - heap;
862 } 947 }
863 948
949 heap [k] = he;
864 ev_active (ANHE_w (he)) = k; 950 ev_active (ANHE_w (he)) = k;
865 heap [k] = he;
866} 951}
867 952
868#else // 4HEAP 953#else /* 4HEAP */
869 954
870#define HEAP0 1 955#define HEAP0 1
956#define HPARENT(k) ((k) >> 1)
957#define UPHEAP_DONE(p,k) (!(p))
871 958
872/* towards the root */ 959/* away from the root */
873void inline_speed 960inline_speed void
874upheap (ANHE *heap, int k) 961downheap (ANHE *heap, int N, int k)
875{ 962{
876 ANHE he = heap [k]; 963 ANHE he = heap [k];
877 964
878 for (;;) 965 for (;;)
879 { 966 {
880 int p = k >> 1; 967 int c = k << 1;
881 968
882 /* maybe we could use a dummy element at heap [0]? */ 969 if (c > N + HEAP0 - 1)
883 if (!p || ANHE_at (heap [p]) <= ANHE_at (he))
884 break; 970 break;
885 971
886 heap [k] = heap [p];
887 ev_active (ANHE_w (heap [k])) = k;
888 k = p;
889 }
890
891 heap [k] = w;
892 ev_active (ANHE_w (heap [k])) = k;
893}
894
895/* away from the root */
896void inline_speed
897downheap (ANHE *heap, int N, int k)
898{
899 ANHE he = heap [k];
900
901 for (;;)
902 {
903 int c = k << 1;
904
905 if (c > N)
906 break;
907
908 c += c + 1 < N && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
909 ? 1 : 0; 973 ? 1 : 0;
910 974
911 if (w->at <= ANHE_at (heap [c])) 975 if (ANHE_at (he) <= ANHE_at (heap [c]))
912 break; 976 break;
913 977
914 heap [k] = heap [c]; 978 heap [k] = heap [c];
915 ev_active (ANHE_w (heap [k])) = k; 979 ev_active (ANHE_w (heap [k])) = k;
916 980
920 heap [k] = he; 984 heap [k] = he;
921 ev_active (ANHE_w (he)) = k; 985 ev_active (ANHE_w (he)) = k;
922} 986}
923#endif 987#endif
924 988
925void inline_size 989/* towards the root */
990inline_speed void
991upheap (ANHE *heap, int k)
992{
993 ANHE he = heap [k];
994
995 for (;;)
996 {
997 int p = HPARENT (k);
998
999 if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
1000 break;
1001
1002 heap [k] = heap [p];
1003 ev_active (ANHE_w (heap [k])) = k;
1004 k = p;
1005 }
1006
1007 heap [k] = he;
1008 ev_active (ANHE_w (he)) = k;
1009}
1010
1011/* move an element suitably so it is in a correct place */
1012inline_size void
926adjustheap (ANHE *heap, int N, int k) 1013adjustheap (ANHE *heap, int N, int k)
927{ 1014{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
928 upheap (heap, k); 1016 upheap (heap, k);
1017 else
929 downheap (heap, N, k); 1018 downheap (heap, N, k);
1019}
1020
1021/* rebuild the heap: this function is used only once and executed rarely */
1022inline_size void
1023reheap (ANHE *heap, int N)
1024{
1025 int i;
1026
1027 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
1028 /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
1029 for (i = 0; i < N; ++i)
1030 upheap (heap, i + HEAP0);
930} 1031}
931 1032
932/*****************************************************************************/ 1033/*****************************************************************************/
933 1034
1035/* associate signal watchers to a signal signal */
934typedef struct 1036typedef struct
935{ 1037{
936 WL head; 1038 WL head;
937 EV_ATOMIC_T gotsig; 1039 EV_ATOMIC_T gotsig;
938} ANSIG; 1040} ANSIG;
940static ANSIG *signals; 1042static ANSIG *signals;
941static int signalmax; 1043static int signalmax;
942 1044
943static EV_ATOMIC_T gotsig; 1045static EV_ATOMIC_T gotsig;
944 1046
945void inline_size
946signals_init (ANSIG *base, int count)
947{
948 while (count--)
949 {
950 base->head = 0;
951 base->gotsig = 0;
952
953 ++base;
954 }
955}
956
957/*****************************************************************************/ 1047/*****************************************************************************/
958 1048
959void inline_speed 1049/* used to prepare libev internal fd's */
1050/* this is not fork-safe */
1051inline_speed void
960fd_intern (int fd) 1052fd_intern (int fd)
961{ 1053{
962#ifdef _WIN32 1054#ifdef _WIN32
963 int arg = 1; 1055 unsigned long arg = 1;
964 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1056 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
965#else 1057#else
966 fcntl (fd, F_SETFD, FD_CLOEXEC); 1058 fcntl (fd, F_SETFD, FD_CLOEXEC);
967 fcntl (fd, F_SETFL, O_NONBLOCK); 1059 fcntl (fd, F_SETFL, O_NONBLOCK);
968#endif 1060#endif
969} 1061}
970 1062
971static void noinline 1063static void noinline
972evpipe_init (EV_P) 1064evpipe_init (EV_P)
973{ 1065{
974 if (!ev_is_active (&pipeev)) 1066 if (!ev_is_active (&pipe_w))
975 { 1067 {
976#if EV_USE_EVENTFD 1068#if EV_USE_EVENTFD
977 if ((evfd = eventfd (0, 0)) >= 0) 1069 if ((evfd = eventfd (0, 0)) >= 0)
978 { 1070 {
979 evpipe [0] = -1; 1071 evpipe [0] = -1;
980 fd_intern (evfd); 1072 fd_intern (evfd);
981 ev_io_set (&pipeev, evfd, EV_READ); 1073 ev_io_set (&pipe_w, evfd, EV_READ);
982 } 1074 }
983 else 1075 else
984#endif 1076#endif
985 { 1077 {
986 while (pipe (evpipe)) 1078 while (pipe (evpipe))
987 syserr ("(libev) error creating signal/async pipe"); 1079 ev_syserr ("(libev) error creating signal/async pipe");
988 1080
989 fd_intern (evpipe [0]); 1081 fd_intern (evpipe [0]);
990 fd_intern (evpipe [1]); 1082 fd_intern (evpipe [1]);
991 ev_io_set (&pipeev, evpipe [0], EV_READ); 1083 ev_io_set (&pipe_w, evpipe [0], EV_READ);
992 } 1084 }
993 1085
994 ev_io_start (EV_A_ &pipeev); 1086 ev_io_start (EV_A_ &pipe_w);
995 ev_unref (EV_A); /* watcher should not keep loop alive */ 1087 ev_unref (EV_A); /* watcher should not keep loop alive */
996 } 1088 }
997} 1089}
998 1090
999void inline_size 1091inline_size void
1000evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1092evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1001{ 1093{
1002 if (!*flag) 1094 if (!*flag)
1003 { 1095 {
1004 int old_errno = errno; /* save errno because write might clobber it */ 1096 int old_errno = errno; /* save errno because write might clobber it */
1017 1109
1018 errno = old_errno; 1110 errno = old_errno;
1019 } 1111 }
1020} 1112}
1021 1113
1114/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */
1022static void 1116static void
1023pipecb (EV_P_ ev_io *iow, int revents) 1117pipecb (EV_P_ ev_io *iow, int revents)
1024{ 1118{
1025#if EV_USE_EVENTFD 1119#if EV_USE_EVENTFD
1026 if (evfd >= 0) 1120 if (evfd >= 0)
1082ev_feed_signal_event (EV_P_ int signum) 1176ev_feed_signal_event (EV_P_ int signum)
1083{ 1177{
1084 WL w; 1178 WL w;
1085 1179
1086#if EV_MULTIPLICITY 1180#if EV_MULTIPLICITY
1087 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1088#endif 1182#endif
1089 1183
1090 --signum; 1184 --signum;
1091 1185
1092 if (signum < 0 || signum >= signalmax) 1186 if (signum < 0 || signum >= signalmax)
1108 1202
1109#ifndef WIFCONTINUED 1203#ifndef WIFCONTINUED
1110# define WIFCONTINUED(status) 0 1204# define WIFCONTINUED(status) 0
1111#endif 1205#endif
1112 1206
1113void inline_speed 1207/* handle a single child status event */
1208inline_speed void
1114child_reap (EV_P_ int chain, int pid, int status) 1209child_reap (EV_P_ int chain, int pid, int status)
1115{ 1210{
1116 ev_child *w; 1211 ev_child *w;
1117 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1212 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1118 1213
1131 1226
1132#ifndef WCONTINUED 1227#ifndef WCONTINUED
1133# define WCONTINUED 0 1228# define WCONTINUED 0
1134#endif 1229#endif
1135 1230
1231/* called on sigchld etc., calls waitpid */
1136static void 1232static void
1137childcb (EV_P_ ev_signal *sw, int revents) 1233childcb (EV_P_ ev_signal *sw, int revents)
1138{ 1234{
1139 int pid, status; 1235 int pid, status;
1140 1236
1221 /* kqueue is borked on everything but netbsd apparently */ 1317 /* kqueue is borked on everything but netbsd apparently */
1222 /* it usually doesn't work correctly on anything but sockets and pipes */ 1318 /* it usually doesn't work correctly on anything but sockets and pipes */
1223 flags &= ~EVBACKEND_KQUEUE; 1319 flags &= ~EVBACKEND_KQUEUE;
1224#endif 1320#endif
1225#ifdef __APPLE__ 1321#ifdef __APPLE__
1226 // flags &= ~EVBACKEND_KQUEUE; for documentation 1322 /* only select works correctly on that "unix-certified" platform */
1227 flags &= ~EVBACKEND_POLL; 1323 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1324 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1228#endif 1325#endif
1229 1326
1230 return flags; 1327 return flags;
1231} 1328}
1232 1329
1264ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1265{ 1362{
1266 timeout_blocktime = interval; 1363 timeout_blocktime = interval;
1267} 1364}
1268 1365
1366/* initialise a loop structure, must be zero-initialised */
1269static void noinline 1367static void noinline
1270loop_init (EV_P_ unsigned int flags) 1368loop_init (EV_P_ unsigned int flags)
1271{ 1369{
1272 if (!backend) 1370 if (!backend)
1273 { 1371 {
1372#if EV_USE_REALTIME
1373 if (!have_realtime)
1374 {
1375 struct timespec ts;
1376
1377 if (!clock_gettime (CLOCK_REALTIME, &ts))
1378 have_realtime = 1;
1379 }
1380#endif
1381
1274#if EV_USE_MONOTONIC 1382#if EV_USE_MONOTONIC
1383 if (!have_monotonic)
1275 { 1384 {
1276 struct timespec ts; 1385 struct timespec ts;
1386
1277 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1278 have_monotonic = 1; 1388 have_monotonic = 1;
1279 } 1389 }
1280#endif 1390#endif
1281 1391
1282 ev_rt_now = ev_time (); 1392 ev_rt_now = ev_time ();
1283 mn_now = get_clock (); 1393 mn_now = get_clock ();
1284 now_floor = mn_now; 1394 now_floor = mn_now;
1321#endif 1431#endif
1322#if EV_USE_SELECT 1432#if EV_USE_SELECT
1323 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1433 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1324#endif 1434#endif
1325 1435
1436 ev_prepare_init (&pending_w, pendingcb);
1437
1326 ev_init (&pipeev, pipecb); 1438 ev_init (&pipe_w, pipecb);
1327 ev_set_priority (&pipeev, EV_MAXPRI); 1439 ev_set_priority (&pipe_w, EV_MAXPRI);
1328 } 1440 }
1329} 1441}
1330 1442
1443/* free up a loop structure */
1331static void noinline 1444static void noinline
1332loop_destroy (EV_P) 1445loop_destroy (EV_P)
1333{ 1446{
1334 int i; 1447 int i;
1335 1448
1336 if (ev_is_active (&pipeev)) 1449 if (ev_is_active (&pipe_w))
1337 { 1450 {
1338 ev_ref (EV_A); /* signal watcher */ 1451 ev_ref (EV_A); /* signal watcher */
1339 ev_io_stop (EV_A_ &pipeev); 1452 ev_io_stop (EV_A_ &pipe_w);
1340 1453
1341#if EV_USE_EVENTFD 1454#if EV_USE_EVENTFD
1342 if (evfd >= 0) 1455 if (evfd >= 0)
1343 close (evfd); 1456 close (evfd);
1344#endif 1457#endif
1383 } 1496 }
1384 1497
1385 ev_free (anfds); anfdmax = 0; 1498 ev_free (anfds); anfdmax = 0;
1386 1499
1387 /* have to use the microsoft-never-gets-it-right macro */ 1500 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY);
1388 array_free (fdchange, EMPTY); 1502 array_free (fdchange, EMPTY);
1389 array_free (timer, EMPTY); 1503 array_free (timer, EMPTY);
1390#if EV_PERIODIC_ENABLE 1504#if EV_PERIODIC_ENABLE
1391 array_free (periodic, EMPTY); 1505 array_free (periodic, EMPTY);
1392#endif 1506#endif
1401 1515
1402 backend = 0; 1516 backend = 0;
1403} 1517}
1404 1518
1405#if EV_USE_INOTIFY 1519#if EV_USE_INOTIFY
1406void inline_size infy_fork (EV_P); 1520inline_size void infy_fork (EV_P);
1407#endif 1521#endif
1408 1522
1409void inline_size 1523inline_size void
1410loop_fork (EV_P) 1524loop_fork (EV_P)
1411{ 1525{
1412#if EV_USE_PORT 1526#if EV_USE_PORT
1413 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1527 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1414#endif 1528#endif
1420#endif 1534#endif
1421#if EV_USE_INOTIFY 1535#if EV_USE_INOTIFY
1422 infy_fork (EV_A); 1536 infy_fork (EV_A);
1423#endif 1537#endif
1424 1538
1425 if (ev_is_active (&pipeev)) 1539 if (ev_is_active (&pipe_w))
1426 { 1540 {
1427 /* this "locks" the handlers against writing to the pipe */ 1541 /* this "locks" the handlers against writing to the pipe */
1428 /* while we modify the fd vars */ 1542 /* while we modify the fd vars */
1429 gotsig = 1; 1543 gotsig = 1;
1430#if EV_ASYNC_ENABLE 1544#if EV_ASYNC_ENABLE
1431 gotasync = 1; 1545 gotasync = 1;
1432#endif 1546#endif
1433 1547
1434 ev_ref (EV_A); 1548 ev_ref (EV_A);
1435 ev_io_stop (EV_A_ &pipeev); 1549 ev_io_stop (EV_A_ &pipe_w);
1436 1550
1437#if EV_USE_EVENTFD 1551#if EV_USE_EVENTFD
1438 if (evfd >= 0) 1552 if (evfd >= 0)
1439 close (evfd); 1553 close (evfd);
1440#endif 1554#endif
1445 close (evpipe [1]); 1559 close (evpipe [1]);
1446 } 1560 }
1447 1561
1448 evpipe_init (EV_A); 1562 evpipe_init (EV_A);
1449 /* now iterate over everything, in case we missed something */ 1563 /* now iterate over everything, in case we missed something */
1450 pipecb (EV_A_ &pipeev, EV_READ); 1564 pipecb (EV_A_ &pipe_w, EV_READ);
1451 } 1565 }
1452 1566
1453 postfork = 0; 1567 postfork = 0;
1454} 1568}
1455 1569
1456#if EV_MULTIPLICITY 1570#if EV_MULTIPLICITY
1571
1457struct ev_loop * 1572struct ev_loop *
1458ev_loop_new (unsigned int flags) 1573ev_loop_new (unsigned int flags)
1459{ 1574{
1460 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1461 1576
1479void 1594void
1480ev_loop_fork (EV_P) 1595ev_loop_fork (EV_P)
1481{ 1596{
1482 postfork = 1; /* must be in line with ev_default_fork */ 1597 postfork = 1; /* must be in line with ev_default_fork */
1483} 1598}
1599
1600#if EV_VERIFY
1601static void noinline
1602verify_watcher (EV_P_ W w)
1603{
1604 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1605
1606 if (w->pending)
1607 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1608}
1609
1610static void noinline
1611verify_heap (EV_P_ ANHE *heap, int N)
1612{
1613 int i;
1614
1615 for (i = HEAP0; i < N + HEAP0; ++i)
1616 {
1617 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1618 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1619 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1620
1621 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1622 }
1623}
1624
1625static void noinline
1626array_verify (EV_P_ W *ws, int cnt)
1627{
1628 while (cnt--)
1629 {
1630 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1631 verify_watcher (EV_A_ ws [cnt]);
1632 }
1633}
1634#endif
1635
1636void
1637ev_loop_verify (EV_P)
1638{
1639#if EV_VERIFY
1640 int i;
1641 WL w;
1642
1643 assert (activecnt >= -1);
1644
1645 assert (fdchangemax >= fdchangecnt);
1646 for (i = 0; i < fdchangecnt; ++i)
1647 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1648
1649 assert (anfdmax >= 0);
1650 for (i = 0; i < anfdmax; ++i)
1651 for (w = anfds [i].head; w; w = w->next)
1652 {
1653 verify_watcher (EV_A_ (W)w);
1654 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1655 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1656 }
1657
1658 assert (timermax >= timercnt);
1659 verify_heap (EV_A_ timers, timercnt);
1660
1661#if EV_PERIODIC_ENABLE
1662 assert (periodicmax >= periodiccnt);
1663 verify_heap (EV_A_ periodics, periodiccnt);
1664#endif
1665
1666 for (i = NUMPRI; i--; )
1667 {
1668 assert (pendingmax [i] >= pendingcnt [i]);
1669#if EV_IDLE_ENABLE
1670 assert (idleall >= 0);
1671 assert (idlemax [i] >= idlecnt [i]);
1672 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1673#endif
1674 }
1675
1676#if EV_FORK_ENABLE
1677 assert (forkmax >= forkcnt);
1678 array_verify (EV_A_ (W *)forks, forkcnt);
1679#endif
1680
1681#if EV_ASYNC_ENABLE
1682 assert (asyncmax >= asynccnt);
1683 array_verify (EV_A_ (W *)asyncs, asynccnt);
1684#endif
1685
1686 assert (preparemax >= preparecnt);
1687 array_verify (EV_A_ (W *)prepares, preparecnt);
1688
1689 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt);
1691
1692# if 0
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
1484#endif 1695# endif
1696#endif
1697}
1698
1699#endif /* multiplicity */
1485 1700
1486#if EV_MULTIPLICITY 1701#if EV_MULTIPLICITY
1487struct ev_loop * 1702struct ev_loop *
1488ev_default_loop_init (unsigned int flags) 1703ev_default_loop_init (unsigned int flags)
1489#else 1704#else
1522{ 1737{
1523#if EV_MULTIPLICITY 1738#if EV_MULTIPLICITY
1524 struct ev_loop *loop = ev_default_loop_ptr; 1739 struct ev_loop *loop = ev_default_loop_ptr;
1525#endif 1740#endif
1526 1741
1742 ev_default_loop_ptr = 0;
1743
1527#ifndef _WIN32 1744#ifndef _WIN32
1528 ev_ref (EV_A); /* child watcher */ 1745 ev_ref (EV_A); /* child watcher */
1529 ev_signal_stop (EV_A_ &childev); 1746 ev_signal_stop (EV_A_ &childev);
1530#endif 1747#endif
1531 1748
1537{ 1754{
1538#if EV_MULTIPLICITY 1755#if EV_MULTIPLICITY
1539 struct ev_loop *loop = ev_default_loop_ptr; 1756 struct ev_loop *loop = ev_default_loop_ptr;
1540#endif 1757#endif
1541 1758
1542 if (backend)
1543 postfork = 1; /* must be in line with ev_loop_fork */ 1759 postfork = 1; /* must be in line with ev_loop_fork */
1544} 1760}
1545 1761
1546/*****************************************************************************/ 1762/*****************************************************************************/
1547 1763
1548void 1764void
1549ev_invoke (EV_P_ void *w, int revents) 1765ev_invoke (EV_P_ void *w, int revents)
1550{ 1766{
1551 EV_CB_INVOKE ((W)w, revents); 1767 EV_CB_INVOKE ((W)w, revents);
1552} 1768}
1553 1769
1554void inline_speed 1770inline_speed void
1555call_pending (EV_P) 1771call_pending (EV_P)
1556{ 1772{
1557 int pri; 1773 int pri;
1558 1774
1559 for (pri = NUMPRI; pri--; ) 1775 for (pri = NUMPRI; pri--; )
1560 while (pendingcnt [pri]) 1776 while (pendingcnt [pri])
1561 { 1777 {
1562 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1778 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1563 1779
1564 if (expect_true (p->w))
1565 {
1566 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1780 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1781 /* ^ this is no longer true, as pending_w could be here */
1567 1782
1568 p->w->pending = 0; 1783 p->w->pending = 0;
1569 EV_CB_INVOKE (p->w, p->events); 1784 EV_CB_INVOKE (p->w, p->events);
1570 } 1785 EV_FREQUENT_CHECK;
1571 } 1786 }
1572} 1787}
1573 1788
1574#if EV_IDLE_ENABLE 1789#if EV_IDLE_ENABLE
1575void inline_size 1790/* make idle watchers pending. this handles the "call-idle */
1791/* only when higher priorities are idle" logic */
1792inline_size void
1576idle_reify (EV_P) 1793idle_reify (EV_P)
1577{ 1794{
1578 if (expect_false (idleall)) 1795 if (expect_false (idleall))
1579 { 1796 {
1580 int pri; 1797 int pri;
1592 } 1809 }
1593 } 1810 }
1594} 1811}
1595#endif 1812#endif
1596 1813
1597void inline_size 1814/* make timers pending */
1815inline_size void
1598timers_reify (EV_P) 1816timers_reify (EV_P)
1599{ 1817{
1818 EV_FREQUENT_CHECK;
1819
1600 while (timercnt && ANHE_at (timers [HEAP0]) <= mn_now) 1820 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1601 { 1821 {
1602 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1822 do
1603
1604 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1605
1606 /* first reschedule or stop timer */
1607 if (w->repeat)
1608 { 1823 {
1824 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1825
1826 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1827
1828 /* first reschedule or stop timer */
1829 if (w->repeat)
1830 {
1831 ev_at (w) += w->repeat;
1832 if (ev_at (w) < mn_now)
1833 ev_at (w) = mn_now;
1834
1609 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1835 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1610 1836
1611 ev_at (w) += w->repeat;
1612 if (ev_at (w) < mn_now)
1613 ev_at (w) = mn_now;
1614
1615 ANHE_at_set (timers [HEAP0]); 1837 ANHE_at_cache (timers [HEAP0]);
1616 downheap (timers, timercnt, HEAP0); 1838 downheap (timers, timercnt, HEAP0);
1839 }
1840 else
1841 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1842
1843 EV_FREQUENT_CHECK;
1844 feed_reverse (EV_A_ (W)w);
1617 } 1845 }
1618 else 1846 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1619 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1620 1847
1621 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1848 feed_reverse_done (EV_A_ EV_TIMEOUT);
1622 } 1849 }
1623} 1850}
1624 1851
1625#if EV_PERIODIC_ENABLE 1852#if EV_PERIODIC_ENABLE
1626void inline_size 1853/* make periodics pending */
1854inline_size void
1627periodics_reify (EV_P) 1855periodics_reify (EV_P)
1628{ 1856{
1857 EV_FREQUENT_CHECK;
1858
1629 while (periodiccnt && ANHE_at (periodics [HEAP0]) <= ev_rt_now) 1859 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1630 { 1860 {
1631 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1861 int feed_count = 0;
1632 1862
1633 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1863 do
1634
1635 /* first reschedule or stop timer */
1636 if (w->reschedule_cb)
1637 { 1864 {
1865 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1866
1867 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1868
1869 /* first reschedule or stop timer */
1870 if (w->reschedule_cb)
1871 {
1638 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON); 1872 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1873
1639 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now)); 1874 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1875
1640 ANHE_at_set (periodics [HEAP0]); 1876 ANHE_at_cache (periodics [HEAP0]);
1641 downheap (periodics, periodiccnt, HEAP0); 1877 downheap (periodics, periodiccnt, HEAP0);
1878 }
1879 else if (w->interval)
1880 {
1881 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1882 /* if next trigger time is not sufficiently in the future, put it there */
1883 /* this might happen because of floating point inexactness */
1884 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1885 {
1886 ev_at (w) += w->interval;
1887
1888 /* if interval is unreasonably low we might still have a time in the past */
1889 /* so correct this. this will make the periodic very inexact, but the user */
1890 /* has effectively asked to get triggered more often than possible */
1891 if (ev_at (w) < ev_rt_now)
1892 ev_at (w) = ev_rt_now;
1893 }
1894
1895 ANHE_at_cache (periodics [HEAP0]);
1896 downheap (periodics, periodiccnt, HEAP0);
1897 }
1898 else
1899 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1900
1901 EV_FREQUENT_CHECK;
1902 feed_reverse (EV_A_ (W)w);
1642 } 1903 }
1643 else if (w->interval) 1904 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1644 {
1645 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1646 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1647 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1648 ANHE_at_set (periodics [HEAP0]);
1649 downheap (periodics, periodiccnt, HEAP0);
1650 }
1651 else
1652 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1653 1905
1654 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1906 feed_reverse_done (EV_A_ EV_PERIODIC);
1655 } 1907 }
1656} 1908}
1657 1909
1910/* simply recalculate all periodics */
1911/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1658static void noinline 1912static void noinline
1659periodics_reschedule (EV_P) 1913periodics_reschedule (EV_P)
1660{ 1914{
1661 int i; 1915 int i;
1662 1916
1668 if (w->reschedule_cb) 1922 if (w->reschedule_cb)
1669 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1923 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1670 else if (w->interval) 1924 else if (w->interval)
1671 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1925 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1672 1926
1673 ANHE_at_set (periodics [i]); 1927 ANHE_at_cache (periodics [i]);
1928 }
1929
1930 reheap (periodics, periodiccnt);
1931}
1932#endif
1933
1934/* adjust all timers by a given offset */
1935static void noinline
1936timers_reschedule (EV_P_ ev_tstamp adjust)
1937{
1938 int i;
1939
1940 for (i = 0; i < timercnt; ++i)
1674 } 1941 {
1675 1942 ANHE *he = timers + i + HEAP0;
1676 /* now rebuild the heap, this for the 2-heap, inefficient for the 4-heap, but correct */ 1943 ANHE_w (*he)->at += adjust;
1677 for (i = periodiccnt >> 1; --i; ) 1944 ANHE_at_cache (*he);
1678 downheap (periodics, periodiccnt, i + HEAP0); 1945 }
1679} 1946}
1680#endif
1681 1947
1682void inline_speed 1948/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */
1950inline_speed void
1683time_update (EV_P_ ev_tstamp max_block) 1951time_update (EV_P_ ev_tstamp max_block)
1684{ 1952{
1685 int i;
1686
1687#if EV_USE_MONOTONIC 1953#if EV_USE_MONOTONIC
1688 if (expect_true (have_monotonic)) 1954 if (expect_true (have_monotonic))
1689 { 1955 {
1956 int i;
1690 ev_tstamp odiff = rtmn_diff; 1957 ev_tstamp odiff = rtmn_diff;
1691 1958
1692 mn_now = get_clock (); 1959 mn_now = get_clock ();
1693 1960
1694 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 1961 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1720 ev_rt_now = ev_time (); 1987 ev_rt_now = ev_time ();
1721 mn_now = get_clock (); 1988 mn_now = get_clock ();
1722 now_floor = mn_now; 1989 now_floor = mn_now;
1723 } 1990 }
1724 1991
1992 /* no timer adjustment, as the monotonic clock doesn't jump */
1993 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1725# if EV_PERIODIC_ENABLE 1994# if EV_PERIODIC_ENABLE
1726 periodics_reschedule (EV_A); 1995 periodics_reschedule (EV_A);
1727# endif 1996# endif
1728 /* no timer adjustment, as the monotonic clock doesn't jump */
1729 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1730 } 1997 }
1731 else 1998 else
1732#endif 1999#endif
1733 { 2000 {
1734 ev_rt_now = ev_time (); 2001 ev_rt_now = ev_time ();
1735 2002
1736 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2003 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1737 { 2004 {
2005 /* adjust timers. this is easy, as the offset is the same for all of them */
2006 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1738#if EV_PERIODIC_ENABLE 2007#if EV_PERIODIC_ENABLE
1739 periodics_reschedule (EV_A); 2008 periodics_reschedule (EV_A);
1740#endif 2009#endif
1741 /* adjust timers. this is easy, as the offset is the same for all of them */
1742 for (i = 0; i < timercnt; ++i)
1743 {
1744 ANHE *he = timers + i + HEAP0;
1745 ANHE_w (*he)->at += ev_rt_now - mn_now;
1746 ANHE_at_set (*he);
1747 }
1748 } 2010 }
1749 2011
1750 mn_now = ev_rt_now; 2012 mn_now = ev_rt_now;
1751 } 2013 }
1752} 2014}
1753 2015
1754void
1755ev_ref (EV_P)
1756{
1757 ++activecnt;
1758}
1759
1760void
1761ev_unref (EV_P)
1762{
1763 --activecnt;
1764}
1765
1766static int loop_done; 2016static int loop_done;
1767 2017
1768void 2018void
1769ev_loop (EV_P_ int flags) 2019ev_loop (EV_P_ int flags)
1770{ 2020{
1772 2022
1773 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2023 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1774 2024
1775 do 2025 do
1776 { 2026 {
2027#if EV_VERIFY >= 2
2028 ev_loop_verify (EV_A);
2029#endif
2030
1777#ifndef _WIN32 2031#ifndef _WIN32
1778 if (expect_false (curpid)) /* penalise the forking check even more */ 2032 if (expect_false (curpid)) /* penalise the forking check even more */
1779 if (expect_false (getpid () != curpid)) 2033 if (expect_false (getpid () != curpid))
1780 { 2034 {
1781 curpid = getpid (); 2035 curpid = getpid ();
1798 { 2052 {
1799 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2053 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1800 call_pending (EV_A); 2054 call_pending (EV_A);
1801 } 2055 }
1802 2056
1803 if (expect_false (!activecnt))
1804 break;
1805
1806 /* we might have forked, so reify kernel state if necessary */ 2057 /* we might have forked, so reify kernel state if necessary */
1807 if (expect_false (postfork)) 2058 if (expect_false (postfork))
1808 loop_fork (EV_A); 2059 loop_fork (EV_A);
1809 2060
1810 /* update fd-related kernel structures */ 2061 /* update fd-related kernel structures */
1889ev_unloop (EV_P_ int how) 2140ev_unloop (EV_P_ int how)
1890{ 2141{
1891 loop_done = how; 2142 loop_done = how;
1892} 2143}
1893 2144
2145void
2146ev_ref (EV_P)
2147{
2148 ++activecnt;
2149}
2150
2151void
2152ev_unref (EV_P)
2153{
2154 --activecnt;
2155}
2156
2157void
2158ev_now_update (EV_P)
2159{
2160 time_update (EV_A_ 1e100);
2161}
2162
2163void
2164ev_suspend (EV_P)
2165{
2166 ev_now_update (EV_A);
2167}
2168
2169void
2170ev_resume (EV_P)
2171{
2172 ev_tstamp mn_prev = mn_now;
2173
2174 ev_now_update (EV_A);
2175 timers_reschedule (EV_A_ mn_now - mn_prev);
2176#if EV_PERIODIC_ENABLE
2177 /* TODO: really do this? */
2178 periodics_reschedule (EV_A);
2179#endif
2180}
2181
1894/*****************************************************************************/ 2182/*****************************************************************************/
2183/* singly-linked list management, used when the expected list length is short */
1895 2184
1896void inline_size 2185inline_size void
1897wlist_add (WL *head, WL elem) 2186wlist_add (WL *head, WL elem)
1898{ 2187{
1899 elem->next = *head; 2188 elem->next = *head;
1900 *head = elem; 2189 *head = elem;
1901} 2190}
1902 2191
1903void inline_size 2192inline_size void
1904wlist_del (WL *head, WL elem) 2193wlist_del (WL *head, WL elem)
1905{ 2194{
1906 while (*head) 2195 while (*head)
1907 { 2196 {
1908 if (*head == elem) 2197 if (*head == elem)
1913 2202
1914 head = &(*head)->next; 2203 head = &(*head)->next;
1915 } 2204 }
1916} 2205}
1917 2206
1918void inline_speed 2207/* internal, faster, version of ev_clear_pending */
2208inline_speed void
1919clear_pending (EV_P_ W w) 2209clear_pending (EV_P_ W w)
1920{ 2210{
1921 if (w->pending) 2211 if (w->pending)
1922 { 2212 {
1923 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2213 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
1924 w->pending = 0; 2214 w->pending = 0;
1925 } 2215 }
1926} 2216}
1927 2217
1928int 2218int
1932 int pending = w_->pending; 2222 int pending = w_->pending;
1933 2223
1934 if (expect_true (pending)) 2224 if (expect_true (pending))
1935 { 2225 {
1936 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2226 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2227 p->w = (W)&pending_w;
1937 w_->pending = 0; 2228 w_->pending = 0;
1938 p->w = 0;
1939 return p->events; 2229 return p->events;
1940 } 2230 }
1941 else 2231 else
1942 return 0; 2232 return 0;
1943} 2233}
1944 2234
1945void inline_size 2235inline_size void
1946pri_adjust (EV_P_ W w) 2236pri_adjust (EV_P_ W w)
1947{ 2237{
1948 int pri = w->priority; 2238 int pri = w->priority;
1949 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2239 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1950 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2240 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1951 w->priority = pri; 2241 w->priority = pri;
1952} 2242}
1953 2243
1954void inline_speed 2244inline_speed void
1955ev_start (EV_P_ W w, int active) 2245ev_start (EV_P_ W w, int active)
1956{ 2246{
1957 pri_adjust (EV_A_ w); 2247 pri_adjust (EV_A_ w);
1958 w->active = active; 2248 w->active = active;
1959 ev_ref (EV_A); 2249 ev_ref (EV_A);
1960} 2250}
1961 2251
1962void inline_size 2252inline_size void
1963ev_stop (EV_P_ W w) 2253ev_stop (EV_P_ W w)
1964{ 2254{
1965 ev_unref (EV_A); 2255 ev_unref (EV_A);
1966 w->active = 0; 2256 w->active = 0;
1967} 2257}
1974 int fd = w->fd; 2264 int fd = w->fd;
1975 2265
1976 if (expect_false (ev_is_active (w))) 2266 if (expect_false (ev_is_active (w)))
1977 return; 2267 return;
1978 2268
1979 assert (("ev_io_start called with negative fd", fd >= 0)); 2269 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2270 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2271
2272 EV_FREQUENT_CHECK;
1980 2273
1981 ev_start (EV_A_ (W)w, 1); 2274 ev_start (EV_A_ (W)w, 1);
1982 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 2275 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
1983 wlist_add (&anfds[fd].head, (WL)w); 2276 wlist_add (&anfds[fd].head, (WL)w);
1984 2277
1985 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2278 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
1986 w->events &= ~EV_IOFDSET; 2279 w->events &= ~EV__IOFDSET;
2280
2281 EV_FREQUENT_CHECK;
1987} 2282}
1988 2283
1989void noinline 2284void noinline
1990ev_io_stop (EV_P_ ev_io *w) 2285ev_io_stop (EV_P_ ev_io *w)
1991{ 2286{
1992 clear_pending (EV_A_ (W)w); 2287 clear_pending (EV_A_ (W)w);
1993 if (expect_false (!ev_is_active (w))) 2288 if (expect_false (!ev_is_active (w)))
1994 return; 2289 return;
1995 2290
1996 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2291 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2292
2293 EV_FREQUENT_CHECK;
1997 2294
1998 wlist_del (&anfds[w->fd].head, (WL)w); 2295 wlist_del (&anfds[w->fd].head, (WL)w);
1999 ev_stop (EV_A_ (W)w); 2296 ev_stop (EV_A_ (W)w);
2000 2297
2001 fd_change (EV_A_ w->fd, 1); 2298 fd_change (EV_A_ w->fd, 1);
2299
2300 EV_FREQUENT_CHECK;
2002} 2301}
2003 2302
2004void noinline 2303void noinline
2005ev_timer_start (EV_P_ ev_timer *w) 2304ev_timer_start (EV_P_ ev_timer *w)
2006{ 2305{
2007 if (expect_false (ev_is_active (w))) 2306 if (expect_false (ev_is_active (w)))
2008 return; 2307 return;
2009 2308
2010 ev_at (w) += mn_now; 2309 ev_at (w) += mn_now;
2011 2310
2012 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2311 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2013 2312
2313 EV_FREQUENT_CHECK;
2314
2315 ++timercnt;
2014 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1); 2316 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2015 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2); 2317 array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
2016 ANHE_w (timers [ev_active (w)]) = (WT)w; 2318 ANHE_w (timers [ev_active (w)]) = (WT)w;
2017 ANHE_at_set (timers [ev_active (w)]); 2319 ANHE_at_cache (timers [ev_active (w)]);
2018 upheap (timers, ev_active (w)); 2320 upheap (timers, ev_active (w));
2019 2321
2322 EV_FREQUENT_CHECK;
2323
2020 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2324 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2021} 2325}
2022 2326
2023void noinline 2327void noinline
2024ev_timer_stop (EV_P_ ev_timer *w) 2328ev_timer_stop (EV_P_ ev_timer *w)
2025{ 2329{
2026 clear_pending (EV_A_ (W)w); 2330 clear_pending (EV_A_ (W)w);
2027 if (expect_false (!ev_is_active (w))) 2331 if (expect_false (!ev_is_active (w)))
2028 return; 2332 return;
2029 2333
2334 EV_FREQUENT_CHECK;
2335
2030 { 2336 {
2031 int active = ev_active (w); 2337 int active = ev_active (w);
2032 2338
2033 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2339 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2034 2340
2341 --timercnt;
2342
2035 if (expect_true (active < timercnt + HEAP0 - 1)) 2343 if (expect_true (active < timercnt + HEAP0))
2036 { 2344 {
2037 timers [active] = timers [timercnt + HEAP0 - 1]; 2345 timers [active] = timers [timercnt + HEAP0];
2038 adjustheap (timers, timercnt, active); 2346 adjustheap (timers, timercnt, active);
2039 } 2347 }
2040
2041 --timercnt;
2042 } 2348 }
2349
2350 EV_FREQUENT_CHECK;
2043 2351
2044 ev_at (w) -= mn_now; 2352 ev_at (w) -= mn_now;
2045 2353
2046 ev_stop (EV_A_ (W)w); 2354 ev_stop (EV_A_ (W)w);
2047} 2355}
2048 2356
2049void noinline 2357void noinline
2050ev_timer_again (EV_P_ ev_timer *w) 2358ev_timer_again (EV_P_ ev_timer *w)
2051{ 2359{
2360 EV_FREQUENT_CHECK;
2361
2052 if (ev_is_active (w)) 2362 if (ev_is_active (w))
2053 { 2363 {
2054 if (w->repeat) 2364 if (w->repeat)
2055 { 2365 {
2056 ev_at (w) = mn_now + w->repeat; 2366 ev_at (w) = mn_now + w->repeat;
2057 ANHE_at_set (timers [ev_active (w)]); 2367 ANHE_at_cache (timers [ev_active (w)]);
2058 adjustheap (timers, timercnt, ev_active (w)); 2368 adjustheap (timers, timercnt, ev_active (w));
2059 } 2369 }
2060 else 2370 else
2061 ev_timer_stop (EV_A_ w); 2371 ev_timer_stop (EV_A_ w);
2062 } 2372 }
2063 else if (w->repeat) 2373 else if (w->repeat)
2064 { 2374 {
2065 ev_at (w) = w->repeat; 2375 ev_at (w) = w->repeat;
2066 ev_timer_start (EV_A_ w); 2376 ev_timer_start (EV_A_ w);
2067 } 2377 }
2378
2379 EV_FREQUENT_CHECK;
2068} 2380}
2069 2381
2070#if EV_PERIODIC_ENABLE 2382#if EV_PERIODIC_ENABLE
2071void noinline 2383void noinline
2072ev_periodic_start (EV_P_ ev_periodic *w) 2384ev_periodic_start (EV_P_ ev_periodic *w)
2076 2388
2077 if (w->reschedule_cb) 2389 if (w->reschedule_cb)
2078 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2390 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2079 else if (w->interval) 2391 else if (w->interval)
2080 { 2392 {
2081 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2393 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2082 /* this formula differs from the one in periodic_reify because we do not always round up */ 2394 /* this formula differs from the one in periodic_reify because we do not always round up */
2083 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2395 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2084 } 2396 }
2085 else 2397 else
2086 ev_at (w) = w->offset; 2398 ev_at (w) = w->offset;
2087 2399
2400 EV_FREQUENT_CHECK;
2401
2402 ++periodiccnt;
2088 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1); 2403 ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
2089 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2); 2404 array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
2090 ANHE_w (periodics [ev_active (w)]) = (WT)w; 2405 ANHE_w (periodics [ev_active (w)]) = (WT)w;
2406 ANHE_at_cache (periodics [ev_active (w)]);
2091 upheap (periodics, ev_active (w)); 2407 upheap (periodics, ev_active (w));
2092 2408
2409 EV_FREQUENT_CHECK;
2410
2093 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2411 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2094} 2412}
2095 2413
2096void noinline 2414void noinline
2097ev_periodic_stop (EV_P_ ev_periodic *w) 2415ev_periodic_stop (EV_P_ ev_periodic *w)
2098{ 2416{
2099 clear_pending (EV_A_ (W)w); 2417 clear_pending (EV_A_ (W)w);
2100 if (expect_false (!ev_is_active (w))) 2418 if (expect_false (!ev_is_active (w)))
2101 return; 2419 return;
2102 2420
2421 EV_FREQUENT_CHECK;
2422
2103 { 2423 {
2104 int active = ev_active (w); 2424 int active = ev_active (w);
2105 2425
2106 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2426 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2107 2427
2428 --periodiccnt;
2429
2108 if (expect_true (active < periodiccnt + HEAP0 - 1)) 2430 if (expect_true (active < periodiccnt + HEAP0))
2109 { 2431 {
2110 periodics [active] = periodics [periodiccnt + HEAP0 - 1]; 2432 periodics [active] = periodics [periodiccnt + HEAP0];
2111 adjustheap (periodics, periodiccnt, active); 2433 adjustheap (periodics, periodiccnt, active);
2112 } 2434 }
2113
2114 --periodiccnt;
2115 } 2435 }
2436
2437 EV_FREQUENT_CHECK;
2116 2438
2117 ev_stop (EV_A_ (W)w); 2439 ev_stop (EV_A_ (W)w);
2118} 2440}
2119 2441
2120void noinline 2442void noinline
2132 2454
2133void noinline 2455void noinline
2134ev_signal_start (EV_P_ ev_signal *w) 2456ev_signal_start (EV_P_ ev_signal *w)
2135{ 2457{
2136#if EV_MULTIPLICITY 2458#if EV_MULTIPLICITY
2137 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2459 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2138#endif 2460#endif
2139 if (expect_false (ev_is_active (w))) 2461 if (expect_false (ev_is_active (w)))
2140 return; 2462 return;
2141 2463
2142 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2464 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2143 2465
2144 evpipe_init (EV_A); 2466 evpipe_init (EV_A);
2467
2468 EV_FREQUENT_CHECK;
2145 2469
2146 { 2470 {
2147#ifndef _WIN32 2471#ifndef _WIN32
2148 sigset_t full, prev; 2472 sigset_t full, prev;
2149 sigfillset (&full); 2473 sigfillset (&full);
2150 sigprocmask (SIG_SETMASK, &full, &prev); 2474 sigprocmask (SIG_SETMASK, &full, &prev);
2151#endif 2475#endif
2152 2476
2153 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 2477 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2154 2478
2155#ifndef _WIN32 2479#ifndef _WIN32
2156 sigprocmask (SIG_SETMASK, &prev, 0); 2480 sigprocmask (SIG_SETMASK, &prev, 0);
2157#endif 2481#endif
2158 } 2482 }
2170 sigfillset (&sa.sa_mask); 2494 sigfillset (&sa.sa_mask);
2171 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2495 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2172 sigaction (w->signum, &sa, 0); 2496 sigaction (w->signum, &sa, 0);
2173#endif 2497#endif
2174 } 2498 }
2499
2500 EV_FREQUENT_CHECK;
2175} 2501}
2176 2502
2177void noinline 2503void noinline
2178ev_signal_stop (EV_P_ ev_signal *w) 2504ev_signal_stop (EV_P_ ev_signal *w)
2179{ 2505{
2180 clear_pending (EV_A_ (W)w); 2506 clear_pending (EV_A_ (W)w);
2181 if (expect_false (!ev_is_active (w))) 2507 if (expect_false (!ev_is_active (w)))
2182 return; 2508 return;
2183 2509
2510 EV_FREQUENT_CHECK;
2511
2184 wlist_del (&signals [w->signum - 1].head, (WL)w); 2512 wlist_del (&signals [w->signum - 1].head, (WL)w);
2185 ev_stop (EV_A_ (W)w); 2513 ev_stop (EV_A_ (W)w);
2186 2514
2187 if (!signals [w->signum - 1].head) 2515 if (!signals [w->signum - 1].head)
2188 signal (w->signum, SIG_DFL); 2516 signal (w->signum, SIG_DFL);
2517
2518 EV_FREQUENT_CHECK;
2189} 2519}
2190 2520
2191void 2521void
2192ev_child_start (EV_P_ ev_child *w) 2522ev_child_start (EV_P_ ev_child *w)
2193{ 2523{
2194#if EV_MULTIPLICITY 2524#if EV_MULTIPLICITY
2195 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2525 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2196#endif 2526#endif
2197 if (expect_false (ev_is_active (w))) 2527 if (expect_false (ev_is_active (w)))
2198 return; 2528 return;
2199 2529
2530 EV_FREQUENT_CHECK;
2531
2200 ev_start (EV_A_ (W)w, 1); 2532 ev_start (EV_A_ (W)w, 1);
2201 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2533 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2534
2535 EV_FREQUENT_CHECK;
2202} 2536}
2203 2537
2204void 2538void
2205ev_child_stop (EV_P_ ev_child *w) 2539ev_child_stop (EV_P_ ev_child *w)
2206{ 2540{
2207 clear_pending (EV_A_ (W)w); 2541 clear_pending (EV_A_ (W)w);
2208 if (expect_false (!ev_is_active (w))) 2542 if (expect_false (!ev_is_active (w)))
2209 return; 2543 return;
2210 2544
2545 EV_FREQUENT_CHECK;
2546
2211 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 2547 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
2212 ev_stop (EV_A_ (W)w); 2548 ev_stop (EV_A_ (W)w);
2549
2550 EV_FREQUENT_CHECK;
2213} 2551}
2214 2552
2215#if EV_STAT_ENABLE 2553#if EV_STAT_ENABLE
2216 2554
2217# ifdef _WIN32 2555# ifdef _WIN32
2218# undef lstat 2556# undef lstat
2219# define lstat(a,b) _stati64 (a,b) 2557# define lstat(a,b) _stati64 (a,b)
2220# endif 2558# endif
2221 2559
2222#define DEF_STAT_INTERVAL 5.0074891 2560#define DEF_STAT_INTERVAL 5.0074891
2561#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2223#define MIN_STAT_INTERVAL 0.1074891 2562#define MIN_STAT_INTERVAL 0.1074891
2224 2563
2225static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2564static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2226 2565
2227#if EV_USE_INOTIFY 2566#if EV_USE_INOTIFY
2228# define EV_INOTIFY_BUFSIZE 8192 2567# define EV_INOTIFY_BUFSIZE 8192
2232{ 2571{
2233 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); 2572 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);
2234 2573
2235 if (w->wd < 0) 2574 if (w->wd < 0)
2236 { 2575 {
2576 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2237 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2577 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2238 2578
2239 /* monitor some parent directory for speedup hints */ 2579 /* monitor some parent directory for speedup hints */
2240 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2580 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2241 /* but an efficiency issue only */ 2581 /* but an efficiency issue only */
2242 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2582 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2243 { 2583 {
2244 char path [4096]; 2584 char path [4096];
2245 strcpy (path, w->path); 2585 strcpy (path, w->path);
2249 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2589 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2250 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2590 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2251 2591
2252 char *pend = strrchr (path, '/'); 2592 char *pend = strrchr (path, '/');
2253 2593
2254 if (!pend) 2594 if (!pend || pend == path)
2255 break; /* whoops, no '/', complain to your admin */ 2595 break;
2256 2596
2257 *pend = 0; 2597 *pend = 0;
2258 w->wd = inotify_add_watch (fs_fd, path, mask); 2598 w->wd = inotify_add_watch (fs_fd, path, mask);
2259 } 2599 }
2260 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2600 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2261 } 2601 }
2262 } 2602 }
2263 else
2264 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2265 2603
2266 if (w->wd >= 0) 2604 if (w->wd >= 0)
2605 {
2267 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2606 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2607
2608 /* now local changes will be tracked by inotify, but remote changes won't */
2609 /* unless the filesystem it known to be local, we therefore still poll */
2610 /* also do poll on <2.6.25, but with normal frequency */
2611 struct statfs sfs;
2612
2613 if (fs_2625 && !statfs (w->path, &sfs))
2614 if (sfs.f_type == 0x1373 /* devfs */
2615 || sfs.f_type == 0xEF53 /* ext2/3 */
2616 || sfs.f_type == 0x3153464a /* jfs */
2617 || sfs.f_type == 0x52654973 /* reiser3 */
2618 || sfs.f_type == 0x01021994 /* tempfs */
2619 || sfs.f_type == 0x58465342 /* xfs */)
2620 return;
2621
2622 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2623 ev_timer_again (EV_A_ &w->timer);
2624 }
2268} 2625}
2269 2626
2270static void noinline 2627static void noinline
2271infy_del (EV_P_ ev_stat *w) 2628infy_del (EV_P_ ev_stat *w)
2272{ 2629{
2286 2643
2287static void noinline 2644static void noinline
2288infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev) 2645infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2289{ 2646{
2290 if (slot < 0) 2647 if (slot < 0)
2291 /* overflow, need to check for all hahs slots */ 2648 /* overflow, need to check for all hash slots */
2292 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 2649 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2293 infy_wd (EV_A_ slot, wd, ev); 2650 infy_wd (EV_A_ slot, wd, ev);
2294 else 2651 else
2295 { 2652 {
2296 WL w_; 2653 WL w_;
2302 2659
2303 if (w->wd == wd || wd == -1) 2660 if (w->wd == wd || wd == -1)
2304 { 2661 {
2305 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2662 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2306 { 2663 {
2664 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2307 w->wd = -1; 2665 w->wd = -1;
2308 infy_add (EV_A_ w); /* re-add, no matter what */ 2666 infy_add (EV_A_ w); /* re-add, no matter what */
2309 } 2667 }
2310 2668
2311 stat_timer_cb (EV_A_ &w->timer, 0); 2669 stat_timer_cb (EV_A_ &w->timer, 0);
2324 2682
2325 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2683 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2326 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2684 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2327} 2685}
2328 2686
2329void inline_size 2687inline_size void
2688check_2625 (EV_P)
2689{
2690 /* kernels < 2.6.25 are borked
2691 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2692 */
2693 struct utsname buf;
2694 int major, minor, micro;
2695
2696 if (uname (&buf))
2697 return;
2698
2699 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2700 return;
2701
2702 if (major < 2
2703 || (major == 2 && minor < 6)
2704 || (major == 2 && minor == 6 && micro < 25))
2705 return;
2706
2707 fs_2625 = 1;
2708}
2709
2710inline_size void
2330infy_init (EV_P) 2711infy_init (EV_P)
2331{ 2712{
2332 if (fs_fd != -2) 2713 if (fs_fd != -2)
2333 return; 2714 return;
2715
2716 fs_fd = -1;
2717
2718 check_2625 (EV_A);
2334 2719
2335 fs_fd = inotify_init (); 2720 fs_fd = inotify_init ();
2336 2721
2337 if (fs_fd >= 0) 2722 if (fs_fd >= 0)
2338 { 2723 {
2340 ev_set_priority (&fs_w, EV_MAXPRI); 2725 ev_set_priority (&fs_w, EV_MAXPRI);
2341 ev_io_start (EV_A_ &fs_w); 2726 ev_io_start (EV_A_ &fs_w);
2342 } 2727 }
2343} 2728}
2344 2729
2345void inline_size 2730inline_size void
2346infy_fork (EV_P) 2731infy_fork (EV_P)
2347{ 2732{
2348 int slot; 2733 int slot;
2349 2734
2350 if (fs_fd < 0) 2735 if (fs_fd < 0)
2366 w->wd = -1; 2751 w->wd = -1;
2367 2752
2368 if (fs_fd >= 0) 2753 if (fs_fd >= 0)
2369 infy_add (EV_A_ w); /* re-add, no matter what */ 2754 infy_add (EV_A_ w); /* re-add, no matter what */
2370 else 2755 else
2371 ev_timer_start (EV_A_ &w->timer); 2756 ev_timer_again (EV_A_ &w->timer);
2372 } 2757 }
2373
2374 } 2758 }
2375} 2759}
2376 2760
2761#endif
2762
2763#ifdef _WIN32
2764# define EV_LSTAT(p,b) _stati64 (p, b)
2765#else
2766# define EV_LSTAT(p,b) lstat (p, b)
2377#endif 2767#endif
2378 2768
2379void 2769void
2380ev_stat_stat (EV_P_ ev_stat *w) 2770ev_stat_stat (EV_P_ ev_stat *w)
2381{ 2771{
2408 || w->prev.st_atime != w->attr.st_atime 2798 || w->prev.st_atime != w->attr.st_atime
2409 || w->prev.st_mtime != w->attr.st_mtime 2799 || w->prev.st_mtime != w->attr.st_mtime
2410 || w->prev.st_ctime != w->attr.st_ctime 2800 || w->prev.st_ctime != w->attr.st_ctime
2411 ) { 2801 ) {
2412 #if EV_USE_INOTIFY 2802 #if EV_USE_INOTIFY
2803 if (fs_fd >= 0)
2804 {
2413 infy_del (EV_A_ w); 2805 infy_del (EV_A_ w);
2414 infy_add (EV_A_ w); 2806 infy_add (EV_A_ w);
2415 ev_stat_stat (EV_A_ w); /* avoid race... */ 2807 ev_stat_stat (EV_A_ w); /* avoid race... */
2808 }
2416 #endif 2809 #endif
2417 2810
2418 ev_feed_event (EV_A_ w, EV_STAT); 2811 ev_feed_event (EV_A_ w, EV_STAT);
2419 } 2812 }
2420} 2813}
2423ev_stat_start (EV_P_ ev_stat *w) 2816ev_stat_start (EV_P_ ev_stat *w)
2424{ 2817{
2425 if (expect_false (ev_is_active (w))) 2818 if (expect_false (ev_is_active (w)))
2426 return; 2819 return;
2427 2820
2428 /* since we use memcmp, we need to clear any padding data etc. */
2429 memset (&w->prev, 0, sizeof (ev_statdata));
2430 memset (&w->attr, 0, sizeof (ev_statdata));
2431
2432 ev_stat_stat (EV_A_ w); 2821 ev_stat_stat (EV_A_ w);
2433 2822
2823 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2434 if (w->interval < MIN_STAT_INTERVAL) 2824 w->interval = MIN_STAT_INTERVAL;
2435 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2436 2825
2437 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2826 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2438 ev_set_priority (&w->timer, ev_priority (w)); 2827 ev_set_priority (&w->timer, ev_priority (w));
2439 2828
2440#if EV_USE_INOTIFY 2829#if EV_USE_INOTIFY
2441 infy_init (EV_A); 2830 infy_init (EV_A);
2442 2831
2443 if (fs_fd >= 0) 2832 if (fs_fd >= 0)
2444 infy_add (EV_A_ w); 2833 infy_add (EV_A_ w);
2445 else 2834 else
2446#endif 2835#endif
2447 ev_timer_start (EV_A_ &w->timer); 2836 ev_timer_again (EV_A_ &w->timer);
2448 2837
2449 ev_start (EV_A_ (W)w, 1); 2838 ev_start (EV_A_ (W)w, 1);
2839
2840 EV_FREQUENT_CHECK;
2450} 2841}
2451 2842
2452void 2843void
2453ev_stat_stop (EV_P_ ev_stat *w) 2844ev_stat_stop (EV_P_ ev_stat *w)
2454{ 2845{
2455 clear_pending (EV_A_ (W)w); 2846 clear_pending (EV_A_ (W)w);
2456 if (expect_false (!ev_is_active (w))) 2847 if (expect_false (!ev_is_active (w)))
2457 return; 2848 return;
2458 2849
2850 EV_FREQUENT_CHECK;
2851
2459#if EV_USE_INOTIFY 2852#if EV_USE_INOTIFY
2460 infy_del (EV_A_ w); 2853 infy_del (EV_A_ w);
2461#endif 2854#endif
2462 ev_timer_stop (EV_A_ &w->timer); 2855 ev_timer_stop (EV_A_ &w->timer);
2463 2856
2464 ev_stop (EV_A_ (W)w); 2857 ev_stop (EV_A_ (W)w);
2858
2859 EV_FREQUENT_CHECK;
2465} 2860}
2466#endif 2861#endif
2467 2862
2468#if EV_IDLE_ENABLE 2863#if EV_IDLE_ENABLE
2469void 2864void
2471{ 2866{
2472 if (expect_false (ev_is_active (w))) 2867 if (expect_false (ev_is_active (w)))
2473 return; 2868 return;
2474 2869
2475 pri_adjust (EV_A_ (W)w); 2870 pri_adjust (EV_A_ (W)w);
2871
2872 EV_FREQUENT_CHECK;
2476 2873
2477 { 2874 {
2478 int active = ++idlecnt [ABSPRI (w)]; 2875 int active = ++idlecnt [ABSPRI (w)];
2479 2876
2480 ++idleall; 2877 ++idleall;
2481 ev_start (EV_A_ (W)w, active); 2878 ev_start (EV_A_ (W)w, active);
2482 2879
2483 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2); 2880 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2484 idles [ABSPRI (w)][active - 1] = w; 2881 idles [ABSPRI (w)][active - 1] = w;
2485 } 2882 }
2883
2884 EV_FREQUENT_CHECK;
2486} 2885}
2487 2886
2488void 2887void
2489ev_idle_stop (EV_P_ ev_idle *w) 2888ev_idle_stop (EV_P_ ev_idle *w)
2490{ 2889{
2491 clear_pending (EV_A_ (W)w); 2890 clear_pending (EV_A_ (W)w);
2492 if (expect_false (!ev_is_active (w))) 2891 if (expect_false (!ev_is_active (w)))
2493 return; 2892 return;
2494 2893
2894 EV_FREQUENT_CHECK;
2895
2495 { 2896 {
2496 int active = ev_active (w); 2897 int active = ev_active (w);
2497 2898
2498 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2899 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2499 ev_active (idles [ABSPRI (w)][active - 1]) = active; 2900 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2500 2901
2501 ev_stop (EV_A_ (W)w); 2902 ev_stop (EV_A_ (W)w);
2502 --idleall; 2903 --idleall;
2503 } 2904 }
2905
2906 EV_FREQUENT_CHECK;
2504} 2907}
2505#endif 2908#endif
2506 2909
2507void 2910void
2508ev_prepare_start (EV_P_ ev_prepare *w) 2911ev_prepare_start (EV_P_ ev_prepare *w)
2509{ 2912{
2510 if (expect_false (ev_is_active (w))) 2913 if (expect_false (ev_is_active (w)))
2511 return; 2914 return;
2915
2916 EV_FREQUENT_CHECK;
2512 2917
2513 ev_start (EV_A_ (W)w, ++preparecnt); 2918 ev_start (EV_A_ (W)w, ++preparecnt);
2514 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); 2919 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2515 prepares [preparecnt - 1] = w; 2920 prepares [preparecnt - 1] = w;
2921
2922 EV_FREQUENT_CHECK;
2516} 2923}
2517 2924
2518void 2925void
2519ev_prepare_stop (EV_P_ ev_prepare *w) 2926ev_prepare_stop (EV_P_ ev_prepare *w)
2520{ 2927{
2521 clear_pending (EV_A_ (W)w); 2928 clear_pending (EV_A_ (W)w);
2522 if (expect_false (!ev_is_active (w))) 2929 if (expect_false (!ev_is_active (w)))
2523 return; 2930 return;
2524 2931
2932 EV_FREQUENT_CHECK;
2933
2525 { 2934 {
2526 int active = ev_active (w); 2935 int active = ev_active (w);
2527 2936
2528 prepares [active - 1] = prepares [--preparecnt]; 2937 prepares [active - 1] = prepares [--preparecnt];
2529 ev_active (prepares [active - 1]) = active; 2938 ev_active (prepares [active - 1]) = active;
2530 } 2939 }
2531 2940
2532 ev_stop (EV_A_ (W)w); 2941 ev_stop (EV_A_ (W)w);
2942
2943 EV_FREQUENT_CHECK;
2533} 2944}
2534 2945
2535void 2946void
2536ev_check_start (EV_P_ ev_check *w) 2947ev_check_start (EV_P_ ev_check *w)
2537{ 2948{
2538 if (expect_false (ev_is_active (w))) 2949 if (expect_false (ev_is_active (w)))
2539 return; 2950 return;
2951
2952 EV_FREQUENT_CHECK;
2540 2953
2541 ev_start (EV_A_ (W)w, ++checkcnt); 2954 ev_start (EV_A_ (W)w, ++checkcnt);
2542 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); 2955 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2543 checks [checkcnt - 1] = w; 2956 checks [checkcnt - 1] = w;
2957
2958 EV_FREQUENT_CHECK;
2544} 2959}
2545 2960
2546void 2961void
2547ev_check_stop (EV_P_ ev_check *w) 2962ev_check_stop (EV_P_ ev_check *w)
2548{ 2963{
2549 clear_pending (EV_A_ (W)w); 2964 clear_pending (EV_A_ (W)w);
2550 if (expect_false (!ev_is_active (w))) 2965 if (expect_false (!ev_is_active (w)))
2551 return; 2966 return;
2552 2967
2968 EV_FREQUENT_CHECK;
2969
2553 { 2970 {
2554 int active = ev_active (w); 2971 int active = ev_active (w);
2555 2972
2556 checks [active - 1] = checks [--checkcnt]; 2973 checks [active - 1] = checks [--checkcnt];
2557 ev_active (checks [active - 1]) = active; 2974 ev_active (checks [active - 1]) = active;
2558 } 2975 }
2559 2976
2560 ev_stop (EV_A_ (W)w); 2977 ev_stop (EV_A_ (W)w);
2978
2979 EV_FREQUENT_CHECK;
2561} 2980}
2562 2981
2563#if EV_EMBED_ENABLE 2982#if EV_EMBED_ENABLE
2564void noinline 2983void noinline
2565ev_embed_sweep (EV_P_ ev_embed *w) 2984ev_embed_sweep (EV_P_ ev_embed *w)
2592 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3011 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2593 } 3012 }
2594 } 3013 }
2595} 3014}
2596 3015
3016static void
3017embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
3018{
3019 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3020
3021 ev_embed_stop (EV_A_ w);
3022
3023 {
3024 struct ev_loop *loop = w->other;
3025
3026 ev_loop_fork (EV_A);
3027 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3028 }
3029
3030 ev_embed_start (EV_A_ w);
3031}
3032
2597#if 0 3033#if 0
2598static void 3034static void
2599embed_idle_cb (EV_P_ ev_idle *idle, int revents) 3035embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2600{ 3036{
2601 ev_idle_stop (EV_A_ idle); 3037 ev_idle_stop (EV_A_ idle);
2608 if (expect_false (ev_is_active (w))) 3044 if (expect_false (ev_is_active (w)))
2609 return; 3045 return;
2610 3046
2611 { 3047 {
2612 struct ev_loop *loop = w->other; 3048 struct ev_loop *loop = w->other;
2613 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3049 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2614 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3050 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2615 } 3051 }
3052
3053 EV_FREQUENT_CHECK;
2616 3054
2617 ev_set_priority (&w->io, ev_priority (w)); 3055 ev_set_priority (&w->io, ev_priority (w));
2618 ev_io_start (EV_A_ &w->io); 3056 ev_io_start (EV_A_ &w->io);
2619 3057
2620 ev_prepare_init (&w->prepare, embed_prepare_cb); 3058 ev_prepare_init (&w->prepare, embed_prepare_cb);
2621 ev_set_priority (&w->prepare, EV_MINPRI); 3059 ev_set_priority (&w->prepare, EV_MINPRI);
2622 ev_prepare_start (EV_A_ &w->prepare); 3060 ev_prepare_start (EV_A_ &w->prepare);
2623 3061
3062 ev_fork_init (&w->fork, embed_fork_cb);
3063 ev_fork_start (EV_A_ &w->fork);
3064
2624 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/ 3065 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2625 3066
2626 ev_start (EV_A_ (W)w, 1); 3067 ev_start (EV_A_ (W)w, 1);
3068
3069 EV_FREQUENT_CHECK;
2627} 3070}
2628 3071
2629void 3072void
2630ev_embed_stop (EV_P_ ev_embed *w) 3073ev_embed_stop (EV_P_ ev_embed *w)
2631{ 3074{
2632 clear_pending (EV_A_ (W)w); 3075 clear_pending (EV_A_ (W)w);
2633 if (expect_false (!ev_is_active (w))) 3076 if (expect_false (!ev_is_active (w)))
2634 return; 3077 return;
2635 3078
3079 EV_FREQUENT_CHECK;
3080
2636 ev_io_stop (EV_A_ &w->io); 3081 ev_io_stop (EV_A_ &w->io);
2637 ev_prepare_stop (EV_A_ &w->prepare); 3082 ev_prepare_stop (EV_A_ &w->prepare);
3083 ev_fork_stop (EV_A_ &w->fork);
2638 3084
2639 ev_stop (EV_A_ (W)w); 3085 EV_FREQUENT_CHECK;
2640} 3086}
2641#endif 3087#endif
2642 3088
2643#if EV_FORK_ENABLE 3089#if EV_FORK_ENABLE
2644void 3090void
2645ev_fork_start (EV_P_ ev_fork *w) 3091ev_fork_start (EV_P_ ev_fork *w)
2646{ 3092{
2647 if (expect_false (ev_is_active (w))) 3093 if (expect_false (ev_is_active (w)))
2648 return; 3094 return;
3095
3096 EV_FREQUENT_CHECK;
2649 3097
2650 ev_start (EV_A_ (W)w, ++forkcnt); 3098 ev_start (EV_A_ (W)w, ++forkcnt);
2651 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2); 3099 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2652 forks [forkcnt - 1] = w; 3100 forks [forkcnt - 1] = w;
3101
3102 EV_FREQUENT_CHECK;
2653} 3103}
2654 3104
2655void 3105void
2656ev_fork_stop (EV_P_ ev_fork *w) 3106ev_fork_stop (EV_P_ ev_fork *w)
2657{ 3107{
2658 clear_pending (EV_A_ (W)w); 3108 clear_pending (EV_A_ (W)w);
2659 if (expect_false (!ev_is_active (w))) 3109 if (expect_false (!ev_is_active (w)))
2660 return; 3110 return;
2661 3111
3112 EV_FREQUENT_CHECK;
3113
2662 { 3114 {
2663 int active = ev_active (w); 3115 int active = ev_active (w);
2664 3116
2665 forks [active - 1] = forks [--forkcnt]; 3117 forks [active - 1] = forks [--forkcnt];
2666 ev_active (forks [active - 1]) = active; 3118 ev_active (forks [active - 1]) = active;
2667 } 3119 }
2668 3120
2669 ev_stop (EV_A_ (W)w); 3121 ev_stop (EV_A_ (W)w);
3122
3123 EV_FREQUENT_CHECK;
2670} 3124}
2671#endif 3125#endif
2672 3126
2673#if EV_ASYNC_ENABLE 3127#if EV_ASYNC_ENABLE
2674void 3128void
2676{ 3130{
2677 if (expect_false (ev_is_active (w))) 3131 if (expect_false (ev_is_active (w)))
2678 return; 3132 return;
2679 3133
2680 evpipe_init (EV_A); 3134 evpipe_init (EV_A);
3135
3136 EV_FREQUENT_CHECK;
2681 3137
2682 ev_start (EV_A_ (W)w, ++asynccnt); 3138 ev_start (EV_A_ (W)w, ++asynccnt);
2683 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2); 3139 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2684 asyncs [asynccnt - 1] = w; 3140 asyncs [asynccnt - 1] = w;
3141
3142 EV_FREQUENT_CHECK;
2685} 3143}
2686 3144
2687void 3145void
2688ev_async_stop (EV_P_ ev_async *w) 3146ev_async_stop (EV_P_ ev_async *w)
2689{ 3147{
2690 clear_pending (EV_A_ (W)w); 3148 clear_pending (EV_A_ (W)w);
2691 if (expect_false (!ev_is_active (w))) 3149 if (expect_false (!ev_is_active (w)))
2692 return; 3150 return;
2693 3151
3152 EV_FREQUENT_CHECK;
3153
2694 { 3154 {
2695 int active = ev_active (w); 3155 int active = ev_active (w);
2696 3156
2697 asyncs [active - 1] = asyncs [--asynccnt]; 3157 asyncs [active - 1] = asyncs [--asynccnt];
2698 ev_active (asyncs [active - 1]) = active; 3158 ev_active (asyncs [active - 1]) = active;
2699 } 3159 }
2700 3160
2701 ev_stop (EV_A_ (W)w); 3161 ev_stop (EV_A_ (W)w);
3162
3163 EV_FREQUENT_CHECK;
2702} 3164}
2703 3165
2704void 3166void
2705ev_async_send (EV_P_ ev_async *w) 3167ev_async_send (EV_P_ ev_async *w)
2706{ 3168{
2723once_cb (EV_P_ struct ev_once *once, int revents) 3185once_cb (EV_P_ struct ev_once *once, int revents)
2724{ 3186{
2725 void (*cb)(int revents, void *arg) = once->cb; 3187 void (*cb)(int revents, void *arg) = once->cb;
2726 void *arg = once->arg; 3188 void *arg = once->arg;
2727 3189
2728 ev_io_stop (EV_A_ &once->io); 3190 ev_io_stop (EV_A_ &once->io);
2729 ev_timer_stop (EV_A_ &once->to); 3191 ev_timer_stop (EV_A_ &once->to);
2730 ev_free (once); 3192 ev_free (once);
2731 3193
2732 cb (revents, arg); 3194 cb (revents, arg);
2733} 3195}
2734 3196
2735static void 3197static void
2736once_cb_io (EV_P_ ev_io *w, int revents) 3198once_cb_io (EV_P_ ev_io *w, int revents)
2737{ 3199{
2738 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 3200 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
3201
3202 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
2739} 3203}
2740 3204
2741static void 3205static void
2742once_cb_to (EV_P_ ev_timer *w, int revents) 3206once_cb_to (EV_P_ ev_timer *w, int revents)
2743{ 3207{
2744 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 3208 struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
3209
3210 once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
2745} 3211}
2746 3212
2747void 3213void
2748ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 3214ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
2749{ 3215{
2771 ev_timer_set (&once->to, timeout, 0.); 3237 ev_timer_set (&once->to, timeout, 0.);
2772 ev_timer_start (EV_A_ &once->to); 3238 ev_timer_start (EV_A_ &once->to);
2773 } 3239 }
2774} 3240}
2775 3241
3242/*****************************************************************************/
3243
3244#if EV_WALK_ENABLE
3245void
3246ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3247{
3248 int i, j;
3249 ev_watcher_list *wl, *wn;
3250
3251 if (types & (EV_IO | EV_EMBED))
3252 for (i = 0; i < anfdmax; ++i)
3253 for (wl = anfds [i].head; wl; )
3254 {
3255 wn = wl->next;
3256
3257#if EV_EMBED_ENABLE
3258 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3259 {
3260 if (types & EV_EMBED)
3261 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3262 }
3263 else
3264#endif
3265#if EV_USE_INOTIFY
3266 if (ev_cb ((ev_io *)wl) == infy_cb)
3267 ;
3268 else
3269#endif
3270 if ((ev_io *)wl != &pipe_w)
3271 if (types & EV_IO)
3272 cb (EV_A_ EV_IO, wl);
3273
3274 wl = wn;
3275 }
3276
3277 if (types & (EV_TIMER | EV_STAT))
3278 for (i = timercnt + HEAP0; i-- > HEAP0; )
3279#if EV_STAT_ENABLE
3280 /*TODO: timer is not always active*/
3281 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3282 {
3283 if (types & EV_STAT)
3284 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3285 }
3286 else
3287#endif
3288 if (types & EV_TIMER)
3289 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3290
3291#if EV_PERIODIC_ENABLE
3292 if (types & EV_PERIODIC)
3293 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3294 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3295#endif
3296
3297#if EV_IDLE_ENABLE
3298 if (types & EV_IDLE)
3299 for (j = NUMPRI; i--; )
3300 for (i = idlecnt [j]; i--; )
3301 cb (EV_A_ EV_IDLE, idles [j][i]);
3302#endif
3303
3304#if EV_FORK_ENABLE
3305 if (types & EV_FORK)
3306 for (i = forkcnt; i--; )
3307 if (ev_cb (forks [i]) != embed_fork_cb)
3308 cb (EV_A_ EV_FORK, forks [i]);
3309#endif
3310
3311#if EV_ASYNC_ENABLE
3312 if (types & EV_ASYNC)
3313 for (i = asynccnt; i--; )
3314 cb (EV_A_ EV_ASYNC, asyncs [i]);
3315#endif
3316
3317 if (types & EV_PREPARE)
3318 for (i = preparecnt; i--; )
3319#if EV_EMBED_ENABLE
3320 if (ev_cb (prepares [i]) != embed_prepare_cb)
3321#endif
3322 cb (EV_A_ EV_PREPARE, prepares [i]);
3323
3324 if (types & EV_CHECK)
3325 for (i = checkcnt; i--; )
3326 cb (EV_A_ EV_CHECK, checks [i]);
3327
3328 if (types & EV_SIGNAL)
3329 for (i = 0; i < signalmax; ++i)
3330 for (wl = signals [i].head; wl; )
3331 {
3332 wn = wl->next;
3333 cb (EV_A_ EV_SIGNAL, wl);
3334 wl = wn;
3335 }
3336
3337 if (types & EV_CHILD)
3338 for (i = EV_PID_HASHSIZE; i--; )
3339 for (wl = childs [i]; wl; )
3340 {
3341 wn = wl->next;
3342 cb (EV_A_ EV_CHILD, wl);
3343 wl = wn;
3344 }
3345/* EV_STAT 0x00001000 /* stat data changed */
3346/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3347}
3348#endif
3349
2776#if EV_MULTIPLICITY 3350#if EV_MULTIPLICITY
2777 #include "ev_wrap.h" 3351 #include "ev_wrap.h"
2778#endif 3352#endif
2779 3353
2780#ifdef __cplusplus 3354#ifdef __cplusplus

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines