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.313 by root, Wed Aug 19 23:44:51 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__ >= 9))
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
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
351#endif 408#endif
352 409
353/**/ 410/**/
354 411
355#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
391# define inline_speed static noinline 448# define inline_speed static noinline
392#else 449#else
393# define inline_speed static inline 450# define inline_speed static inline
394#endif 451#endif
395 452
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454
455#if EV_MINPRI == EV_MAXPRI
456# define ABSPRI(w) (((W)w), 0)
457#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
398 460
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
401 463
402typedef ev_watcher *W; 464typedef ev_watcher *W;
… …
414 476
415#if EV_USE_MONOTONIC 477#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 479#endif
418 480
481#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif
484#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
486#endif
487#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd)
489#endif
490
419#ifdef _WIN32 491#ifdef _WIN32
420# include "ev_win32.c" 492# include "ev_win32.c"
421#endif 493#endif
422 494
423/*****************************************************************************/ 495/*****************************************************************************/
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 557#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 558#define ev_free(ptr) ev_realloc ((ptr), 0)
487 559
488/*****************************************************************************/ 560/*****************************************************************************/
489 561
562/* set in reify when reification needed */
563#define EV_ANFD_REIFY 1
564
490/* file descriptor info structure */ 565/* file descriptor info structure */
491typedef struct 566typedef struct
492{ 567{
493 WL head; 568 WL head;
494 unsigned char events; /* the events watched for */ 569 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 570 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 */ 571 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 572 unsigned char unused;
498#if EV_USE_EPOLL 573#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 574 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 575#endif
… …
562 637
563 static int ev_default_loop_ptr; 638 static int ev_default_loop_ptr;
564 639
565#endif 640#endif
566 641
642#if EV_MINIMAL < 2
643# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
644# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
645# define EV_INVOKE_PENDING invoke_cb (EV_A)
646#else
647# define EV_RELEASE_CB (void)0
648# define EV_ACQUIRE_CB (void)0
649# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
650#endif
651
652#define EVUNLOOP_RECURSE 0x80
653
567/*****************************************************************************/ 654/*****************************************************************************/
568 655
656#ifndef EV_HAVE_EV_TIME
569ev_tstamp 657ev_tstamp
570ev_time (void) 658ev_time (void)
571{ 659{
572#if EV_USE_REALTIME 660#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 661 if (expect_true (have_realtime))
… …
580 668
581 struct timeval tv; 669 struct timeval tv;
582 gettimeofday (&tv, 0); 670 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 671 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 672}
673#endif
585 674
586inline_size ev_tstamp 675inline_size ev_tstamp
587get_clock (void) 676get_clock (void)
588{ 677{
589#if EV_USE_MONOTONIC 678#if EV_USE_MONOTONIC
… …
625 714
626 tv.tv_sec = (time_t)delay; 715 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 716 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 717
629 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 718 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 719 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 720 /* by older ones */
632 select (0, 0, 0, 0, &tv); 721 select (0, 0, 0, 0, &tv);
633#endif 722#endif
634 } 723 }
635} 724}
… …
743} 832}
744 833
745/*****************************************************************************/ 834/*****************************************************************************/
746 835
747inline_speed void 836inline_speed void
748fd_event (EV_P_ int fd, int revents) 837fd_event_nc (EV_P_ int fd, int revents)
749{ 838{
750 ANFD *anfd = anfds + fd; 839 ANFD *anfd = anfds + fd;
751 ev_io *w; 840 ev_io *w;
752 841
753 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 842 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
757 if (ev) 846 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 847 ev_feed_event (EV_A_ (W)w, ev);
759 } 848 }
760} 849}
761 850
851/* do not submit kernel events for fds that have reify set */
852/* because that means they changed while we were polling for new events */
853inline_speed void
854fd_event (EV_P_ int fd, int revents)
855{
856 ANFD *anfd = anfds + fd;
857
858 if (expect_true (!anfd->reify))
859 fd_event_nc (EV_A_ fd, revents);
860}
861
762void 862void
763ev_feed_fd_event (EV_P_ int fd, int revents) 863ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 864{
765 if (fd >= 0 && fd < anfdmax) 865 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 866 fd_event_nc (EV_A_ fd, revents);
767} 867}
768 868
769/* make sure the external fd watch events are in-sync */ 869/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 870/* with the kernel/libev internal state */
771inline_size void 871inline_size void
… …
786 886
787#if EV_SELECT_IS_WINSOCKET 887#if EV_SELECT_IS_WINSOCKET
788 if (events) 888 if (events)
789 { 889 {
790 unsigned long arg; 890 unsigned long arg;
791 #ifdef EV_FD_TO_WIN32_HANDLE
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 891 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)); 892 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
797 } 893 }
798#endif 894#endif
799 895
800 { 896 {
… …
871 967
872 for (fd = anfdmax; fd--; ) 968 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 969 if (anfds [fd].events)
874 { 970 {
875 fd_kill (EV_A_ fd); 971 fd_kill (EV_A_ fd);
876 return; 972 break;
877 } 973 }
878} 974}
879 975
880/* usually called after fork if backend needs to re-arm all fds from scratch */ 976/* usually called after fork if backend needs to re-arm all fds from scratch */
881static void noinline 977static void noinline
… …
886 for (fd = 0; fd < anfdmax; ++fd) 982 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 983 if (anfds [fd].events)
888 { 984 {
889 anfds [fd].events = 0; 985 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 986 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 988 }
893} 989}
894 990
895/*****************************************************************************/ 991/*****************************************************************************/
896 992
… …
971 1067
972 for (;;) 1068 for (;;)
973 { 1069 {
974 int c = k << 1; 1070 int c = k << 1;
975 1071
976 if (c > N + HEAP0 - 1) 1072 if (c >= N + HEAP0)
977 break; 1073 break;
978 1074
979 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1075 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
980 ? 1 : 0; 1076 ? 1 : 0;
981 1077
… …
1017 1113
1018/* move an element suitably so it is in a correct place */ 1114/* move an element suitably so it is in a correct place */
1019inline_size void 1115inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1116adjustheap (ANHE *heap, int N, int k)
1021{ 1117{
1022 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1118 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1023 upheap (heap, k); 1119 upheap (heap, k);
1024 else 1120 else
1025 downheap (heap, N, k); 1121 downheap (heap, N, k);
1026} 1122}
1027 1123
… …
1040/*****************************************************************************/ 1136/*****************************************************************************/
1041 1137
1042/* associate signal watchers to a signal signal */ 1138/* associate signal watchers to a signal signal */
1043typedef struct 1139typedef struct
1044{ 1140{
1141 EV_ATOMIC_T pending;
1142#if EV_MULTIPLICITY
1143 EV_P;
1144#endif
1045 WL head; 1145 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1146} ANSIG;
1048 1147
1049static ANSIG *signals; 1148static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1149
1054/*****************************************************************************/ 1150/*****************************************************************************/
1055 1151
1056/* used to prepare libev internal fd's */ 1152/* used to prepare libev internal fd's */
1057/* this is not fork-safe */ 1153/* this is not fork-safe */
… …
1071evpipe_init (EV_P) 1167evpipe_init (EV_P)
1072{ 1168{
1073 if (!ev_is_active (&pipe_w)) 1169 if (!ev_is_active (&pipe_w))
1074 { 1170 {
1075#if EV_USE_EVENTFD 1171#if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1174 evfd = eventfd (0, 0);
1175
1176 if (evfd >= 0)
1077 { 1177 {
1078 evpipe [0] = -1; 1178 evpipe [0] = -1;
1079 fd_intern (evfd); 1179 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1180 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1181 }
1082 else 1182 else
1083#endif 1183#endif
1084 { 1184 {
… …
1121/* called whenever the libev signal pipe */ 1221/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1222/* got some events (signal, async) */
1123static void 1223static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1224pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1225{
1226 int i;
1227
1126#if EV_USE_EVENTFD 1228#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1229 if (evfd >= 0)
1128 { 1230 {
1129 uint64_t counter; 1231 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1232 read (evfd, &counter, sizeof (uint64_t));
… …
1134 { 1236 {
1135 char dummy; 1237 char dummy;
1136 read (evpipe [0], &dummy, 1); 1238 read (evpipe [0], &dummy, 1);
1137 } 1239 }
1138 1240
1139 if (gotsig && ev_is_default_loop (EV_A)) 1241 if (sig_pending)
1140 { 1242 {
1141 int signum; 1243 sig_pending = 0;
1142 gotsig = 0;
1143 1244
1144 for (signum = signalmax; signum--; ) 1245 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1246 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1247 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1248 }
1148 1249
1149#if EV_ASYNC_ENABLE 1250#if EV_ASYNC_ENABLE
1150 if (gotasync) 1251 if (async_pending)
1151 { 1252 {
1152 int i; 1253 async_pending = 0;
1153 gotasync = 0;
1154 1254
1155 for (i = asynccnt; i--; ) 1255 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1256 if (asyncs [i]->sent)
1157 { 1257 {
1158 asyncs [i]->sent = 0; 1258 asyncs [i]->sent = 0;
… …
1166 1266
1167static void 1267static void
1168ev_sighandler (int signum) 1268ev_sighandler (int signum)
1169{ 1269{
1170#if EV_MULTIPLICITY 1270#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1271 EV_P = signals [signum - 1].loop;
1172#endif 1272#endif
1173 1273
1174#if _WIN32 1274#if _WIN32
1175 signal (signum, ev_sighandler); 1275 signal (signum, ev_sighandler);
1176#endif 1276#endif
1177 1277
1178 signals [signum - 1].gotsig = 1; 1278 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1279 evpipe_write (EV_A_ &sig_pending);
1180} 1280}
1181 1281
1182void noinline 1282void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1283ev_feed_signal_event (EV_P_ int signum)
1184{ 1284{
1185 WL w; 1285 WL w;
1186 1286
1287 if (expect_false (signum <= 0 || signum > EV_NSIG))
1288 return;
1289
1290 --signum;
1291
1187#if EV_MULTIPLICITY 1292#if EV_MULTIPLICITY
1188 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1293 /* it is permissible to try to feed a signal to the wrong loop */
1189#endif 1294 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1295
1191 --signum; 1296 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1297 return;
1298#endif
1195 1299
1196 signals [signum].gotsig = 0; 1300 signals [signum].pending = 0;
1197 1301
1198 for (w = signals [signum].head; w; w = w->next) 1302 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1303 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 1304}
1305
1306#if EV_USE_SIGNALFD
1307static void
1308sigfdcb (EV_P_ ev_io *iow, int revents)
1309{
1310 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1311
1312 for (;;)
1313 {
1314 ssize_t res = read (sigfd, si, sizeof (si));
1315
1316 /* not ISO-C, as res might be -1, but works with SuS */
1317 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1318 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1319
1320 if (res < (ssize_t)sizeof (si))
1321 break;
1322 }
1323}
1324#endif
1201 1325
1202/*****************************************************************************/ 1326/*****************************************************************************/
1203 1327
1204static WL childs [EV_PID_HASHSIZE]; 1328static WL childs [EV_PID_HASHSIZE];
1205 1329
… …
1350ev_backend (EV_P) 1474ev_backend (EV_P)
1351{ 1475{
1352 return backend; 1476 return backend;
1353} 1477}
1354 1478
1479#if EV_MINIMAL < 2
1355unsigned int 1480unsigned int
1356ev_loop_count (EV_P) 1481ev_loop_count (EV_P)
1357{ 1482{
1358 return loop_count; 1483 return loop_count;
1359} 1484}
1360 1485
1486unsigned int
1487ev_loop_depth (EV_P)
1488{
1489 return loop_depth;
1490}
1491
1361void 1492void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1494{
1364 io_blocktime = interval; 1495 io_blocktime = interval;
1365} 1496}
… …
1367void 1498void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1499ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1500{
1370 timeout_blocktime = interval; 1501 timeout_blocktime = interval;
1371} 1502}
1503
1504void
1505ev_set_userdata (EV_P_ void *data)
1506{
1507 userdata = data;
1508}
1509
1510void *
1511ev_userdata (EV_P)
1512{
1513 return userdata;
1514}
1515
1516void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1517{
1518 invoke_cb = invoke_pending_cb;
1519}
1520
1521void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1522{
1523 release_cb = release;
1524 acquire_cb = acquire;
1525}
1526#endif
1372 1527
1373/* initialise a loop structure, must be zero-initialised */ 1528/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1529static void noinline
1375loop_init (EV_P_ unsigned int flags) 1530loop_init (EV_P_ unsigned int flags)
1376{ 1531{
… …
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1549 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1550 have_monotonic = 1;
1396 } 1551 }
1397#endif 1552#endif
1398 1553
1554 /* pid check not overridable via env */
1555#ifndef _WIN32
1556 if (flags & EVFLAG_FORKCHECK)
1557 curpid = getpid ();
1558#endif
1559
1560 if (!(flags & EVFLAG_NOENV)
1561 && !enable_secure ()
1562 && getenv ("LIBEV_FLAGS"))
1563 flags = atoi (getenv ("LIBEV_FLAGS"));
1564
1399 ev_rt_now = ev_time (); 1565 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1566 mn_now = get_clock ();
1401 now_floor = mn_now; 1567 now_floor = mn_now;
1402 rtmn_diff = ev_rt_now - mn_now; 1568 rtmn_diff = ev_rt_now - mn_now;
1569#if EV_MINIMAL < 2
1570 invoke_cb = ev_invoke_pending;
1571#endif
1403 1572
1404 io_blocktime = 0.; 1573 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1574 timeout_blocktime = 0.;
1406 backend = 0; 1575 backend = 0;
1407 backend_fd = -1; 1576 backend_fd = -1;
1408 gotasync = 0; 1577 sig_pending = 0;
1578#if EV_ASYNC_ENABLE
1579 async_pending = 0;
1580#endif
1409#if EV_USE_INOTIFY 1581#if EV_USE_INOTIFY
1410 fs_fd = -2; 1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1583#endif
1412 1584#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1586#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1587
1424 if (!(flags & 0x0000ffffU)) 1588 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1589 flags |= ev_recommended_backends ();
1426 1590
1427#if EV_USE_PORT 1591#if EV_USE_PORT
… …
1453{ 1617{
1454 int i; 1618 int i;
1455 1619
1456 if (ev_is_active (&pipe_w)) 1620 if (ev_is_active (&pipe_w))
1457 { 1621 {
1458 ev_ref (EV_A); /* signal watcher */ 1622 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1623 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1624
1461#if EV_USE_EVENTFD 1625#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1626 if (evfd >= 0)
1463 close (evfd); 1627 close (evfd);
1464#endif 1628#endif
1465 1629
1466 if (evpipe [0] >= 0) 1630 if (evpipe [0] >= 0)
1467 { 1631 {
1468 close (evpipe [0]); 1632 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1633 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1634 }
1471 } 1635 }
1636
1637#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd);
1644 }
1645#endif
1472 1646
1473#if EV_USE_INOTIFY 1647#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1648 if (fs_fd >= 0)
1475 close (fs_fd); 1649 close (fs_fd);
1476#endif 1650#endif
… …
1500#if EV_IDLE_ENABLE 1674#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1675 array_free (idle, [i]);
1502#endif 1676#endif
1503 } 1677 }
1504 1678
1505 ev_free (anfds); anfdmax = 0; 1679 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1680
1507 /* have to use the microsoft-never-gets-it-right macro */ 1681 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1682 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1683 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1684 array_free (timer, EMPTY);
… …
1545 1719
1546 if (ev_is_active (&pipe_w)) 1720 if (ev_is_active (&pipe_w))
1547 { 1721 {
1548 /* this "locks" the handlers against writing to the pipe */ 1722 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1723 /* while we modify the fd vars */
1550 gotsig = 1; 1724 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1725#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1726 async_pending = 1;
1553#endif 1727#endif
1554 1728
1555 ev_ref (EV_A); 1729 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1730 ev_io_stop (EV_A_ &pipe_w);
1557 1731
… …
1560 close (evfd); 1734 close (evfd);
1561#endif 1735#endif
1562 1736
1563 if (evpipe [0] >= 0) 1737 if (evpipe [0] >= 0)
1564 { 1738 {
1565 close (evpipe [0]); 1739 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 1740 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 1741 }
1568 1742
1569 evpipe_init (EV_A); 1743 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 1744 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 1745 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1577#if EV_MULTIPLICITY 1751#if EV_MULTIPLICITY
1578 1752
1579struct ev_loop * 1753struct ev_loop *
1580ev_loop_new (unsigned int flags) 1754ev_loop_new (unsigned int flags)
1581{ 1755{
1582 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1756 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1583 1757
1584 memset (loop, 0, sizeof (struct ev_loop)); 1758 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1759 loop_init (EV_A_ flags);
1587 1760
1588 if (ev_backend (EV_A)) 1761 if (ev_backend (EV_A))
1589 return loop; 1762 return EV_A;
1590 1763
1591 return 0; 1764 return 0;
1592} 1765}
1593 1766
1594void 1767void
… …
1601void 1774void
1602ev_loop_fork (EV_P) 1775ev_loop_fork (EV_P)
1603{ 1776{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1777 postfork = 1; /* must be in line with ev_default_fork */
1605} 1778}
1779#endif /* multiplicity */
1606 1780
1607#if EV_VERIFY 1781#if EV_VERIFY
1608static void noinline 1782static void noinline
1609verify_watcher (EV_P_ W w) 1783verify_watcher (EV_P_ W w)
1610{ 1784{
… …
1638 verify_watcher (EV_A_ ws [cnt]); 1812 verify_watcher (EV_A_ ws [cnt]);
1639 } 1813 }
1640} 1814}
1641#endif 1815#endif
1642 1816
1817#if EV_MINIMAL < 2
1643void 1818void
1644ev_loop_verify (EV_P) 1819ev_loop_verify (EV_P)
1645{ 1820{
1646#if EV_VERIFY 1821#if EV_VERIFY
1647 int i; 1822 int i;
… …
1696 assert (checkmax >= checkcnt); 1871 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1872 array_verify (EV_A_ (W *)checks, checkcnt);
1698 1873
1699# if 0 1874# if 0
1700 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1875 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) 1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1702# endif 1877# endif
1703#endif 1878#endif
1704} 1879}
1705 1880#endif
1706#endif /* multiplicity */
1707 1881
1708#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1709struct ev_loop * 1883struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1884ev_default_loop_init (unsigned int flags)
1711#else 1885#else
… …
1714#endif 1888#endif
1715{ 1889{
1716 if (!ev_default_loop_ptr) 1890 if (!ev_default_loop_ptr)
1717 { 1891 {
1718#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1893 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 1894#else
1721 ev_default_loop_ptr = 1; 1895 ev_default_loop_ptr = 1;
1722#endif 1896#endif
1723 1897
1724 loop_init (EV_A_ flags); 1898 loop_init (EV_A_ flags);
… …
1741 1915
1742void 1916void
1743ev_default_destroy (void) 1917ev_default_destroy (void)
1744{ 1918{
1745#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 1920 EV_P = ev_default_loop_ptr;
1747#endif 1921#endif
1748 1922
1749 ev_default_loop_ptr = 0; 1923 ev_default_loop_ptr = 0;
1750 1924
1751#ifndef _WIN32 1925#ifndef _WIN32
… …
1758 1932
1759void 1933void
1760ev_default_fork (void) 1934ev_default_fork (void)
1761{ 1935{
1762#if EV_MULTIPLICITY 1936#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 1937 EV_P = ev_default_loop_ptr;
1764#endif 1938#endif
1765 1939
1766 postfork = 1; /* must be in line with ev_loop_fork */ 1940 postfork = 1; /* must be in line with ev_loop_fork */
1767} 1941}
1768 1942
… …
1772ev_invoke (EV_P_ void *w, int revents) 1946ev_invoke (EV_P_ void *w, int revents)
1773{ 1947{
1774 EV_CB_INVOKE ((W)w, revents); 1948 EV_CB_INVOKE ((W)w, revents);
1775} 1949}
1776 1950
1777inline_speed void 1951unsigned int
1778call_pending (EV_P) 1952ev_pending_count (EV_P)
1953{
1954 int pri;
1955 unsigned int count = 0;
1956
1957 for (pri = NUMPRI; pri--; )
1958 count += pendingcnt [pri];
1959
1960 return count;
1961}
1962
1963void noinline
1964ev_invoke_pending (EV_P)
1779{ 1965{
1780 int pri; 1966 int pri;
1781 1967
1782 for (pri = NUMPRI; pri--; ) 1968 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 1969 while (pendingcnt [pri])
… …
2018 2204
2019 mn_now = ev_rt_now; 2205 mn_now = ev_rt_now;
2020 } 2206 }
2021} 2207}
2022 2208
2023static int loop_done;
2024
2025void 2209void
2026ev_loop (EV_P_ int flags) 2210ev_loop (EV_P_ int flags)
2027{ 2211{
2212#if EV_MINIMAL < 2
2213 ++loop_depth;
2214#endif
2215
2216 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2217
2028 loop_done = EVUNLOOP_CANCEL; 2218 loop_done = EVUNLOOP_CANCEL;
2029 2219
2030 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2220 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2031 2221
2032 do 2222 do
2033 { 2223 {
2034#if EV_VERIFY >= 2 2224#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2225 ev_loop_verify (EV_A);
… …
2048 /* we might have forked, so queue fork handlers */ 2238 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2239 if (expect_false (postfork))
2050 if (forkcnt) 2240 if (forkcnt)
2051 { 2241 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2243 EV_INVOKE_PENDING;
2054 } 2244 }
2055#endif 2245#endif
2056 2246
2057 /* queue prepare watchers (and execute them) */ 2247 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2248 if (expect_false (preparecnt))
2059 { 2249 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2251 EV_INVOKE_PENDING;
2062 } 2252 }
2253
2254 if (expect_false (loop_done))
2255 break;
2063 2256
2064 /* we might have forked, so reify kernel state if necessary */ 2257 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2258 if (expect_false (postfork))
2066 loop_fork (EV_A); 2259 loop_fork (EV_A);
2067 2260
… …
2073 ev_tstamp waittime = 0.; 2266 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2267 ev_tstamp sleeptime = 0.;
2075 2268
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2269 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2270 {
2271 /* remember old timestamp for io_blocktime calculation */
2272 ev_tstamp prev_mn_now = mn_now;
2273
2078 /* update time to cancel out callback processing overhead */ 2274 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2275 time_update (EV_A_ 1e100);
2080 2276
2081 waittime = MAX_BLOCKTIME; 2277 waittime = MAX_BLOCKTIME;
2082 2278
… …
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2288 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2093 if (waittime > to) waittime = to; 2289 if (waittime > to) waittime = to;
2094 } 2290 }
2095#endif 2291#endif
2096 2292
2293 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2294 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2295 waittime = timeout_blocktime;
2099 2296
2100 sleeptime = waittime - backend_fudge; 2297 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2298 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2299 {
2300 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2301
2302 if (sleeptime > waittime - backend_fudge)
2303 sleeptime = waittime - backend_fudge;
2304
2305 if (expect_true (sleeptime > 0.))
2306 {
2107 ev_sleep (sleeptime); 2307 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2308 waittime -= sleeptime;
2309 }
2109 } 2310 }
2110 } 2311 }
2111 2312
2313#if EV_MINIMAL < 2
2112 ++loop_count; 2314 ++loop_count;
2315#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2317 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2319
2115 /* update ev_rt_now, do magic */ 2320 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2321 time_update (EV_A_ waittime + sleeptime);
2117 } 2322 }
2118 2323
… …
2129 2334
2130 /* queue check watchers, to be executed first */ 2335 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2336 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2133 2338
2134 call_pending (EV_A); 2339 EV_INVOKE_PENDING;
2135 } 2340 }
2136 while (expect_true ( 2341 while (expect_true (
2137 activecnt 2342 activecnt
2138 && !loop_done 2343 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2344 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2345 ));
2141 2346
2142 if (loop_done == EVUNLOOP_ONE) 2347 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2348 loop_done = EVUNLOOP_CANCEL;
2349
2350#if EV_MINIMAL < 2
2351 --loop_depth;
2352#endif
2144} 2353}
2145 2354
2146void 2355void
2147ev_unloop (EV_P_ int how) 2356ev_unloop (EV_P_ int how)
2148{ 2357{
… …
2199inline_size void 2408inline_size void
2200wlist_del (WL *head, WL elem) 2409wlist_del (WL *head, WL elem)
2201{ 2410{
2202 while (*head) 2411 while (*head)
2203 { 2412 {
2204 if (*head == elem) 2413 if (expect_true (*head == elem))
2205 { 2414 {
2206 *head = elem->next; 2415 *head = elem->next;
2207 return; 2416 break;
2208 } 2417 }
2209 2418
2210 head = &(*head)->next; 2419 head = &(*head)->next;
2211 } 2420 }
2212} 2421}
… …
2240} 2449}
2241 2450
2242inline_size void 2451inline_size void
2243pri_adjust (EV_P_ W w) 2452pri_adjust (EV_P_ W w)
2244{ 2453{
2245 int pri = w->priority; 2454 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2455 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2456 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2457 ev_set_priority (w, pri);
2249} 2458}
2250 2459
2251inline_speed void 2460inline_speed void
2252ev_start (EV_P_ W w, int active) 2461ev_start (EV_P_ W w, int active)
2253{ 2462{
… …
2280 2489
2281 ev_start (EV_A_ (W)w, 1); 2490 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2492 wlist_add (&anfds[fd].head, (WL)w);
2284 2493
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2494 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2495 w->events &= ~EV__IOFDSET;
2287 2496
2288 EV_FREQUENT_CHECK; 2497 EV_FREQUENT_CHECK;
2289} 2498}
2290 2499
… …
2384 } 2593 }
2385 2594
2386 EV_FREQUENT_CHECK; 2595 EV_FREQUENT_CHECK;
2387} 2596}
2388 2597
2598ev_tstamp
2599ev_timer_remaining (EV_P_ ev_timer *w)
2600{
2601 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2602}
2603
2389#if EV_PERIODIC_ENABLE 2604#if EV_PERIODIC_ENABLE
2390void noinline 2605void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2606ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2607{
2393 if (expect_false (ev_is_active (w))) 2608 if (expect_false (ev_is_active (w)))
… …
2460#endif 2675#endif
2461 2676
2462void noinline 2677void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2678ev_signal_start (EV_P_ ev_signal *w)
2464{ 2679{
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))) 2680 if (expect_false (ev_is_active (w)))
2469 return; 2681 return;
2470 2682
2471 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2683 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2472 2684
2473 evpipe_init (EV_A); 2685#if EV_MULTIPLICITY
2686 assert (("libev: a signal must not be attached to two different loops",
2687 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2474 2688
2475 EV_FREQUENT_CHECK; 2689 signals [w->signum - 1].loop = EV_A;
2690#endif
2476 2691
2692 EV_FREQUENT_CHECK;
2693
2694#if EV_USE_SIGNALFD
2695 if (sigfd == -2)
2477 { 2696 {
2478#ifndef _WIN32 2697 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2698 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2699 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2700
2484 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2701 if (sigfd >= 0)
2702 {
2703 fd_intern (sigfd); /* doing it twice will not hurt */
2485 2704
2486#ifndef _WIN32 2705 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2706
2488#endif 2707 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2708 ev_set_priority (&sigfd_w, EV_MAXPRI);
2709 ev_io_start (EV_A_ &sigfd_w);
2710 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2711 }
2489 } 2712 }
2713
2714 if (sigfd >= 0)
2715 {
2716 /* TODO: check .head */
2717 sigaddset (&sigfd_set, w->signum);
2718 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2719
2720 signalfd (sigfd, &sigfd_set, 0);
2721 }
2722#endif
2490 2723
2491 ev_start (EV_A_ (W)w, 1); 2724 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2725 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2726
2494 if (!((WL)w)->next) 2727 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/
2730# endif
2495 { 2731 {
2496#if _WIN32 2732# if _WIN32
2497 signal (w->signum, ev_sighandler); 2733 signal (w->signum, ev_sighandler);
2498#else 2734# else
2499 struct sigaction sa; 2735 struct sigaction sa;
2736
2737 evpipe_init (EV_A);
2738
2500 sa.sa_handler = ev_sighandler; 2739 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2740 sigfillset (&sa.sa_mask);
2502 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2741 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2503 sigaction (w->signum, &sa, 0); 2742 sigaction (w->signum, &sa, 0);
2743
2744 sigemptyset (&sa.sa_mask);
2745 sigaddset (&sa.sa_mask, w->signum);
2746 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2504#endif 2747#endif
2505 } 2748 }
2506 2749
2507 EV_FREQUENT_CHECK; 2750 EV_FREQUENT_CHECK;
2508} 2751}
2509 2752
2510void noinline 2753void noinline
… …
2518 2761
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2762 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2763 ev_stop (EV_A_ (W)w);
2521 2764
2522 if (!signals [w->signum - 1].head) 2765 if (!signals [w->signum - 1].head)
2766 {
2767#if EV_MULTIPLICITY
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif
2770#if EV_USE_SIGNALFD
2771 if (sigfd >= 0)
2772 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2774 sigdelset (&sigfd_set, w->signum);
2775 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2777 /*TODO: maybe unblock signal? */
2778 }
2779 else
2780#endif
2523 signal (w->signum, SIG_DFL); 2781 signal (w->signum, SIG_DFL);
2782 }
2524 2783
2525 EV_FREQUENT_CHECK; 2784 EV_FREQUENT_CHECK;
2526} 2785}
2527 2786
2528void 2787void
… …
2608 } 2867 }
2609 } 2868 }
2610 2869
2611 if (w->wd >= 0) 2870 if (w->wd >= 0)
2612 { 2871 {
2872 struct statfs sfs;
2873
2613 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2614 2875
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 2876 /* 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 */ 2877 /* unless the filesystem it known to be local, we therefore still poll */
2617 /* also do poll on <2.6.25, but with normal frequency */ 2878 /* also do poll on <2.6.25, but with normal frequency */
2618 struct statfs sfs;
2619 2879
2620 if (fs_2625 && !statfs (w->path, &sfs)) 2880 if (fs_2625 && !statfs (w->path, &sfs))
2621 if (sfs.f_type == 0x1373 /* devfs */ 2881 if (sfs.f_type == 0x1373 /* devfs */
2622 || sfs.f_type == 0xEF53 /* ext2/3 */ 2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2623 || sfs.f_type == 0x3153464a /* jfs */ 2883 || sfs.f_type == 0x3153464a /* jfs */
… …
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3269{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3270 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3271
3012 { 3272 {
3013 struct ev_loop *loop = w->other; 3273 EV_P = w->other;
3014 3274
3015 while (fdchangecnt) 3275 while (fdchangecnt)
3016 { 3276 {
3017 fd_reify (EV_A); 3277 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3026 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3286 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3027 3287
3028 ev_embed_stop (EV_A_ w); 3288 ev_embed_stop (EV_A_ w);
3029 3289
3030 { 3290 {
3031 struct ev_loop *loop = w->other; 3291 EV_P = w->other;
3032 3292
3033 ev_loop_fork (EV_A); 3293 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3035 } 3295 }
3036 3296
… …
3050{ 3310{
3051 if (expect_false (ev_is_active (w))) 3311 if (expect_false (ev_is_active (w)))
3052 return; 3312 return;
3053 3313
3054 { 3314 {
3055 struct ev_loop *loop = w->other; 3315 EV_P = w->other;
3056 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3316 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); 3317 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3058 } 3318 }
3059 3319
3060 EV_FREQUENT_CHECK; 3320 EV_FREQUENT_CHECK;
… …
3172 3432
3173void 3433void
3174ev_async_send (EV_P_ ev_async *w) 3434ev_async_send (EV_P_ ev_async *w)
3175{ 3435{
3176 w->sent = 1; 3436 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3437 evpipe_write (EV_A_ &async_pending);
3178} 3438}
3179#endif 3439#endif
3180 3440
3181/*****************************************************************************/ 3441/*****************************************************************************/
3182 3442
… …
3331 if (types & EV_CHECK) 3591 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3592 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3593 cb (EV_A_ EV_CHECK, checks [i]);
3334 3594
3335 if (types & EV_SIGNAL) 3595 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3596 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3597 for (wl = signals [i].head; wl; )
3338 { 3598 {
3339 wn = wl->next; 3599 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3600 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3601 wl = wn;

Diff Legend

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