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

Comparing libev/ev.c (file contents):
Revision 1.339 by root, Tue Mar 16 00:43:22 2010 UTC vs.
Revision 1.365 by root, Sun Oct 31 22:01:20 2010 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#ifdef __cplusplus
41extern "C" {
42#endif
43
44/* this big block deduces configuration from config.h */ 40/* this big block deduces configuration from config.h */
45#ifndef EV_STANDALONE 41#ifndef EV_STANDALONE
46# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
47# include EV_CONFIG_H 43# include EV_CONFIG_H
48# else 44# else
… …
77# ifndef EV_USE_REALTIME 73# ifndef EV_USE_REALTIME
78# define EV_USE_REALTIME 0 74# define EV_USE_REALTIME 0
79# endif 75# endif
80# endif 76# endif
81 77
78# if HAVE_NANOSLEEP
82# ifndef EV_USE_NANOSLEEP 79# ifndef EV_USE_NANOSLEEP
83# if HAVE_NANOSLEEP
84# define EV_USE_NANOSLEEP EV_FEATURE_OS 80# define EV_USE_NANOSLEEP EV_FEATURE_OS
81# endif
85# else 82# else
83# undef EV_USE_NANOSLEEP
86# define EV_USE_NANOSLEEP 0 84# define EV_USE_NANOSLEEP 0
85# endif
86
87# if HAVE_SELECT && HAVE_SYS_SELECT_H
88# ifndef EV_USE_SELECT
89# define EV_USE_SELECT EV_FEATURE_BACKENDS
87# endif 90# endif
91# else
92# undef EV_USE_SELECT
93# define EV_USE_SELECT 0
88# endif 94# endif
89 95
96# if HAVE_POLL && HAVE_POLL_H
90# ifndef EV_USE_SELECT 97# ifndef EV_USE_POLL
91# if HAVE_SELECT && HAVE_SYS_SELECT_H
92# define EV_USE_SELECT EV_FEATURE_BACKENDS 98# define EV_USE_POLL EV_FEATURE_BACKENDS
93# else
94# define EV_USE_SELECT 0
95# endif 99# endif
96# endif
97
98# ifndef EV_USE_POLL
99# if HAVE_POLL && HAVE_POLL_H
100# define EV_USE_POLL EV_FEATURE_BACKENDS
101# else 100# else
101# undef EV_USE_POLL
102# define EV_USE_POLL 0 102# define EV_USE_POLL 0
103# endif
104# endif 103# endif
105 104
106# ifndef EV_USE_EPOLL
107# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 105# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
106# ifndef EV_USE_EPOLL
108# define EV_USE_EPOLL EV_FEATURE_BACKENDS 107# define EV_USE_EPOLL EV_FEATURE_BACKENDS
109# else
110# define EV_USE_EPOLL 0
111# endif 108# endif
109# else
110# undef EV_USE_EPOLL
111# define EV_USE_EPOLL 0
112# endif 112# endif
113 113
114# ifndef EV_USE_KQUEUE
115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H 114# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
115# ifndef EV_USE_KQUEUE
116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS 116# define EV_USE_KQUEUE EV_FEATURE_BACKENDS
117# else
118# define EV_USE_KQUEUE 0
119# endif 117# endif
118# else
119# undef EV_USE_KQUEUE
120# define EV_USE_KQUEUE 0
120# endif 121# endif
121 122
122# ifndef EV_USE_PORT
123# if HAVE_PORT_H && HAVE_PORT_CREATE 123# if HAVE_PORT_H && HAVE_PORT_CREATE
124# ifndef EV_USE_PORT
124# define EV_USE_PORT EV_FEATURE_BACKENDS 125# define EV_USE_PORT EV_FEATURE_BACKENDS
125# else
126# define EV_USE_PORT 0
127# endif 126# endif
127# else
128# undef EV_USE_PORT
129# define EV_USE_PORT 0
128# endif 130# endif
129 131
130# ifndef EV_USE_INOTIFY
131# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H 132# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
133# ifndef EV_USE_INOTIFY
132# define EV_USE_INOTIFY EV_FEATURE_OS 134# define EV_USE_INOTIFY EV_FEATURE_OS
133# else
134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# else
137# undef EV_USE_INOTIFY
138# define EV_USE_INOTIFY 0
136# endif 139# endif
137 140
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H 141# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
142# ifndef EV_USE_SIGNALFD
140# define EV_USE_SIGNALFD EV_FEATURE_OS 143# define EV_USE_SIGNALFD EV_FEATURE_OS
141# else
142# define EV_USE_SIGNALFD 0
143# endif 144# endif
145# else
146# undef EV_USE_SIGNALFD
147# define EV_USE_SIGNALFD 0
144# endif 148# endif
145 149
150# if HAVE_EVENTFD
146# ifndef EV_USE_EVENTFD 151# ifndef EV_USE_EVENTFD
147# if HAVE_EVENTFD
148# define EV_USE_EVENTFD EV_FEATURE_OS 152# define EV_USE_EVENTFD EV_FEATURE_OS
149# else
150# define EV_USE_EVENTFD 0
151# endif 153# endif
154# else
155# undef EV_USE_EVENTFD
156# define EV_USE_EVENTFD 0
152# endif 157# endif
153 158
154#endif 159#endif
155 160
156#include <math.h> 161#include <math.h>
… …
172#ifdef EV_H 177#ifdef EV_H
173# include EV_H 178# include EV_H
174#else 179#else
175# include "ev.h" 180# include "ev.h"
176#endif 181#endif
182
183EV_CPP(extern "C" {)
177 184
178#ifndef _WIN32 185#ifndef _WIN32
179# include <sys/time.h> 186# include <sys/time.h>
180# include <sys/wait.h> 187# include <sys/wait.h>
181# include <unistd.h> 188# include <unistd.h>
… …
186# ifndef EV_SELECT_IS_WINSOCKET 193# ifndef EV_SELECT_IS_WINSOCKET
187# define EV_SELECT_IS_WINSOCKET 1 194# define EV_SELECT_IS_WINSOCKET 1
188# endif 195# endif
189# undef EV_AVOID_STDIO 196# undef EV_AVOID_STDIO
190#endif 197#endif
198
199/* OS X, in its infinite idiocy, actually HARDCODES
200 * a limit of 1024 into their select. Where people have brains,
201 * OS X engineers apparently have a vacuum. Or maybe they were
202 * ordered to have a vacuum, or they do anything for money.
203 * This might help. Or not.
204 */
205#define _DARWIN_UNLIMITED_SELECT 1
191 206
192/* this block tries to deduce configuration from header-defined symbols and defaults */ 207/* this block tries to deduce configuration from header-defined symbols and defaults */
193 208
194/* try to deduce the maximum number of signals on this platform */ 209/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG) 210#if defined (EV_NSIG)
… …
367# include <sys/select.h> 382# include <sys/select.h>
368# endif 383# endif
369#endif 384#endif
370 385
371#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
372# include <sys/utsname.h>
373# include <sys/statfs.h> 387# include <sys/statfs.h>
374# include <sys/inotify.h> 388# include <sys/inotify.h>
375/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
376# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
377# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
394# define EFD_CLOEXEC O_CLOEXEC 408# define EFD_CLOEXEC O_CLOEXEC
395# else 409# else
396# define EFD_CLOEXEC 02000000 410# define EFD_CLOEXEC 02000000
397# endif 411# endif
398# endif 412# endif
399# ifdef __cplusplus
400extern "C" {
401# endif
402int (eventfd) (unsigned int initval, int flags); 413EV_CPP(extern "C") int (eventfd) (unsigned int initval, int flags);
403# ifdef __cplusplus
404}
405# endif
406#endif 414#endif
407 415
408#if EV_USE_SIGNALFD 416#if EV_USE_SIGNALFD
409/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 417/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
410# include <stdint.h> 418# include <stdint.h>
… …
416# define SFD_CLOEXEC O_CLOEXEC 424# define SFD_CLOEXEC O_CLOEXEC
417# else 425# else
418# define SFD_CLOEXEC 02000000 426# define SFD_CLOEXEC 02000000
419# endif 427# endif
420# endif 428# endif
421# ifdef __cplusplus
422extern "C" {
423# endif
424int signalfd (int fd, const sigset_t *mask, int flags); 429EV_CPP (extern "C") int signalfd (int fd, const sigset_t *mask, int flags);
425 430
426struct signalfd_siginfo 431struct signalfd_siginfo
427{ 432{
428 uint32_t ssi_signo; 433 uint32_t ssi_signo;
429 char pad[128 - sizeof (uint32_t)]; 434 char pad[128 - sizeof (uint32_t)];
430}; 435};
431# ifdef __cplusplus
432}
433# endif 436#endif
434#endif
435
436 437
437/**/ 438/**/
438 439
439#if EV_VERIFY >= 3 440#if EV_VERIFY >= 3
440# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 441# define EV_FREQUENT_CHECK ev_verify (EV_A)
441#else 442#else
442# define EV_FREQUENT_CHECK do { } while (0) 443# define EV_FREQUENT_CHECK do { } while (0)
443#endif 444#endif
444 445
445/* 446/*
… …
453#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 454#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
454 455
455#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 456#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
456#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 457#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
457 458
459#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
460#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
461
458#if __GNUC__ >= 4 462#if __GNUC__ >= 4
459# define expect(expr,value) __builtin_expect ((expr),(value)) 463# define expect(expr,value) __builtin_expect ((expr),(value))
460# define noinline __attribute__ ((noinline)) 464# define noinline __attribute__ ((noinline))
461#else 465#else
462# define expect(expr,value) (expr) 466# define expect(expr,value) (expr)
… …
494#define ev_active(w) ((W)(w))->active 498#define ev_active(w) ((W)(w))->active
495#define ev_at(w) ((WT)(w))->at 499#define ev_at(w) ((WT)(w))->at
496 500
497#if EV_USE_REALTIME 501#if EV_USE_REALTIME
498/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 502/* sig_atomic_t is used to avoid per-thread variables or locking but still */
499/* giving it a reasonably high chance of working on typical architetcures */ 503/* giving it a reasonably high chance of working on typical architectures */
500static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 504static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
501#endif 505#endif
502 506
503#if EV_USE_MONOTONIC 507#if EV_USE_MONOTONIC
504static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 508static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
… …
515#endif 519#endif
516 520
517#ifdef _WIN32 521#ifdef _WIN32
518# include "ev_win32.c" 522# include "ev_win32.c"
519#endif 523#endif
524
525/*****************************************************************************/
526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
531static unsigned int noinline
532ev_linux_version (void)
533{
534#ifdef __linux
535 unsigned int v = 0;
536 struct utsname buf;
537 int i;
538 char *p = buf.release;
539
540 if (uname (&buf))
541 return 0;
542
543 for (i = 3+1; --i; )
544 {
545 unsigned int c = 0;
546
547 for (;;)
548 {
549 if (*p >= '0' && *p <= '9')
550 c = c * 10 + *p++ - '0';
551 else
552 {
553 p += *p == '.';
554 break;
555 }
556 }
557
558 v = (v << 8) | c;
559 }
560
561 return v;
562#else
563 return 0;
564#endif
565}
520 566
521/*****************************************************************************/ 567/*****************************************************************************/
522 568
523#if EV_AVOID_STDIO 569#if EV_AVOID_STDIO
524static void noinline 570static void noinline
… …
545 if (syserr_cb) 591 if (syserr_cb)
546 syserr_cb (msg); 592 syserr_cb (msg);
547 else 593 else
548 { 594 {
549#if EV_AVOID_STDIO 595#if EV_AVOID_STDIO
550 const char *err = strerror (errno);
551
552 ev_printerr (msg); 596 ev_printerr (msg);
553 ev_printerr (": "); 597 ev_printerr (": ");
554 ev_printerr (err); 598 ev_printerr (strerror (errno));
555 ev_printerr ("\n"); 599 ev_printerr ("\n");
556#else 600#else
557 perror (msg); 601 perror (msg);
558#endif 602#endif
559 abort (); 603 abort ();
… …
593 ptr = alloc (ptr, size); 637 ptr = alloc (ptr, size);
594 638
595 if (!ptr && size) 639 if (!ptr && size)
596 { 640 {
597#if EV_AVOID_STDIO 641#if EV_AVOID_STDIO
598 ev_printerr ("libev: memory allocation failed, aborting.\n"); 642 ev_printerr ("(libev) memory allocation failed, aborting.\n");
599#else 643#else
600 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 644 fprintf (stderr, "(libev) cannot allocate %ld bytes, aborting.", size);
601#endif 645#endif
602 abort (); 646 abort ();
603 } 647 }
604 648
605 return ptr; 649 return ptr;
… …
622 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 666 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
623 unsigned char unused; 667 unsigned char unused;
624#if EV_USE_EPOLL 668#if EV_USE_EPOLL
625 unsigned int egen; /* generation counter to counter epoll bugs */ 669 unsigned int egen; /* generation counter to counter epoll bugs */
626#endif 670#endif
627#if EV_SELECT_IS_WINSOCKET 671#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
628 SOCKET handle; 672 SOCKET handle;
673#endif
674#if EV_USE_IOCP
675 OVERLAPPED or, ow;
629#endif 676#endif
630} ANFD; 677} ANFD;
631 678
632/* stores the pending event set for a given watcher */ 679/* stores the pending event set for a given watcher */
633typedef struct 680typedef struct
… …
698# define EV_RELEASE_CB (void)0 745# define EV_RELEASE_CB (void)0
699# define EV_ACQUIRE_CB (void)0 746# define EV_ACQUIRE_CB (void)0
700# define EV_INVOKE_PENDING ev_invoke_pending (EV_A) 747# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
701#endif 748#endif
702 749
703#define EVUNLOOP_RECURSE 0x80 750#define EVBREAK_RECURSE 0x80
704 751
705/*****************************************************************************/ 752/*****************************************************************************/
706 753
707#ifndef EV_HAVE_EV_TIME 754#ifndef EV_HAVE_EV_TIME
708ev_tstamp 755ev_tstamp
… …
752 if (delay > 0.) 799 if (delay > 0.)
753 { 800 {
754#if EV_USE_NANOSLEEP 801#if EV_USE_NANOSLEEP
755 struct timespec ts; 802 struct timespec ts;
756 803
757 ts.tv_sec = (time_t)delay; 804 EV_TS_SET (ts, delay);
758 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
759
760 nanosleep (&ts, 0); 805 nanosleep (&ts, 0);
761#elif defined(_WIN32) 806#elif defined(_WIN32)
762 Sleep ((unsigned long)(delay * 1e3)); 807 Sleep ((unsigned long)(delay * 1e3));
763#else 808#else
764 struct timeval tv; 809 struct timeval tv;
765 810
766 tv.tv_sec = (time_t)delay;
767 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
768
769 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 811 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
770 /* something not guaranteed by newer posix versions, but guaranteed */ 812 /* something not guaranteed by newer posix versions, but guaranteed */
771 /* by older ones */ 813 /* by older ones */
814 EV_TV_SET (tv, delay);
772 select (0, 0, 0, 0, &tv); 815 select (0, 0, 0, 0, &tv);
773#endif 816#endif
774 } 817 }
775} 818}
776 819
777/*****************************************************************************/ 820/*****************************************************************************/
778 821
779#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 822#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
780 823
781/* find a suitable new size for the given array, */ 824/* find a suitable new size for the given array, */
782/* hopefully by rounding to a ncie-to-malloc size */ 825/* hopefully by rounding to a nice-to-malloc size */
783inline_size int 826inline_size int
784array_nextsize (int elem, int cur, int cnt) 827array_nextsize (int elem, int cur, int cnt)
785{ 828{
786 int ncur = cur + 1; 829 int ncur = cur + 1;
787 830
… …
928 { 971 {
929 int fd = fdchanges [i]; 972 int fd = fdchanges [i];
930 ANFD *anfd = anfds + fd; 973 ANFD *anfd = anfds + fd;
931 ev_io *w; 974 ev_io *w;
932 975
933 unsigned char events = 0; 976 unsigned char o_events = anfd->events;
977 unsigned char o_reify = anfd->reify;
934 978
935 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 979 anfd->reify = 0;
936 events |= (unsigned char)w->events;
937 980
938#if EV_SELECT_IS_WINSOCKET 981#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
939 if (events) 982 if (o_reify & EV__IOFDSET)
940 { 983 {
941 unsigned long arg; 984 unsigned long arg;
942 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 985 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
943 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 986 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
987 printf ("oi %d %x\n", fd, anfd->handle);//D
944 } 988 }
945#endif 989#endif
946 990
991 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
947 { 992 {
948 unsigned char o_events = anfd->events;
949 unsigned char o_reify = anfd->reify;
950
951 anfd->reify = 0;
952 anfd->events = events; 993 anfd->events = 0;
953 994
954 if (o_events != events || o_reify & EV__IOFDSET) 995 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
996 anfd->events |= (unsigned char)w->events;
997
998 if (o_events != anfd->events)
999 o_reify = EV__IOFDSET; /* actually |= */
1000 }
1001
1002 if (o_reify & EV__IOFDSET)
955 backend_modify (EV_A_ fd, o_events, events); 1003 backend_modify (EV_A_ fd, o_events, anfd->events);
956 }
957 } 1004 }
958 1005
959 fdchangecnt = 0; 1006 fdchangecnt = 0;
960} 1007}
961 1008
… …
1054} 1101}
1055 1102
1056/*****************************************************************************/ 1103/*****************************************************************************/
1057 1104
1058/* 1105/*
1059 * the heap functions want a real array index. array index 0 uis guaranteed to not 1106 * the heap functions want a real array index. array index 0 is guaranteed to not
1060 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives 1107 * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
1061 * the branching factor of the d-tree. 1108 * the branching factor of the d-tree.
1062 */ 1109 */
1063 1110
1064/* 1111/*
… …
1264 uint64_t counter = 1; 1311 uint64_t counter = 1;
1265 write (evfd, &counter, sizeof (uint64_t)); 1312 write (evfd, &counter, sizeof (uint64_t));
1266 } 1313 }
1267 else 1314 else
1268#endif 1315#endif
1316 /* win32 people keep sending patches that change this write() to send() */
1317 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1318 /* so when you think this write should be a send instead, please find out */
1319 /* where your send() is from - it's definitely not the microsoft send, and */
1320 /* tell me. thank you. */
1269 write (evpipe [1], &dummy, 1); 1321 write (evpipe [1], &dummy, 1);
1270 1322
1271 errno = old_errno; 1323 errno = old_errno;
1272 } 1324 }
1273} 1325}
… …
1287 } 1339 }
1288 else 1340 else
1289#endif 1341#endif
1290 { 1342 {
1291 char dummy; 1343 char dummy;
1344 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1292 read (evpipe [0], &dummy, 1); 1345 read (evpipe [0], &dummy, 1);
1293 } 1346 }
1294 1347
1295 if (sig_pending) 1348 if (sig_pending)
1296 { 1349 {
… …
1438 1491
1439#endif 1492#endif
1440 1493
1441/*****************************************************************************/ 1494/*****************************************************************************/
1442 1495
1496#if EV_USE_IOCP
1497# include "ev_iocp.c"
1498#endif
1443#if EV_USE_PORT 1499#if EV_USE_PORT
1444# include "ev_port.c" 1500# include "ev_port.c"
1445#endif 1501#endif
1446#if EV_USE_KQUEUE 1502#if EV_USE_KQUEUE
1447# include "ev_kqueue.c" 1503# include "ev_kqueue.c"
… …
1507#ifdef __APPLE__ 1563#ifdef __APPLE__
1508 /* only select works correctly on that "unix-certified" platform */ 1564 /* only select works correctly on that "unix-certified" platform */
1509 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */ 1565 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1510 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */ 1566 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1511#endif 1567#endif
1568#ifdef __FreeBSD__
1569 flags &= ~EVBACKEND_POLL; /* poll return value is unusable (http://forums.freebsd.org/archive/index.php/t-10270.html) */
1570#endif
1512 1571
1513 return flags; 1572 return flags;
1514} 1573}
1515 1574
1516unsigned int 1575unsigned int
1517ev_embeddable_backends (void) 1576ev_embeddable_backends (void)
1518{ 1577{
1519 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1578 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1520 1579
1521 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1580 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1522 /* please fix it and tell me how to detect the fix */ 1581 if (ev_linux_version () < 0x020620) /* disable it on linux < 2.6.32 */
1523 flags &= ~EVBACKEND_EPOLL; 1582 flags &= ~EVBACKEND_EPOLL;
1524 1583
1525 return flags; 1584 return flags;
1526} 1585}
1527 1586
1528unsigned int 1587unsigned int
… …
1531 return backend; 1590 return backend;
1532} 1591}
1533 1592
1534#if EV_FEATURE_API 1593#if EV_FEATURE_API
1535unsigned int 1594unsigned int
1536ev_loop_count (EV_P) 1595ev_iteration (EV_P)
1537{ 1596{
1538 return loop_count; 1597 return loop_count;
1539} 1598}
1540 1599
1541unsigned int 1600unsigned int
1542ev_loop_depth (EV_P) 1601ev_depth (EV_P)
1543{ 1602{
1544 return loop_depth; 1603 return loop_depth;
1545} 1604}
1546 1605
1547void 1606void
… …
1641#endif 1700#endif
1642 1701
1643 if (!(flags & 0x0000ffffU)) 1702 if (!(flags & 0x0000ffffU))
1644 flags |= ev_recommended_backends (); 1703 flags |= ev_recommended_backends ();
1645 1704
1705#if EV_USE_IOCP
1706 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1707#endif
1646#if EV_USE_PORT 1708#if EV_USE_PORT
1647 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1709 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1648#endif 1710#endif
1649#if EV_USE_KQUEUE 1711#if EV_USE_KQUEUE
1650 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1712 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1667#endif 1729#endif
1668 } 1730 }
1669} 1731}
1670 1732
1671/* free up a loop structure */ 1733/* free up a loop structure */
1672static void noinline 1734void
1673loop_destroy (EV_P) 1735ev_loop_destroy (EV_P)
1674{ 1736{
1675 int i; 1737 int i;
1738
1739#if EV_MULTIPLICITY
1740 /* mimic free (0) */
1741 if (!EV_A)
1742 return;
1743#endif
1744
1745#if EV_CLEANUP_ENABLE
1746 /* queue cleanup watchers (and execute them) */
1747 if (expect_false (cleanupcnt))
1748 {
1749 queue_events (EV_A_ (W *)cleanups, cleanupcnt, EV_CLEANUP);
1750 EV_INVOKE_PENDING;
1751 }
1752#endif
1753
1754#if EV_CHILD_ENABLE
1755 if (ev_is_active (&childev))
1756 {
1757 ev_ref (EV_A); /* child watcher */
1758 ev_signal_stop (EV_A_ &childev);
1759 }
1760#endif
1676 1761
1677 if (ev_is_active (&pipe_w)) 1762 if (ev_is_active (&pipe_w))
1678 { 1763 {
1679 /*ev_ref (EV_A);*/ 1764 /*ev_ref (EV_A);*/
1680 /*ev_io_stop (EV_A_ &pipe_w);*/ 1765 /*ev_io_stop (EV_A_ &pipe_w);*/
… …
1702#endif 1787#endif
1703 1788
1704 if (backend_fd >= 0) 1789 if (backend_fd >= 0)
1705 close (backend_fd); 1790 close (backend_fd);
1706 1791
1792#if EV_USE_IOCP
1793 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1794#endif
1707#if EV_USE_PORT 1795#if EV_USE_PORT
1708 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1796 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1709#endif 1797#endif
1710#if EV_USE_KQUEUE 1798#if EV_USE_KQUEUE
1711 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1799 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
… …
1738 array_free (periodic, EMPTY); 1826 array_free (periodic, EMPTY);
1739#endif 1827#endif
1740#if EV_FORK_ENABLE 1828#if EV_FORK_ENABLE
1741 array_free (fork, EMPTY); 1829 array_free (fork, EMPTY);
1742#endif 1830#endif
1831#if EV_CLEANUP_ENABLE
1832 array_free (cleanup, EMPTY);
1833#endif
1743 array_free (prepare, EMPTY); 1834 array_free (prepare, EMPTY);
1744 array_free (check, EMPTY); 1835 array_free (check, EMPTY);
1745#if EV_ASYNC_ENABLE 1836#if EV_ASYNC_ENABLE
1746 array_free (async, EMPTY); 1837 array_free (async, EMPTY);
1747#endif 1838#endif
1748 1839
1749 backend = 0; 1840 backend = 0;
1841
1842#if EV_MULTIPLICITY
1843 if (ev_is_default_loop (EV_A))
1844#endif
1845 ev_default_loop_ptr = 0;
1846#if EV_MULTIPLICITY
1847 else
1848 ev_free (EV_A);
1849#endif
1750} 1850}
1751 1851
1752#if EV_USE_INOTIFY 1852#if EV_USE_INOTIFY
1753inline_size void infy_fork (EV_P); 1853inline_size void infy_fork (EV_P);
1754#endif 1854#endif
… …
1813 loop_init (EV_A_ flags); 1913 loop_init (EV_A_ flags);
1814 1914
1815 if (ev_backend (EV_A)) 1915 if (ev_backend (EV_A))
1816 return EV_A; 1916 return EV_A;
1817 1917
1918 ev_free (EV_A);
1818 return 0; 1919 return 0;
1819} 1920}
1820 1921
1821void
1822ev_loop_destroy (EV_P)
1823{
1824 loop_destroy (EV_A);
1825 ev_free (loop);
1826}
1827
1828void
1829ev_loop_fork (EV_P)
1830{
1831 postfork = 1; /* must be in line with ev_default_fork */
1832}
1833#endif /* multiplicity */ 1922#endif /* multiplicity */
1834 1923
1835#if EV_VERIFY 1924#if EV_VERIFY
1836static void noinline 1925static void noinline
1837verify_watcher (EV_P_ W w) 1926verify_watcher (EV_P_ W w)
… …
1868} 1957}
1869#endif 1958#endif
1870 1959
1871#if EV_FEATURE_API 1960#if EV_FEATURE_API
1872void 1961void
1873ev_loop_verify (EV_P) 1962ev_verify (EV_P)
1874{ 1963{
1875#if EV_VERIFY 1964#if EV_VERIFY
1876 int i; 1965 int i;
1877 WL w; 1966 WL w;
1878 1967
… …
1912#if EV_FORK_ENABLE 2001#if EV_FORK_ENABLE
1913 assert (forkmax >= forkcnt); 2002 assert (forkmax >= forkcnt);
1914 array_verify (EV_A_ (W *)forks, forkcnt); 2003 array_verify (EV_A_ (W *)forks, forkcnt);
1915#endif 2004#endif
1916 2005
2006#if EV_CLEANUP_ENABLE
2007 assert (cleanupmax >= cleanupcnt);
2008 array_verify (EV_A_ (W *)cleanups, cleanupcnt);
2009#endif
2010
1917#if EV_ASYNC_ENABLE 2011#if EV_ASYNC_ENABLE
1918 assert (asyncmax >= asynccnt); 2012 assert (asyncmax >= asynccnt);
1919 array_verify (EV_A_ (W *)asyncs, asynccnt); 2013 array_verify (EV_A_ (W *)asyncs, asynccnt);
1920#endif 2014#endif
1921 2015
… …
1939} 2033}
1940#endif 2034#endif
1941 2035
1942#if EV_MULTIPLICITY 2036#if EV_MULTIPLICITY
1943struct ev_loop * 2037struct ev_loop *
1944ev_default_loop_init (unsigned int flags)
1945#else 2038#else
1946int 2039int
2040#endif
1947ev_default_loop (unsigned int flags) 2041ev_default_loop (unsigned int flags)
1948#endif
1949{ 2042{
1950 if (!ev_default_loop_ptr) 2043 if (!ev_default_loop_ptr)
1951 { 2044 {
1952#if EV_MULTIPLICITY 2045#if EV_MULTIPLICITY
1953 EV_P = ev_default_loop_ptr = &default_loop_struct; 2046 EV_P = ev_default_loop_ptr = &default_loop_struct;
… …
1972 2065
1973 return ev_default_loop_ptr; 2066 return ev_default_loop_ptr;
1974} 2067}
1975 2068
1976void 2069void
1977ev_default_destroy (void) 2070ev_loop_fork (EV_P)
1978{ 2071{
1979#if EV_MULTIPLICITY
1980 EV_P = ev_default_loop_ptr;
1981#endif
1982
1983 ev_default_loop_ptr = 0;
1984
1985#if EV_CHILD_ENABLE
1986 ev_ref (EV_A); /* child watcher */
1987 ev_signal_stop (EV_A_ &childev);
1988#endif
1989
1990 loop_destroy (EV_A);
1991}
1992
1993void
1994ev_default_fork (void)
1995{
1996#if EV_MULTIPLICITY
1997 EV_P = ev_default_loop_ptr;
1998#endif
1999
2000 postfork = 1; /* must be in line with ev_loop_fork */ 2072 postfork = 1; /* must be in line with ev_default_fork */
2001} 2073}
2002 2074
2003/*****************************************************************************/ 2075/*****************************************************************************/
2004 2076
2005void 2077void
… …
2096 EV_FREQUENT_CHECK; 2168 EV_FREQUENT_CHECK;
2097 feed_reverse (EV_A_ (W)w); 2169 feed_reverse (EV_A_ (W)w);
2098 } 2170 }
2099 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now); 2171 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
2100 2172
2101 feed_reverse_done (EV_A_ EV_TIMEOUT); 2173 feed_reverse_done (EV_A_ EV_TIMER);
2102 } 2174 }
2103} 2175}
2104 2176
2105#if EV_PERIODIC_ENABLE 2177#if EV_PERIODIC_ENABLE
2106/* make periodics pending */ 2178/* make periodics pending */
… …
2159 feed_reverse_done (EV_A_ EV_PERIODIC); 2231 feed_reverse_done (EV_A_ EV_PERIODIC);
2160 } 2232 }
2161} 2233}
2162 2234
2163/* simply recalculate all periodics */ 2235/* simply recalculate all periodics */
2164/* TODO: maybe ensure that at leats one event happens when jumping forward? */ 2236/* TODO: maybe ensure that at least one event happens when jumping forward? */
2165static void noinline 2237static void noinline
2166periodics_reschedule (EV_P) 2238periodics_reschedule (EV_P)
2167{ 2239{
2168 int i; 2240 int i;
2169 2241
… …
2265 mn_now = ev_rt_now; 2337 mn_now = ev_rt_now;
2266 } 2338 }
2267} 2339}
2268 2340
2269void 2341void
2270ev_loop (EV_P_ int flags) 2342ev_run (EV_P_ int flags)
2271{ 2343{
2272#if EV_FEATURE_API 2344#if EV_FEATURE_API
2273 ++loop_depth; 2345 ++loop_depth;
2274#endif 2346#endif
2275 2347
2276 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE)); 2348 assert (("libev: ev_loop recursion during release detected", loop_done != EVBREAK_RECURSE));
2277 2349
2278 loop_done = EVUNLOOP_CANCEL; 2350 loop_done = EVBREAK_CANCEL;
2279 2351
2280 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */ 2352 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2281 2353
2282 do 2354 do
2283 { 2355 {
2284#if EV_VERIFY >= 2 2356#if EV_VERIFY >= 2
2285 ev_loop_verify (EV_A); 2357 ev_verify (EV_A);
2286#endif 2358#endif
2287 2359
2288#ifndef _WIN32 2360#ifndef _WIN32
2289 if (expect_false (curpid)) /* penalise the forking check even more */ 2361 if (expect_false (curpid)) /* penalise the forking check even more */
2290 if (expect_false (getpid () != curpid)) 2362 if (expect_false (getpid () != curpid))
… …
2326 /* calculate blocking time */ 2398 /* calculate blocking time */
2327 { 2399 {
2328 ev_tstamp waittime = 0.; 2400 ev_tstamp waittime = 0.;
2329 ev_tstamp sleeptime = 0.; 2401 ev_tstamp sleeptime = 0.;
2330 2402
2403 /* remember old timestamp for io_blocktime calculation */
2404 ev_tstamp prev_mn_now = mn_now;
2405
2406 /* update time to cancel out callback processing overhead */
2407 time_update (EV_A_ 1e100);
2408
2331 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2409 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt)))
2332 { 2410 {
2333 /* remember old timestamp for io_blocktime calculation */
2334 ev_tstamp prev_mn_now = mn_now;
2335
2336 /* update time to cancel out callback processing overhead */
2337 time_update (EV_A_ 1e100);
2338
2339 waittime = MAX_BLOCKTIME; 2411 waittime = MAX_BLOCKTIME;
2340 2412
2341 if (timercnt) 2413 if (timercnt)
2342 { 2414 {
2343 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2415 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
… …
2373 } 2445 }
2374 2446
2375#if EV_FEATURE_API 2447#if EV_FEATURE_API
2376 ++loop_count; 2448 ++loop_count;
2377#endif 2449#endif
2378 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */ 2450 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2379 backend_poll (EV_A_ waittime); 2451 backend_poll (EV_A_ waittime);
2380 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */ 2452 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2381 2453
2382 /* update ev_rt_now, do magic */ 2454 /* update ev_rt_now, do magic */
2383 time_update (EV_A_ waittime + sleeptime); 2455 time_update (EV_A_ waittime + sleeptime);
2384 } 2456 }
2385 2457
… …
2403 EV_INVOKE_PENDING; 2475 EV_INVOKE_PENDING;
2404 } 2476 }
2405 while (expect_true ( 2477 while (expect_true (
2406 activecnt 2478 activecnt
2407 && !loop_done 2479 && !loop_done
2408 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2480 && !(flags & (EVRUN_ONCE | EVRUN_NOWAIT))
2409 )); 2481 ));
2410 2482
2411 if (loop_done == EVUNLOOP_ONE) 2483 if (loop_done == EVBREAK_ONE)
2412 loop_done = EVUNLOOP_CANCEL; 2484 loop_done = EVBREAK_CANCEL;
2413 2485
2414#if EV_FEATURE_API 2486#if EV_FEATURE_API
2415 --loop_depth; 2487 --loop_depth;
2416#endif 2488#endif
2417} 2489}
2418 2490
2419void 2491void
2420ev_unloop (EV_P_ int how) 2492ev_break (EV_P_ int how)
2421{ 2493{
2422 loop_done = how; 2494 loop_done = how;
2423} 2495}
2424 2496
2425void 2497void
… …
2573 EV_FREQUENT_CHECK; 2645 EV_FREQUENT_CHECK;
2574 2646
2575 wlist_del (&anfds[w->fd].head, (WL)w); 2647 wlist_del (&anfds[w->fd].head, (WL)w);
2576 ev_stop (EV_A_ (W)w); 2648 ev_stop (EV_A_ (W)w);
2577 2649
2578 fd_change (EV_A_ w->fd, 1); 2650 fd_change (EV_A_ w->fd, EV_ANFD_REIFY);
2579 2651
2580 EV_FREQUENT_CHECK; 2652 EV_FREQUENT_CHECK;
2581} 2653}
2582 2654
2583void noinline 2655void noinline
… …
3035 { 3107 {
3036 struct inotify_event *ev = (struct inotify_event *)(buf + ofs); 3108 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
3037 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3109 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3038 ofs += sizeof (struct inotify_event) + ev->len; 3110 ofs += sizeof (struct inotify_event) + ev->len;
3039 } 3111 }
3040}
3041
3042inline_size unsigned int
3043ev_linux_version (void)
3044{
3045 struct utsname buf;
3046 unsigned int v;
3047 int i;
3048 char *p = buf.release;
3049
3050 if (uname (&buf))
3051 return 0;
3052
3053 for (i = 3+1; --i; )
3054 {
3055 unsigned int c = 0;
3056
3057 for (;;)
3058 {
3059 if (*p >= '0' && *p <= '9')
3060 c = c * 10 + *p++ - '0';
3061 else
3062 {
3063 p += *p == '.';
3064 break;
3065 }
3066 }
3067
3068 v = (v << 8) | c;
3069 }
3070
3071 return v;
3072} 3112}
3073 3113
3074inline_size void 3114inline_size void
3075ev_check_2625 (EV_P) 3115ev_check_2625 (EV_P)
3076{ 3116{
… …
3400 3440
3401#if EV_EMBED_ENABLE 3441#if EV_EMBED_ENABLE
3402void noinline 3442void noinline
3403ev_embed_sweep (EV_P_ ev_embed *w) 3443ev_embed_sweep (EV_P_ ev_embed *w)
3404{ 3444{
3405 ev_loop (w->other, EVLOOP_NONBLOCK); 3445 ev_run (w->other, EVRUN_NOWAIT);
3406} 3446}
3407 3447
3408static void 3448static void
3409embed_io_cb (EV_P_ ev_io *io, int revents) 3449embed_io_cb (EV_P_ ev_io *io, int revents)
3410{ 3450{
3411 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 3451 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
3412 3452
3413 if (ev_cb (w)) 3453 if (ev_cb (w))
3414 ev_feed_event (EV_A_ (W)w, EV_EMBED); 3454 ev_feed_event (EV_A_ (W)w, EV_EMBED);
3415 else 3455 else
3416 ev_loop (w->other, EVLOOP_NONBLOCK); 3456 ev_run (w->other, EVRUN_NOWAIT);
3417} 3457}
3418 3458
3419static void 3459static void
3420embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3460embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3421{ 3461{
… …
3425 EV_P = w->other; 3465 EV_P = w->other;
3426 3466
3427 while (fdchangecnt) 3467 while (fdchangecnt)
3428 { 3468 {
3429 fd_reify (EV_A); 3469 fd_reify (EV_A);
3430 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3470 ev_run (EV_A_ EVRUN_NOWAIT);
3431 } 3471 }
3432 } 3472 }
3433} 3473}
3434 3474
3435static void 3475static void
… …
3441 3481
3442 { 3482 {
3443 EV_P = w->other; 3483 EV_P = w->other;
3444 3484
3445 ev_loop_fork (EV_A); 3485 ev_loop_fork (EV_A);
3446 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3486 ev_run (EV_A_ EVRUN_NOWAIT);
3447 } 3487 }
3448 3488
3449 ev_embed_start (EV_A_ w); 3489 ev_embed_start (EV_A_ w);
3450} 3490}
3451 3491
… …
3543 3583
3544 EV_FREQUENT_CHECK; 3584 EV_FREQUENT_CHECK;
3545} 3585}
3546#endif 3586#endif
3547 3587
3548#if EV_ASYNC_ENABLE 3588#if EV_CLEANUP_ENABLE
3549void 3589void
3550ev_async_start (EV_P_ ev_async *w) 3590ev_cleanup_start (EV_P_ ev_cleanup *w)
3551{ 3591{
3552 if (expect_false (ev_is_active (w))) 3592 if (expect_false (ev_is_active (w)))
3553 return; 3593 return;
3594
3595 EV_FREQUENT_CHECK;
3596
3597 ev_start (EV_A_ (W)w, ++cleanupcnt);
3598 array_needsize (ev_cleanup *, cleanups, cleanupmax, cleanupcnt, EMPTY2);
3599 cleanups [cleanupcnt - 1] = w;
3600
3601 /* cleanup watchers should never keep a refcount on the loop */
3602 ev_unref (EV_A);
3603 EV_FREQUENT_CHECK;
3604}
3605
3606void
3607ev_cleanup_stop (EV_P_ ev_cleanup *w)
3608{
3609 clear_pending (EV_A_ (W)w);
3610 if (expect_false (!ev_is_active (w)))
3611 return;
3612
3613 EV_FREQUENT_CHECK;
3614 ev_ref (EV_A);
3615
3616 {
3617 int active = ev_active (w);
3618
3619 cleanups [active - 1] = cleanups [--cleanupcnt];
3620 ev_active (cleanups [active - 1]) = active;
3621 }
3622
3623 ev_stop (EV_A_ (W)w);
3624
3625 EV_FREQUENT_CHECK;
3626}
3627#endif
3628
3629#if EV_ASYNC_ENABLE
3630void
3631ev_async_start (EV_P_ ev_async *w)
3632{
3633 if (expect_false (ev_is_active (w)))
3634 return;
3635
3636 w->sent = 0;
3554 3637
3555 evpipe_init (EV_A); 3638 evpipe_init (EV_A);
3556 3639
3557 EV_FREQUENT_CHECK; 3640 EV_FREQUENT_CHECK;
3558 3641
… …
3636{ 3719{
3637 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 3720 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
3638 3721
3639 if (expect_false (!once)) 3722 if (expect_false (!once))
3640 { 3723 {
3641 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 3724 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMER, arg);
3642 return; 3725 return;
3643 } 3726 }
3644 3727
3645 once->cb = cb; 3728 once->cb = cb;
3646 once->arg = arg; 3729 once->arg = arg;
… …
3778 3861
3779#if EV_MULTIPLICITY 3862#if EV_MULTIPLICITY
3780 #include "ev_wrap.h" 3863 #include "ev_wrap.h"
3781#endif 3864#endif
3782 3865
3783#ifdef __cplusplus 3866EV_CPP(})
3784}
3785#endif
3786 3867

Diff Legend

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