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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines