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

Comparing libev/ev.c (file contents):
Revision 1.67 by root, Mon Nov 5 16:42:15 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
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
158typedef struct 205typedef struct
159{ 206{
160 struct ev_watcher_list *head; 207 WL head;
161 unsigned char events; 208 unsigned char events;
162 unsigned char reify; 209 unsigned char reify;
163} ANFD; 210} ANFD;
164 211
165typedef struct 212typedef struct
… …
221ev_now (EV_P) 268ev_now (EV_P)
222{ 269{
223 return rt_now; 270 return rt_now;
224} 271}
225 272
226#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
227 274
228#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
229 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
230 { \ 277 { \
231 int newcnt = cur; \ 278 int newcnt = cur; \
232 do \ 279 do \
233 { \ 280 { \
234 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
235 } \ 282 } \
236 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
237 \ 284 \
238 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
239 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
240 cur = newcnt; \ 287 cur = newcnt; \
241 } 288 }
242 289
243#define array_slim(stem) \ 290#define array_slim(type,stem) \
244 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
245 { \ 292 { \
246 stem ## max = array_roundsize (stem ## cnt >> 1); \ 293 stem ## max = array_roundsize (stem ## cnt >> 1); \
247 base = realloc (base, sizeof (*base) * (stem ## max)); \ 294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
248 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
249 } 296 }
250 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
251#define array_free(stem, idx) \ 303#define array_free(stem, idx) \
252 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
253 305
254/*****************************************************************************/ 306/*****************************************************************************/
255 307
256static void 308static void
257anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
264 316
265 ++base; 317 ++base;
266 } 318 }
267} 319}
268 320
269static void 321void
270event (EV_P_ W w, int events) 322ev_feed_event (EV_P_ void *w, int revents)
271{ 323{
324 W w_ = (W)w;
325
272 if (w->pending) 326 if (w_->pending)
273 { 327 {
274 pendings [ABSPRI (w)][w->pending - 1].events |= events; 328 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
275 return; 329 return;
276 } 330 }
277 331
278 w->pending = ++pendingcnt [ABSPRI (w)]; 332 w_->pending = ++pendingcnt [ABSPRI (w_)];
279 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));
280 pendings [ABSPRI (w)][w->pending - 1].w = w; 334 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
281 pendings [ABSPRI (w)][w->pending - 1].events = events; 335 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
282} 336}
283 337
284static void 338static void
285queue_events (EV_P_ W *events, int eventcnt, int type) 339queue_events (EV_P_ W *events, int eventcnt, int type)
286{ 340{
287 int i; 341 int i;
288 342
289 for (i = 0; i < eventcnt; ++i) 343 for (i = 0; i < eventcnt; ++i)
290 event (EV_A_ events [i], type); 344 ev_feed_event (EV_A_ events [i], type);
291} 345}
292 346
293static void 347static void
294fd_event (EV_P_ int fd, int events) 348fd_event (EV_P_ int fd, int events)
295{ 349{
… …
299 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)
300 { 354 {
301 int ev = w->events & events; 355 int ev = w->events & events;
302 356
303 if (ev) 357 if (ev)
304 event (EV_A_ (W)w, ev); 358 ev_feed_event (EV_A_ (W)w, ev);
305 } 359 }
306} 360}
307 361
308/*****************************************************************************/ 362/*****************************************************************************/
309 363
… …
333} 387}
334 388
335static void 389static void
336fd_change (EV_P_ int fd) 390fd_change (EV_P_ int fd)
337{ 391{
338 if (anfds [fd].reify || fdchangecnt < 0) 392 if (anfds [fd].reify)
339 return; 393 return;
340 394
341 anfds [fd].reify = 1; 395 anfds [fd].reify = 1;
342 396
343 ++fdchangecnt; 397 ++fdchangecnt;
344 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 398 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
345 fdchanges [fdchangecnt - 1] = fd; 399 fdchanges [fdchangecnt - 1] = fd;
346} 400}
347 401
348static void 402static void
349fd_kill (EV_P_ int fd) 403fd_kill (EV_P_ int fd)
… …
351 struct ev_io *w; 405 struct ev_io *w;
352 406
353 while ((w = (struct ev_io *)anfds [fd].head)) 407 while ((w = (struct ev_io *)anfds [fd].head))
354 { 408 {
355 ev_io_stop (EV_A_ w); 409 ev_io_stop (EV_A_ w);
356 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);
357 } 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
358} 422}
359 423
360/* called on EBADF to verify fds */ 424/* called on EBADF to verify fds */
361static void 425static void
362fd_ebadf (EV_P) 426fd_ebadf (EV_P)
363{ 427{
364 int fd; 428 int fd;
365 429
366 for (fd = 0; fd < anfdmax; ++fd) 430 for (fd = 0; fd < anfdmax; ++fd)
367 if (anfds [fd].events) 431 if (anfds [fd].events)
368 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 432 if (!fd_valid (fd) == -1 && errno == EBADF)
369 fd_kill (EV_A_ fd); 433 fd_kill (EV_A_ fd);
370} 434}
371 435
372/* 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 */
373static void 437static void
… …
376 int fd; 440 int fd;
377 441
378 for (fd = anfdmax; fd--; ) 442 for (fd = anfdmax; fd--; )
379 if (anfds [fd].events) 443 if (anfds [fd].events)
380 { 444 {
381 close (fd);
382 fd_kill (EV_A_ fd); 445 fd_kill (EV_A_ fd);
383 return; 446 return;
384 } 447 }
385} 448}
386 449
387/* 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 */
388static void 451static void
389fd_rearm_all (EV_P) 452fd_rearm_all (EV_P)
390{ 453{
391 int fd; 454 int fd;
392 455
… …
444 507
445/*****************************************************************************/ 508/*****************************************************************************/
446 509
447typedef struct 510typedef struct
448{ 511{
449 struct ev_watcher_list *head; 512 WL head;
450 sig_atomic_t volatile gotsig; 513 sig_atomic_t volatile gotsig;
451} ANSIG; 514} ANSIG;
452 515
453static ANSIG *signals; 516static ANSIG *signals;
454static int signalmax; 517static int signalmax;
… …
480 543
481 if (!gotsig) 544 if (!gotsig)
482 { 545 {
483 int old_errno = errno; 546 int old_errno = errno;
484 gotsig = 1; 547 gotsig = 1;
548#ifdef WIN32
549 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
550#else
485 write (sigpipe [1], &signum, 1); 551 write (sigpipe [1], &signum, 1);
552#endif
486 errno = old_errno; 553 errno = old_errno;
487 } 554 }
488} 555}
489 556
490static void 557static void
491sigcb (EV_P_ struct ev_io *iow, int revents) 558sigcb (EV_P_ struct ev_io *iow, int revents)
492{ 559{
493 struct ev_watcher_list *w; 560 WL w;
494 int signum; 561 int signum;
495 562
563#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else
496 read (sigpipe [0], &revents, 1); 566 read (sigpipe [0], &revents, 1);
567#endif
497 gotsig = 0; 568 gotsig = 0;
498 569
499 for (signum = signalmax; signum--; ) 570 for (signum = signalmax; signum--; )
500 if (signals [signum].gotsig) 571 if (signals [signum].gotsig)
501 { 572 {
502 signals [signum].gotsig = 0; 573 signals [signum].gotsig = 0;
503 574
504 for (w = signals [signum].head; w; w = w->next) 575 for (w = signals [signum].head; w; w = w->next)
505 event (EV_A_ (W)w, EV_SIGNAL); 576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
506 } 577 }
507} 578}
508 579
509static void 580static void
510siginit (EV_P) 581siginit (EV_P)
… …
523 ev_unref (EV_A); /* child watcher should not keep loop alive */ 594 ev_unref (EV_A); /* child watcher should not keep loop alive */
524} 595}
525 596
526/*****************************************************************************/ 597/*****************************************************************************/
527 598
599static struct ev_child *childs [PID_HASHSIZE];
600
528#ifndef WIN32 601#ifndef WIN32
529 602
530static struct ev_child *childs [PID_HASHSIZE];
531static struct ev_signal childev; 603static struct ev_signal childev;
532 604
533#ifndef WCONTINUED 605#ifndef WCONTINUED
534# define WCONTINUED 0 606# define WCONTINUED 0
535#endif 607#endif
… …
543 if (w->pid == pid || !w->pid) 615 if (w->pid == pid || !w->pid)
544 { 616 {
545 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 617 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
546 w->rpid = pid; 618 w->rpid = pid;
547 w->rstatus = status; 619 w->rstatus = status;
548 event (EV_A_ (W)w, EV_CHILD); 620 ev_feed_event (EV_A_ (W)w, EV_CHILD);
549 } 621 }
550} 622}
551 623
552static void 624static void
553childcb (EV_P_ struct ev_signal *sw, int revents) 625childcb (EV_P_ struct ev_signal *sw, int revents)
… …
555 int pid, status; 627 int pid, status;
556 628
557 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 629 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
558 { 630 {
559 /* 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 */
560 event (EV_A_ (W)sw, EV_SIGNAL); 632 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
561 633
562 child_reap (EV_A_ sw, pid, pid, status); 634 child_reap (EV_A_ sw, pid, pid, status);
563 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 */
564 } 636 }
565} 637}
… …
649 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 721 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
650#endif 722#endif
651#if EV_USE_SELECT 723#if EV_USE_SELECT
652 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
653#endif 725#endif
726
727 ev_watcher_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI);
654 } 729 }
655} 730}
656 731
657void 732void
658loop_destroy (EV_P) 733loop_destroy (EV_P)
… …
676#endif 751#endif
677 752
678 for (i = NUMPRI; i--; ) 753 for (i = NUMPRI; i--; )
679 array_free (pending, [i]); 754 array_free (pending, [i]);
680 755
756 /* have to use the microsoft-never-gets-it-right macro */
681 array_free (fdchange, ); 757 array_free_microshit (fdchange);
682 array_free (timer, ); 758 array_free_microshit (timer);
683 array_free (periodic, ); 759 array_free_microshit (periodic);
684 array_free (idle, ); 760 array_free_microshit (idle);
685 array_free (prepare, ); 761 array_free_microshit (prepare);
686 array_free (check, ); 762 array_free_microshit (check);
687 763
688 method = 0; 764 method = 0;
689 /*TODO*/
690} 765}
691 766
692void 767static void
693loop_fork (EV_P) 768loop_fork (EV_P)
694{ 769{
695 /*TODO*/
696#if EV_USE_EPOLL 770#if EV_USE_EPOLL
697 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 771 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
698#endif 772#endif
699#if EV_USE_KQUEUE 773#if EV_USE_KQUEUE
700 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 774 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
701#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;
702} 793}
703 794
704#if EV_MULTIPLICITY 795#if EV_MULTIPLICITY
705struct ev_loop * 796struct ev_loop *
706ev_loop_new (int methods) 797ev_loop_new (int methods)
707{ 798{
708 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 799 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
800
801 memset (loop, 0, sizeof (struct ev_loop));
709 802
710 loop_init (EV_A_ methods); 803 loop_init (EV_A_ methods);
711 804
712 if (ev_method (EV_A)) 805 if (ev_method (EV_A))
713 return loop; 806 return loop;
… …
717 810
718void 811void
719ev_loop_destroy (EV_P) 812ev_loop_destroy (EV_P)
720{ 813{
721 loop_destroy (EV_A); 814 loop_destroy (EV_A);
722 free (loop); 815 ev_free (loop);
723} 816}
724 817
725void 818void
726ev_loop_fork (EV_P) 819ev_loop_fork (EV_P)
727{ 820{
728 loop_fork (EV_A); 821 postfork = 1;
729} 822}
730 823
731#endif 824#endif
732 825
733#if EV_MULTIPLICITY 826#if EV_MULTIPLICITY
… …
756 849
757 loop_init (EV_A_ methods); 850 loop_init (EV_A_ methods);
758 851
759 if (ev_method (EV_A)) 852 if (ev_method (EV_A))
760 { 853 {
761 ev_watcher_init (&sigev, sigcb);
762 ev_set_priority (&sigev, EV_MAXPRI);
763 siginit (EV_A); 854 siginit (EV_A);
764 855
765#ifndef WIN32 856#ifndef WIN32
766 ev_signal_init (&childev, childcb, SIGCHLD); 857 ev_signal_init (&childev, childcb, SIGCHLD);
767 ev_set_priority (&childev, EV_MAXPRI); 858 ev_set_priority (&childev, EV_MAXPRI);
… …
781{ 872{
782#if EV_MULTIPLICITY 873#if EV_MULTIPLICITY
783 struct ev_loop *loop = default_loop; 874 struct ev_loop *loop = default_loop;
784#endif 875#endif
785 876
877#ifndef WIN32
786 ev_ref (EV_A); /* child watcher */ 878 ev_ref (EV_A); /* child watcher */
787 ev_signal_stop (EV_A_ &childev); 879 ev_signal_stop (EV_A_ &childev);
880#endif
788 881
789 ev_ref (EV_A); /* signal watcher */ 882 ev_ref (EV_A); /* signal watcher */
790 ev_io_stop (EV_A_ &sigev); 883 ev_io_stop (EV_A_ &sigev);
791 884
792 close (sigpipe [0]); sigpipe [0] = 0; 885 close (sigpipe [0]); sigpipe [0] = 0;
… …
800{ 893{
801#if EV_MULTIPLICITY 894#if EV_MULTIPLICITY
802 struct ev_loop *loop = default_loop; 895 struct ev_loop *loop = default_loop;
803#endif 896#endif
804 897
805 loop_fork (EV_A); 898 if (method)
806 899 postfork = 1;
807 ev_io_stop (EV_A_ &sigev);
808 close (sigpipe [0]);
809 close (sigpipe [1]);
810 pipe (sigpipe);
811
812 ev_ref (EV_A); /* signal watcher */
813 siginit (EV_A);
814} 900}
815 901
816/*****************************************************************************/ 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}
817 915
818static void 916static void
819call_pending (EV_P) 917call_pending (EV_P)
820{ 918{
821 int pri; 919 int pri;
… …
850 downheap ((WT *)timers, timercnt, 0); 948 downheap ((WT *)timers, timercnt, 0);
851 } 949 }
852 else 950 else
853 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
854 952
855 event (EV_A_ (W)w, EV_TIMEOUT); 953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
856 } 954 }
857} 955}
858 956
859static void 957static void
860periodics_reify (EV_P) 958periodics_reify (EV_P)
… …
864 struct ev_periodic *w = periodics [0]; 962 struct ev_periodic *w = periodics [0];
865 963
866 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 964 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
867 965
868 /* 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 }
869 if (w->interval) 974 else if (w->interval)
870 { 975 {
871 ((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;
872 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));
873 downheap ((WT *)periodics, periodiccnt, 0); 978 downheap ((WT *)periodics, periodiccnt, 0);
874 } 979 }
875 else 980 else
876 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
877 982
878 event (EV_A_ (W)w, EV_PERIODIC); 983 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
879 } 984 }
880} 985}
881 986
882static void 987static void
883periodics_reschedule (EV_P) 988periodics_reschedule (EV_P)
… …
887 /* adjust periodics after time jump */ 992 /* adjust periodics after time jump */
888 for (i = 0; i < periodiccnt; ++i) 993 for (i = 0; i < periodiccnt; ++i)
889 { 994 {
890 struct ev_periodic *w = periodics [i]; 995 struct ev_periodic *w = periodics [i];
891 996
997 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now);
892 if (w->interval) 999 else if (w->interval)
893 {
894 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;
895
896 if (fabs (diff) >= 1e-4)
897 {
898 ev_periodic_stop (EV_A_ w);
899 ev_periodic_start (EV_A_ w);
900
901 i = 0; /* restart loop, inefficient, but time jumps should be rare */
902 }
903 }
904 } 1001 }
1002
1003 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i);
905} 1006}
906 1007
907inline int 1008inline int
908time_update_monotonic (EV_P) 1009time_update_monotonic (EV_P)
909{ 1010{
… …
996 { 1097 {
997 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1098 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
998 call_pending (EV_A); 1099 call_pending (EV_A);
999 } 1100 }
1000 1101
1102 /* we might have forked, so reify kernel state if necessary */
1103 if (expect_false (postfork))
1104 loop_fork (EV_A);
1105
1001 /* update fd-related kernel structures */ 1106 /* update fd-related kernel structures */
1002 fd_reify (EV_A); 1107 fd_reify (EV_A);
1003 1108
1004 /* calculate blocking time */ 1109 /* calculate blocking time */
1005 1110
1006 /* 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
1007 always have timers, we just calculate it always */ 1112 always have timers, we just calculate it always */
1008#if EV_USE_MONOTONIC 1113#if EV_USE_MONOTONIC
1009 if (expect_true (have_monotonic)) 1114 if (expect_true (have_monotonic))
1010 time_update_monotonic (EV_A); 1115 time_update_monotonic (EV_A);
1011 else 1116 else
… …
1044 /* queue pending timers and reschedule them */ 1149 /* queue pending timers and reschedule them */
1045 timers_reify (EV_A); /* relative timers called last */ 1150 timers_reify (EV_A); /* relative timers called last */
1046 periodics_reify (EV_A); /* absolute timers called first */ 1151 periodics_reify (EV_A); /* absolute timers called first */
1047 1152
1048 /* queue idle watchers unless io or timers are pending */ 1153 /* queue idle watchers unless io or timers are pending */
1049 if (!pendingcnt) 1154 if (idlecnt && !any_pending (EV_A))
1050 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1051 1156
1052 /* queue check watchers, to be executed first */ 1157 /* queue check watchers, to be executed first */
1053 if (checkcnt) 1158 if (checkcnt)
1054 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1159 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1129 return; 1234 return;
1130 1235
1131 assert (("ev_io_start called with negative fd", fd >= 0)); 1236 assert (("ev_io_start called with negative fd", fd >= 0));
1132 1237
1133 ev_start (EV_A_ (W)w, 1); 1238 ev_start (EV_A_ (W)w, 1);
1134 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1239 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1135 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1240 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1136 1241
1137 fd_change (EV_A_ fd); 1242 fd_change (EV_A_ fd);
1138} 1243}
1139 1244
… …
1159 ((WT)w)->at += mn_now; 1264 ((WT)w)->at += mn_now;
1160 1265
1161 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.));
1162 1267
1163 ev_start (EV_A_ (W)w, ++timercnt); 1268 ev_start (EV_A_ (W)w, ++timercnt);
1164 array_needsize (timers, timermax, timercnt, ); 1269 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1165 timers [timercnt - 1] = w; 1270 timers [timercnt - 1] = w;
1166 upheap ((WT *)timers, timercnt - 1); 1271 upheap ((WT *)timers, timercnt - 1);
1167 1272
1168 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1273 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1169} 1274}
… …
1209ev_periodic_start (EV_P_ struct ev_periodic *w) 1314ev_periodic_start (EV_P_ struct ev_periodic *w)
1210{ 1315{
1211 if (ev_is_active (w)) 1316 if (ev_is_active (w))
1212 return; 1317 return;
1213 1318
1319 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1321 else if (w->interval)
1322 {
1214 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.));
1215
1216 /* 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 */
1217 if (w->interval)
1218 ((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 }
1219 1327
1220 ev_start (EV_A_ (W)w, ++periodiccnt); 1328 ev_start (EV_A_ (W)w, ++periodiccnt);
1221 array_needsize (periodics, periodicmax, periodiccnt, ); 1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1222 periodics [periodiccnt - 1] = w; 1330 periodics [periodiccnt - 1] = w;
1223 upheap ((WT *)periodics, periodiccnt - 1); 1331 upheap ((WT *)periodics, periodiccnt - 1);
1224 1332
1225 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1333 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1226} 1334}
… …
1242 1350
1243 ev_stop (EV_A_ (W)w); 1351 ev_stop (EV_A_ (W)w);
1244} 1352}
1245 1353
1246void 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
1247ev_idle_start (EV_P_ struct ev_idle *w) 1362ev_idle_start (EV_P_ struct ev_idle *w)
1248{ 1363{
1249 if (ev_is_active (w)) 1364 if (ev_is_active (w))
1250 return; 1365 return;
1251 1366
1252 ev_start (EV_A_ (W)w, ++idlecnt); 1367 ev_start (EV_A_ (W)w, ++idlecnt);
1253 array_needsize (idles, idlemax, idlecnt, ); 1368 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1254 idles [idlecnt - 1] = w; 1369 idles [idlecnt - 1] = w;
1255} 1370}
1256 1371
1257void 1372void
1258ev_idle_stop (EV_P_ struct ev_idle *w) 1373ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1270{ 1385{
1271 if (ev_is_active (w)) 1386 if (ev_is_active (w))
1272 return; 1387 return;
1273 1388
1274 ev_start (EV_A_ (W)w, ++preparecnt); 1389 ev_start (EV_A_ (W)w, ++preparecnt);
1275 array_needsize (prepares, preparemax, preparecnt, ); 1390 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1276 prepares [preparecnt - 1] = w; 1391 prepares [preparecnt - 1] = w;
1277} 1392}
1278 1393
1279void 1394void
1280ev_prepare_stop (EV_P_ struct ev_prepare *w) 1395ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1292{ 1407{
1293 if (ev_is_active (w)) 1408 if (ev_is_active (w))
1294 return; 1409 return;
1295 1410
1296 ev_start (EV_A_ (W)w, ++checkcnt); 1411 ev_start (EV_A_ (W)w, ++checkcnt);
1297 array_needsize (checks, checkmax, checkcnt, ); 1412 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1298 checks [checkcnt - 1] = w; 1413 checks [checkcnt - 1] = w;
1299} 1414}
1300 1415
1301void 1416void
1302ev_check_stop (EV_P_ struct ev_check *w) 1417ev_check_stop (EV_P_ struct ev_check *w)
… …
1323 return; 1438 return;
1324 1439
1325 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));
1326 1441
1327 ev_start (EV_A_ (W)w, 1); 1442 ev_start (EV_A_ (W)w, 1);
1328 array_needsize (signals, signalmax, w->signum, signals_init); 1443 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1329 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1444 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1330 1445
1331 if (!((WL)w)->next) 1446 if (!((WL)w)->next)
1332 { 1447 {
1333#if WIN32 1448#if WIN32
… …
1396 void (*cb)(int revents, void *arg) = once->cb; 1511 void (*cb)(int revents, void *arg) = once->cb;
1397 void *arg = once->arg; 1512 void *arg = once->arg;
1398 1513
1399 ev_io_stop (EV_A_ &once->io); 1514 ev_io_stop (EV_A_ &once->io);
1400 ev_timer_stop (EV_A_ &once->to); 1515 ev_timer_stop (EV_A_ &once->to);
1401 free (once); 1516 ev_free (once);
1402 1517
1403 cb (revents, arg); 1518 cb (revents, arg);
1404} 1519}
1405 1520
1406static void 1521static void
… …
1416} 1531}
1417 1532
1418void 1533void
1419ev_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)
1420{ 1535{
1421 struct ev_once *once = malloc (sizeof (struct ev_once)); 1536 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1422 1537
1423 if (!once) 1538 if (!once)
1424 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1539 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1425 else 1540 else
1426 { 1541 {

Diff Legend

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