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

Comparing libev/ev.c (file contents):
Revision 1.84 by root, Fri Nov 9 23:04:35 2007 UTC vs.
Revision 1.128 by root, Thu Nov 22 12:28:27 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);
… …
271#endif 337#endif
272 338
273 return ev_time (); 339 return ev_time ();
274} 340}
275 341
342#if EV_MULTIPLICITY
276ev_tstamp 343ev_tstamp
277ev_now (EV_P) 344ev_now (EV_P)
278{ 345{
279 return rt_now; 346 return ev_rt_now;
280} 347}
348#endif
281 349
282#define array_roundsize(type,n) ((n) | 4 & ~3) 350#define array_roundsize(type,n) (((n) | 4) & ~3)
283 351
284#define array_needsize(type,base,cur,cnt,init) \ 352#define array_needsize(type,base,cur,cnt,init) \
285 if (expect_false ((cnt) > cur)) \ 353 if (expect_false ((cnt) > cur)) \
286 { \ 354 { \
287 int newcnt = cur; \ 355 int newcnt = cur; \
… …
302 stem ## max = array_roundsize (stem ## cnt >> 1); \ 370 stem ## max = array_roundsize (stem ## cnt >> 1); \
303 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 371 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
304 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 372 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
305 } 373 }
306 374
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) \ 375#define array_free(stem, idx) \
313 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;
314 377
315/*****************************************************************************/ 378/*****************************************************************************/
316 379
… …
330void 393void
331ev_feed_event (EV_P_ void *w, int revents) 394ev_feed_event (EV_P_ void *w, int revents)
332{ 395{
333 W w_ = (W)w; 396 W w_ = (W)w;
334 397
335 if (w_->pending) 398 if (expect_false (w_->pending))
336 { 399 {
337 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; 400 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
338 return; 401 return;
339 } 402 }
340 403
341 w_->pending = ++pendingcnt [ABSPRI (w_)]; 404 w_->pending = ++pendingcnt [ABSPRI (w_)];
342 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);
343 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 406 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
344 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 407 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
345} 408}
346 409
347static void 410static void
… …
374 fd_event (EV_A_ fd, revents); 437 fd_event (EV_A_ fd, revents);
375} 438}
376 439
377/*****************************************************************************/ 440/*****************************************************************************/
378 441
379static void 442inline void
380fd_reify (EV_P) 443fd_reify (EV_P)
381{ 444{
382 int i; 445 int i;
383 446
384 for (i = 0; i < fdchangecnt; ++i) 447 for (i = 0; i < fdchangecnt; ++i)
… …
390 int events = 0; 453 int events = 0;
391 454
392 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)
393 events |= w->events; 456 events |= w->events;
394 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
395 anfd->reify = 0; 467 anfd->reify = 0;
396 468
397 method_modify (EV_A_ fd, anfd->events, events); 469 method_modify (EV_A_ fd, anfd->events, events);
398 anfd->events = events; 470 anfd->events = events;
399 } 471 }
… …
402} 474}
403 475
404static void 476static void
405fd_change (EV_P_ int fd) 477fd_change (EV_P_ int fd)
406{ 478{
407 if (anfds [fd].reify) 479 if (expect_false (anfds [fd].reify))
408 return; 480 return;
409 481
410 anfds [fd].reify = 1; 482 anfds [fd].reify = 1;
411 483
412 ++fdchangecnt; 484 ++fdchangecnt;
413 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 485 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
414 fdchanges [fdchangecnt - 1] = fd; 486 fdchanges [fdchangecnt - 1] = fd;
415} 487}
416 488
417static void 489static void
418fd_kill (EV_P_ int fd) 490fd_kill (EV_P_ int fd)
… …
424 ev_io_stop (EV_A_ w); 496 ev_io_stop (EV_A_ w);
425 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);
426 } 498 }
427} 499}
428 500
429static int 501inline int
430fd_valid (int fd) 502fd_valid (int fd)
431{ 503{
432#ifdef WIN32 504#ifdef _WIN32
433 return !!win32_get_osfhandle (fd); 505 return _get_osfhandle (fd) != -1;
434#else 506#else
435 return fcntl (fd, F_GETFD) != -1; 507 return fcntl (fd, F_GETFD) != -1;
436#endif 508#endif
437} 509}
438 510
… …
519 heap [k] = w; 591 heap [k] = w;
520 ((W)heap [k])->active = k + 1; 592 ((W)heap [k])->active = k + 1;
521} 593}
522 594
523inline void 595inline void
524adjustheap (WT *heap, int N, int k, ev_tstamp at) 596adjustheap (WT *heap, int N, int k)
525{ 597{
526 ev_tstamp old_at = heap [k]->at; 598 upheap (heap, k);
527 heap [k]->at = at;
528
529 if (old_at < at)
530 downheap (heap, N, k); 599 downheap (heap, N, k);
531 else
532 upheap (heap, k);
533} 600}
534 601
535/*****************************************************************************/ 602/*****************************************************************************/
536 603
537typedef struct 604typedef struct
… …
560} 627}
561 628
562static void 629static void
563sighandler (int signum) 630sighandler (int signum)
564{ 631{
565#if WIN32 632#if _WIN32
566 signal (signum, sighandler); 633 signal (signum, sighandler);
567#endif 634#endif
568 635
569 signals [signum - 1].gotsig = 1; 636 signals [signum - 1].gotsig = 1;
570 637
571 if (!gotsig) 638 if (!gotsig)
572 { 639 {
573 int old_errno = errno; 640 int old_errno = errno;
574 gotsig = 1; 641 gotsig = 1;
575#ifdef WIN32
576 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
577#else
578 write (sigpipe [1], &signum, 1); 642 write (sigpipe [1], &signum, 1);
579#endif
580 errno = old_errno; 643 errno = old_errno;
581 } 644 }
582} 645}
583 646
584void 647void
585ev_feed_signal_event (EV_P_ int signum) 648ev_feed_signal_event (EV_P_ int signum)
586{ 649{
587 WL w; 650 WL w;
588 651
589#if EV_MULTIPLICITY 652#if EV_MULTIPLICITY
590 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));
591#endif 654#endif
592 655
593 --signum; 656 --signum;
594 657
595 if (signum < 0 || signum >= signalmax) 658 if (signum < 0 || signum >= signalmax)
… …
604static void 667static void
605sigcb (EV_P_ struct ev_io *iow, int revents) 668sigcb (EV_P_ struct ev_io *iow, int revents)
606{ 669{
607 int signum; 670 int signum;
608 671
609#ifdef WIN32
610 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
611#else
612 read (sigpipe [0], &revents, 1); 672 read (sigpipe [0], &revents, 1);
613#endif
614 gotsig = 0; 673 gotsig = 0;
615 674
616 for (signum = signalmax; signum--; ) 675 for (signum = signalmax; signum--; )
617 if (signals [signum].gotsig) 676 if (signals [signum].gotsig)
618 ev_feed_signal_event (EV_A_ signum + 1); 677 ev_feed_signal_event (EV_A_ signum + 1);
619} 678}
620 679
621static 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
622siginit (EV_P) 693siginit (EV_P)
623{ 694{
624#ifndef WIN32 695 fd_intern (sigpipe [0]);
625 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 696 fd_intern (sigpipe [1]);
626 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
627
628 /* rather than sort out wether we really need nb, set it */
629 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
630 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
631#endif
632 697
633 ev_io_set (&sigev, sigpipe [0], EV_READ); 698 ev_io_set (&sigev, sigpipe [0], EV_READ);
634 ev_io_start (EV_A_ &sigev); 699 ev_io_start (EV_A_ &sigev);
635 ev_unref (EV_A); /* child watcher should not keep loop alive */ 700 ev_unref (EV_A); /* child watcher should not keep loop alive */
636} 701}
637 702
638/*****************************************************************************/ 703/*****************************************************************************/
639 704
640static struct ev_child *childs [PID_HASHSIZE]; 705static struct ev_child *childs [PID_HASHSIZE];
641 706
642#ifndef WIN32 707#ifndef _WIN32
643 708
644static struct ev_signal childev; 709static struct ev_signal childev;
645 710
646#ifndef WCONTINUED 711#ifndef WCONTINUED
647# define WCONTINUED 0 712# define WCONTINUED 0
… …
679 744
680#endif 745#endif
681 746
682/*****************************************************************************/ 747/*****************************************************************************/
683 748
749#if EV_USE_PORT
750# include "ev_port.c"
751#endif
684#if EV_USE_KQUEUE 752#if EV_USE_KQUEUE
685# include "ev_kqueue.c" 753# include "ev_kqueue.c"
686#endif 754#endif
687#if EV_USE_EPOLL 755#if EV_USE_EPOLL
688# include "ev_epoll.c" 756# include "ev_epoll.c"
… …
708 776
709/* 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 */
710static int 778static int
711enable_secure (void) 779enable_secure (void)
712{ 780{
713#ifdef WIN32 781#ifdef _WIN32
714 return 0; 782 return 0;
715#else 783#else
716 return getuid () != geteuid () 784 return getuid () != geteuid ()
717 || getgid () != getegid (); 785 || getgid () != getegid ();
718#endif 786#endif
719} 787}
720 788
721int 789unsigned int
722ev_method (EV_P) 790ev_method (EV_P)
723{ 791{
724 return method; 792 return method;
725} 793}
726 794
727static void 795static void
728loop_init (EV_P_ int methods) 796loop_init (EV_P_ unsigned int flags)
729{ 797{
730 if (!method) 798 if (!method)
731 { 799 {
732#if EV_USE_MONOTONIC 800#if EV_USE_MONOTONIC
733 { 801 {
… …
735 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 803 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
736 have_monotonic = 1; 804 have_monotonic = 1;
737 } 805 }
738#endif 806#endif
739 807
740 rt_now = ev_time (); 808 ev_rt_now = ev_time ();
741 mn_now = get_clock (); 809 mn_now = get_clock ();
742 now_floor = mn_now; 810 now_floor = mn_now;
743 rtmn_diff = rt_now - mn_now; 811 rtmn_diff = ev_rt_now - mn_now;
744 812
745 if (methods == EVMETHOD_AUTO) 813 if (!(flags & EVFLAG_NOENV)
746 if (!enable_secure () && getenv ("LIBEV_METHODS")) 814 && !enable_secure ()
815 && getenv ("LIBEV_FLAGS"))
747 methods = atoi (getenv ("LIBEV_METHODS")); 816 flags = atoi (getenv ("LIBEV_FLAGS"));
817
818 if (!(flags & EVMETHOD_ALL))
748 else 819 {
749 methods = EVMETHOD_ANY; 820 flags |= EVMETHOD_ALL;
821#if EV_USE_KQUEUE && !defined (__NetBSD__)
822 /* kqueue is borked on everything but netbsd apparently */
823 /* it usually doesn't work correctly on anything but sockets and pipes */
824 flags &= ~EVMETHOD_KQUEUE;
825#endif
826 }
750 827
751 method = 0; 828 method = 0;
752#if EV_USE_WIN32 829#if EV_USE_PORT
753 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 830 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
754#endif 831#endif
755#if EV_USE_KQUEUE 832#if EV_USE_KQUEUE
756 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 833 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
757#endif 834#endif
758#if EV_USE_EPOLL 835#if EV_USE_EPOLL
759 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 836 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
760#endif 837#endif
761#if EV_USE_POLL 838#if EV_USE_POLL
762 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 839 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
763#endif 840#endif
764#if EV_USE_SELECT 841#if EV_USE_SELECT
765 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 842 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
766#endif 843#endif
767 844
768 ev_init (&sigev, sigcb); 845 ev_init (&sigev, sigcb);
769 ev_set_priority (&sigev, EV_MAXPRI); 846 ev_set_priority (&sigev, EV_MAXPRI);
770 } 847 }
771} 848}
772 849
773void 850static void
774loop_destroy (EV_P) 851loop_destroy (EV_P)
775{ 852{
776 int i; 853 int i;
777 854
778#if EV_USE_WIN32 855#if EV_USE_PORT
779 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 856 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
780#endif 857#endif
781#if EV_USE_KQUEUE 858#if EV_USE_KQUEUE
782 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 859 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
783#endif 860#endif
784#if EV_USE_EPOLL 861#if EV_USE_EPOLL
… …
793 870
794 for (i = NUMPRI; i--; ) 871 for (i = NUMPRI; i--; )
795 array_free (pending, [i]); 872 array_free (pending, [i]);
796 873
797 /* have to use the microsoft-never-gets-it-right macro */ 874 /* have to use the microsoft-never-gets-it-right macro */
798 array_free_microshit (fdchange); 875 array_free (fdchange, EMPTY0);
799 array_free_microshit (timer); 876 array_free (timer, EMPTY0);
800 array_free_microshit (periodic); 877#if EV_PERIODICS
801 array_free_microshit (idle); 878 array_free (periodic, EMPTY0);
802 array_free_microshit (prepare); 879#endif
803 array_free_microshit (check); 880 array_free (idle, EMPTY0);
881 array_free (prepare, EMPTY0);
882 array_free (check, EMPTY0);
804 883
805 method = 0; 884 method = 0;
806} 885}
807 886
808static void 887static void
809loop_fork (EV_P) 888loop_fork (EV_P)
810{ 889{
890#if EV_USE_PORT
891 if (method == EVMETHOD_PORT ) port_fork (EV_A);
892#endif
893#if EV_USE_KQUEUE
894 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
895#endif
811#if EV_USE_EPOLL 896#if EV_USE_EPOLL
812 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 897 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
813#endif
814#if EV_USE_KQUEUE
815 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
816#endif 898#endif
817 899
818 if (ev_is_active (&sigev)) 900 if (ev_is_active (&sigev))
819 { 901 {
820 /* default loop */ 902 /* default loop */
… …
833 postfork = 0; 915 postfork = 0;
834} 916}
835 917
836#if EV_MULTIPLICITY 918#if EV_MULTIPLICITY
837struct ev_loop * 919struct ev_loop *
838ev_loop_new (int methods) 920ev_loop_new (unsigned int flags)
839{ 921{
840 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 922 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
841 923
842 memset (loop, 0, sizeof (struct ev_loop)); 924 memset (loop, 0, sizeof (struct ev_loop));
843 925
844 loop_init (EV_A_ methods); 926 loop_init (EV_A_ flags);
845 927
846 if (ev_method (EV_A)) 928 if (ev_method (EV_A))
847 return loop; 929 return loop;
848 930
849 return 0; 931 return 0;
… …
864 946
865#endif 947#endif
866 948
867#if EV_MULTIPLICITY 949#if EV_MULTIPLICITY
868struct ev_loop * 950struct ev_loop *
951ev_default_loop_init (unsigned int flags)
869#else 952#else
870int 953int
954ev_default_loop (unsigned int flags)
871#endif 955#endif
872ev_default_loop (int methods)
873{ 956{
874 if (sigpipe [0] == sigpipe [1]) 957 if (sigpipe [0] == sigpipe [1])
875 if (pipe (sigpipe)) 958 if (pipe (sigpipe))
876 return 0; 959 return 0;
877 960
878 if (!default_loop) 961 if (!ev_default_loop_ptr)
879 { 962 {
880#if EV_MULTIPLICITY 963#if EV_MULTIPLICITY
881 struct ev_loop *loop = default_loop = &default_loop_struct; 964 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
882#else 965#else
883 default_loop = 1; 966 ev_default_loop_ptr = 1;
884#endif 967#endif
885 968
886 loop_init (EV_A_ methods); 969 loop_init (EV_A_ flags);
887 970
888 if (ev_method (EV_A)) 971 if (ev_method (EV_A))
889 { 972 {
890 siginit (EV_A); 973 siginit (EV_A);
891 974
892#ifndef WIN32 975#ifndef _WIN32
893 ev_signal_init (&childev, childcb, SIGCHLD); 976 ev_signal_init (&childev, childcb, SIGCHLD);
894 ev_set_priority (&childev, EV_MAXPRI); 977 ev_set_priority (&childev, EV_MAXPRI);
895 ev_signal_start (EV_A_ &childev); 978 ev_signal_start (EV_A_ &childev);
896 ev_unref (EV_A); /* child watcher should not keep loop alive */ 979 ev_unref (EV_A); /* child watcher should not keep loop alive */
897#endif 980#endif
898 } 981 }
899 else 982 else
900 default_loop = 0; 983 ev_default_loop_ptr = 0;
901 } 984 }
902 985
903 return default_loop; 986 return ev_default_loop_ptr;
904} 987}
905 988
906void 989void
907ev_default_destroy (void) 990ev_default_destroy (void)
908{ 991{
909#if EV_MULTIPLICITY 992#if EV_MULTIPLICITY
910 struct ev_loop *loop = default_loop; 993 struct ev_loop *loop = ev_default_loop_ptr;
911#endif 994#endif
912 995
913#ifndef WIN32 996#ifndef _WIN32
914 ev_ref (EV_A); /* child watcher */ 997 ev_ref (EV_A); /* child watcher */
915 ev_signal_stop (EV_A_ &childev); 998 ev_signal_stop (EV_A_ &childev);
916#endif 999#endif
917 1000
918 ev_ref (EV_A); /* signal watcher */ 1001 ev_ref (EV_A); /* signal watcher */
… …
926 1009
927void 1010void
928ev_default_fork (void) 1011ev_default_fork (void)
929{ 1012{
930#if EV_MULTIPLICITY 1013#if EV_MULTIPLICITY
931 struct ev_loop *loop = default_loop; 1014 struct ev_loop *loop = ev_default_loop_ptr;
932#endif 1015#endif
933 1016
934 if (method) 1017 if (method)
935 postfork = 1; 1018 postfork = 1;
936} 1019}
… …
947 return 1; 1030 return 1;
948 1031
949 return 0; 1032 return 0;
950} 1033}
951 1034
952static void 1035inline void
953call_pending (EV_P) 1036call_pending (EV_P)
954{ 1037{
955 int pri; 1038 int pri;
956 1039
957 for (pri = NUMPRI; pri--; ) 1040 for (pri = NUMPRI; pri--; )
958 while (pendingcnt [pri]) 1041 while (pendingcnt [pri])
959 { 1042 {
960 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1043 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
961 1044
962 if (p->w) 1045 if (expect_true (p->w))
963 { 1046 {
964 p->w->pending = 0; 1047 p->w->pending = 0;
965 EV_CB_INVOKE (p->w, p->events); 1048 EV_CB_INVOKE (p->w, p->events);
966 } 1049 }
967 } 1050 }
968} 1051}
969 1052
970static void 1053inline void
971timers_reify (EV_P) 1054timers_reify (EV_P)
972{ 1055{
973 while (timercnt && ((WT)timers [0])->at <= mn_now) 1056 while (timercnt && ((WT)timers [0])->at <= mn_now)
974 { 1057 {
975 struct ev_timer *w = timers [0]; 1058 struct ev_timer *w = timers [0];
… …
978 1061
979 /* first reschedule or stop timer */ 1062 /* first reschedule or stop timer */
980 if (w->repeat) 1063 if (w->repeat)
981 { 1064 {
982 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1065 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1066
983 ((WT)w)->at = mn_now + w->repeat; 1067 ((WT)w)->at += w->repeat;
1068 if (((WT)w)->at < mn_now)
1069 ((WT)w)->at = mn_now;
1070
984 downheap ((WT *)timers, timercnt, 0); 1071 downheap ((WT *)timers, timercnt, 0);
985 } 1072 }
986 else 1073 else
987 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1074 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
988 1075
989 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1076 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
990 } 1077 }
991} 1078}
992 1079
993static void 1080#if EV_PERIODICS
1081inline void
994periodics_reify (EV_P) 1082periodics_reify (EV_P)
995{ 1083{
996 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1084 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
997 { 1085 {
998 struct ev_periodic *w = periodics [0]; 1086 struct ev_periodic *w = periodics [0];
999 1087
1000 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1088 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1001 1089
1002 /* first reschedule or stop timer */ 1090 /* first reschedule or stop timer */
1003 if (w->reschedule_cb) 1091 if (w->reschedule_cb)
1004 { 1092 {
1005 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1093 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1006
1007 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1094 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1008 downheap ((WT *)periodics, periodiccnt, 0); 1095 downheap ((WT *)periodics, periodiccnt, 0);
1009 } 1096 }
1010 else if (w->interval) 1097 else if (w->interval)
1011 { 1098 {
1012 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1099 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
1013 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1100 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1014 downheap ((WT *)periodics, periodiccnt, 0); 1101 downheap ((WT *)periodics, periodiccnt, 0);
1015 } 1102 }
1016 else 1103 else
1017 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1104 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1018 1105
… …
1029 for (i = 0; i < periodiccnt; ++i) 1116 for (i = 0; i < periodiccnt; ++i)
1030 { 1117 {
1031 struct ev_periodic *w = periodics [i]; 1118 struct ev_periodic *w = periodics [i];
1032 1119
1033 if (w->reschedule_cb) 1120 if (w->reschedule_cb)
1034 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1121 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1035 else if (w->interval) 1122 else if (w->interval)
1036 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1123 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1037 } 1124 }
1038 1125
1039 /* now rebuild the heap */ 1126 /* now rebuild the heap */
1040 for (i = periodiccnt >> 1; i--; ) 1127 for (i = periodiccnt >> 1; i--; )
1041 downheap ((WT *)periodics, periodiccnt, i); 1128 downheap ((WT *)periodics, periodiccnt, i);
1042} 1129}
1130#endif
1043 1131
1044inline int 1132inline int
1045time_update_monotonic (EV_P) 1133time_update_monotonic (EV_P)
1046{ 1134{
1047 mn_now = get_clock (); 1135 mn_now = get_clock ();
1048 1136
1049 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1137 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1050 { 1138 {
1051 rt_now = rtmn_diff + mn_now; 1139 ev_rt_now = rtmn_diff + mn_now;
1052 return 0; 1140 return 0;
1053 } 1141 }
1054 else 1142 else
1055 { 1143 {
1056 now_floor = mn_now; 1144 now_floor = mn_now;
1057 rt_now = ev_time (); 1145 ev_rt_now = ev_time ();
1058 return 1; 1146 return 1;
1059 } 1147 }
1060} 1148}
1061 1149
1062static void 1150inline void
1063time_update (EV_P) 1151time_update (EV_P)
1064{ 1152{
1065 int i; 1153 int i;
1066 1154
1067#if EV_USE_MONOTONIC 1155#if EV_USE_MONOTONIC
… …
1071 { 1159 {
1072 ev_tstamp odiff = rtmn_diff; 1160 ev_tstamp odiff = rtmn_diff;
1073 1161
1074 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1162 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1075 { 1163 {
1076 rtmn_diff = rt_now - mn_now; 1164 rtmn_diff = ev_rt_now - mn_now;
1077 1165
1078 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1166 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1079 return; /* all is well */ 1167 return; /* all is well */
1080 1168
1081 rt_now = ev_time (); 1169 ev_rt_now = ev_time ();
1082 mn_now = get_clock (); 1170 mn_now = get_clock ();
1083 now_floor = mn_now; 1171 now_floor = mn_now;
1084 } 1172 }
1085 1173
1174# if EV_PERIODICS
1086 periodics_reschedule (EV_A); 1175 periodics_reschedule (EV_A);
1176# endif
1087 /* no timer adjustment, as the monotonic clock doesn't jump */ 1177 /* no timer adjustment, as the monotonic clock doesn't jump */
1088 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1178 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1089 } 1179 }
1090 } 1180 }
1091 else 1181 else
1092#endif 1182#endif
1093 { 1183 {
1094 rt_now = ev_time (); 1184 ev_rt_now = ev_time ();
1095 1185
1096 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1186 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1097 { 1187 {
1188#if EV_PERIODICS
1098 periodics_reschedule (EV_A); 1189 periodics_reschedule (EV_A);
1190#endif
1099 1191
1100 /* adjust timers. this is easy, as the offset is the same for all */ 1192 /* adjust timers. this is easy, as the offset is the same for all */
1101 for (i = 0; i < timercnt; ++i) 1193 for (i = 0; i < timercnt; ++i)
1102 ((WT)timers [i])->at += rt_now - mn_now; 1194 ((WT)timers [i])->at += ev_rt_now - mn_now;
1103 } 1195 }
1104 1196
1105 mn_now = rt_now; 1197 mn_now = ev_rt_now;
1106 } 1198 }
1107} 1199}
1108 1200
1109void 1201void
1110ev_ref (EV_P) 1202ev_ref (EV_P)
… …
1124ev_loop (EV_P_ int flags) 1216ev_loop (EV_P_ int flags)
1125{ 1217{
1126 double block; 1218 double block;
1127 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1219 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1128 1220
1129 do 1221 while (activecnt)
1130 { 1222 {
1131 /* queue check watchers (and execute them) */ 1223 /* queue check watchers (and execute them) */
1132 if (expect_false (preparecnt)) 1224 if (expect_false (preparecnt))
1133 { 1225 {
1134 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1226 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
… …
1150 if (expect_true (have_monotonic)) 1242 if (expect_true (have_monotonic))
1151 time_update_monotonic (EV_A); 1243 time_update_monotonic (EV_A);
1152 else 1244 else
1153#endif 1245#endif
1154 { 1246 {
1155 rt_now = ev_time (); 1247 ev_rt_now = ev_time ();
1156 mn_now = rt_now; 1248 mn_now = ev_rt_now;
1157 } 1249 }
1158 1250
1159 if (flags & EVLOOP_NONBLOCK || idlecnt) 1251 if (flags & EVLOOP_NONBLOCK || idlecnt)
1160 block = 0.; 1252 block = 0.;
1161 else 1253 else
… …
1166 { 1258 {
1167 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1259 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1168 if (block > to) block = to; 1260 if (block > to) block = to;
1169 } 1261 }
1170 1262
1263#if EV_PERIODICS
1171 if (periodiccnt) 1264 if (periodiccnt)
1172 { 1265 {
1173 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1266 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1174 if (block > to) block = to; 1267 if (block > to) block = to;
1175 } 1268 }
1269#endif
1176 1270
1177 if (block < 0.) block = 0.; 1271 if (expect_false (block < 0.)) block = 0.;
1178 } 1272 }
1179 1273
1180 method_poll (EV_A_ block); 1274 method_poll (EV_A_ block);
1181 1275
1182 /* update rt_now, do magic */ 1276 /* update ev_rt_now, do magic */
1183 time_update (EV_A); 1277 time_update (EV_A);
1184 1278
1185 /* queue pending timers and reschedule them */ 1279 /* queue pending timers and reschedule them */
1186 timers_reify (EV_A); /* relative timers called last */ 1280 timers_reify (EV_A); /* relative timers called last */
1281#if EV_PERIODICS
1187 periodics_reify (EV_A); /* absolute timers called first */ 1282 periodics_reify (EV_A); /* absolute timers called first */
1283#endif
1188 1284
1189 /* queue idle watchers unless io or timers are pending */ 1285 /* queue idle watchers unless io or timers are pending */
1190 if (idlecnt && !any_pending (EV_A)) 1286 if (idlecnt && !any_pending (EV_A))
1191 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1287 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1192 1288
1193 /* queue check watchers, to be executed first */ 1289 /* queue check watchers, to be executed first */
1194 if (checkcnt) 1290 if (expect_false (checkcnt))
1195 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1291 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1196 1292
1197 call_pending (EV_A); 1293 call_pending (EV_A);
1294
1295 if (expect_false (loop_done))
1296 break;
1198 } 1297 }
1199 while (activecnt && !loop_done);
1200 1298
1201 if (loop_done != 2) 1299 if (loop_done != 2)
1202 loop_done = 0; 1300 loop_done = 0;
1203} 1301}
1204 1302
… …
1264void 1362void
1265ev_io_start (EV_P_ struct ev_io *w) 1363ev_io_start (EV_P_ struct ev_io *w)
1266{ 1364{
1267 int fd = w->fd; 1365 int fd = w->fd;
1268 1366
1269 if (ev_is_active (w)) 1367 if (expect_false (ev_is_active (w)))
1270 return; 1368 return;
1271 1369
1272 assert (("ev_io_start called with negative fd", fd >= 0)); 1370 assert (("ev_io_start called with negative fd", fd >= 0));
1273 1371
1274 ev_start (EV_A_ (W)w, 1); 1372 ev_start (EV_A_ (W)w, 1);
… …
1280 1378
1281void 1379void
1282ev_io_stop (EV_P_ struct ev_io *w) 1380ev_io_stop (EV_P_ struct ev_io *w)
1283{ 1381{
1284 ev_clear_pending (EV_A_ (W)w); 1382 ev_clear_pending (EV_A_ (W)w);
1285 if (!ev_is_active (w)) 1383 if (expect_false (!ev_is_active (w)))
1286 return; 1384 return;
1385
1386 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1287 1387
1288 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1388 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1289 ev_stop (EV_A_ (W)w); 1389 ev_stop (EV_A_ (W)w);
1290 1390
1291 fd_change (EV_A_ w->fd); 1391 fd_change (EV_A_ w->fd);
1292} 1392}
1293 1393
1294void 1394void
1295ev_timer_start (EV_P_ struct ev_timer *w) 1395ev_timer_start (EV_P_ struct ev_timer *w)
1296{ 1396{
1297 if (ev_is_active (w)) 1397 if (expect_false (ev_is_active (w)))
1298 return; 1398 return;
1299 1399
1300 ((WT)w)->at += mn_now; 1400 ((WT)w)->at += mn_now;
1301 1401
1302 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1402 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1303 1403
1304 ev_start (EV_A_ (W)w, ++timercnt); 1404 ev_start (EV_A_ (W)w, ++timercnt);
1305 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1405 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1306 timers [timercnt - 1] = w; 1406 timers [timercnt - 1] = w;
1307 upheap ((WT *)timers, timercnt - 1); 1407 upheap ((WT *)timers, timercnt - 1);
1308 1408
1309 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1409 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1310} 1410}
1311 1411
1312void 1412void
1313ev_timer_stop (EV_P_ struct ev_timer *w) 1413ev_timer_stop (EV_P_ struct ev_timer *w)
1314{ 1414{
1315 ev_clear_pending (EV_A_ (W)w); 1415 ev_clear_pending (EV_A_ (W)w);
1316 if (!ev_is_active (w)) 1416 if (expect_false (!ev_is_active (w)))
1317 return; 1417 return;
1318 1418
1319 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1419 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1320 1420
1321 if (((W)w)->active < timercnt--) 1421 if (expect_true (((W)w)->active < timercnt--))
1322 { 1422 {
1323 timers [((W)w)->active - 1] = timers [timercnt]; 1423 timers [((W)w)->active - 1] = timers [timercnt];
1324 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1424 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1325 } 1425 }
1326 1426
1327 ((WT)w)->at = w->repeat; 1427 ((WT)w)->at -= mn_now;
1328 1428
1329 ev_stop (EV_A_ (W)w); 1429 ev_stop (EV_A_ (W)w);
1330} 1430}
1331 1431
1332void 1432void
1333ev_timer_again (EV_P_ struct ev_timer *w) 1433ev_timer_again (EV_P_ struct ev_timer *w)
1334{ 1434{
1335 if (ev_is_active (w)) 1435 if (ev_is_active (w))
1336 { 1436 {
1337 if (w->repeat) 1437 if (w->repeat)
1438 {
1439 ((WT)w)->at = mn_now + w->repeat;
1338 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1440 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1441 }
1339 else 1442 else
1340 ev_timer_stop (EV_A_ w); 1443 ev_timer_stop (EV_A_ w);
1341 } 1444 }
1342 else if (w->repeat) 1445 else if (w->repeat)
1446 {
1447 w->at = w->repeat;
1343 ev_timer_start (EV_A_ w); 1448 ev_timer_start (EV_A_ w);
1449 }
1344} 1450}
1345 1451
1452#if EV_PERIODICS
1346void 1453void
1347ev_periodic_start (EV_P_ struct ev_periodic *w) 1454ev_periodic_start (EV_P_ struct ev_periodic *w)
1348{ 1455{
1349 if (ev_is_active (w)) 1456 if (expect_false (ev_is_active (w)))
1350 return; 1457 return;
1351 1458
1352 if (w->reschedule_cb) 1459 if (w->reschedule_cb)
1353 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1460 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1354 else if (w->interval) 1461 else if (w->interval)
1355 { 1462 {
1356 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1463 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1357 /* this formula differs from the one in periodic_reify because we do not always round up */ 1464 /* this formula differs from the one in periodic_reify because we do not always round up */
1358 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1465 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1359 } 1466 }
1360 1467
1361 ev_start (EV_A_ (W)w, ++periodiccnt); 1468 ev_start (EV_A_ (W)w, ++periodiccnt);
1362 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1469 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1363 periodics [periodiccnt - 1] = w; 1470 periodics [periodiccnt - 1] = w;
1364 upheap ((WT *)periodics, periodiccnt - 1); 1471 upheap ((WT *)periodics, periodiccnt - 1);
1365 1472
1366 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1473 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1367} 1474}
1368 1475
1369void 1476void
1370ev_periodic_stop (EV_P_ struct ev_periodic *w) 1477ev_periodic_stop (EV_P_ struct ev_periodic *w)
1371{ 1478{
1372 ev_clear_pending (EV_A_ (W)w); 1479 ev_clear_pending (EV_A_ (W)w);
1373 if (!ev_is_active (w)) 1480 if (expect_false (!ev_is_active (w)))
1374 return; 1481 return;
1375 1482
1376 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1483 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1377 1484
1378 if (((W)w)->active < periodiccnt--) 1485 if (expect_true (((W)w)->active < periodiccnt--))
1379 { 1486 {
1380 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1487 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1381 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1488 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1382 } 1489 }
1383 1490
1384 ev_stop (EV_A_ (W)w); 1491 ev_stop (EV_A_ (W)w);
1385} 1492}
1386 1493
… …
1389{ 1496{
1390 /* TODO: use adjustheap and recalculation */ 1497 /* TODO: use adjustheap and recalculation */
1391 ev_periodic_stop (EV_A_ w); 1498 ev_periodic_stop (EV_A_ w);
1392 ev_periodic_start (EV_A_ w); 1499 ev_periodic_start (EV_A_ w);
1393} 1500}
1501#endif
1394 1502
1395void 1503void
1396ev_idle_start (EV_P_ struct ev_idle *w) 1504ev_idle_start (EV_P_ struct ev_idle *w)
1397{ 1505{
1398 if (ev_is_active (w)) 1506 if (expect_false (ev_is_active (w)))
1399 return; 1507 return;
1400 1508
1401 ev_start (EV_A_ (W)w, ++idlecnt); 1509 ev_start (EV_A_ (W)w, ++idlecnt);
1402 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); 1510 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1403 idles [idlecnt - 1] = w; 1511 idles [idlecnt - 1] = w;
1404} 1512}
1405 1513
1406void 1514void
1407ev_idle_stop (EV_P_ struct ev_idle *w) 1515ev_idle_stop (EV_P_ struct ev_idle *w)
1408{ 1516{
1409 ev_clear_pending (EV_A_ (W)w); 1517 ev_clear_pending (EV_A_ (W)w);
1410 if (ev_is_active (w)) 1518 if (expect_false (!ev_is_active (w)))
1411 return; 1519 return;
1412 1520
1413 idles [((W)w)->active - 1] = idles [--idlecnt]; 1521 idles [((W)w)->active - 1] = idles [--idlecnt];
1414 ev_stop (EV_A_ (W)w); 1522 ev_stop (EV_A_ (W)w);
1415} 1523}
1416 1524
1417void 1525void
1418ev_prepare_start (EV_P_ struct ev_prepare *w) 1526ev_prepare_start (EV_P_ struct ev_prepare *w)
1419{ 1527{
1420 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1421 return; 1529 return;
1422 1530
1423 ev_start (EV_A_ (W)w, ++preparecnt); 1531 ev_start (EV_A_ (W)w, ++preparecnt);
1424 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); 1532 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1425 prepares [preparecnt - 1] = w; 1533 prepares [preparecnt - 1] = w;
1426} 1534}
1427 1535
1428void 1536void
1429ev_prepare_stop (EV_P_ struct ev_prepare *w) 1537ev_prepare_stop (EV_P_ struct ev_prepare *w)
1430{ 1538{
1431 ev_clear_pending (EV_A_ (W)w); 1539 ev_clear_pending (EV_A_ (W)w);
1432 if (ev_is_active (w)) 1540 if (expect_false (!ev_is_active (w)))
1433 return; 1541 return;
1434 1542
1435 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1543 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1436 ev_stop (EV_A_ (W)w); 1544 ev_stop (EV_A_ (W)w);
1437} 1545}
1438 1546
1439void 1547void
1440ev_check_start (EV_P_ struct ev_check *w) 1548ev_check_start (EV_P_ struct ev_check *w)
1441{ 1549{
1442 if (ev_is_active (w)) 1550 if (expect_false (ev_is_active (w)))
1443 return; 1551 return;
1444 1552
1445 ev_start (EV_A_ (W)w, ++checkcnt); 1553 ev_start (EV_A_ (W)w, ++checkcnt);
1446 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); 1554 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1447 checks [checkcnt - 1] = w; 1555 checks [checkcnt - 1] = w;
1448} 1556}
1449 1557
1450void 1558void
1451ev_check_stop (EV_P_ struct ev_check *w) 1559ev_check_stop (EV_P_ struct ev_check *w)
1452{ 1560{
1453 ev_clear_pending (EV_A_ (W)w); 1561 ev_clear_pending (EV_A_ (W)w);
1454 if (ev_is_active (w)) 1562 if (expect_false (!ev_is_active (w)))
1455 return; 1563 return;
1456 1564
1457 checks [((W)w)->active - 1] = checks [--checkcnt]; 1565 checks [((W)w)->active - 1] = checks [--checkcnt];
1458 ev_stop (EV_A_ (W)w); 1566 ev_stop (EV_A_ (W)w);
1459} 1567}
… …
1464 1572
1465void 1573void
1466ev_signal_start (EV_P_ struct ev_signal *w) 1574ev_signal_start (EV_P_ struct ev_signal *w)
1467{ 1575{
1468#if EV_MULTIPLICITY 1576#if EV_MULTIPLICITY
1469 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1577 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1470#endif 1578#endif
1471 if (ev_is_active (w)) 1579 if (expect_false (ev_is_active (w)))
1472 return; 1580 return;
1473 1581
1474 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1582 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1475 1583
1476 ev_start (EV_A_ (W)w, 1); 1584 ev_start (EV_A_ (W)w, 1);
1477 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1585 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1478 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1586 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1479 1587
1480 if (!((WL)w)->next) 1588 if (!((WL)w)->next)
1481 { 1589 {
1482#if WIN32 1590#if _WIN32
1483 signal (w->signum, sighandler); 1591 signal (w->signum, sighandler);
1484#else 1592#else
1485 struct sigaction sa; 1593 struct sigaction sa;
1486 sa.sa_handler = sighandler; 1594 sa.sa_handler = sighandler;
1487 sigfillset (&sa.sa_mask); 1595 sigfillset (&sa.sa_mask);
… …
1493 1601
1494void 1602void
1495ev_signal_stop (EV_P_ struct ev_signal *w) 1603ev_signal_stop (EV_P_ struct ev_signal *w)
1496{ 1604{
1497 ev_clear_pending (EV_A_ (W)w); 1605 ev_clear_pending (EV_A_ (W)w);
1498 if (!ev_is_active (w)) 1606 if (expect_false (!ev_is_active (w)))
1499 return; 1607 return;
1500 1608
1501 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1609 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1502 ev_stop (EV_A_ (W)w); 1610 ev_stop (EV_A_ (W)w);
1503 1611
… …
1507 1615
1508void 1616void
1509ev_child_start (EV_P_ struct ev_child *w) 1617ev_child_start (EV_P_ struct ev_child *w)
1510{ 1618{
1511#if EV_MULTIPLICITY 1619#if EV_MULTIPLICITY
1512 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1620 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1513#endif 1621#endif
1514 if (ev_is_active (w)) 1622 if (expect_false (ev_is_active (w)))
1515 return; 1623 return;
1516 1624
1517 ev_start (EV_A_ (W)w, 1); 1625 ev_start (EV_A_ (W)w, 1);
1518 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1626 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1519} 1627}
1520 1628
1521void 1629void
1522ev_child_stop (EV_P_ struct ev_child *w) 1630ev_child_stop (EV_P_ struct ev_child *w)
1523{ 1631{
1524 ev_clear_pending (EV_A_ (W)w); 1632 ev_clear_pending (EV_A_ (W)w);
1525 if (ev_is_active (w)) 1633 if (expect_false (!ev_is_active (w)))
1526 return; 1634 return;
1527 1635
1528 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1636 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1529 ev_stop (EV_A_ (W)w); 1637 ev_stop (EV_A_ (W)w);
1530} 1638}
… …
1567void 1675void
1568ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1676ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1569{ 1677{
1570 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 1678 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1571 1679
1572 if (!once) 1680 if (expect_false (!once))
1681 {
1573 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1682 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1574 else 1683 return;
1575 { 1684 }
1685
1576 once->cb = cb; 1686 once->cb = cb;
1577 once->arg = arg; 1687 once->arg = arg;
1578 1688
1579 ev_init (&once->io, once_cb_io); 1689 ev_init (&once->io, once_cb_io);
1580 if (fd >= 0) 1690 if (fd >= 0)
1581 { 1691 {
1582 ev_io_set (&once->io, fd, events); 1692 ev_io_set (&once->io, fd, events);
1583 ev_io_start (EV_A_ &once->io); 1693 ev_io_start (EV_A_ &once->io);
1584 } 1694 }
1585 1695
1586 ev_init (&once->to, once_cb_to); 1696 ev_init (&once->to, once_cb_to);
1587 if (timeout >= 0.) 1697 if (timeout >= 0.)
1588 { 1698 {
1589 ev_timer_set (&once->to, timeout, 0.); 1699 ev_timer_set (&once->to, timeout, 0.);
1590 ev_timer_start (EV_A_ &once->to); 1700 ev_timer_start (EV_A_ &once->to);
1591 }
1592 } 1701 }
1593} 1702}
1594 1703
1704#ifdef __cplusplus
1705}
1706#endif
1707

Diff Legend

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