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

Comparing libev/ev.c (file contents):
Revision 1.81 by root, Fri Nov 9 17:07:59 2007 UTC vs.
Revision 1.118 by root, Fri Nov 16 01:33:54 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_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
… …
518 564
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
569inline void
570adjustheap (WT *heap, int N, int k)
571{
572 upheap (heap, k);
573 downheap (heap, N, k);
574}
575
523/*****************************************************************************/ 576/*****************************************************************************/
524 577
525typedef struct 578typedef struct
526{ 579{
527 WL head; 580 WL head;
… …
548} 601}
549 602
550static void 603static void
551sighandler (int signum) 604sighandler (int signum)
552{ 605{
553#if WIN32 606#if _WIN32
554 signal (signum, sighandler); 607 signal (signum, sighandler);
555#endif 608#endif
556 609
557 signals [signum - 1].gotsig = 1; 610 signals [signum - 1].gotsig = 1;
558 611
559 if (!gotsig) 612 if (!gotsig)
560 { 613 {
561 int old_errno = errno; 614 int old_errno = errno;
562 gotsig = 1; 615 gotsig = 1;
563#ifdef WIN32
564 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
565#else
566 write (sigpipe [1], &signum, 1); 616 write (sigpipe [1], &signum, 1);
567#endif
568 errno = old_errno; 617 errno = old_errno;
569 } 618 }
570} 619}
571 620
572void 621void
573ev_feed_signal_event (EV_P_ int signum) 622ev_feed_signal_event (EV_P_ int signum)
574{ 623{
575 WL w; 624 WL w;
576 625
577#if EV_MULTIPLICITY 626#if EV_MULTIPLICITY
578 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));
579#endif 628#endif
580 629
581 --signum; 630 --signum;
582 631
583 if (signum < 0 || signum >= signalmax) 632 if (signum < 0 || signum >= signalmax)
… …
592static void 641static void
593sigcb (EV_P_ struct ev_io *iow, int revents) 642sigcb (EV_P_ struct ev_io *iow, int revents)
594{ 643{
595 int signum; 644 int signum;
596 645
597#ifdef WIN32
598 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
599#else
600 read (sigpipe [0], &revents, 1); 646 read (sigpipe [0], &revents, 1);
601#endif
602 gotsig = 0; 647 gotsig = 0;
603 648
604 for (signum = signalmax; signum--; ) 649 for (signum = signalmax; signum--; )
605 if (signals [signum].gotsig) 650 if (signals [signum].gotsig)
606 ev_feed_signal_event (EV_A_ signum + 1); 651 ev_feed_signal_event (EV_A_ signum + 1);
607} 652}
608 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
609static void 666static void
610siginit (EV_P) 667siginit (EV_P)
611{ 668{
612#ifndef WIN32 669 fd_intern (sigpipe [0]);
613 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 670 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 671
621 ev_io_set (&sigev, sigpipe [0], EV_READ); 672 ev_io_set (&sigev, sigpipe [0], EV_READ);
622 ev_io_start (EV_A_ &sigev); 673 ev_io_start (EV_A_ &sigev);
623 ev_unref (EV_A); /* child watcher should not keep loop alive */ 674 ev_unref (EV_A); /* child watcher should not keep loop alive */
624} 675}
625 676
626/*****************************************************************************/ 677/*****************************************************************************/
627 678
628static struct ev_child *childs [PID_HASHSIZE]; 679static struct ev_child *childs [PID_HASHSIZE];
629 680
630#ifndef WIN32 681#ifndef _WIN32
631 682
632static struct ev_signal childev; 683static struct ev_signal childev;
633 684
634#ifndef WCONTINUED 685#ifndef WCONTINUED
635# define WCONTINUED 0 686# define WCONTINUED 0
… …
667 718
668#endif 719#endif
669 720
670/*****************************************************************************/ 721/*****************************************************************************/
671 722
723#if EV_USE_PORT
724# include "ev_port.c"
725#endif
672#if EV_USE_KQUEUE 726#if EV_USE_KQUEUE
673# include "ev_kqueue.c" 727# include "ev_kqueue.c"
674#endif 728#endif
675#if EV_USE_EPOLL 729#if EV_USE_EPOLL
676# include "ev_epoll.c" 730# include "ev_epoll.c"
… …
696 750
697/* 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 */
698static int 752static int
699enable_secure (void) 753enable_secure (void)
700{ 754{
701#ifdef WIN32 755#ifdef _WIN32
702 return 0; 756 return 0;
703#else 757#else
704 return getuid () != geteuid () 758 return getuid () != geteuid ()
705 || getgid () != getegid (); 759 || getgid () != getegid ();
706#endif 760#endif
707} 761}
708 762
709int 763unsigned int
710ev_method (EV_P) 764ev_method (EV_P)
711{ 765{
712 return method; 766 return method;
713} 767}
714 768
715static void 769static void
716loop_init (EV_P_ int methods) 770loop_init (EV_P_ unsigned int flags)
717{ 771{
718 if (!method) 772 if (!method)
719 { 773 {
720#if EV_USE_MONOTONIC 774#if EV_USE_MONOTONIC
721 { 775 {
… …
723 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 777 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
724 have_monotonic = 1; 778 have_monotonic = 1;
725 } 779 }
726#endif 780#endif
727 781
728 rt_now = ev_time (); 782 ev_rt_now = ev_time ();
729 mn_now = get_clock (); 783 mn_now = get_clock ();
730 now_floor = mn_now; 784 now_floor = mn_now;
731 rtmn_diff = rt_now - mn_now; 785 rtmn_diff = ev_rt_now - mn_now;
732 786
733 if (methods == EVMETHOD_AUTO) 787 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
734 if (!enable_secure () && getenv ("LIBEV_METHODS"))
735 methods = atoi (getenv ("LIBEV_METHODS")); 788 flags = atoi (getenv ("LIBEV_FLAGS"));
736 else 789
737 methods = EVMETHOD_ANY; 790 if (!(flags & 0x0000ffff))
791 flags |= 0x0000ffff;
738 792
739 method = 0; 793 method = 0;
740#if EV_USE_WIN32 794#if EV_USE_PORT
741 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 795 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
742#endif 796#endif
743#if EV_USE_KQUEUE 797#if EV_USE_KQUEUE
744 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 798 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
745#endif 799#endif
746#if EV_USE_EPOLL 800#if EV_USE_EPOLL
747 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 801 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
748#endif 802#endif
749#if EV_USE_POLL 803#if EV_USE_POLL
750 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 804 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
751#endif 805#endif
752#if EV_USE_SELECT 806#if EV_USE_SELECT
753 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 807 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
754#endif 808#endif
755 809
756 ev_watcher_init (&sigev, sigcb); 810 ev_init (&sigev, sigcb);
757 ev_set_priority (&sigev, EV_MAXPRI); 811 ev_set_priority (&sigev, EV_MAXPRI);
758 } 812 }
759} 813}
760 814
761void 815void
762loop_destroy (EV_P) 816loop_destroy (EV_P)
763{ 817{
764 int i; 818 int i;
765 819
766#if EV_USE_WIN32 820#if EV_USE_PORT
767 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 821 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
768#endif 822#endif
769#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
770 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 824 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
771#endif 825#endif
772#if EV_USE_EPOLL 826#if EV_USE_EPOLL
… …
781 835
782 for (i = NUMPRI; i--; ) 836 for (i = NUMPRI; i--; )
783 array_free (pending, [i]); 837 array_free (pending, [i]);
784 838
785 /* have to use the microsoft-never-gets-it-right macro */ 839 /* have to use the microsoft-never-gets-it-right macro */
786 array_free_microshit (fdchange); 840 array_free (fdchange, EMPTY0);
787 array_free_microshit (timer); 841 array_free (timer, EMPTY0);
788 array_free_microshit (periodic); 842#if EV_PERIODICS
789 array_free_microshit (idle); 843 array_free (periodic, EMPTY0);
790 array_free_microshit (prepare); 844#endif
791 array_free_microshit (check); 845 array_free (idle, EMPTY0);
846 array_free (prepare, EMPTY0);
847 array_free (check, EMPTY0);
792 848
793 method = 0; 849 method = 0;
794} 850}
795 851
796static void 852static void
797loop_fork (EV_P) 853loop_fork (EV_P)
798{ 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
799#if EV_USE_EPOLL 861#if EV_USE_EPOLL
800 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 862 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 863#endif
805 864
806 if (ev_is_active (&sigev)) 865 if (ev_is_active (&sigev))
807 { 866 {
808 /* default loop */ 867 /* default loop */
… …
821 postfork = 0; 880 postfork = 0;
822} 881}
823 882
824#if EV_MULTIPLICITY 883#if EV_MULTIPLICITY
825struct ev_loop * 884struct ev_loop *
826ev_loop_new (int methods) 885ev_loop_new (unsigned int flags)
827{ 886{
828 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));
829 888
830 memset (loop, 0, sizeof (struct ev_loop)); 889 memset (loop, 0, sizeof (struct ev_loop));
831 890
832 loop_init (EV_A_ methods); 891 loop_init (EV_A_ flags);
833 892
834 if (ev_method (EV_A)) 893 if (ev_method (EV_A))
835 return loop; 894 return loop;
836 895
837 return 0; 896 return 0;
… …
852 911
853#endif 912#endif
854 913
855#if EV_MULTIPLICITY 914#if EV_MULTIPLICITY
856struct ev_loop * 915struct ev_loop *
916ev_default_loop_ (unsigned int flags)
857#else 917#else
858int 918int
919ev_default_loop (unsigned int flags)
859#endif 920#endif
860ev_default_loop (int methods)
861{ 921{
862 if (sigpipe [0] == sigpipe [1]) 922 if (sigpipe [0] == sigpipe [1])
863 if (pipe (sigpipe)) 923 if (pipe (sigpipe))
864 return 0; 924 return 0;
865 925
866 if (!default_loop) 926 if (!ev_default_loop_ptr)
867 { 927 {
868#if EV_MULTIPLICITY 928#if EV_MULTIPLICITY
869 struct ev_loop *loop = default_loop = &default_loop_struct; 929 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
870#else 930#else
871 default_loop = 1; 931 ev_default_loop_ptr = 1;
872#endif 932#endif
873 933
874 loop_init (EV_A_ methods); 934 loop_init (EV_A_ flags);
875 935
876 if (ev_method (EV_A)) 936 if (ev_method (EV_A))
877 { 937 {
878 siginit (EV_A); 938 siginit (EV_A);
879 939
880#ifndef WIN32 940#ifndef _WIN32
881 ev_signal_init (&childev, childcb, SIGCHLD); 941 ev_signal_init (&childev, childcb, SIGCHLD);
882 ev_set_priority (&childev, EV_MAXPRI); 942 ev_set_priority (&childev, EV_MAXPRI);
883 ev_signal_start (EV_A_ &childev); 943 ev_signal_start (EV_A_ &childev);
884 ev_unref (EV_A); /* child watcher should not keep loop alive */ 944 ev_unref (EV_A); /* child watcher should not keep loop alive */
885#endif 945#endif
886 } 946 }
887 else 947 else
888 default_loop = 0; 948 ev_default_loop_ptr = 0;
889 } 949 }
890 950
891 return default_loop; 951 return ev_default_loop_ptr;
892} 952}
893 953
894void 954void
895ev_default_destroy (void) 955ev_default_destroy (void)
896{ 956{
897#if EV_MULTIPLICITY 957#if EV_MULTIPLICITY
898 struct ev_loop *loop = default_loop; 958 struct ev_loop *loop = ev_default_loop_ptr;
899#endif 959#endif
900 960
901#ifndef WIN32 961#ifndef _WIN32
902 ev_ref (EV_A); /* child watcher */ 962 ev_ref (EV_A); /* child watcher */
903 ev_signal_stop (EV_A_ &childev); 963 ev_signal_stop (EV_A_ &childev);
904#endif 964#endif
905 965
906 ev_ref (EV_A); /* signal watcher */ 966 ev_ref (EV_A); /* signal watcher */
… …
914 974
915void 975void
916ev_default_fork (void) 976ev_default_fork (void)
917{ 977{
918#if EV_MULTIPLICITY 978#if EV_MULTIPLICITY
919 struct ev_loop *loop = default_loop; 979 struct ev_loop *loop = ev_default_loop_ptr;
920#endif 980#endif
921 981
922 if (method) 982 if (method)
923 postfork = 1; 983 postfork = 1;
924} 984}
… …
948 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1008 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
949 1009
950 if (p->w) 1010 if (p->w)
951 { 1011 {
952 p->w->pending = 0; 1012 p->w->pending = 0;
953 p->w->cb (EV_A_ p->w, p->events); 1013 EV_CB_INVOKE (p->w, p->events);
954 } 1014 }
955 } 1015 }
956} 1016}
957 1017
958static void 1018static void
… …
966 1026
967 /* first reschedule or stop timer */ 1027 /* first reschedule or stop timer */
968 if (w->repeat) 1028 if (w->repeat)
969 { 1029 {
970 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
971 ((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
972 downheap ((WT *)timers, timercnt, 0); 1036 downheap ((WT *)timers, timercnt, 0);
973 } 1037 }
974 else 1038 else
975 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1039 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
976 1040
977 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1041 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
978 } 1042 }
979} 1043}
980 1044
1045#if EV_PERIODICS
981static void 1046static void
982periodics_reify (EV_P) 1047periodics_reify (EV_P)
983{ 1048{
984 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1049 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
985 { 1050 {
986 struct ev_periodic *w = periodics [0]; 1051 struct ev_periodic *w = periodics [0];
987 1052
988 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1053 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
989 1054
990 /* first reschedule or stop timer */ 1055 /* first reschedule or stop timer */
991 if (w->reschedule_cb) 1056 if (w->reschedule_cb)
992 { 1057 {
993 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);
994
995 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));
996 downheap ((WT *)periodics, periodiccnt, 0); 1060 downheap ((WT *)periodics, periodiccnt, 0);
997 } 1061 }
998 else if (w->interval) 1062 else if (w->interval)
999 { 1063 {
1000 ((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;
1001 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));
1002 downheap ((WT *)periodics, periodiccnt, 0); 1066 downheap ((WT *)periodics, periodiccnt, 0);
1003 } 1067 }
1004 else 1068 else
1005 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1069 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1006 1070
… …
1017 for (i = 0; i < periodiccnt; ++i) 1081 for (i = 0; i < periodiccnt; ++i)
1018 { 1082 {
1019 struct ev_periodic *w = periodics [i]; 1083 struct ev_periodic *w = periodics [i];
1020 1084
1021 if (w->reschedule_cb) 1085 if (w->reschedule_cb)
1022 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1086 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1023 else if (w->interval) 1087 else if (w->interval)
1024 ((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;
1025 } 1089 }
1026 1090
1027 /* now rebuild the heap */ 1091 /* now rebuild the heap */
1028 for (i = periodiccnt >> 1; i--; ) 1092 for (i = periodiccnt >> 1; i--; )
1029 downheap ((WT *)periodics, periodiccnt, i); 1093 downheap ((WT *)periodics, periodiccnt, i);
1030} 1094}
1095#endif
1031 1096
1032inline int 1097inline int
1033time_update_monotonic (EV_P) 1098time_update_monotonic (EV_P)
1034{ 1099{
1035 mn_now = get_clock (); 1100 mn_now = get_clock ();
1036 1101
1037 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1102 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1038 { 1103 {
1039 rt_now = rtmn_diff + mn_now; 1104 ev_rt_now = rtmn_diff + mn_now;
1040 return 0; 1105 return 0;
1041 } 1106 }
1042 else 1107 else
1043 { 1108 {
1044 now_floor = mn_now; 1109 now_floor = mn_now;
1045 rt_now = ev_time (); 1110 ev_rt_now = ev_time ();
1046 return 1; 1111 return 1;
1047 } 1112 }
1048} 1113}
1049 1114
1050static void 1115static void
… …
1059 { 1124 {
1060 ev_tstamp odiff = rtmn_diff; 1125 ev_tstamp odiff = rtmn_diff;
1061 1126
1062 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 */
1063 { 1128 {
1064 rtmn_diff = rt_now - mn_now; 1129 rtmn_diff = ev_rt_now - mn_now;
1065 1130
1066 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1131 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1067 return; /* all is well */ 1132 return; /* all is well */
1068 1133
1069 rt_now = ev_time (); 1134 ev_rt_now = ev_time ();
1070 mn_now = get_clock (); 1135 mn_now = get_clock ();
1071 now_floor = mn_now; 1136 now_floor = mn_now;
1072 } 1137 }
1073 1138
1139# if EV_PERIODICS
1074 periodics_reschedule (EV_A); 1140 periodics_reschedule (EV_A);
1141# endif
1075 /* no timer adjustment, as the monotonic clock doesn't jump */ 1142 /* no timer adjustment, as the monotonic clock doesn't jump */
1076 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1143 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1077 } 1144 }
1078 } 1145 }
1079 else 1146 else
1080#endif 1147#endif
1081 { 1148 {
1082 rt_now = ev_time (); 1149 ev_rt_now = ev_time ();
1083 1150
1084 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))
1085 { 1152 {
1153#if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1154 periodics_reschedule (EV_A);
1155#endif
1087 1156
1088 /* 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 */
1089 for (i = 0; i < timercnt; ++i) 1158 for (i = 0; i < timercnt; ++i)
1090 ((WT)timers [i])->at += rt_now - mn_now; 1159 ((WT)timers [i])->at += ev_rt_now - mn_now;
1091 } 1160 }
1092 1161
1093 mn_now = rt_now; 1162 mn_now = ev_rt_now;
1094 } 1163 }
1095} 1164}
1096 1165
1097void 1166void
1098ev_ref (EV_P) 1167ev_ref (EV_P)
… …
1112ev_loop (EV_P_ int flags) 1181ev_loop (EV_P_ int flags)
1113{ 1182{
1114 double block; 1183 double block;
1115 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1184 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1116 1185
1117 do 1186 while (activecnt)
1118 { 1187 {
1119 /* queue check watchers (and execute them) */ 1188 /* queue check watchers (and execute them) */
1120 if (expect_false (preparecnt)) 1189 if (expect_false (preparecnt))
1121 { 1190 {
1122 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1191 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1138 if (expect_true (have_monotonic)) 1207 if (expect_true (have_monotonic))
1139 time_update_monotonic (EV_A); 1208 time_update_monotonic (EV_A);
1140 else 1209 else
1141#endif 1210#endif
1142 { 1211 {
1143 rt_now = ev_time (); 1212 ev_rt_now = ev_time ();
1144 mn_now = rt_now; 1213 mn_now = ev_rt_now;
1145 } 1214 }
1146 1215
1147 if (flags & EVLOOP_NONBLOCK || idlecnt) 1216 if (flags & EVLOOP_NONBLOCK || idlecnt)
1148 block = 0.; 1217 block = 0.;
1149 else 1218 else
… …
1154 { 1223 {
1155 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1224 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1156 if (block > to) block = to; 1225 if (block > to) block = to;
1157 } 1226 }
1158 1227
1228#if EV_PERIODICS
1159 if (periodiccnt) 1229 if (periodiccnt)
1160 { 1230 {
1161 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1231 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1162 if (block > to) block = to; 1232 if (block > to) block = to;
1163 } 1233 }
1234#endif
1164 1235
1165 if (block < 0.) block = 0.; 1236 if (block < 0.) block = 0.;
1166 } 1237 }
1167 1238
1168 method_poll (EV_A_ block); 1239 method_poll (EV_A_ block);
1169 1240
1170 /* update rt_now, do magic */ 1241 /* update ev_rt_now, do magic */
1171 time_update (EV_A); 1242 time_update (EV_A);
1172 1243
1173 /* queue pending timers and reschedule them */ 1244 /* queue pending timers and reschedule them */
1174 timers_reify (EV_A); /* relative timers called last */ 1245 timers_reify (EV_A); /* relative timers called last */
1246#if EV_PERIODICS
1175 periodics_reify (EV_A); /* absolute timers called first */ 1247 periodics_reify (EV_A); /* absolute timers called first */
1248#endif
1176 1249
1177 /* queue idle watchers unless io or timers are pending */ 1250 /* queue idle watchers unless io or timers are pending */
1178 if (idlecnt && !any_pending (EV_A)) 1251 if (idlecnt && !any_pending (EV_A))
1179 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1252 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1180 1253
1181 /* queue check watchers, to be executed first */ 1254 /* queue check watchers, to be executed first */
1182 if (checkcnt) 1255 if (checkcnt)
1183 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1256 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1184 1257
1185 call_pending (EV_A); 1258 call_pending (EV_A);
1259
1260 if (loop_done)
1261 break;
1186 } 1262 }
1187 while (activecnt && !loop_done);
1188 1263
1189 if (loop_done != 2) 1264 if (loop_done != 2)
1190 loop_done = 0; 1265 loop_done = 0;
1191} 1266}
1192 1267
… …
1271{ 1346{
1272 ev_clear_pending (EV_A_ (W)w); 1347 ev_clear_pending (EV_A_ (W)w);
1273 if (!ev_is_active (w)) 1348 if (!ev_is_active (w))
1274 return; 1349 return;
1275 1350
1351 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1352
1276 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1353 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1277 ev_stop (EV_A_ (W)w); 1354 ev_stop (EV_A_ (W)w);
1278 1355
1279 fd_change (EV_A_ w->fd); 1356 fd_change (EV_A_ w->fd);
1280} 1357}
… …
1288 ((WT)w)->at += mn_now; 1365 ((WT)w)->at += mn_now;
1289 1366
1290 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.));
1291 1368
1292 ev_start (EV_A_ (W)w, ++timercnt); 1369 ev_start (EV_A_ (W)w, ++timercnt);
1293 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1370 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1294 timers [timercnt - 1] = w; 1371 timers [timercnt - 1] = w;
1295 upheap ((WT *)timers, timercnt - 1); 1372 upheap ((WT *)timers, timercnt - 1);
1296 1373
1297 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1374 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1298} 1375}
… …
1307 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1384 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1308 1385
1309 if (((W)w)->active < timercnt--) 1386 if (((W)w)->active < timercnt--)
1310 { 1387 {
1311 timers [((W)w)->active - 1] = timers [timercnt]; 1388 timers [((W)w)->active - 1] = timers [timercnt];
1312 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1389 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1313 } 1390 }
1314 1391
1315 ((WT)w)->at = w->repeat; 1392 ((WT)w)->at -= mn_now;
1316 1393
1317 ev_stop (EV_A_ (W)w); 1394 ev_stop (EV_A_ (W)w);
1318} 1395}
1319 1396
1320void 1397void
… …
1323 if (ev_is_active (w)) 1400 if (ev_is_active (w))
1324 { 1401 {
1325 if (w->repeat) 1402 if (w->repeat)
1326 { 1403 {
1327 ((WT)w)->at = mn_now + w->repeat; 1404 ((WT)w)->at = mn_now + w->repeat;
1328 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1405 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1329 } 1406 }
1330 else 1407 else
1331 ev_timer_stop (EV_A_ w); 1408 ev_timer_stop (EV_A_ w);
1332 } 1409 }
1333 else if (w->repeat) 1410 else if (w->repeat)
1411 {
1412 w->at = w->repeat;
1334 ev_timer_start (EV_A_ w); 1413 ev_timer_start (EV_A_ w);
1414 }
1335} 1415}
1336 1416
1417#if EV_PERIODICS
1337void 1418void
1338ev_periodic_start (EV_P_ struct ev_periodic *w) 1419ev_periodic_start (EV_P_ struct ev_periodic *w)
1339{ 1420{
1340 if (ev_is_active (w)) 1421 if (ev_is_active (w))
1341 return; 1422 return;
1342 1423
1343 if (w->reschedule_cb) 1424 if (w->reschedule_cb)
1344 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1425 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1345 else if (w->interval) 1426 else if (w->interval)
1346 { 1427 {
1347 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.));
1348 /* 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 */
1349 ((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;
1350 } 1431 }
1351 1432
1352 ev_start (EV_A_ (W)w, ++periodiccnt); 1433 ev_start (EV_A_ (W)w, ++periodiccnt);
1353 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1434 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1354 periodics [periodiccnt - 1] = w; 1435 periodics [periodiccnt - 1] = w;
1355 upheap ((WT *)periodics, periodiccnt - 1); 1436 upheap ((WT *)periodics, periodiccnt - 1);
1356 1437
1357 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1438 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1358} 1439}
… …
1367 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1448 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1368 1449
1369 if (((W)w)->active < periodiccnt--) 1450 if (((W)w)->active < periodiccnt--)
1370 { 1451 {
1371 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1452 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1372 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1453 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1373 } 1454 }
1374 1455
1375 ev_stop (EV_A_ (W)w); 1456 ev_stop (EV_A_ (W)w);
1376} 1457}
1377 1458
1378void 1459void
1379ev_periodic_again (EV_P_ struct ev_periodic *w) 1460ev_periodic_again (EV_P_ struct ev_periodic *w)
1380{ 1461{
1462 /* TODO: use adjustheap and recalculation */
1381 ev_periodic_stop (EV_A_ w); 1463 ev_periodic_stop (EV_A_ w);
1382 ev_periodic_start (EV_A_ w); 1464 ev_periodic_start (EV_A_ w);
1383} 1465}
1466#endif
1384 1467
1385void 1468void
1386ev_idle_start (EV_P_ struct ev_idle *w) 1469ev_idle_start (EV_P_ struct ev_idle *w)
1387{ 1470{
1388 if (ev_is_active (w)) 1471 if (ev_is_active (w))
1389 return; 1472 return;
1390 1473
1391 ev_start (EV_A_ (W)w, ++idlecnt); 1474 ev_start (EV_A_ (W)w, ++idlecnt);
1392 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1475 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1393 idles [idlecnt - 1] = w; 1476 idles [idlecnt - 1] = w;
1394} 1477}
1395 1478
1396void 1479void
1397ev_idle_stop (EV_P_ struct ev_idle *w) 1480ev_idle_stop (EV_P_ struct ev_idle *w)
1398{ 1481{
1399 ev_clear_pending (EV_A_ (W)w); 1482 ev_clear_pending (EV_A_ (W)w);
1400 if (ev_is_active (w)) 1483 if (!ev_is_active (w))
1401 return; 1484 return;
1402 1485
1403 idles [((W)w)->active - 1] = idles [--idlecnt]; 1486 idles [((W)w)->active - 1] = idles [--idlecnt];
1404 ev_stop (EV_A_ (W)w); 1487 ev_stop (EV_A_ (W)w);
1405} 1488}
… …
1409{ 1492{
1410 if (ev_is_active (w)) 1493 if (ev_is_active (w))
1411 return; 1494 return;
1412 1495
1413 ev_start (EV_A_ (W)w, ++preparecnt); 1496 ev_start (EV_A_ (W)w, ++preparecnt);
1414 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1497 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1415 prepares [preparecnt - 1] = w; 1498 prepares [preparecnt - 1] = w;
1416} 1499}
1417 1500
1418void 1501void
1419ev_prepare_stop (EV_P_ struct ev_prepare *w) 1502ev_prepare_stop (EV_P_ struct ev_prepare *w)
1420{ 1503{
1421 ev_clear_pending (EV_A_ (W)w); 1504 ev_clear_pending (EV_A_ (W)w);
1422 if (ev_is_active (w)) 1505 if (!ev_is_active (w))
1423 return; 1506 return;
1424 1507
1425 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1508 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1426 ev_stop (EV_A_ (W)w); 1509 ev_stop (EV_A_ (W)w);
1427} 1510}
… …
1431{ 1514{
1432 if (ev_is_active (w)) 1515 if (ev_is_active (w))
1433 return; 1516 return;
1434 1517
1435 ev_start (EV_A_ (W)w, ++checkcnt); 1518 ev_start (EV_A_ (W)w, ++checkcnt);
1436 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1519 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1437 checks [checkcnt - 1] = w; 1520 checks [checkcnt - 1] = w;
1438} 1521}
1439 1522
1440void 1523void
1441ev_check_stop (EV_P_ struct ev_check *w) 1524ev_check_stop (EV_P_ struct ev_check *w)
1442{ 1525{
1443 ev_clear_pending (EV_A_ (W)w); 1526 ev_clear_pending (EV_A_ (W)w);
1444 if (ev_is_active (w)) 1527 if (!ev_is_active (w))
1445 return; 1528 return;
1446 1529
1447 checks [((W)w)->active - 1] = checks [--checkcnt]; 1530 checks [((W)w)->active - 1] = checks [--checkcnt];
1448 ev_stop (EV_A_ (W)w); 1531 ev_stop (EV_A_ (W)w);
1449} 1532}
… …
1454 1537
1455void 1538void
1456ev_signal_start (EV_P_ struct ev_signal *w) 1539ev_signal_start (EV_P_ struct ev_signal *w)
1457{ 1540{
1458#if EV_MULTIPLICITY 1541#if EV_MULTIPLICITY
1459 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));
1460#endif 1543#endif
1461 if (ev_is_active (w)) 1544 if (ev_is_active (w))
1462 return; 1545 return;
1463 1546
1464 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));
… …
1467 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1550 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1468 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1551 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1469 1552
1470 if (!((WL)w)->next) 1553 if (!((WL)w)->next)
1471 { 1554 {
1472#if WIN32 1555#if _WIN32
1473 signal (w->signum, sighandler); 1556 signal (w->signum, sighandler);
1474#else 1557#else
1475 struct sigaction sa; 1558 struct sigaction sa;
1476 sa.sa_handler = sighandler; 1559 sa.sa_handler = sighandler;
1477 sigfillset (&sa.sa_mask); 1560 sigfillset (&sa.sa_mask);
… …
1497 1580
1498void 1581void
1499ev_child_start (EV_P_ struct ev_child *w) 1582ev_child_start (EV_P_ struct ev_child *w)
1500{ 1583{
1501#if EV_MULTIPLICITY 1584#if EV_MULTIPLICITY
1502 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));
1503#endif 1586#endif
1504 if (ev_is_active (w)) 1587 if (ev_is_active (w))
1505 return; 1588 return;
1506 1589
1507 ev_start (EV_A_ (W)w, 1); 1590 ev_start (EV_A_ (W)w, 1);
… …
1510 1593
1511void 1594void
1512ev_child_stop (EV_P_ struct ev_child *w) 1595ev_child_stop (EV_P_ struct ev_child *w)
1513{ 1596{
1514 ev_clear_pending (EV_A_ (W)w); 1597 ev_clear_pending (EV_A_ (W)w);
1515 if (ev_is_active (w)) 1598 if (!ev_is_active (w))
1516 return; 1599 return;
1517 1600
1518 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1601 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1519 ev_stop (EV_A_ (W)w); 1602 ev_stop (EV_A_ (W)w);
1520} 1603}
… …
1564 else 1647 else
1565 { 1648 {
1566 once->cb = cb; 1649 once->cb = cb;
1567 once->arg = arg; 1650 once->arg = arg;
1568 1651
1569 ev_watcher_init (&once->io, once_cb_io); 1652 ev_init (&once->io, once_cb_io);
1570 if (fd >= 0) 1653 if (fd >= 0)
1571 { 1654 {
1572 ev_io_set (&once->io, fd, events); 1655 ev_io_set (&once->io, fd, events);
1573 ev_io_start (EV_A_ &once->io); 1656 ev_io_start (EV_A_ &once->io);
1574 } 1657 }
1575 1658
1576 ev_watcher_init (&once->to, once_cb_to); 1659 ev_init (&once->to, once_cb_to);
1577 if (timeout >= 0.) 1660 if (timeout >= 0.)
1578 { 1661 {
1579 ev_timer_set (&once->to, timeout, 0.); 1662 ev_timer_set (&once->to, timeout, 0.);
1580 ev_timer_start (EV_A_ &once->to); 1663 ev_timer_start (EV_A_ &once->to);
1581 } 1664 }
1582 } 1665 }
1583} 1666}
1584 1667
1668#ifdef __cplusplus
1669}
1670#endif
1671

Diff Legend

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