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

Comparing libev/ev.c (file contents):
Revision 1.288 by root, Sat Apr 25 14:12:48 2009 UTC vs.
Revision 1.312 by root, Wed Aug 12 18:48:17 2009 UTC

57# endif 57# endif
58# ifndef EV_USE_MONOTONIC 58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1 59# define EV_USE_MONOTONIC 1
60# endif 60# endif
61# endif 61# endif
62# elif !defined(EV_USE_CLOCK_SYSCALL)
63# define EV_USE_CLOCK_SYSCALL 0
62# endif 64# endif
63 65
64# if HAVE_CLOCK_GETTIME 66# if HAVE_CLOCK_GETTIME
65# ifndef EV_USE_MONOTONIC 67# ifndef EV_USE_MONOTONIC
66# define EV_USE_MONOTONIC 1 68# define EV_USE_MONOTONIC 1
131# else 133# else
132# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
133# endif 135# endif
134# endif 136# endif
135 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
136# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
137# if HAVE_EVENTFD 147# if HAVE_EVENTFD
138# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
139# else 149# else
140# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
176# endif 186# endif
177#endif 187#endif
178 188
179/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
180 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
181#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
184# else 221# else
185# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
264# else 301# else
265# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
266# endif 303# endif
267#endif 304#endif
268 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
269#if 0 /* debugging */ 314#if 0 /* debugging */
270# define EV_VERIFY 3 315# define EV_VERIFY 3
271# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
272# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
273#endif 318#endif
280# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
281#endif 326#endif
282 327
283#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
284# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
330#endif
331
332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
333/* which makes programs even slower. might work on other unices, too. */
334#if EV_USE_CLOCK_SYSCALL
335# include <syscall.h>
336# ifdef SYS_clock_gettime
337# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
338# undef EV_USE_MONOTONIC
339# define EV_USE_MONOTONIC 1
340# else
341# undef EV_USE_CLOCK_SYSCALL
342# define EV_USE_CLOCK_SYSCALL 0
343# endif
285#endif 344#endif
286 345
287/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
288 347
289#ifndef CLOCK_MONOTONIC 348#ifndef CLOCK_MONOTONIC
320 379
321#if EV_SELECT_IS_WINSOCKET 380#if EV_SELECT_IS_WINSOCKET
322# include <winsock.h> 381# include <winsock.h>
323#endif 382#endif
324 383
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
332#endif
333
334#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
336# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
337# ifdef __cplusplus 397# ifdef __cplusplus
338extern "C" { 398extern "C" {
339# endif 399# endif
340int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
341# ifdef __cplusplus 401# ifdef __cplusplus
342} 402}
343# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
344#endif 408#endif
345 409
346/**/ 410/**/
347 411
348#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
384# define inline_speed static noinline 448# define inline_speed static noinline
385#else 449#else
386# define inline_speed static inline 450# define inline_speed static inline
387#endif 451#endif
388 452
389#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
390#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
391 460
392#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
393#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
394 463
395typedef ev_watcher *W; 464typedef ev_watcher *W;
478#define ev_malloc(size) ev_realloc (0, (size)) 547#define ev_malloc(size) ev_realloc (0, (size))
479#define ev_free(ptr) ev_realloc ((ptr), 0) 548#define ev_free(ptr) ev_realloc ((ptr), 0)
480 549
481/*****************************************************************************/ 550/*****************************************************************************/
482 551
552/* set in reify when reification needed */
553#define EV_ANFD_REIFY 1
554
483/* file descriptor info structure */ 555/* file descriptor info structure */
484typedef struct 556typedef struct
485{ 557{
486 WL head; 558 WL head;
487 unsigned char events; /* the events watched for */ 559 unsigned char events; /* the events watched for */
488 unsigned char reify; /* flag set when this ANFD needs reification */ 560 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
489 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 561 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
490 unsigned char unused; 562 unsigned char unused;
491#if EV_USE_EPOLL 563#if EV_USE_EPOLL
492 unsigned int egen; /* generation counter to counter epoll bugs */ 564 unsigned int egen; /* generation counter to counter epoll bugs */
493#endif 565#endif
555 627
556 static int ev_default_loop_ptr; 628 static int ev_default_loop_ptr;
557 629
558#endif 630#endif
559 631
632#if EV_MINIMAL < 2
633# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
634# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
635# define EV_INVOKE_PENDING invoke_cb (EV_A)
636#else
637# define EV_RELEASE_CB (void)0
638# define EV_ACQUIRE_CB (void)0
639# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
640#endif
641
642#define EVUNLOOP_RECURSE 0x80
643
560/*****************************************************************************/ 644/*****************************************************************************/
561 645
646#ifndef EV_HAVE_EV_TIME
562ev_tstamp 647ev_tstamp
563ev_time (void) 648ev_time (void)
564{ 649{
565#if EV_USE_REALTIME 650#if EV_USE_REALTIME
566 if (expect_true (have_realtime)) 651 if (expect_true (have_realtime))
573 658
574 struct timeval tv; 659 struct timeval tv;
575 gettimeofday (&tv, 0); 660 gettimeofday (&tv, 0);
576 return tv.tv_sec + tv.tv_usec * 1e-6; 661 return tv.tv_sec + tv.tv_usec * 1e-6;
577} 662}
663#endif
578 664
579inline_size ev_tstamp 665inline_size ev_tstamp
580get_clock (void) 666get_clock (void)
581{ 667{
582#if EV_USE_MONOTONIC 668#if EV_USE_MONOTONIC
618 704
619 tv.tv_sec = (time_t)delay; 705 tv.tv_sec = (time_t)delay;
620 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 706 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
621 707
622 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 708 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
623 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 709 /* something not guaranteed by newer posix versions, but guaranteed */
624 /* by older ones */ 710 /* by older ones */
625 select (0, 0, 0, 0, &tv); 711 select (0, 0, 0, 0, &tv);
626#endif 712#endif
627 } 713 }
628} 714}
736} 822}
737 823
738/*****************************************************************************/ 824/*****************************************************************************/
739 825
740inline_speed void 826inline_speed void
741fd_event (EV_P_ int fd, int revents) 827fd_event_nc (EV_P_ int fd, int revents)
742{ 828{
743 ANFD *anfd = anfds + fd; 829 ANFD *anfd = anfds + fd;
744 ev_io *w; 830 ev_io *w;
745 831
746 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 832 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
750 if (ev) 836 if (ev)
751 ev_feed_event (EV_A_ (W)w, ev); 837 ev_feed_event (EV_A_ (W)w, ev);
752 } 838 }
753} 839}
754 840
841/* do not submit kernel events for fds that have reify set */
842/* because that means they changed while we were polling for new events */
843inline_speed void
844fd_event (EV_P_ int fd, int revents)
845{
846 ANFD *anfd = anfds + fd;
847
848 if (expect_true (!anfd->reify))
849 fd_event_nc (EV_A_ fd, revents);
850}
851
755void 852void
756ev_feed_fd_event (EV_P_ int fd, int revents) 853ev_feed_fd_event (EV_P_ int fd, int revents)
757{ 854{
758 if (fd >= 0 && fd < anfdmax) 855 if (fd >= 0 && fd < anfdmax)
759 fd_event (EV_A_ fd, revents); 856 fd_event_nc (EV_A_ fd, revents);
760} 857}
761 858
762/* make sure the external fd watch events are in-sync */ 859/* make sure the external fd watch events are in-sync */
763/* with the kernel/libev internal state */ 860/* with the kernel/libev internal state */
764inline_size void 861inline_size void
864 961
865 for (fd = anfdmax; fd--; ) 962 for (fd = anfdmax; fd--; )
866 if (anfds [fd].events) 963 if (anfds [fd].events)
867 { 964 {
868 fd_kill (EV_A_ fd); 965 fd_kill (EV_A_ fd);
869 return; 966 break;
870 } 967 }
871} 968}
872 969
873/* usually called after fork if backend needs to re-arm all fds from scratch */ 970/* usually called after fork if backend needs to re-arm all fds from scratch */
874static void noinline 971static void noinline
879 for (fd = 0; fd < anfdmax; ++fd) 976 for (fd = 0; fd < anfdmax; ++fd)
880 if (anfds [fd].events) 977 if (anfds [fd].events)
881 { 978 {
882 anfds [fd].events = 0; 979 anfds [fd].events = 0;
883 anfds [fd].emask = 0; 980 anfds [fd].emask = 0;
884 fd_change (EV_A_ fd, EV__IOFDSET | 1); 981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
885 } 982 }
886} 983}
887 984
888/*****************************************************************************/ 985/*****************************************************************************/
889 986
964 1061
965 for (;;) 1062 for (;;)
966 { 1063 {
967 int c = k << 1; 1064 int c = k << 1;
968 1065
969 if (c > N + HEAP0 - 1) 1066 if (c >= N + HEAP0)
970 break; 1067 break;
971 1068
972 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1069 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
973 ? 1 : 0; 1070 ? 1 : 0;
974 1071
1010 1107
1011/* move an element suitably so it is in a correct place */ 1108/* move an element suitably so it is in a correct place */
1012inline_size void 1109inline_size void
1013adjustheap (ANHE *heap, int N, int k) 1110adjustheap (ANHE *heap, int N, int k)
1014{ 1111{
1015 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1112 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1016 upheap (heap, k); 1113 upheap (heap, k);
1017 else 1114 else
1018 downheap (heap, N, k); 1115 downheap (heap, N, k);
1019} 1116}
1020 1117
1033/*****************************************************************************/ 1130/*****************************************************************************/
1034 1131
1035/* associate signal watchers to a signal signal */ 1132/* associate signal watchers to a signal signal */
1036typedef struct 1133typedef struct
1037{ 1134{
1135 EV_ATOMIC_T pending;
1136#if EV_MULTIPLICITY
1137 EV_P;
1138#endif
1038 WL head; 1139 WL head;
1039 EV_ATOMIC_T gotsig;
1040} ANSIG; 1140} ANSIG;
1041 1141
1042static ANSIG *signals; 1142static ANSIG signals [EV_NSIG - 1];
1043static int signalmax;
1044
1045static EV_ATOMIC_T gotsig;
1046 1143
1047/*****************************************************************************/ 1144/*****************************************************************************/
1048 1145
1049/* used to prepare libev internal fd's */ 1146/* used to prepare libev internal fd's */
1050/* this is not fork-safe */ 1147/* this is not fork-safe */
1064evpipe_init (EV_P) 1161evpipe_init (EV_P)
1065{ 1162{
1066 if (!ev_is_active (&pipe_w)) 1163 if (!ev_is_active (&pipe_w))
1067 { 1164 {
1068#if EV_USE_EVENTFD 1165#if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL)
1069 if ((evfd = eventfd (0, 0)) >= 0) 1168 evfd = eventfd (0, 0);
1169
1170 if (evfd >= 0)
1070 { 1171 {
1071 evpipe [0] = -1; 1172 evpipe [0] = -1;
1072 fd_intern (evfd); 1173 fd_intern (evfd); /* doing it twice doesn't hurt */
1073 ev_io_set (&pipe_w, evfd, EV_READ); 1174 ev_io_set (&pipe_w, evfd, EV_READ);
1074 } 1175 }
1075 else 1176 else
1076#endif 1177#endif
1077 { 1178 {
1114/* called whenever the libev signal pipe */ 1215/* called whenever the libev signal pipe */
1115/* got some events (signal, async) */ 1216/* got some events (signal, async) */
1116static void 1217static void
1117pipecb (EV_P_ ev_io *iow, int revents) 1218pipecb (EV_P_ ev_io *iow, int revents)
1118{ 1219{
1220 int i;
1221
1119#if EV_USE_EVENTFD 1222#if EV_USE_EVENTFD
1120 if (evfd >= 0) 1223 if (evfd >= 0)
1121 { 1224 {
1122 uint64_t counter; 1225 uint64_t counter;
1123 read (evfd, &counter, sizeof (uint64_t)); 1226 read (evfd, &counter, sizeof (uint64_t));
1127 { 1230 {
1128 char dummy; 1231 char dummy;
1129 read (evpipe [0], &dummy, 1); 1232 read (evpipe [0], &dummy, 1);
1130 } 1233 }
1131 1234
1132 if (gotsig && ev_is_default_loop (EV_A)) 1235 if (sig_pending)
1133 { 1236 {
1134 int signum; 1237 sig_pending = 0;
1135 gotsig = 0;
1136 1238
1137 for (signum = signalmax; signum--; ) 1239 for (i = EV_NSIG - 1; i--; )
1138 if (signals [signum].gotsig) 1240 if (expect_false (signals [i].pending))
1139 ev_feed_signal_event (EV_A_ signum + 1); 1241 ev_feed_signal_event (EV_A_ i + 1);
1140 } 1242 }
1141 1243
1142#if EV_ASYNC_ENABLE 1244#if EV_ASYNC_ENABLE
1143 if (gotasync) 1245 if (async_pending)
1144 { 1246 {
1145 int i; 1247 async_pending = 0;
1146 gotasync = 0;
1147 1248
1148 for (i = asynccnt; i--; ) 1249 for (i = asynccnt; i--; )
1149 if (asyncs [i]->sent) 1250 if (asyncs [i]->sent)
1150 { 1251 {
1151 asyncs [i]->sent = 0; 1252 asyncs [i]->sent = 0;
1159 1260
1160static void 1261static void
1161ev_sighandler (int signum) 1262ev_sighandler (int signum)
1162{ 1263{
1163#if EV_MULTIPLICITY 1264#if EV_MULTIPLICITY
1164 struct ev_loop *loop = &default_loop_struct; 1265 EV_P = signals [signum - 1].loop;
1165#endif 1266#endif
1166 1267
1167#if _WIN32 1268#if _WIN32
1168 signal (signum, ev_sighandler); 1269 signal (signum, ev_sighandler);
1169#endif 1270#endif
1170 1271
1171 signals [signum - 1].gotsig = 1; 1272 signals [signum - 1].pending = 1;
1172 evpipe_write (EV_A_ &gotsig); 1273 evpipe_write (EV_A_ &sig_pending);
1173} 1274}
1174 1275
1175void noinline 1276void noinline
1176ev_feed_signal_event (EV_P_ int signum) 1277ev_feed_signal_event (EV_P_ int signum)
1177{ 1278{
1178 WL w; 1279 WL w;
1179 1280
1281 if (expect_false (signum <= 0 || signum > EV_NSIG))
1282 return;
1283
1284 --signum;
1285
1180#if EV_MULTIPLICITY 1286#if EV_MULTIPLICITY
1181 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1287 /* it is permissible to try to feed a signal to the wrong loop */
1182#endif 1288 /* or, likely more useful, feeding a signal nobody is waiting for */
1183 1289
1184 --signum; 1290 if (expect_false (signals [signum].loop != EV_A))
1185
1186 if (signum < 0 || signum >= signalmax)
1187 return; 1291 return;
1292#endif
1188 1293
1189 signals [signum].gotsig = 0; 1294 signals [signum].pending = 0;
1190 1295
1191 for (w = signals [signum].head; w; w = w->next) 1296 for (w = signals [signum].head; w; w = w->next)
1192 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1297 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1193} 1298}
1299
1300#if EV_USE_SIGNALFD
1301static void
1302sigfdcb (EV_P_ ev_io *iow, int revents)
1303{
1304 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1305
1306 for (;;)
1307 {
1308 ssize_t res = read (sigfd, si, sizeof (si));
1309
1310 /* not ISO-C, as res might be -1, but works with SuS */
1311 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1312 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1313
1314 if (res < (ssize_t)sizeof (si))
1315 break;
1316 }
1317}
1318#endif
1194 1319
1195/*****************************************************************************/ 1320/*****************************************************************************/
1196 1321
1197static WL childs [EV_PID_HASHSIZE]; 1322static WL childs [EV_PID_HASHSIZE];
1198 1323
1343ev_backend (EV_P) 1468ev_backend (EV_P)
1344{ 1469{
1345 return backend; 1470 return backend;
1346} 1471}
1347 1472
1473#if EV_MINIMAL < 2
1348unsigned int 1474unsigned int
1349ev_loop_count (EV_P) 1475ev_loop_count (EV_P)
1350{ 1476{
1351 return loop_count; 1477 return loop_count;
1352} 1478}
1353 1479
1480unsigned int
1481ev_loop_depth (EV_P)
1482{
1483 return loop_depth;
1484}
1485
1354void 1486void
1355ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1487ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1356{ 1488{
1357 io_blocktime = interval; 1489 io_blocktime = interval;
1358} 1490}
1360void 1492void
1361ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1362{ 1494{
1363 timeout_blocktime = interval; 1495 timeout_blocktime = interval;
1364} 1496}
1497
1498void
1499ev_set_userdata (EV_P_ void *data)
1500{
1501 userdata = data;
1502}
1503
1504void *
1505ev_userdata (EV_P)
1506{
1507 return userdata;
1508}
1509
1510void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1511{
1512 invoke_cb = invoke_pending_cb;
1513}
1514
1515void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1516{
1517 release_cb = release;
1518 acquire_cb = acquire;
1519}
1520#endif
1365 1521
1366/* initialise a loop structure, must be zero-initialised */ 1522/* initialise a loop structure, must be zero-initialised */
1367static void noinline 1523static void noinline
1368loop_init (EV_P_ unsigned int flags) 1524loop_init (EV_P_ unsigned int flags)
1369{ 1525{
1387 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1543 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1388 have_monotonic = 1; 1544 have_monotonic = 1;
1389 } 1545 }
1390#endif 1546#endif
1391 1547
1548 /* pid check not overridable via env */
1549#ifndef _WIN32
1550 if (flags & EVFLAG_FORKCHECK)
1551 curpid = getpid ();
1552#endif
1553
1554 if (!(flags & EVFLAG_NOENV)
1555 && !enable_secure ()
1556 && getenv ("LIBEV_FLAGS"))
1557 flags = atoi (getenv ("LIBEV_FLAGS"));
1558
1392 ev_rt_now = ev_time (); 1559 ev_rt_now = ev_time ();
1393 mn_now = get_clock (); 1560 mn_now = get_clock ();
1394 now_floor = mn_now; 1561 now_floor = mn_now;
1395 rtmn_diff = ev_rt_now - mn_now; 1562 rtmn_diff = ev_rt_now - mn_now;
1563#if EV_MINIMAL < 2
1564 invoke_cb = ev_invoke_pending;
1565#endif
1396 1566
1397 io_blocktime = 0.; 1567 io_blocktime = 0.;
1398 timeout_blocktime = 0.; 1568 timeout_blocktime = 0.;
1399 backend = 0; 1569 backend = 0;
1400 backend_fd = -1; 1570 backend_fd = -1;
1401 gotasync = 0; 1571 sig_pending = 0;
1572#if EV_ASYNC_ENABLE
1573 async_pending = 0;
1574#endif
1402#if EV_USE_INOTIFY 1575#if EV_USE_INOTIFY
1403 fs_fd = -2; 1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1404#endif 1577#endif
1405 1578#if EV_USE_SIGNALFD
1406 /* pid check not overridable via env */ 1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1407#ifndef _WIN32
1408 if (flags & EVFLAG_FORKCHECK)
1409 curpid = getpid ();
1410#endif 1580#endif
1411
1412 if (!(flags & EVFLAG_NOENV)
1413 && !enable_secure ()
1414 && getenv ("LIBEV_FLAGS"))
1415 flags = atoi (getenv ("LIBEV_FLAGS"));
1416 1581
1417 if (!(flags & 0x0000ffffU)) 1582 if (!(flags & 0x0000ffffU))
1418 flags |= ev_recommended_backends (); 1583 flags |= ev_recommended_backends ();
1419 1584
1420#if EV_USE_PORT 1585#if EV_USE_PORT
1446{ 1611{
1447 int i; 1612 int i;
1448 1613
1449 if (ev_is_active (&pipe_w)) 1614 if (ev_is_active (&pipe_w))
1450 { 1615 {
1451 ev_ref (EV_A); /* signal watcher */ 1616 /*ev_ref (EV_A);*/
1452 ev_io_stop (EV_A_ &pipe_w); 1617 /*ev_io_stop (EV_A_ &pipe_w);*/
1453 1618
1454#if EV_USE_EVENTFD 1619#if EV_USE_EVENTFD
1455 if (evfd >= 0) 1620 if (evfd >= 0)
1456 close (evfd); 1621 close (evfd);
1457#endif 1622#endif
1461 close (evpipe [0]); 1626 close (evpipe [0]);
1462 close (evpipe [1]); 1627 close (evpipe [1]);
1463 } 1628 }
1464 } 1629 }
1465 1630
1631#if EV_USE_SIGNALFD
1632 if (ev_is_active (&sigfd_w))
1633 {
1634 /*ev_ref (EV_A);*/
1635 /*ev_io_stop (EV_A_ &sigfd_w);*/
1636
1637 close (sigfd);
1638 }
1639#endif
1640
1466#if EV_USE_INOTIFY 1641#if EV_USE_INOTIFY
1467 if (fs_fd >= 0) 1642 if (fs_fd >= 0)
1468 close (fs_fd); 1643 close (fs_fd);
1469#endif 1644#endif
1470 1645
1493#if EV_IDLE_ENABLE 1668#if EV_IDLE_ENABLE
1494 array_free (idle, [i]); 1669 array_free (idle, [i]);
1495#endif 1670#endif
1496 } 1671 }
1497 1672
1498 ev_free (anfds); anfdmax = 0; 1673 ev_free (anfds); anfds = 0; anfdmax = 0;
1499 1674
1500 /* have to use the microsoft-never-gets-it-right macro */ 1675 /* have to use the microsoft-never-gets-it-right macro */
1501 array_free (rfeed, EMPTY); 1676 array_free (rfeed, EMPTY);
1502 array_free (fdchange, EMPTY); 1677 array_free (fdchange, EMPTY);
1503 array_free (timer, EMPTY); 1678 array_free (timer, EMPTY);
1538 1713
1539 if (ev_is_active (&pipe_w)) 1714 if (ev_is_active (&pipe_w))
1540 { 1715 {
1541 /* this "locks" the handlers against writing to the pipe */ 1716 /* this "locks" the handlers against writing to the pipe */
1542 /* while we modify the fd vars */ 1717 /* while we modify the fd vars */
1543 gotsig = 1; 1718 sig_pending = 1;
1544#if EV_ASYNC_ENABLE 1719#if EV_ASYNC_ENABLE
1545 gotasync = 1; 1720 async_pending = 1;
1546#endif 1721#endif
1547 1722
1548 ev_ref (EV_A); 1723 ev_ref (EV_A);
1549 ev_io_stop (EV_A_ &pipe_w); 1724 ev_io_stop (EV_A_ &pipe_w);
1550 1725
1570#if EV_MULTIPLICITY 1745#if EV_MULTIPLICITY
1571 1746
1572struct ev_loop * 1747struct ev_loop *
1573ev_loop_new (unsigned int flags) 1748ev_loop_new (unsigned int flags)
1574{ 1749{
1575 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1750 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1576 1751
1577 memset (loop, 0, sizeof (struct ev_loop)); 1752 memset (EV_A, 0, sizeof (struct ev_loop));
1578
1579 loop_init (EV_A_ flags); 1753 loop_init (EV_A_ flags);
1580 1754
1581 if (ev_backend (EV_A)) 1755 if (ev_backend (EV_A))
1582 return loop; 1756 return EV_A;
1583 1757
1584 return 0; 1758 return 0;
1585} 1759}
1586 1760
1587void 1761void
1594void 1768void
1595ev_loop_fork (EV_P) 1769ev_loop_fork (EV_P)
1596{ 1770{
1597 postfork = 1; /* must be in line with ev_default_fork */ 1771 postfork = 1; /* must be in line with ev_default_fork */
1598} 1772}
1773#endif /* multiplicity */
1599 1774
1600#if EV_VERIFY 1775#if EV_VERIFY
1601static void noinline 1776static void noinline
1602verify_watcher (EV_P_ W w) 1777verify_watcher (EV_P_ W w)
1603{ 1778{
1631 verify_watcher (EV_A_ ws [cnt]); 1806 verify_watcher (EV_A_ ws [cnt]);
1632 } 1807 }
1633} 1808}
1634#endif 1809#endif
1635 1810
1811#if EV_MINIMAL < 2
1636void 1812void
1637ev_loop_verify (EV_P) 1813ev_loop_verify (EV_P)
1638{ 1814{
1639#if EV_VERIFY 1815#if EV_VERIFY
1640 int i; 1816 int i;
1689 assert (checkmax >= checkcnt); 1865 assert (checkmax >= checkcnt);
1690 array_verify (EV_A_ (W *)checks, checkcnt); 1866 array_verify (EV_A_ (W *)checks, checkcnt);
1691 1867
1692# if 0 1868# if 0
1693 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1869 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1694 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1695# endif 1871# endif
1696#endif 1872#endif
1697} 1873}
1698 1874#endif
1699#endif /* multiplicity */
1700 1875
1701#if EV_MULTIPLICITY 1876#if EV_MULTIPLICITY
1702struct ev_loop * 1877struct ev_loop *
1703ev_default_loop_init (unsigned int flags) 1878ev_default_loop_init (unsigned int flags)
1704#else 1879#else
1707#endif 1882#endif
1708{ 1883{
1709 if (!ev_default_loop_ptr) 1884 if (!ev_default_loop_ptr)
1710 { 1885 {
1711#if EV_MULTIPLICITY 1886#if EV_MULTIPLICITY
1712 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1887 EV_P = ev_default_loop_ptr = &default_loop_struct;
1713#else 1888#else
1714 ev_default_loop_ptr = 1; 1889 ev_default_loop_ptr = 1;
1715#endif 1890#endif
1716 1891
1717 loop_init (EV_A_ flags); 1892 loop_init (EV_A_ flags);
1734 1909
1735void 1910void
1736ev_default_destroy (void) 1911ev_default_destroy (void)
1737{ 1912{
1738#if EV_MULTIPLICITY 1913#if EV_MULTIPLICITY
1739 struct ev_loop *loop = ev_default_loop_ptr; 1914 EV_P = ev_default_loop_ptr;
1740#endif 1915#endif
1741 1916
1742 ev_default_loop_ptr = 0; 1917 ev_default_loop_ptr = 0;
1743 1918
1744#ifndef _WIN32 1919#ifndef _WIN32
1751 1926
1752void 1927void
1753ev_default_fork (void) 1928ev_default_fork (void)
1754{ 1929{
1755#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1756 struct ev_loop *loop = ev_default_loop_ptr; 1931 EV_P = ev_default_loop_ptr;
1757#endif 1932#endif
1758 1933
1759 postfork = 1; /* must be in line with ev_loop_fork */ 1934 postfork = 1; /* must be in line with ev_loop_fork */
1760} 1935}
1761 1936
1765ev_invoke (EV_P_ void *w, int revents) 1940ev_invoke (EV_P_ void *w, int revents)
1766{ 1941{
1767 EV_CB_INVOKE ((W)w, revents); 1942 EV_CB_INVOKE ((W)w, revents);
1768} 1943}
1769 1944
1770inline_speed void 1945unsigned int
1771call_pending (EV_P) 1946ev_pending_count (EV_P)
1947{
1948 int pri;
1949 unsigned int count = 0;
1950
1951 for (pri = NUMPRI; pri--; )
1952 count += pendingcnt [pri];
1953
1954 return count;
1955}
1956
1957void noinline
1958ev_invoke_pending (EV_P)
1772{ 1959{
1773 int pri; 1960 int pri;
1774 1961
1775 for (pri = NUMPRI; pri--; ) 1962 for (pri = NUMPRI; pri--; )
1776 while (pendingcnt [pri]) 1963 while (pendingcnt [pri])
1948/* fetch new monotonic and realtime times from the kernel */ 2135/* fetch new monotonic and realtime times from the kernel */
1949/* also detetc if there was a timejump, and act accordingly */ 2136/* also detetc if there was a timejump, and act accordingly */
1950inline_speed void 2137inline_speed void
1951time_update (EV_P_ ev_tstamp max_block) 2138time_update (EV_P_ ev_tstamp max_block)
1952{ 2139{
1953 int i;
1954
1955#if EV_USE_MONOTONIC 2140#if EV_USE_MONOTONIC
1956 if (expect_true (have_monotonic)) 2141 if (expect_true (have_monotonic))
1957 { 2142 {
2143 int i;
1958 ev_tstamp odiff = rtmn_diff; 2144 ev_tstamp odiff = rtmn_diff;
1959 2145
1960 mn_now = get_clock (); 2146 mn_now = get_clock ();
1961 2147
1962 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */ 2148 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
2012 2198
2013 mn_now = ev_rt_now; 2199 mn_now = ev_rt_now;
2014 } 2200 }
2015} 2201}
2016 2202
2017static int loop_done;
2018
2019void 2203void
2020ev_loop (EV_P_ int flags) 2204ev_loop (EV_P_ int flags)
2021{ 2205{
2206#if EV_MINIMAL < 2
2207 ++loop_depth;
2208#endif
2209
2210 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2211
2022 loop_done = EVUNLOOP_CANCEL; 2212 loop_done = EVUNLOOP_CANCEL;
2023 2213
2024 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2214 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2025 2215
2026 do 2216 do
2027 { 2217 {
2028#if EV_VERIFY >= 2 2218#if EV_VERIFY >= 2
2029 ev_loop_verify (EV_A); 2219 ev_loop_verify (EV_A);
2042 /* we might have forked, so queue fork handlers */ 2232 /* we might have forked, so queue fork handlers */
2043 if (expect_false (postfork)) 2233 if (expect_false (postfork))
2044 if (forkcnt) 2234 if (forkcnt)
2045 { 2235 {
2046 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2236 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2047 call_pending (EV_A); 2237 EV_INVOKE_PENDING;
2048 } 2238 }
2049#endif 2239#endif
2050 2240
2051 /* queue prepare watchers (and execute them) */ 2241 /* queue prepare watchers (and execute them) */
2052 if (expect_false (preparecnt)) 2242 if (expect_false (preparecnt))
2053 { 2243 {
2054 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2055 call_pending (EV_A); 2245 EV_INVOKE_PENDING;
2056 } 2246 }
2247
2248 if (expect_false (loop_done))
2249 break;
2057 2250
2058 /* we might have forked, so reify kernel state if necessary */ 2251 /* we might have forked, so reify kernel state if necessary */
2059 if (expect_false (postfork)) 2252 if (expect_false (postfork))
2060 loop_fork (EV_A); 2253 loop_fork (EV_A);
2061 2254
2067 ev_tstamp waittime = 0.; 2260 ev_tstamp waittime = 0.;
2068 ev_tstamp sleeptime = 0.; 2261 ev_tstamp sleeptime = 0.;
2069 2262
2070 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2263 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2071 { 2264 {
2265 /* remember old timestamp for io_blocktime calculation */
2266 ev_tstamp prev_mn_now = mn_now;
2267
2072 /* update time to cancel out callback processing overhead */ 2268 /* update time to cancel out callback processing overhead */
2073 time_update (EV_A_ 1e100); 2269 time_update (EV_A_ 1e100);
2074 2270
2075 waittime = MAX_BLOCKTIME; 2271 waittime = MAX_BLOCKTIME;
2076 2272
2086 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2282 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
2087 if (waittime > to) waittime = to; 2283 if (waittime > to) waittime = to;
2088 } 2284 }
2089#endif 2285#endif
2090 2286
2287 /* don't let timeouts decrease the waittime below timeout_blocktime */
2091 if (expect_false (waittime < timeout_blocktime)) 2288 if (expect_false (waittime < timeout_blocktime))
2092 waittime = timeout_blocktime; 2289 waittime = timeout_blocktime;
2093 2290
2094 sleeptime = waittime - backend_fudge; 2291 /* extra check because io_blocktime is commonly 0 */
2095
2096 if (expect_true (sleeptime > io_blocktime)) 2292 if (expect_false (io_blocktime))
2097 sleeptime = io_blocktime;
2098
2099 if (sleeptime)
2100 { 2293 {
2294 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2295
2296 if (sleeptime > waittime - backend_fudge)
2297 sleeptime = waittime - backend_fudge;
2298
2299 if (expect_true (sleeptime > 0.))
2300 {
2101 ev_sleep (sleeptime); 2301 ev_sleep (sleeptime);
2102 waittime -= sleeptime; 2302 waittime -= sleeptime;
2303 }
2103 } 2304 }
2104 } 2305 }
2105 2306
2307#if EV_MINIMAL < 2
2106 ++loop_count; 2308 ++loop_count;
2309#endif
2310 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2107 backend_poll (EV_A_ waittime); 2311 backend_poll (EV_A_ waittime);
2312 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2108 2313
2109 /* update ev_rt_now, do magic */ 2314 /* update ev_rt_now, do magic */
2110 time_update (EV_A_ waittime + sleeptime); 2315 time_update (EV_A_ waittime + sleeptime);
2111 } 2316 }
2112 2317
2123 2328
2124 /* queue check watchers, to be executed first */ 2329 /* queue check watchers, to be executed first */
2125 if (expect_false (checkcnt)) 2330 if (expect_false (checkcnt))
2126 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2331 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2127 2332
2128 call_pending (EV_A); 2333 EV_INVOKE_PENDING;
2129 } 2334 }
2130 while (expect_true ( 2335 while (expect_true (
2131 activecnt 2336 activecnt
2132 && !loop_done 2337 && !loop_done
2133 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2338 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2134 )); 2339 ));
2135 2340
2136 if (loop_done == EVUNLOOP_ONE) 2341 if (loop_done == EVUNLOOP_ONE)
2137 loop_done = EVUNLOOP_CANCEL; 2342 loop_done = EVUNLOOP_CANCEL;
2343
2344#if EV_MINIMAL < 2
2345 --loop_depth;
2346#endif
2138} 2347}
2139 2348
2140void 2349void
2141ev_unloop (EV_P_ int how) 2350ev_unloop (EV_P_ int how)
2142{ 2351{
2193inline_size void 2402inline_size void
2194wlist_del (WL *head, WL elem) 2403wlist_del (WL *head, WL elem)
2195{ 2404{
2196 while (*head) 2405 while (*head)
2197 { 2406 {
2198 if (*head == elem) 2407 if (expect_true (*head == elem))
2199 { 2408 {
2200 *head = elem->next; 2409 *head = elem->next;
2201 return; 2410 break;
2202 } 2411 }
2203 2412
2204 head = &(*head)->next; 2413 head = &(*head)->next;
2205 } 2414 }
2206} 2415}
2234} 2443}
2235 2444
2236inline_size void 2445inline_size void
2237pri_adjust (EV_P_ W w) 2446pri_adjust (EV_P_ W w)
2238{ 2447{
2239 int pri = w->priority; 2448 int pri = ev_priority (w);
2240 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2449 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2241 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2450 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2242 w->priority = pri; 2451 ev_set_priority (w, pri);
2243} 2452}
2244 2453
2245inline_speed void 2454inline_speed void
2246ev_start (EV_P_ W w, int active) 2455ev_start (EV_P_ W w, int active)
2247{ 2456{
2274 2483
2275 ev_start (EV_A_ (W)w, 1); 2484 ev_start (EV_A_ (W)w, 1);
2276 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2277 wlist_add (&anfds[fd].head, (WL)w); 2486 wlist_add (&anfds[fd].head, (WL)w);
2278 2487
2279 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2488 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2280 w->events &= ~EV__IOFDSET; 2489 w->events &= ~EV__IOFDSET;
2281 2490
2282 EV_FREQUENT_CHECK; 2491 EV_FREQUENT_CHECK;
2283} 2492}
2284 2493
2378 } 2587 }
2379 2588
2380 EV_FREQUENT_CHECK; 2589 EV_FREQUENT_CHECK;
2381} 2590}
2382 2591
2592ev_tstamp
2593ev_timer_remaining (EV_P_ ev_timer *w)
2594{
2595 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2596}
2597
2383#if EV_PERIODIC_ENABLE 2598#if EV_PERIODIC_ENABLE
2384void noinline 2599void noinline
2385ev_periodic_start (EV_P_ ev_periodic *w) 2600ev_periodic_start (EV_P_ ev_periodic *w)
2386{ 2601{
2387 if (expect_false (ev_is_active (w))) 2602 if (expect_false (ev_is_active (w)))
2454#endif 2669#endif
2455 2670
2456void noinline 2671void noinline
2457ev_signal_start (EV_P_ ev_signal *w) 2672ev_signal_start (EV_P_ ev_signal *w)
2458{ 2673{
2459#if EV_MULTIPLICITY
2460 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2461#endif
2462 if (expect_false (ev_is_active (w))) 2674 if (expect_false (ev_is_active (w)))
2463 return; 2675 return;
2464 2676
2465 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2677 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2466 2678
2467 evpipe_init (EV_A); 2679#if EV_MULTIPLICITY
2680 assert (("libev: a signal must not be attached to two different loops",
2681 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2468 2682
2469 EV_FREQUENT_CHECK; 2683 signals [w->signum - 1].loop = EV_A;
2684#endif
2470 2685
2686 EV_FREQUENT_CHECK;
2687
2688#if EV_USE_SIGNALFD
2689 if (sigfd == -2)
2471 { 2690 {
2472#ifndef _WIN32 2691 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2473 sigset_t full, prev; 2692 if (sigfd < 0 && errno == EINVAL)
2474 sigfillset (&full); 2693 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2475 sigprocmask (SIG_SETMASK, &full, &prev);
2476#endif
2477 2694
2478 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2695 if (sigfd >= 0)
2696 {
2697 fd_intern (sigfd); /* doing it twice will not hurt */
2479 2698
2480#ifndef _WIN32 2699 sigemptyset (&sigfd_set);
2481 sigprocmask (SIG_SETMASK, &prev, 0); 2700
2482#endif 2701 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2702 ev_set_priority (&sigfd_w, EV_MAXPRI);
2703 ev_io_start (EV_A_ &sigfd_w);
2704 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2705 }
2483 } 2706 }
2707
2708 if (sigfd >= 0)
2709 {
2710 /* TODO: check .head */
2711 sigaddset (&sigfd_set, w->signum);
2712 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2713
2714 signalfd (sigfd, &sigfd_set, 0);
2715 }
2716#endif
2484 2717
2485 ev_start (EV_A_ (W)w, 1); 2718 ev_start (EV_A_ (W)w, 1);
2486 wlist_add (&signals [w->signum - 1].head, (WL)w); 2719 wlist_add (&signals [w->signum - 1].head, (WL)w);
2487 2720
2488 if (!((WL)w)->next) 2721 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/
2724# endif
2489 { 2725 {
2490#if _WIN32 2726# if _WIN32
2491 signal (w->signum, ev_sighandler); 2727 signal (w->signum, ev_sighandler);
2492#else 2728# else
2493 struct sigaction sa; 2729 struct sigaction sa;
2730
2731 evpipe_init (EV_A);
2732
2494 sa.sa_handler = ev_sighandler; 2733 sa.sa_handler = ev_sighandler;
2495 sigfillset (&sa.sa_mask); 2734 sigfillset (&sa.sa_mask);
2496 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2735 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2497 sigaction (w->signum, &sa, 0); 2736 sigaction (w->signum, &sa, 0);
2737
2738 sigemptyset (&sa.sa_mask);
2739 sigaddset (&sa.sa_mask, w->signum);
2740 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2498#endif 2741#endif
2499 } 2742 }
2500 2743
2501 EV_FREQUENT_CHECK; 2744 EV_FREQUENT_CHECK;
2502} 2745}
2503 2746
2504void noinline 2747void noinline
2512 2755
2513 wlist_del (&signals [w->signum - 1].head, (WL)w); 2756 wlist_del (&signals [w->signum - 1].head, (WL)w);
2514 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2515 2758
2516 if (!signals [w->signum - 1].head) 2759 if (!signals [w->signum - 1].head)
2760 {
2761#if EV_MULTIPLICITY
2762 signals [w->signum - 1].loop = 0; /* unattach from signal */
2763#endif
2764#if EV_USE_SIGNALFD
2765 if (sigfd >= 0)
2766 {
2767 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2768 sigdelset (&sigfd_set, w->signum);
2769 signalfd (sigfd, &sigfd_set, 0);
2770 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2771 /*TODO: maybe unblock signal? */
2772 }
2773 else
2774#endif
2517 signal (w->signum, SIG_DFL); 2775 signal (w->signum, SIG_DFL);
2776 }
2518 2777
2519 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2520} 2779}
2521 2780
2522void 2781void
2602 } 2861 }
2603 } 2862 }
2604 2863
2605 if (w->wd >= 0) 2864 if (w->wd >= 0)
2606 { 2865 {
2866 struct statfs sfs;
2867
2607 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2868 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2608 2869
2609 /* now local changes will be tracked by inotify, but remote changes won't */ 2870 /* now local changes will be tracked by inotify, but remote changes won't */
2610 /* unless the filesystem it known to be local, we therefore still poll */ 2871 /* unless the filesystem it known to be local, we therefore still poll */
2611 /* also do poll on <2.6.25, but with normal frequency */ 2872 /* also do poll on <2.6.25, but with normal frequency */
2612 struct statfs sfs;
2613 2873
2614 if (fs_2625 && !statfs (w->path, &sfs)) 2874 if (fs_2625 && !statfs (w->path, &sfs))
2615 if (sfs.f_type == 0x1373 /* devfs */ 2875 if (sfs.f_type == 0x1373 /* devfs */
2616 || sfs.f_type == 0xEF53 /* ext2/3 */ 2876 || sfs.f_type == 0xEF53 /* ext2/3 */
2617 || sfs.f_type == 0x3153464a /* jfs */ 2877 || sfs.f_type == 0x3153464a /* jfs */
3002embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3262embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3003{ 3263{
3004 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3264 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3005 3265
3006 { 3266 {
3007 struct ev_loop *loop = w->other; 3267 EV_P = w->other;
3008 3268
3009 while (fdchangecnt) 3269 while (fdchangecnt)
3010 { 3270 {
3011 fd_reify (EV_A); 3271 fd_reify (EV_A);
3012 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3272 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3020 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3280 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3021 3281
3022 ev_embed_stop (EV_A_ w); 3282 ev_embed_stop (EV_A_ w);
3023 3283
3024 { 3284 {
3025 struct ev_loop *loop = w->other; 3285 EV_P = w->other;
3026 3286
3027 ev_loop_fork (EV_A); 3287 ev_loop_fork (EV_A);
3028 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3288 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3029 } 3289 }
3030 3290
3044{ 3304{
3045 if (expect_false (ev_is_active (w))) 3305 if (expect_false (ev_is_active (w)))
3046 return; 3306 return;
3047 3307
3048 { 3308 {
3049 struct ev_loop *loop = w->other; 3309 EV_P = w->other;
3050 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3310 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3051 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3311 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3052 } 3312 }
3053 3313
3054 EV_FREQUENT_CHECK; 3314 EV_FREQUENT_CHECK;
3166 3426
3167void 3427void
3168ev_async_send (EV_P_ ev_async *w) 3428ev_async_send (EV_P_ ev_async *w)
3169{ 3429{
3170 w->sent = 1; 3430 w->sent = 1;
3171 evpipe_write (EV_A_ &gotasync); 3431 evpipe_write (EV_A_ &async_pending);
3172} 3432}
3173#endif 3433#endif
3174 3434
3175/*****************************************************************************/ 3435/*****************************************************************************/
3176 3436
3325 if (types & EV_CHECK) 3585 if (types & EV_CHECK)
3326 for (i = checkcnt; i--; ) 3586 for (i = checkcnt; i--; )
3327 cb (EV_A_ EV_CHECK, checks [i]); 3587 cb (EV_A_ EV_CHECK, checks [i]);
3328 3588
3329 if (types & EV_SIGNAL) 3589 if (types & EV_SIGNAL)
3330 for (i = 0; i < signalmax; ++i) 3590 for (i = 0; i < EV_NSIG - 1; ++i)
3331 for (wl = signals [i].head; wl; ) 3591 for (wl = signals [i].head; wl; )
3332 { 3592 {
3333 wn = wl->next; 3593 wn = wl->next;
3334 cb (EV_A_ EV_SIGNAL, wl); 3594 cb (EV_A_ EV_SIGNAL, wl);
3335 wl = wn; 3595 wl = wn;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines