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

Comparing libev/ev.c (file contents):
Revision 1.284 by root, Wed Apr 15 17:49:26 2009 UTC vs.
Revision 1.332 by root, Tue Mar 9 08:58:17 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
108# define EV_USE_EPOLL 0 110# define EV_USE_EPOLL 0
109# endif 111# endif
110# endif 112# endif
111 113
112# ifndef EV_USE_KQUEUE 114# ifndef EV_USE_KQUEUE
113# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 115# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
114# define EV_USE_KQUEUE 1 116# define EV_USE_KQUEUE 1
115# else 117# else
116# define EV_USE_KQUEUE 0 118# define EV_USE_KQUEUE 0
117# endif 119# endif
118# endif 120# endif
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
143 153
144#endif 154#endif
145 155
146#include <math.h> 156#include <math.h>
147#include <stdlib.h> 157#include <stdlib.h>
158#include <string.h>
148#include <fcntl.h> 159#include <fcntl.h>
149#include <stddef.h> 160#include <stddef.h>
150 161
151#include <stdio.h> 162#include <stdio.h>
152 163
153#include <assert.h> 164#include <assert.h>
154#include <errno.h> 165#include <errno.h>
155#include <sys/types.h> 166#include <sys/types.h>
156#include <time.h> 167#include <time.h>
168#include <limits.h>
157 169
158#include <signal.h> 170#include <signal.h>
159 171
160#ifdef EV_H 172#ifdef EV_H
161# include EV_H 173# include EV_H
172# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
173# include <windows.h> 185# include <windows.h>
174# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
175# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
176# endif 188# endif
189# undef EV_AVOID_STDIO
177#endif 190#endif
178 191
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
193
194/* try to deduce the maximum number of signals on this platform */
195#if defined (EV_NSIG)
196/* use what's provided */
197#elif defined (NSIG)
198# define EV_NSIG (NSIG)
199#elif defined(_NSIG)
200# define EV_NSIG (_NSIG)
201#elif defined (SIGMAX)
202# define EV_NSIG (SIGMAX+1)
203#elif defined (SIG_MAX)
204# define EV_NSIG (SIG_MAX+1)
205#elif defined (_SIG_MAX)
206# define EV_NSIG (_SIG_MAX+1)
207#elif defined (MAXSIG)
208# define EV_NSIG (MAXSIG+1)
209#elif defined (MAX_SIG)
210# define EV_NSIG (MAX_SIG+1)
211#elif defined (SIGARRAYSIZE)
212# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
213#elif defined (_sys_nsig)
214# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
215#else
216# error "unable to find value for NSIG, please report"
217/* to make it compile regardless, just remove the above line */
218# define EV_NSIG 65
219#endif
180 220
181#ifndef EV_USE_CLOCK_SYSCALL 221#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 222# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 223# define EV_USE_CLOCK_SYSCALL 1
184# else 224# else
264# else 304# else
265# define EV_USE_EVENTFD 0 305# define EV_USE_EVENTFD 0
266# endif 306# endif
267#endif 307#endif
268 308
309#ifndef EV_USE_SIGNALFD
310# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
311# define EV_USE_SIGNALFD 1
312# else
313# define EV_USE_SIGNALFD 0
314# endif
315#endif
316
269#if 0 /* debugging */ 317#if 0 /* debugging */
270# define EV_VERIFY 3 318# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 319# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 320# define EV_HEAP_CACHE_AT 1
273#endif 321#endif
282 330
283#ifndef EV_HEAP_CACHE_AT 331#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 332# define EV_HEAP_CACHE_AT !EV_MINIMAL
285#endif 333#endif
286 334
335/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
336/* which makes programs even slower. might work on other unices, too. */
337#if EV_USE_CLOCK_SYSCALL
338# include <syscall.h>
339# ifdef SYS_clock_gettime
340# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
341# undef EV_USE_MONOTONIC
342# define EV_USE_MONOTONIC 1
343# else
344# undef EV_USE_CLOCK_SYSCALL
345# define EV_USE_CLOCK_SYSCALL 0
346# endif
347#endif
348
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
288 356
289#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
290# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
291# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
292#endif 360#endif
320 388
321#if EV_SELECT_IS_WINSOCKET 389#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 390# include <winsock.h>
323#endif 391#endif
324 392
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 393#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 394/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 395# include <stdint.h>
396# ifndef EFD_NONBLOCK
397# define EFD_NONBLOCK O_NONBLOCK
398# endif
399# ifndef EFD_CLOEXEC
400# ifdef O_CLOEXEC
401# define EFD_CLOEXEC O_CLOEXEC
402# else
403# define EFD_CLOEXEC 02000000
404# endif
405# endif
337# ifdef __cplusplus 406# ifdef __cplusplus
338extern "C" { 407extern "C" {
339# endif 408# endif
340int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
341# ifdef __cplusplus 410# ifdef __cplusplus
342} 411}
343# endif 412# endif
344#endif 413#endif
414
415#if EV_USE_SIGNALFD
416/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
417# include <stdint.h>
418# ifndef SFD_NONBLOCK
419# define SFD_NONBLOCK O_NONBLOCK
420# endif
421# ifndef SFD_CLOEXEC
422# ifdef O_CLOEXEC
423# define SFD_CLOEXEC O_CLOEXEC
424# else
425# define SFD_CLOEXEC 02000000
426# endif
427# endif
428# ifdef __cplusplus
429extern "C" {
430# endif
431int signalfd (int fd, const sigset_t *mask, int flags);
432
433struct signalfd_siginfo
434{
435 uint32_t ssi_signo;
436 char pad[128 - sizeof (uint32_t)];
437};
438# ifdef __cplusplus
439}
440# endif
441#endif
442
345 443
346/**/ 444/**/
347 445
348#if EV_VERIFY >= 3 446#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 447# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 459 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 461
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 462#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
365#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 463#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
366/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
367 464
368#if __GNUC__ >= 4 465#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 466# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 467# define noinline __attribute__ ((noinline))
371#else 468#else
384# define inline_speed static noinline 481# define inline_speed static noinline
385#else 482#else
386# define inline_speed static inline 483# define inline_speed static inline
387#endif 484#endif
388 485
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 486#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
487
488#if EV_MINPRI == EV_MAXPRI
489# define ABSPRI(w) (((W)w), 0)
490#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 491# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
492#endif
391 493
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 494#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 495#define EMPTY2(a,b) /* used to suppress some warnings */
394 496
395typedef ev_watcher *W; 497typedef ev_watcher *W;
407 509
408#if EV_USE_MONOTONIC 510#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 511static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 512#endif
411 513
514#ifndef EV_FD_TO_WIN32_HANDLE
515# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
516#endif
517#ifndef EV_WIN32_HANDLE_TO_FD
518# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
519#endif
520#ifndef EV_WIN32_CLOSE_FD
521# define EV_WIN32_CLOSE_FD(fd) close (fd)
522#endif
523
412#ifdef _WIN32 524#ifdef _WIN32
413# include "ev_win32.c" 525# include "ev_win32.c"
414#endif 526#endif
415 527
416/*****************************************************************************/ 528/*****************************************************************************/
529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
417 537
418static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
419 539
420void 540void
421ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
431 551
432 if (syserr_cb) 552 if (syserr_cb)
433 syserr_cb (msg); 553 syserr_cb (msg);
434 else 554 else
435 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
436 perror (msg); 564 perror (msg);
565#endif
437 abort (); 566 abort ();
438 } 567 }
439} 568}
440 569
441static void * 570static void *
443{ 572{
444 /* some systems, notably openbsd and darwin, fail to properly 573 /* some systems, notably openbsd and darwin, fail to properly
445 * implement realloc (x, 0) (as required by both ansi c-98 and 574 * implement realloc (x, 0) (as required by both ansi c-98 and
446 * the single unix specification, so work around them here. 575 * the single unix specification, so work around them here.
447 */ 576 */
448
449 if (size) 577 if (size)
450 return realloc (ptr, size); 578 return realloc (ptr, size);
451 579
452 free (ptr); 580 free (ptr);
453 return 0; 581 return 0;
466{ 594{
467 ptr = alloc (ptr, size); 595 ptr = alloc (ptr, size);
468 596
469 if (!ptr && size) 597 if (!ptr && size)
470 { 598 {
599#if EV_AVOID_STDIO
600 ev_printerr ("libev: memory allocation failed, aborting.\n");
601#else
471 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 602 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
603#endif
472 abort (); 604 abort ();
473 } 605 }
474 606
475 return ptr; 607 return ptr;
476} 608}
478#define ev_malloc(size) ev_realloc (0, (size)) 610#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 611#define ev_free(ptr) ev_realloc ((ptr), 0)
480 612
481/*****************************************************************************/ 613/*****************************************************************************/
482 614
615/* set in reify when reification needed */
616#define EV_ANFD_REIFY 1
617
618/* file descriptor info structure */
483typedef struct 619typedef struct
484{ 620{
485 WL head; 621 WL head;
486 unsigned char events; 622 unsigned char events; /* the events watched for */
487 unsigned char reify; 623 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 624 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
489 unsigned char unused; 625 unsigned char unused;
490#if EV_USE_EPOLL 626#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */ 627 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif 628#endif
493#if EV_SELECT_IS_WINSOCKET 629#if EV_SELECT_IS_WINSOCKET
494 SOCKET handle; 630 SOCKET handle;
495#endif 631#endif
496} ANFD; 632} ANFD;
497 633
634/* stores the pending event set for a given watcher */
498typedef struct 635typedef struct
499{ 636{
500 W w; 637 W w;
501 int events; 638 int events; /* the pending event set for the given watcher */
502} ANPENDING; 639} ANPENDING;
503 640
504#if EV_USE_INOTIFY 641#if EV_USE_INOTIFY
505/* hash table entry per inotify-id */ 642/* hash table entry per inotify-id */
506typedef struct 643typedef struct
509} ANFS; 646} ANFS;
510#endif 647#endif
511 648
512/* Heap Entry */ 649/* Heap Entry */
513#if EV_HEAP_CACHE_AT 650#if EV_HEAP_CACHE_AT
651 /* a heap element */
514 typedef struct { 652 typedef struct {
515 ev_tstamp at; 653 ev_tstamp at;
516 WT w; 654 WT w;
517 } ANHE; 655 } ANHE;
518 656
519 #define ANHE_w(he) (he).w /* access watcher, read-write */ 657 #define ANHE_w(he) (he).w /* access watcher, read-write */
520 #define ANHE_at(he) (he).at /* access cached at, read-only */ 658 #define ANHE_at(he) (he).at /* access cached at, read-only */
521 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */ 659 #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
522#else 660#else
661 /* a heap element */
523 typedef WT ANHE; 662 typedef WT ANHE;
524 663
525 #define ANHE_w(he) (he) 664 #define ANHE_w(he) (he)
526 #define ANHE_at(he) (he)->at 665 #define ANHE_at(he) (he)->at
527 #define ANHE_at_cache(he) 666 #define ANHE_at_cache(he)
551 690
552 static int ev_default_loop_ptr; 691 static int ev_default_loop_ptr;
553 692
554#endif 693#endif
555 694
695#if EV_MINIMAL < 2
696# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
697# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
698# define EV_INVOKE_PENDING invoke_cb (EV_A)
699#else
700# define EV_RELEASE_CB (void)0
701# define EV_ACQUIRE_CB (void)0
702# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
703#endif
704
705#define EVUNLOOP_RECURSE 0x80
706
556/*****************************************************************************/ 707/*****************************************************************************/
557 708
709#ifndef EV_HAVE_EV_TIME
558ev_tstamp 710ev_tstamp
559ev_time (void) 711ev_time (void)
560{ 712{
561#if EV_USE_REALTIME 713#if EV_USE_REALTIME
562 if (expect_true (have_realtime)) 714 if (expect_true (have_realtime))
569 721
570 struct timeval tv; 722 struct timeval tv;
571 gettimeofday (&tv, 0); 723 gettimeofday (&tv, 0);
572 return tv.tv_sec + tv.tv_usec * 1e-6; 724 return tv.tv_sec + tv.tv_usec * 1e-6;
573} 725}
726#endif
574 727
575inline_size ev_tstamp 728inline_size ev_tstamp
576get_clock (void) 729get_clock (void)
577{ 730{
578#if EV_USE_MONOTONIC 731#if EV_USE_MONOTONIC
614 767
615 tv.tv_sec = (time_t)delay; 768 tv.tv_sec = (time_t)delay;
616 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 769 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
617 770
618 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 771 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
619 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 772 /* something not guaranteed by newer posix versions, but guaranteed */
620 /* by older ones */ 773 /* by older ones */
621 select (0, 0, 0, 0, &tv); 774 select (0, 0, 0, 0, &tv);
622#endif 775#endif
623 } 776 }
624} 777}
625 778
626/*****************************************************************************/ 779/*****************************************************************************/
627 780
628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 781#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
629 782
783/* find a suitable new size for the given array, */
784/* hopefully by rounding to a ncie-to-malloc size */
630inline_size int 785inline_size int
631array_nextsize (int elem, int cur, int cnt) 786array_nextsize (int elem, int cur, int cnt)
632{ 787{
633 int ncur = cur + 1; 788 int ncur = cur + 1;
634 789
680#define array_free(stem, idx) \ 835#define array_free(stem, idx) \
681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0 836 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
682 837
683/*****************************************************************************/ 838/*****************************************************************************/
684 839
840/* dummy callback for pending events */
841static void noinline
842pendingcb (EV_P_ ev_prepare *w, int revents)
843{
844}
845
685void noinline 846void noinline
686ev_feed_event (EV_P_ void *w, int revents) 847ev_feed_event (EV_P_ void *w, int revents)
687{ 848{
688 W w_ = (W)w; 849 W w_ = (W)w;
689 int pri = ABSPRI (w_); 850 int pri = ABSPRI (w_);
724} 885}
725 886
726/*****************************************************************************/ 887/*****************************************************************************/
727 888
728inline_speed void 889inline_speed void
729fd_event (EV_P_ int fd, int revents) 890fd_event_nc (EV_P_ int fd, int revents)
730{ 891{
731 ANFD *anfd = anfds + fd; 892 ANFD *anfd = anfds + fd;
732 ev_io *w; 893 ev_io *w;
733 894
734 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 895 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
738 if (ev) 899 if (ev)
739 ev_feed_event (EV_A_ (W)w, ev); 900 ev_feed_event (EV_A_ (W)w, ev);
740 } 901 }
741} 902}
742 903
904/* do not submit kernel events for fds that have reify set */
905/* because that means they changed while we were polling for new events */
906inline_speed void
907fd_event (EV_P_ int fd, int revents)
908{
909 ANFD *anfd = anfds + fd;
910
911 if (expect_true (!anfd->reify))
912 fd_event_nc (EV_A_ fd, revents);
913}
914
743void 915void
744ev_feed_fd_event (EV_P_ int fd, int revents) 916ev_feed_fd_event (EV_P_ int fd, int revents)
745{ 917{
746 if (fd >= 0 && fd < anfdmax) 918 if (fd >= 0 && fd < anfdmax)
747 fd_event (EV_A_ fd, revents); 919 fd_event_nc (EV_A_ fd, revents);
748} 920}
749 921
922/* make sure the external fd watch events are in-sync */
923/* with the kernel/libev internal state */
750inline_size void 924inline_size void
751fd_reify (EV_P) 925fd_reify (EV_P)
752{ 926{
753 int i; 927 int i;
754 928
765 939
766#if EV_SELECT_IS_WINSOCKET 940#if EV_SELECT_IS_WINSOCKET
767 if (events) 941 if (events)
768 { 942 {
769 unsigned long arg; 943 unsigned long arg;
770 #ifdef EV_FD_TO_WIN32_HANDLE
771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 944 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
772 #else
773 anfd->handle = _get_osfhandle (fd);
774 #endif
775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 945 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
776 } 946 }
777#endif 947#endif
778 948
779 { 949 {
789 } 959 }
790 960
791 fdchangecnt = 0; 961 fdchangecnt = 0;
792} 962}
793 963
964/* something about the given fd changed */
794inline_size void 965inline_size void
795fd_change (EV_P_ int fd, int flags) 966fd_change (EV_P_ int fd, int flags)
796{ 967{
797 unsigned char reify = anfds [fd].reify; 968 unsigned char reify = anfds [fd].reify;
798 anfds [fd].reify |= flags; 969 anfds [fd].reify |= flags;
803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 974 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
804 fdchanges [fdchangecnt - 1] = fd; 975 fdchanges [fdchangecnt - 1] = fd;
805 } 976 }
806} 977}
807 978
979/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
808inline_speed void 980inline_speed void
809fd_kill (EV_P_ int fd) 981fd_kill (EV_P_ int fd)
810{ 982{
811 ev_io *w; 983 ev_io *w;
812 984
815 ev_io_stop (EV_A_ w); 987 ev_io_stop (EV_A_ w);
816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 988 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
817 } 989 }
818} 990}
819 991
992/* check whether the given fd is atcually valid, for error recovery */
820inline_size int 993inline_size int
821fd_valid (int fd) 994fd_valid (int fd)
822{ 995{
823#ifdef _WIN32 996#ifdef _WIN32
824 return _get_osfhandle (fd) != -1; 997 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
825#else 998#else
826 return fcntl (fd, F_GETFD) != -1; 999 return fcntl (fd, F_GETFD) != -1;
827#endif 1000#endif
828} 1001}
829 1002
847 1020
848 for (fd = anfdmax; fd--; ) 1021 for (fd = anfdmax; fd--; )
849 if (anfds [fd].events) 1022 if (anfds [fd].events)
850 { 1023 {
851 fd_kill (EV_A_ fd); 1024 fd_kill (EV_A_ fd);
852 return; 1025 break;
853 } 1026 }
854} 1027}
855 1028
856/* usually called after fork if backend needs to re-arm all fds from scratch */ 1029/* usually called after fork if backend needs to re-arm all fds from scratch */
857static void noinline 1030static void noinline
862 for (fd = 0; fd < anfdmax; ++fd) 1035 for (fd = 0; fd < anfdmax; ++fd)
863 if (anfds [fd].events) 1036 if (anfds [fd].events)
864 { 1037 {
865 anfds [fd].events = 0; 1038 anfds [fd].events = 0;
866 anfds [fd].emask = 0; 1039 anfds [fd].emask = 0;
867 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1040 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
868 } 1041 }
869} 1042}
870 1043
871/*****************************************************************************/ 1044/*****************************************************************************/
872 1045
947 1120
948 for (;;) 1121 for (;;)
949 { 1122 {
950 int c = k << 1; 1123 int c = k << 1;
951 1124
952 if (c > N + HEAP0 - 1) 1125 if (c >= N + HEAP0)
953 break; 1126 break;
954 1127
955 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1128 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
956 ? 1 : 0; 1129 ? 1 : 0;
957 1130
989 1162
990 heap [k] = he; 1163 heap [k] = he;
991 ev_active (ANHE_w (he)) = k; 1164 ev_active (ANHE_w (he)) = k;
992} 1165}
993 1166
1167/* move an element suitably so it is in a correct place */
994inline_size void 1168inline_size void
995adjustheap (ANHE *heap, int N, int k) 1169adjustheap (ANHE *heap, int N, int k)
996{ 1170{
997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1171 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
998 upheap (heap, k); 1172 upheap (heap, k);
999 else 1173 else
1000 downheap (heap, N, k); 1174 downheap (heap, N, k);
1001} 1175}
1002 1176
1012 upheap (heap, i + HEAP0); 1186 upheap (heap, i + HEAP0);
1013} 1187}
1014 1188
1015/*****************************************************************************/ 1189/*****************************************************************************/
1016 1190
1191/* associate signal watchers to a signal signal */
1017typedef struct 1192typedef struct
1018{ 1193{
1194 EV_ATOMIC_T pending;
1195#if EV_MULTIPLICITY
1196 EV_P;
1197#endif
1019 WL head; 1198 WL head;
1020 EV_ATOMIC_T gotsig;
1021} ANSIG; 1199} ANSIG;
1022 1200
1023static ANSIG *signals; 1201static ANSIG signals [EV_NSIG - 1];
1024static int signalmax;
1025
1026static EV_ATOMIC_T gotsig;
1027 1202
1028/*****************************************************************************/ 1203/*****************************************************************************/
1029 1204
1205/* used to prepare libev internal fd's */
1206/* this is not fork-safe */
1030inline_speed void 1207inline_speed void
1031fd_intern (int fd) 1208fd_intern (int fd)
1032{ 1209{
1033#ifdef _WIN32 1210#ifdef _WIN32
1034 unsigned long arg = 1; 1211 unsigned long arg = 1;
1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1212 ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1036#else 1213#else
1037 fcntl (fd, F_SETFD, FD_CLOEXEC); 1214 fcntl (fd, F_SETFD, FD_CLOEXEC);
1038 fcntl (fd, F_SETFL, O_NONBLOCK); 1215 fcntl (fd, F_SETFL, O_NONBLOCK);
1039#endif 1216#endif
1040} 1217}
1041 1218
1042static void noinline 1219static void noinline
1043evpipe_init (EV_P) 1220evpipe_init (EV_P)
1044{ 1221{
1045 if (!ev_is_active (&pipeev)) 1222 if (!ev_is_active (&pipe_w))
1046 { 1223 {
1047#if EV_USE_EVENTFD 1224#if EV_USE_EVENTFD
1225 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1226 if (evfd < 0 && errno == EINVAL)
1048 if ((evfd = eventfd (0, 0)) >= 0) 1227 evfd = eventfd (0, 0);
1228
1229 if (evfd >= 0)
1049 { 1230 {
1050 evpipe [0] = -1; 1231 evpipe [0] = -1;
1051 fd_intern (evfd); 1232 fd_intern (evfd); /* doing it twice doesn't hurt */
1052 ev_io_set (&pipeev, evfd, EV_READ); 1233 ev_io_set (&pipe_w, evfd, EV_READ);
1053 } 1234 }
1054 else 1235 else
1055#endif 1236#endif
1056 { 1237 {
1057 while (pipe (evpipe)) 1238 while (pipe (evpipe))
1058 ev_syserr ("(libev) error creating signal/async pipe"); 1239 ev_syserr ("(libev) error creating signal/async pipe");
1059 1240
1060 fd_intern (evpipe [0]); 1241 fd_intern (evpipe [0]);
1061 fd_intern (evpipe [1]); 1242 fd_intern (evpipe [1]);
1062 ev_io_set (&pipeev, evpipe [0], EV_READ); 1243 ev_io_set (&pipe_w, evpipe [0], EV_READ);
1063 } 1244 }
1064 1245
1065 ev_io_start (EV_A_ &pipeev); 1246 ev_io_start (EV_A_ &pipe_w);
1066 ev_unref (EV_A); /* watcher should not keep loop alive */ 1247 ev_unref (EV_A); /* watcher should not keep loop alive */
1067 } 1248 }
1068} 1249}
1069 1250
1070inline_size void 1251inline_size void
1088 1269
1089 errno = old_errno; 1270 errno = old_errno;
1090 } 1271 }
1091} 1272}
1092 1273
1274/* called whenever the libev signal pipe */
1275/* got some events (signal, async) */
1093static void 1276static void
1094pipecb (EV_P_ ev_io *iow, int revents) 1277pipecb (EV_P_ ev_io *iow, int revents)
1095{ 1278{
1279 int i;
1280
1096#if EV_USE_EVENTFD 1281#if EV_USE_EVENTFD
1097 if (evfd >= 0) 1282 if (evfd >= 0)
1098 { 1283 {
1099 uint64_t counter; 1284 uint64_t counter;
1100 read (evfd, &counter, sizeof (uint64_t)); 1285 read (evfd, &counter, sizeof (uint64_t));
1104 { 1289 {
1105 char dummy; 1290 char dummy;
1106 read (evpipe [0], &dummy, 1); 1291 read (evpipe [0], &dummy, 1);
1107 } 1292 }
1108 1293
1109 if (gotsig && ev_is_default_loop (EV_A)) 1294 if (sig_pending)
1110 { 1295 {
1111 int signum; 1296 sig_pending = 0;
1112 gotsig = 0;
1113 1297
1114 for (signum = signalmax; signum--; ) 1298 for (i = EV_NSIG - 1; i--; )
1115 if (signals [signum].gotsig) 1299 if (expect_false (signals [i].pending))
1116 ev_feed_signal_event (EV_A_ signum + 1); 1300 ev_feed_signal_event (EV_A_ i + 1);
1117 } 1301 }
1118 1302
1119#if EV_ASYNC_ENABLE 1303#if EV_ASYNC_ENABLE
1120 if (gotasync) 1304 if (async_pending)
1121 { 1305 {
1122 int i; 1306 async_pending = 0;
1123 gotasync = 0;
1124 1307
1125 for (i = asynccnt; i--; ) 1308 for (i = asynccnt; i--; )
1126 if (asyncs [i]->sent) 1309 if (asyncs [i]->sent)
1127 { 1310 {
1128 asyncs [i]->sent = 0; 1311 asyncs [i]->sent = 0;
1136 1319
1137static void 1320static void
1138ev_sighandler (int signum) 1321ev_sighandler (int signum)
1139{ 1322{
1140#if EV_MULTIPLICITY 1323#if EV_MULTIPLICITY
1141 struct ev_loop *loop = &default_loop_struct; 1324 EV_P = signals [signum - 1].loop;
1142#endif 1325#endif
1143 1326
1144#if _WIN32 1327#ifdef _WIN32
1145 signal (signum, ev_sighandler); 1328 signal (signum, ev_sighandler);
1146#endif 1329#endif
1147 1330
1148 signals [signum - 1].gotsig = 1; 1331 signals [signum - 1].pending = 1;
1149 evpipe_write (EV_A_ &gotsig); 1332 evpipe_write (EV_A_ &sig_pending);
1150} 1333}
1151 1334
1152void noinline 1335void noinline
1153ev_feed_signal_event (EV_P_ int signum) 1336ev_feed_signal_event (EV_P_ int signum)
1154{ 1337{
1155 WL w; 1338 WL w;
1156 1339
1340 if (expect_false (signum <= 0 || signum > EV_NSIG))
1341 return;
1342
1343 --signum;
1344
1157#if EV_MULTIPLICITY 1345#if EV_MULTIPLICITY
1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1346 /* it is permissible to try to feed a signal to the wrong loop */
1159#endif 1347 /* or, likely more useful, feeding a signal nobody is waiting for */
1160 1348
1161 --signum; 1349 if (expect_false (signals [signum].loop != EV_A))
1162
1163 if (signum < 0 || signum >= signalmax)
1164 return; 1350 return;
1351#endif
1165 1352
1166 signals [signum].gotsig = 0; 1353 signals [signum].pending = 0;
1167 1354
1168 for (w = signals [signum].head; w; w = w->next) 1355 for (w = signals [signum].head; w; w = w->next)
1169 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1356 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1170} 1357}
1171 1358
1359#if EV_USE_SIGNALFD
1360static void
1361sigfdcb (EV_P_ ev_io *iow, int revents)
1362{
1363 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1364
1365 for (;;)
1366 {
1367 ssize_t res = read (sigfd, si, sizeof (si));
1368
1369 /* not ISO-C, as res might be -1, but works with SuS */
1370 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1371 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1372
1373 if (res < (ssize_t)sizeof (si))
1374 break;
1375 }
1376}
1377#endif
1378
1172/*****************************************************************************/ 1379/*****************************************************************************/
1173 1380
1174static WL childs [EV_PID_HASHSIZE]; 1381static WL childs [EV_PID_HASHSIZE];
1175 1382
1176#ifndef _WIN32 1383#ifndef _WIN32
1179 1386
1180#ifndef WIFCONTINUED 1387#ifndef WIFCONTINUED
1181# define WIFCONTINUED(status) 0 1388# define WIFCONTINUED(status) 0
1182#endif 1389#endif
1183 1390
1391/* handle a single child status event */
1184inline_speed void 1392inline_speed void
1185child_reap (EV_P_ int chain, int pid, int status) 1393child_reap (EV_P_ int chain, int pid, int status)
1186{ 1394{
1187 ev_child *w; 1395 ev_child *w;
1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1396 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1202 1410
1203#ifndef WCONTINUED 1411#ifndef WCONTINUED
1204# define WCONTINUED 0 1412# define WCONTINUED 0
1205#endif 1413#endif
1206 1414
1415/* called on sigchld etc., calls waitpid */
1207static void 1416static void
1208childcb (EV_P_ ev_signal *sw, int revents) 1417childcb (EV_P_ ev_signal *sw, int revents)
1209{ 1418{
1210 int pid, status; 1419 int pid, status;
1211 1420
1318ev_backend (EV_P) 1527ev_backend (EV_P)
1319{ 1528{
1320 return backend; 1529 return backend;
1321} 1530}
1322 1531
1532#if EV_MINIMAL < 2
1323unsigned int 1533unsigned int
1324ev_loop_count (EV_P) 1534ev_loop_count (EV_P)
1325{ 1535{
1326 return loop_count; 1536 return loop_count;
1327} 1537}
1328 1538
1539unsigned int
1540ev_loop_depth (EV_P)
1541{
1542 return loop_depth;
1543}
1544
1329void 1545void
1330ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1546ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1331{ 1547{
1332 io_blocktime = interval; 1548 io_blocktime = interval;
1333} 1549}
1336ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1552ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1337{ 1553{
1338 timeout_blocktime = interval; 1554 timeout_blocktime = interval;
1339} 1555}
1340 1556
1557void
1558ev_set_userdata (EV_P_ void *data)
1559{
1560 userdata = data;
1561}
1562
1563void *
1564ev_userdata (EV_P)
1565{
1566 return userdata;
1567}
1568
1569void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1570{
1571 invoke_cb = invoke_pending_cb;
1572}
1573
1574void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1575{
1576 release_cb = release;
1577 acquire_cb = acquire;
1578}
1579#endif
1580
1581/* initialise a loop structure, must be zero-initialised */
1341static void noinline 1582static void noinline
1342loop_init (EV_P_ unsigned int flags) 1583loop_init (EV_P_ unsigned int flags)
1343{ 1584{
1344 if (!backend) 1585 if (!backend)
1345 { 1586 {
1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1602 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1362 have_monotonic = 1; 1603 have_monotonic = 1;
1363 } 1604 }
1364#endif 1605#endif
1365 1606
1607 /* pid check not overridable via env */
1608#ifndef _WIN32
1609 if (flags & EVFLAG_FORKCHECK)
1610 curpid = getpid ();
1611#endif
1612
1613 if (!(flags & EVFLAG_NOENV)
1614 && !enable_secure ()
1615 && getenv ("LIBEV_FLAGS"))
1616 flags = atoi (getenv ("LIBEV_FLAGS"));
1617
1366 ev_rt_now = ev_time (); 1618 ev_rt_now = ev_time ();
1367 mn_now = get_clock (); 1619 mn_now = get_clock ();
1368 now_floor = mn_now; 1620 now_floor = mn_now;
1369 rtmn_diff = ev_rt_now - mn_now; 1621 rtmn_diff = ev_rt_now - mn_now;
1622#if EV_MINIMAL < 2
1623 invoke_cb = ev_invoke_pending;
1624#endif
1370 1625
1371 io_blocktime = 0.; 1626 io_blocktime = 0.;
1372 timeout_blocktime = 0.; 1627 timeout_blocktime = 0.;
1373 backend = 0; 1628 backend = 0;
1374 backend_fd = -1; 1629 backend_fd = -1;
1375 gotasync = 0; 1630 sig_pending = 0;
1631#if EV_ASYNC_ENABLE
1632 async_pending = 0;
1633#endif
1376#if EV_USE_INOTIFY 1634#if EV_USE_INOTIFY
1377 fs_fd = -2; 1635 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1378#endif 1636#endif
1379 1637#if EV_USE_SIGNALFD
1380 /* pid check not overridable via env */ 1638 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1381#ifndef _WIN32
1382 if (flags & EVFLAG_FORKCHECK)
1383 curpid = getpid ();
1384#endif 1639#endif
1385
1386 if (!(flags & EVFLAG_NOENV)
1387 && !enable_secure ()
1388 && getenv ("LIBEV_FLAGS"))
1389 flags = atoi (getenv ("LIBEV_FLAGS"));
1390 1640
1391 if (!(flags & 0x0000ffffU)) 1641 if (!(flags & 0x0000ffffU))
1392 flags |= ev_recommended_backends (); 1642 flags |= ev_recommended_backends ();
1393 1643
1394#if EV_USE_PORT 1644#if EV_USE_PORT
1405#endif 1655#endif
1406#if EV_USE_SELECT 1656#if EV_USE_SELECT
1407 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); 1657 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
1408#endif 1658#endif
1409 1659
1660 ev_prepare_init (&pending_w, pendingcb);
1661
1410 ev_init (&pipeev, pipecb); 1662 ev_init (&pipe_w, pipecb);
1411 ev_set_priority (&pipeev, EV_MAXPRI); 1663 ev_set_priority (&pipe_w, EV_MAXPRI);
1412 } 1664 }
1413} 1665}
1414 1666
1667/* free up a loop structure */
1415static void noinline 1668static void noinline
1416loop_destroy (EV_P) 1669loop_destroy (EV_P)
1417{ 1670{
1418 int i; 1671 int i;
1419 1672
1420 if (ev_is_active (&pipeev)) 1673 if (ev_is_active (&pipe_w))
1421 { 1674 {
1422 ev_ref (EV_A); /* signal watcher */ 1675 /*ev_ref (EV_A);*/
1423 ev_io_stop (EV_A_ &pipeev); 1676 /*ev_io_stop (EV_A_ &pipe_w);*/
1424 1677
1425#if EV_USE_EVENTFD 1678#if EV_USE_EVENTFD
1426 if (evfd >= 0) 1679 if (evfd >= 0)
1427 close (evfd); 1680 close (evfd);
1428#endif 1681#endif
1429 1682
1430 if (evpipe [0] >= 0) 1683 if (evpipe [0] >= 0)
1431 { 1684 {
1432 close (evpipe [0]); 1685 EV_WIN32_CLOSE_FD (evpipe [0]);
1433 close (evpipe [1]); 1686 EV_WIN32_CLOSE_FD (evpipe [1]);
1434 } 1687 }
1435 } 1688 }
1689
1690#if EV_USE_SIGNALFD
1691 if (ev_is_active (&sigfd_w))
1692 close (sigfd);
1693#endif
1436 1694
1437#if EV_USE_INOTIFY 1695#if EV_USE_INOTIFY
1438 if (fs_fd >= 0) 1696 if (fs_fd >= 0)
1439 close (fs_fd); 1697 close (fs_fd);
1440#endif 1698#endif
1464#if EV_IDLE_ENABLE 1722#if EV_IDLE_ENABLE
1465 array_free (idle, [i]); 1723 array_free (idle, [i]);
1466#endif 1724#endif
1467 } 1725 }
1468 1726
1469 ev_free (anfds); anfdmax = 0; 1727 ev_free (anfds); anfds = 0; anfdmax = 0;
1470 1728
1471 /* have to use the microsoft-never-gets-it-right macro */ 1729 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY); 1730 array_free (rfeed, EMPTY);
1473 array_free (fdchange, EMPTY); 1731 array_free (fdchange, EMPTY);
1474 array_free (timer, EMPTY); 1732 array_free (timer, EMPTY);
1505#endif 1763#endif
1506#if EV_USE_INOTIFY 1764#if EV_USE_INOTIFY
1507 infy_fork (EV_A); 1765 infy_fork (EV_A);
1508#endif 1766#endif
1509 1767
1510 if (ev_is_active (&pipeev)) 1768 if (ev_is_active (&pipe_w))
1511 { 1769 {
1512 /* this "locks" the handlers against writing to the pipe */ 1770 /* this "locks" the handlers against writing to the pipe */
1513 /* while we modify the fd vars */ 1771 /* while we modify the fd vars */
1514 gotsig = 1; 1772 sig_pending = 1;
1515#if EV_ASYNC_ENABLE 1773#if EV_ASYNC_ENABLE
1516 gotasync = 1; 1774 async_pending = 1;
1517#endif 1775#endif
1518 1776
1519 ev_ref (EV_A); 1777 ev_ref (EV_A);
1520 ev_io_stop (EV_A_ &pipeev); 1778 ev_io_stop (EV_A_ &pipe_w);
1521 1779
1522#if EV_USE_EVENTFD 1780#if EV_USE_EVENTFD
1523 if (evfd >= 0) 1781 if (evfd >= 0)
1524 close (evfd); 1782 close (evfd);
1525#endif 1783#endif
1526 1784
1527 if (evpipe [0] >= 0) 1785 if (evpipe [0] >= 0)
1528 { 1786 {
1529 close (evpipe [0]); 1787 EV_WIN32_CLOSE_FD (evpipe [0]);
1530 close (evpipe [1]); 1788 EV_WIN32_CLOSE_FD (evpipe [1]);
1531 } 1789 }
1532 1790
1533 evpipe_init (EV_A); 1791 evpipe_init (EV_A);
1534 /* now iterate over everything, in case we missed something */ 1792 /* now iterate over everything, in case we missed something */
1535 pipecb (EV_A_ &pipeev, EV_READ); 1793 pipecb (EV_A_ &pipe_w, EV_READ);
1536 } 1794 }
1537 1795
1538 postfork = 0; 1796 postfork = 0;
1539} 1797}
1540 1798
1541#if EV_MULTIPLICITY 1799#if EV_MULTIPLICITY
1542 1800
1543struct ev_loop * 1801struct ev_loop *
1544ev_loop_new (unsigned int flags) 1802ev_loop_new (unsigned int flags)
1545{ 1803{
1546 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1804 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1547 1805
1548 memset (loop, 0, sizeof (struct ev_loop)); 1806 memset (EV_A, 0, sizeof (struct ev_loop));
1549
1550 loop_init (EV_A_ flags); 1807 loop_init (EV_A_ flags);
1551 1808
1552 if (ev_backend (EV_A)) 1809 if (ev_backend (EV_A))
1553 return loop; 1810 return EV_A;
1554 1811
1555 return 0; 1812 return 0;
1556} 1813}
1557 1814
1558void 1815void
1565void 1822void
1566ev_loop_fork (EV_P) 1823ev_loop_fork (EV_P)
1567{ 1824{
1568 postfork = 1; /* must be in line with ev_default_fork */ 1825 postfork = 1; /* must be in line with ev_default_fork */
1569} 1826}
1827#endif /* multiplicity */
1570 1828
1571#if EV_VERIFY 1829#if EV_VERIFY
1572static void noinline 1830static void noinline
1573verify_watcher (EV_P_ W w) 1831verify_watcher (EV_P_ W w)
1574{ 1832{
1602 verify_watcher (EV_A_ ws [cnt]); 1860 verify_watcher (EV_A_ ws [cnt]);
1603 } 1861 }
1604} 1862}
1605#endif 1863#endif
1606 1864
1865#if EV_MINIMAL < 2
1607void 1866void
1608ev_loop_verify (EV_P) 1867ev_loop_verify (EV_P)
1609{ 1868{
1610#if EV_VERIFY 1869#if EV_VERIFY
1611 int i; 1870 int i;
1660 assert (checkmax >= checkcnt); 1919 assert (checkmax >= checkcnt);
1661 array_verify (EV_A_ (W *)checks, checkcnt); 1920 array_verify (EV_A_ (W *)checks, checkcnt);
1662 1921
1663# if 0 1922# if 0
1664 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1923 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1665 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1924 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1666# endif
1667#endif 1925# endif
1926#endif
1668} 1927}
1669 1928#endif
1670#endif /* multiplicity */
1671 1929
1672#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1673struct ev_loop * 1931struct ev_loop *
1674ev_default_loop_init (unsigned int flags) 1932ev_default_loop_init (unsigned int flags)
1675#else 1933#else
1678#endif 1936#endif
1679{ 1937{
1680 if (!ev_default_loop_ptr) 1938 if (!ev_default_loop_ptr)
1681 { 1939 {
1682#if EV_MULTIPLICITY 1940#if EV_MULTIPLICITY
1683 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1941 EV_P = ev_default_loop_ptr = &default_loop_struct;
1684#else 1942#else
1685 ev_default_loop_ptr = 1; 1943 ev_default_loop_ptr = 1;
1686#endif 1944#endif
1687 1945
1688 loop_init (EV_A_ flags); 1946 loop_init (EV_A_ flags);
1705 1963
1706void 1964void
1707ev_default_destroy (void) 1965ev_default_destroy (void)
1708{ 1966{
1709#if EV_MULTIPLICITY 1967#if EV_MULTIPLICITY
1710 struct ev_loop *loop = ev_default_loop_ptr; 1968 EV_P = ev_default_loop_ptr;
1711#endif 1969#endif
1712 1970
1713 ev_default_loop_ptr = 0; 1971 ev_default_loop_ptr = 0;
1714 1972
1715#ifndef _WIN32 1973#ifndef _WIN32
1722 1980
1723void 1981void
1724ev_default_fork (void) 1982ev_default_fork (void)
1725{ 1983{
1726#if EV_MULTIPLICITY 1984#if EV_MULTIPLICITY
1727 struct ev_loop *loop = ev_default_loop_ptr; 1985 EV_P = ev_default_loop_ptr;
1728#endif 1986#endif
1729 1987
1730 postfork = 1; /* must be in line with ev_loop_fork */ 1988 postfork = 1; /* must be in line with ev_loop_fork */
1731} 1989}
1732 1990
1736ev_invoke (EV_P_ void *w, int revents) 1994ev_invoke (EV_P_ void *w, int revents)
1737{ 1995{
1738 EV_CB_INVOKE ((W)w, revents); 1996 EV_CB_INVOKE ((W)w, revents);
1739} 1997}
1740 1998
1741inline_speed void 1999unsigned int
1742call_pending (EV_P) 2000ev_pending_count (EV_P)
2001{
2002 int pri;
2003 unsigned int count = 0;
2004
2005 for (pri = NUMPRI; pri--; )
2006 count += pendingcnt [pri];
2007
2008 return count;
2009}
2010
2011void noinline
2012ev_invoke_pending (EV_P)
1743{ 2013{
1744 int pri; 2014 int pri;
1745 2015
1746 for (pri = NUMPRI; pri--; ) 2016 for (pri = NUMPRI; pri--; )
1747 while (pendingcnt [pri]) 2017 while (pendingcnt [pri])
1748 { 2018 {
1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 2019 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1750 2020
1751 if (expect_true (p->w))
1752 {
1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/ 2021 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
2022 /* ^ this is no longer true, as pending_w could be here */
1754 2023
1755 p->w->pending = 0; 2024 p->w->pending = 0;
1756 EV_CB_INVOKE (p->w, p->events); 2025 EV_CB_INVOKE (p->w, p->events);
1757 EV_FREQUENT_CHECK; 2026 EV_FREQUENT_CHECK;
1758 }
1759 } 2027 }
1760} 2028}
1761 2029
1762#if EV_IDLE_ENABLE 2030#if EV_IDLE_ENABLE
2031/* make idle watchers pending. this handles the "call-idle */
2032/* only when higher priorities are idle" logic */
1763inline_size void 2033inline_size void
1764idle_reify (EV_P) 2034idle_reify (EV_P)
1765{ 2035{
1766 if (expect_false (idleall)) 2036 if (expect_false (idleall))
1767 { 2037 {
1780 } 2050 }
1781 } 2051 }
1782} 2052}
1783#endif 2053#endif
1784 2054
2055/* make timers pending */
1785inline_size void 2056inline_size void
1786timers_reify (EV_P) 2057timers_reify (EV_P)
1787{ 2058{
1788 EV_FREQUENT_CHECK; 2059 EV_FREQUENT_CHECK;
1789 2060
1818 feed_reverse_done (EV_A_ EV_TIMEOUT); 2089 feed_reverse_done (EV_A_ EV_TIMEOUT);
1819 } 2090 }
1820} 2091}
1821 2092
1822#if EV_PERIODIC_ENABLE 2093#if EV_PERIODIC_ENABLE
2094/* make periodics pending */
1823inline_size void 2095inline_size void
1824periodics_reify (EV_P) 2096periodics_reify (EV_P)
1825{ 2097{
1826 EV_FREQUENT_CHECK; 2098 EV_FREQUENT_CHECK;
1827 2099
1874 2146
1875 feed_reverse_done (EV_A_ EV_PERIODIC); 2147 feed_reverse_done (EV_A_ EV_PERIODIC);
1876 } 2148 }
1877} 2149}
1878 2150
2151/* simply recalculate all periodics */
2152/* TODO: maybe ensure that at leats one event happens when jumping forward? */
1879static void noinline 2153static void noinline
1880periodics_reschedule (EV_P) 2154periodics_reschedule (EV_P)
1881{ 2155{
1882 int i; 2156 int i;
1883 2157
1896 2170
1897 reheap (periodics, periodiccnt); 2171 reheap (periodics, periodiccnt);
1898} 2172}
1899#endif 2173#endif
1900 2174
2175/* adjust all timers by a given offset */
2176static void noinline
2177timers_reschedule (EV_P_ ev_tstamp adjust)
2178{
2179 int i;
2180
2181 for (i = 0; i < timercnt; ++i)
2182 {
2183 ANHE *he = timers + i + HEAP0;
2184 ANHE_w (*he)->at += adjust;
2185 ANHE_at_cache (*he);
2186 }
2187}
2188
2189/* fetch new monotonic and realtime times from the kernel */
2190/* also detect if there was a timejump, and act accordingly */
1901inline_speed void 2191inline_speed void
1902time_update (EV_P_ ev_tstamp max_block) 2192time_update (EV_P_ ev_tstamp max_block)
1903{ 2193{
1904 int i;
1905
1906#if EV_USE_MONOTONIC 2194#if EV_USE_MONOTONIC
1907 if (expect_true (have_monotonic)) 2195 if (expect_true (have_monotonic))
1908 { 2196 {
2197 int i;
1909 ev_tstamp odiff = rtmn_diff; 2198 ev_tstamp odiff = rtmn_diff;
1910 2199
1911 mn_now = get_clock (); 2200 mn_now = get_clock ();
1912 2201
1913 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2202 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1939 ev_rt_now = ev_time (); 2228 ev_rt_now = ev_time ();
1940 mn_now = get_clock (); 2229 mn_now = get_clock ();
1941 now_floor = mn_now; 2230 now_floor = mn_now;
1942 } 2231 }
1943 2232
2233 /* no timer adjustment, as the monotonic clock doesn't jump */
2234 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1944# if EV_PERIODIC_ENABLE 2235# if EV_PERIODIC_ENABLE
1945 periodics_reschedule (EV_A); 2236 periodics_reschedule (EV_A);
1946# endif 2237# endif
1947 /* no timer adjustment, as the monotonic clock doesn't jump */
1948 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1949 } 2238 }
1950 else 2239 else
1951#endif 2240#endif
1952 { 2241 {
1953 ev_rt_now = ev_time (); 2242 ev_rt_now = ev_time ();
1954 2243
1955 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 2244 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1956 { 2245 {
2246 /* adjust timers. this is easy, as the offset is the same for all of them */
2247 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1957#if EV_PERIODIC_ENABLE 2248#if EV_PERIODIC_ENABLE
1958 periodics_reschedule (EV_A); 2249 periodics_reschedule (EV_A);
1959#endif 2250#endif
1960 /* adjust timers. this is easy, as the offset is the same for all of them */
1961 for (i = 0; i < timercnt; ++i)
1962 {
1963 ANHE *he = timers + i + HEAP0;
1964 ANHE_w (*he)->at += ev_rt_now - mn_now;
1965 ANHE_at_cache (*he);
1966 }
1967 } 2251 }
1968 2252
1969 mn_now = ev_rt_now; 2253 mn_now = ev_rt_now;
1970 } 2254 }
1971} 2255}
1972 2256
1973void 2257void
1974ev_ref (EV_P)
1975{
1976 ++activecnt;
1977}
1978
1979void
1980ev_unref (EV_P)
1981{
1982 --activecnt;
1983}
1984
1985void
1986ev_now_update (EV_P)
1987{
1988 time_update (EV_A_ 1e100);
1989}
1990
1991static int loop_done;
1992
1993void
1994ev_loop (EV_P_ int flags) 2258ev_loop (EV_P_ int flags)
1995{ 2259{
2260#if EV_MINIMAL < 2
2261 ++loop_depth;
2262#endif
2263
2264 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2265
1996 loop_done = EVUNLOOP_CANCEL; 2266 loop_done = EVUNLOOP_CANCEL;
1997 2267
1998 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2268 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
1999 2269
2000 do 2270 do
2001 { 2271 {
2002#if EV_VERIFY >= 2 2272#if EV_VERIFY >= 2
2003 ev_loop_verify (EV_A); 2273 ev_loop_verify (EV_A);
2016 /* we might have forked, so queue fork handlers */ 2286 /* we might have forked, so queue fork handlers */
2017 if (expect_false (postfork)) 2287 if (expect_false (postfork))
2018 if (forkcnt) 2288 if (forkcnt)
2019 { 2289 {
2020 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2290 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2021 call_pending (EV_A); 2291 EV_INVOKE_PENDING;
2022 } 2292 }
2023#endif 2293#endif
2024 2294
2025 /* queue prepare watchers (and execute them) */ 2295 /* queue prepare watchers (and execute them) */
2026 if (expect_false (preparecnt)) 2296 if (expect_false (preparecnt))
2027 { 2297 {
2028 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2298 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2029 call_pending (EV_A); 2299 EV_INVOKE_PENDING;
2030 } 2300 }
2301
2302 if (expect_false (loop_done))
2303 break;
2031 2304
2032 /* we might have forked, so reify kernel state if necessary */ 2305 /* we might have forked, so reify kernel state if necessary */
2033 if (expect_false (postfork)) 2306 if (expect_false (postfork))
2034 loop_fork (EV_A); 2307 loop_fork (EV_A);
2035 2308
2041 ev_tstamp waittime = 0.; 2314 ev_tstamp waittime = 0.;
2042 ev_tstamp sleeptime = 0.; 2315 ev_tstamp sleeptime = 0.;
2043 2316
2044 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2317 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2045 { 2318 {
2319 /* remember old timestamp for io_blocktime calculation */
2320 ev_tstamp prev_mn_now = mn_now;
2321
2046 /* update time to cancel out callback processing overhead */ 2322 /* update time to cancel out callback processing overhead */
2047 time_update (EV_A_ 1e100); 2323 time_update (EV_A_ 1e100);
2324
2325 waittime = MAX_BLOCKTIME;
2048 2326
2049 if (timercnt) 2327 if (timercnt)
2050 { 2328 {
2051 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2329 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
2052 if (waittime > to) waittime = to; 2330 if (waittime > to) waittime = to;
2058 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2336 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2059 if (waittime > to) waittime = to; 2337 if (waittime > to) waittime = to;
2060 } 2338 }
2061#endif 2339#endif
2062 2340
2341 /* don't let timeouts decrease the waittime below timeout_blocktime */
2063 if (expect_false (waittime < timeout_blocktime)) 2342 if (expect_false (waittime < timeout_blocktime))
2064 waittime = timeout_blocktime; 2343 waittime = timeout_blocktime;
2065 2344
2066 sleeptime = waittime - backend_fudge; 2345 /* extra check because io_blocktime is commonly 0 */
2067
2068 if (expect_true (sleeptime > io_blocktime)) 2346 if (expect_false (io_blocktime))
2069 sleeptime = io_blocktime;
2070
2071 if (sleeptime)
2072 { 2347 {
2348 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2349
2350 if (sleeptime > waittime - backend_fudge)
2351 sleeptime = waittime - backend_fudge;
2352
2353 if (expect_true (sleeptime > 0.))
2354 {
2073 ev_sleep (sleeptime); 2355 ev_sleep (sleeptime);
2074 waittime -= sleeptime; 2356 waittime -= sleeptime;
2357 }
2075 } 2358 }
2076 } 2359 }
2077 2360
2361#if EV_MINIMAL < 2
2078 ++loop_count; 2362 ++loop_count;
2363#endif
2364 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2079 backend_poll (EV_A_ waittime); 2365 backend_poll (EV_A_ waittime);
2366 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2080 2367
2081 /* update ev_rt_now, do magic */ 2368 /* update ev_rt_now, do magic */
2082 time_update (EV_A_ waittime + sleeptime); 2369 time_update (EV_A_ waittime + sleeptime);
2083 } 2370 }
2084 2371
2095 2382
2096 /* queue check watchers, to be executed first */ 2383 /* queue check watchers, to be executed first */
2097 if (expect_false (checkcnt)) 2384 if (expect_false (checkcnt))
2098 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2385 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2099 2386
2100 call_pending (EV_A); 2387 EV_INVOKE_PENDING;
2101 } 2388 }
2102 while (expect_true ( 2389 while (expect_true (
2103 activecnt 2390 activecnt
2104 && !loop_done 2391 && !loop_done
2105 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2392 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2106 )); 2393 ));
2107 2394
2108 if (loop_done == EVUNLOOP_ONE) 2395 if (loop_done == EVUNLOOP_ONE)
2109 loop_done = EVUNLOOP_CANCEL; 2396 loop_done = EVUNLOOP_CANCEL;
2397
2398#if EV_MINIMAL < 2
2399 --loop_depth;
2400#endif
2110} 2401}
2111 2402
2112void 2403void
2113ev_unloop (EV_P_ int how) 2404ev_unloop (EV_P_ int how)
2114{ 2405{
2115 loop_done = how; 2406 loop_done = how;
2116} 2407}
2117 2408
2409void
2410ev_ref (EV_P)
2411{
2412 ++activecnt;
2413}
2414
2415void
2416ev_unref (EV_P)
2417{
2418 --activecnt;
2419}
2420
2421void
2422ev_now_update (EV_P)
2423{
2424 time_update (EV_A_ 1e100);
2425}
2426
2427void
2428ev_suspend (EV_P)
2429{
2430 ev_now_update (EV_A);
2431}
2432
2433void
2434ev_resume (EV_P)
2435{
2436 ev_tstamp mn_prev = mn_now;
2437
2438 ev_now_update (EV_A);
2439 timers_reschedule (EV_A_ mn_now - mn_prev);
2440#if EV_PERIODIC_ENABLE
2441 /* TODO: really do this? */
2442 periodics_reschedule (EV_A);
2443#endif
2444}
2445
2118/*****************************************************************************/ 2446/*****************************************************************************/
2447/* singly-linked list management, used when the expected list length is short */
2119 2448
2120inline_size void 2449inline_size void
2121wlist_add (WL *head, WL elem) 2450wlist_add (WL *head, WL elem)
2122{ 2451{
2123 elem->next = *head; 2452 elem->next = *head;
2127inline_size void 2456inline_size void
2128wlist_del (WL *head, WL elem) 2457wlist_del (WL *head, WL elem)
2129{ 2458{
2130 while (*head) 2459 while (*head)
2131 { 2460 {
2132 if (*head == elem) 2461 if (expect_true (*head == elem))
2133 { 2462 {
2134 *head = elem->next; 2463 *head = elem->next;
2135 return; 2464 break;
2136 } 2465 }
2137 2466
2138 head = &(*head)->next; 2467 head = &(*head)->next;
2139 } 2468 }
2140} 2469}
2141 2470
2471/* internal, faster, version of ev_clear_pending */
2142inline_speed void 2472inline_speed void
2143clear_pending (EV_P_ W w) 2473clear_pending (EV_P_ W w)
2144{ 2474{
2145 if (w->pending) 2475 if (w->pending)
2146 { 2476 {
2147 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2477 pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
2148 w->pending = 0; 2478 w->pending = 0;
2149 } 2479 }
2150} 2480}
2151 2481
2152int 2482int
2156 int pending = w_->pending; 2486 int pending = w_->pending;
2157 2487
2158 if (expect_true (pending)) 2488 if (expect_true (pending))
2159 { 2489 {
2160 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1; 2490 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
2491 p->w = (W)&pending_w;
2161 w_->pending = 0; 2492 w_->pending = 0;
2162 p->w = 0;
2163 return p->events; 2493 return p->events;
2164 } 2494 }
2165 else 2495 else
2166 return 0; 2496 return 0;
2167} 2497}
2168 2498
2169inline_size void 2499inline_size void
2170pri_adjust (EV_P_ W w) 2500pri_adjust (EV_P_ W w)
2171{ 2501{
2172 int pri = w->priority; 2502 int pri = ev_priority (w);
2173 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2503 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2174 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2504 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2175 w->priority = pri; 2505 ev_set_priority (w, pri);
2176} 2506}
2177 2507
2178inline_speed void 2508inline_speed void
2179ev_start (EV_P_ W w, int active) 2509ev_start (EV_P_ W w, int active)
2180{ 2510{
2199 2529
2200 if (expect_false (ev_is_active (w))) 2530 if (expect_false (ev_is_active (w)))
2201 return; 2531 return;
2202 2532
2203 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2533 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2204 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2534 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2205 2535
2206 EV_FREQUENT_CHECK; 2536 EV_FREQUENT_CHECK;
2207 2537
2208 ev_start (EV_A_ (W)w, 1); 2538 ev_start (EV_A_ (W)w, 1);
2209 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2539 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2210 wlist_add (&anfds[fd].head, (WL)w); 2540 wlist_add (&anfds[fd].head, (WL)w);
2211 2541
2212 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2542 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2213 w->events &= ~EV__IOFDSET; 2543 w->events &= ~EV__IOFDSET;
2214 2544
2215 EV_FREQUENT_CHECK; 2545 EV_FREQUENT_CHECK;
2216} 2546}
2217 2547
2279 timers [active] = timers [timercnt + HEAP0]; 2609 timers [active] = timers [timercnt + HEAP0];
2280 adjustheap (timers, timercnt, active); 2610 adjustheap (timers, timercnt, active);
2281 } 2611 }
2282 } 2612 }
2283 2613
2284 EV_FREQUENT_CHECK;
2285
2286 ev_at (w) -= mn_now; 2614 ev_at (w) -= mn_now;
2287 2615
2288 ev_stop (EV_A_ (W)w); 2616 ev_stop (EV_A_ (W)w);
2617
2618 EV_FREQUENT_CHECK;
2289} 2619}
2290 2620
2291void noinline 2621void noinline
2292ev_timer_again (EV_P_ ev_timer *w) 2622ev_timer_again (EV_P_ ev_timer *w)
2293{ 2623{
2311 } 2641 }
2312 2642
2313 EV_FREQUENT_CHECK; 2643 EV_FREQUENT_CHECK;
2314} 2644}
2315 2645
2646ev_tstamp
2647ev_timer_remaining (EV_P_ ev_timer *w)
2648{
2649 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2650}
2651
2316#if EV_PERIODIC_ENABLE 2652#if EV_PERIODIC_ENABLE
2317void noinline 2653void noinline
2318ev_periodic_start (EV_P_ ev_periodic *w) 2654ev_periodic_start (EV_P_ ev_periodic *w)
2319{ 2655{
2320 if (expect_false (ev_is_active (w))) 2656 if (expect_false (ev_is_active (w)))
2366 periodics [active] = periodics [periodiccnt + HEAP0]; 2702 periodics [active] = periodics [periodiccnt + HEAP0];
2367 adjustheap (periodics, periodiccnt, active); 2703 adjustheap (periodics, periodiccnt, active);
2368 } 2704 }
2369 } 2705 }
2370 2706
2371 EV_FREQUENT_CHECK;
2372
2373 ev_stop (EV_A_ (W)w); 2707 ev_stop (EV_A_ (W)w);
2708
2709 EV_FREQUENT_CHECK;
2374} 2710}
2375 2711
2376void noinline 2712void noinline
2377ev_periodic_again (EV_P_ ev_periodic *w) 2713ev_periodic_again (EV_P_ ev_periodic *w)
2378{ 2714{
2387#endif 2723#endif
2388 2724
2389void noinline 2725void noinline
2390ev_signal_start (EV_P_ ev_signal *w) 2726ev_signal_start (EV_P_ ev_signal *w)
2391{ 2727{
2392#if EV_MULTIPLICITY
2393 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2394#endif
2395 if (expect_false (ev_is_active (w))) 2728 if (expect_false (ev_is_active (w)))
2396 return; 2729 return;
2397 2730
2398 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2731 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2399 2732
2400 evpipe_init (EV_A); 2733#if EV_MULTIPLICITY
2734 assert (("libev: a signal must not be attached to two different loops",
2735 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2401 2736
2402 EV_FREQUENT_CHECK; 2737 signals [w->signum - 1].loop = EV_A;
2738#endif
2403 2739
2740 EV_FREQUENT_CHECK;
2741
2742#if EV_USE_SIGNALFD
2743 if (sigfd == -2)
2404 { 2744 {
2405#ifndef _WIN32 2745 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2406 sigset_t full, prev; 2746 if (sigfd < 0 && errno == EINVAL)
2407 sigfillset (&full); 2747 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2408 sigprocmask (SIG_SETMASK, &full, &prev);
2409#endif
2410 2748
2411 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2749 if (sigfd >= 0)
2750 {
2751 fd_intern (sigfd); /* doing it twice will not hurt */
2412 2752
2413#ifndef _WIN32 2753 sigemptyset (&sigfd_set);
2414 sigprocmask (SIG_SETMASK, &prev, 0); 2754
2415#endif 2755 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2756 ev_set_priority (&sigfd_w, EV_MAXPRI);
2757 ev_io_start (EV_A_ &sigfd_w);
2758 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2759 }
2416 } 2760 }
2761
2762 if (sigfd >= 0)
2763 {
2764 /* TODO: check .head */
2765 sigaddset (&sigfd_set, w->signum);
2766 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2767
2768 signalfd (sigfd, &sigfd_set, 0);
2769 }
2770#endif
2417 2771
2418 ev_start (EV_A_ (W)w, 1); 2772 ev_start (EV_A_ (W)w, 1);
2419 wlist_add (&signals [w->signum - 1].head, (WL)w); 2773 wlist_add (&signals [w->signum - 1].head, (WL)w);
2420 2774
2421 if (!((WL)w)->next) 2775 if (!((WL)w)->next)
2776# if EV_USE_SIGNALFD
2777 if (sigfd < 0) /*TODO*/
2778# endif
2422 { 2779 {
2423#if _WIN32 2780# ifdef _WIN32
2781 evpipe_init (EV_A);
2782
2424 signal (w->signum, ev_sighandler); 2783 signal (w->signum, ev_sighandler);
2425#else 2784# else
2426 struct sigaction sa; 2785 struct sigaction sa;
2786
2787 evpipe_init (EV_A);
2788
2427 sa.sa_handler = ev_sighandler; 2789 sa.sa_handler = ev_sighandler;
2428 sigfillset (&sa.sa_mask); 2790 sigfillset (&sa.sa_mask);
2429 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2791 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2430 sigaction (w->signum, &sa, 0); 2792 sigaction (w->signum, &sa, 0);
2793
2794 sigemptyset (&sa.sa_mask);
2795 sigaddset (&sa.sa_mask, w->signum);
2796 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2431#endif 2797#endif
2432 } 2798 }
2433 2799
2434 EV_FREQUENT_CHECK; 2800 EV_FREQUENT_CHECK;
2435} 2801}
2436 2802
2437void noinline 2803void noinline
2445 2811
2446 wlist_del (&signals [w->signum - 1].head, (WL)w); 2812 wlist_del (&signals [w->signum - 1].head, (WL)w);
2447 ev_stop (EV_A_ (W)w); 2813 ev_stop (EV_A_ (W)w);
2448 2814
2449 if (!signals [w->signum - 1].head) 2815 if (!signals [w->signum - 1].head)
2816 {
2817#if EV_MULTIPLICITY
2818 signals [w->signum - 1].loop = 0; /* unattach from signal */
2819#endif
2820#if EV_USE_SIGNALFD
2821 if (sigfd >= 0)
2822 {
2823 sigset_t ss;
2824
2825 sigemptyset (&ss);
2826 sigaddset (&ss, w->signum);
2827 sigdelset (&sigfd_set, w->signum);
2828
2829 signalfd (sigfd, &sigfd_set, 0);
2830 sigprocmask (SIG_UNBLOCK, &ss, 0);
2831 }
2832 else
2833#endif
2450 signal (w->signum, SIG_DFL); 2834 signal (w->signum, SIG_DFL);
2835 }
2451 2836
2452 EV_FREQUENT_CHECK; 2837 EV_FREQUENT_CHECK;
2453} 2838}
2454 2839
2455void 2840void
2496#define MIN_STAT_INTERVAL 0.1074891 2881#define MIN_STAT_INTERVAL 0.1074891
2497 2882
2498static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2883static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2499 2884
2500#if EV_USE_INOTIFY 2885#if EV_USE_INOTIFY
2501# define EV_INOTIFY_BUFSIZE 8192 2886
2887/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2888# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2502 2889
2503static void noinline 2890static void noinline
2504infy_add (EV_P_ ev_stat *w) 2891infy_add (EV_P_ ev_stat *w)
2505{ 2892{
2506 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2893 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2507 2894
2508 if (w->wd < 0) 2895 if (w->wd >= 0)
2896 {
2897 struct statfs sfs;
2898
2899 /* now local changes will be tracked by inotify, but remote changes won't */
2900 /* unless the filesystem is known to be local, we therefore still poll */
2901 /* also do poll on <2.6.25, but with normal frequency */
2902
2903 if (!fs_2625)
2904 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2905 else if (!statfs (w->path, &sfs)
2906 && (sfs.f_type == 0x1373 /* devfs */
2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2908 || sfs.f_type == 0x3153464a /* jfs */
2909 || sfs.f_type == 0x52654973 /* reiser3 */
2910 || sfs.f_type == 0x01021994 /* tempfs */
2911 || sfs.f_type == 0x58465342 /* xfs */))
2912 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
2913 else
2914 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2509 { 2915 }
2916 else
2917 {
2918 /* can't use inotify, continue to stat */
2510 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 2919 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2511 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2512 2920
2513 /* monitor some parent directory for speedup hints */ 2921 /* if path is not there, monitor some parent directory for speedup hints */
2514 /* note that exceeding the hardcoded path limit is not a correctness issue, */ 2922 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2515 /* but an efficiency issue only */ 2923 /* but an efficiency issue only */
2516 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2924 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2517 { 2925 {
2518 char path [4096]; 2926 char path [4096];
2534 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2942 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2535 } 2943 }
2536 } 2944 }
2537 2945
2538 if (w->wd >= 0) 2946 if (w->wd >= 0)
2539 {
2540 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2947 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2541 2948
2542 /* now local changes will be tracked by inotify, but remote changes won't */ 2949 /* now re-arm timer, if required */
2543 /* unless the filesystem it known to be local, we therefore still poll */ 2950 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2544 /* also do poll on <2.6.25, but with normal frequency */
2545 struct statfs sfs;
2546
2547 if (fs_2625 && !statfs (w->path, &sfs))
2548 if (sfs.f_type == 0x1373 /* devfs */
2549 || sfs.f_type == 0xEF53 /* ext2/3 */
2550 || sfs.f_type == 0x3153464a /* jfs */
2551 || sfs.f_type == 0x52654973 /* reiser3 */
2552 || sfs.f_type == 0x01021994 /* tempfs */
2553 || sfs.f_type == 0x58465342 /* xfs */)
2554 return;
2555
2556 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2557 ev_timer_again (EV_A_ &w->timer); 2951 ev_timer_again (EV_A_ &w->timer);
2558 } 2952 if (ev_is_active (&w->timer)) ev_unref (EV_A);
2559} 2953}
2560 2954
2561static void noinline 2955static void noinline
2562infy_del (EV_P_ ev_stat *w) 2956infy_del (EV_P_ ev_stat *w)
2563{ 2957{
2608 3002
2609static void 3003static void
2610infy_cb (EV_P_ ev_io *w, int revents) 3004infy_cb (EV_P_ ev_io *w, int revents)
2611{ 3005{
2612 char buf [EV_INOTIFY_BUFSIZE]; 3006 char buf [EV_INOTIFY_BUFSIZE];
2613 struct inotify_event *ev = (struct inotify_event *)buf;
2614 int ofs; 3007 int ofs;
2615 int len = read (fs_fd, buf, sizeof (buf)); 3008 int len = read (fs_fd, buf, sizeof (buf));
2616 3009
2617 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3010 for (ofs = 0; ofs < len; )
3011 {
3012 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2618 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3013 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3014 ofs += sizeof (struct inotify_event) + ev->len;
3015 }
3016}
3017
3018inline_size unsigned int
3019ev_linux_version (void)
3020{
3021 struct utsname buf;
3022 unsigned int v;
3023 int i;
3024 char *p = buf.release;
3025
3026 if (uname (&buf))
3027 return 0;
3028
3029 for (i = 3+1; --i; )
3030 {
3031 unsigned int c = 0;
3032
3033 for (;;)
3034 {
3035 if (*p >= '0' && *p <= '9')
3036 c = c * 10 + *p++ - '0';
3037 else
3038 {
3039 p += *p == '.';
3040 break;
3041 }
3042 }
3043
3044 v = (v << 8) | c;
3045 }
3046
3047 return v;
2619} 3048}
2620 3049
2621inline_size void 3050inline_size void
2622check_2625 (EV_P) 3051ev_check_2625 (EV_P)
2623{ 3052{
2624 /* kernels < 2.6.25 are borked 3053 /* kernels < 2.6.25 are borked
2625 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3054 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2626 */ 3055 */
2627 struct utsname buf; 3056 if (ev_linux_version () < 0x020619)
2628 int major, minor, micro;
2629
2630 if (uname (&buf))
2631 return; 3057 return;
2632 3058
2633 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2634 return;
2635
2636 if (major < 2
2637 || (major == 2 && minor < 6)
2638 || (major == 2 && minor == 6 && micro < 25))
2639 return;
2640
2641 fs_2625 = 1; 3059 fs_2625 = 1;
3060}
3061
3062inline_size int
3063infy_newfd (void)
3064{
3065#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3066 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3067 if (fd >= 0)
3068 return fd;
3069#endif
3070 return inotify_init ();
2642} 3071}
2643 3072
2644inline_size void 3073inline_size void
2645infy_init (EV_P) 3074infy_init (EV_P)
2646{ 3075{
2647 if (fs_fd != -2) 3076 if (fs_fd != -2)
2648 return; 3077 return;
2649 3078
2650 fs_fd = -1; 3079 fs_fd = -1;
2651 3080
2652 check_2625 (EV_A); 3081 ev_check_2625 (EV_A);
2653 3082
2654 fs_fd = inotify_init (); 3083 fs_fd = infy_newfd ();
2655 3084
2656 if (fs_fd >= 0) 3085 if (fs_fd >= 0)
2657 { 3086 {
3087 fd_intern (fs_fd);
2658 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3088 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2659 ev_set_priority (&fs_w, EV_MAXPRI); 3089 ev_set_priority (&fs_w, EV_MAXPRI);
2660 ev_io_start (EV_A_ &fs_w); 3090 ev_io_start (EV_A_ &fs_w);
3091 ev_unref (EV_A);
2661 } 3092 }
2662} 3093}
2663 3094
2664inline_size void 3095inline_size void
2665infy_fork (EV_P) 3096infy_fork (EV_P)
2667 int slot; 3098 int slot;
2668 3099
2669 if (fs_fd < 0) 3100 if (fs_fd < 0)
2670 return; 3101 return;
2671 3102
3103 ev_ref (EV_A);
3104 ev_io_stop (EV_A_ &fs_w);
2672 close (fs_fd); 3105 close (fs_fd);
2673 fs_fd = inotify_init (); 3106 fs_fd = infy_newfd ();
3107
3108 if (fs_fd >= 0)
3109 {
3110 fd_intern (fs_fd);
3111 ev_io_set (&fs_w, fs_fd, EV_READ);
3112 ev_io_start (EV_A_ &fs_w);
3113 ev_unref (EV_A);
3114 }
2674 3115
2675 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3116 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2676 { 3117 {
2677 WL w_ = fs_hash [slot].head; 3118 WL w_ = fs_hash [slot].head;
2678 fs_hash [slot].head = 0; 3119 fs_hash [slot].head = 0;
2685 w->wd = -1; 3126 w->wd = -1;
2686 3127
2687 if (fs_fd >= 0) 3128 if (fs_fd >= 0)
2688 infy_add (EV_A_ w); /* re-add, no matter what */ 3129 infy_add (EV_A_ w); /* re-add, no matter what */
2689 else 3130 else
3131 {
3132 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3133 if (ev_is_active (&w->timer)) ev_ref (EV_A);
2690 ev_timer_again (EV_A_ &w->timer); 3134 ev_timer_again (EV_A_ &w->timer);
3135 if (ev_is_active (&w->timer)) ev_unref (EV_A);
3136 }
2691 } 3137 }
2692 } 3138 }
2693} 3139}
2694 3140
2695#endif 3141#endif
2712static void noinline 3158static void noinline
2713stat_timer_cb (EV_P_ ev_timer *w_, int revents) 3159stat_timer_cb (EV_P_ ev_timer *w_, int revents)
2714{ 3160{
2715 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer)); 3161 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
2716 3162
2717 /* we copy this here each the time so that */ 3163 ev_statdata prev = w->attr;
2718 /* prev has the old value when the callback gets invoked */
2719 w->prev = w->attr;
2720 ev_stat_stat (EV_A_ w); 3164 ev_stat_stat (EV_A_ w);
2721 3165
2722 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */ 3166 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
2723 if ( 3167 if (
2724 w->prev.st_dev != w->attr.st_dev 3168 prev.st_dev != w->attr.st_dev
2725 || w->prev.st_ino != w->attr.st_ino 3169 || prev.st_ino != w->attr.st_ino
2726 || w->prev.st_mode != w->attr.st_mode 3170 || prev.st_mode != w->attr.st_mode
2727 || w->prev.st_nlink != w->attr.st_nlink 3171 || prev.st_nlink != w->attr.st_nlink
2728 || w->prev.st_uid != w->attr.st_uid 3172 || prev.st_uid != w->attr.st_uid
2729 || w->prev.st_gid != w->attr.st_gid 3173 || prev.st_gid != w->attr.st_gid
2730 || w->prev.st_rdev != w->attr.st_rdev 3174 || prev.st_rdev != w->attr.st_rdev
2731 || w->prev.st_size != w->attr.st_size 3175 || prev.st_size != w->attr.st_size
2732 || w->prev.st_atime != w->attr.st_atime 3176 || prev.st_atime != w->attr.st_atime
2733 || w->prev.st_mtime != w->attr.st_mtime 3177 || prev.st_mtime != w->attr.st_mtime
2734 || w->prev.st_ctime != w->attr.st_ctime 3178 || prev.st_ctime != w->attr.st_ctime
2735 ) { 3179 ) {
3180 /* we only update w->prev on actual differences */
3181 /* in case we test more often than invoke the callback, */
3182 /* to ensure that prev is always different to attr */
3183 w->prev = prev;
3184
2736 #if EV_USE_INOTIFY 3185 #if EV_USE_INOTIFY
2737 if (fs_fd >= 0) 3186 if (fs_fd >= 0)
2738 { 3187 {
2739 infy_del (EV_A_ w); 3188 infy_del (EV_A_ w);
2740 infy_add (EV_A_ w); 3189 infy_add (EV_A_ w);
2765 3214
2766 if (fs_fd >= 0) 3215 if (fs_fd >= 0)
2767 infy_add (EV_A_ w); 3216 infy_add (EV_A_ w);
2768 else 3217 else
2769#endif 3218#endif
3219 {
2770 ev_timer_again (EV_A_ &w->timer); 3220 ev_timer_again (EV_A_ &w->timer);
3221 ev_unref (EV_A);
3222 }
2771 3223
2772 ev_start (EV_A_ (W)w, 1); 3224 ev_start (EV_A_ (W)w, 1);
2773 3225
2774 EV_FREQUENT_CHECK; 3226 EV_FREQUENT_CHECK;
2775} 3227}
2784 EV_FREQUENT_CHECK; 3236 EV_FREQUENT_CHECK;
2785 3237
2786#if EV_USE_INOTIFY 3238#if EV_USE_INOTIFY
2787 infy_del (EV_A_ w); 3239 infy_del (EV_A_ w);
2788#endif 3240#endif
3241
3242 if (ev_is_active (&w->timer))
3243 {
3244 ev_ref (EV_A);
2789 ev_timer_stop (EV_A_ &w->timer); 3245 ev_timer_stop (EV_A_ &w->timer);
3246 }
2790 3247
2791 ev_stop (EV_A_ (W)w); 3248 ev_stop (EV_A_ (W)w);
2792 3249
2793 EV_FREQUENT_CHECK; 3250 EV_FREQUENT_CHECK;
2794} 3251}
2935embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3392embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2936{ 3393{
2937 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3394 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2938 3395
2939 { 3396 {
2940 struct ev_loop *loop = w->other; 3397 EV_P = w->other;
2941 3398
2942 while (fdchangecnt) 3399 while (fdchangecnt)
2943 { 3400 {
2944 fd_reify (EV_A); 3401 fd_reify (EV_A);
2945 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3402 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2953 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3410 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2954 3411
2955 ev_embed_stop (EV_A_ w); 3412 ev_embed_stop (EV_A_ w);
2956 3413
2957 { 3414 {
2958 struct ev_loop *loop = w->other; 3415 EV_P = w->other;
2959 3416
2960 ev_loop_fork (EV_A); 3417 ev_loop_fork (EV_A);
2961 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3418 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2962 } 3419 }
2963 3420
2977{ 3434{
2978 if (expect_false (ev_is_active (w))) 3435 if (expect_false (ev_is_active (w)))
2979 return; 3436 return;
2980 3437
2981 { 3438 {
2982 struct ev_loop *loop = w->other; 3439 EV_P = w->other;
2983 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3440 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2984 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3441 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2985 } 3442 }
2986 3443
2987 EV_FREQUENT_CHECK; 3444 EV_FREQUENT_CHECK;
3014 3471
3015 ev_io_stop (EV_A_ &w->io); 3472 ev_io_stop (EV_A_ &w->io);
3016 ev_prepare_stop (EV_A_ &w->prepare); 3473 ev_prepare_stop (EV_A_ &w->prepare);
3017 ev_fork_stop (EV_A_ &w->fork); 3474 ev_fork_stop (EV_A_ &w->fork);
3018 3475
3476 ev_stop (EV_A_ (W)w);
3477
3019 EV_FREQUENT_CHECK; 3478 EV_FREQUENT_CHECK;
3020} 3479}
3021#endif 3480#endif
3022 3481
3023#if EV_FORK_ENABLE 3482#if EV_FORK_ENABLE
3099 3558
3100void 3559void
3101ev_async_send (EV_P_ ev_async *w) 3560ev_async_send (EV_P_ ev_async *w)
3102{ 3561{
3103 w->sent = 1; 3562 w->sent = 1;
3104 evpipe_write (EV_A_ &gotasync); 3563 evpipe_write (EV_A_ &async_pending);
3105} 3564}
3106#endif 3565#endif
3107 3566
3108/*****************************************************************************/ 3567/*****************************************************************************/
3109 3568
3173 } 3632 }
3174} 3633}
3175 3634
3176/*****************************************************************************/ 3635/*****************************************************************************/
3177 3636
3178#if 0 3637#if EV_WALK_ENABLE
3179void 3638void
3180ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3639ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3181{ 3640{
3182 int i, j; 3641 int i, j;
3183 ev_watcher_list *wl, *wn; 3642 ev_watcher_list *wl, *wn;
3199#if EV_USE_INOTIFY 3658#if EV_USE_INOTIFY
3200 if (ev_cb ((ev_io *)wl) == infy_cb) 3659 if (ev_cb ((ev_io *)wl) == infy_cb)
3201 ; 3660 ;
3202 else 3661 else
3203#endif 3662#endif
3204 if ((ev_io *)wl != &pipeev) 3663 if ((ev_io *)wl != &pipe_w)
3205 if (types & EV_IO) 3664 if (types & EV_IO)
3206 cb (EV_A_ EV_IO, wl); 3665 cb (EV_A_ EV_IO, wl);
3207 3666
3208 wl = wn; 3667 wl = wn;
3209 } 3668 }
3258 if (types & EV_CHECK) 3717 if (types & EV_CHECK)
3259 for (i = checkcnt; i--; ) 3718 for (i = checkcnt; i--; )
3260 cb (EV_A_ EV_CHECK, checks [i]); 3719 cb (EV_A_ EV_CHECK, checks [i]);
3261 3720
3262 if (types & EV_SIGNAL) 3721 if (types & EV_SIGNAL)
3263 for (i = 0; i < signalmax; ++i) 3722 for (i = 0; i < EV_NSIG - 1; ++i)
3264 for (wl = signals [i].head; wl; ) 3723 for (wl = signals [i].head; wl; )
3265 { 3724 {
3266 wn = wl->next; 3725 wn = wl->next;
3267 cb (EV_A_ EV_SIGNAL, wl); 3726 cb (EV_A_ EV_SIGNAL, wl);
3268 wl = wn; 3727 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines