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

Comparing libev/ev.c (file contents):
Revision 1.84 by root, Fri Nov 9 23:04:35 2007 UTC vs.
Revision 1.119 by root, Fri Nov 16 01:43:52 2007 UTC

… …
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# 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
53# endif 66# endif
54 67
55#endif 68#endif
56 69
57#include <math.h> 70#include <math.h>
… …
66#include <sys/types.h> 79#include <sys/types.h>
67#include <time.h> 80#include <time.h>
68 81
69#include <signal.h> 82#include <signal.h>
70 83
71#ifndef WIN32 84#ifndef _WIN32
72# include <unistd.h> 85# include <unistd.h>
73# include <sys/time.h> 86# include <sys/time.h>
74# 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
75#endif 93# endif
94#endif
95
76/**/ 96/**/
77 97
78#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 1
80#endif 100#endif
81 101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 1
104#endif
105
82#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
108# define EV_SELECT_USE_FD_SET 1
84#endif 109#endif
85 110
86#ifndef EV_USE_POLL 111#ifndef EV_USE_POLL
87# 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
88#endif 117#endif
89 118
90#ifndef EV_USE_EPOLL 119#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 120# define EV_USE_EPOLL 0
92#endif 121#endif
93 122
94#ifndef EV_USE_KQUEUE 123#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 124# define EV_USE_KQUEUE 0
96#endif 125#endif
97 126
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif
107
108#ifndef EV_USE_REALTIME 127#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 128# define EV_USE_PORT 0
110#endif 129#endif
111 130
112/**/ 131/**/
132
133/* darwin simply cannot be helped */
134#ifdef __APPLE__
135# undef EV_USE_POLL
136# undef EV_USE_KQUEUE
137#endif
113 138
114#ifndef CLOCK_MONOTONIC 139#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 140# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 141# define EV_USE_MONOTONIC 0
117#endif 142#endif
118 143
119#ifndef CLOCK_REALTIME 144#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 145# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 146# define EV_USE_REALTIME 0
147#endif
148
149#if EV_SELECT_IS_WINSOCKET
150# include <winsock.h>
122#endif 151#endif
123 152
124/**/ 153/**/
125 154
126#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) */
… …
146#define expect_true(expr) expect ((expr) != 0, 1) 175#define expect_true(expr) expect ((expr) != 0, 1)
147 176
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 177#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 178#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 179
180#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
181#define EMPTY2(a,b) /* used to suppress some warnings */
182
151typedef struct ev_watcher *W; 183typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 184typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 185typedef struct ev_watcher_time *WT;
154 186
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 187static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 188
189#ifdef _WIN32
157#include "ev_win32.c" 190# include "ev_win32.c"
191#endif
158 192
159/*****************************************************************************/ 193/*****************************************************************************/
160 194
161static void (*syserr_cb)(const char *msg); 195static void (*syserr_cb)(const char *msg);
162 196
… …
209typedef struct 243typedef struct
210{ 244{
211 WL head; 245 WL head;
212 unsigned char events; 246 unsigned char events;
213 unsigned char reify; 247 unsigned char reify;
248#if EV_SELECT_IS_WINSOCKET
249 SOCKET handle;
250#endif
214} ANFD; 251} ANFD;
215 252
216typedef struct 253typedef struct
217{ 254{
218 W w; 255 W w;
… …
221 258
222#if EV_MULTIPLICITY 259#if EV_MULTIPLICITY
223 260
224 struct ev_loop 261 struct ev_loop
225 { 262 {
263 ev_tstamp ev_rt_now;
264 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 265 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 266 #include "ev_vars.h"
228 #undef VAR 267 #undef VAR
229 }; 268 };
230 #include "ev_wrap.h" 269 #include "ev_wrap.h"
231 270
232 struct ev_loop default_loop_struct; 271 static struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 272 struct ev_loop *ev_default_loop_ptr;
234 273
235#else 274#else
236 275
276 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 277 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 278 #include "ev_vars.h"
239 #undef VAR 279 #undef VAR
240 280
241 static int default_loop; 281 static int ev_default_loop_ptr;
242 282
243#endif 283#endif
244 284
245/*****************************************************************************/ 285/*****************************************************************************/
246 286
247inline ev_tstamp 287ev_tstamp
248ev_time (void) 288ev_time (void)
249{ 289{
250#if EV_USE_REALTIME 290#if EV_USE_REALTIME
251 struct timespec ts; 291 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 292 clock_gettime (CLOCK_REALTIME, &ts);
… …
271#endif 311#endif
272 312
273 return ev_time (); 313 return ev_time ();
274} 314}
275 315
316#if EV_MULTIPLICITY
276ev_tstamp 317ev_tstamp
277ev_now (EV_P) 318ev_now (EV_P)
278{ 319{
279 return rt_now; 320 return ev_rt_now;
280} 321}
322#endif
281 323
282#define array_roundsize(type,n) ((n) | 4 & ~3) 324#define array_roundsize(type,n) (((n) | 4) & ~3)
283 325
284#define array_needsize(type,base,cur,cnt,init) \ 326#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 327 if (expect_false ((cnt) > cur)) \
286 { \ 328 { \
287 int newcnt = cur; \ 329 int newcnt = cur; \
… …
302 stem ## max = array_roundsize (stem ## cnt >> 1); \ 344 stem ## max = array_roundsize (stem ## cnt >> 1); \
303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 345 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 346 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
305 } 347 }
306 348
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;
311
312#define array_free(stem, idx) \ 349#define array_free(stem, idx) \
313 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;
314 351
315/*****************************************************************************/ 352/*****************************************************************************/
316 353
… …
337 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 374 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
338 return; 375 return;
339 } 376 }
340 377
341 w_->pending = ++pendingcnt [ABSPRI (w_)]; 378 w_->pending = ++pendingcnt [ABSPRI (w_)];
342 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);
343 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 380 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
344 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 381 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
345} 382}
346 383
347static void 384static void
… …
390 int events = 0; 427 int events = 0;
391 428
392 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)
393 events |= w->events; 430 events |= w->events;
394 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
395 anfd->reify = 0; 441 anfd->reify = 0;
396 442
397 method_modify (EV_A_ fd, anfd->events, events); 443 method_modify (EV_A_ fd, anfd->events, events);
398 anfd->events = events; 444 anfd->events = events;
399 } 445 }
… …
408 return; 454 return;
409 455
410 anfds [fd].reify = 1; 456 anfds [fd].reify = 1;
411 457
412 ++fdchangecnt; 458 ++fdchangecnt;
413 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 459 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
414 fdchanges [fdchangecnt - 1] = fd; 460 fdchanges [fdchangecnt - 1] = fd;
415} 461}
416 462
417static void 463static void
418fd_kill (EV_P_ int fd) 464fd_kill (EV_P_ int fd)
… …
427} 473}
428 474
429static int 475static int
430fd_valid (int fd) 476fd_valid (int fd)
431{ 477{
432#ifdef WIN32 478#ifdef _WIN32
433 return !!win32_get_osfhandle (fd); 479 return _get_osfhandle (fd) != -1;
434#else 480#else
435 return fcntl (fd, F_GETFD) != -1; 481 return fcntl (fd, F_GETFD) != -1;
436#endif 482#endif
437} 483}
438 484
… …
519 heap [k] = w; 565 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 566 ((W)heap [k])->active = k + 1;
521} 567}
522 568
523inline void 569inline void
524adjustheap (WT *heap, int N, int k, ev_tstamp at) 570adjustheap (WT *heap, int N, int k)
525{ 571{
526 ev_tstamp old_at = heap [k]->at; 572 upheap (heap, k);
527 heap [k]->at = at;
528
529 if (old_at < at)
530 downheap (heap, N, k); 573 downheap (heap, N, k);
531 else
532 upheap (heap, k);
533} 574}
534 575
535/*****************************************************************************/ 576/*****************************************************************************/
536 577
537typedef struct 578typedef struct
… …
560} 601}
561 602
562static void 603static void
563sighandler (int signum) 604sighandler (int signum)
564{ 605{
565#if WIN32 606#if _WIN32
566 signal (signum, sighandler); 607 signal (signum, sighandler);
567#endif 608#endif
568 609
569 signals [signum - 1].gotsig = 1; 610 signals [signum - 1].gotsig = 1;
570 611
571 if (!gotsig) 612 if (!gotsig)
572 { 613 {
573 int old_errno = errno; 614 int old_errno = errno;
574 gotsig = 1; 615 gotsig = 1;
575#ifdef WIN32
576 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
577#else
578 write (sigpipe [1], &signum, 1); 616 write (sigpipe [1], &signum, 1);
579#endif
580 errno = old_errno; 617 errno = old_errno;
581 } 618 }
582} 619}
583 620
584void 621void
585ev_feed_signal_event (EV_P_ int signum) 622ev_feed_signal_event (EV_P_ int signum)
586{ 623{
587 WL w; 624 WL w;
588 625
589#if EV_MULTIPLICITY 626#if EV_MULTIPLICITY
590 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));
591#endif 628#endif
592 629
593 --signum; 630 --signum;
594 631
595 if (signum < 0 || signum >= signalmax) 632 if (signum < 0 || signum >= signalmax)
… …
604static void 641static void
605sigcb (EV_P_ struct ev_io *iow, int revents) 642sigcb (EV_P_ struct ev_io *iow, int revents)
606{ 643{
607 int signum; 644 int signum;
608 645
609#ifdef WIN32
610 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
611#else
612 read (sigpipe [0], &revents, 1); 646 read (sigpipe [0], &revents, 1);
613#endif
614 gotsig = 0; 647 gotsig = 0;
615 648
616 for (signum = signalmax; signum--; ) 649 for (signum = signalmax; signum--; )
617 if (signals [signum].gotsig) 650 if (signals [signum].gotsig)
618 ev_feed_signal_event (EV_A_ signum + 1); 651 ev_feed_signal_event (EV_A_ signum + 1);
619} 652}
620 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
621static void 666static void
622siginit (EV_P) 667siginit (EV_P)
623{ 668{
624#ifndef WIN32 669 fd_intern (sigpipe [0]);
625 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 670 fd_intern (sigpipe [1]);
626 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
627
628 /* rather than sort out wether we really need nb, set it */
629 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
630 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
631#endif
632 671
633 ev_io_set (&sigev, sigpipe [0], EV_READ); 672 ev_io_set (&sigev, sigpipe [0], EV_READ);
634 ev_io_start (EV_A_ &sigev); 673 ev_io_start (EV_A_ &sigev);
635 ev_unref (EV_A); /* child watcher should not keep loop alive */ 674 ev_unref (EV_A); /* child watcher should not keep loop alive */
636} 675}
637 676
638/*****************************************************************************/ 677/*****************************************************************************/
639 678
640static struct ev_child *childs [PID_HASHSIZE]; 679static struct ev_child *childs [PID_HASHSIZE];
641 680
642#ifndef WIN32 681#ifndef _WIN32
643 682
644static struct ev_signal childev; 683static struct ev_signal childev;
645 684
646#ifndef WCONTINUED 685#ifndef WCONTINUED
647# define WCONTINUED 0 686# define WCONTINUED 0
… …
679 718
680#endif 719#endif
681 720
682/*****************************************************************************/ 721/*****************************************************************************/
683 722
723#if EV_USE_PORT
724# include "ev_port.c"
725#endif
684#if EV_USE_KQUEUE 726#if EV_USE_KQUEUE
685# include "ev_kqueue.c" 727# include "ev_kqueue.c"
686#endif 728#endif
687#if EV_USE_EPOLL 729#if EV_USE_EPOLL
688# include "ev_epoll.c" 730# include "ev_epoll.c"
… …
708 750
709/* 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 */
710static int 752static int
711enable_secure (void) 753enable_secure (void)
712{ 754{
713#ifdef WIN32 755#ifdef _WIN32
714 return 0; 756 return 0;
715#else 757#else
716 return getuid () != geteuid () 758 return getuid () != geteuid ()
717 || getgid () != getegid (); 759 || getgid () != getegid ();
718#endif 760#endif
719} 761}
720 762
721int 763unsigned int
722ev_method (EV_P) 764ev_method (EV_P)
723{ 765{
724 return method; 766 return method;
725} 767}
726 768
727static void 769static void
728loop_init (EV_P_ int methods) 770loop_init (EV_P_ unsigned int flags)
729{ 771{
730 if (!method) 772 if (!method)
731 { 773 {
732#if EV_USE_MONOTONIC 774#if EV_USE_MONOTONIC
733 { 775 {
… …
735 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 777 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
736 have_monotonic = 1; 778 have_monotonic = 1;
737 } 779 }
738#endif 780#endif
739 781
740 rt_now = ev_time (); 782 ev_rt_now = ev_time ();
741 mn_now = get_clock (); 783 mn_now = get_clock ();
742 now_floor = mn_now; 784 now_floor = mn_now;
743 rtmn_diff = rt_now - mn_now; 785 rtmn_diff = ev_rt_now - mn_now;
744 786
745 if (methods == EVMETHOD_AUTO) 787 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
746 if (!enable_secure () && getenv ("LIBEV_METHODS"))
747 methods = atoi (getenv ("LIBEV_METHODS")); 788 flags = atoi (getenv ("LIBEV_FLAGS"));
748 else 789
749 methods = EVMETHOD_ANY; 790 if (!(flags & 0x0000ffff))
791 flags |= 0x0000ffff;
750 792
751 method = 0; 793 method = 0;
752#if EV_USE_WIN32 794#if EV_USE_PORT
753 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 795 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
754#endif 796#endif
755#if EV_USE_KQUEUE 797#if EV_USE_KQUEUE
756 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 798 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
757#endif 799#endif
758#if EV_USE_EPOLL 800#if EV_USE_EPOLL
759 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 801 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
760#endif 802#endif
761#if EV_USE_POLL 803#if EV_USE_POLL
762 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 804 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
763#endif 805#endif
764#if EV_USE_SELECT 806#if EV_USE_SELECT
765 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 807 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
766#endif 808#endif
767 809
768 ev_init (&sigev, sigcb); 810 ev_init (&sigev, sigcb);
769 ev_set_priority (&sigev, EV_MAXPRI); 811 ev_set_priority (&sigev, EV_MAXPRI);
770 } 812 }
… …
773void 815void
774loop_destroy (EV_P) 816loop_destroy (EV_P)
775{ 817{
776 int i; 818 int i;
777 819
778#if EV_USE_WIN32 820#if EV_USE_PORT
779 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 821 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
780#endif 822#endif
781#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
782 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 824 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
783#endif 825#endif
784#if EV_USE_EPOLL 826#if EV_USE_EPOLL
… …
793 835
794 for (i = NUMPRI; i--; ) 836 for (i = NUMPRI; i--; )
795 array_free (pending, [i]); 837 array_free (pending, [i]);
796 838
797 /* have to use the microsoft-never-gets-it-right macro */ 839 /* have to use the microsoft-never-gets-it-right macro */
798 array_free_microshit (fdchange); 840 array_free (fdchange, EMPTY0);
799 array_free_microshit (timer); 841 array_free (timer, EMPTY0);
800 array_free_microshit (periodic); 842#if EV_PERIODICS
801 array_free_microshit (idle); 843 array_free (periodic, EMPTY0);
802 array_free_microshit (prepare); 844#endif
803 array_free_microshit (check); 845 array_free (idle, EMPTY0);
846 array_free (prepare, EMPTY0);
847 array_free (check, EMPTY0);
804 848
805 method = 0; 849 method = 0;
806} 850}
807 851
808static void 852static void
809loop_fork (EV_P) 853loop_fork (EV_P)
810{ 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
811#if EV_USE_EPOLL 861#if EV_USE_EPOLL
812 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 862 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
813#endif
814#if EV_USE_KQUEUE
815 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
816#endif 863#endif
817 864
818 if (ev_is_active (&sigev)) 865 if (ev_is_active (&sigev))
819 { 866 {
820 /* default loop */ 867 /* default loop */
… …
833 postfork = 0; 880 postfork = 0;
834} 881}
835 882
836#if EV_MULTIPLICITY 883#if EV_MULTIPLICITY
837struct ev_loop * 884struct ev_loop *
838ev_loop_new (int methods) 885ev_loop_new (unsigned int flags)
839{ 886{
840 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));
841 888
842 memset (loop, 0, sizeof (struct ev_loop)); 889 memset (loop, 0, sizeof (struct ev_loop));
843 890
844 loop_init (EV_A_ methods); 891 loop_init (EV_A_ flags);
845 892
846 if (ev_method (EV_A)) 893 if (ev_method (EV_A))
847 return loop; 894 return loop;
848 895
849 return 0; 896 return 0;
… …
864 911
865#endif 912#endif
866 913
867#if EV_MULTIPLICITY 914#if EV_MULTIPLICITY
868struct ev_loop * 915struct ev_loop *
916ev_default_loop_ (unsigned int flags)
869#else 917#else
870int 918int
919ev_default_loop (unsigned int flags)
871#endif 920#endif
872ev_default_loop (int methods)
873{ 921{
874 if (sigpipe [0] == sigpipe [1]) 922 if (sigpipe [0] == sigpipe [1])
875 if (pipe (sigpipe)) 923 if (pipe (sigpipe))
876 return 0; 924 return 0;
877 925
878 if (!default_loop) 926 if (!ev_default_loop_ptr)
879 { 927 {
880#if EV_MULTIPLICITY 928#if EV_MULTIPLICITY
881 struct ev_loop *loop = default_loop = &default_loop_struct; 929 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
882#else 930#else
883 default_loop = 1; 931 ev_default_loop_ptr = 1;
884#endif 932#endif
885 933
886 loop_init (EV_A_ methods); 934 loop_init (EV_A_ flags);
887 935
888 if (ev_method (EV_A)) 936 if (ev_method (EV_A))
889 { 937 {
890 siginit (EV_A); 938 siginit (EV_A);
891 939
892#ifndef WIN32 940#ifndef _WIN32
893 ev_signal_init (&childev, childcb, SIGCHLD); 941 ev_signal_init (&childev, childcb, SIGCHLD);
894 ev_set_priority (&childev, EV_MAXPRI); 942 ev_set_priority (&childev, EV_MAXPRI);
895 ev_signal_start (EV_A_ &childev); 943 ev_signal_start (EV_A_ &childev);
896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 944 ev_unref (EV_A); /* child watcher should not keep loop alive */
897#endif 945#endif
898 } 946 }
899 else 947 else
900 default_loop = 0; 948 ev_default_loop_ptr = 0;
901 } 949 }
902 950
903 return default_loop; 951 return ev_default_loop_ptr;
904} 952}
905 953
906void 954void
907ev_default_destroy (void) 955ev_default_destroy (void)
908{ 956{
909#if EV_MULTIPLICITY 957#if EV_MULTIPLICITY
910 struct ev_loop *loop = default_loop; 958 struct ev_loop *loop = ev_default_loop_ptr;
911#endif 959#endif
912 960
913#ifndef WIN32 961#ifndef _WIN32
914 ev_ref (EV_A); /* child watcher */ 962 ev_ref (EV_A); /* child watcher */
915 ev_signal_stop (EV_A_ &childev); 963 ev_signal_stop (EV_A_ &childev);
916#endif 964#endif
917 965
918 ev_ref (EV_A); /* signal watcher */ 966 ev_ref (EV_A); /* signal watcher */
… …
926 974
927void 975void
928ev_default_fork (void) 976ev_default_fork (void)
929{ 977{
930#if EV_MULTIPLICITY 978#if EV_MULTIPLICITY
931 struct ev_loop *loop = default_loop; 979 struct ev_loop *loop = ev_default_loop_ptr;
932#endif 980#endif
933 981
934 if (method) 982 if (method)
935 postfork = 1; 983 postfork = 1;
936} 984}
… …
978 1026
979 /* first reschedule or stop timer */ 1027 /* first reschedule or stop timer */
980 if (w->repeat) 1028 if (w->repeat)
981 { 1029 {
982 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1030 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1031
983 ((WT)w)->at = mn_now + w->repeat; 1032 ((WT)w)->at += w->repeat;
1033 if (((WT)w)->at < mn_now)
1034 ((WT)w)->at = mn_now;
1035
984 downheap ((WT *)timers, timercnt, 0); 1036 downheap ((WT *)timers, timercnt, 0);
985 } 1037 }
986 else 1038 else
987 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1039 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
988 1040
989 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1041 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
990 } 1042 }
991} 1043}
992 1044
1045#if EV_PERIODICS
993static void 1046static void
994periodics_reify (EV_P) 1047periodics_reify (EV_P)
995{ 1048{
996 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1049 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
997 { 1050 {
998 struct ev_periodic *w = periodics [0]; 1051 struct ev_periodic *w = periodics [0];
999 1052
1000 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1053 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1001 1054
1002 /* first reschedule or stop timer */ 1055 /* first reschedule or stop timer */
1003 if (w->reschedule_cb) 1056 if (w->reschedule_cb)
1004 { 1057 {
1005 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1058 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1006
1007 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1059 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1008 downheap ((WT *)periodics, periodiccnt, 0); 1060 downheap ((WT *)periodics, periodiccnt, 0);
1009 } 1061 }
1010 else if (w->interval) 1062 else if (w->interval)
1011 { 1063 {
1012 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1064 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
1013 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1065 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1014 downheap ((WT *)periodics, periodiccnt, 0); 1066 downheap ((WT *)periodics, periodiccnt, 0);
1015 } 1067 }
1016 else 1068 else
1017 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1069 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1018 1070
… …
1029 for (i = 0; i < periodiccnt; ++i) 1081 for (i = 0; i < periodiccnt; ++i)
1030 { 1082 {
1031 struct ev_periodic *w = periodics [i]; 1083 struct ev_periodic *w = periodics [i];
1032 1084
1033 if (w->reschedule_cb) 1085 if (w->reschedule_cb)
1034 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1086 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1035 else if (w->interval) 1087 else if (w->interval)
1036 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1088 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1037 } 1089 }
1038 1090
1039 /* now rebuild the heap */ 1091 /* now rebuild the heap */
1040 for (i = periodiccnt >> 1; i--; ) 1092 for (i = periodiccnt >> 1; i--; )
1041 downheap ((WT *)periodics, periodiccnt, i); 1093 downheap ((WT *)periodics, periodiccnt, i);
1042} 1094}
1095#endif
1043 1096
1044inline int 1097inline int
1045time_update_monotonic (EV_P) 1098time_update_monotonic (EV_P)
1046{ 1099{
1047 mn_now = get_clock (); 1100 mn_now = get_clock ();
1048 1101
1049 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1102 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1050 { 1103 {
1051 rt_now = rtmn_diff + mn_now; 1104 ev_rt_now = rtmn_diff + mn_now;
1052 return 0; 1105 return 0;
1053 } 1106 }
1054 else 1107 else
1055 { 1108 {
1056 now_floor = mn_now; 1109 now_floor = mn_now;
1057 rt_now = ev_time (); 1110 ev_rt_now = ev_time ();
1058 return 1; 1111 return 1;
1059 } 1112 }
1060} 1113}
1061 1114
1062static void 1115static void
… …
1071 { 1124 {
1072 ev_tstamp odiff = rtmn_diff; 1125 ev_tstamp odiff = rtmn_diff;
1073 1126
1074 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1127 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1075 { 1128 {
1076 rtmn_diff = rt_now - mn_now; 1129 rtmn_diff = ev_rt_now - mn_now;
1077 1130
1078 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1131 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1079 return; /* all is well */ 1132 return; /* all is well */
1080 1133
1081 rt_now = ev_time (); 1134 ev_rt_now = ev_time ();
1082 mn_now = get_clock (); 1135 mn_now = get_clock ();
1083 now_floor = mn_now; 1136 now_floor = mn_now;
1084 } 1137 }
1085 1138
1139# if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1140 periodics_reschedule (EV_A);
1141# endif
1087 /* no timer adjustment, as the monotonic clock doesn't jump */ 1142 /* no timer adjustment, as the monotonic clock doesn't jump */
1088 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1143 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1089 } 1144 }
1090 } 1145 }
1091 else 1146 else
1092#endif 1147#endif
1093 { 1148 {
1094 rt_now = ev_time (); 1149 ev_rt_now = ev_time ();
1095 1150
1096 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1151 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1097 { 1152 {
1153#if EV_PERIODICS
1098 periodics_reschedule (EV_A); 1154 periodics_reschedule (EV_A);
1155#endif
1099 1156
1100 /* adjust timers. this is easy, as the offset is the same for all */ 1157 /* adjust timers. this is easy, as the offset is the same for all */
1101 for (i = 0; i < timercnt; ++i) 1158 for (i = 0; i < timercnt; ++i)
1102 ((WT)timers [i])->at += rt_now - mn_now; 1159 ((WT)timers [i])->at += ev_rt_now - mn_now;
1103 } 1160 }
1104 1161
1105 mn_now = rt_now; 1162 mn_now = ev_rt_now;
1106 } 1163 }
1107} 1164}
1108 1165
1109void 1166void
1110ev_ref (EV_P) 1167ev_ref (EV_P)
… …
1124ev_loop (EV_P_ int flags) 1181ev_loop (EV_P_ int flags)
1125{ 1182{
1126 double block; 1183 double block;
1127 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1184 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1128 1185
1129 do 1186 while (activecnt)
1130 { 1187 {
1131 /* queue check watchers (and execute them) */ 1188 /* queue check watchers (and execute them) */
1132 if (expect_false (preparecnt)) 1189 if (expect_false (preparecnt))
1133 { 1190 {
1134 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1191 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1150 if (expect_true (have_monotonic)) 1207 if (expect_true (have_monotonic))
1151 time_update_monotonic (EV_A); 1208 time_update_monotonic (EV_A);
1152 else 1209 else
1153#endif 1210#endif
1154 { 1211 {
1155 rt_now = ev_time (); 1212 ev_rt_now = ev_time ();
1156 mn_now = rt_now; 1213 mn_now = ev_rt_now;
1157 } 1214 }
1158 1215
1159 if (flags & EVLOOP_NONBLOCK || idlecnt) 1216 if (flags & EVLOOP_NONBLOCK || idlecnt)
1160 block = 0.; 1217 block = 0.;
1161 else 1218 else
… …
1166 { 1223 {
1167 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1224 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1168 if (block > to) block = to; 1225 if (block > to) block = to;
1169 } 1226 }
1170 1227
1228#if EV_PERIODICS
1171 if (periodiccnt) 1229 if (periodiccnt)
1172 { 1230 {
1173 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1231 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1174 if (block > to) block = to; 1232 if (block > to) block = to;
1175 } 1233 }
1234#endif
1176 1235
1177 if (block < 0.) block = 0.; 1236 if (block < 0.) block = 0.;
1178 } 1237 }
1179 1238
1180 method_poll (EV_A_ block); 1239 method_poll (EV_A_ block);
1181 1240
1182 /* update rt_now, do magic */ 1241 /* update ev_rt_now, do magic */
1183 time_update (EV_A); 1242 time_update (EV_A);
1184 1243
1185 /* queue pending timers and reschedule them */ 1244 /* queue pending timers and reschedule them */
1186 timers_reify (EV_A); /* relative timers called last */ 1245 timers_reify (EV_A); /* relative timers called last */
1246#if EV_PERIODICS
1187 periodics_reify (EV_A); /* absolute timers called first */ 1247 periodics_reify (EV_A); /* absolute timers called first */
1248#endif
1188 1249
1189 /* queue idle watchers unless io or timers are pending */ 1250 /* queue idle watchers unless io or timers are pending */
1190 if (idlecnt && !any_pending (EV_A)) 1251 if (idlecnt && !any_pending (EV_A))
1191 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1252 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1192 1253
1193 /* queue check watchers, to be executed first */ 1254 /* queue check watchers, to be executed first */
1194 if (checkcnt) 1255 if (checkcnt)
1195 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1196 1257
1197 call_pending (EV_A); 1258 call_pending (EV_A);
1259
1260 if (loop_done)
1261 break;
1198 } 1262 }
1199 while (activecnt && !loop_done);
1200 1263
1201 if (loop_done != 2) 1264 if (loop_done != 2)
1202 loop_done = 0; 1265 loop_done = 0;
1203} 1266}
1204 1267
… …
1283{ 1346{
1284 ev_clear_pending (EV_A_ (W)w); 1347 ev_clear_pending (EV_A_ (W)w);
1285 if (!ev_is_active (w)) 1348 if (!ev_is_active (w))
1286 return; 1349 return;
1287 1350
1351 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1352
1288 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1353 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1289 ev_stop (EV_A_ (W)w); 1354 ev_stop (EV_A_ (W)w);
1290 1355
1291 fd_change (EV_A_ w->fd); 1356 fd_change (EV_A_ w->fd);
1292} 1357}
… …
1300 ((WT)w)->at += mn_now; 1365 ((WT)w)->at += mn_now;
1301 1366
1302 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.));
1303 1368
1304 ev_start (EV_A_ (W)w, ++timercnt); 1369 ev_start (EV_A_ (W)w, ++timercnt);
1305 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1370 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1306 timers [timercnt - 1] = w; 1371 timers [timercnt - 1] = w;
1307 upheap ((WT *)timers, timercnt - 1); 1372 upheap ((WT *)timers, timercnt - 1);
1308 1373
1309 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1374 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1310} 1375}
… …
1319 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1384 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1320 1385
1321 if (((W)w)->active < timercnt--) 1386 if (((W)w)->active < timercnt--)
1322 { 1387 {
1323 timers [((W)w)->active - 1] = timers [timercnt]; 1388 timers [((W)w)->active - 1] = timers [timercnt];
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1389 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1390 }
1326 1391
1327 ((WT)w)->at = w->repeat; 1392 ((WT)w)->at -= mn_now;
1328 1393
1329 ev_stop (EV_A_ (W)w); 1394 ev_stop (EV_A_ (W)w);
1330} 1395}
1331 1396
1332void 1397void
1333ev_timer_again (EV_P_ struct ev_timer *w) 1398ev_timer_again (EV_P_ struct ev_timer *w)
1334{ 1399{
1335 if (ev_is_active (w)) 1400 if (ev_is_active (w))
1336 { 1401 {
1337 if (w->repeat) 1402 if (w->repeat)
1403 {
1404 ((WT)w)->at = mn_now + w->repeat;
1338 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1405 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1406 }
1339 else 1407 else
1340 ev_timer_stop (EV_A_ w); 1408 ev_timer_stop (EV_A_ w);
1341 } 1409 }
1342 else if (w->repeat) 1410 else if (w->repeat)
1411 {
1412 w->at = w->repeat;
1343 ev_timer_start (EV_A_ w); 1413 ev_timer_start (EV_A_ w);
1414 }
1344} 1415}
1345 1416
1417#if EV_PERIODICS
1346void 1418void
1347ev_periodic_start (EV_P_ struct ev_periodic *w) 1419ev_periodic_start (EV_P_ struct ev_periodic *w)
1348{ 1420{
1349 if (ev_is_active (w)) 1421 if (ev_is_active (w))
1350 return; 1422 return;
1351 1423
1352 if (w->reschedule_cb) 1424 if (w->reschedule_cb)
1353 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1425 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1354 else if (w->interval) 1426 else if (w->interval)
1355 { 1427 {
1356 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1428 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1357 /* 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 */
1358 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1430 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1359 } 1431 }
1360 1432
1361 ev_start (EV_A_ (W)w, ++periodiccnt); 1433 ev_start (EV_A_ (W)w, ++periodiccnt);
1362 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1434 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1363 periodics [periodiccnt - 1] = w; 1435 periodics [periodiccnt - 1] = w;
1364 upheap ((WT *)periodics, periodiccnt - 1); 1436 upheap ((WT *)periodics, periodiccnt - 1);
1365 1437
1366 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1438 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1367} 1439}
… …
1376 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1448 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1377 1449
1378 if (((W)w)->active < periodiccnt--) 1450 if (((W)w)->active < periodiccnt--)
1379 { 1451 {
1380 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1452 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1381 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1453 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1382 } 1454 }
1383 1455
1384 ev_stop (EV_A_ (W)w); 1456 ev_stop (EV_A_ (W)w);
1385} 1457}
1386 1458
… …
1389{ 1461{
1390 /* TODO: use adjustheap and recalculation */ 1462 /* TODO: use adjustheap and recalculation */
1391 ev_periodic_stop (EV_A_ w); 1463 ev_periodic_stop (EV_A_ w);
1392 ev_periodic_start (EV_A_ w); 1464 ev_periodic_start (EV_A_ w);
1393} 1465}
1466#endif
1394 1467
1395void 1468void
1396ev_idle_start (EV_P_ struct ev_idle *w) 1469ev_idle_start (EV_P_ struct ev_idle *w)
1397{ 1470{
1398 if (ev_is_active (w)) 1471 if (ev_is_active (w))
1399 return; 1472 return;
1400 1473
1401 ev_start (EV_A_ (W)w, ++idlecnt); 1474 ev_start (EV_A_ (W)w, ++idlecnt);
1402 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1403 idles [idlecnt - 1] = w; 1476 idles [idlecnt - 1] = w;
1404} 1477}
1405 1478
1406void 1479void
1407ev_idle_stop (EV_P_ struct ev_idle *w) 1480ev_idle_stop (EV_P_ struct ev_idle *w)
1408{ 1481{
1409 ev_clear_pending (EV_A_ (W)w); 1482 ev_clear_pending (EV_A_ (W)w);
1410 if (ev_is_active (w)) 1483 if (!ev_is_active (w))
1411 return; 1484 return;
1412 1485
1413 idles [((W)w)->active - 1] = idles [--idlecnt]; 1486 idles [((W)w)->active - 1] = idles [--idlecnt];
1414 ev_stop (EV_A_ (W)w); 1487 ev_stop (EV_A_ (W)w);
1415} 1488}
… …
1419{ 1492{
1420 if (ev_is_active (w)) 1493 if (ev_is_active (w))
1421 return; 1494 return;
1422 1495
1423 ev_start (EV_A_ (W)w, ++preparecnt); 1496 ev_start (EV_A_ (W)w, ++preparecnt);
1424 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1425 prepares [preparecnt - 1] = w; 1498 prepares [preparecnt - 1] = w;
1426} 1499}
1427 1500
1428void 1501void
1429ev_prepare_stop (EV_P_ struct ev_prepare *w) 1502ev_prepare_stop (EV_P_ struct ev_prepare *w)
1430{ 1503{
1431 ev_clear_pending (EV_A_ (W)w); 1504 ev_clear_pending (EV_A_ (W)w);
1432 if (ev_is_active (w)) 1505 if (!ev_is_active (w))
1433 return; 1506 return;
1434 1507
1435 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1508 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1436 ev_stop (EV_A_ (W)w); 1509 ev_stop (EV_A_ (W)w);
1437} 1510}
… …
1441{ 1514{
1442 if (ev_is_active (w)) 1515 if (ev_is_active (w))
1443 return; 1516 return;
1444 1517
1445 ev_start (EV_A_ (W)w, ++checkcnt); 1518 ev_start (EV_A_ (W)w, ++checkcnt);
1446 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1447 checks [checkcnt - 1] = w; 1520 checks [checkcnt - 1] = w;
1448} 1521}
1449 1522
1450void 1523void
1451ev_check_stop (EV_P_ struct ev_check *w) 1524ev_check_stop (EV_P_ struct ev_check *w)
1452{ 1525{
1453 ev_clear_pending (EV_A_ (W)w); 1526 ev_clear_pending (EV_A_ (W)w);
1454 if (ev_is_active (w)) 1527 if (!ev_is_active (w))
1455 return; 1528 return;
1456 1529
1457 checks [((W)w)->active - 1] = checks [--checkcnt]; 1530 checks [((W)w)->active - 1] = checks [--checkcnt];
1458 ev_stop (EV_A_ (W)w); 1531 ev_stop (EV_A_ (W)w);
1459} 1532}
… …
1464 1537
1465void 1538void
1466ev_signal_start (EV_P_ struct ev_signal *w) 1539ev_signal_start (EV_P_ struct ev_signal *w)
1467{ 1540{
1468#if EV_MULTIPLICITY 1541#if EV_MULTIPLICITY
1469 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));
1470#endif 1543#endif
1471 if (ev_is_active (w)) 1544 if (ev_is_active (w))
1472 return; 1545 return;
1473 1546
1474 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));
… …
1477 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1550 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1478 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1551 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1479 1552
1480 if (!((WL)w)->next) 1553 if (!((WL)w)->next)
1481 { 1554 {
1482#if WIN32 1555#if _WIN32
1483 signal (w->signum, sighandler); 1556 signal (w->signum, sighandler);
1484#else 1557#else
1485 struct sigaction sa; 1558 struct sigaction sa;
1486 sa.sa_handler = sighandler; 1559 sa.sa_handler = sighandler;
1487 sigfillset (&sa.sa_mask); 1560 sigfillset (&sa.sa_mask);
… …
1507 1580
1508void 1581void
1509ev_child_start (EV_P_ struct ev_child *w) 1582ev_child_start (EV_P_ struct ev_child *w)
1510{ 1583{
1511#if EV_MULTIPLICITY 1584#if EV_MULTIPLICITY
1512 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));
1513#endif 1586#endif
1514 if (ev_is_active (w)) 1587 if (ev_is_active (w))
1515 return; 1588 return;
1516 1589
1517 ev_start (EV_A_ (W)w, 1); 1590 ev_start (EV_A_ (W)w, 1);
… …
1520 1593
1521void 1594void
1522ev_child_stop (EV_P_ struct ev_child *w) 1595ev_child_stop (EV_P_ struct ev_child *w)
1523{ 1596{
1524 ev_clear_pending (EV_A_ (W)w); 1597 ev_clear_pending (EV_A_ (W)w);
1525 if (ev_is_active (w)) 1598 if (!ev_is_active (w))
1526 return; 1599 return;
1527 1600
1528 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1601 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1529 ev_stop (EV_A_ (W)w); 1602 ev_stop (EV_A_ (W)w);
1530} 1603}
… …
1590 ev_timer_start (EV_A_ &once->to); 1663 ev_timer_start (EV_A_ &once->to);
1591 } 1664 }
1592 } 1665 }
1593} 1666}
1594 1667
1668#ifdef __cplusplus
1669}
1670#endif
1671

Diff Legend

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