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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines