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

Comparing libev/ev.c (file contents):
Revision 1.83 by root, Fri Nov 9 21:48:23 2007 UTC vs.
Revision 1.122 by root, Sat Nov 17 02:00:48 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 0
100#endif
101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 0
80#endif 104#endif
81 105
82#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
84#endif 108#endif
85 109
86#ifndef EV_USE_POLL 110#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 111# ifdef _WIN32
112# define EV_USE_POLL 0
113# else
114# define EV_USE_POLL 1
115# endif
88#endif 116#endif
89 117
90#ifndef EV_USE_EPOLL 118#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 119# define EV_USE_EPOLL 0
92#endif 120#endif
93 121
94#ifndef EV_USE_KQUEUE 122#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 123# define EV_USE_KQUEUE 0
96#endif 124#endif
97 125
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 126#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 127# define EV_USE_PORT 0
110#endif 128#endif
111 129
112/**/ 130/**/
131
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
113 137
114#ifndef CLOCK_MONOTONIC 138#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 139# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 140# define EV_USE_MONOTONIC 0
117#endif 141#endif
… …
119#ifndef CLOCK_REALTIME 143#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 144# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 145# define EV_USE_REALTIME 0
122#endif 146#endif
123 147
148#if EV_SELECT_IS_WINSOCKET
149# include <winsock.h>
150#endif
151
124/**/ 152/**/
125 153
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 154#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 155#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 156#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 157/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
130 158
131#ifdef EV_H 159#ifdef EV_H
132# include EV_H 160# include EV_H
133#else 161#else
134# include "ev.h" 162# include "ev.h"
… …
146#define expect_true(expr) expect ((expr) != 0, 1) 174#define expect_true(expr) expect ((expr) != 0, 1)
147 175
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 176#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 177#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 178
179#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
180#define EMPTY2(a,b) /* used to suppress some warnings */
181
151typedef struct ev_watcher *W; 182typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 183typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 184typedef struct ev_watcher_time *WT;
154 185
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 186static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 187
188#ifdef _WIN32
157#include "ev_win32.c" 189# include "ev_win32.c"
190#endif
158 191
159/*****************************************************************************/ 192/*****************************************************************************/
160 193
161static void (*syserr_cb)(const char *msg); 194static void (*syserr_cb)(const char *msg);
162 195
… …
209typedef struct 242typedef struct
210{ 243{
211 WL head; 244 WL head;
212 unsigned char events; 245 unsigned char events;
213 unsigned char reify; 246 unsigned char reify;
247#if EV_SELECT_IS_WINSOCKET
248 SOCKET handle;
249#endif
214} ANFD; 250} ANFD;
215 251
216typedef struct 252typedef struct
217{ 253{
218 W w; 254 W w;
… …
221 257
222#if EV_MULTIPLICITY 258#if EV_MULTIPLICITY
223 259
224 struct ev_loop 260 struct ev_loop
225 { 261 {
262 ev_tstamp ev_rt_now;
263 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 264 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 265 #include "ev_vars.h"
228 #undef VAR 266 #undef VAR
229 }; 267 };
230 #include "ev_wrap.h" 268 #include "ev_wrap.h"
231 269
232 struct ev_loop default_loop_struct; 270 static struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 271 struct ev_loop *ev_default_loop_ptr;
234 272
235#else 273#else
236 274
275 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 277 #include "ev_vars.h"
239 #undef VAR 278 #undef VAR
240 279
241 static int default_loop; 280 static int ev_default_loop_ptr;
242 281
243#endif 282#endif
244 283
245/*****************************************************************************/ 284/*****************************************************************************/
246 285
247inline ev_tstamp 286ev_tstamp
248ev_time (void) 287ev_time (void)
249{ 288{
250#if EV_USE_REALTIME 289#if EV_USE_REALTIME
251 struct timespec ts; 290 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 291 clock_gettime (CLOCK_REALTIME, &ts);
… …
271#endif 310#endif
272 311
273 return ev_time (); 312 return ev_time ();
274} 313}
275 314
315#if EV_MULTIPLICITY
276ev_tstamp 316ev_tstamp
277ev_now (EV_P) 317ev_now (EV_P)
278{ 318{
279 return rt_now; 319 return ev_rt_now;
280} 320}
321#endif
281 322
282#define array_roundsize(type,n) ((n) | 4 & ~3) 323#define array_roundsize(type,n) (((n) | 4) & ~3)
283 324
284#define array_needsize(type,base,cur,cnt,init) \ 325#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 326 if (expect_false ((cnt) > cur)) \
286 { \ 327 { \
287 int newcnt = cur; \ 328 int newcnt = cur; \
… …
302 stem ## max = array_roundsize (stem ## cnt >> 1); \ 343 stem ## max = array_roundsize (stem ## cnt >> 1); \
303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 344 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 345 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
305 } 346 }
306 347
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) \ 348#define array_free(stem, idx) \
313 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 349 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
314 350
315/*****************************************************************************/ 351/*****************************************************************************/
316 352
… …
337 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
338 return; 374 return;
339 } 375 }
340 376
341 w_->pending = ++pendingcnt [ABSPRI (w_)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
342 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 378 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
343 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
344 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
345} 381}
346 382
347static void 383static void
… …
390 int events = 0; 426 int events = 0;
391 427
392 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 428 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
393 events |= w->events; 429 events |= w->events;
394 430
431#if EV_SELECT_IS_WINSOCKET
432 if (events)
433 {
434 unsigned long argp;
435 anfd->handle = _get_osfhandle (fd);
436 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
437 }
438#endif
439
395 anfd->reify = 0; 440 anfd->reify = 0;
396 441
397 method_modify (EV_A_ fd, anfd->events, events); 442 method_modify (EV_A_ fd, anfd->events, events);
398 anfd->events = events; 443 anfd->events = events;
399 } 444 }
… …
408 return; 453 return;
409 454
410 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
411 456
412 ++fdchangecnt; 457 ++fdchangecnt;
413 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
414 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
415} 460}
416 461
417static void 462static void
418fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
… …
427} 472}
428 473
429static int 474static int
430fd_valid (int fd) 475fd_valid (int fd)
431{ 476{
432#ifdef WIN32 477#ifdef _WIN32
433 return !!win32_get_osfhandle (fd); 478 return _get_osfhandle (fd) != -1;
434#else 479#else
435 return fcntl (fd, F_GETFD) != -1; 480 return fcntl (fd, F_GETFD) != -1;
436#endif 481#endif
437} 482}
438 483
… …
518 563
519 heap [k] = w; 564 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 565 ((W)heap [k])->active = k + 1;
521} 566}
522 567
568inline void
569adjustheap (WT *heap, int N, int k)
570{
571 upheap (heap, k);
572 downheap (heap, N, k);
573}
574
523/*****************************************************************************/ 575/*****************************************************************************/
524 576
525typedef struct 577typedef struct
526{ 578{
527 WL head; 579 WL head;
… …
548} 600}
549 601
550static void 602static void
551sighandler (int signum) 603sighandler (int signum)
552{ 604{
553#if WIN32 605#if _WIN32
554 signal (signum, sighandler); 606 signal (signum, sighandler);
555#endif 607#endif
556 608
557 signals [signum - 1].gotsig = 1; 609 signals [signum - 1].gotsig = 1;
558 610
559 if (!gotsig) 611 if (!gotsig)
560 { 612 {
561 int old_errno = errno; 613 int old_errno = errno;
562 gotsig = 1; 614 gotsig = 1;
563#ifdef WIN32
564 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
565#else
566 write (sigpipe [1], &signum, 1); 615 write (sigpipe [1], &signum, 1);
567#endif
568 errno = old_errno; 616 errno = old_errno;
569 } 617 }
570} 618}
571 619
572void 620void
573ev_feed_signal_event (EV_P_ int signum) 621ev_feed_signal_event (EV_P_ int signum)
574{ 622{
575 WL w; 623 WL w;
576 624
577#if EV_MULTIPLICITY 625#if EV_MULTIPLICITY
578 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 626 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
579#endif 627#endif
580 628
581 --signum; 629 --signum;
582 630
583 if (signum < 0 || signum >= signalmax) 631 if (signum < 0 || signum >= signalmax)
… …
592static void 640static void
593sigcb (EV_P_ struct ev_io *iow, int revents) 641sigcb (EV_P_ struct ev_io *iow, int revents)
594{ 642{
595 int signum; 643 int signum;
596 644
597#ifdef WIN32
598 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
599#else
600 read (sigpipe [0], &revents, 1); 645 read (sigpipe [0], &revents, 1);
601#endif
602 gotsig = 0; 646 gotsig = 0;
603 647
604 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
605 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
606 ev_feed_signal_event (EV_A_ signum + 1); 650 ev_feed_signal_event (EV_A_ signum + 1);
607} 651}
608 652
653inline void
654fd_intern (int fd)
655{
656#ifdef _WIN32
657 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
659#else
660 fcntl (fd, F_SETFD, FD_CLOEXEC);
661 fcntl (fd, F_SETFL, O_NONBLOCK);
662#endif
663}
664
609static void 665static void
610siginit (EV_P) 666siginit (EV_P)
611{ 667{
612#ifndef WIN32 668 fd_intern (sigpipe [0]);
613 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 669 fd_intern (sigpipe [1]);
614 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
615
616 /* rather than sort out wether we really need nb, set it */
617 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
618 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
619#endif
620 670
621 ev_io_set (&sigev, sigpipe [0], EV_READ); 671 ev_io_set (&sigev, sigpipe [0], EV_READ);
622 ev_io_start (EV_A_ &sigev); 672 ev_io_start (EV_A_ &sigev);
623 ev_unref (EV_A); /* child watcher should not keep loop alive */ 673 ev_unref (EV_A); /* child watcher should not keep loop alive */
624} 674}
625 675
626/*****************************************************************************/ 676/*****************************************************************************/
627 677
628static struct ev_child *childs [PID_HASHSIZE]; 678static struct ev_child *childs [PID_HASHSIZE];
629 679
630#ifndef WIN32 680#ifndef _WIN32
631 681
632static struct ev_signal childev; 682static struct ev_signal childev;
633 683
634#ifndef WCONTINUED 684#ifndef WCONTINUED
635# define WCONTINUED 0 685# define WCONTINUED 0
… …
667 717
668#endif 718#endif
669 719
670/*****************************************************************************/ 720/*****************************************************************************/
671 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
672#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
673# include "ev_kqueue.c" 726# include "ev_kqueue.c"
674#endif 727#endif
675#if EV_USE_EPOLL 728#if EV_USE_EPOLL
676# include "ev_epoll.c" 729# include "ev_epoll.c"
… …
696 749
697/* return true if we are running with elevated privileges and should ignore env variables */ 750/* return true if we are running with elevated privileges and should ignore env variables */
698static int 751static int
699enable_secure (void) 752enable_secure (void)
700{ 753{
701#ifdef WIN32 754#ifdef _WIN32
702 return 0; 755 return 0;
703#else 756#else
704 return getuid () != geteuid () 757 return getuid () != geteuid ()
705 || getgid () != getegid (); 758 || getgid () != getegid ();
706#endif 759#endif
707} 760}
708 761
709int 762unsigned int
710ev_method (EV_P) 763ev_method (EV_P)
711{ 764{
712 return method; 765 return method;
713} 766}
714 767
715static void 768static void
716loop_init (EV_P_ int methods) 769loop_init (EV_P_ unsigned int flags)
717{ 770{
718 if (!method) 771 if (!method)
719 { 772 {
720#if EV_USE_MONOTONIC 773#if EV_USE_MONOTONIC
721 { 774 {
… …
723 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 776 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
724 have_monotonic = 1; 777 have_monotonic = 1;
725 } 778 }
726#endif 779#endif
727 780
728 rt_now = ev_time (); 781 ev_rt_now = ev_time ();
729 mn_now = get_clock (); 782 mn_now = get_clock ();
730 now_floor = mn_now; 783 now_floor = mn_now;
731 rtmn_diff = rt_now - mn_now; 784 rtmn_diff = ev_rt_now - mn_now;
732 785
733 if (methods == EVMETHOD_AUTO) 786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
734 if (!enable_secure () && getenv ("LIBEV_METHODS"))
735 methods = atoi (getenv ("LIBEV_METHODS")); 787 flags = atoi (getenv ("LIBEV_FLAGS"));
736 else 788
737 methods = EVMETHOD_ANY; 789 if (!(flags & 0x0000ffff))
790 flags |= 0x0000ffff;
738 791
739 method = 0; 792 method = 0;
740#if EV_USE_WIN32 793#if EV_USE_PORT
741 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
742#endif 795#endif
743#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
744 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
745#endif 798#endif
746#if EV_USE_EPOLL 799#if EV_USE_EPOLL
747 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
748#endif 801#endif
749#if EV_USE_POLL 802#if EV_USE_POLL
750 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
751#endif 804#endif
752#if EV_USE_SELECT 805#if EV_USE_SELECT
753 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
754#endif 807#endif
755 808
756 ev_init (&sigev, sigcb); 809 ev_init (&sigev, sigcb);
757 ev_set_priority (&sigev, EV_MAXPRI); 810 ev_set_priority (&sigev, EV_MAXPRI);
758 } 811 }
… …
761void 814void
762loop_destroy (EV_P) 815loop_destroy (EV_P)
763{ 816{
764 int i; 817 int i;
765 818
766#if EV_USE_WIN32 819#if EV_USE_PORT
767 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
768#endif 821#endif
769#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
770 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
771#endif 824#endif
772#if EV_USE_EPOLL 825#if EV_USE_EPOLL
… …
781 834
782 for (i = NUMPRI; i--; ) 835 for (i = NUMPRI; i--; )
783 array_free (pending, [i]); 836 array_free (pending, [i]);
784 837
785 /* have to use the microsoft-never-gets-it-right macro */ 838 /* have to use the microsoft-never-gets-it-right macro */
786 array_free_microshit (fdchange); 839 array_free (fdchange, EMPTY0);
787 array_free_microshit (timer); 840 array_free (timer, EMPTY0);
788 array_free_microshit (periodic); 841#if EV_PERIODICS
789 array_free_microshit (idle); 842 array_free (periodic, EMPTY0);
790 array_free_microshit (prepare); 843#endif
791 array_free_microshit (check); 844 array_free (idle, EMPTY0);
845 array_free (prepare, EMPTY0);
846 array_free (check, EMPTY0);
792 847
793 method = 0; 848 method = 0;
794} 849}
795 850
796static void 851static void
797loop_fork (EV_P) 852loop_fork (EV_P)
798{ 853{
854#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A);
856#endif
857#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
859#endif
799#if EV_USE_EPOLL 860#if EV_USE_EPOLL
800 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
801#endif
802#if EV_USE_KQUEUE
803 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
804#endif 862#endif
805 863
806 if (ev_is_active (&sigev)) 864 if (ev_is_active (&sigev))
807 { 865 {
808 /* default loop */ 866 /* default loop */
… …
821 postfork = 0; 879 postfork = 0;
822} 880}
823 881
824#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
825struct ev_loop * 883struct ev_loop *
826ev_loop_new (int methods) 884ev_loop_new (unsigned int flags)
827{ 885{
828 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 886 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
829 887
830 memset (loop, 0, sizeof (struct ev_loop)); 888 memset (loop, 0, sizeof (struct ev_loop));
831 889
832 loop_init (EV_A_ methods); 890 loop_init (EV_A_ flags);
833 891
834 if (ev_method (EV_A)) 892 if (ev_method (EV_A))
835 return loop; 893 return loop;
836 894
837 return 0; 895 return 0;
… …
852 910
853#endif 911#endif
854 912
855#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
856struct ev_loop * 914struct ev_loop *
915ev_default_loop_ (unsigned int flags)
857#else 916#else
858int 917int
918ev_default_loop (unsigned int flags)
859#endif 919#endif
860ev_default_loop (int methods)
861{ 920{
862 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
863 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
864 return 0; 923 return 0;
865 924
866 if (!default_loop) 925 if (!ev_default_loop_ptr)
867 { 926 {
868#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
869 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
870#else 929#else
871 default_loop = 1; 930 ev_default_loop_ptr = 1;
872#endif 931#endif
873 932
874 loop_init (EV_A_ methods); 933 loop_init (EV_A_ flags);
875 934
876 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
877 { 936 {
878 siginit (EV_A); 937 siginit (EV_A);
879 938
880#ifndef WIN32 939#ifndef _WIN32
881 ev_signal_init (&childev, childcb, SIGCHLD); 940 ev_signal_init (&childev, childcb, SIGCHLD);
882 ev_set_priority (&childev, EV_MAXPRI); 941 ev_set_priority (&childev, EV_MAXPRI);
883 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
884 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
885#endif 944#endif
886 } 945 }
887 else 946 else
888 default_loop = 0; 947 ev_default_loop_ptr = 0;
889 } 948 }
890 949
891 return default_loop; 950 return ev_default_loop_ptr;
892} 951}
893 952
894void 953void
895ev_default_destroy (void) 954ev_default_destroy (void)
896{ 955{
897#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
898 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
899#endif 958#endif
900 959
901#ifndef WIN32 960#ifndef _WIN32
902 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
903 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
904#endif 963#endif
905 964
906 ev_ref (EV_A); /* signal watcher */ 965 ev_ref (EV_A); /* signal watcher */
… …
914 973
915void 974void
916ev_default_fork (void) 975ev_default_fork (void)
917{ 976{
918#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
919 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
920#endif 979#endif
921 980
922 if (method) 981 if (method)
923 postfork = 1; 982 postfork = 1;
924} 983}
… …
935 return 1; 994 return 1;
936 995
937 return 0; 996 return 0;
938} 997}
939 998
940static void 999inline void
941call_pending (EV_P) 1000call_pending (EV_P)
942{ 1001{
943 int pri; 1002 int pri;
944 1003
945 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
946 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
947 { 1006 {
948 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
949 1008
950 if (p->w) 1009 if (expect_true (p->w))
951 { 1010 {
952 p->w->pending = 0; 1011 p->w->pending = 0;
953 EV_CB_INVOKE (p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
954 } 1013 }
955 } 1014 }
… …
966 1025
967 /* first reschedule or stop timer */ 1026 /* first reschedule or stop timer */
968 if (w->repeat) 1027 if (w->repeat)
969 { 1028 {
970 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1029 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1030
971 ((WT)w)->at = mn_now + w->repeat; 1031 ((WT)w)->at += w->repeat;
1032 if (((WT)w)->at < mn_now)
1033 ((WT)w)->at = mn_now;
1034
972 downheap ((WT *)timers, timercnt, 0); 1035 downheap ((WT *)timers, timercnt, 0);
973 } 1036 }
974 else 1037 else
975 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1038 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
976 1039
977 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
978 } 1041 }
979} 1042}
980 1043
1044#if EV_PERIODICS
981static void 1045static void
982periodics_reify (EV_P) 1046periodics_reify (EV_P)
983{ 1047{
984 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
985 { 1049 {
986 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
987 1051
988 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1052 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
989 1053
990 /* first reschedule or stop timer */ 1054 /* first reschedule or stop timer */
991 if (w->reschedule_cb) 1055 if (w->reschedule_cb)
992 { 1056 {
993 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1057 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
994
995 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1058 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
996 downheap ((WT *)periodics, periodiccnt, 0); 1059 downheap ((WT *)periodics, periodiccnt, 0);
997 } 1060 }
998 else if (w->interval) 1061 else if (w->interval)
999 { 1062 {
1000 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1063 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
1001 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1064 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1002 downheap ((WT *)periodics, periodiccnt, 0); 1065 downheap ((WT *)periodics, periodiccnt, 0);
1003 } 1066 }
1004 else 1067 else
1005 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1068 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1006 1069
… …
1017 for (i = 0; i < periodiccnt; ++i) 1080 for (i = 0; i < periodiccnt; ++i)
1018 { 1081 {
1019 struct ev_periodic *w = periodics [i]; 1082 struct ev_periodic *w = periodics [i];
1020 1083
1021 if (w->reschedule_cb) 1084 if (w->reschedule_cb)
1022 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1085 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1023 else if (w->interval) 1086 else if (w->interval)
1024 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1087 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1025 } 1088 }
1026 1089
1027 /* now rebuild the heap */ 1090 /* now rebuild the heap */
1028 for (i = periodiccnt >> 1; i--; ) 1091 for (i = periodiccnt >> 1; i--; )
1029 downheap ((WT *)periodics, periodiccnt, i); 1092 downheap ((WT *)periodics, periodiccnt, i);
1030} 1093}
1094#endif
1031 1095
1032inline int 1096inline int
1033time_update_monotonic (EV_P) 1097time_update_monotonic (EV_P)
1034{ 1098{
1035 mn_now = get_clock (); 1099 mn_now = get_clock ();
1036 1100
1037 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1101 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1038 { 1102 {
1039 rt_now = rtmn_diff + mn_now; 1103 ev_rt_now = rtmn_diff + mn_now;
1040 return 0; 1104 return 0;
1041 } 1105 }
1042 else 1106 else
1043 { 1107 {
1044 now_floor = mn_now; 1108 now_floor = mn_now;
1045 rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
1046 return 1; 1110 return 1;
1047 } 1111 }
1048} 1112}
1049 1113
1050static void 1114static void
… …
1059 { 1123 {
1060 ev_tstamp odiff = rtmn_diff; 1124 ev_tstamp odiff = rtmn_diff;
1061 1125
1062 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1126 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1063 { 1127 {
1064 rtmn_diff = rt_now - mn_now; 1128 rtmn_diff = ev_rt_now - mn_now;
1065 1129
1066 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1130 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1067 return; /* all is well */ 1131 return; /* all is well */
1068 1132
1069 rt_now = ev_time (); 1133 ev_rt_now = ev_time ();
1070 mn_now = get_clock (); 1134 mn_now = get_clock ();
1071 now_floor = mn_now; 1135 now_floor = mn_now;
1072 } 1136 }
1073 1137
1138# if EV_PERIODICS
1074 periodics_reschedule (EV_A); 1139 periodics_reschedule (EV_A);
1140# endif
1075 /* no timer adjustment, as the monotonic clock doesn't jump */ 1141 /* no timer adjustment, as the monotonic clock doesn't jump */
1076 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1077 } 1143 }
1078 } 1144 }
1079 else 1145 else
1080#endif 1146#endif
1081 { 1147 {
1082 rt_now = ev_time (); 1148 ev_rt_now = ev_time ();
1083 1149
1084 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1150 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1085 { 1151 {
1152#if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1153 periodics_reschedule (EV_A);
1154#endif
1087 1155
1088 /* adjust timers. this is easy, as the offset is the same for all */ 1156 /* adjust timers. this is easy, as the offset is the same for all */
1089 for (i = 0; i < timercnt; ++i) 1157 for (i = 0; i < timercnt; ++i)
1090 ((WT)timers [i])->at += rt_now - mn_now; 1158 ((WT)timers [i])->at += ev_rt_now - mn_now;
1091 } 1159 }
1092 1160
1093 mn_now = rt_now; 1161 mn_now = ev_rt_now;
1094 } 1162 }
1095} 1163}
1096 1164
1097void 1165void
1098ev_ref (EV_P) 1166ev_ref (EV_P)
… …
1112ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
1113{ 1181{
1114 double block; 1182 double block;
1115 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1116 1184
1117 do 1185 while (activecnt)
1118 { 1186 {
1119 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
1120 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
1121 { 1189 {
1122 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1138 if (expect_true (have_monotonic)) 1206 if (expect_true (have_monotonic))
1139 time_update_monotonic (EV_A); 1207 time_update_monotonic (EV_A);
1140 else 1208 else
1141#endif 1209#endif
1142 { 1210 {
1143 rt_now = ev_time (); 1211 ev_rt_now = ev_time ();
1144 mn_now = rt_now; 1212 mn_now = ev_rt_now;
1145 } 1213 }
1146 1214
1147 if (flags & EVLOOP_NONBLOCK || idlecnt) 1215 if (flags & EVLOOP_NONBLOCK || idlecnt)
1148 block = 0.; 1216 block = 0.;
1149 else 1217 else
… …
1154 { 1222 {
1155 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1156 if (block > to) block = to; 1224 if (block > to) block = to;
1157 } 1225 }
1158 1226
1227#if EV_PERIODICS
1159 if (periodiccnt) 1228 if (periodiccnt)
1160 { 1229 {
1161 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1162 if (block > to) block = to; 1231 if (block > to) block = to;
1163 } 1232 }
1233#endif
1164 1234
1165 if (block < 0.) block = 0.; 1235 if (block < 0.) block = 0.;
1166 } 1236 }
1167 1237
1168 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1169 1239
1170 /* update rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
1171 time_update (EV_A); 1241 time_update (EV_A);
1172 1242
1173 /* queue pending timers and reschedule them */ 1243 /* queue pending timers and reschedule them */
1174 timers_reify (EV_A); /* relative timers called last */ 1244 timers_reify (EV_A); /* relative timers called last */
1245#if EV_PERIODICS
1175 periodics_reify (EV_A); /* absolute timers called first */ 1246 periodics_reify (EV_A); /* absolute timers called first */
1247#endif
1176 1248
1177 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1178 if (idlecnt && !any_pending (EV_A)) 1250 if (idlecnt && !any_pending (EV_A))
1179 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1180 1252
1181 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1182 if (checkcnt) 1254 if (checkcnt)
1183 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1184 1256
1185 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (loop_done)
1260 break;
1186 } 1261 }
1187 while (activecnt && !loop_done);
1188 1262
1189 if (loop_done != 2) 1263 if (loop_done != 2)
1190 loop_done = 0; 1264 loop_done = 0;
1191} 1265}
1192 1266
… …
1271{ 1345{
1272 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1273 if (!ev_is_active (w)) 1347 if (!ev_is_active (w))
1274 return; 1348 return;
1275 1349
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1351
1276 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1277 ev_stop (EV_A_ (W)w); 1353 ev_stop (EV_A_ (W)w);
1278 1354
1279 fd_change (EV_A_ w->fd); 1355 fd_change (EV_A_ w->fd);
1280} 1356}
… …
1288 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1289 1365
1290 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1291 1367
1292 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1293 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1294 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1295 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1296 1372
1297 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1298} 1374}
… …
1307 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1308 1384
1309 if (((W)w)->active < timercnt--) 1385 if (((W)w)->active < timercnt--)
1310 { 1386 {
1311 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1312 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1313 } 1389 }
1314 1390
1315 ((WT)w)->at = w->repeat; 1391 ((WT)w)->at -= mn_now;
1316 1392
1317 ev_stop (EV_A_ (W)w); 1393 ev_stop (EV_A_ (W)w);
1318} 1394}
1319 1395
1320void 1396void
… …
1323 if (ev_is_active (w)) 1399 if (ev_is_active (w))
1324 { 1400 {
1325 if (w->repeat) 1401 if (w->repeat)
1326 { 1402 {
1327 ((WT)w)->at = mn_now + w->repeat; 1403 ((WT)w)->at = mn_now + w->repeat;
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1404 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1405 }
1330 else 1406 else
1331 ev_timer_stop (EV_A_ w); 1407 ev_timer_stop (EV_A_ w);
1332 } 1408 }
1333 else if (w->repeat) 1409 else if (w->repeat)
1410 {
1411 w->at = w->repeat;
1334 ev_timer_start (EV_A_ w); 1412 ev_timer_start (EV_A_ w);
1413 }
1335} 1414}
1336 1415
1416#if EV_PERIODICS
1337void 1417void
1338ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1339{ 1419{
1340 if (ev_is_active (w)) 1420 if (ev_is_active (w))
1341 return; 1421 return;
1342 1422
1343 if (w->reschedule_cb) 1423 if (w->reschedule_cb)
1344 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1345 else if (w->interval) 1425 else if (w->interval)
1346 { 1426 {
1347 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1427 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1348 /* this formula differs from the one in periodic_reify because we do not always round up */ 1428 /* this formula differs from the one in periodic_reify because we do not always round up */
1349 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1350 } 1430 }
1351 1431
1352 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1353 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1354 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1355 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1356 1436
1357 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1358} 1438}
… …
1367 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1368 1448
1369 if (((W)w)->active < periodiccnt--) 1449 if (((W)w)->active < periodiccnt--)
1370 { 1450 {
1371 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1372 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1373 } 1453 }
1374 1454
1375 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1376} 1456}
1377 1457
1378void 1458void
1379ev_periodic_again (EV_P_ struct ev_periodic *w) 1459ev_periodic_again (EV_P_ struct ev_periodic *w)
1380{ 1460{
1461 /* TODO: use adjustheap and recalculation */
1381 ev_periodic_stop (EV_A_ w); 1462 ev_periodic_stop (EV_A_ w);
1382 ev_periodic_start (EV_A_ w); 1463 ev_periodic_start (EV_A_ w);
1383} 1464}
1465#endif
1384 1466
1385void 1467void
1386ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1387{ 1469{
1388 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1389 return; 1471 return;
1390 1472
1391 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1392 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1393 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1394} 1476}
1395 1477
1396void 1478void
1397ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1398{ 1480{
1399 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1400 if (ev_is_active (w)) 1482 if (!ev_is_active (w))
1401 return; 1483 return;
1402 1484
1403 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1404 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1405} 1487}
… …
1409{ 1491{
1410 if (ev_is_active (w)) 1492 if (ev_is_active (w))
1411 return; 1493 return;
1412 1494
1413 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1414 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1415 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1416} 1498}
1417 1499
1418void 1500void
1419ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1420{ 1502{
1421 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1422 if (ev_is_active (w)) 1504 if (!ev_is_active (w))
1423 return; 1505 return;
1424 1506
1425 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1426 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1427} 1509}
… …
1431{ 1513{
1432 if (ev_is_active (w)) 1514 if (ev_is_active (w))
1433 return; 1515 return;
1434 1516
1435 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1436 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1437 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1438} 1520}
1439 1521
1440void 1522void
1441ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1442{ 1524{
1443 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1444 if (ev_is_active (w)) 1526 if (!ev_is_active (w))
1445 return; 1527 return;
1446 1528
1447 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1448 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1449} 1531}
… …
1454 1536
1455void 1537void
1456ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1457{ 1539{
1458#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1459 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1460#endif 1542#endif
1461 if (ev_is_active (w)) 1543 if (ev_is_active (w))
1462 return; 1544 return;
1463 1545
1464 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
… …
1467 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1549 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1468 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1550 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1469 1551
1470 if (!((WL)w)->next) 1552 if (!((WL)w)->next)
1471 { 1553 {
1472#if WIN32 1554#if _WIN32
1473 signal (w->signum, sighandler); 1555 signal (w->signum, sighandler);
1474#else 1556#else
1475 struct sigaction sa; 1557 struct sigaction sa;
1476 sa.sa_handler = sighandler; 1558 sa.sa_handler = sighandler;
1477 sigfillset (&sa.sa_mask); 1559 sigfillset (&sa.sa_mask);
… …
1497 1579
1498void 1580void
1499ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1500{ 1582{
1501#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1502 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1503#endif 1585#endif
1504 if (ev_is_active (w)) 1586 if (ev_is_active (w))
1505 return; 1587 return;
1506 1588
1507 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
… …
1510 1592
1511void 1593void
1512ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1513{ 1595{
1514 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1515 if (ev_is_active (w)) 1597 if (!ev_is_active (w))
1516 return; 1598 return;
1517 1599
1518 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1519 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1520} 1602}
… …
1580 ev_timer_start (EV_A_ &once->to); 1662 ev_timer_start (EV_A_ &once->to);
1581 } 1663 }
1582 } 1664 }
1583} 1665}
1584 1666
1667#ifdef __cplusplus
1668}
1669#endif
1670

Diff Legend

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