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

Comparing libev/ev.c (file contents):
Revision 1.77 by root, Thu Nov 8 00:44:17 2007 UTC vs.
Revision 1.109 by root, Mon Nov 12 05:53:55 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
… …
316 353
317 ++base; 354 ++base;
318 } 355 }
319} 356}
320 357
321static void 358void
322event (EV_P_ W w, int events) 359ev_feed_event (EV_P_ void *w, int revents)
323{ 360{
361 W w_ = (W)w;
362
324 if (w->pending) 363 if (w_->pending)
325 { 364 {
326 pendings [ABSPRI (w)][w->pending - 1].events |= events; 365 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
327 return; 366 return;
328 } 367 }
329 368
330 w->pending = ++pendingcnt [ABSPRI (w)]; 369 w_->pending = ++pendingcnt [ABSPRI (w_)];
331 array_needsize (ANPENDING, pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void)); 370 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
332 pendings [ABSPRI (w)][w->pending - 1].w = w; 371 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
333 pendings [ABSPRI (w)][w->pending - 1].events = events; 372 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
334} 373}
335 374
336static void 375static void
337queue_events (EV_P_ W *events, int eventcnt, int type) 376queue_events (EV_P_ W *events, int eventcnt, int type)
338{ 377{
339 int i; 378 int i;
340 379
341 for (i = 0; i < eventcnt; ++i) 380 for (i = 0; i < eventcnt; ++i)
342 event (EV_A_ events [i], type); 381 ev_feed_event (EV_A_ events [i], type);
343} 382}
344 383
345static void 384inline void
346fd_event (EV_P_ int fd, int events) 385fd_event (EV_P_ int fd, int revents)
347{ 386{
348 ANFD *anfd = anfds + fd; 387 ANFD *anfd = anfds + fd;
349 struct ev_io *w; 388 struct ev_io *w;
350 389
351 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)
352 { 391 {
353 int ev = w->events & events; 392 int ev = w->events & revents;
354 393
355 if (ev) 394 if (ev)
356 event (EV_A_ (W)w, ev); 395 ev_feed_event (EV_A_ (W)w, ev);
357 } 396 }
397}
398
399void
400ev_feed_fd_event (EV_P_ int fd, int revents)
401{
402 fd_event (EV_A_ fd, revents);
358} 403}
359 404
360/*****************************************************************************/ 405/*****************************************************************************/
361 406
362static void 407static void
… …
373 int events = 0; 418 int events = 0;
374 419
375 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)
376 events |= w->events; 421 events |= w->events;
377 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
378 anfd->reify = 0; 432 anfd->reify = 0;
379 433
380 method_modify (EV_A_ fd, anfd->events, events); 434 method_modify (EV_A_ fd, anfd->events, events);
381 anfd->events = events; 435 anfd->events = events;
382 } 436 }
… …
403 struct ev_io *w; 457 struct ev_io *w;
404 458
405 while ((w = (struct ev_io *)anfds [fd].head)) 459 while ((w = (struct ev_io *)anfds [fd].head))
406 { 460 {
407 ev_io_stop (EV_A_ w); 461 ev_io_stop (EV_A_ w);
408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 462 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
409 } 463 }
410} 464}
411 465
412static int 466static int
413fd_valid (int fd) 467fd_valid (int fd)
414{ 468{
415#ifdef WIN32 469#ifdef _WIN32
416 return !!win32_get_osfhandle (fd); 470 return _get_osfhandle (fd) != -1;
417#else 471#else
418 return fcntl (fd, F_GETFD) != -1; 472 return fcntl (fd, F_GETFD) != -1;
419#endif 473#endif
420} 474}
421 475
… …
501 555
502 heap [k] = w; 556 heap [k] = w;
503 ((W)heap [k])->active = k + 1; 557 ((W)heap [k])->active = k + 1;
504} 558}
505 559
560inline void
561adjustheap (WT *heap, int N, int k)
562{
563 upheap (heap, k);
564 downheap (heap, N, k);
565}
566
506/*****************************************************************************/ 567/*****************************************************************************/
507 568
508typedef struct 569typedef struct
509{ 570{
510 WL head; 571 WL head;
… …
531} 592}
532 593
533static void 594static void
534sighandler (int signum) 595sighandler (int signum)
535{ 596{
536#if WIN32 597#if _WIN32
537 signal (signum, sighandler); 598 signal (signum, sighandler);
538#endif 599#endif
539 600
540 signals [signum - 1].gotsig = 1; 601 signals [signum - 1].gotsig = 1;
541 602
542 if (!gotsig) 603 if (!gotsig)
543 { 604 {
544 int old_errno = errno; 605 int old_errno = errno;
545 gotsig = 1; 606 gotsig = 1;
546#ifdef WIN32
547 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
548#else
549 write (sigpipe [1], &signum, 1); 607 write (sigpipe [1], &signum, 1);
550#endif
551 errno = old_errno; 608 errno = old_errno;
552 } 609 }
553} 610}
554 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
555static void 632static void
556sigcb (EV_P_ struct ev_io *iow, int revents) 633sigcb (EV_P_ struct ev_io *iow, int revents)
557{ 634{
558 WL w;
559 int signum; 635 int signum;
560 636
561#ifdef WIN32
562 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563#else
564 read (sigpipe [0], &revents, 1); 637 read (sigpipe [0], &revents, 1);
565#endif
566 gotsig = 0; 638 gotsig = 0;
567 639
568 for (signum = signalmax; signum--; ) 640 for (signum = signalmax; signum--; )
569 if (signals [signum].gotsig) 641 if (signals [signum].gotsig)
570 { 642 ev_feed_signal_event (EV_A_ signum + 1);
571 signals [signum].gotsig = 0; 643}
572 644
573 for (w = signals [signum].head; w; w = w->next) 645inline void
574 event (EV_A_ (W)w, EV_SIGNAL); 646fd_intern (int fd)
575 } 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
576} 655}
577 656
578static void 657static void
579siginit (EV_P) 658siginit (EV_P)
580{ 659{
581#ifndef WIN32 660 fd_intern (sigpipe [0]);
582 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 661 fd_intern (sigpipe [1]);
583 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
584
585 /* rather than sort out wether we really need nb, set it */
586 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
587 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
588#endif
589 662
590 ev_io_set (&sigev, sigpipe [0], EV_READ); 663 ev_io_set (&sigev, sigpipe [0], EV_READ);
591 ev_io_start (EV_A_ &sigev); 664 ev_io_start (EV_A_ &sigev);
592 ev_unref (EV_A); /* child watcher should not keep loop alive */ 665 ev_unref (EV_A); /* child watcher should not keep loop alive */
593} 666}
594 667
595/*****************************************************************************/ 668/*****************************************************************************/
596 669
597static struct ev_child *childs [PID_HASHSIZE]; 670static struct ev_child *childs [PID_HASHSIZE];
598 671
599#ifndef WIN32 672#ifndef _WIN32
600 673
601static struct ev_signal childev; 674static struct ev_signal childev;
602 675
603#ifndef WCONTINUED 676#ifndef WCONTINUED
604# define WCONTINUED 0 677# define WCONTINUED 0
… …
613 if (w->pid == pid || !w->pid) 686 if (w->pid == pid || !w->pid)
614 { 687 {
615 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 688 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
616 w->rpid = pid; 689 w->rpid = pid;
617 w->rstatus = status; 690 w->rstatus = status;
618 event (EV_A_ (W)w, EV_CHILD); 691 ev_feed_event (EV_A_ (W)w, EV_CHILD);
619 } 692 }
620} 693}
621 694
622static void 695static void
623childcb (EV_P_ struct ev_signal *sw, int revents) 696childcb (EV_P_ struct ev_signal *sw, int revents)
… …
625 int pid, status; 698 int pid, status;
626 699
627 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 700 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
628 { 701 {
629 /* make sure we are called again until all childs have been reaped */ 702 /* make sure we are called again until all childs have been reaped */
630 event (EV_A_ (W)sw, EV_SIGNAL); 703 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
631 704
632 child_reap (EV_A_ sw, pid, pid, status); 705 child_reap (EV_A_ sw, pid, pid, status);
633 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 706 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
634 } 707 }
635} 708}
… …
665 738
666/* 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 */
667static int 740static int
668enable_secure (void) 741enable_secure (void)
669{ 742{
670#ifdef WIN32 743#ifdef _WIN32
671 return 0; 744 return 0;
672#else 745#else
673 return getuid () != geteuid () 746 return getuid () != geteuid ()
674 || getgid () != getegid (); 747 || getgid () != getegid ();
675#endif 748#endif
… …
680{ 753{
681 return method; 754 return method;
682} 755}
683 756
684static void 757static void
685loop_init (EV_P_ int methods) 758loop_init (EV_P_ unsigned int flags)
686{ 759{
687 if (!method) 760 if (!method)
688 { 761 {
689#if EV_USE_MONOTONIC 762#if EV_USE_MONOTONIC
690 { 763 {
… …
692 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 765 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
693 have_monotonic = 1; 766 have_monotonic = 1;
694 } 767 }
695#endif 768#endif
696 769
697 rt_now = ev_time (); 770 ev_rt_now = ev_time ();
698 mn_now = get_clock (); 771 mn_now = get_clock ();
699 now_floor = mn_now; 772 now_floor = mn_now;
700 rtmn_diff = rt_now - mn_now; 773 rtmn_diff = ev_rt_now - mn_now;
701 774
702 if (methods == EVMETHOD_AUTO) 775 if (!(flags & EVMETHOD_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
703 if (!enable_secure () && getenv ("LIBEV_METHODS"))
704 methods = atoi (getenv ("LIBEV_METHODS")); 776 flags = atoi (getenv ("LIBEV_FLAGS"));
705 else 777
706 methods = EVMETHOD_ANY; 778 if (!(flags & 0x0000ffff))
779 flags |= 0x0000ffff;
707 780
708 method = 0; 781 method = 0;
709#if EV_USE_WIN32
710 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
711#endif
712#if EV_USE_KQUEUE 782#if EV_USE_KQUEUE
713 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 783 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
714#endif 784#endif
715#if EV_USE_EPOLL 785#if EV_USE_EPOLL
716 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 786 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
717#endif 787#endif
718#if EV_USE_POLL 788#if EV_USE_POLL
719 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 789 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
720#endif 790#endif
721#if EV_USE_SELECT 791#if EV_USE_SELECT
722 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 792 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
723#endif 793#endif
724 794
725 ev_watcher_init (&sigev, sigcb); 795 ev_init (&sigev, sigcb);
726 ev_set_priority (&sigev, EV_MAXPRI); 796 ev_set_priority (&sigev, EV_MAXPRI);
727 } 797 }
728} 798}
729 799
730void 800void
731loop_destroy (EV_P) 801loop_destroy (EV_P)
732{ 802{
733 int i; 803 int i;
734 804
735#if EV_USE_WIN32
736 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
737#endif
738#if EV_USE_KQUEUE 805#if EV_USE_KQUEUE
739 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
740#endif 807#endif
741#if EV_USE_EPOLL 808#if EV_USE_EPOLL
742 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
750 817
751 for (i = NUMPRI; i--; ) 818 for (i = NUMPRI; i--; )
752 array_free (pending, [i]); 819 array_free (pending, [i]);
753 820
754 /* have to use the microsoft-never-gets-it-right macro */ 821 /* have to use the microsoft-never-gets-it-right macro */
755 array_free_microshit (fdchange); 822 array_free (fdchange, EMPTY);
756 array_free_microshit (timer); 823 array_free (timer, EMPTY);
757 array_free_microshit (periodic); 824#if EV_PERIODICS
758 array_free_microshit (idle); 825 array_free (periodic, EMPTY);
759 array_free_microshit (prepare); 826#endif
760 array_free_microshit (check); 827 array_free (idle, EMPTY);
828 array_free (prepare, EMPTY);
829 array_free (check, EMPTY);
761 830
762 method = 0; 831 method = 0;
763} 832}
764 833
765static void 834static void
… …
790 postfork = 0; 859 postfork = 0;
791} 860}
792 861
793#if EV_MULTIPLICITY 862#if EV_MULTIPLICITY
794struct ev_loop * 863struct ev_loop *
795ev_loop_new (int methods) 864ev_loop_new (unsigned int flags)
796{ 865{
797 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));
798 867
799 memset (loop, 0, sizeof (struct ev_loop)); 868 memset (loop, 0, sizeof (struct ev_loop));
800 869
801 loop_init (EV_A_ methods); 870 loop_init (EV_A_ flags);
802 871
803 if (ev_method (EV_A)) 872 if (ev_method (EV_A))
804 return loop; 873 return loop;
805 874
806 return 0; 875 return 0;
… …
820} 889}
821 890
822#endif 891#endif
823 892
824#if EV_MULTIPLICITY 893#if EV_MULTIPLICITY
825struct ev_loop default_loop_struct;
826static struct ev_loop *default_loop;
827
828struct ev_loop * 894struct ev_loop *
829#else 895#else
830static int default_loop;
831
832int 896int
833#endif 897#endif
834ev_default_loop (int methods) 898ev_default_loop (unsigned int flags)
835{ 899{
836 if (sigpipe [0] == sigpipe [1]) 900 if (sigpipe [0] == sigpipe [1])
837 if (pipe (sigpipe)) 901 if (pipe (sigpipe))
838 return 0; 902 return 0;
839 903
… …
849 913
850 if (ev_method (EV_A)) 914 if (ev_method (EV_A))
851 { 915 {
852 siginit (EV_A); 916 siginit (EV_A);
853 917
854#ifndef WIN32 918#ifndef _WIN32
855 ev_signal_init (&childev, childcb, SIGCHLD); 919 ev_signal_init (&childev, childcb, SIGCHLD);
856 ev_set_priority (&childev, EV_MAXPRI); 920 ev_set_priority (&childev, EV_MAXPRI);
857 ev_signal_start (EV_A_ &childev); 921 ev_signal_start (EV_A_ &childev);
858 ev_unref (EV_A); /* child watcher should not keep loop alive */ 922 ev_unref (EV_A); /* child watcher should not keep loop alive */
859#endif 923#endif
… …
870{ 934{
871#if EV_MULTIPLICITY 935#if EV_MULTIPLICITY
872 struct ev_loop *loop = default_loop; 936 struct ev_loop *loop = default_loop;
873#endif 937#endif
874 938
875#ifndef WIN32 939#ifndef _WIN32
876 ev_ref (EV_A); /* child watcher */ 940 ev_ref (EV_A); /* child watcher */
877 ev_signal_stop (EV_A_ &childev); 941 ev_signal_stop (EV_A_ &childev);
878#endif 942#endif
879 943
880 ev_ref (EV_A); /* signal watcher */ 944 ev_ref (EV_A); /* signal watcher */
… …
922 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 986 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
923 987
924 if (p->w) 988 if (p->w)
925 { 989 {
926 p->w->pending = 0; 990 p->w->pending = 0;
927 p->w->cb (EV_A_ p->w, p->events); 991 EV_CB_INVOKE (p->w, p->events);
928 } 992 }
929 } 993 }
930} 994}
931 995
932static void 996static void
… …
940 1004
941 /* first reschedule or stop timer */ 1005 /* first reschedule or stop timer */
942 if (w->repeat) 1006 if (w->repeat)
943 { 1007 {
944 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
945 ((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
946 downheap ((WT *)timers, timercnt, 0); 1014 downheap ((WT *)timers, timercnt, 0);
947 } 1015 }
948 else 1016 else
949 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1017 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
950 1018
951 event (EV_A_ (W)w, EV_TIMEOUT); 1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
952 } 1020 }
953} 1021}
954 1022
1023#if EV_PERIODICS
955static void 1024static void
956periodics_reify (EV_P) 1025periodics_reify (EV_P)
957{ 1026{
958 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
959 { 1028 {
960 struct ev_periodic *w = periodics [0]; 1029 struct ev_periodic *w = periodics [0];
961 1030
962 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1031 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
963 1032
964 /* first reschedule or stop timer */ 1033 /* first reschedule or stop timer */
965 if (w->reschedule_cb) 1034 if (w->reschedule_cb)
966 { 1035 {
967 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);
968
969 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));
970 downheap ((WT *)periodics, periodiccnt, 0); 1038 downheap ((WT *)periodics, periodiccnt, 0);
971 } 1039 }
972 else if (w->interval) 1040 else if (w->interval)
973 { 1041 {
974 ((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;
975 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));
976 downheap ((WT *)periodics, periodiccnt, 0); 1044 downheap ((WT *)periodics, periodiccnt, 0);
977 } 1045 }
978 else 1046 else
979 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1047 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
980 1048
981 event (EV_A_ (W)w, EV_PERIODIC); 1049 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
982 } 1050 }
983} 1051}
984 1052
985static void 1053static void
986periodics_reschedule (EV_P) 1054periodics_reschedule (EV_P)
… …
991 for (i = 0; i < periodiccnt; ++i) 1059 for (i = 0; i < periodiccnt; ++i)
992 { 1060 {
993 struct ev_periodic *w = periodics [i]; 1061 struct ev_periodic *w = periodics [i];
994 1062
995 if (w->reschedule_cb) 1063 if (w->reschedule_cb)
996 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1064 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
997 else if (w->interval) 1065 else if (w->interval)
998 ((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;
999 } 1067 }
1000 1068
1001 /* now rebuild the heap */ 1069 /* now rebuild the heap */
1002 for (i = periodiccnt >> 1; i--; ) 1070 for (i = periodiccnt >> 1; i--; )
1003 downheap ((WT *)periodics, periodiccnt, i); 1071 downheap ((WT *)periodics, periodiccnt, i);
1004} 1072}
1073#endif
1005 1074
1006inline int 1075inline int
1007time_update_monotonic (EV_P) 1076time_update_monotonic (EV_P)
1008{ 1077{
1009 mn_now = get_clock (); 1078 mn_now = get_clock ();
1010 1079
1011 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1080 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1012 { 1081 {
1013 rt_now = rtmn_diff + mn_now; 1082 ev_rt_now = rtmn_diff + mn_now;
1014 return 0; 1083 return 0;
1015 } 1084 }
1016 else 1085 else
1017 { 1086 {
1018 now_floor = mn_now; 1087 now_floor = mn_now;
1019 rt_now = ev_time (); 1088 ev_rt_now = ev_time ();
1020 return 1; 1089 return 1;
1021 } 1090 }
1022} 1091}
1023 1092
1024static void 1093static void
… …
1033 { 1102 {
1034 ev_tstamp odiff = rtmn_diff; 1103 ev_tstamp odiff = rtmn_diff;
1035 1104
1036 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 */
1037 { 1106 {
1038 rtmn_diff = rt_now - mn_now; 1107 rtmn_diff = ev_rt_now - mn_now;
1039 1108
1040 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1109 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1041 return; /* all is well */ 1110 return; /* all is well */
1042 1111
1043 rt_now = ev_time (); 1112 ev_rt_now = ev_time ();
1044 mn_now = get_clock (); 1113 mn_now = get_clock ();
1045 now_floor = mn_now; 1114 now_floor = mn_now;
1046 } 1115 }
1047 1116
1117# if EV_PERIODICS
1048 periodics_reschedule (EV_A); 1118 periodics_reschedule (EV_A);
1119# endif
1049 /* no timer adjustment, as the monotonic clock doesn't jump */ 1120 /* no timer adjustment, as the monotonic clock doesn't jump */
1050 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1121 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1051 } 1122 }
1052 } 1123 }
1053 else 1124 else
1054#endif 1125#endif
1055 { 1126 {
1056 rt_now = ev_time (); 1127 ev_rt_now = ev_time ();
1057 1128
1058 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))
1059 { 1130 {
1131#if EV_PERIODICS
1060 periodics_reschedule (EV_A); 1132 periodics_reschedule (EV_A);
1133#endif
1061 1134
1062 /* 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 */
1063 for (i = 0; i < timercnt; ++i) 1136 for (i = 0; i < timercnt; ++i)
1064 ((WT)timers [i])->at += rt_now - mn_now; 1137 ((WT)timers [i])->at += ev_rt_now - mn_now;
1065 } 1138 }
1066 1139
1067 mn_now = rt_now; 1140 mn_now = ev_rt_now;
1068 } 1141 }
1069} 1142}
1070 1143
1071void 1144void
1072ev_ref (EV_P) 1145ev_ref (EV_P)
… …
1112 if (expect_true (have_monotonic)) 1185 if (expect_true (have_monotonic))
1113 time_update_monotonic (EV_A); 1186 time_update_monotonic (EV_A);
1114 else 1187 else
1115#endif 1188#endif
1116 { 1189 {
1117 rt_now = ev_time (); 1190 ev_rt_now = ev_time ();
1118 mn_now = rt_now; 1191 mn_now = ev_rt_now;
1119 } 1192 }
1120 1193
1121 if (flags & EVLOOP_NONBLOCK || idlecnt) 1194 if (flags & EVLOOP_NONBLOCK || idlecnt)
1122 block = 0.; 1195 block = 0.;
1123 else 1196 else
… …
1128 { 1201 {
1129 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1202 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1130 if (block > to) block = to; 1203 if (block > to) block = to;
1131 } 1204 }
1132 1205
1206#if EV_PERIODICS
1133 if (periodiccnt) 1207 if (periodiccnt)
1134 { 1208 {
1135 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1209 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1136 if (block > to) block = to; 1210 if (block > to) block = to;
1137 } 1211 }
1212#endif
1138 1213
1139 if (block < 0.) block = 0.; 1214 if (block < 0.) block = 0.;
1140 } 1215 }
1141 1216
1142 method_poll (EV_A_ block); 1217 method_poll (EV_A_ block);
1143 1218
1144 /* update rt_now, do magic */ 1219 /* update ev_rt_now, do magic */
1145 time_update (EV_A); 1220 time_update (EV_A);
1146 1221
1147 /* queue pending timers and reschedule them */ 1222 /* queue pending timers and reschedule them */
1148 timers_reify (EV_A); /* relative timers called last */ 1223 timers_reify (EV_A); /* relative timers called last */
1224#if EV_PERIODICS
1149 periodics_reify (EV_A); /* absolute timers called first */ 1225 periodics_reify (EV_A); /* absolute timers called first */
1226#endif
1150 1227
1151 /* queue idle watchers unless io or timers are pending */ 1228 /* queue idle watchers unless io or timers are pending */
1152 if (idlecnt && !any_pending (EV_A)) 1229 if (idlecnt && !any_pending (EV_A))
1153 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1230 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1154 1231
… …
1245{ 1322{
1246 ev_clear_pending (EV_A_ (W)w); 1323 ev_clear_pending (EV_A_ (W)w);
1247 if (!ev_is_active (w)) 1324 if (!ev_is_active (w))
1248 return; 1325 return;
1249 1326
1327 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1328
1250 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1329 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1251 ev_stop (EV_A_ (W)w); 1330 ev_stop (EV_A_ (W)w);
1252 1331
1253 fd_change (EV_A_ w->fd); 1332 fd_change (EV_A_ w->fd);
1254} 1333}
… …
1281 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1360 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1282 1361
1283 if (((W)w)->active < timercnt--) 1362 if (((W)w)->active < timercnt--)
1284 { 1363 {
1285 timers [((W)w)->active - 1] = timers [timercnt]; 1364 timers [((W)w)->active - 1] = timers [timercnt];
1286 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1287 } 1366 }
1288 1367
1289 ((WT)w)->at = w->repeat; 1368 ((WT)w)->at -= mn_now;
1290 1369
1291 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1292} 1371}
1293 1372
1294void 1373void
… …
1297 if (ev_is_active (w)) 1376 if (ev_is_active (w))
1298 { 1377 {
1299 if (w->repeat) 1378 if (w->repeat)
1300 { 1379 {
1301 ((WT)w)->at = mn_now + w->repeat; 1380 ((WT)w)->at = mn_now + w->repeat;
1302 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1381 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1303 } 1382 }
1304 else 1383 else
1305 ev_timer_stop (EV_A_ w); 1384 ev_timer_stop (EV_A_ w);
1306 } 1385 }
1307 else if (w->repeat) 1386 else if (w->repeat)
1308 ev_timer_start (EV_A_ w); 1387 ev_timer_start (EV_A_ w);
1309} 1388}
1310 1389
1390#if EV_PERIODICS
1311void 1391void
1312ev_periodic_start (EV_P_ struct ev_periodic *w) 1392ev_periodic_start (EV_P_ struct ev_periodic *w)
1313{ 1393{
1314 if (ev_is_active (w)) 1394 if (ev_is_active (w))
1315 return; 1395 return;
1316 1396
1317 if (w->reschedule_cb) 1397 if (w->reschedule_cb)
1318 ((WT)w)->at = w->reschedule_cb (w, rt_now); 1398 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1319 else if (w->interval) 1399 else if (w->interval)
1320 { 1400 {
1321 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1401 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1322 /* this formula differs from the one in periodic_reify because we do not always round up */ 1402 /* this formula differs from the one in periodic_reify because we do not always round up */
1323 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1403 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1324 } 1404 }
1325 1405
1326 ev_start (EV_A_ (W)w, ++periodiccnt); 1406 ev_start (EV_A_ (W)w, ++periodiccnt);
1327 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1407 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1328 periodics [periodiccnt - 1] = w; 1408 periodics [periodiccnt - 1] = w;
… …
1341 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1421 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1342 1422
1343 if (((W)w)->active < periodiccnt--) 1423 if (((W)w)->active < periodiccnt--)
1344 { 1424 {
1345 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1425 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1346 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1426 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1347 } 1427 }
1348 1428
1349 ev_stop (EV_A_ (W)w); 1429 ev_stop (EV_A_ (W)w);
1350} 1430}
1351 1431
1352void 1432void
1353ev_periodic_again (EV_P_ struct ev_periodic *w) 1433ev_periodic_again (EV_P_ struct ev_periodic *w)
1354{ 1434{
1435 /* TODO: use adjustheap and recalculation */
1355 ev_periodic_stop (EV_A_ w); 1436 ev_periodic_stop (EV_A_ w);
1356 ev_periodic_start (EV_A_ w); 1437 ev_periodic_start (EV_A_ w);
1357} 1438}
1439#endif
1358 1440
1359void 1441void
1360ev_idle_start (EV_P_ struct ev_idle *w) 1442ev_idle_start (EV_P_ struct ev_idle *w)
1361{ 1443{
1362 if (ev_is_active (w)) 1444 if (ev_is_active (w))
… …
1369 1451
1370void 1452void
1371ev_idle_stop (EV_P_ struct ev_idle *w) 1453ev_idle_stop (EV_P_ struct ev_idle *w)
1372{ 1454{
1373 ev_clear_pending (EV_A_ (W)w); 1455 ev_clear_pending (EV_A_ (W)w);
1374 if (ev_is_active (w)) 1456 if (!ev_is_active (w))
1375 return; 1457 return;
1376 1458
1377 idles [((W)w)->active - 1] = idles [--idlecnt]; 1459 idles [((W)w)->active - 1] = idles [--idlecnt];
1378 ev_stop (EV_A_ (W)w); 1460 ev_stop (EV_A_ (W)w);
1379} 1461}
… …
1391 1473
1392void 1474void
1393ev_prepare_stop (EV_P_ struct ev_prepare *w) 1475ev_prepare_stop (EV_P_ struct ev_prepare *w)
1394{ 1476{
1395 ev_clear_pending (EV_A_ (W)w); 1477 ev_clear_pending (EV_A_ (W)w);
1396 if (ev_is_active (w)) 1478 if (!ev_is_active (w))
1397 return; 1479 return;
1398 1480
1399 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1481 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1400 ev_stop (EV_A_ (W)w); 1482 ev_stop (EV_A_ (W)w);
1401} 1483}
… …
1413 1495
1414void 1496void
1415ev_check_stop (EV_P_ struct ev_check *w) 1497ev_check_stop (EV_P_ struct ev_check *w)
1416{ 1498{
1417 ev_clear_pending (EV_A_ (W)w); 1499 ev_clear_pending (EV_A_ (W)w);
1418 if (ev_is_active (w)) 1500 if (!ev_is_active (w))
1419 return; 1501 return;
1420 1502
1421 checks [((W)w)->active - 1] = checks [--checkcnt]; 1503 checks [((W)w)->active - 1] = checks [--checkcnt];
1422 ev_stop (EV_A_ (W)w); 1504 ev_stop (EV_A_ (W)w);
1423} 1505}
… …
1441 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1523 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1442 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1524 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1443 1525
1444 if (!((WL)w)->next) 1526 if (!((WL)w)->next)
1445 { 1527 {
1446#if WIN32 1528#if _WIN32
1447 signal (w->signum, sighandler); 1529 signal (w->signum, sighandler);
1448#else 1530#else
1449 struct sigaction sa; 1531 struct sigaction sa;
1450 sa.sa_handler = sighandler; 1532 sa.sa_handler = sighandler;
1451 sigfillset (&sa.sa_mask); 1533 sigfillset (&sa.sa_mask);
… …
1484 1566
1485void 1567void
1486ev_child_stop (EV_P_ struct ev_child *w) 1568ev_child_stop (EV_P_ struct ev_child *w)
1487{ 1569{
1488 ev_clear_pending (EV_A_ (W)w); 1570 ev_clear_pending (EV_A_ (W)w);
1489 if (ev_is_active (w)) 1571 if (!ev_is_active (w))
1490 return; 1572 return;
1491 1573
1492 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1574 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1493 ev_stop (EV_A_ (W)w); 1575 ev_stop (EV_A_ (W)w);
1494} 1576}
… …
1538 else 1620 else
1539 { 1621 {
1540 once->cb = cb; 1622 once->cb = cb;
1541 once->arg = arg; 1623 once->arg = arg;
1542 1624
1543 ev_watcher_init (&once->io, once_cb_io); 1625 ev_init (&once->io, once_cb_io);
1544 if (fd >= 0) 1626 if (fd >= 0)
1545 { 1627 {
1546 ev_io_set (&once->io, fd, events); 1628 ev_io_set (&once->io, fd, events);
1547 ev_io_start (EV_A_ &once->io); 1629 ev_io_start (EV_A_ &once->io);
1548 } 1630 }
1549 1631
1550 ev_watcher_init (&once->to, once_cb_to); 1632 ev_init (&once->to, once_cb_to);
1551 if (timeout >= 0.) 1633 if (timeout >= 0.)
1552 { 1634 {
1553 ev_timer_set (&once->to, timeout, 0.); 1635 ev_timer_set (&once->to, timeout, 0.);
1554 ev_timer_start (EV_A_ &once->to); 1636 ev_timer_start (EV_A_ &once->to);
1555 } 1637 }
1556 } 1638 }
1557} 1639}
1558 1640
1641#ifdef __cplusplus
1642}
1643#endif
1644

Diff Legend

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