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.79 by root, Fri Nov 9 15:15:20 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 347inline void
339fd_event (EV_P_ int fd, int events) 348fd_event (EV_P_ int fd, int revents)
340{ 349{
341 ANFD *anfd = anfds + fd; 350 ANFD *anfd = anfds + fd;
342 struct ev_io *w; 351 struct ev_io *w;
343 352
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 & revents;
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 }
360}
361
362void
363ev_feed_fd_event (EV_P_ int fd, int revents)
364{
365 fd_event (EV_A_ fd, revents);
351} 366}
352 367
353/*****************************************************************************/ 368/*****************************************************************************/
354 369
355static void 370static void
… …
378} 393}
379 394
380static void 395static void
381fd_change (EV_P_ int fd) 396fd_change (EV_P_ int fd)
382{ 397{
383 if (anfds [fd].reify || fdchangecnt < 0) 398 if (anfds [fd].reify)
384 return; 399 return;
385 400
386 anfds [fd].reify = 1; 401 anfds [fd].reify = 1;
387 402
388 ++fdchangecnt; 403 ++fdchangecnt;
389 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 404 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
390 fdchanges [fdchangecnt - 1] = fd; 405 fdchanges [fdchangecnt - 1] = fd;
391} 406}
392 407
393static void 408static void
394fd_kill (EV_P_ int fd) 409fd_kill (EV_P_ int fd)
… …
396 struct ev_io *w; 411 struct ev_io *w;
397 412
398 while ((w = (struct ev_io *)anfds [fd].head)) 413 while ((w = (struct ev_io *)anfds [fd].head))
399 { 414 {
400 ev_io_stop (EV_A_ w); 415 ev_io_stop (EV_A_ w);
401 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 416 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
402 } 417 }
418}
419
420static int
421fd_valid (int fd)
422{
423#ifdef WIN32
424 return !!win32_get_osfhandle (fd);
425#else
426 return fcntl (fd, F_GETFD) != -1;
427#endif
403} 428}
404 429
405/* called on EBADF to verify fds */ 430/* called on EBADF to verify fds */
406static void 431static void
407fd_ebadf (EV_P) 432fd_ebadf (EV_P)
408{ 433{
409 int fd; 434 int fd;
410 435
411 for (fd = 0; fd < anfdmax; ++fd) 436 for (fd = 0; fd < anfdmax; ++fd)
412 if (anfds [fd].events) 437 if (anfds [fd].events)
413 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 438 if (!fd_valid (fd) == -1 && errno == EBADF)
414 fd_kill (EV_A_ fd); 439 fd_kill (EV_A_ fd);
415} 440}
416 441
417/* called on ENOMEM in select/poll to kill some fds and retry */ 442/* called on ENOMEM in select/poll to kill some fds and retry */
418static void 443static void
… …
426 fd_kill (EV_A_ fd); 451 fd_kill (EV_A_ fd);
427 return; 452 return;
428 } 453 }
429} 454}
430 455
431/* susually called after fork if method needs to re-arm all fds from scratch */ 456/* usually called after fork if method needs to re-arm all fds from scratch */
432static void 457static void
433fd_rearm_all (EV_P) 458fd_rearm_all (EV_P)
434{ 459{
435 int fd; 460 int fd;
436 461
… …
524 549
525 if (!gotsig) 550 if (!gotsig)
526 { 551 {
527 int old_errno = errno; 552 int old_errno = errno;
528 gotsig = 1; 553 gotsig = 1;
554#ifdef WIN32
555 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
556#else
529 write (sigpipe [1], &signum, 1); 557 write (sigpipe [1], &signum, 1);
558#endif
530 errno = old_errno; 559 errno = old_errno;
531 } 560 }
561}
562
563void
564ev_feed_signal_event (EV_P_ int signum)
565{
566#if EV_MULTIPLICITY
567 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
568#endif
569
570 --signum;
571
572 if (signum < 0 || signum >= signalmax)
573 return;
574
575 signals [signum].gotsig = 0;
576
577 for (w = signals [signum].head; w; w = w->next)
578 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
532} 579}
533 580
534static void 581static void
535sigcb (EV_P_ struct ev_io *iow, int revents) 582sigcb (EV_P_ struct ev_io *iow, int revents)
536{ 583{
537 WL w; 584 WL w;
538 int signum; 585 int signum;
539 586
587#ifdef WIN32
588 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
589#else
540 read (sigpipe [0], &revents, 1); 590 read (sigpipe [0], &revents, 1);
591#endif
541 gotsig = 0; 592 gotsig = 0;
542 593
543 for (signum = signalmax; signum--; ) 594 for (signum = signalmax; signum--; )
544 if (signals [signum].gotsig) 595 if (signals [signum].gotsig)
545 { 596 sigevent (EV_A_ signum + 1);
546 signals [signum].gotsig = 0;
547
548 for (w = signals [signum].head; w; w = w->next)
549 event (EV_A_ (W)w, EV_SIGNAL);
550 }
551} 597}
552 598
553static void 599static void
554siginit (EV_P) 600siginit (EV_P)
555{ 601{
… …
567 ev_unref (EV_A); /* child watcher should not keep loop alive */ 613 ev_unref (EV_A); /* child watcher should not keep loop alive */
568} 614}
569 615
570/*****************************************************************************/ 616/*****************************************************************************/
571 617
618static struct ev_child *childs [PID_HASHSIZE];
619
572#ifndef WIN32 620#ifndef WIN32
573 621
574static struct ev_child *childs [PID_HASHSIZE];
575static struct ev_signal childev; 622static struct ev_signal childev;
576 623
577#ifndef WCONTINUED 624#ifndef WCONTINUED
578# define WCONTINUED 0 625# define WCONTINUED 0
579#endif 626#endif
… …
587 if (w->pid == pid || !w->pid) 634 if (w->pid == pid || !w->pid)
588 { 635 {
589 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 636 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
590 w->rpid = pid; 637 w->rpid = pid;
591 w->rstatus = status; 638 w->rstatus = status;
592 event (EV_A_ (W)w, EV_CHILD); 639 ev_feed_event (EV_A_ (W)w, EV_CHILD);
593 } 640 }
594} 641}
595 642
596static void 643static void
597childcb (EV_P_ struct ev_signal *sw, int revents) 644childcb (EV_P_ struct ev_signal *sw, int revents)
… …
599 int pid, status; 646 int pid, status;
600 647
601 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 648 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
602 { 649 {
603 /* make sure we are called again until all childs have been reaped */ 650 /* make sure we are called again until all childs have been reaped */
604 event (EV_A_ (W)sw, EV_SIGNAL); 651 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
605 652
606 child_reap (EV_A_ sw, pid, pid, status); 653 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 */ 654 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
608 } 655 }
609} 656}
… …
693 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 740 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
694#endif 741#endif
695#if EV_USE_SELECT 742#if EV_USE_SELECT
696 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 743 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
697#endif 744#endif
745
746 ev_watcher_init (&sigev, sigcb);
747 ev_set_priority (&sigev, EV_MAXPRI);
698 } 748 }
699} 749}
700 750
701void 751void
702loop_destroy (EV_P) 752loop_destroy (EV_P)
… …
720#endif 770#endif
721 771
722 for (i = NUMPRI; i--; ) 772 for (i = NUMPRI; i--; )
723 array_free (pending, [i]); 773 array_free (pending, [i]);
724 774
775 /* have to use the microsoft-never-gets-it-right macro */
725 array_free (fdchange, ); 776 array_free_microshit (fdchange);
726 array_free (timer, ); 777 array_free_microshit (timer);
727 array_free (periodic, ); 778 array_free_microshit (periodic);
728 array_free (idle, ); 779 array_free_microshit (idle);
729 array_free (prepare, ); 780 array_free_microshit (prepare);
730 array_free (check, ); 781 array_free_microshit (check);
731 782
732 method = 0; 783 method = 0;
733 /*TODO*/
734} 784}
735 785
736void 786static void
737loop_fork (EV_P) 787loop_fork (EV_P)
738{ 788{
739 /*TODO*/
740#if EV_USE_EPOLL 789#if EV_USE_EPOLL
741 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 790 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
742#endif 791#endif
743#if EV_USE_KQUEUE 792#if EV_USE_KQUEUE
744 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 793 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
745#endif 794#endif
795
796 if (ev_is_active (&sigev))
797 {
798 /* default loop */
799
800 ev_ref (EV_A);
801 ev_io_stop (EV_A_ &sigev);
802 close (sigpipe [0]);
803 close (sigpipe [1]);
804
805 while (pipe (sigpipe))
806 syserr ("(libev) error creating pipe");
807
808 siginit (EV_A);
809 }
810
811 postfork = 0;
746} 812}
747 813
748#if EV_MULTIPLICITY 814#if EV_MULTIPLICITY
749struct ev_loop * 815struct ev_loop *
750ev_loop_new (int methods) 816ev_loop_new (int methods)
… …
769} 835}
770 836
771void 837void
772ev_loop_fork (EV_P) 838ev_loop_fork (EV_P)
773{ 839{
774 loop_fork (EV_A); 840 postfork = 1;
775} 841}
776 842
777#endif 843#endif
778 844
779#if EV_MULTIPLICITY 845#if EV_MULTIPLICITY
… …
802 868
803 loop_init (EV_A_ methods); 869 loop_init (EV_A_ methods);
804 870
805 if (ev_method (EV_A)) 871 if (ev_method (EV_A))
806 { 872 {
807 ev_watcher_init (&sigev, sigcb);
808 ev_set_priority (&sigev, EV_MAXPRI);
809 siginit (EV_A); 873 siginit (EV_A);
810 874
811#ifndef WIN32 875#ifndef WIN32
812 ev_signal_init (&childev, childcb, SIGCHLD); 876 ev_signal_init (&childev, childcb, SIGCHLD);
813 ev_set_priority (&childev, EV_MAXPRI); 877 ev_set_priority (&childev, EV_MAXPRI);
… …
827{ 891{
828#if EV_MULTIPLICITY 892#if EV_MULTIPLICITY
829 struct ev_loop *loop = default_loop; 893 struct ev_loop *loop = default_loop;
830#endif 894#endif
831 895
896#ifndef WIN32
832 ev_ref (EV_A); /* child watcher */ 897 ev_ref (EV_A); /* child watcher */
833 ev_signal_stop (EV_A_ &childev); 898 ev_signal_stop (EV_A_ &childev);
899#endif
834 900
835 ev_ref (EV_A); /* signal watcher */ 901 ev_ref (EV_A); /* signal watcher */
836 ev_io_stop (EV_A_ &sigev); 902 ev_io_stop (EV_A_ &sigev);
837 903
838 close (sigpipe [0]); sigpipe [0] = 0; 904 close (sigpipe [0]); sigpipe [0] = 0;
… …
846{ 912{
847#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop; 914 struct ev_loop *loop = default_loop;
849#endif 915#endif
850 916
851 loop_fork (EV_A); 917 if (method)
852 918 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} 919}
861 920
862/*****************************************************************************/ 921/*****************************************************************************/
922
923static int
924any_pending (EV_P)
925{
926 int pri;
927
928 for (pri = NUMPRI; pri--; )
929 if (pendingcnt [pri])
930 return 1;
931
932 return 0;
933}
863 934
864static void 935static void
865call_pending (EV_P) 936call_pending (EV_P)
866{ 937{
867 int pri; 938 int pri;
… …
896 downheap ((WT *)timers, timercnt, 0); 967 downheap ((WT *)timers, timercnt, 0);
897 } 968 }
898 else 969 else
899 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 970 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
900 971
901 event (EV_A_ (W)w, EV_TIMEOUT); 972 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
902 } 973 }
903} 974}
904 975
905static void 976static void
906periodics_reify (EV_P) 977periodics_reify (EV_P)
… …
910 struct ev_periodic *w = periodics [0]; 981 struct ev_periodic *w = periodics [0];
911 982
912 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 983 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
913 984
914 /* first reschedule or stop timer */ 985 /* first reschedule or stop timer */
986 if (w->reschedule_cb)
987 {
988 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
989
990 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
991 downheap ((WT *)periodics, periodiccnt, 0);
992 }
915 if (w->interval) 993 else if (w->interval)
916 { 994 {
917 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 995 ((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)); 996 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
919 downheap ((WT *)periodics, periodiccnt, 0); 997 downheap ((WT *)periodics, periodiccnt, 0);
920 } 998 }
921 else 999 else
922 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1000 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
923 1001
924 event (EV_A_ (W)w, EV_PERIODIC); 1002 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
925 } 1003 }
926} 1004}
927 1005
928static void 1006static void
929periodics_reschedule (EV_P) 1007periodics_reschedule (EV_P)
… …
933 /* adjust periodics after time jump */ 1011 /* adjust periodics after time jump */
934 for (i = 0; i < periodiccnt; ++i) 1012 for (i = 0; i < periodiccnt; ++i)
935 { 1013 {
936 struct ev_periodic *w = periodics [i]; 1014 struct ev_periodic *w = periodics [i];
937 1015
1016 if (w->reschedule_cb)
1017 ((WT)w)->at = w->reschedule_cb (w, rt_now);
938 if (w->interval) 1018 else if (w->interval)
939 {
940 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1019 ((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 } 1020 }
1021
1022 /* now rebuild the heap */
1023 for (i = periodiccnt >> 1; i--; )
1024 downheap ((WT *)periodics, periodiccnt, i);
951} 1025}
952 1026
953inline int 1027inline int
954time_update_monotonic (EV_P) 1028time_update_monotonic (EV_P)
955{ 1029{
… …
1042 { 1116 {
1043 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1117 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1044 call_pending (EV_A); 1118 call_pending (EV_A);
1045 } 1119 }
1046 1120
1121 /* we might have forked, so reify kernel state if necessary */
1122 if (expect_false (postfork))
1123 loop_fork (EV_A);
1124
1047 /* update fd-related kernel structures */ 1125 /* update fd-related kernel structures */
1048 fd_reify (EV_A); 1126 fd_reify (EV_A);
1049 1127
1050 /* calculate blocking time */ 1128 /* calculate blocking time */
1051 1129
1052 /* we only need this for !monotonic clockor timers, but as we basically 1130 /* we only need this for !monotonic clock or timers, but as we basically
1053 always have timers, we just calculate it always */ 1131 always have timers, we just calculate it always */
1054#if EV_USE_MONOTONIC 1132#if EV_USE_MONOTONIC
1055 if (expect_true (have_monotonic)) 1133 if (expect_true (have_monotonic))
1056 time_update_monotonic (EV_A); 1134 time_update_monotonic (EV_A);
1057 else 1135 else
… …
1090 /* queue pending timers and reschedule them */ 1168 /* queue pending timers and reschedule them */
1091 timers_reify (EV_A); /* relative timers called last */ 1169 timers_reify (EV_A); /* relative timers called last */
1092 periodics_reify (EV_A); /* absolute timers called first */ 1170 periodics_reify (EV_A); /* absolute timers called first */
1093 1171
1094 /* queue idle watchers unless io or timers are pending */ 1172 /* queue idle watchers unless io or timers are pending */
1095 if (!pendingcnt) 1173 if (idlecnt && !any_pending (EV_A))
1096 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1174 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1097 1175
1098 /* queue check watchers, to be executed first */ 1176 /* queue check watchers, to be executed first */
1099 if (checkcnt) 1177 if (checkcnt)
1100 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1178 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1175 return; 1253 return;
1176 1254
1177 assert (("ev_io_start called with negative fd", fd >= 0)); 1255 assert (("ev_io_start called with negative fd", fd >= 0));
1178 1256
1179 ev_start (EV_A_ (W)w, 1); 1257 ev_start (EV_A_ (W)w, 1);
1180 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1258 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1181 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1259 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1182 1260
1183 fd_change (EV_A_ fd); 1261 fd_change (EV_A_ fd);
1184} 1262}
1185 1263
… …
1205 ((WT)w)->at += mn_now; 1283 ((WT)w)->at += mn_now;
1206 1284
1207 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1285 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1208 1286
1209 ev_start (EV_A_ (W)w, ++timercnt); 1287 ev_start (EV_A_ (W)w, ++timercnt);
1210 array_needsize (timers, timermax, timercnt, ); 1288 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1211 timers [timercnt - 1] = w; 1289 timers [timercnt - 1] = w;
1212 upheap ((WT *)timers, timercnt - 1); 1290 upheap ((WT *)timers, timercnt - 1);
1213 1291
1214 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1292 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1215} 1293}
… …
1255ev_periodic_start (EV_P_ struct ev_periodic *w) 1333ev_periodic_start (EV_P_ struct ev_periodic *w)
1256{ 1334{
1257 if (ev_is_active (w)) 1335 if (ev_is_active (w))
1258 return; 1336 return;
1259 1337
1338 if (w->reschedule_cb)
1339 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1340 else if (w->interval)
1341 {
1260 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1342 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 */ 1343 /* 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; 1344 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1345 }
1265 1346
1266 ev_start (EV_A_ (W)w, ++periodiccnt); 1347 ev_start (EV_A_ (W)w, ++periodiccnt);
1267 array_needsize (periodics, periodicmax, periodiccnt, ); 1348 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1268 periodics [periodiccnt - 1] = w; 1349 periodics [periodiccnt - 1] = w;
1269 upheap ((WT *)periodics, periodiccnt - 1); 1350 upheap ((WT *)periodics, periodiccnt - 1);
1270 1351
1271 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1352 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1272} 1353}
… …
1288 1369
1289 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1290} 1371}
1291 1372
1292void 1373void
1374ev_periodic_again (EV_P_ struct ev_periodic *w)
1375{
1376 ev_periodic_stop (EV_A_ w);
1377 ev_periodic_start (EV_A_ w);
1378}
1379
1380void
1293ev_idle_start (EV_P_ struct ev_idle *w) 1381ev_idle_start (EV_P_ struct ev_idle *w)
1294{ 1382{
1295 if (ev_is_active (w)) 1383 if (ev_is_active (w))
1296 return; 1384 return;
1297 1385
1298 ev_start (EV_A_ (W)w, ++idlecnt); 1386 ev_start (EV_A_ (W)w, ++idlecnt);
1299 array_needsize (idles, idlemax, idlecnt, ); 1387 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1300 idles [idlecnt - 1] = w; 1388 idles [idlecnt - 1] = w;
1301} 1389}
1302 1390
1303void 1391void
1304ev_idle_stop (EV_P_ struct ev_idle *w) 1392ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1316{ 1404{
1317 if (ev_is_active (w)) 1405 if (ev_is_active (w))
1318 return; 1406 return;
1319 1407
1320 ev_start (EV_A_ (W)w, ++preparecnt); 1408 ev_start (EV_A_ (W)w, ++preparecnt);
1321 array_needsize (prepares, preparemax, preparecnt, ); 1409 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1322 prepares [preparecnt - 1] = w; 1410 prepares [preparecnt - 1] = w;
1323} 1411}
1324 1412
1325void 1413void
1326ev_prepare_stop (EV_P_ struct ev_prepare *w) 1414ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1338{ 1426{
1339 if (ev_is_active (w)) 1427 if (ev_is_active (w))
1340 return; 1428 return;
1341 1429
1342 ev_start (EV_A_ (W)w, ++checkcnt); 1430 ev_start (EV_A_ (W)w, ++checkcnt);
1343 array_needsize (checks, checkmax, checkcnt, ); 1431 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1344 checks [checkcnt - 1] = w; 1432 checks [checkcnt - 1] = w;
1345} 1433}
1346 1434
1347void 1435void
1348ev_check_stop (EV_P_ struct ev_check *w) 1436ev_check_stop (EV_P_ struct ev_check *w)
… …
1369 return; 1457 return;
1370 1458
1371 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1459 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1372 1460
1373 ev_start (EV_A_ (W)w, 1); 1461 ev_start (EV_A_ (W)w, 1);
1374 array_needsize (signals, signalmax, w->signum, signals_init); 1462 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1375 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1463 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1376 1464
1377 if (!((WL)w)->next) 1465 if (!((WL)w)->next)
1378 { 1466 {
1379#if WIN32 1467#if WIN32
… …
1462} 1550}
1463 1551
1464void 1552void
1465ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1553ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1466{ 1554{
1467 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1555 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1468 1556
1469 if (!once) 1557 if (!once)
1470 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1558 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1471 else 1559 else
1472 { 1560 {

Diff Legend

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