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

Comparing libev/ev.c (file contents):
Revision 1.68 by root, Mon Nov 5 20:19:00 2007 UTC vs.
Revision 1.80 by root, Fri Nov 9 15:30:59 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 */ 154
152/* MSDN says this is required to handle SIGFPE */ 155/*****************************************************************************/
153volatile double SIGFPE_REQ = 0.0f; 156
154#endif 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)
155 202
156/*****************************************************************************/ 203/*****************************************************************************/
157 204
158typedef struct 205typedef struct
159{ 206{
… …
168 int events; 215 int events;
169} ANPENDING; 216} ANPENDING;
170 217
171#if EV_MULTIPLICITY 218#if EV_MULTIPLICITY
172 219
173struct ev_loop 220 struct ev_loop
174{ 221 {
175# define VAR(name,decl) decl; 222 #define VAR(name,decl) decl;
176# include "ev_vars.h" 223 #include "ev_vars.h"
177};
178# undef VAR 224 #undef VAR
225 };
179# include "ev_wrap.h" 226 #include "ev_wrap.h"
227
228 struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop;
180 230
181#else 231#else
182 232
183# define VAR(name,decl) static decl; 233 #define VAR(name,decl) static decl;
184# include "ev_vars.h" 234 #include "ev_vars.h"
185# undef VAR 235 #undef VAR
236
237 static int default_loop;
186 238
187#endif 239#endif
188 240
189/*****************************************************************************/ 241/*****************************************************************************/
190 242
… …
221ev_now (EV_P) 273ev_now (EV_P)
222{ 274{
223 return rt_now; 275 return rt_now;
224} 276}
225 277
226#define array_roundsize(base,n) ((n) | 4 & ~3) 278#define array_roundsize(type,n) ((n) | 4 & ~3)
227 279
228#define array_needsize(base,cur,cnt,init) \ 280#define array_needsize(type,base,cur,cnt,init) \
229 if (expect_false ((cnt) > cur)) \ 281 if (expect_false ((cnt) > cur)) \
230 { \ 282 { \
231 int newcnt = cur; \ 283 int newcnt = cur; \
232 do \ 284 do \
233 { \ 285 { \
234 newcnt = array_roundsize (base, newcnt << 1); \ 286 newcnt = array_roundsize (type, newcnt << 1); \
235 } \ 287 } \
236 while ((cnt) > newcnt); \ 288 while ((cnt) > newcnt); \
237 \ 289 \
238 base = realloc (base, sizeof (*base) * (newcnt)); \ 290 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
239 init (base + cur, newcnt - cur); \ 291 init (base + cur, newcnt - cur); \
240 cur = newcnt; \ 292 cur = newcnt; \
241 } 293 }
242 294
243#define array_slim(stem) \ 295#define array_slim(type,stem) \
244 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 296 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
245 { \ 297 { \
246 stem ## max = array_roundsize (stem ## cnt >> 1); \ 298 stem ## max = array_roundsize (stem ## cnt >> 1); \
247 base = realloc (base, sizeof (*base) * (stem ## max)); \ 299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
248 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
249 } 301 }
250 302
303/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
304/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
305#define array_free_microshit(stem) \
306 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
307
251#define array_free(stem, idx) \ 308#define array_free(stem, idx) \
252 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 309 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
253 310
254/*****************************************************************************/ 311/*****************************************************************************/
255 312
256static void 313static void
257anfds_init (ANFD *base, int count) 314anfds_init (ANFD *base, int count)
… …
264 321
265 ++base; 322 ++base;
266 } 323 }
267} 324}
268 325
269static void 326void
270event (EV_P_ W w, int events) 327ev_feed_event (EV_P_ void *w, int revents)
271{ 328{
329 W w_ = (W)w;
330
272 if (w->pending) 331 if (w_->pending)
273 { 332 {
274 pendings [ABSPRI (w)][w->pending - 1].events |= events; 333 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
275 return; 334 return;
276 } 335 }
277 336
278 w->pending = ++pendingcnt [ABSPRI (w)]; 337 w_->pending = ++pendingcnt [ABSPRI (w_)];
279 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 338 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
280 pendings [ABSPRI (w)][w->pending - 1].w = w; 339 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
281 pendings [ABSPRI (w)][w->pending - 1].events = events; 340 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
282} 341}
283 342
284static void 343static void
285queue_events (EV_P_ W *events, int eventcnt, int type) 344queue_events (EV_P_ W *events, int eventcnt, int type)
286{ 345{
287 int i; 346 int i;
288 347
289 for (i = 0; i < eventcnt; ++i) 348 for (i = 0; i < eventcnt; ++i)
290 event (EV_A_ events [i], type); 349 ev_feed_event (EV_A_ events [i], type);
291} 350}
292 351
293static void 352inline void
294fd_event (EV_P_ int fd, int events) 353fd_event (EV_P_ int fd, int revents)
295{ 354{
296 ANFD *anfd = anfds + fd; 355 ANFD *anfd = anfds + fd;
297 struct ev_io *w; 356 struct ev_io *w;
298 357
299 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 358 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
300 { 359 {
301 int ev = w->events & events; 360 int ev = w->events & revents;
302 361
303 if (ev) 362 if (ev)
304 event (EV_A_ (W)w, ev); 363 ev_feed_event (EV_A_ (W)w, ev);
305 } 364 }
365}
366
367void
368ev_feed_fd_event (EV_P_ int fd, int revents)
369{
370 fd_event (EV_A_ fd, revents);
306} 371}
307 372
308/*****************************************************************************/ 373/*****************************************************************************/
309 374
310static void 375static void
… …
333} 398}
334 399
335static void 400static void
336fd_change (EV_P_ int fd) 401fd_change (EV_P_ int fd)
337{ 402{
338 if (anfds [fd].reify || fdchangecnt < 0) 403 if (anfds [fd].reify)
339 return; 404 return;
340 405
341 anfds [fd].reify = 1; 406 anfds [fd].reify = 1;
342 407
343 ++fdchangecnt; 408 ++fdchangecnt;
344 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 409 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
345 fdchanges [fdchangecnt - 1] = fd; 410 fdchanges [fdchangecnt - 1] = fd;
346} 411}
347 412
348static void 413static void
349fd_kill (EV_P_ int fd) 414fd_kill (EV_P_ int fd)
… …
351 struct ev_io *w; 416 struct ev_io *w;
352 417
353 while ((w = (struct ev_io *)anfds [fd].head)) 418 while ((w = (struct ev_io *)anfds [fd].head))
354 { 419 {
355 ev_io_stop (EV_A_ w); 420 ev_io_stop (EV_A_ w);
356 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 421 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
357 } 422 }
423}
424
425static int
426fd_valid (int fd)
427{
428#ifdef WIN32
429 return !!win32_get_osfhandle (fd);
430#else
431 return fcntl (fd, F_GETFD) != -1;
432#endif
358} 433}
359 434
360/* called on EBADF to verify fds */ 435/* called on EBADF to verify fds */
361static void 436static void
362fd_ebadf (EV_P) 437fd_ebadf (EV_P)
363{ 438{
364 int fd; 439 int fd;
365 440
366 for (fd = 0; fd < anfdmax; ++fd) 441 for (fd = 0; fd < anfdmax; ++fd)
367 if (anfds [fd].events) 442 if (anfds [fd].events)
368 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 443 if (!fd_valid (fd) == -1 && errno == EBADF)
369 fd_kill (EV_A_ fd); 444 fd_kill (EV_A_ fd);
370} 445}
371 446
372/* called on ENOMEM in select/poll to kill some fds and retry */ 447/* called on ENOMEM in select/poll to kill some fds and retry */
373static void 448static void
… …
381 fd_kill (EV_A_ fd); 456 fd_kill (EV_A_ fd);
382 return; 457 return;
383 } 458 }
384} 459}
385 460
386/* susually called after fork if method needs to re-arm all fds from scratch */ 461/* usually called after fork if method needs to re-arm all fds from scratch */
387static void 462static void
388fd_rearm_all (EV_P) 463fd_rearm_all (EV_P)
389{ 464{
390 int fd; 465 int fd;
391 466
… …
479 554
480 if (!gotsig) 555 if (!gotsig)
481 { 556 {
482 int old_errno = errno; 557 int old_errno = errno;
483 gotsig = 1; 558 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
484 write (sigpipe [1], &signum, 1); 562 write (sigpipe [1], &signum, 1);
563#endif
485 errno = old_errno; 564 errno = old_errno;
486 } 565 }
487} 566}
488 567
568void
569ev_feed_signal_event (EV_P_ int signum)
570{
571 WL w;
572
573#if EV_MULTIPLICITY
574 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
575#endif
576
577 --signum;
578
579 if (signum < 0 || signum >= signalmax)
580 return;
581
582 signals [signum].gotsig = 0;
583
584 for (w = signals [signum].head; w; w = w->next)
585 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
586}
587
489static void 588static void
490sigcb (EV_P_ struct ev_io *iow, int revents) 589sigcb (EV_P_ struct ev_io *iow, int revents)
491{ 590{
492 WL w;
493 int signum; 591 int signum;
494 592
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
495 read (sigpipe [0], &revents, 1); 596 read (sigpipe [0], &revents, 1);
597#endif
496 gotsig = 0; 598 gotsig = 0;
497 599
498 for (signum = signalmax; signum--; ) 600 for (signum = signalmax; signum--; )
499 if (signals [signum].gotsig) 601 if (signals [signum].gotsig)
500 { 602 ev_feed_signal_event (EV_A_ signum + 1);
501 signals [signum].gotsig = 0;
502
503 for (w = signals [signum].head; w; w = w->next)
504 event (EV_A_ (W)w, EV_SIGNAL);
505 }
506} 603}
507 604
508static void 605static void
509siginit (EV_P) 606siginit (EV_P)
510{ 607{
… …
522 ev_unref (EV_A); /* child watcher should not keep loop alive */ 619 ev_unref (EV_A); /* child watcher should not keep loop alive */
523} 620}
524 621
525/*****************************************************************************/ 622/*****************************************************************************/
526 623
624static struct ev_child *childs [PID_HASHSIZE];
625
527#ifndef WIN32 626#ifndef WIN32
528 627
529static struct ev_child *childs [PID_HASHSIZE];
530static struct ev_signal childev; 628static struct ev_signal childev;
531 629
532#ifndef WCONTINUED 630#ifndef WCONTINUED
533# define WCONTINUED 0 631# define WCONTINUED 0
534#endif 632#endif
… …
542 if (w->pid == pid || !w->pid) 640 if (w->pid == pid || !w->pid)
543 { 641 {
544 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 642 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
545 w->rpid = pid; 643 w->rpid = pid;
546 w->rstatus = status; 644 w->rstatus = status;
547 event (EV_A_ (W)w, EV_CHILD); 645 ev_feed_event (EV_A_ (W)w, EV_CHILD);
548 } 646 }
549} 647}
550 648
551static void 649static void
552childcb (EV_P_ struct ev_signal *sw, int revents) 650childcb (EV_P_ struct ev_signal *sw, int revents)
… …
554 int pid, status; 652 int pid, status;
555 653
556 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 654 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
557 { 655 {
558 /* make sure we are called again until all childs have been reaped */ 656 /* make sure we are called again until all childs have been reaped */
559 event (EV_A_ (W)sw, EV_SIGNAL); 657 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
560 658
561 child_reap (EV_A_ sw, pid, pid, status); 659 child_reap (EV_A_ sw, pid, pid, status);
562 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 660 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
563 } 661 }
564} 662}
… …
648 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 746 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
649#endif 747#endif
650#if EV_USE_SELECT 748#if EV_USE_SELECT
651 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
652#endif 750#endif
751
752 ev_watcher_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI);
653 } 754 }
654} 755}
655 756
656void 757void
657loop_destroy (EV_P) 758loop_destroy (EV_P)
… …
675#endif 776#endif
676 777
677 for (i = NUMPRI; i--; ) 778 for (i = NUMPRI; i--; )
678 array_free (pending, [i]); 779 array_free (pending, [i]);
679 780
781 /* have to use the microsoft-never-gets-it-right macro */
680 array_free (fdchange, ); 782 array_free_microshit (fdchange);
681 array_free (timer, ); 783 array_free_microshit (timer);
682 array_free (periodic, ); 784 array_free_microshit (periodic);
683 array_free (idle, ); 785 array_free_microshit (idle);
684 array_free (prepare, ); 786 array_free_microshit (prepare);
685 array_free (check, ); 787 array_free_microshit (check);
686 788
687 method = 0; 789 method = 0;
688 /*TODO*/
689} 790}
690 791
691void 792static void
692loop_fork (EV_P) 793loop_fork (EV_P)
693{ 794{
694 /*TODO*/
695#if EV_USE_EPOLL 795#if EV_USE_EPOLL
696 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 796 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
697#endif 797#endif
698#if EV_USE_KQUEUE 798#if EV_USE_KQUEUE
699 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 799 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
700#endif 800#endif
801
802 if (ev_is_active (&sigev))
803 {
804 /* default loop */
805
806 ev_ref (EV_A);
807 ev_io_stop (EV_A_ &sigev);
808 close (sigpipe [0]);
809 close (sigpipe [1]);
810
811 while (pipe (sigpipe))
812 syserr ("(libev) error creating pipe");
813
814 siginit (EV_A);
815 }
816
817 postfork = 0;
701} 818}
702 819
703#if EV_MULTIPLICITY 820#if EV_MULTIPLICITY
704struct ev_loop * 821struct ev_loop *
705ev_loop_new (int methods) 822ev_loop_new (int methods)
706{ 823{
707 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 824 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
825
826 memset (loop, 0, sizeof (struct ev_loop));
708 827
709 loop_init (EV_A_ methods); 828 loop_init (EV_A_ methods);
710 829
711 if (ev_method (EV_A)) 830 if (ev_method (EV_A))
712 return loop; 831 return loop;
… …
716 835
717void 836void
718ev_loop_destroy (EV_P) 837ev_loop_destroy (EV_P)
719{ 838{
720 loop_destroy (EV_A); 839 loop_destroy (EV_A);
721 free (loop); 840 ev_free (loop);
722} 841}
723 842
724void 843void
725ev_loop_fork (EV_P) 844ev_loop_fork (EV_P)
726{ 845{
727 loop_fork (EV_A); 846 postfork = 1;
728} 847}
729 848
730#endif 849#endif
731 850
732#if EV_MULTIPLICITY 851#if EV_MULTIPLICITY
733struct ev_loop default_loop_struct;
734static struct ev_loop *default_loop;
735
736struct ev_loop * 852struct ev_loop *
737#else 853#else
738static int default_loop;
739
740int 854int
741#endif 855#endif
742ev_default_loop (int methods) 856ev_default_loop (int methods)
743{ 857{
744 if (sigpipe [0] == sigpipe [1]) 858 if (sigpipe [0] == sigpipe [1])
… …
755 869
756 loop_init (EV_A_ methods); 870 loop_init (EV_A_ methods);
757 871
758 if (ev_method (EV_A)) 872 if (ev_method (EV_A))
759 { 873 {
760 ev_watcher_init (&sigev, sigcb);
761 ev_set_priority (&sigev, EV_MAXPRI);
762 siginit (EV_A); 874 siginit (EV_A);
763 875
764#ifndef WIN32 876#ifndef WIN32
765 ev_signal_init (&childev, childcb, SIGCHLD); 877 ev_signal_init (&childev, childcb, SIGCHLD);
766 ev_set_priority (&childev, EV_MAXPRI); 878 ev_set_priority (&childev, EV_MAXPRI);
… …
780{ 892{
781#if EV_MULTIPLICITY 893#if EV_MULTIPLICITY
782 struct ev_loop *loop = default_loop; 894 struct ev_loop *loop = default_loop;
783#endif 895#endif
784 896
897#ifndef WIN32
785 ev_ref (EV_A); /* child watcher */ 898 ev_ref (EV_A); /* child watcher */
786 ev_signal_stop (EV_A_ &childev); 899 ev_signal_stop (EV_A_ &childev);
900#endif
787 901
788 ev_ref (EV_A); /* signal watcher */ 902 ev_ref (EV_A); /* signal watcher */
789 ev_io_stop (EV_A_ &sigev); 903 ev_io_stop (EV_A_ &sigev);
790 904
791 close (sigpipe [0]); sigpipe [0] = 0; 905 close (sigpipe [0]); sigpipe [0] = 0;
… …
799{ 913{
800#if EV_MULTIPLICITY 914#if EV_MULTIPLICITY
801 struct ev_loop *loop = default_loop; 915 struct ev_loop *loop = default_loop;
802#endif 916#endif
803 917
804 loop_fork (EV_A); 918 if (method)
805 919 postfork = 1;
806 ev_io_stop (EV_A_ &sigev);
807 close (sigpipe [0]);
808 close (sigpipe [1]);
809 pipe (sigpipe);
810
811 ev_ref (EV_A); /* signal watcher */
812 siginit (EV_A);
813} 920}
814 921
815/*****************************************************************************/ 922/*****************************************************************************/
923
924static int
925any_pending (EV_P)
926{
927 int pri;
928
929 for (pri = NUMPRI; pri--; )
930 if (pendingcnt [pri])
931 return 1;
932
933 return 0;
934}
816 935
817static void 936static void
818call_pending (EV_P) 937call_pending (EV_P)
819{ 938{
820 int pri; 939 int pri;
… …
849 downheap ((WT *)timers, timercnt, 0); 968 downheap ((WT *)timers, timercnt, 0);
850 } 969 }
851 else 970 else
852 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
853 972
854 event (EV_A_ (W)w, EV_TIMEOUT); 973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
855 } 974 }
856} 975}
857 976
858static void 977static void
859periodics_reify (EV_P) 978periodics_reify (EV_P)
… …
863 struct ev_periodic *w = periodics [0]; 982 struct ev_periodic *w = periodics [0];
864 983
865 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 984 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
866 985
867 /* first reschedule or stop timer */ 986 /* first reschedule or stop timer */
987 if (w->reschedule_cb)
988 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
990
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0);
993 }
868 if (w->interval) 994 else if (w->interval)
869 { 995 {
870 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 996 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
871 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 997 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
872 downheap ((WT *)periodics, periodiccnt, 0); 998 downheap ((WT *)periodics, periodiccnt, 0);
873 } 999 }
874 else 1000 else
875 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
876 1002
877 event (EV_A_ (W)w, EV_PERIODIC); 1003 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
878 } 1004 }
879} 1005}
880 1006
881static void 1007static void
882periodics_reschedule (EV_P) 1008periodics_reschedule (EV_P)
… …
886 /* adjust periodics after time jump */ 1012 /* adjust periodics after time jump */
887 for (i = 0; i < periodiccnt; ++i) 1013 for (i = 0; i < periodiccnt; ++i)
888 { 1014 {
889 struct ev_periodic *w = periodics [i]; 1015 struct ev_periodic *w = periodics [i];
890 1016
1017 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now);
891 if (w->interval) 1019 else if (w->interval)
892 {
893 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1020 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
894
895 if (fabs (diff) >= 1e-4)
896 {
897 ev_periodic_stop (EV_A_ w);
898 ev_periodic_start (EV_A_ w);
899
900 i = 0; /* restart loop, inefficient, but time jumps should be rare */
901 }
902 }
903 } 1021 }
1022
1023 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i);
904} 1026}
905 1027
906inline int 1028inline int
907time_update_monotonic (EV_P) 1029time_update_monotonic (EV_P)
908{ 1030{
… …
995 { 1117 {
996 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1118 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
997 call_pending (EV_A); 1119 call_pending (EV_A);
998 } 1120 }
999 1121
1122 /* we might have forked, so reify kernel state if necessary */
1123 if (expect_false (postfork))
1124 loop_fork (EV_A);
1125
1000 /* update fd-related kernel structures */ 1126 /* update fd-related kernel structures */
1001 fd_reify (EV_A); 1127 fd_reify (EV_A);
1002 1128
1003 /* calculate blocking time */ 1129 /* calculate blocking time */
1004 1130
1005 /* we only need this for !monotonic clockor timers, but as we basically 1131 /* we only need this for !monotonic clock or timers, but as we basically
1006 always have timers, we just calculate it always */ 1132 always have timers, we just calculate it always */
1007#if EV_USE_MONOTONIC 1133#if EV_USE_MONOTONIC
1008 if (expect_true (have_monotonic)) 1134 if (expect_true (have_monotonic))
1009 time_update_monotonic (EV_A); 1135 time_update_monotonic (EV_A);
1010 else 1136 else
… …
1043 /* queue pending timers and reschedule them */ 1169 /* queue pending timers and reschedule them */
1044 timers_reify (EV_A); /* relative timers called last */ 1170 timers_reify (EV_A); /* relative timers called last */
1045 periodics_reify (EV_A); /* absolute timers called first */ 1171 periodics_reify (EV_A); /* absolute timers called first */
1046 1172
1047 /* queue idle watchers unless io or timers are pending */ 1173 /* queue idle watchers unless io or timers are pending */
1048 if (!pendingcnt) 1174 if (idlecnt && !any_pending (EV_A))
1049 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1050 1176
1051 /* queue check watchers, to be executed first */ 1177 /* queue check watchers, to be executed first */
1052 if (checkcnt) 1178 if (checkcnt)
1053 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1179 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1128 return; 1254 return;
1129 1255
1130 assert (("ev_io_start called with negative fd", fd >= 0)); 1256 assert (("ev_io_start called with negative fd", fd >= 0));
1131 1257
1132 ev_start (EV_A_ (W)w, 1); 1258 ev_start (EV_A_ (W)w, 1);
1133 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1259 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1134 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1260 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1135 1261
1136 fd_change (EV_A_ fd); 1262 fd_change (EV_A_ fd);
1137} 1263}
1138 1264
… …
1158 ((WT)w)->at += mn_now; 1284 ((WT)w)->at += mn_now;
1159 1285
1160 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1286 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1161 1287
1162 ev_start (EV_A_ (W)w, ++timercnt); 1288 ev_start (EV_A_ (W)w, ++timercnt);
1163 array_needsize (timers, timermax, timercnt, ); 1289 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1164 timers [timercnt - 1] = w; 1290 timers [timercnt - 1] = w;
1165 upheap ((WT *)timers, timercnt - 1); 1291 upheap ((WT *)timers, timercnt - 1);
1166 1292
1167 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1293 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1168} 1294}
… …
1208ev_periodic_start (EV_P_ struct ev_periodic *w) 1334ev_periodic_start (EV_P_ struct ev_periodic *w)
1209{ 1335{
1210 if (ev_is_active (w)) 1336 if (ev_is_active (w))
1211 return; 1337 return;
1212 1338
1339 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1341 else if (w->interval)
1342 {
1213 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1343 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1214
1215 /* this formula differs from the one in periodic_reify because we do not always round up */ 1344 /* this formula differs from the one in periodic_reify because we do not always round up */
1216 if (w->interval)
1217 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1345 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 }
1218 1347
1219 ev_start (EV_A_ (W)w, ++periodiccnt); 1348 ev_start (EV_A_ (W)w, ++periodiccnt);
1220 array_needsize (periodics, periodicmax, periodiccnt, ); 1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1221 periodics [periodiccnt - 1] = w; 1350 periodics [periodiccnt - 1] = w;
1222 upheap ((WT *)periodics, periodiccnt - 1); 1351 upheap ((WT *)periodics, periodiccnt - 1);
1223 1352
1224 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1353 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1225} 1354}
… …
1241 1370
1242 ev_stop (EV_A_ (W)w); 1371 ev_stop (EV_A_ (W)w);
1243} 1372}
1244 1373
1245void 1374void
1375ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{
1377 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w);
1379}
1380
1381void
1246ev_idle_start (EV_P_ struct ev_idle *w) 1382ev_idle_start (EV_P_ struct ev_idle *w)
1247{ 1383{
1248 if (ev_is_active (w)) 1384 if (ev_is_active (w))
1249 return; 1385 return;
1250 1386
1251 ev_start (EV_A_ (W)w, ++idlecnt); 1387 ev_start (EV_A_ (W)w, ++idlecnt);
1252 array_needsize (idles, idlemax, idlecnt, ); 1388 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1253 idles [idlecnt - 1] = w; 1389 idles [idlecnt - 1] = w;
1254} 1390}
1255 1391
1256void 1392void
1257ev_idle_stop (EV_P_ struct ev_idle *w) 1393ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1269{ 1405{
1270 if (ev_is_active (w)) 1406 if (ev_is_active (w))
1271 return; 1407 return;
1272 1408
1273 ev_start (EV_A_ (W)w, ++preparecnt); 1409 ev_start (EV_A_ (W)w, ++preparecnt);
1274 array_needsize (prepares, preparemax, preparecnt, ); 1410 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1275 prepares [preparecnt - 1] = w; 1411 prepares [preparecnt - 1] = w;
1276} 1412}
1277 1413
1278void 1414void
1279ev_prepare_stop (EV_P_ struct ev_prepare *w) 1415ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1291{ 1427{
1292 if (ev_is_active (w)) 1428 if (ev_is_active (w))
1293 return; 1429 return;
1294 1430
1295 ev_start (EV_A_ (W)w, ++checkcnt); 1431 ev_start (EV_A_ (W)w, ++checkcnt);
1296 array_needsize (checks, checkmax, checkcnt, ); 1432 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1297 checks [checkcnt - 1] = w; 1433 checks [checkcnt - 1] = w;
1298} 1434}
1299 1435
1300void 1436void
1301ev_check_stop (EV_P_ struct ev_check *w) 1437ev_check_stop (EV_P_ struct ev_check *w)
… …
1322 return; 1458 return;
1323 1459
1324 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1460 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1325 1461
1326 ev_start (EV_A_ (W)w, 1); 1462 ev_start (EV_A_ (W)w, 1);
1327 array_needsize (signals, signalmax, w->signum, signals_init); 1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1328 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1329 1465
1330 if (!((WL)w)->next) 1466 if (!((WL)w)->next)
1331 { 1467 {
1332#if WIN32 1468#if WIN32
… …
1395 void (*cb)(int revents, void *arg) = once->cb; 1531 void (*cb)(int revents, void *arg) = once->cb;
1396 void *arg = once->arg; 1532 void *arg = once->arg;
1397 1533
1398 ev_io_stop (EV_A_ &once->io); 1534 ev_io_stop (EV_A_ &once->io);
1399 ev_timer_stop (EV_A_ &once->to); 1535 ev_timer_stop (EV_A_ &once->to);
1400 free (once); 1536 ev_free (once);
1401 1537
1402 cb (revents, arg); 1538 cb (revents, arg);
1403} 1539}
1404 1540
1405static void 1541static void
… …
1415} 1551}
1416 1552
1417void 1553void
1418ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1554ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1419{ 1555{
1420 struct ev_once *once = malloc (sizeof (struct ev_once)); 1556 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1421 1557
1422 if (!once) 1558 if (!once)
1423 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1559 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1424 else 1560 else
1425 { 1561 {

Diff Legend

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