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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines