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

Comparing libev/ev.c (file contents):
Revision 1.291 by root, Mon Jun 29 04:44:18 2009 UTC vs.
Revision 1.314 by root, Wed Aug 26 17:31:20 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
263#ifndef EV_USE_EVENTFD 298#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 300# define EV_USE_EVENTFD 1
266# else 301# else
267# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
303# endif
304#endif
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
268# endif 311# endif
269#endif 312#endif
270 313
271#if 0 /* debugging */ 314#if 0 /* debugging */
272# define EV_VERIFY 3 315# define EV_VERIFY 3
339#endif 382#endif
340 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)
391# define inline_speed static noinline 473# define inline_speed static noinline
392#else 474#else
393# define inline_speed static inline 475# define inline_speed static inline
394#endif 476#endif
395 477
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 478#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
479
480#if EV_MINPRI == EV_MAXPRI
481# define ABSPRI(w) (((W)w), 0)
482#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 483# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
484#endif
398 485
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 486#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 487#define EMPTY2(a,b) /* used to suppress some warnings */
401 488
402typedef ev_watcher *W; 489typedef ev_watcher *W;
414 501
415#if EV_USE_MONOTONIC 502#if EV_USE_MONOTONIC
416static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 503static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
417#endif 504#endif
418 505
506#ifndef EV_FD_TO_WIN32_HANDLE
507# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
508#endif
509#ifndef EV_WIN32_HANDLE_TO_FD
510# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
511#endif
512#ifndef EV_WIN32_CLOSE_FD
513# define EV_WIN32_CLOSE_FD(fd) close (fd)
514#endif
515
419#ifdef _WIN32 516#ifdef _WIN32
420# include "ev_win32.c" 517# include "ev_win32.c"
421#endif 518#endif
422 519
423/*****************************************************************************/ 520/*****************************************************************************/
485#define ev_malloc(size) ev_realloc (0, (size)) 582#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 583#define ev_free(ptr) ev_realloc ((ptr), 0)
487 584
488/*****************************************************************************/ 585/*****************************************************************************/
489 586
587/* set in reify when reification needed */
588#define EV_ANFD_REIFY 1
589
490/* file descriptor info structure */ 590/* file descriptor info structure */
491typedef struct 591typedef struct
492{ 592{
493 WL head; 593 WL head;
494 unsigned char events; /* the events watched for */ 594 unsigned char events; /* the events watched for */
495 unsigned char reify; /* flag set when this ANFD needs reification */ 595 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 */ 596 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
497 unsigned char unused; 597 unsigned char unused;
498#if EV_USE_EPOLL 598#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 599 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 600#endif
562 662
563 static int ev_default_loop_ptr; 663 static int ev_default_loop_ptr;
564 664
565#endif 665#endif
566 666
667#if EV_MINIMAL < 2
668# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
669# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
670# define EV_INVOKE_PENDING invoke_cb (EV_A)
671#else
672# define EV_RELEASE_CB (void)0
673# define EV_ACQUIRE_CB (void)0
674# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
675#endif
676
677#define EVUNLOOP_RECURSE 0x80
678
567/*****************************************************************************/ 679/*****************************************************************************/
568 680
681#ifndef EV_HAVE_EV_TIME
569ev_tstamp 682ev_tstamp
570ev_time (void) 683ev_time (void)
571{ 684{
572#if EV_USE_REALTIME 685#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 686 if (expect_true (have_realtime))
580 693
581 struct timeval tv; 694 struct timeval tv;
582 gettimeofday (&tv, 0); 695 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 696 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 697}
698#endif
585 699
586inline_size ev_tstamp 700inline_size ev_tstamp
587get_clock (void) 701get_clock (void)
588{ 702{
589#if EV_USE_MONOTONIC 703#if EV_USE_MONOTONIC
625 739
626 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 742
629 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 743 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 745 /* by older ones */
632 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
633#endif 747#endif
634 } 748 }
635} 749}
743} 857}
744 858
745/*****************************************************************************/ 859/*****************************************************************************/
746 860
747inline_speed void 861inline_speed void
748fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
749{ 863{
750 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
751 ev_io *w; 865 ev_io *w;
752 866
753 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 867 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
757 if (ev) 871 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
759 } 873 }
760} 874}
761 875
876/* do not submit kernel events for fds that have reify set */
877/* because that means they changed while we were polling for new events */
878inline_speed void
879fd_event (EV_P_ int fd, int revents)
880{
881 ANFD *anfd = anfds + fd;
882
883 if (expect_true (!anfd->reify))
884 fd_event_nc (EV_A_ fd, revents);
885}
886
762void 887void
763ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 889{
765 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
767} 892}
768 893
769/* make sure the external fd watch events are in-sync */ 894/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 895/* with the kernel/libev internal state */
771inline_size void 896inline_size void
786 911
787#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
788 if (events) 913 if (events)
789 { 914 {
790 unsigned long arg; 915 unsigned long arg;
791 #ifdef EV_FD_TO_WIN32_HANDLE
792 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 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)); 917 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
797 } 918 }
798#endif 919#endif
799 920
800 { 921 {
871 992
872 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 994 if (anfds [fd].events)
874 { 995 {
875 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
876 return; 997 break;
877 } 998 }
878} 999}
879 1000
880/* usually called after fork if backend needs to re-arm all fds from scratch */ 1001/* usually called after fork if backend needs to re-arm all fds from scratch */
881static void noinline 1002static void noinline
886 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 1008 if (anfds [fd].events)
888 { 1009 {
889 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 1013 }
893} 1014}
894 1015
895/*****************************************************************************/ 1016/*****************************************************************************/
896 1017
971 1092
972 for (;;) 1093 for (;;)
973 { 1094 {
974 int c = k << 1; 1095 int c = k << 1;
975 1096
976 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
977 break; 1098 break;
978 1099
979 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1100 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
980 ? 1 : 0; 1101 ? 1 : 0;
981 1102
1017 1138
1018/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1019inline_size void 1140inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1021{ 1142{
1022 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1143 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1023 upheap (heap, k); 1144 upheap (heap, k);
1024 else 1145 else
1025 downheap (heap, N, k); 1146 downheap (heap, N, k);
1026} 1147}
1027 1148
1040/*****************************************************************************/ 1161/*****************************************************************************/
1041 1162
1042/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1043typedef struct 1164typedef struct
1044{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1045 WL head; 1170 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1171} ANSIG;
1048 1172
1049static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1174
1054/*****************************************************************************/ 1175/*****************************************************************************/
1055 1176
1056/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1057/* this is not fork-safe */ 1178/* this is not fork-safe */
1071evpipe_init (EV_P) 1192evpipe_init (EV_P)
1072{ 1193{
1073 if (!ev_is_active (&pipe_w)) 1194 if (!ev_is_active (&pipe_w))
1074 { 1195 {
1075#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1077 { 1202 {
1078 evpipe [0] = -1; 1203 evpipe [0] = -1;
1079 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1206 }
1082 else 1207 else
1083#endif 1208#endif
1084 { 1209 {
1121/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1123static void 1248static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1250{
1251 int i;
1252
1126#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1254 if (evfd >= 0)
1128 { 1255 {
1129 uint64_t counter; 1256 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1134 { 1261 {
1135 char dummy; 1262 char dummy;
1136 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1137 } 1264 }
1138 1265
1139 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1140 { 1267 {
1141 int signum; 1268 sig_pending = 0;
1142 gotsig = 0;
1143 1269
1144 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1273 }
1148 1274
1149#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1150 if (gotasync) 1276 if (async_pending)
1151 { 1277 {
1152 int i; 1278 async_pending = 0;
1153 gotasync = 0;
1154 1279
1155 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1157 { 1282 {
1158 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1166 1291
1167static void 1292static void
1168ev_sighandler (int signum) 1293ev_sighandler (int signum)
1169{ 1294{
1170#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1172#endif 1297#endif
1173 1298
1174#if _WIN32 1299#if _WIN32
1175 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1176#endif 1301#endif
1177 1302
1178 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1180} 1305}
1181 1306
1182void noinline 1307void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1184{ 1309{
1185 WL w; 1310 WL w;
1186 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1187#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1188 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1318 /* it is permissible to try to feed a signal to the wrong loop */
1189#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1320
1191 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1322 return;
1323#endif
1195 1324
1196 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1197 1326
1198 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 1329}
1330
1331#if EV_USE_SIGNALFD
1332static void
1333sigfdcb (EV_P_ ev_io *iow, int revents)
1334{
1335 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1336
1337 for (;;)
1338 {
1339 ssize_t res = read (sigfd, si, sizeof (si));
1340
1341 /* not ISO-C, as res might be -1, but works with SuS */
1342 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1343 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1344
1345 if (res < (ssize_t)sizeof (si))
1346 break;
1347 }
1348}
1349#endif
1201 1350
1202/*****************************************************************************/ 1351/*****************************************************************************/
1203 1352
1204static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1205 1354
1350ev_backend (EV_P) 1499ev_backend (EV_P)
1351{ 1500{
1352 return backend; 1501 return backend;
1353} 1502}
1354 1503
1504#if EV_MINIMAL < 2
1355unsigned int 1505unsigned int
1356ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1357{ 1507{
1358 return loop_count; 1508 return loop_count;
1359} 1509}
1360 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1361void 1517void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1519{
1364 io_blocktime = interval; 1520 io_blocktime = interval;
1365} 1521}
1367void 1523void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1525{
1370 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1371} 1527}
1528
1529void
1530ev_set_userdata (EV_P_ void *data)
1531{
1532 userdata = data;
1533}
1534
1535void *
1536ev_userdata (EV_P)
1537{
1538 return userdata;
1539}
1540
1541void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1542{
1543 invoke_cb = invoke_pending_cb;
1544}
1545
1546void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1547{
1548 release_cb = release;
1549 acquire_cb = acquire;
1550}
1551#endif
1372 1552
1373/* initialise a loop structure, must be zero-initialised */ 1553/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1554static void noinline
1375loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1376{ 1556{
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1575 have_monotonic = 1;
1396 } 1576 }
1397#endif 1577#endif
1398 1578
1579 /* pid check not overridable via env */
1580#ifndef _WIN32
1581 if (flags & EVFLAG_FORKCHECK)
1582 curpid = getpid ();
1583#endif
1584
1585 if (!(flags & EVFLAG_NOENV)
1586 && !enable_secure ()
1587 && getenv ("LIBEV_FLAGS"))
1588 flags = atoi (getenv ("LIBEV_FLAGS"));
1589
1399 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1591 mn_now = get_clock ();
1401 now_floor = mn_now; 1592 now_floor = mn_now;
1402 rtmn_diff = ev_rt_now - mn_now; 1593 rtmn_diff = ev_rt_now - mn_now;
1594#if EV_MINIMAL < 2
1595 invoke_cb = ev_invoke_pending;
1596#endif
1403 1597
1404 io_blocktime = 0.; 1598 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1406 backend = 0; 1600 backend = 0;
1407 backend_fd = -1; 1601 backend_fd = -1;
1408 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1409#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1410 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1608#endif
1412 1609#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1611#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1612
1424 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1426 1615
1427#if EV_USE_PORT 1616#if EV_USE_PORT
1453{ 1642{
1454 int i; 1643 int i;
1455 1644
1456 if (ev_is_active (&pipe_w)) 1645 if (ev_is_active (&pipe_w))
1457 { 1646 {
1458 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1649
1461#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1651 if (evfd >= 0)
1463 close (evfd); 1652 close (evfd);
1464#endif 1653#endif
1465 1654
1466 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1467 { 1656 {
1468 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1469 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1470 } 1659 }
1471 } 1660 }
1661
1662#if EV_USE_SIGNALFD
1663 if (ev_is_active (&sigfd_w))
1664 {
1665 /*ev_ref (EV_A);*/
1666 /*ev_io_stop (EV_A_ &sigfd_w);*/
1667
1668 close (sigfd);
1669 }
1670#endif
1472 1671
1473#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1673 if (fs_fd >= 0)
1475 close (fs_fd); 1674 close (fs_fd);
1476#endif 1675#endif
1500#if EV_IDLE_ENABLE 1699#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1700 array_free (idle, [i]);
1502#endif 1701#endif
1503 } 1702 }
1504 1703
1505 ev_free (anfds); anfdmax = 0; 1704 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1705
1507 /* have to use the microsoft-never-gets-it-right macro */ 1706 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1707 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1708 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1709 array_free (timer, EMPTY);
1545 1744
1546 if (ev_is_active (&pipe_w)) 1745 if (ev_is_active (&pipe_w))
1547 { 1746 {
1548 /* this "locks" the handlers against writing to the pipe */ 1747 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1748 /* while we modify the fd vars */
1550 gotsig = 1; 1749 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1750#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1751 async_pending = 1;
1553#endif 1752#endif
1554 1753
1555 ev_ref (EV_A); 1754 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1755 ev_io_stop (EV_A_ &pipe_w);
1557 1756
1560 close (evfd); 1759 close (evfd);
1561#endif 1760#endif
1562 1761
1563 if (evpipe [0] >= 0) 1762 if (evpipe [0] >= 0)
1564 { 1763 {
1565 close (evpipe [0]); 1764 EV_WIN32_CLOSE_FD (evpipe [0]);
1566 close (evpipe [1]); 1765 EV_WIN32_CLOSE_FD (evpipe [1]);
1567 } 1766 }
1568 1767
1569 evpipe_init (EV_A); 1768 evpipe_init (EV_A);
1570 /* now iterate over everything, in case we missed something */ 1769 /* now iterate over everything, in case we missed something */
1571 pipecb (EV_A_ &pipe_w, EV_READ); 1770 pipecb (EV_A_ &pipe_w, EV_READ);
1577#if EV_MULTIPLICITY 1776#if EV_MULTIPLICITY
1578 1777
1579struct ev_loop * 1778struct ev_loop *
1580ev_loop_new (unsigned int flags) 1779ev_loop_new (unsigned int flags)
1581{ 1780{
1582 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1781 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1583 1782
1584 memset (loop, 0, sizeof (struct ev_loop)); 1783 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1784 loop_init (EV_A_ flags);
1587 1785
1588 if (ev_backend (EV_A)) 1786 if (ev_backend (EV_A))
1589 return loop; 1787 return EV_A;
1590 1788
1591 return 0; 1789 return 0;
1592} 1790}
1593 1791
1594void 1792void
1601void 1799void
1602ev_loop_fork (EV_P) 1800ev_loop_fork (EV_P)
1603{ 1801{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1802 postfork = 1; /* must be in line with ev_default_fork */
1605} 1803}
1804#endif /* multiplicity */
1606 1805
1607#if EV_VERIFY 1806#if EV_VERIFY
1608static void noinline 1807static void noinline
1609verify_watcher (EV_P_ W w) 1808verify_watcher (EV_P_ W w)
1610{ 1809{
1638 verify_watcher (EV_A_ ws [cnt]); 1837 verify_watcher (EV_A_ ws [cnt]);
1639 } 1838 }
1640} 1839}
1641#endif 1840#endif
1642 1841
1842#if EV_MINIMAL < 2
1643void 1843void
1644ev_loop_verify (EV_P) 1844ev_loop_verify (EV_P)
1645{ 1845{
1646#if EV_VERIFY 1846#if EV_VERIFY
1647 int i; 1847 int i;
1696 assert (checkmax >= checkcnt); 1896 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1897 array_verify (EV_A_ (W *)checks, checkcnt);
1698 1898
1699# if 0 1899# if 0
1700 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1900 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) 1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1702# endif
1703#endif 1902# endif
1903#endif
1704} 1904}
1705 1905#endif
1706#endif /* multiplicity */
1707 1906
1708#if EV_MULTIPLICITY 1907#if EV_MULTIPLICITY
1709struct ev_loop * 1908struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1909ev_default_loop_init (unsigned int flags)
1711#else 1910#else
1714#endif 1913#endif
1715{ 1914{
1716 if (!ev_default_loop_ptr) 1915 if (!ev_default_loop_ptr)
1717 { 1916 {
1718#if EV_MULTIPLICITY 1917#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1918 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 1919#else
1721 ev_default_loop_ptr = 1; 1920 ev_default_loop_ptr = 1;
1722#endif 1921#endif
1723 1922
1724 loop_init (EV_A_ flags); 1923 loop_init (EV_A_ flags);
1741 1940
1742void 1941void
1743ev_default_destroy (void) 1942ev_default_destroy (void)
1744{ 1943{
1745#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 1945 EV_P = ev_default_loop_ptr;
1747#endif 1946#endif
1748 1947
1749 ev_default_loop_ptr = 0; 1948 ev_default_loop_ptr = 0;
1750 1949
1751#ifndef _WIN32 1950#ifndef _WIN32
1758 1957
1759void 1958void
1760ev_default_fork (void) 1959ev_default_fork (void)
1761{ 1960{
1762#if EV_MULTIPLICITY 1961#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 1962 EV_P = ev_default_loop_ptr;
1764#endif 1963#endif
1765 1964
1766 postfork = 1; /* must be in line with ev_loop_fork */ 1965 postfork = 1; /* must be in line with ev_loop_fork */
1767} 1966}
1768 1967
1772ev_invoke (EV_P_ void *w, int revents) 1971ev_invoke (EV_P_ void *w, int revents)
1773{ 1972{
1774 EV_CB_INVOKE ((W)w, revents); 1973 EV_CB_INVOKE ((W)w, revents);
1775} 1974}
1776 1975
1777inline_speed void 1976unsigned int
1778call_pending (EV_P) 1977ev_pending_count (EV_P)
1978{
1979 int pri;
1980 unsigned int count = 0;
1981
1982 for (pri = NUMPRI; pri--; )
1983 count += pendingcnt [pri];
1984
1985 return count;
1986}
1987
1988void noinline
1989ev_invoke_pending (EV_P)
1779{ 1990{
1780 int pri; 1991 int pri;
1781 1992
1782 for (pri = NUMPRI; pri--; ) 1993 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 1994 while (pendingcnt [pri])
2018 2229
2019 mn_now = ev_rt_now; 2230 mn_now = ev_rt_now;
2020 } 2231 }
2021} 2232}
2022 2233
2023static int loop_done;
2024
2025void 2234void
2026ev_loop (EV_P_ int flags) 2235ev_loop (EV_P_ int flags)
2027{ 2236{
2237#if EV_MINIMAL < 2
2238 ++loop_depth;
2239#endif
2240
2241 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2242
2028 loop_done = EVUNLOOP_CANCEL; 2243 loop_done = EVUNLOOP_CANCEL;
2029 2244
2030 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2245 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2031 2246
2032 do 2247 do
2033 { 2248 {
2034#if EV_VERIFY >= 2 2249#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2250 ev_loop_verify (EV_A);
2048 /* we might have forked, so queue fork handlers */ 2263 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2264 if (expect_false (postfork))
2050 if (forkcnt) 2265 if (forkcnt)
2051 { 2266 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2268 EV_INVOKE_PENDING;
2054 } 2269 }
2055#endif 2270#endif
2056 2271
2057 /* queue prepare watchers (and execute them) */ 2272 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2273 if (expect_false (preparecnt))
2059 { 2274 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2276 EV_INVOKE_PENDING;
2062 } 2277 }
2278
2279 if (expect_false (loop_done))
2280 break;
2063 2281
2064 /* we might have forked, so reify kernel state if necessary */ 2282 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2283 if (expect_false (postfork))
2066 loop_fork (EV_A); 2284 loop_fork (EV_A);
2067 2285
2073 ev_tstamp waittime = 0.; 2291 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2292 ev_tstamp sleeptime = 0.;
2075 2293
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2294 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2295 {
2296 /* remember old timestamp for io_blocktime calculation */
2297 ev_tstamp prev_mn_now = mn_now;
2298
2078 /* update time to cancel out callback processing overhead */ 2299 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2300 time_update (EV_A_ 1e100);
2080 2301
2081 waittime = MAX_BLOCKTIME; 2302 waittime = MAX_BLOCKTIME;
2082 2303
2092 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2313 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2093 if (waittime > to) waittime = to; 2314 if (waittime > to) waittime = to;
2094 } 2315 }
2095#endif 2316#endif
2096 2317
2318 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2319 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2320 waittime = timeout_blocktime;
2099 2321
2100 sleeptime = waittime - backend_fudge; 2322 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2323 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 2324 {
2325 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2326
2327 if (sleeptime > waittime - backend_fudge)
2328 sleeptime = waittime - backend_fudge;
2329
2330 if (expect_true (sleeptime > 0.))
2331 {
2107 ev_sleep (sleeptime); 2332 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2333 waittime -= sleeptime;
2334 }
2109 } 2335 }
2110 } 2336 }
2111 2337
2338#if EV_MINIMAL < 2
2112 ++loop_count; 2339 ++loop_count;
2340#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2342 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2344
2115 /* update ev_rt_now, do magic */ 2345 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2346 time_update (EV_A_ waittime + sleeptime);
2117 } 2347 }
2118 2348
2129 2359
2130 /* queue check watchers, to be executed first */ 2360 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2361 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2133 2363
2134 call_pending (EV_A); 2364 EV_INVOKE_PENDING;
2135 } 2365 }
2136 while (expect_true ( 2366 while (expect_true (
2137 activecnt 2367 activecnt
2138 && !loop_done 2368 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2369 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2370 ));
2141 2371
2142 if (loop_done == EVUNLOOP_ONE) 2372 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2373 loop_done = EVUNLOOP_CANCEL;
2374
2375#if EV_MINIMAL < 2
2376 --loop_depth;
2377#endif
2144} 2378}
2145 2379
2146void 2380void
2147ev_unloop (EV_P_ int how) 2381ev_unloop (EV_P_ int how)
2148{ 2382{
2199inline_size void 2433inline_size void
2200wlist_del (WL *head, WL elem) 2434wlist_del (WL *head, WL elem)
2201{ 2435{
2202 while (*head) 2436 while (*head)
2203 { 2437 {
2204 if (*head == elem) 2438 if (expect_true (*head == elem))
2205 { 2439 {
2206 *head = elem->next; 2440 *head = elem->next;
2207 return; 2441 break;
2208 } 2442 }
2209 2443
2210 head = &(*head)->next; 2444 head = &(*head)->next;
2211 } 2445 }
2212} 2446}
2240} 2474}
2241 2475
2242inline_size void 2476inline_size void
2243pri_adjust (EV_P_ W w) 2477pri_adjust (EV_P_ W w)
2244{ 2478{
2245 int pri = w->priority; 2479 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2480 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2481 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2482 ev_set_priority (w, pri);
2249} 2483}
2250 2484
2251inline_speed void 2485inline_speed void
2252ev_start (EV_P_ W w, int active) 2486ev_start (EV_P_ W w, int active)
2253{ 2487{
2280 2514
2281 ev_start (EV_A_ (W)w, 1); 2515 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2517 wlist_add (&anfds[fd].head, (WL)w);
2284 2518
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2519 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2520 w->events &= ~EV__IOFDSET;
2287 2521
2288 EV_FREQUENT_CHECK; 2522 EV_FREQUENT_CHECK;
2289} 2523}
2290 2524
2384 } 2618 }
2385 2619
2386 EV_FREQUENT_CHECK; 2620 EV_FREQUENT_CHECK;
2387} 2621}
2388 2622
2623ev_tstamp
2624ev_timer_remaining (EV_P_ ev_timer *w)
2625{
2626 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2627}
2628
2389#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2390void noinline 2630void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2631ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2632{
2393 if (expect_false (ev_is_active (w))) 2633 if (expect_false (ev_is_active (w)))
2460#endif 2700#endif
2461 2701
2462void noinline 2702void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2703ev_signal_start (EV_P_ ev_signal *w)
2464{ 2704{
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))) 2705 if (expect_false (ev_is_active (w)))
2469 return; 2706 return;
2470 2707
2471 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2708 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2472 2709
2473 evpipe_init (EV_A); 2710#if EV_MULTIPLICITY
2711 assert (("libev: a signal must not be attached to two different loops",
2712 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2474 2713
2475 EV_FREQUENT_CHECK; 2714 signals [w->signum - 1].loop = EV_A;
2715#endif
2476 2716
2717 EV_FREQUENT_CHECK;
2718
2719#if EV_USE_SIGNALFD
2720 if (sigfd == -2)
2477 { 2721 {
2478#ifndef _WIN32 2722 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2723 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2724 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2725
2484 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2726 if (sigfd >= 0)
2727 {
2728 fd_intern (sigfd); /* doing it twice will not hurt */
2485 2729
2486#ifndef _WIN32 2730 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2731
2488#endif 2732 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2733 ev_set_priority (&sigfd_w, EV_MAXPRI);
2734 ev_io_start (EV_A_ &sigfd_w);
2735 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2736 }
2489 } 2737 }
2738
2739 if (sigfd >= 0)
2740 {
2741 /* TODO: check .head */
2742 sigaddset (&sigfd_set, w->signum);
2743 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2744
2745 signalfd (sigfd, &sigfd_set, 0);
2746 }
2747#endif
2490 2748
2491 ev_start (EV_A_ (W)w, 1); 2749 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2750 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2751
2494 if (!((WL)w)->next) 2752 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/
2755# endif
2495 { 2756 {
2496#if _WIN32 2757# if _WIN32
2497 signal (w->signum, ev_sighandler); 2758 signal (w->signum, ev_sighandler);
2498#else 2759# else
2499 struct sigaction sa; 2760 struct sigaction sa;
2761
2762 evpipe_init (EV_A);
2763
2500 sa.sa_handler = ev_sighandler; 2764 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2765 sigfillset (&sa.sa_mask);
2502 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2766 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2503 sigaction (w->signum, &sa, 0); 2767 sigaction (w->signum, &sa, 0);
2768
2769 sigemptyset (&sa.sa_mask);
2770 sigaddset (&sa.sa_mask, w->signum);
2771 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2504#endif 2772#endif
2505 } 2773 }
2506 2774
2507 EV_FREQUENT_CHECK; 2775 EV_FREQUENT_CHECK;
2508} 2776}
2509 2777
2510void noinline 2778void noinline
2518 2786
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2787 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2788 ev_stop (EV_A_ (W)w);
2521 2789
2522 if (!signals [w->signum - 1].head) 2790 if (!signals [w->signum - 1].head)
2791 {
2792#if EV_MULTIPLICITY
2793 signals [w->signum - 1].loop = 0; /* unattach from signal */
2794#endif
2795#if EV_USE_SIGNALFD
2796 if (sigfd >= 0)
2797 {
2798 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2799 sigdelset (&sigfd_set, w->signum);
2800 signalfd (sigfd, &sigfd_set, 0);
2801 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2802 /*TODO: maybe unblock signal? */
2803 }
2804 else
2805#endif
2523 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2524 2808
2525 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2526} 2810}
2527 2811
2528void 2812void
2608 } 2892 }
2609 } 2893 }
2610 2894
2611 if (w->wd >= 0) 2895 if (w->wd >= 0)
2612 { 2896 {
2897 struct statfs sfs;
2898
2613 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2899 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2614 2900
2615 /* now local changes will be tracked by inotify, but remote changes won't */ 2901 /* 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 */ 2902 /* unless the filesystem it known to be local, we therefore still poll */
2617 /* also do poll on <2.6.25, but with normal frequency */ 2903 /* also do poll on <2.6.25, but with normal frequency */
2618 struct statfs sfs;
2619 2904
2620 if (fs_2625 && !statfs (w->path, &sfs)) 2905 if (fs_2625 && !statfs (w->path, &sfs))
2621 if (sfs.f_type == 0x1373 /* devfs */ 2906 if (sfs.f_type == 0x1373 /* devfs */
2622 || sfs.f_type == 0xEF53 /* ext2/3 */ 2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2623 || sfs.f_type == 0x3153464a /* jfs */ 2908 || sfs.f_type == 0x3153464a /* jfs */
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3293embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3294{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3295 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3296
3012 { 3297 {
3013 struct ev_loop *loop = w->other; 3298 EV_P = w->other;
3014 3299
3015 while (fdchangecnt) 3300 while (fdchangecnt)
3016 { 3301 {
3017 fd_reify (EV_A); 3302 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3303 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3026 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3311 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3027 3312
3028 ev_embed_stop (EV_A_ w); 3313 ev_embed_stop (EV_A_ w);
3029 3314
3030 { 3315 {
3031 struct ev_loop *loop = w->other; 3316 EV_P = w->other;
3032 3317
3033 ev_loop_fork (EV_A); 3318 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3319 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3035 } 3320 }
3036 3321
3050{ 3335{
3051 if (expect_false (ev_is_active (w))) 3336 if (expect_false (ev_is_active (w)))
3052 return; 3337 return;
3053 3338
3054 { 3339 {
3055 struct ev_loop *loop = w->other; 3340 EV_P = w->other;
3056 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3341 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); 3342 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3058 } 3343 }
3059 3344
3060 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
3172 3457
3173void 3458void
3174ev_async_send (EV_P_ ev_async *w) 3459ev_async_send (EV_P_ ev_async *w)
3175{ 3460{
3176 w->sent = 1; 3461 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3462 evpipe_write (EV_A_ &async_pending);
3178} 3463}
3179#endif 3464#endif
3180 3465
3181/*****************************************************************************/ 3466/*****************************************************************************/
3182 3467
3331 if (types & EV_CHECK) 3616 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3617 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3618 cb (EV_A_ EV_CHECK, checks [i]);
3334 3619
3335 if (types & EV_SIGNAL) 3620 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3621 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3622 for (wl = signals [i].head; wl; )
3338 { 3623 {
3339 wn = wl->next; 3624 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3625 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3626 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines