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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines