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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines