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

Comparing libev/ev.c (file contents):
Revision 1.184 by root, Wed Dec 12 05:30:52 2007 UTC vs.
Revision 1.234 by root, Tue May 6 23:42:16 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
202#ifndef CLOCK_REALTIME 247#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 248# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 249# define EV_USE_REALTIME 0
205#endif 250#endif
206 251
252#if !EV_STAT_ENABLE
253# undef EV_USE_INOTIFY
254# define EV_USE_INOTIFY 0
255#endif
256
257#if !EV_USE_NANOSLEEP
258# ifndef _WIN32
259# include <sys/select.h>
260# endif
261#endif
262
263#if EV_USE_INOTIFY
264# include <sys/inotify.h>
265#endif
266
207#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 268# include <winsock.h>
209#endif 269#endif
210 270
211#if !EV_STAT_ENABLE 271#if EV_USE_EVENTFD
212# define EV_USE_INOTIFY 0 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" {
213#endif 276# endif
214 277int eventfd (unsigned int initval, int flags);
215#if EV_USE_INOTIFY 278# ifdef __cplusplus
216# include <sys/inotify.h> 279}
280# endif
217#endif 281#endif
218 282
219/**/ 283/**/
220 284
221/* 285/*
230 294
231#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 295#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
232#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 296#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
233/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */ 297/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
234 298
235#if __GNUC__ >= 3 299#if __GNUC__ >= 4
236# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
237# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
238#else 302#else
239# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
240# define noinline 304# define noinline
241# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
242# define inline 306# define inline
243# endif 307# endif
244#endif 308#endif
245 309
246#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
261 325
262typedef ev_watcher *W; 326typedef ev_watcher *W;
263typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
264typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
265 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 */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
337#endif
267 338
268#ifdef _WIN32 339#ifdef _WIN32
269# include "ev_win32.c" 340# include "ev_win32.c"
270#endif 341#endif
271 342
292 perror (msg); 363 perror (msg);
293 abort (); 364 abort ();
294 } 365 }
295} 366}
296 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
297static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
298 384
299void 385void
300ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
301{ 387{
302 alloc = cb; 388 alloc = cb;
303} 389}
304 390
305inline_speed void * 391inline_speed void *
306ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
307{ 393{
308 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
309 395
310 if (!ptr && size) 396 if (!ptr && size)
311 { 397 {
312 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
313 abort (); 399 abort ();
407{ 493{
408 return ev_rt_now; 494 return ev_rt_now;
409} 495}
410#endif 496#endif
411 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
412int inline_size 527int inline_size
413array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
414{ 529{
415 int ncur = cur + 1; 530 int ncur = cur + 1;
416 531
417 do 532 do
418 ncur <<= 1; 533 ncur <<= 1;
419 while (cnt > ncur); 534 while (cnt > ncur);
420 535
421 /* 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 */
422 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
423 { 538 {
424 ncur *= elem; 539 ncur *= elem;
425 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
426 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
427 ncur /= elem; 542 ncur /= elem;
428 } 543 }
429 544
430 return ncur; 545 return ncur;
542 657
543#if EV_SELECT_IS_WINSOCKET 658#if EV_SELECT_IS_WINSOCKET
544 if (events) 659 if (events)
545 { 660 {
546 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
547 anfd->handle = _get_osfhandle (fd); 665 anfd->handle = _get_osfhandle (fd);
666 #endif
548 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));
549 } 668 }
550#endif 669#endif
551 670
552 { 671 {
640 } 759 }
641} 760}
642 761
643/*****************************************************************************/ 762/*****************************************************************************/
644 763
764/* towards the root */
645void inline_speed 765void inline_speed
646upheap (WT *heap, int k) 766upheap (WT *heap, int k)
647{ 767{
648 WT w = heap [k]; 768 WT w = heap [k];
649 769
650 while (k) 770 for (;;)
651 { 771 {
652 int p = (k - 1) >> 1; 772 int p = k >> 1;
653 773
774 /* maybe we could use a dummy element at heap [0]? */
654 if (heap [p]->at <= w->at) 775 if (!p || heap [p]->at <= w->at)
655 break; 776 break;
656 777
657 heap [k] = heap [p]; 778 heap [k] = heap [p];
658 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
659 k = p; 780 k = p;
660 } 781 }
661 782
662 heap [k] = w; 783 heap [k] = w;
663 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
664} 785}
665 786
787/* away from the root */
666void inline_speed 788void inline_speed
667downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
668{ 790{
669 WT w = heap [k]; 791 WT w = heap [k];
670 792
671 for (;;) 793 for (;;)
672 { 794 {
673 int c = (k << 1) + 1; 795 int c = k << 1;
674 796
675 if (c >= N) 797 if (c > N)
676 break; 798 break;
677 799
678 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 800 c += c < N && heap [c]->at > heap [c + 1]->at
679 ? 1 : 0; 801 ? 1 : 0;
680 802
681 if (w->at <= heap [c]->at) 803 if (w->at <= heap [c]->at)
682 break; 804 break;
683 805
684 heap [k] = heap [c]; 806 heap [k] = heap [c];
685 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
686 808
687 k = c; 809 k = c;
688 } 810 }
689 811
690 heap [k] = w; 812 heap [k] = w;
691 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
692} 814}
693 815
694void inline_size 816void inline_size
695adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
696{ 818{
701/*****************************************************************************/ 823/*****************************************************************************/
702 824
703typedef struct 825typedef struct
704{ 826{
705 WL head; 827 WL head;
706 sig_atomic_t volatile gotsig; 828 EV_ATOMIC_T gotsig;
707} ANSIG; 829} ANSIG;
708 830
709static ANSIG *signals; 831static ANSIG *signals;
710static int signalmax; 832static int signalmax;
711 833
712static int sigpipe [2]; 834static EV_ATOMIC_T gotsig;
713static sig_atomic_t volatile gotsig;
714static ev_io sigev;
715 835
716void inline_size 836void inline_size
717signals_init (ANSIG *base, int count) 837signals_init (ANSIG *base, int count)
718{ 838{
719 while (count--) 839 while (count--)
723 843
724 ++base; 844 ++base;
725 } 845 }
726} 846}
727 847
728static void 848/*****************************************************************************/
729sighandler (int signum)
730{
731#if _WIN32
732 signal (signum, sighandler);
733#endif
734
735 signals [signum - 1].gotsig = 1;
736
737 if (!gotsig)
738 {
739 int old_errno = errno;
740 gotsig = 1;
741 write (sigpipe [1], &signum, 1);
742 errno = old_errno;
743 }
744}
745
746void noinline
747ev_feed_signal_event (EV_P_ int signum)
748{
749 WL w;
750
751#if EV_MULTIPLICITY
752 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
753#endif
754
755 --signum;
756
757 if (signum < 0 || signum >= signalmax)
758 return;
759
760 signals [signum].gotsig = 0;
761
762 for (w = signals [signum].head; w; w = w->next)
763 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
764}
765
766static void
767sigcb (EV_P_ ev_io *iow, int revents)
768{
769 int signum;
770
771 read (sigpipe [0], &revents, 1);
772 gotsig = 0;
773
774 for (signum = signalmax; signum--; )
775 if (signals [signum].gotsig)
776 ev_feed_signal_event (EV_A_ signum + 1);
777}
778 849
779void inline_speed 850void inline_speed
780fd_intern (int fd) 851fd_intern (int fd)
781{ 852{
782#ifdef _WIN32 853#ifdef _WIN32
787 fcntl (fd, F_SETFL, O_NONBLOCK); 858 fcntl (fd, F_SETFL, O_NONBLOCK);
788#endif 859#endif
789} 860}
790 861
791static void noinline 862static void noinline
792siginit (EV_P) 863evpipe_init (EV_P)
793{ 864{
865 if (!ev_is_active (&pipeev))
866 {
867#if EV_USE_EVENTFD
868 if ((evfd = eventfd (0, 0)) >= 0)
869 {
870 evpipe [0] = -1;
871 fd_intern (evfd);
872 ev_io_set (&pipeev, evfd, EV_READ);
873 }
874 else
875#endif
876 {
877 while (pipe (evpipe))
878 syserr ("(libev) error creating signal/async pipe");
879
794 fd_intern (sigpipe [0]); 880 fd_intern (evpipe [0]);
795 fd_intern (sigpipe [1]); 881 fd_intern (evpipe [1]);
882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
796 884
797 ev_io_set (&sigev, sigpipe [0], EV_READ);
798 ev_io_start (EV_A_ &sigev); 885 ev_io_start (EV_A_ &pipeev);
799 ev_unref (EV_A); /* child watcher should not keep loop alive */ 886 ev_unref (EV_A); /* watcher should not keep loop alive */
887 }
888}
889
890void inline_size
891evpipe_write (EV_P_ EV_ATOMIC_T *flag)
892{
893 if (!*flag)
894 {
895 int old_errno = errno; /* save errno because write might clobber it */
896
897 *flag = 1;
898
899#if EV_USE_EVENTFD
900 if (evfd >= 0)
901 {
902 uint64_t counter = 1;
903 write (evfd, &counter, sizeof (uint64_t));
904 }
905 else
906#endif
907 write (evpipe [1], &old_errno, 1);
908
909 errno = old_errno;
910 }
911}
912
913static void
914pipecb (EV_P_ ev_io *iow, int revents)
915{
916#if EV_USE_EVENTFD
917 if (evfd >= 0)
918 {
919 uint64_t counter;
920 read (evfd, &counter, sizeof (uint64_t));
921 }
922 else
923#endif
924 {
925 char dummy;
926 read (evpipe [0], &dummy, 1);
927 }
928
929 if (gotsig && ev_is_default_loop (EV_A))
930 {
931 int signum;
932 gotsig = 0;
933
934 for (signum = signalmax; signum--; )
935 if (signals [signum].gotsig)
936 ev_feed_signal_event (EV_A_ signum + 1);
937 }
938
939#if EV_ASYNC_ENABLE
940 if (gotasync)
941 {
942 int i;
943 gotasync = 0;
944
945 for (i = asynccnt; i--; )
946 if (asyncs [i]->sent)
947 {
948 asyncs [i]->sent = 0;
949 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
950 }
951 }
952#endif
800} 953}
801 954
802/*****************************************************************************/ 955/*****************************************************************************/
803 956
957static void
958ev_sighandler (int signum)
959{
960#if EV_MULTIPLICITY
961 struct ev_loop *loop = &default_loop_struct;
962#endif
963
964#if _WIN32
965 signal (signum, ev_sighandler);
966#endif
967
968 signals [signum - 1].gotsig = 1;
969 evpipe_write (EV_A_ &gotsig);
970}
971
972void noinline
973ev_feed_signal_event (EV_P_ int signum)
974{
975 WL w;
976
977#if EV_MULTIPLICITY
978 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
979#endif
980
981 --signum;
982
983 if (signum < 0 || signum >= signalmax)
984 return;
985
986 signals [signum].gotsig = 0;
987
988 for (w = signals [signum].head; w; w = w->next)
989 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
990}
991
992/*****************************************************************************/
993
804static WL childs [EV_PID_HASHSIZE]; 994static WL childs [EV_PID_HASHSIZE];
805 995
806#ifndef _WIN32 996#ifndef _WIN32
807 997
808static ev_signal childev; 998static ev_signal childev;
809 999
1000#ifndef WIFCONTINUED
1001# define WIFCONTINUED(status) 0
1002#endif
1003
810void inline_speed 1004void inline_speed
811child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1005child_reap (EV_P_ int chain, int pid, int status)
812{ 1006{
813 ev_child *w; 1007 ev_child *w;
1008 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
814 1009
815 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1010 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1011 {
816 if (w->pid == pid || !w->pid) 1012 if ((w->pid == pid || !w->pid)
1013 && (!traced || (w->flags & 1)))
817 { 1014 {
818 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1015 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
819 w->rpid = pid; 1016 w->rpid = pid;
820 w->rstatus = status; 1017 w->rstatus = status;
821 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1018 ev_feed_event (EV_A_ (W)w, EV_CHILD);
822 } 1019 }
1020 }
823} 1021}
824 1022
825#ifndef WCONTINUED 1023#ifndef WCONTINUED
826# define WCONTINUED 0 1024# define WCONTINUED 0
827#endif 1025#endif
836 if (!WCONTINUED 1034 if (!WCONTINUED
837 || errno != EINVAL 1035 || errno != EINVAL
838 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1036 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
839 return; 1037 return;
840 1038
841 /* make sure we are called again until all childs have been reaped */ 1039 /* make sure we are called again until all children have been reaped */
842 /* we need to do it this way so that the callback gets called before we continue */ 1040 /* we need to do it this way so that the callback gets called before we continue */
843 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1041 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
844 1042
845 child_reap (EV_A_ sw, pid, pid, status); 1043 child_reap (EV_A_ pid, pid, status);
846 if (EV_PID_HASHSIZE > 1) 1044 if (EV_PID_HASHSIZE > 1)
847 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1045 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
848} 1046}
849 1047
850#endif 1048#endif
851 1049
852/*****************************************************************************/ 1050/*****************************************************************************/
924} 1122}
925 1123
926unsigned int 1124unsigned int
927ev_embeddable_backends (void) 1125ev_embeddable_backends (void)
928{ 1126{
929 return EVBACKEND_EPOLL 1127 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
930 | EVBACKEND_KQUEUE 1128
931 | EVBACKEND_PORT; 1129 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1130 /* please fix it and tell me how to detect the fix */
1131 flags &= ~EVBACKEND_EPOLL;
1132
1133 return flags;
932} 1134}
933 1135
934unsigned int 1136unsigned int
935ev_backend (EV_P) 1137ev_backend (EV_P)
936{ 1138{
939 1141
940unsigned int 1142unsigned int
941ev_loop_count (EV_P) 1143ev_loop_count (EV_P)
942{ 1144{
943 return loop_count; 1145 return loop_count;
1146}
1147
1148void
1149ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1150{
1151 io_blocktime = interval;
1152}
1153
1154void
1155ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1156{
1157 timeout_blocktime = interval;
944} 1158}
945 1159
946static void noinline 1160static void noinline
947loop_init (EV_P_ unsigned int flags) 1161loop_init (EV_P_ unsigned int flags)
948{ 1162{
954 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1168 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
955 have_monotonic = 1; 1169 have_monotonic = 1;
956 } 1170 }
957#endif 1171#endif
958 1172
959 ev_rt_now = ev_time (); 1173 ev_rt_now = ev_time ();
960 mn_now = get_clock (); 1174 mn_now = get_clock ();
961 now_floor = mn_now; 1175 now_floor = mn_now;
962 rtmn_diff = ev_rt_now - mn_now; 1176 rtmn_diff = ev_rt_now - mn_now;
1177
1178 io_blocktime = 0.;
1179 timeout_blocktime = 0.;
1180 backend = 0;
1181 backend_fd = -1;
1182 gotasync = 0;
1183#if EV_USE_INOTIFY
1184 fs_fd = -2;
1185#endif
963 1186
964 /* pid check not overridable via env */ 1187 /* pid check not overridable via env */
965#ifndef _WIN32 1188#ifndef _WIN32
966 if (flags & EVFLAG_FORKCHECK) 1189 if (flags & EVFLAG_FORKCHECK)
967 curpid = getpid (); 1190 curpid = getpid ();
970 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
971 && !enable_secure () 1194 && !enable_secure ()
972 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
973 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
974 1197
975 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
976 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
977
978 backend = 0;
979 backend_fd = -1;
980#if EV_USE_INOTIFY
981 fs_fd = -2;
982#endif
983 1200
984#if EV_USE_PORT 1201#if EV_USE_PORT
985 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
986#endif 1203#endif
987#if EV_USE_KQUEUE 1204#if EV_USE_KQUEUE
995#endif 1212#endif
996#if EV_USE_SELECT 1213#if EV_USE_SELECT
997 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1214 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
998#endif 1215#endif
999 1216
1000 ev_init (&sigev, sigcb); 1217 ev_init (&pipeev, pipecb);
1001 ev_set_priority (&sigev, EV_MAXPRI); 1218 ev_set_priority (&pipeev, EV_MAXPRI);
1002 } 1219 }
1003} 1220}
1004 1221
1005static void noinline 1222static void noinline
1006loop_destroy (EV_P) 1223loop_destroy (EV_P)
1007{ 1224{
1008 int i; 1225 int i;
1226
1227 if (ev_is_active (&pipeev))
1228 {
1229 ev_ref (EV_A); /* signal watcher */
1230 ev_io_stop (EV_A_ &pipeev);
1231
1232#if EV_USE_EVENTFD
1233 if (evfd >= 0)
1234 close (evfd);
1235#endif
1236
1237 if (evpipe [0] >= 0)
1238 {
1239 close (evpipe [0]);
1240 close (evpipe [1]);
1241 }
1242 }
1009 1243
1010#if EV_USE_INOTIFY 1244#if EV_USE_INOTIFY
1011 if (fs_fd >= 0) 1245 if (fs_fd >= 0)
1012 close (fs_fd); 1246 close (fs_fd);
1013#endif 1247#endif
1036 array_free (pending, [i]); 1270 array_free (pending, [i]);
1037#if EV_IDLE_ENABLE 1271#if EV_IDLE_ENABLE
1038 array_free (idle, [i]); 1272 array_free (idle, [i]);
1039#endif 1273#endif
1040 } 1274 }
1275
1276 ev_free (anfds); anfdmax = 0;
1041 1277
1042 /* have to use the microsoft-never-gets-it-right macro */ 1278 /* have to use the microsoft-never-gets-it-right macro */
1043 array_free (fdchange, EMPTY); 1279 array_free (fdchange, EMPTY);
1044 array_free (timer, EMPTY); 1280 array_free (timer, EMPTY);
1045#if EV_PERIODIC_ENABLE 1281#if EV_PERIODIC_ENABLE
1046 array_free (periodic, EMPTY); 1282 array_free (periodic, EMPTY);
1047#endif 1283#endif
1284#if EV_FORK_ENABLE
1285 array_free (fork, EMPTY);
1286#endif
1048 array_free (prepare, EMPTY); 1287 array_free (prepare, EMPTY);
1049 array_free (check, EMPTY); 1288 array_free (check, EMPTY);
1289#if EV_ASYNC_ENABLE
1290 array_free (async, EMPTY);
1291#endif
1050 1292
1051 backend = 0; 1293 backend = 0;
1052} 1294}
1053 1295
1296#if EV_USE_INOTIFY
1054void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1055 1299
1056void inline_size 1300void inline_size
1057loop_fork (EV_P) 1301loop_fork (EV_P)
1058{ 1302{
1059#if EV_USE_PORT 1303#if EV_USE_PORT
1067#endif 1311#endif
1068#if EV_USE_INOTIFY 1312#if EV_USE_INOTIFY
1069 infy_fork (EV_A); 1313 infy_fork (EV_A);
1070#endif 1314#endif
1071 1315
1072 if (ev_is_active (&sigev)) 1316 if (ev_is_active (&pipeev))
1073 { 1317 {
1074 /* default loop */ 1318 /* this "locks" the handlers against writing to the pipe */
1319 /* while we modify the fd vars */
1320 gotsig = 1;
1321#if EV_ASYNC_ENABLE
1322 gotasync = 1;
1323#endif
1075 1324
1076 ev_ref (EV_A); 1325 ev_ref (EV_A);
1077 ev_io_stop (EV_A_ &sigev); 1326 ev_io_stop (EV_A_ &pipeev);
1327
1328#if EV_USE_EVENTFD
1329 if (evfd >= 0)
1330 close (evfd);
1331#endif
1332
1333 if (evpipe [0] >= 0)
1334 {
1078 close (sigpipe [0]); 1335 close (evpipe [0]);
1079 close (sigpipe [1]); 1336 close (evpipe [1]);
1337 }
1080 1338
1081 while (pipe (sigpipe))
1082 syserr ("(libev) error creating pipe");
1083
1084 siginit (EV_A); 1339 evpipe_init (EV_A);
1340 /* now iterate over everything, in case we missed something */
1341 pipecb (EV_A_ &pipeev, EV_READ);
1085 } 1342 }
1086 1343
1087 postfork = 0; 1344 postfork = 0;
1088} 1345}
1089 1346
1111} 1368}
1112 1369
1113void 1370void
1114ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1115{ 1372{
1116 postfork = 1; 1373 postfork = 1; /* must be in line with ev_default_fork */
1117} 1374}
1118
1119#endif 1375#endif
1120 1376
1121#if EV_MULTIPLICITY 1377#if EV_MULTIPLICITY
1122struct ev_loop * 1378struct ev_loop *
1123ev_default_loop_init (unsigned int flags) 1379ev_default_loop_init (unsigned int flags)
1124#else 1380#else
1125int 1381int
1126ev_default_loop (unsigned int flags) 1382ev_default_loop (unsigned int flags)
1127#endif 1383#endif
1128{ 1384{
1129 if (sigpipe [0] == sigpipe [1])
1130 if (pipe (sigpipe))
1131 return 0;
1132
1133 if (!ev_default_loop_ptr) 1385 if (!ev_default_loop_ptr)
1134 { 1386 {
1135#if EV_MULTIPLICITY 1387#if EV_MULTIPLICITY
1136 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1388 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1137#else 1389#else
1140 1392
1141 loop_init (EV_A_ flags); 1393 loop_init (EV_A_ flags);
1142 1394
1143 if (ev_backend (EV_A)) 1395 if (ev_backend (EV_A))
1144 { 1396 {
1145 siginit (EV_A);
1146
1147#ifndef _WIN32 1397#ifndef _WIN32
1148 ev_signal_init (&childev, childcb, SIGCHLD); 1398 ev_signal_init (&childev, childcb, SIGCHLD);
1149 ev_set_priority (&childev, EV_MAXPRI); 1399 ev_set_priority (&childev, EV_MAXPRI);
1150 ev_signal_start (EV_A_ &childev); 1400 ev_signal_start (EV_A_ &childev);
1151 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1401 ev_unref (EV_A); /* child watcher should not keep loop alive */
1168#ifndef _WIN32 1418#ifndef _WIN32
1169 ev_ref (EV_A); /* child watcher */ 1419 ev_ref (EV_A); /* child watcher */
1170 ev_signal_stop (EV_A_ &childev); 1420 ev_signal_stop (EV_A_ &childev);
1171#endif 1421#endif
1172 1422
1173 ev_ref (EV_A); /* signal watcher */
1174 ev_io_stop (EV_A_ &sigev);
1175
1176 close (sigpipe [0]); sigpipe [0] = 0;
1177 close (sigpipe [1]); sigpipe [1] = 0;
1178
1179 loop_destroy (EV_A); 1423 loop_destroy (EV_A);
1180} 1424}
1181 1425
1182void 1426void
1183ev_default_fork (void) 1427ev_default_fork (void)
1185#if EV_MULTIPLICITY 1429#if EV_MULTIPLICITY
1186 struct ev_loop *loop = ev_default_loop_ptr; 1430 struct ev_loop *loop = ev_default_loop_ptr;
1187#endif 1431#endif
1188 1432
1189 if (backend) 1433 if (backend)
1190 postfork = 1; 1434 postfork = 1; /* must be in line with ev_loop_fork */
1191} 1435}
1192 1436
1193/*****************************************************************************/ 1437/*****************************************************************************/
1194 1438
1195void 1439void
1215 p->w->pending = 0; 1459 p->w->pending = 0;
1216 EV_CB_INVOKE (p->w, p->events); 1460 EV_CB_INVOKE (p->w, p->events);
1217 } 1461 }
1218 } 1462 }
1219} 1463}
1220
1221void inline_size
1222timers_reify (EV_P)
1223{
1224 while (timercnt && ((WT)timers [0])->at <= mn_now)
1225 {
1226 ev_timer *w = (ev_timer *)timers [0];
1227
1228 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1229
1230 /* first reschedule or stop timer */
1231 if (w->repeat)
1232 {
1233 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1234
1235 ((WT)w)->at += w->repeat;
1236 if (((WT)w)->at < mn_now)
1237 ((WT)w)->at = mn_now;
1238
1239 downheap (timers, timercnt, 0);
1240 }
1241 else
1242 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1243
1244 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1245 }
1246}
1247
1248#if EV_PERIODIC_ENABLE
1249void inline_size
1250periodics_reify (EV_P)
1251{
1252 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1253 {
1254 ev_periodic *w = (ev_periodic *)periodics [0];
1255
1256 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1257
1258 /* first reschedule or stop timer */
1259 if (w->reschedule_cb)
1260 {
1261 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1262 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1263 downheap (periodics, periodiccnt, 0);
1264 }
1265 else if (w->interval)
1266 {
1267 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1268 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1269 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1270 downheap (periodics, periodiccnt, 0);
1271 }
1272 else
1273 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1274
1275 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1276 }
1277}
1278
1279static void noinline
1280periodics_reschedule (EV_P)
1281{
1282 int i;
1283
1284 /* adjust periodics after time jump */
1285 for (i = 0; i < periodiccnt; ++i)
1286 {
1287 ev_periodic *w = (ev_periodic *)periodics [i];
1288
1289 if (w->reschedule_cb)
1290 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1291 else if (w->interval)
1292 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1293 }
1294
1295 /* now rebuild the heap */
1296 for (i = periodiccnt >> 1; i--; )
1297 downheap (periodics, periodiccnt, i);
1298}
1299#endif
1300 1464
1301#if EV_IDLE_ENABLE 1465#if EV_IDLE_ENABLE
1302void inline_size 1466void inline_size
1303idle_reify (EV_P) 1467idle_reify (EV_P)
1304{ 1468{
1316 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1480 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1317 break; 1481 break;
1318 } 1482 }
1319 } 1483 }
1320 } 1484 }
1485}
1486#endif
1487
1488void inline_size
1489timers_reify (EV_P)
1490{
1491 while (timercnt && ev_at (timers [1]) <= mn_now)
1492 {
1493 ev_timer *w = (ev_timer *)timers [1];
1494
1495 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1496
1497 /* first reschedule or stop timer */
1498 if (w->repeat)
1499 {
1500 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1501
1502 ev_at (w) += w->repeat;
1503 if (ev_at (w) < mn_now)
1504 ev_at (w) = mn_now;
1505
1506 downheap (timers, timercnt, 1);
1507 }
1508 else
1509 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1510
1511 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1512 }
1513}
1514
1515#if EV_PERIODIC_ENABLE
1516void inline_size
1517periodics_reify (EV_P)
1518{
1519 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1520 {
1521 ev_periodic *w = (ev_periodic *)periodics [1];
1522
1523 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1524
1525 /* first reschedule or stop timer */
1526 if (w->reschedule_cb)
1527 {
1528 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1529 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1530 downheap (periodics, periodiccnt, 1);
1531 }
1532 else if (w->interval)
1533 {
1534 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1535 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1536 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1537 downheap (periodics, periodiccnt, 1);
1538 }
1539 else
1540 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1541
1542 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1543 }
1544}
1545
1546static void noinline
1547periodics_reschedule (EV_P)
1548{
1549 int i;
1550
1551 /* adjust periodics after time jump */
1552 for (i = 1; i <= periodiccnt; ++i)
1553 {
1554 ev_periodic *w = (ev_periodic *)periodics [i];
1555
1556 if (w->reschedule_cb)
1557 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1558 else if (w->interval)
1559 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1560 }
1561
1562 /* now rebuild the heap */
1563 for (i = periodiccnt >> 1; i--; )
1564 downheap (periodics, periodiccnt, i);
1321} 1565}
1322#endif 1566#endif
1323 1567
1324void inline_speed 1568void inline_speed
1325time_update (EV_P_ ev_tstamp max_block) 1569time_update (EV_P_ ev_tstamp max_block)
1354 */ 1598 */
1355 for (i = 4; --i; ) 1599 for (i = 4; --i; )
1356 { 1600 {
1357 rtmn_diff = ev_rt_now - mn_now; 1601 rtmn_diff = ev_rt_now - mn_now;
1358 1602
1359 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1603 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1360 return; /* all is well */ 1604 return; /* all is well */
1361 1605
1362 ev_rt_now = ev_time (); 1606 ev_rt_now = ev_time ();
1363 mn_now = get_clock (); 1607 mn_now = get_clock ();
1364 now_floor = mn_now; 1608 now_floor = mn_now;
1379 { 1623 {
1380#if EV_PERIODIC_ENABLE 1624#if EV_PERIODIC_ENABLE
1381 periodics_reschedule (EV_A); 1625 periodics_reschedule (EV_A);
1382#endif 1626#endif
1383 /* adjust timers. this is easy, as the offset is the same for all of them */ 1627 /* adjust timers. this is easy, as the offset is the same for all of them */
1384 for (i = 0; i < timercnt; ++i) 1628 for (i = 1; i <= timercnt; ++i)
1385 ((WT)timers [i])->at += ev_rt_now - mn_now; 1629 ev_at (timers [i]) += ev_rt_now - mn_now;
1386 } 1630 }
1387 1631
1388 mn_now = ev_rt_now; 1632 mn_now = ev_rt_now;
1389 } 1633 }
1390} 1634}
1404static int loop_done; 1648static int loop_done;
1405 1649
1406void 1650void
1407ev_loop (EV_P_ int flags) 1651ev_loop (EV_P_ int flags)
1408{ 1652{
1409 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1653 loop_done = EVUNLOOP_CANCEL;
1410 ? EVUNLOOP_ONE
1411 : EVUNLOOP_CANCEL;
1412 1654
1413 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1655 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1414 1656
1415 do 1657 do
1416 { 1658 {
1450 /* update fd-related kernel structures */ 1692 /* update fd-related kernel structures */
1451 fd_reify (EV_A); 1693 fd_reify (EV_A);
1452 1694
1453 /* calculate blocking time */ 1695 /* calculate blocking time */
1454 { 1696 {
1455 ev_tstamp block; 1697 ev_tstamp waittime = 0.;
1698 ev_tstamp sleeptime = 0.;
1456 1699
1457 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1700 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1458 block = 0.; /* do not block at all */
1459 else
1460 { 1701 {
1461 /* update time to cancel out callback processing overhead */ 1702 /* update time to cancel out callback processing overhead */
1462 time_update (EV_A_ 1e100); 1703 time_update (EV_A_ 1e100);
1463 1704
1464 block = MAX_BLOCKTIME; 1705 waittime = MAX_BLOCKTIME;
1465 1706
1466 if (timercnt) 1707 if (timercnt)
1467 { 1708 {
1468 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1709 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1469 if (block > to) block = to; 1710 if (waittime > to) waittime = to;
1470 } 1711 }
1471 1712
1472#if EV_PERIODIC_ENABLE 1713#if EV_PERIODIC_ENABLE
1473 if (periodiccnt) 1714 if (periodiccnt)
1474 { 1715 {
1475 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1716 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1476 if (block > to) block = to; 1717 if (waittime > to) waittime = to;
1477 } 1718 }
1478#endif 1719#endif
1479 1720
1480 if (expect_false (block < 0.)) block = 0.; 1721 if (expect_false (waittime < timeout_blocktime))
1722 waittime = timeout_blocktime;
1723
1724 sleeptime = waittime - backend_fudge;
1725
1726 if (expect_true (sleeptime > io_blocktime))
1727 sleeptime = io_blocktime;
1728
1729 if (sleeptime)
1730 {
1731 ev_sleep (sleeptime);
1732 waittime -= sleeptime;
1733 }
1481 } 1734 }
1482 1735
1483 ++loop_count; 1736 ++loop_count;
1484 backend_poll (EV_A_ block); 1737 backend_poll (EV_A_ waittime);
1485 1738
1486 /* update ev_rt_now, do magic */ 1739 /* update ev_rt_now, do magic */
1487 time_update (EV_A_ block); 1740 time_update (EV_A_ waittime + sleeptime);
1488 } 1741 }
1489 1742
1490 /* queue pending timers and reschedule them */ 1743 /* queue pending timers and reschedule them */
1491 timers_reify (EV_A); /* relative timers called last */ 1744 timers_reify (EV_A); /* relative timers called last */
1492#if EV_PERIODIC_ENABLE 1745#if EV_PERIODIC_ENABLE
1501 /* queue check watchers, to be executed first */ 1754 /* queue check watchers, to be executed first */
1502 if (expect_false (checkcnt)) 1755 if (expect_false (checkcnt))
1503 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1756 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1504 1757
1505 call_pending (EV_A); 1758 call_pending (EV_A);
1506
1507 } 1759 }
1508 while (expect_true (activecnt && !loop_done)); 1760 while (expect_true (
1761 activecnt
1762 && !loop_done
1763 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1764 ));
1509 1765
1510 if (loop_done == EVUNLOOP_ONE) 1766 if (loop_done == EVUNLOOP_ONE)
1511 loop_done = EVUNLOOP_CANCEL; 1767 loop_done = EVUNLOOP_CANCEL;
1512} 1768}
1513 1769
1631ev_timer_start (EV_P_ ev_timer *w) 1887ev_timer_start (EV_P_ ev_timer *w)
1632{ 1888{
1633 if (expect_false (ev_is_active (w))) 1889 if (expect_false (ev_is_active (w)))
1634 return; 1890 return;
1635 1891
1636 ((WT)w)->at += mn_now; 1892 ev_at (w) += mn_now;
1637 1893
1638 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1894 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1639 1895
1640 ev_start (EV_A_ (W)w, ++timercnt); 1896 ev_start (EV_A_ (W)w, ++timercnt);
1641 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1897 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1642 timers [timercnt - 1] = (WT)w; 1898 timers [timercnt] = (WT)w;
1643 upheap (timers, timercnt - 1); 1899 upheap (timers, timercnt);
1644 1900
1645 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1901 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1646} 1902}
1647 1903
1648void noinline 1904void noinline
1649ev_timer_stop (EV_P_ ev_timer *w) 1905ev_timer_stop (EV_P_ ev_timer *w)
1650{ 1906{
1651 clear_pending (EV_A_ (W)w); 1907 clear_pending (EV_A_ (W)w);
1652 if (expect_false (!ev_is_active (w))) 1908 if (expect_false (!ev_is_active (w)))
1653 return; 1909 return;
1654 1910
1655 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1656
1657 { 1911 {
1658 int active = ((W)w)->active; 1912 int active = ev_active (w);
1659 1913
1914 assert (("internal timer heap corruption", timers [active] == (WT)w));
1915
1660 if (expect_true (--active < --timercnt)) 1916 if (expect_true (active < timercnt))
1661 { 1917 {
1662 timers [active] = timers [timercnt]; 1918 timers [active] = timers [timercnt];
1663 adjustheap (timers, timercnt, active); 1919 adjustheap (timers, timercnt, active);
1664 } 1920 }
1921
1922 --timercnt;
1665 } 1923 }
1666 1924
1667 ((WT)w)->at -= mn_now; 1925 ev_at (w) -= mn_now;
1668 1926
1669 ev_stop (EV_A_ (W)w); 1927 ev_stop (EV_A_ (W)w);
1670} 1928}
1671 1929
1672void noinline 1930void noinline
1674{ 1932{
1675 if (ev_is_active (w)) 1933 if (ev_is_active (w))
1676 { 1934 {
1677 if (w->repeat) 1935 if (w->repeat)
1678 { 1936 {
1679 ((WT)w)->at = mn_now + w->repeat; 1937 ev_at (w) = mn_now + w->repeat;
1680 adjustheap (timers, timercnt, ((W)w)->active - 1); 1938 adjustheap (timers, timercnt, ev_active (w));
1681 } 1939 }
1682 else 1940 else
1683 ev_timer_stop (EV_A_ w); 1941 ev_timer_stop (EV_A_ w);
1684 } 1942 }
1685 else if (w->repeat) 1943 else if (w->repeat)
1686 { 1944 {
1687 w->at = w->repeat; 1945 ev_at (w) = w->repeat;
1688 ev_timer_start (EV_A_ w); 1946 ev_timer_start (EV_A_ w);
1689 } 1947 }
1690} 1948}
1691 1949
1692#if EV_PERIODIC_ENABLE 1950#if EV_PERIODIC_ENABLE
1695{ 1953{
1696 if (expect_false (ev_is_active (w))) 1954 if (expect_false (ev_is_active (w)))
1697 return; 1955 return;
1698 1956
1699 if (w->reschedule_cb) 1957 if (w->reschedule_cb)
1700 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1958 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1701 else if (w->interval) 1959 else if (w->interval)
1702 { 1960 {
1703 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1961 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1704 /* this formula differs from the one in periodic_reify because we do not always round up */ 1962 /* this formula differs from the one in periodic_reify because we do not always round up */
1705 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1963 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1706 } 1964 }
1707 else 1965 else
1708 ((WT)w)->at = w->offset; 1966 ev_at (w) = w->offset;
1709 1967
1710 ev_start (EV_A_ (W)w, ++periodiccnt); 1968 ev_start (EV_A_ (W)w, ++periodiccnt);
1711 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1969 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1712 periodics [periodiccnt - 1] = (WT)w; 1970 periodics [periodiccnt] = (WT)w;
1713 upheap (periodics, periodiccnt - 1); 1971 upheap (periodics, periodiccnt);
1714 1972
1715 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1973 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1716} 1974}
1717 1975
1718void noinline 1976void noinline
1719ev_periodic_stop (EV_P_ ev_periodic *w) 1977ev_periodic_stop (EV_P_ ev_periodic *w)
1720{ 1978{
1721 clear_pending (EV_A_ (W)w); 1979 clear_pending (EV_A_ (W)w);
1722 if (expect_false (!ev_is_active (w))) 1980 if (expect_false (!ev_is_active (w)))
1723 return; 1981 return;
1724 1982
1725 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1726
1727 { 1983 {
1728 int active = ((W)w)->active; 1984 int active = ev_active (w);
1729 1985
1986 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1987
1730 if (expect_true (--active < --periodiccnt)) 1988 if (expect_true (active < periodiccnt))
1731 { 1989 {
1732 periodics [active] = periodics [periodiccnt]; 1990 periodics [active] = periodics [periodiccnt];
1733 adjustheap (periodics, periodiccnt, active); 1991 adjustheap (periodics, periodiccnt, active);
1734 } 1992 }
1993
1994 --periodiccnt;
1735 } 1995 }
1736 1996
1737 ev_stop (EV_A_ (W)w); 1997 ev_stop (EV_A_ (W)w);
1738} 1998}
1739 1999
1758#endif 2018#endif
1759 if (expect_false (ev_is_active (w))) 2019 if (expect_false (ev_is_active (w)))
1760 return; 2020 return;
1761 2021
1762 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2022 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
2023
2024 evpipe_init (EV_A);
1763 2025
1764 { 2026 {
1765#ifndef _WIN32 2027#ifndef _WIN32
1766 sigset_t full, prev; 2028 sigset_t full, prev;
1767 sigfillset (&full); 2029 sigfillset (&full);
1779 wlist_add (&signals [w->signum - 1].head, (WL)w); 2041 wlist_add (&signals [w->signum - 1].head, (WL)w);
1780 2042
1781 if (!((WL)w)->next) 2043 if (!((WL)w)->next)
1782 { 2044 {
1783#if _WIN32 2045#if _WIN32
1784 signal (w->signum, sighandler); 2046 signal (w->signum, ev_sighandler);
1785#else 2047#else
1786 struct sigaction sa; 2048 struct sigaction sa;
1787 sa.sa_handler = sighandler; 2049 sa.sa_handler = ev_sighandler;
1788 sigfillset (&sa.sa_mask); 2050 sigfillset (&sa.sa_mask);
1789 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2051 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1790 sigaction (w->signum, &sa, 0); 2052 sigaction (w->signum, &sa, 0);
1791#endif 2053#endif
1792 } 2054 }
1853 if (w->wd < 0) 2115 if (w->wd < 0)
1854 { 2116 {
1855 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2117 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1856 2118
1857 /* monitor some parent directory for speedup hints */ 2119 /* monitor some parent directory for speedup hints */
2120 /* note that exceeding the hardcoded limit is not a correctness issue, */
2121 /* but an efficiency issue only */
1858 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2122 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1859 { 2123 {
1860 char path [4096]; 2124 char path [4096];
1861 strcpy (path, w->path); 2125 strcpy (path, w->path);
1862 2126
2107 clear_pending (EV_A_ (W)w); 2371 clear_pending (EV_A_ (W)w);
2108 if (expect_false (!ev_is_active (w))) 2372 if (expect_false (!ev_is_active (w)))
2109 return; 2373 return;
2110 2374
2111 { 2375 {
2112 int active = ((W)w)->active; 2376 int active = ev_active (w);
2113 2377
2114 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2378 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2115 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2379 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2116 2380
2117 ev_stop (EV_A_ (W)w); 2381 ev_stop (EV_A_ (W)w);
2118 --idleall; 2382 --idleall;
2119 } 2383 }
2120} 2384}
2137 clear_pending (EV_A_ (W)w); 2401 clear_pending (EV_A_ (W)w);
2138 if (expect_false (!ev_is_active (w))) 2402 if (expect_false (!ev_is_active (w)))
2139 return; 2403 return;
2140 2404
2141 { 2405 {
2142 int active = ((W)w)->active; 2406 int active = ev_active (w);
2407
2143 prepares [active - 1] = prepares [--preparecnt]; 2408 prepares [active - 1] = prepares [--preparecnt];
2144 ((W)prepares [active - 1])->active = active; 2409 ev_active (prepares [active - 1]) = active;
2145 } 2410 }
2146 2411
2147 ev_stop (EV_A_ (W)w); 2412 ev_stop (EV_A_ (W)w);
2148} 2413}
2149 2414
2164 clear_pending (EV_A_ (W)w); 2429 clear_pending (EV_A_ (W)w);
2165 if (expect_false (!ev_is_active (w))) 2430 if (expect_false (!ev_is_active (w)))
2166 return; 2431 return;
2167 2432
2168 { 2433 {
2169 int active = ((W)w)->active; 2434 int active = ev_active (w);
2435
2170 checks [active - 1] = checks [--checkcnt]; 2436 checks [active - 1] = checks [--checkcnt];
2171 ((W)checks [active - 1])->active = active; 2437 ev_active (checks [active - 1]) = active;
2172 } 2438 }
2173 2439
2174 ev_stop (EV_A_ (W)w); 2440 ev_stop (EV_A_ (W)w);
2175} 2441}
2176 2442
2177#if EV_EMBED_ENABLE 2443#if EV_EMBED_ENABLE
2178void noinline 2444void noinline
2179ev_embed_sweep (EV_P_ ev_embed *w) 2445ev_embed_sweep (EV_P_ ev_embed *w)
2180{ 2446{
2181 ev_loop (w->loop, EVLOOP_NONBLOCK); 2447 ev_loop (w->other, EVLOOP_NONBLOCK);
2182} 2448}
2183 2449
2184static void 2450static void
2185embed_cb (EV_P_ ev_io *io, int revents) 2451embed_io_cb (EV_P_ ev_io *io, int revents)
2186{ 2452{
2187 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2453 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2188 2454
2189 if (ev_cb (w)) 2455 if (ev_cb (w))
2190 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2456 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2191 else 2457 else
2192 ev_embed_sweep (loop, w); 2458 ev_loop (w->other, EVLOOP_NONBLOCK);
2193} 2459}
2460
2461static void
2462embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2463{
2464 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2465
2466 {
2467 struct ev_loop *loop = w->other;
2468
2469 while (fdchangecnt)
2470 {
2471 fd_reify (EV_A);
2472 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2473 }
2474 }
2475}
2476
2477#if 0
2478static void
2479embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2480{
2481 ev_idle_stop (EV_A_ idle);
2482}
2483#endif
2194 2484
2195void 2485void
2196ev_embed_start (EV_P_ ev_embed *w) 2486ev_embed_start (EV_P_ ev_embed *w)
2197{ 2487{
2198 if (expect_false (ev_is_active (w))) 2488 if (expect_false (ev_is_active (w)))
2199 return; 2489 return;
2200 2490
2201 { 2491 {
2202 struct ev_loop *loop = w->loop; 2492 struct ev_loop *loop = w->other;
2203 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2493 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2204 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2494 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2205 } 2495 }
2206 2496
2207 ev_set_priority (&w->io, ev_priority (w)); 2497 ev_set_priority (&w->io, ev_priority (w));
2208 ev_io_start (EV_A_ &w->io); 2498 ev_io_start (EV_A_ &w->io);
2209 2499
2500 ev_prepare_init (&w->prepare, embed_prepare_cb);
2501 ev_set_priority (&w->prepare, EV_MINPRI);
2502 ev_prepare_start (EV_A_ &w->prepare);
2503
2504 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2505
2210 ev_start (EV_A_ (W)w, 1); 2506 ev_start (EV_A_ (W)w, 1);
2211} 2507}
2212 2508
2213void 2509void
2214ev_embed_stop (EV_P_ ev_embed *w) 2510ev_embed_stop (EV_P_ ev_embed *w)
2216 clear_pending (EV_A_ (W)w); 2512 clear_pending (EV_A_ (W)w);
2217 if (expect_false (!ev_is_active (w))) 2513 if (expect_false (!ev_is_active (w)))
2218 return; 2514 return;
2219 2515
2220 ev_io_stop (EV_A_ &w->io); 2516 ev_io_stop (EV_A_ &w->io);
2517 ev_prepare_stop (EV_A_ &w->prepare);
2221 2518
2222 ev_stop (EV_A_ (W)w); 2519 ev_stop (EV_A_ (W)w);
2223} 2520}
2224#endif 2521#endif
2225 2522
2241 clear_pending (EV_A_ (W)w); 2538 clear_pending (EV_A_ (W)w);
2242 if (expect_false (!ev_is_active (w))) 2539 if (expect_false (!ev_is_active (w)))
2243 return; 2540 return;
2244 2541
2245 { 2542 {
2246 int active = ((W)w)->active; 2543 int active = ev_active (w);
2544
2247 forks [active - 1] = forks [--forkcnt]; 2545 forks [active - 1] = forks [--forkcnt];
2248 ((W)forks [active - 1])->active = active; 2546 ev_active (forks [active - 1]) = active;
2249 } 2547 }
2250 2548
2251 ev_stop (EV_A_ (W)w); 2549 ev_stop (EV_A_ (W)w);
2550}
2551#endif
2552
2553#if EV_ASYNC_ENABLE
2554void
2555ev_async_start (EV_P_ ev_async *w)
2556{
2557 if (expect_false (ev_is_active (w)))
2558 return;
2559
2560 evpipe_init (EV_A);
2561
2562 ev_start (EV_A_ (W)w, ++asynccnt);
2563 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2564 asyncs [asynccnt - 1] = w;
2565}
2566
2567void
2568ev_async_stop (EV_P_ ev_async *w)
2569{
2570 clear_pending (EV_A_ (W)w);
2571 if (expect_false (!ev_is_active (w)))
2572 return;
2573
2574 {
2575 int active = ev_active (w);
2576
2577 asyncs [active - 1] = asyncs [--asynccnt];
2578 ev_active (asyncs [active - 1]) = active;
2579 }
2580
2581 ev_stop (EV_A_ (W)w);
2582}
2583
2584void
2585ev_async_send (EV_P_ ev_async *w)
2586{
2587 w->sent = 1;
2588 evpipe_write (EV_A_ &gotasync);
2252} 2589}
2253#endif 2590#endif
2254 2591
2255/*****************************************************************************/ 2592/*****************************************************************************/
2256 2593
2314 ev_timer_set (&once->to, timeout, 0.); 2651 ev_timer_set (&once->to, timeout, 0.);
2315 ev_timer_start (EV_A_ &once->to); 2652 ev_timer_start (EV_A_ &once->to);
2316 } 2653 }
2317} 2654}
2318 2655
2656#if EV_MULTIPLICITY
2657 #include "ev_wrap.h"
2658#endif
2659
2319#ifdef __cplusplus 2660#ifdef __cplusplus
2320} 2661}
2321#endif 2662#endif
2322 2663

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines