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.72 by root, Tue Nov 6 16:09:37 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#if WIN32
154/* note: the comment below could not be substantiated, but what would I care */
155/* MSDN says this is required to handle SIGFPE */
156volatile double SIGFPE_REQ = 0.0f;
157
158static int
159ev_socketpair_tcp (int filedes [2])
160{
161 struct sockaddr_in addr = { 0 };
162 int addr_size = sizeof (addr);
163 SOCKET listener;
164 SOCKET sock [2] = { -1, -1 };
165
166 if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
167 return -1;
168
169 addr.sin_family = AF_INET;
170 addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
171 addr.sin_port = 0;
172
173 if (bind (listener, (struct sockaddr *)&addr, addr_size))
174 goto fail;
175
176 if (getsockname(listener, (struct sockaddr *)&addr, &addr_size))
177 goto fail;
178
179 if (listen (listener, 1))
180 goto fail;
181
182 if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
183 goto fail;
184
185 if (connect (sock[0], (struct sockaddr *)&addr, addr_size))
186 goto fail;
187
188 if ((sock[1] = accept (listener, 0, 0)) < 0)
189 goto fail;
190
191 closesocket (listener);
192
193 filedes [0] = sock [0];
194 filedes [1] = sock [1];
195
196 return 0;
197
198fail:
199 closesocket (listener);
200
201 if (sock [0] != INVALID_SOCKET) closesocket (sock [0]);
202 if (sock [1] != INVALID_SOCKET) closesocket (sock [1]);
203
204 return -1;
205}
206
207# define ev_pipe(filedes) ev_socketpair_tcp (filedes)
208#else
209# define ev_pipe(filedes) pipe (filedes)
210#endif
211
142/*****************************************************************************/ 212/*****************************************************************************/
143 213
214static void (*syserr_cb)(const char *msg);
215
216void ev_set_syserr_cb (void (*cb)(const char *msg))
217{
218 syserr_cb = cb;
219}
220
221static void
222syserr (const char *msg)
223{
224 if (!msg)
225 msg = "(libev) system error";
226
227 if (syserr_cb)
228 syserr_cb (msg);
229 else
230 {
231 perror (msg);
232 abort ();
233 }
234}
235
236static void *(*alloc)(void *ptr, long size);
237
238void ev_set_allocator (void *(*cb)(void *ptr, long size))
239{
240 alloc = cb;
241}
242
243static void *
244ev_realloc (void *ptr, long size)
245{
246 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
247
248 if (!ptr && size)
249 {
250 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
251 abort ();
252 }
253
254 return ptr;
255}
256
257#define ev_malloc(size) ev_realloc (0, (size))
258#define ev_free(ptr) ev_realloc ((ptr), 0)
259
260/*****************************************************************************/
261
144typedef struct 262typedef struct
145{ 263{
146 struct ev_watcher_list *head; 264 WL head;
147 unsigned char events; 265 unsigned char events;
148 unsigned char reify; 266 unsigned char reify;
149} ANFD; 267} ANFD;
150 268
151typedef struct 269typedef struct
… …
209 return rt_now; 327 return rt_now;
210} 328}
211 329
212#define array_roundsize(base,n) ((n) | 4 & ~3) 330#define array_roundsize(base,n) ((n) | 4 & ~3)
213 331
214#define array_needsize(base,cur,cnt,init) \ 332#define array_needsize(base,cur,cnt,init) \
215 if (expect_false ((cnt) > cur)) \ 333 if (expect_false ((cnt) > cur)) \
216 { \ 334 { \
217 int newcnt = cur; \ 335 int newcnt = cur; \
218 do \ 336 do \
219 { \ 337 { \
220 newcnt = array_roundsize (base, newcnt << 1); \ 338 newcnt = array_roundsize (base, newcnt << 1); \
221 } \ 339 } \
222 while ((cnt) > newcnt); \ 340 while ((cnt) > newcnt); \
223 \ 341 \
224 base = realloc (base, sizeof (*base) * (newcnt)); \ 342 base = ev_realloc (base, sizeof (*base) * (newcnt)); \
225 init (base + cur, newcnt - cur); \ 343 init (base + cur, newcnt - cur); \
226 cur = newcnt; \ 344 cur = newcnt; \
227 } 345 }
346
347#define array_slim(stem) \
348 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
349 { \
350 stem ## max = array_roundsize (stem ## cnt >> 1); \
351 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \
352 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
353 }
354
355/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
356/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
357#define array_free_microshit(stem) \
358 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
359
360#define array_free(stem, idx) \
361 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
228 362
229/*****************************************************************************/ 363/*****************************************************************************/
230 364
231static void 365static void
232anfds_init (ANFD *base, int count) 366anfds_init (ANFD *base, int count)
… …
249 pendings [ABSPRI (w)][w->pending - 1].events |= events; 383 pendings [ABSPRI (w)][w->pending - 1].events |= events;
250 return; 384 return;
251 } 385 }
252 386
253 w->pending = ++pendingcnt [ABSPRI (w)]; 387 w->pending = ++pendingcnt [ABSPRI (w)];
254 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 388 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void));
255 pendings [ABSPRI (w)][w->pending - 1].w = w; 389 pendings [ABSPRI (w)][w->pending - 1].w = w;
256 pendings [ABSPRI (w)][w->pending - 1].events = events; 390 pendings [ABSPRI (w)][w->pending - 1].events = events;
257} 391}
258 392
259static void 393static void
… …
298 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 432 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
299 events |= w->events; 433 events |= w->events;
300 434
301 anfd->reify = 0; 435 anfd->reify = 0;
302 436
303 if (anfd->events != events)
304 {
305 method_modify (EV_A_ fd, anfd->events, events); 437 method_modify (EV_A_ fd, anfd->events, events);
306 anfd->events = events; 438 anfd->events = events;
307 }
308 } 439 }
309 440
310 fdchangecnt = 0; 441 fdchangecnt = 0;
311} 442}
312 443
313static void 444static void
314fd_change (EV_P_ int fd) 445fd_change (EV_P_ int fd)
315{ 446{
316 if (anfds [fd].reify || fdchangecnt < 0) 447 if (anfds [fd].reify)
317 return; 448 return;
318 449
319 anfds [fd].reify = 1; 450 anfds [fd].reify = 1;
320 451
321 ++fdchangecnt; 452 ++fdchangecnt;
322 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 453 array_needsize (fdchanges, fdchangemax, fdchangecnt, (void));
323 fdchanges [fdchangecnt - 1] = fd; 454 fdchanges [fdchangecnt - 1] = fd;
324} 455}
325 456
326static void 457static void
327fd_kill (EV_P_ int fd) 458fd_kill (EV_P_ int fd)
… …
333 ev_io_stop (EV_A_ w); 464 ev_io_stop (EV_A_ w);
334 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 465 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
335 } 466 }
336} 467}
337 468
469static int
470fd_valid (int fd)
471{
472#ifdef WIN32
473 return !!win32_get_osfhandle (fd);
474#else
475 return fcntl (fd, F_GETFD) != -1;
476#endif
477}
478
338/* called on EBADF to verify fds */ 479/* called on EBADF to verify fds */
339static void 480static void
340fd_ebadf (EV_P) 481fd_ebadf (EV_P)
341{ 482{
342 int fd; 483 int fd;
343 484
344 for (fd = 0; fd < anfdmax; ++fd) 485 for (fd = 0; fd < anfdmax; ++fd)
345 if (anfds [fd].events) 486 if (anfds [fd].events)
346 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 487 if (!fd_valid (fd) == -1 && errno == EBADF)
347 fd_kill (EV_A_ fd); 488 fd_kill (EV_A_ fd);
348} 489}
349 490
350/* called on ENOMEM in select/poll to kill some fds and retry */ 491/* called on ENOMEM in select/poll to kill some fds and retry */
351static void 492static void
352fd_enomem (EV_P) 493fd_enomem (EV_P)
353{ 494{
354 int fd = anfdmax; 495 int fd;
355 496
356 while (fd--) 497 for (fd = anfdmax; fd--; )
357 if (anfds [fd].events) 498 if (anfds [fd].events)
358 { 499 {
359 close (fd);
360 fd_kill (EV_A_ fd); 500 fd_kill (EV_A_ fd);
361 return; 501 return;
362 } 502 }
363} 503}
364 504
365/* susually called after fork if method needs to re-arm all fds from scratch */ 505/* usually called after fork if method needs to re-arm all fds from scratch */
366static void 506static void
367fd_rearm_all (EV_P) 507fd_rearm_all (EV_P)
368{ 508{
369 int fd; 509 int fd;
370 510
… …
385 WT w = heap [k]; 525 WT w = heap [k];
386 526
387 while (k && heap [k >> 1]->at > w->at) 527 while (k && heap [k >> 1]->at > w->at)
388 { 528 {
389 heap [k] = heap [k >> 1]; 529 heap [k] = heap [k >> 1];
390 heap [k]->active = k + 1; 530 ((W)heap [k])->active = k + 1;
391 k >>= 1; 531 k >>= 1;
392 } 532 }
393 533
394 heap [k] = w; 534 heap [k] = w;
395 heap [k]->active = k + 1; 535 ((W)heap [k])->active = k + 1;
396 536
397} 537}
398 538
399static void 539static void
400downheap (WT *heap, int N, int k) 540downheap (WT *heap, int N, int k)
… …
410 550
411 if (w->at <= heap [j]->at) 551 if (w->at <= heap [j]->at)
412 break; 552 break;
413 553
414 heap [k] = heap [j]; 554 heap [k] = heap [j];
415 heap [k]->active = k + 1; 555 ((W)heap [k])->active = k + 1;
416 k = j; 556 k = j;
417 } 557 }
418 558
419 heap [k] = w; 559 heap [k] = w;
420 heap [k]->active = k + 1; 560 ((W)heap [k])->active = k + 1;
421} 561}
422 562
423/*****************************************************************************/ 563/*****************************************************************************/
424 564
425typedef struct 565typedef struct
426{ 566{
427 struct ev_watcher_list *head; 567 WL head;
428 sig_atomic_t volatile gotsig; 568 sig_atomic_t volatile gotsig;
429} ANSIG; 569} ANSIG;
430 570
431static ANSIG *signals; 571static ANSIG *signals;
432static int signalmax; 572static int signalmax;
… …
448} 588}
449 589
450static void 590static void
451sighandler (int signum) 591sighandler (int signum)
452{ 592{
593#if WIN32
594 signal (signum, sighandler);
595#endif
596
453 signals [signum - 1].gotsig = 1; 597 signals [signum - 1].gotsig = 1;
454 598
455 if (!gotsig) 599 if (!gotsig)
456 { 600 {
457 int old_errno = errno; 601 int old_errno = errno;
… …
462} 606}
463 607
464static void 608static void
465sigcb (EV_P_ struct ev_io *iow, int revents) 609sigcb (EV_P_ struct ev_io *iow, int revents)
466{ 610{
467 struct ev_watcher_list *w; 611 WL w;
468 int signum; 612 int signum;
469 613
470 read (sigpipe [0], &revents, 1); 614 read (sigpipe [0], &revents, 1);
471 gotsig = 0; 615 gotsig = 0;
472 616
… …
497 ev_unref (EV_A); /* child watcher should not keep loop alive */ 641 ev_unref (EV_A); /* child watcher should not keep loop alive */
498} 642}
499 643
500/*****************************************************************************/ 644/*****************************************************************************/
501 645
646static struct ev_child *childs [PID_HASHSIZE];
647
502#ifndef WIN32 648#ifndef WIN32
503 649
504static struct ev_child *childs [PID_HASHSIZE];
505static struct ev_signal childev; 650static struct ev_signal childev;
506 651
507#ifndef WCONTINUED 652#ifndef WCONTINUED
508# define WCONTINUED 0 653# define WCONTINUED 0
509#endif 654#endif
… …
514 struct ev_child *w; 659 struct ev_child *w;
515 660
516 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 661 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) 662 if (w->pid == pid || !w->pid)
518 { 663 {
519 w->priority = sw->priority; /* need to do it *now* */ 664 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
520 w->rpid = pid; 665 w->rpid = pid;
521 w->rstatus = status; 666 w->rstatus = status;
522 event (EV_A_ (W)w, EV_CHILD); 667 event (EV_A_ (W)w, EV_CHILD);
523 } 668 }
524} 669}
525 670
526static void 671static void
… …
608 methods = atoi (getenv ("LIBEV_METHODS")); 753 methods = atoi (getenv ("LIBEV_METHODS"));
609 else 754 else
610 methods = EVMETHOD_ANY; 755 methods = EVMETHOD_ANY;
611 756
612 method = 0; 757 method = 0;
758#if EV_USE_WIN32
759 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
760#endif
613#if EV_USE_KQUEUE 761#if EV_USE_KQUEUE
614 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 762 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
615#endif 763#endif
616#if EV_USE_EPOLL 764#if EV_USE_EPOLL
617 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 765 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
620 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 768 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
621#endif 769#endif
622#if EV_USE_SELECT 770#if EV_USE_SELECT
623 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 771 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
624#endif 772#endif
773
774 ev_watcher_init (&sigev, sigcb);
775 ev_set_priority (&sigev, EV_MAXPRI);
625 } 776 }
626} 777}
627 778
628void 779void
629loop_destroy (EV_P) 780loop_destroy (EV_P)
630{ 781{
782 int i;
783
784#if EV_USE_WIN32
785 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
786#endif
631#if EV_USE_KQUEUE 787#if EV_USE_KQUEUE
632 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 788 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
633#endif 789#endif
634#if EV_USE_EPOLL 790#if EV_USE_EPOLL
635 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 791 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
639#endif 795#endif
640#if EV_USE_SELECT 796#if EV_USE_SELECT
641 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 797 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
642#endif 798#endif
643 799
800 for (i = NUMPRI; i--; )
801 array_free (pending, [i]);
802
803 /* have to use the microsoft-never-gets-it-right macro */
804 array_free_microshit (fdchange);
805 array_free_microshit (timer);
806 array_free_microshit (periodic);
807 array_free_microshit (idle);
808 array_free_microshit (prepare);
809 array_free_microshit (check);
810
644 method = 0; 811 method = 0;
645 /*TODO*/
646} 812}
647 813
648void 814static void
649loop_fork (EV_P) 815loop_fork (EV_P)
650{ 816{
651 /*TODO*/
652#if EV_USE_EPOLL 817#if EV_USE_EPOLL
653 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 818 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
654#endif 819#endif
655#if EV_USE_KQUEUE 820#if EV_USE_KQUEUE
656 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 821 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
657#endif 822#endif
823
824 if (ev_is_active (&sigev))
825 {
826 /* default loop */
827
828 ev_ref (EV_A);
829 ev_io_stop (EV_A_ &sigev);
830 close (sigpipe [0]);
831 close (sigpipe [1]);
832
833 while (ev_pipe (sigpipe))
834 syserr ("(libev) error creating pipe");
835
836 siginit (EV_A);
837 }
838
839 postfork = 0;
658} 840}
659 841
660#if EV_MULTIPLICITY 842#if EV_MULTIPLICITY
661struct ev_loop * 843struct ev_loop *
662ev_loop_new (int methods) 844ev_loop_new (int methods)
663{ 845{
664 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 846 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
847
848 memset (loop, 0, sizeof (struct ev_loop));
665 849
666 loop_init (EV_A_ methods); 850 loop_init (EV_A_ methods);
667 851
668 if (ev_method (EV_A)) 852 if (ev_method (EV_A))
669 return loop; 853 return loop;
… …
673 857
674void 858void
675ev_loop_destroy (EV_P) 859ev_loop_destroy (EV_P)
676{ 860{
677 loop_destroy (EV_A); 861 loop_destroy (EV_A);
678 free (loop); 862 ev_free (loop);
679} 863}
680 864
681void 865void
682ev_loop_fork (EV_P) 866ev_loop_fork (EV_P)
683{ 867{
684 loop_fork (EV_A); 868 postfork = 1;
685} 869}
686 870
687#endif 871#endif
688 872
689#if EV_MULTIPLICITY 873#if EV_MULTIPLICITY
… …
697int 881int
698#endif 882#endif
699ev_default_loop (int methods) 883ev_default_loop (int methods)
700{ 884{
701 if (sigpipe [0] == sigpipe [1]) 885 if (sigpipe [0] == sigpipe [1])
702 if (pipe (sigpipe)) 886 if (ev_pipe (sigpipe))
703 return 0; 887 return 0;
704 888
705 if (!default_loop) 889 if (!default_loop)
706 { 890 {
707#if EV_MULTIPLICITY 891#if EV_MULTIPLICITY
… …
712 896
713 loop_init (EV_A_ methods); 897 loop_init (EV_A_ methods);
714 898
715 if (ev_method (EV_A)) 899 if (ev_method (EV_A))
716 { 900 {
717 ev_watcher_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI);
719 siginit (EV_A); 901 siginit (EV_A);
720 902
721#ifndef WIN32 903#ifndef WIN32
722 ev_signal_init (&childev, childcb, SIGCHLD); 904 ev_signal_init (&childev, childcb, SIGCHLD);
723 ev_set_priority (&childev, EV_MAXPRI); 905 ev_set_priority (&childev, EV_MAXPRI);
… …
737{ 919{
738#if EV_MULTIPLICITY 920#if EV_MULTIPLICITY
739 struct ev_loop *loop = default_loop; 921 struct ev_loop *loop = default_loop;
740#endif 922#endif
741 923
924#ifndef WIN32
742 ev_ref (EV_A); /* child watcher */ 925 ev_ref (EV_A); /* child watcher */
743 ev_signal_stop (EV_A_ &childev); 926 ev_signal_stop (EV_A_ &childev);
927#endif
744 928
745 ev_ref (EV_A); /* signal watcher */ 929 ev_ref (EV_A); /* signal watcher */
746 ev_io_stop (EV_A_ &sigev); 930 ev_io_stop (EV_A_ &sigev);
747 931
748 close (sigpipe [0]); sigpipe [0] = 0; 932 close (sigpipe [0]); sigpipe [0] = 0;
… …
756{ 940{
757#if EV_MULTIPLICITY 941#if EV_MULTIPLICITY
758 struct ev_loop *loop = default_loop; 942 struct ev_loop *loop = default_loop;
759#endif 943#endif
760 944
761 loop_fork (EV_A); 945 if (method)
762 946 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} 947}
771 948
772/*****************************************************************************/ 949/*****************************************************************************/
773 950
774static void 951static void
… …
790} 967}
791 968
792static void 969static void
793timers_reify (EV_P) 970timers_reify (EV_P)
794{ 971{
795 while (timercnt && timers [0]->at <= mn_now) 972 while (timercnt && ((WT)timers [0])->at <= mn_now)
796 { 973 {
797 struct ev_timer *w = timers [0]; 974 struct ev_timer *w = timers [0];
975
976 assert (("inactive timer on timer heap detected", ev_is_active (w)));
798 977
799 /* first reschedule or stop timer */ 978 /* first reschedule or stop timer */
800 if (w->repeat) 979 if (w->repeat)
801 { 980 {
802 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 981 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
803 w->at = mn_now + w->repeat; 982 ((WT)w)->at = mn_now + w->repeat;
804 downheap ((WT *)timers, timercnt, 0); 983 downheap ((WT *)timers, timercnt, 0);
805 } 984 }
806 else 985 else
807 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 986 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
808 987
… …
811} 990}
812 991
813static void 992static void
814periodics_reify (EV_P) 993periodics_reify (EV_P)
815{ 994{
816 while (periodiccnt && periodics [0]->at <= rt_now) 995 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
817 { 996 {
818 struct ev_periodic *w = periodics [0]; 997 struct ev_periodic *w = periodics [0];
998
999 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
819 1000
820 /* first reschedule or stop timer */ 1001 /* first reschedule or stop timer */
821 if (w->interval) 1002 if (w->interval)
822 { 1003 {
823 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 1004 ((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)); 1005 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
825 downheap ((WT *)periodics, periodiccnt, 0); 1006 downheap ((WT *)periodics, periodiccnt, 0);
826 } 1007 }
827 else 1008 else
828 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1009 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
829 1010
… …
841 { 1022 {
842 struct ev_periodic *w = periodics [i]; 1023 struct ev_periodic *w = periodics [i];
843 1024
844 if (w->interval) 1025 if (w->interval)
845 { 1026 {
846 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 1027 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
847 1028
848 if (fabs (diff) >= 1e-4) 1029 if (fabs (diff) >= 1e-4)
849 { 1030 {
850 ev_periodic_stop (EV_A_ w); 1031 ev_periodic_stop (EV_A_ w);
851 ev_periodic_start (EV_A_ w); 1032 ev_periodic_start (EV_A_ w);
… …
912 { 1093 {
913 periodics_reschedule (EV_A); 1094 periodics_reschedule (EV_A);
914 1095
915 /* adjust timers. this is easy, as the offset is the same for all */ 1096 /* adjust timers. this is easy, as the offset is the same for all */
916 for (i = 0; i < timercnt; ++i) 1097 for (i = 0; i < timercnt; ++i)
917 timers [i]->at += rt_now - mn_now; 1098 ((WT)timers [i])->at += rt_now - mn_now;
918 } 1099 }
919 1100
920 mn_now = rt_now; 1101 mn_now = rt_now;
921 } 1102 }
922} 1103}
… …
948 { 1129 {
949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1130 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
950 call_pending (EV_A); 1131 call_pending (EV_A);
951 } 1132 }
952 1133
1134 /* we might have forked, so reify kernel state if necessary */
1135 if (expect_false (postfork))
1136 loop_fork (EV_A);
1137
953 /* update fd-related kernel structures */ 1138 /* update fd-related kernel structures */
954 fd_reify (EV_A); 1139 fd_reify (EV_A);
955 1140
956 /* calculate blocking time */ 1141 /* calculate blocking time */
957 1142
… …
973 { 1158 {
974 block = MAX_BLOCKTIME; 1159 block = MAX_BLOCKTIME;
975 1160
976 if (timercnt) 1161 if (timercnt)
977 { 1162 {
978 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1163 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
979 if (block > to) block = to; 1164 if (block > to) block = to;
980 } 1165 }
981 1166
982 if (periodiccnt) 1167 if (periodiccnt)
983 { 1168 {
984 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1169 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
985 if (block > to) block = to; 1170 if (block > to) block = to;
986 } 1171 }
987 1172
988 if (block < 0.) block = 0.; 1173 if (block < 0.) block = 0.;
989 } 1174 }
… …
1106ev_timer_start (EV_P_ struct ev_timer *w) 1291ev_timer_start (EV_P_ struct ev_timer *w)
1107{ 1292{
1108 if (ev_is_active (w)) 1293 if (ev_is_active (w))
1109 return; 1294 return;
1110 1295
1111 w->at += mn_now; 1296 ((WT)w)->at += mn_now;
1112 1297
1113 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1298 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1114 1299
1115 ev_start (EV_A_ (W)w, ++timercnt); 1300 ev_start (EV_A_ (W)w, ++timercnt);
1116 array_needsize (timers, timermax, timercnt, ); 1301 array_needsize (timers, timermax, timercnt, (void));
1117 timers [timercnt - 1] = w; 1302 timers [timercnt - 1] = w;
1118 upheap ((WT *)timers, timercnt - 1); 1303 upheap ((WT *)timers, timercnt - 1);
1304
1305 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1119} 1306}
1120 1307
1121void 1308void
1122ev_timer_stop (EV_P_ struct ev_timer *w) 1309ev_timer_stop (EV_P_ struct ev_timer *w)
1123{ 1310{
1124 ev_clear_pending (EV_A_ (W)w); 1311 ev_clear_pending (EV_A_ (W)w);
1125 if (!ev_is_active (w)) 1312 if (!ev_is_active (w))
1126 return; 1313 return;
1127 1314
1315 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1316
1128 if (w->active < timercnt--) 1317 if (((W)w)->active < timercnt--)
1129 { 1318 {
1130 timers [w->active - 1] = timers [timercnt]; 1319 timers [((W)w)->active - 1] = timers [timercnt];
1131 downheap ((WT *)timers, timercnt, w->active - 1); 1320 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1132 } 1321 }
1133 1322
1134 w->at = w->repeat; 1323 ((WT)w)->at = w->repeat;
1135 1324
1136 ev_stop (EV_A_ (W)w); 1325 ev_stop (EV_A_ (W)w);
1137} 1326}
1138 1327
1139void 1328void
… …
1141{ 1330{
1142 if (ev_is_active (w)) 1331 if (ev_is_active (w))
1143 { 1332 {
1144 if (w->repeat) 1333 if (w->repeat)
1145 { 1334 {
1146 w->at = mn_now + w->repeat; 1335 ((WT)w)->at = mn_now + w->repeat;
1147 downheap ((WT *)timers, timercnt, w->active - 1); 1336 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1148 } 1337 }
1149 else 1338 else
1150 ev_timer_stop (EV_A_ w); 1339 ev_timer_stop (EV_A_ w);
1151 } 1340 }
1152 else if (w->repeat) 1341 else if (w->repeat)
… …
1161 1350
1162 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1351 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1163 1352
1164 /* this formula differs from the one in periodic_reify because we do not always round up */ 1353 /* this formula differs from the one in periodic_reify because we do not always round up */
1165 if (w->interval) 1354 if (w->interval)
1166 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1355 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1167 1356
1168 ev_start (EV_A_ (W)w, ++periodiccnt); 1357 ev_start (EV_A_ (W)w, ++periodiccnt);
1169 array_needsize (periodics, periodicmax, periodiccnt, ); 1358 array_needsize (periodics, periodicmax, periodiccnt, (void));
1170 periodics [periodiccnt - 1] = w; 1359 periodics [periodiccnt - 1] = w;
1171 upheap ((WT *)periodics, periodiccnt - 1); 1360 upheap ((WT *)periodics, periodiccnt - 1);
1361
1362 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1172} 1363}
1173 1364
1174void 1365void
1175ev_periodic_stop (EV_P_ struct ev_periodic *w) 1366ev_periodic_stop (EV_P_ struct ev_periodic *w)
1176{ 1367{
1177 ev_clear_pending (EV_A_ (W)w); 1368 ev_clear_pending (EV_A_ (W)w);
1178 if (!ev_is_active (w)) 1369 if (!ev_is_active (w))
1179 return; 1370 return;
1180 1371
1372 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1373
1181 if (w->active < periodiccnt--) 1374 if (((W)w)->active < periodiccnt--)
1182 { 1375 {
1183 periodics [w->active - 1] = periodics [periodiccnt]; 1376 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1184 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1377 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1185 } 1378 }
1186 1379
1187 ev_stop (EV_A_ (W)w); 1380 ev_stop (EV_A_ (W)w);
1188} 1381}
1189 1382
… …
1192{ 1385{
1193 if (ev_is_active (w)) 1386 if (ev_is_active (w))
1194 return; 1387 return;
1195 1388
1196 ev_start (EV_A_ (W)w, ++idlecnt); 1389 ev_start (EV_A_ (W)w, ++idlecnt);
1197 array_needsize (idles, idlemax, idlecnt, ); 1390 array_needsize (idles, idlemax, idlecnt, (void));
1198 idles [idlecnt - 1] = w; 1391 idles [idlecnt - 1] = w;
1199} 1392}
1200 1393
1201void 1394void
1202ev_idle_stop (EV_P_ struct ev_idle *w) 1395ev_idle_stop (EV_P_ struct ev_idle *w)
1203{ 1396{
1204 ev_clear_pending (EV_A_ (W)w); 1397 ev_clear_pending (EV_A_ (W)w);
1205 if (ev_is_active (w)) 1398 if (ev_is_active (w))
1206 return; 1399 return;
1207 1400
1208 idles [w->active - 1] = idles [--idlecnt]; 1401 idles [((W)w)->active - 1] = idles [--idlecnt];
1209 ev_stop (EV_A_ (W)w); 1402 ev_stop (EV_A_ (W)w);
1210} 1403}
1211 1404
1212void 1405void
1213ev_prepare_start (EV_P_ struct ev_prepare *w) 1406ev_prepare_start (EV_P_ struct ev_prepare *w)
1214{ 1407{
1215 if (ev_is_active (w)) 1408 if (ev_is_active (w))
1216 return; 1409 return;
1217 1410
1218 ev_start (EV_A_ (W)w, ++preparecnt); 1411 ev_start (EV_A_ (W)w, ++preparecnt);
1219 array_needsize (prepares, preparemax, preparecnt, ); 1412 array_needsize (prepares, preparemax, preparecnt, (void));
1220 prepares [preparecnt - 1] = w; 1413 prepares [preparecnt - 1] = w;
1221} 1414}
1222 1415
1223void 1416void
1224ev_prepare_stop (EV_P_ struct ev_prepare *w) 1417ev_prepare_stop (EV_P_ struct ev_prepare *w)
1225{ 1418{
1226 ev_clear_pending (EV_A_ (W)w); 1419 ev_clear_pending (EV_A_ (W)w);
1227 if (ev_is_active (w)) 1420 if (ev_is_active (w))
1228 return; 1421 return;
1229 1422
1230 prepares [w->active - 1] = prepares [--preparecnt]; 1423 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1231 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1232} 1425}
1233 1426
1234void 1427void
1235ev_check_start (EV_P_ struct ev_check *w) 1428ev_check_start (EV_P_ struct ev_check *w)
1236{ 1429{
1237 if (ev_is_active (w)) 1430 if (ev_is_active (w))
1238 return; 1431 return;
1239 1432
1240 ev_start (EV_A_ (W)w, ++checkcnt); 1433 ev_start (EV_A_ (W)w, ++checkcnt);
1241 array_needsize (checks, checkmax, checkcnt, ); 1434 array_needsize (checks, checkmax, checkcnt, (void));
1242 checks [checkcnt - 1] = w; 1435 checks [checkcnt - 1] = w;
1243} 1436}
1244 1437
1245void 1438void
1246ev_check_stop (EV_P_ struct ev_check *w) 1439ev_check_stop (EV_P_ struct ev_check *w)
1247{ 1440{
1248 ev_clear_pending (EV_A_ (W)w); 1441 ev_clear_pending (EV_A_ (W)w);
1249 if (ev_is_active (w)) 1442 if (ev_is_active (w))
1250 return; 1443 return;
1251 1444
1252 checks [w->active - 1] = checks [--checkcnt]; 1445 checks [((W)w)->active - 1] = checks [--checkcnt];
1253 ev_stop (EV_A_ (W)w); 1446 ev_stop (EV_A_ (W)w);
1254} 1447}
1255 1448
1256#ifndef SA_RESTART 1449#ifndef SA_RESTART
1257# define SA_RESTART 0 1450# define SA_RESTART 0
… …
1270 1463
1271 ev_start (EV_A_ (W)w, 1); 1464 ev_start (EV_A_ (W)w, 1);
1272 array_needsize (signals, signalmax, w->signum, signals_init); 1465 array_needsize (signals, signalmax, w->signum, signals_init);
1273 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1466 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1274 1467
1275 if (!w->next) 1468 if (!((WL)w)->next)
1276 { 1469 {
1470#if WIN32
1471 signal (w->signum, sighandler);
1472#else
1277 struct sigaction sa; 1473 struct sigaction sa;
1278 sa.sa_handler = sighandler; 1474 sa.sa_handler = sighandler;
1279 sigfillset (&sa.sa_mask); 1475 sigfillset (&sa.sa_mask);
1280 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1476 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1281 sigaction (w->signum, &sa, 0); 1477 sigaction (w->signum, &sa, 0);
1478#endif
1282 } 1479 }
1283} 1480}
1284 1481
1285void 1482void
1286ev_signal_stop (EV_P_ struct ev_signal *w) 1483ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1336 void (*cb)(int revents, void *arg) = once->cb; 1533 void (*cb)(int revents, void *arg) = once->cb;
1337 void *arg = once->arg; 1534 void *arg = once->arg;
1338 1535
1339 ev_io_stop (EV_A_ &once->io); 1536 ev_io_stop (EV_A_ &once->io);
1340 ev_timer_stop (EV_A_ &once->to); 1537 ev_timer_stop (EV_A_ &once->to);
1341 free (once); 1538 ev_free (once);
1342 1539
1343 cb (revents, arg); 1540 cb (revents, arg);
1344} 1541}
1345 1542
1346static void 1543static void
… …
1356} 1553}
1357 1554
1358void 1555void
1359ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1556ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1360{ 1557{
1361 struct ev_once *once = malloc (sizeof (struct ev_once)); 1558 struct ev_once *once = ev_malloc (sizeof (struct ev_once));
1362 1559
1363 if (!once) 1560 if (!once)
1364 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1561 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1365 else 1562 else
1366 { 1563 {

Diff Legend

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