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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines