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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines