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

Comparing libev/ev.c (file contents):
Revision 1.56 by root, Sun Nov 4 15:58:49 2007 UTC vs.
Revision 1.73 by root, Tue Nov 6 16:27:10 2007 UTC

… …
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_STANDALONE 31#ifndef EV_STANDALONE
32# include "config.h" 32# include "config.h"
33
34# if HAVE_CLOCK_GETTIME
35# define EV_USE_MONOTONIC 1
36# define EV_USE_REALTIME 1
37# endif
38
39# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1
41# endif
42
43# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1
45# endif
46
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1
49# endif
50
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1
53# endif
54
33#endif 55#endif
34 56
35#include <math.h> 57#include <math.h>
36#include <stdlib.h> 58#include <stdlib.h>
37#include <unistd.h>
38#include <fcntl.h> 59#include <fcntl.h>
39#include <signal.h>
40#include <stddef.h> 60#include <stddef.h>
41 61
42#include <stdio.h> 62#include <stdio.h>
43 63
44#include <assert.h> 64#include <assert.h>
45#include <errno.h> 65#include <errno.h>
46#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
47#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
48# include <sys/wait.h> 74# include <sys/wait.h>
49#endif 75#endif
50#include <sys/time.h>
51#include <time.h>
52
53/**/ 76/**/
54 77
55#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
56# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
57#endif 80#endif
58 81
59#ifndef EV_USE_SELECT 82#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1 83# define EV_USE_SELECT 1
61#endif 84#endif
62 85
63#ifndef EV_USEV_POLL 86#ifndef EV_USE_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */ 87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif 88#endif
66 89
67#ifndef EV_USE_EPOLL 90#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0 91# define EV_USE_EPOLL 0
69#endif 92#endif
70 93
71#ifndef EV_USE_KQUEUE 94#ifndef EV_USE_KQUEUE
72# 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
73#endif 106#endif
74 107
75#ifndef EV_USE_REALTIME 108#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1 109# define EV_USE_REALTIME 1
77#endif 110#endif
… …
115typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
116typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
117 150
118static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
119 152
153#include "ev_win32.c"
154
120/*****************************************************************************/ 155/*****************************************************************************/
121 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
122typedef struct 205typedef struct
123{ 206{
124 struct ev_watcher_list *head; 207 WL head;
125 unsigned char events; 208 unsigned char events;
126 unsigned char reify; 209 unsigned char reify;
127} ANFD; 210} ANFD;
128 211
129typedef struct 212typedef struct
… …
187 return rt_now; 270 return rt_now;
188} 271}
189 272
190#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(base,n) ((n) | 4 & ~3)
191 274
192#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(base,cur,cnt,init) \
193 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
194 { \ 277 { \
195 int newcnt = cur; \ 278 int newcnt = cur; \
196 do \ 279 do \
197 { \ 280 { \
198 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (base, newcnt << 1); \
199 } \ 282 } \
200 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
201 \ 284 \
202 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = ev_realloc (base, sizeof (*base) * (newcnt)); \
203 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
204 cur = newcnt; \ 287 cur = newcnt; \
205 } 288 }
289
290#define array_slim(stem) \
291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
292 { \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = ev_realloc (base, sizeof (*base) * (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;
206 305
207/*****************************************************************************/ 306/*****************************************************************************/
208 307
209static void 308static void
210anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
227 pendings [ABSPRI (w)][w->pending - 1].events |= events; 326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
228 return; 327 return;
229 } 328 }
230 329
231 w->pending = ++pendingcnt [ABSPRI (w)]; 330 w->pending = ++pendingcnt [ABSPRI (w)];
232 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 331 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void));
233 pendings [ABSPRI (w)][w->pending - 1].w = w; 332 pendings [ABSPRI (w)][w->pending - 1].w = w;
234 pendings [ABSPRI (w)][w->pending - 1].events = events; 333 pendings [ABSPRI (w)][w->pending - 1].events = events;
235} 334}
236 335
237static void 336static void
… …
276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 375 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
277 events |= w->events; 376 events |= w->events;
278 377
279 anfd->reify = 0; 378 anfd->reify = 0;
280 379
281 if (anfd->events != events)
282 {
283 method_modify (EV_A_ fd, anfd->events, events); 380 method_modify (EV_A_ fd, anfd->events, events);
284 anfd->events = events; 381 anfd->events = events;
285 }
286 } 382 }
287 383
288 fdchangecnt = 0; 384 fdchangecnt = 0;
289} 385}
290 386
291static void 387static void
292fd_change (EV_P_ int fd) 388fd_change (EV_P_ int fd)
293{ 389{
294 if (anfds [fd].reify || fdchangecnt < 0) 390 if (anfds [fd].reify)
295 return; 391 return;
296 392
297 anfds [fd].reify = 1; 393 anfds [fd].reify = 1;
298 394
299 ++fdchangecnt; 395 ++fdchangecnt;
300 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 396 array_needsize (fdchanges, fdchangemax, fdchangecnt, (void));
301 fdchanges [fdchangecnt - 1] = fd; 397 fdchanges [fdchangecnt - 1] = fd;
302} 398}
303 399
304static void 400static void
305fd_kill (EV_P_ int fd) 401fd_kill (EV_P_ int fd)
… …
311 ev_io_stop (EV_A_ w); 407 ev_io_stop (EV_A_ w);
312 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
313 } 409 }
314} 410}
315 411
412static int
413fd_valid (int fd)
414{
415#ifdef WIN32
416 return !!win32_get_osfhandle (fd);
417#else
418 return fcntl (fd, F_GETFD) != -1;
419#endif
420}
421
316/* called on EBADF to verify fds */ 422/* called on EBADF to verify fds */
317static void 423static void
318fd_ebadf (EV_P) 424fd_ebadf (EV_P)
319{ 425{
320 int fd; 426 int fd;
321 427
322 for (fd = 0; fd < anfdmax; ++fd) 428 for (fd = 0; fd < anfdmax; ++fd)
323 if (anfds [fd].events) 429 if (anfds [fd].events)
324 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 430 if (!fd_valid (fd) == -1 && errno == EBADF)
325 fd_kill (EV_A_ fd); 431 fd_kill (EV_A_ fd);
326} 432}
327 433
328/* called on ENOMEM in select/poll to kill some fds and retry */ 434/* called on ENOMEM in select/poll to kill some fds and retry */
329static void 435static void
330fd_enomem (EV_P) 436fd_enomem (EV_P)
331{ 437{
332 int fd = anfdmax; 438 int fd;
333 439
334 while (fd--) 440 for (fd = anfdmax; fd--; )
335 if (anfds [fd].events) 441 if (anfds [fd].events)
336 { 442 {
337 close (fd);
338 fd_kill (EV_A_ fd); 443 fd_kill (EV_A_ fd);
339 return; 444 return;
340 } 445 }
341} 446}
342 447
343/* susually called after fork if method needs to re-arm all fds from scratch */ 448/* usually called after fork if method needs to re-arm all fds from scratch */
344static void 449static void
345fd_rearm_all (EV_P) 450fd_rearm_all (EV_P)
346{ 451{
347 int fd; 452 int fd;
348 453
349 /* this should be highly optimised to not do anything but set a flag */ 454 /* this should be highly optimised to not do anything but set a flag */
350 for (fd = 0; fd < anfdmax; ++fd) 455 for (fd = 0; fd < anfdmax; ++fd)
351 if (anfds [fd].events) 456 if (anfds [fd].events)
352 { 457 {
353 anfds [fd].events = 0; 458 anfds [fd].events = 0;
354 fd_change (fd); 459 fd_change (EV_A_ fd);
355 } 460 }
356} 461}
357 462
358/*****************************************************************************/ 463/*****************************************************************************/
359 464
… …
363 WT w = heap [k]; 468 WT w = heap [k];
364 469
365 while (k && heap [k >> 1]->at > w->at) 470 while (k && heap [k >> 1]->at > w->at)
366 { 471 {
367 heap [k] = heap [k >> 1]; 472 heap [k] = heap [k >> 1];
368 heap [k]->active = k + 1; 473 ((W)heap [k])->active = k + 1;
369 k >>= 1; 474 k >>= 1;
370 } 475 }
371 476
372 heap [k] = w; 477 heap [k] = w;
373 heap [k]->active = k + 1; 478 ((W)heap [k])->active = k + 1;
374 479
375} 480}
376 481
377static void 482static void
378downheap (WT *heap, int N, int k) 483downheap (WT *heap, int N, int k)
… …
388 493
389 if (w->at <= heap [j]->at) 494 if (w->at <= heap [j]->at)
390 break; 495 break;
391 496
392 heap [k] = heap [j]; 497 heap [k] = heap [j];
393 heap [k]->active = k + 1; 498 ((W)heap [k])->active = k + 1;
394 k = j; 499 k = j;
395 } 500 }
396 501
397 heap [k] = w; 502 heap [k] = w;
398 heap [k]->active = k + 1; 503 ((W)heap [k])->active = k + 1;
399} 504}
400 505
401/*****************************************************************************/ 506/*****************************************************************************/
402 507
403typedef struct 508typedef struct
404{ 509{
405 struct ev_watcher_list *head; 510 WL head;
406 sig_atomic_t volatile gotsig; 511 sig_atomic_t volatile gotsig;
407} ANSIG; 512} ANSIG;
408 513
409static ANSIG *signals; 514static ANSIG *signals;
410static int signalmax; 515static int signalmax;
411 516
412static int sigpipe [2]; 517static int sigpipe [2];
413static sig_atomic_t volatile gotsig; 518static sig_atomic_t volatile gotsig;
519static struct ev_io sigev;
414 520
415static void 521static void
416signals_init (ANSIG *base, int count) 522signals_init (ANSIG *base, int count)
417{ 523{
418 while (count--) 524 while (count--)
… …
425} 531}
426 532
427static void 533static void
428sighandler (int signum) 534sighandler (int signum)
429{ 535{
536#if WIN32
537 signal (signum, sighandler);
538#endif
539
430 signals [signum - 1].gotsig = 1; 540 signals [signum - 1].gotsig = 1;
431 541
432 if (!gotsig) 542 if (!gotsig)
433 { 543 {
434 int old_errno = errno; 544 int old_errno = errno;
… …
439} 549}
440 550
441static void 551static void
442sigcb (EV_P_ struct ev_io *iow, int revents) 552sigcb (EV_P_ struct ev_io *iow, int revents)
443{ 553{
444 struct ev_watcher_list *w; 554 WL w;
445 int signum; 555 int signum;
446 556
447 read (sigpipe [0], &revents, 1); 557 read (sigpipe [0], &revents, 1);
448 gotsig = 0; 558 gotsig = 0;
449 559
… …
474 ev_unref (EV_A); /* child watcher should not keep loop alive */ 584 ev_unref (EV_A); /* child watcher should not keep loop alive */
475} 585}
476 586
477/*****************************************************************************/ 587/*****************************************************************************/
478 588
589static struct ev_child *childs [PID_HASHSIZE];
590
479#ifndef WIN32 591#ifndef WIN32
592
593static struct ev_signal childev;
480 594
481#ifndef WCONTINUED 595#ifndef WCONTINUED
482# define WCONTINUED 0 596# define WCONTINUED 0
483#endif 597#endif
484 598
… …
488 struct ev_child *w; 602 struct ev_child *w;
489 603
490 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 604 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
491 if (w->pid == pid || !w->pid) 605 if (w->pid == pid || !w->pid)
492 { 606 {
493 w->priority = sw->priority; /* need to do it *now* */ 607 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
494 w->rpid = pid; 608 w->rpid = pid;
495 w->rstatus = status; 609 w->rstatus = status;
496 event (EV_A_ (W)w, EV_CHILD); 610 event (EV_A_ (W)w, EV_CHILD);
497 } 611 }
498} 612}
499 613
500static void 614static void
… …
520# include "ev_kqueue.c" 634# include "ev_kqueue.c"
521#endif 635#endif
522#if EV_USE_EPOLL 636#if EV_USE_EPOLL
523# include "ev_epoll.c" 637# include "ev_epoll.c"
524#endif 638#endif
525#if EV_USEV_POLL 639#if EV_USE_POLL
526# include "ev_poll.c" 640# include "ev_poll.c"
527#endif 641#endif
528#if EV_USE_SELECT 642#if EV_USE_SELECT
529# include "ev_select.c" 643# include "ev_select.c"
530#endif 644#endif
… …
582 methods = atoi (getenv ("LIBEV_METHODS")); 696 methods = atoi (getenv ("LIBEV_METHODS"));
583 else 697 else
584 methods = EVMETHOD_ANY; 698 methods = EVMETHOD_ANY;
585 699
586 method = 0; 700 method = 0;
701#if EV_USE_WIN32
702 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
703#endif
587#if EV_USE_KQUEUE 704#if EV_USE_KQUEUE
588 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 705 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
589#endif 706#endif
590#if EV_USE_EPOLL 707#if EV_USE_EPOLL
591 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 708 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
592#endif 709#endif
593#if EV_USEV_POLL 710#if EV_USE_POLL
594 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 711 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
595#endif 712#endif
596#if EV_USE_SELECT 713#if EV_USE_SELECT
597 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 714 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
598#endif 715#endif
716
717 ev_watcher_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI);
599 } 719 }
600} 720}
601 721
602void 722void
603loop_destroy (EV_P) 723loop_destroy (EV_P)
604{ 724{
725 int i;
726
727#if EV_USE_WIN32
728 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
729#endif
605#if EV_USE_KQUEUE 730#if EV_USE_KQUEUE
606 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 731 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
607#endif 732#endif
608#if EV_USE_EPOLL 733#if EV_USE_EPOLL
609 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 734 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
610#endif 735#endif
611#if EV_USEV_POLL 736#if EV_USE_POLL
612 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 737 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
613#endif 738#endif
614#if EV_USE_SELECT 739#if EV_USE_SELECT
615 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 740 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
616#endif 741#endif
617 742
743 for (i = NUMPRI; i--; )
744 array_free (pending, [i]);
745
746 /* have to use the microsoft-never-gets-it-right macro */
747 array_free_microshit (fdchange);
748 array_free_microshit (timer);
749 array_free_microshit (periodic);
750 array_free_microshit (idle);
751 array_free_microshit (prepare);
752 array_free_microshit (check);
753
618 method = 0; 754 method = 0;
619 /*TODO*/
620} 755}
621 756
622void 757static void
623loop_fork (EV_P) 758loop_fork (EV_P)
624{ 759{
625 /*TODO*/
626#if EV_USE_EPOLL 760#if EV_USE_EPOLL
627 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 761 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
628#endif 762#endif
629#if EV_USE_KQUEUE 763#if EV_USE_KQUEUE
630 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 764 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
631#endif 765#endif
766
767 if (ev_is_active (&sigev))
768 {
769 /* default loop */
770
771 ev_ref (EV_A);
772 ev_io_stop (EV_A_ &sigev);
773 close (sigpipe [0]);
774 close (sigpipe [1]);
775
776 while (pipe (sigpipe))
777 syserr ("(libev) error creating pipe");
778
779 siginit (EV_A);
780 }
781
782 postfork = 0;
632} 783}
633 784
634#if EV_MULTIPLICITY 785#if EV_MULTIPLICITY
635struct ev_loop * 786struct ev_loop *
636ev_loop_new (int methods) 787ev_loop_new (int methods)
637{ 788{
638 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 789 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
790
791 memset (loop, 0, sizeof (struct ev_loop));
639 792
640 loop_init (EV_A_ methods); 793 loop_init (EV_A_ methods);
641 794
642 if (ev_methods (EV_A)) 795 if (ev_method (EV_A))
643 return loop; 796 return loop;
644 797
645 return 0; 798 return 0;
646} 799}
647 800
648void 801void
649ev_loop_destroy (EV_P) 802ev_loop_destroy (EV_P)
650{ 803{
651 loop_destroy (EV_A); 804 loop_destroy (EV_A);
652 free (loop); 805 ev_free (loop);
653} 806}
654 807
655void 808void
656ev_loop_fork (EV_P) 809ev_loop_fork (EV_P)
657{ 810{
658 loop_fork (EV_A); 811 postfork = 1;
659} 812}
660 813
661#endif 814#endif
662 815
663#if EV_MULTIPLICITY 816#if EV_MULTIPLICITY
… …
686 839
687 loop_init (EV_A_ methods); 840 loop_init (EV_A_ methods);
688 841
689 if (ev_method (EV_A)) 842 if (ev_method (EV_A))
690 { 843 {
691 ev_watcher_init (&sigev, sigcb);
692 ev_set_priority (&sigev, EV_MAXPRI);
693 siginit (EV_A); 844 siginit (EV_A);
694 845
695#ifndef WIN32 846#ifndef WIN32
696 ev_signal_init (&childev, childcb, SIGCHLD); 847 ev_signal_init (&childev, childcb, SIGCHLD);
697 ev_set_priority (&childev, EV_MAXPRI); 848 ev_set_priority (&childev, EV_MAXPRI);
… …
707} 858}
708 859
709void 860void
710ev_default_destroy (void) 861ev_default_destroy (void)
711{ 862{
863#if EV_MULTIPLICITY
712 struct ev_loop *loop = default_loop; 864 struct ev_loop *loop = default_loop;
865#endif
713 866
867#ifndef WIN32
714 ev_ref (EV_A); /* child watcher */ 868 ev_ref (EV_A); /* child watcher */
715 ev_signal_stop (EV_A_ &childev); 869 ev_signal_stop (EV_A_ &childev);
870#endif
716 871
717 ev_ref (EV_A); /* signal watcher */ 872 ev_ref (EV_A); /* signal watcher */
718 ev_io_stop (EV_A_ &sigev); 873 ev_io_stop (EV_A_ &sigev);
719 874
720 close (sigpipe [0]); sigpipe [0] = 0; 875 close (sigpipe [0]); sigpipe [0] = 0;
… …
722 877
723 loop_destroy (EV_A); 878 loop_destroy (EV_A);
724} 879}
725 880
726void 881void
727ev_default_fork (EV_P) 882ev_default_fork (void)
728{ 883{
729 loop_fork (EV_A); 884#if EV_MULTIPLICITY
885 struct ev_loop *loop = default_loop;
886#endif
730 887
731 ev_io_stop (EV_A_ &sigev); 888 if (method)
732 close (sigpipe [0]); 889 postfork = 1;
733 close (sigpipe [1]);
734 pipe (sigpipe);
735
736 ev_ref (EV_A); /* signal watcher */
737 siginit (EV_A);
738} 890}
739 891
740/*****************************************************************************/ 892/*****************************************************************************/
741 893
742static void 894static void
… …
758} 910}
759 911
760static void 912static void
761timers_reify (EV_P) 913timers_reify (EV_P)
762{ 914{
763 while (timercnt && timers [0]->at <= mn_now) 915 while (timercnt && ((WT)timers [0])->at <= mn_now)
764 { 916 {
765 struct ev_timer *w = timers [0]; 917 struct ev_timer *w = timers [0];
918
919 assert (("inactive timer on timer heap detected", ev_is_active (w)));
766 920
767 /* first reschedule or stop timer */ 921 /* first reschedule or stop timer */
768 if (w->repeat) 922 if (w->repeat)
769 { 923 {
770 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 924 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
771 w->at = mn_now + w->repeat; 925 ((WT)w)->at = mn_now + w->repeat;
772 downheap ((WT *)timers, timercnt, 0); 926 downheap ((WT *)timers, timercnt, 0);
773 } 927 }
774 else 928 else
775 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 929 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
776 930
… …
779} 933}
780 934
781static void 935static void
782periodics_reify (EV_P) 936periodics_reify (EV_P)
783{ 937{
784 while (periodiccnt && periodics [0]->at <= rt_now) 938 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
785 { 939 {
786 struct ev_periodic *w = periodics [0]; 940 struct ev_periodic *w = periodics [0];
941
942 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
787 943
788 /* first reschedule or stop timer */ 944 /* first reschedule or stop timer */
789 if (w->interval) 945 if (w->interval)
790 { 946 {
791 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 947 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
792 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 948 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
793 downheap ((WT *)periodics, periodiccnt, 0); 949 downheap ((WT *)periodics, periodiccnt, 0);
794 } 950 }
795 else 951 else
796 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 952 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
797 953
… …
809 { 965 {
810 struct ev_periodic *w = periodics [i]; 966 struct ev_periodic *w = periodics [i];
811 967
812 if (w->interval) 968 if (w->interval)
813 { 969 {
814 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 970 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
815 971
816 if (fabs (diff) >= 1e-4) 972 if (fabs (diff) >= 1e-4)
817 { 973 {
818 ev_periodic_stop (EV_A_ w); 974 ev_periodic_stop (EV_A_ w);
819 ev_periodic_start (EV_A_ w); 975 ev_periodic_start (EV_A_ w);
… …
880 { 1036 {
881 periodics_reschedule (EV_A); 1037 periodics_reschedule (EV_A);
882 1038
883 /* adjust timers. this is easy, as the offset is the same for all */ 1039 /* adjust timers. this is easy, as the offset is the same for all */
884 for (i = 0; i < timercnt; ++i) 1040 for (i = 0; i < timercnt; ++i)
885 timers [i]->at += rt_now - mn_now; 1041 ((WT)timers [i])->at += rt_now - mn_now;
886 } 1042 }
887 1043
888 mn_now = rt_now; 1044 mn_now = rt_now;
889 } 1045 }
890} 1046}
… …
916 { 1072 {
917 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
918 call_pending (EV_A); 1074 call_pending (EV_A);
919 } 1075 }
920 1076
1077 /* we might have forked, so reify kernel state if necessary */
1078 if (expect_false (postfork))
1079 loop_fork (EV_A);
1080
921 /* update fd-related kernel structures */ 1081 /* update fd-related kernel structures */
922 fd_reify (EV_A); 1082 fd_reify (EV_A);
923 1083
924 /* calculate blocking time */ 1084 /* calculate blocking time */
925 1085
… …
941 { 1101 {
942 block = MAX_BLOCKTIME; 1102 block = MAX_BLOCKTIME;
943 1103
944 if (timercnt) 1104 if (timercnt)
945 { 1105 {
946 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1106 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
947 if (block > to) block = to; 1107 if (block > to) block = to;
948 } 1108 }
949 1109
950 if (periodiccnt) 1110 if (periodiccnt)
951 { 1111 {
952 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1112 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
953 if (block > to) block = to; 1113 if (block > to) block = to;
954 } 1114 }
955 1115
956 if (block < 0.) block = 0.; 1116 if (block < 0.) block = 0.;
957 } 1117 }
… …
1074ev_timer_start (EV_P_ struct ev_timer *w) 1234ev_timer_start (EV_P_ struct ev_timer *w)
1075{ 1235{
1076 if (ev_is_active (w)) 1236 if (ev_is_active (w))
1077 return; 1237 return;
1078 1238
1079 w->at += mn_now; 1239 ((WT)w)->at += mn_now;
1080 1240
1081 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1241 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1082 1242
1083 ev_start (EV_A_ (W)w, ++timercnt); 1243 ev_start (EV_A_ (W)w, ++timercnt);
1084 array_needsize (timers, timermax, timercnt, ); 1244 array_needsize (timers, timermax, timercnt, (void));
1085 timers [timercnt - 1] = w; 1245 timers [timercnt - 1] = w;
1086 upheap ((WT *)timers, timercnt - 1); 1246 upheap ((WT *)timers, timercnt - 1);
1247
1248 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1087} 1249}
1088 1250
1089void 1251void
1090ev_timer_stop (EV_P_ struct ev_timer *w) 1252ev_timer_stop (EV_P_ struct ev_timer *w)
1091{ 1253{
1092 ev_clear_pending (EV_A_ (W)w); 1254 ev_clear_pending (EV_A_ (W)w);
1093 if (!ev_is_active (w)) 1255 if (!ev_is_active (w))
1094 return; 1256 return;
1095 1257
1258 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1259
1096 if (w->active < timercnt--) 1260 if (((W)w)->active < timercnt--)
1097 { 1261 {
1098 timers [w->active - 1] = timers [timercnt]; 1262 timers [((W)w)->active - 1] = timers [timercnt];
1099 downheap ((WT *)timers, timercnt, w->active - 1); 1263 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1100 } 1264 }
1101 1265
1102 w->at = w->repeat; 1266 ((WT)w)->at = w->repeat;
1103 1267
1104 ev_stop (EV_A_ (W)w); 1268 ev_stop (EV_A_ (W)w);
1105} 1269}
1106 1270
1107void 1271void
… …
1109{ 1273{
1110 if (ev_is_active (w)) 1274 if (ev_is_active (w))
1111 { 1275 {
1112 if (w->repeat) 1276 if (w->repeat)
1113 { 1277 {
1114 w->at = mn_now + w->repeat; 1278 ((WT)w)->at = mn_now + w->repeat;
1115 downheap ((WT *)timers, timercnt, w->active - 1); 1279 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1116 } 1280 }
1117 else 1281 else
1118 ev_timer_stop (EV_A_ w); 1282 ev_timer_stop (EV_A_ w);
1119 } 1283 }
1120 else if (w->repeat) 1284 else if (w->repeat)
… …
1129 1293
1130 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1294 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1131 1295
1132 /* this formula differs from the one in periodic_reify because we do not always round up */ 1296 /* this formula differs from the one in periodic_reify because we do not always round up */
1133 if (w->interval) 1297 if (w->interval)
1134 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1298 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1135 1299
1136 ev_start (EV_A_ (W)w, ++periodiccnt); 1300 ev_start (EV_A_ (W)w, ++periodiccnt);
1137 array_needsize (periodics, periodicmax, periodiccnt, ); 1301 array_needsize (periodics, periodicmax, periodiccnt, (void));
1138 periodics [periodiccnt - 1] = w; 1302 periodics [periodiccnt - 1] = w;
1139 upheap ((WT *)periodics, periodiccnt - 1); 1303 upheap ((WT *)periodics, periodiccnt - 1);
1304
1305 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1140} 1306}
1141 1307
1142void 1308void
1143ev_periodic_stop (EV_P_ struct ev_periodic *w) 1309ev_periodic_stop (EV_P_ struct ev_periodic *w)
1144{ 1310{
1145 ev_clear_pending (EV_A_ (W)w); 1311 ev_clear_pending (EV_A_ (W)w);
1146 if (!ev_is_active (w)) 1312 if (!ev_is_active (w))
1147 return; 1313 return;
1148 1314
1315 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1316
1149 if (w->active < periodiccnt--) 1317 if (((W)w)->active < periodiccnt--)
1150 { 1318 {
1151 periodics [w->active - 1] = periodics [periodiccnt]; 1319 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1152 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1320 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1153 } 1321 }
1154 1322
1155 ev_stop (EV_A_ (W)w); 1323 ev_stop (EV_A_ (W)w);
1156} 1324}
1157 1325
… …
1160{ 1328{
1161 if (ev_is_active (w)) 1329 if (ev_is_active (w))
1162 return; 1330 return;
1163 1331
1164 ev_start (EV_A_ (W)w, ++idlecnt); 1332 ev_start (EV_A_ (W)w, ++idlecnt);
1165 array_needsize (idles, idlemax, idlecnt, ); 1333 array_needsize (idles, idlemax, idlecnt, (void));
1166 idles [idlecnt - 1] = w; 1334 idles [idlecnt - 1] = w;
1167} 1335}
1168 1336
1169void 1337void
1170ev_idle_stop (EV_P_ struct ev_idle *w) 1338ev_idle_stop (EV_P_ struct ev_idle *w)
1171{ 1339{
1172 ev_clear_pending (EV_A_ (W)w); 1340 ev_clear_pending (EV_A_ (W)w);
1173 if (ev_is_active (w)) 1341 if (ev_is_active (w))
1174 return; 1342 return;
1175 1343
1176 idles [w->active - 1] = idles [--idlecnt]; 1344 idles [((W)w)->active - 1] = idles [--idlecnt];
1177 ev_stop (EV_A_ (W)w); 1345 ev_stop (EV_A_ (W)w);
1178} 1346}
1179 1347
1180void 1348void
1181ev_prepare_start (EV_P_ struct ev_prepare *w) 1349ev_prepare_start (EV_P_ struct ev_prepare *w)
1182{ 1350{
1183 if (ev_is_active (w)) 1351 if (ev_is_active (w))
1184 return; 1352 return;
1185 1353
1186 ev_start (EV_A_ (W)w, ++preparecnt); 1354 ev_start (EV_A_ (W)w, ++preparecnt);
1187 array_needsize (prepares, preparemax, preparecnt, ); 1355 array_needsize (prepares, preparemax, preparecnt, (void));
1188 prepares [preparecnt - 1] = w; 1356 prepares [preparecnt - 1] = w;
1189} 1357}
1190 1358
1191void 1359void
1192ev_prepare_stop (EV_P_ struct ev_prepare *w) 1360ev_prepare_stop (EV_P_ struct ev_prepare *w)
1193{ 1361{
1194 ev_clear_pending (EV_A_ (W)w); 1362 ev_clear_pending (EV_A_ (W)w);
1195 if (ev_is_active (w)) 1363 if (ev_is_active (w))
1196 return; 1364 return;
1197 1365
1198 prepares [w->active - 1] = prepares [--preparecnt]; 1366 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1199 ev_stop (EV_A_ (W)w); 1367 ev_stop (EV_A_ (W)w);
1200} 1368}
1201 1369
1202void 1370void
1203ev_check_start (EV_P_ struct ev_check *w) 1371ev_check_start (EV_P_ struct ev_check *w)
1204{ 1372{
1205 if (ev_is_active (w)) 1373 if (ev_is_active (w))
1206 return; 1374 return;
1207 1375
1208 ev_start (EV_A_ (W)w, ++checkcnt); 1376 ev_start (EV_A_ (W)w, ++checkcnt);
1209 array_needsize (checks, checkmax, checkcnt, ); 1377 array_needsize (checks, checkmax, checkcnt, (void));
1210 checks [checkcnt - 1] = w; 1378 checks [checkcnt - 1] = w;
1211} 1379}
1212 1380
1213void 1381void
1214ev_check_stop (EV_P_ struct ev_check *w) 1382ev_check_stop (EV_P_ struct ev_check *w)
1215{ 1383{
1216 ev_clear_pending (EV_A_ (W)w); 1384 ev_clear_pending (EV_A_ (W)w);
1217 if (ev_is_active (w)) 1385 if (ev_is_active (w))
1218 return; 1386 return;
1219 1387
1220 checks [w->active - 1] = checks [--checkcnt]; 1388 checks [((W)w)->active - 1] = checks [--checkcnt];
1221 ev_stop (EV_A_ (W)w); 1389 ev_stop (EV_A_ (W)w);
1222} 1390}
1223 1391
1224#ifndef SA_RESTART 1392#ifndef SA_RESTART
1225# define SA_RESTART 0 1393# define SA_RESTART 0
… …
1238 1406
1239 ev_start (EV_A_ (W)w, 1); 1407 ev_start (EV_A_ (W)w, 1);
1240 array_needsize (signals, signalmax, w->signum, signals_init); 1408 array_needsize (signals, signalmax, w->signum, signals_init);
1241 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1409 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1242 1410
1243 if (!w->next) 1411 if (!((WL)w)->next)
1244 { 1412 {
1413#if WIN32
1414 signal (w->signum, sighandler);
1415#else
1245 struct sigaction sa; 1416 struct sigaction sa;
1246 sa.sa_handler = sighandler; 1417 sa.sa_handler = sighandler;
1247 sigfillset (&sa.sa_mask); 1418 sigfillset (&sa.sa_mask);
1248 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1419 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1249 sigaction (w->signum, &sa, 0); 1420 sigaction (w->signum, &sa, 0);
1421#endif
1250 } 1422 }
1251} 1423}
1252 1424
1253void 1425void
1254ev_signal_stop (EV_P_ struct ev_signal *w) 1426ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1304 void (*cb)(int revents, void *arg) = once->cb; 1476 void (*cb)(int revents, void *arg) = once->cb;
1305 void *arg = once->arg; 1477 void *arg = once->arg;
1306 1478
1307 ev_io_stop (EV_A_ &once->io); 1479 ev_io_stop (EV_A_ &once->io);
1308 ev_timer_stop (EV_A_ &once->to); 1480 ev_timer_stop (EV_A_ &once->to);
1309 free (once); 1481 ev_free (once);
1310 1482
1311 cb (revents, arg); 1483 cb (revents, arg);
1312} 1484}
1313 1485
1314static void 1486static void
… …
1324} 1496}
1325 1497
1326void 1498void
1327ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1499ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1328{ 1500{
1329 struct ev_once *once = malloc (sizeof (struct ev_once)); 1501 struct ev_once *once = ev_malloc (sizeof (struct ev_once));
1330 1502
1331 if (!once) 1503 if (!once)
1332 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1504 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1333 else 1505 else
1334 { 1506 {

Diff Legend

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