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.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
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 347inline void
294fd_event (EV_P_ int fd, int events) 348fd_event (EV_P_ int fd, int revents)
295{ 349{
296 ANFD *anfd = anfds + fd; 350 ANFD *anfd = anfds + fd;
297 struct ev_io *w; 351 struct ev_io *w;
298 352
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 & revents;
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 }
360}
361
362void
363ev_feed_fd_event (EV_P_ int fd, int revents)
364{
365 fd_event (EV_A_ fd, revents);
306} 366}
307 367
308/*****************************************************************************/ 368/*****************************************************************************/
309 369
310static void 370static void
… …
333} 393}
334 394
335static void 395static void
336fd_change (EV_P_ int fd) 396fd_change (EV_P_ int fd)
337{ 397{
338 if (anfds [fd].reify || fdchangecnt < 0) 398 if (anfds [fd].reify)
339 return; 399 return;
340 400
341 anfds [fd].reify = 1; 401 anfds [fd].reify = 1;
342 402
343 ++fdchangecnt; 403 ++fdchangecnt;
344 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 404 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
345 fdchanges [fdchangecnt - 1] = fd; 405 fdchanges [fdchangecnt - 1] = fd;
346} 406}
347 407
348static void 408static void
349fd_kill (EV_P_ int fd) 409fd_kill (EV_P_ int fd)
… …
351 struct ev_io *w; 411 struct ev_io *w;
352 412
353 while ((w = (struct ev_io *)anfds [fd].head)) 413 while ((w = (struct ev_io *)anfds [fd].head))
354 { 414 {
355 ev_io_stop (EV_A_ w); 415 ev_io_stop (EV_A_ w);
356 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);
357 } 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
358} 428}
359 429
360/* called on EBADF to verify fds */ 430/* called on EBADF to verify fds */
361static void 431static void
362fd_ebadf (EV_P) 432fd_ebadf (EV_P)
363{ 433{
364 int fd; 434 int fd;
365 435
366 for (fd = 0; fd < anfdmax; ++fd) 436 for (fd = 0; fd < anfdmax; ++fd)
367 if (anfds [fd].events) 437 if (anfds [fd].events)
368 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 438 if (!fd_valid (fd) == -1 && errno == EBADF)
369 fd_kill (EV_A_ fd); 439 fd_kill (EV_A_ fd);
370} 440}
371 441
372/* 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 */
373static void 443static void
… …
376 int fd; 446 int fd;
377 447
378 for (fd = anfdmax; fd--; ) 448 for (fd = anfdmax; fd--; )
379 if (anfds [fd].events) 449 if (anfds [fd].events)
380 { 450 {
381 close (fd);
382 fd_kill (EV_A_ fd); 451 fd_kill (EV_A_ fd);
383 return; 452 return;
384 } 453 }
385} 454}
386 455
387/* 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 */
388static void 457static void
389fd_rearm_all (EV_P) 458fd_rearm_all (EV_P)
390{ 459{
391 int fd; 460 int fd;
392 461
… …
444 513
445/*****************************************************************************/ 514/*****************************************************************************/
446 515
447typedef struct 516typedef struct
448{ 517{
449 struct ev_watcher_list *head; 518 WL head;
450 sig_atomic_t volatile gotsig; 519 sig_atomic_t volatile gotsig;
451} ANSIG; 520} ANSIG;
452 521
453static ANSIG *signals; 522static ANSIG *signals;
454static int signalmax; 523static int signalmax;
… …
480 549
481 if (!gotsig) 550 if (!gotsig)
482 { 551 {
483 int old_errno = errno; 552 int old_errno = errno;
484 gotsig = 1; 553 gotsig = 1;
554#ifdef WIN32
555 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
556#else
485 write (sigpipe [1], &signum, 1); 557 write (sigpipe [1], &signum, 1);
558#endif
486 errno = old_errno; 559 errno = old_errno;
487 } 560 }
488} 561}
489 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);
579}
580
490static void 581static void
491sigcb (EV_P_ struct ev_io *iow, int revents) 582sigcb (EV_P_ struct ev_io *iow, int revents)
492{ 583{
493 struct ev_watcher_list *w; 584 WL w;
494 int signum; 585 int signum;
495 586
587#ifdef WIN32
588 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
589#else
496 read (sigpipe [0], &revents, 1); 590 read (sigpipe [0], &revents, 1);
591#endif
497 gotsig = 0; 592 gotsig = 0;
498 593
499 for (signum = signalmax; signum--; ) 594 for (signum = signalmax; signum--; )
500 if (signals [signum].gotsig) 595 if (signals [signum].gotsig)
501 { 596 sigevent (EV_A_ signum + 1);
502 signals [signum].gotsig = 0;
503
504 for (w = signals [signum].head; w; w = w->next)
505 event (EV_A_ (W)w, EV_SIGNAL);
506 }
507} 597}
508 598
509static void 599static void
510siginit (EV_P) 600siginit (EV_P)
511{ 601{
… …
523 ev_unref (EV_A); /* child watcher should not keep loop alive */ 613 ev_unref (EV_A); /* child watcher should not keep loop alive */
524} 614}
525 615
526/*****************************************************************************/ 616/*****************************************************************************/
527 617
618static struct ev_child *childs [PID_HASHSIZE];
619
528#ifndef WIN32 620#ifndef WIN32
529 621
530static struct ev_child *childs [PID_HASHSIZE];
531static struct ev_signal childev; 622static struct ev_signal childev;
532 623
533#ifndef WCONTINUED 624#ifndef WCONTINUED
534# define WCONTINUED 0 625# define WCONTINUED 0
535#endif 626#endif
… …
543 if (w->pid == pid || !w->pid) 634 if (w->pid == pid || !w->pid)
544 { 635 {
545 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 636 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
546 w->rpid = pid; 637 w->rpid = pid;
547 w->rstatus = status; 638 w->rstatus = status;
548 event (EV_A_ (W)w, EV_CHILD); 639 ev_feed_event (EV_A_ (W)w, EV_CHILD);
549 } 640 }
550} 641}
551 642
552static void 643static void
553childcb (EV_P_ struct ev_signal *sw, int revents) 644childcb (EV_P_ struct ev_signal *sw, int revents)
… …
555 int pid, status; 646 int pid, status;
556 647
557 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 648 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
558 { 649 {
559 /* 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 */
560 event (EV_A_ (W)sw, EV_SIGNAL); 651 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
561 652
562 child_reap (EV_A_ sw, pid, pid, status); 653 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 */ 654 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
564 } 655 }
565} 656}
… …
649 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 740 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
650#endif 741#endif
651#if EV_USE_SELECT 742#if EV_USE_SELECT
652 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 743 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
653#endif 744#endif
745
746 ev_watcher_init (&sigev, sigcb);
747 ev_set_priority (&sigev, EV_MAXPRI);
654 } 748 }
655} 749}
656 750
657void 751void
658loop_destroy (EV_P) 752loop_destroy (EV_P)
… …
676#endif 770#endif
677 771
678 for (i = NUMPRI; i--; ) 772 for (i = NUMPRI; i--; )
679 array_free (pending, [i]); 773 array_free (pending, [i]);
680 774
775 /* have to use the microsoft-never-gets-it-right macro */
681 array_free (fdchange, ); 776 array_free_microshit (fdchange);
682 array_free (timer, ); 777 array_free_microshit (timer);
683 array_free (periodic, ); 778 array_free_microshit (periodic);
684 array_free (idle, ); 779 array_free_microshit (idle);
685 array_free (prepare, ); 780 array_free_microshit (prepare);
686 array_free (check, ); 781 array_free_microshit (check);
687 782
688 method = 0; 783 method = 0;
689 /*TODO*/
690} 784}
691 785
692void 786static void
693loop_fork (EV_P) 787loop_fork (EV_P)
694{ 788{
695 /*TODO*/
696#if EV_USE_EPOLL 789#if EV_USE_EPOLL
697 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 790 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
698#endif 791#endif
699#if EV_USE_KQUEUE 792#if EV_USE_KQUEUE
700 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 793 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
701#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;
702} 812}
703 813
704#if EV_MULTIPLICITY 814#if EV_MULTIPLICITY
705struct ev_loop * 815struct ev_loop *
706ev_loop_new (int methods) 816ev_loop_new (int methods)
707{ 817{
708 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 818 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
819
820 memset (loop, 0, sizeof (struct ev_loop));
709 821
710 loop_init (EV_A_ methods); 822 loop_init (EV_A_ methods);
711 823
712 if (ev_method (EV_A)) 824 if (ev_method (EV_A))
713 return loop; 825 return loop;
… …
717 829
718void 830void
719ev_loop_destroy (EV_P) 831ev_loop_destroy (EV_P)
720{ 832{
721 loop_destroy (EV_A); 833 loop_destroy (EV_A);
722 free (loop); 834 ev_free (loop);
723} 835}
724 836
725void 837void
726ev_loop_fork (EV_P) 838ev_loop_fork (EV_P)
727{ 839{
728 loop_fork (EV_A); 840 postfork = 1;
729} 841}
730 842
731#endif 843#endif
732 844
733#if EV_MULTIPLICITY 845#if EV_MULTIPLICITY
… …
756 868
757 loop_init (EV_A_ methods); 869 loop_init (EV_A_ methods);
758 870
759 if (ev_method (EV_A)) 871 if (ev_method (EV_A))
760 { 872 {
761 ev_watcher_init (&sigev, sigcb);
762 ev_set_priority (&sigev, EV_MAXPRI);
763 siginit (EV_A); 873 siginit (EV_A);
764 874
765#ifndef WIN32 875#ifndef WIN32
766 ev_signal_init (&childev, childcb, SIGCHLD); 876 ev_signal_init (&childev, childcb, SIGCHLD);
767 ev_set_priority (&childev, EV_MAXPRI); 877 ev_set_priority (&childev, EV_MAXPRI);
… …
781{ 891{
782#if EV_MULTIPLICITY 892#if EV_MULTIPLICITY
783 struct ev_loop *loop = default_loop; 893 struct ev_loop *loop = default_loop;
784#endif 894#endif
785 895
896#ifndef WIN32
786 ev_ref (EV_A); /* child watcher */ 897 ev_ref (EV_A); /* child watcher */
787 ev_signal_stop (EV_A_ &childev); 898 ev_signal_stop (EV_A_ &childev);
899#endif
788 900
789 ev_ref (EV_A); /* signal watcher */ 901 ev_ref (EV_A); /* signal watcher */
790 ev_io_stop (EV_A_ &sigev); 902 ev_io_stop (EV_A_ &sigev);
791 903
792 close (sigpipe [0]); sigpipe [0] = 0; 904 close (sigpipe [0]); sigpipe [0] = 0;
… …
800{ 912{
801#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
802 struct ev_loop *loop = default_loop; 914 struct ev_loop *loop = default_loop;
803#endif 915#endif
804 916
805 loop_fork (EV_A); 917 if (method)
806 918 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} 919}
815 920
816/*****************************************************************************/ 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}
817 934
818static void 935static void
819call_pending (EV_P) 936call_pending (EV_P)
820{ 937{
821 int pri; 938 int pri;
… …
850 downheap ((WT *)timers, timercnt, 0); 967 downheap ((WT *)timers, timercnt, 0);
851 } 968 }
852 else 969 else
853 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 970 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
854 971
855 event (EV_A_ (W)w, EV_TIMEOUT); 972 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
856 } 973 }
857} 974}
858 975
859static void 976static void
860periodics_reify (EV_P) 977periodics_reify (EV_P)
… …
864 struct ev_periodic *w = periodics [0]; 981 struct ev_periodic *w = periodics [0];
865 982
866 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 983 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
867 984
868 /* 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 }
869 if (w->interval) 993 else if (w->interval)
870 { 994 {
871 ((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;
872 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));
873 downheap ((WT *)periodics, periodiccnt, 0); 997 downheap ((WT *)periodics, periodiccnt, 0);
874 } 998 }
875 else 999 else
876 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1000 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
877 1001
878 event (EV_A_ (W)w, EV_PERIODIC); 1002 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
879 } 1003 }
880} 1004}
881 1005
882static void 1006static void
883periodics_reschedule (EV_P) 1007periodics_reschedule (EV_P)
… …
887 /* adjust periodics after time jump */ 1011 /* adjust periodics after time jump */
888 for (i = 0; i < periodiccnt; ++i) 1012 for (i = 0; i < periodiccnt; ++i)
889 { 1013 {
890 struct ev_periodic *w = periodics [i]; 1014 struct ev_periodic *w = periodics [i];
891 1015
1016 if (w->reschedule_cb)
1017 ((WT)w)->at = w->reschedule_cb (w, rt_now);
892 if (w->interval) 1018 else if (w->interval)
893 {
894 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;
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 } 1020 }
1021
1022 /* now rebuild the heap */
1023 for (i = periodiccnt >> 1; i--; )
1024 downheap ((WT *)periodics, periodiccnt, i);
905} 1025}
906 1026
907inline int 1027inline int
908time_update_monotonic (EV_P) 1028time_update_monotonic (EV_P)
909{ 1029{
… …
996 { 1116 {
997 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1117 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
998 call_pending (EV_A); 1118 call_pending (EV_A);
999 } 1119 }
1000 1120
1121 /* we might have forked, so reify kernel state if necessary */
1122 if (expect_false (postfork))
1123 loop_fork (EV_A);
1124
1001 /* update fd-related kernel structures */ 1125 /* update fd-related kernel structures */
1002 fd_reify (EV_A); 1126 fd_reify (EV_A);
1003 1127
1004 /* calculate blocking time */ 1128 /* calculate blocking time */
1005 1129
1006 /* 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
1007 always have timers, we just calculate it always */ 1131 always have timers, we just calculate it always */
1008#if EV_USE_MONOTONIC 1132#if EV_USE_MONOTONIC
1009 if (expect_true (have_monotonic)) 1133 if (expect_true (have_monotonic))
1010 time_update_monotonic (EV_A); 1134 time_update_monotonic (EV_A);
1011 else 1135 else
… …
1044 /* queue pending timers and reschedule them */ 1168 /* queue pending timers and reschedule them */
1045 timers_reify (EV_A); /* relative timers called last */ 1169 timers_reify (EV_A); /* relative timers called last */
1046 periodics_reify (EV_A); /* absolute timers called first */ 1170 periodics_reify (EV_A); /* absolute timers called first */
1047 1171
1048 /* queue idle watchers unless io or timers are pending */ 1172 /* queue idle watchers unless io or timers are pending */
1049 if (!pendingcnt) 1173 if (idlecnt && !any_pending (EV_A))
1050 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1174 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1051 1175
1052 /* queue check watchers, to be executed first */ 1176 /* queue check watchers, to be executed first */
1053 if (checkcnt) 1177 if (checkcnt)
1054 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1178 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1129 return; 1253 return;
1130 1254
1131 assert (("ev_io_start called with negative fd", fd >= 0)); 1255 assert (("ev_io_start called with negative fd", fd >= 0));
1132 1256
1133 ev_start (EV_A_ (W)w, 1); 1257 ev_start (EV_A_ (W)w, 1);
1134 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1258 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1135 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1259 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1136 1260
1137 fd_change (EV_A_ fd); 1261 fd_change (EV_A_ fd);
1138} 1262}
1139 1263
… …
1159 ((WT)w)->at += mn_now; 1283 ((WT)w)->at += mn_now;
1160 1284
1161 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.));
1162 1286
1163 ev_start (EV_A_ (W)w, ++timercnt); 1287 ev_start (EV_A_ (W)w, ++timercnt);
1164 array_needsize (timers, timermax, timercnt, ); 1288 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1165 timers [timercnt - 1] = w; 1289 timers [timercnt - 1] = w;
1166 upheap ((WT *)timers, timercnt - 1); 1290 upheap ((WT *)timers, timercnt - 1);
1167 1291
1168 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1292 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1169} 1293}
… …
1209ev_periodic_start (EV_P_ struct ev_periodic *w) 1333ev_periodic_start (EV_P_ struct ev_periodic *w)
1210{ 1334{
1211 if (ev_is_active (w)) 1335 if (ev_is_active (w))
1212 return; 1336 return;
1213 1337
1338 if (w->reschedule_cb)
1339 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1340 else if (w->interval)
1341 {
1214 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.));
1215
1216 /* 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 */
1217 if (w->interval)
1218 ((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 }
1219 1346
1220 ev_start (EV_A_ (W)w, ++periodiccnt); 1347 ev_start (EV_A_ (W)w, ++periodiccnt);
1221 array_needsize (periodics, periodicmax, periodiccnt, ); 1348 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1222 periodics [periodiccnt - 1] = w; 1349 periodics [periodiccnt - 1] = w;
1223 upheap ((WT *)periodics, periodiccnt - 1); 1350 upheap ((WT *)periodics, periodiccnt - 1);
1224 1351
1225 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1352 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1226} 1353}
… …
1242 1369
1243 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1244} 1371}
1245 1372
1246void 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
1247ev_idle_start (EV_P_ struct ev_idle *w) 1381ev_idle_start (EV_P_ struct ev_idle *w)
1248{ 1382{
1249 if (ev_is_active (w)) 1383 if (ev_is_active (w))
1250 return; 1384 return;
1251 1385
1252 ev_start (EV_A_ (W)w, ++idlecnt); 1386 ev_start (EV_A_ (W)w, ++idlecnt);
1253 array_needsize (idles, idlemax, idlecnt, ); 1387 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1254 idles [idlecnt - 1] = w; 1388 idles [idlecnt - 1] = w;
1255} 1389}
1256 1390
1257void 1391void
1258ev_idle_stop (EV_P_ struct ev_idle *w) 1392ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1270{ 1404{
1271 if (ev_is_active (w)) 1405 if (ev_is_active (w))
1272 return; 1406 return;
1273 1407
1274 ev_start (EV_A_ (W)w, ++preparecnt); 1408 ev_start (EV_A_ (W)w, ++preparecnt);
1275 array_needsize (prepares, preparemax, preparecnt, ); 1409 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1276 prepares [preparecnt - 1] = w; 1410 prepares [preparecnt - 1] = w;
1277} 1411}
1278 1412
1279void 1413void
1280ev_prepare_stop (EV_P_ struct ev_prepare *w) 1414ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1292{ 1426{
1293 if (ev_is_active (w)) 1427 if (ev_is_active (w))
1294 return; 1428 return;
1295 1429
1296 ev_start (EV_A_ (W)w, ++checkcnt); 1430 ev_start (EV_A_ (W)w, ++checkcnt);
1297 array_needsize (checks, checkmax, checkcnt, ); 1431 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1298 checks [checkcnt - 1] = w; 1432 checks [checkcnt - 1] = w;
1299} 1433}
1300 1434
1301void 1435void
1302ev_check_stop (EV_P_ struct ev_check *w) 1436ev_check_stop (EV_P_ struct ev_check *w)
… …
1323 return; 1457 return;
1324 1458
1325 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));
1326 1460
1327 ev_start (EV_A_ (W)w, 1); 1461 ev_start (EV_A_ (W)w, 1);
1328 array_needsize (signals, signalmax, w->signum, signals_init); 1462 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1329 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1463 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1330 1464
1331 if (!((WL)w)->next) 1465 if (!((WL)w)->next)
1332 { 1466 {
1333#if WIN32 1467#if WIN32
… …
1396 void (*cb)(int revents, void *arg) = once->cb; 1530 void (*cb)(int revents, void *arg) = once->cb;
1397 void *arg = once->arg; 1531 void *arg = once->arg;
1398 1532
1399 ev_io_stop (EV_A_ &once->io); 1533 ev_io_stop (EV_A_ &once->io);
1400 ev_timer_stop (EV_A_ &once->to); 1534 ev_timer_stop (EV_A_ &once->to);
1401 free (once); 1535 ev_free (once);
1402 1536
1403 cb (revents, arg); 1537 cb (revents, arg);
1404} 1538}
1405 1539
1406static void 1540static void
… …
1416} 1550}
1417 1551
1418void 1552void
1419ev_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)
1420{ 1554{
1421 struct ev_once *once = malloc (sizeof (struct ev_once)); 1555 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1422 1556
1423 if (!once) 1557 if (!once)
1424 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1558 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1425 else 1559 else
1426 { 1560 {

Diff Legend

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