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

Comparing libev/ev.c (file contents):
Revision 1.289 by root, Sat Jun 6 11:13:16 2009 UTC vs.
Revision 1.317 by root, Sat Nov 14 00:15:21 2009 UTC

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
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
176# endif 186# endif
177#endif 187#endif
178 188
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
180 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
181#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
184# else 221# else
185# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
264# else 301# else
265# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
266# endif 303# endif
267#endif 304#endif
268 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
269#if 0 /* debugging */ 314#if 0 /* debugging */
270# define EV_VERIFY 3 315# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
273#endif 318#endif
280# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
281#endif 326#endif
282 327
283#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
285#endif 344#endif
286 345
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 347
289#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
320 379
321#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 381# include <winsock.h>
323#endif 382#endif
324 383
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 384#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
337# ifdef __cplusplus 397# ifdef __cplusplus
338extern "C" { 398extern "C" {
339# endif 399# endif
340int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 401# ifdef __cplusplus
342} 402}
343# endif 403# endif
344#endif 404#endif
405
406#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
345 434
346/**/ 435/**/
347 436
348#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
349# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
361 */ 450 */
362#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
363 452
364#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 453#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) */ 454#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 455
368#if __GNUC__ >= 4 456#if __GNUC__ >= 4
369# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
370# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
371#else 459#else
384# define inline_speed static noinline 472# define inline_speed static noinline
385#else 473#else
386# define inline_speed static inline 474# define inline_speed static inline
387#endif 475#endif
388 476
389#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 477#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
478
479#if EV_MINPRI == EV_MAXPRI
480# define ABSPRI(w) (((W)w), 0)
481#else
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 482# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
483#endif
391 484
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 485#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 486#define EMPTY2(a,b) /* used to suppress some warnings */
394 487
395typedef ev_watcher *W; 488typedef ev_watcher *W;
407 500
408#if EV_USE_MONOTONIC 501#if EV_USE_MONOTONIC
409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
410#endif 503#endif
411 504
505#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif
508#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
510#endif
511#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd)
513#endif
514
412#ifdef _WIN32 515#ifdef _WIN32
413# include "ev_win32.c" 516# include "ev_win32.c"
414#endif 517#endif
415 518
416/*****************************************************************************/ 519/*****************************************************************************/
478#define ev_malloc(size) ev_realloc (0, (size)) 581#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 582#define ev_free(ptr) ev_realloc ((ptr), 0)
480 583
481/*****************************************************************************/ 584/*****************************************************************************/
482 585
586/* set in reify when reification needed */
587#define EV_ANFD_REIFY 1
588
483/* file descriptor info structure */ 589/* file descriptor info structure */
484typedef struct 590typedef struct
485{ 591{
486 WL head; 592 WL head;
487 unsigned char events; /* the events watched for */ 593 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 594 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 595 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 596 unsigned char unused;
491#if EV_USE_EPOLL 597#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 598 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 599#endif
555 661
556 static int ev_default_loop_ptr; 662 static int ev_default_loop_ptr;
557 663
558#endif 664#endif
559 665
666#if EV_MINIMAL < 2
667# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
668# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
669# define EV_INVOKE_PENDING invoke_cb (EV_A)
670#else
671# define EV_RELEASE_CB (void)0
672# define EV_ACQUIRE_CB (void)0
673# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
674#endif
675
676#define EVUNLOOP_RECURSE 0x80
677
560/*****************************************************************************/ 678/*****************************************************************************/
561 679
680#ifndef EV_HAVE_EV_TIME
562ev_tstamp 681ev_tstamp
563ev_time (void) 682ev_time (void)
564{ 683{
565#if EV_USE_REALTIME 684#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 685 if (expect_true (have_realtime))
573 692
574 struct timeval tv; 693 struct timeval tv;
575 gettimeofday (&tv, 0); 694 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 695 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 696}
697#endif
578 698
579inline_size ev_tstamp 699inline_size ev_tstamp
580get_clock (void) 700get_clock (void)
581{ 701{
582#if EV_USE_MONOTONIC 702#if EV_USE_MONOTONIC
618 738
619 tv.tv_sec = (time_t)delay; 739 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 741
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 742 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 743 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 744 /* by older ones */
625 select (0, 0, 0, 0, &tv); 745 select (0, 0, 0, 0, &tv);
626#endif 746#endif
627 } 747 }
628} 748}
736} 856}
737 857
738/*****************************************************************************/ 858/*****************************************************************************/
739 859
740inline_speed void 860inline_speed void
741fd_event (EV_P_ int fd, int revents) 861fd_event_nc (EV_P_ int fd, int revents)
742{ 862{
743 ANFD *anfd = anfds + fd; 863 ANFD *anfd = anfds + fd;
744 ev_io *w; 864 ev_io *w;
745 865
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 866 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
750 if (ev) 870 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 871 ev_feed_event (EV_A_ (W)w, ev);
752 } 872 }
753} 873}
754 874
875/* do not submit kernel events for fds that have reify set */
876/* because that means they changed while we were polling for new events */
877inline_speed void
878fd_event (EV_P_ int fd, int revents)
879{
880 ANFD *anfd = anfds + fd;
881
882 if (expect_true (!anfd->reify))
883 fd_event_nc (EV_A_ fd, revents);
884}
885
755void 886void
756ev_feed_fd_event (EV_P_ int fd, int revents) 887ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 888{
758 if (fd >= 0 && fd < anfdmax) 889 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 890 fd_event_nc (EV_A_ fd, revents);
760} 891}
761 892
762/* make sure the external fd watch events are in-sync */ 893/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 894/* with the kernel/libev internal state */
764inline_size void 895inline_size void
779 910
780#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
781 if (events) 912 if (events)
782 { 913 {
783 unsigned long arg; 914 unsigned long arg;
784 #ifdef EV_FD_TO_WIN32_HANDLE
785 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
786 #else
787 anfd->handle = _get_osfhandle (fd);
788 #endif
789 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
790 } 917 }
791#endif 918#endif
792 919
793 { 920 {
864 991
865 for (fd = anfdmax; fd--; ) 992 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 993 if (anfds [fd].events)
867 { 994 {
868 fd_kill (EV_A_ fd); 995 fd_kill (EV_A_ fd);
869 return; 996 break;
870 } 997 }
871} 998}
872 999
873/* usually called after fork if backend needs to re-arm all fds from scratch */ 1000/* usually called after fork if backend needs to re-arm all fds from scratch */
874static void noinline 1001static void noinline
879 for (fd = 0; fd < anfdmax; ++fd) 1006 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 1007 if (anfds [fd].events)
881 { 1008 {
882 anfds [fd].events = 0; 1009 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 1010 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 1012 }
886} 1013}
887 1014
888/*****************************************************************************/ 1015/*****************************************************************************/
889 1016
964 1091
965 for (;;) 1092 for (;;)
966 { 1093 {
967 int c = k << 1; 1094 int c = k << 1;
968 1095
969 if (c > N + HEAP0 - 1) 1096 if (c >= N + HEAP0)
970 break; 1097 break;
971 1098
972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1099 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
973 ? 1 : 0; 1100 ? 1 : 0;
974 1101
1010 1137
1011/* move an element suitably so it is in a correct place */ 1138/* move an element suitably so it is in a correct place */
1012inline_size void 1139inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1140adjustheap (ANHE *heap, int N, int k)
1014{ 1141{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1142 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1016 upheap (heap, k); 1143 upheap (heap, k);
1017 else 1144 else
1018 downheap (heap, N, k); 1145 downheap (heap, N, k);
1019} 1146}
1020 1147
1033/*****************************************************************************/ 1160/*****************************************************************************/
1034 1161
1035/* associate signal watchers to a signal signal */ 1162/* associate signal watchers to a signal signal */
1036typedef struct 1163typedef struct
1037{ 1164{
1165 EV_ATOMIC_T pending;
1166#if EV_MULTIPLICITY
1167 EV_P;
1168#endif
1038 WL head; 1169 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1170} ANSIG;
1041 1171
1042static ANSIG *signals; 1172static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1173
1047/*****************************************************************************/ 1174/*****************************************************************************/
1048 1175
1049/* used to prepare libev internal fd's */ 1176/* used to prepare libev internal fd's */
1050/* this is not fork-safe */ 1177/* this is not fork-safe */
1064evpipe_init (EV_P) 1191evpipe_init (EV_P)
1065{ 1192{
1066 if (!ev_is_active (&pipe_w)) 1193 if (!ev_is_active (&pipe_w))
1067 { 1194 {
1068#if EV_USE_EVENTFD 1195#if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1198 evfd = eventfd (0, 0);
1199
1200 if (evfd >= 0)
1070 { 1201 {
1071 evpipe [0] = -1; 1202 evpipe [0] = -1;
1072 fd_intern (evfd); 1203 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1204 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1205 }
1075 else 1206 else
1076#endif 1207#endif
1077 { 1208 {
1114/* called whenever the libev signal pipe */ 1245/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1246/* got some events (signal, async) */
1116static void 1247static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1248pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1249{
1250 int i;
1251
1119#if EV_USE_EVENTFD 1252#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1253 if (evfd >= 0)
1121 { 1254 {
1122 uint64_t counter; 1255 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1256 read (evfd, &counter, sizeof (uint64_t));
1127 { 1260 {
1128 char dummy; 1261 char dummy;
1129 read (evpipe [0], &dummy, 1); 1262 read (evpipe [0], &dummy, 1);
1130 } 1263 }
1131 1264
1132 if (gotsig && ev_is_default_loop (EV_A)) 1265 if (sig_pending)
1133 { 1266 {
1134 int signum; 1267 sig_pending = 0;
1135 gotsig = 0;
1136 1268
1137 for (signum = signalmax; signum--; ) 1269 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1270 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1271 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1272 }
1141 1273
1142#if EV_ASYNC_ENABLE 1274#if EV_ASYNC_ENABLE
1143 if (gotasync) 1275 if (async_pending)
1144 { 1276 {
1145 int i; 1277 async_pending = 0;
1146 gotasync = 0;
1147 1278
1148 for (i = asynccnt; i--; ) 1279 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1280 if (asyncs [i]->sent)
1150 { 1281 {
1151 asyncs [i]->sent = 0; 1282 asyncs [i]->sent = 0;
1159 1290
1160static void 1291static void
1161ev_sighandler (int signum) 1292ev_sighandler (int signum)
1162{ 1293{
1163#if EV_MULTIPLICITY 1294#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1295 EV_P = signals [signum - 1].loop;
1165#endif 1296#endif
1166 1297
1167#if _WIN32 1298#if _WIN32
1168 signal (signum, ev_sighandler); 1299 signal (signum, ev_sighandler);
1169#endif 1300#endif
1170 1301
1171 signals [signum - 1].gotsig = 1; 1302 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1303 evpipe_write (EV_A_ &sig_pending);
1173} 1304}
1174 1305
1175void noinline 1306void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1307ev_feed_signal_event (EV_P_ int signum)
1177{ 1308{
1178 WL w; 1309 WL w;
1179 1310
1311 if (expect_false (signum <= 0 || signum > EV_NSIG))
1312 return;
1313
1314 --signum;
1315
1180#if EV_MULTIPLICITY 1316#if EV_MULTIPLICITY
1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1317 /* it is permissible to try to feed a signal to the wrong loop */
1182#endif 1318 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1319
1184 --signum; 1320 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1321 return;
1322#endif
1188 1323
1189 signals [signum].gotsig = 0; 1324 signals [signum].pending = 0;
1190 1325
1191 for (w = signals [signum].head; w; w = w->next) 1326 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1327 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1328}
1329
1330#if EV_USE_SIGNALFD
1331static void
1332sigfdcb (EV_P_ ev_io *iow, int revents)
1333{
1334 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1335
1336 for (;;)
1337 {
1338 ssize_t res = read (sigfd, si, sizeof (si));
1339
1340 /* not ISO-C, as res might be -1, but works with SuS */
1341 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1342 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1343
1344 if (res < (ssize_t)sizeof (si))
1345 break;
1346 }
1347}
1348#endif
1194 1349
1195/*****************************************************************************/ 1350/*****************************************************************************/
1196 1351
1197static WL childs [EV_PID_HASHSIZE]; 1352static WL childs [EV_PID_HASHSIZE];
1198 1353
1343ev_backend (EV_P) 1498ev_backend (EV_P)
1344{ 1499{
1345 return backend; 1500 return backend;
1346} 1501}
1347 1502
1503#if EV_MINIMAL < 2
1348unsigned int 1504unsigned int
1349ev_loop_count (EV_P) 1505ev_loop_count (EV_P)
1350{ 1506{
1351 return loop_count; 1507 return loop_count;
1352} 1508}
1353 1509
1510unsigned int
1511ev_loop_depth (EV_P)
1512{
1513 return loop_depth;
1514}
1515
1354void 1516void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1517ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1518{
1357 io_blocktime = interval; 1519 io_blocktime = interval;
1358} 1520}
1360void 1522void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1523ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1524{
1363 timeout_blocktime = interval; 1525 timeout_blocktime = interval;
1364} 1526}
1527
1528void
1529ev_set_userdata (EV_P_ void *data)
1530{
1531 userdata = data;
1532}
1533
1534void *
1535ev_userdata (EV_P)
1536{
1537 return userdata;
1538}
1539
1540void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1541{
1542 invoke_cb = invoke_pending_cb;
1543}
1544
1545void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1546{
1547 release_cb = release;
1548 acquire_cb = acquire;
1549}
1550#endif
1365 1551
1366/* initialise a loop structure, must be zero-initialised */ 1552/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1553static void noinline
1368loop_init (EV_P_ unsigned int flags) 1554loop_init (EV_P_ unsigned int flags)
1369{ 1555{
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1573 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1574 have_monotonic = 1;
1389 } 1575 }
1390#endif 1576#endif
1391 1577
1578 /* pid check not overridable via env */
1579#ifndef _WIN32
1580 if (flags & EVFLAG_FORKCHECK)
1581 curpid = getpid ();
1582#endif
1583
1584 if (!(flags & EVFLAG_NOENV)
1585 && !enable_secure ()
1586 && getenv ("LIBEV_FLAGS"))
1587 flags = atoi (getenv ("LIBEV_FLAGS"));
1588
1392 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1590 mn_now = get_clock ();
1394 now_floor = mn_now; 1591 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1592 rtmn_diff = ev_rt_now - mn_now;
1593#if EV_MINIMAL < 2
1594 invoke_cb = ev_invoke_pending;
1595#endif
1396 1596
1397 io_blocktime = 0.; 1597 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1598 timeout_blocktime = 0.;
1399 backend = 0; 1599 backend = 0;
1400 backend_fd = -1; 1600 backend_fd = -1;
1401 gotasync = 0; 1601 sig_pending = 0;
1602#if EV_ASYNC_ENABLE
1603 async_pending = 0;
1604#endif
1402#if EV_USE_INOTIFY 1605#if EV_USE_INOTIFY
1403 fs_fd = -2; 1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1607#endif
1405 1608#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1610#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1611
1417 if (!(flags & 0x0000ffffU)) 1612 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1613 flags |= ev_recommended_backends ();
1419 1614
1420#if EV_USE_PORT 1615#if EV_USE_PORT
1446{ 1641{
1447 int i; 1642 int i;
1448 1643
1449 if (ev_is_active (&pipe_w)) 1644 if (ev_is_active (&pipe_w))
1450 { 1645 {
1451 ev_ref (EV_A); /* signal watcher */ 1646 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1647 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1648
1454#if EV_USE_EVENTFD 1649#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1650 if (evfd >= 0)
1456 close (evfd); 1651 close (evfd);
1457#endif 1652#endif
1458 1653
1459 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1460 { 1655 {
1461 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1462 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1463 } 1658 }
1464 } 1659 }
1660
1661#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w))
1663 close (sigfd);
1664#endif
1465 1665
1466#if EV_USE_INOTIFY 1666#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1667 if (fs_fd >= 0)
1468 close (fs_fd); 1668 close (fs_fd);
1469#endif 1669#endif
1493#if EV_IDLE_ENABLE 1693#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1694 array_free (idle, [i]);
1495#endif 1695#endif
1496 } 1696 }
1497 1697
1498 ev_free (anfds); anfdmax = 0; 1698 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1699
1500 /* have to use the microsoft-never-gets-it-right macro */ 1700 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1701 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1702 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1703 array_free (timer, EMPTY);
1538 1738
1539 if (ev_is_active (&pipe_w)) 1739 if (ev_is_active (&pipe_w))
1540 { 1740 {
1541 /* this "locks" the handlers against writing to the pipe */ 1741 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1742 /* while we modify the fd vars */
1543 gotsig = 1; 1743 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1744#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1745 async_pending = 1;
1546#endif 1746#endif
1547 1747
1548 ev_ref (EV_A); 1748 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1749 ev_io_stop (EV_A_ &pipe_w);
1550 1750
1553 close (evfd); 1753 close (evfd);
1554#endif 1754#endif
1555 1755
1556 if (evpipe [0] >= 0) 1756 if (evpipe [0] >= 0)
1557 { 1757 {
1558 close (evpipe [0]); 1758 EV_WIN32_CLOSE_FD (evpipe [0]);
1559 close (evpipe [1]); 1759 EV_WIN32_CLOSE_FD (evpipe [1]);
1560 } 1760 }
1561 1761
1562 evpipe_init (EV_A); 1762 evpipe_init (EV_A);
1563 /* now iterate over everything, in case we missed something */ 1763 /* now iterate over everything, in case we missed something */
1564 pipecb (EV_A_ &pipe_w, EV_READ); 1764 pipecb (EV_A_ &pipe_w, EV_READ);
1570#if EV_MULTIPLICITY 1770#if EV_MULTIPLICITY
1571 1771
1572struct ev_loop * 1772struct ev_loop *
1573ev_loop_new (unsigned int flags) 1773ev_loop_new (unsigned int flags)
1574{ 1774{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1775 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1776
1577 memset (loop, 0, sizeof (struct ev_loop)); 1777 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1778 loop_init (EV_A_ flags);
1580 1779
1581 if (ev_backend (EV_A)) 1780 if (ev_backend (EV_A))
1582 return loop; 1781 return EV_A;
1583 1782
1584 return 0; 1783 return 0;
1585} 1784}
1586 1785
1587void 1786void
1594void 1793void
1595ev_loop_fork (EV_P) 1794ev_loop_fork (EV_P)
1596{ 1795{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1796 postfork = 1; /* must be in line with ev_default_fork */
1598} 1797}
1798#endif /* multiplicity */
1599 1799
1600#if EV_VERIFY 1800#if EV_VERIFY
1601static void noinline 1801static void noinline
1602verify_watcher (EV_P_ W w) 1802verify_watcher (EV_P_ W w)
1603{ 1803{
1631 verify_watcher (EV_A_ ws [cnt]); 1831 verify_watcher (EV_A_ ws [cnt]);
1632 } 1832 }
1633} 1833}
1634#endif 1834#endif
1635 1835
1836#if EV_MINIMAL < 2
1636void 1837void
1637ev_loop_verify (EV_P) 1838ev_loop_verify (EV_P)
1638{ 1839{
1639#if EV_VERIFY 1840#if EV_VERIFY
1640 int i; 1841 int i;
1689 assert (checkmax >= checkcnt); 1890 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1891 array_verify (EV_A_ (W *)checks, checkcnt);
1691 1892
1692# if 0 1893# if 0
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1894 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1895 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1695# endif
1696#endif 1896# endif
1897#endif
1697} 1898}
1698 1899#endif
1699#endif /* multiplicity */
1700 1900
1701#if EV_MULTIPLICITY 1901#if EV_MULTIPLICITY
1702struct ev_loop * 1902struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1903ev_default_loop_init (unsigned int flags)
1704#else 1904#else
1707#endif 1907#endif
1708{ 1908{
1709 if (!ev_default_loop_ptr) 1909 if (!ev_default_loop_ptr)
1710 { 1910 {
1711#if EV_MULTIPLICITY 1911#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1912 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 1913#else
1714 ev_default_loop_ptr = 1; 1914 ev_default_loop_ptr = 1;
1715#endif 1915#endif
1716 1916
1717 loop_init (EV_A_ flags); 1917 loop_init (EV_A_ flags);
1734 1934
1735void 1935void
1736ev_default_destroy (void) 1936ev_default_destroy (void)
1737{ 1937{
1738#if EV_MULTIPLICITY 1938#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 1939 EV_P = ev_default_loop_ptr;
1740#endif 1940#endif
1741 1941
1742 ev_default_loop_ptr = 0; 1942 ev_default_loop_ptr = 0;
1743 1943
1744#ifndef _WIN32 1944#ifndef _WIN32
1751 1951
1752void 1952void
1753ev_default_fork (void) 1953ev_default_fork (void)
1754{ 1954{
1755#if EV_MULTIPLICITY 1955#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 1956 EV_P = ev_default_loop_ptr;
1757#endif 1957#endif
1758 1958
1759 postfork = 1; /* must be in line with ev_loop_fork */ 1959 postfork = 1; /* must be in line with ev_loop_fork */
1760} 1960}
1761 1961
1765ev_invoke (EV_P_ void *w, int revents) 1965ev_invoke (EV_P_ void *w, int revents)
1766{ 1966{
1767 EV_CB_INVOKE ((W)w, revents); 1967 EV_CB_INVOKE ((W)w, revents);
1768} 1968}
1769 1969
1770inline_speed void 1970unsigned int
1771call_pending (EV_P) 1971ev_pending_count (EV_P)
1972{
1973 int pri;
1974 unsigned int count = 0;
1975
1976 for (pri = NUMPRI; pri--; )
1977 count += pendingcnt [pri];
1978
1979 return count;
1980}
1981
1982void noinline
1983ev_invoke_pending (EV_P)
1772{ 1984{
1773 int pri; 1985 int pri;
1774 1986
1775 for (pri = NUMPRI; pri--; ) 1987 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 1988 while (pendingcnt [pri])
2011 2223
2012 mn_now = ev_rt_now; 2224 mn_now = ev_rt_now;
2013 } 2225 }
2014} 2226}
2015 2227
2016static int loop_done;
2017
2018void 2228void
2019ev_loop (EV_P_ int flags) 2229ev_loop (EV_P_ int flags)
2020{ 2230{
2231#if EV_MINIMAL < 2
2232 ++loop_depth;
2233#endif
2234
2235 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2236
2021 loop_done = EVUNLOOP_CANCEL; 2237 loop_done = EVUNLOOP_CANCEL;
2022 2238
2023 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2239 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2024 2240
2025 do 2241 do
2026 { 2242 {
2027#if EV_VERIFY >= 2 2243#if EV_VERIFY >= 2
2028 ev_loop_verify (EV_A); 2244 ev_loop_verify (EV_A);
2041 /* we might have forked, so queue fork handlers */ 2257 /* we might have forked, so queue fork handlers */
2042 if (expect_false (postfork)) 2258 if (expect_false (postfork))
2043 if (forkcnt) 2259 if (forkcnt)
2044 { 2260 {
2045 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2261 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2046 call_pending (EV_A); 2262 EV_INVOKE_PENDING;
2047 } 2263 }
2048#endif 2264#endif
2049 2265
2050 /* queue prepare watchers (and execute them) */ 2266 /* queue prepare watchers (and execute them) */
2051 if (expect_false (preparecnt)) 2267 if (expect_false (preparecnt))
2052 { 2268 {
2053 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2269 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2054 call_pending (EV_A); 2270 EV_INVOKE_PENDING;
2055 } 2271 }
2272
2273 if (expect_false (loop_done))
2274 break;
2056 2275
2057 /* we might have forked, so reify kernel state if necessary */ 2276 /* we might have forked, so reify kernel state if necessary */
2058 if (expect_false (postfork)) 2277 if (expect_false (postfork))
2059 loop_fork (EV_A); 2278 loop_fork (EV_A);
2060 2279
2066 ev_tstamp waittime = 0.; 2285 ev_tstamp waittime = 0.;
2067 ev_tstamp sleeptime = 0.; 2286 ev_tstamp sleeptime = 0.;
2068 2287
2069 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2288 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2070 { 2289 {
2290 /* remember old timestamp for io_blocktime calculation */
2291 ev_tstamp prev_mn_now = mn_now;
2292
2071 /* update time to cancel out callback processing overhead */ 2293 /* update time to cancel out callback processing overhead */
2072 time_update (EV_A_ 1e100); 2294 time_update (EV_A_ 1e100);
2073 2295
2074 waittime = MAX_BLOCKTIME; 2296 waittime = MAX_BLOCKTIME;
2075 2297
2085 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2307 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2086 if (waittime > to) waittime = to; 2308 if (waittime > to) waittime = to;
2087 } 2309 }
2088#endif 2310#endif
2089 2311
2312 /* don't let timeouts decrease the waittime below timeout_blocktime */
2090 if (expect_false (waittime < timeout_blocktime)) 2313 if (expect_false (waittime < timeout_blocktime))
2091 waittime = timeout_blocktime; 2314 waittime = timeout_blocktime;
2092 2315
2093 sleeptime = waittime - backend_fudge; 2316 /* extra check because io_blocktime is commonly 0 */
2094
2095 if (expect_true (sleeptime > io_blocktime)) 2317 if (expect_false (io_blocktime))
2096 sleeptime = io_blocktime;
2097
2098 if (sleeptime)
2099 { 2318 {
2319 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2320
2321 if (sleeptime > waittime - backend_fudge)
2322 sleeptime = waittime - backend_fudge;
2323
2324 if (expect_true (sleeptime > 0.))
2325 {
2100 ev_sleep (sleeptime); 2326 ev_sleep (sleeptime);
2101 waittime -= sleeptime; 2327 waittime -= sleeptime;
2328 }
2102 } 2329 }
2103 } 2330 }
2104 2331
2332#if EV_MINIMAL < 2
2105 ++loop_count; 2333 ++loop_count;
2334#endif
2335 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2106 backend_poll (EV_A_ waittime); 2336 backend_poll (EV_A_ waittime);
2337 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2107 2338
2108 /* update ev_rt_now, do magic */ 2339 /* update ev_rt_now, do magic */
2109 time_update (EV_A_ waittime + sleeptime); 2340 time_update (EV_A_ waittime + sleeptime);
2110 } 2341 }
2111 2342
2122 2353
2123 /* queue check watchers, to be executed first */ 2354 /* queue check watchers, to be executed first */
2124 if (expect_false (checkcnt)) 2355 if (expect_false (checkcnt))
2125 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2356 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2126 2357
2127 call_pending (EV_A); 2358 EV_INVOKE_PENDING;
2128 } 2359 }
2129 while (expect_true ( 2360 while (expect_true (
2130 activecnt 2361 activecnt
2131 && !loop_done 2362 && !loop_done
2132 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2363 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2133 )); 2364 ));
2134 2365
2135 if (loop_done == EVUNLOOP_ONE) 2366 if (loop_done == EVUNLOOP_ONE)
2136 loop_done = EVUNLOOP_CANCEL; 2367 loop_done = EVUNLOOP_CANCEL;
2368
2369#if EV_MINIMAL < 2
2370 --loop_depth;
2371#endif
2137} 2372}
2138 2373
2139void 2374void
2140ev_unloop (EV_P_ int how) 2375ev_unloop (EV_P_ int how)
2141{ 2376{
2192inline_size void 2427inline_size void
2193wlist_del (WL *head, WL elem) 2428wlist_del (WL *head, WL elem)
2194{ 2429{
2195 while (*head) 2430 while (*head)
2196 { 2431 {
2197 if (*head == elem) 2432 if (expect_true (*head == elem))
2198 { 2433 {
2199 *head = elem->next; 2434 *head = elem->next;
2200 return; 2435 break;
2201 } 2436 }
2202 2437
2203 head = &(*head)->next; 2438 head = &(*head)->next;
2204 } 2439 }
2205} 2440}
2233} 2468}
2234 2469
2235inline_size void 2470inline_size void
2236pri_adjust (EV_P_ W w) 2471pri_adjust (EV_P_ W w)
2237{ 2472{
2238 int pri = w->priority; 2473 int pri = ev_priority (w);
2239 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2474 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2240 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2475 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2241 w->priority = pri; 2476 ev_set_priority (w, pri);
2242} 2477}
2243 2478
2244inline_speed void 2479inline_speed void
2245ev_start (EV_P_ W w, int active) 2480ev_start (EV_P_ W w, int active)
2246{ 2481{
2273 2508
2274 ev_start (EV_A_ (W)w, 1); 2509 ev_start (EV_A_ (W)w, 1);
2275 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2510 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2276 wlist_add (&anfds[fd].head, (WL)w); 2511 wlist_add (&anfds[fd].head, (WL)w);
2277 2512
2278 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2513 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2279 w->events &= ~EV__IOFDSET; 2514 w->events &= ~EV__IOFDSET;
2280 2515
2281 EV_FREQUENT_CHECK; 2516 EV_FREQUENT_CHECK;
2282} 2517}
2283 2518
2377 } 2612 }
2378 2613
2379 EV_FREQUENT_CHECK; 2614 EV_FREQUENT_CHECK;
2380} 2615}
2381 2616
2617ev_tstamp
2618ev_timer_remaining (EV_P_ ev_timer *w)
2619{
2620 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2621}
2622
2382#if EV_PERIODIC_ENABLE 2623#if EV_PERIODIC_ENABLE
2383void noinline 2624void noinline
2384ev_periodic_start (EV_P_ ev_periodic *w) 2625ev_periodic_start (EV_P_ ev_periodic *w)
2385{ 2626{
2386 if (expect_false (ev_is_active (w))) 2627 if (expect_false (ev_is_active (w)))
2453#endif 2694#endif
2454 2695
2455void noinline 2696void noinline
2456ev_signal_start (EV_P_ ev_signal *w) 2697ev_signal_start (EV_P_ ev_signal *w)
2457{ 2698{
2458#if EV_MULTIPLICITY
2459 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2460#endif
2461 if (expect_false (ev_is_active (w))) 2699 if (expect_false (ev_is_active (w)))
2462 return; 2700 return;
2463 2701
2464 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2702 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2465 2703
2466 evpipe_init (EV_A); 2704#if EV_MULTIPLICITY
2705 assert (("libev: a signal must not be attached to two different loops",
2706 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2467 2707
2468 EV_FREQUENT_CHECK; 2708 signals [w->signum - 1].loop = EV_A;
2709#endif
2469 2710
2711 EV_FREQUENT_CHECK;
2712
2713#if EV_USE_SIGNALFD
2714 if (sigfd == -2)
2470 { 2715 {
2471#ifndef _WIN32 2716 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2472 sigset_t full, prev; 2717 if (sigfd < 0 && errno == EINVAL)
2473 sigfillset (&full); 2718 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2474 sigprocmask (SIG_SETMASK, &full, &prev);
2475#endif
2476 2719
2477 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2720 if (sigfd >= 0)
2721 {
2722 fd_intern (sigfd); /* doing it twice will not hurt */
2478 2723
2479#ifndef _WIN32 2724 sigemptyset (&sigfd_set);
2480 sigprocmask (SIG_SETMASK, &prev, 0); 2725
2481#endif 2726 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2727 ev_set_priority (&sigfd_w, EV_MAXPRI);
2728 ev_io_start (EV_A_ &sigfd_w);
2729 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2730 }
2482 } 2731 }
2732
2733 if (sigfd >= 0)
2734 {
2735 /* TODO: check .head */
2736 sigaddset (&sigfd_set, w->signum);
2737 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2738
2739 signalfd (sigfd, &sigfd_set, 0);
2740 }
2741#endif
2483 2742
2484 ev_start (EV_A_ (W)w, 1); 2743 ev_start (EV_A_ (W)w, 1);
2485 wlist_add (&signals [w->signum - 1].head, (WL)w); 2744 wlist_add (&signals [w->signum - 1].head, (WL)w);
2486 2745
2487 if (!((WL)w)->next) 2746 if (!((WL)w)->next)
2747# if EV_USE_SIGNALFD
2748 if (sigfd < 0) /*TODO*/
2749# endif
2488 { 2750 {
2489#if _WIN32 2751# if _WIN32
2752 evpipe_init (EV_A);
2753
2490 signal (w->signum, ev_sighandler); 2754 signal (w->signum, ev_sighandler);
2491#else 2755# else
2492 struct sigaction sa; 2756 struct sigaction sa;
2757
2758 evpipe_init (EV_A);
2759
2493 sa.sa_handler = ev_sighandler; 2760 sa.sa_handler = ev_sighandler;
2494 sigfillset (&sa.sa_mask); 2761 sigfillset (&sa.sa_mask);
2495 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2762 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2496 sigaction (w->signum, &sa, 0); 2763 sigaction (w->signum, &sa, 0);
2764
2765 sigemptyset (&sa.sa_mask);
2766 sigaddset (&sa.sa_mask, w->signum);
2767 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2497#endif 2768#endif
2498 } 2769 }
2499 2770
2500 EV_FREQUENT_CHECK; 2771 EV_FREQUENT_CHECK;
2501} 2772}
2502 2773
2503void noinline 2774void noinline
2511 2782
2512 wlist_del (&signals [w->signum - 1].head, (WL)w); 2783 wlist_del (&signals [w->signum - 1].head, (WL)w);
2513 ev_stop (EV_A_ (W)w); 2784 ev_stop (EV_A_ (W)w);
2514 2785
2515 if (!signals [w->signum - 1].head) 2786 if (!signals [w->signum - 1].head)
2787 {
2788#if EV_MULTIPLICITY
2789 signals [w->signum - 1].loop = 0; /* unattach from signal */
2790#endif
2791#if EV_USE_SIGNALFD
2792 if (sigfd >= 0)
2793 {
2794 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2795 sigdelset (&sigfd_set, w->signum);
2796 signalfd (sigfd, &sigfd_set, 0);
2797 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2798 /*TODO: maybe unblock signal? */
2799 }
2800 else
2801#endif
2516 signal (w->signum, SIG_DFL); 2802 signal (w->signum, SIG_DFL);
2803 }
2517 2804
2518 EV_FREQUENT_CHECK; 2805 EV_FREQUENT_CHECK;
2519} 2806}
2520 2807
2521void 2808void
2601 } 2888 }
2602 } 2889 }
2603 2890
2604 if (w->wd >= 0) 2891 if (w->wd >= 0)
2605 { 2892 {
2893 struct statfs sfs;
2894
2606 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2895 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2607 2896
2608 /* now local changes will be tracked by inotify, but remote changes won't */ 2897 /* now local changes will be tracked by inotify, but remote changes won't */
2609 /* unless the filesystem it known to be local, we therefore still poll */ 2898 /* unless the filesystem is known to be local, we therefore still poll */
2610 /* also do poll on <2.6.25, but with normal frequency */ 2899 /* also do poll on <2.6.25, but with normal frequency */
2611 struct statfs sfs;
2612 2900
2613 if (fs_2625 && !statfs (w->path, &sfs)) 2901 if (fs_2625 && !statfs (w->path, &sfs))
2614 if (sfs.f_type == 0x1373 /* devfs */ 2902 if (sfs.f_type == 0x1373 /* devfs */
2615 || sfs.f_type == 0xEF53 /* ext2/3 */ 2903 || sfs.f_type == 0xEF53 /* ext2/3 */
2616 || sfs.f_type == 0x3153464a /* jfs */ 2904 || sfs.f_type == 0x3153464a /* jfs */
2705 return; 2993 return;
2706 2994
2707 fs_2625 = 1; 2995 fs_2625 = 1;
2708} 2996}
2709 2997
2998inline_size int
2999infy_newfd (void)
3000{
3001#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3002 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3003 if (fd >= 0)
3004 return fd;
3005#endif
3006 return inotify_init ();
3007}
3008
2710inline_size void 3009inline_size void
2711infy_init (EV_P) 3010infy_init (EV_P)
2712{ 3011{
2713 if (fs_fd != -2) 3012 if (fs_fd != -2)
2714 return; 3013 return;
2715 3014
2716 fs_fd = -1; 3015 fs_fd = -1;
2717 3016
2718 check_2625 (EV_A); 3017 check_2625 (EV_A);
2719 3018
2720 fs_fd = inotify_init (); 3019 fs_fd = infy_newfd ();
2721 3020
2722 if (fs_fd >= 0) 3021 if (fs_fd >= 0)
2723 { 3022 {
3023 fd_intern (fs_fd);
2724 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3024 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2725 ev_set_priority (&fs_w, EV_MAXPRI); 3025 ev_set_priority (&fs_w, EV_MAXPRI);
2726 ev_io_start (EV_A_ &fs_w); 3026 ev_io_start (EV_A_ &fs_w);
3027 ev_unref (EV_A);
2727 } 3028 }
2728} 3029}
2729 3030
2730inline_size void 3031inline_size void
2731infy_fork (EV_P) 3032infy_fork (EV_P)
2733 int slot; 3034 int slot;
2734 3035
2735 if (fs_fd < 0) 3036 if (fs_fd < 0)
2736 return; 3037 return;
2737 3038
3039 ev_ref (EV_A);
3040 ev_io_stop (EV_A_ &fs_w);
2738 close (fs_fd); 3041 close (fs_fd);
2739 fs_fd = inotify_init (); 3042 fs_fd = infy_newfd ();
3043
3044 if (fs_fd >= 0)
3045 {
3046 fd_intern (fs_fd);
3047 ev_io_set (&fs_w, fs_fd, EV_READ);
3048 ev_io_start (EV_A_ &fs_w);
3049 ev_unref (EV_A);
3050 }
2740 3051
2741 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2742 { 3053 {
2743 WL w_ = fs_hash [slot].head; 3054 WL w_ = fs_hash [slot].head;
2744 fs_hash [slot].head = 0; 3055 fs_hash [slot].head = 0;
3001embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3312embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3002{ 3313{
3003 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3314 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3004 3315
3005 { 3316 {
3006 struct ev_loop *loop = w->other; 3317 EV_P = w->other;
3007 3318
3008 while (fdchangecnt) 3319 while (fdchangecnt)
3009 { 3320 {
3010 fd_reify (EV_A); 3321 fd_reify (EV_A);
3011 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3322 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3019 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3330 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3020 3331
3021 ev_embed_stop (EV_A_ w); 3332 ev_embed_stop (EV_A_ w);
3022 3333
3023 { 3334 {
3024 struct ev_loop *loop = w->other; 3335 EV_P = w->other;
3025 3336
3026 ev_loop_fork (EV_A); 3337 ev_loop_fork (EV_A);
3027 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3338 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3028 } 3339 }
3029 3340
3043{ 3354{
3044 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
3045 return; 3356 return;
3046 3357
3047 { 3358 {
3048 struct ev_loop *loop = w->other; 3359 EV_P = w->other;
3049 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3360 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3050 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3361 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3051 } 3362 }
3052 3363
3053 EV_FREQUENT_CHECK; 3364 EV_FREQUENT_CHECK;
3165 3476
3166void 3477void
3167ev_async_send (EV_P_ ev_async *w) 3478ev_async_send (EV_P_ ev_async *w)
3168{ 3479{
3169 w->sent = 1; 3480 w->sent = 1;
3170 evpipe_write (EV_A_ &gotasync); 3481 evpipe_write (EV_A_ &async_pending);
3171} 3482}
3172#endif 3483#endif
3173 3484
3174/*****************************************************************************/ 3485/*****************************************************************************/
3175 3486
3324 if (types & EV_CHECK) 3635 if (types & EV_CHECK)
3325 for (i = checkcnt; i--; ) 3636 for (i = checkcnt; i--; )
3326 cb (EV_A_ EV_CHECK, checks [i]); 3637 cb (EV_A_ EV_CHECK, checks [i]);
3327 3638
3328 if (types & EV_SIGNAL) 3639 if (types & EV_SIGNAL)
3329 for (i = 0; i < signalmax; ++i) 3640 for (i = 0; i < EV_NSIG - 1; ++i)
3330 for (wl = signals [i].head; wl; ) 3641 for (wl = signals [i].head; wl; )
3331 { 3642 {
3332 wn = wl->next; 3643 wn = wl->next;
3333 cb (EV_A_ EV_SIGNAL, wl); 3644 cb (EV_A_ EV_SIGNAL, wl);
3334 wl = wn; 3645 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines