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

Comparing libev/ev.c (file contents):
Revision 1.76 by root, Wed Nov 7 18:47:26 2007 UTC vs.
Revision 1.118 by root, Fri Nov 16 01:33:54 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines