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

Comparing libev/ev.c (file contents):
Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC vs.
Revision 1.127 by root, Sun Nov 18 02:17:57 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
46# else
47# ifndef EV_USE_MONOTONIC
48# define EV_USE_MONOTONIC 0
49# endif
50# ifndef EV_USE_REALTIME
51# define EV_USE_REALTIME 0
52# endif
37# endif 53# endif
38 54
55# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 56# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 57# define EV_USE_SELECT 1
58# else
59# define EV_USE_SELECT 0
60# endif
41# endif 61# endif
42 62
63# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 64# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 65# define EV_USE_POLL 1
66# else
67# define EV_USE_POLL 0
68# endif
45# endif 69# endif
46 70
71# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 72# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 73# define EV_USE_EPOLL 1
74# else
75# define EV_USE_EPOLL 0
76# endif
49# endif 77# endif
50 78
79# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 80# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 81# define EV_USE_KQUEUE 1
82# else
83# define EV_USE_KQUEUE 0
84# endif
85# endif
86
87# ifndef EV_USE_PORT
88# if HAVE_PORT_H && HAVE_PORT_CREATE
89# define EV_USE_PORT 1
90# else
91# define EV_USE_PORT 0
92# endif
53# endif 93# endif
54 94
55#endif 95#endif
56 96
57#include <math.h> 97#include <math.h>
66#include <sys/types.h> 106#include <sys/types.h>
67#include <time.h> 107#include <time.h>
68 108
69#include <signal.h> 109#include <signal.h>
70 110
71#ifndef WIN32 111#ifndef _WIN32
72# include <unistd.h> 112# include <unistd.h>
73# include <sys/time.h> 113# include <sys/time.h>
74# include <sys/wait.h> 114# include <sys/wait.h>
115#else
116# define WIN32_LEAN_AND_MEAN
117# include <windows.h>
118# ifndef EV_SELECT_IS_WINSOCKET
119# define EV_SELECT_IS_WINSOCKET 1
75#endif 120# endif
121#endif
122
76/**/ 123/**/
77 124
78#ifndef EV_USE_MONOTONIC 125#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 126# define EV_USE_MONOTONIC 0
127#endif
128
129#ifndef EV_USE_REALTIME
130# define EV_USE_REALTIME 0
80#endif 131#endif
81 132
82#ifndef EV_USE_SELECT 133#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 134# define EV_USE_SELECT 1
84#endif 135#endif
85 136
86#ifndef EV_USE_POLL 137#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 138# ifdef _WIN32
139# define EV_USE_POLL 0
140# else
141# define EV_USE_POLL 1
142# endif
88#endif 143#endif
89 144
90#ifndef EV_USE_EPOLL 145#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 146# define EV_USE_EPOLL 0
92#endif 147#endif
93 148
94#ifndef EV_USE_KQUEUE 149#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 150# define EV_USE_KQUEUE 0
96#endif 151#endif
97 152
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 153#ifndef EV_USE_PORT
109# define EV_USE_REALTIME 1 154# define EV_USE_PORT 0
110#endif 155#endif
111 156
112/**/ 157/**/
158
159/* darwin simply cannot be helped */
160#ifdef __APPLE__
161# undef EV_USE_POLL
162# undef EV_USE_KQUEUE
163#endif
113 164
114#ifndef CLOCK_MONOTONIC 165#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 166# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 167# define EV_USE_MONOTONIC 0
117#endif 168#endif
119#ifndef CLOCK_REALTIME 170#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 171# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 172# define EV_USE_REALTIME 0
122#endif 173#endif
123 174
175#if EV_SELECT_IS_WINSOCKET
176# include <winsock.h>
177#endif
178
124/**/ 179/**/
125 180
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 181#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) */ 182#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 */ 183#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 */ 184/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
130 185
131#ifdef EV_H 186#ifdef EV_H
132# include EV_H 187# include EV_H
133#else 188#else
134# include "ev.h" 189# include "ev.h"
135#endif 190#endif
136 191
137#if __GNUC__ >= 3 192#if __GNUC__ >= 3
138# define expect(expr,value) __builtin_expect ((expr),(value)) 193# define expect(expr,value) __builtin_expect ((expr),(value))
139# define inline inline 194# define inline static inline
140#else 195#else
141# define expect(expr,value) (expr) 196# define expect(expr,value) (expr)
142# define inline static 197# define inline static
143#endif 198#endif
144 199
146#define expect_true(expr) expect ((expr) != 0, 1) 201#define expect_true(expr) expect ((expr) != 0, 1)
147 202
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 203#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 204#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 205
206#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
207#define EMPTY2(a,b) /* used to suppress some warnings */
208
151typedef struct ev_watcher *W; 209typedef struct ev_watcher *W;
152typedef struct ev_watcher_list *WL; 210typedef struct ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 211typedef struct ev_watcher_time *WT;
154 212
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 213static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 214
215#ifdef _WIN32
157#include "ev_win32.c" 216# include "ev_win32.c"
217#endif
158 218
159/*****************************************************************************/ 219/*****************************************************************************/
160 220
161static void (*syserr_cb)(const char *msg); 221static void (*syserr_cb)(const char *msg);
162 222
209typedef struct 269typedef struct
210{ 270{
211 WL head; 271 WL head;
212 unsigned char events; 272 unsigned char events;
213 unsigned char reify; 273 unsigned char reify;
274#if EV_SELECT_IS_WINSOCKET
275 SOCKET handle;
276#endif
214} ANFD; 277} ANFD;
215 278
216typedef struct 279typedef struct
217{ 280{
218 W w; 281 W w;
221 284
222#if EV_MULTIPLICITY 285#if EV_MULTIPLICITY
223 286
224 struct ev_loop 287 struct ev_loop
225 { 288 {
289 ev_tstamp ev_rt_now;
290 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 291 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 292 #include "ev_vars.h"
228 #undef VAR 293 #undef VAR
229 }; 294 };
230 #include "ev_wrap.h" 295 #include "ev_wrap.h"
231 296
232 struct ev_loop default_loop_struct; 297 static struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 298 struct ev_loop *ev_default_loop_ptr;
234 299
235#else 300#else
236 301
302 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 303 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 304 #include "ev_vars.h"
239 #undef VAR 305 #undef VAR
240 306
241 static int default_loop; 307 static int ev_default_loop_ptr;
242 308
243#endif 309#endif
244 310
245/*****************************************************************************/ 311/*****************************************************************************/
246 312
247inline ev_tstamp 313ev_tstamp
248ev_time (void) 314ev_time (void)
249{ 315{
250#if EV_USE_REALTIME 316#if EV_USE_REALTIME
251 struct timespec ts; 317 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 318 clock_gettime (CLOCK_REALTIME, &ts);
279{ 345{
280 return ev_rt_now; 346 return ev_rt_now;
281} 347}
282#endif 348#endif
283 349
284#define array_roundsize(type,n) ((n) | 4 & ~3) 350#define array_roundsize(type,n) (((n) | 4) & ~3)
285 351
286#define array_needsize(type,base,cur,cnt,init) \ 352#define array_needsize(type,base,cur,cnt,init) \
287 if (expect_false ((cnt) > cur)) \ 353 if (expect_false ((cnt) > cur)) \
288 { \ 354 { \
289 int newcnt = cur; \ 355 int newcnt = cur; \
304 stem ## max = array_roundsize (stem ## cnt >> 1); \ 370 stem ## max = array_roundsize (stem ## cnt >> 1); \
305 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 371 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
306 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 372 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
307 } 373 }
308 374
309/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
310/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
311#define array_free_microshit(stem) \
312 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
313
314#define array_free(stem, idx) \ 375#define array_free(stem, idx) \
315 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 376 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
316 377
317/*****************************************************************************/ 378/*****************************************************************************/
318 379
332void 393void
333ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
334{ 395{
335 W w_ = (W)w; 396 W w_ = (W)w;
336 397
337 if (w_->pending) 398 if (expect_false (w_->pending))
338 { 399 {
339 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
340 return; 401 return;
341 } 402 }
342 403
343 w_->pending = ++pendingcnt [ABSPRI (w_)]; 404 w_->pending = ++pendingcnt [ABSPRI (w_)];
344 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); 405 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
345 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
346 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
347} 408}
348 409
349static void 410static void
376 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
377} 438}
378 439
379/*****************************************************************************/ 440/*****************************************************************************/
380 441
381static void 442inline void
382fd_reify (EV_P) 443fd_reify (EV_P)
383{ 444{
384 int i; 445 int i;
385 446
386 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
392 int events = 0; 453 int events = 0;
393 454
394 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 455 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
395 events |= w->events; 456 events |= w->events;
396 457
458#if EV_SELECT_IS_WINSOCKET
459 if (events)
460 {
461 unsigned long argp;
462 anfd->handle = _get_osfhandle (fd);
463 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
464 }
465#endif
466
397 anfd->reify = 0; 467 anfd->reify = 0;
398 468
399 method_modify (EV_A_ fd, anfd->events, events); 469 method_modify (EV_A_ fd, anfd->events, events);
400 anfd->events = events; 470 anfd->events = events;
401 } 471 }
404} 474}
405 475
406static void 476static void
407fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
408{ 478{
409 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
410 return; 480 return;
411 481
412 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
413 483
414 ++fdchangecnt; 484 ++fdchangecnt;
415 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
416 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
417} 487}
418 488
419static void 489static void
420fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
426 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
427 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 497 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
428 } 498 }
429} 499}
430 500
431static int 501inline int
432fd_valid (int fd) 502fd_valid (int fd)
433{ 503{
434#ifdef WIN32 504#ifdef _WIN32
435 return !!win32_get_osfhandle (fd); 505 return _get_osfhandle (fd) != -1;
436#else 506#else
437 return fcntl (fd, F_GETFD) != -1; 507 return fcntl (fd, F_GETFD) != -1;
438#endif 508#endif
439} 509}
440 510
521 heap [k] = w; 591 heap [k] = w;
522 ((W)heap [k])->active = k + 1; 592 ((W)heap [k])->active = k + 1;
523} 593}
524 594
525inline void 595inline void
526adjustheap (WT *heap, int N, int k, ev_tstamp at) 596adjustheap (WT *heap, int N, int k)
527{ 597{
528 ev_tstamp old_at = heap [k]->at; 598 upheap (heap, k);
529 heap [k]->at = at;
530
531 if (old_at < at)
532 downheap (heap, N, k); 599 downheap (heap, N, k);
533 else
534 upheap (heap, k);
535} 600}
536 601
537/*****************************************************************************/ 602/*****************************************************************************/
538 603
539typedef struct 604typedef struct
562} 627}
563 628
564static void 629static void
565sighandler (int signum) 630sighandler (int signum)
566{ 631{
567#if WIN32 632#if _WIN32
568 signal (signum, sighandler); 633 signal (signum, sighandler);
569#endif 634#endif
570 635
571 signals [signum - 1].gotsig = 1; 636 signals [signum - 1].gotsig = 1;
572 637
573 if (!gotsig) 638 if (!gotsig)
574 { 639 {
575 int old_errno = errno; 640 int old_errno = errno;
576 gotsig = 1; 641 gotsig = 1;
577#ifdef WIN32
578 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
579#else
580 write (sigpipe [1], &signum, 1); 642 write (sigpipe [1], &signum, 1);
581#endif
582 errno = old_errno; 643 errno = old_errno;
583 } 644 }
584} 645}
585 646
586void 647void
587ev_feed_signal_event (EV_P_ int signum) 648ev_feed_signal_event (EV_P_ int signum)
588{ 649{
589 WL w; 650 WL w;
590 651
591#if EV_MULTIPLICITY 652#if EV_MULTIPLICITY
592 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 653 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
593#endif 654#endif
594 655
595 --signum; 656 --signum;
596 657
597 if (signum < 0 || signum >= signalmax) 658 if (signum < 0 || signum >= signalmax)
606static void 667static void
607sigcb (EV_P_ struct ev_io *iow, int revents) 668sigcb (EV_P_ struct ev_io *iow, int revents)
608{ 669{
609 int signum; 670 int signum;
610 671
611#ifdef WIN32
612 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
613#else
614 read (sigpipe [0], &revents, 1); 672 read (sigpipe [0], &revents, 1);
615#endif
616 gotsig = 0; 673 gotsig = 0;
617 674
618 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
619 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
620 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
621} 678}
622 679
623static void 680static void
681fd_intern (int fd)
682{
683#ifdef _WIN32
684 int arg = 1;
685 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
686#else
687 fcntl (fd, F_SETFD, FD_CLOEXEC);
688 fcntl (fd, F_SETFL, O_NONBLOCK);
689#endif
690}
691
692static void
624siginit (EV_P) 693siginit (EV_P)
625{ 694{
626#ifndef WIN32 695 fd_intern (sigpipe [0]);
627 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 696 fd_intern (sigpipe [1]);
628 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
629
630 /* rather than sort out wether we really need nb, set it */
631 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
632 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
633#endif
634 697
635 ev_io_set (&sigev, sigpipe [0], EV_READ); 698 ev_io_set (&sigev, sigpipe [0], EV_READ);
636 ev_io_start (EV_A_ &sigev); 699 ev_io_start (EV_A_ &sigev);
637 ev_unref (EV_A); /* child watcher should not keep loop alive */ 700 ev_unref (EV_A); /* child watcher should not keep loop alive */
638} 701}
639 702
640/*****************************************************************************/ 703/*****************************************************************************/
641 704
642static struct ev_child *childs [PID_HASHSIZE]; 705static struct ev_child *childs [PID_HASHSIZE];
643 706
644#ifndef WIN32 707#ifndef _WIN32
645 708
646static struct ev_signal childev; 709static struct ev_signal childev;
647 710
648#ifndef WCONTINUED 711#ifndef WCONTINUED
649# define WCONTINUED 0 712# define WCONTINUED 0
681 744
682#endif 745#endif
683 746
684/*****************************************************************************/ 747/*****************************************************************************/
685 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
686#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
687# include "ev_kqueue.c" 753# include "ev_kqueue.c"
688#endif 754#endif
689#if EV_USE_EPOLL 755#if EV_USE_EPOLL
690# include "ev_epoll.c" 756# include "ev_epoll.c"
710 776
711/* return true if we are running with elevated privileges and should ignore env variables */ 777/* return true if we are running with elevated privileges and should ignore env variables */
712static int 778static int
713enable_secure (void) 779enable_secure (void)
714{ 780{
715#ifdef WIN32 781#ifdef _WIN32
716 return 0; 782 return 0;
717#else 783#else
718 return getuid () != geteuid () 784 return getuid () != geteuid ()
719 || getgid () != getegid (); 785 || getgid () != getegid ();
720#endif 786#endif
721} 787}
722 788
723int 789unsigned int
724ev_method (EV_P) 790ev_method (EV_P)
725{ 791{
726 return method; 792 return method;
727} 793}
728 794
729static void 795static void
730loop_init (EV_P_ int methods) 796loop_init (EV_P_ unsigned int flags)
731{ 797{
732 if (!method) 798 if (!method)
733 { 799 {
734#if EV_USE_MONOTONIC 800#if EV_USE_MONOTONIC
735 { 801 {
742 ev_rt_now = ev_time (); 808 ev_rt_now = ev_time ();
743 mn_now = get_clock (); 809 mn_now = get_clock ();
744 now_floor = mn_now; 810 now_floor = mn_now;
745 rtmn_diff = ev_rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
746 812
747 if (methods == EVMETHOD_AUTO) 813 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
748 if (!enable_secure () && getenv ("LIBEV_METHODS"))
749 methods = atoi (getenv ("LIBEV_METHODS")); 814 flags = atoi (getenv ("LIBEV_FLAGS"));
750 else 815
751 methods = EVMETHOD_ANY; 816 if (!(flags & 0x0000ffff))
817 flags |= 0x0000ffff;
752 818
753 method = 0; 819 method = 0;
754#if EV_USE_WIN32 820#if EV_USE_PORT
755 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 821 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
756#endif 822#endif
757#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
758 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 824 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
759#endif 825#endif
760#if EV_USE_EPOLL 826#if EV_USE_EPOLL
761 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 827 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
762#endif 828#endif
763#if EV_USE_POLL 829#if EV_USE_POLL
764 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 830 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
765#endif 831#endif
766#if EV_USE_SELECT 832#if EV_USE_SELECT
767 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
768#endif 834#endif
769 835
770 ev_init (&sigev, sigcb); 836 ev_init (&sigev, sigcb);
771 ev_set_priority (&sigev, EV_MAXPRI); 837 ev_set_priority (&sigev, EV_MAXPRI);
772 } 838 }
773} 839}
774 840
775void 841static void
776loop_destroy (EV_P) 842loop_destroy (EV_P)
777{ 843{
778 int i; 844 int i;
779 845
780#if EV_USE_WIN32 846#if EV_USE_PORT
781 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 847 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
782#endif 848#endif
783#if EV_USE_KQUEUE 849#if EV_USE_KQUEUE
784 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 850 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
785#endif 851#endif
786#if EV_USE_EPOLL 852#if EV_USE_EPOLL
795 861
796 for (i = NUMPRI; i--; ) 862 for (i = NUMPRI; i--; )
797 array_free (pending, [i]); 863 array_free (pending, [i]);
798 864
799 /* have to use the microsoft-never-gets-it-right macro */ 865 /* have to use the microsoft-never-gets-it-right macro */
800 array_free_microshit (fdchange); 866 array_free (fdchange, EMPTY0);
801 array_free_microshit (timer); 867 array_free (timer, EMPTY0);
802 array_free_microshit (periodic); 868#if EV_PERIODICS
803 array_free_microshit (idle); 869 array_free (periodic, EMPTY0);
804 array_free_microshit (prepare); 870#endif
805 array_free_microshit (check); 871 array_free (idle, EMPTY0);
872 array_free (prepare, EMPTY0);
873 array_free (check, EMPTY0);
806 874
807 method = 0; 875 method = 0;
808} 876}
809 877
810static void 878static void
811loop_fork (EV_P) 879loop_fork (EV_P)
812{ 880{
881#if EV_USE_PORT
882 if (method == EVMETHOD_PORT ) port_fork (EV_A);
883#endif
884#if EV_USE_KQUEUE
885 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
886#endif
813#if EV_USE_EPOLL 887#if EV_USE_EPOLL
814 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 888 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
815#endif
816#if EV_USE_KQUEUE
817 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
818#endif 889#endif
819 890
820 if (ev_is_active (&sigev)) 891 if (ev_is_active (&sigev))
821 { 892 {
822 /* default loop */ 893 /* default loop */
835 postfork = 0; 906 postfork = 0;
836} 907}
837 908
838#if EV_MULTIPLICITY 909#if EV_MULTIPLICITY
839struct ev_loop * 910struct ev_loop *
840ev_loop_new (int methods) 911ev_loop_new (unsigned int flags)
841{ 912{
842 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 913 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
843 914
844 memset (loop, 0, sizeof (struct ev_loop)); 915 memset (loop, 0, sizeof (struct ev_loop));
845 916
846 loop_init (EV_A_ methods); 917 loop_init (EV_A_ flags);
847 918
848 if (ev_method (EV_A)) 919 if (ev_method (EV_A))
849 return loop; 920 return loop;
850 921
851 return 0; 922 return 0;
866 937
867#endif 938#endif
868 939
869#if EV_MULTIPLICITY 940#if EV_MULTIPLICITY
870struct ev_loop * 941struct ev_loop *
942ev_default_loop_init (unsigned int flags)
871#else 943#else
872int 944int
945ev_default_loop (unsigned int flags)
873#endif 946#endif
874ev_default_loop (int methods)
875{ 947{
876 if (sigpipe [0] == sigpipe [1]) 948 if (sigpipe [0] == sigpipe [1])
877 if (pipe (sigpipe)) 949 if (pipe (sigpipe))
878 return 0; 950 return 0;
879 951
880 if (!default_loop) 952 if (!ev_default_loop_ptr)
881 { 953 {
882#if EV_MULTIPLICITY 954#if EV_MULTIPLICITY
883 struct ev_loop *loop = default_loop = &default_loop_struct; 955 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
884#else 956#else
885 default_loop = 1; 957 ev_default_loop_ptr = 1;
886#endif 958#endif
887 959
888 loop_init (EV_A_ methods); 960 loop_init (EV_A_ flags);
889 961
890 if (ev_method (EV_A)) 962 if (ev_method (EV_A))
891 { 963 {
892 siginit (EV_A); 964 siginit (EV_A);
893 965
894#ifndef WIN32 966#ifndef _WIN32
895 ev_signal_init (&childev, childcb, SIGCHLD); 967 ev_signal_init (&childev, childcb, SIGCHLD);
896 ev_set_priority (&childev, EV_MAXPRI); 968 ev_set_priority (&childev, EV_MAXPRI);
897 ev_signal_start (EV_A_ &childev); 969 ev_signal_start (EV_A_ &childev);
898 ev_unref (EV_A); /* child watcher should not keep loop alive */ 970 ev_unref (EV_A); /* child watcher should not keep loop alive */
899#endif 971#endif
900 } 972 }
901 else 973 else
902 default_loop = 0; 974 ev_default_loop_ptr = 0;
903 } 975 }
904 976
905 return default_loop; 977 return ev_default_loop_ptr;
906} 978}
907 979
908void 980void
909ev_default_destroy (void) 981ev_default_destroy (void)
910{ 982{
911#if EV_MULTIPLICITY 983#if EV_MULTIPLICITY
912 struct ev_loop *loop = default_loop; 984 struct ev_loop *loop = ev_default_loop_ptr;
913#endif 985#endif
914 986
915#ifndef WIN32 987#ifndef _WIN32
916 ev_ref (EV_A); /* child watcher */ 988 ev_ref (EV_A); /* child watcher */
917 ev_signal_stop (EV_A_ &childev); 989 ev_signal_stop (EV_A_ &childev);
918#endif 990#endif
919 991
920 ev_ref (EV_A); /* signal watcher */ 992 ev_ref (EV_A); /* signal watcher */
928 1000
929void 1001void
930ev_default_fork (void) 1002ev_default_fork (void)
931{ 1003{
932#if EV_MULTIPLICITY 1004#if EV_MULTIPLICITY
933 struct ev_loop *loop = default_loop; 1005 struct ev_loop *loop = ev_default_loop_ptr;
934#endif 1006#endif
935 1007
936 if (method) 1008 if (method)
937 postfork = 1; 1009 postfork = 1;
938} 1010}
949 return 1; 1021 return 1;
950 1022
951 return 0; 1023 return 0;
952} 1024}
953 1025
954static void 1026inline void
955call_pending (EV_P) 1027call_pending (EV_P)
956{ 1028{
957 int pri; 1029 int pri;
958 1030
959 for (pri = NUMPRI; pri--; ) 1031 for (pri = NUMPRI; pri--; )
960 while (pendingcnt [pri]) 1032 while (pendingcnt [pri])
961 { 1033 {
962 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1034 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
963 1035
964 if (p->w) 1036 if (expect_true (p->w))
965 { 1037 {
966 p->w->pending = 0; 1038 p->w->pending = 0;
967 EV_CB_INVOKE (p->w, p->events); 1039 EV_CB_INVOKE (p->w, p->events);
968 } 1040 }
969 } 1041 }
970} 1042}
971 1043
972static void 1044inline void
973timers_reify (EV_P) 1045timers_reify (EV_P)
974{ 1046{
975 while (timercnt && ((WT)timers [0])->at <= mn_now) 1047 while (timercnt && ((WT)timers [0])->at <= mn_now)
976 { 1048 {
977 struct ev_timer *w = timers [0]; 1049 struct ev_timer *w = timers [0];
980 1052
981 /* first reschedule or stop timer */ 1053 /* first reschedule or stop timer */
982 if (w->repeat) 1054 if (w->repeat)
983 { 1055 {
984 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1056 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1057
985 ((WT)w)->at = mn_now + w->repeat; 1058 ((WT)w)->at += w->repeat;
1059 if (((WT)w)->at < mn_now)
1060 ((WT)w)->at = mn_now;
1061
986 downheap ((WT *)timers, timercnt, 0); 1062 downheap ((WT *)timers, timercnt, 0);
987 } 1063 }
988 else 1064 else
989 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1065 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
990 1066
991 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1067 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
992 } 1068 }
993} 1069}
994 1070
995static void 1071#if EV_PERIODICS
1072inline void
996periodics_reify (EV_P) 1073periodics_reify (EV_P)
997{ 1074{
998 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1075 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
999 { 1076 {
1000 struct ev_periodic *w = periodics [0]; 1077 struct ev_periodic *w = periodics [0];
1002 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1079 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1003 1080
1004 /* first reschedule or stop timer */ 1081 /* first reschedule or stop timer */
1005 if (w->reschedule_cb) 1082 if (w->reschedule_cb)
1006 { 1083 {
1007 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1084 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1008
1009 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1085 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1010 downheap ((WT *)periodics, periodiccnt, 0); 1086 downheap ((WT *)periodics, periodiccnt, 0);
1011 } 1087 }
1012 else if (w->interval) 1088 else if (w->interval)
1013 { 1089 {
1040 1116
1041 /* now rebuild the heap */ 1117 /* now rebuild the heap */
1042 for (i = periodiccnt >> 1; i--; ) 1118 for (i = periodiccnt >> 1; i--; )
1043 downheap ((WT *)periodics, periodiccnt, i); 1119 downheap ((WT *)periodics, periodiccnt, i);
1044} 1120}
1121#endif
1045 1122
1046inline int 1123inline int
1047time_update_monotonic (EV_P) 1124time_update_monotonic (EV_P)
1048{ 1125{
1049 mn_now = get_clock (); 1126 mn_now = get_clock ();
1059 ev_rt_now = ev_time (); 1136 ev_rt_now = ev_time ();
1060 return 1; 1137 return 1;
1061 } 1138 }
1062} 1139}
1063 1140
1064static void 1141inline void
1065time_update (EV_P) 1142time_update (EV_P)
1066{ 1143{
1067 int i; 1144 int i;
1068 1145
1069#if EV_USE_MONOTONIC 1146#if EV_USE_MONOTONIC
1083 ev_rt_now = ev_time (); 1160 ev_rt_now = ev_time ();
1084 mn_now = get_clock (); 1161 mn_now = get_clock ();
1085 now_floor = mn_now; 1162 now_floor = mn_now;
1086 } 1163 }
1087 1164
1165# if EV_PERIODICS
1088 periodics_reschedule (EV_A); 1166 periodics_reschedule (EV_A);
1167# endif
1089 /* no timer adjustment, as the monotonic clock doesn't jump */ 1168 /* no timer adjustment, as the monotonic clock doesn't jump */
1090 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1169 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1091 } 1170 }
1092 } 1171 }
1093 else 1172 else
1095 { 1174 {
1096 ev_rt_now = ev_time (); 1175 ev_rt_now = ev_time ();
1097 1176
1098 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1177 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1099 { 1178 {
1179#if EV_PERIODICS
1100 periodics_reschedule (EV_A); 1180 periodics_reschedule (EV_A);
1181#endif
1101 1182
1102 /* adjust timers. this is easy, as the offset is the same for all */ 1183 /* adjust timers. this is easy, as the offset is the same for all */
1103 for (i = 0; i < timercnt; ++i) 1184 for (i = 0; i < timercnt; ++i)
1104 ((WT)timers [i])->at += ev_rt_now - mn_now; 1185 ((WT)timers [i])->at += ev_rt_now - mn_now;
1105 } 1186 }
1126ev_loop (EV_P_ int flags) 1207ev_loop (EV_P_ int flags)
1127{ 1208{
1128 double block; 1209 double block;
1129 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1210 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1130 1211
1131 do 1212 while (activecnt)
1132 { 1213 {
1133 /* queue check watchers (and execute them) */ 1214 /* queue check watchers (and execute them) */
1134 if (expect_false (preparecnt)) 1215 if (expect_false (preparecnt))
1135 { 1216 {
1136 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1217 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1168 { 1249 {
1169 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1250 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1170 if (block > to) block = to; 1251 if (block > to) block = to;
1171 } 1252 }
1172 1253
1254#if EV_PERIODICS
1173 if (periodiccnt) 1255 if (periodiccnt)
1174 { 1256 {
1175 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1257 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1176 if (block > to) block = to; 1258 if (block > to) block = to;
1177 } 1259 }
1260#endif
1178 1261
1179 if (block < 0.) block = 0.; 1262 if (expect_false (block < 0.)) block = 0.;
1180 } 1263 }
1181 1264
1182 method_poll (EV_A_ block); 1265 method_poll (EV_A_ block);
1183 1266
1184 /* update ev_rt_now, do magic */ 1267 /* update ev_rt_now, do magic */
1185 time_update (EV_A); 1268 time_update (EV_A);
1186 1269
1187 /* queue pending timers and reschedule them */ 1270 /* queue pending timers and reschedule them */
1188 timers_reify (EV_A); /* relative timers called last */ 1271 timers_reify (EV_A); /* relative timers called last */
1272#if EV_PERIODICS
1189 periodics_reify (EV_A); /* absolute timers called first */ 1273 periodics_reify (EV_A); /* absolute timers called first */
1274#endif
1190 1275
1191 /* queue idle watchers unless io or timers are pending */ 1276 /* queue idle watchers unless io or timers are pending */
1192 if (idlecnt && !any_pending (EV_A)) 1277 if (idlecnt && !any_pending (EV_A))
1193 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1278 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1194 1279
1195 /* queue check watchers, to be executed first */ 1280 /* queue check watchers, to be executed first */
1196 if (checkcnt) 1281 if (expect_false (checkcnt))
1197 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1282 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1198 1283
1199 call_pending (EV_A); 1284 call_pending (EV_A);
1285
1286 if (expect_false (loop_done))
1287 break;
1200 } 1288 }
1201 while (activecnt && !loop_done);
1202 1289
1203 if (loop_done != 2) 1290 if (loop_done != 2)
1204 loop_done = 0; 1291 loop_done = 0;
1205} 1292}
1206 1293
1266void 1353void
1267ev_io_start (EV_P_ struct ev_io *w) 1354ev_io_start (EV_P_ struct ev_io *w)
1268{ 1355{
1269 int fd = w->fd; 1356 int fd = w->fd;
1270 1357
1271 if (ev_is_active (w)) 1358 if (expect_false (ev_is_active (w)))
1272 return; 1359 return;
1273 1360
1274 assert (("ev_io_start called with negative fd", fd >= 0)); 1361 assert (("ev_io_start called with negative fd", fd >= 0));
1275 1362
1276 ev_start (EV_A_ (W)w, 1); 1363 ev_start (EV_A_ (W)w, 1);
1282 1369
1283void 1370void
1284ev_io_stop (EV_P_ struct ev_io *w) 1371ev_io_stop (EV_P_ struct ev_io *w)
1285{ 1372{
1286 ev_clear_pending (EV_A_ (W)w); 1373 ev_clear_pending (EV_A_ (W)w);
1287 if (!ev_is_active (w)) 1374 if (expect_false (!ev_is_active (w)))
1288 return; 1375 return;
1376
1377 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1289 1378
1290 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1379 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1291 ev_stop (EV_A_ (W)w); 1380 ev_stop (EV_A_ (W)w);
1292 1381
1293 fd_change (EV_A_ w->fd); 1382 fd_change (EV_A_ w->fd);
1294} 1383}
1295 1384
1296void 1385void
1297ev_timer_start (EV_P_ struct ev_timer *w) 1386ev_timer_start (EV_P_ struct ev_timer *w)
1298{ 1387{
1299 if (ev_is_active (w)) 1388 if (expect_false (ev_is_active (w)))
1300 return; 1389 return;
1301 1390
1302 ((WT)w)->at += mn_now; 1391 ((WT)w)->at += mn_now;
1303 1392
1304 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1393 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1305 1394
1306 ev_start (EV_A_ (W)w, ++timercnt); 1395 ev_start (EV_A_ (W)w, ++timercnt);
1307 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1396 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1308 timers [timercnt - 1] = w; 1397 timers [timercnt - 1] = w;
1309 upheap ((WT *)timers, timercnt - 1); 1398 upheap ((WT *)timers, timercnt - 1);
1310 1399
1311 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1400 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1312} 1401}
1313 1402
1314void 1403void
1315ev_timer_stop (EV_P_ struct ev_timer *w) 1404ev_timer_stop (EV_P_ struct ev_timer *w)
1316{ 1405{
1317 ev_clear_pending (EV_A_ (W)w); 1406 ev_clear_pending (EV_A_ (W)w);
1318 if (!ev_is_active (w)) 1407 if (expect_false (!ev_is_active (w)))
1319 return; 1408 return;
1320 1409
1321 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1410 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1322 1411
1323 if (((W)w)->active < timercnt--) 1412 if (expect_true (((W)w)->active < timercnt--))
1324 { 1413 {
1325 timers [((W)w)->active - 1] = timers [timercnt]; 1414 timers [((W)w)->active - 1] = timers [timercnt];
1326 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1415 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1327 } 1416 }
1328 1417
1329 ((WT)w)->at = w->repeat; 1418 ((WT)w)->at -= mn_now;
1330 1419
1331 ev_stop (EV_A_ (W)w); 1420 ev_stop (EV_A_ (W)w);
1332} 1421}
1333 1422
1334void 1423void
1335ev_timer_again (EV_P_ struct ev_timer *w) 1424ev_timer_again (EV_P_ struct ev_timer *w)
1336{ 1425{
1337 if (ev_is_active (w)) 1426 if (ev_is_active (w))
1338 { 1427 {
1339 if (w->repeat) 1428 if (w->repeat)
1429 {
1430 ((WT)w)->at = mn_now + w->repeat;
1340 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1431 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1432 }
1341 else 1433 else
1342 ev_timer_stop (EV_A_ w); 1434 ev_timer_stop (EV_A_ w);
1343 } 1435 }
1344 else if (w->repeat) 1436 else if (w->repeat)
1437 {
1438 w->at = w->repeat;
1345 ev_timer_start (EV_A_ w); 1439 ev_timer_start (EV_A_ w);
1440 }
1346} 1441}
1347 1442
1443#if EV_PERIODICS
1348void 1444void
1349ev_periodic_start (EV_P_ struct ev_periodic *w) 1445ev_periodic_start (EV_P_ struct ev_periodic *w)
1350{ 1446{
1351 if (ev_is_active (w)) 1447 if (expect_false (ev_is_active (w)))
1352 return; 1448 return;
1353 1449
1354 if (w->reschedule_cb) 1450 if (w->reschedule_cb)
1355 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1451 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1356 else if (w->interval) 1452 else if (w->interval)
1359 /* this formula differs from the one in periodic_reify because we do not always round up */ 1455 /* this formula differs from the one in periodic_reify because we do not always round up */
1360 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1456 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1361 } 1457 }
1362 1458
1363 ev_start (EV_A_ (W)w, ++periodiccnt); 1459 ev_start (EV_A_ (W)w, ++periodiccnt);
1364 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1460 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1365 periodics [periodiccnt - 1] = w; 1461 periodics [periodiccnt - 1] = w;
1366 upheap ((WT *)periodics, periodiccnt - 1); 1462 upheap ((WT *)periodics, periodiccnt - 1);
1367 1463
1368 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1464 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1369} 1465}
1370 1466
1371void 1467void
1372ev_periodic_stop (EV_P_ struct ev_periodic *w) 1468ev_periodic_stop (EV_P_ struct ev_periodic *w)
1373{ 1469{
1374 ev_clear_pending (EV_A_ (W)w); 1470 ev_clear_pending (EV_A_ (W)w);
1375 if (!ev_is_active (w)) 1471 if (expect_false (!ev_is_active (w)))
1376 return; 1472 return;
1377 1473
1378 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1474 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1379 1475
1380 if (((W)w)->active < periodiccnt--) 1476 if (expect_true (((W)w)->active < periodiccnt--))
1381 { 1477 {
1382 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1478 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1383 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1479 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1384 } 1480 }
1385 1481
1386 ev_stop (EV_A_ (W)w); 1482 ev_stop (EV_A_ (W)w);
1387} 1483}
1388 1484
1391{ 1487{
1392 /* TODO: use adjustheap and recalculation */ 1488 /* TODO: use adjustheap and recalculation */
1393 ev_periodic_stop (EV_A_ w); 1489 ev_periodic_stop (EV_A_ w);
1394 ev_periodic_start (EV_A_ w); 1490 ev_periodic_start (EV_A_ w);
1395} 1491}
1492#endif
1396 1493
1397void 1494void
1398ev_idle_start (EV_P_ struct ev_idle *w) 1495ev_idle_start (EV_P_ struct ev_idle *w)
1399{ 1496{
1400 if (ev_is_active (w)) 1497 if (expect_false (ev_is_active (w)))
1401 return; 1498 return;
1402 1499
1403 ev_start (EV_A_ (W)w, ++idlecnt); 1500 ev_start (EV_A_ (W)w, ++idlecnt);
1404 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1501 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1405 idles [idlecnt - 1] = w; 1502 idles [idlecnt - 1] = w;
1406} 1503}
1407 1504
1408void 1505void
1409ev_idle_stop (EV_P_ struct ev_idle *w) 1506ev_idle_stop (EV_P_ struct ev_idle *w)
1410{ 1507{
1411 ev_clear_pending (EV_A_ (W)w); 1508 ev_clear_pending (EV_A_ (W)w);
1412 if (ev_is_active (w)) 1509 if (expect_false (!ev_is_active (w)))
1413 return; 1510 return;
1414 1511
1415 idles [((W)w)->active - 1] = idles [--idlecnt]; 1512 idles [((W)w)->active - 1] = idles [--idlecnt];
1416 ev_stop (EV_A_ (W)w); 1513 ev_stop (EV_A_ (W)w);
1417} 1514}
1418 1515
1419void 1516void
1420ev_prepare_start (EV_P_ struct ev_prepare *w) 1517ev_prepare_start (EV_P_ struct ev_prepare *w)
1421{ 1518{
1422 if (ev_is_active (w)) 1519 if (expect_false (ev_is_active (w)))
1423 return; 1520 return;
1424 1521
1425 ev_start (EV_A_ (W)w, ++preparecnt); 1522 ev_start (EV_A_ (W)w, ++preparecnt);
1426 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1523 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1427 prepares [preparecnt - 1] = w; 1524 prepares [preparecnt - 1] = w;
1428} 1525}
1429 1526
1430void 1527void
1431ev_prepare_stop (EV_P_ struct ev_prepare *w) 1528ev_prepare_stop (EV_P_ struct ev_prepare *w)
1432{ 1529{
1433 ev_clear_pending (EV_A_ (W)w); 1530 ev_clear_pending (EV_A_ (W)w);
1434 if (ev_is_active (w)) 1531 if (expect_false (!ev_is_active (w)))
1435 return; 1532 return;
1436 1533
1437 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1534 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1438 ev_stop (EV_A_ (W)w); 1535 ev_stop (EV_A_ (W)w);
1439} 1536}
1440 1537
1441void 1538void
1442ev_check_start (EV_P_ struct ev_check *w) 1539ev_check_start (EV_P_ struct ev_check *w)
1443{ 1540{
1444 if (ev_is_active (w)) 1541 if (expect_false (ev_is_active (w)))
1445 return; 1542 return;
1446 1543
1447 ev_start (EV_A_ (W)w, ++checkcnt); 1544 ev_start (EV_A_ (W)w, ++checkcnt);
1448 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1545 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1449 checks [checkcnt - 1] = w; 1546 checks [checkcnt - 1] = w;
1450} 1547}
1451 1548
1452void 1549void
1453ev_check_stop (EV_P_ struct ev_check *w) 1550ev_check_stop (EV_P_ struct ev_check *w)
1454{ 1551{
1455 ev_clear_pending (EV_A_ (W)w); 1552 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w)) 1553 if (expect_false (!ev_is_active (w)))
1457 return; 1554 return;
1458 1555
1459 checks [((W)w)->active - 1] = checks [--checkcnt]; 1556 checks [((W)w)->active - 1] = checks [--checkcnt];
1460 ev_stop (EV_A_ (W)w); 1557 ev_stop (EV_A_ (W)w);
1461} 1558}
1466 1563
1467void 1564void
1468ev_signal_start (EV_P_ struct ev_signal *w) 1565ev_signal_start (EV_P_ struct ev_signal *w)
1469{ 1566{
1470#if EV_MULTIPLICITY 1567#if EV_MULTIPLICITY
1471 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1568 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1472#endif 1569#endif
1473 if (ev_is_active (w)) 1570 if (expect_false (ev_is_active (w)))
1474 return; 1571 return;
1475 1572
1476 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1573 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1477 1574
1478 ev_start (EV_A_ (W)w, 1); 1575 ev_start (EV_A_ (W)w, 1);
1479 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1576 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1480 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1577 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1481 1578
1482 if (!((WL)w)->next) 1579 if (!((WL)w)->next)
1483 { 1580 {
1484#if WIN32 1581#if _WIN32
1485 signal (w->signum, sighandler); 1582 signal (w->signum, sighandler);
1486#else 1583#else
1487 struct sigaction sa; 1584 struct sigaction sa;
1488 sa.sa_handler = sighandler; 1585 sa.sa_handler = sighandler;
1489 sigfillset (&sa.sa_mask); 1586 sigfillset (&sa.sa_mask);
1495 1592
1496void 1593void
1497ev_signal_stop (EV_P_ struct ev_signal *w) 1594ev_signal_stop (EV_P_ struct ev_signal *w)
1498{ 1595{
1499 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1500 if (!ev_is_active (w)) 1597 if (expect_false (!ev_is_active (w)))
1501 return; 1598 return;
1502 1599
1503 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1600 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1504 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1505 1602
1509 1606
1510void 1607void
1511ev_child_start (EV_P_ struct ev_child *w) 1608ev_child_start (EV_P_ struct ev_child *w)
1512{ 1609{
1513#if EV_MULTIPLICITY 1610#if EV_MULTIPLICITY
1514 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1611 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1515#endif 1612#endif
1516 if (ev_is_active (w)) 1613 if (expect_false (ev_is_active (w)))
1517 return; 1614 return;
1518 1615
1519 ev_start (EV_A_ (W)w, 1); 1616 ev_start (EV_A_ (W)w, 1);
1520 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1617 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1521} 1618}
1522 1619
1523void 1620void
1524ev_child_stop (EV_P_ struct ev_child *w) 1621ev_child_stop (EV_P_ struct ev_child *w)
1525{ 1622{
1526 ev_clear_pending (EV_A_ (W)w); 1623 ev_clear_pending (EV_A_ (W)w);
1527 if (ev_is_active (w)) 1624 if (expect_false (!ev_is_active (w)))
1528 return; 1625 return;
1529 1626
1530 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1627 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1531 ev_stop (EV_A_ (W)w); 1628 ev_stop (EV_A_ (W)w);
1532} 1629}
1569void 1666void
1570ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1667ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1571{ 1668{
1572 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1669 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1573 1670
1574 if (!once) 1671 if (expect_false (!once))
1672 {
1575 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1673 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1576 else 1674 return;
1577 { 1675 }
1676
1578 once->cb = cb; 1677 once->cb = cb;
1579 once->arg = arg; 1678 once->arg = arg;
1580 1679
1581 ev_init (&once->io, once_cb_io); 1680 ev_init (&once->io, once_cb_io);
1582 if (fd >= 0) 1681 if (fd >= 0)
1583 { 1682 {
1584 ev_io_set (&once->io, fd, events); 1683 ev_io_set (&once->io, fd, events);
1585 ev_io_start (EV_A_ &once->io); 1684 ev_io_start (EV_A_ &once->io);
1586 } 1685 }
1587 1686
1588 ev_init (&once->to, once_cb_to); 1687 ev_init (&once->to, once_cb_to);
1589 if (timeout >= 0.) 1688 if (timeout >= 0.)
1590 { 1689 {
1591 ev_timer_set (&once->to, timeout, 0.); 1690 ev_timer_set (&once->to, timeout, 0.);
1592 ev_timer_start (EV_A_ &once->to); 1691 ev_timer_start (EV_A_ &once->to);
1593 }
1594 } 1692 }
1595} 1693}
1596 1694
1695#ifdef __cplusplus
1696}
1697#endif
1698

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines