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

Comparing libev/ev.c (file contents):
Revision 1.69 by root, Tue Nov 6 00:10:04 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
… …
94# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
95#endif 96#endif
96 97
97#ifndef EV_USE_WIN32 98#ifndef EV_USE_WIN32
98# ifdef WIN32 99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
99# define EV_USE_WIN32 1 102# define EV_USE_SELECT 1
100# else 103# else
101# define EV_USE_WIN32 0 104# define EV_USE_WIN32 0
102# endif 105# endif
103#endif 106#endif
104 107
… …
145typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
147 150
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 152
150#if WIN32 153#include "ev_win32.c"
151/* note: the comment below could not be substantiated, but what would I care */
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif
155 154
156/*****************************************************************************/ 155/*****************************************************************************/
157 156
158static void (*syserr_cb)(void); 157static void (*syserr_cb)(const char *msg);
159 158
160void ev_set_syserr_cb (void (*cb)(void)) 159void ev_set_syserr_cb (void (*cb)(const char *msg))
161{ 160{
162 syserr_cb = cb; 161 syserr_cb = cb;
163} 162}
164 163
165static void 164static void
166syserr (void) 165syserr (const char *msg)
167{ 166{
167 if (!msg)
168 msg = "(libev) system error";
169
168 if (syserr_cb) 170 if (syserr_cb)
169 syserr_cb (); 171 syserr_cb (msg);
170 else 172 else
171 { 173 {
172 perror ("libev"); 174 perror (msg);
173 abort (); 175 abort ();
174 } 176 }
175} 177}
176 178
177static void *(*alloc)(void *ptr, long size); 179static void *(*alloc)(void *ptr, long size);
… …
266ev_now (EV_P) 268ev_now (EV_P)
267{ 269{
268 return rt_now; 270 return rt_now;
269} 271}
270 272
271#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
272 274
273#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
274 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
275 { \ 277 { \
276 int newcnt = cur; \ 278 int newcnt = cur; \
277 do \ 279 do \
278 { \ 280 { \
279 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
280 } \ 282 } \
281 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
282 \ 284 \
283 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
284 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
285 cur = newcnt; \ 287 cur = newcnt; \
286 } 288 }
287 289
288#define array_slim(stem) \ 290#define array_slim(type,stem) \
289 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
290 { \ 292 { \
291 stem ## max = array_roundsize (stem ## cnt >> 1); \ 293 stem ## max = array_roundsize (stem ## cnt >> 1); \
292 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
293 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
294 } 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;
295 302
296#define array_free(stem, idx) \ 303#define array_free(stem, idx) \
297 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
298 305
299/*****************************************************************************/ 306/*****************************************************************************/
… …
309 316
310 ++base; 317 ++base;
311 } 318 }
312} 319}
313 320
314static void 321void
315event (EV_P_ W w, int events) 322ev_feed_event (EV_P_ void *w, int revents)
316{ 323{
324 W w_ = (W)w;
325
317 if (w->pending) 326 if (w_->pending)
318 { 327 {
319 pendings [ABSPRI (w)][w->pending - 1].events |= events; 328 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
320 return; 329 return;
321 } 330 }
322 331
323 w->pending = ++pendingcnt [ABSPRI (w)]; 332 w_->pending = ++pendingcnt [ABSPRI (w_)];
324 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));
325 pendings [ABSPRI (w)][w->pending - 1].w = w; 334 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
326 pendings [ABSPRI (w)][w->pending - 1].events = events; 335 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
327} 336}
328 337
329static void 338static void
330queue_events (EV_P_ W *events, int eventcnt, int type) 339queue_events (EV_P_ W *events, int eventcnt, int type)
331{ 340{
332 int i; 341 int i;
333 342
334 for (i = 0; i < eventcnt; ++i) 343 for (i = 0; i < eventcnt; ++i)
335 event (EV_A_ events [i], type); 344 ev_feed_event (EV_A_ events [i], type);
336} 345}
337 346
338static void 347static void
339fd_event (EV_P_ int fd, int events) 348fd_event (EV_P_ int fd, int events)
340{ 349{
… …
344 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)
345 { 354 {
346 int ev = w->events & events; 355 int ev = w->events & events;
347 356
348 if (ev) 357 if (ev)
349 event (EV_A_ (W)w, ev); 358 ev_feed_event (EV_A_ (W)w, ev);
350 } 359 }
351} 360}
352 361
353/*****************************************************************************/ 362/*****************************************************************************/
354 363
… …
378} 387}
379 388
380static void 389static void
381fd_change (EV_P_ int fd) 390fd_change (EV_P_ int fd)
382{ 391{
383 if (anfds [fd].reify || fdchangecnt < 0) 392 if (anfds [fd].reify)
384 return; 393 return;
385 394
386 anfds [fd].reify = 1; 395 anfds [fd].reify = 1;
387 396
388 ++fdchangecnt; 397 ++fdchangecnt;
389 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 398 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
390 fdchanges [fdchangecnt - 1] = fd; 399 fdchanges [fdchangecnt - 1] = fd;
391} 400}
392 401
393static void 402static void
394fd_kill (EV_P_ int fd) 403fd_kill (EV_P_ int fd)
… …
396 struct ev_io *w; 405 struct ev_io *w;
397 406
398 while ((w = (struct ev_io *)anfds [fd].head)) 407 while ((w = (struct ev_io *)anfds [fd].head))
399 { 408 {
400 ev_io_stop (EV_A_ w); 409 ev_io_stop (EV_A_ w);
401 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);
402 } 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
403} 422}
404 423
405/* called on EBADF to verify fds */ 424/* called on EBADF to verify fds */
406static void 425static void
407fd_ebadf (EV_P) 426fd_ebadf (EV_P)
408{ 427{
409 int fd; 428 int fd;
410 429
411 for (fd = 0; fd < anfdmax; ++fd) 430 for (fd = 0; fd < anfdmax; ++fd)
412 if (anfds [fd].events) 431 if (anfds [fd].events)
413 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 432 if (!fd_valid (fd) == -1 && errno == EBADF)
414 fd_kill (EV_A_ fd); 433 fd_kill (EV_A_ fd);
415} 434}
416 435
417/* 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 */
418static void 437static void
… …
426 fd_kill (EV_A_ fd); 445 fd_kill (EV_A_ fd);
427 return; 446 return;
428 } 447 }
429} 448}
430 449
431/* 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 */
432static void 451static void
433fd_rearm_all (EV_P) 452fd_rearm_all (EV_P)
434{ 453{
435 int fd; 454 int fd;
436 455
… …
524 543
525 if (!gotsig) 544 if (!gotsig)
526 { 545 {
527 int old_errno = errno; 546 int old_errno = errno;
528 gotsig = 1; 547 gotsig = 1;
548#ifdef WIN32
549 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
550#else
529 write (sigpipe [1], &signum, 1); 551 write (sigpipe [1], &signum, 1);
552#endif
530 errno = old_errno; 553 errno = old_errno;
531 } 554 }
532} 555}
533 556
534static void 557static void
535sigcb (EV_P_ struct ev_io *iow, int revents) 558sigcb (EV_P_ struct ev_io *iow, int revents)
536{ 559{
537 WL w; 560 WL w;
538 int signum; 561 int signum;
539 562
563#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else
540 read (sigpipe [0], &revents, 1); 566 read (sigpipe [0], &revents, 1);
567#endif
541 gotsig = 0; 568 gotsig = 0;
542 569
543 for (signum = signalmax; signum--; ) 570 for (signum = signalmax; signum--; )
544 if (signals [signum].gotsig) 571 if (signals [signum].gotsig)
545 { 572 {
546 signals [signum].gotsig = 0; 573 signals [signum].gotsig = 0;
547 574
548 for (w = signals [signum].head; w; w = w->next) 575 for (w = signals [signum].head; w; w = w->next)
549 event (EV_A_ (W)w, EV_SIGNAL); 576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
550 } 577 }
551} 578}
552 579
553static void 580static void
554siginit (EV_P) 581siginit (EV_P)
… …
567 ev_unref (EV_A); /* child watcher should not keep loop alive */ 594 ev_unref (EV_A); /* child watcher should not keep loop alive */
568} 595}
569 596
570/*****************************************************************************/ 597/*****************************************************************************/
571 598
599static struct ev_child *childs [PID_HASHSIZE];
600
572#ifndef WIN32 601#ifndef WIN32
573 602
574static struct ev_child *childs [PID_HASHSIZE];
575static struct ev_signal childev; 603static struct ev_signal childev;
576 604
577#ifndef WCONTINUED 605#ifndef WCONTINUED
578# define WCONTINUED 0 606# define WCONTINUED 0
579#endif 607#endif
… …
587 if (w->pid == pid || !w->pid) 615 if (w->pid == pid || !w->pid)
588 { 616 {
589 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 617 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
590 w->rpid = pid; 618 w->rpid = pid;
591 w->rstatus = status; 619 w->rstatus = status;
592 event (EV_A_ (W)w, EV_CHILD); 620 ev_feed_event (EV_A_ (W)w, EV_CHILD);
593 } 621 }
594} 622}
595 623
596static void 624static void
597childcb (EV_P_ struct ev_signal *sw, int revents) 625childcb (EV_P_ struct ev_signal *sw, int revents)
… …
599 int pid, status; 627 int pid, status;
600 628
601 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 629 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
602 { 630 {
603 /* 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 */
604 event (EV_A_ (W)sw, EV_SIGNAL); 632 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
605 633
606 child_reap (EV_A_ sw, pid, pid, status); 634 child_reap (EV_A_ sw, pid, pid, status);
607 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 */
608 } 636 }
609} 637}
… …
693 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 721 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
694#endif 722#endif
695#if EV_USE_SELECT 723#if EV_USE_SELECT
696 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
697#endif 725#endif
726
727 ev_watcher_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI);
698 } 729 }
699} 730}
700 731
701void 732void
702loop_destroy (EV_P) 733loop_destroy (EV_P)
… …
720#endif 751#endif
721 752
722 for (i = NUMPRI; i--; ) 753 for (i = NUMPRI; i--; )
723 array_free (pending, [i]); 754 array_free (pending, [i]);
724 755
756 /* have to use the microsoft-never-gets-it-right macro */
725 array_free (fdchange, ); 757 array_free_microshit (fdchange);
726 array_free (timer, ); 758 array_free_microshit (timer);
727 array_free (periodic, ); 759 array_free_microshit (periodic);
728 array_free (idle, ); 760 array_free_microshit (idle);
729 array_free (prepare, ); 761 array_free_microshit (prepare);
730 array_free (check, ); 762 array_free_microshit (check);
731 763
732 method = 0; 764 method = 0;
733 /*TODO*/
734} 765}
735 766
736void 767static void
737loop_fork (EV_P) 768loop_fork (EV_P)
738{ 769{
739 /*TODO*/
740#if EV_USE_EPOLL 770#if EV_USE_EPOLL
741 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 771 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
742#endif 772#endif
743#if EV_USE_KQUEUE 773#if EV_USE_KQUEUE
744 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 774 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
745#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;
746} 793}
747 794
748#if EV_MULTIPLICITY 795#if EV_MULTIPLICITY
749struct ev_loop * 796struct ev_loop *
750ev_loop_new (int methods) 797ev_loop_new (int methods)
… …
769} 816}
770 817
771void 818void
772ev_loop_fork (EV_P) 819ev_loop_fork (EV_P)
773{ 820{
774 loop_fork (EV_A); 821 postfork = 1;
775} 822}
776 823
777#endif 824#endif
778 825
779#if EV_MULTIPLICITY 826#if EV_MULTIPLICITY
… …
802 849
803 loop_init (EV_A_ methods); 850 loop_init (EV_A_ methods);
804 851
805 if (ev_method (EV_A)) 852 if (ev_method (EV_A))
806 { 853 {
807 ev_watcher_init (&sigev, sigcb);
808 ev_set_priority (&sigev, EV_MAXPRI);
809 siginit (EV_A); 854 siginit (EV_A);
810 855
811#ifndef WIN32 856#ifndef WIN32
812 ev_signal_init (&childev, childcb, SIGCHLD); 857 ev_signal_init (&childev, childcb, SIGCHLD);
813 ev_set_priority (&childev, EV_MAXPRI); 858 ev_set_priority (&childev, EV_MAXPRI);
… …
827{ 872{
828#if EV_MULTIPLICITY 873#if EV_MULTIPLICITY
829 struct ev_loop *loop = default_loop; 874 struct ev_loop *loop = default_loop;
830#endif 875#endif
831 876
877#ifndef WIN32
832 ev_ref (EV_A); /* child watcher */ 878 ev_ref (EV_A); /* child watcher */
833 ev_signal_stop (EV_A_ &childev); 879 ev_signal_stop (EV_A_ &childev);
880#endif
834 881
835 ev_ref (EV_A); /* signal watcher */ 882 ev_ref (EV_A); /* signal watcher */
836 ev_io_stop (EV_A_ &sigev); 883 ev_io_stop (EV_A_ &sigev);
837 884
838 close (sigpipe [0]); sigpipe [0] = 0; 885 close (sigpipe [0]); sigpipe [0] = 0;
… …
846{ 893{
847#if EV_MULTIPLICITY 894#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop; 895 struct ev_loop *loop = default_loop;
849#endif 896#endif
850 897
851 loop_fork (EV_A); 898 if (method)
852 899 postfork = 1;
853 ev_io_stop (EV_A_ &sigev);
854 close (sigpipe [0]);
855 close (sigpipe [1]);
856 pipe (sigpipe);
857
858 ev_ref (EV_A); /* signal watcher */
859 siginit (EV_A);
860} 900}
861 901
862/*****************************************************************************/ 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}
863 915
864static void 916static void
865call_pending (EV_P) 917call_pending (EV_P)
866{ 918{
867 int pri; 919 int pri;
… …
896 downheap ((WT *)timers, timercnt, 0); 948 downheap ((WT *)timers, timercnt, 0);
897 } 949 }
898 else 950 else
899 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
900 952
901 event (EV_A_ (W)w, EV_TIMEOUT); 953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
902 } 954 }
903} 955}
904 956
905static void 957static void
906periodics_reify (EV_P) 958periodics_reify (EV_P)
… …
910 struct ev_periodic *w = periodics [0]; 962 struct ev_periodic *w = periodics [0];
911 963
912 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 964 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
913 965
914 /* first reschedule or stop timer */ 966 /* first reschedule or stop timer */
967 if (w->reschedule_cb)
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 }
915 if (w->interval) 974 else if (w->interval)
916 { 975 {
917 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 976 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
918 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 977 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
919 downheap ((WT *)periodics, periodiccnt, 0); 978 downheap ((WT *)periodics, periodiccnt, 0);
920 } 979 }
921 else 980 else
922 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
923 982
924 event (EV_A_ (W)w, EV_PERIODIC); 983 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
925 } 984 }
926} 985}
927 986
928static void 987static void
929periodics_reschedule (EV_P) 988periodics_reschedule (EV_P)
… …
933 /* adjust periodics after time jump */ 992 /* adjust periodics after time jump */
934 for (i = 0; i < periodiccnt; ++i) 993 for (i = 0; i < periodiccnt; ++i)
935 { 994 {
936 struct ev_periodic *w = periodics [i]; 995 struct ev_periodic *w = periodics [i];
937 996
997 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now);
938 if (w->interval) 999 else if (w->interval)
939 {
940 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1000 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
941
942 if (fabs (diff) >= 1e-4)
943 {
944 ev_periodic_stop (EV_A_ w);
945 ev_periodic_start (EV_A_ w);
946
947 i = 0; /* restart loop, inefficient, but time jumps should be rare */
948 }
949 }
950 } 1001 }
1002
1003 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i);
951} 1006}
952 1007
953inline int 1008inline int
954time_update_monotonic (EV_P) 1009time_update_monotonic (EV_P)
955{ 1010{
… …
1042 { 1097 {
1043 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1098 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1044 call_pending (EV_A); 1099 call_pending (EV_A);
1045 } 1100 }
1046 1101
1102 /* we might have forked, so reify kernel state if necessary */
1103 if (expect_false (postfork))
1104 loop_fork (EV_A);
1105
1047 /* update fd-related kernel structures */ 1106 /* update fd-related kernel structures */
1048 fd_reify (EV_A); 1107 fd_reify (EV_A);
1049 1108
1050 /* calculate blocking time */ 1109 /* calculate blocking time */
1051 1110
1052 /* 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
1053 always have timers, we just calculate it always */ 1112 always have timers, we just calculate it always */
1054#if EV_USE_MONOTONIC 1113#if EV_USE_MONOTONIC
1055 if (expect_true (have_monotonic)) 1114 if (expect_true (have_monotonic))
1056 time_update_monotonic (EV_A); 1115 time_update_monotonic (EV_A);
1057 else 1116 else
… …
1090 /* queue pending timers and reschedule them */ 1149 /* queue pending timers and reschedule them */
1091 timers_reify (EV_A); /* relative timers called last */ 1150 timers_reify (EV_A); /* relative timers called last */
1092 periodics_reify (EV_A); /* absolute timers called first */ 1151 periodics_reify (EV_A); /* absolute timers called first */
1093 1152
1094 /* queue idle watchers unless io or timers are pending */ 1153 /* queue idle watchers unless io or timers are pending */
1095 if (!pendingcnt) 1154 if (idlecnt && !any_pending (EV_A))
1096 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1097 1156
1098 /* queue check watchers, to be executed first */ 1157 /* queue check watchers, to be executed first */
1099 if (checkcnt) 1158 if (checkcnt)
1100 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1159 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1175 return; 1234 return;
1176 1235
1177 assert (("ev_io_start called with negative fd", fd >= 0)); 1236 assert (("ev_io_start called with negative fd", fd >= 0));
1178 1237
1179 ev_start (EV_A_ (W)w, 1); 1238 ev_start (EV_A_ (W)w, 1);
1180 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1239 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1181 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1240 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1182 1241
1183 fd_change (EV_A_ fd); 1242 fd_change (EV_A_ fd);
1184} 1243}
1185 1244
… …
1205 ((WT)w)->at += mn_now; 1264 ((WT)w)->at += mn_now;
1206 1265
1207 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.));
1208 1267
1209 ev_start (EV_A_ (W)w, ++timercnt); 1268 ev_start (EV_A_ (W)w, ++timercnt);
1210 array_needsize (timers, timermax, timercnt, ); 1269 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1211 timers [timercnt - 1] = w; 1270 timers [timercnt - 1] = w;
1212 upheap ((WT *)timers, timercnt - 1); 1271 upheap ((WT *)timers, timercnt - 1);
1213 1272
1214 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1273 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1215} 1274}
… …
1255ev_periodic_start (EV_P_ struct ev_periodic *w) 1314ev_periodic_start (EV_P_ struct ev_periodic *w)
1256{ 1315{
1257 if (ev_is_active (w)) 1316 if (ev_is_active (w))
1258 return; 1317 return;
1259 1318
1319 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1321 else if (w->interval)
1322 {
1260 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.));
1261
1262 /* 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 */
1263 if (w->interval)
1264 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1325 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1326 }
1265 1327
1266 ev_start (EV_A_ (W)w, ++periodiccnt); 1328 ev_start (EV_A_ (W)w, ++periodiccnt);
1267 array_needsize (periodics, periodicmax, periodiccnt, ); 1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1268 periodics [periodiccnt - 1] = w; 1330 periodics [periodiccnt - 1] = w;
1269 upheap ((WT *)periodics, periodiccnt - 1); 1331 upheap ((WT *)periodics, periodiccnt - 1);
1270 1332
1271 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1333 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1272} 1334}
… …
1288 1350
1289 ev_stop (EV_A_ (W)w); 1351 ev_stop (EV_A_ (W)w);
1290} 1352}
1291 1353
1292void 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
1293ev_idle_start (EV_P_ struct ev_idle *w) 1362ev_idle_start (EV_P_ struct ev_idle *w)
1294{ 1363{
1295 if (ev_is_active (w)) 1364 if (ev_is_active (w))
1296 return; 1365 return;
1297 1366
1298 ev_start (EV_A_ (W)w, ++idlecnt); 1367 ev_start (EV_A_ (W)w, ++idlecnt);
1299 array_needsize (idles, idlemax, idlecnt, ); 1368 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1300 idles [idlecnt - 1] = w; 1369 idles [idlecnt - 1] = w;
1301} 1370}
1302 1371
1303void 1372void
1304ev_idle_stop (EV_P_ struct ev_idle *w) 1373ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1316{ 1385{
1317 if (ev_is_active (w)) 1386 if (ev_is_active (w))
1318 return; 1387 return;
1319 1388
1320 ev_start (EV_A_ (W)w, ++preparecnt); 1389 ev_start (EV_A_ (W)w, ++preparecnt);
1321 array_needsize (prepares, preparemax, preparecnt, ); 1390 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1322 prepares [preparecnt - 1] = w; 1391 prepares [preparecnt - 1] = w;
1323} 1392}
1324 1393
1325void 1394void
1326ev_prepare_stop (EV_P_ struct ev_prepare *w) 1395ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1338{ 1407{
1339 if (ev_is_active (w)) 1408 if (ev_is_active (w))
1340 return; 1409 return;
1341 1410
1342 ev_start (EV_A_ (W)w, ++checkcnt); 1411 ev_start (EV_A_ (W)w, ++checkcnt);
1343 array_needsize (checks, checkmax, checkcnt, ); 1412 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1344 checks [checkcnt - 1] = w; 1413 checks [checkcnt - 1] = w;
1345} 1414}
1346 1415
1347void 1416void
1348ev_check_stop (EV_P_ struct ev_check *w) 1417ev_check_stop (EV_P_ struct ev_check *w)
… …
1369 return; 1438 return;
1370 1439
1371 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));
1372 1441
1373 ev_start (EV_A_ (W)w, 1); 1442 ev_start (EV_A_ (W)w, 1);
1374 array_needsize (signals, signalmax, w->signum, signals_init); 1443 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1375 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1444 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1376 1445
1377 if (!((WL)w)->next) 1446 if (!((WL)w)->next)
1378 { 1447 {
1379#if WIN32 1448#if WIN32
… …
1462} 1531}
1463 1532
1464void 1533void
1465ev_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)
1466{ 1535{
1467 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1536 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1468 1537
1469 if (!once) 1538 if (!once)
1470 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1539 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1471 else 1540 else
1472 { 1541 {

Diff Legend

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