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

Comparing libev/ev.c (file contents):
Revision 1.290 by root, Mon Jun 29 04:41:34 2009 UTC vs.
Revision 1.316 by root, Fri Sep 18 21:02:12 2009 UTC

… …
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 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
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
178# endif 186# endif
179#endif 187#endif
180 188
181/* 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 */
182 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
183#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
186# else 221# else
187# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
266# else 301# else
267# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
268# endif 303# endif
269#endif 304#endif
270 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
271#if 0 /* debugging */ 314#if 0 /* debugging */
272# define EV_VERIFY 3 315# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
275#endif 318#endif
… …
282# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
283#endif 326#endif
284 327
285#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
287#endif
288
289/* this block fixes any misconfiguration where we know we run into trouble otherwise */
290
291#ifndef CLOCK_MONOTONIC
292# undef EV_USE_MONOTONIC
293# define EV_USE_MONOTONIC 0
294#endif
295
296#ifndef CLOCK_REALTIME
297# undef EV_USE_REALTIME
298# define EV_USE_REALTIME 0
299#endif
300
301#if !EV_STAT_ENABLE
302# undef EV_USE_INOTIFY
303# define EV_USE_INOTIFY 0
304#endif
305
306#if !EV_USE_NANOSLEEP
307# ifndef _WIN32
308# include <sys/select.h>
309# endif
310#endif
311
312#if EV_USE_INOTIFY
313# include <sys/utsname.h>
314# include <sys/statfs.h>
315# include <sys/inotify.h>
316/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
317# ifndef IN_DONT_FOLLOW
318# undef EV_USE_INOTIFY
319# define EV_USE_INOTIFY 0
320# endif
321#endif
322
323#if EV_SELECT_IS_WINSOCKET
324# include <winsock.h>
325#endif 330#endif
326 331
327/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
328/* which makes programs even slower. might work on other unices, too. */ 333/* which makes programs even slower. might work on other unices, too. */
329#if EV_USE_CLOCK_SYSCALL 334#if EV_USE_CLOCK_SYSCALL
… …
336# undef EV_USE_CLOCK_SYSCALL 341# undef EV_USE_CLOCK_SYSCALL
337# define EV_USE_CLOCK_SYSCALL 0 342# define EV_USE_CLOCK_SYSCALL 0
338# endif 343# endif
339#endif 344#endif
340 345
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347
348#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0
351#endif
352
353#ifndef CLOCK_REALTIME
354# undef EV_USE_REALTIME
355# define EV_USE_REALTIME 0
356#endif
357
358#if !EV_STAT_ENABLE
359# undef EV_USE_INOTIFY
360# define EV_USE_INOTIFY 0
361#endif
362
363#if !EV_USE_NANOSLEEP
364# ifndef _WIN32
365# include <sys/select.h>
366# endif
367#endif
368
369#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h>
372# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY
376# define EV_USE_INOTIFY 0
377# endif
378#endif
379
380#if EV_SELECT_IS_WINSOCKET
381# include <winsock.h>
382#endif
383
341#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
342/* 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 */
343# 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
344# ifdef __cplusplus 397# ifdef __cplusplus
345extern "C" { 398extern "C" {
346# endif 399# endif
347int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 401# ifdef __cplusplus
349} 402}
350# endif 403# endif
351#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
352 434
353/**/ 435/**/
354 436
355#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
368 */ 450 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 452
371#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) */
372#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) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 455
375#if __GNUC__ >= 4 456#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
378#else 459#else
… …
391# define inline_speed static noinline 472# define inline_speed static noinline
392#else 473#else
393# define inline_speed static inline 474# define inline_speed static inline
394#endif 475#endif
395 476
396#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
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 482# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
483#endif
398 484
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 485#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 486#define EMPTY2(a,b) /* used to suppress some warnings */
401 487
402typedef ev_watcher *W; 488typedef ev_watcher *W;
… …
414 500
415#if EV_USE_MONOTONIC 501#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 503#endif
418 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
419#ifdef _WIN32 515#ifdef _WIN32
420# include "ev_win32.c" 516# include "ev_win32.c"
421#endif 517#endif
422 518
423/*****************************************************************************/ 519/*****************************************************************************/
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 581#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 582#define ev_free(ptr) ev_realloc ((ptr), 0)
487 583
488/*****************************************************************************/ 584/*****************************************************************************/
489 585
586/* set in reify when reification needed */
587#define EV_ANFD_REIFY 1
588
490/* file descriptor info structure */ 589/* file descriptor info structure */
491typedef struct 590typedef struct
492{ 591{
493 WL head; 592 WL head;
494 unsigned char events; /* the events watched for */ 593 unsigned char events; /* the events watched for */
495 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) */
496 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 */
497 unsigned char unused; 596 unsigned char unused;
498#if EV_USE_EPOLL 597#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 598 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 599#endif
… …
562 661
563 static int ev_default_loop_ptr; 662 static int ev_default_loop_ptr;
564 663
565#endif 664#endif
566 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
567/*****************************************************************************/ 678/*****************************************************************************/
568 679
680#ifndef EV_HAVE_EV_TIME
569ev_tstamp 681ev_tstamp
570ev_time (void) 682ev_time (void)
571{ 683{
572#if EV_USE_REALTIME 684#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 685 if (expect_true (have_realtime))
… …
580 692
581 struct timeval tv; 693 struct timeval tv;
582 gettimeofday (&tv, 0); 694 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 695 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 696}
697#endif
585 698
586inline_size ev_tstamp 699inline_size ev_tstamp
587get_clock (void) 700get_clock (void)
588{ 701{
589#if EV_USE_MONOTONIC 702#if EV_USE_MONOTONIC
… …
625 738
626 tv.tv_sec = (time_t)delay; 739 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 741
629 /* 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 */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 743 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 744 /* by older ones */
632 select (0, 0, 0, 0, &tv); 745 select (0, 0, 0, 0, &tv);
633#endif 746#endif
634 } 747 }
635} 748}
… …
743} 856}
744 857
745/*****************************************************************************/ 858/*****************************************************************************/
746 859
747inline_speed void 860inline_speed void
748fd_event (EV_P_ int fd, int revents) 861fd_event_nc (EV_P_ int fd, int revents)
749{ 862{
750 ANFD *anfd = anfds + fd; 863 ANFD *anfd = anfds + fd;
751 ev_io *w; 864 ev_io *w;
752 865
753 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)
… …
757 if (ev) 870 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 871 ev_feed_event (EV_A_ (W)w, ev);
759 } 872 }
760} 873}
761 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
762void 886void
763ev_feed_fd_event (EV_P_ int fd, int revents) 887ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 888{
765 if (fd >= 0 && fd < anfdmax) 889 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 890 fd_event_nc (EV_A_ fd, revents);
767} 891}
768 892
769/* make sure the external fd watch events are in-sync */ 893/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 894/* with the kernel/libev internal state */
771inline_size void 895inline_size void
… …
786 910
787#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
788 if (events) 912 if (events)
789 { 913 {
790 unsigned long arg; 914 unsigned long arg;
791 #ifdef EV_FD_TO_WIN32_HANDLE
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
793 #else
794 anfd->handle = _get_osfhandle (fd);
795 #endif
796 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));
797 } 917 }
798#endif 918#endif
799 919
800 { 920 {
… …
871 991
872 for (fd = anfdmax; fd--; ) 992 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 993 if (anfds [fd].events)
874 { 994 {
875 fd_kill (EV_A_ fd); 995 fd_kill (EV_A_ fd);
876 return; 996 break;
877 } 997 }
878} 998}
879 999
880/* 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 */
881static void noinline 1001static void noinline
… …
886 for (fd = 0; fd < anfdmax; ++fd) 1006 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 1007 if (anfds [fd].events)
888 { 1008 {
889 anfds [fd].events = 0; 1009 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 1010 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1011 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 1012 }
893} 1013}
894 1014
895/*****************************************************************************/ 1015/*****************************************************************************/
896 1016
… …
971 1091
972 for (;;) 1092 for (;;)
973 { 1093 {
974 int c = k << 1; 1094 int c = k << 1;
975 1095
976 if (c > N + HEAP0 - 1) 1096 if (c >= N + HEAP0)
977 break; 1097 break;
978 1098
979 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])
980 ? 1 : 0; 1100 ? 1 : 0;
981 1101
… …
1017 1137
1018/* move an element suitably so it is in a correct place */ 1138/* move an element suitably so it is in a correct place */
1019inline_size void 1139inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1140adjustheap (ANHE *heap, int N, int k)
1021{ 1141{
1022 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)]))
1023 upheap (heap, k); 1143 upheap (heap, k);
1024 else 1144 else
1025 downheap (heap, N, k); 1145 downheap (heap, N, k);
1026} 1146}
1027 1147
… …
1040/*****************************************************************************/ 1160/*****************************************************************************/
1041 1161
1042/* associate signal watchers to a signal signal */ 1162/* associate signal watchers to a signal signal */
1043typedef struct 1163typedef struct
1044{ 1164{
1165 EV_ATOMIC_T pending;
1166#if EV_MULTIPLICITY
1167 EV_P;
1168#endif
1045 WL head; 1169 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1170} ANSIG;
1048 1171
1049static ANSIG *signals; 1172static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1173
1054/*****************************************************************************/ 1174/*****************************************************************************/
1055 1175
1056/* used to prepare libev internal fd's */ 1176/* used to prepare libev internal fd's */
1057/* this is not fork-safe */ 1177/* this is not fork-safe */
… …
1071evpipe_init (EV_P) 1191evpipe_init (EV_P)
1072{ 1192{
1073 if (!ev_is_active (&pipe_w)) 1193 if (!ev_is_active (&pipe_w))
1074 { 1194 {
1075#if EV_USE_EVENTFD 1195#if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1198 evfd = eventfd (0, 0);
1199
1200 if (evfd >= 0)
1077 { 1201 {
1078 evpipe [0] = -1; 1202 evpipe [0] = -1;
1079 fd_intern (evfd); 1203 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1204 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1205 }
1082 else 1206 else
1083#endif 1207#endif
1084 { 1208 {
… …
1121/* called whenever the libev signal pipe */ 1245/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1246/* got some events (signal, async) */
1123static void 1247static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1248pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1249{
1250 int i;
1251
1126#if EV_USE_EVENTFD 1252#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1253 if (evfd >= 0)
1128 { 1254 {
1129 uint64_t counter; 1255 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1256 read (evfd, &counter, sizeof (uint64_t));
… …
1134 { 1260 {
1135 char dummy; 1261 char dummy;
1136 read (evpipe [0], &dummy, 1); 1262 read (evpipe [0], &dummy, 1);
1137 } 1263 }
1138 1264
1139 if (gotsig && ev_is_default_loop (EV_A)) 1265 if (sig_pending)
1140 { 1266 {
1141 int signum; 1267 sig_pending = 0;
1142 gotsig = 0;
1143 1268
1144 for (signum = signalmax; signum--; ) 1269 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1270 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1271 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1272 }
1148 1273
1149#if EV_ASYNC_ENABLE 1274#if EV_ASYNC_ENABLE
1150 if (gotasync) 1275 if (async_pending)
1151 { 1276 {
1152 int i; 1277 async_pending = 0;
1153 gotasync = 0;
1154 1278
1155 for (i = asynccnt; i--; ) 1279 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1280 if (asyncs [i]->sent)
1157 { 1281 {
1158 asyncs [i]->sent = 0; 1282 asyncs [i]->sent = 0;
… …
1166 1290
1167static void 1291static void
1168ev_sighandler (int signum) 1292ev_sighandler (int signum)
1169{ 1293{
1170#if EV_MULTIPLICITY 1294#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1295 EV_P = signals [signum - 1].loop;
1172#endif 1296#endif
1173 1297
1174#if _WIN32 1298#if _WIN32
1175 signal (signum, ev_sighandler); 1299 signal (signum, ev_sighandler);
1176#endif 1300#endif
1177 1301
1178 signals [signum - 1].gotsig = 1; 1302 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1303 evpipe_write (EV_A_ &sig_pending);
1180} 1304}
1181 1305
1182void noinline 1306void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1307ev_feed_signal_event (EV_P_ int signum)
1184{ 1308{
1185 WL w; 1309 WL w;
1186 1310
1311 if (expect_false (signum <= 0 || signum > EV_NSIG))
1312 return;
1313
1314 --signum;
1315
1187#if EV_MULTIPLICITY 1316#if EV_MULTIPLICITY
1188 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 */
1189#endif 1318 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1319
1191 --signum; 1320 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1321 return;
1322#endif
1195 1323
1196 signals [signum].gotsig = 0; 1324 signals [signum].pending = 0;
1197 1325
1198 for (w = signals [signum].head; w; w = w->next) 1326 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1327 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 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
1201 1349
1202/*****************************************************************************/ 1350/*****************************************************************************/
1203 1351
1204static WL childs [EV_PID_HASHSIZE]; 1352static WL childs [EV_PID_HASHSIZE];
1205 1353
… …
1350ev_backend (EV_P) 1498ev_backend (EV_P)
1351{ 1499{
1352 return backend; 1500 return backend;
1353} 1501}
1354 1502
1503#if EV_MINIMAL < 2
1355unsigned int 1504unsigned int
1356ev_loop_count (EV_P) 1505ev_loop_count (EV_P)
1357{ 1506{
1358 return loop_count; 1507 return loop_count;
1359} 1508}
1360 1509
1510unsigned int
1511ev_loop_depth (EV_P)
1512{
1513 return loop_depth;
1514}
1515
1361void 1516void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1517ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1518{
1364 io_blocktime = interval; 1519 io_blocktime = interval;
1365} 1520}
… …
1367void 1522void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1523ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1524{
1370 timeout_blocktime = interval; 1525 timeout_blocktime = interval;
1371} 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
1372 1551
1373/* initialise a loop structure, must be zero-initialised */ 1552/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1553static void noinline
1375loop_init (EV_P_ unsigned int flags) 1554loop_init (EV_P_ unsigned int flags)
1376{ 1555{
… …
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1573 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1574 have_monotonic = 1;
1396 } 1575 }
1397#endif 1576#endif
1398 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
1399 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1590 mn_now = get_clock ();
1401 now_floor = mn_now; 1591 now_floor = mn_now;
1402 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
1403 1596
1404 io_blocktime = 0.; 1597 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1598 timeout_blocktime = 0.;
1406 backend = 0; 1599 backend = 0;
1407 backend_fd = -1; 1600 backend_fd = -1;
1408 gotasync = 0; 1601 sig_pending = 0;
1602#if EV_ASYNC_ENABLE
1603 async_pending = 0;
1604#endif
1409#if EV_USE_INOTIFY 1605#if EV_USE_INOTIFY
1410 fs_fd = -2; 1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1607#endif
1412 1608#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1610#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1611
1424 if (!(flags & 0x0000ffffU)) 1612 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1613 flags |= ev_recommended_backends ();
1426 1614
1427#if EV_USE_PORT 1615#if EV_USE_PORT
… …
1453{ 1641{
1454 int i; 1642 int i;
1455 1643
1456 if (ev_is_active (&pipe_w)) 1644 if (ev_is_active (&pipe_w))
1457 { 1645 {
1458 ev_ref (EV_A); /* signal watcher */ 1646 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1647 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1648
1461#if EV_USE_EVENTFD 1649#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1650 if (evfd >= 0)
1463 close (evfd); 1651 close (evfd);
1464#endif 1652#endif
1465 1653
1466 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1467 { 1655 {
1468 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1658 }
1471 } 1659 }
1660
1661#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w))
1663 {
1664 /*ev_ref (EV_A);*/
1665 /*ev_io_stop (EV_A_ &sigfd_w);*/
1666
1667 close (sigfd);
1668 }
1669#endif
1472 1670
1473#if EV_USE_INOTIFY 1671#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1672 if (fs_fd >= 0)
1475 close (fs_fd); 1673 close (fs_fd);
1476#endif 1674#endif
… …
1500#if EV_IDLE_ENABLE 1698#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1699 array_free (idle, [i]);
1502#endif 1700#endif
1503 } 1701 }
1504 1702
1505 ev_free (anfds); anfdmax = 0; 1703 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1704
1507 /* have to use the microsoft-never-gets-it-right macro */ 1705 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1706 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1707 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1708 array_free (timer, EMPTY);
… …
1545 1743
1546 if (ev_is_active (&pipe_w)) 1744 if (ev_is_active (&pipe_w))
1547 { 1745 {
1548 /* this "locks" the handlers against writing to the pipe */ 1746 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1747 /* while we modify the fd vars */
1550 gotsig = 1; 1748 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1749#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1750 async_pending = 1;
1553#endif 1751#endif
1554 1752
1555 ev_ref (EV_A); 1753 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1754 ev_io_stop (EV_A_ &pipe_w);
1557 1755
… …
1560 close (evfd); 1758 close (evfd);
1561#endif 1759#endif
1562 1760
1563 if (evpipe [0] >= 0) 1761 if (evpipe [0] >= 0)
1564 { 1762 {
1565 close (evpipe [0]); 1763 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 1764 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 1765 }
1568 1766
1569 evpipe_init (EV_A); 1767 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 1768 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 1769 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1577#if EV_MULTIPLICITY 1775#if EV_MULTIPLICITY
1578 1776
1579struct ev_loop * 1777struct ev_loop *
1580ev_loop_new (unsigned int flags) 1778ev_loop_new (unsigned int flags)
1581{ 1779{
1582 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1780 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1583 1781
1584 memset (loop, 0, sizeof (struct ev_loop)); 1782 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1783 loop_init (EV_A_ flags);
1587 1784
1588 if (ev_backend (EV_A)) 1785 if (ev_backend (EV_A))
1589 return loop; 1786 return EV_A;
1590 1787
1591 return 0; 1788 return 0;
1592} 1789}
1593 1790
1594void 1791void
… …
1601void 1798void
1602ev_loop_fork (EV_P) 1799ev_loop_fork (EV_P)
1603{ 1800{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1801 postfork = 1; /* must be in line with ev_default_fork */
1605} 1802}
1803#endif /* multiplicity */
1606 1804
1607#if EV_VERIFY 1805#if EV_VERIFY
1608static void noinline 1806static void noinline
1609verify_watcher (EV_P_ W w) 1807verify_watcher (EV_P_ W w)
1610{ 1808{
… …
1638 verify_watcher (EV_A_ ws [cnt]); 1836 verify_watcher (EV_A_ ws [cnt]);
1639 } 1837 }
1640} 1838}
1641#endif 1839#endif
1642 1840
1841#if EV_MINIMAL < 2
1643void 1842void
1644ev_loop_verify (EV_P) 1843ev_loop_verify (EV_P)
1645{ 1844{
1646#if EV_VERIFY 1845#if EV_VERIFY
1647 int i; 1846 int i;
… …
1696 assert (checkmax >= checkcnt); 1895 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1896 array_verify (EV_A_ (W *)checks, checkcnt);
1698 1897
1699# if 0 1898# if 0
1700 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1899 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1701 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1900 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1702# endif
1703#endif 1901# endif
1902#endif
1704} 1903}
1705 1904#endif
1706#endif /* multiplicity */
1707 1905
1708#if EV_MULTIPLICITY 1906#if EV_MULTIPLICITY
1709struct ev_loop * 1907struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1908ev_default_loop_init (unsigned int flags)
1711#else 1909#else
… …
1714#endif 1912#endif
1715{ 1913{
1716 if (!ev_default_loop_ptr) 1914 if (!ev_default_loop_ptr)
1717 { 1915 {
1718#if EV_MULTIPLICITY 1916#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1917 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 1918#else
1721 ev_default_loop_ptr = 1; 1919 ev_default_loop_ptr = 1;
1722#endif 1920#endif
1723 1921
1724 loop_init (EV_A_ flags); 1922 loop_init (EV_A_ flags);
… …
1741 1939
1742void 1940void
1743ev_default_destroy (void) 1941ev_default_destroy (void)
1744{ 1942{
1745#if EV_MULTIPLICITY 1943#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 1944 EV_P = ev_default_loop_ptr;
1747#endif 1945#endif
1748 1946
1749 ev_default_loop_ptr = 0; 1947 ev_default_loop_ptr = 0;
1750 1948
1751#ifndef _WIN32 1949#ifndef _WIN32
… …
1758 1956
1759void 1957void
1760ev_default_fork (void) 1958ev_default_fork (void)
1761{ 1959{
1762#if EV_MULTIPLICITY 1960#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 1961 EV_P = ev_default_loop_ptr;
1764#endif 1962#endif
1765 1963
1766 postfork = 1; /* must be in line with ev_loop_fork */ 1964 postfork = 1; /* must be in line with ev_loop_fork */
1767} 1965}
1768 1966
… …
1772ev_invoke (EV_P_ void *w, int revents) 1970ev_invoke (EV_P_ void *w, int revents)
1773{ 1971{
1774 EV_CB_INVOKE ((W)w, revents); 1972 EV_CB_INVOKE ((W)w, revents);
1775} 1973}
1776 1974
1777inline_speed void 1975unsigned int
1778call_pending (EV_P) 1976ev_pending_count (EV_P)
1977{
1978 int pri;
1979 unsigned int count = 0;
1980
1981 for (pri = NUMPRI; pri--; )
1982 count += pendingcnt [pri];
1983
1984 return count;
1985}
1986
1987void noinline
1988ev_invoke_pending (EV_P)
1779{ 1989{
1780 int pri; 1990 int pri;
1781 1991
1782 for (pri = NUMPRI; pri--; ) 1992 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 1993 while (pendingcnt [pri])
… …
2018 2228
2019 mn_now = ev_rt_now; 2229 mn_now = ev_rt_now;
2020 } 2230 }
2021} 2231}
2022 2232
2023static int loop_done;
2024
2025void 2233void
2026ev_loop (EV_P_ int flags) 2234ev_loop (EV_P_ int flags)
2027{ 2235{
2236#if EV_MINIMAL < 2
2237 ++loop_depth;
2238#endif
2239
2240 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2241
2028 loop_done = EVUNLOOP_CANCEL; 2242 loop_done = EVUNLOOP_CANCEL;
2029 2243
2030 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2244 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2031 2245
2032 do 2246 do
2033 { 2247 {
2034#if EV_VERIFY >= 2 2248#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2249 ev_loop_verify (EV_A);
… …
2048 /* we might have forked, so queue fork handlers */ 2262 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2263 if (expect_false (postfork))
2050 if (forkcnt) 2264 if (forkcnt)
2051 { 2265 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2266 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2267 EV_INVOKE_PENDING;
2054 } 2268 }
2055#endif 2269#endif
2056 2270
2057 /* queue prepare watchers (and execute them) */ 2271 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2272 if (expect_false (preparecnt))
2059 { 2273 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2274 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2275 EV_INVOKE_PENDING;
2062 } 2276 }
2277
2278 if (expect_false (loop_done))
2279 break;
2063 2280
2064 /* we might have forked, so reify kernel state if necessary */ 2281 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2282 if (expect_false (postfork))
2066 loop_fork (EV_A); 2283 loop_fork (EV_A);
2067 2284
… …
2073 ev_tstamp waittime = 0.; 2290 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2291 ev_tstamp sleeptime = 0.;
2075 2292
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2293 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2294 {
2295 /* remember old timestamp for io_blocktime calculation */
2296 ev_tstamp prev_mn_now = mn_now;
2297
2078 /* update time to cancel out callback processing overhead */ 2298 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2299 time_update (EV_A_ 1e100);
2080 2300
2081 waittime = MAX_BLOCKTIME; 2301 waittime = MAX_BLOCKTIME;
2082 2302
… …
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2312 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2093 if (waittime > to) waittime = to; 2313 if (waittime > to) waittime = to;
2094 } 2314 }
2095#endif 2315#endif
2096 2316
2317 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2318 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2319 waittime = timeout_blocktime;
2099 2320
2100 sleeptime = waittime - backend_fudge; 2321 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2322 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2323 {
2324 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2325
2326 if (sleeptime > waittime - backend_fudge)
2327 sleeptime = waittime - backend_fudge;
2328
2329 if (expect_true (sleeptime > 0.))
2330 {
2107 ev_sleep (sleeptime); 2331 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2332 waittime -= sleeptime;
2333 }
2109 } 2334 }
2110 } 2335 }
2111 2336
2337#if EV_MINIMAL < 2
2112 ++loop_count; 2338 ++loop_count;
2339#endif
2340 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2341 backend_poll (EV_A_ waittime);
2342 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2343
2115 /* update ev_rt_now, do magic */ 2344 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2345 time_update (EV_A_ waittime + sleeptime);
2117 } 2346 }
2118 2347
… …
2129 2358
2130 /* queue check watchers, to be executed first */ 2359 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2360 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2361 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2133 2362
2134 call_pending (EV_A); 2363 EV_INVOKE_PENDING;
2135 } 2364 }
2136 while (expect_true ( 2365 while (expect_true (
2137 activecnt 2366 activecnt
2138 && !loop_done 2367 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2368 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2369 ));
2141 2370
2142 if (loop_done == EVUNLOOP_ONE) 2371 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2372 loop_done = EVUNLOOP_CANCEL;
2373
2374#if EV_MINIMAL < 2
2375 --loop_depth;
2376#endif
2144} 2377}
2145 2378
2146void 2379void
2147ev_unloop (EV_P_ int how) 2380ev_unloop (EV_P_ int how)
2148{ 2381{
… …
2199inline_size void 2432inline_size void
2200wlist_del (WL *head, WL elem) 2433wlist_del (WL *head, WL elem)
2201{ 2434{
2202 while (*head) 2435 while (*head)
2203 { 2436 {
2204 if (*head == elem) 2437 if (expect_true (*head == elem))
2205 { 2438 {
2206 *head = elem->next; 2439 *head = elem->next;
2207 return; 2440 break;
2208 } 2441 }
2209 2442
2210 head = &(*head)->next; 2443 head = &(*head)->next;
2211 } 2444 }
2212} 2445}
… …
2240} 2473}
2241 2474
2242inline_size void 2475inline_size void
2243pri_adjust (EV_P_ W w) 2476pri_adjust (EV_P_ W w)
2244{ 2477{
2245 int pri = w->priority; 2478 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2479 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2480 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2481 ev_set_priority (w, pri);
2249} 2482}
2250 2483
2251inline_speed void 2484inline_speed void
2252ev_start (EV_P_ W w, int active) 2485ev_start (EV_P_ W w, int active)
2253{ 2486{
… …
2280 2513
2281 ev_start (EV_A_ (W)w, 1); 2514 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2515 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2516 wlist_add (&anfds[fd].head, (WL)w);
2284 2517
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2518 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2519 w->events &= ~EV__IOFDSET;
2287 2520
2288 EV_FREQUENT_CHECK; 2521 EV_FREQUENT_CHECK;
2289} 2522}
2290 2523
… …
2384 } 2617 }
2385 2618
2386 EV_FREQUENT_CHECK; 2619 EV_FREQUENT_CHECK;
2387} 2620}
2388 2621
2622ev_tstamp
2623ev_timer_remaining (EV_P_ ev_timer *w)
2624{
2625 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2626}
2627
2389#if EV_PERIODIC_ENABLE 2628#if EV_PERIODIC_ENABLE
2390void noinline 2629void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2630ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2631{
2393 if (expect_false (ev_is_active (w))) 2632 if (expect_false (ev_is_active (w)))
… …
2460#endif 2699#endif
2461 2700
2462void noinline 2701void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2702ev_signal_start (EV_P_ ev_signal *w)
2464{ 2703{
2465#if EV_MULTIPLICITY
2466 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2467#endif
2468 if (expect_false (ev_is_active (w))) 2704 if (expect_false (ev_is_active (w)))
2469 return; 2705 return;
2470 2706
2471 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2707 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2472 2708
2473 evpipe_init (EV_A); 2709#if EV_MULTIPLICITY
2710 assert (("libev: a signal must not be attached to two different loops",
2711 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2474 2712
2475 EV_FREQUENT_CHECK; 2713 signals [w->signum - 1].loop = EV_A;
2714#endif
2476 2715
2716 EV_FREQUENT_CHECK;
2717
2718#if EV_USE_SIGNALFD
2719 if (sigfd == -2)
2477 { 2720 {
2478#ifndef _WIN32 2721 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2722 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2723 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2724
2484 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2725 if (sigfd >= 0)
2726 {
2727 fd_intern (sigfd); /* doing it twice will not hurt */
2485 2728
2486#ifndef _WIN32 2729 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2730
2488#endif 2731 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2732 ev_set_priority (&sigfd_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &sigfd_w);
2734 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2735 }
2489 } 2736 }
2737
2738 if (sigfd >= 0)
2739 {
2740 /* TODO: check .head */
2741 sigaddset (&sigfd_set, w->signum);
2742 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2743
2744 signalfd (sigfd, &sigfd_set, 0);
2745 }
2746#endif
2490 2747
2491 ev_start (EV_A_ (W)w, 1); 2748 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2749 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2750
2494 if (!((WL)w)->next) 2751 if (!((WL)w)->next)
2752# if EV_USE_SIGNALFD
2753 if (sigfd < 0) /*TODO*/
2754# endif
2495 { 2755 {
2496#if _WIN32 2756# if _WIN32
2497 signal (w->signum, ev_sighandler); 2757 signal (w->signum, ev_sighandler);
2498#else 2758# else
2499 struct sigaction sa; 2759 struct sigaction sa;
2760
2761 evpipe_init (EV_A);
2762
2500 sa.sa_handler = ev_sighandler; 2763 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2764 sigfillset (&sa.sa_mask);
2502 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2765 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2503 sigaction (w->signum, &sa, 0); 2766 sigaction (w->signum, &sa, 0);
2767
2768 sigemptyset (&sa.sa_mask);
2769 sigaddset (&sa.sa_mask, w->signum);
2770 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2504#endif 2771#endif
2505 } 2772 }
2506 2773
2507 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2508} 2775}
2509 2776
2510void noinline 2777void noinline
… …
2518 2785
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2786 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2787 ev_stop (EV_A_ (W)w);
2521 2788
2522 if (!signals [w->signum - 1].head) 2789 if (!signals [w->signum - 1].head)
2790 {
2791#if EV_MULTIPLICITY
2792 signals [w->signum - 1].loop = 0; /* unattach from signal */
2793#endif
2794#if EV_USE_SIGNALFD
2795 if (sigfd >= 0)
2796 {
2797 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2798 sigdelset (&sigfd_set, w->signum);
2799 signalfd (sigfd, &sigfd_set, 0);
2800 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2801 /*TODO: maybe unblock signal? */
2802 }
2803 else
2804#endif
2523 signal (w->signum, SIG_DFL); 2805 signal (w->signum, SIG_DFL);
2806 }
2524 2807
2525 EV_FREQUENT_CHECK; 2808 EV_FREQUENT_CHECK;
2526} 2809}
2527 2810
2528void 2811void
… …
2608 } 2891 }
2609 } 2892 }
2610 2893
2611 if (w->wd >= 0) 2894 if (w->wd >= 0)
2612 { 2895 {
2896 struct statfs sfs;
2897
2613 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2898 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2614 2899
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 2900 /* now local changes will be tracked by inotify, but remote changes won't */
2616 /* unless the filesystem it known to be local, we therefore still poll */ 2901 /* unless the filesystem it known to be local, we therefore still poll */
2617 /* also do poll on <2.6.25, but with normal frequency */ 2902 /* also do poll on <2.6.25, but with normal frequency */
2618 struct statfs sfs;
2619 2903
2620 if (fs_2625 && !statfs (w->path, &sfs)) 2904 if (fs_2625 && !statfs (w->path, &sfs))
2621 if (sfs.f_type == 0x1373 /* devfs */ 2905 if (sfs.f_type == 0x1373 /* devfs */
2622 || sfs.f_type == 0xEF53 /* ext2/3 */ 2906 || sfs.f_type == 0xEF53 /* ext2/3 */
2623 || sfs.f_type == 0x3153464a /* jfs */ 2907 || sfs.f_type == 0x3153464a /* jfs */
… …
2712 return; 2996 return;
2713 2997
2714 fs_2625 = 1; 2998 fs_2625 = 1;
2715} 2999}
2716 3000
3001inline_size int
3002infy_newfd (void)
3003{
3004#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3005 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3006 if (fd >= 0)
3007 return fd;
3008#endif
3009 return inotify_init ();
3010}
3011
2717inline_size void 3012inline_size void
2718infy_init (EV_P) 3013infy_init (EV_P)
2719{ 3014{
2720 if (fs_fd != -2) 3015 if (fs_fd != -2)
2721 return; 3016 return;
2722 3017
2723 fs_fd = -1; 3018 fs_fd = -1;
2724 3019
2725 check_2625 (EV_A); 3020 check_2625 (EV_A);
2726 3021
2727 fs_fd = inotify_init (); 3022 fs_fd = infy_newfd ();
2728 3023
2729 if (fs_fd >= 0) 3024 if (fs_fd >= 0)
2730 { 3025 {
3026 fd_intern (fs_fd);
2731 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2732 ev_set_priority (&fs_w, EV_MAXPRI); 3028 ev_set_priority (&fs_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &fs_w); 3029 ev_io_start (EV_A_ &fs_w);
2734 } 3030 }
2735} 3031}
… …
2740 int slot; 3036 int slot;
2741 3037
2742 if (fs_fd < 0) 3038 if (fs_fd < 0)
2743 return; 3039 return;
2744 3040
3041 ev_io_stop (EV_A_ &fs_w);
2745 close (fs_fd); 3042 close (fs_fd);
2746 fs_fd = inotify_init (); 3043 fs_fd = infy_newfd ();
3044
3045 if (fs_fd >= 0)
3046 {
3047 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w);
3050 }
2747 3051
2748 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2749 { 3053 {
2750 WL w_ = fs_hash [slot].head; 3054 WL w_ = fs_hash [slot].head;
2751 fs_hash [slot].head = 0; 3055 fs_hash [slot].head = 0;
… …
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3312embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3313{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3314 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3315
3012 { 3316 {
3013 struct ev_loop *loop = w->other; 3317 EV_P = w->other;
3014 3318
3015 while (fdchangecnt) 3319 while (fdchangecnt)
3016 { 3320 {
3017 fd_reify (EV_A); 3321 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3322 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3026 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));
3027 3331
3028 ev_embed_stop (EV_A_ w); 3332 ev_embed_stop (EV_A_ w);
3029 3333
3030 { 3334 {
3031 struct ev_loop *loop = w->other; 3335 EV_P = w->other;
3032 3336
3033 ev_loop_fork (EV_A); 3337 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3338 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3035 } 3339 }
3036 3340
… …
3050{ 3354{
3051 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
3052 return; 3356 return;
3053 3357
3054 { 3358 {
3055 struct ev_loop *loop = w->other; 3359 EV_P = w->other;
3056 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 ()));
3057 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);
3058 } 3362 }
3059 3363
3060 EV_FREQUENT_CHECK; 3364 EV_FREQUENT_CHECK;
… …
3172 3476
3173void 3477void
3174ev_async_send (EV_P_ ev_async *w) 3478ev_async_send (EV_P_ ev_async *w)
3175{ 3479{
3176 w->sent = 1; 3480 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3481 evpipe_write (EV_A_ &async_pending);
3178} 3482}
3179#endif 3483#endif
3180 3484
3181/*****************************************************************************/ 3485/*****************************************************************************/
3182 3486
… …
3331 if (types & EV_CHECK) 3635 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3636 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3637 cb (EV_A_ EV_CHECK, checks [i]);
3334 3638
3335 if (types & EV_SIGNAL) 3639 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3640 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3641 for (wl = signals [i].head; wl; )
3338 { 3642 {
3339 wn = wl->next; 3643 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3644 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3645 wl = wn;

Diff Legend

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