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.80 by root, Fri Nov 9 15:30: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
… …
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
… …
162 int events; 215 int events;
163} ANPENDING; 216} ANPENDING;
164 217
165#if EV_MULTIPLICITY 218#if EV_MULTIPLICITY
166 219
167struct ev_loop 220 struct ev_loop
168{ 221 {
169# define VAR(name,decl) decl; 222 #define VAR(name,decl) decl;
170# include "ev_vars.h" 223 #include "ev_vars.h"
171};
172# undef VAR 224 #undef VAR
225 };
173# include "ev_wrap.h" 226 #include "ev_wrap.h"
227
228 struct ev_loop default_loop_struct;
229 static struct ev_loop *default_loop;
174 230
175#else 231#else
176 232
177# define VAR(name,decl) static decl; 233 #define VAR(name,decl) static decl;
178# include "ev_vars.h" 234 #include "ev_vars.h"
179# undef VAR 235 #undef VAR
236
237 static int default_loop;
180 238
181#endif 239#endif
182 240
183/*****************************************************************************/ 241/*****************************************************************************/
184 242
… …
215ev_now (EV_P) 273ev_now (EV_P)
216{ 274{
217 return rt_now; 275 return rt_now;
218} 276}
219 277
220#define array_roundsize(base,n) ((n) | 4 & ~3) 278#define array_roundsize(type,n) ((n) | 4 & ~3)
221 279
222#define array_needsize(base,cur,cnt,init) \ 280#define array_needsize(type,base,cur,cnt,init) \
223 if (expect_false ((cnt) > cur)) \ 281 if (expect_false ((cnt) > cur)) \
224 { \ 282 { \
225 int newcnt = cur; \ 283 int newcnt = cur; \
226 do \ 284 do \
227 { \ 285 { \
228 newcnt = array_roundsize (base, newcnt << 1); \ 286 newcnt = array_roundsize (type, newcnt << 1); \
229 } \ 287 } \
230 while ((cnt) > newcnt); \ 288 while ((cnt) > newcnt); \
231 \ 289 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 290 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
233 init (base + cur, newcnt - cur); \ 291 init (base + cur, newcnt - cur); \
234 cur = newcnt; \ 292 cur = newcnt; \
235 } 293 }
294
295#define array_slim(type,stem) \
296 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
297 { \
298 stem ## max = array_roundsize (stem ## cnt >> 1); \
299 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
300 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
301 }
302
303/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
304/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
305#define array_free_microshit(stem) \
306 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
307
308#define array_free(stem, idx) \
309 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
236 310
237/*****************************************************************************/ 311/*****************************************************************************/
238 312
239static void 313static void
240anfds_init (ANFD *base, int count) 314anfds_init (ANFD *base, int count)
… …
247 321
248 ++base; 322 ++base;
249 } 323 }
250} 324}
251 325
252static void 326void
253event (EV_P_ W w, int events) 327ev_feed_event (EV_P_ void *w, int revents)
254{ 328{
329 W w_ = (W)w;
330
255 if (w->pending) 331 if (w_->pending)
256 { 332 {
257 pendings [ABSPRI (w)][w->pending - 1].events |= events; 333 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
258 return; 334 return;
259 } 335 }
260 336
261 w->pending = ++pendingcnt [ABSPRI (w)]; 337 w_->pending = ++pendingcnt [ABSPRI (w_)];
262 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 338 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
263 pendings [ABSPRI (w)][w->pending - 1].w = w; 339 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
264 pendings [ABSPRI (w)][w->pending - 1].events = events; 340 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
265} 341}
266 342
267static void 343static void
268queue_events (EV_P_ W *events, int eventcnt, int type) 344queue_events (EV_P_ W *events, int eventcnt, int type)
269{ 345{
270 int i; 346 int i;
271 347
272 for (i = 0; i < eventcnt; ++i) 348 for (i = 0; i < eventcnt; ++i)
273 event (EV_A_ events [i], type); 349 ev_feed_event (EV_A_ events [i], type);
274} 350}
275 351
276static void 352inline void
277fd_event (EV_P_ int fd, int events) 353fd_event (EV_P_ int fd, int revents)
278{ 354{
279 ANFD *anfd = anfds + fd; 355 ANFD *anfd = anfds + fd;
280 struct ev_io *w; 356 struct ev_io *w;
281 357
282 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 358 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
283 { 359 {
284 int ev = w->events & events; 360 int ev = w->events & revents;
285 361
286 if (ev) 362 if (ev)
287 event (EV_A_ (W)w, ev); 363 ev_feed_event (EV_A_ (W)w, ev);
288 } 364 }
365}
366
367void
368ev_feed_fd_event (EV_P_ int fd, int revents)
369{
370 fd_event (EV_A_ fd, revents);
289} 371}
290 372
291/*****************************************************************************/ 373/*****************************************************************************/
292 374
293static void 375static void
… …
316} 398}
317 399
318static void 400static void
319fd_change (EV_P_ int fd) 401fd_change (EV_P_ int fd)
320{ 402{
321 if (anfds [fd].reify || fdchangecnt < 0) 403 if (anfds [fd].reify)
322 return; 404 return;
323 405
324 anfds [fd].reify = 1; 406 anfds [fd].reify = 1;
325 407
326 ++fdchangecnt; 408 ++fdchangecnt;
327 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 409 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
328 fdchanges [fdchangecnt - 1] = fd; 410 fdchanges [fdchangecnt - 1] = fd;
329} 411}
330 412
331static void 413static void
332fd_kill (EV_P_ int fd) 414fd_kill (EV_P_ int fd)
… …
334 struct ev_io *w; 416 struct ev_io *w;
335 417
336 while ((w = (struct ev_io *)anfds [fd].head)) 418 while ((w = (struct ev_io *)anfds [fd].head))
337 { 419 {
338 ev_io_stop (EV_A_ w); 420 ev_io_stop (EV_A_ w);
339 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 421 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
340 } 422 }
423}
424
425static int
426fd_valid (int fd)
427{
428#ifdef WIN32
429 return !!win32_get_osfhandle (fd);
430#else
431 return fcntl (fd, F_GETFD) != -1;
432#endif
341} 433}
342 434
343/* called on EBADF to verify fds */ 435/* called on EBADF to verify fds */
344static void 436static void
345fd_ebadf (EV_P) 437fd_ebadf (EV_P)
346{ 438{
347 int fd; 439 int fd;
348 440
349 for (fd = 0; fd < anfdmax; ++fd) 441 for (fd = 0; fd < anfdmax; ++fd)
350 if (anfds [fd].events) 442 if (anfds [fd].events)
351 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 443 if (!fd_valid (fd) == -1 && errno == EBADF)
352 fd_kill (EV_A_ fd); 444 fd_kill (EV_A_ fd);
353} 445}
354 446
355/* called on ENOMEM in select/poll to kill some fds and retry */ 447/* called on ENOMEM in select/poll to kill some fds and retry */
356static void 448static void
… …
359 int fd; 451 int fd;
360 452
361 for (fd = anfdmax; fd--; ) 453 for (fd = anfdmax; fd--; )
362 if (anfds [fd].events) 454 if (anfds [fd].events)
363 { 455 {
364 close (fd);
365 fd_kill (EV_A_ fd); 456 fd_kill (EV_A_ fd);
366 return; 457 return;
367 } 458 }
368} 459}
369 460
370/* susually called after fork if method needs to re-arm all fds from scratch */ 461/* usually called after fork if method needs to re-arm all fds from scratch */
371static void 462static void
372fd_rearm_all (EV_P) 463fd_rearm_all (EV_P)
373{ 464{
374 int fd; 465 int fd;
375 466
… …
427 518
428/*****************************************************************************/ 519/*****************************************************************************/
429 520
430typedef struct 521typedef struct
431{ 522{
432 struct ev_watcher_list *head; 523 WL head;
433 sig_atomic_t volatile gotsig; 524 sig_atomic_t volatile gotsig;
434} ANSIG; 525} ANSIG;
435 526
436static ANSIG *signals; 527static ANSIG *signals;
437static int signalmax; 528static int signalmax;
… …
453} 544}
454 545
455static void 546static void
456sighandler (int signum) 547sighandler (int signum)
457{ 548{
549#if WIN32
550 signal (signum, sighandler);
551#endif
552
458 signals [signum - 1].gotsig = 1; 553 signals [signum - 1].gotsig = 1;
459 554
460 if (!gotsig) 555 if (!gotsig)
461 { 556 {
462 int old_errno = errno; 557 int old_errno = errno;
463 gotsig = 1; 558 gotsig = 1;
559#ifdef WIN32
560 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
561#else
464 write (sigpipe [1], &signum, 1); 562 write (sigpipe [1], &signum, 1);
563#endif
465 errno = old_errno; 564 errno = old_errno;
466 } 565 }
467} 566}
468 567
568void
569ev_feed_signal_event (EV_P_ int signum)
570{
571 WL w;
572
573#if EV_MULTIPLICITY
574 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
575#endif
576
577 --signum;
578
579 if (signum < 0 || signum >= signalmax)
580 return;
581
582 signals [signum].gotsig = 0;
583
584 for (w = signals [signum].head; w; w = w->next)
585 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
586}
587
469static void 588static void
470sigcb (EV_P_ struct ev_io *iow, int revents) 589sigcb (EV_P_ struct ev_io *iow, int revents)
471{ 590{
472 struct ev_watcher_list *w;
473 int signum; 591 int signum;
474 592
593#ifdef WIN32
594 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
595#else
475 read (sigpipe [0], &revents, 1); 596 read (sigpipe [0], &revents, 1);
597#endif
476 gotsig = 0; 598 gotsig = 0;
477 599
478 for (signum = signalmax; signum--; ) 600 for (signum = signalmax; signum--; )
479 if (signals [signum].gotsig) 601 if (signals [signum].gotsig)
480 { 602 ev_feed_signal_event (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} 603}
487 604
488static void 605static void
489siginit (EV_P) 606siginit (EV_P)
490{ 607{
… …
502 ev_unref (EV_A); /* child watcher should not keep loop alive */ 619 ev_unref (EV_A); /* child watcher should not keep loop alive */
503} 620}
504 621
505/*****************************************************************************/ 622/*****************************************************************************/
506 623
624static struct ev_child *childs [PID_HASHSIZE];
625
507#ifndef WIN32 626#ifndef WIN32
508 627
509static struct ev_child *childs [PID_HASHSIZE];
510static struct ev_signal childev; 628static struct ev_signal childev;
511 629
512#ifndef WCONTINUED 630#ifndef WCONTINUED
513# define WCONTINUED 0 631# define WCONTINUED 0
514#endif 632#endif
… …
522 if (w->pid == pid || !w->pid) 640 if (w->pid == pid || !w->pid)
523 { 641 {
524 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 642 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
525 w->rpid = pid; 643 w->rpid = pid;
526 w->rstatus = status; 644 w->rstatus = status;
527 event (EV_A_ (W)w, EV_CHILD); 645 ev_feed_event (EV_A_ (W)w, EV_CHILD);
528 } 646 }
529} 647}
530 648
531static void 649static void
532childcb (EV_P_ struct ev_signal *sw, int revents) 650childcb (EV_P_ struct ev_signal *sw, int revents)
… …
534 int pid, status; 652 int pid, status;
535 653
536 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 654 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
537 { 655 {
538 /* make sure we are called again until all childs have been reaped */ 656 /* make sure we are called again until all childs have been reaped */
539 event (EV_A_ (W)sw, EV_SIGNAL); 657 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
540 658
541 child_reap (EV_A_ sw, pid, pid, status); 659 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 */ 660 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
543 } 661 }
544} 662}
… …
628 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 746 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
629#endif 747#endif
630#if EV_USE_SELECT 748#if EV_USE_SELECT
631 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 749 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
632#endif 750#endif
751
752 ev_watcher_init (&sigev, sigcb);
753 ev_set_priority (&sigev, EV_MAXPRI);
633 } 754 }
634} 755}
635 756
636void 757void
637loop_destroy (EV_P) 758loop_destroy (EV_P)
638{ 759{
760 int i;
761
639#if EV_USE_WIN32 762#if EV_USE_WIN32
640 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 763 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
641#endif 764#endif
642#if EV_USE_KQUEUE 765#if EV_USE_KQUEUE
643 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 766 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
… …
650#endif 773#endif
651#if EV_USE_SELECT 774#if EV_USE_SELECT
652 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 775 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
653#endif 776#endif
654 777
778 for (i = NUMPRI; i--; )
779 array_free (pending, [i]);
780
781 /* have to use the microsoft-never-gets-it-right macro */
782 array_free_microshit (fdchange);
783 array_free_microshit (timer);
784 array_free_microshit (periodic);
785 array_free_microshit (idle);
786 array_free_microshit (prepare);
787 array_free_microshit (check);
788
655 method = 0; 789 method = 0;
656 /*TODO*/
657} 790}
658 791
659void 792static void
660loop_fork (EV_P) 793loop_fork (EV_P)
661{ 794{
662 /*TODO*/
663#if EV_USE_EPOLL 795#if EV_USE_EPOLL
664 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 796 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
665#endif 797#endif
666#if EV_USE_KQUEUE 798#if EV_USE_KQUEUE
667 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 799 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
668#endif 800#endif
801
802 if (ev_is_active (&sigev))
803 {
804 /* default loop */
805
806 ev_ref (EV_A);
807 ev_io_stop (EV_A_ &sigev);
808 close (sigpipe [0]);
809 close (sigpipe [1]);
810
811 while (pipe (sigpipe))
812 syserr ("(libev) error creating pipe");
813
814 siginit (EV_A);
815 }
816
817 postfork = 0;
669} 818}
670 819
671#if EV_MULTIPLICITY 820#if EV_MULTIPLICITY
672struct ev_loop * 821struct ev_loop *
673ev_loop_new (int methods) 822ev_loop_new (int methods)
674{ 823{
675 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 824 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
825
826 memset (loop, 0, sizeof (struct ev_loop));
676 827
677 loop_init (EV_A_ methods); 828 loop_init (EV_A_ methods);
678 829
679 if (ev_method (EV_A)) 830 if (ev_method (EV_A))
680 return loop; 831 return loop;
… …
684 835
685void 836void
686ev_loop_destroy (EV_P) 837ev_loop_destroy (EV_P)
687{ 838{
688 loop_destroy (EV_A); 839 loop_destroy (EV_A);
689 free (loop); 840 ev_free (loop);
690} 841}
691 842
692void 843void
693ev_loop_fork (EV_P) 844ev_loop_fork (EV_P)
694{ 845{
695 loop_fork (EV_A); 846 postfork = 1;
696} 847}
697 848
698#endif 849#endif
699 850
700#if EV_MULTIPLICITY 851#if EV_MULTIPLICITY
701struct ev_loop default_loop_struct;
702static struct ev_loop *default_loop;
703
704struct ev_loop * 852struct ev_loop *
705#else 853#else
706static int default_loop;
707
708int 854int
709#endif 855#endif
710ev_default_loop (int methods) 856ev_default_loop (int methods)
711{ 857{
712 if (sigpipe [0] == sigpipe [1]) 858 if (sigpipe [0] == sigpipe [1])
… …
723 869
724 loop_init (EV_A_ methods); 870 loop_init (EV_A_ methods);
725 871
726 if (ev_method (EV_A)) 872 if (ev_method (EV_A))
727 { 873 {
728 ev_watcher_init (&sigev, sigcb);
729 ev_set_priority (&sigev, EV_MAXPRI);
730 siginit (EV_A); 874 siginit (EV_A);
731 875
732#ifndef WIN32 876#ifndef WIN32
733 ev_signal_init (&childev, childcb, SIGCHLD); 877 ev_signal_init (&childev, childcb, SIGCHLD);
734 ev_set_priority (&childev, EV_MAXPRI); 878 ev_set_priority (&childev, EV_MAXPRI);
… …
748{ 892{
749#if EV_MULTIPLICITY 893#if EV_MULTIPLICITY
750 struct ev_loop *loop = default_loop; 894 struct ev_loop *loop = default_loop;
751#endif 895#endif
752 896
897#ifndef WIN32
753 ev_ref (EV_A); /* child watcher */ 898 ev_ref (EV_A); /* child watcher */
754 ev_signal_stop (EV_A_ &childev); 899 ev_signal_stop (EV_A_ &childev);
900#endif
755 901
756 ev_ref (EV_A); /* signal watcher */ 902 ev_ref (EV_A); /* signal watcher */
757 ev_io_stop (EV_A_ &sigev); 903 ev_io_stop (EV_A_ &sigev);
758 904
759 close (sigpipe [0]); sigpipe [0] = 0; 905 close (sigpipe [0]); sigpipe [0] = 0;
… …
767{ 913{
768#if EV_MULTIPLICITY 914#if EV_MULTIPLICITY
769 struct ev_loop *loop = default_loop; 915 struct ev_loop *loop = default_loop;
770#endif 916#endif
771 917
772 loop_fork (EV_A); 918 if (method)
773 919 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} 920}
782 921
783/*****************************************************************************/ 922/*****************************************************************************/
923
924static int
925any_pending (EV_P)
926{
927 int pri;
928
929 for (pri = NUMPRI; pri--; )
930 if (pendingcnt [pri])
931 return 1;
932
933 return 0;
934}
784 935
785static void 936static void
786call_pending (EV_P) 937call_pending (EV_P)
787{ 938{
788 int pri; 939 int pri;
… …
793 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 944 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
794 945
795 if (p->w) 946 if (p->w)
796 { 947 {
797 p->w->pending = 0; 948 p->w->pending = 0;
798
799 (*(void (**)(EV_P_ W, int))&p->w->cb) (EV_A_ p->w, p->events); 949 p->w->cb (EV_A_ p->w, p->events);
800 } 950 }
801 } 951 }
802} 952}
803 953
804static void 954static void
… …
818 downheap ((WT *)timers, timercnt, 0); 968 downheap ((WT *)timers, timercnt, 0);
819 } 969 }
820 else 970 else
821 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 971 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
822 972
823 event (EV_A_ (W)w, EV_TIMEOUT); 973 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
824 } 974 }
825} 975}
826 976
827static void 977static void
828periodics_reify (EV_P) 978periodics_reify (EV_P)
… …
832 struct ev_periodic *w = periodics [0]; 982 struct ev_periodic *w = periodics [0];
833 983
834 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 984 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
835 985
836 /* first reschedule or stop timer */ 986 /* first reschedule or stop timer */
987 if (w->reschedule_cb)
988 {
989 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
990
991 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
992 downheap ((WT *)periodics, periodiccnt, 0);
993 }
837 if (w->interval) 994 else if (w->interval)
838 { 995 {
839 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 996 ((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)); 997 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
841 downheap ((WT *)periodics, periodiccnt, 0); 998 downheap ((WT *)periodics, periodiccnt, 0);
842 } 999 }
843 else 1000 else
844 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1001 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
845 1002
846 event (EV_A_ (W)w, EV_PERIODIC); 1003 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
847 } 1004 }
848} 1005}
849 1006
850static void 1007static void
851periodics_reschedule (EV_P) 1008periodics_reschedule (EV_P)
… …
855 /* adjust periodics after time jump */ 1012 /* adjust periodics after time jump */
856 for (i = 0; i < periodiccnt; ++i) 1013 for (i = 0; i < periodiccnt; ++i)
857 { 1014 {
858 struct ev_periodic *w = periodics [i]; 1015 struct ev_periodic *w = periodics [i];
859 1016
1017 if (w->reschedule_cb)
1018 ((WT)w)->at = w->reschedule_cb (w, rt_now);
860 if (w->interval) 1019 else if (w->interval)
861 {
862 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1020 ((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 } 1021 }
1022
1023 /* now rebuild the heap */
1024 for (i = periodiccnt >> 1; i--; )
1025 downheap ((WT *)periodics, periodiccnt, i);
873} 1026}
874 1027
875inline int 1028inline int
876time_update_monotonic (EV_P) 1029time_update_monotonic (EV_P)
877{ 1030{
… …
964 { 1117 {
965 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1118 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
966 call_pending (EV_A); 1119 call_pending (EV_A);
967 } 1120 }
968 1121
1122 /* we might have forked, so reify kernel state if necessary */
1123 if (expect_false (postfork))
1124 loop_fork (EV_A);
1125
969 /* update fd-related kernel structures */ 1126 /* update fd-related kernel structures */
970 fd_reify (EV_A); 1127 fd_reify (EV_A);
971 1128
972 /* calculate blocking time */ 1129 /* calculate blocking time */
973 1130
974 /* we only need this for !monotonic clockor timers, but as we basically 1131 /* we only need this for !monotonic clock or timers, but as we basically
975 always have timers, we just calculate it always */ 1132 always have timers, we just calculate it always */
976#if EV_USE_MONOTONIC 1133#if EV_USE_MONOTONIC
977 if (expect_true (have_monotonic)) 1134 if (expect_true (have_monotonic))
978 time_update_monotonic (EV_A); 1135 time_update_monotonic (EV_A);
979 else 1136 else
… …
1012 /* queue pending timers and reschedule them */ 1169 /* queue pending timers and reschedule them */
1013 timers_reify (EV_A); /* relative timers called last */ 1170 timers_reify (EV_A); /* relative timers called last */
1014 periodics_reify (EV_A); /* absolute timers called first */ 1171 periodics_reify (EV_A); /* absolute timers called first */
1015 1172
1016 /* queue idle watchers unless io or timers are pending */ 1173 /* queue idle watchers unless io or timers are pending */
1017 if (!pendingcnt) 1174 if (idlecnt && !any_pending (EV_A))
1018 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1175 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1019 1176
1020 /* queue check watchers, to be executed first */ 1177 /* queue check watchers, to be executed first */
1021 if (checkcnt) 1178 if (checkcnt)
1022 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1179 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1097 return; 1254 return;
1098 1255
1099 assert (("ev_io_start called with negative fd", fd >= 0)); 1256 assert (("ev_io_start called with negative fd", fd >= 0));
1100 1257
1101 ev_start (EV_A_ (W)w, 1); 1258 ev_start (EV_A_ (W)w, 1);
1102 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1259 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1103 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1260 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1104 1261
1105 fd_change (EV_A_ fd); 1262 fd_change (EV_A_ fd);
1106} 1263}
1107 1264
… …
1127 ((WT)w)->at += mn_now; 1284 ((WT)w)->at += mn_now;
1128 1285
1129 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1286 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1130 1287
1131 ev_start (EV_A_ (W)w, ++timercnt); 1288 ev_start (EV_A_ (W)w, ++timercnt);
1132 array_needsize (timers, timermax, timercnt, ); 1289 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1133 timers [timercnt - 1] = w; 1290 timers [timercnt - 1] = w;
1134 upheap ((WT *)timers, timercnt - 1); 1291 upheap ((WT *)timers, timercnt - 1);
1135 1292
1136 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1293 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1137} 1294}
… …
1177ev_periodic_start (EV_P_ struct ev_periodic *w) 1334ev_periodic_start (EV_P_ struct ev_periodic *w)
1178{ 1335{
1179 if (ev_is_active (w)) 1336 if (ev_is_active (w))
1180 return; 1337 return;
1181 1338
1339 if (w->reschedule_cb)
1340 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1341 else if (w->interval)
1342 {
1182 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1343 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 */ 1344 /* 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; 1345 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1346 }
1187 1347
1188 ev_start (EV_A_ (W)w, ++periodiccnt); 1348 ev_start (EV_A_ (W)w, ++periodiccnt);
1189 array_needsize (periodics, periodicmax, periodiccnt, ); 1349 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1190 periodics [periodiccnt - 1] = w; 1350 periodics [periodiccnt - 1] = w;
1191 upheap ((WT *)periodics, periodiccnt - 1); 1351 upheap ((WT *)periodics, periodiccnt - 1);
1192 1352
1193 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1353 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1194} 1354}
… …
1210 1370
1211 ev_stop (EV_A_ (W)w); 1371 ev_stop (EV_A_ (W)w);
1212} 1372}
1213 1373
1214void 1374void
1375ev_periodic_again (EV_P_ struct ev_periodic *w)
1376{
1377 ev_periodic_stop (EV_A_ w);
1378 ev_periodic_start (EV_A_ w);
1379}
1380
1381void
1215ev_idle_start (EV_P_ struct ev_idle *w) 1382ev_idle_start (EV_P_ struct ev_idle *w)
1216{ 1383{
1217 if (ev_is_active (w)) 1384 if (ev_is_active (w))
1218 return; 1385 return;
1219 1386
1220 ev_start (EV_A_ (W)w, ++idlecnt); 1387 ev_start (EV_A_ (W)w, ++idlecnt);
1221 array_needsize (idles, idlemax, idlecnt, ); 1388 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1222 idles [idlecnt - 1] = w; 1389 idles [idlecnt - 1] = w;
1223} 1390}
1224 1391
1225void 1392void
1226ev_idle_stop (EV_P_ struct ev_idle *w) 1393ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1238{ 1405{
1239 if (ev_is_active (w)) 1406 if (ev_is_active (w))
1240 return; 1407 return;
1241 1408
1242 ev_start (EV_A_ (W)w, ++preparecnt); 1409 ev_start (EV_A_ (W)w, ++preparecnt);
1243 array_needsize (prepares, preparemax, preparecnt, ); 1410 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1244 prepares [preparecnt - 1] = w; 1411 prepares [preparecnt - 1] = w;
1245} 1412}
1246 1413
1247void 1414void
1248ev_prepare_stop (EV_P_ struct ev_prepare *w) 1415ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1260{ 1427{
1261 if (ev_is_active (w)) 1428 if (ev_is_active (w))
1262 return; 1429 return;
1263 1430
1264 ev_start (EV_A_ (W)w, ++checkcnt); 1431 ev_start (EV_A_ (W)w, ++checkcnt);
1265 array_needsize (checks, checkmax, checkcnt, ); 1432 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1266 checks [checkcnt - 1] = w; 1433 checks [checkcnt - 1] = w;
1267} 1434}
1268 1435
1269void 1436void
1270ev_check_stop (EV_P_ struct ev_check *w) 1437ev_check_stop (EV_P_ struct ev_check *w)
… …
1291 return; 1458 return;
1292 1459
1293 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1460 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1294 1461
1295 ev_start (EV_A_ (W)w, 1); 1462 ev_start (EV_A_ (W)w, 1);
1296 array_needsize (signals, signalmax, w->signum, signals_init); 1463 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1297 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1464 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1298 1465
1299 if (!((WL)w)->next) 1466 if (!((WL)w)->next)
1300 { 1467 {
1468#if WIN32
1469 signal (w->signum, sighandler);
1470#else
1301 struct sigaction sa; 1471 struct sigaction sa;
1302 sa.sa_handler = sighandler; 1472 sa.sa_handler = sighandler;
1303 sigfillset (&sa.sa_mask); 1473 sigfillset (&sa.sa_mask);
1304 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1474 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1305 sigaction (w->signum, &sa, 0); 1475 sigaction (w->signum, &sa, 0);
1476#endif
1306 } 1477 }
1307} 1478}
1308 1479
1309void 1480void
1310ev_signal_stop (EV_P_ struct ev_signal *w) 1481ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1360 void (*cb)(int revents, void *arg) = once->cb; 1531 void (*cb)(int revents, void *arg) = once->cb;
1361 void *arg = once->arg; 1532 void *arg = once->arg;
1362 1533
1363 ev_io_stop (EV_A_ &once->io); 1534 ev_io_stop (EV_A_ &once->io);
1364 ev_timer_stop (EV_A_ &once->to); 1535 ev_timer_stop (EV_A_ &once->to);
1365 free (once); 1536 ev_free (once);
1366 1537
1367 cb (revents, arg); 1538 cb (revents, arg);
1368} 1539}
1369 1540
1370static void 1541static void
… …
1380} 1551}
1381 1552
1382void 1553void
1383ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1554ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1384{ 1555{
1385 struct ev_once *once = malloc (sizeof (struct ev_once)); 1556 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1386 1557
1387 if (!once) 1558 if (!once)
1388 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1559 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1389 else 1560 else
1390 { 1561 {

Diff Legend

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