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

Comparing libev/ev.c (file contents):
Revision 1.65 by root, Sun Nov 4 23:29:48 2007 UTC vs.
Revision 1.81 by root, Fri Nov 9 17:07:59 2007 UTC

… …
54 54
55#endif 55#endif
56 56
57#include <math.h> 57#include <math.h>
58#include <stdlib.h> 58#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 59#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 60#include <stddef.h>
63 61
64#include <stdio.h> 62#include <stdio.h>
65 63
66#include <assert.h> 64#include <assert.h>
67#include <errno.h> 65#include <errno.h>
68#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
69#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
70# include <sys/wait.h> 74# include <sys/wait.h>
71#endif 75#endif
72#include <sys/time.h>
73#include <time.h>
74
75/**/ 76/**/
76 77
77#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
79#endif 80#endif
… …
94# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
95#endif 96#endif
96 97
97#ifndef EV_USE_WIN32 98#ifndef EV_USE_WIN32
98# ifdef WIN32 99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
99# define EV_USE_WIN32 1 102# define EV_USE_SELECT 1
100# else 103# else
101# define EV_USE_WIN32 0 104# define EV_USE_WIN32 0
102# endif 105# endif
103#endif 106#endif
104 107
… …
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
127 130
131#ifdef EV_H
132# include EV_H
133#else
128#include "ev.h" 134# include "ev.h"
135#endif
129 136
130#if __GNUC__ >= 3 137#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 138# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 139# define inline inline
133#else 140#else
… …
145typedef struct ev_watcher_list *WL; 152typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 153typedef struct ev_watcher_time *WT;
147 154
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 156
157#include "ev_win32.c"
158
150/*****************************************************************************/ 159/*****************************************************************************/
151 160
161static void (*syserr_cb)(const char *msg);
162
163void ev_set_syserr_cb (void (*cb)(const char *msg))
164{
165 syserr_cb = cb;
166}
167
168static void
169syserr (const char *msg)
170{
171 if (!msg)
172 msg = "(libev) system error";
173
174 if (syserr_cb)
175 syserr_cb (msg);
176 else
177 {
178 perror (msg);
179 abort ();
180 }
181}
182
183static void *(*alloc)(void *ptr, long size);
184
185void ev_set_allocator (void *(*cb)(void *ptr, long size))
186{
187 alloc = cb;
188}
189
190static void *
191ev_realloc (void *ptr, long size)
192{
193 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
194
195 if (!ptr && size)
196 {
197 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
198 abort ();
199 }
200
201 return ptr;
202}
203
204#define ev_malloc(size) ev_realloc (0, (size))
205#define ev_free(ptr) ev_realloc ((ptr), 0)
206
207/*****************************************************************************/
208
152typedef struct 209typedef struct
153{ 210{
154 struct ev_watcher_list *head; 211 WL head;
155 unsigned char events; 212 unsigned char events;
156 unsigned char reify; 213 unsigned char reify;
157} ANFD; 214} ANFD;
158 215
159typedef struct 216typedef struct
… …
162 int events; 219 int events;
163} ANPENDING; 220} ANPENDING;
164 221
165#if EV_MULTIPLICITY 222#if EV_MULTIPLICITY
166 223
167struct ev_loop 224 struct ev_loop
168{ 225 {
169# define VAR(name,decl) decl; 226 #define VAR(name,decl) decl;
170# include "ev_vars.h" 227 #include "ev_vars.h"
171};
172# undef VAR 228 #undef VAR
229 };
173# include "ev_wrap.h" 230 #include "ev_wrap.h"
231
232 struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop;
174 234
175#else 235#else
176 236
177# define VAR(name,decl) static decl; 237 #define VAR(name,decl) static decl;
178# include "ev_vars.h" 238 #include "ev_vars.h"
179# undef VAR 239 #undef VAR
240
241 static int default_loop;
180 242
181#endif 243#endif
182 244
183/*****************************************************************************/ 245/*****************************************************************************/
184 246
… …
215ev_now (EV_P) 277ev_now (EV_P)
216{ 278{
217 return rt_now; 279 return rt_now;
218} 280}
219 281
220#define array_roundsize(base,n) ((n) | 4 & ~3) 282#define array_roundsize(type,n) ((n) | 4 & ~3)
221 283
222#define array_needsize(base,cur,cnt,init) \ 284#define array_needsize(type,base,cur,cnt,init) \
223 if (expect_false ((cnt) > cur)) \ 285 if (expect_false ((cnt) > cur)) \
224 { \ 286 { \
225 int newcnt = cur; \ 287 int newcnt = cur; \
226 do \ 288 do \
227 { \ 289 { \
228 newcnt = array_roundsize (base, newcnt << 1); \ 290 newcnt = array_roundsize (type, newcnt << 1); \
229 } \ 291 } \
230 while ((cnt) > newcnt); \ 292 while ((cnt) > newcnt); \
231 \ 293 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 294 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
233 init (base + cur, newcnt - cur); \ 295 init (base + cur, newcnt - cur); \
234 cur = newcnt; \ 296 cur = newcnt; \
235 } 297 }
298
299#define array_slim(type,stem) \
300 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
301 { \
302 stem ## max = array_roundsize (stem ## cnt >> 1); \
303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
305 }
306
307/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
308/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
309#define array_free_microshit(stem) \
310 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
236 311
237#define array_free(stem, idx) \ 312#define array_free(stem, idx) \
238 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 313 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
239 314
240/*****************************************************************************/ 315/*****************************************************************************/
241 316
242static void 317static void
243anfds_init (ANFD *base, int count) 318anfds_init (ANFD *base, int count)
… …
250 325
251 ++base; 326 ++base;
252 } 327 }
253} 328}
254 329
255static void 330void
256event (EV_P_ W w, int events) 331ev_feed_event (EV_P_ void *w, int revents)
257{ 332{
333 W w_ = (W)w;
334
258 if (w->pending) 335 if (w_->pending)
259 { 336 {
260 pendings [ABSPRI (w)][w->pending - 1].events |= events; 337 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
261 return; 338 return;
262 } 339 }
263 340
264 w->pending = ++pendingcnt [ABSPRI (w)]; 341 w_->pending = ++pendingcnt [ABSPRI (w_)];
265 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 342 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
266 pendings [ABSPRI (w)][w->pending - 1].w = w; 343 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
267 pendings [ABSPRI (w)][w->pending - 1].events = events; 344 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
268} 345}
269 346
270static void 347static void
271queue_events (EV_P_ W *events, int eventcnt, int type) 348queue_events (EV_P_ W *events, int eventcnt, int type)
272{ 349{
273 int i; 350 int i;
274 351
275 for (i = 0; i < eventcnt; ++i) 352 for (i = 0; i < eventcnt; ++i)
276 event (EV_A_ events [i], type); 353 ev_feed_event (EV_A_ events [i], type);
277} 354}
278 355
279static void 356inline void
280fd_event (EV_P_ int fd, int events) 357fd_event (EV_P_ int fd, int revents)
281{ 358{
282 ANFD *anfd = anfds + fd; 359 ANFD *anfd = anfds + fd;
283 struct ev_io *w; 360 struct ev_io *w;
284 361
285 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 362 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
286 { 363 {
287 int ev = w->events & events; 364 int ev = w->events & revents;
288 365
289 if (ev) 366 if (ev)
290 event (EV_A_ (W)w, ev); 367 ev_feed_event (EV_A_ (W)w, ev);
291 } 368 }
369}
370
371void
372ev_feed_fd_event (EV_P_ int fd, int revents)
373{
374 fd_event (EV_A_ fd, revents);
292} 375}
293 376
294/*****************************************************************************/ 377/*****************************************************************************/
295 378
296static void 379static void
… …
319} 402}
320 403
321static void 404static void
322fd_change (EV_P_ int fd) 405fd_change (EV_P_ int fd)
323{ 406{
324 if (anfds [fd].reify || fdchangecnt < 0) 407 if (anfds [fd].reify)
325 return; 408 return;
326 409
327 anfds [fd].reify = 1; 410 anfds [fd].reify = 1;
328 411
329 ++fdchangecnt; 412 ++fdchangecnt;
330 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 413 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
331 fdchanges [fdchangecnt - 1] = fd; 414 fdchanges [fdchangecnt - 1] = fd;
332} 415}
333 416
334static void 417static void
335fd_kill (EV_P_ int fd) 418fd_kill (EV_P_ int fd)
… …
337 struct ev_io *w; 420 struct ev_io *w;
338 421
339 while ((w = (struct ev_io *)anfds [fd].head)) 422 while ((w = (struct ev_io *)anfds [fd].head))
340 { 423 {
341 ev_io_stop (EV_A_ w); 424 ev_io_stop (EV_A_ w);
342 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 425 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
343 } 426 }
427}
428
429static int
430fd_valid (int fd)
431{
432#ifdef WIN32
433 return !!win32_get_osfhandle (fd);
434#else
435 return fcntl (fd, F_GETFD) != -1;
436#endif
344} 437}
345 438
346/* called on EBADF to verify fds */ 439/* called on EBADF to verify fds */
347static void 440static void
348fd_ebadf (EV_P) 441fd_ebadf (EV_P)
349{ 442{
350 int fd; 443 int fd;
351 444
352 for (fd = 0; fd < anfdmax; ++fd) 445 for (fd = 0; fd < anfdmax; ++fd)
353 if (anfds [fd].events) 446 if (anfds [fd].events)
354 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 447 if (!fd_valid (fd) == -1 && errno == EBADF)
355 fd_kill (EV_A_ fd); 448 fd_kill (EV_A_ fd);
356} 449}
357 450
358/* called on ENOMEM in select/poll to kill some fds and retry */ 451/* called on ENOMEM in select/poll to kill some fds and retry */
359static void 452static void
… …
362 int fd; 455 int fd;
363 456
364 for (fd = anfdmax; fd--; ) 457 for (fd = anfdmax; fd--; )
365 if (anfds [fd].events) 458 if (anfds [fd].events)
366 { 459 {
367 close (fd);
368 fd_kill (EV_A_ fd); 460 fd_kill (EV_A_ fd);
369 return; 461 return;
370 } 462 }
371} 463}
372 464
373/* susually called after fork if method needs to re-arm all fds from scratch */ 465/* usually called after fork if method needs to re-arm all fds from scratch */
374static void 466static void
375fd_rearm_all (EV_P) 467fd_rearm_all (EV_P)
376{ 468{
377 int fd; 469 int fd;
378 470
… …
430 522
431/*****************************************************************************/ 523/*****************************************************************************/
432 524
433typedef struct 525typedef struct
434{ 526{
435 struct ev_watcher_list *head; 527 WL head;
436 sig_atomic_t volatile gotsig; 528 sig_atomic_t volatile gotsig;
437} ANSIG; 529} ANSIG;
438 530
439static ANSIG *signals; 531static ANSIG *signals;
440static int signalmax; 532static int signalmax;
… …
456} 548}
457 549
458static void 550static void
459sighandler (int signum) 551sighandler (int signum)
460{ 552{
553#if WIN32
554 signal (signum, sighandler);
555#endif
556
461 signals [signum - 1].gotsig = 1; 557 signals [signum - 1].gotsig = 1;
462 558
463 if (!gotsig) 559 if (!gotsig)
464 { 560 {
465 int old_errno = errno; 561 int old_errno = errno;
466 gotsig = 1; 562 gotsig = 1;
563#ifdef WIN32
564 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
565#else
467 write (sigpipe [1], &signum, 1); 566 write (sigpipe [1], &signum, 1);
567#endif
468 errno = old_errno; 568 errno = old_errno;
469 } 569 }
470} 570}
471 571
572void
573ev_feed_signal_event (EV_P_ int signum)
574{
575 WL w;
576
577#if EV_MULTIPLICITY
578 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
579#endif
580
581 --signum;
582
583 if (signum < 0 || signum >= signalmax)
584 return;
585
586 signals [signum].gotsig = 0;
587
588 for (w = signals [signum].head; w; w = w->next)
589 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
590}
591
472static void 592static void
473sigcb (EV_P_ struct ev_io *iow, int revents) 593sigcb (EV_P_ struct ev_io *iow, int revents)
474{ 594{
475 struct ev_watcher_list *w;
476 int signum; 595 int signum;
477 596
597#ifdef WIN32
598 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
599#else
478 read (sigpipe [0], &revents, 1); 600 read (sigpipe [0], &revents, 1);
601#endif
479 gotsig = 0; 602 gotsig = 0;
480 603
481 for (signum = signalmax; signum--; ) 604 for (signum = signalmax; signum--; )
482 if (signals [signum].gotsig) 605 if (signals [signum].gotsig)
483 { 606 ev_feed_signal_event (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} 607}
490 608
491static void 609static void
492siginit (EV_P) 610siginit (EV_P)
493{ 611{
… …
505 ev_unref (EV_A); /* child watcher should not keep loop alive */ 623 ev_unref (EV_A); /* child watcher should not keep loop alive */
506} 624}
507 625
508/*****************************************************************************/ 626/*****************************************************************************/
509 627
628static struct ev_child *childs [PID_HASHSIZE];
629
510#ifndef WIN32 630#ifndef WIN32
511 631
512static struct ev_child *childs [PID_HASHSIZE];
513static struct ev_signal childev; 632static struct ev_signal childev;
514 633
515#ifndef WCONTINUED 634#ifndef WCONTINUED
516# define WCONTINUED 0 635# define WCONTINUED 0
517#endif 636#endif
… …
525 if (w->pid == pid || !w->pid) 644 if (w->pid == pid || !w->pid)
526 { 645 {
527 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 646 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
528 w->rpid = pid; 647 w->rpid = pid;
529 w->rstatus = status; 648 w->rstatus = status;
530 event (EV_A_ (W)w, EV_CHILD); 649 ev_feed_event (EV_A_ (W)w, EV_CHILD);
531 } 650 }
532} 651}
533 652
534static void 653static void
535childcb (EV_P_ struct ev_signal *sw, int revents) 654childcb (EV_P_ struct ev_signal *sw, int revents)
… …
537 int pid, status; 656 int pid, status;
538 657
539 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 658 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
540 { 659 {
541 /* make sure we are called again until all childs have been reaped */ 660 /* make sure we are called again until all childs have been reaped */
542 event (EV_A_ (W)sw, EV_SIGNAL); 661 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
543 662
544 child_reap (EV_A_ sw, pid, pid, status); 663 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 */ 664 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
546 } 665 }
547} 666}
… …
631 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 750 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
632#endif 751#endif
633#if EV_USE_SELECT 752#if EV_USE_SELECT
634 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 753 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
635#endif 754#endif
755
756 ev_watcher_init (&sigev, sigcb);
757 ev_set_priority (&sigev, EV_MAXPRI);
636 } 758 }
637} 759}
638 760
639void 761void
640loop_destroy (EV_P) 762loop_destroy (EV_P)
… …
658#endif 780#endif
659 781
660 for (i = NUMPRI; i--; ) 782 for (i = NUMPRI; i--; )
661 array_free (pending, [i]); 783 array_free (pending, [i]);
662 784
785 /* have to use the microsoft-never-gets-it-right macro */
663 array_free (fdchange, ); 786 array_free_microshit (fdchange);
664 array_free (timer, ); 787 array_free_microshit (timer);
665 array_free (periodic, ); 788 array_free_microshit (periodic);
666 array_free (idle, ); 789 array_free_microshit (idle);
667 array_free (prepare, ); 790 array_free_microshit (prepare);
668 array_free (check, ); 791 array_free_microshit (check);
669 792
670 method = 0; 793 method = 0;
671 /*TODO*/
672} 794}
673 795
674void 796static void
675loop_fork (EV_P) 797loop_fork (EV_P)
676{ 798{
677 /*TODO*/
678#if EV_USE_EPOLL 799#if EV_USE_EPOLL
679 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 800 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
680#endif 801#endif
681#if EV_USE_KQUEUE 802#if EV_USE_KQUEUE
682 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 803 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
683#endif 804#endif
805
806 if (ev_is_active (&sigev))
807 {
808 /* default loop */
809
810 ev_ref (EV_A);
811 ev_io_stop (EV_A_ &sigev);
812 close (sigpipe [0]);
813 close (sigpipe [1]);
814
815 while (pipe (sigpipe))
816 syserr ("(libev) error creating pipe");
817
818 siginit (EV_A);
819 }
820
821 postfork = 0;
684} 822}
685 823
686#if EV_MULTIPLICITY 824#if EV_MULTIPLICITY
687struct ev_loop * 825struct ev_loop *
688ev_loop_new (int methods) 826ev_loop_new (int methods)
689{ 827{
690 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 828 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
829
830 memset (loop, 0, sizeof (struct ev_loop));
691 831
692 loop_init (EV_A_ methods); 832 loop_init (EV_A_ methods);
693 833
694 if (ev_method (EV_A)) 834 if (ev_method (EV_A))
695 return loop; 835 return loop;
… …
699 839
700void 840void
701ev_loop_destroy (EV_P) 841ev_loop_destroy (EV_P)
702{ 842{
703 loop_destroy (EV_A); 843 loop_destroy (EV_A);
704 free (loop); 844 ev_free (loop);
705} 845}
706 846
707void 847void
708ev_loop_fork (EV_P) 848ev_loop_fork (EV_P)
709{ 849{
710 loop_fork (EV_A); 850 postfork = 1;
711} 851}
712 852
713#endif 853#endif
714 854
715#if EV_MULTIPLICITY 855#if EV_MULTIPLICITY
716struct ev_loop default_loop_struct;
717static struct ev_loop *default_loop;
718
719struct ev_loop * 856struct ev_loop *
720#else 857#else
721static int default_loop;
722
723int 858int
724#endif 859#endif
725ev_default_loop (int methods) 860ev_default_loop (int methods)
726{ 861{
727 if (sigpipe [0] == sigpipe [1]) 862 if (sigpipe [0] == sigpipe [1])
… …
738 873
739 loop_init (EV_A_ methods); 874 loop_init (EV_A_ methods);
740 875
741 if (ev_method (EV_A)) 876 if (ev_method (EV_A))
742 { 877 {
743 ev_watcher_init (&sigev, sigcb);
744 ev_set_priority (&sigev, EV_MAXPRI);
745 siginit (EV_A); 878 siginit (EV_A);
746 879
747#ifndef WIN32 880#ifndef WIN32
748 ev_signal_init (&childev, childcb, SIGCHLD); 881 ev_signal_init (&childev, childcb, SIGCHLD);
749 ev_set_priority (&childev, EV_MAXPRI); 882 ev_set_priority (&childev, EV_MAXPRI);
… …
763{ 896{
764#if EV_MULTIPLICITY 897#if EV_MULTIPLICITY
765 struct ev_loop *loop = default_loop; 898 struct ev_loop *loop = default_loop;
766#endif 899#endif
767 900
901#ifndef WIN32
768 ev_ref (EV_A); /* child watcher */ 902 ev_ref (EV_A); /* child watcher */
769 ev_signal_stop (EV_A_ &childev); 903 ev_signal_stop (EV_A_ &childev);
904#endif
770 905
771 ev_ref (EV_A); /* signal watcher */ 906 ev_ref (EV_A); /* signal watcher */
772 ev_io_stop (EV_A_ &sigev); 907 ev_io_stop (EV_A_ &sigev);
773 908
774 close (sigpipe [0]); sigpipe [0] = 0; 909 close (sigpipe [0]); sigpipe [0] = 0;
… …
782{ 917{
783#if EV_MULTIPLICITY 918#if EV_MULTIPLICITY
784 struct ev_loop *loop = default_loop; 919 struct ev_loop *loop = default_loop;
785#endif 920#endif
786 921
787 loop_fork (EV_A); 922 if (method)
788 923 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} 924}
797 925
798/*****************************************************************************/ 926/*****************************************************************************/
927
928static int
929any_pending (EV_P)
930{
931 int pri;
932
933 for (pri = NUMPRI; pri--; )
934 if (pendingcnt [pri])
935 return 1;
936
937 return 0;
938}
799 939
800static void 940static void
801call_pending (EV_P) 941call_pending (EV_P)
802{ 942{
803 int pri; 943 int pri;
… …
808 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 948 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
809 949
810 if (p->w) 950 if (p->w)
811 { 951 {
812 p->w->pending = 0; 952 p->w->pending = 0;
813
814 ((void (*)(EV_P_ W, int))p->w->cb) (EV_A_ p->w, p->events); 953 p->w->cb (EV_A_ p->w, p->events);
815 } 954 }
816 } 955 }
817} 956}
818 957
819static void 958static void
… …
833 downheap ((WT *)timers, timercnt, 0); 972 downheap ((WT *)timers, timercnt, 0);
834 } 973 }
835 else 974 else
836 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 975 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
837 976
838 event (EV_A_ (W)w, EV_TIMEOUT); 977 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
839 } 978 }
840} 979}
841 980
842static void 981static void
843periodics_reify (EV_P) 982periodics_reify (EV_P)
… …
847 struct ev_periodic *w = periodics [0]; 986 struct ev_periodic *w = periodics [0];
848 987
849 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 988 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
850 989
851 /* first reschedule or stop timer */ 990 /* first reschedule or stop timer */
991 if (w->reschedule_cb)
992 {
993 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
994
995 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
996 downheap ((WT *)periodics, periodiccnt, 0);
997 }
852 if (w->interval) 998 else if (w->interval)
853 { 999 {
854 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1000 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
855 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1001 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
856 downheap ((WT *)periodics, periodiccnt, 0); 1002 downheap ((WT *)periodics, periodiccnt, 0);
857 } 1003 }
858 else 1004 else
859 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1005 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
860 1006
861 event (EV_A_ (W)w, EV_PERIODIC); 1007 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
862 } 1008 }
863} 1009}
864 1010
865static void 1011static void
866periodics_reschedule (EV_P) 1012periodics_reschedule (EV_P)
… …
870 /* adjust periodics after time jump */ 1016 /* adjust periodics after time jump */
871 for (i = 0; i < periodiccnt; ++i) 1017 for (i = 0; i < periodiccnt; ++i)
872 { 1018 {
873 struct ev_periodic *w = periodics [i]; 1019 struct ev_periodic *w = periodics [i];
874 1020
1021 if (w->reschedule_cb)
1022 ((WT)w)->at = w->reschedule_cb (w, rt_now);
875 if (w->interval) 1023 else if (w->interval)
876 {
877 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1024 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
878
879 if (fabs (diff) >= 1e-4)
880 {
881 ev_periodic_stop (EV_A_ w);
882 ev_periodic_start (EV_A_ w);
883
884 i = 0; /* restart loop, inefficient, but time jumps should be rare */
885 }
886 }
887 } 1025 }
1026
1027 /* now rebuild the heap */
1028 for (i = periodiccnt >> 1; i--; )
1029 downheap ((WT *)periodics, periodiccnt, i);
888} 1030}
889 1031
890inline int 1032inline int
891time_update_monotonic (EV_P) 1033time_update_monotonic (EV_P)
892{ 1034{
… …
979 { 1121 {
980 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1122 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
981 call_pending (EV_A); 1123 call_pending (EV_A);
982 } 1124 }
983 1125
1126 /* we might have forked, so reify kernel state if necessary */
1127 if (expect_false (postfork))
1128 loop_fork (EV_A);
1129
984 /* update fd-related kernel structures */ 1130 /* update fd-related kernel structures */
985 fd_reify (EV_A); 1131 fd_reify (EV_A);
986 1132
987 /* calculate blocking time */ 1133 /* calculate blocking time */
988 1134
989 /* we only need this for !monotonic clockor timers, but as we basically 1135 /* we only need this for !monotonic clock or timers, but as we basically
990 always have timers, we just calculate it always */ 1136 always have timers, we just calculate it always */
991#if EV_USE_MONOTONIC 1137#if EV_USE_MONOTONIC
992 if (expect_true (have_monotonic)) 1138 if (expect_true (have_monotonic))
993 time_update_monotonic (EV_A); 1139 time_update_monotonic (EV_A);
994 else 1140 else
… …
1027 /* queue pending timers and reschedule them */ 1173 /* queue pending timers and reschedule them */
1028 timers_reify (EV_A); /* relative timers called last */ 1174 timers_reify (EV_A); /* relative timers called last */
1029 periodics_reify (EV_A); /* absolute timers called first */ 1175 periodics_reify (EV_A); /* absolute timers called first */
1030 1176
1031 /* queue idle watchers unless io or timers are pending */ 1177 /* queue idle watchers unless io or timers are pending */
1032 if (!pendingcnt) 1178 if (idlecnt && !any_pending (EV_A))
1033 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1179 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1034 1180
1035 /* queue check watchers, to be executed first */ 1181 /* queue check watchers, to be executed first */
1036 if (checkcnt) 1182 if (checkcnt)
1037 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1183 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1112 return; 1258 return;
1113 1259
1114 assert (("ev_io_start called with negative fd", fd >= 0)); 1260 assert (("ev_io_start called with negative fd", fd >= 0));
1115 1261
1116 ev_start (EV_A_ (W)w, 1); 1262 ev_start (EV_A_ (W)w, 1);
1117 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1263 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1118 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1264 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1119 1265
1120 fd_change (EV_A_ fd); 1266 fd_change (EV_A_ fd);
1121} 1267}
1122 1268
… …
1142 ((WT)w)->at += mn_now; 1288 ((WT)w)->at += mn_now;
1143 1289
1144 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1290 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1145 1291
1146 ev_start (EV_A_ (W)w, ++timercnt); 1292 ev_start (EV_A_ (W)w, ++timercnt);
1147 array_needsize (timers, timermax, timercnt, ); 1293 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1148 timers [timercnt - 1] = w; 1294 timers [timercnt - 1] = w;
1149 upheap ((WT *)timers, timercnt - 1); 1295 upheap ((WT *)timers, timercnt - 1);
1150 1296
1151 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1297 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1152} 1298}
… …
1192ev_periodic_start (EV_P_ struct ev_periodic *w) 1338ev_periodic_start (EV_P_ struct ev_periodic *w)
1193{ 1339{
1194 if (ev_is_active (w)) 1340 if (ev_is_active (w))
1195 return; 1341 return;
1196 1342
1343 if (w->reschedule_cb)
1344 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1345 else if (w->interval)
1346 {
1197 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1347 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1198
1199 /* this formula differs from the one in periodic_reify because we do not always round up */ 1348 /* this formula differs from the one in periodic_reify because we do not always round up */
1200 if (w->interval)
1201 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1349 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1350 }
1202 1351
1203 ev_start (EV_A_ (W)w, ++periodiccnt); 1352 ev_start (EV_A_ (W)w, ++periodiccnt);
1204 array_needsize (periodics, periodicmax, periodiccnt, ); 1353 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1205 periodics [periodiccnt - 1] = w; 1354 periodics [periodiccnt - 1] = w;
1206 upheap ((WT *)periodics, periodiccnt - 1); 1355 upheap ((WT *)periodics, periodiccnt - 1);
1207 1356
1208 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1357 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1209} 1358}
… …
1225 1374
1226 ev_stop (EV_A_ (W)w); 1375 ev_stop (EV_A_ (W)w);
1227} 1376}
1228 1377
1229void 1378void
1379ev_periodic_again (EV_P_ struct ev_periodic *w)
1380{
1381 ev_periodic_stop (EV_A_ w);
1382 ev_periodic_start (EV_A_ w);
1383}
1384
1385void
1230ev_idle_start (EV_P_ struct ev_idle *w) 1386ev_idle_start (EV_P_ struct ev_idle *w)
1231{ 1387{
1232 if (ev_is_active (w)) 1388 if (ev_is_active (w))
1233 return; 1389 return;
1234 1390
1235 ev_start (EV_A_ (W)w, ++idlecnt); 1391 ev_start (EV_A_ (W)w, ++idlecnt);
1236 array_needsize (idles, idlemax, idlecnt, ); 1392 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1237 idles [idlecnt - 1] = w; 1393 idles [idlecnt - 1] = w;
1238} 1394}
1239 1395
1240void 1396void
1241ev_idle_stop (EV_P_ struct ev_idle *w) 1397ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1253{ 1409{
1254 if (ev_is_active (w)) 1410 if (ev_is_active (w))
1255 return; 1411 return;
1256 1412
1257 ev_start (EV_A_ (W)w, ++preparecnt); 1413 ev_start (EV_A_ (W)w, ++preparecnt);
1258 array_needsize (prepares, preparemax, preparecnt, ); 1414 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1259 prepares [preparecnt - 1] = w; 1415 prepares [preparecnt - 1] = w;
1260} 1416}
1261 1417
1262void 1418void
1263ev_prepare_stop (EV_P_ struct ev_prepare *w) 1419ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1275{ 1431{
1276 if (ev_is_active (w)) 1432 if (ev_is_active (w))
1277 return; 1433 return;
1278 1434
1279 ev_start (EV_A_ (W)w, ++checkcnt); 1435 ev_start (EV_A_ (W)w, ++checkcnt);
1280 array_needsize (checks, checkmax, checkcnt, ); 1436 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1281 checks [checkcnt - 1] = w; 1437 checks [checkcnt - 1] = w;
1282} 1438}
1283 1439
1284void 1440void
1285ev_check_stop (EV_P_ struct ev_check *w) 1441ev_check_stop (EV_P_ struct ev_check *w)
… …
1306 return; 1462 return;
1307 1463
1308 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1464 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1309 1465
1310 ev_start (EV_A_ (W)w, 1); 1466 ev_start (EV_A_ (W)w, 1);
1311 array_needsize (signals, signalmax, w->signum, signals_init); 1467 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1312 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1468 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1313 1469
1314 if (!((WL)w)->next) 1470 if (!((WL)w)->next)
1315 { 1471 {
1472#if WIN32
1473 signal (w->signum, sighandler);
1474#else
1316 struct sigaction sa; 1475 struct sigaction sa;
1317 sa.sa_handler = sighandler; 1476 sa.sa_handler = sighandler;
1318 sigfillset (&sa.sa_mask); 1477 sigfillset (&sa.sa_mask);
1319 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1478 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1320 sigaction (w->signum, &sa, 0); 1479 sigaction (w->signum, &sa, 0);
1480#endif
1321 } 1481 }
1322} 1482}
1323 1483
1324void 1484void
1325ev_signal_stop (EV_P_ struct ev_signal *w) 1485ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1375 void (*cb)(int revents, void *arg) = once->cb; 1535 void (*cb)(int revents, void *arg) = once->cb;
1376 void *arg = once->arg; 1536 void *arg = once->arg;
1377 1537
1378 ev_io_stop (EV_A_ &once->io); 1538 ev_io_stop (EV_A_ &once->io);
1379 ev_timer_stop (EV_A_ &once->to); 1539 ev_timer_stop (EV_A_ &once->to);
1380 free (once); 1540 ev_free (once);
1381 1541
1382 cb (revents, arg); 1542 cb (revents, arg);
1383} 1543}
1384 1544
1385static void 1545static void
… …
1395} 1555}
1396 1556
1397void 1557void
1398ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1558ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1399{ 1559{
1400 struct ev_once *once = malloc (sizeof (struct ev_once)); 1560 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1401 1561
1402 if (!once) 1562 if (!once)
1403 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1563 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1404 else 1564 else
1405 { 1565 {

Diff Legend

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