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

Comparing libev/ev.c (file contents):
Revision 1.76 by root, Wed Nov 7 18:47:26 2007 UTC vs.
Revision 1.126 by root, Sun Nov 18 01:25:23 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines