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

Comparing libev/ev.c (file contents):
Revision 1.190 by root, Fri Dec 21 01:26:04 2007 UTC vs.
Revision 1.236 by root, Wed May 7 14:46:22 2008 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008 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 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
35 43
44/* this big block deduces configuration from config.h */
36#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
38# include EV_CONFIG_H 47# include EV_CONFIG_H
39# else 48# else
40# include "config.h" 49# include "config.h"
51# ifndef EV_USE_MONOTONIC 60# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 61# define EV_USE_MONOTONIC 0
53# endif 62# endif
54# ifndef EV_USE_REALTIME 63# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 64# define EV_USE_REALTIME 0
65# endif
66# endif
67
68# ifndef EV_USE_NANOSLEEP
69# if HAVE_NANOSLEEP
70# define EV_USE_NANOSLEEP 1
71# else
72# define EV_USE_NANOSLEEP 0
56# endif 73# endif
57# endif 74# endif
58 75
59# ifndef EV_USE_SELECT 76# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 77# if HAVE_SELECT && HAVE_SYS_SELECT_H
102# else 119# else
103# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
104# endif 121# endif
105# endif 122# endif
106 123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
107#endif 132#endif
108 133
109#include <math.h> 134#include <math.h>
110#include <stdlib.h> 135#include <stdlib.h>
111#include <fcntl.h> 136#include <fcntl.h>
136# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
138# endif 163# endif
139#endif 164#endif
140 165
141/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
142 167
143#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
144# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
145#endif 170#endif
146 171
147#ifndef EV_USE_REALTIME 172#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 173# define EV_USE_REALTIME 0
174#endif
175
176#ifndef EV_USE_NANOSLEEP
177# define EV_USE_NANOSLEEP 0
149#endif 178#endif
150 179
151#ifndef EV_USE_SELECT 180#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 181# define EV_USE_SELECT 1
153#endif 182#endif
159# define EV_USE_POLL 1 188# define EV_USE_POLL 1
160# endif 189# endif
161#endif 190#endif
162 191
163#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
164# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
165#endif 198#endif
166 199
167#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
168# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
169#endif 202#endif
171#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
172# define EV_USE_PORT 0 205# define EV_USE_PORT 0
173#endif 206#endif
174 207
175#ifndef EV_USE_INOTIFY 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
176# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
177#endif 214#endif
178 215
179#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL 217# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
190# else 227# else
191# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
192# endif 229# endif
193#endif 230#endif
194 231
195/**/ 232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
196 241
197#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
200#endif 245#endif
207#if !EV_STAT_ENABLE 252#if !EV_STAT_ENABLE
208# undef EV_USE_INOTIFY 253# undef EV_USE_INOTIFY
209# define EV_USE_INOTIFY 0 254# define EV_USE_INOTIFY 0
210#endif 255#endif
211 256
257#if !EV_USE_NANOSLEEP
258# ifndef _WIN32
259# include <sys/select.h>
260# endif
261#endif
262
212#if EV_USE_INOTIFY 263#if EV_USE_INOTIFY
213# include <sys/inotify.h> 264# include <sys/inotify.h>
214#endif 265#endif
215 266
216#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
217# include <winsock.h> 268# include <winsock.h>
269#endif
270
271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
276# endif
277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
218#endif 281#endif
219 282
220/**/ 283/**/
221 284
222/* 285/*
237# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
238# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
239#else 302#else
240# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
241# define noinline 304# define noinline
242# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
243# define inline 306# define inline
244# endif 307# endif
245#endif 308#endif
246 309
247#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
262 325
263typedef ev_watcher *W; 326typedef ev_watcher *W;
264typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
265typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
266 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
333#if EV_USE_MONOTONIC
334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
335/* giving it a reasonably high chance of working on typical architetcures */
267static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
268 338
269#ifdef _WIN32 339#ifdef _WIN32
270# include "ev_win32.c" 340# include "ev_win32.c"
271#endif 341#endif
272 342
293 perror (msg); 363 perror (msg);
294 abort (); 364 abort ();
295 } 365 }
296} 366}
297 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
298static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
299 384
300void 385void
301ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
302{ 387{
303 alloc = cb; 388 alloc = cb;
304} 389}
305 390
306inline_speed void * 391inline_speed void *
307ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
308{ 393{
309 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
310 395
311 if (!ptr && size) 396 if (!ptr && size)
312 { 397 {
313 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
314 abort (); 399 abort ();
408{ 493{
409 return ev_rt_now; 494 return ev_rt_now;
410} 495}
411#endif 496#endif
412 497
498void
499ev_sleep (ev_tstamp delay)
500{
501 if (delay > 0.)
502 {
503#if EV_USE_NANOSLEEP
504 struct timespec ts;
505
506 ts.tv_sec = (time_t)delay;
507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
508
509 nanosleep (&ts, 0);
510#elif defined(_WIN32)
511 Sleep ((unsigned long)(delay * 1e3));
512#else
513 struct timeval tv;
514
515 tv.tv_sec = (time_t)delay;
516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
517
518 select (0, 0, 0, 0, &tv);
519#endif
520 }
521}
522
523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
526
413int inline_size 527int inline_size
414array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
415{ 529{
416 int ncur = cur + 1; 530 int ncur = cur + 1;
417 531
418 do 532 do
419 ncur <<= 1; 533 ncur <<= 1;
420 while (cnt > ncur); 534 while (cnt > ncur);
421 535
422 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
423 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
424 { 538 {
425 ncur *= elem; 539 ncur *= elem;
426 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
427 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
428 ncur /= elem; 542 ncur /= elem;
429 } 543 }
430 544
431 return ncur; 545 return ncur;
543 657
544#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
545 if (events) 659 if (events)
546 { 660 {
547 unsigned long argp; 661 unsigned long argp;
662 #ifdef EV_FD_TO_WIN32_HANDLE
663 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
664 #else
548 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
549 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 667 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
550 } 668 }
551#endif 669#endif
552 670
553 { 671 {
641 } 759 }
642} 760}
643 761
644/*****************************************************************************/ 762/*****************************************************************************/
645 763
764/*
765 * at the moment we allow libev the luxury of two heaps,
766 * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
767 * which is more cache-efficient.
768 * the difference is about 5% with 50000+ watchers.
769 */
770#define USE_4HEAP !EV_MINIMAL
771#if USE_4HEAP
772
773#define HEAP0 3 /* index of first element in heap */
774
775/* towards the root */
646void inline_speed 776void inline_speed
647upheap (WT *heap, int k) 777upheap (WT *heap, int k)
648{ 778{
649 WT w = heap [k]; 779 WT w = heap [k];
650 780
651 while (k) 781 for (;;)
652 { 782 {
653 int p = (k - 1) >> 1; 783 int p = ((k - HEAP0 - 1) / 4) + HEAP0;
654 784
655 if (heap [p]->at <= w->at) 785 if (p >= HEAP0 || heap [p]->at <= w->at)
656 break; 786 break;
657 787
658 heap [k] = heap [p]; 788 heap [k] = heap [p];
659 ((W)heap [k])->active = k + 1; 789 ev_active (heap [k]) = k;
660 k = p; 790 k = p;
661 } 791 }
662 792
663 heap [k] = w; 793 heap [k] = w;
664 ((W)heap [k])->active = k + 1; 794 ev_active (heap [k]) = k;
665} 795}
666 796
797/* away from the root */
667void inline_speed 798void inline_speed
668downheap (WT *heap, int N, int k) 799downheap (WT *heap, int N, int k)
669{ 800{
670 WT w = heap [k]; 801 WT w = heap [k];
802 WT *E = heap + N + HEAP0;
671 803
672 for (;;) 804 for (;;)
673 { 805 {
806 ev_tstamp minat;
807 WT *minpos;
808 WT *pos = heap + 4 * (k - HEAP0) + HEAP0;
809
810 // find minimum child
811 if (expect_true (pos +3 < E))
812 {
813 /* fast path */
814 (minpos = pos + 0), (minat = (*minpos)->at);
815 if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
816 if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
817 if (pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
818 }
819 else
820 {
821 /* slow path */
822 if (pos >= E)
823 break;
824 (minpos = pos + 0), (minat = (*minpos)->at);
825 if (pos + 1 < E && pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
826 if (pos + 2 < E && pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);
827 if (pos + 3 < E && pos [3]->at < minat) (minpos = pos + 3), (minat = (*minpos)->at);
828 }
829
830 if (w->at <= minat)
831 break;
832
833 ev_active (*minpos) = k;
834 heap [k] = *minpos;
835
836 k = minpos - heap;
837 }
838
839 heap [k] = w;
840 ev_active (heap [k]) = k;
841}
842
843#else // 4HEAP
844
845#define HEAP0 1
846
847/* towards the root */
848void inline_speed
849upheap (WT *heap, int k)
850{
851 WT w = heap [k];
852
853 for (;;)
854 {
855 int p = k >> 1;
856
857 /* maybe we could use a dummy element at heap [0]? */
858 if (!p || heap [p]->at <= w->at)
859 break;
860
861 heap [k] = heap [p];
862 ev_active (heap [k]) = k;
863 k = p;
864 }
865
866 heap [k] = w;
867 ev_active (heap [k]) = k;
868}
869
870/* away from the root */
871void inline_speed
872downheap (WT *heap, int N, int k)
873{
874 WT w = heap [k];
875
876 for (;;)
877 {
674 int c = (k << 1) + 1; 878 int c = k << 1;
675 879
676 if (c >= N) 880 if (c > N)
677 break; 881 break;
678 882
679 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 883 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
680 ? 1 : 0; 884 ? 1 : 0;
681 885
682 if (w->at <= heap [c]->at) 886 if (w->at <= heap [c]->at)
683 break; 887 break;
684 888
685 heap [k] = heap [c]; 889 heap [k] = heap [c];
686 ((W)heap [k])->active = k + 1; 890 ((W)heap [k])->active = k;
687 891
688 k = c; 892 k = c;
689 } 893 }
690 894
691 heap [k] = w; 895 heap [k] = w;
692 ((W)heap [k])->active = k + 1; 896 ev_active (heap [k]) = k;
693} 897}
898#endif
694 899
695void inline_size 900void inline_size
696adjustheap (WT *heap, int N, int k) 901adjustheap (WT *heap, int N, int k)
697{ 902{
698 upheap (heap, k); 903 upheap (heap, k);
702/*****************************************************************************/ 907/*****************************************************************************/
703 908
704typedef struct 909typedef struct
705{ 910{
706 WL head; 911 WL head;
707 sig_atomic_t volatile gotsig; 912 EV_ATOMIC_T gotsig;
708} ANSIG; 913} ANSIG;
709 914
710static ANSIG *signals; 915static ANSIG *signals;
711static int signalmax; 916static int signalmax;
712 917
713static int sigpipe [2]; 918static EV_ATOMIC_T gotsig;
714static sig_atomic_t volatile gotsig;
715static ev_io sigev;
716 919
717void inline_size 920void inline_size
718signals_init (ANSIG *base, int count) 921signals_init (ANSIG *base, int count)
719{ 922{
720 while (count--) 923 while (count--)
724 927
725 ++base; 928 ++base;
726 } 929 }
727} 930}
728 931
729static void 932/*****************************************************************************/
730sighandler (int signum)
731{
732#if _WIN32
733 signal (signum, sighandler);
734#endif
735
736 signals [signum - 1].gotsig = 1;
737
738 if (!gotsig)
739 {
740 int old_errno = errno;
741 gotsig = 1;
742 write (sigpipe [1], &signum, 1);
743 errno = old_errno;
744 }
745}
746
747void noinline
748ev_feed_signal_event (EV_P_ int signum)
749{
750 WL w;
751
752#if EV_MULTIPLICITY
753 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
754#endif
755
756 --signum;
757
758 if (signum < 0 || signum >= signalmax)
759 return;
760
761 signals [signum].gotsig = 0;
762
763 for (w = signals [signum].head; w; w = w->next)
764 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
765}
766
767static void
768sigcb (EV_P_ ev_io *iow, int revents)
769{
770 int signum;
771
772 read (sigpipe [0], &revents, 1);
773 gotsig = 0;
774
775 for (signum = signalmax; signum--; )
776 if (signals [signum].gotsig)
777 ev_feed_signal_event (EV_A_ signum + 1);
778}
779 933
780void inline_speed 934void inline_speed
781fd_intern (int fd) 935fd_intern (int fd)
782{ 936{
783#ifdef _WIN32 937#ifdef _WIN32
788 fcntl (fd, F_SETFL, O_NONBLOCK); 942 fcntl (fd, F_SETFL, O_NONBLOCK);
789#endif 943#endif
790} 944}
791 945
792static void noinline 946static void noinline
793siginit (EV_P) 947evpipe_init (EV_P)
794{ 948{
949 if (!ev_is_active (&pipeev))
950 {
951#if EV_USE_EVENTFD
952 if ((evfd = eventfd (0, 0)) >= 0)
953 {
954 evpipe [0] = -1;
955 fd_intern (evfd);
956 ev_io_set (&pipeev, evfd, EV_READ);
957 }
958 else
959#endif
960 {
961 while (pipe (evpipe))
962 syserr ("(libev) error creating signal/async pipe");
963
795 fd_intern (sigpipe [0]); 964 fd_intern (evpipe [0]);
796 fd_intern (sigpipe [1]); 965 fd_intern (evpipe [1]);
966 ev_io_set (&pipeev, evpipe [0], EV_READ);
967 }
797 968
798 ev_io_set (&sigev, sigpipe [0], EV_READ);
799 ev_io_start (EV_A_ &sigev); 969 ev_io_start (EV_A_ &pipeev);
800 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* watcher should not keep loop alive */
971 }
972}
973
974void inline_size
975evpipe_write (EV_P_ EV_ATOMIC_T *flag)
976{
977 if (!*flag)
978 {
979 int old_errno = errno; /* save errno because write might clobber it */
980
981 *flag = 1;
982
983#if EV_USE_EVENTFD
984 if (evfd >= 0)
985 {
986 uint64_t counter = 1;
987 write (evfd, &counter, sizeof (uint64_t));
988 }
989 else
990#endif
991 write (evpipe [1], &old_errno, 1);
992
993 errno = old_errno;
994 }
995}
996
997static void
998pipecb (EV_P_ ev_io *iow, int revents)
999{
1000#if EV_USE_EVENTFD
1001 if (evfd >= 0)
1002 {
1003 uint64_t counter;
1004 read (evfd, &counter, sizeof (uint64_t));
1005 }
1006 else
1007#endif
1008 {
1009 char dummy;
1010 read (evpipe [0], &dummy, 1);
1011 }
1012
1013 if (gotsig && ev_is_default_loop (EV_A))
1014 {
1015 int signum;
1016 gotsig = 0;
1017
1018 for (signum = signalmax; signum--; )
1019 if (signals [signum].gotsig)
1020 ev_feed_signal_event (EV_A_ signum + 1);
1021 }
1022
1023#if EV_ASYNC_ENABLE
1024 if (gotasync)
1025 {
1026 int i;
1027 gotasync = 0;
1028
1029 for (i = asynccnt; i--; )
1030 if (asyncs [i]->sent)
1031 {
1032 asyncs [i]->sent = 0;
1033 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
1034 }
1035 }
1036#endif
801} 1037}
802 1038
803/*****************************************************************************/ 1039/*****************************************************************************/
804 1040
1041static void
1042ev_sighandler (int signum)
1043{
1044#if EV_MULTIPLICITY
1045 struct ev_loop *loop = &default_loop_struct;
1046#endif
1047
1048#if _WIN32
1049 signal (signum, ev_sighandler);
1050#endif
1051
1052 signals [signum - 1].gotsig = 1;
1053 evpipe_write (EV_A_ &gotsig);
1054}
1055
1056void noinline
1057ev_feed_signal_event (EV_P_ int signum)
1058{
1059 WL w;
1060
1061#if EV_MULTIPLICITY
1062 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1063#endif
1064
1065 --signum;
1066
1067 if (signum < 0 || signum >= signalmax)
1068 return;
1069
1070 signals [signum].gotsig = 0;
1071
1072 for (w = signals [signum].head; w; w = w->next)
1073 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1074}
1075
1076/*****************************************************************************/
1077
805static WL childs [EV_PID_HASHSIZE]; 1078static WL childs [EV_PID_HASHSIZE];
806 1079
807#ifndef _WIN32 1080#ifndef _WIN32
808 1081
809static ev_signal childev; 1082static ev_signal childev;
810 1083
1084#ifndef WIFCONTINUED
1085# define WIFCONTINUED(status) 0
1086#endif
1087
811void inline_speed 1088void inline_speed
812child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1089child_reap (EV_P_ int chain, int pid, int status)
813{ 1090{
814 ev_child *w; 1091 ev_child *w;
1092 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
815 1093
816 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1094 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1095 {
817 if (w->pid == pid || !w->pid) 1096 if ((w->pid == pid || !w->pid)
1097 && (!traced || (w->flags & 1)))
818 { 1098 {
819 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1099 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
820 w->rpid = pid; 1100 w->rpid = pid;
821 w->rstatus = status; 1101 w->rstatus = status;
822 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1102 ev_feed_event (EV_A_ (W)w, EV_CHILD);
823 } 1103 }
1104 }
824} 1105}
825 1106
826#ifndef WCONTINUED 1107#ifndef WCONTINUED
827# define WCONTINUED 0 1108# define WCONTINUED 0
828#endif 1109#endif
837 if (!WCONTINUED 1118 if (!WCONTINUED
838 || errno != EINVAL 1119 || errno != EINVAL
839 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1120 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
840 return; 1121 return;
841 1122
842 /* make sure we are called again until all childs have been reaped */ 1123 /* make sure we are called again until all children have been reaped */
843 /* we need to do it this way so that the callback gets called before we continue */ 1124 /* we need to do it this way so that the callback gets called before we continue */
844 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1125 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
845 1126
846 child_reap (EV_A_ sw, pid, pid, status); 1127 child_reap (EV_A_ pid, pid, status);
847 if (EV_PID_HASHSIZE > 1) 1128 if (EV_PID_HASHSIZE > 1)
848 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1129 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
849} 1130}
850 1131
851#endif 1132#endif
852 1133
853/*****************************************************************************/ 1134/*****************************************************************************/
925} 1206}
926 1207
927unsigned int 1208unsigned int
928ev_embeddable_backends (void) 1209ev_embeddable_backends (void)
929{ 1210{
930 return EVBACKEND_EPOLL 1211 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
931 | EVBACKEND_KQUEUE 1212
932 | EVBACKEND_PORT; 1213 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1214 /* please fix it and tell me how to detect the fix */
1215 flags &= ~EVBACKEND_EPOLL;
1216
1217 return flags;
933} 1218}
934 1219
935unsigned int 1220unsigned int
936ev_backend (EV_P) 1221ev_backend (EV_P)
937{ 1222{
940 1225
941unsigned int 1226unsigned int
942ev_loop_count (EV_P) 1227ev_loop_count (EV_P)
943{ 1228{
944 return loop_count; 1229 return loop_count;
1230}
1231
1232void
1233ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1234{
1235 io_blocktime = interval;
1236}
1237
1238void
1239ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1240{
1241 timeout_blocktime = interval;
945} 1242}
946 1243
947static void noinline 1244static void noinline
948loop_init (EV_P_ unsigned int flags) 1245loop_init (EV_P_ unsigned int flags)
949{ 1246{
955 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1252 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
956 have_monotonic = 1; 1253 have_monotonic = 1;
957 } 1254 }
958#endif 1255#endif
959 1256
960 ev_rt_now = ev_time (); 1257 ev_rt_now = ev_time ();
961 mn_now = get_clock (); 1258 mn_now = get_clock ();
962 now_floor = mn_now; 1259 now_floor = mn_now;
963 rtmn_diff = ev_rt_now - mn_now; 1260 rtmn_diff = ev_rt_now - mn_now;
1261
1262 io_blocktime = 0.;
1263 timeout_blocktime = 0.;
1264 backend = 0;
1265 backend_fd = -1;
1266 gotasync = 0;
1267#if EV_USE_INOTIFY
1268 fs_fd = -2;
1269#endif
964 1270
965 /* pid check not overridable via env */ 1271 /* pid check not overridable via env */
966#ifndef _WIN32 1272#ifndef _WIN32
967 if (flags & EVFLAG_FORKCHECK) 1273 if (flags & EVFLAG_FORKCHECK)
968 curpid = getpid (); 1274 curpid = getpid ();
971 if (!(flags & EVFLAG_NOENV) 1277 if (!(flags & EVFLAG_NOENV)
972 && !enable_secure () 1278 && !enable_secure ()
973 && getenv ("LIBEV_FLAGS")) 1279 && getenv ("LIBEV_FLAGS"))
974 flags = atoi (getenv ("LIBEV_FLAGS")); 1280 flags = atoi (getenv ("LIBEV_FLAGS"));
975 1281
976 if (!(flags & 0x0000ffffUL)) 1282 if (!(flags & 0x0000ffffU))
977 flags |= ev_recommended_backends (); 1283 flags |= ev_recommended_backends ();
978
979 backend = 0;
980 backend_fd = -1;
981#if EV_USE_INOTIFY
982 fs_fd = -2;
983#endif
984 1284
985#if EV_USE_PORT 1285#if EV_USE_PORT
986 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1286 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
987#endif 1287#endif
988#if EV_USE_KQUEUE 1288#if EV_USE_KQUEUE
996#endif 1296#endif
997#if EV_USE_SELECT 1297#if EV_USE_SELECT
998 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1298 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
999#endif 1299#endif
1000 1300
1001 ev_init (&sigev, sigcb); 1301 ev_init (&pipeev, pipecb);
1002 ev_set_priority (&sigev, EV_MAXPRI); 1302 ev_set_priority (&pipeev, EV_MAXPRI);
1003 } 1303 }
1004} 1304}
1005 1305
1006static void noinline 1306static void noinline
1007loop_destroy (EV_P) 1307loop_destroy (EV_P)
1008{ 1308{
1009 int i; 1309 int i;
1310
1311 if (ev_is_active (&pipeev))
1312 {
1313 ev_ref (EV_A); /* signal watcher */
1314 ev_io_stop (EV_A_ &pipeev);
1315
1316#if EV_USE_EVENTFD
1317 if (evfd >= 0)
1318 close (evfd);
1319#endif
1320
1321 if (evpipe [0] >= 0)
1322 {
1323 close (evpipe [0]);
1324 close (evpipe [1]);
1325 }
1326 }
1010 1327
1011#if EV_USE_INOTIFY 1328#if EV_USE_INOTIFY
1012 if (fs_fd >= 0) 1329 if (fs_fd >= 0)
1013 close (fs_fd); 1330 close (fs_fd);
1014#endif 1331#endif
1051#if EV_FORK_ENABLE 1368#if EV_FORK_ENABLE
1052 array_free (fork, EMPTY); 1369 array_free (fork, EMPTY);
1053#endif 1370#endif
1054 array_free (prepare, EMPTY); 1371 array_free (prepare, EMPTY);
1055 array_free (check, EMPTY); 1372 array_free (check, EMPTY);
1373#if EV_ASYNC_ENABLE
1374 array_free (async, EMPTY);
1375#endif
1056 1376
1057 backend = 0; 1377 backend = 0;
1058} 1378}
1059 1379
1380#if EV_USE_INOTIFY
1060void inline_size infy_fork (EV_P); 1381void inline_size infy_fork (EV_P);
1382#endif
1061 1383
1062void inline_size 1384void inline_size
1063loop_fork (EV_P) 1385loop_fork (EV_P)
1064{ 1386{
1065#if EV_USE_PORT 1387#if EV_USE_PORT
1073#endif 1395#endif
1074#if EV_USE_INOTIFY 1396#if EV_USE_INOTIFY
1075 infy_fork (EV_A); 1397 infy_fork (EV_A);
1076#endif 1398#endif
1077 1399
1078 if (ev_is_active (&sigev)) 1400 if (ev_is_active (&pipeev))
1079 { 1401 {
1080 /* default loop */ 1402 /* this "locks" the handlers against writing to the pipe */
1403 /* while we modify the fd vars */
1404 gotsig = 1;
1405#if EV_ASYNC_ENABLE
1406 gotasync = 1;
1407#endif
1081 1408
1082 ev_ref (EV_A); 1409 ev_ref (EV_A);
1083 ev_io_stop (EV_A_ &sigev); 1410 ev_io_stop (EV_A_ &pipeev);
1411
1412#if EV_USE_EVENTFD
1413 if (evfd >= 0)
1414 close (evfd);
1415#endif
1416
1417 if (evpipe [0] >= 0)
1418 {
1084 close (sigpipe [0]); 1419 close (evpipe [0]);
1085 close (sigpipe [1]); 1420 close (evpipe [1]);
1421 }
1086 1422
1087 while (pipe (sigpipe))
1088 syserr ("(libev) error creating pipe");
1089
1090 siginit (EV_A); 1423 evpipe_init (EV_A);
1424 /* now iterate over everything, in case we missed something */
1425 pipecb (EV_A_ &pipeev, EV_READ);
1091 } 1426 }
1092 1427
1093 postfork = 0; 1428 postfork = 0;
1094} 1429}
1095 1430
1117} 1452}
1118 1453
1119void 1454void
1120ev_loop_fork (EV_P) 1455ev_loop_fork (EV_P)
1121{ 1456{
1122 postfork = 1; 1457 postfork = 1; /* must be in line with ev_default_fork */
1123} 1458}
1124
1125#endif 1459#endif
1126 1460
1127#if EV_MULTIPLICITY 1461#if EV_MULTIPLICITY
1128struct ev_loop * 1462struct ev_loop *
1129ev_default_loop_init (unsigned int flags) 1463ev_default_loop_init (unsigned int flags)
1130#else 1464#else
1131int 1465int
1132ev_default_loop (unsigned int flags) 1466ev_default_loop (unsigned int flags)
1133#endif 1467#endif
1134{ 1468{
1135 if (sigpipe [0] == sigpipe [1])
1136 if (pipe (sigpipe))
1137 return 0;
1138
1139 if (!ev_default_loop_ptr) 1469 if (!ev_default_loop_ptr)
1140 { 1470 {
1141#if EV_MULTIPLICITY 1471#if EV_MULTIPLICITY
1142 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1472 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1143#else 1473#else
1146 1476
1147 loop_init (EV_A_ flags); 1477 loop_init (EV_A_ flags);
1148 1478
1149 if (ev_backend (EV_A)) 1479 if (ev_backend (EV_A))
1150 { 1480 {
1151 siginit (EV_A);
1152
1153#ifndef _WIN32 1481#ifndef _WIN32
1154 ev_signal_init (&childev, childcb, SIGCHLD); 1482 ev_signal_init (&childev, childcb, SIGCHLD);
1155 ev_set_priority (&childev, EV_MAXPRI); 1483 ev_set_priority (&childev, EV_MAXPRI);
1156 ev_signal_start (EV_A_ &childev); 1484 ev_signal_start (EV_A_ &childev);
1157 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1485 ev_unref (EV_A); /* child watcher should not keep loop alive */
1174#ifndef _WIN32 1502#ifndef _WIN32
1175 ev_ref (EV_A); /* child watcher */ 1503 ev_ref (EV_A); /* child watcher */
1176 ev_signal_stop (EV_A_ &childev); 1504 ev_signal_stop (EV_A_ &childev);
1177#endif 1505#endif
1178 1506
1179 ev_ref (EV_A); /* signal watcher */
1180 ev_io_stop (EV_A_ &sigev);
1181
1182 close (sigpipe [0]); sigpipe [0] = 0;
1183 close (sigpipe [1]); sigpipe [1] = 0;
1184
1185 loop_destroy (EV_A); 1507 loop_destroy (EV_A);
1186} 1508}
1187 1509
1188void 1510void
1189ev_default_fork (void) 1511ev_default_fork (void)
1191#if EV_MULTIPLICITY 1513#if EV_MULTIPLICITY
1192 struct ev_loop *loop = ev_default_loop_ptr; 1514 struct ev_loop *loop = ev_default_loop_ptr;
1193#endif 1515#endif
1194 1516
1195 if (backend) 1517 if (backend)
1196 postfork = 1; 1518 postfork = 1; /* must be in line with ev_loop_fork */
1197} 1519}
1198 1520
1199/*****************************************************************************/ 1521/*****************************************************************************/
1200 1522
1201void 1523void
1221 p->w->pending = 0; 1543 p->w->pending = 0;
1222 EV_CB_INVOKE (p->w, p->events); 1544 EV_CB_INVOKE (p->w, p->events);
1223 } 1545 }
1224 } 1546 }
1225} 1547}
1226
1227void inline_size
1228timers_reify (EV_P)
1229{
1230 while (timercnt && ((WT)timers [0])->at <= mn_now)
1231 {
1232 ev_timer *w = (ev_timer *)timers [0];
1233
1234 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1235
1236 /* first reschedule or stop timer */
1237 if (w->repeat)
1238 {
1239 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1240
1241 ((WT)w)->at += w->repeat;
1242 if (((WT)w)->at < mn_now)
1243 ((WT)w)->at = mn_now;
1244
1245 downheap (timers, timercnt, 0);
1246 }
1247 else
1248 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1249
1250 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1251 }
1252}
1253
1254#if EV_PERIODIC_ENABLE
1255void inline_size
1256periodics_reify (EV_P)
1257{
1258 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1259 {
1260 ev_periodic *w = (ev_periodic *)periodics [0];
1261
1262 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1263
1264 /* first reschedule or stop timer */
1265 if (w->reschedule_cb)
1266 {
1267 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1268 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1269 downheap (periodics, periodiccnt, 0);
1270 }
1271 else if (w->interval)
1272 {
1273 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1274 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1275 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1276 downheap (periodics, periodiccnt, 0);
1277 }
1278 else
1279 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1280
1281 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1282 }
1283}
1284
1285static void noinline
1286periodics_reschedule (EV_P)
1287{
1288 int i;
1289
1290 /* adjust periodics after time jump */
1291 for (i = 0; i < periodiccnt; ++i)
1292 {
1293 ev_periodic *w = (ev_periodic *)periodics [i];
1294
1295 if (w->reschedule_cb)
1296 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1297 else if (w->interval)
1298 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1299 }
1300
1301 /* now rebuild the heap */
1302 for (i = periodiccnt >> 1; i--; )
1303 downheap (periodics, periodiccnt, i);
1304}
1305#endif
1306 1548
1307#if EV_IDLE_ENABLE 1549#if EV_IDLE_ENABLE
1308void inline_size 1550void inline_size
1309idle_reify (EV_P) 1551idle_reify (EV_P)
1310{ 1552{
1322 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1564 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1323 break; 1565 break;
1324 } 1566 }
1325 } 1567 }
1326 } 1568 }
1569}
1570#endif
1571
1572void inline_size
1573timers_reify (EV_P)
1574{
1575 while (timercnt && ev_at (timers [HEAP0]) <= mn_now)
1576 {
1577 ev_timer *w = (ev_timer *)timers [HEAP0];
1578
1579 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1580
1581 /* first reschedule or stop timer */
1582 if (w->repeat)
1583 {
1584 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1585
1586 ev_at (w) += w->repeat;
1587 if (ev_at (w) < mn_now)
1588 ev_at (w) = mn_now;
1589
1590 downheap (timers, timercnt, HEAP0);
1591 }
1592 else
1593 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1594
1595 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1596 }
1597}
1598
1599#if EV_PERIODIC_ENABLE
1600void inline_size
1601periodics_reify (EV_P)
1602{
1603 while (periodiccnt && ev_at (periodics [HEAP0]) <= ev_rt_now)
1604 {
1605 ev_periodic *w = (ev_periodic *)periodics [HEAP0];
1606
1607 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1608
1609 /* first reschedule or stop timer */
1610 if (w->reschedule_cb)
1611 {
1612 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1613 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1614 downheap (periodics, periodiccnt, 1);
1615 }
1616 else if (w->interval)
1617 {
1618 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1619 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1620 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1621 downheap (periodics, periodiccnt, HEAP0);
1622 }
1623 else
1624 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1625
1626 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1627 }
1628}
1629
1630static void noinline
1631periodics_reschedule (EV_P)
1632{
1633 int i;
1634
1635 /* adjust periodics after time jump */
1636 for (i = 1; i <= periodiccnt; ++i)
1637 {
1638 ev_periodic *w = (ev_periodic *)periodics [i];
1639
1640 if (w->reschedule_cb)
1641 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1642 else if (w->interval)
1643 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1644 }
1645
1646 /* now rebuild the heap */
1647 for (i = periodiccnt >> 1; --i; )
1648 downheap (periodics, periodiccnt, i + HEAP0);
1327} 1649}
1328#endif 1650#endif
1329 1651
1330void inline_speed 1652void inline_speed
1331time_update (EV_P_ ev_tstamp max_block) 1653time_update (EV_P_ ev_tstamp max_block)
1360 */ 1682 */
1361 for (i = 4; --i; ) 1683 for (i = 4; --i; )
1362 { 1684 {
1363 rtmn_diff = ev_rt_now - mn_now; 1685 rtmn_diff = ev_rt_now - mn_now;
1364 1686
1365 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1687 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1366 return; /* all is well */ 1688 return; /* all is well */
1367 1689
1368 ev_rt_now = ev_time (); 1690 ev_rt_now = ev_time ();
1369 mn_now = get_clock (); 1691 mn_now = get_clock ();
1370 now_floor = mn_now; 1692 now_floor = mn_now;
1385 { 1707 {
1386#if EV_PERIODIC_ENABLE 1708#if EV_PERIODIC_ENABLE
1387 periodics_reschedule (EV_A); 1709 periodics_reschedule (EV_A);
1388#endif 1710#endif
1389 /* adjust timers. this is easy, as the offset is the same for all of them */ 1711 /* adjust timers. this is easy, as the offset is the same for all of them */
1390 for (i = 0; i < timercnt; ++i) 1712 for (i = 1; i <= timercnt; ++i)
1391 ((WT)timers [i])->at += ev_rt_now - mn_now; 1713 ev_at (timers [i]) += ev_rt_now - mn_now;
1392 } 1714 }
1393 1715
1394 mn_now = ev_rt_now; 1716 mn_now = ev_rt_now;
1395 } 1717 }
1396} 1718}
1410static int loop_done; 1732static int loop_done;
1411 1733
1412void 1734void
1413ev_loop (EV_P_ int flags) 1735ev_loop (EV_P_ int flags)
1414{ 1736{
1415 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1737 loop_done = EVUNLOOP_CANCEL;
1416 ? EVUNLOOP_ONE
1417 : EVUNLOOP_CANCEL;
1418 1738
1419 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1739 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1420 1740
1421 do 1741 do
1422 { 1742 {
1456 /* update fd-related kernel structures */ 1776 /* update fd-related kernel structures */
1457 fd_reify (EV_A); 1777 fd_reify (EV_A);
1458 1778
1459 /* calculate blocking time */ 1779 /* calculate blocking time */
1460 { 1780 {
1461 ev_tstamp block; 1781 ev_tstamp waittime = 0.;
1782 ev_tstamp sleeptime = 0.;
1462 1783
1463 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1784 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1464 block = 0.; /* do not block at all */
1465 else
1466 { 1785 {
1467 /* update time to cancel out callback processing overhead */ 1786 /* update time to cancel out callback processing overhead */
1468 time_update (EV_A_ 1e100); 1787 time_update (EV_A_ 1e100);
1469 1788
1470 block = MAX_BLOCKTIME; 1789 waittime = MAX_BLOCKTIME;
1471 1790
1472 if (timercnt) 1791 if (timercnt)
1473 { 1792 {
1474 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1793 ev_tstamp to = ev_at (timers [HEAP0]) - mn_now + backend_fudge;
1475 if (block > to) block = to; 1794 if (waittime > to) waittime = to;
1476 } 1795 }
1477 1796
1478#if EV_PERIODIC_ENABLE 1797#if EV_PERIODIC_ENABLE
1479 if (periodiccnt) 1798 if (periodiccnt)
1480 { 1799 {
1481 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1800 ev_tstamp to = ev_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
1482 if (block > to) block = to; 1801 if (waittime > to) waittime = to;
1483 } 1802 }
1484#endif 1803#endif
1485 1804
1486 if (expect_false (block < 0.)) block = 0.; 1805 if (expect_false (waittime < timeout_blocktime))
1806 waittime = timeout_blocktime;
1807
1808 sleeptime = waittime - backend_fudge;
1809
1810 if (expect_true (sleeptime > io_blocktime))
1811 sleeptime = io_blocktime;
1812
1813 if (sleeptime)
1814 {
1815 ev_sleep (sleeptime);
1816 waittime -= sleeptime;
1817 }
1487 } 1818 }
1488 1819
1489 ++loop_count; 1820 ++loop_count;
1490 backend_poll (EV_A_ block); 1821 backend_poll (EV_A_ waittime);
1491 1822
1492 /* update ev_rt_now, do magic */ 1823 /* update ev_rt_now, do magic */
1493 time_update (EV_A_ block); 1824 time_update (EV_A_ waittime + sleeptime);
1494 } 1825 }
1495 1826
1496 /* queue pending timers and reschedule them */ 1827 /* queue pending timers and reschedule them */
1497 timers_reify (EV_A); /* relative timers called last */ 1828 timers_reify (EV_A); /* relative timers called last */
1498#if EV_PERIODIC_ENABLE 1829#if EV_PERIODIC_ENABLE
1507 /* queue check watchers, to be executed first */ 1838 /* queue check watchers, to be executed first */
1508 if (expect_false (checkcnt)) 1839 if (expect_false (checkcnt))
1509 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1840 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1510 1841
1511 call_pending (EV_A); 1842 call_pending (EV_A);
1512
1513 } 1843 }
1514 while (expect_true (activecnt && !loop_done)); 1844 while (expect_true (
1845 activecnt
1846 && !loop_done
1847 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1848 ));
1515 1849
1516 if (loop_done == EVUNLOOP_ONE) 1850 if (loop_done == EVUNLOOP_ONE)
1517 loop_done = EVUNLOOP_CANCEL; 1851 loop_done = EVUNLOOP_CANCEL;
1518} 1852}
1519 1853
1637ev_timer_start (EV_P_ ev_timer *w) 1971ev_timer_start (EV_P_ ev_timer *w)
1638{ 1972{
1639 if (expect_false (ev_is_active (w))) 1973 if (expect_false (ev_is_active (w)))
1640 return; 1974 return;
1641 1975
1642 ((WT)w)->at += mn_now; 1976 ev_at (w) += mn_now;
1643 1977
1644 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1978 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1645 1979
1646 ev_start (EV_A_ (W)w, ++timercnt); 1980 ev_start (EV_A_ (W)w, ++timercnt + HEAP0 - 1);
1647 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1981 array_needsize (WT, timers, timermax, timercnt + HEAP0, EMPTY2);
1648 timers [timercnt - 1] = (WT)w; 1982 timers [ev_active (w)] = (WT)w;
1649 upheap (timers, timercnt - 1); 1983 upheap (timers, ev_active (w));
1650 1984
1651 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1985 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1652} 1986}
1653 1987
1654void noinline 1988void noinline
1655ev_timer_stop (EV_P_ ev_timer *w) 1989ev_timer_stop (EV_P_ ev_timer *w)
1656{ 1990{
1657 clear_pending (EV_A_ (W)w); 1991 clear_pending (EV_A_ (W)w);
1658 if (expect_false (!ev_is_active (w))) 1992 if (expect_false (!ev_is_active (w)))
1659 return; 1993 return;
1660 1994
1661 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1662
1663 { 1995 {
1664 int active = ((W)w)->active; 1996 int active = ev_active (w);
1665 1997
1998 assert (("internal timer heap corruption", timers [active] == (WT)w));
1999
1666 if (expect_true (--active < --timercnt)) 2000 if (expect_true (active < timercnt + HEAP0 - 1))
1667 { 2001 {
1668 timers [active] = timers [timercnt]; 2002 timers [active] = timers [timercnt + HEAP0 - 1];
1669 adjustheap (timers, timercnt, active); 2003 adjustheap (timers, timercnt, active);
1670 } 2004 }
2005
2006 --timercnt;
1671 } 2007 }
1672 2008
1673 ((WT)w)->at -= mn_now; 2009 ev_at (w) -= mn_now;
1674 2010
1675 ev_stop (EV_A_ (W)w); 2011 ev_stop (EV_A_ (W)w);
1676} 2012}
1677 2013
1678void noinline 2014void noinline
1680{ 2016{
1681 if (ev_is_active (w)) 2017 if (ev_is_active (w))
1682 { 2018 {
1683 if (w->repeat) 2019 if (w->repeat)
1684 { 2020 {
1685 ((WT)w)->at = mn_now + w->repeat; 2021 ev_at (w) = mn_now + w->repeat;
1686 adjustheap (timers, timercnt, ((W)w)->active - 1); 2022 adjustheap (timers, timercnt, ev_active (w));
1687 } 2023 }
1688 else 2024 else
1689 ev_timer_stop (EV_A_ w); 2025 ev_timer_stop (EV_A_ w);
1690 } 2026 }
1691 else if (w->repeat) 2027 else if (w->repeat)
1692 { 2028 {
1693 w->at = w->repeat; 2029 ev_at (w) = w->repeat;
1694 ev_timer_start (EV_A_ w); 2030 ev_timer_start (EV_A_ w);
1695 } 2031 }
1696} 2032}
1697 2033
1698#if EV_PERIODIC_ENABLE 2034#if EV_PERIODIC_ENABLE
1701{ 2037{
1702 if (expect_false (ev_is_active (w))) 2038 if (expect_false (ev_is_active (w)))
1703 return; 2039 return;
1704 2040
1705 if (w->reschedule_cb) 2041 if (w->reschedule_cb)
1706 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 2042 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1707 else if (w->interval) 2043 else if (w->interval)
1708 { 2044 {
1709 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2045 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1710 /* this formula differs from the one in periodic_reify because we do not always round up */ 2046 /* this formula differs from the one in periodic_reify because we do not always round up */
1711 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2047 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1712 } 2048 }
1713 else 2049 else
1714 ((WT)w)->at = w->offset; 2050 ev_at (w) = w->offset;
1715 2051
1716 ev_start (EV_A_ (W)w, ++periodiccnt); 2052 ev_start (EV_A_ (W)w, ++periodiccnt + HEAP0 - 1);
1717 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 2053 array_needsize (WT, periodics, periodicmax, periodiccnt + HEAP0, EMPTY2);
1718 periodics [periodiccnt - 1] = (WT)w; 2054 periodics [ev_active (w)] = (WT)w;
1719 upheap (periodics, periodiccnt - 1); 2055 upheap (periodics, ev_active (w));
1720 2056
1721 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 2057 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1722} 2058}
1723 2059
1724void noinline 2060void noinline
1725ev_periodic_stop (EV_P_ ev_periodic *w) 2061ev_periodic_stop (EV_P_ ev_periodic *w)
1726{ 2062{
1727 clear_pending (EV_A_ (W)w); 2063 clear_pending (EV_A_ (W)w);
1728 if (expect_false (!ev_is_active (w))) 2064 if (expect_false (!ev_is_active (w)))
1729 return; 2065 return;
1730 2066
1731 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1732
1733 { 2067 {
1734 int active = ((W)w)->active; 2068 int active = ev_active (w);
1735 2069
2070 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
2071
1736 if (expect_true (--active < --periodiccnt)) 2072 if (expect_true (active < periodiccnt + HEAP0 - 1))
1737 { 2073 {
1738 periodics [active] = periodics [periodiccnt]; 2074 periodics [active] = periodics [periodiccnt + HEAP0 - 1];
1739 adjustheap (periodics, periodiccnt, active); 2075 adjustheap (periodics, periodiccnt, active);
1740 } 2076 }
2077
2078 --periodiccnt;
1741 } 2079 }
1742 2080
1743 ev_stop (EV_A_ (W)w); 2081 ev_stop (EV_A_ (W)w);
1744} 2082}
1745 2083
1764#endif 2102#endif
1765 if (expect_false (ev_is_active (w))) 2103 if (expect_false (ev_is_active (w)))
1766 return; 2104 return;
1767 2105
1768 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2106 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2107
2108 evpipe_init (EV_A);
1769 2109
1770 { 2110 {
1771#ifndef _WIN32 2111#ifndef _WIN32
1772 sigset_t full, prev; 2112 sigset_t full, prev;
1773 sigfillset (&full); 2113 sigfillset (&full);
1785 wlist_add (&signals [w->signum - 1].head, (WL)w); 2125 wlist_add (&signals [w->signum - 1].head, (WL)w);
1786 2126
1787 if (!((WL)w)->next) 2127 if (!((WL)w)->next)
1788 { 2128 {
1789#if _WIN32 2129#if _WIN32
1790 signal (w->signum, sighandler); 2130 signal (w->signum, ev_sighandler);
1791#else 2131#else
1792 struct sigaction sa; 2132 struct sigaction sa;
1793 sa.sa_handler = sighandler; 2133 sa.sa_handler = ev_sighandler;
1794 sigfillset (&sa.sa_mask); 2134 sigfillset (&sa.sa_mask);
1795 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2135 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1796 sigaction (w->signum, &sa, 0); 2136 sigaction (w->signum, &sa, 0);
1797#endif 2137#endif
1798 } 2138 }
1859 if (w->wd < 0) 2199 if (w->wd < 0)
1860 { 2200 {
1861 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2201 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1862 2202
1863 /* monitor some parent directory for speedup hints */ 2203 /* monitor some parent directory for speedup hints */
2204 /* note that exceeding the hardcoded limit is not a correctness issue, */
2205 /* but an efficiency issue only */
1864 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2206 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1865 { 2207 {
1866 char path [4096]; 2208 char path [4096];
1867 strcpy (path, w->path); 2209 strcpy (path, w->path);
1868 2210
2113 clear_pending (EV_A_ (W)w); 2455 clear_pending (EV_A_ (W)w);
2114 if (expect_false (!ev_is_active (w))) 2456 if (expect_false (!ev_is_active (w)))
2115 return; 2457 return;
2116 2458
2117 { 2459 {
2118 int active = ((W)w)->active; 2460 int active = ev_active (w);
2119 2461
2120 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2462 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2121 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2463 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2122 2464
2123 ev_stop (EV_A_ (W)w); 2465 ev_stop (EV_A_ (W)w);
2124 --idleall; 2466 --idleall;
2125 } 2467 }
2126} 2468}
2143 clear_pending (EV_A_ (W)w); 2485 clear_pending (EV_A_ (W)w);
2144 if (expect_false (!ev_is_active (w))) 2486 if (expect_false (!ev_is_active (w)))
2145 return; 2487 return;
2146 2488
2147 { 2489 {
2148 int active = ((W)w)->active; 2490 int active = ev_active (w);
2491
2149 prepares [active - 1] = prepares [--preparecnt]; 2492 prepares [active - 1] = prepares [--preparecnt];
2150 ((W)prepares [active - 1])->active = active; 2493 ev_active (prepares [active - 1]) = active;
2151 } 2494 }
2152 2495
2153 ev_stop (EV_A_ (W)w); 2496 ev_stop (EV_A_ (W)w);
2154} 2497}
2155 2498
2170 clear_pending (EV_A_ (W)w); 2513 clear_pending (EV_A_ (W)w);
2171 if (expect_false (!ev_is_active (w))) 2514 if (expect_false (!ev_is_active (w)))
2172 return; 2515 return;
2173 2516
2174 { 2517 {
2175 int active = ((W)w)->active; 2518 int active = ev_active (w);
2519
2176 checks [active - 1] = checks [--checkcnt]; 2520 checks [active - 1] = checks [--checkcnt];
2177 ((W)checks [active - 1])->active = active; 2521 ev_active (checks [active - 1]) = active;
2178 } 2522 }
2179 2523
2180 ev_stop (EV_A_ (W)w); 2524 ev_stop (EV_A_ (W)w);
2181} 2525}
2182 2526
2193 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2537 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2194 2538
2195 if (ev_cb (w)) 2539 if (ev_cb (w))
2196 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2540 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2197 else 2541 else
2198 ev_embed_sweep (loop, w); 2542 ev_loop (w->other, EVLOOP_NONBLOCK);
2199} 2543}
2200 2544
2201static void 2545static void
2202embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 2546embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2203{ 2547{
2204 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 2548 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2205 2549
2206 fd_reify (w->other); 2550 {
2551 struct ev_loop *loop = w->other;
2552
2553 while (fdchangecnt)
2554 {
2555 fd_reify (EV_A);
2556 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2557 }
2558 }
2207} 2559}
2560
2561#if 0
2562static void
2563embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2564{
2565 ev_idle_stop (EV_A_ idle);
2566}
2567#endif
2208 2568
2209void 2569void
2210ev_embed_start (EV_P_ ev_embed *w) 2570ev_embed_start (EV_P_ ev_embed *w)
2211{ 2571{
2212 if (expect_false (ev_is_active (w))) 2572 if (expect_false (ev_is_active (w)))
2213 return; 2573 return;
2214 2574
2215 { 2575 {
2216 struct ev_loop *loop = w->other; 2576 struct ev_loop *loop = w->other;
2217 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2577 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2218 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_WRITE); 2578 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2219 } 2579 }
2220 2580
2221 ev_set_priority (&w->io, ev_priority (w)); 2581 ev_set_priority (&w->io, ev_priority (w));
2222 ev_io_start (EV_A_ &w->io); 2582 ev_io_start (EV_A_ &w->io);
2223 2583
2224 ev_prepare_init (&w->prepare, embed_prepare_cb); 2584 ev_prepare_init (&w->prepare, embed_prepare_cb);
2225 ev_set_priority (&w->prepare, EV_MINPRI); 2585 ev_set_priority (&w->prepare, EV_MINPRI);
2226 ev_prepare_start (EV_A_ &w->prepare); 2586 ev_prepare_start (EV_A_ &w->prepare);
2227 2587
2588 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2589
2228 ev_start (EV_A_ (W)w, 1); 2590 ev_start (EV_A_ (W)w, 1);
2229} 2591}
2230 2592
2231void 2593void
2232ev_embed_stop (EV_P_ ev_embed *w) 2594ev_embed_stop (EV_P_ ev_embed *w)
2260 clear_pending (EV_A_ (W)w); 2622 clear_pending (EV_A_ (W)w);
2261 if (expect_false (!ev_is_active (w))) 2623 if (expect_false (!ev_is_active (w)))
2262 return; 2624 return;
2263 2625
2264 { 2626 {
2265 int active = ((W)w)->active; 2627 int active = ev_active (w);
2628
2266 forks [active - 1] = forks [--forkcnt]; 2629 forks [active - 1] = forks [--forkcnt];
2267 ((W)forks [active - 1])->active = active; 2630 ev_active (forks [active - 1]) = active;
2268 } 2631 }
2269 2632
2270 ev_stop (EV_A_ (W)w); 2633 ev_stop (EV_A_ (W)w);
2634}
2635#endif
2636
2637#if EV_ASYNC_ENABLE
2638void
2639ev_async_start (EV_P_ ev_async *w)
2640{
2641 if (expect_false (ev_is_active (w)))
2642 return;
2643
2644 evpipe_init (EV_A);
2645
2646 ev_start (EV_A_ (W)w, ++asynccnt);
2647 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2648 asyncs [asynccnt - 1] = w;
2649}
2650
2651void
2652ev_async_stop (EV_P_ ev_async *w)
2653{
2654 clear_pending (EV_A_ (W)w);
2655 if (expect_false (!ev_is_active (w)))
2656 return;
2657
2658 {
2659 int active = ev_active (w);
2660
2661 asyncs [active - 1] = asyncs [--asynccnt];
2662 ev_active (asyncs [active - 1]) = active;
2663 }
2664
2665 ev_stop (EV_A_ (W)w);
2666}
2667
2668void
2669ev_async_send (EV_P_ ev_async *w)
2670{
2671 w->sent = 1;
2672 evpipe_write (EV_A_ &gotasync);
2271} 2673}
2272#endif 2674#endif
2273 2675
2274/*****************************************************************************/ 2676/*****************************************************************************/
2275 2677

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines