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

Diff Legend

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