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

Comparing libev/ev.c (file contents):
Revision 1.69 by root, Tue Nov 6 00:10:04 2007 UTC vs.
Revision 1.82 by root, Fri Nov 9 20:55:09 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
… …
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
127 130
131#ifdef EV_H
132# include EV_H
133#else
128#include "ev.h" 134# include "ev.h"
135#endif
129 136
130#if __GNUC__ >= 3 137#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 138# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 139# define inline inline
133#else 140#else
… …
145typedef struct ev_watcher_list *WL; 152typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 153typedef struct ev_watcher_time *WT;
147 154
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 156
150#if WIN32 157#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 158
156/*****************************************************************************/ 159/*****************************************************************************/
157 160
158static void (*syserr_cb)(void); 161static void (*syserr_cb)(const char *msg);
159 162
160void ev_set_syserr_cb (void (*cb)(void)) 163void ev_set_syserr_cb (void (*cb)(const char *msg))
161{ 164{
162 syserr_cb = cb; 165 syserr_cb = cb;
163} 166}
164 167
165static void 168static void
166syserr (void) 169syserr (const char *msg)
167{ 170{
171 if (!msg)
172 msg = "(libev) system error";
173
168 if (syserr_cb) 174 if (syserr_cb)
169 syserr_cb (); 175 syserr_cb (msg);
170 else 176 else
171 { 177 {
172 perror ("libev"); 178 perror (msg);
173 abort (); 179 abort ();
174 } 180 }
175} 181}
176 182
177static void *(*alloc)(void *ptr, long size); 183static void *(*alloc)(void *ptr, long size);
… …
213 int events; 219 int events;
214} ANPENDING; 220} ANPENDING;
215 221
216#if EV_MULTIPLICITY 222#if EV_MULTIPLICITY
217 223
218struct ev_loop 224 struct ev_loop
219{ 225 {
220# define VAR(name,decl) decl; 226 #define VAR(name,decl) decl;
221# include "ev_vars.h" 227 #include "ev_vars.h"
222};
223# undef VAR 228 #undef VAR
229 };
224# include "ev_wrap.h" 230 #include "ev_wrap.h"
231
232 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop;
225 234
226#else 235#else
227 236
228# define VAR(name,decl) static decl; 237 #define VAR(name,decl) static decl;
229# include "ev_vars.h" 238 #include "ev_vars.h"
230# undef VAR 239 #undef VAR
240
241 static int default_loop;
231 242
232#endif 243#endif
233 244
234/*****************************************************************************/ 245/*****************************************************************************/
235 246
… …
266ev_now (EV_P) 277ev_now (EV_P)
267{ 278{
268 return rt_now; 279 return rt_now;
269} 280}
270 281
271#define array_roundsize(base,n) ((n) | 4 & ~3) 282#define array_roundsize(type,n) ((n) | 4 & ~3)
272 283
273#define array_needsize(base,cur,cnt,init) \ 284#define array_needsize(type,base,cur,cnt,init) \
274 if (expect_false ((cnt) > cur)) \ 285 if (expect_false ((cnt) > cur)) \
275 { \ 286 { \
276 int newcnt = cur; \ 287 int newcnt = cur; \
277 do \ 288 do \
278 { \ 289 { \
279 newcnt = array_roundsize (base, newcnt << 1); \ 290 newcnt = array_roundsize (type, newcnt << 1); \
280 } \ 291 } \
281 while ((cnt) > newcnt); \ 292 while ((cnt) > newcnt); \
282 \ 293 \
283 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 294 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
284 init (base + cur, newcnt - cur); \ 295 init (base + cur, newcnt - cur); \
285 cur = newcnt; \ 296 cur = newcnt; \
286 } 297 }
287 298
288#define array_slim(stem) \ 299#define array_slim(type,stem) \
289 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 300 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
290 { \ 301 { \
291 stem ## max = array_roundsize (stem ## cnt >> 1); \ 302 stem ## max = array_roundsize (stem ## cnt >> 1); \
292 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
293 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
294 } 305 }
306
307/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
308/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
309#define array_free_microshit(stem) \
310 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
295 311
296#define array_free(stem, idx) \ 312#define array_free(stem, idx) \
297 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 313 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
298 314
299/*****************************************************************************/ 315/*****************************************************************************/
… …
309 325
310 ++base; 326 ++base;
311 } 327 }
312} 328}
313 329
314static void 330void
315event (EV_P_ W w, int events) 331ev_feed_event (EV_P_ void *w, int revents)
316{ 332{
333 W w_ = (W)w;
334
317 if (w->pending) 335 if (w_->pending)
318 { 336 {
319 pendings [ABSPRI (w)][w->pending - 1].events |= events; 337 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
320 return; 338 return;
321 } 339 }
322 340
323 w->pending = ++pendingcnt [ABSPRI (w)]; 341 w_->pending = ++pendingcnt [ABSPRI (w_)];
324 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 342 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
325 pendings [ABSPRI (w)][w->pending - 1].w = w; 343 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
326 pendings [ABSPRI (w)][w->pending - 1].events = events; 344 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
327} 345}
328 346
329static void 347static void
330queue_events (EV_P_ W *events, int eventcnt, int type) 348queue_events (EV_P_ W *events, int eventcnt, int type)
331{ 349{
332 int i; 350 int i;
333 351
334 for (i = 0; i < eventcnt; ++i) 352 for (i = 0; i < eventcnt; ++i)
335 event (EV_A_ events [i], type); 353 ev_feed_event (EV_A_ events [i], type);
336} 354}
337 355
338static void 356inline void
339fd_event (EV_P_ int fd, int events) 357fd_event (EV_P_ int fd, int revents)
340{ 358{
341 ANFD *anfd = anfds + fd; 359 ANFD *anfd = anfds + fd;
342 struct ev_io *w; 360 struct ev_io *w;
343 361
344 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 362 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
345 { 363 {
346 int ev = w->events & events; 364 int ev = w->events & revents;
347 365
348 if (ev) 366 if (ev)
349 event (EV_A_ (W)w, ev); 367 ev_feed_event (EV_A_ (W)w, ev);
350 } 368 }
369}
370
371void
372ev_feed_fd_event (EV_P_ int fd, int revents)
373{
374 fd_event (EV_A_ fd, revents);
351} 375}
352 376
353/*****************************************************************************/ 377/*****************************************************************************/
354 378
355static void 379static void
… …
378} 402}
379 403
380static void 404static void
381fd_change (EV_P_ int fd) 405fd_change (EV_P_ int fd)
382{ 406{
383 if (anfds [fd].reify || fdchangecnt < 0) 407 if (anfds [fd].reify)
384 return; 408 return;
385 409
386 anfds [fd].reify = 1; 410 anfds [fd].reify = 1;
387 411
388 ++fdchangecnt; 412 ++fdchangecnt;
389 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 413 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
390 fdchanges [fdchangecnt - 1] = fd; 414 fdchanges [fdchangecnt - 1] = fd;
391} 415}
392 416
393static void 417static void
394fd_kill (EV_P_ int fd) 418fd_kill (EV_P_ int fd)
… …
396 struct ev_io *w; 420 struct ev_io *w;
397 421
398 while ((w = (struct ev_io *)anfds [fd].head)) 422 while ((w = (struct ev_io *)anfds [fd].head))
399 { 423 {
400 ev_io_stop (EV_A_ w); 424 ev_io_stop (EV_A_ w);
401 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 425 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
402 } 426 }
427}
428
429static int
430fd_valid (int fd)
431{
432#ifdef WIN32
433 return !!win32_get_osfhandle (fd);
434#else
435 return fcntl (fd, F_GETFD) != -1;
436#endif
403} 437}
404 438
405/* called on EBADF to verify fds */ 439/* called on EBADF to verify fds */
406static void 440static void
407fd_ebadf (EV_P) 441fd_ebadf (EV_P)
408{ 442{
409 int fd; 443 int fd;
410 444
411 for (fd = 0; fd < anfdmax; ++fd) 445 for (fd = 0; fd < anfdmax; ++fd)
412 if (anfds [fd].events) 446 if (anfds [fd].events)
413 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 447 if (!fd_valid (fd) == -1 && errno == EBADF)
414 fd_kill (EV_A_ fd); 448 fd_kill (EV_A_ fd);
415} 449}
416 450
417/* called on ENOMEM in select/poll to kill some fds and retry */ 451/* called on ENOMEM in select/poll to kill some fds and retry */
418static void 452static void
… …
426 fd_kill (EV_A_ fd); 460 fd_kill (EV_A_ fd);
427 return; 461 return;
428 } 462 }
429} 463}
430 464
431/* susually called after fork if method needs to re-arm all fds from scratch */ 465/* usually called after fork if method needs to re-arm all fds from scratch */
432static void 466static void
433fd_rearm_all (EV_P) 467fd_rearm_all (EV_P)
434{ 468{
435 int fd; 469 int fd;
436 470
… …
524 558
525 if (!gotsig) 559 if (!gotsig)
526 { 560 {
527 int old_errno = errno; 561 int old_errno = errno;
528 gotsig = 1; 562 gotsig = 1;
563#ifdef WIN32
564 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
565#else
529 write (sigpipe [1], &signum, 1); 566 write (sigpipe [1], &signum, 1);
567#endif
530 errno = old_errno; 568 errno = old_errno;
531 } 569 }
532} 570}
533 571
572void
573ev_feed_signal_event (EV_P_ int signum)
574{
575 WL w;
576
577#if EV_MULTIPLICITY
578 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
579#endif
580
581 --signum;
582
583 if (signum < 0 || signum >= signalmax)
584 return;
585
586 signals [signum].gotsig = 0;
587
588 for (w = signals [signum].head; w; w = w->next)
589 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
590}
591
534static void 592static void
535sigcb (EV_P_ struct ev_io *iow, int revents) 593sigcb (EV_P_ struct ev_io *iow, int revents)
536{ 594{
537 WL w;
538 int signum; 595 int signum;
539 596
597#ifdef WIN32
598 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
599#else
540 read (sigpipe [0], &revents, 1); 600 read (sigpipe [0], &revents, 1);
601#endif
541 gotsig = 0; 602 gotsig = 0;
542 603
543 for (signum = signalmax; signum--; ) 604 for (signum = signalmax; signum--; )
544 if (signals [signum].gotsig) 605 if (signals [signum].gotsig)
545 { 606 ev_feed_signal_event (EV_A_ signum + 1);
546 signals [signum].gotsig = 0;
547
548 for (w = signals [signum].head; w; w = w->next)
549 event (EV_A_ (W)w, EV_SIGNAL);
550 }
551} 607}
552 608
553static void 609static void
554siginit (EV_P) 610siginit (EV_P)
555{ 611{
… …
567 ev_unref (EV_A); /* child watcher should not keep loop alive */ 623 ev_unref (EV_A); /* child watcher should not keep loop alive */
568} 624}
569 625
570/*****************************************************************************/ 626/*****************************************************************************/
571 627
628static struct ev_child *childs [PID_HASHSIZE];
629
572#ifndef WIN32 630#ifndef WIN32
573 631
574static struct ev_child *childs [PID_HASHSIZE];
575static struct ev_signal childev; 632static struct ev_signal childev;
576 633
577#ifndef WCONTINUED 634#ifndef WCONTINUED
578# define WCONTINUED 0 635# define WCONTINUED 0
579#endif 636#endif
… …
587 if (w->pid == pid || !w->pid) 644 if (w->pid == pid || !w->pid)
588 { 645 {
589 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 646 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
590 w->rpid = pid; 647 w->rpid = pid;
591 w->rstatus = status; 648 w->rstatus = status;
592 event (EV_A_ (W)w, EV_CHILD); 649 ev_feed_event (EV_A_ (W)w, EV_CHILD);
593 } 650 }
594} 651}
595 652
596static void 653static void
597childcb (EV_P_ struct ev_signal *sw, int revents) 654childcb (EV_P_ struct ev_signal *sw, int revents)
… …
599 int pid, status; 656 int pid, status;
600 657
601 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 658 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
602 { 659 {
603 /* make sure we are called again until all childs have been reaped */ 660 /* make sure we are called again until all childs have been reaped */
604 event (EV_A_ (W)sw, EV_SIGNAL); 661 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
605 662
606 child_reap (EV_A_ sw, pid, pid, status); 663 child_reap (EV_A_ sw, pid, pid, status);
607 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 664 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
608 } 665 }
609} 666}
… …
693 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 750 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
694#endif 751#endif
695#if EV_USE_SELECT 752#if EV_USE_SELECT
696 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 753 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
697#endif 754#endif
755
756 ev_watcher_init (&sigev, sigcb);
757 ev_set_priority (&sigev, EV_MAXPRI);
698 } 758 }
699} 759}
700 760
701void 761void
702loop_destroy (EV_P) 762loop_destroy (EV_P)
… …
720#endif 780#endif
721 781
722 for (i = NUMPRI; i--; ) 782 for (i = NUMPRI; i--; )
723 array_free (pending, [i]); 783 array_free (pending, [i]);
724 784
785 /* have to use the microsoft-never-gets-it-right macro */
725 array_free (fdchange, ); 786 array_free_microshit (fdchange);
726 array_free (timer, ); 787 array_free_microshit (timer);
727 array_free (periodic, ); 788 array_free_microshit (periodic);
728 array_free (idle, ); 789 array_free_microshit (idle);
729 array_free (prepare, ); 790 array_free_microshit (prepare);
730 array_free (check, ); 791 array_free_microshit (check);
731 792
732 method = 0; 793 method = 0;
733 /*TODO*/
734} 794}
735 795
736void 796static void
737loop_fork (EV_P) 797loop_fork (EV_P)
738{ 798{
739 /*TODO*/
740#if EV_USE_EPOLL 799#if EV_USE_EPOLL
741 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 800 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
742#endif 801#endif
743#if EV_USE_KQUEUE 802#if EV_USE_KQUEUE
744 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 803 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
745#endif 804#endif
805
806 if (ev_is_active (&sigev))
807 {
808 /* default loop */
809
810 ev_ref (EV_A);
811 ev_io_stop (EV_A_ &sigev);
812 close (sigpipe [0]);
813 close (sigpipe [1]);
814
815 while (pipe (sigpipe))
816 syserr ("(libev) error creating pipe");
817
818 siginit (EV_A);
819 }
820
821 postfork = 0;
746} 822}
747 823
748#if EV_MULTIPLICITY 824#if EV_MULTIPLICITY
749struct ev_loop * 825struct ev_loop *
750ev_loop_new (int methods) 826ev_loop_new (int methods)
… …
769} 845}
770 846
771void 847void
772ev_loop_fork (EV_P) 848ev_loop_fork (EV_P)
773{ 849{
774 loop_fork (EV_A); 850 postfork = 1;
775} 851}
776 852
777#endif 853#endif
778 854
779#if EV_MULTIPLICITY 855#if EV_MULTIPLICITY
780struct ev_loop default_loop_struct;
781static struct ev_loop *default_loop;
782
783struct ev_loop * 856struct ev_loop *
784#else 857#else
785static int default_loop;
786
787int 858int
788#endif 859#endif
789ev_default_loop (int methods) 860ev_default_loop (int methods)
790{ 861{
791 if (sigpipe [0] == sigpipe [1]) 862 if (sigpipe [0] == sigpipe [1])
… …
802 873
803 loop_init (EV_A_ methods); 874 loop_init (EV_A_ methods);
804 875
805 if (ev_method (EV_A)) 876 if (ev_method (EV_A))
806 { 877 {
807 ev_watcher_init (&sigev, sigcb);
808 ev_set_priority (&sigev, EV_MAXPRI);
809 siginit (EV_A); 878 siginit (EV_A);
810 879
811#ifndef WIN32 880#ifndef WIN32
812 ev_signal_init (&childev, childcb, SIGCHLD); 881 ev_signal_init (&childev, childcb, SIGCHLD);
813 ev_set_priority (&childev, EV_MAXPRI); 882 ev_set_priority (&childev, EV_MAXPRI);
… …
827{ 896{
828#if EV_MULTIPLICITY 897#if EV_MULTIPLICITY
829 struct ev_loop *loop = default_loop; 898 struct ev_loop *loop = default_loop;
830#endif 899#endif
831 900
901#ifndef WIN32
832 ev_ref (EV_A); /* child watcher */ 902 ev_ref (EV_A); /* child watcher */
833 ev_signal_stop (EV_A_ &childev); 903 ev_signal_stop (EV_A_ &childev);
904#endif
834 905
835 ev_ref (EV_A); /* signal watcher */ 906 ev_ref (EV_A); /* signal watcher */
836 ev_io_stop (EV_A_ &sigev); 907 ev_io_stop (EV_A_ &sigev);
837 908
838 close (sigpipe [0]); sigpipe [0] = 0; 909 close (sigpipe [0]); sigpipe [0] = 0;
… …
846{ 917{
847#if EV_MULTIPLICITY 918#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop; 919 struct ev_loop *loop = default_loop;
849#endif 920#endif
850 921
851 loop_fork (EV_A); 922 if (method)
852 923 postfork = 1;
853 ev_io_stop (EV_A_ &sigev);
854 close (sigpipe [0]);
855 close (sigpipe [1]);
856 pipe (sigpipe);
857
858 ev_ref (EV_A); /* signal watcher */
859 siginit (EV_A);
860} 924}
861 925
862/*****************************************************************************/ 926/*****************************************************************************/
927
928static int
929any_pending (EV_P)
930{
931 int pri;
932
933 for (pri = NUMPRI; pri--; )
934 if (pendingcnt [pri])
935 return 1;
936
937 return 0;
938}
863 939
864static void 940static void
865call_pending (EV_P) 941call_pending (EV_P)
866{ 942{
867 int pri; 943 int pri;
… …
872 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 948 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
873 949
874 if (p->w) 950 if (p->w)
875 { 951 {
876 p->w->pending = 0; 952 p->w->pending = 0;
877 p->w->cb (EV_A_ p->w, p->events); 953 EV_CB_INVOKE (p->w, p->events);
878 } 954 }
879 } 955 }
880} 956}
881 957
882static void 958static void
… …
896 downheap ((WT *)timers, timercnt, 0); 972 downheap ((WT *)timers, timercnt, 0);
897 } 973 }
898 else 974 else
899 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 975 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
900 976
901 event (EV_A_ (W)w, EV_TIMEOUT); 977 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
902 } 978 }
903} 979}
904 980
905static void 981static void
906periodics_reify (EV_P) 982periodics_reify (EV_P)
… …
910 struct ev_periodic *w = periodics [0]; 986 struct ev_periodic *w = periodics [0];
911 987
912 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 988 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
913 989
914 /* first reschedule or stop timer */ 990 /* first reschedule or stop timer */
991 if (w->reschedule_cb)
992 {
993 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
994
995 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
996 downheap ((WT *)periodics, periodiccnt, 0);
997 }
915 if (w->interval) 998 else if (w->interval)
916 { 999 {
917 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1000 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
918 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1001 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
919 downheap ((WT *)periodics, periodiccnt, 0); 1002 downheap ((WT *)periodics, periodiccnt, 0);
920 } 1003 }
921 else 1004 else
922 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1005 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
923 1006
924 event (EV_A_ (W)w, EV_PERIODIC); 1007 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
925 } 1008 }
926} 1009}
927 1010
928static void 1011static void
929periodics_reschedule (EV_P) 1012periodics_reschedule (EV_P)
… …
933 /* adjust periodics after time jump */ 1016 /* adjust periodics after time jump */
934 for (i = 0; i < periodiccnt; ++i) 1017 for (i = 0; i < periodiccnt; ++i)
935 { 1018 {
936 struct ev_periodic *w = periodics [i]; 1019 struct ev_periodic *w = periodics [i];
937 1020
1021 if (w->reschedule_cb)
1022 ((WT)w)->at = w->reschedule_cb (w, rt_now);
938 if (w->interval) 1023 else if (w->interval)
939 {
940 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1024 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
941
942 if (fabs (diff) >= 1e-4)
943 {
944 ev_periodic_stop (EV_A_ w);
945 ev_periodic_start (EV_A_ w);
946
947 i = 0; /* restart loop, inefficient, but time jumps should be rare */
948 }
949 }
950 } 1025 }
1026
1027 /* now rebuild the heap */
1028 for (i = periodiccnt >> 1; i--; )
1029 downheap ((WT *)periodics, periodiccnt, i);
951} 1030}
952 1031
953inline int 1032inline int
954time_update_monotonic (EV_P) 1033time_update_monotonic (EV_P)
955{ 1034{
… …
1042 { 1121 {
1043 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1122 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1044 call_pending (EV_A); 1123 call_pending (EV_A);
1045 } 1124 }
1046 1125
1126 /* we might have forked, so reify kernel state if necessary */
1127 if (expect_false (postfork))
1128 loop_fork (EV_A);
1129
1047 /* update fd-related kernel structures */ 1130 /* update fd-related kernel structures */
1048 fd_reify (EV_A); 1131 fd_reify (EV_A);
1049 1132
1050 /* calculate blocking time */ 1133 /* calculate blocking time */
1051 1134
1052 /* we only need this for !monotonic clockor timers, but as we basically 1135 /* we only need this for !monotonic clock or timers, but as we basically
1053 always have timers, we just calculate it always */ 1136 always have timers, we just calculate it always */
1054#if EV_USE_MONOTONIC 1137#if EV_USE_MONOTONIC
1055 if (expect_true (have_monotonic)) 1138 if (expect_true (have_monotonic))
1056 time_update_monotonic (EV_A); 1139 time_update_monotonic (EV_A);
1057 else 1140 else
… …
1090 /* queue pending timers and reschedule them */ 1173 /* queue pending timers and reschedule them */
1091 timers_reify (EV_A); /* relative timers called last */ 1174 timers_reify (EV_A); /* relative timers called last */
1092 periodics_reify (EV_A); /* absolute timers called first */ 1175 periodics_reify (EV_A); /* absolute timers called first */
1093 1176
1094 /* queue idle watchers unless io or timers are pending */ 1177 /* queue idle watchers unless io or timers are pending */
1095 if (!pendingcnt) 1178 if (idlecnt && !any_pending (EV_A))
1096 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1179 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1097 1180
1098 /* queue check watchers, to be executed first */ 1181 /* queue check watchers, to be executed first */
1099 if (checkcnt) 1182 if (checkcnt)
1100 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1183 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1175 return; 1258 return;
1176 1259
1177 assert (("ev_io_start called with negative fd", fd >= 0)); 1260 assert (("ev_io_start called with negative fd", fd >= 0));
1178 1261
1179 ev_start (EV_A_ (W)w, 1); 1262 ev_start (EV_A_ (W)w, 1);
1180 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1263 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1181 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1264 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1182 1265
1183 fd_change (EV_A_ fd); 1266 fd_change (EV_A_ fd);
1184} 1267}
1185 1268
… …
1205 ((WT)w)->at += mn_now; 1288 ((WT)w)->at += mn_now;
1206 1289
1207 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1290 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1208 1291
1209 ev_start (EV_A_ (W)w, ++timercnt); 1292 ev_start (EV_A_ (W)w, ++timercnt);
1210 array_needsize (timers, timermax, timercnt, ); 1293 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1211 timers [timercnt - 1] = w; 1294 timers [timercnt - 1] = w;
1212 upheap ((WT *)timers, timercnt - 1); 1295 upheap ((WT *)timers, timercnt - 1);
1213 1296
1214 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1297 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1215} 1298}
… …
1255ev_periodic_start (EV_P_ struct ev_periodic *w) 1338ev_periodic_start (EV_P_ struct ev_periodic *w)
1256{ 1339{
1257 if (ev_is_active (w)) 1340 if (ev_is_active (w))
1258 return; 1341 return;
1259 1342
1343 if (w->reschedule_cb)
1344 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1345 else if (w->interval)
1346 {
1260 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1347 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1261
1262 /* this formula differs from the one in periodic_reify because we do not always round up */ 1348 /* this formula differs from the one in periodic_reify because we do not always round up */
1263 if (w->interval)
1264 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1349 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1350 }
1265 1351
1266 ev_start (EV_A_ (W)w, ++periodiccnt); 1352 ev_start (EV_A_ (W)w, ++periodiccnt);
1267 array_needsize (periodics, periodicmax, periodiccnt, ); 1353 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1268 periodics [periodiccnt - 1] = w; 1354 periodics [periodiccnt - 1] = w;
1269 upheap ((WT *)periodics, periodiccnt - 1); 1355 upheap ((WT *)periodics, periodiccnt - 1);
1270 1356
1271 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1357 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1272} 1358}
… …
1288 1374
1289 ev_stop (EV_A_ (W)w); 1375 ev_stop (EV_A_ (W)w);
1290} 1376}
1291 1377
1292void 1378void
1379ev_periodic_again (EV_P_ struct ev_periodic *w)
1380{
1381 ev_periodic_stop (EV_A_ w);
1382 ev_periodic_start (EV_A_ w);
1383}
1384
1385void
1293ev_idle_start (EV_P_ struct ev_idle *w) 1386ev_idle_start (EV_P_ struct ev_idle *w)
1294{ 1387{
1295 if (ev_is_active (w)) 1388 if (ev_is_active (w))
1296 return; 1389 return;
1297 1390
1298 ev_start (EV_A_ (W)w, ++idlecnt); 1391 ev_start (EV_A_ (W)w, ++idlecnt);
1299 array_needsize (idles, idlemax, idlecnt, ); 1392 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1300 idles [idlecnt - 1] = w; 1393 idles [idlecnt - 1] = w;
1301} 1394}
1302 1395
1303void 1396void
1304ev_idle_stop (EV_P_ struct ev_idle *w) 1397ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1316{ 1409{
1317 if (ev_is_active (w)) 1410 if (ev_is_active (w))
1318 return; 1411 return;
1319 1412
1320 ev_start (EV_A_ (W)w, ++preparecnt); 1413 ev_start (EV_A_ (W)w, ++preparecnt);
1321 array_needsize (prepares, preparemax, preparecnt, ); 1414 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1322 prepares [preparecnt - 1] = w; 1415 prepares [preparecnt - 1] = w;
1323} 1416}
1324 1417
1325void 1418void
1326ev_prepare_stop (EV_P_ struct ev_prepare *w) 1419ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1338{ 1431{
1339 if (ev_is_active (w)) 1432 if (ev_is_active (w))
1340 return; 1433 return;
1341 1434
1342 ev_start (EV_A_ (W)w, ++checkcnt); 1435 ev_start (EV_A_ (W)w, ++checkcnt);
1343 array_needsize (checks, checkmax, checkcnt, ); 1436 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1344 checks [checkcnt - 1] = w; 1437 checks [checkcnt - 1] = w;
1345} 1438}
1346 1439
1347void 1440void
1348ev_check_stop (EV_P_ struct ev_check *w) 1441ev_check_stop (EV_P_ struct ev_check *w)
… …
1369 return; 1462 return;
1370 1463
1371 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1464 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1372 1465
1373 ev_start (EV_A_ (W)w, 1); 1466 ev_start (EV_A_ (W)w, 1);
1374 array_needsize (signals, signalmax, w->signum, signals_init); 1467 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1375 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1468 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1376 1469
1377 if (!((WL)w)->next) 1470 if (!((WL)w)->next)
1378 { 1471 {
1379#if WIN32 1472#if WIN32
… …
1462} 1555}
1463 1556
1464void 1557void
1465ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1558ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1466{ 1559{
1467 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1560 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1468 1561
1469 if (!once) 1562 if (!once)
1470 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1563 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1471 else 1564 else
1472 { 1565 {

Diff Legend

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