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

Comparing libev/ev.c (file contents):
Revision 1.292 by root, Mon Jun 29 07:22:56 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
569#ifndef EV_HAVE_EV_TIME 681#ifndef EV_HAVE_EV_TIME
570ev_tstamp 682ev_tstamp
571ev_time (void) 683ev_time (void)
627 739
628 tv.tv_sec = (time_t)delay; 740 tv.tv_sec = (time_t)delay;
629 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 741 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
630 742
631 /* 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 */
632 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 744 /* something not guaranteed by newer posix versions, but guaranteed */
633 /* by older ones */ 745 /* by older ones */
634 select (0, 0, 0, 0, &tv); 746 select (0, 0, 0, 0, &tv);
635#endif 747#endif
636 } 748 }
637} 749}
745} 857}
746 858
747/*****************************************************************************/ 859/*****************************************************************************/
748 860
749inline_speed void 861inline_speed void
750fd_event (EV_P_ int fd, int revents) 862fd_event_nc (EV_P_ int fd, int revents)
751{ 863{
752 ANFD *anfd = anfds + fd; 864 ANFD *anfd = anfds + fd;
753 ev_io *w; 865 ev_io *w;
754 866
755 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)
759 if (ev) 871 if (ev)
760 ev_feed_event (EV_A_ (W)w, ev); 872 ev_feed_event (EV_A_ (W)w, ev);
761 } 873 }
762} 874}
763 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
764void 887void
765ev_feed_fd_event (EV_P_ int fd, int revents) 888ev_feed_fd_event (EV_P_ int fd, int revents)
766{ 889{
767 if (fd >= 0 && fd < anfdmax) 890 if (fd >= 0 && fd < anfdmax)
768 fd_event (EV_A_ fd, revents); 891 fd_event_nc (EV_A_ fd, revents);
769} 892}
770 893
771/* make sure the external fd watch events are in-sync */ 894/* make sure the external fd watch events are in-sync */
772/* with the kernel/libev internal state */ 895/* with the kernel/libev internal state */
773inline_size void 896inline_size void
788 911
789#if EV_SELECT_IS_WINSOCKET 912#if EV_SELECT_IS_WINSOCKET
790 if (events) 913 if (events)
791 { 914 {
792 unsigned long arg; 915 unsigned long arg;
793 #ifdef EV_FD_TO_WIN32_HANDLE
794 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 916 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
795 #else
796 anfd->handle = _get_osfhandle (fd);
797 #endif
798 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));
799 } 918 }
800#endif 919#endif
801 920
802 { 921 {
873 992
874 for (fd = anfdmax; fd--; ) 993 for (fd = anfdmax; fd--; )
875 if (anfds [fd].events) 994 if (anfds [fd].events)
876 { 995 {
877 fd_kill (EV_A_ fd); 996 fd_kill (EV_A_ fd);
878 return; 997 break;
879 } 998 }
880} 999}
881 1000
882/* 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 */
883static void noinline 1002static void noinline
888 for (fd = 0; fd < anfdmax; ++fd) 1007 for (fd = 0; fd < anfdmax; ++fd)
889 if (anfds [fd].events) 1008 if (anfds [fd].events)
890 { 1009 {
891 anfds [fd].events = 0; 1010 anfds [fd].events = 0;
892 anfds [fd].emask = 0; 1011 anfds [fd].emask = 0;
893 fd_change (EV_A_ fd, EV__IOFDSET | 1); 1012 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
894 } 1013 }
895} 1014}
896 1015
897/*****************************************************************************/ 1016/*****************************************************************************/
898 1017
973 1092
974 for (;;) 1093 for (;;)
975 { 1094 {
976 int c = k << 1; 1095 int c = k << 1;
977 1096
978 if (c > N + HEAP0 - 1) 1097 if (c >= N + HEAP0)
979 break; 1098 break;
980 1099
981 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])
982 ? 1 : 0; 1101 ? 1 : 0;
983 1102
1019 1138
1020/* move an element suitably so it is in a correct place */ 1139/* move an element suitably so it is in a correct place */
1021inline_size void 1140inline_size void
1022adjustheap (ANHE *heap, int N, int k) 1141adjustheap (ANHE *heap, int N, int k)
1023{ 1142{
1024 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)]))
1025 upheap (heap, k); 1144 upheap (heap, k);
1026 else 1145 else
1027 downheap (heap, N, k); 1146 downheap (heap, N, k);
1028} 1147}
1029 1148
1042/*****************************************************************************/ 1161/*****************************************************************************/
1043 1162
1044/* associate signal watchers to a signal signal */ 1163/* associate signal watchers to a signal signal */
1045typedef struct 1164typedef struct
1046{ 1165{
1166 EV_ATOMIC_T pending;
1167#if EV_MULTIPLICITY
1168 EV_P;
1169#endif
1047 WL head; 1170 WL head;
1048 EV_ATOMIC_T gotsig;
1049} ANSIG; 1171} ANSIG;
1050 1172
1051static ANSIG *signals; 1173static ANSIG signals [EV_NSIG - 1];
1052static int signalmax;
1053
1054static EV_ATOMIC_T gotsig;
1055 1174
1056/*****************************************************************************/ 1175/*****************************************************************************/
1057 1176
1058/* used to prepare libev internal fd's */ 1177/* used to prepare libev internal fd's */
1059/* this is not fork-safe */ 1178/* this is not fork-safe */
1073evpipe_init (EV_P) 1192evpipe_init (EV_P)
1074{ 1193{
1075 if (!ev_is_active (&pipe_w)) 1194 if (!ev_is_active (&pipe_w))
1076 { 1195 {
1077#if EV_USE_EVENTFD 1196#if EV_USE_EVENTFD
1197 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1198 if (evfd < 0 && errno == EINVAL)
1078 if ((evfd = eventfd (0, 0)) >= 0) 1199 evfd = eventfd (0, 0);
1200
1201 if (evfd >= 0)
1079 { 1202 {
1080 evpipe [0] = -1; 1203 evpipe [0] = -1;
1081 fd_intern (evfd); 1204 fd_intern (evfd); /* doing it twice doesn't hurt */
1082 ev_io_set (&pipe_w, evfd, EV_READ); 1205 ev_io_set (&pipe_w, evfd, EV_READ);
1083 } 1206 }
1084 else 1207 else
1085#endif 1208#endif
1086 { 1209 {
1123/* called whenever the libev signal pipe */ 1246/* called whenever the libev signal pipe */
1124/* got some events (signal, async) */ 1247/* got some events (signal, async) */
1125static void 1248static void
1126pipecb (EV_P_ ev_io *iow, int revents) 1249pipecb (EV_P_ ev_io *iow, int revents)
1127{ 1250{
1251 int i;
1252
1128#if EV_USE_EVENTFD 1253#if EV_USE_EVENTFD
1129 if (evfd >= 0) 1254 if (evfd >= 0)
1130 { 1255 {
1131 uint64_t counter; 1256 uint64_t counter;
1132 read (evfd, &counter, sizeof (uint64_t)); 1257 read (evfd, &counter, sizeof (uint64_t));
1136 { 1261 {
1137 char dummy; 1262 char dummy;
1138 read (evpipe [0], &dummy, 1); 1263 read (evpipe [0], &dummy, 1);
1139 } 1264 }
1140 1265
1141 if (gotsig && ev_is_default_loop (EV_A)) 1266 if (sig_pending)
1142 { 1267 {
1143 int signum; 1268 sig_pending = 0;
1144 gotsig = 0;
1145 1269
1146 for (signum = signalmax; signum--; ) 1270 for (i = EV_NSIG - 1; i--; )
1147 if (signals [signum].gotsig) 1271 if (expect_false (signals [i].pending))
1148 ev_feed_signal_event (EV_A_ signum + 1); 1272 ev_feed_signal_event (EV_A_ i + 1);
1149 } 1273 }
1150 1274
1151#if EV_ASYNC_ENABLE 1275#if EV_ASYNC_ENABLE
1152 if (gotasync) 1276 if (async_pending)
1153 { 1277 {
1154 int i; 1278 async_pending = 0;
1155 gotasync = 0;
1156 1279
1157 for (i = asynccnt; i--; ) 1280 for (i = asynccnt; i--; )
1158 if (asyncs [i]->sent) 1281 if (asyncs [i]->sent)
1159 { 1282 {
1160 asyncs [i]->sent = 0; 1283 asyncs [i]->sent = 0;
1168 1291
1169static void 1292static void
1170ev_sighandler (int signum) 1293ev_sighandler (int signum)
1171{ 1294{
1172#if EV_MULTIPLICITY 1295#if EV_MULTIPLICITY
1173 struct ev_loop *loop = &default_loop_struct; 1296 EV_P = signals [signum - 1].loop;
1174#endif 1297#endif
1175 1298
1176#if _WIN32 1299#if _WIN32
1177 signal (signum, ev_sighandler); 1300 signal (signum, ev_sighandler);
1178#endif 1301#endif
1179 1302
1180 signals [signum - 1].gotsig = 1; 1303 signals [signum - 1].pending = 1;
1181 evpipe_write (EV_A_ &gotsig); 1304 evpipe_write (EV_A_ &sig_pending);
1182} 1305}
1183 1306
1184void noinline 1307void noinline
1185ev_feed_signal_event (EV_P_ int signum) 1308ev_feed_signal_event (EV_P_ int signum)
1186{ 1309{
1187 WL w; 1310 WL w;
1188 1311
1312 if (expect_false (signum <= 0 || signum > EV_NSIG))
1313 return;
1314
1315 --signum;
1316
1189#if EV_MULTIPLICITY 1317#if EV_MULTIPLICITY
1190 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 */
1191#endif 1319 /* or, likely more useful, feeding a signal nobody is waiting for */
1192 1320
1193 --signum; 1321 if (expect_false (signals [signum].loop != EV_A))
1194
1195 if (signum < 0 || signum >= signalmax)
1196 return; 1322 return;
1323#endif
1197 1324
1198 signals [signum].gotsig = 0; 1325 signals [signum].pending = 0;
1199 1326
1200 for (w = signals [signum].head; w; w = w->next) 1327 for (w = signals [signum].head; w; w = w->next)
1201 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1328 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1202} 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
1203 1350
1204/*****************************************************************************/ 1351/*****************************************************************************/
1205 1352
1206static WL childs [EV_PID_HASHSIZE]; 1353static WL childs [EV_PID_HASHSIZE];
1207 1354
1352ev_backend (EV_P) 1499ev_backend (EV_P)
1353{ 1500{
1354 return backend; 1501 return backend;
1355} 1502}
1356 1503
1504#if EV_MINIMAL < 2
1357unsigned int 1505unsigned int
1358ev_loop_count (EV_P) 1506ev_loop_count (EV_P)
1359{ 1507{
1360 return loop_count; 1508 return loop_count;
1361} 1509}
1362 1510
1511unsigned int
1512ev_loop_depth (EV_P)
1513{
1514 return loop_depth;
1515}
1516
1363void 1517void
1364ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1518ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1365{ 1519{
1366 io_blocktime = interval; 1520 io_blocktime = interval;
1367} 1521}
1369void 1523void
1370ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1524ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1371{ 1525{
1372 timeout_blocktime = interval; 1526 timeout_blocktime = interval;
1373} 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
1374 1552
1375/* initialise a loop structure, must be zero-initialised */ 1553/* initialise a loop structure, must be zero-initialised */
1376static void noinline 1554static void noinline
1377loop_init (EV_P_ unsigned int flags) 1555loop_init (EV_P_ unsigned int flags)
1378{ 1556{
1396 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1574 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1397 have_monotonic = 1; 1575 have_monotonic = 1;
1398 } 1576 }
1399#endif 1577#endif
1400 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
1401 ev_rt_now = ev_time (); 1590 ev_rt_now = ev_time ();
1402 mn_now = get_clock (); 1591 mn_now = get_clock ();
1403 now_floor = mn_now; 1592 now_floor = mn_now;
1404 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
1405 1597
1406 io_blocktime = 0.; 1598 io_blocktime = 0.;
1407 timeout_blocktime = 0.; 1599 timeout_blocktime = 0.;
1408 backend = 0; 1600 backend = 0;
1409 backend_fd = -1; 1601 backend_fd = -1;
1410 gotasync = 0; 1602 sig_pending = 0;
1603#if EV_ASYNC_ENABLE
1604 async_pending = 0;
1605#endif
1411#if EV_USE_INOTIFY 1606#if EV_USE_INOTIFY
1412 fs_fd = -2; 1607 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1413#endif 1608#endif
1414 1609#if EV_USE_SIGNALFD
1415 /* pid check not overridable via env */ 1610 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1416#ifndef _WIN32
1417 if (flags & EVFLAG_FORKCHECK)
1418 curpid = getpid ();
1419#endif 1611#endif
1420
1421 if (!(flags & EVFLAG_NOENV)
1422 && !enable_secure ()
1423 && getenv ("LIBEV_FLAGS"))
1424 flags = atoi (getenv ("LIBEV_FLAGS"));
1425 1612
1426 if (!(flags & 0x0000ffffU)) 1613 if (!(flags & 0x0000ffffU))
1427 flags |= ev_recommended_backends (); 1614 flags |= ev_recommended_backends ();
1428 1615
1429#if EV_USE_PORT 1616#if EV_USE_PORT
1455{ 1642{
1456 int i; 1643 int i;
1457 1644
1458 if (ev_is_active (&pipe_w)) 1645 if (ev_is_active (&pipe_w))
1459 { 1646 {
1460 ev_ref (EV_A); /* signal watcher */ 1647 /*ev_ref (EV_A);*/
1461 ev_io_stop (EV_A_ &pipe_w); 1648 /*ev_io_stop (EV_A_ &pipe_w);*/
1462 1649
1463#if EV_USE_EVENTFD 1650#if EV_USE_EVENTFD
1464 if (evfd >= 0) 1651 if (evfd >= 0)
1465 close (evfd); 1652 close (evfd);
1466#endif 1653#endif
1467 1654
1468 if (evpipe [0] >= 0) 1655 if (evpipe [0] >= 0)
1469 { 1656 {
1470 close (evpipe [0]); 1657 EV_WIN32_CLOSE_FD (evpipe [0]);
1471 close (evpipe [1]); 1658 EV_WIN32_CLOSE_FD (evpipe [1]);
1472 } 1659 }
1473 } 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
1474 1671
1475#if EV_USE_INOTIFY 1672#if EV_USE_INOTIFY
1476 if (fs_fd >= 0) 1673 if (fs_fd >= 0)
1477 close (fs_fd); 1674 close (fs_fd);
1478#endif 1675#endif
1502#if EV_IDLE_ENABLE 1699#if EV_IDLE_ENABLE
1503 array_free (idle, [i]); 1700 array_free (idle, [i]);
1504#endif 1701#endif
1505 } 1702 }
1506 1703
1507 ev_free (anfds); anfdmax = 0; 1704 ev_free (anfds); anfds = 0; anfdmax = 0;
1508 1705
1509 /* have to use the microsoft-never-gets-it-right macro */ 1706 /* have to use the microsoft-never-gets-it-right macro */
1510 array_free (rfeed, EMPTY); 1707 array_free (rfeed, EMPTY);
1511 array_free (fdchange, EMPTY); 1708 array_free (fdchange, EMPTY);
1512 array_free (timer, EMPTY); 1709 array_free (timer, EMPTY);
1547 1744
1548 if (ev_is_active (&pipe_w)) 1745 if (ev_is_active (&pipe_w))
1549 { 1746 {
1550 /* this "locks" the handlers against writing to the pipe */ 1747 /* this "locks" the handlers against writing to the pipe */
1551 /* while we modify the fd vars */ 1748 /* while we modify the fd vars */
1552 gotsig = 1; 1749 sig_pending = 1;
1553#if EV_ASYNC_ENABLE 1750#if EV_ASYNC_ENABLE
1554 gotasync = 1; 1751 async_pending = 1;
1555#endif 1752#endif
1556 1753
1557 ev_ref (EV_A); 1754 ev_ref (EV_A);
1558 ev_io_stop (EV_A_ &pipe_w); 1755 ev_io_stop (EV_A_ &pipe_w);
1559 1756
1562 close (evfd); 1759 close (evfd);
1563#endif 1760#endif
1564 1761
1565 if (evpipe [0] >= 0) 1762 if (evpipe [0] >= 0)
1566 { 1763 {
1567 close (evpipe [0]); 1764 EV_WIN32_CLOSE_FD (evpipe [0]);
1568 close (evpipe [1]); 1765 EV_WIN32_CLOSE_FD (evpipe [1]);
1569 } 1766 }
1570 1767
1571 evpipe_init (EV_A); 1768 evpipe_init (EV_A);
1572 /* now iterate over everything, in case we missed something */ 1769 /* now iterate over everything, in case we missed something */
1573 pipecb (EV_A_ &pipe_w, EV_READ); 1770 pipecb (EV_A_ &pipe_w, EV_READ);
1579#if EV_MULTIPLICITY 1776#if EV_MULTIPLICITY
1580 1777
1581struct ev_loop * 1778struct ev_loop *
1582ev_loop_new (unsigned int flags) 1779ev_loop_new (unsigned int flags)
1583{ 1780{
1584 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));
1585 1782
1586 memset (loop, 0, sizeof (struct ev_loop)); 1783 memset (EV_A, 0, sizeof (struct ev_loop));
1587
1588 loop_init (EV_A_ flags); 1784 loop_init (EV_A_ flags);
1589 1785
1590 if (ev_backend (EV_A)) 1786 if (ev_backend (EV_A))
1591 return loop; 1787 return EV_A;
1592 1788
1593 return 0; 1789 return 0;
1594} 1790}
1595 1791
1596void 1792void
1603void 1799void
1604ev_loop_fork (EV_P) 1800ev_loop_fork (EV_P)
1605{ 1801{
1606 postfork = 1; /* must be in line with ev_default_fork */ 1802 postfork = 1; /* must be in line with ev_default_fork */
1607} 1803}
1804#endif /* multiplicity */
1608 1805
1609#if EV_VERIFY 1806#if EV_VERIFY
1610static void noinline 1807static void noinline
1611verify_watcher (EV_P_ W w) 1808verify_watcher (EV_P_ W w)
1612{ 1809{
1640 verify_watcher (EV_A_ ws [cnt]); 1837 verify_watcher (EV_A_ ws [cnt]);
1641 } 1838 }
1642} 1839}
1643#endif 1840#endif
1644 1841
1842#if EV_MINIMAL < 2
1645void 1843void
1646ev_loop_verify (EV_P) 1844ev_loop_verify (EV_P)
1647{ 1845{
1648#if EV_VERIFY 1846#if EV_VERIFY
1649 int i; 1847 int i;
1698 assert (checkmax >= checkcnt); 1896 assert (checkmax >= checkcnt);
1699 array_verify (EV_A_ (W *)checks, checkcnt); 1897 array_verify (EV_A_ (W *)checks, checkcnt);
1700 1898
1701# if 0 1899# if 0
1702 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)
1703 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1901 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1704# endif
1705#endif 1902# endif
1903#endif
1706} 1904}
1707 1905#endif
1708#endif /* multiplicity */
1709 1906
1710#if EV_MULTIPLICITY 1907#if EV_MULTIPLICITY
1711struct ev_loop * 1908struct ev_loop *
1712ev_default_loop_init (unsigned int flags) 1909ev_default_loop_init (unsigned int flags)
1713#else 1910#else
1716#endif 1913#endif
1717{ 1914{
1718 if (!ev_default_loop_ptr) 1915 if (!ev_default_loop_ptr)
1719 { 1916 {
1720#if EV_MULTIPLICITY 1917#if EV_MULTIPLICITY
1721 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1918 EV_P = ev_default_loop_ptr = &default_loop_struct;
1722#else 1919#else
1723 ev_default_loop_ptr = 1; 1920 ev_default_loop_ptr = 1;
1724#endif 1921#endif
1725 1922
1726 loop_init (EV_A_ flags); 1923 loop_init (EV_A_ flags);
1743 1940
1744void 1941void
1745ev_default_destroy (void) 1942ev_default_destroy (void)
1746{ 1943{
1747#if EV_MULTIPLICITY 1944#if EV_MULTIPLICITY
1748 struct ev_loop *loop = ev_default_loop_ptr; 1945 EV_P = ev_default_loop_ptr;
1749#endif 1946#endif
1750 1947
1751 ev_default_loop_ptr = 0; 1948 ev_default_loop_ptr = 0;
1752 1949
1753#ifndef _WIN32 1950#ifndef _WIN32
1760 1957
1761void 1958void
1762ev_default_fork (void) 1959ev_default_fork (void)
1763{ 1960{
1764#if EV_MULTIPLICITY 1961#if EV_MULTIPLICITY
1765 struct ev_loop *loop = ev_default_loop_ptr; 1962 EV_P = ev_default_loop_ptr;
1766#endif 1963#endif
1767 1964
1768 postfork = 1; /* must be in line with ev_loop_fork */ 1965 postfork = 1; /* must be in line with ev_loop_fork */
1769} 1966}
1770 1967
1774ev_invoke (EV_P_ void *w, int revents) 1971ev_invoke (EV_P_ void *w, int revents)
1775{ 1972{
1776 EV_CB_INVOKE ((W)w, revents); 1973 EV_CB_INVOKE ((W)w, revents);
1777} 1974}
1778 1975
1779inline_speed void 1976unsigned int
1780call_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)
1781{ 1990{
1782 int pri; 1991 int pri;
1783 1992
1784 for (pri = NUMPRI; pri--; ) 1993 for (pri = NUMPRI; pri--; )
1785 while (pendingcnt [pri]) 1994 while (pendingcnt [pri])
2020 2229
2021 mn_now = ev_rt_now; 2230 mn_now = ev_rt_now;
2022 } 2231 }
2023} 2232}
2024 2233
2025static int loop_done;
2026
2027void 2234void
2028ev_loop (EV_P_ int flags) 2235ev_loop (EV_P_ int flags)
2029{ 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
2030 loop_done = EVUNLOOP_CANCEL; 2243 loop_done = EVUNLOOP_CANCEL;
2031 2244
2032 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 */
2033 2246
2034 do 2247 do
2035 { 2248 {
2036#if EV_VERIFY >= 2 2249#if EV_VERIFY >= 2
2037 ev_loop_verify (EV_A); 2250 ev_loop_verify (EV_A);
2050 /* we might have forked, so queue fork handlers */ 2263 /* we might have forked, so queue fork handlers */
2051 if (expect_false (postfork)) 2264 if (expect_false (postfork))
2052 if (forkcnt) 2265 if (forkcnt)
2053 { 2266 {
2054 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2267 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2055 call_pending (EV_A); 2268 EV_INVOKE_PENDING;
2056 } 2269 }
2057#endif 2270#endif
2058 2271
2059 /* queue prepare watchers (and execute them) */ 2272 /* queue prepare watchers (and execute them) */
2060 if (expect_false (preparecnt)) 2273 if (expect_false (preparecnt))
2061 { 2274 {
2062 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2275 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2063 call_pending (EV_A); 2276 EV_INVOKE_PENDING;
2064 } 2277 }
2278
2279 if (expect_false (loop_done))
2280 break;
2065 2281
2066 /* we might have forked, so reify kernel state if necessary */ 2282 /* we might have forked, so reify kernel state if necessary */
2067 if (expect_false (postfork)) 2283 if (expect_false (postfork))
2068 loop_fork (EV_A); 2284 loop_fork (EV_A);
2069 2285
2075 ev_tstamp waittime = 0.; 2291 ev_tstamp waittime = 0.;
2076 ev_tstamp sleeptime = 0.; 2292 ev_tstamp sleeptime = 0.;
2077 2293
2078 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2294 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2079 { 2295 {
2296 /* remember old timestamp for io_blocktime calculation */
2297 ev_tstamp prev_mn_now = mn_now;
2298
2080 /* update time to cancel out callback processing overhead */ 2299 /* update time to cancel out callback processing overhead */
2081 time_update (EV_A_ 1e100); 2300 time_update (EV_A_ 1e100);
2082 2301
2083 waittime = MAX_BLOCKTIME; 2302 waittime = MAX_BLOCKTIME;
2084 2303
2094 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;
2095 if (waittime > to) waittime = to; 2314 if (waittime > to) waittime = to;
2096 } 2315 }
2097#endif 2316#endif
2098 2317
2318 /* don't let timeouts decrease the waittime below timeout_blocktime */
2099 if (expect_false (waittime < timeout_blocktime)) 2319 if (expect_false (waittime < timeout_blocktime))
2100 waittime = timeout_blocktime; 2320 waittime = timeout_blocktime;
2101 2321
2102 sleeptime = waittime - backend_fudge; 2322 /* extra check because io_blocktime is commonly 0 */
2103
2104 if (expect_true (sleeptime > io_blocktime)) 2323 if (expect_false (io_blocktime))
2105 sleeptime = io_blocktime;
2106
2107 if (sleeptime)
2108 { 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 {
2109 ev_sleep (sleeptime); 2332 ev_sleep (sleeptime);
2110 waittime -= sleeptime; 2333 waittime -= sleeptime;
2334 }
2111 } 2335 }
2112 } 2336 }
2113 2337
2338#if EV_MINIMAL < 2
2114 ++loop_count; 2339 ++loop_count;
2340#endif
2341 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2115 backend_poll (EV_A_ waittime); 2342 backend_poll (EV_A_ waittime);
2343 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2116 2344
2117 /* update ev_rt_now, do magic */ 2345 /* update ev_rt_now, do magic */
2118 time_update (EV_A_ waittime + sleeptime); 2346 time_update (EV_A_ waittime + sleeptime);
2119 } 2347 }
2120 2348
2131 2359
2132 /* queue check watchers, to be executed first */ 2360 /* queue check watchers, to be executed first */
2133 if (expect_false (checkcnt)) 2361 if (expect_false (checkcnt))
2134 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2362 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2135 2363
2136 call_pending (EV_A); 2364 EV_INVOKE_PENDING;
2137 } 2365 }
2138 while (expect_true ( 2366 while (expect_true (
2139 activecnt 2367 activecnt
2140 && !loop_done 2368 && !loop_done
2141 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2369 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2142 )); 2370 ));
2143 2371
2144 if (loop_done == EVUNLOOP_ONE) 2372 if (loop_done == EVUNLOOP_ONE)
2145 loop_done = EVUNLOOP_CANCEL; 2373 loop_done = EVUNLOOP_CANCEL;
2374
2375#if EV_MINIMAL < 2
2376 --loop_depth;
2377#endif
2146} 2378}
2147 2379
2148void 2380void
2149ev_unloop (EV_P_ int how) 2381ev_unloop (EV_P_ int how)
2150{ 2382{
2201inline_size void 2433inline_size void
2202wlist_del (WL *head, WL elem) 2434wlist_del (WL *head, WL elem)
2203{ 2435{
2204 while (*head) 2436 while (*head)
2205 { 2437 {
2206 if (*head == elem) 2438 if (expect_true (*head == elem))
2207 { 2439 {
2208 *head = elem->next; 2440 *head = elem->next;
2209 return; 2441 break;
2210 } 2442 }
2211 2443
2212 head = &(*head)->next; 2444 head = &(*head)->next;
2213 } 2445 }
2214} 2446}
2242} 2474}
2243 2475
2244inline_size void 2476inline_size void
2245pri_adjust (EV_P_ W w) 2477pri_adjust (EV_P_ W w)
2246{ 2478{
2247 int pri = w->priority; 2479 int pri = ev_priority (w);
2248 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2480 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2249 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2481 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2250 w->priority = pri; 2482 ev_set_priority (w, pri);
2251} 2483}
2252 2484
2253inline_speed void 2485inline_speed void
2254ev_start (EV_P_ W w, int active) 2486ev_start (EV_P_ W w, int active)
2255{ 2487{
2282 2514
2283 ev_start (EV_A_ (W)w, 1); 2515 ev_start (EV_A_ (W)w, 1);
2284 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2516 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2285 wlist_add (&anfds[fd].head, (WL)w); 2517 wlist_add (&anfds[fd].head, (WL)w);
2286 2518
2287 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2519 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2288 w->events &= ~EV__IOFDSET; 2520 w->events &= ~EV__IOFDSET;
2289 2521
2290 EV_FREQUENT_CHECK; 2522 EV_FREQUENT_CHECK;
2291} 2523}
2292 2524
2386 } 2618 }
2387 2619
2388 EV_FREQUENT_CHECK; 2620 EV_FREQUENT_CHECK;
2389} 2621}
2390 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
2391#if EV_PERIODIC_ENABLE 2629#if EV_PERIODIC_ENABLE
2392void noinline 2630void noinline
2393ev_periodic_start (EV_P_ ev_periodic *w) 2631ev_periodic_start (EV_P_ ev_periodic *w)
2394{ 2632{
2395 if (expect_false (ev_is_active (w))) 2633 if (expect_false (ev_is_active (w)))
2462#endif 2700#endif
2463 2701
2464void noinline 2702void noinline
2465ev_signal_start (EV_P_ ev_signal *w) 2703ev_signal_start (EV_P_ ev_signal *w)
2466{ 2704{
2467#if EV_MULTIPLICITY
2468 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2469#endif
2470 if (expect_false (ev_is_active (w))) 2705 if (expect_false (ev_is_active (w)))
2471 return; 2706 return;
2472 2707
2473 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));
2474 2709
2475 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));
2476 2713
2477 EV_FREQUENT_CHECK; 2714 signals [w->signum - 1].loop = EV_A;
2715#endif
2478 2716
2717 EV_FREQUENT_CHECK;
2718
2719#if EV_USE_SIGNALFD
2720 if (sigfd == -2)
2479 { 2721 {
2480#ifndef _WIN32 2722 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2481 sigset_t full, prev; 2723 if (sigfd < 0 && errno == EINVAL)
2482 sigfillset (&full); 2724 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2483 sigprocmask (SIG_SETMASK, &full, &prev);
2484#endif
2485 2725
2486 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 */
2487 2729
2488#ifndef _WIN32 2730 sigemptyset (&sigfd_set);
2489 sigprocmask (SIG_SETMASK, &prev, 0); 2731
2490#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 }
2491 } 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
2492 2748
2493 ev_start (EV_A_ (W)w, 1); 2749 ev_start (EV_A_ (W)w, 1);
2494 wlist_add (&signals [w->signum - 1].head, (WL)w); 2750 wlist_add (&signals [w->signum - 1].head, (WL)w);
2495 2751
2496 if (!((WL)w)->next) 2752 if (!((WL)w)->next)
2753# if EV_USE_SIGNALFD
2754 if (sigfd < 0) /*TODO*/
2755# endif
2497 { 2756 {
2498#if _WIN32 2757# if _WIN32
2499 signal (w->signum, ev_sighandler); 2758 signal (w->signum, ev_sighandler);
2500#else 2759# else
2501 struct sigaction sa; 2760 struct sigaction sa;
2761
2762 evpipe_init (EV_A);
2763
2502 sa.sa_handler = ev_sighandler; 2764 sa.sa_handler = ev_sighandler;
2503 sigfillset (&sa.sa_mask); 2765 sigfillset (&sa.sa_mask);
2504 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 */
2505 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);
2506#endif 2772#endif
2507 } 2773 }
2508 2774
2509 EV_FREQUENT_CHECK; 2775 EV_FREQUENT_CHECK;
2510} 2776}
2511 2777
2512void noinline 2778void noinline
2520 2786
2521 wlist_del (&signals [w->signum - 1].head, (WL)w); 2787 wlist_del (&signals [w->signum - 1].head, (WL)w);
2522 ev_stop (EV_A_ (W)w); 2788 ev_stop (EV_A_ (W)w);
2523 2789
2524 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
2525 signal (w->signum, SIG_DFL); 2806 signal (w->signum, SIG_DFL);
2807 }
2526 2808
2527 EV_FREQUENT_CHECK; 2809 EV_FREQUENT_CHECK;
2528} 2810}
2529 2811
2530void 2812void
2610 } 2892 }
2611 } 2893 }
2612 2894
2613 if (w->wd >= 0) 2895 if (w->wd >= 0)
2614 { 2896 {
2897 struct statfs sfs;
2898
2615 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);
2616 2900
2617 /* 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 */
2618 /* 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 */
2619 /* also do poll on <2.6.25, but with normal frequency */ 2903 /* also do poll on <2.6.25, but with normal frequency */
2620 struct statfs sfs;
2621 2904
2622 if (fs_2625 && !statfs (w->path, &sfs)) 2905 if (fs_2625 && !statfs (w->path, &sfs))
2623 if (sfs.f_type == 0x1373 /* devfs */ 2906 if (sfs.f_type == 0x1373 /* devfs */
2624 || sfs.f_type == 0xEF53 /* ext2/3 */ 2907 || sfs.f_type == 0xEF53 /* ext2/3 */
2625 || sfs.f_type == 0x3153464a /* jfs */ 2908 || sfs.f_type == 0x3153464a /* jfs */
3010embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3293embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3011{ 3294{
3012 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3295 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3013 3296
3014 { 3297 {
3015 struct ev_loop *loop = w->other; 3298 EV_P = w->other;
3016 3299
3017 while (fdchangecnt) 3300 while (fdchangecnt)
3018 { 3301 {
3019 fd_reify (EV_A); 3302 fd_reify (EV_A);
3020 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3303 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3028 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));
3029 3312
3030 ev_embed_stop (EV_A_ w); 3313 ev_embed_stop (EV_A_ w);
3031 3314
3032 { 3315 {
3033 struct ev_loop *loop = w->other; 3316 EV_P = w->other;
3034 3317
3035 ev_loop_fork (EV_A); 3318 ev_loop_fork (EV_A);
3036 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3319 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3037 } 3320 }
3038 3321
3052{ 3335{
3053 if (expect_false (ev_is_active (w))) 3336 if (expect_false (ev_is_active (w)))
3054 return; 3337 return;
3055 3338
3056 { 3339 {
3057 struct ev_loop *loop = w->other; 3340 EV_P = w->other;
3058 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 ()));
3059 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);
3060 } 3343 }
3061 3344
3062 EV_FREQUENT_CHECK; 3345 EV_FREQUENT_CHECK;
3174 3457
3175void 3458void
3176ev_async_send (EV_P_ ev_async *w) 3459ev_async_send (EV_P_ ev_async *w)
3177{ 3460{
3178 w->sent = 1; 3461 w->sent = 1;
3179 evpipe_write (EV_A_ &gotasync); 3462 evpipe_write (EV_A_ &async_pending);
3180} 3463}
3181#endif 3464#endif
3182 3465
3183/*****************************************************************************/ 3466/*****************************************************************************/
3184 3467
3333 if (types & EV_CHECK) 3616 if (types & EV_CHECK)
3334 for (i = checkcnt; i--; ) 3617 for (i = checkcnt; i--; )
3335 cb (EV_A_ EV_CHECK, checks [i]); 3618 cb (EV_A_ EV_CHECK, checks [i]);
3336 3619
3337 if (types & EV_SIGNAL) 3620 if (types & EV_SIGNAL)
3338 for (i = 0; i < signalmax; ++i) 3621 for (i = 0; i < EV_NSIG - 1; ++i)
3339 for (wl = signals [i].head; wl; ) 3622 for (wl = signals [i].head; wl; )
3340 { 3623 {
3341 wn = wl->next; 3624 wn = wl->next;
3342 cb (EV_A_ EV_SIGNAL, wl); 3625 cb (EV_A_ EV_SIGNAL, wl);
3343 wl = wn; 3626 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines