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

Diff Legend

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