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

Comparing libev/ev.c (file contents):
Revision 1.75 by root, Tue Nov 6 19:29:20 2007 UTC vs.
Revision 1.128 by root, Thu Nov 22 12:28:27 2007 UTC

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

Diff Legend

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