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

Comparing libev/ev.c (file contents):
Revision 1.69 by root, Tue Nov 6 00:10:04 2007 UTC vs.
Revision 1.97 by root, Sun Nov 11 01:53:07 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 && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
53# endif 62# endif
54 63
55#endif 64#endif
56 65
57#include <math.h> 66#include <math.h>
58#include <stdlib.h> 67#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 68#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 69#include <stddef.h>
63 70
64#include <stdio.h> 71#include <stdio.h>
65 72
66#include <assert.h> 73#include <assert.h>
67#include <errno.h> 74#include <errno.h>
68#include <sys/types.h> 75#include <sys/types.h>
76#include <time.h>
77
78#include <signal.h>
79
69#ifndef WIN32 80#ifndef WIN32
81# include <unistd.h>
82# include <sys/time.h>
70# include <sys/wait.h> 83# include <sys/wait.h>
71#endif 84#endif
72#include <sys/time.h>
73#include <time.h>
74
75/**/ 85/**/
76 86
77#ifndef EV_USE_MONOTONIC 87#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 88# define EV_USE_MONOTONIC 1
79#endif 89#endif
… …
94# define EV_USE_KQUEUE 0 104# define EV_USE_KQUEUE 0
95#endif 105#endif
96 106
97#ifndef EV_USE_WIN32 107#ifndef EV_USE_WIN32
98# ifdef WIN32 108# ifdef WIN32
109# define EV_USE_WIN32 0 /* it does not exist, use select */
110# undef EV_USE_SELECT
99# define EV_USE_WIN32 1 111# define EV_USE_SELECT 1
100# else 112# else
101# define EV_USE_WIN32 0 113# define EV_USE_WIN32 0
102# endif 114# endif
103#endif 115#endif
104 116
… …
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 135#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 136#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 137#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 138/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
127 139
140#ifdef EV_H
141# include EV_H
142#else
128#include "ev.h" 143# include "ev.h"
144#endif
129 145
130#if __GNUC__ >= 3 146#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 147# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 148# define inline inline
133#else 149#else
… …
145typedef struct ev_watcher_list *WL; 161typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 162typedef struct ev_watcher_time *WT;
147 163
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 164static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 165
150#if WIN32 166#include "ev_win32.c"
151/* note: the comment below could not be substantiated, but what would I care */
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif
155 167
156/*****************************************************************************/ 168/*****************************************************************************/
157 169
158static void (*syserr_cb)(void); 170static void (*syserr_cb)(const char *msg);
159 171
160void ev_set_syserr_cb (void (*cb)(void)) 172void ev_set_syserr_cb (void (*cb)(const char *msg))
161{ 173{
162 syserr_cb = cb; 174 syserr_cb = cb;
163} 175}
164 176
165static void 177static void
166syserr (void) 178syserr (const char *msg)
167{ 179{
180 if (!msg)
181 msg = "(libev) system error";
182
168 if (syserr_cb) 183 if (syserr_cb)
169 syserr_cb (); 184 syserr_cb (msg);
170 else 185 else
171 { 186 {
172 perror ("libev"); 187 perror (msg);
173 abort (); 188 abort ();
174 } 189 }
175} 190}
176 191
177static void *(*alloc)(void *ptr, long size); 192static void *(*alloc)(void *ptr, long size);
… …
213 int events; 228 int events;
214} ANPENDING; 229} ANPENDING;
215 230
216#if EV_MULTIPLICITY 231#if EV_MULTIPLICITY
217 232
218struct ev_loop 233 struct ev_loop
219{ 234 {
235 ev_tstamp ev_rt_now;
220# define VAR(name,decl) decl; 236 #define VAR(name,decl) decl;
221# include "ev_vars.h" 237 #include "ev_vars.h"
222};
223# undef VAR 238 #undef VAR
239 };
224# include "ev_wrap.h" 240 #include "ev_wrap.h"
241
242 struct ev_loop default_loop_struct;
243 static struct ev_loop *default_loop;
225 244
226#else 245#else
227 246
247 ev_tstamp ev_rt_now;
228# define VAR(name,decl) static decl; 248 #define VAR(name,decl) static decl;
229# include "ev_vars.h" 249 #include "ev_vars.h"
230# undef VAR 250 #undef VAR
251
252 static int default_loop;
231 253
232#endif 254#endif
233 255
234/*****************************************************************************/ 256/*****************************************************************************/
235 257
236inline ev_tstamp 258ev_tstamp
237ev_time (void) 259ev_time (void)
238{ 260{
239#if EV_USE_REALTIME 261#if EV_USE_REALTIME
240 struct timespec ts; 262 struct timespec ts;
241 clock_gettime (CLOCK_REALTIME, &ts); 263 clock_gettime (CLOCK_REALTIME, &ts);
… …
260#endif 282#endif
261 283
262 return ev_time (); 284 return ev_time ();
263} 285}
264 286
287#if EV_MULTIPLICITY
265ev_tstamp 288ev_tstamp
266ev_now (EV_P) 289ev_now (EV_P)
267{ 290{
268 return rt_now; 291 return ev_rt_now;
269} 292}
293#endif
270 294
271#define array_roundsize(base,n) ((n) | 4 & ~3) 295#define array_roundsize(type,n) ((n) | 4 & ~3)
272 296
273#define array_needsize(base,cur,cnt,init) \ 297#define array_needsize(type,base,cur,cnt,init) \
274 if (expect_false ((cnt) > cur)) \ 298 if (expect_false ((cnt) > cur)) \
275 { \ 299 { \
276 int newcnt = cur; \ 300 int newcnt = cur; \
277 do \ 301 do \
278 { \ 302 { \
279 newcnt = array_roundsize (base, newcnt << 1); \ 303 newcnt = array_roundsize (type, newcnt << 1); \
280 } \ 304 } \
281 while ((cnt) > newcnt); \ 305 while ((cnt) > newcnt); \
282 \ 306 \
283 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 307 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
284 init (base + cur, newcnt - cur); \ 308 init (base + cur, newcnt - cur); \
285 cur = newcnt; \ 309 cur = newcnt; \
286 } 310 }
287 311
288#define array_slim(stem) \ 312#define array_slim(type,stem) \
289 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 313 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
290 { \ 314 { \
291 stem ## max = array_roundsize (stem ## cnt >> 1); \ 315 stem ## max = array_roundsize (stem ## cnt >> 1); \
292 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 316 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
293 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 317 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
294 } 318 }
319
320/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
321/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
322#define array_free_microshit(stem) \
323 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
295 324
296#define array_free(stem, idx) \ 325#define array_free(stem, idx) \
297 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 326 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
298 327
299/*****************************************************************************/ 328/*****************************************************************************/
… …
309 338
310 ++base; 339 ++base;
311 } 340 }
312} 341}
313 342
314static void 343void
315event (EV_P_ W w, int events) 344ev_feed_event (EV_P_ void *w, int revents)
316{ 345{
346 W w_ = (W)w;
347
317 if (w->pending) 348 if (w_->pending)
318 { 349 {
319 pendings [ABSPRI (w)][w->pending - 1].events |= events; 350 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
320 return; 351 return;
321 } 352 }
322 353
323 w->pending = ++pendingcnt [ABSPRI (w)]; 354 w_->pending = ++pendingcnt [ABSPRI (w_)];
324 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 355 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
325 pendings [ABSPRI (w)][w->pending - 1].w = w; 356 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
326 pendings [ABSPRI (w)][w->pending - 1].events = events; 357 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
327} 358}
328 359
329static void 360static void
330queue_events (EV_P_ W *events, int eventcnt, int type) 361queue_events (EV_P_ W *events, int eventcnt, int type)
331{ 362{
332 int i; 363 int i;
333 364
334 for (i = 0; i < eventcnt; ++i) 365 for (i = 0; i < eventcnt; ++i)
335 event (EV_A_ events [i], type); 366 ev_feed_event (EV_A_ events [i], type);
336} 367}
337 368
338static void 369inline void
339fd_event (EV_P_ int fd, int events) 370fd_event (EV_P_ int fd, int revents)
340{ 371{
341 ANFD *anfd = anfds + fd; 372 ANFD *anfd = anfds + fd;
342 struct ev_io *w; 373 struct ev_io *w;
343 374
344 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 375 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
345 { 376 {
346 int ev = w->events & events; 377 int ev = w->events & revents;
347 378
348 if (ev) 379 if (ev)
349 event (EV_A_ (W)w, ev); 380 ev_feed_event (EV_A_ (W)w, ev);
350 } 381 }
382}
383
384void
385ev_feed_fd_event (EV_P_ int fd, int revents)
386{
387 fd_event (EV_A_ fd, revents);
351} 388}
352 389
353/*****************************************************************************/ 390/*****************************************************************************/
354 391
355static void 392static void
… …
378} 415}
379 416
380static void 417static void
381fd_change (EV_P_ int fd) 418fd_change (EV_P_ int fd)
382{ 419{
383 if (anfds [fd].reify || fdchangecnt < 0) 420 if (anfds [fd].reify)
384 return; 421 return;
385 422
386 anfds [fd].reify = 1; 423 anfds [fd].reify = 1;
387 424
388 ++fdchangecnt; 425 ++fdchangecnt;
389 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 426 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
390 fdchanges [fdchangecnt - 1] = fd; 427 fdchanges [fdchangecnt - 1] = fd;
391} 428}
392 429
393static void 430static void
394fd_kill (EV_P_ int fd) 431fd_kill (EV_P_ int fd)
… …
396 struct ev_io *w; 433 struct ev_io *w;
397 434
398 while ((w = (struct ev_io *)anfds [fd].head)) 435 while ((w = (struct ev_io *)anfds [fd].head))
399 { 436 {
400 ev_io_stop (EV_A_ w); 437 ev_io_stop (EV_A_ w);
401 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 438 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
402 } 439 }
440}
441
442static int
443fd_valid (int fd)
444{
445#ifdef WIN32
446 return !!win32_get_osfhandle (fd);
447#else
448 return fcntl (fd, F_GETFD) != -1;
449#endif
403} 450}
404 451
405/* called on EBADF to verify fds */ 452/* called on EBADF to verify fds */
406static void 453static void
407fd_ebadf (EV_P) 454fd_ebadf (EV_P)
408{ 455{
409 int fd; 456 int fd;
410 457
411 for (fd = 0; fd < anfdmax; ++fd) 458 for (fd = 0; fd < anfdmax; ++fd)
412 if (anfds [fd].events) 459 if (anfds [fd].events)
413 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 460 if (!fd_valid (fd) == -1 && errno == EBADF)
414 fd_kill (EV_A_ fd); 461 fd_kill (EV_A_ fd);
415} 462}
416 463
417/* called on ENOMEM in select/poll to kill some fds and retry */ 464/* called on ENOMEM in select/poll to kill some fds and retry */
418static void 465static void
… …
426 fd_kill (EV_A_ fd); 473 fd_kill (EV_A_ fd);
427 return; 474 return;
428 } 475 }
429} 476}
430 477
431/* susually called after fork if method needs to re-arm all fds from scratch */ 478/* usually called after fork if method needs to re-arm all fds from scratch */
432static void 479static void
433fd_rearm_all (EV_P) 480fd_rearm_all (EV_P)
434{ 481{
435 int fd; 482 int fd;
436 483
… …
484 531
485 heap [k] = w; 532 heap [k] = w;
486 ((W)heap [k])->active = k + 1; 533 ((W)heap [k])->active = k + 1;
487} 534}
488 535
536inline void
537adjustheap (WT *heap, int N, int k, ev_tstamp at)
538{
539 ev_tstamp old_at = heap [k]->at;
540 heap [k]->at = at;
541
542 if (old_at < at)
543 downheap (heap, N, k);
544 else
545 upheap (heap, k);
546}
547
489/*****************************************************************************/ 548/*****************************************************************************/
490 549
491typedef struct 550typedef struct
492{ 551{
493 WL head; 552 WL head;
… …
524 583
525 if (!gotsig) 584 if (!gotsig)
526 { 585 {
527 int old_errno = errno; 586 int old_errno = errno;
528 gotsig = 1; 587 gotsig = 1;
588#ifdef WIN32
589 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
590#else
529 write (sigpipe [1], &signum, 1); 591 write (sigpipe [1], &signum, 1);
592#endif
530 errno = old_errno; 593 errno = old_errno;
531 } 594 }
532} 595}
533 596
597void
598ev_feed_signal_event (EV_P_ int signum)
599{
600 WL w;
601
602#if EV_MULTIPLICITY
603 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
604#endif
605
606 --signum;
607
608 if (signum < 0 || signum >= signalmax)
609 return;
610
611 signals [signum].gotsig = 0;
612
613 for (w = signals [signum].head; w; w = w->next)
614 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
615}
616
534static void 617static void
535sigcb (EV_P_ struct ev_io *iow, int revents) 618sigcb (EV_P_ struct ev_io *iow, int revents)
536{ 619{
537 WL w;
538 int signum; 620 int signum;
539 621
622#ifdef WIN32
623 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
624#else
540 read (sigpipe [0], &revents, 1); 625 read (sigpipe [0], &revents, 1);
626#endif
541 gotsig = 0; 627 gotsig = 0;
542 628
543 for (signum = signalmax; signum--; ) 629 for (signum = signalmax; signum--; )
544 if (signals [signum].gotsig) 630 if (signals [signum].gotsig)
545 { 631 ev_feed_signal_event (EV_A_ signum + 1);
546 signals [signum].gotsig = 0;
547
548 for (w = signals [signum].head; w; w = w->next)
549 event (EV_A_ (W)w, EV_SIGNAL);
550 }
551} 632}
552 633
553static void 634static void
554siginit (EV_P) 635siginit (EV_P)
555{ 636{
… …
567 ev_unref (EV_A); /* child watcher should not keep loop alive */ 648 ev_unref (EV_A); /* child watcher should not keep loop alive */
568} 649}
569 650
570/*****************************************************************************/ 651/*****************************************************************************/
571 652
653static struct ev_child *childs [PID_HASHSIZE];
654
572#ifndef WIN32 655#ifndef WIN32
573 656
574static struct ev_child *childs [PID_HASHSIZE];
575static struct ev_signal childev; 657static struct ev_signal childev;
576 658
577#ifndef WCONTINUED 659#ifndef WCONTINUED
578# define WCONTINUED 0 660# define WCONTINUED 0
579#endif 661#endif
… …
587 if (w->pid == pid || !w->pid) 669 if (w->pid == pid || !w->pid)
588 { 670 {
589 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 671 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
590 w->rpid = pid; 672 w->rpid = pid;
591 w->rstatus = status; 673 w->rstatus = status;
592 event (EV_A_ (W)w, EV_CHILD); 674 ev_feed_event (EV_A_ (W)w, EV_CHILD);
593 } 675 }
594} 676}
595 677
596static void 678static void
597childcb (EV_P_ struct ev_signal *sw, int revents) 679childcb (EV_P_ struct ev_signal *sw, int revents)
… …
599 int pid, status; 681 int pid, status;
600 682
601 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 683 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
602 { 684 {
603 /* make sure we are called again until all childs have been reaped */ 685 /* make sure we are called again until all childs have been reaped */
604 event (EV_A_ (W)sw, EV_SIGNAL); 686 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
605 687
606 child_reap (EV_A_ sw, pid, pid, status); 688 child_reap (EV_A_ sw, pid, pid, status);
607 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 689 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
608 } 690 }
609} 691}
… …
666 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 748 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
667 have_monotonic = 1; 749 have_monotonic = 1;
668 } 750 }
669#endif 751#endif
670 752
671 rt_now = ev_time (); 753 ev_rt_now = ev_time ();
672 mn_now = get_clock (); 754 mn_now = get_clock ();
673 now_floor = mn_now; 755 now_floor = mn_now;
674 rtmn_diff = rt_now - mn_now; 756 rtmn_diff = ev_rt_now - mn_now;
675 757
676 if (methods == EVMETHOD_AUTO) 758 if (methods == EVMETHOD_AUTO)
677 if (!enable_secure () && getenv ("LIBEV_METHODS")) 759 if (!enable_secure () && getenv ("LIBEV_METHODS"))
678 methods = atoi (getenv ("LIBEV_METHODS")); 760 methods = atoi (getenv ("LIBEV_METHODS"));
679 else 761 else
… …
693 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 775 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
694#endif 776#endif
695#if EV_USE_SELECT 777#if EV_USE_SELECT
696 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 778 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
697#endif 779#endif
780
781 ev_init (&sigev, sigcb);
782 ev_set_priority (&sigev, EV_MAXPRI);
698 } 783 }
699} 784}
700 785
701void 786void
702loop_destroy (EV_P) 787loop_destroy (EV_P)
… …
720#endif 805#endif
721 806
722 for (i = NUMPRI; i--; ) 807 for (i = NUMPRI; i--; )
723 array_free (pending, [i]); 808 array_free (pending, [i]);
724 809
810 /* have to use the microsoft-never-gets-it-right macro */
725 array_free (fdchange, ); 811 array_free_microshit (fdchange);
726 array_free (timer, ); 812 array_free_microshit (timer);
813#if EV_PERIODICS
727 array_free (periodic, ); 814 array_free_microshit (periodic);
815#endif
728 array_free (idle, ); 816 array_free_microshit (idle);
729 array_free (prepare, ); 817 array_free_microshit (prepare);
730 array_free (check, ); 818 array_free_microshit (check);
731 819
732 method = 0; 820 method = 0;
733 /*TODO*/
734} 821}
735 822
736void 823static void
737loop_fork (EV_P) 824loop_fork (EV_P)
738{ 825{
739 /*TODO*/
740#if EV_USE_EPOLL 826#if EV_USE_EPOLL
741 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
742#endif 828#endif
743#if EV_USE_KQUEUE 829#if EV_USE_KQUEUE
744 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 830 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
745#endif 831#endif
832
833 if (ev_is_active (&sigev))
834 {
835 /* default loop */
836
837 ev_ref (EV_A);
838 ev_io_stop (EV_A_ &sigev);
839 close (sigpipe [0]);
840 close (sigpipe [1]);
841
842 while (pipe (sigpipe))
843 syserr ("(libev) error creating pipe");
844
845 siginit (EV_A);
846 }
847
848 postfork = 0;
746} 849}
747 850
748#if EV_MULTIPLICITY 851#if EV_MULTIPLICITY
749struct ev_loop * 852struct ev_loop *
750ev_loop_new (int methods) 853ev_loop_new (int methods)
… …
769} 872}
770 873
771void 874void
772ev_loop_fork (EV_P) 875ev_loop_fork (EV_P)
773{ 876{
774 loop_fork (EV_A); 877 postfork = 1;
775} 878}
776 879
777#endif 880#endif
778 881
779#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
780struct ev_loop default_loop_struct;
781static struct ev_loop *default_loop;
782
783struct ev_loop * 883struct ev_loop *
784#else 884#else
785static int default_loop;
786
787int 885int
788#endif 886#endif
789ev_default_loop (int methods) 887ev_default_loop (int methods)
790{ 888{
791 if (sigpipe [0] == sigpipe [1]) 889 if (sigpipe [0] == sigpipe [1])
… …
802 900
803 loop_init (EV_A_ methods); 901 loop_init (EV_A_ methods);
804 902
805 if (ev_method (EV_A)) 903 if (ev_method (EV_A))
806 { 904 {
807 ev_watcher_init (&sigev, sigcb);
808 ev_set_priority (&sigev, EV_MAXPRI);
809 siginit (EV_A); 905 siginit (EV_A);
810 906
811#ifndef WIN32 907#ifndef WIN32
812 ev_signal_init (&childev, childcb, SIGCHLD); 908 ev_signal_init (&childev, childcb, SIGCHLD);
813 ev_set_priority (&childev, EV_MAXPRI); 909 ev_set_priority (&childev, EV_MAXPRI);
… …
827{ 923{
828#if EV_MULTIPLICITY 924#if EV_MULTIPLICITY
829 struct ev_loop *loop = default_loop; 925 struct ev_loop *loop = default_loop;
830#endif 926#endif
831 927
928#ifndef WIN32
832 ev_ref (EV_A); /* child watcher */ 929 ev_ref (EV_A); /* child watcher */
833 ev_signal_stop (EV_A_ &childev); 930 ev_signal_stop (EV_A_ &childev);
931#endif
834 932
835 ev_ref (EV_A); /* signal watcher */ 933 ev_ref (EV_A); /* signal watcher */
836 ev_io_stop (EV_A_ &sigev); 934 ev_io_stop (EV_A_ &sigev);
837 935
838 close (sigpipe [0]); sigpipe [0] = 0; 936 close (sigpipe [0]); sigpipe [0] = 0;
… …
846{ 944{
847#if EV_MULTIPLICITY 945#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop; 946 struct ev_loop *loop = default_loop;
849#endif 947#endif
850 948
851 loop_fork (EV_A); 949 if (method)
852 950 postfork = 1;
853 ev_io_stop (EV_A_ &sigev);
854 close (sigpipe [0]);
855 close (sigpipe [1]);
856 pipe (sigpipe);
857
858 ev_ref (EV_A); /* signal watcher */
859 siginit (EV_A);
860} 951}
861 952
862/*****************************************************************************/ 953/*****************************************************************************/
954
955static int
956any_pending (EV_P)
957{
958 int pri;
959
960 for (pri = NUMPRI; pri--; )
961 if (pendingcnt [pri])
962 return 1;
963
964 return 0;
965}
863 966
864static void 967static void
865call_pending (EV_P) 968call_pending (EV_P)
866{ 969{
867 int pri; 970 int pri;
… …
872 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 975 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
873 976
874 if (p->w) 977 if (p->w)
875 { 978 {
876 p->w->pending = 0; 979 p->w->pending = 0;
877 p->w->cb (EV_A_ p->w, p->events); 980 EV_CB_INVOKE (p->w, p->events);
878 } 981 }
879 } 982 }
880} 983}
881 984
882static void 985static void
… …
890 993
891 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
892 if (w->repeat) 995 if (w->repeat)
893 { 996 {
894 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 997 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
998
895 ((WT)w)->at = mn_now + w->repeat; 999 ((WT)w)->at += w->repeat;
1000 if (((WT)w)->at < mn_now)
1001 ((WT)w)->at = mn_now;
1002
896 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
897 } 1004 }
898 else 1005 else
899 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
900 1007
901 event (EV_A_ (W)w, EV_TIMEOUT); 1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
902 } 1009 }
903} 1010}
904 1011
1012#if EV_PERIODICS
905static void 1013static void
906periodics_reify (EV_P) 1014periodics_reify (EV_P)
907{ 1015{
908 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
909 { 1017 {
910 struct ev_periodic *w = periodics [0]; 1018 struct ev_periodic *w = periodics [0];
911 1019
912 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1020 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
913 1021
914 /* first reschedule or stop timer */ 1022 /* first reschedule or stop timer */
915 if (w->interval) 1023 if (w->reschedule_cb)
916 { 1024 {
1025 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1026
1027 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1028 downheap ((WT *)periodics, periodiccnt, 0);
1029 }
1030 else if (w->interval)
1031 {
917 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1032 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
918 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1033 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
919 downheap ((WT *)periodics, periodiccnt, 0); 1034 downheap ((WT *)periodics, periodiccnt, 0);
920 } 1035 }
921 else 1036 else
922 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1037 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
923 1038
924 event (EV_A_ (W)w, EV_PERIODIC); 1039 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
925 } 1040 }
926} 1041}
927 1042
928static void 1043static void
929periodics_reschedule (EV_P) 1044periodics_reschedule (EV_P)
… …
933 /* adjust periodics after time jump */ 1048 /* adjust periodics after time jump */
934 for (i = 0; i < periodiccnt; ++i) 1049 for (i = 0; i < periodiccnt; ++i)
935 { 1050 {
936 struct ev_periodic *w = periodics [i]; 1051 struct ev_periodic *w = periodics [i];
937 1052
1053 if (w->reschedule_cb)
1054 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
938 if (w->interval) 1055 else if (w->interval)
939 {
940 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1056 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
941
942 if (fabs (diff) >= 1e-4)
943 {
944 ev_periodic_stop (EV_A_ w);
945 ev_periodic_start (EV_A_ w);
946
947 i = 0; /* restart loop, inefficient, but time jumps should be rare */
948 }
949 }
950 } 1057 }
1058
1059 /* now rebuild the heap */
1060 for (i = periodiccnt >> 1; i--; )
1061 downheap ((WT *)periodics, periodiccnt, i);
951} 1062}
1063#endif
952 1064
953inline int 1065inline int
954time_update_monotonic (EV_P) 1066time_update_monotonic (EV_P)
955{ 1067{
956 mn_now = get_clock (); 1068 mn_now = get_clock ();
957 1069
958 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1070 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
959 { 1071 {
960 rt_now = rtmn_diff + mn_now; 1072 ev_rt_now = rtmn_diff + mn_now;
961 return 0; 1073 return 0;
962 } 1074 }
963 else 1075 else
964 { 1076 {
965 now_floor = mn_now; 1077 now_floor = mn_now;
966 rt_now = ev_time (); 1078 ev_rt_now = ev_time ();
967 return 1; 1079 return 1;
968 } 1080 }
969} 1081}
970 1082
971static void 1083static void
… …
980 { 1092 {
981 ev_tstamp odiff = rtmn_diff; 1093 ev_tstamp odiff = rtmn_diff;
982 1094
983 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1095 for (i = 4; --i; ) /* loop a few times, before making important decisions */
984 { 1096 {
985 rtmn_diff = rt_now - mn_now; 1097 rtmn_diff = ev_rt_now - mn_now;
986 1098
987 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1099 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
988 return; /* all is well */ 1100 return; /* all is well */
989 1101
990 rt_now = ev_time (); 1102 ev_rt_now = ev_time ();
991 mn_now = get_clock (); 1103 mn_now = get_clock ();
992 now_floor = mn_now; 1104 now_floor = mn_now;
993 } 1105 }
994 1106
1107# if EV_PERIODICS
995 periodics_reschedule (EV_A); 1108 periodics_reschedule (EV_A);
1109# endif
996 /* no timer adjustment, as the monotonic clock doesn't jump */ 1110 /* no timer adjustment, as the monotonic clock doesn't jump */
997 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
998 } 1112 }
999 } 1113 }
1000 else 1114 else
1001#endif 1115#endif
1002 { 1116 {
1003 rt_now = ev_time (); 1117 ev_rt_now = ev_time ();
1004 1118
1005 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1119 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1006 { 1120 {
1121#if EV_PERIODICS
1007 periodics_reschedule (EV_A); 1122 periodics_reschedule (EV_A);
1123#endif
1008 1124
1009 /* adjust timers. this is easy, as the offset is the same for all */ 1125 /* adjust timers. this is easy, as the offset is the same for all */
1010 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
1011 ((WT)timers [i])->at += rt_now - mn_now; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
1012 } 1128 }
1013 1129
1014 mn_now = rt_now; 1130 mn_now = ev_rt_now;
1015 } 1131 }
1016} 1132}
1017 1133
1018void 1134void
1019ev_ref (EV_P) 1135ev_ref (EV_P)
… …
1042 { 1158 {
1043 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1044 call_pending (EV_A); 1160 call_pending (EV_A);
1045 } 1161 }
1046 1162
1163 /* we might have forked, so reify kernel state if necessary */
1164 if (expect_false (postfork))
1165 loop_fork (EV_A);
1166
1047 /* update fd-related kernel structures */ 1167 /* update fd-related kernel structures */
1048 fd_reify (EV_A); 1168 fd_reify (EV_A);
1049 1169
1050 /* calculate blocking time */ 1170 /* calculate blocking time */
1051 1171
1052 /* we only need this for !monotonic clockor timers, but as we basically 1172 /* we only need this for !monotonic clock or timers, but as we basically
1053 always have timers, we just calculate it always */ 1173 always have timers, we just calculate it always */
1054#if EV_USE_MONOTONIC 1174#if EV_USE_MONOTONIC
1055 if (expect_true (have_monotonic)) 1175 if (expect_true (have_monotonic))
1056 time_update_monotonic (EV_A); 1176 time_update_monotonic (EV_A);
1057 else 1177 else
1058#endif 1178#endif
1059 { 1179 {
1060 rt_now = ev_time (); 1180 ev_rt_now = ev_time ();
1061 mn_now = rt_now; 1181 mn_now = ev_rt_now;
1062 } 1182 }
1063 1183
1064 if (flags & EVLOOP_NONBLOCK || idlecnt) 1184 if (flags & EVLOOP_NONBLOCK || idlecnt)
1065 block = 0.; 1185 block = 0.;
1066 else 1186 else
… …
1071 { 1191 {
1072 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1073 if (block > to) block = to; 1193 if (block > to) block = to;
1074 } 1194 }
1075 1195
1196#if EV_PERIODICS
1076 if (periodiccnt) 1197 if (periodiccnt)
1077 { 1198 {
1078 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1079 if (block > to) block = to; 1200 if (block > to) block = to;
1080 } 1201 }
1202#endif
1081 1203
1082 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
1083 } 1205 }
1084 1206
1085 method_poll (EV_A_ block); 1207 method_poll (EV_A_ block);
1086 1208
1087 /* update rt_now, do magic */ 1209 /* update ev_rt_now, do magic */
1088 time_update (EV_A); 1210 time_update (EV_A);
1089 1211
1090 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
1091 timers_reify (EV_A); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
1092 periodics_reify (EV_A); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
1093 1217
1094 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
1095 if (!pendingcnt) 1219 if (idlecnt && !any_pending (EV_A))
1096 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1097 1221
1098 /* queue check watchers, to be executed first */ 1222 /* queue check watchers, to be executed first */
1099 if (checkcnt) 1223 if (checkcnt)
1100 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1175 return; 1299 return;
1176 1300
1177 assert (("ev_io_start called with negative fd", fd >= 0)); 1301 assert (("ev_io_start called with negative fd", fd >= 0));
1178 1302
1179 ev_start (EV_A_ (W)w, 1); 1303 ev_start (EV_A_ (W)w, 1);
1180 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1304 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1181 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1305 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1182 1306
1183 fd_change (EV_A_ fd); 1307 fd_change (EV_A_ fd);
1184} 1308}
1185 1309
… …
1188{ 1312{
1189 ev_clear_pending (EV_A_ (W)w); 1313 ev_clear_pending (EV_A_ (W)w);
1190 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
1191 return; 1315 return;
1192 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
1193 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1194 ev_stop (EV_A_ (W)w); 1320 ev_stop (EV_A_ (W)w);
1195 1321
1196 fd_change (EV_A_ w->fd); 1322 fd_change (EV_A_ w->fd);
1197} 1323}
… …
1205 ((WT)w)->at += mn_now; 1331 ((WT)w)->at += mn_now;
1206 1332
1207 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1333 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1208 1334
1209 ev_start (EV_A_ (W)w, ++timercnt); 1335 ev_start (EV_A_ (W)w, ++timercnt);
1210 array_needsize (timers, timermax, timercnt, ); 1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1211 timers [timercnt - 1] = w; 1337 timers [timercnt - 1] = w;
1212 upheap ((WT *)timers, timercnt - 1); 1338 upheap ((WT *)timers, timercnt - 1);
1213 1339
1214 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1215} 1341}
… …
1227 { 1353 {
1228 timers [((W)w)->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
1229 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1355 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1230 } 1356 }
1231 1357
1232 ((WT)w)->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
1233 1359
1234 ev_stop (EV_A_ (W)w); 1360 ev_stop (EV_A_ (W)w);
1235} 1361}
1236 1362
1237void 1363void
1238ev_timer_again (EV_P_ struct ev_timer *w) 1364ev_timer_again (EV_P_ struct ev_timer *w)
1239{ 1365{
1240 if (ev_is_active (w)) 1366 if (ev_is_active (w))
1241 { 1367 {
1242 if (w->repeat) 1368 if (w->repeat)
1243 {
1244 ((WT)w)->at = mn_now + w->repeat;
1245 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1369 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1246 }
1247 else 1370 else
1248 ev_timer_stop (EV_A_ w); 1371 ev_timer_stop (EV_A_ w);
1249 } 1372 }
1250 else if (w->repeat) 1373 else if (w->repeat)
1251 ev_timer_start (EV_A_ w); 1374 ev_timer_start (EV_A_ w);
1252} 1375}
1253 1376
1377#if EV_PERIODICS
1254void 1378void
1255ev_periodic_start (EV_P_ struct ev_periodic *w) 1379ev_periodic_start (EV_P_ struct ev_periodic *w)
1256{ 1380{
1257 if (ev_is_active (w)) 1381 if (ev_is_active (w))
1258 return; 1382 return;
1259 1383
1384 if (w->reschedule_cb)
1385 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1386 else if (w->interval)
1387 {
1260 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1388 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1261
1262 /* this formula differs from the one in periodic_reify because we do not always round up */ 1389 /* this formula differs from the one in periodic_reify because we do not always round up */
1263 if (w->interval)
1264 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1390 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1391 }
1265 1392
1266 ev_start (EV_A_ (W)w, ++periodiccnt); 1393 ev_start (EV_A_ (W)w, ++periodiccnt);
1267 array_needsize (periodics, periodicmax, periodiccnt, ); 1394 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1268 periodics [periodiccnt - 1] = w; 1395 periodics [periodiccnt - 1] = w;
1269 upheap ((WT *)periodics, periodiccnt - 1); 1396 upheap ((WT *)periodics, periodiccnt - 1);
1270 1397
1271 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1398 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1272} 1399}
… …
1288 1415
1289 ev_stop (EV_A_ (W)w); 1416 ev_stop (EV_A_ (W)w);
1290} 1417}
1291 1418
1292void 1419void
1420ev_periodic_again (EV_P_ struct ev_periodic *w)
1421{
1422 /* TODO: use adjustheap and recalculation */
1423 ev_periodic_stop (EV_A_ w);
1424 ev_periodic_start (EV_A_ w);
1425}
1426#endif
1427
1428void
1293ev_idle_start (EV_P_ struct ev_idle *w) 1429ev_idle_start (EV_P_ struct ev_idle *w)
1294{ 1430{
1295 if (ev_is_active (w)) 1431 if (ev_is_active (w))
1296 return; 1432 return;
1297 1433
1298 ev_start (EV_A_ (W)w, ++idlecnt); 1434 ev_start (EV_A_ (W)w, ++idlecnt);
1299 array_needsize (idles, idlemax, idlecnt, ); 1435 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1300 idles [idlecnt - 1] = w; 1436 idles [idlecnt - 1] = w;
1301} 1437}
1302 1438
1303void 1439void
1304ev_idle_stop (EV_P_ struct ev_idle *w) 1440ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1316{ 1452{
1317 if (ev_is_active (w)) 1453 if (ev_is_active (w))
1318 return; 1454 return;
1319 1455
1320 ev_start (EV_A_ (W)w, ++preparecnt); 1456 ev_start (EV_A_ (W)w, ++preparecnt);
1321 array_needsize (prepares, preparemax, preparecnt, ); 1457 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1322 prepares [preparecnt - 1] = w; 1458 prepares [preparecnt - 1] = w;
1323} 1459}
1324 1460
1325void 1461void
1326ev_prepare_stop (EV_P_ struct ev_prepare *w) 1462ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1338{ 1474{
1339 if (ev_is_active (w)) 1475 if (ev_is_active (w))
1340 return; 1476 return;
1341 1477
1342 ev_start (EV_A_ (W)w, ++checkcnt); 1478 ev_start (EV_A_ (W)w, ++checkcnt);
1343 array_needsize (checks, checkmax, checkcnt, ); 1479 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1344 checks [checkcnt - 1] = w; 1480 checks [checkcnt - 1] = w;
1345} 1481}
1346 1482
1347void 1483void
1348ev_check_stop (EV_P_ struct ev_check *w) 1484ev_check_stop (EV_P_ struct ev_check *w)
1349{ 1485{
1350 ev_clear_pending (EV_A_ (W)w); 1486 ev_clear_pending (EV_A_ (W)w);
1351 if (ev_is_active (w)) 1487 if (!ev_is_active (w))
1352 return; 1488 return;
1353 1489
1354 checks [((W)w)->active - 1] = checks [--checkcnt]; 1490 checks [((W)w)->active - 1] = checks [--checkcnt];
1355 ev_stop (EV_A_ (W)w); 1491 ev_stop (EV_A_ (W)w);
1356} 1492}
… …
1369 return; 1505 return;
1370 1506
1371 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1507 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1372 1508
1373 ev_start (EV_A_ (W)w, 1); 1509 ev_start (EV_A_ (W)w, 1);
1374 array_needsize (signals, signalmax, w->signum, signals_init); 1510 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1375 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1511 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1376 1512
1377 if (!((WL)w)->next) 1513 if (!((WL)w)->next)
1378 { 1514 {
1379#if WIN32 1515#if WIN32
… …
1417 1553
1418void 1554void
1419ev_child_stop (EV_P_ struct ev_child *w) 1555ev_child_stop (EV_P_ struct ev_child *w)
1420{ 1556{
1421 ev_clear_pending (EV_A_ (W)w); 1557 ev_clear_pending (EV_A_ (W)w);
1422 if (ev_is_active (w)) 1558 if (!ev_is_active (w))
1423 return; 1559 return;
1424 1560
1425 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1561 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1426 ev_stop (EV_A_ (W)w); 1562 ev_stop (EV_A_ (W)w);
1427} 1563}
… …
1462} 1598}
1463 1599
1464void 1600void
1465ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1601ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1466{ 1602{
1467 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1603 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1468 1604
1469 if (!once) 1605 if (!once)
1470 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1606 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1471 else 1607 else
1472 { 1608 {
1473 once->cb = cb; 1609 once->cb = cb;
1474 once->arg = arg; 1610 once->arg = arg;
1475 1611
1476 ev_watcher_init (&once->io, once_cb_io); 1612 ev_init (&once->io, once_cb_io);
1477 if (fd >= 0) 1613 if (fd >= 0)
1478 { 1614 {
1479 ev_io_set (&once->io, fd, events); 1615 ev_io_set (&once->io, fd, events);
1480 ev_io_start (EV_A_ &once->io); 1616 ev_io_start (EV_A_ &once->io);
1481 } 1617 }
1482 1618
1483 ev_watcher_init (&once->to, once_cb_to); 1619 ev_init (&once->to, once_cb_to);
1484 if (timeout >= 0.) 1620 if (timeout >= 0.)
1485 { 1621 {
1486 ev_timer_set (&once->to, timeout, 0.); 1622 ev_timer_set (&once->to, timeout, 0.);
1487 ev_timer_start (EV_A_ &once->to); 1623 ev_timer_start (EV_A_ &once->to);
1488 } 1624 }
1489 } 1625 }
1490} 1626}
1491 1627
1628#ifdef __cplusplus
1629}
1630#endif
1631

Diff Legend

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