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

Comparing libev/ev.c (file contents):
Revision 1.66 by root, Sun Nov 4 23:30:53 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
153#include "ev_win32.c"
154
150/*****************************************************************************/ 155/*****************************************************************************/
151 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
152typedef struct 205typedef struct
153{ 206{
154 struct ev_watcher_list *head; 207 WL head;
155 unsigned char events; 208 unsigned char events;
156 unsigned char reify; 209 unsigned char reify;
157} ANFD; 210} ANFD;
158 211
159typedef struct 212typedef struct
… …
215ev_now (EV_P) 268ev_now (EV_P)
216{ 269{
217 return rt_now; 270 return rt_now;
218} 271}
219 272
220#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
221 274
222#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
223 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
224 { \ 277 { \
225 int newcnt = cur; \ 278 int newcnt = cur; \
226 do \ 279 do \
227 { \ 280 { \
228 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
229 } \ 282 } \
230 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
231 \ 284 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
233 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
234 cur = newcnt; \ 287 cur = newcnt; \
235 } 288 }
289
290#define array_slim(type,stem) \
291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
292 { \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 }
297
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
236 302
237#define array_free(stem, idx) \ 303#define array_free(stem, idx) \
238 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
239 305
240/*****************************************************************************/ 306/*****************************************************************************/
241 307
242static void 308static void
243anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
250 316
251 ++base; 317 ++base;
252 } 318 }
253} 319}
254 320
255static void 321void
256event (EV_P_ W w, int events) 322ev_feed_event (EV_P_ void *w, int revents)
257{ 323{
324 W w_ = (W)w;
325
258 if (w->pending) 326 if (w_->pending)
259 { 327 {
260 pendings [ABSPRI (w)][w->pending - 1].events |= events; 328 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
261 return; 329 return;
262 } 330 }
263 331
264 w->pending = ++pendingcnt [ABSPRI (w)]; 332 w_->pending = ++pendingcnt [ABSPRI (w_)];
265 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));
266 pendings [ABSPRI (w)][w->pending - 1].w = w; 334 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
267 pendings [ABSPRI (w)][w->pending - 1].events = events; 335 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
268} 336}
269 337
270static void 338static void
271queue_events (EV_P_ W *events, int eventcnt, int type) 339queue_events (EV_P_ W *events, int eventcnt, int type)
272{ 340{
273 int i; 341 int i;
274 342
275 for (i = 0; i < eventcnt; ++i) 343 for (i = 0; i < eventcnt; ++i)
276 event (EV_A_ events [i], type); 344 ev_feed_event (EV_A_ events [i], type);
277} 345}
278 346
279static void 347inline void
280fd_event (EV_P_ int fd, int events) 348fd_event (EV_P_ int fd, int revents)
281{ 349{
282 ANFD *anfd = anfds + fd; 350 ANFD *anfd = anfds + fd;
283 struct ev_io *w; 351 struct ev_io *w;
284 352
285 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)
286 { 354 {
287 int ev = w->events & events; 355 int ev = w->events & revents;
288 356
289 if (ev) 357 if (ev)
290 event (EV_A_ (W)w, ev); 358 ev_feed_event (EV_A_ (W)w, ev);
291 } 359 }
360}
361
362void
363ev_feed_fd_event (EV_P_ int fd, int revents)
364{
365 fd_event (EV_A_ fd, revents);
292} 366}
293 367
294/*****************************************************************************/ 368/*****************************************************************************/
295 369
296static void 370static void
… …
319} 393}
320 394
321static void 395static void
322fd_change (EV_P_ int fd) 396fd_change (EV_P_ int fd)
323{ 397{
324 if (anfds [fd].reify || fdchangecnt < 0) 398 if (anfds [fd].reify)
325 return; 399 return;
326 400
327 anfds [fd].reify = 1; 401 anfds [fd].reify = 1;
328 402
329 ++fdchangecnt; 403 ++fdchangecnt;
330 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 404 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
331 fdchanges [fdchangecnt - 1] = fd; 405 fdchanges [fdchangecnt - 1] = fd;
332} 406}
333 407
334static void 408static void
335fd_kill (EV_P_ int fd) 409fd_kill (EV_P_ int fd)
… …
337 struct ev_io *w; 411 struct ev_io *w;
338 412
339 while ((w = (struct ev_io *)anfds [fd].head)) 413 while ((w = (struct ev_io *)anfds [fd].head))
340 { 414 {
341 ev_io_stop (EV_A_ w); 415 ev_io_stop (EV_A_ w);
342 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);
343 } 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
344} 428}
345 429
346/* called on EBADF to verify fds */ 430/* called on EBADF to verify fds */
347static void 431static void
348fd_ebadf (EV_P) 432fd_ebadf (EV_P)
349{ 433{
350 int fd; 434 int fd;
351 435
352 for (fd = 0; fd < anfdmax; ++fd) 436 for (fd = 0; fd < anfdmax; ++fd)
353 if (anfds [fd].events) 437 if (anfds [fd].events)
354 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 438 if (!fd_valid (fd) == -1 && errno == EBADF)
355 fd_kill (EV_A_ fd); 439 fd_kill (EV_A_ fd);
356} 440}
357 441
358/* 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 */
359static void 443static void
… …
362 int fd; 446 int fd;
363 447
364 for (fd = anfdmax; fd--; ) 448 for (fd = anfdmax; fd--; )
365 if (anfds [fd].events) 449 if (anfds [fd].events)
366 { 450 {
367 close (fd);
368 fd_kill (EV_A_ fd); 451 fd_kill (EV_A_ fd);
369 return; 452 return;
370 } 453 }
371} 454}
372 455
373/* 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 */
374static void 457static void
375fd_rearm_all (EV_P) 458fd_rearm_all (EV_P)
376{ 459{
377 int fd; 460 int fd;
378 461
… …
430 513
431/*****************************************************************************/ 514/*****************************************************************************/
432 515
433typedef struct 516typedef struct
434{ 517{
435 struct ev_watcher_list *head; 518 WL head;
436 sig_atomic_t volatile gotsig; 519 sig_atomic_t volatile gotsig;
437} ANSIG; 520} ANSIG;
438 521
439static ANSIG *signals; 522static ANSIG *signals;
440static int signalmax; 523static int signalmax;
… …
456} 539}
457 540
458static void 541static void
459sighandler (int signum) 542sighandler (int signum)
460{ 543{
544#if WIN32
545 signal (signum, sighandler);
546#endif
547
461 signals [signum - 1].gotsig = 1; 548 signals [signum - 1].gotsig = 1;
462 549
463 if (!gotsig) 550 if (!gotsig)
464 { 551 {
465 int old_errno = errno; 552 int old_errno = errno;
466 gotsig = 1; 553 gotsig = 1;
554#ifdef WIN32
555 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
556#else
467 write (sigpipe [1], &signum, 1); 557 write (sigpipe [1], &signum, 1);
558#endif
468 errno = old_errno; 559 errno = old_errno;
469 } 560 }
470} 561}
471 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
472static void 581static void
473sigcb (EV_P_ struct ev_io *iow, int revents) 582sigcb (EV_P_ struct ev_io *iow, int revents)
474{ 583{
475 struct ev_watcher_list *w; 584 WL w;
476 int signum; 585 int signum;
477 586
587#ifdef WIN32
588 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
589#else
478 read (sigpipe [0], &revents, 1); 590 read (sigpipe [0], &revents, 1);
591#endif
479 gotsig = 0; 592 gotsig = 0;
480 593
481 for (signum = signalmax; signum--; ) 594 for (signum = signalmax; signum--; )
482 if (signals [signum].gotsig) 595 if (signals [signum].gotsig)
483 { 596 sigevent (EV_A_ signum + 1);
484 signals [signum].gotsig = 0;
485
486 for (w = signals [signum].head; w; w = w->next)
487 event (EV_A_ (W)w, EV_SIGNAL);
488 }
489} 597}
490 598
491static void 599static void
492siginit (EV_P) 600siginit (EV_P)
493{ 601{
… …
505 ev_unref (EV_A); /* child watcher should not keep loop alive */ 613 ev_unref (EV_A); /* child watcher should not keep loop alive */
506} 614}
507 615
508/*****************************************************************************/ 616/*****************************************************************************/
509 617
618static struct ev_child *childs [PID_HASHSIZE];
619
510#ifndef WIN32 620#ifndef WIN32
511 621
512static struct ev_child *childs [PID_HASHSIZE];
513static struct ev_signal childev; 622static struct ev_signal childev;
514 623
515#ifndef WCONTINUED 624#ifndef WCONTINUED
516# define WCONTINUED 0 625# define WCONTINUED 0
517#endif 626#endif
… …
525 if (w->pid == pid || !w->pid) 634 if (w->pid == pid || !w->pid)
526 { 635 {
527 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 636 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
528 w->rpid = pid; 637 w->rpid = pid;
529 w->rstatus = status; 638 w->rstatus = status;
530 event (EV_A_ (W)w, EV_CHILD); 639 ev_feed_event (EV_A_ (W)w, EV_CHILD);
531 } 640 }
532} 641}
533 642
534static void 643static void
535childcb (EV_P_ struct ev_signal *sw, int revents) 644childcb (EV_P_ struct ev_signal *sw, int revents)
… …
537 int pid, status; 646 int pid, status;
538 647
539 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 648 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
540 { 649 {
541 /* 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 */
542 event (EV_A_ (W)sw, EV_SIGNAL); 651 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
543 652
544 child_reap (EV_A_ sw, pid, pid, status); 653 child_reap (EV_A_ sw, pid, pid, status);
545 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 */
546 } 655 }
547} 656}
… …
631 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 740 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
632#endif 741#endif
633#if EV_USE_SELECT 742#if EV_USE_SELECT
634 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 743 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
635#endif 744#endif
745
746 ev_watcher_init (&sigev, sigcb);
747 ev_set_priority (&sigev, EV_MAXPRI);
636 } 748 }
637} 749}
638 750
639void 751void
640loop_destroy (EV_P) 752loop_destroy (EV_P)
… …
658#endif 770#endif
659 771
660 for (i = NUMPRI; i--; ) 772 for (i = NUMPRI; i--; )
661 array_free (pending, [i]); 773 array_free (pending, [i]);
662 774
775 /* have to use the microsoft-never-gets-it-right macro */
663 array_free (fdchange, ); 776 array_free_microshit (fdchange);
664 array_free (timer, ); 777 array_free_microshit (timer);
665 array_free (periodic, ); 778 array_free_microshit (periodic);
666 array_free (idle, ); 779 array_free_microshit (idle);
667 array_free (prepare, ); 780 array_free_microshit (prepare);
668 array_free (check, ); 781 array_free_microshit (check);
669 782
670 method = 0; 783 method = 0;
671 /*TODO*/
672} 784}
673 785
674void 786static void
675loop_fork (EV_P) 787loop_fork (EV_P)
676{ 788{
677 /*TODO*/
678#if EV_USE_EPOLL 789#if EV_USE_EPOLL
679 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 790 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
680#endif 791#endif
681#if EV_USE_KQUEUE 792#if EV_USE_KQUEUE
682 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 793 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
683#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;
684} 812}
685 813
686#if EV_MULTIPLICITY 814#if EV_MULTIPLICITY
687struct ev_loop * 815struct ev_loop *
688ev_loop_new (int methods) 816ev_loop_new (int methods)
689{ 817{
690 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));
691 821
692 loop_init (EV_A_ methods); 822 loop_init (EV_A_ methods);
693 823
694 if (ev_method (EV_A)) 824 if (ev_method (EV_A))
695 return loop; 825 return loop;
… …
699 829
700void 830void
701ev_loop_destroy (EV_P) 831ev_loop_destroy (EV_P)
702{ 832{
703 loop_destroy (EV_A); 833 loop_destroy (EV_A);
704 free (loop); 834 ev_free (loop);
705} 835}
706 836
707void 837void
708ev_loop_fork (EV_P) 838ev_loop_fork (EV_P)
709{ 839{
710 loop_fork (EV_A); 840 postfork = 1;
711} 841}
712 842
713#endif 843#endif
714 844
715#if EV_MULTIPLICITY 845#if EV_MULTIPLICITY
… …
738 868
739 loop_init (EV_A_ methods); 869 loop_init (EV_A_ methods);
740 870
741 if (ev_method (EV_A)) 871 if (ev_method (EV_A))
742 { 872 {
743 ev_watcher_init (&sigev, sigcb);
744 ev_set_priority (&sigev, EV_MAXPRI);
745 siginit (EV_A); 873 siginit (EV_A);
746 874
747#ifndef WIN32 875#ifndef WIN32
748 ev_signal_init (&childev, childcb, SIGCHLD); 876 ev_signal_init (&childev, childcb, SIGCHLD);
749 ev_set_priority (&childev, EV_MAXPRI); 877 ev_set_priority (&childev, EV_MAXPRI);
… …
763{ 891{
764#if EV_MULTIPLICITY 892#if EV_MULTIPLICITY
765 struct ev_loop *loop = default_loop; 893 struct ev_loop *loop = default_loop;
766#endif 894#endif
767 895
896#ifndef WIN32
768 ev_ref (EV_A); /* child watcher */ 897 ev_ref (EV_A); /* child watcher */
769 ev_signal_stop (EV_A_ &childev); 898 ev_signal_stop (EV_A_ &childev);
899#endif
770 900
771 ev_ref (EV_A); /* signal watcher */ 901 ev_ref (EV_A); /* signal watcher */
772 ev_io_stop (EV_A_ &sigev); 902 ev_io_stop (EV_A_ &sigev);
773 903
774 close (sigpipe [0]); sigpipe [0] = 0; 904 close (sigpipe [0]); sigpipe [0] = 0;
… …
782{ 912{
783#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
784 struct ev_loop *loop = default_loop; 914 struct ev_loop *loop = default_loop;
785#endif 915#endif
786 916
787 loop_fork (EV_A); 917 if (method)
788 918 postfork = 1;
789 ev_io_stop (EV_A_ &sigev);
790 close (sigpipe [0]);
791 close (sigpipe [1]);
792 pipe (sigpipe);
793
794 ev_ref (EV_A); /* signal watcher */
795 siginit (EV_A);
796} 919}
797 920
798/*****************************************************************************/ 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}
799 934
800static void 935static void
801call_pending (EV_P) 936call_pending (EV_P)
802{ 937{
803 int pri; 938 int pri;
… …
832 downheap ((WT *)timers, timercnt, 0); 967 downheap ((WT *)timers, timercnt, 0);
833 } 968 }
834 else 969 else
835 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 970 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
836 971
837 event (EV_A_ (W)w, EV_TIMEOUT); 972 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
838 } 973 }
839} 974}
840 975
841static void 976static void
842periodics_reify (EV_P) 977periodics_reify (EV_P)
… …
846 struct ev_periodic *w = periodics [0]; 981 struct ev_periodic *w = periodics [0];
847 982
848 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 983 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
849 984
850 /* 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 }
851 if (w->interval) 993 else if (w->interval)
852 { 994 {
853 ((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;
854 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));
855 downheap ((WT *)periodics, periodiccnt, 0); 997 downheap ((WT *)periodics, periodiccnt, 0);
856 } 998 }
857 else 999 else
858 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1000 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
859 1001
860 event (EV_A_ (W)w, EV_PERIODIC); 1002 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
861 } 1003 }
862} 1004}
863 1005
864static void 1006static void
865periodics_reschedule (EV_P) 1007periodics_reschedule (EV_P)
… …
869 /* adjust periodics after time jump */ 1011 /* adjust periodics after time jump */
870 for (i = 0; i < periodiccnt; ++i) 1012 for (i = 0; i < periodiccnt; ++i)
871 { 1013 {
872 struct ev_periodic *w = periodics [i]; 1014 struct ev_periodic *w = periodics [i];
873 1015
1016 if (w->reschedule_cb)
1017 ((WT)w)->at = w->reschedule_cb (w, rt_now);
874 if (w->interval) 1018 else if (w->interval)
875 {
876 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;
877
878 if (fabs (diff) >= 1e-4)
879 {
880 ev_periodic_stop (EV_A_ w);
881 ev_periodic_start (EV_A_ w);
882
883 i = 0; /* restart loop, inefficient, but time jumps should be rare */
884 }
885 }
886 } 1020 }
1021
1022 /* now rebuild the heap */
1023 for (i = periodiccnt >> 1; i--; )
1024 downheap ((WT *)periodics, periodiccnt, i);
887} 1025}
888 1026
889inline int 1027inline int
890time_update_monotonic (EV_P) 1028time_update_monotonic (EV_P)
891{ 1029{
… …
978 { 1116 {
979 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1117 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
980 call_pending (EV_A); 1118 call_pending (EV_A);
981 } 1119 }
982 1120
1121 /* we might have forked, so reify kernel state if necessary */
1122 if (expect_false (postfork))
1123 loop_fork (EV_A);
1124
983 /* update fd-related kernel structures */ 1125 /* update fd-related kernel structures */
984 fd_reify (EV_A); 1126 fd_reify (EV_A);
985 1127
986 /* calculate blocking time */ 1128 /* calculate blocking time */
987 1129
988 /* 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
989 always have timers, we just calculate it always */ 1131 always have timers, we just calculate it always */
990#if EV_USE_MONOTONIC 1132#if EV_USE_MONOTONIC
991 if (expect_true (have_monotonic)) 1133 if (expect_true (have_monotonic))
992 time_update_monotonic (EV_A); 1134 time_update_monotonic (EV_A);
993 else 1135 else
… …
1026 /* queue pending timers and reschedule them */ 1168 /* queue pending timers and reschedule them */
1027 timers_reify (EV_A); /* relative timers called last */ 1169 timers_reify (EV_A); /* relative timers called last */
1028 periodics_reify (EV_A); /* absolute timers called first */ 1170 periodics_reify (EV_A); /* absolute timers called first */
1029 1171
1030 /* queue idle watchers unless io or timers are pending */ 1172 /* queue idle watchers unless io or timers are pending */
1031 if (!pendingcnt) 1173 if (idlecnt && !any_pending (EV_A))
1032 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1174 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1033 1175
1034 /* queue check watchers, to be executed first */ 1176 /* queue check watchers, to be executed first */
1035 if (checkcnt) 1177 if (checkcnt)
1036 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1178 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1111 return; 1253 return;
1112 1254
1113 assert (("ev_io_start called with negative fd", fd >= 0)); 1255 assert (("ev_io_start called with negative fd", fd >= 0));
1114 1256
1115 ev_start (EV_A_ (W)w, 1); 1257 ev_start (EV_A_ (W)w, 1);
1116 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1258 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1117 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1259 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1118 1260
1119 fd_change (EV_A_ fd); 1261 fd_change (EV_A_ fd);
1120} 1262}
1121 1263
… …
1141 ((WT)w)->at += mn_now; 1283 ((WT)w)->at += mn_now;
1142 1284
1143 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.));
1144 1286
1145 ev_start (EV_A_ (W)w, ++timercnt); 1287 ev_start (EV_A_ (W)w, ++timercnt);
1146 array_needsize (timers, timermax, timercnt, ); 1288 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1147 timers [timercnt - 1] = w; 1289 timers [timercnt - 1] = w;
1148 upheap ((WT *)timers, timercnt - 1); 1290 upheap ((WT *)timers, timercnt - 1);
1149 1291
1150 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1292 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1151} 1293}
… …
1191ev_periodic_start (EV_P_ struct ev_periodic *w) 1333ev_periodic_start (EV_P_ struct ev_periodic *w)
1192{ 1334{
1193 if (ev_is_active (w)) 1335 if (ev_is_active (w))
1194 return; 1336 return;
1195 1337
1338 if (w->reschedule_cb)
1339 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1340 else if (w->interval)
1341 {
1196 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.));
1197
1198 /* 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 */
1199 if (w->interval)
1200 ((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 }
1201 1346
1202 ev_start (EV_A_ (W)w, ++periodiccnt); 1347 ev_start (EV_A_ (W)w, ++periodiccnt);
1203 array_needsize (periodics, periodicmax, periodiccnt, ); 1348 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1204 periodics [periodiccnt - 1] = w; 1349 periodics [periodiccnt - 1] = w;
1205 upheap ((WT *)periodics, periodiccnt - 1); 1350 upheap ((WT *)periodics, periodiccnt - 1);
1206 1351
1207 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1352 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1208} 1353}
… …
1224 1369
1225 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1226} 1371}
1227 1372
1228void 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
1229ev_idle_start (EV_P_ struct ev_idle *w) 1381ev_idle_start (EV_P_ struct ev_idle *w)
1230{ 1382{
1231 if (ev_is_active (w)) 1383 if (ev_is_active (w))
1232 return; 1384 return;
1233 1385
1234 ev_start (EV_A_ (W)w, ++idlecnt); 1386 ev_start (EV_A_ (W)w, ++idlecnt);
1235 array_needsize (idles, idlemax, idlecnt, ); 1387 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1236 idles [idlecnt - 1] = w; 1388 idles [idlecnt - 1] = w;
1237} 1389}
1238 1390
1239void 1391void
1240ev_idle_stop (EV_P_ struct ev_idle *w) 1392ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1252{ 1404{
1253 if (ev_is_active (w)) 1405 if (ev_is_active (w))
1254 return; 1406 return;
1255 1407
1256 ev_start (EV_A_ (W)w, ++preparecnt); 1408 ev_start (EV_A_ (W)w, ++preparecnt);
1257 array_needsize (prepares, preparemax, preparecnt, ); 1409 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1258 prepares [preparecnt - 1] = w; 1410 prepares [preparecnt - 1] = w;
1259} 1411}
1260 1412
1261void 1413void
1262ev_prepare_stop (EV_P_ struct ev_prepare *w) 1414ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1274{ 1426{
1275 if (ev_is_active (w)) 1427 if (ev_is_active (w))
1276 return; 1428 return;
1277 1429
1278 ev_start (EV_A_ (W)w, ++checkcnt); 1430 ev_start (EV_A_ (W)w, ++checkcnt);
1279 array_needsize (checks, checkmax, checkcnt, ); 1431 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1280 checks [checkcnt - 1] = w; 1432 checks [checkcnt - 1] = w;
1281} 1433}
1282 1434
1283void 1435void
1284ev_check_stop (EV_P_ struct ev_check *w) 1436ev_check_stop (EV_P_ struct ev_check *w)
… …
1305 return; 1457 return;
1306 1458
1307 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));
1308 1460
1309 ev_start (EV_A_ (W)w, 1); 1461 ev_start (EV_A_ (W)w, 1);
1310 array_needsize (signals, signalmax, w->signum, signals_init); 1462 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1311 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1463 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1312 1464
1313 if (!((WL)w)->next) 1465 if (!((WL)w)->next)
1314 { 1466 {
1467#if WIN32
1468 signal (w->signum, sighandler);
1469#else
1315 struct sigaction sa; 1470 struct sigaction sa;
1316 sa.sa_handler = sighandler; 1471 sa.sa_handler = sighandler;
1317 sigfillset (&sa.sa_mask); 1472 sigfillset (&sa.sa_mask);
1318 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1473 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1319 sigaction (w->signum, &sa, 0); 1474 sigaction (w->signum, &sa, 0);
1475#endif
1320 } 1476 }
1321} 1477}
1322 1478
1323void 1479void
1324ev_signal_stop (EV_P_ struct ev_signal *w) 1480ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1374 void (*cb)(int revents, void *arg) = once->cb; 1530 void (*cb)(int revents, void *arg) = once->cb;
1375 void *arg = once->arg; 1531 void *arg = once->arg;
1376 1532
1377 ev_io_stop (EV_A_ &once->io); 1533 ev_io_stop (EV_A_ &once->io);
1378 ev_timer_stop (EV_A_ &once->to); 1534 ev_timer_stop (EV_A_ &once->to);
1379 free (once); 1535 ev_free (once);
1380 1536
1381 cb (revents, arg); 1537 cb (revents, arg);
1382} 1538}
1383 1539
1384static void 1540static void
… …
1394} 1550}
1395 1551
1396void 1552void
1397ev_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)
1398{ 1554{
1399 struct ev_once *once = malloc (sizeof (struct ev_once)); 1555 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1400 1556
1401 if (!once) 1557 if (!once)
1402 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1558 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1403 else 1559 else
1404 { 1560 {

Diff Legend

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