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

Comparing libev/ev.c (file contents):
Revision 1.74 by root, Tue Nov 6 16:51:20 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
… …
66#include <sys/types.h> 75#include <sys/types.h>
67#include <time.h> 76#include <time.h>
68 77
69#include <signal.h> 78#include <signal.h>
70 79
71#ifndef WIN32 80#ifndef _WIN32
72# include <unistd.h> 81# include <unistd.h>
73# include <sys/time.h> 82# include <sys/time.h>
74# 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
75#endif 89# endif
90#endif
91
76/**/ 92/**/
77 93
78#ifndef EV_USE_MONOTONIC 94#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 95# define EV_USE_MONOTONIC 1
80#endif 96#endif
81 97
82#ifndef EV_USE_SELECT 98#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 99# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
84#endif 101#endif
85 102
86#ifndef EV_USE_POLL 103#ifndef EV_USE_POLL
87# 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
88#endif 109#endif
89 110
90#ifndef EV_USE_EPOLL 111#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 112# define EV_USE_EPOLL 0
92#endif 113#endif
93 114
94#ifndef EV_USE_KQUEUE 115#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 116# define EV_USE_KQUEUE 0
96#endif
97
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif 117#endif
107 118
108#ifndef EV_USE_REALTIME 119#ifndef EV_USE_REALTIME
109# define EV_USE_REALTIME 1 120# define EV_USE_REALTIME 1
110#endif 121#endif
… …
117#endif 128#endif
118 129
119#ifndef CLOCK_REALTIME 130#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 131# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 132# define EV_USE_REALTIME 0
133#endif
134
135#if EV_SELECT_IS_WINSOCKET
136# include <winsock.h>
122#endif 137#endif
123 138
124/**/ 139/**/
125 140
126#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) */
127#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) */
128#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 */
129/*#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 */
130 145
146#ifdef EV_H
147# include EV_H
148#else
131#include "ev.h" 149# include "ev.h"
150#endif
132 151
133#if __GNUC__ >= 3 152#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 153# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 154# define inline inline
136#else 155#else
… …
142#define expect_true(expr) expect ((expr) != 0, 1) 161#define expect_true(expr) expect ((expr) != 0, 1)
143 162
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 164#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 165
166#define EMPTY /* required for microsofts broken pseudo-c compiler */
167
147typedef struct ev_watcher *W; 168typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 169typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 170typedef struct ev_watcher_time *WT;
150 171
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 172static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 173
174#ifdef _WIN32
153#include "ev_win32.c" 175# include "ev_win32.c"
176#endif
154 177
155/*****************************************************************************/ 178/*****************************************************************************/
156 179
157static void (*syserr_cb)(const char *msg); 180static void (*syserr_cb)(const char *msg);
158 181
… …
205typedef struct 228typedef struct
206{ 229{
207 WL head; 230 WL head;
208 unsigned char events; 231 unsigned char events;
209 unsigned char reify; 232 unsigned char reify;
233#if EV_SELECT_IS_WINSOCKET
234 SOCKET handle;
235#endif
210} ANFD; 236} ANFD;
211 237
212typedef struct 238typedef struct
213{ 239{
214 W w; 240 W w;
215 int events; 241 int events;
216} ANPENDING; 242} ANPENDING;
217 243
218#if EV_MULTIPLICITY 244#if EV_MULTIPLICITY
219 245
220struct ev_loop 246 struct ev_loop
221{ 247 {
248 ev_tstamp ev_rt_now;
249 #define ev_rt_now ((loop)->ev_rt_now)
222# define VAR(name,decl) decl; 250 #define VAR(name,decl) decl;
223# include "ev_vars.h" 251 #include "ev_vars.h"
224};
225# undef VAR 252 #undef VAR
253 };
226# include "ev_wrap.h" 254 #include "ev_wrap.h"
255
256 struct ev_loop default_loop_struct;
257 static struct ev_loop *default_loop;
227 258
228#else 259#else
229 260
261 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 262 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 263 #include "ev_vars.h"
232# undef VAR 264 #undef VAR
265
266 static int default_loop;
233 267
234#endif 268#endif
235 269
236/*****************************************************************************/ 270/*****************************************************************************/
237 271
238inline ev_tstamp 272ev_tstamp
239ev_time (void) 273ev_time (void)
240{ 274{
241#if EV_USE_REALTIME 275#if EV_USE_REALTIME
242 struct timespec ts; 276 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 277 clock_gettime (CLOCK_REALTIME, &ts);
… …
262#endif 296#endif
263 297
264 return ev_time (); 298 return ev_time ();
265} 299}
266 300
301#if EV_MULTIPLICITY
267ev_tstamp 302ev_tstamp
268ev_now (EV_P) 303ev_now (EV_P)
269{ 304{
270 return rt_now; 305 return ev_rt_now;
271} 306}
307#endif
272 308
273#define array_roundsize(type,n) ((n) | 4 & ~3) 309#define array_roundsize(type,n) ((n) | 4 & ~3)
274 310
275#define array_needsize(type,base,cur,cnt,init) \ 311#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 312 if (expect_false ((cnt) > cur)) \
… …
293 stem ## max = array_roundsize (stem ## cnt >> 1); \ 329 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 330 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 331 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 } 332 }
297 333
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
302
303#define array_free(stem, idx) \ 334#define array_free(stem, idx) \
304 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;
305 336
306/*****************************************************************************/ 337/*****************************************************************************/
307 338
… …
316 347
317 ++base; 348 ++base;
318 } 349 }
319} 350}
320 351
321static void 352void
322event (EV_P_ W w, int events) 353ev_feed_event (EV_P_ void *w, int revents)
323{ 354{
355 W w_ = (W)w;
356
324 if (w->pending) 357 if (w_->pending)
325 { 358 {
326 pendings [ABSPRI (w)][w->pending - 1].events |= events; 359 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
327 return; 360 return;
328 } 361 }
329 362
330 w->pending = ++pendingcnt [ABSPRI (w)]; 363 w_->pending = ++pendingcnt [ABSPRI (w_)];
331 array_needsize (ANPENDING, pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void)); 364 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
332 pendings [ABSPRI (w)][w->pending - 1].w = w; 365 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
333 pendings [ABSPRI (w)][w->pending - 1].events = events; 366 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
334} 367}
335 368
336static void 369static void
337queue_events (EV_P_ W *events, int eventcnt, int type) 370queue_events (EV_P_ W *events, int eventcnt, int type)
338{ 371{
339 int i; 372 int i;
340 373
341 for (i = 0; i < eventcnt; ++i) 374 for (i = 0; i < eventcnt; ++i)
342 event (EV_A_ events [i], type); 375 ev_feed_event (EV_A_ events [i], type);
343} 376}
344 377
345static void 378inline void
346fd_event (EV_P_ int fd, int events) 379fd_event (EV_P_ int fd, int revents)
347{ 380{
348 ANFD *anfd = anfds + fd; 381 ANFD *anfd = anfds + fd;
349 struct ev_io *w; 382 struct ev_io *w;
350 383
351 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)
352 { 385 {
353 int ev = w->events & events; 386 int ev = w->events & revents;
354 387
355 if (ev) 388 if (ev)
356 event (EV_A_ (W)w, ev); 389 ev_feed_event (EV_A_ (W)w, ev);
357 } 390 }
391}
392
393void
394ev_feed_fd_event (EV_P_ int fd, int revents)
395{
396 fd_event (EV_A_ fd, revents);
358} 397}
359 398
360/*****************************************************************************/ 399/*****************************************************************************/
361 400
362static void 401static void
… …
373 int events = 0; 412 int events = 0;
374 413
375 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)
376 events |= w->events; 415 events |= w->events;
377 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
378 anfd->reify = 0; 426 anfd->reify = 0;
379 427
380 method_modify (EV_A_ fd, anfd->events, events); 428 method_modify (EV_A_ fd, anfd->events, events);
381 anfd->events = events; 429 anfd->events = events;
382 } 430 }
… …
403 struct ev_io *w; 451 struct ev_io *w;
404 452
405 while ((w = (struct ev_io *)anfds [fd].head)) 453 while ((w = (struct ev_io *)anfds [fd].head))
406 { 454 {
407 ev_io_stop (EV_A_ w); 455 ev_io_stop (EV_A_ w);
408 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);
409 } 457 }
410} 458}
411 459
412static int 460static int
413fd_valid (int fd) 461fd_valid (int fd)
414{ 462{
415#ifdef WIN32 463#ifdef _WIN32
416 return !!win32_get_osfhandle (fd); 464 return _get_osfhandle (fd) != -1;
417#else 465#else
418 return fcntl (fd, F_GETFD) != -1; 466 return fcntl (fd, F_GETFD) != -1;
419#endif 467#endif
420} 468}
421 469
… …
501 549
502 heap [k] = w; 550 heap [k] = w;
503 ((W)heap [k])->active = k + 1; 551 ((W)heap [k])->active = k + 1;
504} 552}
505 553
554inline void
555adjustheap (WT *heap, int N, int k)
556{
557 upheap (heap, k);
558 downheap (heap, N, k);
559}
560
506/*****************************************************************************/ 561/*****************************************************************************/
507 562
508typedef struct 563typedef struct
509{ 564{
510 WL head; 565 WL head;
… …
531} 586}
532 587
533static void 588static void
534sighandler (int signum) 589sighandler (int signum)
535{ 590{
536#if WIN32 591#if _WIN32
537 signal (signum, sighandler); 592 signal (signum, sighandler);
538#endif 593#endif
539 594
540 signals [signum - 1].gotsig = 1; 595 signals [signum - 1].gotsig = 1;
541 596
… …
546 write (sigpipe [1], &signum, 1); 601 write (sigpipe [1], &signum, 1);
547 errno = old_errno; 602 errno = old_errno;
548 } 603 }
549} 604}
550 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
551static void 626static void
552sigcb (EV_P_ struct ev_io *iow, int revents) 627sigcb (EV_P_ struct ev_io *iow, int revents)
553{ 628{
554 WL w;
555 int signum; 629 int signum;
556 630
557 read (sigpipe [0], &revents, 1); 631 read (sigpipe [0], &revents, 1);
558 gotsig = 0; 632 gotsig = 0;
559 633
560 for (signum = signalmax; signum--; ) 634 for (signum = signalmax; signum--; )
561 if (signals [signum].gotsig) 635 if (signals [signum].gotsig)
562 { 636 ev_feed_signal_event (EV_A_ signum + 1);
563 signals [signum].gotsig = 0; 637}
564 638
565 for (w = signals [signum].head; w; w = w->next) 639inline void
566 event (EV_A_ (W)w, EV_SIGNAL); 640fd_intern (int fd)
567 } 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
568} 649}
569 650
570static void 651static void
571siginit (EV_P) 652siginit (EV_P)
572{ 653{
573#ifndef WIN32 654 fd_intern (sigpipe [0]);
574 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 655 fd_intern (sigpipe [1]);
575 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
576
577 /* rather than sort out wether we really need nb, set it */
578 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
579 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
580#endif
581 656
582 ev_io_set (&sigev, sigpipe [0], EV_READ); 657 ev_io_set (&sigev, sigpipe [0], EV_READ);
583 ev_io_start (EV_A_ &sigev); 658 ev_io_start (EV_A_ &sigev);
584 ev_unref (EV_A); /* child watcher should not keep loop alive */ 659 ev_unref (EV_A); /* child watcher should not keep loop alive */
585} 660}
586 661
587/*****************************************************************************/ 662/*****************************************************************************/
588 663
589static struct ev_child *childs [PID_HASHSIZE]; 664static struct ev_child *childs [PID_HASHSIZE];
590 665
591#ifndef WIN32 666#ifndef _WIN32
592 667
593static struct ev_signal childev; 668static struct ev_signal childev;
594 669
595#ifndef WCONTINUED 670#ifndef WCONTINUED
596# define WCONTINUED 0 671# define WCONTINUED 0
… …
605 if (w->pid == pid || !w->pid) 680 if (w->pid == pid || !w->pid)
606 { 681 {
607 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 682 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
608 w->rpid = pid; 683 w->rpid = pid;
609 w->rstatus = status; 684 w->rstatus = status;
610 event (EV_A_ (W)w, EV_CHILD); 685 ev_feed_event (EV_A_ (W)w, EV_CHILD);
611 } 686 }
612} 687}
613 688
614static void 689static void
615childcb (EV_P_ struct ev_signal *sw, int revents) 690childcb (EV_P_ struct ev_signal *sw, int revents)
… …
617 int pid, status; 692 int pid, status;
618 693
619 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 694 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
620 { 695 {
621 /* 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 */
622 event (EV_A_ (W)sw, EV_SIGNAL); 697 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
623 698
624 child_reap (EV_A_ sw, pid, pid, status); 699 child_reap (EV_A_ sw, pid, pid, status);
625 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 */
626 } 701 }
627} 702}
… …
657 732
658/* 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 */
659static int 734static int
660enable_secure (void) 735enable_secure (void)
661{ 736{
662#ifdef WIN32 737#ifdef _WIN32
663 return 0; 738 return 0;
664#else 739#else
665 return getuid () != geteuid () 740 return getuid () != geteuid ()
666 || getgid () != getegid (); 741 || getgid () != getegid ();
667#endif 742#endif
… …
684 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 759 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
685 have_monotonic = 1; 760 have_monotonic = 1;
686 } 761 }
687#endif 762#endif
688 763
689 rt_now = ev_time (); 764 ev_rt_now = ev_time ();
690 mn_now = get_clock (); 765 mn_now = get_clock ();
691 now_floor = mn_now; 766 now_floor = mn_now;
692 rtmn_diff = rt_now - mn_now; 767 rtmn_diff = ev_rt_now - mn_now;
693 768
694 if (methods == EVMETHOD_AUTO) 769 if (methods == EVMETHOD_AUTO)
695 if (!enable_secure () && getenv ("LIBEV_METHODS")) 770 if (!enable_secure () && getenv ("LIBEV_METHODS"))
696 methods = atoi (getenv ("LIBEV_METHODS")); 771 methods = atoi (getenv ("LIBEV_METHODS"));
697 else 772 else
698 methods = EVMETHOD_ANY; 773 methods = EVMETHOD_ANY;
699 774
700 method = 0; 775 method = 0;
701#if EV_USE_WIN32
702 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
703#endif
704#if EV_USE_KQUEUE 776#if EV_USE_KQUEUE
705 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
706#endif 778#endif
707#if EV_USE_EPOLL 779#if EV_USE_EPOLL
708 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
712#endif 784#endif
713#if EV_USE_SELECT 785#if EV_USE_SELECT
714 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 786 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
715#endif 787#endif
716 788
717 ev_watcher_init (&sigev, sigcb); 789 ev_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI); 790 ev_set_priority (&sigev, EV_MAXPRI);
719 } 791 }
720} 792}
721 793
722void 794void
723loop_destroy (EV_P) 795loop_destroy (EV_P)
724{ 796{
725 int i; 797 int i;
726 798
727#if EV_USE_WIN32
728 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
729#endif
730#if EV_USE_KQUEUE 799#if EV_USE_KQUEUE
731 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
732#endif 801#endif
733#if EV_USE_EPOLL 802#if EV_USE_EPOLL
734 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
742 811
743 for (i = NUMPRI; i--; ) 812 for (i = NUMPRI; i--; )
744 array_free (pending, [i]); 813 array_free (pending, [i]);
745 814
746 /* have to use the microsoft-never-gets-it-right macro */ 815 /* have to use the microsoft-never-gets-it-right macro */
747 array_free_microshit (fdchange); 816 array_free (fdchange, EMPTY);
748 array_free_microshit (timer); 817 array_free (timer, EMPTY);
749 array_free_microshit (periodic); 818#if EV_PERIODICS
750 array_free_microshit (idle); 819 array_free (periodic, EMPTY);
751 array_free_microshit (prepare); 820#endif
752 array_free_microshit (check); 821 array_free (idle, EMPTY);
822 array_free (prepare, EMPTY);
823 array_free (check, EMPTY);
753 824
754 method = 0; 825 method = 0;
755} 826}
756 827
757static void 828static void
… …
812} 883}
813 884
814#endif 885#endif
815 886
816#if EV_MULTIPLICITY 887#if EV_MULTIPLICITY
817struct ev_loop default_loop_struct;
818static struct ev_loop *default_loop;
819
820struct ev_loop * 888struct ev_loop *
821#else 889#else
822static int default_loop;
823
824int 890int
825#endif 891#endif
826ev_default_loop (int methods) 892ev_default_loop (int methods)
827{ 893{
828 if (sigpipe [0] == sigpipe [1]) 894 if (sigpipe [0] == sigpipe [1])
… …
841 907
842 if (ev_method (EV_A)) 908 if (ev_method (EV_A))
843 { 909 {
844 siginit (EV_A); 910 siginit (EV_A);
845 911
846#ifndef WIN32 912#ifndef _WIN32
847 ev_signal_init (&childev, childcb, SIGCHLD); 913 ev_signal_init (&childev, childcb, SIGCHLD);
848 ev_set_priority (&childev, EV_MAXPRI); 914 ev_set_priority (&childev, EV_MAXPRI);
849 ev_signal_start (EV_A_ &childev); 915 ev_signal_start (EV_A_ &childev);
850 ev_unref (EV_A); /* child watcher should not keep loop alive */ 916 ev_unref (EV_A); /* child watcher should not keep loop alive */
851#endif 917#endif
… …
862{ 928{
863#if EV_MULTIPLICITY 929#if EV_MULTIPLICITY
864 struct ev_loop *loop = default_loop; 930 struct ev_loop *loop = default_loop;
865#endif 931#endif
866 932
867#ifndef WIN32 933#ifndef _WIN32
868 ev_ref (EV_A); /* child watcher */ 934 ev_ref (EV_A); /* child watcher */
869 ev_signal_stop (EV_A_ &childev); 935 ev_signal_stop (EV_A_ &childev);
870#endif 936#endif
871 937
872 ev_ref (EV_A); /* signal watcher */ 938 ev_ref (EV_A); /* signal watcher */
… …
888 if (method) 954 if (method)
889 postfork = 1; 955 postfork = 1;
890} 956}
891 957
892/*****************************************************************************/ 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}
893 971
894static void 972static void
895call_pending (EV_P) 973call_pending (EV_P)
896{ 974{
897 int pri; 975 int pri;
… …
902 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 980 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
903 981
904 if (p->w) 982 if (p->w)
905 { 983 {
906 p->w->pending = 0; 984 p->w->pending = 0;
907 p->w->cb (EV_A_ p->w, p->events); 985 EV_CB_INVOKE (p->w, p->events);
908 } 986 }
909 } 987 }
910} 988}
911 989
912static void 990static void
… …
920 998
921 /* first reschedule or stop timer */ 999 /* first reschedule or stop timer */
922 if (w->repeat) 1000 if (w->repeat)
923 { 1001 {
924 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
925 ((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
926 downheap ((WT *)timers, timercnt, 0); 1008 downheap ((WT *)timers, timercnt, 0);
927 } 1009 }
928 else 1010 else
929 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1011 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
930 1012
931 event (EV_A_ (W)w, EV_TIMEOUT); 1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
932 } 1014 }
933} 1015}
934 1016
1017#if EV_PERIODICS
935static void 1018static void
936periodics_reify (EV_P) 1019periodics_reify (EV_P)
937{ 1020{
938 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
939 { 1022 {
940 struct ev_periodic *w = periodics [0]; 1023 struct ev_periodic *w = periodics [0];
941 1024
942 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1025 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
943 1026
944 /* first reschedule or stop timer */ 1027 /* first reschedule or stop timer */
945 if (w->interval) 1028 if (w->reschedule_cb)
946 { 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 {
947 ((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;
948 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));
949 downheap ((WT *)periodics, periodiccnt, 0); 1039 downheap ((WT *)periodics, periodiccnt, 0);
950 } 1040 }
951 else 1041 else
952 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1042 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
953 1043
954 event (EV_A_ (W)w, EV_PERIODIC); 1044 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
955 } 1045 }
956} 1046}
957 1047
958static void 1048static void
959periodics_reschedule (EV_P) 1049periodics_reschedule (EV_P)
… …
963 /* adjust periodics after time jump */ 1053 /* adjust periodics after time jump */
964 for (i = 0; i < periodiccnt; ++i) 1054 for (i = 0; i < periodiccnt; ++i)
965 { 1055 {
966 struct ev_periodic *w = periodics [i]; 1056 struct ev_periodic *w = periodics [i];
967 1057
1058 if (w->reschedule_cb)
1059 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
968 if (w->interval) 1060 else if (w->interval)
969 {
970 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;
971
972 if (fabs (diff) >= 1e-4)
973 {
974 ev_periodic_stop (EV_A_ w);
975 ev_periodic_start (EV_A_ w);
976
977 i = 0; /* restart loop, inefficient, but time jumps should be rare */
978 }
979 }
980 } 1062 }
1063
1064 /* now rebuild the heap */
1065 for (i = periodiccnt >> 1; i--; )
1066 downheap ((WT *)periodics, periodiccnt, i);
981} 1067}
1068#endif
982 1069
983inline int 1070inline int
984time_update_monotonic (EV_P) 1071time_update_monotonic (EV_P)
985{ 1072{
986 mn_now = get_clock (); 1073 mn_now = get_clock ();
987 1074
988 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1075 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
989 { 1076 {
990 rt_now = rtmn_diff + mn_now; 1077 ev_rt_now = rtmn_diff + mn_now;
991 return 0; 1078 return 0;
992 } 1079 }
993 else 1080 else
994 { 1081 {
995 now_floor = mn_now; 1082 now_floor = mn_now;
996 rt_now = ev_time (); 1083 ev_rt_now = ev_time ();
997 return 1; 1084 return 1;
998 } 1085 }
999} 1086}
1000 1087
1001static void 1088static void
… …
1010 { 1097 {
1011 ev_tstamp odiff = rtmn_diff; 1098 ev_tstamp odiff = rtmn_diff;
1012 1099
1013 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 */
1014 { 1101 {
1015 rtmn_diff = rt_now - mn_now; 1102 rtmn_diff = ev_rt_now - mn_now;
1016 1103
1017 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1104 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1018 return; /* all is well */ 1105 return; /* all is well */
1019 1106
1020 rt_now = ev_time (); 1107 ev_rt_now = ev_time ();
1021 mn_now = get_clock (); 1108 mn_now = get_clock ();
1022 now_floor = mn_now; 1109 now_floor = mn_now;
1023 } 1110 }
1024 1111
1112# if EV_PERIODICS
1025 periodics_reschedule (EV_A); 1113 periodics_reschedule (EV_A);
1114# endif
1026 /* no timer adjustment, as the monotonic clock doesn't jump */ 1115 /* no timer adjustment, as the monotonic clock doesn't jump */
1027 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1116 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1028 } 1117 }
1029 } 1118 }
1030 else 1119 else
1031#endif 1120#endif
1032 { 1121 {
1033 rt_now = ev_time (); 1122 ev_rt_now = ev_time ();
1034 1123
1035 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))
1036 { 1125 {
1126#if EV_PERIODICS
1037 periodics_reschedule (EV_A); 1127 periodics_reschedule (EV_A);
1128#endif
1038 1129
1039 /* 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 */
1040 for (i = 0; i < timercnt; ++i) 1131 for (i = 0; i < timercnt; ++i)
1041 ((WT)timers [i])->at += rt_now - mn_now; 1132 ((WT)timers [i])->at += ev_rt_now - mn_now;
1042 } 1133 }
1043 1134
1044 mn_now = rt_now; 1135 mn_now = ev_rt_now;
1045 } 1136 }
1046} 1137}
1047 1138
1048void 1139void
1049ev_ref (EV_P) 1140ev_ref (EV_P)
… …
1081 /* update fd-related kernel structures */ 1172 /* update fd-related kernel structures */
1082 fd_reify (EV_A); 1173 fd_reify (EV_A);
1083 1174
1084 /* calculate blocking time */ 1175 /* calculate blocking time */
1085 1176
1086 /* 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
1087 always have timers, we just calculate it always */ 1178 always have timers, we just calculate it always */
1088#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
1089 if (expect_true (have_monotonic)) 1180 if (expect_true (have_monotonic))
1090 time_update_monotonic (EV_A); 1181 time_update_monotonic (EV_A);
1091 else 1182 else
1092#endif 1183#endif
1093 { 1184 {
1094 rt_now = ev_time (); 1185 ev_rt_now = ev_time ();
1095 mn_now = rt_now; 1186 mn_now = ev_rt_now;
1096 } 1187 }
1097 1188
1098 if (flags & EVLOOP_NONBLOCK || idlecnt) 1189 if (flags & EVLOOP_NONBLOCK || idlecnt)
1099 block = 0.; 1190 block = 0.;
1100 else 1191 else
… …
1105 { 1196 {
1106 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1197 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1107 if (block > to) block = to; 1198 if (block > to) block = to;
1108 } 1199 }
1109 1200
1201#if EV_PERIODICS
1110 if (periodiccnt) 1202 if (periodiccnt)
1111 { 1203 {
1112 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1204 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1113 if (block > to) block = to; 1205 if (block > to) block = to;
1114 } 1206 }
1207#endif
1115 1208
1116 if (block < 0.) block = 0.; 1209 if (block < 0.) block = 0.;
1117 } 1210 }
1118 1211
1119 method_poll (EV_A_ block); 1212 method_poll (EV_A_ block);
1120 1213
1121 /* update rt_now, do magic */ 1214 /* update ev_rt_now, do magic */
1122 time_update (EV_A); 1215 time_update (EV_A);
1123 1216
1124 /* queue pending timers and reschedule them */ 1217 /* queue pending timers and reschedule them */
1125 timers_reify (EV_A); /* relative timers called last */ 1218 timers_reify (EV_A); /* relative timers called last */
1219#if EV_PERIODICS
1126 periodics_reify (EV_A); /* absolute timers called first */ 1220 periodics_reify (EV_A); /* absolute timers called first */
1221#endif
1127 1222
1128 /* queue idle watchers unless io or timers are pending */ 1223 /* queue idle watchers unless io or timers are pending */
1129 if (!pendingcnt) 1224 if (idlecnt && !any_pending (EV_A))
1130 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1131 1226
1132 /* queue check watchers, to be executed first */ 1227 /* queue check watchers, to be executed first */
1133 if (checkcnt) 1228 if (checkcnt)
1134 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1229 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1222{ 1317{
1223 ev_clear_pending (EV_A_ (W)w); 1318 ev_clear_pending (EV_A_ (W)w);
1224 if (!ev_is_active (w)) 1319 if (!ev_is_active (w))
1225 return; 1320 return;
1226 1321
1322 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1323
1227 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1228 ev_stop (EV_A_ (W)w); 1325 ev_stop (EV_A_ (W)w);
1229 1326
1230 fd_change (EV_A_ w->fd); 1327 fd_change (EV_A_ w->fd);
1231} 1328}
… …
1258 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1259 1356
1260 if (((W)w)->active < timercnt--) 1357 if (((W)w)->active < timercnt--)
1261 { 1358 {
1262 timers [((W)w)->active - 1] = timers [timercnt]; 1359 timers [((W)w)->active - 1] = timers [timercnt];
1263 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1264 } 1361 }
1265 1362
1266 ((WT)w)->at = w->repeat; 1363 ((WT)w)->at -= mn_now;
1267 1364
1268 ev_stop (EV_A_ (W)w); 1365 ev_stop (EV_A_ (W)w);
1269} 1366}
1270 1367
1271void 1368void
… …
1274 if (ev_is_active (w)) 1371 if (ev_is_active (w))
1275 { 1372 {
1276 if (w->repeat) 1373 if (w->repeat)
1277 { 1374 {
1278 ((WT)w)->at = mn_now + w->repeat; 1375 ((WT)w)->at = mn_now + w->repeat;
1279 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1376 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1280 } 1377 }
1281 else 1378 else
1282 ev_timer_stop (EV_A_ w); 1379 ev_timer_stop (EV_A_ w);
1283 } 1380 }
1284 else if (w->repeat) 1381 else if (w->repeat)
1285 ev_timer_start (EV_A_ w); 1382 ev_timer_start (EV_A_ w);
1286} 1383}
1287 1384
1385#if EV_PERIODICS
1288void 1386void
1289ev_periodic_start (EV_P_ struct ev_periodic *w) 1387ev_periodic_start (EV_P_ struct ev_periodic *w)
1290{ 1388{
1291 if (ev_is_active (w)) 1389 if (ev_is_active (w))
1292 return; 1390 return;
1293 1391
1392 if (w->reschedule_cb)
1393 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1394 else if (w->interval)
1395 {
1294 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.));
1295
1296 /* 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 */
1297 if (w->interval)
1298 ((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 }
1299 1400
1300 ev_start (EV_A_ (W)w, ++periodiccnt); 1401 ev_start (EV_A_ (W)w, ++periodiccnt);
1301 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1402 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1302 periodics [periodiccnt - 1] = w; 1403 periodics [periodiccnt - 1] = w;
1303 upheap ((WT *)periodics, periodiccnt - 1); 1404 upheap ((WT *)periodics, periodiccnt - 1);
… …
1315 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1316 1417
1317 if (((W)w)->active < periodiccnt--) 1418 if (((W)w)->active < periodiccnt--)
1318 { 1419 {
1319 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1420 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1320 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1321 } 1422 }
1322 1423
1323 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1324} 1425}
1426
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
1325 1435
1326void 1436void
1327ev_idle_start (EV_P_ struct ev_idle *w) 1437ev_idle_start (EV_P_ struct ev_idle *w)
1328{ 1438{
1329 if (ev_is_active (w)) 1439 if (ev_is_active (w))
… …
1336 1446
1337void 1447void
1338ev_idle_stop (EV_P_ struct ev_idle *w) 1448ev_idle_stop (EV_P_ struct ev_idle *w)
1339{ 1449{
1340 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1341 if (ev_is_active (w)) 1451 if (!ev_is_active (w))
1342 return; 1452 return;
1343 1453
1344 idles [((W)w)->active - 1] = idles [--idlecnt]; 1454 idles [((W)w)->active - 1] = idles [--idlecnt];
1345 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1346} 1456}
… …
1358 1468
1359void 1469void
1360ev_prepare_stop (EV_P_ struct ev_prepare *w) 1470ev_prepare_stop (EV_P_ struct ev_prepare *w)
1361{ 1471{
1362 ev_clear_pending (EV_A_ (W)w); 1472 ev_clear_pending (EV_A_ (W)w);
1363 if (ev_is_active (w)) 1473 if (!ev_is_active (w))
1364 return; 1474 return;
1365 1475
1366 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1476 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1367 ev_stop (EV_A_ (W)w); 1477 ev_stop (EV_A_ (W)w);
1368} 1478}
… …
1380 1490
1381void 1491void
1382ev_check_stop (EV_P_ struct ev_check *w) 1492ev_check_stop (EV_P_ struct ev_check *w)
1383{ 1493{
1384 ev_clear_pending (EV_A_ (W)w); 1494 ev_clear_pending (EV_A_ (W)w);
1385 if (ev_is_active (w)) 1495 if (!ev_is_active (w))
1386 return; 1496 return;
1387 1497
1388 checks [((W)w)->active - 1] = checks [--checkcnt]; 1498 checks [((W)w)->active - 1] = checks [--checkcnt];
1389 ev_stop (EV_A_ (W)w); 1499 ev_stop (EV_A_ (W)w);
1390} 1500}
… …
1408 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1518 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1409 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1519 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1410 1520
1411 if (!((WL)w)->next) 1521 if (!((WL)w)->next)
1412 { 1522 {
1413#if WIN32 1523#if _WIN32
1414 signal (w->signum, sighandler); 1524 signal (w->signum, sighandler);
1415#else 1525#else
1416 struct sigaction sa; 1526 struct sigaction sa;
1417 sa.sa_handler = sighandler; 1527 sa.sa_handler = sighandler;
1418 sigfillset (&sa.sa_mask); 1528 sigfillset (&sa.sa_mask);
… …
1451 1561
1452void 1562void
1453ev_child_stop (EV_P_ struct ev_child *w) 1563ev_child_stop (EV_P_ struct ev_child *w)
1454{ 1564{
1455 ev_clear_pending (EV_A_ (W)w); 1565 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w)) 1566 if (!ev_is_active (w))
1457 return; 1567 return;
1458 1568
1459 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1460 ev_stop (EV_A_ (W)w); 1570 ev_stop (EV_A_ (W)w);
1461} 1571}
… …
1505 else 1615 else
1506 { 1616 {
1507 once->cb = cb; 1617 once->cb = cb;
1508 once->arg = arg; 1618 once->arg = arg;
1509 1619
1510 ev_watcher_init (&once->io, once_cb_io); 1620 ev_init (&once->io, once_cb_io);
1511 if (fd >= 0) 1621 if (fd >= 0)
1512 { 1622 {
1513 ev_io_set (&once->io, fd, events); 1623 ev_io_set (&once->io, fd, events);
1514 ev_io_start (EV_A_ &once->io); 1624 ev_io_start (EV_A_ &once->io);
1515 } 1625 }
1516 1626
1517 ev_watcher_init (&once->to, once_cb_to); 1627 ev_init (&once->to, once_cb_to);
1518 if (timeout >= 0.) 1628 if (timeout >= 0.)
1519 { 1629 {
1520 ev_timer_set (&once->to, timeout, 0.); 1630 ev_timer_set (&once->to, timeout, 0.);
1521 ev_timer_start (EV_A_ &once->to); 1631 ev_timer_start (EV_A_ &once->to);
1522 } 1632 }
1523 } 1633 }
1524} 1634}
1525 1635
1636#ifdef __cplusplus
1637}
1638#endif
1639

Diff Legend

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