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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines