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

Comparing libev/ev.c (file contents):
Revision 1.72 by root, Tue Nov 6 16:09:37 2007 UTC vs.
Revision 1.127 by root, Sun Nov 18 02:17:57 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 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. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
37# endif 53# endif
38 54
55# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 56# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
41# endif 61# endif
42 62
63# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 64# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
45# endif 69# endif
46 70
71# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
49# endif 77# endif
50 78
79# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
85# endif
86
87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
53# endif 93# endif
54 94
55#endif 95#endif
56 96
57#include <math.h> 97#include <math.h>
66#include <sys/types.h> 106#include <sys/types.h>
67#include <time.h> 107#include <time.h>
68 108
69#include <signal.h> 109#include <signal.h>
70 110
71#ifndef WIN32 111#ifndef _WIN32
72# include <unistd.h> 112# include <unistd.h>
73# include <sys/time.h> 113# include <sys/time.h>
74# include <sys/wait.h> 114# include <sys/wait.h>
115#else
116# define WIN32_LEAN_AND_MEAN
117# include <windows.h>
118# ifndef EV_SELECT_IS_WINSOCKET
119# define EV_SELECT_IS_WINSOCKET 1
75#endif 120# endif
121#endif
122
76/**/ 123/**/
77 124
78#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
127#endif
128
129#ifndef EV_USE_REALTIME
130# define EV_USE_REALTIME 0
80#endif 131#endif
81 132
82#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
84#endif 135#endif
85 136
86#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 138# ifdef _WIN32
139# define EV_USE_POLL 0
140# else
141# define EV_USE_POLL 1
142# endif
88#endif 143#endif
89 144
90#ifndef EV_USE_EPOLL 145#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 146# define EV_USE_EPOLL 0
92#endif 147#endif
93 148
94#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
96#endif 151#endif
97 152
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif
107
108#ifndef EV_USE_REALTIME 153#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
110#endif 155#endif
111 156
112/**/ 157/**/
158
159/* darwin simply cannot be helped */
160#ifdef __APPLE__
161# undef EV_USE_POLL
162# undef EV_USE_KQUEUE
163#endif
113 164
114#ifndef CLOCK_MONOTONIC 165#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 166# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 167# define EV_USE_MONOTONIC 0
117#endif 168#endif
119#ifndef CLOCK_REALTIME 170#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 171# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 172# define EV_USE_REALTIME 0
122#endif 173#endif
123 174
175#if EV_SELECT_IS_WINSOCKET
176# include <winsock.h>
177#endif
178
124/**/ 179/**/
125 180
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 181#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 182#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 183#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 184/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
130 185
186#ifdef EV_H
187# include EV_H
188#else
131#include "ev.h" 189# include "ev.h"
190#endif
132 191
133#if __GNUC__ >= 3 192#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 193# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 194# define inline static inline
136#else 195#else
137# define expect(expr,value) (expr) 196# define expect(expr,value) (expr)
138# define inline static 197# define inline static
139#endif 198#endif
140 199
142#define expect_true(expr) expect ((expr) != 0, 1) 201#define expect_true(expr) expect ((expr) != 0, 1)
143 202
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 203#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 204#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 205
206#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
207#define EMPTY2(a,b) /* used to suppress some warnings */
208
147typedef struct ev_watcher *W; 209typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 210typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 211typedef struct ev_watcher_time *WT;
150 212
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 213static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 214
153#if WIN32 215#ifdef _WIN32
154/* note: the comment below could not be substantiated, but what would I care */ 216# include "ev_win32.c"
155/* MSDN says this is required to handle SIGFPE */
156volatile double SIGFPE_REQ = 0.0f;
157
158static int
159ev_socketpair_tcp (int filedes [2])
160{
161 struct sockaddr_in addr = { 0 };
162 int addr_size = sizeof (addr);
163 SOCKET listener;
164 SOCKET sock [2] = { -1, -1 };
165
166 if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
167 return -1;
168
169 addr.sin_family = AF_INET;
170 addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
171 addr.sin_port = 0;
172
173 if (bind (listener, (struct sockaddr *)&addr, addr_size))
174 goto fail;
175
176 if (getsockname(listener, (struct sockaddr *)&addr, &addr_size))
177 goto fail;
178
179 if (listen (listener, 1))
180 goto fail;
181
182 if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
183 goto fail;
184
185 if (connect (sock[0], (struct sockaddr *)&addr, addr_size))
186 goto fail;
187
188 if ((sock[1] = accept (listener, 0, 0)) < 0)
189 goto fail;
190
191 closesocket (listener);
192
193 filedes [0] = sock [0];
194 filedes [1] = sock [1];
195
196 return 0;
197
198fail:
199 closesocket (listener);
200
201 if (sock [0] != INVALID_SOCKET) closesocket (sock [0]);
202 if (sock [1] != INVALID_SOCKET) closesocket (sock [1]);
203
204 return -1;
205}
206
207# define ev_pipe(filedes) ev_socketpair_tcp (filedes)
208#else
209# define ev_pipe(filedes) pipe (filedes)
210#endif 217#endif
211 218
212/*****************************************************************************/ 219/*****************************************************************************/
213 220
214static void (*syserr_cb)(const char *msg); 221static void (*syserr_cb)(const char *msg);
262typedef struct 269typedef struct
263{ 270{
264 WL head; 271 WL head;
265 unsigned char events; 272 unsigned char events;
266 unsigned char reify; 273 unsigned char reify;
274#if EV_SELECT_IS_WINSOCKET
275 SOCKET handle;
276#endif
267} ANFD; 277} ANFD;
268 278
269typedef struct 279typedef struct
270{ 280{
271 W w; 281 W w;
272 int events; 282 int events;
273} ANPENDING; 283} ANPENDING;
274 284
275#if EV_MULTIPLICITY 285#if EV_MULTIPLICITY
276 286
277struct ev_loop 287 struct ev_loop
278{ 288 {
289 ev_tstamp ev_rt_now;
290 #define ev_rt_now ((loop)->ev_rt_now)
279# define VAR(name,decl) decl; 291 #define VAR(name,decl) decl;
280# include "ev_vars.h" 292 #include "ev_vars.h"
281};
282# undef VAR 293 #undef VAR
294 };
283# include "ev_wrap.h" 295 #include "ev_wrap.h"
296
297 static struct ev_loop default_loop_struct;
298 struct ev_loop *ev_default_loop_ptr;
284 299
285#else 300#else
286 301
302 ev_tstamp ev_rt_now;
287# define VAR(name,decl) static decl; 303 #define VAR(name,decl) static decl;
288# include "ev_vars.h" 304 #include "ev_vars.h"
289# undef VAR 305 #undef VAR
306
307 static int ev_default_loop_ptr;
290 308
291#endif 309#endif
292 310
293/*****************************************************************************/ 311/*****************************************************************************/
294 312
295inline ev_tstamp 313ev_tstamp
296ev_time (void) 314ev_time (void)
297{ 315{
298#if EV_USE_REALTIME 316#if EV_USE_REALTIME
299 struct timespec ts; 317 struct timespec ts;
300 clock_gettime (CLOCK_REALTIME, &ts); 318 clock_gettime (CLOCK_REALTIME, &ts);
319#endif 337#endif
320 338
321 return ev_time (); 339 return ev_time ();
322} 340}
323 341
342#if EV_MULTIPLICITY
324ev_tstamp 343ev_tstamp
325ev_now (EV_P) 344ev_now (EV_P)
326{ 345{
327 return rt_now; 346 return ev_rt_now;
328} 347}
348#endif
329 349
330#define array_roundsize(base,n) ((n) | 4 & ~3) 350#define array_roundsize(type,n) (((n) | 4) & ~3)
331 351
332#define array_needsize(base,cur,cnt,init) \ 352#define array_needsize(type,base,cur,cnt,init) \
333 if (expect_false ((cnt) > cur)) \ 353 if (expect_false ((cnt) > cur)) \
334 { \ 354 { \
335 int newcnt = cur; \ 355 int newcnt = cur; \
336 do \ 356 do \
337 { \ 357 { \
338 newcnt = array_roundsize (base, newcnt << 1); \ 358 newcnt = array_roundsize (type, newcnt << 1); \
339 } \ 359 } \
340 while ((cnt) > newcnt); \ 360 while ((cnt) > newcnt); \
341 \ 361 \
342 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 362 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
343 init (base + cur, newcnt - cur); \ 363 init (base + cur, newcnt - cur); \
344 cur = newcnt; \ 364 cur = newcnt; \
345 } 365 }
346 366
347#define array_slim(stem) \ 367#define array_slim(type,stem) \
348 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 368 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
349 { \ 369 { \
350 stem ## max = array_roundsize (stem ## cnt >> 1); \ 370 stem ## max = array_roundsize (stem ## cnt >> 1); \
351 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 371 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
352 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 372 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
353 } 373 }
354
355/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
356/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
357#define array_free_microshit(stem) \
358 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
359 374
360#define array_free(stem, idx) \ 375#define array_free(stem, idx) \
361 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 376 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
362 377
363/*****************************************************************************/ 378/*****************************************************************************/
373 388
374 ++base; 389 ++base;
375 } 390 }
376} 391}
377 392
378static void 393void
379event (EV_P_ W w, int events) 394ev_feed_event (EV_P_ void *w, int revents)
380{ 395{
381 if (w->pending) 396 W w_ = (W)w;
397
398 if (expect_false (w_->pending))
382 { 399 {
383 pendings [ABSPRI (w)][w->pending - 1].events |= events; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
384 return; 401 return;
385 } 402 }
386 403
387 w->pending = ++pendingcnt [ABSPRI (w)]; 404 w_->pending = ++pendingcnt [ABSPRI (w_)];
388 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void)); 405 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
389 pendings [ABSPRI (w)][w->pending - 1].w = w; 406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
390 pendings [ABSPRI (w)][w->pending - 1].events = events; 407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
391} 408}
392 409
393static void 410static void
394queue_events (EV_P_ W *events, int eventcnt, int type) 411queue_events (EV_P_ W *events, int eventcnt, int type)
395{ 412{
396 int i; 413 int i;
397 414
398 for (i = 0; i < eventcnt; ++i) 415 for (i = 0; i < eventcnt; ++i)
399 event (EV_A_ events [i], type); 416 ev_feed_event (EV_A_ events [i], type);
400} 417}
401 418
402static void 419inline void
403fd_event (EV_P_ int fd, int events) 420fd_event (EV_P_ int fd, int revents)
404{ 421{
405 ANFD *anfd = anfds + fd; 422 ANFD *anfd = anfds + fd;
406 struct ev_io *w; 423 struct ev_io *w;
407 424
408 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 425 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
409 { 426 {
410 int ev = w->events & events; 427 int ev = w->events & revents;
411 428
412 if (ev) 429 if (ev)
413 event (EV_A_ (W)w, ev); 430 ev_feed_event (EV_A_ (W)w, ev);
414 } 431 }
432}
433
434void
435ev_feed_fd_event (EV_P_ int fd, int revents)
436{
437 fd_event (EV_A_ fd, revents);
415} 438}
416 439
417/*****************************************************************************/ 440/*****************************************************************************/
418 441
419static void 442inline void
420fd_reify (EV_P) 443fd_reify (EV_P)
421{ 444{
422 int i; 445 int i;
423 446
424 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
430 int events = 0; 453 int events = 0;
431 454
432 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 455 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
433 events |= w->events; 456 events |= w->events;
434 457
458#if EV_SELECT_IS_WINSOCKET
459 if (events)
460 {
461 unsigned long argp;
462 anfd->handle = _get_osfhandle (fd);
463 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
464 }
465#endif
466
435 anfd->reify = 0; 467 anfd->reify = 0;
436 468
437 method_modify (EV_A_ fd, anfd->events, events); 469 method_modify (EV_A_ fd, anfd->events, events);
438 anfd->events = events; 470 anfd->events = events;
439 } 471 }
442} 474}
443 475
444static void 476static void
445fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
446{ 478{
447 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
448 return; 480 return;
449 481
450 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
451 483
452 ++fdchangecnt; 484 ++fdchangecnt;
453 array_needsize (fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
454 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
455} 487}
456 488
457static void 489static void
458fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
460 struct ev_io *w; 492 struct ev_io *w;
461 493
462 while ((w = (struct ev_io *)anfds [fd].head)) 494 while ((w = (struct ev_io *)anfds [fd].head))
463 { 495 {
464 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
465 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 497 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
466 } 498 }
467} 499}
468 500
469static int 501inline int
470fd_valid (int fd) 502fd_valid (int fd)
471{ 503{
472#ifdef WIN32 504#ifdef _WIN32
473 return !!win32_get_osfhandle (fd); 505 return _get_osfhandle (fd) != -1;
474#else 506#else
475 return fcntl (fd, F_GETFD) != -1; 507 return fcntl (fd, F_GETFD) != -1;
476#endif 508#endif
477} 509}
478 510
558 590
559 heap [k] = w; 591 heap [k] = w;
560 ((W)heap [k])->active = k + 1; 592 ((W)heap [k])->active = k + 1;
561} 593}
562 594
595inline void
596adjustheap (WT *heap, int N, int k)
597{
598 upheap (heap, k);
599 downheap (heap, N, k);
600}
601
563/*****************************************************************************/ 602/*****************************************************************************/
564 603
565typedef struct 604typedef struct
566{ 605{
567 WL head; 606 WL head;
588} 627}
589 628
590static void 629static void
591sighandler (int signum) 630sighandler (int signum)
592{ 631{
593#if WIN32 632#if _WIN32
594 signal (signum, sighandler); 633 signal (signum, sighandler);
595#endif 634#endif
596 635
597 signals [signum - 1].gotsig = 1; 636 signals [signum - 1].gotsig = 1;
598 637
603 write (sigpipe [1], &signum, 1); 642 write (sigpipe [1], &signum, 1);
604 errno = old_errno; 643 errno = old_errno;
605 } 644 }
606} 645}
607 646
647void
648ev_feed_signal_event (EV_P_ int signum)
649{
650 WL w;
651
652#if EV_MULTIPLICITY
653 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
654#endif
655
656 --signum;
657
658 if (signum < 0 || signum >= signalmax)
659 return;
660
661 signals [signum].gotsig = 0;
662
663 for (w = signals [signum].head; w; w = w->next)
664 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
665}
666
608static void 667static void
609sigcb (EV_P_ struct ev_io *iow, int revents) 668sigcb (EV_P_ struct ev_io *iow, int revents)
610{ 669{
611 WL w;
612 int signum; 670 int signum;
613 671
614 read (sigpipe [0], &revents, 1); 672 read (sigpipe [0], &revents, 1);
615 gotsig = 0; 673 gotsig = 0;
616 674
617 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
618 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
619 { 677 ev_feed_signal_event (EV_A_ signum + 1);
620 signals [signum].gotsig = 0; 678}
621 679
622 for (w = signals [signum].head; w; w = w->next) 680static void
623 event (EV_A_ (W)w, EV_SIGNAL); 681fd_intern (int fd)
624 } 682{
683#ifdef _WIN32
684 int arg = 1;
685 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
686#else
687 fcntl (fd, F_SETFD, FD_CLOEXEC);
688 fcntl (fd, F_SETFL, O_NONBLOCK);
689#endif
625} 690}
626 691
627static void 692static void
628siginit (EV_P) 693siginit (EV_P)
629{ 694{
630#ifndef WIN32 695 fd_intern (sigpipe [0]);
631 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 696 fd_intern (sigpipe [1]);
632 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
633
634 /* rather than sort out wether we really need nb, set it */
635 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
636 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
637#endif
638 697
639 ev_io_set (&sigev, sigpipe [0], EV_READ); 698 ev_io_set (&sigev, sigpipe [0], EV_READ);
640 ev_io_start (EV_A_ &sigev); 699 ev_io_start (EV_A_ &sigev);
641 ev_unref (EV_A); /* child watcher should not keep loop alive */ 700 ev_unref (EV_A); /* child watcher should not keep loop alive */
642} 701}
643 702
644/*****************************************************************************/ 703/*****************************************************************************/
645 704
646static struct ev_child *childs [PID_HASHSIZE]; 705static struct ev_child *childs [PID_HASHSIZE];
647 706
648#ifndef WIN32 707#ifndef _WIN32
649 708
650static struct ev_signal childev; 709static struct ev_signal childev;
651 710
652#ifndef WCONTINUED 711#ifndef WCONTINUED
653# define WCONTINUED 0 712# define WCONTINUED 0
662 if (w->pid == pid || !w->pid) 721 if (w->pid == pid || !w->pid)
663 { 722 {
664 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 723 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
665 w->rpid = pid; 724 w->rpid = pid;
666 w->rstatus = status; 725 w->rstatus = status;
667 event (EV_A_ (W)w, EV_CHILD); 726 ev_feed_event (EV_A_ (W)w, EV_CHILD);
668 } 727 }
669} 728}
670 729
671static void 730static void
672childcb (EV_P_ struct ev_signal *sw, int revents) 731childcb (EV_P_ struct ev_signal *sw, int revents)
674 int pid, status; 733 int pid, status;
675 734
676 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 735 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
677 { 736 {
678 /* make sure we are called again until all childs have been reaped */ 737 /* make sure we are called again until all childs have been reaped */
679 event (EV_A_ (W)sw, EV_SIGNAL); 738 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
680 739
681 child_reap (EV_A_ sw, pid, pid, status); 740 child_reap (EV_A_ sw, pid, pid, status);
682 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 741 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
683 } 742 }
684} 743}
685 744
686#endif 745#endif
687 746
688/*****************************************************************************/ 747/*****************************************************************************/
689 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
690#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
691# include "ev_kqueue.c" 753# include "ev_kqueue.c"
692#endif 754#endif
693#if EV_USE_EPOLL 755#if EV_USE_EPOLL
694# include "ev_epoll.c" 756# include "ev_epoll.c"
714 776
715/* return true if we are running with elevated privileges and should ignore env variables */ 777/* return true if we are running with elevated privileges and should ignore env variables */
716static int 778static int
717enable_secure (void) 779enable_secure (void)
718{ 780{
719#ifdef WIN32 781#ifdef _WIN32
720 return 0; 782 return 0;
721#else 783#else
722 return getuid () != geteuid () 784 return getuid () != geteuid ()
723 || getgid () != getegid (); 785 || getgid () != getegid ();
724#endif 786#endif
725} 787}
726 788
727int 789unsigned int
728ev_method (EV_P) 790ev_method (EV_P)
729{ 791{
730 return method; 792 return method;
731} 793}
732 794
733static void 795static void
734loop_init (EV_P_ int methods) 796loop_init (EV_P_ unsigned int flags)
735{ 797{
736 if (!method) 798 if (!method)
737 { 799 {
738#if EV_USE_MONOTONIC 800#if EV_USE_MONOTONIC
739 { 801 {
741 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 803 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
742 have_monotonic = 1; 804 have_monotonic = 1;
743 } 805 }
744#endif 806#endif
745 807
746 rt_now = ev_time (); 808 ev_rt_now = ev_time ();
747 mn_now = get_clock (); 809 mn_now = get_clock ();
748 now_floor = mn_now; 810 now_floor = mn_now;
749 rtmn_diff = rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
750 812
751 if (methods == EVMETHOD_AUTO) 813 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
752 if (!enable_secure () && getenv ("LIBEV_METHODS"))
753 methods = atoi (getenv ("LIBEV_METHODS")); 814 flags = atoi (getenv ("LIBEV_FLAGS"));
754 else 815
755 methods = EVMETHOD_ANY; 816 if (!(flags & 0x0000ffff))
817 flags |= 0x0000ffff;
756 818
757 method = 0; 819 method = 0;
758#if EV_USE_WIN32 820#if EV_USE_PORT
759 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 821 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
760#endif 822#endif
761#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
762 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 824 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
763#endif 825#endif
764#if EV_USE_EPOLL 826#if EV_USE_EPOLL
765 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 827 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
766#endif 828#endif
767#if EV_USE_POLL 829#if EV_USE_POLL
768 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 830 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
769#endif 831#endif
770#if EV_USE_SELECT 832#if EV_USE_SELECT
771 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
772#endif 834#endif
773 835
774 ev_watcher_init (&sigev, sigcb); 836 ev_init (&sigev, sigcb);
775 ev_set_priority (&sigev, EV_MAXPRI); 837 ev_set_priority (&sigev, EV_MAXPRI);
776 } 838 }
777} 839}
778 840
779void 841static void
780loop_destroy (EV_P) 842loop_destroy (EV_P)
781{ 843{
782 int i; 844 int i;
783 845
784#if EV_USE_WIN32 846#if EV_USE_PORT
785 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 847 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
786#endif 848#endif
787#if EV_USE_KQUEUE 849#if EV_USE_KQUEUE
788 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 850 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
789#endif 851#endif
790#if EV_USE_EPOLL 852#if EV_USE_EPOLL
799 861
800 for (i = NUMPRI; i--; ) 862 for (i = NUMPRI; i--; )
801 array_free (pending, [i]); 863 array_free (pending, [i]);
802 864
803 /* have to use the microsoft-never-gets-it-right macro */ 865 /* have to use the microsoft-never-gets-it-right macro */
804 array_free_microshit (fdchange); 866 array_free (fdchange, EMPTY0);
805 array_free_microshit (timer); 867 array_free (timer, EMPTY0);
806 array_free_microshit (periodic); 868#if EV_PERIODICS
807 array_free_microshit (idle); 869 array_free (periodic, EMPTY0);
808 array_free_microshit (prepare); 870#endif
809 array_free_microshit (check); 871 array_free (idle, EMPTY0);
872 array_free (prepare, EMPTY0);
873 array_free (check, EMPTY0);
810 874
811 method = 0; 875 method = 0;
812} 876}
813 877
814static void 878static void
815loop_fork (EV_P) 879loop_fork (EV_P)
816{ 880{
881#if EV_USE_PORT
882 if (method == EVMETHOD_PORT ) port_fork (EV_A);
883#endif
884#if EV_USE_KQUEUE
885 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
886#endif
817#if EV_USE_EPOLL 887#if EV_USE_EPOLL
818 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 888 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
819#endif
820#if EV_USE_KQUEUE
821 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
822#endif 889#endif
823 890
824 if (ev_is_active (&sigev)) 891 if (ev_is_active (&sigev))
825 { 892 {
826 /* default loop */ 893 /* default loop */
828 ev_ref (EV_A); 895 ev_ref (EV_A);
829 ev_io_stop (EV_A_ &sigev); 896 ev_io_stop (EV_A_ &sigev);
830 close (sigpipe [0]); 897 close (sigpipe [0]);
831 close (sigpipe [1]); 898 close (sigpipe [1]);
832 899
833 while (ev_pipe (sigpipe)) 900 while (pipe (sigpipe))
834 syserr ("(libev) error creating pipe"); 901 syserr ("(libev) error creating pipe");
835 902
836 siginit (EV_A); 903 siginit (EV_A);
837 } 904 }
838 905
839 postfork = 0; 906 postfork = 0;
840} 907}
841 908
842#if EV_MULTIPLICITY 909#if EV_MULTIPLICITY
843struct ev_loop * 910struct ev_loop *
844ev_loop_new (int methods) 911ev_loop_new (unsigned int flags)
845{ 912{
846 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 913 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
847 914
848 memset (loop, 0, sizeof (struct ev_loop)); 915 memset (loop, 0, sizeof (struct ev_loop));
849 916
850 loop_init (EV_A_ methods); 917 loop_init (EV_A_ flags);
851 918
852 if (ev_method (EV_A)) 919 if (ev_method (EV_A))
853 return loop; 920 return loop;
854 921
855 return 0; 922 return 0;
869} 936}
870 937
871#endif 938#endif
872 939
873#if EV_MULTIPLICITY 940#if EV_MULTIPLICITY
874struct ev_loop default_loop_struct;
875static struct ev_loop *default_loop;
876
877struct ev_loop * 941struct ev_loop *
942ev_default_loop_init (unsigned int flags)
878#else 943#else
879static int default_loop;
880
881int 944int
945ev_default_loop (unsigned int flags)
882#endif 946#endif
883ev_default_loop (int methods)
884{ 947{
885 if (sigpipe [0] == sigpipe [1]) 948 if (sigpipe [0] == sigpipe [1])
886 if (ev_pipe (sigpipe)) 949 if (pipe (sigpipe))
887 return 0; 950 return 0;
888 951
889 if (!default_loop) 952 if (!ev_default_loop_ptr)
890 { 953 {
891#if EV_MULTIPLICITY 954#if EV_MULTIPLICITY
892 struct ev_loop *loop = default_loop = &default_loop_struct; 955 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
893#else 956#else
894 default_loop = 1; 957 ev_default_loop_ptr = 1;
895#endif 958#endif
896 959
897 loop_init (EV_A_ methods); 960 loop_init (EV_A_ flags);
898 961
899 if (ev_method (EV_A)) 962 if (ev_method (EV_A))
900 { 963 {
901 siginit (EV_A); 964 siginit (EV_A);
902 965
903#ifndef WIN32 966#ifndef _WIN32
904 ev_signal_init (&childev, childcb, SIGCHLD); 967 ev_signal_init (&childev, childcb, SIGCHLD);
905 ev_set_priority (&childev, EV_MAXPRI); 968 ev_set_priority (&childev, EV_MAXPRI);
906 ev_signal_start (EV_A_ &childev); 969 ev_signal_start (EV_A_ &childev);
907 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* child watcher should not keep loop alive */
908#endif 971#endif
909 } 972 }
910 else 973 else
911 default_loop = 0; 974 ev_default_loop_ptr = 0;
912 } 975 }
913 976
914 return default_loop; 977 return ev_default_loop_ptr;
915} 978}
916 979
917void 980void
918ev_default_destroy (void) 981ev_default_destroy (void)
919{ 982{
920#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
921 struct ev_loop *loop = default_loop; 984 struct ev_loop *loop = ev_default_loop_ptr;
922#endif 985#endif
923 986
924#ifndef WIN32 987#ifndef _WIN32
925 ev_ref (EV_A); /* child watcher */ 988 ev_ref (EV_A); /* child watcher */
926 ev_signal_stop (EV_A_ &childev); 989 ev_signal_stop (EV_A_ &childev);
927#endif 990#endif
928 991
929 ev_ref (EV_A); /* signal watcher */ 992 ev_ref (EV_A); /* signal watcher */
937 1000
938void 1001void
939ev_default_fork (void) 1002ev_default_fork (void)
940{ 1003{
941#if EV_MULTIPLICITY 1004#if EV_MULTIPLICITY
942 struct ev_loop *loop = default_loop; 1005 struct ev_loop *loop = ev_default_loop_ptr;
943#endif 1006#endif
944 1007
945 if (method) 1008 if (method)
946 postfork = 1; 1009 postfork = 1;
947} 1010}
948 1011
949/*****************************************************************************/ 1012/*****************************************************************************/
950 1013
951static void 1014static int
1015any_pending (EV_P)
1016{
1017 int pri;
1018
1019 for (pri = NUMPRI; pri--; )
1020 if (pendingcnt [pri])
1021 return 1;
1022
1023 return 0;
1024}
1025
1026inline void
952call_pending (EV_P) 1027call_pending (EV_P)
953{ 1028{
954 int pri; 1029 int pri;
955 1030
956 for (pri = NUMPRI; pri--; ) 1031 for (pri = NUMPRI; pri--; )
957 while (pendingcnt [pri]) 1032 while (pendingcnt [pri])
958 { 1033 {
959 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1034 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
960 1035
961 if (p->w) 1036 if (expect_true (p->w))
962 { 1037 {
963 p->w->pending = 0; 1038 p->w->pending = 0;
964 p->w->cb (EV_A_ p->w, p->events); 1039 EV_CB_INVOKE (p->w, p->events);
965 } 1040 }
966 } 1041 }
967} 1042}
968 1043
969static void 1044inline void
970timers_reify (EV_P) 1045timers_reify (EV_P)
971{ 1046{
972 while (timercnt && ((WT)timers [0])->at <= mn_now) 1047 while (timercnt && ((WT)timers [0])->at <= mn_now)
973 { 1048 {
974 struct ev_timer *w = timers [0]; 1049 struct ev_timer *w = timers [0];
977 1052
978 /* first reschedule or stop timer */ 1053 /* first reschedule or stop timer */
979 if (w->repeat) 1054 if (w->repeat)
980 { 1055 {
981 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1056 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1057
982 ((WT)w)->at = mn_now + w->repeat; 1058 ((WT)w)->at += w->repeat;
1059 if (((WT)w)->at < mn_now)
1060 ((WT)w)->at = mn_now;
1061
983 downheap ((WT *)timers, timercnt, 0); 1062 downheap ((WT *)timers, timercnt, 0);
984 } 1063 }
985 else 1064 else
986 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1065 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
987 1066
988 event (EV_A_ (W)w, EV_TIMEOUT); 1067 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
989 } 1068 }
990} 1069}
991 1070
992static void 1071#if EV_PERIODICS
1072inline void
993periodics_reify (EV_P) 1073periodics_reify (EV_P)
994{ 1074{
995 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1075 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
996 { 1076 {
997 struct ev_periodic *w = periodics [0]; 1077 struct ev_periodic *w = periodics [0];
998 1078
999 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1079 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1000 1080
1001 /* first reschedule or stop timer */ 1081 /* first reschedule or stop timer */
1002 if (w->interval) 1082 if (w->reschedule_cb)
1003 { 1083 {
1084 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1085 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1086 downheap ((WT *)periodics, periodiccnt, 0);
1087 }
1088 else if (w->interval)
1089 {
1004 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1090 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
1005 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1091 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1006 downheap ((WT *)periodics, periodiccnt, 0); 1092 downheap ((WT *)periodics, periodiccnt, 0);
1007 } 1093 }
1008 else 1094 else
1009 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1095 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1010 1096
1011 event (EV_A_ (W)w, EV_PERIODIC); 1097 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1012 } 1098 }
1013} 1099}
1014 1100
1015static void 1101static void
1016periodics_reschedule (EV_P) 1102periodics_reschedule (EV_P)
1020 /* adjust periodics after time jump */ 1106 /* adjust periodics after time jump */
1021 for (i = 0; i < periodiccnt; ++i) 1107 for (i = 0; i < periodiccnt; ++i)
1022 { 1108 {
1023 struct ev_periodic *w = periodics [i]; 1109 struct ev_periodic *w = periodics [i];
1024 1110
1111 if (w->reschedule_cb)
1112 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1025 if (w->interval) 1113 else if (w->interval)
1026 {
1027 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1114 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1028
1029 if (fabs (diff) >= 1e-4)
1030 {
1031 ev_periodic_stop (EV_A_ w);
1032 ev_periodic_start (EV_A_ w);
1033
1034 i = 0; /* restart loop, inefficient, but time jumps should be rare */
1035 }
1036 }
1037 } 1115 }
1116
1117 /* now rebuild the heap */
1118 for (i = periodiccnt >> 1; i--; )
1119 downheap ((WT *)periodics, periodiccnt, i);
1038} 1120}
1121#endif
1039 1122
1040inline int 1123inline int
1041time_update_monotonic (EV_P) 1124time_update_monotonic (EV_P)
1042{ 1125{
1043 mn_now = get_clock (); 1126 mn_now = get_clock ();
1044 1127
1045 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1128 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1046 { 1129 {
1047 rt_now = rtmn_diff + mn_now; 1130 ev_rt_now = rtmn_diff + mn_now;
1048 return 0; 1131 return 0;
1049 } 1132 }
1050 else 1133 else
1051 { 1134 {
1052 now_floor = mn_now; 1135 now_floor = mn_now;
1053 rt_now = ev_time (); 1136 ev_rt_now = ev_time ();
1054 return 1; 1137 return 1;
1055 } 1138 }
1056} 1139}
1057 1140
1058static void 1141inline void
1059time_update (EV_P) 1142time_update (EV_P)
1060{ 1143{
1061 int i; 1144 int i;
1062 1145
1063#if EV_USE_MONOTONIC 1146#if EV_USE_MONOTONIC
1067 { 1150 {
1068 ev_tstamp odiff = rtmn_diff; 1151 ev_tstamp odiff = rtmn_diff;
1069 1152
1070 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1153 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1071 { 1154 {
1072 rtmn_diff = rt_now - mn_now; 1155 rtmn_diff = ev_rt_now - mn_now;
1073 1156
1074 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1157 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1075 return; /* all is well */ 1158 return; /* all is well */
1076 1159
1077 rt_now = ev_time (); 1160 ev_rt_now = ev_time ();
1078 mn_now = get_clock (); 1161 mn_now = get_clock ();
1079 now_floor = mn_now; 1162 now_floor = mn_now;
1080 } 1163 }
1081 1164
1165# if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1166 periodics_reschedule (EV_A);
1167# endif
1083 /* no timer adjustment, as the monotonic clock doesn't jump */ 1168 /* no timer adjustment, as the monotonic clock doesn't jump */
1084 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1169 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1085 } 1170 }
1086 } 1171 }
1087 else 1172 else
1088#endif 1173#endif
1089 { 1174 {
1090 rt_now = ev_time (); 1175 ev_rt_now = ev_time ();
1091 1176
1092 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1177 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1093 { 1178 {
1179#if EV_PERIODICS
1094 periodics_reschedule (EV_A); 1180 periodics_reschedule (EV_A);
1181#endif
1095 1182
1096 /* adjust timers. this is easy, as the offset is the same for all */ 1183 /* adjust timers. this is easy, as the offset is the same for all */
1097 for (i = 0; i < timercnt; ++i) 1184 for (i = 0; i < timercnt; ++i)
1098 ((WT)timers [i])->at += rt_now - mn_now; 1185 ((WT)timers [i])->at += ev_rt_now - mn_now;
1099 } 1186 }
1100 1187
1101 mn_now = rt_now; 1188 mn_now = ev_rt_now;
1102 } 1189 }
1103} 1190}
1104 1191
1105void 1192void
1106ev_ref (EV_P) 1193ev_ref (EV_P)
1120ev_loop (EV_P_ int flags) 1207ev_loop (EV_P_ int flags)
1121{ 1208{
1122 double block; 1209 double block;
1123 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1210 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1124 1211
1125 do 1212 while (activecnt)
1126 { 1213 {
1127 /* queue check watchers (and execute them) */ 1214 /* queue check watchers (and execute them) */
1128 if (expect_false (preparecnt)) 1215 if (expect_false (preparecnt))
1129 { 1216 {
1130 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1217 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1138 /* update fd-related kernel structures */ 1225 /* update fd-related kernel structures */
1139 fd_reify (EV_A); 1226 fd_reify (EV_A);
1140 1227
1141 /* calculate blocking time */ 1228 /* calculate blocking time */
1142 1229
1143 /* we only need this for !monotonic clockor timers, but as we basically 1230 /* we only need this for !monotonic clock or timers, but as we basically
1144 always have timers, we just calculate it always */ 1231 always have timers, we just calculate it always */
1145#if EV_USE_MONOTONIC 1232#if EV_USE_MONOTONIC
1146 if (expect_true (have_monotonic)) 1233 if (expect_true (have_monotonic))
1147 time_update_monotonic (EV_A); 1234 time_update_monotonic (EV_A);
1148 else 1235 else
1149#endif 1236#endif
1150 { 1237 {
1151 rt_now = ev_time (); 1238 ev_rt_now = ev_time ();
1152 mn_now = rt_now; 1239 mn_now = ev_rt_now;
1153 } 1240 }
1154 1241
1155 if (flags & EVLOOP_NONBLOCK || idlecnt) 1242 if (flags & EVLOOP_NONBLOCK || idlecnt)
1156 block = 0.; 1243 block = 0.;
1157 else 1244 else
1162 { 1249 {
1163 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1250 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1164 if (block > to) block = to; 1251 if (block > to) block = to;
1165 } 1252 }
1166 1253
1254#if EV_PERIODICS
1167 if (periodiccnt) 1255 if (periodiccnt)
1168 { 1256 {
1169 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1257 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1170 if (block > to) block = to; 1258 if (block > to) block = to;
1171 } 1259 }
1260#endif
1172 1261
1173 if (block < 0.) block = 0.; 1262 if (expect_false (block < 0.)) block = 0.;
1174 } 1263 }
1175 1264
1176 method_poll (EV_A_ block); 1265 method_poll (EV_A_ block);
1177 1266
1178 /* update rt_now, do magic */ 1267 /* update ev_rt_now, do magic */
1179 time_update (EV_A); 1268 time_update (EV_A);
1180 1269
1181 /* queue pending timers and reschedule them */ 1270 /* queue pending timers and reschedule them */
1182 timers_reify (EV_A); /* relative timers called last */ 1271 timers_reify (EV_A); /* relative timers called last */
1272#if EV_PERIODICS
1183 periodics_reify (EV_A); /* absolute timers called first */ 1273 periodics_reify (EV_A); /* absolute timers called first */
1274#endif
1184 1275
1185 /* queue idle watchers unless io or timers are pending */ 1276 /* queue idle watchers unless io or timers are pending */
1186 if (!pendingcnt) 1277 if (idlecnt && !any_pending (EV_A))
1187 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1278 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1188 1279
1189 /* queue check watchers, to be executed first */ 1280 /* queue check watchers, to be executed first */
1190 if (checkcnt) 1281 if (expect_false (checkcnt))
1191 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1282 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1192 1283
1193 call_pending (EV_A); 1284 call_pending (EV_A);
1285
1286 if (expect_false (loop_done))
1287 break;
1194 } 1288 }
1195 while (activecnt && !loop_done);
1196 1289
1197 if (loop_done != 2) 1290 if (loop_done != 2)
1198 loop_done = 0; 1291 loop_done = 0;
1199} 1292}
1200 1293
1260void 1353void
1261ev_io_start (EV_P_ struct ev_io *w) 1354ev_io_start (EV_P_ struct ev_io *w)
1262{ 1355{
1263 int fd = w->fd; 1356 int fd = w->fd;
1264 1357
1265 if (ev_is_active (w)) 1358 if (expect_false (ev_is_active (w)))
1266 return; 1359 return;
1267 1360
1268 assert (("ev_io_start called with negative fd", fd >= 0)); 1361 assert (("ev_io_start called with negative fd", fd >= 0));
1269 1362
1270 ev_start (EV_A_ (W)w, 1); 1363 ev_start (EV_A_ (W)w, 1);
1271 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1364 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1272 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1365 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1273 1366
1274 fd_change (EV_A_ fd); 1367 fd_change (EV_A_ fd);
1275} 1368}
1276 1369
1277void 1370void
1278ev_io_stop (EV_P_ struct ev_io *w) 1371ev_io_stop (EV_P_ struct ev_io *w)
1279{ 1372{
1280 ev_clear_pending (EV_A_ (W)w); 1373 ev_clear_pending (EV_A_ (W)w);
1281 if (!ev_is_active (w)) 1374 if (expect_false (!ev_is_active (w)))
1282 return; 1375 return;
1376
1377 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1283 1378
1284 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1379 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1285 ev_stop (EV_A_ (W)w); 1380 ev_stop (EV_A_ (W)w);
1286 1381
1287 fd_change (EV_A_ w->fd); 1382 fd_change (EV_A_ w->fd);
1288} 1383}
1289 1384
1290void 1385void
1291ev_timer_start (EV_P_ struct ev_timer *w) 1386ev_timer_start (EV_P_ struct ev_timer *w)
1292{ 1387{
1293 if (ev_is_active (w)) 1388 if (expect_false (ev_is_active (w)))
1294 return; 1389 return;
1295 1390
1296 ((WT)w)->at += mn_now; 1391 ((WT)w)->at += mn_now;
1297 1392
1298 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1393 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1299 1394
1300 ev_start (EV_A_ (W)w, ++timercnt); 1395 ev_start (EV_A_ (W)w, ++timercnt);
1301 array_needsize (timers, timermax, timercnt, (void)); 1396 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1302 timers [timercnt - 1] = w; 1397 timers [timercnt - 1] = w;
1303 upheap ((WT *)timers, timercnt - 1); 1398 upheap ((WT *)timers, timercnt - 1);
1304 1399
1305 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1400 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1306} 1401}
1307 1402
1308void 1403void
1309ev_timer_stop (EV_P_ struct ev_timer *w) 1404ev_timer_stop (EV_P_ struct ev_timer *w)
1310{ 1405{
1311 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1312 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1313 return; 1408 return;
1314 1409
1315 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1410 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1316 1411
1317 if (((W)w)->active < timercnt--) 1412 if (expect_true (((W)w)->active < timercnt--))
1318 { 1413 {
1319 timers [((W)w)->active - 1] = timers [timercnt]; 1414 timers [((W)w)->active - 1] = timers [timercnt];
1320 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1415 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1321 } 1416 }
1322 1417
1323 ((WT)w)->at = w->repeat; 1418 ((WT)w)->at -= mn_now;
1324 1419
1325 ev_stop (EV_A_ (W)w); 1420 ev_stop (EV_A_ (W)w);
1326} 1421}
1327 1422
1328void 1423void
1331 if (ev_is_active (w)) 1426 if (ev_is_active (w))
1332 { 1427 {
1333 if (w->repeat) 1428 if (w->repeat)
1334 { 1429 {
1335 ((WT)w)->at = mn_now + w->repeat; 1430 ((WT)w)->at = mn_now + w->repeat;
1336 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1431 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1337 } 1432 }
1338 else 1433 else
1339 ev_timer_stop (EV_A_ w); 1434 ev_timer_stop (EV_A_ w);
1340 } 1435 }
1341 else if (w->repeat) 1436 else if (w->repeat)
1437 {
1438 w->at = w->repeat;
1342 ev_timer_start (EV_A_ w); 1439 ev_timer_start (EV_A_ w);
1440 }
1343} 1441}
1344 1442
1443#if EV_PERIODICS
1345void 1444void
1346ev_periodic_start (EV_P_ struct ev_periodic *w) 1445ev_periodic_start (EV_P_ struct ev_periodic *w)
1347{ 1446{
1348 if (ev_is_active (w)) 1447 if (expect_false (ev_is_active (w)))
1349 return; 1448 return;
1350 1449
1450 if (w->reschedule_cb)
1451 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1452 else if (w->interval)
1453 {
1351 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1454 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1352
1353 /* this formula differs from the one in periodic_reify because we do not always round up */ 1455 /* this formula differs from the one in periodic_reify because we do not always round up */
1354 if (w->interval)
1355 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1456 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1457 }
1356 1458
1357 ev_start (EV_A_ (W)w, ++periodiccnt); 1459 ev_start (EV_A_ (W)w, ++periodiccnt);
1358 array_needsize (periodics, periodicmax, periodiccnt, (void)); 1460 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1359 periodics [periodiccnt - 1] = w; 1461 periodics [periodiccnt - 1] = w;
1360 upheap ((WT *)periodics, periodiccnt - 1); 1462 upheap ((WT *)periodics, periodiccnt - 1);
1361 1463
1362 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1464 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1363} 1465}
1364 1466
1365void 1467void
1366ev_periodic_stop (EV_P_ struct ev_periodic *w) 1468ev_periodic_stop (EV_P_ struct ev_periodic *w)
1367{ 1469{
1368 ev_clear_pending (EV_A_ (W)w); 1470 ev_clear_pending (EV_A_ (W)w);
1369 if (!ev_is_active (w)) 1471 if (expect_false (!ev_is_active (w)))
1370 return; 1472 return;
1371 1473
1372 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1474 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1373 1475
1374 if (((W)w)->active < periodiccnt--) 1476 if (expect_true (((W)w)->active < periodiccnt--))
1375 { 1477 {
1376 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1478 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1377 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1479 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1378 } 1480 }
1379 1481
1380 ev_stop (EV_A_ (W)w); 1482 ev_stop (EV_A_ (W)w);
1381} 1483}
1382 1484
1383void 1485void
1486ev_periodic_again (EV_P_ struct ev_periodic *w)
1487{
1488 /* TODO: use adjustheap and recalculation */
1489 ev_periodic_stop (EV_A_ w);
1490 ev_periodic_start (EV_A_ w);
1491}
1492#endif
1493
1494void
1384ev_idle_start (EV_P_ struct ev_idle *w) 1495ev_idle_start (EV_P_ struct ev_idle *w)
1385{ 1496{
1386 if (ev_is_active (w)) 1497 if (expect_false (ev_is_active (w)))
1387 return; 1498 return;
1388 1499
1389 ev_start (EV_A_ (W)w, ++idlecnt); 1500 ev_start (EV_A_ (W)w, ++idlecnt);
1390 array_needsize (idles, idlemax, idlecnt, (void)); 1501 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1391 idles [idlecnt - 1] = w; 1502 idles [idlecnt - 1] = w;
1392} 1503}
1393 1504
1394void 1505void
1395ev_idle_stop (EV_P_ struct ev_idle *w) 1506ev_idle_stop (EV_P_ struct ev_idle *w)
1396{ 1507{
1397 ev_clear_pending (EV_A_ (W)w); 1508 ev_clear_pending (EV_A_ (W)w);
1398 if (ev_is_active (w)) 1509 if (expect_false (!ev_is_active (w)))
1399 return; 1510 return;
1400 1511
1401 idles [((W)w)->active - 1] = idles [--idlecnt]; 1512 idles [((W)w)->active - 1] = idles [--idlecnt];
1402 ev_stop (EV_A_ (W)w); 1513 ev_stop (EV_A_ (W)w);
1403} 1514}
1404 1515
1405void 1516void
1406ev_prepare_start (EV_P_ struct ev_prepare *w) 1517ev_prepare_start (EV_P_ struct ev_prepare *w)
1407{ 1518{
1408 if (ev_is_active (w)) 1519 if (expect_false (ev_is_active (w)))
1409 return; 1520 return;
1410 1521
1411 ev_start (EV_A_ (W)w, ++preparecnt); 1522 ev_start (EV_A_ (W)w, ++preparecnt);
1412 array_needsize (prepares, preparemax, preparecnt, (void)); 1523 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1413 prepares [preparecnt - 1] = w; 1524 prepares [preparecnt - 1] = w;
1414} 1525}
1415 1526
1416void 1527void
1417ev_prepare_stop (EV_P_ struct ev_prepare *w) 1528ev_prepare_stop (EV_P_ struct ev_prepare *w)
1418{ 1529{
1419 ev_clear_pending (EV_A_ (W)w); 1530 ev_clear_pending (EV_A_ (W)w);
1420 if (ev_is_active (w)) 1531 if (expect_false (!ev_is_active (w)))
1421 return; 1532 return;
1422 1533
1423 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1534 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1424 ev_stop (EV_A_ (W)w); 1535 ev_stop (EV_A_ (W)w);
1425} 1536}
1426 1537
1427void 1538void
1428ev_check_start (EV_P_ struct ev_check *w) 1539ev_check_start (EV_P_ struct ev_check *w)
1429{ 1540{
1430 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1431 return; 1542 return;
1432 1543
1433 ev_start (EV_A_ (W)w, ++checkcnt); 1544 ev_start (EV_A_ (W)w, ++checkcnt);
1434 array_needsize (checks, checkmax, checkcnt, (void)); 1545 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1435 checks [checkcnt - 1] = w; 1546 checks [checkcnt - 1] = w;
1436} 1547}
1437 1548
1438void 1549void
1439ev_check_stop (EV_P_ struct ev_check *w) 1550ev_check_stop (EV_P_ struct ev_check *w)
1440{ 1551{
1441 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1442 if (ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1443 return; 1554 return;
1444 1555
1445 checks [((W)w)->active - 1] = checks [--checkcnt]; 1556 checks [((W)w)->active - 1] = checks [--checkcnt];
1446 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1447} 1558}
1452 1563
1453void 1564void
1454ev_signal_start (EV_P_ struct ev_signal *w) 1565ev_signal_start (EV_P_ struct ev_signal *w)
1455{ 1566{
1456#if EV_MULTIPLICITY 1567#if EV_MULTIPLICITY
1457 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1568 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1458#endif 1569#endif
1459 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1460 return; 1571 return;
1461 1572
1462 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1573 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1463 1574
1464 ev_start (EV_A_ (W)w, 1); 1575 ev_start (EV_A_ (W)w, 1);
1465 array_needsize (signals, signalmax, w->signum, signals_init); 1576 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1466 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1577 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1467 1578
1468 if (!((WL)w)->next) 1579 if (!((WL)w)->next)
1469 { 1580 {
1470#if WIN32 1581#if _WIN32
1471 signal (w->signum, sighandler); 1582 signal (w->signum, sighandler);
1472#else 1583#else
1473 struct sigaction sa; 1584 struct sigaction sa;
1474 sa.sa_handler = sighandler; 1585 sa.sa_handler = sighandler;
1475 sigfillset (&sa.sa_mask); 1586 sigfillset (&sa.sa_mask);
1481 1592
1482void 1593void
1483ev_signal_stop (EV_P_ struct ev_signal *w) 1594ev_signal_stop (EV_P_ struct ev_signal *w)
1484{ 1595{
1485 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1486 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1487 return; 1598 return;
1488 1599
1489 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1600 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1490 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1491 1602
1495 1606
1496void 1607void
1497ev_child_start (EV_P_ struct ev_child *w) 1608ev_child_start (EV_P_ struct ev_child *w)
1498{ 1609{
1499#if EV_MULTIPLICITY 1610#if EV_MULTIPLICITY
1500 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1611 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1501#endif 1612#endif
1502 if (ev_is_active (w)) 1613 if (expect_false (ev_is_active (w)))
1503 return; 1614 return;
1504 1615
1505 ev_start (EV_A_ (W)w, 1); 1616 ev_start (EV_A_ (W)w, 1);
1506 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1507} 1618}
1508 1619
1509void 1620void
1510ev_child_stop (EV_P_ struct ev_child *w) 1621ev_child_stop (EV_P_ struct ev_child *w)
1511{ 1622{
1512 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1513 if (ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1514 return; 1625 return;
1515 1626
1516 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1627 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1517 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1518} 1629}
1553} 1664}
1554 1665
1555void 1666void
1556ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1667ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1557{ 1668{
1558 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1669 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1559 1670
1560 if (!once) 1671 if (expect_false (!once))
1672 {
1561 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1673 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1562 else 1674 return;
1563 { 1675 }
1676
1564 once->cb = cb; 1677 once->cb = cb;
1565 once->arg = arg; 1678 once->arg = arg;
1566 1679
1567 ev_watcher_init (&once->io, once_cb_io); 1680 ev_init (&once->io, once_cb_io);
1568 if (fd >= 0) 1681 if (fd >= 0)
1569 { 1682 {
1570 ev_io_set (&once->io, fd, events); 1683 ev_io_set (&once->io, fd, events);
1571 ev_io_start (EV_A_ &once->io); 1684 ev_io_start (EV_A_ &once->io);
1572 } 1685 }
1573 1686
1574 ev_watcher_init (&once->to, once_cb_to); 1687 ev_init (&once->to, once_cb_to);
1575 if (timeout >= 0.) 1688 if (timeout >= 0.)
1576 { 1689 {
1577 ev_timer_set (&once->to, timeout, 0.); 1690 ev_timer_set (&once->to, timeout, 0.);
1578 ev_timer_start (EV_A_ &once->to); 1691 ev_timer_start (EV_A_ &once->to);
1579 }
1580 } 1692 }
1581} 1693}
1582 1694
1695#ifdef __cplusplus
1696}
1697#endif
1698

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines