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

Comparing libev/ev.c (file contents):
Revision 1.60 by root, Sun Nov 4 18:29:44 2007 UTC vs.
Revision 1.78 by root, Thu Nov 8 21:08:56 2007 UTC

… …
54 54
55#endif 55#endif
56 56
57#include <math.h> 57#include <math.h>
58#include <stdlib.h> 58#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 59#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 60#include <stddef.h>
63 61
64#include <stdio.h> 62#include <stdio.h>
65 63
66#include <assert.h> 64#include <assert.h>
67#include <errno.h> 65#include <errno.h>
68#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
69#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
70# include <sys/wait.h> 74# include <sys/wait.h>
71#endif 75#endif
72#include <sys/time.h>
73#include <time.h>
74
75/**/ 76/**/
76 77
77#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
79#endif 80#endif
… …
90# define EV_USE_EPOLL 0 91# define EV_USE_EPOLL 0
91#endif 92#endif
92 93
93#ifndef EV_USE_KQUEUE 94#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
96#endif
97
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
95#endif 106#endif
96 107
97#ifndef EV_USE_REALTIME 108#ifndef EV_USE_REALTIME
98# define EV_USE_REALTIME 1 109# define EV_USE_REALTIME 1
99#endif 110#endif
… …
137typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
138typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
139 150
140static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
141 152
153#include "ev_win32.c"
154
142/*****************************************************************************/ 155/*****************************************************************************/
143 156
157static void (*syserr_cb)(const char *msg);
158
159void ev_set_syserr_cb (void (*cb)(const char *msg))
160{
161 syserr_cb = cb;
162}
163
164static void
165syserr (const char *msg)
166{
167 if (!msg)
168 msg = "(libev) system error";
169
170 if (syserr_cb)
171 syserr_cb (msg);
172 else
173 {
174 perror (msg);
175 abort ();
176 }
177}
178
179static void *(*alloc)(void *ptr, long size);
180
181void ev_set_allocator (void *(*cb)(void *ptr, long size))
182{
183 alloc = cb;
184}
185
186static void *
187ev_realloc (void *ptr, long size)
188{
189 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
190
191 if (!ptr && size)
192 {
193 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
194 abort ();
195 }
196
197 return ptr;
198}
199
200#define ev_malloc(size) ev_realloc (0, (size))
201#define ev_free(ptr) ev_realloc ((ptr), 0)
202
203/*****************************************************************************/
204
144typedef struct 205typedef struct
145{ 206{
146 struct ev_watcher_list *head; 207 WL head;
147 unsigned char events; 208 unsigned char events;
148 unsigned char reify; 209 unsigned char reify;
149} ANFD; 210} ANFD;
150 211
151typedef struct 212typedef struct
… …
207ev_now (EV_P) 268ev_now (EV_P)
208{ 269{
209 return rt_now; 270 return rt_now;
210} 271}
211 272
212#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
213 274
214#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
215 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
216 { \ 277 { \
217 int newcnt = cur; \ 278 int newcnt = cur; \
218 do \ 279 do \
219 { \ 280 { \
220 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
221 } \ 282 } \
222 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
223 \ 284 \
224 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
225 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
226 cur = newcnt; \ 287 cur = newcnt; \
227 } 288 }
289
290#define array_slim(type,stem) \
291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
292 { \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 }
297
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
302
303#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
228 305
229/*****************************************************************************/ 306/*****************************************************************************/
230 307
231static void 308static void
232anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
239 316
240 ++base; 317 ++base;
241 } 318 }
242} 319}
243 320
244static void 321void
245event (EV_P_ W w, int events) 322ev_feed_event (EV_P_ void *w, int revents)
246{ 323{
324 W w_ = (W)w;
325
247 if (w->pending) 326 if (w_->pending)
248 { 327 {
249 pendings [ABSPRI (w)][w->pending - 1].events |= events; 328 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
250 return; 329 return;
251 } 330 }
252 331
253 w->pending = ++pendingcnt [ABSPRI (w)]; 332 w_->pending = ++pendingcnt [ABSPRI (w_)];
254 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 333 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
255 pendings [ABSPRI (w)][w->pending - 1].w = w; 334 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
256 pendings [ABSPRI (w)][w->pending - 1].events = events; 335 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
257} 336}
258 337
259static void 338static void
260queue_events (EV_P_ W *events, int eventcnt, int type) 339queue_events (EV_P_ W *events, int eventcnt, int type)
261{ 340{
262 int i; 341 int i;
263 342
264 for (i = 0; i < eventcnt; ++i) 343 for (i = 0; i < eventcnt; ++i)
265 event (EV_A_ events [i], type); 344 ev_feed_event (EV_A_ events [i], type);
266} 345}
267 346
268static void 347static void
269fd_event (EV_P_ int fd, int events) 348fd_event (EV_P_ int fd, int events)
270{ 349{
… …
274 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 353 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
275 { 354 {
276 int ev = w->events & events; 355 int ev = w->events & events;
277 356
278 if (ev) 357 if (ev)
279 event (EV_A_ (W)w, ev); 358 ev_feed_event (EV_A_ (W)w, ev);
280 } 359 }
281} 360}
282 361
283/*****************************************************************************/ 362/*****************************************************************************/
284 363
… …
298 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 377 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
299 events |= w->events; 378 events |= w->events;
300 379
301 anfd->reify = 0; 380 anfd->reify = 0;
302 381
303 if (anfd->events != events)
304 {
305 method_modify (EV_A_ fd, anfd->events, events); 382 method_modify (EV_A_ fd, anfd->events, events);
306 anfd->events = events; 383 anfd->events = events;
307 }
308 } 384 }
309 385
310 fdchangecnt = 0; 386 fdchangecnt = 0;
311} 387}
312 388
313static void 389static void
314fd_change (EV_P_ int fd) 390fd_change (EV_P_ int fd)
315{ 391{
316 if (anfds [fd].reify || fdchangecnt < 0) 392 if (anfds [fd].reify)
317 return; 393 return;
318 394
319 anfds [fd].reify = 1; 395 anfds [fd].reify = 1;
320 396
321 ++fdchangecnt; 397 ++fdchangecnt;
322 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 398 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
323 fdchanges [fdchangecnt - 1] = fd; 399 fdchanges [fdchangecnt - 1] = fd;
324} 400}
325 401
326static void 402static void
327fd_kill (EV_P_ int fd) 403fd_kill (EV_P_ int fd)
… …
329 struct ev_io *w; 405 struct ev_io *w;
330 406
331 while ((w = (struct ev_io *)anfds [fd].head)) 407 while ((w = (struct ev_io *)anfds [fd].head))
332 { 408 {
333 ev_io_stop (EV_A_ w); 409 ev_io_stop (EV_A_ w);
334 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 410 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
335 } 411 }
412}
413
414static int
415fd_valid (int fd)
416{
417#ifdef WIN32
418 return !!win32_get_osfhandle (fd);
419#else
420 return fcntl (fd, F_GETFD) != -1;
421#endif
336} 422}
337 423
338/* called on EBADF to verify fds */ 424/* called on EBADF to verify fds */
339static void 425static void
340fd_ebadf (EV_P) 426fd_ebadf (EV_P)
341{ 427{
342 int fd; 428 int fd;
343 429
344 for (fd = 0; fd < anfdmax; ++fd) 430 for (fd = 0; fd < anfdmax; ++fd)
345 if (anfds [fd].events) 431 if (anfds [fd].events)
346 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 432 if (!fd_valid (fd) == -1 && errno == EBADF)
347 fd_kill (EV_A_ fd); 433 fd_kill (EV_A_ fd);
348} 434}
349 435
350/* called on ENOMEM in select/poll to kill some fds and retry */ 436/* called on ENOMEM in select/poll to kill some fds and retry */
351static void 437static void
352fd_enomem (EV_P) 438fd_enomem (EV_P)
353{ 439{
354 int fd = anfdmax; 440 int fd;
355 441
356 while (fd--) 442 for (fd = anfdmax; fd--; )
357 if (anfds [fd].events) 443 if (anfds [fd].events)
358 { 444 {
359 close (fd);
360 fd_kill (EV_A_ fd); 445 fd_kill (EV_A_ fd);
361 return; 446 return;
362 } 447 }
363} 448}
364 449
365/* susually called after fork if method needs to re-arm all fds from scratch */ 450/* usually called after fork if method needs to re-arm all fds from scratch */
366static void 451static void
367fd_rearm_all (EV_P) 452fd_rearm_all (EV_P)
368{ 453{
369 int fd; 454 int fd;
370 455
… …
385 WT w = heap [k]; 470 WT w = heap [k];
386 471
387 while (k && heap [k >> 1]->at > w->at) 472 while (k && heap [k >> 1]->at > w->at)
388 { 473 {
389 heap [k] = heap [k >> 1]; 474 heap [k] = heap [k >> 1];
390 heap [k]->active = k + 1; 475 ((W)heap [k])->active = k + 1;
391 k >>= 1; 476 k >>= 1;
392 } 477 }
393 478
394 heap [k] = w; 479 heap [k] = w;
395 heap [k]->active = k + 1; 480 ((W)heap [k])->active = k + 1;
396 481
397} 482}
398 483
399static void 484static void
400downheap (WT *heap, int N, int k) 485downheap (WT *heap, int N, int k)
… …
410 495
411 if (w->at <= heap [j]->at) 496 if (w->at <= heap [j]->at)
412 break; 497 break;
413 498
414 heap [k] = heap [j]; 499 heap [k] = heap [j];
415 heap [k]->active = k + 1; 500 ((W)heap [k])->active = k + 1;
416 k = j; 501 k = j;
417 } 502 }
418 503
419 heap [k] = w; 504 heap [k] = w;
420 heap [k]->active = k + 1; 505 ((W)heap [k])->active = k + 1;
421} 506}
422 507
423/*****************************************************************************/ 508/*****************************************************************************/
424 509
425typedef struct 510typedef struct
426{ 511{
427 struct ev_watcher_list *head; 512 WL head;
428 sig_atomic_t volatile gotsig; 513 sig_atomic_t volatile gotsig;
429} ANSIG; 514} ANSIG;
430 515
431static ANSIG *signals; 516static ANSIG *signals;
432static int signalmax; 517static int signalmax;
… …
448} 533}
449 534
450static void 535static void
451sighandler (int signum) 536sighandler (int signum)
452{ 537{
538#if WIN32
539 signal (signum, sighandler);
540#endif
541
453 signals [signum - 1].gotsig = 1; 542 signals [signum - 1].gotsig = 1;
454 543
455 if (!gotsig) 544 if (!gotsig)
456 { 545 {
457 int old_errno = errno; 546 int old_errno = errno;
458 gotsig = 1; 547 gotsig = 1;
548#ifdef WIN32
549 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
550#else
459 write (sigpipe [1], &signum, 1); 551 write (sigpipe [1], &signum, 1);
552#endif
460 errno = old_errno; 553 errno = old_errno;
461 } 554 }
462} 555}
463 556
464static void 557static void
465sigcb (EV_P_ struct ev_io *iow, int revents) 558sigcb (EV_P_ struct ev_io *iow, int revents)
466{ 559{
467 struct ev_watcher_list *w; 560 WL w;
468 int signum; 561 int signum;
469 562
563#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else
470 read (sigpipe [0], &revents, 1); 566 read (sigpipe [0], &revents, 1);
567#endif
471 gotsig = 0; 568 gotsig = 0;
472 569
473 for (signum = signalmax; signum--; ) 570 for (signum = signalmax; signum--; )
474 if (signals [signum].gotsig) 571 if (signals [signum].gotsig)
475 { 572 {
476 signals [signum].gotsig = 0; 573 signals [signum].gotsig = 0;
477 574
478 for (w = signals [signum].head; w; w = w->next) 575 for (w = signals [signum].head; w; w = w->next)
479 event (EV_A_ (W)w, EV_SIGNAL); 576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
480 } 577 }
481} 578}
482 579
483static void 580static void
484siginit (EV_P) 581siginit (EV_P)
… …
497 ev_unref (EV_A); /* child watcher should not keep loop alive */ 594 ev_unref (EV_A); /* child watcher should not keep loop alive */
498} 595}
499 596
500/*****************************************************************************/ 597/*****************************************************************************/
501 598
599static struct ev_child *childs [PID_HASHSIZE];
600
502#ifndef WIN32 601#ifndef WIN32
503 602
504static struct ev_child *childs [PID_HASHSIZE];
505static struct ev_signal childev; 603static struct ev_signal childev;
506 604
507#ifndef WCONTINUED 605#ifndef WCONTINUED
508# define WCONTINUED 0 606# define WCONTINUED 0
509#endif 607#endif
… …
514 struct ev_child *w; 612 struct ev_child *w;
515 613
516 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 614 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
517 if (w->pid == pid || !w->pid) 615 if (w->pid == pid || !w->pid)
518 { 616 {
519 w->priority = sw->priority; /* need to do it *now* */ 617 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
520 w->rpid = pid; 618 w->rpid = pid;
521 w->rstatus = status; 619 w->rstatus = status;
522 event (EV_A_ (W)w, EV_CHILD); 620 ev_feed_event (EV_A_ (W)w, EV_CHILD);
523 } 621 }
524} 622}
525 623
526static void 624static void
527childcb (EV_P_ struct ev_signal *sw, int revents) 625childcb (EV_P_ struct ev_signal *sw, int revents)
… …
529 int pid, status; 627 int pid, status;
530 628
531 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 629 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
532 { 630 {
533 /* make sure we are called again until all childs have been reaped */ 631 /* make sure we are called again until all childs have been reaped */
534 event (EV_A_ (W)sw, EV_SIGNAL); 632 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
535 633
536 child_reap (EV_A_ sw, pid, pid, status); 634 child_reap (EV_A_ sw, pid, pid, status);
537 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 635 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
538 } 636 }
539} 637}
… …
608 methods = atoi (getenv ("LIBEV_METHODS")); 706 methods = atoi (getenv ("LIBEV_METHODS"));
609 else 707 else
610 methods = EVMETHOD_ANY; 708 methods = EVMETHOD_ANY;
611 709
612 method = 0; 710 method = 0;
711#if EV_USE_WIN32
712 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
713#endif
613#if EV_USE_KQUEUE 714#if EV_USE_KQUEUE
614 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 715 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
615#endif 716#endif
616#if EV_USE_EPOLL 717#if EV_USE_EPOLL
617 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 718 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
620 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 721 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
621#endif 722#endif
622#if EV_USE_SELECT 723#if EV_USE_SELECT
623 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
624#endif 725#endif
726
727 ev_watcher_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI);
625 } 729 }
626} 730}
627 731
628void 732void
629loop_destroy (EV_P) 733loop_destroy (EV_P)
630{ 734{
735 int i;
736
737#if EV_USE_WIN32
738 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
739#endif
631#if EV_USE_KQUEUE 740#if EV_USE_KQUEUE
632 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 741 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
633#endif 742#endif
634#if EV_USE_EPOLL 743#if EV_USE_EPOLL
635 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 744 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
639#endif 748#endif
640#if EV_USE_SELECT 749#if EV_USE_SELECT
641 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 750 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
642#endif 751#endif
643 752
753 for (i = NUMPRI; i--; )
754 array_free (pending, [i]);
755
756 /* have to use the microsoft-never-gets-it-right macro */
757 array_free_microshit (fdchange);
758 array_free_microshit (timer);
759 array_free_microshit (periodic);
760 array_free_microshit (idle);
761 array_free_microshit (prepare);
762 array_free_microshit (check);
763
644 method = 0; 764 method = 0;
645 /*TODO*/
646} 765}
647 766
648void 767static void
649loop_fork (EV_P) 768loop_fork (EV_P)
650{ 769{
651 /*TODO*/
652#if EV_USE_EPOLL 770#if EV_USE_EPOLL
653 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 771 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
654#endif 772#endif
655#if EV_USE_KQUEUE 773#if EV_USE_KQUEUE
656 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 774 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
657#endif 775#endif
776
777 if (ev_is_active (&sigev))
778 {
779 /* default loop */
780
781 ev_ref (EV_A);
782 ev_io_stop (EV_A_ &sigev);
783 close (sigpipe [0]);
784 close (sigpipe [1]);
785
786 while (pipe (sigpipe))
787 syserr ("(libev) error creating pipe");
788
789 siginit (EV_A);
790 }
791
792 postfork = 0;
658} 793}
659 794
660#if EV_MULTIPLICITY 795#if EV_MULTIPLICITY
661struct ev_loop * 796struct ev_loop *
662ev_loop_new (int methods) 797ev_loop_new (int methods)
663{ 798{
664 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 799 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
800
801 memset (loop, 0, sizeof (struct ev_loop));
665 802
666 loop_init (EV_A_ methods); 803 loop_init (EV_A_ methods);
667 804
668 if (ev_method (EV_A)) 805 if (ev_method (EV_A))
669 return loop; 806 return loop;
… …
673 810
674void 811void
675ev_loop_destroy (EV_P) 812ev_loop_destroy (EV_P)
676{ 813{
677 loop_destroy (EV_A); 814 loop_destroy (EV_A);
678 free (loop); 815 ev_free (loop);
679} 816}
680 817
681void 818void
682ev_loop_fork (EV_P) 819ev_loop_fork (EV_P)
683{ 820{
684 loop_fork (EV_A); 821 postfork = 1;
685} 822}
686 823
687#endif 824#endif
688 825
689#if EV_MULTIPLICITY 826#if EV_MULTIPLICITY
… …
712 849
713 loop_init (EV_A_ methods); 850 loop_init (EV_A_ methods);
714 851
715 if (ev_method (EV_A)) 852 if (ev_method (EV_A))
716 { 853 {
717 ev_watcher_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI);
719 siginit (EV_A); 854 siginit (EV_A);
720 855
721#ifndef WIN32 856#ifndef WIN32
722 ev_signal_init (&childev, childcb, SIGCHLD); 857 ev_signal_init (&childev, childcb, SIGCHLD);
723 ev_set_priority (&childev, EV_MAXPRI); 858 ev_set_priority (&childev, EV_MAXPRI);
… …
737{ 872{
738#if EV_MULTIPLICITY 873#if EV_MULTIPLICITY
739 struct ev_loop *loop = default_loop; 874 struct ev_loop *loop = default_loop;
740#endif 875#endif
741 876
877#ifndef WIN32
742 ev_ref (EV_A); /* child watcher */ 878 ev_ref (EV_A); /* child watcher */
743 ev_signal_stop (EV_A_ &childev); 879 ev_signal_stop (EV_A_ &childev);
880#endif
744 881
745 ev_ref (EV_A); /* signal watcher */ 882 ev_ref (EV_A); /* signal watcher */
746 ev_io_stop (EV_A_ &sigev); 883 ev_io_stop (EV_A_ &sigev);
747 884
748 close (sigpipe [0]); sigpipe [0] = 0; 885 close (sigpipe [0]); sigpipe [0] = 0;
… …
756{ 893{
757#if EV_MULTIPLICITY 894#if EV_MULTIPLICITY
758 struct ev_loop *loop = default_loop; 895 struct ev_loop *loop = default_loop;
759#endif 896#endif
760 897
761 loop_fork (EV_A); 898 if (method)
762 899 postfork = 1;
763 ev_io_stop (EV_A_ &sigev);
764 close (sigpipe [0]);
765 close (sigpipe [1]);
766 pipe (sigpipe);
767
768 ev_ref (EV_A); /* signal watcher */
769 siginit (EV_A);
770} 900}
771 901
772/*****************************************************************************/ 902/*****************************************************************************/
903
904static int
905any_pending (EV_P)
906{
907 int pri;
908
909 for (pri = NUMPRI; pri--; )
910 if (pendingcnt [pri])
911 return 1;
912
913 return 0;
914}
773 915
774static void 916static void
775call_pending (EV_P) 917call_pending (EV_P)
776{ 918{
777 int pri; 919 int pri;
… …
790} 932}
791 933
792static void 934static void
793timers_reify (EV_P) 935timers_reify (EV_P)
794{ 936{
795 while (timercnt && timers [0]->at <= mn_now) 937 while (timercnt && ((WT)timers [0])->at <= mn_now)
796 { 938 {
797 struct ev_timer *w = timers [0]; 939 struct ev_timer *w = timers [0];
940
941 assert (("inactive timer on timer heap detected", ev_is_active (w)));
798 942
799 /* first reschedule or stop timer */ 943 /* first reschedule or stop timer */
800 if (w->repeat) 944 if (w->repeat)
801 { 945 {
802 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 946 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
803 w->at = mn_now + w->repeat; 947 ((WT)w)->at = mn_now + w->repeat;
804 downheap ((WT *)timers, timercnt, 0); 948 downheap ((WT *)timers, timercnt, 0);
805 } 949 }
806 else 950 else
807 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
808 952
809 event (EV_A_ (W)w, EV_TIMEOUT); 953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
810 } 954 }
811} 955}
812 956
813static void 957static void
814periodics_reify (EV_P) 958periodics_reify (EV_P)
815{ 959{
816 while (periodiccnt && periodics [0]->at <= rt_now) 960 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
817 { 961 {
818 struct ev_periodic *w = periodics [0]; 962 struct ev_periodic *w = periodics [0];
819 963
964 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
965
820 /* first reschedule or stop timer */ 966 /* first reschedule or stop timer */
821 if (w->interval) 967 if (w->reschedule_cb)
822 { 968 {
969 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
970
971 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
972 downheap ((WT *)periodics, periodiccnt, 0);
973 }
974 else if (w->interval)
975 {
823 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 976 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
824 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 977 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
825 downheap ((WT *)periodics, periodiccnt, 0); 978 downheap ((WT *)periodics, periodiccnt, 0);
826 } 979 }
827 else 980 else
828 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
829 982
830 event (EV_A_ (W)w, EV_PERIODIC); 983 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
831 } 984 }
832} 985}
833 986
834static void 987static void
835periodics_reschedule (EV_P) 988periodics_reschedule (EV_P)
… …
839 /* adjust periodics after time jump */ 992 /* adjust periodics after time jump */
840 for (i = 0; i < periodiccnt; ++i) 993 for (i = 0; i < periodiccnt; ++i)
841 { 994 {
842 struct ev_periodic *w = periodics [i]; 995 struct ev_periodic *w = periodics [i];
843 996
997 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now);
844 if (w->interval) 999 else if (w->interval)
845 {
846 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 1000 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
847
848 if (fabs (diff) >= 1e-4)
849 {
850 ev_periodic_stop (EV_A_ w);
851 ev_periodic_start (EV_A_ w);
852
853 i = 0; /* restart loop, inefficient, but time jumps should be rare */
854 }
855 }
856 } 1001 }
1002
1003 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i);
857} 1006}
858 1007
859inline int 1008inline int
860time_update_monotonic (EV_P) 1009time_update_monotonic (EV_P)
861{ 1010{
… …
912 { 1061 {
913 periodics_reschedule (EV_A); 1062 periodics_reschedule (EV_A);
914 1063
915 /* adjust timers. this is easy, as the offset is the same for all */ 1064 /* adjust timers. this is easy, as the offset is the same for all */
916 for (i = 0; i < timercnt; ++i) 1065 for (i = 0; i < timercnt; ++i)
917 timers [i]->at += rt_now - mn_now; 1066 ((WT)timers [i])->at += rt_now - mn_now;
918 } 1067 }
919 1068
920 mn_now = rt_now; 1069 mn_now = rt_now;
921 } 1070 }
922} 1071}
… …
948 { 1097 {
949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1098 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
950 call_pending (EV_A); 1099 call_pending (EV_A);
951 } 1100 }
952 1101
1102 /* we might have forked, so reify kernel state if necessary */
1103 if (expect_false (postfork))
1104 loop_fork (EV_A);
1105
953 /* update fd-related kernel structures */ 1106 /* update fd-related kernel structures */
954 fd_reify (EV_A); 1107 fd_reify (EV_A);
955 1108
956 /* calculate blocking time */ 1109 /* calculate blocking time */
957 1110
958 /* we only need this for !monotonic clockor timers, but as we basically 1111 /* we only need this for !monotonic clock or timers, but as we basically
959 always have timers, we just calculate it always */ 1112 always have timers, we just calculate it always */
960#if EV_USE_MONOTONIC 1113#if EV_USE_MONOTONIC
961 if (expect_true (have_monotonic)) 1114 if (expect_true (have_monotonic))
962 time_update_monotonic (EV_A); 1115 time_update_monotonic (EV_A);
963 else 1116 else
… …
973 { 1126 {
974 block = MAX_BLOCKTIME; 1127 block = MAX_BLOCKTIME;
975 1128
976 if (timercnt) 1129 if (timercnt)
977 { 1130 {
978 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1131 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
979 if (block > to) block = to; 1132 if (block > to) block = to;
980 } 1133 }
981 1134
982 if (periodiccnt) 1135 if (periodiccnt)
983 { 1136 {
984 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1137 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
985 if (block > to) block = to; 1138 if (block > to) block = to;
986 } 1139 }
987 1140
988 if (block < 0.) block = 0.; 1141 if (block < 0.) block = 0.;
989 } 1142 }
… …
996 /* queue pending timers and reschedule them */ 1149 /* queue pending timers and reschedule them */
997 timers_reify (EV_A); /* relative timers called last */ 1150 timers_reify (EV_A); /* relative timers called last */
998 periodics_reify (EV_A); /* absolute timers called first */ 1151 periodics_reify (EV_A); /* absolute timers called first */
999 1152
1000 /* queue idle watchers unless io or timers are pending */ 1153 /* queue idle watchers unless io or timers are pending */
1001 if (!pendingcnt) 1154 if (idlecnt && !any_pending (EV_A))
1002 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1003 1156
1004 /* queue check watchers, to be executed first */ 1157 /* queue check watchers, to be executed first */
1005 if (checkcnt) 1158 if (checkcnt)
1006 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1159 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1081 return; 1234 return;
1082 1235
1083 assert (("ev_io_start called with negative fd", fd >= 0)); 1236 assert (("ev_io_start called with negative fd", fd >= 0));
1084 1237
1085 ev_start (EV_A_ (W)w, 1); 1238 ev_start (EV_A_ (W)w, 1);
1086 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1239 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1087 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1240 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1088 1241
1089 fd_change (EV_A_ fd); 1242 fd_change (EV_A_ fd);
1090} 1243}
1091 1244
… …
1106ev_timer_start (EV_P_ struct ev_timer *w) 1259ev_timer_start (EV_P_ struct ev_timer *w)
1107{ 1260{
1108 if (ev_is_active (w)) 1261 if (ev_is_active (w))
1109 return; 1262 return;
1110 1263
1111 w->at += mn_now; 1264 ((WT)w)->at += mn_now;
1112 1265
1113 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1266 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1114 1267
1115 ev_start (EV_A_ (W)w, ++timercnt); 1268 ev_start (EV_A_ (W)w, ++timercnt);
1116 array_needsize (timers, timermax, timercnt, ); 1269 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1117 timers [timercnt - 1] = w; 1270 timers [timercnt - 1] = w;
1118 upheap ((WT *)timers, timercnt - 1); 1271 upheap ((WT *)timers, timercnt - 1);
1272
1273 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1119} 1274}
1120 1275
1121void 1276void
1122ev_timer_stop (EV_P_ struct ev_timer *w) 1277ev_timer_stop (EV_P_ struct ev_timer *w)
1123{ 1278{
1124 ev_clear_pending (EV_A_ (W)w); 1279 ev_clear_pending (EV_A_ (W)w);
1125 if (!ev_is_active (w)) 1280 if (!ev_is_active (w))
1126 return; 1281 return;
1127 1282
1283 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1284
1128 if (w->active < timercnt--) 1285 if (((W)w)->active < timercnt--)
1129 { 1286 {
1130 timers [w->active - 1] = timers [timercnt]; 1287 timers [((W)w)->active - 1] = timers [timercnt];
1131 downheap ((WT *)timers, timercnt, w->active - 1); 1288 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1132 } 1289 }
1133 1290
1134 w->at = w->repeat; 1291 ((WT)w)->at = w->repeat;
1135 1292
1136 ev_stop (EV_A_ (W)w); 1293 ev_stop (EV_A_ (W)w);
1137} 1294}
1138 1295
1139void 1296void
… …
1141{ 1298{
1142 if (ev_is_active (w)) 1299 if (ev_is_active (w))
1143 { 1300 {
1144 if (w->repeat) 1301 if (w->repeat)
1145 { 1302 {
1146 w->at = mn_now + w->repeat; 1303 ((WT)w)->at = mn_now + w->repeat;
1147 downheap ((WT *)timers, timercnt, w->active - 1); 1304 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1148 } 1305 }
1149 else 1306 else
1150 ev_timer_stop (EV_A_ w); 1307 ev_timer_stop (EV_A_ w);
1151 } 1308 }
1152 else if (w->repeat) 1309 else if (w->repeat)
… …
1157ev_periodic_start (EV_P_ struct ev_periodic *w) 1314ev_periodic_start (EV_P_ struct ev_periodic *w)
1158{ 1315{
1159 if (ev_is_active (w)) 1316 if (ev_is_active (w))
1160 return; 1317 return;
1161 1318
1319 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1321 else if (w->interval)
1322 {
1162 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1323 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1163
1164 /* this formula differs from the one in periodic_reify because we do not always round up */ 1324 /* this formula differs from the one in periodic_reify because we do not always round up */
1165 if (w->interval)
1166 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1325 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1326 }
1167 1327
1168 ev_start (EV_A_ (W)w, ++periodiccnt); 1328 ev_start (EV_A_ (W)w, ++periodiccnt);
1169 array_needsize (periodics, periodicmax, periodiccnt, ); 1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1170 periodics [periodiccnt - 1] = w; 1330 periodics [periodiccnt - 1] = w;
1171 upheap ((WT *)periodics, periodiccnt - 1); 1331 upheap ((WT *)periodics, periodiccnt - 1);
1332
1333 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1172} 1334}
1173 1335
1174void 1336void
1175ev_periodic_stop (EV_P_ struct ev_periodic *w) 1337ev_periodic_stop (EV_P_ struct ev_periodic *w)
1176{ 1338{
1177 ev_clear_pending (EV_A_ (W)w); 1339 ev_clear_pending (EV_A_ (W)w);
1178 if (!ev_is_active (w)) 1340 if (!ev_is_active (w))
1179 return; 1341 return;
1180 1342
1343 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1344
1181 if (w->active < periodiccnt--) 1345 if (((W)w)->active < periodiccnt--)
1182 { 1346 {
1183 periodics [w->active - 1] = periodics [periodiccnt]; 1347 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1184 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1348 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1185 } 1349 }
1186 1350
1187 ev_stop (EV_A_ (W)w); 1351 ev_stop (EV_A_ (W)w);
1188} 1352}
1189 1353
1190void 1354void
1355ev_periodic_again (EV_P_ struct ev_periodic *w)
1356{
1357 ev_periodic_stop (EV_A_ w);
1358 ev_periodic_start (EV_A_ w);
1359}
1360
1361void
1191ev_idle_start (EV_P_ struct ev_idle *w) 1362ev_idle_start (EV_P_ struct ev_idle *w)
1192{ 1363{
1193 if (ev_is_active (w)) 1364 if (ev_is_active (w))
1194 return; 1365 return;
1195 1366
1196 ev_start (EV_A_ (W)w, ++idlecnt); 1367 ev_start (EV_A_ (W)w, ++idlecnt);
1197 array_needsize (idles, idlemax, idlecnt, ); 1368 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1198 idles [idlecnt - 1] = w; 1369 idles [idlecnt - 1] = w;
1199} 1370}
1200 1371
1201void 1372void
1202ev_idle_stop (EV_P_ struct ev_idle *w) 1373ev_idle_stop (EV_P_ struct ev_idle *w)
1203{ 1374{
1204 ev_clear_pending (EV_A_ (W)w); 1375 ev_clear_pending (EV_A_ (W)w);
1205 if (ev_is_active (w)) 1376 if (ev_is_active (w))
1206 return; 1377 return;
1207 1378
1208 idles [w->active - 1] = idles [--idlecnt]; 1379 idles [((W)w)->active - 1] = idles [--idlecnt];
1209 ev_stop (EV_A_ (W)w); 1380 ev_stop (EV_A_ (W)w);
1210} 1381}
1211 1382
1212void 1383void
1213ev_prepare_start (EV_P_ struct ev_prepare *w) 1384ev_prepare_start (EV_P_ struct ev_prepare *w)
1214{ 1385{
1215 if (ev_is_active (w)) 1386 if (ev_is_active (w))
1216 return; 1387 return;
1217 1388
1218 ev_start (EV_A_ (W)w, ++preparecnt); 1389 ev_start (EV_A_ (W)w, ++preparecnt);
1219 array_needsize (prepares, preparemax, preparecnt, ); 1390 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1220 prepares [preparecnt - 1] = w; 1391 prepares [preparecnt - 1] = w;
1221} 1392}
1222 1393
1223void 1394void
1224ev_prepare_stop (EV_P_ struct ev_prepare *w) 1395ev_prepare_stop (EV_P_ struct ev_prepare *w)
1225{ 1396{
1226 ev_clear_pending (EV_A_ (W)w); 1397 ev_clear_pending (EV_A_ (W)w);
1227 if (ev_is_active (w)) 1398 if (ev_is_active (w))
1228 return; 1399 return;
1229 1400
1230 prepares [w->active - 1] = prepares [--preparecnt]; 1401 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1231 ev_stop (EV_A_ (W)w); 1402 ev_stop (EV_A_ (W)w);
1232} 1403}
1233 1404
1234void 1405void
1235ev_check_start (EV_P_ struct ev_check *w) 1406ev_check_start (EV_P_ struct ev_check *w)
1236{ 1407{
1237 if (ev_is_active (w)) 1408 if (ev_is_active (w))
1238 return; 1409 return;
1239 1410
1240 ev_start (EV_A_ (W)w, ++checkcnt); 1411 ev_start (EV_A_ (W)w, ++checkcnt);
1241 array_needsize (checks, checkmax, checkcnt, ); 1412 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1242 checks [checkcnt - 1] = w; 1413 checks [checkcnt - 1] = w;
1243} 1414}
1244 1415
1245void 1416void
1246ev_check_stop (EV_P_ struct ev_check *w) 1417ev_check_stop (EV_P_ struct ev_check *w)
1247{ 1418{
1248 ev_clear_pending (EV_A_ (W)w); 1419 ev_clear_pending (EV_A_ (W)w);
1249 if (ev_is_active (w)) 1420 if (ev_is_active (w))
1250 return; 1421 return;
1251 1422
1252 checks [w->active - 1] = checks [--checkcnt]; 1423 checks [((W)w)->active - 1] = checks [--checkcnt];
1253 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1254} 1425}
1255 1426
1256#ifndef SA_RESTART 1427#ifndef SA_RESTART
1257# define SA_RESTART 0 1428# define SA_RESTART 0
… …
1267 return; 1438 return;
1268 1439
1269 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1440 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1270 1441
1271 ev_start (EV_A_ (W)w, 1); 1442 ev_start (EV_A_ (W)w, 1);
1272 array_needsize (signals, signalmax, w->signum, signals_init); 1443 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1273 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1444 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1274 1445
1275 if (!w->next) 1446 if (!((WL)w)->next)
1276 { 1447 {
1448#if WIN32
1449 signal (w->signum, sighandler);
1450#else
1277 struct sigaction sa; 1451 struct sigaction sa;
1278 sa.sa_handler = sighandler; 1452 sa.sa_handler = sighandler;
1279 sigfillset (&sa.sa_mask); 1453 sigfillset (&sa.sa_mask);
1280 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1454 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1281 sigaction (w->signum, &sa, 0); 1455 sigaction (w->signum, &sa, 0);
1456#endif
1282 } 1457 }
1283} 1458}
1284 1459
1285void 1460void
1286ev_signal_stop (EV_P_ struct ev_signal *w) 1461ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1336 void (*cb)(int revents, void *arg) = once->cb; 1511 void (*cb)(int revents, void *arg) = once->cb;
1337 void *arg = once->arg; 1512 void *arg = once->arg;
1338 1513
1339 ev_io_stop (EV_A_ &once->io); 1514 ev_io_stop (EV_A_ &once->io);
1340 ev_timer_stop (EV_A_ &once->to); 1515 ev_timer_stop (EV_A_ &once->to);
1341 free (once); 1516 ev_free (once);
1342 1517
1343 cb (revents, arg); 1518 cb (revents, arg);
1344} 1519}
1345 1520
1346static void 1521static void
… …
1356} 1531}
1357 1532
1358void 1533void
1359ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1534ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1360{ 1535{
1361 struct ev_once *once = malloc (sizeof (struct ev_once)); 1536 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1362 1537
1363 if (!once) 1538 if (!once)
1364 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1539 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1365 else 1540 else
1366 { 1541 {

Diff Legend

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