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.223 by root, Sun Apr 6 14:34:50 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#if EV_USE_MONOTONIC
331/* sig_atomic_t is used to avoid per-thread variables or locking but still */
332/* giving it a reasonably high chance of working on typical architetcures */
266static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 333static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
334#endif
267 335
268#ifdef _WIN32 336#ifdef _WIN32
269# include "ev_win32.c" 337# include "ev_win32.c"
270#endif 338#endif
271 339
… …
407{ 475{
408 return ev_rt_now; 476 return ev_rt_now;
409} 477}
410#endif 478#endif
411 479
480void
481ev_sleep (ev_tstamp delay)
482{
483 if (delay > 0.)
484 {
485#if EV_USE_NANOSLEEP
486 struct timespec ts;
487
488 ts.tv_sec = (time_t)delay;
489 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
490
491 nanosleep (&ts, 0);
492#elif defined(_WIN32)
493 Sleep ((unsigned long)(delay * 1e3));
494#else
495 struct timeval tv;
496
497 tv.tv_sec = (time_t)delay;
498 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
499
500 select (0, 0, 0, 0, &tv);
501#endif
502 }
503}
504
505/*****************************************************************************/
506
412int inline_size 507int inline_size
413array_nextsize (int elem, int cur, int cnt) 508array_nextsize (int elem, int cur, int cnt)
414{ 509{
415 int ncur = cur + 1; 510 int ncur = cur + 1;
416 511
… …
542 637
543#if EV_SELECT_IS_WINSOCKET 638#if EV_SELECT_IS_WINSOCKET
544 if (events) 639 if (events)
545 { 640 {
546 unsigned long argp; 641 unsigned long argp;
642 #ifdef EV_FD_TO_WIN32_HANDLE
643 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
644 #else
547 anfd->handle = _get_osfhandle (fd); 645 anfd->handle = _get_osfhandle (fd);
646 #endif
548 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 647 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
549 } 648 }
550#endif 649#endif
551 650
552 { 651 {
… …
701/*****************************************************************************/ 800/*****************************************************************************/
702 801
703typedef struct 802typedef struct
704{ 803{
705 WL head; 804 WL head;
706 sig_atomic_t volatile gotsig; 805 EV_ATOMIC_T gotsig;
707} ANSIG; 806} ANSIG;
708 807
709static ANSIG *signals; 808static ANSIG *signals;
710static int signalmax; 809static int signalmax;
711 810
712static int sigpipe [2]; 811static EV_ATOMIC_T gotsig;
713static sig_atomic_t volatile gotsig;
714static ev_io sigev;
715 812
716void inline_size 813void inline_size
717signals_init (ANSIG *base, int count) 814signals_init (ANSIG *base, int count)
718{ 815{
719 while (count--) 816 while (count--)
… …
723 820
724 ++base; 821 ++base;
725 } 822 }
726} 823}
727 824
728static void 825/*****************************************************************************/
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 826
779void inline_speed 827void inline_speed
780fd_intern (int fd) 828fd_intern (int fd)
781{ 829{
782#ifdef _WIN32 830#ifdef _WIN32
… …
787 fcntl (fd, F_SETFL, O_NONBLOCK); 835 fcntl (fd, F_SETFL, O_NONBLOCK);
788#endif 836#endif
789} 837}
790 838
791static void noinline 839static void noinline
792siginit (EV_P) 840evpipe_init (EV_P)
793{ 841{
842 if (!ev_is_active (&pipeev))
843 {
844#if EV_USE_EVENTFD
845 if ((evfd = eventfd (0, 0)) >= 0)
846 {
847 evpipe [0] = -1;
848 fd_intern (evfd);
849 ev_io_set (&pipeev, evfd, EV_READ);
850 }
851 else
852#endif
853 {
854 while (pipe (evpipe))
855 syserr ("(libev) error creating signal/async pipe");
856
794 fd_intern (sigpipe [0]); 857 fd_intern (evpipe [0]);
795 fd_intern (sigpipe [1]); 858 fd_intern (evpipe [1]);
859 ev_io_set (&pipeev, evpipe [0], EV_READ);
860 }
796 861
797 ev_io_set (&sigev, sigpipe [0], EV_READ);
798 ev_io_start (EV_A_ &sigev); 862 ev_io_start (EV_A_ &pipeev);
799 ev_unref (EV_A); /* child watcher should not keep loop alive */ 863 ev_unref (EV_A); /* watcher should not keep loop alive */
864 }
865}
866
867void inline_size
868evpipe_write (EV_P_ EV_ATOMIC_T *flag)
869{
870 if (!*flag)
871 {
872 int old_errno = errno; /* save errno because write might clobber it */
873
874 *flag = 1;
875
876#if EV_USE_EVENTFD
877 if (evfd >= 0)
878 {
879 uint64_t counter = 1;
880 write (evfd, &counter, sizeof (uint64_t));
881 }
882 else
883#endif
884 write (evpipe [1], &old_errno, 1);
885
886 errno = old_errno;
887 }
888}
889
890static void
891pipecb (EV_P_ ev_io *iow, int revents)
892{
893#if EV_USE_EVENTFD
894 if (evfd >= 0)
895 {
896 uint64_t counter = 1;
897 read (evfd, &counter, sizeof (uint64_t));
898 }
899 else
900#endif
901 {
902 char dummy;
903 read (evpipe [0], &dummy, 1);
904 }
905
906 if (gotsig && ev_is_default_loop (EV_A))
907 {
908 int signum;
909 gotsig = 0;
910
911 for (signum = signalmax; signum--; )
912 if (signals [signum].gotsig)
913 ev_feed_signal_event (EV_A_ signum + 1);
914 }
915
916#if EV_ASYNC_ENABLE
917 if (gotasync)
918 {
919 int i;
920 gotasync = 0;
921
922 for (i = asynccnt; i--; )
923 if (asyncs [i]->sent)
924 {
925 asyncs [i]->sent = 0;
926 ev_feed_event (EV_A_ asyncs [i], EV_ASYNC);
927 }
928 }
929#endif
800} 930}
801 931
802/*****************************************************************************/ 932/*****************************************************************************/
803 933
934static void
935ev_sighandler (int signum)
936{
937#if EV_MULTIPLICITY
938 struct ev_loop *loop = &default_loop_struct;
939#endif
940
941#if _WIN32
942 signal (signum, ev_sighandler);
943#endif
944
945 signals [signum - 1].gotsig = 1;
946 evpipe_write (EV_A_ &gotsig);
947}
948
949void noinline
950ev_feed_signal_event (EV_P_ int signum)
951{
952 WL w;
953
954#if EV_MULTIPLICITY
955 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
956#endif
957
958 --signum;
959
960 if (signum < 0 || signum >= signalmax)
961 return;
962
963 signals [signum].gotsig = 0;
964
965 for (w = signals [signum].head; w; w = w->next)
966 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
967}
968
969/*****************************************************************************/
970
804static WL childs [EV_PID_HASHSIZE]; 971static WL childs [EV_PID_HASHSIZE];
805 972
806#ifndef _WIN32 973#ifndef _WIN32
807 974
808static ev_signal childev; 975static ev_signal childev;
809 976
977#ifndef WIFCONTINUED
978# define WIFCONTINUED(status) 0
979#endif
980
810void inline_speed 981void inline_speed
811child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 982child_reap (EV_P_ int chain, int pid, int status)
812{ 983{
813 ev_child *w; 984 ev_child *w;
985 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
814 986
815 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 987 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
988 {
816 if (w->pid == pid || !w->pid) 989 if ((w->pid == pid || !w->pid)
990 && (!traced || (w->flags & 1)))
817 { 991 {
818 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 992 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; 993 w->rpid = pid;
820 w->rstatus = status; 994 w->rstatus = status;
821 ev_feed_event (EV_A_ (W)w, EV_CHILD); 995 ev_feed_event (EV_A_ (W)w, EV_CHILD);
822 } 996 }
997 }
823} 998}
824 999
825#ifndef WCONTINUED 1000#ifndef WCONTINUED
826# define WCONTINUED 0 1001# define WCONTINUED 0
827#endif 1002#endif
… …
836 if (!WCONTINUED 1011 if (!WCONTINUED
837 || errno != EINVAL 1012 || errno != EINVAL
838 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1013 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
839 return; 1014 return;
840 1015
841 /* make sure we are called again until all childs have been reaped */ 1016 /* 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 */ 1017 /* 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); 1018 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
844 1019
845 child_reap (EV_A_ sw, pid, pid, status); 1020 child_reap (EV_A_ pid, pid, status);
846 if (EV_PID_HASHSIZE > 1) 1021 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 */ 1022 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
848} 1023}
849 1024
850#endif 1025#endif
851 1026
852/*****************************************************************************/ 1027/*****************************************************************************/
… …
924} 1099}
925 1100
926unsigned int 1101unsigned int
927ev_embeddable_backends (void) 1102ev_embeddable_backends (void)
928{ 1103{
929 return EVBACKEND_EPOLL 1104 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
930 | EVBACKEND_KQUEUE 1105
931 | EVBACKEND_PORT; 1106 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1107 /* please fix it and tell me how to detect the fix */
1108 flags &= ~EVBACKEND_EPOLL;
1109
1110 return flags;
932} 1111}
933 1112
934unsigned int 1113unsigned int
935ev_backend (EV_P) 1114ev_backend (EV_P)
936{ 1115{
… …
939 1118
940unsigned int 1119unsigned int
941ev_loop_count (EV_P) 1120ev_loop_count (EV_P)
942{ 1121{
943 return loop_count; 1122 return loop_count;
1123}
1124
1125void
1126ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1127{
1128 io_blocktime = interval;
1129}
1130
1131void
1132ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1133{
1134 timeout_blocktime = interval;
944} 1135}
945 1136
946static void noinline 1137static void noinline
947loop_init (EV_P_ unsigned int flags) 1138loop_init (EV_P_ unsigned int flags)
948{ 1139{
… …
954 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1145 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
955 have_monotonic = 1; 1146 have_monotonic = 1;
956 } 1147 }
957#endif 1148#endif
958 1149
959 ev_rt_now = ev_time (); 1150 ev_rt_now = ev_time ();
960 mn_now = get_clock (); 1151 mn_now = get_clock ();
961 now_floor = mn_now; 1152 now_floor = mn_now;
962 rtmn_diff = ev_rt_now - mn_now; 1153 rtmn_diff = ev_rt_now - mn_now;
1154
1155 io_blocktime = 0.;
1156 timeout_blocktime = 0.;
1157 backend = 0;
1158 backend_fd = -1;
1159 gotasync = 0;
1160#if EV_USE_INOTIFY
1161 fs_fd = -2;
1162#endif
963 1163
964 /* pid check not overridable via env */ 1164 /* pid check not overridable via env */
965#ifndef _WIN32 1165#ifndef _WIN32
966 if (flags & EVFLAG_FORKCHECK) 1166 if (flags & EVFLAG_FORKCHECK)
967 curpid = getpid (); 1167 curpid = getpid ();
… …
973 flags = atoi (getenv ("LIBEV_FLAGS")); 1173 flags = atoi (getenv ("LIBEV_FLAGS"));
974 1174
975 if (!(flags & 0x0000ffffUL)) 1175 if (!(flags & 0x0000ffffUL))
976 flags |= ev_recommended_backends (); 1176 flags |= ev_recommended_backends ();
977 1177
978 backend = 0;
979 backend_fd = -1;
980#if EV_USE_INOTIFY
981 fs_fd = -2;
982#endif
983
984#if EV_USE_PORT 1178#if EV_USE_PORT
985 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1179 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
986#endif 1180#endif
987#if EV_USE_KQUEUE 1181#if EV_USE_KQUEUE
988 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1182 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
995#endif 1189#endif
996#if EV_USE_SELECT 1190#if EV_USE_SELECT
997 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1191 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
998#endif 1192#endif
999 1193
1000 ev_init (&sigev, sigcb); 1194 ev_init (&pipeev, pipecb);
1001 ev_set_priority (&sigev, EV_MAXPRI); 1195 ev_set_priority (&pipeev, EV_MAXPRI);
1002 } 1196 }
1003} 1197}
1004 1198
1005static void noinline 1199static void noinline
1006loop_destroy (EV_P) 1200loop_destroy (EV_P)
1007{ 1201{
1008 int i; 1202 int i;
1203
1204 if (ev_is_active (&pipeev))
1205 {
1206 ev_ref (EV_A); /* signal watcher */
1207 ev_io_stop (EV_A_ &pipeev);
1208
1209#if EV_USE_EVENTFD
1210 if (evfd >= 0)
1211 close (evfd);
1212#endif
1213
1214 if (evpipe [0] >= 0)
1215 {
1216 close (evpipe [0]);
1217 close (evpipe [1]);
1218 }
1219 }
1009 1220
1010#if EV_USE_INOTIFY 1221#if EV_USE_INOTIFY
1011 if (fs_fd >= 0) 1222 if (fs_fd >= 0)
1012 close (fs_fd); 1223 close (fs_fd);
1013#endif 1224#endif
… …
1036 array_free (pending, [i]); 1247 array_free (pending, [i]);
1037#if EV_IDLE_ENABLE 1248#if EV_IDLE_ENABLE
1038 array_free (idle, [i]); 1249 array_free (idle, [i]);
1039#endif 1250#endif
1040 } 1251 }
1252
1253 ev_free (anfds); anfdmax = 0;
1041 1254
1042 /* have to use the microsoft-never-gets-it-right macro */ 1255 /* have to use the microsoft-never-gets-it-right macro */
1043 array_free (fdchange, EMPTY); 1256 array_free (fdchange, EMPTY);
1044 array_free (timer, EMPTY); 1257 array_free (timer, EMPTY);
1045#if EV_PERIODIC_ENABLE 1258#if EV_PERIODIC_ENABLE
1046 array_free (periodic, EMPTY); 1259 array_free (periodic, EMPTY);
1047#endif 1260#endif
1261#if EV_FORK_ENABLE
1262 array_free (fork, EMPTY);
1263#endif
1048 array_free (prepare, EMPTY); 1264 array_free (prepare, EMPTY);
1049 array_free (check, EMPTY); 1265 array_free (check, EMPTY);
1266#if EV_ASYNC_ENABLE
1267 array_free (async, EMPTY);
1268#endif
1050 1269
1051 backend = 0; 1270 backend = 0;
1052} 1271}
1053 1272
1054void inline_size infy_fork (EV_P); 1273void inline_size infy_fork (EV_P);
… …
1067#endif 1286#endif
1068#if EV_USE_INOTIFY 1287#if EV_USE_INOTIFY
1069 infy_fork (EV_A); 1288 infy_fork (EV_A);
1070#endif 1289#endif
1071 1290
1072 if (ev_is_active (&sigev)) 1291 if (ev_is_active (&pipeev))
1073 { 1292 {
1074 /* default loop */ 1293 /* this "locks" the handlers against writing to the pipe */
1294 /* while we modify the fd vars */
1295 gotsig = 1;
1296#if EV_ASYNC_ENABLE
1297 gotasync = 1;
1298#endif
1075 1299
1076 ev_ref (EV_A); 1300 ev_ref (EV_A);
1077 ev_io_stop (EV_A_ &sigev); 1301 ev_io_stop (EV_A_ &pipeev);
1302
1303#if EV_USE_EVENTFD
1304 if (evfd >= 0)
1305 close (evfd);
1306#endif
1307
1308 if (evpipe [0] >= 0)
1309 {
1078 close (sigpipe [0]); 1310 close (evpipe [0]);
1079 close (sigpipe [1]); 1311 close (evpipe [1]);
1312 }
1080 1313
1081 while (pipe (sigpipe))
1082 syserr ("(libev) error creating pipe");
1083
1084 siginit (EV_A); 1314 evpipe_init (EV_A);
1315 /* now iterate over everything, in case we missed something */
1316 pipecb (EV_A_ &pipeev, EV_READ);
1085 } 1317 }
1086 1318
1087 postfork = 0; 1319 postfork = 0;
1088} 1320}
1089 1321
… …
1111} 1343}
1112 1344
1113void 1345void
1114ev_loop_fork (EV_P) 1346ev_loop_fork (EV_P)
1115{ 1347{
1116 postfork = 1; 1348 postfork = 1; /* must be in line with ev_default_fork */
1117} 1349}
1118 1350
1119#endif 1351#endif
1120 1352
1121#if EV_MULTIPLICITY 1353#if EV_MULTIPLICITY
… …
1124#else 1356#else
1125int 1357int
1126ev_default_loop (unsigned int flags) 1358ev_default_loop (unsigned int flags)
1127#endif 1359#endif
1128{ 1360{
1129 if (sigpipe [0] == sigpipe [1])
1130 if (pipe (sigpipe))
1131 return 0;
1132
1133 if (!ev_default_loop_ptr) 1361 if (!ev_default_loop_ptr)
1134 { 1362 {
1135#if EV_MULTIPLICITY 1363#if EV_MULTIPLICITY
1136 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1364 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
1137#else 1365#else
… …
1140 1368
1141 loop_init (EV_A_ flags); 1369 loop_init (EV_A_ flags);
1142 1370
1143 if (ev_backend (EV_A)) 1371 if (ev_backend (EV_A))
1144 { 1372 {
1145 siginit (EV_A);
1146
1147#ifndef _WIN32 1373#ifndef _WIN32
1148 ev_signal_init (&childev, childcb, SIGCHLD); 1374 ev_signal_init (&childev, childcb, SIGCHLD);
1149 ev_set_priority (&childev, EV_MAXPRI); 1375 ev_set_priority (&childev, EV_MAXPRI);
1150 ev_signal_start (EV_A_ &childev); 1376 ev_signal_start (EV_A_ &childev);
1151 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1377 ev_unref (EV_A); /* child watcher should not keep loop alive */
… …
1168#ifndef _WIN32 1394#ifndef _WIN32
1169 ev_ref (EV_A); /* child watcher */ 1395 ev_ref (EV_A); /* child watcher */
1170 ev_signal_stop (EV_A_ &childev); 1396 ev_signal_stop (EV_A_ &childev);
1171#endif 1397#endif
1172 1398
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); 1399 loop_destroy (EV_A);
1180} 1400}
1181 1401
1182void 1402void
1183ev_default_fork (void) 1403ev_default_fork (void)
… …
1185#if EV_MULTIPLICITY 1405#if EV_MULTIPLICITY
1186 struct ev_loop *loop = ev_default_loop_ptr; 1406 struct ev_loop *loop = ev_default_loop_ptr;
1187#endif 1407#endif
1188 1408
1189 if (backend) 1409 if (backend)
1190 postfork = 1; 1410 postfork = 1; /* must be in line with ev_loop_fork */
1191} 1411}
1192 1412
1193/*****************************************************************************/ 1413/*****************************************************************************/
1194 1414
1195void 1415void
… …
1404static int loop_done; 1624static int loop_done;
1405 1625
1406void 1626void
1407ev_loop (EV_P_ int flags) 1627ev_loop (EV_P_ int flags)
1408{ 1628{
1409 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1629 loop_done = EVUNLOOP_CANCEL;
1410 ? EVUNLOOP_ONE
1411 : EVUNLOOP_CANCEL;
1412 1630
1413 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1631 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1414 1632
1415 do 1633 do
1416 { 1634 {
… …
1450 /* update fd-related kernel structures */ 1668 /* update fd-related kernel structures */
1451 fd_reify (EV_A); 1669 fd_reify (EV_A);
1452 1670
1453 /* calculate blocking time */ 1671 /* calculate blocking time */
1454 { 1672 {
1455 ev_tstamp block; 1673 ev_tstamp waittime = 0.;
1674 ev_tstamp sleeptime = 0.;
1456 1675
1457 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1676 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1458 block = 0.; /* do not block at all */
1459 else
1460 { 1677 {
1461 /* update time to cancel out callback processing overhead */ 1678 /* update time to cancel out callback processing overhead */
1462 time_update (EV_A_ 1e100); 1679 time_update (EV_A_ 1e100);
1463 1680
1464 block = MAX_BLOCKTIME; 1681 waittime = MAX_BLOCKTIME;
1465 1682
1466 if (timercnt) 1683 if (timercnt)
1467 { 1684 {
1468 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1685 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1469 if (block > to) block = to; 1686 if (waittime > to) waittime = to;
1470 } 1687 }
1471 1688
1472#if EV_PERIODIC_ENABLE 1689#if EV_PERIODIC_ENABLE
1473 if (periodiccnt) 1690 if (periodiccnt)
1474 { 1691 {
1475 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1692 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1476 if (block > to) block = to; 1693 if (waittime > to) waittime = to;
1477 } 1694 }
1478#endif 1695#endif
1479 1696
1480 if (expect_false (block < 0.)) block = 0.; 1697 if (expect_false (waittime < timeout_blocktime))
1698 waittime = timeout_blocktime;
1699
1700 sleeptime = waittime - backend_fudge;
1701
1702 if (expect_true (sleeptime > io_blocktime))
1703 sleeptime = io_blocktime;
1704
1705 if (sleeptime)
1706 {
1707 ev_sleep (sleeptime);
1708 waittime -= sleeptime;
1709 }
1481 } 1710 }
1482 1711
1483 ++loop_count; 1712 ++loop_count;
1484 backend_poll (EV_A_ block); 1713 backend_poll (EV_A_ waittime);
1485 1714
1486 /* update ev_rt_now, do magic */ 1715 /* update ev_rt_now, do magic */
1487 time_update (EV_A_ block); 1716 time_update (EV_A_ waittime + sleeptime);
1488 } 1717 }
1489 1718
1490 /* queue pending timers and reschedule them */ 1719 /* queue pending timers and reschedule them */
1491 timers_reify (EV_A); /* relative timers called last */ 1720 timers_reify (EV_A); /* relative timers called last */
1492#if EV_PERIODIC_ENABLE 1721#if EV_PERIODIC_ENABLE
… …
1501 /* queue check watchers, to be executed first */ 1730 /* queue check watchers, to be executed first */
1502 if (expect_false (checkcnt)) 1731 if (expect_false (checkcnt))
1503 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1732 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1504 1733
1505 call_pending (EV_A); 1734 call_pending (EV_A);
1506
1507 } 1735 }
1508 while (expect_true (activecnt && !loop_done)); 1736 while (expect_true (
1737 activecnt
1738 && !loop_done
1739 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1740 ));
1509 1741
1510 if (loop_done == EVUNLOOP_ONE) 1742 if (loop_done == EVUNLOOP_ONE)
1511 loop_done = EVUNLOOP_CANCEL; 1743 loop_done = EVUNLOOP_CANCEL;
1512} 1744}
1513 1745
… …
1759 if (expect_false (ev_is_active (w))) 1991 if (expect_false (ev_is_active (w)))
1760 return; 1992 return;
1761 1993
1762 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1994 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1763 1995
1996 evpipe_init (EV_A);
1997
1764 { 1998 {
1765#ifndef _WIN32 1999#ifndef _WIN32
1766 sigset_t full, prev; 2000 sigset_t full, prev;
1767 sigfillset (&full); 2001 sigfillset (&full);
1768 sigprocmask (SIG_SETMASK, &full, &prev); 2002 sigprocmask (SIG_SETMASK, &full, &prev);
… …
1779 wlist_add (&signals [w->signum - 1].head, (WL)w); 2013 wlist_add (&signals [w->signum - 1].head, (WL)w);
1780 2014
1781 if (!((WL)w)->next) 2015 if (!((WL)w)->next)
1782 { 2016 {
1783#if _WIN32 2017#if _WIN32
1784 signal (w->signum, sighandler); 2018 signal (w->signum, ev_sighandler);
1785#else 2019#else
1786 struct sigaction sa; 2020 struct sigaction sa;
1787 sa.sa_handler = sighandler; 2021 sa.sa_handler = ev_sighandler;
1788 sigfillset (&sa.sa_mask); 2022 sigfillset (&sa.sa_mask);
1789 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2023 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1790 sigaction (w->signum, &sa, 0); 2024 sigaction (w->signum, &sa, 0);
1791#endif 2025#endif
1792 } 2026 }
… …
2176 2410
2177#if EV_EMBED_ENABLE 2411#if EV_EMBED_ENABLE
2178void noinline 2412void noinline
2179ev_embed_sweep (EV_P_ ev_embed *w) 2413ev_embed_sweep (EV_P_ ev_embed *w)
2180{ 2414{
2181 ev_loop (w->loop, EVLOOP_NONBLOCK); 2415 ev_loop (w->other, EVLOOP_NONBLOCK);
2182} 2416}
2183 2417
2184static void 2418static void
2185embed_cb (EV_P_ ev_io *io, int revents) 2419embed_io_cb (EV_P_ ev_io *io, int revents)
2186{ 2420{
2187 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2421 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2188 2422
2189 if (ev_cb (w)) 2423 if (ev_cb (w))
2190 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2424 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2191 else 2425 else
2192 ev_embed_sweep (loop, w); 2426 ev_loop (w->other, EVLOOP_NONBLOCK);
2193} 2427}
2428
2429static void
2430embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2431{
2432 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2433
2434 {
2435 struct ev_loop *loop = w->other;
2436
2437 while (fdchangecnt)
2438 {
2439 fd_reify (EV_A);
2440 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2441 }
2442 }
2443}
2444
2445#if 0
2446static void
2447embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2448{
2449 ev_idle_stop (EV_A_ idle);
2450}
2451#endif
2194 2452
2195void 2453void
2196ev_embed_start (EV_P_ ev_embed *w) 2454ev_embed_start (EV_P_ ev_embed *w)
2197{ 2455{
2198 if (expect_false (ev_is_active (w))) 2456 if (expect_false (ev_is_active (w)))
2199 return; 2457 return;
2200 2458
2201 { 2459 {
2202 struct ev_loop *loop = w->loop; 2460 struct ev_loop *loop = w->other;
2203 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2461 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2204 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2462 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2205 } 2463 }
2206 2464
2207 ev_set_priority (&w->io, ev_priority (w)); 2465 ev_set_priority (&w->io, ev_priority (w));
2208 ev_io_start (EV_A_ &w->io); 2466 ev_io_start (EV_A_ &w->io);
2209 2467
2468 ev_prepare_init (&w->prepare, embed_prepare_cb);
2469 ev_set_priority (&w->prepare, EV_MINPRI);
2470 ev_prepare_start (EV_A_ &w->prepare);
2471
2472 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2473
2210 ev_start (EV_A_ (W)w, 1); 2474 ev_start (EV_A_ (W)w, 1);
2211} 2475}
2212 2476
2213void 2477void
2214ev_embed_stop (EV_P_ ev_embed *w) 2478ev_embed_stop (EV_P_ ev_embed *w)
… …
2216 clear_pending (EV_A_ (W)w); 2480 clear_pending (EV_A_ (W)w);
2217 if (expect_false (!ev_is_active (w))) 2481 if (expect_false (!ev_is_active (w)))
2218 return; 2482 return;
2219 2483
2220 ev_io_stop (EV_A_ &w->io); 2484 ev_io_stop (EV_A_ &w->io);
2485 ev_prepare_stop (EV_A_ &w->prepare);
2221 2486
2222 ev_stop (EV_A_ (W)w); 2487 ev_stop (EV_A_ (W)w);
2223} 2488}
2224#endif 2489#endif
2225 2490
… …
2250 2515
2251 ev_stop (EV_A_ (W)w); 2516 ev_stop (EV_A_ (W)w);
2252} 2517}
2253#endif 2518#endif
2254 2519
2520#if EV_ASYNC_ENABLE
2521void
2522ev_async_start (EV_P_ ev_async *w)
2523{
2524 if (expect_false (ev_is_active (w)))
2525 return;
2526
2527 evpipe_init (EV_A);
2528
2529 ev_start (EV_A_ (W)w, ++asynccnt);
2530 array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
2531 asyncs [asynccnt - 1] = w;
2532}
2533
2534void
2535ev_async_stop (EV_P_ ev_async *w)
2536{
2537 clear_pending (EV_A_ (W)w);
2538 if (expect_false (!ev_is_active (w)))
2539 return;
2540
2541 {
2542 int active = ((W)w)->active;
2543 asyncs [active - 1] = asyncs [--asynccnt];
2544 ((W)asyncs [active - 1])->active = active;
2545 }
2546
2547 ev_stop (EV_A_ (W)w);
2548}
2549
2550void
2551ev_async_send (EV_P_ ev_async *w)
2552{
2553 w->sent = 1;
2554 evpipe_write (EV_A_ &gotasync);
2555}
2556#endif
2557
2255/*****************************************************************************/ 2558/*****************************************************************************/
2256 2559
2257struct ev_once 2560struct ev_once
2258{ 2561{
2259 ev_io io; 2562 ev_io io;
… …
2314 ev_timer_set (&once->to, timeout, 0.); 2617 ev_timer_set (&once->to, timeout, 0.);
2315 ev_timer_start (EV_A_ &once->to); 2618 ev_timer_start (EV_A_ &once->to);
2316 } 2619 }
2317} 2620}
2318 2621
2622#if EV_MULTIPLICITY
2623 #include "ev_wrap.h"
2624#endif
2625
2319#ifdef __cplusplus 2626#ifdef __cplusplus
2320} 2627}
2321#endif 2628#endif
2322 2629

Diff Legend

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