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

Comparing libev/ev.c (file contents):
Revision 1.249 by root, Wed May 21 23:30:52 2008 UTC vs.
Revision 1.305 by root, Sun Jul 19 03:49:04 2009 UTC

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

Diff Legend

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