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

Comparing libev/ev.c (file contents):
Revision 1.62 by root, Sun Nov 4 20:38:07 2007 UTC vs.
Revision 1.78 by root, Thu Nov 8 21:08:56 2007 UTC

… …
54 54
55#endif 55#endif
56 56
57#include <math.h> 57#include <math.h>
58#include <stdlib.h> 58#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 59#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 60#include <stddef.h>
63 61
64#include <stdio.h> 62#include <stdio.h>
65 63
66#include <assert.h> 64#include <assert.h>
67#include <errno.h> 65#include <errno.h>
68#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
69#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
70# include <sys/wait.h> 74# include <sys/wait.h>
71#endif 75#endif
72#include <sys/time.h>
73#include <time.h>
74
75/**/ 76/**/
76 77
77#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
79#endif 80#endif
… …
94# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
95#endif 96#endif
96 97
97#ifndef EV_USE_WIN32 98#ifndef EV_USE_WIN32
98# ifdef WIN32 99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
99# define EV_USE_WIN32 1 102# define EV_USE_SELECT 1
100# else 103# else
101# define EV_USE_WIN32 0 104# define EV_USE_WIN32 0
102# endif 105# endif
103#endif 106#endif
104 107
… …
145typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
147 150
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 152
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;
302
303#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
236 305
237/*****************************************************************************/ 306/*****************************************************************************/
238 307
239static void 308static void
240anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
247 316
248 ++base; 317 ++base;
249 } 318 }
250} 319}
251 320
252static void 321void
253event (EV_P_ W w, int events) 322ev_feed_event (EV_P_ void *w, int revents)
254{ 323{
324 W w_ = (W)w;
325
255 if (w->pending) 326 if (w_->pending)
256 { 327 {
257 pendings [ABSPRI (w)][w->pending - 1].events |= events; 328 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
258 return; 329 return;
259 } 330 }
260 331
261 w->pending = ++pendingcnt [ABSPRI (w)]; 332 w_->pending = ++pendingcnt [ABSPRI (w_)];
262 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));
263 pendings [ABSPRI (w)][w->pending - 1].w = w; 334 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
264 pendings [ABSPRI (w)][w->pending - 1].events = events; 335 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
265} 336}
266 337
267static void 338static void
268queue_events (EV_P_ W *events, int eventcnt, int type) 339queue_events (EV_P_ W *events, int eventcnt, int type)
269{ 340{
270 int i; 341 int i;
271 342
272 for (i = 0; i < eventcnt; ++i) 343 for (i = 0; i < eventcnt; ++i)
273 event (EV_A_ events [i], type); 344 ev_feed_event (EV_A_ events [i], type);
274} 345}
275 346
276static void 347static void
277fd_event (EV_P_ int fd, int events) 348fd_event (EV_P_ int fd, int events)
278{ 349{
… …
282 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)
283 { 354 {
284 int ev = w->events & events; 355 int ev = w->events & events;
285 356
286 if (ev) 357 if (ev)
287 event (EV_A_ (W)w, ev); 358 ev_feed_event (EV_A_ (W)w, ev);
288 } 359 }
289} 360}
290 361
291/*****************************************************************************/ 362/*****************************************************************************/
292 363
… …
306 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 377 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
307 events |= w->events; 378 events |= w->events;
308 379
309 anfd->reify = 0; 380 anfd->reify = 0;
310 381
311 if (anfd->events != events)
312 {
313 method_modify (EV_A_ fd, anfd->events, events); 382 method_modify (EV_A_ fd, anfd->events, events);
314 anfd->events = events; 383 anfd->events = events;
315 }
316 } 384 }
317 385
318 fdchangecnt = 0; 386 fdchangecnt = 0;
319} 387}
320 388
321static void 389static void
322fd_change (EV_P_ int fd) 390fd_change (EV_P_ int fd)
323{ 391{
324 if (anfds [fd].reify || fdchangecnt < 0) 392 if (anfds [fd].reify)
325 return; 393 return;
326 394
327 anfds [fd].reify = 1; 395 anfds [fd].reify = 1;
328 396
329 ++fdchangecnt; 397 ++fdchangecnt;
330 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 398 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
331 fdchanges [fdchangecnt - 1] = fd; 399 fdchanges [fdchangecnt - 1] = fd;
332} 400}
333 401
334static void 402static void
335fd_kill (EV_P_ int fd) 403fd_kill (EV_P_ int fd)
… …
337 struct ev_io *w; 405 struct ev_io *w;
338 406
339 while ((w = (struct ev_io *)anfds [fd].head)) 407 while ((w = (struct ev_io *)anfds [fd].head))
340 { 408 {
341 ev_io_stop (EV_A_ w); 409 ev_io_stop (EV_A_ w);
342 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 410 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
343 } 411 }
412}
413
414static int
415fd_valid (int fd)
416{
417#ifdef WIN32
418 return !!win32_get_osfhandle (fd);
419#else
420 return fcntl (fd, F_GETFD) != -1;
421#endif
344} 422}
345 423
346/* called on EBADF to verify fds */ 424/* called on EBADF to verify fds */
347static void 425static void
348fd_ebadf (EV_P) 426fd_ebadf (EV_P)
349{ 427{
350 int fd; 428 int fd;
351 429
352 for (fd = 0; fd < anfdmax; ++fd) 430 for (fd = 0; fd < anfdmax; ++fd)
353 if (anfds [fd].events) 431 if (anfds [fd].events)
354 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 432 if (!fd_valid (fd) == -1 && errno == EBADF)
355 fd_kill (EV_A_ fd); 433 fd_kill (EV_A_ fd);
356} 434}
357 435
358/* called on ENOMEM in select/poll to kill some fds and retry */ 436/* called on ENOMEM in select/poll to kill some fds and retry */
359static void 437static void
… …
362 int fd; 440 int fd;
363 441
364 for (fd = anfdmax; fd--; ) 442 for (fd = anfdmax; fd--; )
365 if (anfds [fd].events) 443 if (anfds [fd].events)
366 { 444 {
367 close (fd);
368 fd_kill (EV_A_ fd); 445 fd_kill (EV_A_ fd);
369 return; 446 return;
370 } 447 }
371} 448}
372 449
373/* susually called after fork if method needs to re-arm all fds from scratch */ 450/* usually called after fork if method needs to re-arm all fds from scratch */
374static void 451static void
375fd_rearm_all (EV_P) 452fd_rearm_all (EV_P)
376{ 453{
377 int fd; 454 int fd;
378 455
… …
430 507
431/*****************************************************************************/ 508/*****************************************************************************/
432 509
433typedef struct 510typedef struct
434{ 511{
435 struct ev_watcher_list *head; 512 WL head;
436 sig_atomic_t volatile gotsig; 513 sig_atomic_t volatile gotsig;
437} ANSIG; 514} ANSIG;
438 515
439static ANSIG *signals; 516static ANSIG *signals;
440static int signalmax; 517static int signalmax;
… …
456} 533}
457 534
458static void 535static void
459sighandler (int signum) 536sighandler (int signum)
460{ 537{
538#if WIN32
539 signal (signum, sighandler);
540#endif
541
461 signals [signum - 1].gotsig = 1; 542 signals [signum - 1].gotsig = 1;
462 543
463 if (!gotsig) 544 if (!gotsig)
464 { 545 {
465 int old_errno = errno; 546 int old_errno = errno;
466 gotsig = 1; 547 gotsig = 1;
548#ifdef WIN32
549 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
550#else
467 write (sigpipe [1], &signum, 1); 551 write (sigpipe [1], &signum, 1);
552#endif
468 errno = old_errno; 553 errno = old_errno;
469 } 554 }
470} 555}
471 556
472static void 557static void
473sigcb (EV_P_ struct ev_io *iow, int revents) 558sigcb (EV_P_ struct ev_io *iow, int revents)
474{ 559{
475 struct ev_watcher_list *w; 560 WL w;
476 int signum; 561 int signum;
477 562
563#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else
478 read (sigpipe [0], &revents, 1); 566 read (sigpipe [0], &revents, 1);
567#endif
479 gotsig = 0; 568 gotsig = 0;
480 569
481 for (signum = signalmax; signum--; ) 570 for (signum = signalmax; signum--; )
482 if (signals [signum].gotsig) 571 if (signals [signum].gotsig)
483 { 572 {
484 signals [signum].gotsig = 0; 573 signals [signum].gotsig = 0;
485 574
486 for (w = signals [signum].head; w; w = w->next) 575 for (w = signals [signum].head; w; w = w->next)
487 event (EV_A_ (W)w, EV_SIGNAL); 576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
488 } 577 }
489} 578}
490 579
491static void 580static void
492siginit (EV_P) 581siginit (EV_P)
… …
505 ev_unref (EV_A); /* child watcher should not keep loop alive */ 594 ev_unref (EV_A); /* child watcher should not keep loop alive */
506} 595}
507 596
508/*****************************************************************************/ 597/*****************************************************************************/
509 598
599static struct ev_child *childs [PID_HASHSIZE];
600
510#ifndef WIN32 601#ifndef WIN32
511 602
512static struct ev_child *childs [PID_HASHSIZE];
513static struct ev_signal childev; 603static struct ev_signal childev;
514 604
515#ifndef WCONTINUED 605#ifndef WCONTINUED
516# define WCONTINUED 0 606# define WCONTINUED 0
517#endif 607#endif
… …
522 struct ev_child *w; 612 struct ev_child *w;
523 613
524 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 614 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
525 if (w->pid == pid || !w->pid) 615 if (w->pid == pid || !w->pid)
526 { 616 {
527 w->priority = sw->priority; /* need to do it *now* */ 617 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
528 w->rpid = pid; 618 w->rpid = pid;
529 w->rstatus = status; 619 w->rstatus = status;
530 event (EV_A_ (W)w, EV_CHILD); 620 ev_feed_event (EV_A_ (W)w, EV_CHILD);
531 } 621 }
532} 622}
533 623
534static void 624static void
535childcb (EV_P_ struct ev_signal *sw, int revents) 625childcb (EV_P_ struct ev_signal *sw, int revents)
… …
537 int pid, status; 627 int pid, status;
538 628
539 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 629 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
540 { 630 {
541 /* make sure we are called again until all childs have been reaped */ 631 /* make sure we are called again until all childs have been reaped */
542 event (EV_A_ (W)sw, EV_SIGNAL); 632 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
543 633
544 child_reap (EV_A_ sw, pid, pid, status); 634 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 */ 635 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
546 } 636 }
547} 637}
… …
631 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 721 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
632#endif 722#endif
633#if EV_USE_SELECT 723#if EV_USE_SELECT
634 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
635#endif 725#endif
726
727 ev_watcher_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI);
636 } 729 }
637} 730}
638 731
639void 732void
640loop_destroy (EV_P) 733loop_destroy (EV_P)
641{ 734{
735 int i;
736
642#if EV_USE_WIN32 737#if EV_USE_WIN32
643 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 738 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
644#endif 739#endif
645#if EV_USE_KQUEUE 740#if EV_USE_KQUEUE
646 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 741 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
… …
653#endif 748#endif
654#if EV_USE_SELECT 749#if EV_USE_SELECT
655 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 750 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
656#endif 751#endif
657 752
753 for (i = NUMPRI; i--; )
754 array_free (pending, [i]);
755
756 /* have to use the microsoft-never-gets-it-right macro */
757 array_free_microshit (fdchange);
758 array_free_microshit (timer);
759 array_free_microshit (periodic);
760 array_free_microshit (idle);
761 array_free_microshit (prepare);
762 array_free_microshit (check);
763
658 method = 0; 764 method = 0;
659 /*TODO*/
660} 765}
661 766
662void 767static void
663loop_fork (EV_P) 768loop_fork (EV_P)
664{ 769{
665 /*TODO*/
666#if EV_USE_EPOLL 770#if EV_USE_EPOLL
667 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 771 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
668#endif 772#endif
669#if EV_USE_KQUEUE 773#if EV_USE_KQUEUE
670 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 774 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
671#endif 775#endif
776
777 if (ev_is_active (&sigev))
778 {
779 /* default loop */
780
781 ev_ref (EV_A);
782 ev_io_stop (EV_A_ &sigev);
783 close (sigpipe [0]);
784 close (sigpipe [1]);
785
786 while (pipe (sigpipe))
787 syserr ("(libev) error creating pipe");
788
789 siginit (EV_A);
790 }
791
792 postfork = 0;
672} 793}
673 794
674#if EV_MULTIPLICITY 795#if EV_MULTIPLICITY
675struct ev_loop * 796struct ev_loop *
676ev_loop_new (int methods) 797ev_loop_new (int methods)
677{ 798{
678 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 799 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
800
801 memset (loop, 0, sizeof (struct ev_loop));
679 802
680 loop_init (EV_A_ methods); 803 loop_init (EV_A_ methods);
681 804
682 if (ev_method (EV_A)) 805 if (ev_method (EV_A))
683 return loop; 806 return loop;
… …
687 810
688void 811void
689ev_loop_destroy (EV_P) 812ev_loop_destroy (EV_P)
690{ 813{
691 loop_destroy (EV_A); 814 loop_destroy (EV_A);
692 free (loop); 815 ev_free (loop);
693} 816}
694 817
695void 818void
696ev_loop_fork (EV_P) 819ev_loop_fork (EV_P)
697{ 820{
698 loop_fork (EV_A); 821 postfork = 1;
699} 822}
700 823
701#endif 824#endif
702 825
703#if EV_MULTIPLICITY 826#if EV_MULTIPLICITY
… …
726 849
727 loop_init (EV_A_ methods); 850 loop_init (EV_A_ methods);
728 851
729 if (ev_method (EV_A)) 852 if (ev_method (EV_A))
730 { 853 {
731 ev_watcher_init (&sigev, sigcb);
732 ev_set_priority (&sigev, EV_MAXPRI);
733 siginit (EV_A); 854 siginit (EV_A);
734 855
735#ifndef WIN32 856#ifndef WIN32
736 ev_signal_init (&childev, childcb, SIGCHLD); 857 ev_signal_init (&childev, childcb, SIGCHLD);
737 ev_set_priority (&childev, EV_MAXPRI); 858 ev_set_priority (&childev, EV_MAXPRI);
… …
751{ 872{
752#if EV_MULTIPLICITY 873#if EV_MULTIPLICITY
753 struct ev_loop *loop = default_loop; 874 struct ev_loop *loop = default_loop;
754#endif 875#endif
755 876
877#ifndef WIN32
756 ev_ref (EV_A); /* child watcher */ 878 ev_ref (EV_A); /* child watcher */
757 ev_signal_stop (EV_A_ &childev); 879 ev_signal_stop (EV_A_ &childev);
880#endif
758 881
759 ev_ref (EV_A); /* signal watcher */ 882 ev_ref (EV_A); /* signal watcher */
760 ev_io_stop (EV_A_ &sigev); 883 ev_io_stop (EV_A_ &sigev);
761 884
762 close (sigpipe [0]); sigpipe [0] = 0; 885 close (sigpipe [0]); sigpipe [0] = 0;
… …
770{ 893{
771#if EV_MULTIPLICITY 894#if EV_MULTIPLICITY
772 struct ev_loop *loop = default_loop; 895 struct ev_loop *loop = default_loop;
773#endif 896#endif
774 897
775 loop_fork (EV_A); 898 if (method)
776 899 postfork = 1;
777 ev_io_stop (EV_A_ &sigev);
778 close (sigpipe [0]);
779 close (sigpipe [1]);
780 pipe (sigpipe);
781
782 ev_ref (EV_A); /* signal watcher */
783 siginit (EV_A);
784} 900}
785 901
786/*****************************************************************************/ 902/*****************************************************************************/
903
904static int
905any_pending (EV_P)
906{
907 int pri;
908
909 for (pri = NUMPRI; pri--; )
910 if (pendingcnt [pri])
911 return 1;
912
913 return 0;
914}
787 915
788static void 916static void
789call_pending (EV_P) 917call_pending (EV_P)
790{ 918{
791 int pri; 919 int pri;
… …
804} 932}
805 933
806static void 934static void
807timers_reify (EV_P) 935timers_reify (EV_P)
808{ 936{
809 while (timercnt && timers [0]->at <= mn_now) 937 while (timercnt && ((WT)timers [0])->at <= mn_now)
810 { 938 {
811 struct ev_timer *w = timers [0]; 939 struct ev_timer *w = timers [0];
812 940
813 assert (("inactive timer on timer heap detected", ev_is_active (w))); 941 assert (("inactive timer on timer heap detected", ev_is_active (w)));
814 942
815 /* first reschedule or stop timer */ 943 /* first reschedule or stop timer */
816 if (w->repeat) 944 if (w->repeat)
817 { 945 {
818 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 946 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
819 w->at = mn_now + w->repeat; 947 ((WT)w)->at = mn_now + w->repeat;
820 downheap ((WT *)timers, timercnt, 0); 948 downheap ((WT *)timers, timercnt, 0);
821 } 949 }
822 else 950 else
823 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
824 952
825 event (EV_A_ (W)w, EV_TIMEOUT); 953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
826 } 954 }
827} 955}
828 956
829static void 957static void
830periodics_reify (EV_P) 958periodics_reify (EV_P)
831{ 959{
832 while (periodiccnt && periodics [0]->at <= rt_now) 960 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
833 { 961 {
834 struct ev_periodic *w = periodics [0]; 962 struct ev_periodic *w = periodics [0];
835 963
836 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 964 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
837 965
838 /* first reschedule or stop timer */ 966 /* first reschedule or stop timer */
839 if (w->interval) 967 if (w->reschedule_cb)
840 { 968 {
969 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
970
971 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
972 downheap ((WT *)periodics, periodiccnt, 0);
973 }
974 else if (w->interval)
975 {
841 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 976 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
842 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 977 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
843 downheap ((WT *)periodics, periodiccnt, 0); 978 downheap ((WT *)periodics, periodiccnt, 0);
844 } 979 }
845 else 980 else
846 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
847 982
848 event (EV_A_ (W)w, EV_PERIODIC); 983 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
849 } 984 }
850} 985}
851 986
852static void 987static void
853periodics_reschedule (EV_P) 988periodics_reschedule (EV_P)
… …
857 /* adjust periodics after time jump */ 992 /* adjust periodics after time jump */
858 for (i = 0; i < periodiccnt; ++i) 993 for (i = 0; i < periodiccnt; ++i)
859 { 994 {
860 struct ev_periodic *w = periodics [i]; 995 struct ev_periodic *w = periodics [i];
861 996
997 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now);
862 if (w->interval) 999 else if (w->interval)
863 {
864 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 1000 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
865
866 if (fabs (diff) >= 1e-4)
867 {
868 ev_periodic_stop (EV_A_ w);
869 ev_periodic_start (EV_A_ w);
870
871 i = 0; /* restart loop, inefficient, but time jumps should be rare */
872 }
873 }
874 } 1001 }
1002
1003 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i);
875} 1006}
876 1007
877inline int 1008inline int
878time_update_monotonic (EV_P) 1009time_update_monotonic (EV_P)
879{ 1010{
… …
930 { 1061 {
931 periodics_reschedule (EV_A); 1062 periodics_reschedule (EV_A);
932 1063
933 /* adjust timers. this is easy, as the offset is the same for all */ 1064 /* adjust timers. this is easy, as the offset is the same for all */
934 for (i = 0; i < timercnt; ++i) 1065 for (i = 0; i < timercnt; ++i)
935 timers [i]->at += rt_now - mn_now; 1066 ((WT)timers [i])->at += rt_now - mn_now;
936 } 1067 }
937 1068
938 mn_now = rt_now; 1069 mn_now = rt_now;
939 } 1070 }
940} 1071}
… …
966 { 1097 {
967 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1098 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
968 call_pending (EV_A); 1099 call_pending (EV_A);
969 } 1100 }
970 1101
1102 /* we might have forked, so reify kernel state if necessary */
1103 if (expect_false (postfork))
1104 loop_fork (EV_A);
1105
971 /* update fd-related kernel structures */ 1106 /* update fd-related kernel structures */
972 fd_reify (EV_A); 1107 fd_reify (EV_A);
973 1108
974 /* calculate blocking time */ 1109 /* calculate blocking time */
975 1110
976 /* we only need this for !monotonic clockor timers, but as we basically 1111 /* we only need this for !monotonic clock or timers, but as we basically
977 always have timers, we just calculate it always */ 1112 always have timers, we just calculate it always */
978#if EV_USE_MONOTONIC 1113#if EV_USE_MONOTONIC
979 if (expect_true (have_monotonic)) 1114 if (expect_true (have_monotonic))
980 time_update_monotonic (EV_A); 1115 time_update_monotonic (EV_A);
981 else 1116 else
… …
991 { 1126 {
992 block = MAX_BLOCKTIME; 1127 block = MAX_BLOCKTIME;
993 1128
994 if (timercnt) 1129 if (timercnt)
995 { 1130 {
996 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1131 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
997 if (block > to) block = to; 1132 if (block > to) block = to;
998 } 1133 }
999 1134
1000 if (periodiccnt) 1135 if (periodiccnt)
1001 { 1136 {
1002 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1137 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
1003 if (block > to) block = to; 1138 if (block > to) block = to;
1004 } 1139 }
1005 1140
1006 if (block < 0.) block = 0.; 1141 if (block < 0.) block = 0.;
1007 } 1142 }
… …
1014 /* queue pending timers and reschedule them */ 1149 /* queue pending timers and reschedule them */
1015 timers_reify (EV_A); /* relative timers called last */ 1150 timers_reify (EV_A); /* relative timers called last */
1016 periodics_reify (EV_A); /* absolute timers called first */ 1151 periodics_reify (EV_A); /* absolute timers called first */
1017 1152
1018 /* queue idle watchers unless io or timers are pending */ 1153 /* queue idle watchers unless io or timers are pending */
1019 if (!pendingcnt) 1154 if (idlecnt && !any_pending (EV_A))
1020 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1021 1156
1022 /* queue check watchers, to be executed first */ 1157 /* queue check watchers, to be executed first */
1023 if (checkcnt) 1158 if (checkcnt)
1024 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1159 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1099 return; 1234 return;
1100 1235
1101 assert (("ev_io_start called with negative fd", fd >= 0)); 1236 assert (("ev_io_start called with negative fd", fd >= 0));
1102 1237
1103 ev_start (EV_A_ (W)w, 1); 1238 ev_start (EV_A_ (W)w, 1);
1104 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1239 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1105 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1240 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1106 1241
1107 fd_change (EV_A_ fd); 1242 fd_change (EV_A_ fd);
1108} 1243}
1109 1244
… …
1124ev_timer_start (EV_P_ struct ev_timer *w) 1259ev_timer_start (EV_P_ struct ev_timer *w)
1125{ 1260{
1126 if (ev_is_active (w)) 1261 if (ev_is_active (w))
1127 return; 1262 return;
1128 1263
1129 w->at += mn_now; 1264 ((WT)w)->at += mn_now;
1130 1265
1131 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1266 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1132 1267
1133 ev_start (EV_A_ (W)w, ++timercnt); 1268 ev_start (EV_A_ (W)w, ++timercnt);
1134 array_needsize (timers, timermax, timercnt, ); 1269 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1135 timers [timercnt - 1] = w; 1270 timers [timercnt - 1] = w;
1136 upheap ((WT *)timers, timercnt - 1); 1271 upheap ((WT *)timers, timercnt - 1);
1137 1272
1138 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1273 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1139} 1274}
… …
1151 { 1286 {
1152 timers [((W)w)->active - 1] = timers [timercnt]; 1287 timers [((W)w)->active - 1] = timers [timercnt];
1153 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1288 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1154 } 1289 }
1155 1290
1156 w->at = w->repeat; 1291 ((WT)w)->at = w->repeat;
1157 1292
1158 ev_stop (EV_A_ (W)w); 1293 ev_stop (EV_A_ (W)w);
1159} 1294}
1160 1295
1161void 1296void
… …
1163{ 1298{
1164 if (ev_is_active (w)) 1299 if (ev_is_active (w))
1165 { 1300 {
1166 if (w->repeat) 1301 if (w->repeat)
1167 { 1302 {
1168 w->at = mn_now + w->repeat; 1303 ((WT)w)->at = mn_now + w->repeat;
1169 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1304 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1170 } 1305 }
1171 else 1306 else
1172 ev_timer_stop (EV_A_ w); 1307 ev_timer_stop (EV_A_ w);
1173 } 1308 }
… …
1179ev_periodic_start (EV_P_ struct ev_periodic *w) 1314ev_periodic_start (EV_P_ struct ev_periodic *w)
1180{ 1315{
1181 if (ev_is_active (w)) 1316 if (ev_is_active (w))
1182 return; 1317 return;
1183 1318
1319 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1321 else if (w->interval)
1322 {
1184 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1323 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1185
1186 /* this formula differs from the one in periodic_reify because we do not always round up */ 1324 /* this formula differs from the one in periodic_reify because we do not always round up */
1187 if (w->interval)
1188 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1325 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1326 }
1189 1327
1190 ev_start (EV_A_ (W)w, ++periodiccnt); 1328 ev_start (EV_A_ (W)w, ++periodiccnt);
1191 array_needsize (periodics, periodicmax, periodiccnt, ); 1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1192 periodics [periodiccnt - 1] = w; 1330 periodics [periodiccnt - 1] = w;
1193 upheap ((WT *)periodics, periodiccnt - 1); 1331 upheap ((WT *)periodics, periodiccnt - 1);
1194 1332
1195 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1333 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1196} 1334}
… …
1212 1350
1213 ev_stop (EV_A_ (W)w); 1351 ev_stop (EV_A_ (W)w);
1214} 1352}
1215 1353
1216void 1354void
1355ev_periodic_again (EV_P_ struct ev_periodic *w)
1356{
1357 ev_periodic_stop (EV_A_ w);
1358 ev_periodic_start (EV_A_ w);
1359}
1360
1361void
1217ev_idle_start (EV_P_ struct ev_idle *w) 1362ev_idle_start (EV_P_ struct ev_idle *w)
1218{ 1363{
1219 if (ev_is_active (w)) 1364 if (ev_is_active (w))
1220 return; 1365 return;
1221 1366
1222 ev_start (EV_A_ (W)w, ++idlecnt); 1367 ev_start (EV_A_ (W)w, ++idlecnt);
1223 array_needsize (idles, idlemax, idlecnt, ); 1368 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1224 idles [idlecnt - 1] = w; 1369 idles [idlecnt - 1] = w;
1225} 1370}
1226 1371
1227void 1372void
1228ev_idle_stop (EV_P_ struct ev_idle *w) 1373ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1240{ 1385{
1241 if (ev_is_active (w)) 1386 if (ev_is_active (w))
1242 return; 1387 return;
1243 1388
1244 ev_start (EV_A_ (W)w, ++preparecnt); 1389 ev_start (EV_A_ (W)w, ++preparecnt);
1245 array_needsize (prepares, preparemax, preparecnt, ); 1390 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1246 prepares [preparecnt - 1] = w; 1391 prepares [preparecnt - 1] = w;
1247} 1392}
1248 1393
1249void 1394void
1250ev_prepare_stop (EV_P_ struct ev_prepare *w) 1395ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1262{ 1407{
1263 if (ev_is_active (w)) 1408 if (ev_is_active (w))
1264 return; 1409 return;
1265 1410
1266 ev_start (EV_A_ (W)w, ++checkcnt); 1411 ev_start (EV_A_ (W)w, ++checkcnt);
1267 array_needsize (checks, checkmax, checkcnt, ); 1412 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1268 checks [checkcnt - 1] = w; 1413 checks [checkcnt - 1] = w;
1269} 1414}
1270 1415
1271void 1416void
1272ev_check_stop (EV_P_ struct ev_check *w) 1417ev_check_stop (EV_P_ struct ev_check *w)
… …
1293 return; 1438 return;
1294 1439
1295 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1440 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1296 1441
1297 ev_start (EV_A_ (W)w, 1); 1442 ev_start (EV_A_ (W)w, 1);
1298 array_needsize (signals, signalmax, w->signum, signals_init); 1443 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1299 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1444 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1300 1445
1301 if (!w->next) 1446 if (!((WL)w)->next)
1302 { 1447 {
1448#if WIN32
1449 signal (w->signum, sighandler);
1450#else
1303 struct sigaction sa; 1451 struct sigaction sa;
1304 sa.sa_handler = sighandler; 1452 sa.sa_handler = sighandler;
1305 sigfillset (&sa.sa_mask); 1453 sigfillset (&sa.sa_mask);
1306 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1454 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1307 sigaction (w->signum, &sa, 0); 1455 sigaction (w->signum, &sa, 0);
1456#endif
1308 } 1457 }
1309} 1458}
1310 1459
1311void 1460void
1312ev_signal_stop (EV_P_ struct ev_signal *w) 1461ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1362 void (*cb)(int revents, void *arg) = once->cb; 1511 void (*cb)(int revents, void *arg) = once->cb;
1363 void *arg = once->arg; 1512 void *arg = once->arg;
1364 1513
1365 ev_io_stop (EV_A_ &once->io); 1514 ev_io_stop (EV_A_ &once->io);
1366 ev_timer_stop (EV_A_ &once->to); 1515 ev_timer_stop (EV_A_ &once->to);
1367 free (once); 1516 ev_free (once);
1368 1517
1369 cb (revents, arg); 1518 cb (revents, arg);
1370} 1519}
1371 1520
1372static void 1521static void
… …
1382} 1531}
1383 1532
1384void 1533void
1385ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1534ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1386{ 1535{
1387 struct ev_once *once = malloc (sizeof (struct ev_once)); 1536 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1388 1537
1389 if (!once) 1538 if (!once)
1390 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1539 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1391 else 1540 else
1392 { 1541 {

Diff Legend

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