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

Comparing libev/ev.c (file contents):
Revision 1.78 by root, Thu Nov 8 21:08:56 2007 UTC vs.
Revision 1.112 by root, Mon Nov 12 07:20:24 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
… …
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 117#endif
97 118
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif
107
108#ifndef EV_USE_REALTIME 119#ifndef EV_USE_REALTIME
109# define EV_USE_REALTIME 1 120# define EV_USE_REALTIME 1
110#endif 121#endif
111 122
112/**/ 123/**/
124
125/* darwin simply cannot be helped */
126#ifdef __APPLE__
127# undef EV_USE_POLL
128# undef EV_USE_KQUEUE
129#endif
113 130
114#ifndef CLOCK_MONOTONIC 131#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC 132# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0 133# define EV_USE_MONOTONIC 0
117#endif 134#endif
118 135
119#ifndef CLOCK_REALTIME 136#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 137# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 138# define EV_USE_REALTIME 0
139#endif
140
141#if EV_SELECT_IS_WINSOCKET
142# include <winsock.h>
122#endif 143#endif
123 144
124/**/ 145/**/
125 146
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 147#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) */ 148#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 */ 149#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 */ 150/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130 151
152#ifdef EV_H
153# include EV_H
154#else
131#include "ev.h" 155# include "ev.h"
156#endif
132 157
133#if __GNUC__ >= 3 158#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 159# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 160# define inline inline
136#else 161#else
… …
142#define expect_true(expr) expect ((expr) != 0, 1) 167#define expect_true(expr) expect ((expr) != 0, 1)
143 168
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 169#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 170#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 171
172#define EMPTY /* required for microsofts broken pseudo-c compiler */
173
147typedef struct ev_watcher *W; 174typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 175typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 176typedef struct ev_watcher_time *WT;
150 177
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 178static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 179
180#ifdef _WIN32
153#include "ev_win32.c" 181# include "ev_win32.c"
182#endif
154 183
155/*****************************************************************************/ 184/*****************************************************************************/
156 185
157static void (*syserr_cb)(const char *msg); 186static void (*syserr_cb)(const char *msg);
158 187
… …
205typedef struct 234typedef struct
206{ 235{
207 WL head; 236 WL head;
208 unsigned char events; 237 unsigned char events;
209 unsigned char reify; 238 unsigned char reify;
239#if EV_SELECT_IS_WINSOCKET
240 SOCKET handle;
241#endif
210} ANFD; 242} ANFD;
211 243
212typedef struct 244typedef struct
213{ 245{
214 W w; 246 W w;
215 int events; 247 int events;
216} ANPENDING; 248} ANPENDING;
217 249
218#if EV_MULTIPLICITY 250#if EV_MULTIPLICITY
219 251
220struct ev_loop 252 struct ev_loop
221{ 253 {
254 ev_tstamp ev_rt_now;
255 #define ev_rt_now ((loop)->ev_rt_now)
222# define VAR(name,decl) decl; 256 #define VAR(name,decl) decl;
223# include "ev_vars.h" 257 #include "ev_vars.h"
224};
225# undef VAR 258 #undef VAR
259 };
226# include "ev_wrap.h" 260 #include "ev_wrap.h"
261
262 struct ev_loop default_loop_struct;
263 static struct ev_loop *default_loop;
227 264
228#else 265#else
229 266
267 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 268 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 269 #include "ev_vars.h"
232# undef VAR 270 #undef VAR
271
272 static int default_loop;
233 273
234#endif 274#endif
235 275
236/*****************************************************************************/ 276/*****************************************************************************/
237 277
238inline ev_tstamp 278ev_tstamp
239ev_time (void) 279ev_time (void)
240{ 280{
241#if EV_USE_REALTIME 281#if EV_USE_REALTIME
242 struct timespec ts; 282 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 283 clock_gettime (CLOCK_REALTIME, &ts);
… …
262#endif 302#endif
263 303
264 return ev_time (); 304 return ev_time ();
265} 305}
266 306
307#if EV_MULTIPLICITY
267ev_tstamp 308ev_tstamp
268ev_now (EV_P) 309ev_now (EV_P)
269{ 310{
270 return rt_now; 311 return ev_rt_now;
271} 312}
313#endif
272 314
273#define array_roundsize(type,n) ((n) | 4 & ~3) 315#define array_roundsize(type,n) (((n) | 4) & ~3)
274 316
275#define array_needsize(type,base,cur,cnt,init) \ 317#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 318 if (expect_false ((cnt) > cur)) \
277 { \ 319 { \
278 int newcnt = cur; \ 320 int newcnt = cur; \
… …
293 stem ## max = array_roundsize (stem ## cnt >> 1); \ 335 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 336 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 337 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 } 338 }
297 339
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) \ 340#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 341 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
305 342
306/*****************************************************************************/ 343/*****************************************************************************/
307 344
… …
342 379
343 for (i = 0; i < eventcnt; ++i) 380 for (i = 0; i < eventcnt; ++i)
344 ev_feed_event (EV_A_ events [i], type); 381 ev_feed_event (EV_A_ events [i], type);
345} 382}
346 383
347static void 384inline void
348fd_event (EV_P_ int fd, int events) 385fd_event (EV_P_ int fd, int revents)
349{ 386{
350 ANFD *anfd = anfds + fd; 387 ANFD *anfd = anfds + fd;
351 struct ev_io *w; 388 struct ev_io *w;
352 389
353 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 390 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
354 { 391 {
355 int ev = w->events & events; 392 int ev = w->events & revents;
356 393
357 if (ev) 394 if (ev)
358 ev_feed_event (EV_A_ (W)w, ev); 395 ev_feed_event (EV_A_ (W)w, ev);
359 } 396 }
397}
398
399void
400ev_feed_fd_event (EV_P_ int fd, int revents)
401{
402 fd_event (EV_A_ fd, revents);
360} 403}
361 404
362/*****************************************************************************/ 405/*****************************************************************************/
363 406
364static void 407static void
… …
375 int events = 0; 418 int events = 0;
376 419
377 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 420 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
378 events |= w->events; 421 events |= w->events;
379 422
423#if EV_SELECT_IS_WINSOCKET
424 if (events)
425 {
426 unsigned long argp;
427 anfd->handle = _get_osfhandle (fd);
428 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
429 }
430#endif
431
380 anfd->reify = 0; 432 anfd->reify = 0;
381 433
382 method_modify (EV_A_ fd, anfd->events, events); 434 method_modify (EV_A_ fd, anfd->events, events);
383 anfd->events = events; 435 anfd->events = events;
384 } 436 }
… …
412} 464}
413 465
414static int 466static int
415fd_valid (int fd) 467fd_valid (int fd)
416{ 468{
417#ifdef WIN32 469#ifdef _WIN32
418 return !!win32_get_osfhandle (fd); 470 return _get_osfhandle (fd) != -1;
419#else 471#else
420 return fcntl (fd, F_GETFD) != -1; 472 return fcntl (fd, F_GETFD) != -1;
421#endif 473#endif
422} 474}
423 475
… …
503 555
504 heap [k] = w; 556 heap [k] = w;
505 ((W)heap [k])->active = k + 1; 557 ((W)heap [k])->active = k + 1;
506} 558}
507 559
560inline void
561adjustheap (WT *heap, int N, int k)
562{
563 upheap (heap, k);
564 downheap (heap, N, k);
565}
566
508/*****************************************************************************/ 567/*****************************************************************************/
509 568
510typedef struct 569typedef struct
511{ 570{
512 WL head; 571 WL head;
… …
533} 592}
534 593
535static void 594static void
536sighandler (int signum) 595sighandler (int signum)
537{ 596{
538#if WIN32 597#if _WIN32
539 signal (signum, sighandler); 598 signal (signum, sighandler);
540#endif 599#endif
541 600
542 signals [signum - 1].gotsig = 1; 601 signals [signum - 1].gotsig = 1;
543 602
544 if (!gotsig) 603 if (!gotsig)
545 { 604 {
546 int old_errno = errno; 605 int old_errno = errno;
547 gotsig = 1; 606 gotsig = 1;
548#ifdef WIN32
549 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
550#else
551 write (sigpipe [1], &signum, 1); 607 write (sigpipe [1], &signum, 1);
552#endif
553 errno = old_errno; 608 errno = old_errno;
554 } 609 }
555} 610}
556 611
612void
613ev_feed_signal_event (EV_P_ int signum)
614{
615 WL w;
616
617#if EV_MULTIPLICITY
618 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
619#endif
620
621 --signum;
622
623 if (signum < 0 || signum >= signalmax)
624 return;
625
626 signals [signum].gotsig = 0;
627
628 for (w = signals [signum].head; w; w = w->next)
629 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
630}
631
557static void 632static void
558sigcb (EV_P_ struct ev_io *iow, int revents) 633sigcb (EV_P_ struct ev_io *iow, int revents)
559{ 634{
560 WL w;
561 int signum; 635 int signum;
562 636
563#ifdef WIN32
564 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
565#else
566 read (sigpipe [0], &revents, 1); 637 read (sigpipe [0], &revents, 1);
567#endif
568 gotsig = 0; 638 gotsig = 0;
569 639
570 for (signum = signalmax; signum--; ) 640 for (signum = signalmax; signum--; )
571 if (signals [signum].gotsig) 641 if (signals [signum].gotsig)
572 { 642 ev_feed_signal_event (EV_A_ signum + 1);
573 signals [signum].gotsig = 0; 643}
574 644
575 for (w = signals [signum].head; w; w = w->next) 645inline void
576 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 646fd_intern (int fd)
577 } 647{
648#ifdef _WIN32
649 int arg = 1;
650 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
651#else
652 fcntl (fd, F_SETFD, FD_CLOEXEC);
653 fcntl (fd, F_SETFL, O_NONBLOCK);
654#endif
578} 655}
579 656
580static void 657static void
581siginit (EV_P) 658siginit (EV_P)
582{ 659{
583#ifndef WIN32 660 fd_intern (sigpipe [0]);
584 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 661 fd_intern (sigpipe [1]);
585 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
586
587 /* rather than sort out wether we really need nb, set it */
588 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
589 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
590#endif
591 662
592 ev_io_set (&sigev, sigpipe [0], EV_READ); 663 ev_io_set (&sigev, sigpipe [0], EV_READ);
593 ev_io_start (EV_A_ &sigev); 664 ev_io_start (EV_A_ &sigev);
594 ev_unref (EV_A); /* child watcher should not keep loop alive */ 665 ev_unref (EV_A); /* child watcher should not keep loop alive */
595} 666}
596 667
597/*****************************************************************************/ 668/*****************************************************************************/
598 669
599static struct ev_child *childs [PID_HASHSIZE]; 670static struct ev_child *childs [PID_HASHSIZE];
600 671
601#ifndef WIN32 672#ifndef _WIN32
602 673
603static struct ev_signal childev; 674static struct ev_signal childev;
604 675
605#ifndef WCONTINUED 676#ifndef WCONTINUED
606# define WCONTINUED 0 677# define WCONTINUED 0
… …
667 738
668/* return true if we are running with elevated privileges and should ignore env variables */ 739/* return true if we are running with elevated privileges and should ignore env variables */
669static int 740static int
670enable_secure (void) 741enable_secure (void)
671{ 742{
672#ifdef WIN32 743#ifdef _WIN32
673 return 0; 744 return 0;
674#else 745#else
675 return getuid () != geteuid () 746 return getuid () != geteuid ()
676 || getgid () != getegid (); 747 || getgid () != getegid ();
677#endif 748#endif
678} 749}
679 750
680int 751unsigned int
681ev_method (EV_P) 752ev_method (EV_P)
682{ 753{
683 return method; 754 return method;
684} 755}
685 756
686static void 757static void
687loop_init (EV_P_ int methods) 758loop_init (EV_P_ unsigned int flags)
688{ 759{
689 if (!method) 760 if (!method)
690 { 761 {
691#if EV_USE_MONOTONIC 762#if EV_USE_MONOTONIC
692 { 763 {
… …
694 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 765 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
695 have_monotonic = 1; 766 have_monotonic = 1;
696 } 767 }
697#endif 768#endif
698 769
699 rt_now = ev_time (); 770 ev_rt_now = ev_time ();
700 mn_now = get_clock (); 771 mn_now = get_clock ();
701 now_floor = mn_now; 772 now_floor = mn_now;
702 rtmn_diff = rt_now - mn_now; 773 rtmn_diff = ev_rt_now - mn_now;
703 774
704 if (methods == EVMETHOD_AUTO) 775 if (!(flags & EVMETHOD_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
705 if (!enable_secure () && getenv ("LIBEV_METHODS"))
706 methods = atoi (getenv ("LIBEV_METHODS")); 776 flags = atoi (getenv ("LIBEV_FLAGS"));
707 else 777
708 methods = EVMETHOD_ANY; 778 if (!(flags & 0x0000ffff))
779 flags |= 0x0000ffff;
709 780
710 method = 0; 781 method = 0;
711#if EV_USE_WIN32
712 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
713#endif
714#if EV_USE_KQUEUE 782#if EV_USE_KQUEUE
715 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 783 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
716#endif 784#endif
717#if EV_USE_EPOLL 785#if EV_USE_EPOLL
718 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 786 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
719#endif 787#endif
720#if EV_USE_POLL 788#if EV_USE_POLL
721 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 789 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
722#endif 790#endif
723#if EV_USE_SELECT 791#if EV_USE_SELECT
724 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 792 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
725#endif 793#endif
726 794
727 ev_watcher_init (&sigev, sigcb); 795 ev_init (&sigev, sigcb);
728 ev_set_priority (&sigev, EV_MAXPRI); 796 ev_set_priority (&sigev, EV_MAXPRI);
729 } 797 }
730} 798}
731 799
732void 800void
733loop_destroy (EV_P) 801loop_destroy (EV_P)
734{ 802{
735 int i; 803 int i;
736 804
737#if EV_USE_WIN32
738 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
739#endif
740#if EV_USE_KQUEUE 805#if EV_USE_KQUEUE
741 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
742#endif 807#endif
743#if EV_USE_EPOLL 808#if EV_USE_EPOLL
744 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
752 817
753 for (i = NUMPRI; i--; ) 818 for (i = NUMPRI; i--; )
754 array_free (pending, [i]); 819 array_free (pending, [i]);
755 820
756 /* have to use the microsoft-never-gets-it-right macro */ 821 /* have to use the microsoft-never-gets-it-right macro */
757 array_free_microshit (fdchange); 822 array_free (fdchange, EMPTY);
758 array_free_microshit (timer); 823 array_free (timer, EMPTY);
759 array_free_microshit (periodic); 824#if EV_PERIODICS
760 array_free_microshit (idle); 825 array_free (periodic, EMPTY);
761 array_free_microshit (prepare); 826#endif
762 array_free_microshit (check); 827 array_free (idle, EMPTY);
828 array_free (prepare, EMPTY);
829 array_free (check, EMPTY);
763 830
764 method = 0; 831 method = 0;
765} 832}
766 833
767static void 834static void
… …
792 postfork = 0; 859 postfork = 0;
793} 860}
794 861
795#if EV_MULTIPLICITY 862#if EV_MULTIPLICITY
796struct ev_loop * 863struct ev_loop *
797ev_loop_new (int methods) 864ev_loop_new (unsigned int flags)
798{ 865{
799 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 866 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
800 867
801 memset (loop, 0, sizeof (struct ev_loop)); 868 memset (loop, 0, sizeof (struct ev_loop));
802 869
803 loop_init (EV_A_ methods); 870 loop_init (EV_A_ flags);
804 871
805 if (ev_method (EV_A)) 872 if (ev_method (EV_A))
806 return loop; 873 return loop;
807 874
808 return 0; 875 return 0;
… …
822} 889}
823 890
824#endif 891#endif
825 892
826#if EV_MULTIPLICITY 893#if EV_MULTIPLICITY
827struct ev_loop default_loop_struct;
828static struct ev_loop *default_loop;
829
830struct ev_loop * 894struct ev_loop *
831#else 895#else
832static int default_loop;
833
834int 896int
835#endif 897#endif
836ev_default_loop (int methods) 898ev_default_loop (unsigned int flags)
837{ 899{
838 if (sigpipe [0] == sigpipe [1]) 900 if (sigpipe [0] == sigpipe [1])
839 if (pipe (sigpipe)) 901 if (pipe (sigpipe))
840 return 0; 902 return 0;
841 903
… …
845 struct ev_loop *loop = default_loop = &default_loop_struct; 907 struct ev_loop *loop = default_loop = &default_loop_struct;
846#else 908#else
847 default_loop = 1; 909 default_loop = 1;
848#endif 910#endif
849 911
850 loop_init (EV_A_ methods); 912 loop_init (EV_A_ flags);
851 913
852 if (ev_method (EV_A)) 914 if (ev_method (EV_A))
853 { 915 {
854 siginit (EV_A); 916 siginit (EV_A);
855 917
856#ifndef WIN32 918#ifndef _WIN32
857 ev_signal_init (&childev, childcb, SIGCHLD); 919 ev_signal_init (&childev, childcb, SIGCHLD);
858 ev_set_priority (&childev, EV_MAXPRI); 920 ev_set_priority (&childev, EV_MAXPRI);
859 ev_signal_start (EV_A_ &childev); 921 ev_signal_start (EV_A_ &childev);
860 ev_unref (EV_A); /* child watcher should not keep loop alive */ 922 ev_unref (EV_A); /* child watcher should not keep loop alive */
861#endif 923#endif
… …
872{ 934{
873#if EV_MULTIPLICITY 935#if EV_MULTIPLICITY
874 struct ev_loop *loop = default_loop; 936 struct ev_loop *loop = default_loop;
875#endif 937#endif
876 938
877#ifndef WIN32 939#ifndef _WIN32
878 ev_ref (EV_A); /* child watcher */ 940 ev_ref (EV_A); /* child watcher */
879 ev_signal_stop (EV_A_ &childev); 941 ev_signal_stop (EV_A_ &childev);
880#endif 942#endif
881 943
882 ev_ref (EV_A); /* signal watcher */ 944 ev_ref (EV_A); /* signal watcher */
… …
924 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 986 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
925 987
926 if (p->w) 988 if (p->w)
927 { 989 {
928 p->w->pending = 0; 990 p->w->pending = 0;
929 p->w->cb (EV_A_ p->w, p->events); 991 EV_CB_INVOKE (p->w, p->events);
930 } 992 }
931 } 993 }
932} 994}
933 995
934static void 996static void
… …
942 1004
943 /* first reschedule or stop timer */ 1005 /* first reschedule or stop timer */
944 if (w->repeat) 1006 if (w->repeat)
945 { 1007 {
946 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1008 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1009
947 ((WT)w)->at = mn_now + w->repeat; 1010 ((WT)w)->at += w->repeat;
1011 if (((WT)w)->at < mn_now)
1012 ((WT)w)->at = mn_now;
1013
948 downheap ((WT *)timers, timercnt, 0); 1014 downheap ((WT *)timers, timercnt, 0);
949 } 1015 }
950 else 1016 else
951 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1017 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
952 1018
953 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
954 } 1020 }
955} 1021}
956 1022
1023#if EV_PERIODICS
957static void 1024static void
958periodics_reify (EV_P) 1025periodics_reify (EV_P)
959{ 1026{
960 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
961 { 1028 {
962 struct ev_periodic *w = periodics [0]; 1029 struct ev_periodic *w = periodics [0];
963 1030
964 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1031 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
965 1032
966 /* first reschedule or stop timer */ 1033 /* first reschedule or stop timer */
967 if (w->reschedule_cb) 1034 if (w->reschedule_cb)
968 { 1035 {
969 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001); 1036 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
970
971 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now)); 1037 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
972 downheap ((WT *)periodics, periodiccnt, 0); 1038 downheap ((WT *)periodics, periodiccnt, 0);
973 } 1039 }
974 else if (w->interval) 1040 else if (w->interval)
975 { 1041 {
976 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1042 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
977 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1043 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
978 downheap ((WT *)periodics, periodiccnt, 0); 1044 downheap ((WT *)periodics, periodiccnt, 0);
979 } 1045 }
980 else 1046 else
981 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1047 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
982 1048
… …
993 for (i = 0; i < periodiccnt; ++i) 1059 for (i = 0; i < periodiccnt; ++i)
994 { 1060 {
995 struct ev_periodic *w = periodics [i]; 1061 struct ev_periodic *w = periodics [i];
996 1062
997 if (w->reschedule_cb) 1063 if (w->reschedule_cb)
998 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1064 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
999 else if (w->interval) 1065 else if (w->interval)
1000 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1066 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1001 } 1067 }
1002 1068
1003 /* now rebuild the heap */ 1069 /* now rebuild the heap */
1004 for (i = periodiccnt >> 1; i--; ) 1070 for (i = periodiccnt >> 1; i--; )
1005 downheap ((WT *)periodics, periodiccnt, i); 1071 downheap ((WT *)periodics, periodiccnt, i);
1006} 1072}
1073#endif
1007 1074
1008inline int 1075inline int
1009time_update_monotonic (EV_P) 1076time_update_monotonic (EV_P)
1010{ 1077{
1011 mn_now = get_clock (); 1078 mn_now = get_clock ();
1012 1079
1013 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1080 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1014 { 1081 {
1015 rt_now = rtmn_diff + mn_now; 1082 ev_rt_now = rtmn_diff + mn_now;
1016 return 0; 1083 return 0;
1017 } 1084 }
1018 else 1085 else
1019 { 1086 {
1020 now_floor = mn_now; 1087 now_floor = mn_now;
1021 rt_now = ev_time (); 1088 ev_rt_now = ev_time ();
1022 return 1; 1089 return 1;
1023 } 1090 }
1024} 1091}
1025 1092
1026static void 1093static void
… …
1035 { 1102 {
1036 ev_tstamp odiff = rtmn_diff; 1103 ev_tstamp odiff = rtmn_diff;
1037 1104
1038 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1105 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1039 { 1106 {
1040 rtmn_diff = rt_now - mn_now; 1107 rtmn_diff = ev_rt_now - mn_now;
1041 1108
1042 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1109 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1043 return; /* all is well */ 1110 return; /* all is well */
1044 1111
1045 rt_now = ev_time (); 1112 ev_rt_now = ev_time ();
1046 mn_now = get_clock (); 1113 mn_now = get_clock ();
1047 now_floor = mn_now; 1114 now_floor = mn_now;
1048 } 1115 }
1049 1116
1117# if EV_PERIODICS
1050 periodics_reschedule (EV_A); 1118 periodics_reschedule (EV_A);
1119# endif
1051 /* no timer adjustment, as the monotonic clock doesn't jump */ 1120 /* no timer adjustment, as the monotonic clock doesn't jump */
1052 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1121 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1053 } 1122 }
1054 } 1123 }
1055 else 1124 else
1056#endif 1125#endif
1057 { 1126 {
1058 rt_now = ev_time (); 1127 ev_rt_now = ev_time ();
1059 1128
1060 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1129 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1061 { 1130 {
1131#if EV_PERIODICS
1062 periodics_reschedule (EV_A); 1132 periodics_reschedule (EV_A);
1133#endif
1063 1134
1064 /* adjust timers. this is easy, as the offset is the same for all */ 1135 /* adjust timers. this is easy, as the offset is the same for all */
1065 for (i = 0; i < timercnt; ++i) 1136 for (i = 0; i < timercnt; ++i)
1066 ((WT)timers [i])->at += rt_now - mn_now; 1137 ((WT)timers [i])->at += ev_rt_now - mn_now;
1067 } 1138 }
1068 1139
1069 mn_now = rt_now; 1140 mn_now = ev_rt_now;
1070 } 1141 }
1071} 1142}
1072 1143
1073void 1144void
1074ev_ref (EV_P) 1145ev_ref (EV_P)
… …
1114 if (expect_true (have_monotonic)) 1185 if (expect_true (have_monotonic))
1115 time_update_monotonic (EV_A); 1186 time_update_monotonic (EV_A);
1116 else 1187 else
1117#endif 1188#endif
1118 { 1189 {
1119 rt_now = ev_time (); 1190 ev_rt_now = ev_time ();
1120 mn_now = rt_now; 1191 mn_now = ev_rt_now;
1121 } 1192 }
1122 1193
1123 if (flags & EVLOOP_NONBLOCK || idlecnt) 1194 if (flags & EVLOOP_NONBLOCK || idlecnt)
1124 block = 0.; 1195 block = 0.;
1125 else 1196 else
… …
1130 { 1201 {
1131 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1202 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1132 if (block > to) block = to; 1203 if (block > to) block = to;
1133 } 1204 }
1134 1205
1206#if EV_PERIODICS
1135 if (periodiccnt) 1207 if (periodiccnt)
1136 { 1208 {
1137 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1209 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1138 if (block > to) block = to; 1210 if (block > to) block = to;
1139 } 1211 }
1212#endif
1140 1213
1141 if (block < 0.) block = 0.; 1214 if (block < 0.) block = 0.;
1142 } 1215 }
1143 1216
1144 method_poll (EV_A_ block); 1217 method_poll (EV_A_ block);
1145 1218
1146 /* update rt_now, do magic */ 1219 /* update ev_rt_now, do magic */
1147 time_update (EV_A); 1220 time_update (EV_A);
1148 1221
1149 /* queue pending timers and reschedule them */ 1222 /* queue pending timers and reschedule them */
1150 timers_reify (EV_A); /* relative timers called last */ 1223 timers_reify (EV_A); /* relative timers called last */
1224#if EV_PERIODICS
1151 periodics_reify (EV_A); /* absolute timers called first */ 1225 periodics_reify (EV_A); /* absolute timers called first */
1226#endif
1152 1227
1153 /* queue idle watchers unless io or timers are pending */ 1228 /* queue idle watchers unless io or timers are pending */
1154 if (idlecnt && !any_pending (EV_A)) 1229 if (idlecnt && !any_pending (EV_A))
1155 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1230 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1156 1231
… …
1247{ 1322{
1248 ev_clear_pending (EV_A_ (W)w); 1323 ev_clear_pending (EV_A_ (W)w);
1249 if (!ev_is_active (w)) 1324 if (!ev_is_active (w))
1250 return; 1325 return;
1251 1326
1327 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1328
1252 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1329 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1253 ev_stop (EV_A_ (W)w); 1330 ev_stop (EV_A_ (W)w);
1254 1331
1255 fd_change (EV_A_ w->fd); 1332 fd_change (EV_A_ w->fd);
1256} 1333}
… …
1283 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1360 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1284 1361
1285 if (((W)w)->active < timercnt--) 1362 if (((W)w)->active < timercnt--)
1286 { 1363 {
1287 timers [((W)w)->active - 1] = timers [timercnt]; 1364 timers [((W)w)->active - 1] = timers [timercnt];
1288 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1289 } 1366 }
1290 1367
1291 ((WT)w)->at = w->repeat; 1368 ((WT)w)->at -= mn_now;
1292 1369
1293 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1294} 1371}
1295 1372
1296void 1373void
… …
1299 if (ev_is_active (w)) 1376 if (ev_is_active (w))
1300 { 1377 {
1301 if (w->repeat) 1378 if (w->repeat)
1302 { 1379 {
1303 ((WT)w)->at = mn_now + w->repeat; 1380 ((WT)w)->at = mn_now + w->repeat;
1304 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1381 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1305 } 1382 }
1306 else 1383 else
1307 ev_timer_stop (EV_A_ w); 1384 ev_timer_stop (EV_A_ w);
1308 } 1385 }
1309 else if (w->repeat) 1386 else if (w->repeat)
1387 {
1388 w->at = w->repeat;
1310 ev_timer_start (EV_A_ w); 1389 ev_timer_start (EV_A_ w);
1390 }
1311} 1391}
1312 1392
1393#if EV_PERIODICS
1313void 1394void
1314ev_periodic_start (EV_P_ struct ev_periodic *w) 1395ev_periodic_start (EV_P_ struct ev_periodic *w)
1315{ 1396{
1316 if (ev_is_active (w)) 1397 if (ev_is_active (w))
1317 return; 1398 return;
1318 1399
1319 if (w->reschedule_cb) 1400 if (w->reschedule_cb)
1320 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1401 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1321 else if (w->interval) 1402 else if (w->interval)
1322 { 1403 {
1323 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1404 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1324 /* this formula differs from the one in periodic_reify because we do not always round up */ 1405 /* this formula differs from the one in periodic_reify because we do not always round up */
1325 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1406 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1326 } 1407 }
1327 1408
1328 ev_start (EV_A_ (W)w, ++periodiccnt); 1409 ev_start (EV_A_ (W)w, ++periodiccnt);
1329 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1410 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1330 periodics [periodiccnt - 1] = w; 1411 periodics [periodiccnt - 1] = w;
… …
1343 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1424 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1344 1425
1345 if (((W)w)->active < periodiccnt--) 1426 if (((W)w)->active < periodiccnt--)
1346 { 1427 {
1347 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1428 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1348 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1429 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1349 } 1430 }
1350 1431
1351 ev_stop (EV_A_ (W)w); 1432 ev_stop (EV_A_ (W)w);
1352} 1433}
1353 1434
1354void 1435void
1355ev_periodic_again (EV_P_ struct ev_periodic *w) 1436ev_periodic_again (EV_P_ struct ev_periodic *w)
1356{ 1437{
1438 /* TODO: use adjustheap and recalculation */
1357 ev_periodic_stop (EV_A_ w); 1439 ev_periodic_stop (EV_A_ w);
1358 ev_periodic_start (EV_A_ w); 1440 ev_periodic_start (EV_A_ w);
1359} 1441}
1442#endif
1360 1443
1361void 1444void
1362ev_idle_start (EV_P_ struct ev_idle *w) 1445ev_idle_start (EV_P_ struct ev_idle *w)
1363{ 1446{
1364 if (ev_is_active (w)) 1447 if (ev_is_active (w))
… …
1371 1454
1372void 1455void
1373ev_idle_stop (EV_P_ struct ev_idle *w) 1456ev_idle_stop (EV_P_ struct ev_idle *w)
1374{ 1457{
1375 ev_clear_pending (EV_A_ (W)w); 1458 ev_clear_pending (EV_A_ (W)w);
1376 if (ev_is_active (w)) 1459 if (!ev_is_active (w))
1377 return; 1460 return;
1378 1461
1379 idles [((W)w)->active - 1] = idles [--idlecnt]; 1462 idles [((W)w)->active - 1] = idles [--idlecnt];
1380 ev_stop (EV_A_ (W)w); 1463 ev_stop (EV_A_ (W)w);
1381} 1464}
… …
1393 1476
1394void 1477void
1395ev_prepare_stop (EV_P_ struct ev_prepare *w) 1478ev_prepare_stop (EV_P_ struct ev_prepare *w)
1396{ 1479{
1397 ev_clear_pending (EV_A_ (W)w); 1480 ev_clear_pending (EV_A_ (W)w);
1398 if (ev_is_active (w)) 1481 if (!ev_is_active (w))
1399 return; 1482 return;
1400 1483
1401 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1484 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1402 ev_stop (EV_A_ (W)w); 1485 ev_stop (EV_A_ (W)w);
1403} 1486}
… …
1415 1498
1416void 1499void
1417ev_check_stop (EV_P_ struct ev_check *w) 1500ev_check_stop (EV_P_ struct ev_check *w)
1418{ 1501{
1419 ev_clear_pending (EV_A_ (W)w); 1502 ev_clear_pending (EV_A_ (W)w);
1420 if (ev_is_active (w)) 1503 if (!ev_is_active (w))
1421 return; 1504 return;
1422 1505
1423 checks [((W)w)->active - 1] = checks [--checkcnt]; 1506 checks [((W)w)->active - 1] = checks [--checkcnt];
1424 ev_stop (EV_A_ (W)w); 1507 ev_stop (EV_A_ (W)w);
1425} 1508}
… …
1443 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1526 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1444 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1527 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1445 1528
1446 if (!((WL)w)->next) 1529 if (!((WL)w)->next)
1447 { 1530 {
1448#if WIN32 1531#if _WIN32
1449 signal (w->signum, sighandler); 1532 signal (w->signum, sighandler);
1450#else 1533#else
1451 struct sigaction sa; 1534 struct sigaction sa;
1452 sa.sa_handler = sighandler; 1535 sa.sa_handler = sighandler;
1453 sigfillset (&sa.sa_mask); 1536 sigfillset (&sa.sa_mask);
… …
1486 1569
1487void 1570void
1488ev_child_stop (EV_P_ struct ev_child *w) 1571ev_child_stop (EV_P_ struct ev_child *w)
1489{ 1572{
1490 ev_clear_pending (EV_A_ (W)w); 1573 ev_clear_pending (EV_A_ (W)w);
1491 if (ev_is_active (w)) 1574 if (!ev_is_active (w))
1492 return; 1575 return;
1493 1576
1494 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1577 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1495 ev_stop (EV_A_ (W)w); 1578 ev_stop (EV_A_ (W)w);
1496} 1579}
… …
1540 else 1623 else
1541 { 1624 {
1542 once->cb = cb; 1625 once->cb = cb;
1543 once->arg = arg; 1626 once->arg = arg;
1544 1627
1545 ev_watcher_init (&once->io, once_cb_io); 1628 ev_init (&once->io, once_cb_io);
1546 if (fd >= 0) 1629 if (fd >= 0)
1547 { 1630 {
1548 ev_io_set (&once->io, fd, events); 1631 ev_io_set (&once->io, fd, events);
1549 ev_io_start (EV_A_ &once->io); 1632 ev_io_start (EV_A_ &once->io);
1550 } 1633 }
1551 1634
1552 ev_watcher_init (&once->to, once_cb_to); 1635 ev_init (&once->to, once_cb_to);
1553 if (timeout >= 0.) 1636 if (timeout >= 0.)
1554 { 1637 {
1555 ev_timer_set (&once->to, timeout, 0.); 1638 ev_timer_set (&once->to, timeout, 0.);
1556 ev_timer_start (EV_A_ &once->to); 1639 ev_timer_start (EV_A_ &once->to);
1557 } 1640 }
1558 } 1641 }
1559} 1642}
1560 1643
1644#ifdef __cplusplus
1645}
1646#endif
1647

Diff Legend

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