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

Comparing libev/ev.c (file contents):
Revision 1.70 by root, Tue Nov 6 00:52:32 2007 UTC vs.
Revision 1.110 by root, Mon Nov 12 05:56:49 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 EMPTY /* required for microsofts broken pseudo-c compiler */
173
144typedef struct ev_watcher *W; 174typedef struct ev_watcher *W;
145typedef struct ev_watcher_list *WL; 175typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 176typedef struct ev_watcher_time *WT;
147 177
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 178static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 179
150#if WIN32 180#ifdef _WIN32
151/* note: the comment below could not be substantiated, but what would I care */ 181# include "ev_win32.c"
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif 182#endif
155 183
156/*****************************************************************************/ 184/*****************************************************************************/
157 185
158static void (*syserr_cb)(const char *msg); 186static void (*syserr_cb)(const char *msg);
206typedef struct 234typedef struct
207{ 235{
208 WL head; 236 WL head;
209 unsigned char events; 237 unsigned char events;
210 unsigned char reify; 238 unsigned char reify;
239#if EV_SELECT_IS_WINSOCKET
240 SOCKET handle;
241#endif
211} ANFD; 242} ANFD;
212 243
213typedef struct 244typedef struct
214{ 245{
215 W w; 246 W w;
216 int events; 247 int events;
217} ANPENDING; 248} ANPENDING;
218 249
219#if EV_MULTIPLICITY 250#if EV_MULTIPLICITY
220 251
221struct ev_loop 252 struct ev_loop
222{ 253 {
254 ev_tstamp ev_rt_now;
255 #define ev_rt_now ((loop)->ev_rt_now)
223# define VAR(name,decl) decl; 256 #define VAR(name,decl) decl;
224# include "ev_vars.h" 257 #include "ev_vars.h"
225};
226# undef VAR 258 #undef VAR
259 };
227# include "ev_wrap.h" 260 #include "ev_wrap.h"
261
262 struct ev_loop default_loop_struct;
263 static struct ev_loop *default_loop;
228 264
229#else 265#else
230 266
267 ev_tstamp ev_rt_now;
231# define VAR(name,decl) static decl; 268 #define VAR(name,decl) static decl;
232# include "ev_vars.h" 269 #include "ev_vars.h"
233# undef VAR 270 #undef VAR
271
272 static int default_loop;
234 273
235#endif 274#endif
236 275
237/*****************************************************************************/ 276/*****************************************************************************/
238 277
239inline ev_tstamp 278ev_tstamp
240ev_time (void) 279ev_time (void)
241{ 280{
242#if EV_USE_REALTIME 281#if EV_USE_REALTIME
243 struct timespec ts; 282 struct timespec ts;
244 clock_gettime (CLOCK_REALTIME, &ts); 283 clock_gettime (CLOCK_REALTIME, &ts);
263#endif 302#endif
264 303
265 return ev_time (); 304 return ev_time ();
266} 305}
267 306
307#if EV_MULTIPLICITY
268ev_tstamp 308ev_tstamp
269ev_now (EV_P) 309ev_now (EV_P)
270{ 310{
271 return rt_now; 311 return ev_rt_now;
272} 312}
313#endif
273 314
274#define array_roundsize(base,n) ((n) | 4 & ~3) 315#define array_roundsize(type,n) (((n) | 4) & ~3)
275 316
276#define array_needsize(base,cur,cnt,init) \ 317#define array_needsize(type,base,cur,cnt,init) \
277 if (expect_false ((cnt) > cur)) \ 318 if (expect_false ((cnt) > cur)) \
278 { \ 319 { \
279 int newcnt = cur; \ 320 int newcnt = cur; \
280 do \ 321 do \
281 { \ 322 { \
282 newcnt = array_roundsize (base, newcnt << 1); \ 323 newcnt = array_roundsize (type, newcnt << 1); \
283 } \ 324 } \
284 while ((cnt) > newcnt); \ 325 while ((cnt) > newcnt); \
285 \ 326 \
286 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 327 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
287 init (base + cur, newcnt - cur); \ 328 init (base + cur, newcnt - cur); \
288 cur = newcnt; \ 329 cur = newcnt; \
289 } 330 }
290 331
291#define array_slim(stem) \ 332#define array_slim(type,stem) \
292 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 333 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
293 { \ 334 { \
294 stem ## max = array_roundsize (stem ## cnt >> 1); \ 335 stem ## max = array_roundsize (stem ## cnt >> 1); \
295 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 336 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
296 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 337 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
297 } 338 }
298 339
299#define array_free(stem, idx) \ 340#define array_free(stem, idx) \
300 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 341 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
312 353
313 ++base; 354 ++base;
314 } 355 }
315} 356}
316 357
317static void 358void
318event (EV_P_ W w, int events) 359ev_feed_event (EV_P_ void *w, int revents)
319{ 360{
361 W w_ = (W)w;
362
320 if (w->pending) 363 if (w_->pending)
321 { 364 {
322 pendings [ABSPRI (w)][w->pending - 1].events |= events; 365 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
323 return; 366 return;
324 } 367 }
325 368
326 w->pending = ++pendingcnt [ABSPRI (w)]; 369 w_->pending = ++pendingcnt [ABSPRI (w_)];
327 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 370 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
328 pendings [ABSPRI (w)][w->pending - 1].w = w; 371 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
329 pendings [ABSPRI (w)][w->pending - 1].events = events; 372 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
330} 373}
331 374
332static void 375static void
333queue_events (EV_P_ W *events, int eventcnt, int type) 376queue_events (EV_P_ W *events, int eventcnt, int type)
334{ 377{
335 int i; 378 int i;
336 379
337 for (i = 0; i < eventcnt; ++i) 380 for (i = 0; i < eventcnt; ++i)
338 event (EV_A_ events [i], type); 381 ev_feed_event (EV_A_ events [i], type);
339} 382}
340 383
341static void 384inline void
342fd_event (EV_P_ int fd, int events) 385fd_event (EV_P_ int fd, int revents)
343{ 386{
344 ANFD *anfd = anfds + fd; 387 ANFD *anfd = anfds + fd;
345 struct ev_io *w; 388 struct ev_io *w;
346 389
347 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 390 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
348 { 391 {
349 int ev = w->events & events; 392 int ev = w->events & revents;
350 393
351 if (ev) 394 if (ev)
352 event (EV_A_ (W)w, ev); 395 ev_feed_event (EV_A_ (W)w, ev);
353 } 396 }
397}
398
399void
400ev_feed_fd_event (EV_P_ int fd, int revents)
401{
402 fd_event (EV_A_ fd, revents);
354} 403}
355 404
356/*****************************************************************************/ 405/*****************************************************************************/
357 406
358static void 407static void
369 int events = 0; 418 int events = 0;
370 419
371 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 420 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
372 events |= w->events; 421 events |= w->events;
373 422
423#if EV_SELECT_IS_WINSOCKET
424 if (events)
425 {
426 unsigned long argp;
427 anfd->handle = _get_osfhandle (fd);
428 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
429 }
430#endif
431
374 anfd->reify = 0; 432 anfd->reify = 0;
375 433
376 method_modify (EV_A_ fd, anfd->events, events); 434 method_modify (EV_A_ fd, anfd->events, events);
377 anfd->events = events; 435 anfd->events = events;
378 } 436 }
387 return; 445 return;
388 446
389 anfds [fd].reify = 1; 447 anfds [fd].reify = 1;
390 448
391 ++fdchangecnt; 449 ++fdchangecnt;
392 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 450 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
393 fdchanges [fdchangecnt - 1] = fd; 451 fdchanges [fdchangecnt - 1] = fd;
394} 452}
395 453
396static void 454static void
397fd_kill (EV_P_ int fd) 455fd_kill (EV_P_ int fd)
399 struct ev_io *w; 457 struct ev_io *w;
400 458
401 while ((w = (struct ev_io *)anfds [fd].head)) 459 while ((w = (struct ev_io *)anfds [fd].head))
402 { 460 {
403 ev_io_stop (EV_A_ w); 461 ev_io_stop (EV_A_ w);
404 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 462 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
405 } 463 }
464}
465
466static int
467fd_valid (int fd)
468{
469#ifdef _WIN32
470 return _get_osfhandle (fd) != -1;
471#else
472 return fcntl (fd, F_GETFD) != -1;
473#endif
406} 474}
407 475
408/* called on EBADF to verify fds */ 476/* called on EBADF to verify fds */
409static void 477static void
410fd_ebadf (EV_P) 478fd_ebadf (EV_P)
411{ 479{
412 int fd; 480 int fd;
413 481
414 for (fd = 0; fd < anfdmax; ++fd) 482 for (fd = 0; fd < anfdmax; ++fd)
415 if (anfds [fd].events) 483 if (anfds [fd].events)
416 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 484 if (!fd_valid (fd) == -1 && errno == EBADF)
417 fd_kill (EV_A_ fd); 485 fd_kill (EV_A_ fd);
418} 486}
419 487
420/* called on ENOMEM in select/poll to kill some fds and retry */ 488/* called on ENOMEM in select/poll to kill some fds and retry */
421static void 489static void
487 555
488 heap [k] = w; 556 heap [k] = w;
489 ((W)heap [k])->active = k + 1; 557 ((W)heap [k])->active = k + 1;
490} 558}
491 559
560inline void
561adjustheap (WT *heap, int N, int k)
562{
563 upheap (heap, k);
564 downheap (heap, N, k);
565}
566
492/*****************************************************************************/ 567/*****************************************************************************/
493 568
494typedef struct 569typedef struct
495{ 570{
496 WL head; 571 WL head;
517} 592}
518 593
519static void 594static void
520sighandler (int signum) 595sighandler (int signum)
521{ 596{
522#if WIN32 597#if _WIN32
523 signal (signum, sighandler); 598 signal (signum, sighandler);
524#endif 599#endif
525 600
526 signals [signum - 1].gotsig = 1; 601 signals [signum - 1].gotsig = 1;
527 602
532 write (sigpipe [1], &signum, 1); 607 write (sigpipe [1], &signum, 1);
533 errno = old_errno; 608 errno = old_errno;
534 } 609 }
535} 610}
536 611
612void
613ev_feed_signal_event (EV_P_ int signum)
614{
615 WL w;
616
617#if EV_MULTIPLICITY
618 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
619#endif
620
621 --signum;
622
623 if (signum < 0 || signum >= signalmax)
624 return;
625
626 signals [signum].gotsig = 0;
627
628 for (w = signals [signum].head; w; w = w->next)
629 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
630}
631
537static void 632static void
538sigcb (EV_P_ struct ev_io *iow, int revents) 633sigcb (EV_P_ struct ev_io *iow, int revents)
539{ 634{
540 WL w;
541 int signum; 635 int signum;
542 636
543 read (sigpipe [0], &revents, 1); 637 read (sigpipe [0], &revents, 1);
544 gotsig = 0; 638 gotsig = 0;
545 639
546 for (signum = signalmax; signum--; ) 640 for (signum = signalmax; signum--; )
547 if (signals [signum].gotsig) 641 if (signals [signum].gotsig)
548 { 642 ev_feed_signal_event (EV_A_ signum + 1);
549 signals [signum].gotsig = 0; 643}
550 644
551 for (w = signals [signum].head; w; w = w->next) 645inline void
552 event (EV_A_ (W)w, EV_SIGNAL); 646fd_intern (int fd)
553 } 647{
648#ifdef _WIN32
649 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
651#else
652 fcntl (fd, F_SETFD, FD_CLOEXEC);
653 fcntl (fd, F_SETFL, O_NONBLOCK);
654#endif
554} 655}
555 656
556static void 657static void
557siginit (EV_P) 658siginit (EV_P)
558{ 659{
559#ifndef WIN32 660 fd_intern (sigpipe [0]);
560 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 661 fd_intern (sigpipe [1]);
561 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
562
563 /* rather than sort out wether we really need nb, set it */
564 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
565 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
566#endif
567 662
568 ev_io_set (&sigev, sigpipe [0], EV_READ); 663 ev_io_set (&sigev, sigpipe [0], EV_READ);
569 ev_io_start (EV_A_ &sigev); 664 ev_io_start (EV_A_ &sigev);
570 ev_unref (EV_A); /* child watcher should not keep loop alive */ 665 ev_unref (EV_A); /* child watcher should not keep loop alive */
571} 666}
572 667
573/*****************************************************************************/ 668/*****************************************************************************/
574 669
575#ifndef WIN32
576
577static struct ev_child *childs [PID_HASHSIZE]; 670static struct ev_child *childs [PID_HASHSIZE];
671
672#ifndef _WIN32
673
578static struct ev_signal childev; 674static struct ev_signal childev;
579 675
580#ifndef WCONTINUED 676#ifndef WCONTINUED
581# define WCONTINUED 0 677# define WCONTINUED 0
582#endif 678#endif
590 if (w->pid == pid || !w->pid) 686 if (w->pid == pid || !w->pid)
591 { 687 {
592 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 688 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
593 w->rpid = pid; 689 w->rpid = pid;
594 w->rstatus = status; 690 w->rstatus = status;
595 event (EV_A_ (W)w, EV_CHILD); 691 ev_feed_event (EV_A_ (W)w, EV_CHILD);
596 } 692 }
597} 693}
598 694
599static void 695static void
600childcb (EV_P_ struct ev_signal *sw, int revents) 696childcb (EV_P_ struct ev_signal *sw, int revents)
602 int pid, status; 698 int pid, status;
603 699
604 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 700 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
605 { 701 {
606 /* make sure we are called again until all childs have been reaped */ 702 /* make sure we are called again until all childs have been reaped */
607 event (EV_A_ (W)sw, EV_SIGNAL); 703 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
608 704
609 child_reap (EV_A_ sw, pid, pid, status); 705 child_reap (EV_A_ sw, pid, pid, status);
610 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 706 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
611 } 707 }
612} 708}
642 738
643/* return true if we are running with elevated privileges and should ignore env variables */ 739/* return true if we are running with elevated privileges and should ignore env variables */
644static int 740static int
645enable_secure (void) 741enable_secure (void)
646{ 742{
647#ifdef WIN32 743#ifdef _WIN32
648 return 0; 744 return 0;
649#else 745#else
650 return getuid () != geteuid () 746 return getuid () != geteuid ()
651 || getgid () != getegid (); 747 || getgid () != getegid ();
652#endif 748#endif
657{ 753{
658 return method; 754 return method;
659} 755}
660 756
661static void 757static void
662loop_init (EV_P_ int methods) 758loop_init (EV_P_ unsigned int flags)
663{ 759{
664 if (!method) 760 if (!method)
665 { 761 {
666#if EV_USE_MONOTONIC 762#if EV_USE_MONOTONIC
667 { 763 {
669 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 765 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
670 have_monotonic = 1; 766 have_monotonic = 1;
671 } 767 }
672#endif 768#endif
673 769
674 rt_now = ev_time (); 770 ev_rt_now = ev_time ();
675 mn_now = get_clock (); 771 mn_now = get_clock ();
676 now_floor = mn_now; 772 now_floor = mn_now;
677 rtmn_diff = rt_now - mn_now; 773 rtmn_diff = ev_rt_now - mn_now;
678 774
679 if (methods == EVMETHOD_AUTO) 775 if (!(flags & EVMETHOD_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
680 if (!enable_secure () && getenv ("LIBEV_METHODS"))
681 methods = atoi (getenv ("LIBEV_METHODS")); 776 flags = atoi (getenv ("LIBEV_FLAGS"));
682 else 777
683 methods = EVMETHOD_ANY; 778 if (!(flags & 0x0000ffff))
779 flags |= 0x0000ffff;
684 780
685 method = 0; 781 method = 0;
686#if EV_USE_WIN32
687 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
688#endif
689#if EV_USE_KQUEUE 782#if EV_USE_KQUEUE
690 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 783 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
691#endif 784#endif
692#if EV_USE_EPOLL 785#if EV_USE_EPOLL
693 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 786 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
694#endif 787#endif
695#if EV_USE_POLL 788#if EV_USE_POLL
696 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 789 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
697#endif 790#endif
698#if EV_USE_SELECT 791#if EV_USE_SELECT
699 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 792 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
700#endif 793#endif
701 794
702 ev_watcher_init (&sigev, sigcb); 795 ev_init (&sigev, sigcb);
703 ev_set_priority (&sigev, EV_MAXPRI); 796 ev_set_priority (&sigev, EV_MAXPRI);
704 } 797 }
705} 798}
706 799
707void 800void
708loop_destroy (EV_P) 801loop_destroy (EV_P)
709{ 802{
710 int i; 803 int i;
711 804
712#if EV_USE_WIN32
713 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
714#endif
715#if EV_USE_KQUEUE 805#if EV_USE_KQUEUE
716 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
717#endif 807#endif
718#if EV_USE_EPOLL 808#if EV_USE_EPOLL
719 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
726#endif 816#endif
727 817
728 for (i = NUMPRI; i--; ) 818 for (i = NUMPRI; i--; )
729 array_free (pending, [i]); 819 array_free (pending, [i]);
730 820
821 /* have to use the microsoft-never-gets-it-right macro */
731 array_free (fdchange, ); 822 array_free (fdchange, EMPTY);
732 array_free (timer, ); 823 array_free (timer, EMPTY);
824#if EV_PERIODICS
733 array_free (periodic, ); 825 array_free (periodic, EMPTY);
826#endif
734 array_free (idle, ); 827 array_free (idle, EMPTY);
735 array_free (prepare, ); 828 array_free (prepare, EMPTY);
736 array_free (check, ); 829 array_free (check, EMPTY);
737 830
738 method = 0; 831 method = 0;
739} 832}
740 833
741static void 834static void
766 postfork = 0; 859 postfork = 0;
767} 860}
768 861
769#if EV_MULTIPLICITY 862#if EV_MULTIPLICITY
770struct ev_loop * 863struct ev_loop *
771ev_loop_new (int methods) 864ev_loop_new (unsigned int flags)
772{ 865{
773 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 866 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
774 867
775 memset (loop, 0, sizeof (struct ev_loop)); 868 memset (loop, 0, sizeof (struct ev_loop));
776 869
777 loop_init (EV_A_ methods); 870 loop_init (EV_A_ flags);
778 871
779 if (ev_method (EV_A)) 872 if (ev_method (EV_A))
780 return loop; 873 return loop;
781 874
782 return 0; 875 return 0;
796} 889}
797 890
798#endif 891#endif
799 892
800#if EV_MULTIPLICITY 893#if EV_MULTIPLICITY
801struct ev_loop default_loop_struct;
802static struct ev_loop *default_loop;
803
804struct ev_loop * 894struct ev_loop *
805#else 895#else
806static int default_loop;
807
808int 896int
809#endif 897#endif
810ev_default_loop (int methods) 898ev_default_loop (unsigned int flags)
811{ 899{
812 if (sigpipe [0] == sigpipe [1]) 900 if (sigpipe [0] == sigpipe [1])
813 if (pipe (sigpipe)) 901 if (pipe (sigpipe))
814 return 0; 902 return 0;
815 903
819 struct ev_loop *loop = default_loop = &default_loop_struct; 907 struct ev_loop *loop = default_loop = &default_loop_struct;
820#else 908#else
821 default_loop = 1; 909 default_loop = 1;
822#endif 910#endif
823 911
824 loop_init (EV_A_ methods); 912 loop_init (EV_A_ flags);
825 913
826 if (ev_method (EV_A)) 914 if (ev_method (EV_A))
827 { 915 {
828 siginit (EV_A); 916 siginit (EV_A);
829 917
830#ifndef WIN32 918#ifndef _WIN32
831 ev_signal_init (&childev, childcb, SIGCHLD); 919 ev_signal_init (&childev, childcb, SIGCHLD);
832 ev_set_priority (&childev, EV_MAXPRI); 920 ev_set_priority (&childev, EV_MAXPRI);
833 ev_signal_start (EV_A_ &childev); 921 ev_signal_start (EV_A_ &childev);
834 ev_unref (EV_A); /* child watcher should not keep loop alive */ 922 ev_unref (EV_A); /* child watcher should not keep loop alive */
835#endif 923#endif
846{ 934{
847#if EV_MULTIPLICITY 935#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop; 936 struct ev_loop *loop = default_loop;
849#endif 937#endif
850 938
939#ifndef _WIN32
851 ev_ref (EV_A); /* child watcher */ 940 ev_ref (EV_A); /* child watcher */
852 ev_signal_stop (EV_A_ &childev); 941 ev_signal_stop (EV_A_ &childev);
942#endif
853 943
854 ev_ref (EV_A); /* signal watcher */ 944 ev_ref (EV_A); /* signal watcher */
855 ev_io_stop (EV_A_ &sigev); 945 ev_io_stop (EV_A_ &sigev);
856 946
857 close (sigpipe [0]); sigpipe [0] = 0; 947 close (sigpipe [0]); sigpipe [0] = 0;
870 if (method) 960 if (method)
871 postfork = 1; 961 postfork = 1;
872} 962}
873 963
874/*****************************************************************************/ 964/*****************************************************************************/
965
966static int
967any_pending (EV_P)
968{
969 int pri;
970
971 for (pri = NUMPRI; pri--; )
972 if (pendingcnt [pri])
973 return 1;
974
975 return 0;
976}
875 977
876static void 978static void
877call_pending (EV_P) 979call_pending (EV_P)
878{ 980{
879 int pri; 981 int pri;
884 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 986 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
885 987
886 if (p->w) 988 if (p->w)
887 { 989 {
888 p->w->pending = 0; 990 p->w->pending = 0;
889 p->w->cb (EV_A_ p->w, p->events); 991 EV_CB_INVOKE (p->w, p->events);
890 } 992 }
891 } 993 }
892} 994}
893 995
894static void 996static void
902 1004
903 /* first reschedule or stop timer */ 1005 /* first reschedule or stop timer */
904 if (w->repeat) 1006 if (w->repeat)
905 { 1007 {
906 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1008 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1009
907 ((WT)w)->at = mn_now + w->repeat; 1010 ((WT)w)->at += w->repeat;
1011 if (((WT)w)->at < mn_now)
1012 ((WT)w)->at = mn_now;
1013
908 downheap ((WT *)timers, timercnt, 0); 1014 downheap ((WT *)timers, timercnt, 0);
909 } 1015 }
910 else 1016 else
911 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1017 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
912 1018
913 event (EV_A_ (W)w, EV_TIMEOUT); 1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
914 } 1020 }
915} 1021}
916 1022
1023#if EV_PERIODICS
917static void 1024static void
918periodics_reify (EV_P) 1025periodics_reify (EV_P)
919{ 1026{
920 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
921 { 1028 {
922 struct ev_periodic *w = periodics [0]; 1029 struct ev_periodic *w = periodics [0];
923 1030
924 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1031 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
925 1032
926 /* first reschedule or stop timer */ 1033 /* first reschedule or stop timer */
927 if (w->interval) 1034 if (w->reschedule_cb)
928 { 1035 {
1036 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1037 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1038 downheap ((WT *)periodics, periodiccnt, 0);
1039 }
1040 else if (w->interval)
1041 {
929 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1042 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
930 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1043 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
931 downheap ((WT *)periodics, periodiccnt, 0); 1044 downheap ((WT *)periodics, periodiccnt, 0);
932 } 1045 }
933 else 1046 else
934 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1047 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
935 1048
936 event (EV_A_ (W)w, EV_PERIODIC); 1049 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
937 } 1050 }
938} 1051}
939 1052
940static void 1053static void
941periodics_reschedule (EV_P) 1054periodics_reschedule (EV_P)
945 /* adjust periodics after time jump */ 1058 /* adjust periodics after time jump */
946 for (i = 0; i < periodiccnt; ++i) 1059 for (i = 0; i < periodiccnt; ++i)
947 { 1060 {
948 struct ev_periodic *w = periodics [i]; 1061 struct ev_periodic *w = periodics [i];
949 1062
1063 if (w->reschedule_cb)
1064 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
950 if (w->interval) 1065 else if (w->interval)
951 {
952 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1066 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
953
954 if (fabs (diff) >= 1e-4)
955 {
956 ev_periodic_stop (EV_A_ w);
957 ev_periodic_start (EV_A_ w);
958
959 i = 0; /* restart loop, inefficient, but time jumps should be rare */
960 }
961 }
962 } 1067 }
1068
1069 /* now rebuild the heap */
1070 for (i = periodiccnt >> 1; i--; )
1071 downheap ((WT *)periodics, periodiccnt, i);
963} 1072}
1073#endif
964 1074
965inline int 1075inline int
966time_update_monotonic (EV_P) 1076time_update_monotonic (EV_P)
967{ 1077{
968 mn_now = get_clock (); 1078 mn_now = get_clock ();
969 1079
970 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1080 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
971 { 1081 {
972 rt_now = rtmn_diff + mn_now; 1082 ev_rt_now = rtmn_diff + mn_now;
973 return 0; 1083 return 0;
974 } 1084 }
975 else 1085 else
976 { 1086 {
977 now_floor = mn_now; 1087 now_floor = mn_now;
978 rt_now = ev_time (); 1088 ev_rt_now = ev_time ();
979 return 1; 1089 return 1;
980 } 1090 }
981} 1091}
982 1092
983static void 1093static void
992 { 1102 {
993 ev_tstamp odiff = rtmn_diff; 1103 ev_tstamp odiff = rtmn_diff;
994 1104
995 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1105 for (i = 4; --i; ) /* loop a few times, before making important decisions */
996 { 1106 {
997 rtmn_diff = rt_now - mn_now; 1107 rtmn_diff = ev_rt_now - mn_now;
998 1108
999 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1109 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1000 return; /* all is well */ 1110 return; /* all is well */
1001 1111
1002 rt_now = ev_time (); 1112 ev_rt_now = ev_time ();
1003 mn_now = get_clock (); 1113 mn_now = get_clock ();
1004 now_floor = mn_now; 1114 now_floor = mn_now;
1005 } 1115 }
1006 1116
1117# if EV_PERIODICS
1007 periodics_reschedule (EV_A); 1118 periodics_reschedule (EV_A);
1119# endif
1008 /* no timer adjustment, as the monotonic clock doesn't jump */ 1120 /* no timer adjustment, as the monotonic clock doesn't jump */
1009 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1121 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1010 } 1122 }
1011 } 1123 }
1012 else 1124 else
1013#endif 1125#endif
1014 { 1126 {
1015 rt_now = ev_time (); 1127 ev_rt_now = ev_time ();
1016 1128
1017 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1129 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1018 { 1130 {
1131#if EV_PERIODICS
1019 periodics_reschedule (EV_A); 1132 periodics_reschedule (EV_A);
1133#endif
1020 1134
1021 /* adjust timers. this is easy, as the offset is the same for all */ 1135 /* adjust timers. this is easy, as the offset is the same for all */
1022 for (i = 0; i < timercnt; ++i) 1136 for (i = 0; i < timercnt; ++i)
1023 ((WT)timers [i])->at += rt_now - mn_now; 1137 ((WT)timers [i])->at += ev_rt_now - mn_now;
1024 } 1138 }
1025 1139
1026 mn_now = rt_now; 1140 mn_now = ev_rt_now;
1027 } 1141 }
1028} 1142}
1029 1143
1030void 1144void
1031ev_ref (EV_P) 1145ev_ref (EV_P)
1063 /* update fd-related kernel structures */ 1177 /* update fd-related kernel structures */
1064 fd_reify (EV_A); 1178 fd_reify (EV_A);
1065 1179
1066 /* calculate blocking time */ 1180 /* calculate blocking time */
1067 1181
1068 /* we only need this for !monotonic clockor timers, but as we basically 1182 /* we only need this for !monotonic clock or timers, but as we basically
1069 always have timers, we just calculate it always */ 1183 always have timers, we just calculate it always */
1070#if EV_USE_MONOTONIC 1184#if EV_USE_MONOTONIC
1071 if (expect_true (have_monotonic)) 1185 if (expect_true (have_monotonic))
1072 time_update_monotonic (EV_A); 1186 time_update_monotonic (EV_A);
1073 else 1187 else
1074#endif 1188#endif
1075 { 1189 {
1076 rt_now = ev_time (); 1190 ev_rt_now = ev_time ();
1077 mn_now = rt_now; 1191 mn_now = ev_rt_now;
1078 } 1192 }
1079 1193
1080 if (flags & EVLOOP_NONBLOCK || idlecnt) 1194 if (flags & EVLOOP_NONBLOCK || idlecnt)
1081 block = 0.; 1195 block = 0.;
1082 else 1196 else
1087 { 1201 {
1088 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1202 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1089 if (block > to) block = to; 1203 if (block > to) block = to;
1090 } 1204 }
1091 1205
1206#if EV_PERIODICS
1092 if (periodiccnt) 1207 if (periodiccnt)
1093 { 1208 {
1094 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1209 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1095 if (block > to) block = to; 1210 if (block > to) block = to;
1096 } 1211 }
1212#endif
1097 1213
1098 if (block < 0.) block = 0.; 1214 if (block < 0.) block = 0.;
1099 } 1215 }
1100 1216
1101 method_poll (EV_A_ block); 1217 method_poll (EV_A_ block);
1102 1218
1103 /* update rt_now, do magic */ 1219 /* update ev_rt_now, do magic */
1104 time_update (EV_A); 1220 time_update (EV_A);
1105 1221
1106 /* queue pending timers and reschedule them */ 1222 /* queue pending timers and reschedule them */
1107 timers_reify (EV_A); /* relative timers called last */ 1223 timers_reify (EV_A); /* relative timers called last */
1224#if EV_PERIODICS
1108 periodics_reify (EV_A); /* absolute timers called first */ 1225 periodics_reify (EV_A); /* absolute timers called first */
1226#endif
1109 1227
1110 /* queue idle watchers unless io or timers are pending */ 1228 /* queue idle watchers unless io or timers are pending */
1111 if (!pendingcnt) 1229 if (idlecnt && !any_pending (EV_A))
1112 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1230 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1113 1231
1114 /* queue check watchers, to be executed first */ 1232 /* queue check watchers, to be executed first */
1115 if (checkcnt) 1233 if (checkcnt)
1116 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1234 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1191 return; 1309 return;
1192 1310
1193 assert (("ev_io_start called with negative fd", fd >= 0)); 1311 assert (("ev_io_start called with negative fd", fd >= 0));
1194 1312
1195 ev_start (EV_A_ (W)w, 1); 1313 ev_start (EV_A_ (W)w, 1);
1196 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1314 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1197 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1315 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1198 1316
1199 fd_change (EV_A_ fd); 1317 fd_change (EV_A_ fd);
1200} 1318}
1201 1319
1204{ 1322{
1205 ev_clear_pending (EV_A_ (W)w); 1323 ev_clear_pending (EV_A_ (W)w);
1206 if (!ev_is_active (w)) 1324 if (!ev_is_active (w))
1207 return; 1325 return;
1208 1326
1327 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1328
1209 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1329 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1210 ev_stop (EV_A_ (W)w); 1330 ev_stop (EV_A_ (W)w);
1211 1331
1212 fd_change (EV_A_ w->fd); 1332 fd_change (EV_A_ w->fd);
1213} 1333}
1221 ((WT)w)->at += mn_now; 1341 ((WT)w)->at += mn_now;
1222 1342
1223 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1343 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1224 1344
1225 ev_start (EV_A_ (W)w, ++timercnt); 1345 ev_start (EV_A_ (W)w, ++timercnt);
1226 array_needsize (timers, timermax, timercnt, ); 1346 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1227 timers [timercnt - 1] = w; 1347 timers [timercnt - 1] = w;
1228 upheap ((WT *)timers, timercnt - 1); 1348 upheap ((WT *)timers, timercnt - 1);
1229 1349
1230 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1231} 1351}
1240 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1360 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1241 1361
1242 if (((W)w)->active < timercnt--) 1362 if (((W)w)->active < timercnt--)
1243 { 1363 {
1244 timers [((W)w)->active - 1] = timers [timercnt]; 1364 timers [((W)w)->active - 1] = timers [timercnt];
1245 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1246 } 1366 }
1247 1367
1248 ((WT)w)->at = w->repeat; 1368 ((WT)w)->at -= mn_now;
1249 1369
1250 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1251} 1371}
1252 1372
1253void 1373void
1256 if (ev_is_active (w)) 1376 if (ev_is_active (w))
1257 { 1377 {
1258 if (w->repeat) 1378 if (w->repeat)
1259 { 1379 {
1260 ((WT)w)->at = mn_now + w->repeat; 1380 ((WT)w)->at = mn_now + w->repeat;
1261 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1381 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1262 } 1382 }
1263 else 1383 else
1264 ev_timer_stop (EV_A_ w); 1384 ev_timer_stop (EV_A_ w);
1265 } 1385 }
1266 else if (w->repeat) 1386 else if (w->repeat)
1267 ev_timer_start (EV_A_ w); 1387 ev_timer_start (EV_A_ w);
1268} 1388}
1269 1389
1390#if EV_PERIODICS
1270void 1391void
1271ev_periodic_start (EV_P_ struct ev_periodic *w) 1392ev_periodic_start (EV_P_ struct ev_periodic *w)
1272{ 1393{
1273 if (ev_is_active (w)) 1394 if (ev_is_active (w))
1274 return; 1395 return;
1275 1396
1397 if (w->reschedule_cb)
1398 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1399 else if (w->interval)
1400 {
1276 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1401 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1277
1278 /* this formula differs from the one in periodic_reify because we do not always round up */ 1402 /* this formula differs from the one in periodic_reify because we do not always round up */
1279 if (w->interval)
1280 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1403 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1404 }
1281 1405
1282 ev_start (EV_A_ (W)w, ++periodiccnt); 1406 ev_start (EV_A_ (W)w, ++periodiccnt);
1283 array_needsize (periodics, periodicmax, periodiccnt, ); 1407 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1284 periodics [periodiccnt - 1] = w; 1408 periodics [periodiccnt - 1] = w;
1285 upheap ((WT *)periodics, periodiccnt - 1); 1409 upheap ((WT *)periodics, periodiccnt - 1);
1286 1410
1287 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1288} 1412}
1297 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1421 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1298 1422
1299 if (((W)w)->active < periodiccnt--) 1423 if (((W)w)->active < periodiccnt--)
1300 { 1424 {
1301 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1425 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1302 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1426 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1303 } 1427 }
1304 1428
1305 ev_stop (EV_A_ (W)w); 1429 ev_stop (EV_A_ (W)w);
1306} 1430}
1307 1431
1308void 1432void
1433ev_periodic_again (EV_P_ struct ev_periodic *w)
1434{
1435 /* TODO: use adjustheap and recalculation */
1436 ev_periodic_stop (EV_A_ w);
1437 ev_periodic_start (EV_A_ w);
1438}
1439#endif
1440
1441void
1309ev_idle_start (EV_P_ struct ev_idle *w) 1442ev_idle_start (EV_P_ struct ev_idle *w)
1310{ 1443{
1311 if (ev_is_active (w)) 1444 if (ev_is_active (w))
1312 return; 1445 return;
1313 1446
1314 ev_start (EV_A_ (W)w, ++idlecnt); 1447 ev_start (EV_A_ (W)w, ++idlecnt);
1315 array_needsize (idles, idlemax, idlecnt, ); 1448 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1316 idles [idlecnt - 1] = w; 1449 idles [idlecnt - 1] = w;
1317} 1450}
1318 1451
1319void 1452void
1320ev_idle_stop (EV_P_ struct ev_idle *w) 1453ev_idle_stop (EV_P_ struct ev_idle *w)
1321{ 1454{
1322 ev_clear_pending (EV_A_ (W)w); 1455 ev_clear_pending (EV_A_ (W)w);
1323 if (ev_is_active (w)) 1456 if (!ev_is_active (w))
1324 return; 1457 return;
1325 1458
1326 idles [((W)w)->active - 1] = idles [--idlecnt]; 1459 idles [((W)w)->active - 1] = idles [--idlecnt];
1327 ev_stop (EV_A_ (W)w); 1460 ev_stop (EV_A_ (W)w);
1328} 1461}
1332{ 1465{
1333 if (ev_is_active (w)) 1466 if (ev_is_active (w))
1334 return; 1467 return;
1335 1468
1336 ev_start (EV_A_ (W)w, ++preparecnt); 1469 ev_start (EV_A_ (W)w, ++preparecnt);
1337 array_needsize (prepares, preparemax, preparecnt, ); 1470 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1338 prepares [preparecnt - 1] = w; 1471 prepares [preparecnt - 1] = w;
1339} 1472}
1340 1473
1341void 1474void
1342ev_prepare_stop (EV_P_ struct ev_prepare *w) 1475ev_prepare_stop (EV_P_ struct ev_prepare *w)
1343{ 1476{
1344 ev_clear_pending (EV_A_ (W)w); 1477 ev_clear_pending (EV_A_ (W)w);
1345 if (ev_is_active (w)) 1478 if (!ev_is_active (w))
1346 return; 1479 return;
1347 1480
1348 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1481 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1349 ev_stop (EV_A_ (W)w); 1482 ev_stop (EV_A_ (W)w);
1350} 1483}
1354{ 1487{
1355 if (ev_is_active (w)) 1488 if (ev_is_active (w))
1356 return; 1489 return;
1357 1490
1358 ev_start (EV_A_ (W)w, ++checkcnt); 1491 ev_start (EV_A_ (W)w, ++checkcnt);
1359 array_needsize (checks, checkmax, checkcnt, ); 1492 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1360 checks [checkcnt - 1] = w; 1493 checks [checkcnt - 1] = w;
1361} 1494}
1362 1495
1363void 1496void
1364ev_check_stop (EV_P_ struct ev_check *w) 1497ev_check_stop (EV_P_ struct ev_check *w)
1365{ 1498{
1366 ev_clear_pending (EV_A_ (W)w); 1499 ev_clear_pending (EV_A_ (W)w);
1367 if (ev_is_active (w)) 1500 if (!ev_is_active (w))
1368 return; 1501 return;
1369 1502
1370 checks [((W)w)->active - 1] = checks [--checkcnt]; 1503 checks [((W)w)->active - 1] = checks [--checkcnt];
1371 ev_stop (EV_A_ (W)w); 1504 ev_stop (EV_A_ (W)w);
1372} 1505}
1385 return; 1518 return;
1386 1519
1387 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1520 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1388 1521
1389 ev_start (EV_A_ (W)w, 1); 1522 ev_start (EV_A_ (W)w, 1);
1390 array_needsize (signals, signalmax, w->signum, signals_init); 1523 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1391 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1524 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1392 1525
1393 if (!((WL)w)->next) 1526 if (!((WL)w)->next)
1394 { 1527 {
1395#if WIN32 1528#if _WIN32
1396 signal (w->signum, sighandler); 1529 signal (w->signum, sighandler);
1397#else 1530#else
1398 struct sigaction sa; 1531 struct sigaction sa;
1399 sa.sa_handler = sighandler; 1532 sa.sa_handler = sighandler;
1400 sigfillset (&sa.sa_mask); 1533 sigfillset (&sa.sa_mask);
1433 1566
1434void 1567void
1435ev_child_stop (EV_P_ struct ev_child *w) 1568ev_child_stop (EV_P_ struct ev_child *w)
1436{ 1569{
1437 ev_clear_pending (EV_A_ (W)w); 1570 ev_clear_pending (EV_A_ (W)w);
1438 if (ev_is_active (w)) 1571 if (!ev_is_active (w))
1439 return; 1572 return;
1440 1573
1441 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1574 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1442 ev_stop (EV_A_ (W)w); 1575 ev_stop (EV_A_ (W)w);
1443} 1576}
1478} 1611}
1479 1612
1480void 1613void
1481ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1614ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1482{ 1615{
1483 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1616 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1484 1617
1485 if (!once) 1618 if (!once)
1486 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1619 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1487 else 1620 else
1488 { 1621 {
1489 once->cb = cb; 1622 once->cb = cb;
1490 once->arg = arg; 1623 once->arg = arg;
1491 1624
1492 ev_watcher_init (&once->io, once_cb_io); 1625 ev_init (&once->io, once_cb_io);
1493 if (fd >= 0) 1626 if (fd >= 0)
1494 { 1627 {
1495 ev_io_set (&once->io, fd, events); 1628 ev_io_set (&once->io, fd, events);
1496 ev_io_start (EV_A_ &once->io); 1629 ev_io_start (EV_A_ &once->io);
1497 } 1630 }
1498 1631
1499 ev_watcher_init (&once->to, once_cb_to); 1632 ev_init (&once->to, once_cb_to);
1500 if (timeout >= 0.) 1633 if (timeout >= 0.)
1501 { 1634 {
1502 ev_timer_set (&once->to, timeout, 0.); 1635 ev_timer_set (&once->to, timeout, 0.);
1503 ev_timer_start (EV_A_ &once->to); 1636 ev_timer_start (EV_A_ &once->to);
1504 } 1637 }
1505 } 1638 }
1506} 1639}
1507 1640
1641#ifdef __cplusplus
1642}
1643#endif
1644

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines