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

Comparing libev/ev.c (file contents):
Revision 1.96 by root, Sun Nov 11 01:50:36 2007 UTC vs.
Revision 1.120 by root, Fri Nov 16 01:54:25 2007 UTC

… …
35 35
36#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# include "config.h" 37# include "config.h"
38 38
39# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
40# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
41# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
42# endif 46# endif
43 47
44# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
45# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
46# endif 50# endif
47 51
48# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
49# define EV_USE_POLL 1 53# define EV_USE_POLL 1
50# endif 54# endif
51 55
52# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) 56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
53# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
54# endif 58# endif
55 59
56# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
57# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
62# endif
63
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
58# endif 66# endif
59 67
60#endif 68#endif
61 69
62#include <math.h> 70#include <math.h>
… …
71#include <sys/types.h> 79#include <sys/types.h>
72#include <time.h> 80#include <time.h>
73 81
74#include <signal.h> 82#include <signal.h>
75 83
76#ifndef WIN32 84#ifndef _WIN32
77# include <unistd.h> 85# include <unistd.h>
78# include <sys/time.h> 86# include <sys/time.h>
79# include <sys/wait.h> 87# include <sys/wait.h>
88#else
89# define WIN32_LEAN_AND_MEAN
90# include <windows.h>
91# ifndef EV_SELECT_IS_WINSOCKET
92# define EV_SELECT_IS_WINSOCKET 1
80#endif 93# endif
94#endif
95
81/**/ 96/**/
82 97
83#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
84# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 1
85#endif 100#endif
86 101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 1
104#endif
105
87#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
88# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
108# define EV_SELECT_USE_FD_SET 1
89#endif 109#endif
90 110
91#ifndef EV_USE_POLL 111#ifndef EV_USE_POLL
92# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 112# ifdef _WIN32
113# define EV_USE_POLL 0
114# else
115# define EV_USE_POLL 1
116# endif
93#endif 117#endif
94 118
95#ifndef EV_USE_EPOLL 119#ifndef EV_USE_EPOLL
96# define EV_USE_EPOLL 0 120# define EV_USE_EPOLL 0
97#endif 121#endif
98 122
99#ifndef EV_USE_KQUEUE 123#ifndef EV_USE_KQUEUE
100# define EV_USE_KQUEUE 0 124# define EV_USE_KQUEUE 0
101#endif 125#endif
102 126
103#ifndef EV_USE_WIN32
104# ifdef WIN32
105# define EV_USE_WIN32 0 /* it does not exist, use select */
106# undef EV_USE_SELECT
107# define EV_USE_SELECT 1
108# else
109# define EV_USE_WIN32 0
110# endif
111#endif
112
113#ifndef EV_USE_REALTIME 127#ifndef EV_USE_PORT
114# define EV_USE_REALTIME 1 128# define EV_USE_PORT 0
115#endif 129#endif
116 130
117/**/ 131/**/
132
133/* darwin simply cannot be helped */
134#ifdef __APPLE__
135# undef EV_USE_POLL
136# undef EV_USE_KQUEUE
137#endif
118 138
119#ifndef CLOCK_MONOTONIC 139#ifndef CLOCK_MONOTONIC
120# undef EV_USE_MONOTONIC 140# undef EV_USE_MONOTONIC
121# define EV_USE_MONOTONIC 0 141# define EV_USE_MONOTONIC 0
122#endif 142#endif
… …
124#ifndef CLOCK_REALTIME 144#ifndef CLOCK_REALTIME
125# undef EV_USE_REALTIME 145# undef EV_USE_REALTIME
126# define EV_USE_REALTIME 0 146# define EV_USE_REALTIME 0
127#endif 147#endif
128 148
149#if EV_SELECT_IS_WINSOCKET
150# include <winsock.h>
151#endif
152
129/**/ 153/**/
130 154
131#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 155#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
132#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 156#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
133#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 157#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
134/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 158/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
135 159
136#ifdef EV_H 160#ifdef EV_H
137# include EV_H 161# include EV_H
138#else 162#else
139# include "ev.h" 163# include "ev.h"
… …
151#define expect_true(expr) expect ((expr) != 0, 1) 175#define expect_true(expr) expect ((expr) != 0, 1)
152 176
153#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 177#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
154#define ABSPRI(w) ((w)->priority - EV_MINPRI) 178#define ABSPRI(w) ((w)->priority - EV_MINPRI)
155 179
180#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
181#define EMPTY2(a,b) /* used to suppress some warnings */
182
156typedef struct ev_watcher *W; 183typedef struct ev_watcher *W;
157typedef struct ev_watcher_list *WL; 184typedef struct ev_watcher_list *WL;
158typedef struct ev_watcher_time *WT; 185typedef struct ev_watcher_time *WT;
159 186
160static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 187static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
161 188
189#ifdef _WIN32
162#include "ev_win32.c" 190# include "ev_win32.c"
191#endif
163 192
164/*****************************************************************************/ 193/*****************************************************************************/
165 194
166static void (*syserr_cb)(const char *msg); 195static void (*syserr_cb)(const char *msg);
167 196
… …
214typedef struct 243typedef struct
215{ 244{
216 WL head; 245 WL head;
217 unsigned char events; 246 unsigned char events;
218 unsigned char reify; 247 unsigned char reify;
248#if EV_SELECT_IS_WINSOCKET
249 SOCKET handle;
250#endif
219} ANFD; 251} ANFD;
220 252
221typedef struct 253typedef struct
222{ 254{
223 W w; 255 W w;
… …
227#if EV_MULTIPLICITY 259#if EV_MULTIPLICITY
228 260
229 struct ev_loop 261 struct ev_loop
230 { 262 {
231 ev_tstamp ev_rt_now; 263 ev_tstamp ev_rt_now;
264 #define ev_rt_now ((loop)->ev_rt_now)
232 #define VAR(name,decl) decl; 265 #define VAR(name,decl) decl;
233 #include "ev_vars.h" 266 #include "ev_vars.h"
234 #undef VAR 267 #undef VAR
235 }; 268 };
236 #include "ev_wrap.h" 269 #include "ev_wrap.h"
237 270
238 struct ev_loop default_loop_struct; 271 static struct ev_loop default_loop_struct;
239 static struct ev_loop *default_loop; 272 struct ev_loop *ev_default_loop_ptr;
240 273
241#else 274#else
242 275
243 ev_tstamp ev_rt_now; 276 ev_tstamp ev_rt_now;
244 #define VAR(name,decl) static decl; 277 #define VAR(name,decl) static decl;
245 #include "ev_vars.h" 278 #include "ev_vars.h"
246 #undef VAR 279 #undef VAR
247 280
248 static int default_loop; 281 static int ev_default_loop_ptr;
249 282
250#endif 283#endif
251 284
252/*****************************************************************************/ 285/*****************************************************************************/
253 286
… …
286{ 319{
287 return ev_rt_now; 320 return ev_rt_now;
288} 321}
289#endif 322#endif
290 323
291#define array_roundsize(type,n) ((n) | 4 & ~3) 324#define array_roundsize(type,n) (((n) | 4) & ~3)
292 325
293#define array_needsize(type,base,cur,cnt,init) \ 326#define array_needsize(type,base,cur,cnt,init) \
294 if (expect_false ((cnt) > cur)) \ 327 if (expect_false ((cnt) > cur)) \
295 { \ 328 { \
296 int newcnt = cur; \ 329 int newcnt = cur; \
… …
311 stem ## max = array_roundsize (stem ## cnt >> 1); \ 344 stem ## max = array_roundsize (stem ## cnt >> 1); \
312 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 345 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
313 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 346 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
314 } 347 }
315 348
316/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
317/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
318#define array_free_microshit(stem) \
319 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
320
321#define array_free(stem, idx) \ 349#define array_free(stem, idx) \
322 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 350 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
323 351
324/*****************************************************************************/ 352/*****************************************************************************/
325 353
… …
346 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 374 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
347 return; 375 return;
348 } 376 }
349 377
350 w_->pending = ++pendingcnt [ABSPRI (w_)]; 378 w_->pending = ++pendingcnt [ABSPRI (w_)];
351 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 379 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
352 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 380 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
353 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 381 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
354} 382}
355 383
356static void 384static void
… …
399 int events = 0; 427 int events = 0;
400 428
401 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 429 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
402 events |= w->events; 430 events |= w->events;
403 431
432#if EV_SELECT_IS_WINSOCKET
433 if (events)
434 {
435 unsigned long argp;
436 anfd->handle = _get_osfhandle (fd);
437 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
438 }
439#endif
440
404 anfd->reify = 0; 441 anfd->reify = 0;
405 442
406 method_modify (EV_A_ fd, anfd->events, events); 443 method_modify (EV_A_ fd, anfd->events, events);
407 anfd->events = events; 444 anfd->events = events;
408 } 445 }
… …
417 return; 454 return;
418 455
419 anfds [fd].reify = 1; 456 anfds [fd].reify = 1;
420 457
421 ++fdchangecnt; 458 ++fdchangecnt;
422 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 459 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
423 fdchanges [fdchangecnt - 1] = fd; 460 fdchanges [fdchangecnt - 1] = fd;
424} 461}
425 462
426static void 463static void
427fd_kill (EV_P_ int fd) 464fd_kill (EV_P_ int fd)
… …
436} 473}
437 474
438static int 475static int
439fd_valid (int fd) 476fd_valid (int fd)
440{ 477{
441#ifdef WIN32 478#ifdef _WIN32
442 return !!win32_get_osfhandle (fd); 479 return _get_osfhandle (fd) != -1;
443#else 480#else
444 return fcntl (fd, F_GETFD) != -1; 481 return fcntl (fd, F_GETFD) != -1;
445#endif 482#endif
446} 483}
447 484
… …
528 heap [k] = w; 565 heap [k] = w;
529 ((W)heap [k])->active = k + 1; 566 ((W)heap [k])->active = k + 1;
530} 567}
531 568
532inline void 569inline void
533adjustheap (WT *heap, int N, int k, ev_tstamp at) 570adjustheap (WT *heap, int N, int k)
534{ 571{
535 ev_tstamp old_at = heap [k]->at; 572 upheap (heap, k);
536 heap [k]->at = at;
537
538 if (old_at < at)
539 downheap (heap, N, k); 573 downheap (heap, N, k);
540 else
541 upheap (heap, k);
542} 574}
543 575
544/*****************************************************************************/ 576/*****************************************************************************/
545 577
546typedef struct 578typedef struct
… …
569} 601}
570 602
571static void 603static void
572sighandler (int signum) 604sighandler (int signum)
573{ 605{
574#if WIN32 606#if _WIN32
575 signal (signum, sighandler); 607 signal (signum, sighandler);
576#endif 608#endif
577 609
578 signals [signum - 1].gotsig = 1; 610 signals [signum - 1].gotsig = 1;
579 611
580 if (!gotsig) 612 if (!gotsig)
581 { 613 {
582 int old_errno = errno; 614 int old_errno = errno;
583 gotsig = 1; 615 gotsig = 1;
584#ifdef WIN32
585 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
586#else
587 write (sigpipe [1], &signum, 1); 616 write (sigpipe [1], &signum, 1);
588#endif
589 errno = old_errno; 617 errno = old_errno;
590 } 618 }
591} 619}
592 620
593void 621void
594ev_feed_signal_event (EV_P_ int signum) 622ev_feed_signal_event (EV_P_ int signum)
595{ 623{
596 WL w; 624 WL w;
597 625
598#if EV_MULTIPLICITY 626#if EV_MULTIPLICITY
599 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 627 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
600#endif 628#endif
601 629
602 --signum; 630 --signum;
603 631
604 if (signum < 0 || signum >= signalmax) 632 if (signum < 0 || signum >= signalmax)
… …
613static void 641static void
614sigcb (EV_P_ struct ev_io *iow, int revents) 642sigcb (EV_P_ struct ev_io *iow, int revents)
615{ 643{
616 int signum; 644 int signum;
617 645
618#ifdef WIN32
619 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
620#else
621 read (sigpipe [0], &revents, 1); 646 read (sigpipe [0], &revents, 1);
622#endif
623 gotsig = 0; 647 gotsig = 0;
624 648
625 for (signum = signalmax; signum--; ) 649 for (signum = signalmax; signum--; )
626 if (signals [signum].gotsig) 650 if (signals [signum].gotsig)
627 ev_feed_signal_event (EV_A_ signum + 1); 651 ev_feed_signal_event (EV_A_ signum + 1);
628} 652}
629 653
654inline void
655fd_intern (int fd)
656{
657#ifdef _WIN32
658 int arg = 1;
659 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
660#else
661 fcntl (fd, F_SETFD, FD_CLOEXEC);
662 fcntl (fd, F_SETFL, O_NONBLOCK);
663#endif
664}
665
630static void 666static void
631siginit (EV_P) 667siginit (EV_P)
632{ 668{
633#ifndef WIN32 669 fd_intern (sigpipe [0]);
634 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 670 fd_intern (sigpipe [1]);
635 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
636
637 /* rather than sort out wether we really need nb, set it */
638 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
639 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
640#endif
641 671
642 ev_io_set (&sigev, sigpipe [0], EV_READ); 672 ev_io_set (&sigev, sigpipe [0], EV_READ);
643 ev_io_start (EV_A_ &sigev); 673 ev_io_start (EV_A_ &sigev);
644 ev_unref (EV_A); /* child watcher should not keep loop alive */ 674 ev_unref (EV_A); /* child watcher should not keep loop alive */
645} 675}
646 676
647/*****************************************************************************/ 677/*****************************************************************************/
648 678
649static struct ev_child *childs [PID_HASHSIZE]; 679static struct ev_child *childs [PID_HASHSIZE];
650 680
651#ifndef WIN32 681#ifndef _WIN32
652 682
653static struct ev_signal childev; 683static struct ev_signal childev;
654 684
655#ifndef WCONTINUED 685#ifndef WCONTINUED
656# define WCONTINUED 0 686# define WCONTINUED 0
… …
688 718
689#endif 719#endif
690 720
691/*****************************************************************************/ 721/*****************************************************************************/
692 722
723#if EV_USE_PORT
724# include "ev_port.c"
725#endif
693#if EV_USE_KQUEUE 726#if EV_USE_KQUEUE
694# include "ev_kqueue.c" 727# include "ev_kqueue.c"
695#endif 728#endif
696#if EV_USE_EPOLL 729#if EV_USE_EPOLL
697# include "ev_epoll.c" 730# include "ev_epoll.c"
… …
717 750
718/* return true if we are running with elevated privileges and should ignore env variables */ 751/* return true if we are running with elevated privileges and should ignore env variables */
719static int 752static int
720enable_secure (void) 753enable_secure (void)
721{ 754{
722#ifdef WIN32 755#ifdef _WIN32
723 return 0; 756 return 0;
724#else 757#else
725 return getuid () != geteuid () 758 return getuid () != geteuid ()
726 || getgid () != getegid (); 759 || getgid () != getegid ();
727#endif 760#endif
728} 761}
729 762
730int 763unsigned int
731ev_method (EV_P) 764ev_method (EV_P)
732{ 765{
733 return method; 766 return method;
734} 767}
735 768
736static void 769static void
737loop_init (EV_P_ int methods) 770loop_init (EV_P_ unsigned int flags)
738{ 771{
739 if (!method) 772 if (!method)
740 { 773 {
741#if EV_USE_MONOTONIC 774#if EV_USE_MONOTONIC
742 { 775 {
… …
749 ev_rt_now = ev_time (); 782 ev_rt_now = ev_time ();
750 mn_now = get_clock (); 783 mn_now = get_clock ();
751 now_floor = mn_now; 784 now_floor = mn_now;
752 rtmn_diff = ev_rt_now - mn_now; 785 rtmn_diff = ev_rt_now - mn_now;
753 786
754 if (methods == EVMETHOD_AUTO) 787 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
755 if (!enable_secure () && getenv ("LIBEV_METHODS"))
756 methods = atoi (getenv ("LIBEV_METHODS")); 788 flags = atoi (getenv ("LIBEV_FLAGS"));
757 else 789
758 methods = EVMETHOD_ANY; 790 if (!(flags & 0x0000ffff))
791 flags |= 0x0000ffff;
759 792
760 method = 0; 793 method = 0;
761#if EV_USE_WIN32 794#if EV_USE_PORT
762 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 795 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
763#endif 796#endif
764#if EV_USE_KQUEUE 797#if EV_USE_KQUEUE
765 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 798 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
766#endif 799#endif
767#if EV_USE_EPOLL 800#if EV_USE_EPOLL
768 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 801 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
769#endif 802#endif
770#if EV_USE_POLL 803#if EV_USE_POLL
771 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 804 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
772#endif 805#endif
773#if EV_USE_SELECT 806#if EV_USE_SELECT
774 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 807 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
775#endif 808#endif
776 809
777 ev_init (&sigev, sigcb); 810 ev_init (&sigev, sigcb);
778 ev_set_priority (&sigev, EV_MAXPRI); 811 ev_set_priority (&sigev, EV_MAXPRI);
779 } 812 }
… …
782void 815void
783loop_destroy (EV_P) 816loop_destroy (EV_P)
784{ 817{
785 int i; 818 int i;
786 819
787#if EV_USE_WIN32 820#if EV_USE_PORT
788 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 821 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
789#endif 822#endif
790#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
791 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 824 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
792#endif 825#endif
793#if EV_USE_EPOLL 826#if EV_USE_EPOLL
… …
802 835
803 for (i = NUMPRI; i--; ) 836 for (i = NUMPRI; i--; )
804 array_free (pending, [i]); 837 array_free (pending, [i]);
805 838
806 /* have to use the microsoft-never-gets-it-right macro */ 839 /* have to use the microsoft-never-gets-it-right macro */
807 array_free_microshit (fdchange); 840 array_free (fdchange, EMPTY0);
808 array_free_microshit (timer); 841 array_free (timer, EMPTY0);
809#if EV_PERIODICS 842#if EV_PERIODICS
810 array_free_microshit (periodic); 843 array_free (periodic, EMPTY0);
811#endif 844#endif
812 array_free_microshit (idle); 845 array_free (idle, EMPTY0);
813 array_free_microshit (prepare); 846 array_free (prepare, EMPTY0);
814 array_free_microshit (check); 847 array_free (check, EMPTY0);
815 848
816 method = 0; 849 method = 0;
817} 850}
818 851
819static void 852static void
820loop_fork (EV_P) 853loop_fork (EV_P)
821{ 854{
855#if EV_USE_PORT
856 if (method == EVMETHOD_PORT ) port_fork (EV_A);
857#endif
858#if EV_USE_KQUEUE
859 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
860#endif
822#if EV_USE_EPOLL 861#if EV_USE_EPOLL
823 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 862 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
824#endif
825#if EV_USE_KQUEUE
826 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
827#endif 863#endif
828 864
829 if (ev_is_active (&sigev)) 865 if (ev_is_active (&sigev))
830 { 866 {
831 /* default loop */ 867 /* default loop */
… …
844 postfork = 0; 880 postfork = 0;
845} 881}
846 882
847#if EV_MULTIPLICITY 883#if EV_MULTIPLICITY
848struct ev_loop * 884struct ev_loop *
849ev_loop_new (int methods) 885ev_loop_new (unsigned int flags)
850{ 886{
851 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 887 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
852 888
853 memset (loop, 0, sizeof (struct ev_loop)); 889 memset (loop, 0, sizeof (struct ev_loop));
854 890
855 loop_init (EV_A_ methods); 891 loop_init (EV_A_ flags);
856 892
857 if (ev_method (EV_A)) 893 if (ev_method (EV_A))
858 return loop; 894 return loop;
859 895
860 return 0; 896 return 0;
… …
875 911
876#endif 912#endif
877 913
878#if EV_MULTIPLICITY 914#if EV_MULTIPLICITY
879struct ev_loop * 915struct ev_loop *
916ev_default_loop_ (unsigned int flags)
880#else 917#else
881int 918int
919ev_default_loop (unsigned int flags)
882#endif 920#endif
883ev_default_loop (int methods)
884{ 921{
885 if (sigpipe [0] == sigpipe [1]) 922 if (sigpipe [0] == sigpipe [1])
886 if (pipe (sigpipe)) 923 if (pipe (sigpipe))
887 return 0; 924 return 0;
888 925
889 if (!default_loop) 926 if (!ev_default_loop_ptr)
890 { 927 {
891#if EV_MULTIPLICITY 928#if EV_MULTIPLICITY
892 struct ev_loop *loop = default_loop = &default_loop_struct; 929 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
893#else 930#else
894 default_loop = 1; 931 ev_default_loop_ptr = 1;
895#endif 932#endif
896 933
897 loop_init (EV_A_ methods); 934 loop_init (EV_A_ flags);
898 935
899 if (ev_method (EV_A)) 936 if (ev_method (EV_A))
900 { 937 {
901 siginit (EV_A); 938 siginit (EV_A);
902 939
903#ifndef WIN32 940#ifndef _WIN32
904 ev_signal_init (&childev, childcb, SIGCHLD); 941 ev_signal_init (&childev, childcb, SIGCHLD);
905 ev_set_priority (&childev, EV_MAXPRI); 942 ev_set_priority (&childev, EV_MAXPRI);
906 ev_signal_start (EV_A_ &childev); 943 ev_signal_start (EV_A_ &childev);
907 ev_unref (EV_A); /* child watcher should not keep loop alive */ 944 ev_unref (EV_A); /* child watcher should not keep loop alive */
908#endif 945#endif
909 } 946 }
910 else 947 else
911 default_loop = 0; 948 ev_default_loop_ptr = 0;
912 } 949 }
913 950
914 return default_loop; 951 return ev_default_loop_ptr;
915} 952}
916 953
917void 954void
918ev_default_destroy (void) 955ev_default_destroy (void)
919{ 956{
920#if EV_MULTIPLICITY 957#if EV_MULTIPLICITY
921 struct ev_loop *loop = default_loop; 958 struct ev_loop *loop = ev_default_loop_ptr;
922#endif 959#endif
923 960
924#ifndef WIN32 961#ifndef _WIN32
925 ev_ref (EV_A); /* child watcher */ 962 ev_ref (EV_A); /* child watcher */
926 ev_signal_stop (EV_A_ &childev); 963 ev_signal_stop (EV_A_ &childev);
927#endif 964#endif
928 965
929 ev_ref (EV_A); /* signal watcher */ 966 ev_ref (EV_A); /* signal watcher */
… …
937 974
938void 975void
939ev_default_fork (void) 976ev_default_fork (void)
940{ 977{
941#if EV_MULTIPLICITY 978#if EV_MULTIPLICITY
942 struct ev_loop *loop = default_loop; 979 struct ev_loop *loop = ev_default_loop_ptr;
943#endif 980#endif
944 981
945 if (method) 982 if (method)
946 postfork = 1; 983 postfork = 1;
947} 984}
… …
1016 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1053 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1017 1054
1018 /* first reschedule or stop timer */ 1055 /* first reschedule or stop timer */
1019 if (w->reschedule_cb) 1056 if (w->reschedule_cb)
1020 { 1057 {
1021 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1058 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1022
1023 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1059 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1024 downheap ((WT *)periodics, periodiccnt, 0); 1060 downheap ((WT *)periodics, periodiccnt, 0);
1025 } 1061 }
1026 else if (w->interval) 1062 else if (w->interval)
1027 { 1063 {
… …
1145ev_loop (EV_P_ int flags) 1181ev_loop (EV_P_ int flags)
1146{ 1182{
1147 double block; 1183 double block;
1148 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1184 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1149 1185
1150 do 1186 while (activecnt)
1151 { 1187 {
1152 /* queue check watchers (and execute them) */ 1188 /* queue check watchers (and execute them) */
1153 if (expect_false (preparecnt)) 1189 if (expect_false (preparecnt))
1154 { 1190 {
1155 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1191 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1218 /* queue check watchers, to be executed first */ 1254 /* queue check watchers, to be executed first */
1219 if (checkcnt) 1255 if (checkcnt)
1220 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1221 1257
1222 call_pending (EV_A); 1258 call_pending (EV_A);
1259
1260 if (loop_done)
1261 break;
1223 } 1262 }
1224 while (activecnt && !loop_done);
1225 1263
1226 if (loop_done != 2) 1264 if (loop_done != 2)
1227 loop_done = 0; 1265 loop_done = 0;
1228} 1266}
1229 1267
… …
1327 ((WT)w)->at += mn_now; 1365 ((WT)w)->at += mn_now;
1328 1366
1329 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1367 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1330 1368
1331 ev_start (EV_A_ (W)w, ++timercnt); 1369 ev_start (EV_A_ (W)w, ++timercnt);
1332 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1370 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1333 timers [timercnt - 1] = w; 1371 timers [timercnt - 1] = w;
1334 upheap ((WT *)timers, timercnt - 1); 1372 upheap ((WT *)timers, timercnt - 1);
1335 1373
1336 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1374 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1337} 1375}
… …
1346 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1384 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1347 1385
1348 if (((W)w)->active < timercnt--) 1386 if (((W)w)->active < timercnt--)
1349 { 1387 {
1350 timers [((W)w)->active - 1] = timers [timercnt]; 1388 timers [((W)w)->active - 1] = timers [timercnt];
1351 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1389 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1352 } 1390 }
1353 1391
1354 ((WT)w)->at -= mn_now; 1392 ((WT)w)->at -= mn_now;
1355 1393
1356 ev_stop (EV_A_ (W)w); 1394 ev_stop (EV_A_ (W)w);
… …
1360ev_timer_again (EV_P_ struct ev_timer *w) 1398ev_timer_again (EV_P_ struct ev_timer *w)
1361{ 1399{
1362 if (ev_is_active (w)) 1400 if (ev_is_active (w))
1363 { 1401 {
1364 if (w->repeat) 1402 if (w->repeat)
1403 {
1404 ((WT)w)->at = mn_now + w->repeat;
1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1405 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1406 }
1366 else 1407 else
1367 ev_timer_stop (EV_A_ w); 1408 ev_timer_stop (EV_A_ w);
1368 } 1409 }
1369 else if (w->repeat) 1410 else if (w->repeat)
1411 {
1412 w->at = w->repeat;
1370 ev_timer_start (EV_A_ w); 1413 ev_timer_start (EV_A_ w);
1414 }
1371} 1415}
1372 1416
1373#if EV_PERIODICS 1417#if EV_PERIODICS
1374void 1418void
1375ev_periodic_start (EV_P_ struct ev_periodic *w) 1419ev_periodic_start (EV_P_ struct ev_periodic *w)
… …
1385 /* this formula differs from the one in periodic_reify because we do not always round up */ 1429 /* this formula differs from the one in periodic_reify because we do not always round up */
1386 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1430 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1387 } 1431 }
1388 1432
1389 ev_start (EV_A_ (W)w, ++periodiccnt); 1433 ev_start (EV_A_ (W)w, ++periodiccnt);
1390 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1434 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1391 periodics [periodiccnt - 1] = w; 1435 periodics [periodiccnt - 1] = w;
1392 upheap ((WT *)periodics, periodiccnt - 1); 1436 upheap ((WT *)periodics, periodiccnt - 1);
1393 1437
1394 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1438 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1395} 1439}
… …
1404 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1448 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1405 1449
1406 if (((W)w)->active < periodiccnt--) 1450 if (((W)w)->active < periodiccnt--)
1407 { 1451 {
1408 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1452 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1409 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1453 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1410 } 1454 }
1411 1455
1412 ev_stop (EV_A_ (W)w); 1456 ev_stop (EV_A_ (W)w);
1413} 1457}
1414 1458
… …
1426{ 1470{
1427 if (ev_is_active (w)) 1471 if (ev_is_active (w))
1428 return; 1472 return;
1429 1473
1430 ev_start (EV_A_ (W)w, ++idlecnt); 1474 ev_start (EV_A_ (W)w, ++idlecnt);
1431 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1432 idles [idlecnt - 1] = w; 1476 idles [idlecnt - 1] = w;
1433} 1477}
1434 1478
1435void 1479void
1436ev_idle_stop (EV_P_ struct ev_idle *w) 1480ev_idle_stop (EV_P_ struct ev_idle *w)
1437{ 1481{
1438 ev_clear_pending (EV_A_ (W)w); 1482 ev_clear_pending (EV_A_ (W)w);
1439 if (ev_is_active (w)) 1483 if (!ev_is_active (w))
1440 return; 1484 return;
1441 1485
1442 idles [((W)w)->active - 1] = idles [--idlecnt]; 1486 idles [((W)w)->active - 1] = idles [--idlecnt];
1443 ev_stop (EV_A_ (W)w); 1487 ev_stop (EV_A_ (W)w);
1444} 1488}
… …
1448{ 1492{
1449 if (ev_is_active (w)) 1493 if (ev_is_active (w))
1450 return; 1494 return;
1451 1495
1452 ev_start (EV_A_ (W)w, ++preparecnt); 1496 ev_start (EV_A_ (W)w, ++preparecnt);
1453 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1454 prepares [preparecnt - 1] = w; 1498 prepares [preparecnt - 1] = w;
1455} 1499}
1456 1500
1457void 1501void
1458ev_prepare_stop (EV_P_ struct ev_prepare *w) 1502ev_prepare_stop (EV_P_ struct ev_prepare *w)
1459{ 1503{
1460 ev_clear_pending (EV_A_ (W)w); 1504 ev_clear_pending (EV_A_ (W)w);
1461 if (ev_is_active (w)) 1505 if (!ev_is_active (w))
1462 return; 1506 return;
1463 1507
1464 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1508 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1465 ev_stop (EV_A_ (W)w); 1509 ev_stop (EV_A_ (W)w);
1466} 1510}
… …
1470{ 1514{
1471 if (ev_is_active (w)) 1515 if (ev_is_active (w))
1472 return; 1516 return;
1473 1517
1474 ev_start (EV_A_ (W)w, ++checkcnt); 1518 ev_start (EV_A_ (W)w, ++checkcnt);
1475 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1476 checks [checkcnt - 1] = w; 1520 checks [checkcnt - 1] = w;
1477} 1521}
1478 1522
1479void 1523void
1480ev_check_stop (EV_P_ struct ev_check *w) 1524ev_check_stop (EV_P_ struct ev_check *w)
… …
1493 1537
1494void 1538void
1495ev_signal_start (EV_P_ struct ev_signal *w) 1539ev_signal_start (EV_P_ struct ev_signal *w)
1496{ 1540{
1497#if EV_MULTIPLICITY 1541#if EV_MULTIPLICITY
1498 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1542 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1499#endif 1543#endif
1500 if (ev_is_active (w)) 1544 if (ev_is_active (w))
1501 return; 1545 return;
1502 1546
1503 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1547 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
… …
1506 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1550 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1507 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1551 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1508 1552
1509 if (!((WL)w)->next) 1553 if (!((WL)w)->next)
1510 { 1554 {
1511#if WIN32 1555#if _WIN32
1512 signal (w->signum, sighandler); 1556 signal (w->signum, sighandler);
1513#else 1557#else
1514 struct sigaction sa; 1558 struct sigaction sa;
1515 sa.sa_handler = sighandler; 1559 sa.sa_handler = sighandler;
1516 sigfillset (&sa.sa_mask); 1560 sigfillset (&sa.sa_mask);
… …
1536 1580
1537void 1581void
1538ev_child_start (EV_P_ struct ev_child *w) 1582ev_child_start (EV_P_ struct ev_child *w)
1539{ 1583{
1540#if EV_MULTIPLICITY 1584#if EV_MULTIPLICITY
1541 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1585 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1542#endif 1586#endif
1543 if (ev_is_active (w)) 1587 if (ev_is_active (w))
1544 return; 1588 return;
1545 1589
1546 ev_start (EV_A_ (W)w, 1); 1590 ev_start (EV_A_ (W)w, 1);

Diff Legend

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