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

Comparing libev/ev.c (file contents):
Revision 1.64 by root, Sun Nov 4 23:14:11 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;
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 347inline void
277fd_event (EV_P_ int fd, int events) 348fd_event (EV_P_ int fd, int revents)
278{ 349{
279 ANFD *anfd = anfds + fd; 350 ANFD *anfd = anfds + fd;
280 struct ev_io *w; 351 struct ev_io *w;
281 352
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 & revents;
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 }
360}
361
362void
363ev_feed_fd_event (EV_P_ int fd, int revents)
364{
365 fd_event (EV_A_ fd, revents);
289} 366}
290 367
291/*****************************************************************************/ 368/*****************************************************************************/
292 369
293static void 370static void
… …
316} 393}
317 394
318static void 395static void
319fd_change (EV_P_ int fd) 396fd_change (EV_P_ int fd)
320{ 397{
321 if (anfds [fd].reify || fdchangecnt < 0) 398 if (anfds [fd].reify)
322 return; 399 return;
323 400
324 anfds [fd].reify = 1; 401 anfds [fd].reify = 1;
325 402
326 ++fdchangecnt; 403 ++fdchangecnt;
327 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 404 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
328 fdchanges [fdchangecnt - 1] = fd; 405 fdchanges [fdchangecnt - 1] = fd;
329} 406}
330 407
331static void 408static void
332fd_kill (EV_P_ int fd) 409fd_kill (EV_P_ int fd)
… …
334 struct ev_io *w; 411 struct ev_io *w;
335 412
336 while ((w = (struct ev_io *)anfds [fd].head)) 413 while ((w = (struct ev_io *)anfds [fd].head))
337 { 414 {
338 ev_io_stop (EV_A_ w); 415 ev_io_stop (EV_A_ w);
339 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);
340 } 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
341} 428}
342 429
343/* called on EBADF to verify fds */ 430/* called on EBADF to verify fds */
344static void 431static void
345fd_ebadf (EV_P) 432fd_ebadf (EV_P)
346{ 433{
347 int fd; 434 int fd;
348 435
349 for (fd = 0; fd < anfdmax; ++fd) 436 for (fd = 0; fd < anfdmax; ++fd)
350 if (anfds [fd].events) 437 if (anfds [fd].events)
351 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 438 if (!fd_valid (fd) == -1 && errno == EBADF)
352 fd_kill (EV_A_ fd); 439 fd_kill (EV_A_ fd);
353} 440}
354 441
355/* 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 */
356static void 443static void
… …
359 int fd; 446 int fd;
360 447
361 for (fd = anfdmax; fd--; ) 448 for (fd = anfdmax; fd--; )
362 if (anfds [fd].events) 449 if (anfds [fd].events)
363 { 450 {
364 close (fd);
365 fd_kill (EV_A_ fd); 451 fd_kill (EV_A_ fd);
366 return; 452 return;
367 } 453 }
368} 454}
369 455
370/* 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 */
371static void 457static void
372fd_rearm_all (EV_P) 458fd_rearm_all (EV_P)
373{ 459{
374 int fd; 460 int fd;
375 461
… …
427 513
428/*****************************************************************************/ 514/*****************************************************************************/
429 515
430typedef struct 516typedef struct
431{ 517{
432 struct ev_watcher_list *head; 518 WL head;
433 sig_atomic_t volatile gotsig; 519 sig_atomic_t volatile gotsig;
434} ANSIG; 520} ANSIG;
435 521
436static ANSIG *signals; 522static ANSIG *signals;
437static int signalmax; 523static int signalmax;
… …
453} 539}
454 540
455static void 541static void
456sighandler (int signum) 542sighandler (int signum)
457{ 543{
544#if WIN32
545 signal (signum, sighandler);
546#endif
547
458 signals [signum - 1].gotsig = 1; 548 signals [signum - 1].gotsig = 1;
459 549
460 if (!gotsig) 550 if (!gotsig)
461 { 551 {
462 int old_errno = errno; 552 int old_errno = errno;
463 gotsig = 1; 553 gotsig = 1;
554#ifdef WIN32
555 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
556#else
464 write (sigpipe [1], &signum, 1); 557 write (sigpipe [1], &signum, 1);
558#endif
465 errno = old_errno; 559 errno = old_errno;
466 } 560 }
467} 561}
468 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
469static void 581static void
470sigcb (EV_P_ struct ev_io *iow, int revents) 582sigcb (EV_P_ struct ev_io *iow, int revents)
471{ 583{
472 struct ev_watcher_list *w; 584 WL w;
473 int signum; 585 int signum;
474 586
587#ifdef WIN32
588 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
589#else
475 read (sigpipe [0], &revents, 1); 590 read (sigpipe [0], &revents, 1);
591#endif
476 gotsig = 0; 592 gotsig = 0;
477 593
478 for (signum = signalmax; signum--; ) 594 for (signum = signalmax; signum--; )
479 if (signals [signum].gotsig) 595 if (signals [signum].gotsig)
480 { 596 sigevent (EV_A_ signum + 1);
481 signals [signum].gotsig = 0;
482
483 for (w = signals [signum].head; w; w = w->next)
484 event (EV_A_ (W)w, EV_SIGNAL);
485 }
486} 597}
487 598
488static void 599static void
489siginit (EV_P) 600siginit (EV_P)
490{ 601{
… …
502 ev_unref (EV_A); /* child watcher should not keep loop alive */ 613 ev_unref (EV_A); /* child watcher should not keep loop alive */
503} 614}
504 615
505/*****************************************************************************/ 616/*****************************************************************************/
506 617
618static struct ev_child *childs [PID_HASHSIZE];
619
507#ifndef WIN32 620#ifndef WIN32
508 621
509static struct ev_child *childs [PID_HASHSIZE];
510static struct ev_signal childev; 622static struct ev_signal childev;
511 623
512#ifndef WCONTINUED 624#ifndef WCONTINUED
513# define WCONTINUED 0 625# define WCONTINUED 0
514#endif 626#endif
… …
522 if (w->pid == pid || !w->pid) 634 if (w->pid == pid || !w->pid)
523 { 635 {
524 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 636 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
525 w->rpid = pid; 637 w->rpid = pid;
526 w->rstatus = status; 638 w->rstatus = status;
527 event (EV_A_ (W)w, EV_CHILD); 639 ev_feed_event (EV_A_ (W)w, EV_CHILD);
528 } 640 }
529} 641}
530 642
531static void 643static void
532childcb (EV_P_ struct ev_signal *sw, int revents) 644childcb (EV_P_ struct ev_signal *sw, int revents)
… …
534 int pid, status; 646 int pid, status;
535 647
536 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 648 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
537 { 649 {
538 /* 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 */
539 event (EV_A_ (W)sw, EV_SIGNAL); 651 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
540 652
541 child_reap (EV_A_ sw, pid, pid, status); 653 child_reap (EV_A_ sw, pid, pid, status);
542 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 */
543 } 655 }
544} 656}
… …
628 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 740 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
629#endif 741#endif
630#if EV_USE_SELECT 742#if EV_USE_SELECT
631 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 743 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
632#endif 744#endif
745
746 ev_watcher_init (&sigev, sigcb);
747 ev_set_priority (&sigev, EV_MAXPRI);
633 } 748 }
634} 749}
635 750
636void 751void
637loop_destroy (EV_P) 752loop_destroy (EV_P)
638{ 753{
754 int i;
755
639#if EV_USE_WIN32 756#if EV_USE_WIN32
640 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 757 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
641#endif 758#endif
642#if EV_USE_KQUEUE 759#if EV_USE_KQUEUE
643 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 760 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
… …
650#endif 767#endif
651#if EV_USE_SELECT 768#if EV_USE_SELECT
652 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 769 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
653#endif 770#endif
654 771
772 for (i = NUMPRI; i--; )
773 array_free (pending, [i]);
774
775 /* have to use the microsoft-never-gets-it-right macro */
776 array_free_microshit (fdchange);
777 array_free_microshit (timer);
778 array_free_microshit (periodic);
779 array_free_microshit (idle);
780 array_free_microshit (prepare);
781 array_free_microshit (check);
782
655 method = 0; 783 method = 0;
656 /*TODO*/
657} 784}
658 785
659void 786static void
660loop_fork (EV_P) 787loop_fork (EV_P)
661{ 788{
662 /*TODO*/
663#if EV_USE_EPOLL 789#if EV_USE_EPOLL
664 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 790 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
665#endif 791#endif
666#if EV_USE_KQUEUE 792#if EV_USE_KQUEUE
667 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 793 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
668#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;
669} 812}
670 813
671#if EV_MULTIPLICITY 814#if EV_MULTIPLICITY
672struct ev_loop * 815struct ev_loop *
673ev_loop_new (int methods) 816ev_loop_new (int methods)
674{ 817{
675 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));
676 821
677 loop_init (EV_A_ methods); 822 loop_init (EV_A_ methods);
678 823
679 if (ev_method (EV_A)) 824 if (ev_method (EV_A))
680 return loop; 825 return loop;
… …
684 829
685void 830void
686ev_loop_destroy (EV_P) 831ev_loop_destroy (EV_P)
687{ 832{
688 loop_destroy (EV_A); 833 loop_destroy (EV_A);
689 free (loop); 834 ev_free (loop);
690} 835}
691 836
692void 837void
693ev_loop_fork (EV_P) 838ev_loop_fork (EV_P)
694{ 839{
695 loop_fork (EV_A); 840 postfork = 1;
696} 841}
697 842
698#endif 843#endif
699 844
700#if EV_MULTIPLICITY 845#if EV_MULTIPLICITY
… …
723 868
724 loop_init (EV_A_ methods); 869 loop_init (EV_A_ methods);
725 870
726 if (ev_method (EV_A)) 871 if (ev_method (EV_A))
727 { 872 {
728 ev_watcher_init (&sigev, sigcb);
729 ev_set_priority (&sigev, EV_MAXPRI);
730 siginit (EV_A); 873 siginit (EV_A);
731 874
732#ifndef WIN32 875#ifndef WIN32
733 ev_signal_init (&childev, childcb, SIGCHLD); 876 ev_signal_init (&childev, childcb, SIGCHLD);
734 ev_set_priority (&childev, EV_MAXPRI); 877 ev_set_priority (&childev, EV_MAXPRI);
… …
748{ 891{
749#if EV_MULTIPLICITY 892#if EV_MULTIPLICITY
750 struct ev_loop *loop = default_loop; 893 struct ev_loop *loop = default_loop;
751#endif 894#endif
752 895
896#ifndef WIN32
753 ev_ref (EV_A); /* child watcher */ 897 ev_ref (EV_A); /* child watcher */
754 ev_signal_stop (EV_A_ &childev); 898 ev_signal_stop (EV_A_ &childev);
899#endif
755 900
756 ev_ref (EV_A); /* signal watcher */ 901 ev_ref (EV_A); /* signal watcher */
757 ev_io_stop (EV_A_ &sigev); 902 ev_io_stop (EV_A_ &sigev);
758 903
759 close (sigpipe [0]); sigpipe [0] = 0; 904 close (sigpipe [0]); sigpipe [0] = 0;
… …
767{ 912{
768#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
769 struct ev_loop *loop = default_loop; 914 struct ev_loop *loop = default_loop;
770#endif 915#endif
771 916
772 loop_fork (EV_A); 917 if (method)
773 918 postfork = 1;
774 ev_io_stop (EV_A_ &sigev);
775 close (sigpipe [0]);
776 close (sigpipe [1]);
777 pipe (sigpipe);
778
779 ev_ref (EV_A); /* signal watcher */
780 siginit (EV_A);
781} 919}
782 920
783/*****************************************************************************/ 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}
784 934
785static void 935static void
786call_pending (EV_P) 936call_pending (EV_P)
787{ 937{
788 int pri; 938 int pri;
… …
793 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 943 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
794 944
795 if (p->w) 945 if (p->w)
796 { 946 {
797 p->w->pending = 0; 947 p->w->pending = 0;
798
799 (*(void (**)(EV_P_ W, int))&p->w->cb) (EV_A_ p->w, p->events); 948 p->w->cb (EV_A_ p->w, p->events);
800 } 949 }
801 } 950 }
802} 951}
803 952
804static void 953static void
… …
818 downheap ((WT *)timers, timercnt, 0); 967 downheap ((WT *)timers, timercnt, 0);
819 } 968 }
820 else 969 else
821 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 970 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
822 971
823 event (EV_A_ (W)w, EV_TIMEOUT); 972 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
824 } 973 }
825} 974}
826 975
827static void 976static void
828periodics_reify (EV_P) 977periodics_reify (EV_P)
… …
832 struct ev_periodic *w = periodics [0]; 981 struct ev_periodic *w = periodics [0];
833 982
834 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 983 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
835 984
836 /* 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 }
837 if (w->interval) 993 else if (w->interval)
838 { 994 {
839 ((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;
840 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));
841 downheap ((WT *)periodics, periodiccnt, 0); 997 downheap ((WT *)periodics, periodiccnt, 0);
842 } 998 }
843 else 999 else
844 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1000 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
845 1001
846 event (EV_A_ (W)w, EV_PERIODIC); 1002 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
847 } 1003 }
848} 1004}
849 1005
850static void 1006static void
851periodics_reschedule (EV_P) 1007periodics_reschedule (EV_P)
… …
855 /* adjust periodics after time jump */ 1011 /* adjust periodics after time jump */
856 for (i = 0; i < periodiccnt; ++i) 1012 for (i = 0; i < periodiccnt; ++i)
857 { 1013 {
858 struct ev_periodic *w = periodics [i]; 1014 struct ev_periodic *w = periodics [i];
859 1015
1016 if (w->reschedule_cb)
1017 ((WT)w)->at = w->reschedule_cb (w, rt_now);
860 if (w->interval) 1018 else if (w->interval)
861 {
862 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;
863
864 if (fabs (diff) >= 1e-4)
865 {
866 ev_periodic_stop (EV_A_ w);
867 ev_periodic_start (EV_A_ w);
868
869 i = 0; /* restart loop, inefficient, but time jumps should be rare */
870 }
871 }
872 } 1020 }
1021
1022 /* now rebuild the heap */
1023 for (i = periodiccnt >> 1; i--; )
1024 downheap ((WT *)periodics, periodiccnt, i);
873} 1025}
874 1026
875inline int 1027inline int
876time_update_monotonic (EV_P) 1028time_update_monotonic (EV_P)
877{ 1029{
… …
964 { 1116 {
965 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1117 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
966 call_pending (EV_A); 1118 call_pending (EV_A);
967 } 1119 }
968 1120
1121 /* we might have forked, so reify kernel state if necessary */
1122 if (expect_false (postfork))
1123 loop_fork (EV_A);
1124
969 /* update fd-related kernel structures */ 1125 /* update fd-related kernel structures */
970 fd_reify (EV_A); 1126 fd_reify (EV_A);
971 1127
972 /* calculate blocking time */ 1128 /* calculate blocking time */
973 1129
974 /* 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
975 always have timers, we just calculate it always */ 1131 always have timers, we just calculate it always */
976#if EV_USE_MONOTONIC 1132#if EV_USE_MONOTONIC
977 if (expect_true (have_monotonic)) 1133 if (expect_true (have_monotonic))
978 time_update_monotonic (EV_A); 1134 time_update_monotonic (EV_A);
979 else 1135 else
… …
1012 /* queue pending timers and reschedule them */ 1168 /* queue pending timers and reschedule them */
1013 timers_reify (EV_A); /* relative timers called last */ 1169 timers_reify (EV_A); /* relative timers called last */
1014 periodics_reify (EV_A); /* absolute timers called first */ 1170 periodics_reify (EV_A); /* absolute timers called first */
1015 1171
1016 /* queue idle watchers unless io or timers are pending */ 1172 /* queue idle watchers unless io or timers are pending */
1017 if (!pendingcnt) 1173 if (idlecnt && !any_pending (EV_A))
1018 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1174 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1019 1175
1020 /* queue check watchers, to be executed first */ 1176 /* queue check watchers, to be executed first */
1021 if (checkcnt) 1177 if (checkcnt)
1022 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1178 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1097 return; 1253 return;
1098 1254
1099 assert (("ev_io_start called with negative fd", fd >= 0)); 1255 assert (("ev_io_start called with negative fd", fd >= 0));
1100 1256
1101 ev_start (EV_A_ (W)w, 1); 1257 ev_start (EV_A_ (W)w, 1);
1102 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1258 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1103 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1259 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1104 1260
1105 fd_change (EV_A_ fd); 1261 fd_change (EV_A_ fd);
1106} 1262}
1107 1263
… …
1127 ((WT)w)->at += mn_now; 1283 ((WT)w)->at += mn_now;
1128 1284
1129 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.));
1130 1286
1131 ev_start (EV_A_ (W)w, ++timercnt); 1287 ev_start (EV_A_ (W)w, ++timercnt);
1132 array_needsize (timers, timermax, timercnt, ); 1288 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1133 timers [timercnt - 1] = w; 1289 timers [timercnt - 1] = w;
1134 upheap ((WT *)timers, timercnt - 1); 1290 upheap ((WT *)timers, timercnt - 1);
1135 1291
1136 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1292 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1137} 1293}
… …
1177ev_periodic_start (EV_P_ struct ev_periodic *w) 1333ev_periodic_start (EV_P_ struct ev_periodic *w)
1178{ 1334{
1179 if (ev_is_active (w)) 1335 if (ev_is_active (w))
1180 return; 1336 return;
1181 1337
1338 if (w->reschedule_cb)
1339 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1340 else if (w->interval)
1341 {
1182 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.));
1183
1184 /* 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 */
1185 if (w->interval)
1186 ((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 }
1187 1346
1188 ev_start (EV_A_ (W)w, ++periodiccnt); 1347 ev_start (EV_A_ (W)w, ++periodiccnt);
1189 array_needsize (periodics, periodicmax, periodiccnt, ); 1348 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1190 periodics [periodiccnt - 1] = w; 1349 periodics [periodiccnt - 1] = w;
1191 upheap ((WT *)periodics, periodiccnt - 1); 1350 upheap ((WT *)periodics, periodiccnt - 1);
1192 1351
1193 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1352 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1194} 1353}
… …
1210 1369
1211 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1212} 1371}
1213 1372
1214void 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
1215ev_idle_start (EV_P_ struct ev_idle *w) 1381ev_idle_start (EV_P_ struct ev_idle *w)
1216{ 1382{
1217 if (ev_is_active (w)) 1383 if (ev_is_active (w))
1218 return; 1384 return;
1219 1385
1220 ev_start (EV_A_ (W)w, ++idlecnt); 1386 ev_start (EV_A_ (W)w, ++idlecnt);
1221 array_needsize (idles, idlemax, idlecnt, ); 1387 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1222 idles [idlecnt - 1] = w; 1388 idles [idlecnt - 1] = w;
1223} 1389}
1224 1390
1225void 1391void
1226ev_idle_stop (EV_P_ struct ev_idle *w) 1392ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1238{ 1404{
1239 if (ev_is_active (w)) 1405 if (ev_is_active (w))
1240 return; 1406 return;
1241 1407
1242 ev_start (EV_A_ (W)w, ++preparecnt); 1408 ev_start (EV_A_ (W)w, ++preparecnt);
1243 array_needsize (prepares, preparemax, preparecnt, ); 1409 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1244 prepares [preparecnt - 1] = w; 1410 prepares [preparecnt - 1] = w;
1245} 1411}
1246 1412
1247void 1413void
1248ev_prepare_stop (EV_P_ struct ev_prepare *w) 1414ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1260{ 1426{
1261 if (ev_is_active (w)) 1427 if (ev_is_active (w))
1262 return; 1428 return;
1263 1429
1264 ev_start (EV_A_ (W)w, ++checkcnt); 1430 ev_start (EV_A_ (W)w, ++checkcnt);
1265 array_needsize (checks, checkmax, checkcnt, ); 1431 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1266 checks [checkcnt - 1] = w; 1432 checks [checkcnt - 1] = w;
1267} 1433}
1268 1434
1269void 1435void
1270ev_check_stop (EV_P_ struct ev_check *w) 1436ev_check_stop (EV_P_ struct ev_check *w)
… …
1291 return; 1457 return;
1292 1458
1293 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));
1294 1460
1295 ev_start (EV_A_ (W)w, 1); 1461 ev_start (EV_A_ (W)w, 1);
1296 array_needsize (signals, signalmax, w->signum, signals_init); 1462 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1297 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1463 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1298 1464
1299 if (!((WL)w)->next) 1465 if (!((WL)w)->next)
1300 { 1466 {
1467#if WIN32
1468 signal (w->signum, sighandler);
1469#else
1301 struct sigaction sa; 1470 struct sigaction sa;
1302 sa.sa_handler = sighandler; 1471 sa.sa_handler = sighandler;
1303 sigfillset (&sa.sa_mask); 1472 sigfillset (&sa.sa_mask);
1304 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 */
1305 sigaction (w->signum, &sa, 0); 1474 sigaction (w->signum, &sa, 0);
1475#endif
1306 } 1476 }
1307} 1477}
1308 1478
1309void 1479void
1310ev_signal_stop (EV_P_ struct ev_signal *w) 1480ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1360 void (*cb)(int revents, void *arg) = once->cb; 1530 void (*cb)(int revents, void *arg) = once->cb;
1361 void *arg = once->arg; 1531 void *arg = once->arg;
1362 1532
1363 ev_io_stop (EV_A_ &once->io); 1533 ev_io_stop (EV_A_ &once->io);
1364 ev_timer_stop (EV_A_ &once->to); 1534 ev_timer_stop (EV_A_ &once->to);
1365 free (once); 1535 ev_free (once);
1366 1536
1367 cb (revents, arg); 1537 cb (revents, arg);
1368} 1538}
1369 1539
1370static void 1540static void
… …
1380} 1550}
1381 1551
1382void 1552void
1383ev_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)
1384{ 1554{
1385 struct ev_once *once = malloc (sizeof (struct ev_once)); 1555 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1386 1556
1387 if (!once) 1557 if (!once)
1388 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1558 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1389 else 1559 else
1390 { 1560 {

Diff Legend

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