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

Comparing libev/ev.c (file contents):
Revision 1.71 by root, Tue Nov 6 13:17:55 2007 UTC vs.
Revision 1.103 by root, Mon Nov 12 00:31:08 2007 UTC

… …
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
53# endif 62# endif
54 63
55#endif 64#endif
56 65
… …
64#include <assert.h> 73#include <assert.h>
65#include <errno.h> 74#include <errno.h>
66#include <sys/types.h> 75#include <sys/types.h>
67#include <time.h> 76#include <time.h>
68 77
69#ifndef PERL
70# include <signal.h> 78#include <signal.h>
71#endif
72 79
73#ifndef WIN32 80#ifndef _WIN32
74# include <unistd.h> 81# include <unistd.h>
75# include <sys/time.h> 82# include <sys/time.h>
76# 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
77#endif 89# endif
90#endif
91
78/**/ 92/**/
79 93
80#ifndef EV_USE_MONOTONIC 94#ifndef EV_USE_MONOTONIC
81# define EV_USE_MONOTONIC 1 95# define EV_USE_MONOTONIC 1
82#endif 96#endif
… …
93# define EV_USE_EPOLL 0 107# define EV_USE_EPOLL 0
94#endif 108#endif
95 109
96#ifndef EV_USE_KQUEUE 110#ifndef EV_USE_KQUEUE
97# define EV_USE_KQUEUE 0 111# define EV_USE_KQUEUE 0
98#endif
99
100#ifndef EV_USE_WIN32
101# ifdef WIN32
102# define EV_USE_WIN32 0 /* it does not exist, use select */
103# undef EV_USE_SELECT
104# define EV_USE_SELECT 1
105# else
106# define EV_USE_WIN32 0
107# endif
108#endif 112#endif
109 113
110#ifndef EV_USE_REALTIME 114#ifndef EV_USE_REALTIME
111# define EV_USE_REALTIME 1 115# define EV_USE_REALTIME 1
112#endif 116#endif
… …
119#endif 123#endif
120 124
121#ifndef CLOCK_REALTIME 125#ifndef CLOCK_REALTIME
122# undef EV_USE_REALTIME 126# undef EV_USE_REALTIME
123# define EV_USE_REALTIME 0 127# define EV_USE_REALTIME 0
128#endif
129
130#if EV_SELECT_IS_WINSOCKET
131# include <winsock.h>
124#endif 132#endif
125 133
126/**/ 134/**/
127 135
128#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 136#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
129#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 137#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
130#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 138#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
131/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 139/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
132 140
141#ifdef EV_H
142# include EV_H
143#else
133#include "ev.h" 144# include "ev.h"
145#endif
134 146
135#if __GNUC__ >= 3 147#if __GNUC__ >= 3
136# define expect(expr,value) __builtin_expect ((expr),(value)) 148# define expect(expr,value) __builtin_expect ((expr),(value))
137# define inline inline 149# define inline inline
138#else 150#else
… …
144#define expect_true(expr) expect ((expr) != 0, 1) 156#define expect_true(expr) expect ((expr) != 0, 1)
145 157
146#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 158#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
147#define ABSPRI(w) ((w)->priority - EV_MINPRI) 159#define ABSPRI(w) ((w)->priority - EV_MINPRI)
148 160
161#define EMPTY /* required for microsofts broken pseudo-c compiler */
162
149typedef struct ev_watcher *W; 163typedef struct ev_watcher *W;
150typedef struct ev_watcher_list *WL; 164typedef struct ev_watcher_list *WL;
151typedef struct ev_watcher_time *WT; 165typedef struct ev_watcher_time *WT;
152 166
153static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 167static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
154 168
155#if WIN32 169#ifdef _WIN32
156/* note: the comment below could not be substantiated, but what would I care */ 170# include "ev_win32.c"
157/* MSDN says this is required to handle SIGFPE */
158volatile double SIGFPE_REQ = 0.0f;
159#endif 171#endif
160 172
161/*****************************************************************************/ 173/*****************************************************************************/
162 174
163static void (*syserr_cb)(const char *msg); 175static void (*syserr_cb)(const char *msg);
… …
211typedef struct 223typedef struct
212{ 224{
213 WL head; 225 WL head;
214 unsigned char events; 226 unsigned char events;
215 unsigned char reify; 227 unsigned char reify;
228#if EV_SELECT_IS_WINSOCKET
229 SOCKET handle;
230#endif
216} ANFD; 231} ANFD;
217 232
218typedef struct 233typedef struct
219{ 234{
220 W w; 235 W w;
221 int events; 236 int events;
222} ANPENDING; 237} ANPENDING;
223 238
224#if EV_MULTIPLICITY 239#if EV_MULTIPLICITY
225 240
226struct ev_loop 241 struct ev_loop
227{ 242 {
243 ev_tstamp ev_rt_now;
244 #define ev_rt_now ((loop)->ev_rt_now)
228# define VAR(name,decl) decl; 245 #define VAR(name,decl) decl;
229# include "ev_vars.h" 246 #include "ev_vars.h"
230};
231# undef VAR 247 #undef VAR
248 };
232# include "ev_wrap.h" 249 #include "ev_wrap.h"
250
251 struct ev_loop default_loop_struct;
252 static struct ev_loop *default_loop;
233 253
234#else 254#else
235 255
256 ev_tstamp ev_rt_now;
236# define VAR(name,decl) static decl; 257 #define VAR(name,decl) static decl;
237# include "ev_vars.h" 258 #include "ev_vars.h"
238# undef VAR 259 #undef VAR
260
261 static int default_loop;
239 262
240#endif 263#endif
241 264
242/*****************************************************************************/ 265/*****************************************************************************/
243 266
244inline ev_tstamp 267ev_tstamp
245ev_time (void) 268ev_time (void)
246{ 269{
247#if EV_USE_REALTIME 270#if EV_USE_REALTIME
248 struct timespec ts; 271 struct timespec ts;
249 clock_gettime (CLOCK_REALTIME, &ts); 272 clock_gettime (CLOCK_REALTIME, &ts);
… …
268#endif 291#endif
269 292
270 return ev_time (); 293 return ev_time ();
271} 294}
272 295
296#if EV_MULTIPLICITY
273ev_tstamp 297ev_tstamp
274ev_now (EV_P) 298ev_now (EV_P)
275{ 299{
276 return rt_now; 300 return ev_rt_now;
277} 301}
302#endif
278 303
279#define array_roundsize(base,n) ((n) | 4 & ~3) 304#define array_roundsize(type,n) ((n) | 4 & ~3)
280 305
281#define array_needsize(base,cur,cnt,init) \ 306#define array_needsize(type,base,cur,cnt,init) \
282 if (expect_false ((cnt) > cur)) \ 307 if (expect_false ((cnt) > cur)) \
283 { \ 308 { \
284 int newcnt = cur; \ 309 int newcnt = cur; \
285 do \ 310 do \
286 { \ 311 { \
287 newcnt = array_roundsize (base, newcnt << 1); \ 312 newcnt = array_roundsize (type, newcnt << 1); \
288 } \ 313 } \
289 while ((cnt) > newcnt); \ 314 while ((cnt) > newcnt); \
290 \ 315 \
291 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 316 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
292 init (base + cur, newcnt - cur); \ 317 init (base + cur, newcnt - cur); \
293 cur = newcnt; \ 318 cur = newcnt; \
294 } 319 }
295 320
296#define array_slim(stem) \ 321#define array_slim(type,stem) \
297 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 322 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
298 { \ 323 { \
299 stem ## max = array_roundsize (stem ## cnt >> 1); \ 324 stem ## max = array_roundsize (stem ## cnt >> 1); \
300 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 325 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
301 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 326 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
302 } 327 }
303
304/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
305/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
306#define array_free_microshit(stem) \
307 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
308 328
309#define array_free(stem, idx) \ 329#define array_free(stem, idx) \
310 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 330 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
311 331
312/*****************************************************************************/ 332/*****************************************************************************/
… …
322 342
323 ++base; 343 ++base;
324 } 344 }
325} 345}
326 346
327static void 347void
328event (EV_P_ W w, int events) 348ev_feed_event (EV_P_ void *w, int revents)
329{ 349{
350 W w_ = (W)w;
351
330 if (w->pending) 352 if (w_->pending)
331 { 353 {
332 pendings [ABSPRI (w)][w->pending - 1].events |= events; 354 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
333 return; 355 return;
334 } 356 }
335 357
336 w->pending = ++pendingcnt [ABSPRI (w)]; 358 w_->pending = ++pendingcnt [ABSPRI (w_)];
337 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void)); 359 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
338 pendings [ABSPRI (w)][w->pending - 1].w = w; 360 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
339 pendings [ABSPRI (w)][w->pending - 1].events = events; 361 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
340} 362}
341 363
342static void 364static void
343queue_events (EV_P_ W *events, int eventcnt, int type) 365queue_events (EV_P_ W *events, int eventcnt, int type)
344{ 366{
345 int i; 367 int i;
346 368
347 for (i = 0; i < eventcnt; ++i) 369 for (i = 0; i < eventcnt; ++i)
348 event (EV_A_ events [i], type); 370 ev_feed_event (EV_A_ events [i], type);
349} 371}
350 372
351static void 373inline void
352fd_event (EV_P_ int fd, int events) 374fd_event (EV_P_ int fd, int revents)
353{ 375{
354 ANFD *anfd = anfds + fd; 376 ANFD *anfd = anfds + fd;
355 struct ev_io *w; 377 struct ev_io *w;
356 378
357 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 379 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
358 { 380 {
359 int ev = w->events & events; 381 int ev = w->events & revents;
360 382
361 if (ev) 383 if (ev)
362 event (EV_A_ (W)w, ev); 384 ev_feed_event (EV_A_ (W)w, ev);
363 } 385 }
386}
387
388void
389ev_feed_fd_event (EV_P_ int fd, int revents)
390{
391 fd_event (EV_A_ fd, revents);
364} 392}
365 393
366/*****************************************************************************/ 394/*****************************************************************************/
367 395
368static void 396static void
… …
379 int events = 0; 407 int events = 0;
380 408
381 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 409 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
382 events |= w->events; 410 events |= w->events;
383 411
412#if EV_SELECT_IS_WINSOCKET
413 if (events)
414 {
415 unsigned long argp;
416 anfd->handle = _get_osfhandle (fd);
417 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
418 }
419#endif
420
384 anfd->reify = 0; 421 anfd->reify = 0;
385 422
386 method_modify (EV_A_ fd, anfd->events, events); 423 method_modify (EV_A_ fd, anfd->events, events);
387 anfd->events = events; 424 anfd->events = events;
388 } 425 }
… …
397 return; 434 return;
398 435
399 anfds [fd].reify = 1; 436 anfds [fd].reify = 1;
400 437
401 ++fdchangecnt; 438 ++fdchangecnt;
402 array_needsize (fdchanges, fdchangemax, fdchangecnt, (void)); 439 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
403 fdchanges [fdchangecnt - 1] = fd; 440 fdchanges [fdchangecnt - 1] = fd;
404} 441}
405 442
406static void 443static void
407fd_kill (EV_P_ int fd) 444fd_kill (EV_P_ int fd)
… …
409 struct ev_io *w; 446 struct ev_io *w;
410 447
411 while ((w = (struct ev_io *)anfds [fd].head)) 448 while ((w = (struct ev_io *)anfds [fd].head))
412 { 449 {
413 ev_io_stop (EV_A_ w); 450 ev_io_stop (EV_A_ w);
414 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 451 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
415 } 452 }
416} 453}
417 454
418static int 455static int
419fd_valid (int fd) 456fd_valid (int fd)
420{ 457{
421#ifdef WIN32 458#ifdef _WIN32
422 return !!win32_get_osfhandle (fd); 459 return _get_osfhandle (fd) != -1;
423#else 460#else
424 return fcntl (fd, F_GETFD) != -1; 461 return fcntl (fd, F_GETFD) != -1;
425#endif 462#endif
426} 463}
427 464
… …
507 544
508 heap [k] = w; 545 heap [k] = w;
509 ((W)heap [k])->active = k + 1; 546 ((W)heap [k])->active = k + 1;
510} 547}
511 548
549inline void
550adjustheap (WT *heap, int N, int k)
551{
552 upheap (heap, k);
553 downheap (heap, N, k);
554}
555
512/*****************************************************************************/ 556/*****************************************************************************/
513 557
514typedef struct 558typedef struct
515{ 559{
516 WL head; 560 WL head;
… …
537} 581}
538 582
539static void 583static void
540sighandler (int signum) 584sighandler (int signum)
541{ 585{
542#if WIN32 586#if _WIN32
543 signal (signum, sighandler); 587 signal (signum, sighandler);
544#endif 588#endif
545 589
546 signals [signum - 1].gotsig = 1; 590 signals [signum - 1].gotsig = 1;
547 591
… …
552 write (sigpipe [1], &signum, 1); 596 write (sigpipe [1], &signum, 1);
553 errno = old_errno; 597 errno = old_errno;
554 } 598 }
555} 599}
556 600
601void
602ev_feed_signal_event (EV_P_ int signum)
603{
604 WL w;
605
606#if EV_MULTIPLICITY
607 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
608#endif
609
610 --signum;
611
612 if (signum < 0 || signum >= signalmax)
613 return;
614
615 signals [signum].gotsig = 0;
616
617 for (w = signals [signum].head; w; w = w->next)
618 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
619}
620
557static void 621static void
558sigcb (EV_P_ struct ev_io *iow, int revents) 622sigcb (EV_P_ struct ev_io *iow, int revents)
559{ 623{
560 WL w;
561 int signum; 624 int signum;
562 625
563 read (sigpipe [0], &revents, 1); 626 read (sigpipe [0], &revents, 1);
564 gotsig = 0; 627 gotsig = 0;
565 628
566 for (signum = signalmax; signum--; ) 629 for (signum = signalmax; signum--; )
567 if (signals [signum].gotsig) 630 if (signals [signum].gotsig)
568 { 631 ev_feed_signal_event (EV_A_ signum + 1);
569 signals [signum].gotsig = 0; 632}
570 633
571 for (w = signals [signum].head; w; w = w->next) 634inline void
572 event (EV_A_ (W)w, EV_SIGNAL); 635fd_intern (int fd)
573 } 636{
637#ifdef _WIN32
638 int arg = 1;
639 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
640#else
641 fcntl (fd, F_SETFD, FD_CLOEXEC);
642 fcntl (fd, F_SETFL, O_NONBLOCK);
643#endif
574} 644}
575 645
576static void 646static void
577siginit (EV_P) 647siginit (EV_P)
578{ 648{
579#ifndef WIN32 649 fd_intern (sigpipe [0]);
580 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 650 fd_intern (sigpipe [1]);
581 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
582
583 /* rather than sort out wether we really need nb, set it */
584 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
585 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
586#endif
587 651
588 ev_io_set (&sigev, sigpipe [0], EV_READ); 652 ev_io_set (&sigev, sigpipe [0], EV_READ);
589 ev_io_start (EV_A_ &sigev); 653 ev_io_start (EV_A_ &sigev);
590 ev_unref (EV_A); /* child watcher should not keep loop alive */ 654 ev_unref (EV_A); /* child watcher should not keep loop alive */
591} 655}
592 656
593/*****************************************************************************/ 657/*****************************************************************************/
594 658
595static struct ev_child *childs [PID_HASHSIZE]; 659static struct ev_child *childs [PID_HASHSIZE];
596 660
597#ifndef WIN32 661#ifndef _WIN32
598 662
599static struct ev_signal childev; 663static struct ev_signal childev;
600 664
601#ifndef WCONTINUED 665#ifndef WCONTINUED
602# define WCONTINUED 0 666# define WCONTINUED 0
… …
611 if (w->pid == pid || !w->pid) 675 if (w->pid == pid || !w->pid)
612 { 676 {
613 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 677 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
614 w->rpid = pid; 678 w->rpid = pid;
615 w->rstatus = status; 679 w->rstatus = status;
616 event (EV_A_ (W)w, EV_CHILD); 680 ev_feed_event (EV_A_ (W)w, EV_CHILD);
617 } 681 }
618} 682}
619 683
620static void 684static void
621childcb (EV_P_ struct ev_signal *sw, int revents) 685childcb (EV_P_ struct ev_signal *sw, int revents)
… …
623 int pid, status; 687 int pid, status;
624 688
625 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 689 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
626 { 690 {
627 /* make sure we are called again until all childs have been reaped */ 691 /* make sure we are called again until all childs have been reaped */
628 event (EV_A_ (W)sw, EV_SIGNAL); 692 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
629 693
630 child_reap (EV_A_ sw, pid, pid, status); 694 child_reap (EV_A_ sw, pid, pid, status);
631 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 695 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
632 } 696 }
633} 697}
… …
663 727
664/* return true if we are running with elevated privileges and should ignore env variables */ 728/* return true if we are running with elevated privileges and should ignore env variables */
665static int 729static int
666enable_secure (void) 730enable_secure (void)
667{ 731{
668#ifdef WIN32 732#ifdef _WIN32
669 return 0; 733 return 0;
670#else 734#else
671 return getuid () != geteuid () 735 return getuid () != geteuid ()
672 || getgid () != getegid (); 736 || getgid () != getegid ();
673#endif 737#endif
… …
690 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 754 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
691 have_monotonic = 1; 755 have_monotonic = 1;
692 } 756 }
693#endif 757#endif
694 758
695 rt_now = ev_time (); 759 ev_rt_now = ev_time ();
696 mn_now = get_clock (); 760 mn_now = get_clock ();
697 now_floor = mn_now; 761 now_floor = mn_now;
698 rtmn_diff = rt_now - mn_now; 762 rtmn_diff = ev_rt_now - mn_now;
699 763
700 if (methods == EVMETHOD_AUTO) 764 if (methods == EVMETHOD_AUTO)
701 if (!enable_secure () && getenv ("LIBEV_METHODS")) 765 if (!enable_secure () && getenv ("LIBEV_METHODS"))
702 methods = atoi (getenv ("LIBEV_METHODS")); 766 methods = atoi (getenv ("LIBEV_METHODS"));
703 else 767 else
704 methods = EVMETHOD_ANY; 768 methods = EVMETHOD_ANY;
705 769
706 method = 0; 770 method = 0;
707#if EV_USE_WIN32
708 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
709#endif
710#if EV_USE_KQUEUE 771#if EV_USE_KQUEUE
711 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
712#endif 773#endif
713#if EV_USE_EPOLL 774#if EV_USE_EPOLL
714 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
718#endif 779#endif
719#if EV_USE_SELECT 780#if EV_USE_SELECT
720 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
721#endif 782#endif
722 783
723 ev_watcher_init (&sigev, sigcb); 784 ev_init (&sigev, sigcb);
724 ev_set_priority (&sigev, EV_MAXPRI); 785 ev_set_priority (&sigev, EV_MAXPRI);
725 } 786 }
726} 787}
727 788
728void 789void
729loop_destroy (EV_P) 790loop_destroy (EV_P)
730{ 791{
731 int i; 792 int i;
732 793
733#if EV_USE_WIN32
734 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
735#endif
736#if EV_USE_KQUEUE 794#if EV_USE_KQUEUE
737 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
738#endif 796#endif
739#if EV_USE_EPOLL 797#if EV_USE_EPOLL
740 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
748 806
749 for (i = NUMPRI; i--; ) 807 for (i = NUMPRI; i--; )
750 array_free (pending, [i]); 808 array_free (pending, [i]);
751 809
752 /* have to use the microsoft-never-gets-it-right macro */ 810 /* have to use the microsoft-never-gets-it-right macro */
753 array_free_microshit (fdchange); 811 array_free (fdchange, EMPTY);
754 array_free_microshit (timer); 812 array_free (timer, EMPTY);
755 array_free_microshit (periodic); 813#if EV_PERIODICS
756 array_free_microshit (idle); 814 array_free (periodic, EMPTY);
757 array_free_microshit (prepare); 815#endif
758 array_free_microshit (check); 816 array_free (idle, EMPTY);
817 array_free (prepare, EMPTY);
818 array_free (check, EMPTY);
759 819
760 method = 0; 820 method = 0;
761} 821}
762 822
763static void 823static void
… …
818} 878}
819 879
820#endif 880#endif
821 881
822#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
823struct ev_loop default_loop_struct;
824static struct ev_loop *default_loop;
825
826struct ev_loop * 883struct ev_loop *
827#else 884#else
828static int default_loop;
829
830int 885int
831#endif 886#endif
832ev_default_loop (int methods) 887ev_default_loop (int methods)
833{ 888{
834 if (sigpipe [0] == sigpipe [1]) 889 if (sigpipe [0] == sigpipe [1])
… …
847 902
848 if (ev_method (EV_A)) 903 if (ev_method (EV_A))
849 { 904 {
850 siginit (EV_A); 905 siginit (EV_A);
851 906
852#ifndef WIN32 907#ifndef _WIN32
853 ev_signal_init (&childev, childcb, SIGCHLD); 908 ev_signal_init (&childev, childcb, SIGCHLD);
854 ev_set_priority (&childev, EV_MAXPRI); 909 ev_set_priority (&childev, EV_MAXPRI);
855 ev_signal_start (EV_A_ &childev); 910 ev_signal_start (EV_A_ &childev);
856 ev_unref (EV_A); /* child watcher should not keep loop alive */ 911 ev_unref (EV_A); /* child watcher should not keep loop alive */
857#endif 912#endif
… …
868{ 923{
869#if EV_MULTIPLICITY 924#if EV_MULTIPLICITY
870 struct ev_loop *loop = default_loop; 925 struct ev_loop *loop = default_loop;
871#endif 926#endif
872 927
873#ifndef WIN32 928#ifndef _WIN32
874 ev_ref (EV_A); /* child watcher */ 929 ev_ref (EV_A); /* child watcher */
875 ev_signal_stop (EV_A_ &childev); 930 ev_signal_stop (EV_A_ &childev);
876#endif 931#endif
877 932
878 ev_ref (EV_A); /* signal watcher */ 933 ev_ref (EV_A); /* signal watcher */
… …
894 if (method) 949 if (method)
895 postfork = 1; 950 postfork = 1;
896} 951}
897 952
898/*****************************************************************************/ 953/*****************************************************************************/
954
955static int
956any_pending (EV_P)
957{
958 int pri;
959
960 for (pri = NUMPRI; pri--; )
961 if (pendingcnt [pri])
962 return 1;
963
964 return 0;
965}
899 966
900static void 967static void
901call_pending (EV_P) 968call_pending (EV_P)
902{ 969{
903 int pri; 970 int pri;
… …
908 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 975 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
909 976
910 if (p->w) 977 if (p->w)
911 { 978 {
912 p->w->pending = 0; 979 p->w->pending = 0;
913 p->w->cb (EV_A_ p->w, p->events); 980 EV_CB_INVOKE (p->w, p->events);
914 } 981 }
915 } 982 }
916} 983}
917 984
918static void 985static void
… …
926 993
927 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
928 if (w->repeat) 995 if (w->repeat)
929 { 996 {
930 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 997 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
998
931 ((WT)w)->at = mn_now + w->repeat; 999 ((WT)w)->at += w->repeat;
1000 if (((WT)w)->at < mn_now)
1001 ((WT)w)->at = mn_now;
1002
932 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
933 } 1004 }
934 else 1005 else
935 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
936 1007
937 event (EV_A_ (W)w, EV_TIMEOUT); 1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
938 } 1009 }
939} 1010}
940 1011
1012#if EV_PERIODICS
941static void 1013static void
942periodics_reify (EV_P) 1014periodics_reify (EV_P)
943{ 1015{
944 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
945 { 1017 {
946 struct ev_periodic *w = periodics [0]; 1018 struct ev_periodic *w = periodics [0];
947 1019
948 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1020 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
949 1021
950 /* first reschedule or stop timer */ 1022 /* first reschedule or stop timer */
951 if (w->interval) 1023 if (w->reschedule_cb)
952 { 1024 {
1025 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1026
1027 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1028 downheap ((WT *)periodics, periodiccnt, 0);
1029 }
1030 else if (w->interval)
1031 {
953 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1032 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
954 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1033 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
955 downheap ((WT *)periodics, periodiccnt, 0); 1034 downheap ((WT *)periodics, periodiccnt, 0);
956 } 1035 }
957 else 1036 else
958 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1037 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
959 1038
960 event (EV_A_ (W)w, EV_PERIODIC); 1039 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
961 } 1040 }
962} 1041}
963 1042
964static void 1043static void
965periodics_reschedule (EV_P) 1044periodics_reschedule (EV_P)
… …
969 /* adjust periodics after time jump */ 1048 /* adjust periodics after time jump */
970 for (i = 0; i < periodiccnt; ++i) 1049 for (i = 0; i < periodiccnt; ++i)
971 { 1050 {
972 struct ev_periodic *w = periodics [i]; 1051 struct ev_periodic *w = periodics [i];
973 1052
1053 if (w->reschedule_cb)
1054 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
974 if (w->interval) 1055 else if (w->interval)
975 {
976 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1056 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
977
978 if (fabs (diff) >= 1e-4)
979 {
980 ev_periodic_stop (EV_A_ w);
981 ev_periodic_start (EV_A_ w);
982
983 i = 0; /* restart loop, inefficient, but time jumps should be rare */
984 }
985 }
986 } 1057 }
1058
1059 /* now rebuild the heap */
1060 for (i = periodiccnt >> 1; i--; )
1061 downheap ((WT *)periodics, periodiccnt, i);
987} 1062}
1063#endif
988 1064
989inline int 1065inline int
990time_update_monotonic (EV_P) 1066time_update_monotonic (EV_P)
991{ 1067{
992 mn_now = get_clock (); 1068 mn_now = get_clock ();
993 1069
994 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1070 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
995 { 1071 {
996 rt_now = rtmn_diff + mn_now; 1072 ev_rt_now = rtmn_diff + mn_now;
997 return 0; 1073 return 0;
998 } 1074 }
999 else 1075 else
1000 { 1076 {
1001 now_floor = mn_now; 1077 now_floor = mn_now;
1002 rt_now = ev_time (); 1078 ev_rt_now = ev_time ();
1003 return 1; 1079 return 1;
1004 } 1080 }
1005} 1081}
1006 1082
1007static void 1083static void
… …
1016 { 1092 {
1017 ev_tstamp odiff = rtmn_diff; 1093 ev_tstamp odiff = rtmn_diff;
1018 1094
1019 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1095 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1020 { 1096 {
1021 rtmn_diff = rt_now - mn_now; 1097 rtmn_diff = ev_rt_now - mn_now;
1022 1098
1023 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1099 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1024 return; /* all is well */ 1100 return; /* all is well */
1025 1101
1026 rt_now = ev_time (); 1102 ev_rt_now = ev_time ();
1027 mn_now = get_clock (); 1103 mn_now = get_clock ();
1028 now_floor = mn_now; 1104 now_floor = mn_now;
1029 } 1105 }
1030 1106
1107# if EV_PERIODICS
1031 periodics_reschedule (EV_A); 1108 periodics_reschedule (EV_A);
1109# endif
1032 /* no timer adjustment, as the monotonic clock doesn't jump */ 1110 /* no timer adjustment, as the monotonic clock doesn't jump */
1033 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1034 } 1112 }
1035 } 1113 }
1036 else 1114 else
1037#endif 1115#endif
1038 { 1116 {
1039 rt_now = ev_time (); 1117 ev_rt_now = ev_time ();
1040 1118
1041 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1119 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1042 { 1120 {
1121#if EV_PERIODICS
1043 periodics_reschedule (EV_A); 1122 periodics_reschedule (EV_A);
1123#endif
1044 1124
1045 /* adjust timers. this is easy, as the offset is the same for all */ 1125 /* adjust timers. this is easy, as the offset is the same for all */
1046 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
1047 ((WT)timers [i])->at += rt_now - mn_now; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
1048 } 1128 }
1049 1129
1050 mn_now = rt_now; 1130 mn_now = ev_rt_now;
1051 } 1131 }
1052} 1132}
1053 1133
1054void 1134void
1055ev_ref (EV_P) 1135ev_ref (EV_P)
… …
1087 /* update fd-related kernel structures */ 1167 /* update fd-related kernel structures */
1088 fd_reify (EV_A); 1168 fd_reify (EV_A);
1089 1169
1090 /* calculate blocking time */ 1170 /* calculate blocking time */
1091 1171
1092 /* we only need this for !monotonic clockor timers, but as we basically 1172 /* we only need this for !monotonic clock or timers, but as we basically
1093 always have timers, we just calculate it always */ 1173 always have timers, we just calculate it always */
1094#if EV_USE_MONOTONIC 1174#if EV_USE_MONOTONIC
1095 if (expect_true (have_monotonic)) 1175 if (expect_true (have_monotonic))
1096 time_update_monotonic (EV_A); 1176 time_update_monotonic (EV_A);
1097 else 1177 else
1098#endif 1178#endif
1099 { 1179 {
1100 rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1101 mn_now = rt_now; 1181 mn_now = ev_rt_now;
1102 } 1182 }
1103 1183
1104 if (flags & EVLOOP_NONBLOCK || idlecnt) 1184 if (flags & EVLOOP_NONBLOCK || idlecnt)
1105 block = 0.; 1185 block = 0.;
1106 else 1186 else
… …
1111 { 1191 {
1112 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1113 if (block > to) block = to; 1193 if (block > to) block = to;
1114 } 1194 }
1115 1195
1196#if EV_PERIODICS
1116 if (periodiccnt) 1197 if (periodiccnt)
1117 { 1198 {
1118 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1119 if (block > to) block = to; 1200 if (block > to) block = to;
1120 } 1201 }
1202#endif
1121 1203
1122 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
1123 } 1205 }
1124 1206
1125 method_poll (EV_A_ block); 1207 method_poll (EV_A_ block);
1126 1208
1127 /* update rt_now, do magic */ 1209 /* update ev_rt_now, do magic */
1128 time_update (EV_A); 1210 time_update (EV_A);
1129 1211
1130 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
1131 timers_reify (EV_A); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
1132 periodics_reify (EV_A); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
1133 1217
1134 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
1135 if (!pendingcnt) 1219 if (idlecnt && !any_pending (EV_A))
1136 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1137 1221
1138 /* queue check watchers, to be executed first */ 1222 /* queue check watchers, to be executed first */
1139 if (checkcnt) 1223 if (checkcnt)
1140 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1215 return; 1299 return;
1216 1300
1217 assert (("ev_io_start called with negative fd", fd >= 0)); 1301 assert (("ev_io_start called with negative fd", fd >= 0));
1218 1302
1219 ev_start (EV_A_ (W)w, 1); 1303 ev_start (EV_A_ (W)w, 1);
1220 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1304 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1221 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1305 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1222 1306
1223 fd_change (EV_A_ fd); 1307 fd_change (EV_A_ fd);
1224} 1308}
1225 1309
… …
1228{ 1312{
1229 ev_clear_pending (EV_A_ (W)w); 1313 ev_clear_pending (EV_A_ (W)w);
1230 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
1231 return; 1315 return;
1232 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
1233 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1234 ev_stop (EV_A_ (W)w); 1320 ev_stop (EV_A_ (W)w);
1235 1321
1236 fd_change (EV_A_ w->fd); 1322 fd_change (EV_A_ w->fd);
1237} 1323}
… …
1245 ((WT)w)->at += mn_now; 1331 ((WT)w)->at += mn_now;
1246 1332
1247 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1333 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1248 1334
1249 ev_start (EV_A_ (W)w, ++timercnt); 1335 ev_start (EV_A_ (W)w, ++timercnt);
1250 array_needsize (timers, timermax, timercnt, (void)); 1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1251 timers [timercnt - 1] = w; 1337 timers [timercnt - 1] = w;
1252 upheap ((WT *)timers, timercnt - 1); 1338 upheap ((WT *)timers, timercnt - 1);
1253 1339
1254 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1255} 1341}
… …
1264 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1265 1351
1266 if (((W)w)->active < timercnt--) 1352 if (((W)w)->active < timercnt--)
1267 { 1353 {
1268 timers [((W)w)->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
1269 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1270 } 1356 }
1271 1357
1272 ((WT)w)->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
1273 1359
1274 ev_stop (EV_A_ (W)w); 1360 ev_stop (EV_A_ (W)w);
1275} 1361}
1276 1362
1277void 1363void
… …
1280 if (ev_is_active (w)) 1366 if (ev_is_active (w))
1281 { 1367 {
1282 if (w->repeat) 1368 if (w->repeat)
1283 { 1369 {
1284 ((WT)w)->at = mn_now + w->repeat; 1370 ((WT)w)->at = mn_now + w->repeat;
1285 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1371 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1286 } 1372 }
1287 else 1373 else
1288 ev_timer_stop (EV_A_ w); 1374 ev_timer_stop (EV_A_ w);
1289 } 1375 }
1290 else if (w->repeat) 1376 else if (w->repeat)
1291 ev_timer_start (EV_A_ w); 1377 ev_timer_start (EV_A_ w);
1292} 1378}
1293 1379
1380#if EV_PERIODICS
1294void 1381void
1295ev_periodic_start (EV_P_ struct ev_periodic *w) 1382ev_periodic_start (EV_P_ struct ev_periodic *w)
1296{ 1383{
1297 if (ev_is_active (w)) 1384 if (ev_is_active (w))
1298 return; 1385 return;
1299 1386
1387 if (w->reschedule_cb)
1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1389 else if (w->interval)
1390 {
1300 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1391 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1301
1302 /* this formula differs from the one in periodic_reify because we do not always round up */ 1392 /* this formula differs from the one in periodic_reify because we do not always round up */
1303 if (w->interval)
1304 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1393 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1394 }
1305 1395
1306 ev_start (EV_A_ (W)w, ++periodiccnt); 1396 ev_start (EV_A_ (W)w, ++periodiccnt);
1307 array_needsize (periodics, periodicmax, periodiccnt, (void)); 1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1308 periodics [periodiccnt - 1] = w; 1398 periodics [periodiccnt - 1] = w;
1309 upheap ((WT *)periodics, periodiccnt - 1); 1399 upheap ((WT *)periodics, periodiccnt - 1);
1310 1400
1311 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1401 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1312} 1402}
… …
1321 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1322 1412
1323 if (((W)w)->active < periodiccnt--) 1413 if (((W)w)->active < periodiccnt--)
1324 { 1414 {
1325 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1415 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1326 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1327 } 1417 }
1328 1418
1329 ev_stop (EV_A_ (W)w); 1419 ev_stop (EV_A_ (W)w);
1330} 1420}
1331 1421
1332void 1422void
1423ev_periodic_again (EV_P_ struct ev_periodic *w)
1424{
1425 /* TODO: use adjustheap and recalculation */
1426 ev_periodic_stop (EV_A_ w);
1427 ev_periodic_start (EV_A_ w);
1428}
1429#endif
1430
1431void
1333ev_idle_start (EV_P_ struct ev_idle *w) 1432ev_idle_start (EV_P_ struct ev_idle *w)
1334{ 1433{
1335 if (ev_is_active (w)) 1434 if (ev_is_active (w))
1336 return; 1435 return;
1337 1436
1338 ev_start (EV_A_ (W)w, ++idlecnt); 1437 ev_start (EV_A_ (W)w, ++idlecnt);
1339 array_needsize (idles, idlemax, idlecnt, (void)); 1438 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1340 idles [idlecnt - 1] = w; 1439 idles [idlecnt - 1] = w;
1341} 1440}
1342 1441
1343void 1442void
1344ev_idle_stop (EV_P_ struct ev_idle *w) 1443ev_idle_stop (EV_P_ struct ev_idle *w)
1345{ 1444{
1346 ev_clear_pending (EV_A_ (W)w); 1445 ev_clear_pending (EV_A_ (W)w);
1347 if (ev_is_active (w)) 1446 if (!ev_is_active (w))
1348 return; 1447 return;
1349 1448
1350 idles [((W)w)->active - 1] = idles [--idlecnt]; 1449 idles [((W)w)->active - 1] = idles [--idlecnt];
1351 ev_stop (EV_A_ (W)w); 1450 ev_stop (EV_A_ (W)w);
1352} 1451}
… …
1356{ 1455{
1357 if (ev_is_active (w)) 1456 if (ev_is_active (w))
1358 return; 1457 return;
1359 1458
1360 ev_start (EV_A_ (W)w, ++preparecnt); 1459 ev_start (EV_A_ (W)w, ++preparecnt);
1361 array_needsize (prepares, preparemax, preparecnt, (void)); 1460 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1362 prepares [preparecnt - 1] = w; 1461 prepares [preparecnt - 1] = w;
1363} 1462}
1364 1463
1365void 1464void
1366ev_prepare_stop (EV_P_ struct ev_prepare *w) 1465ev_prepare_stop (EV_P_ struct ev_prepare *w)
1367{ 1466{
1368 ev_clear_pending (EV_A_ (W)w); 1467 ev_clear_pending (EV_A_ (W)w);
1369 if (ev_is_active (w)) 1468 if (!ev_is_active (w))
1370 return; 1469 return;
1371 1470
1372 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1471 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1373 ev_stop (EV_A_ (W)w); 1472 ev_stop (EV_A_ (W)w);
1374} 1473}
… …
1378{ 1477{
1379 if (ev_is_active (w)) 1478 if (ev_is_active (w))
1380 return; 1479 return;
1381 1480
1382 ev_start (EV_A_ (W)w, ++checkcnt); 1481 ev_start (EV_A_ (W)w, ++checkcnt);
1383 array_needsize (checks, checkmax, checkcnt, (void)); 1482 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1384 checks [checkcnt - 1] = w; 1483 checks [checkcnt - 1] = w;
1385} 1484}
1386 1485
1387void 1486void
1388ev_check_stop (EV_P_ struct ev_check *w) 1487ev_check_stop (EV_P_ struct ev_check *w)
1389{ 1488{
1390 ev_clear_pending (EV_A_ (W)w); 1489 ev_clear_pending (EV_A_ (W)w);
1391 if (ev_is_active (w)) 1490 if (!ev_is_active (w))
1392 return; 1491 return;
1393 1492
1394 checks [((W)w)->active - 1] = checks [--checkcnt]; 1493 checks [((W)w)->active - 1] = checks [--checkcnt];
1395 ev_stop (EV_A_ (W)w); 1494 ev_stop (EV_A_ (W)w);
1396} 1495}
… …
1409 return; 1508 return;
1410 1509
1411 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1510 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1412 1511
1413 ev_start (EV_A_ (W)w, 1); 1512 ev_start (EV_A_ (W)w, 1);
1414 array_needsize (signals, signalmax, w->signum, signals_init); 1513 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1415 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1514 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1416 1515
1417 if (!((WL)w)->next) 1516 if (!((WL)w)->next)
1418 { 1517 {
1419#if WIN32 1518#if _WIN32
1420 signal (w->signum, sighandler); 1519 signal (w->signum, sighandler);
1421#else 1520#else
1422 struct sigaction sa; 1521 struct sigaction sa;
1423 sa.sa_handler = sighandler; 1522 sa.sa_handler = sighandler;
1424 sigfillset (&sa.sa_mask); 1523 sigfillset (&sa.sa_mask);
… …
1457 1556
1458void 1557void
1459ev_child_stop (EV_P_ struct ev_child *w) 1558ev_child_stop (EV_P_ struct ev_child *w)
1460{ 1559{
1461 ev_clear_pending (EV_A_ (W)w); 1560 ev_clear_pending (EV_A_ (W)w);
1462 if (ev_is_active (w)) 1561 if (!ev_is_active (w))
1463 return; 1562 return;
1464 1563
1465 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1466 ev_stop (EV_A_ (W)w); 1565 ev_stop (EV_A_ (W)w);
1467} 1566}
… …
1502} 1601}
1503 1602
1504void 1603void
1505ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1604ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1506{ 1605{
1507 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1606 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1508 1607
1509 if (!once) 1608 if (!once)
1510 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1609 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1511 else 1610 else
1512 { 1611 {
1513 once->cb = cb; 1612 once->cb = cb;
1514 once->arg = arg; 1613 once->arg = arg;
1515 1614
1516 ev_watcher_init (&once->io, once_cb_io); 1615 ev_init (&once->io, once_cb_io);
1517 if (fd >= 0) 1616 if (fd >= 0)
1518 { 1617 {
1519 ev_io_set (&once->io, fd, events); 1618 ev_io_set (&once->io, fd, events);
1520 ev_io_start (EV_A_ &once->io); 1619 ev_io_start (EV_A_ &once->io);
1521 } 1620 }
1522 1621
1523 ev_watcher_init (&once->to, once_cb_to); 1622 ev_init (&once->to, once_cb_to);
1524 if (timeout >= 0.) 1623 if (timeout >= 0.)
1525 { 1624 {
1526 ev_timer_set (&once->to, timeout, 0.); 1625 ev_timer_set (&once->to, timeout, 0.);
1527 ev_timer_start (EV_A_ &once->to); 1626 ev_timer_start (EV_A_ &once->to);
1528 } 1627 }
1529 } 1628 }
1530} 1629}
1531 1630
1631#ifdef __cplusplus
1632}
1633#endif
1634

Diff Legend

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