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

Comparing libev/ev.c (file contents):
Revision 1.290 by root, Mon Jun 29 04:41:34 2009 UTC vs.
Revision 1.312 by root, Wed Aug 12 18:48:17 2009 UTC

… …
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
178# endif 186# endif
179#endif 187#endif
180 188
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
182 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
183#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
186# else 221# else
187# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
266# else 301# else
267# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
268# endif 303# endif
269#endif 304#endif
270 305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
311# endif
312#endif
313
271#if 0 /* debugging */ 314#if 0 /* debugging */
272# define EV_VERIFY 3 315# define EV_VERIFY 3
273# define EV_USE_4HEAP 1 316# define EV_USE_4HEAP 1
274# define EV_HEAP_CACHE_AT 1 317# define EV_HEAP_CACHE_AT 1
275#endif 318#endif
… …
282# define EV_USE_4HEAP !EV_MINIMAL 325# define EV_USE_4HEAP !EV_MINIMAL
283#endif 326#endif
284 327
285#ifndef EV_HEAP_CACHE_AT 328#ifndef EV_HEAP_CACHE_AT
286# define EV_HEAP_CACHE_AT !EV_MINIMAL 329# define EV_HEAP_CACHE_AT !EV_MINIMAL
287#endif
288
289/* this block fixes any misconfiguration where we know we run into trouble otherwise */
290
291#ifndef CLOCK_MONOTONIC
292# undef EV_USE_MONOTONIC
293# define EV_USE_MONOTONIC 0
294#endif
295
296#ifndef CLOCK_REALTIME
297# undef EV_USE_REALTIME
298# define EV_USE_REALTIME 0
299#endif
300
301#if !EV_STAT_ENABLE
302# undef EV_USE_INOTIFY
303# define EV_USE_INOTIFY 0
304#endif
305
306#if !EV_USE_NANOSLEEP
307# ifndef _WIN32
308# include <sys/select.h>
309# endif
310#endif
311
312#if EV_USE_INOTIFY
313# include <sys/utsname.h>
314# include <sys/statfs.h>
315# include <sys/inotify.h>
316/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
317# ifndef IN_DONT_FOLLOW
318# undef EV_USE_INOTIFY
319# define EV_USE_INOTIFY 0
320# endif
321#endif
322
323#if EV_SELECT_IS_WINSOCKET
324# include <winsock.h>
325#endif 330#endif
326 331
327/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 332/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
328/* which makes programs even slower. might work on other unices, too. */ 333/* which makes programs even slower. might work on other unices, too. */
329#if EV_USE_CLOCK_SYSCALL 334#if EV_USE_CLOCK_SYSCALL
… …
336# undef EV_USE_CLOCK_SYSCALL 341# undef EV_USE_CLOCK_SYSCALL
337# define EV_USE_CLOCK_SYSCALL 0 342# define EV_USE_CLOCK_SYSCALL 0
338# endif 343# endif
339#endif 344#endif
340 345
346/* this block fixes any misconfiguration where we know we run into trouble otherwise */
347
348#ifndef CLOCK_MONOTONIC
349# undef EV_USE_MONOTONIC
350# define EV_USE_MONOTONIC 0
351#endif
352
353#ifndef CLOCK_REALTIME
354# undef EV_USE_REALTIME
355# define EV_USE_REALTIME 0
356#endif
357
358#if !EV_STAT_ENABLE
359# undef EV_USE_INOTIFY
360# define EV_USE_INOTIFY 0
361#endif
362
363#if !EV_USE_NANOSLEEP
364# ifndef _WIN32
365# include <sys/select.h>
366# endif
367#endif
368
369#if EV_USE_INOTIFY
370# include <sys/utsname.h>
371# include <sys/statfs.h>
372# include <sys/inotify.h>
373/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
374# ifndef IN_DONT_FOLLOW
375# undef EV_USE_INOTIFY
376# define EV_USE_INOTIFY 0
377# endif
378#endif
379
380#if EV_SELECT_IS_WINSOCKET
381# include <winsock.h>
382#endif
383
341#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
344# ifdef __cplusplus 397# ifdef __cplusplus
345extern "C" { 398extern "C" {
346# endif 399# endif
347int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 401# ifdef __cplusplus
349} 402}
350# endif 403# endif
404#endif
405
406#if EV_USE_SIGNALFD
407# include <sys/signalfd.h>
351#endif 408#endif
352 409
353/**/ 410/**/
354 411
355#if EV_VERIFY >= 3 412#if EV_VERIFY >= 3
… …
391# define inline_speed static noinline 448# define inline_speed static noinline
392#else 449#else
393# define inline_speed static inline 450# define inline_speed static inline
394#endif 451#endif
395 452
396#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 453#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
454
455#if EV_MINPRI == EV_MAXPRI
456# define ABSPRI(w) (((W)w), 0)
457#else
397#define ABSPRI(w) (((W)w)->priority - EV_MINPRI) 458# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
459#endif
398 460
399#define EMPTY /* required for microsofts broken pseudo-c compiler */ 461#define EMPTY /* required for microsofts broken pseudo-c compiler */
400#define EMPTY2(a,b) /* used to suppress some warnings */ 462#define EMPTY2(a,b) /* used to suppress some warnings */
401 463
402typedef ev_watcher *W; 464typedef ev_watcher *W;
… …
485#define ev_malloc(size) ev_realloc (0, (size)) 547#define ev_malloc(size) ev_realloc (0, (size))
486#define ev_free(ptr) ev_realloc ((ptr), 0) 548#define ev_free(ptr) ev_realloc ((ptr), 0)
487 549
488/*****************************************************************************/ 550/*****************************************************************************/
489 551
552/* set in reify when reification needed */
553#define EV_ANFD_REIFY 1
554
490/* file descriptor info structure */ 555/* file descriptor info structure */
491typedef struct 556typedef struct
492{ 557{
493 WL head; 558 WL head;
494 unsigned char events; /* the events watched for */ 559 unsigned char events; /* the events watched for */
495 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) */
496 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 */
497 unsigned char unused; 562 unsigned char unused;
498#if EV_USE_EPOLL 563#if EV_USE_EPOLL
499 unsigned int egen; /* generation counter to counter epoll bugs */ 564 unsigned int egen; /* generation counter to counter epoll bugs */
500#endif 565#endif
… …
562 627
563 static int ev_default_loop_ptr; 628 static int ev_default_loop_ptr;
564 629
565#endif 630#endif
566 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
567/*****************************************************************************/ 644/*****************************************************************************/
568 645
646#ifndef EV_HAVE_EV_TIME
569ev_tstamp 647ev_tstamp
570ev_time (void) 648ev_time (void)
571{ 649{
572#if EV_USE_REALTIME 650#if EV_USE_REALTIME
573 if (expect_true (have_realtime)) 651 if (expect_true (have_realtime))
… …
580 658
581 struct timeval tv; 659 struct timeval tv;
582 gettimeofday (&tv, 0); 660 gettimeofday (&tv, 0);
583 return tv.tv_sec + tv.tv_usec * 1e-6; 661 return tv.tv_sec + tv.tv_usec * 1e-6;
584} 662}
663#endif
585 664
586inline_size ev_tstamp 665inline_size ev_tstamp
587get_clock (void) 666get_clock (void)
588{ 667{
589#if EV_USE_MONOTONIC 668#if EV_USE_MONOTONIC
… …
625 704
626 tv.tv_sec = (time_t)delay; 705 tv.tv_sec = (time_t)delay;
627 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 706 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
628 707
629 /* 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 */
630 /* somehting nto guaranteed by newer posix versions, but guaranteed */ 709 /* something not guaranteed by newer posix versions, but guaranteed */
631 /* by older ones */ 710 /* by older ones */
632 select (0, 0, 0, 0, &tv); 711 select (0, 0, 0, 0, &tv);
633#endif 712#endif
634 } 713 }
635} 714}
… …
743} 822}
744 823
745/*****************************************************************************/ 824/*****************************************************************************/
746 825
747inline_speed void 826inline_speed void
748fd_event (EV_P_ int fd, int revents) 827fd_event_nc (EV_P_ int fd, int revents)
749{ 828{
750 ANFD *anfd = anfds + fd; 829 ANFD *anfd = anfds + fd;
751 ev_io *w; 830 ev_io *w;
752 831
753 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)
… …
757 if (ev) 836 if (ev)
758 ev_feed_event (EV_A_ (W)w, ev); 837 ev_feed_event (EV_A_ (W)w, ev);
759 } 838 }
760} 839}
761 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
762void 852void
763ev_feed_fd_event (EV_P_ int fd, int revents) 853ev_feed_fd_event (EV_P_ int fd, int revents)
764{ 854{
765 if (fd >= 0 && fd < anfdmax) 855 if (fd >= 0 && fd < anfdmax)
766 fd_event (EV_A_ fd, revents); 856 fd_event_nc (EV_A_ fd, revents);
767} 857}
768 858
769/* make sure the external fd watch events are in-sync */ 859/* make sure the external fd watch events are in-sync */
770/* with the kernel/libev internal state */ 860/* with the kernel/libev internal state */
771inline_size void 861inline_size void
… …
871 961
872 for (fd = anfdmax; fd--; ) 962 for (fd = anfdmax; fd--; )
873 if (anfds [fd].events) 963 if (anfds [fd].events)
874 { 964 {
875 fd_kill (EV_A_ fd); 965 fd_kill (EV_A_ fd);
876 return; 966 break;
877 } 967 }
878} 968}
879 969
880/* 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 */
881static void noinline 971static void noinline
… …
886 for (fd = 0; fd < anfdmax; ++fd) 976 for (fd = 0; fd < anfdmax; ++fd)
887 if (anfds [fd].events) 977 if (anfds [fd].events)
888 { 978 {
889 anfds [fd].events = 0; 979 anfds [fd].events = 0;
890 anfds [fd].emask = 0; 980 anfds [fd].emask = 0;
891 fd_change (EV_A_ fd, EV__IOFDSET | 1); 981 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
892 } 982 }
893} 983}
894 984
895/*****************************************************************************/ 985/*****************************************************************************/
896 986
… …
971 1061
972 for (;;) 1062 for (;;)
973 { 1063 {
974 int c = k << 1; 1064 int c = k << 1;
975 1065
976 if (c > N + HEAP0 - 1) 1066 if (c >= N + HEAP0)
977 break; 1067 break;
978 1068
979 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])
980 ? 1 : 0; 1070 ? 1 : 0;
981 1071
… …
1017 1107
1018/* move an element suitably so it is in a correct place */ 1108/* move an element suitably so it is in a correct place */
1019inline_size void 1109inline_size void
1020adjustheap (ANHE *heap, int N, int k) 1110adjustheap (ANHE *heap, int N, int k)
1021{ 1111{
1022 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)]))
1023 upheap (heap, k); 1113 upheap (heap, k);
1024 else 1114 else
1025 downheap (heap, N, k); 1115 downheap (heap, N, k);
1026} 1116}
1027 1117
… …
1040/*****************************************************************************/ 1130/*****************************************************************************/
1041 1131
1042/* associate signal watchers to a signal signal */ 1132/* associate signal watchers to a signal signal */
1043typedef struct 1133typedef struct
1044{ 1134{
1135 EV_ATOMIC_T pending;
1136#if EV_MULTIPLICITY
1137 EV_P;
1138#endif
1045 WL head; 1139 WL head;
1046 EV_ATOMIC_T gotsig;
1047} ANSIG; 1140} ANSIG;
1048 1141
1049static ANSIG *signals; 1142static ANSIG signals [EV_NSIG - 1];
1050static int signalmax;
1051
1052static EV_ATOMIC_T gotsig;
1053 1143
1054/*****************************************************************************/ 1144/*****************************************************************************/
1055 1145
1056/* used to prepare libev internal fd's */ 1146/* used to prepare libev internal fd's */
1057/* this is not fork-safe */ 1147/* this is not fork-safe */
… …
1071evpipe_init (EV_P) 1161evpipe_init (EV_P)
1072{ 1162{
1073 if (!ev_is_active (&pipe_w)) 1163 if (!ev_is_active (&pipe_w))
1074 { 1164 {
1075#if EV_USE_EVENTFD 1165#if EV_USE_EVENTFD
1166 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1167 if (evfd < 0 && errno == EINVAL)
1076 if ((evfd = eventfd (0, 0)) >= 0) 1168 evfd = eventfd (0, 0);
1169
1170 if (evfd >= 0)
1077 { 1171 {
1078 evpipe [0] = -1; 1172 evpipe [0] = -1;
1079 fd_intern (evfd); 1173 fd_intern (evfd); /* doing it twice doesn't hurt */
1080 ev_io_set (&pipe_w, evfd, EV_READ); 1174 ev_io_set (&pipe_w, evfd, EV_READ);
1081 } 1175 }
1082 else 1176 else
1083#endif 1177#endif
1084 { 1178 {
… …
1121/* called whenever the libev signal pipe */ 1215/* called whenever the libev signal pipe */
1122/* got some events (signal, async) */ 1216/* got some events (signal, async) */
1123static void 1217static void
1124pipecb (EV_P_ ev_io *iow, int revents) 1218pipecb (EV_P_ ev_io *iow, int revents)
1125{ 1219{
1220 int i;
1221
1126#if EV_USE_EVENTFD 1222#if EV_USE_EVENTFD
1127 if (evfd >= 0) 1223 if (evfd >= 0)
1128 { 1224 {
1129 uint64_t counter; 1225 uint64_t counter;
1130 read (evfd, &counter, sizeof (uint64_t)); 1226 read (evfd, &counter, sizeof (uint64_t));
… …
1134 { 1230 {
1135 char dummy; 1231 char dummy;
1136 read (evpipe [0], &dummy, 1); 1232 read (evpipe [0], &dummy, 1);
1137 } 1233 }
1138 1234
1139 if (gotsig && ev_is_default_loop (EV_A)) 1235 if (sig_pending)
1140 { 1236 {
1141 int signum; 1237 sig_pending = 0;
1142 gotsig = 0;
1143 1238
1144 for (signum = signalmax; signum--; ) 1239 for (i = EV_NSIG - 1; i--; )
1145 if (signals [signum].gotsig) 1240 if (expect_false (signals [i].pending))
1146 ev_feed_signal_event (EV_A_ signum + 1); 1241 ev_feed_signal_event (EV_A_ i + 1);
1147 } 1242 }
1148 1243
1149#if EV_ASYNC_ENABLE 1244#if EV_ASYNC_ENABLE
1150 if (gotasync) 1245 if (async_pending)
1151 { 1246 {
1152 int i; 1247 async_pending = 0;
1153 gotasync = 0;
1154 1248
1155 for (i = asynccnt; i--; ) 1249 for (i = asynccnt; i--; )
1156 if (asyncs [i]->sent) 1250 if (asyncs [i]->sent)
1157 { 1251 {
1158 asyncs [i]->sent = 0; 1252 asyncs [i]->sent = 0;
… …
1166 1260
1167static void 1261static void
1168ev_sighandler (int signum) 1262ev_sighandler (int signum)
1169{ 1263{
1170#if EV_MULTIPLICITY 1264#if EV_MULTIPLICITY
1171 struct ev_loop *loop = &default_loop_struct; 1265 EV_P = signals [signum - 1].loop;
1172#endif 1266#endif
1173 1267
1174#if _WIN32 1268#if _WIN32
1175 signal (signum, ev_sighandler); 1269 signal (signum, ev_sighandler);
1176#endif 1270#endif
1177 1271
1178 signals [signum - 1].gotsig = 1; 1272 signals [signum - 1].pending = 1;
1179 evpipe_write (EV_A_ &gotsig); 1273 evpipe_write (EV_A_ &sig_pending);
1180} 1274}
1181 1275
1182void noinline 1276void noinline
1183ev_feed_signal_event (EV_P_ int signum) 1277ev_feed_signal_event (EV_P_ int signum)
1184{ 1278{
1185 WL w; 1279 WL w;
1186 1280
1281 if (expect_false (signum <= 0 || signum > EV_NSIG))
1282 return;
1283
1284 --signum;
1285
1187#if EV_MULTIPLICITY 1286#if EV_MULTIPLICITY
1188 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 */
1189#endif 1288 /* or, likely more useful, feeding a signal nobody is waiting for */
1190 1289
1191 --signum; 1290 if (expect_false (signals [signum].loop != EV_A))
1192
1193 if (signum < 0 || signum >= signalmax)
1194 return; 1291 return;
1292#endif
1195 1293
1196 signals [signum].gotsig = 0; 1294 signals [signum].pending = 0;
1197 1295
1198 for (w = signals [signum].head; w; w = w->next) 1296 for (w = signals [signum].head; w; w = w->next)
1199 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1297 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1200} 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
1201 1319
1202/*****************************************************************************/ 1320/*****************************************************************************/
1203 1321
1204static WL childs [EV_PID_HASHSIZE]; 1322static WL childs [EV_PID_HASHSIZE];
1205 1323
… …
1350ev_backend (EV_P) 1468ev_backend (EV_P)
1351{ 1469{
1352 return backend; 1470 return backend;
1353} 1471}
1354 1472
1473#if EV_MINIMAL < 2
1355unsigned int 1474unsigned int
1356ev_loop_count (EV_P) 1475ev_loop_count (EV_P)
1357{ 1476{
1358 return loop_count; 1477 return loop_count;
1359} 1478}
1360 1479
1480unsigned int
1481ev_loop_depth (EV_P)
1482{
1483 return loop_depth;
1484}
1485
1361void 1486void
1362ev_set_io_collect_interval (EV_P_ ev_tstamp interval) 1487ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1363{ 1488{
1364 io_blocktime = interval; 1489 io_blocktime = interval;
1365} 1490}
… …
1367void 1492void
1368ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1493ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1369{ 1494{
1370 timeout_blocktime = interval; 1495 timeout_blocktime = interval;
1371} 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
1372 1521
1373/* initialise a loop structure, must be zero-initialised */ 1522/* initialise a loop structure, must be zero-initialised */
1374static void noinline 1523static void noinline
1375loop_init (EV_P_ unsigned int flags) 1524loop_init (EV_P_ unsigned int flags)
1376{ 1525{
… …
1394 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1543 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1395 have_monotonic = 1; 1544 have_monotonic = 1;
1396 } 1545 }
1397#endif 1546#endif
1398 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
1399 ev_rt_now = ev_time (); 1559 ev_rt_now = ev_time ();
1400 mn_now = get_clock (); 1560 mn_now = get_clock ();
1401 now_floor = mn_now; 1561 now_floor = mn_now;
1402 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
1403 1566
1404 io_blocktime = 0.; 1567 io_blocktime = 0.;
1405 timeout_blocktime = 0.; 1568 timeout_blocktime = 0.;
1406 backend = 0; 1569 backend = 0;
1407 backend_fd = -1; 1570 backend_fd = -1;
1408 gotasync = 0; 1571 sig_pending = 0;
1572#if EV_ASYNC_ENABLE
1573 async_pending = 0;
1574#endif
1409#if EV_USE_INOTIFY 1575#if EV_USE_INOTIFY
1410 fs_fd = -2; 1576 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1411#endif 1577#endif
1412 1578#if EV_USE_SIGNALFD
1413 /* pid check not overridable via env */ 1579 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1414#ifndef _WIN32
1415 if (flags & EVFLAG_FORKCHECK)
1416 curpid = getpid ();
1417#endif 1580#endif
1418
1419 if (!(flags & EVFLAG_NOENV)
1420 && !enable_secure ()
1421 && getenv ("LIBEV_FLAGS"))
1422 flags = atoi (getenv ("LIBEV_FLAGS"));
1423 1581
1424 if (!(flags & 0x0000ffffU)) 1582 if (!(flags & 0x0000ffffU))
1425 flags |= ev_recommended_backends (); 1583 flags |= ev_recommended_backends ();
1426 1584
1427#if EV_USE_PORT 1585#if EV_USE_PORT
… …
1453{ 1611{
1454 int i; 1612 int i;
1455 1613
1456 if (ev_is_active (&pipe_w)) 1614 if (ev_is_active (&pipe_w))
1457 { 1615 {
1458 ev_ref (EV_A); /* signal watcher */ 1616 /*ev_ref (EV_A);*/
1459 ev_io_stop (EV_A_ &pipe_w); 1617 /*ev_io_stop (EV_A_ &pipe_w);*/
1460 1618
1461#if EV_USE_EVENTFD 1619#if EV_USE_EVENTFD
1462 if (evfd >= 0) 1620 if (evfd >= 0)
1463 close (evfd); 1621 close (evfd);
1464#endif 1622#endif
… …
1468 close (evpipe [0]); 1626 close (evpipe [0]);
1469 close (evpipe [1]); 1627 close (evpipe [1]);
1470 } 1628 }
1471 } 1629 }
1472 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
1473#if EV_USE_INOTIFY 1641#if EV_USE_INOTIFY
1474 if (fs_fd >= 0) 1642 if (fs_fd >= 0)
1475 close (fs_fd); 1643 close (fs_fd);
1476#endif 1644#endif
1477 1645
… …
1500#if EV_IDLE_ENABLE 1668#if EV_IDLE_ENABLE
1501 array_free (idle, [i]); 1669 array_free (idle, [i]);
1502#endif 1670#endif
1503 } 1671 }
1504 1672
1505 ev_free (anfds); anfdmax = 0; 1673 ev_free (anfds); anfds = 0; anfdmax = 0;
1506 1674
1507 /* have to use the microsoft-never-gets-it-right macro */ 1675 /* have to use the microsoft-never-gets-it-right macro */
1508 array_free (rfeed, EMPTY); 1676 array_free (rfeed, EMPTY);
1509 array_free (fdchange, EMPTY); 1677 array_free (fdchange, EMPTY);
1510 array_free (timer, EMPTY); 1678 array_free (timer, EMPTY);
… …
1545 1713
1546 if (ev_is_active (&pipe_w)) 1714 if (ev_is_active (&pipe_w))
1547 { 1715 {
1548 /* this "locks" the handlers against writing to the pipe */ 1716 /* this "locks" the handlers against writing to the pipe */
1549 /* while we modify the fd vars */ 1717 /* while we modify the fd vars */
1550 gotsig = 1; 1718 sig_pending = 1;
1551#if EV_ASYNC_ENABLE 1719#if EV_ASYNC_ENABLE
1552 gotasync = 1; 1720 async_pending = 1;
1553#endif 1721#endif
1554 1722
1555 ev_ref (EV_A); 1723 ev_ref (EV_A);
1556 ev_io_stop (EV_A_ &pipe_w); 1724 ev_io_stop (EV_A_ &pipe_w);
1557 1725
… …
1577#if EV_MULTIPLICITY 1745#if EV_MULTIPLICITY
1578 1746
1579struct ev_loop * 1747struct ev_loop *
1580ev_loop_new (unsigned int flags) 1748ev_loop_new (unsigned int flags)
1581{ 1749{
1582 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));
1583 1751
1584 memset (loop, 0, sizeof (struct ev_loop)); 1752 memset (EV_A, 0, sizeof (struct ev_loop));
1585
1586 loop_init (EV_A_ flags); 1753 loop_init (EV_A_ flags);
1587 1754
1588 if (ev_backend (EV_A)) 1755 if (ev_backend (EV_A))
1589 return loop; 1756 return EV_A;
1590 1757
1591 return 0; 1758 return 0;
1592} 1759}
1593 1760
1594void 1761void
… …
1601void 1768void
1602ev_loop_fork (EV_P) 1769ev_loop_fork (EV_P)
1603{ 1770{
1604 postfork = 1; /* must be in line with ev_default_fork */ 1771 postfork = 1; /* must be in line with ev_default_fork */
1605} 1772}
1773#endif /* multiplicity */
1606 1774
1607#if EV_VERIFY 1775#if EV_VERIFY
1608static void noinline 1776static void noinline
1609verify_watcher (EV_P_ W w) 1777verify_watcher (EV_P_ W w)
1610{ 1778{
… …
1638 verify_watcher (EV_A_ ws [cnt]); 1806 verify_watcher (EV_A_ ws [cnt]);
1639 } 1807 }
1640} 1808}
1641#endif 1809#endif
1642 1810
1811#if EV_MINIMAL < 2
1643void 1812void
1644ev_loop_verify (EV_P) 1813ev_loop_verify (EV_P)
1645{ 1814{
1646#if EV_VERIFY 1815#if EV_VERIFY
1647 int i; 1816 int i;
… …
1696 assert (checkmax >= checkcnt); 1865 assert (checkmax >= checkcnt);
1697 array_verify (EV_A_ (W *)checks, checkcnt); 1866 array_verify (EV_A_ (W *)checks, checkcnt);
1698 1867
1699# if 0 1868# if 0
1700 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)
1701 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1870 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1702# endif 1871# endif
1703#endif 1872#endif
1704} 1873}
1705 1874#endif
1706#endif /* multiplicity */
1707 1875
1708#if EV_MULTIPLICITY 1876#if EV_MULTIPLICITY
1709struct ev_loop * 1877struct ev_loop *
1710ev_default_loop_init (unsigned int flags) 1878ev_default_loop_init (unsigned int flags)
1711#else 1879#else
… …
1714#endif 1882#endif
1715{ 1883{
1716 if (!ev_default_loop_ptr) 1884 if (!ev_default_loop_ptr)
1717 { 1885 {
1718#if EV_MULTIPLICITY 1886#if EV_MULTIPLICITY
1719 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1887 EV_P = ev_default_loop_ptr = &default_loop_struct;
1720#else 1888#else
1721 ev_default_loop_ptr = 1; 1889 ev_default_loop_ptr = 1;
1722#endif 1890#endif
1723 1891
1724 loop_init (EV_A_ flags); 1892 loop_init (EV_A_ flags);
… …
1741 1909
1742void 1910void
1743ev_default_destroy (void) 1911ev_default_destroy (void)
1744{ 1912{
1745#if EV_MULTIPLICITY 1913#if EV_MULTIPLICITY
1746 struct ev_loop *loop = ev_default_loop_ptr; 1914 EV_P = ev_default_loop_ptr;
1747#endif 1915#endif
1748 1916
1749 ev_default_loop_ptr = 0; 1917 ev_default_loop_ptr = 0;
1750 1918
1751#ifndef _WIN32 1919#ifndef _WIN32
… …
1758 1926
1759void 1927void
1760ev_default_fork (void) 1928ev_default_fork (void)
1761{ 1929{
1762#if EV_MULTIPLICITY 1930#if EV_MULTIPLICITY
1763 struct ev_loop *loop = ev_default_loop_ptr; 1931 EV_P = ev_default_loop_ptr;
1764#endif 1932#endif
1765 1933
1766 postfork = 1; /* must be in line with ev_loop_fork */ 1934 postfork = 1; /* must be in line with ev_loop_fork */
1767} 1935}
1768 1936
… …
1772ev_invoke (EV_P_ void *w, int revents) 1940ev_invoke (EV_P_ void *w, int revents)
1773{ 1941{
1774 EV_CB_INVOKE ((W)w, revents); 1942 EV_CB_INVOKE ((W)w, revents);
1775} 1943}
1776 1944
1777inline_speed void 1945unsigned int
1778call_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)
1779{ 1959{
1780 int pri; 1960 int pri;
1781 1961
1782 for (pri = NUMPRI; pri--; ) 1962 for (pri = NUMPRI; pri--; )
1783 while (pendingcnt [pri]) 1963 while (pendingcnt [pri])
… …
2018 2198
2019 mn_now = ev_rt_now; 2199 mn_now = ev_rt_now;
2020 } 2200 }
2021} 2201}
2022 2202
2023static int loop_done;
2024
2025void 2203void
2026ev_loop (EV_P_ int flags) 2204ev_loop (EV_P_ int flags)
2027{ 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
2028 loop_done = EVUNLOOP_CANCEL; 2212 loop_done = EVUNLOOP_CANCEL;
2029 2213
2030 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 */
2031 2215
2032 do 2216 do
2033 { 2217 {
2034#if EV_VERIFY >= 2 2218#if EV_VERIFY >= 2
2035 ev_loop_verify (EV_A); 2219 ev_loop_verify (EV_A);
… …
2048 /* we might have forked, so queue fork handlers */ 2232 /* we might have forked, so queue fork handlers */
2049 if (expect_false (postfork)) 2233 if (expect_false (postfork))
2050 if (forkcnt) 2234 if (forkcnt)
2051 { 2235 {
2052 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2236 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2053 call_pending (EV_A); 2237 EV_INVOKE_PENDING;
2054 } 2238 }
2055#endif 2239#endif
2056 2240
2057 /* queue prepare watchers (and execute them) */ 2241 /* queue prepare watchers (and execute them) */
2058 if (expect_false (preparecnt)) 2242 if (expect_false (preparecnt))
2059 { 2243 {
2060 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2244 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2061 call_pending (EV_A); 2245 EV_INVOKE_PENDING;
2062 } 2246 }
2247
2248 if (expect_false (loop_done))
2249 break;
2063 2250
2064 /* we might have forked, so reify kernel state if necessary */ 2251 /* we might have forked, so reify kernel state if necessary */
2065 if (expect_false (postfork)) 2252 if (expect_false (postfork))
2066 loop_fork (EV_A); 2253 loop_fork (EV_A);
2067 2254
… …
2073 ev_tstamp waittime = 0.; 2260 ev_tstamp waittime = 0.;
2074 ev_tstamp sleeptime = 0.; 2261 ev_tstamp sleeptime = 0.;
2075 2262
2076 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt))) 2263 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
2077 { 2264 {
2265 /* remember old timestamp for io_blocktime calculation */
2266 ev_tstamp prev_mn_now = mn_now;
2267
2078 /* update time to cancel out callback processing overhead */ 2268 /* update time to cancel out callback processing overhead */
2079 time_update (EV_A_ 1e100); 2269 time_update (EV_A_ 1e100);
2080 2270
2081 waittime = MAX_BLOCKTIME; 2271 waittime = MAX_BLOCKTIME;
2082 2272
… …
2092 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;
2093 if (waittime > to) waittime = to; 2283 if (waittime > to) waittime = to;
2094 } 2284 }
2095#endif 2285#endif
2096 2286
2287 /* don't let timeouts decrease the waittime below timeout_blocktime */
2097 if (expect_false (waittime < timeout_blocktime)) 2288 if (expect_false (waittime < timeout_blocktime))
2098 waittime = timeout_blocktime; 2289 waittime = timeout_blocktime;
2099 2290
2100 sleeptime = waittime - backend_fudge; 2291 /* extra check because io_blocktime is commonly 0 */
2101
2102 if (expect_true (sleeptime > io_blocktime)) 2292 if (expect_false (io_blocktime))
2103 sleeptime = io_blocktime;
2104
2105 if (sleeptime)
2106 { 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 {
2107 ev_sleep (sleeptime); 2301 ev_sleep (sleeptime);
2108 waittime -= sleeptime; 2302 waittime -= sleeptime;
2303 }
2109 } 2304 }
2110 } 2305 }
2111 2306
2307#if EV_MINIMAL < 2
2112 ++loop_count; 2308 ++loop_count;
2309#endif
2310 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2113 backend_poll (EV_A_ waittime); 2311 backend_poll (EV_A_ waittime);
2312 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2114 2313
2115 /* update ev_rt_now, do magic */ 2314 /* update ev_rt_now, do magic */
2116 time_update (EV_A_ waittime + sleeptime); 2315 time_update (EV_A_ waittime + sleeptime);
2117 } 2316 }
2118 2317
… …
2129 2328
2130 /* queue check watchers, to be executed first */ 2329 /* queue check watchers, to be executed first */
2131 if (expect_false (checkcnt)) 2330 if (expect_false (checkcnt))
2132 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2331 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2133 2332
2134 call_pending (EV_A); 2333 EV_INVOKE_PENDING;
2135 } 2334 }
2136 while (expect_true ( 2335 while (expect_true (
2137 activecnt 2336 activecnt
2138 && !loop_done 2337 && !loop_done
2139 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2338 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2140 )); 2339 ));
2141 2340
2142 if (loop_done == EVUNLOOP_ONE) 2341 if (loop_done == EVUNLOOP_ONE)
2143 loop_done = EVUNLOOP_CANCEL; 2342 loop_done = EVUNLOOP_CANCEL;
2343
2344#if EV_MINIMAL < 2
2345 --loop_depth;
2346#endif
2144} 2347}
2145 2348
2146void 2349void
2147ev_unloop (EV_P_ int how) 2350ev_unloop (EV_P_ int how)
2148{ 2351{
… …
2199inline_size void 2402inline_size void
2200wlist_del (WL *head, WL elem) 2403wlist_del (WL *head, WL elem)
2201{ 2404{
2202 while (*head) 2405 while (*head)
2203 { 2406 {
2204 if (*head == elem) 2407 if (expect_true (*head == elem))
2205 { 2408 {
2206 *head = elem->next; 2409 *head = elem->next;
2207 return; 2410 break;
2208 } 2411 }
2209 2412
2210 head = &(*head)->next; 2413 head = &(*head)->next;
2211 } 2414 }
2212} 2415}
… …
2240} 2443}
2241 2444
2242inline_size void 2445inline_size void
2243pri_adjust (EV_P_ W w) 2446pri_adjust (EV_P_ W w)
2244{ 2447{
2245 int pri = w->priority; 2448 int pri = ev_priority (w);
2246 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2449 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2247 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2450 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2248 w->priority = pri; 2451 ev_set_priority (w, pri);
2249} 2452}
2250 2453
2251inline_speed void 2454inline_speed void
2252ev_start (EV_P_ W w, int active) 2455ev_start (EV_P_ W w, int active)
2253{ 2456{
… …
2280 2483
2281 ev_start (EV_A_ (W)w, 1); 2484 ev_start (EV_A_ (W)w, 1);
2282 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2485 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2283 wlist_add (&anfds[fd].head, (WL)w); 2486 wlist_add (&anfds[fd].head, (WL)w);
2284 2487
2285 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2488 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2286 w->events &= ~EV__IOFDSET; 2489 w->events &= ~EV__IOFDSET;
2287 2490
2288 EV_FREQUENT_CHECK; 2491 EV_FREQUENT_CHECK;
2289} 2492}
2290 2493
… …
2384 } 2587 }
2385 2588
2386 EV_FREQUENT_CHECK; 2589 EV_FREQUENT_CHECK;
2387} 2590}
2388 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
2389#if EV_PERIODIC_ENABLE 2598#if EV_PERIODIC_ENABLE
2390void noinline 2599void noinline
2391ev_periodic_start (EV_P_ ev_periodic *w) 2600ev_periodic_start (EV_P_ ev_periodic *w)
2392{ 2601{
2393 if (expect_false (ev_is_active (w))) 2602 if (expect_false (ev_is_active (w)))
… …
2460#endif 2669#endif
2461 2670
2462void noinline 2671void noinline
2463ev_signal_start (EV_P_ ev_signal *w) 2672ev_signal_start (EV_P_ ev_signal *w)
2464{ 2673{
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))) 2674 if (expect_false (ev_is_active (w)))
2469 return; 2675 return;
2470 2676
2471 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));
2472 2678
2473 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));
2474 2682
2475 EV_FREQUENT_CHECK; 2683 signals [w->signum - 1].loop = EV_A;
2684#endif
2476 2685
2686 EV_FREQUENT_CHECK;
2687
2688#if EV_USE_SIGNALFD
2689 if (sigfd == -2)
2477 { 2690 {
2478#ifndef _WIN32 2691 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2479 sigset_t full, prev; 2692 if (sigfd < 0 && errno == EINVAL)
2480 sigfillset (&full); 2693 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2481 sigprocmask (SIG_SETMASK, &full, &prev);
2482#endif
2483 2694
2484 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 */
2485 2698
2486#ifndef _WIN32 2699 sigemptyset (&sigfd_set);
2487 sigprocmask (SIG_SETMASK, &prev, 0); 2700
2488#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 }
2489 } 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
2490 2717
2491 ev_start (EV_A_ (W)w, 1); 2718 ev_start (EV_A_ (W)w, 1);
2492 wlist_add (&signals [w->signum - 1].head, (WL)w); 2719 wlist_add (&signals [w->signum - 1].head, (WL)w);
2493 2720
2494 if (!((WL)w)->next) 2721 if (!((WL)w)->next)
2722# if EV_USE_SIGNALFD
2723 if (sigfd < 0) /*TODO*/
2724# endif
2495 { 2725 {
2496#if _WIN32 2726# if _WIN32
2497 signal (w->signum, ev_sighandler); 2727 signal (w->signum, ev_sighandler);
2498#else 2728# else
2499 struct sigaction sa; 2729 struct sigaction sa;
2730
2731 evpipe_init (EV_A);
2732
2500 sa.sa_handler = ev_sighandler; 2733 sa.sa_handler = ev_sighandler;
2501 sigfillset (&sa.sa_mask); 2734 sigfillset (&sa.sa_mask);
2502 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 */
2503 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);
2504#endif 2741#endif
2505 } 2742 }
2506 2743
2507 EV_FREQUENT_CHECK; 2744 EV_FREQUENT_CHECK;
2508} 2745}
2509 2746
2510void noinline 2747void noinline
… …
2518 2755
2519 wlist_del (&signals [w->signum - 1].head, (WL)w); 2756 wlist_del (&signals [w->signum - 1].head, (WL)w);
2520 ev_stop (EV_A_ (W)w); 2757 ev_stop (EV_A_ (W)w);
2521 2758
2522 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
2523 signal (w->signum, SIG_DFL); 2775 signal (w->signum, SIG_DFL);
2776 }
2524 2777
2525 EV_FREQUENT_CHECK; 2778 EV_FREQUENT_CHECK;
2526} 2779}
2527 2780
2528void 2781void
… …
2608 } 2861 }
2609 } 2862 }
2610 2863
2611 if (w->wd >= 0) 2864 if (w->wd >= 0)
2612 { 2865 {
2866 struct statfs sfs;
2867
2613 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);
2614 2869
2615 /* 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 */
2616 /* 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 */
2617 /* also do poll on <2.6.25, but with normal frequency */ 2872 /* also do poll on <2.6.25, but with normal frequency */
2618 struct statfs sfs;
2619 2873
2620 if (fs_2625 && !statfs (w->path, &sfs)) 2874 if (fs_2625 && !statfs (w->path, &sfs))
2621 if (sfs.f_type == 0x1373 /* devfs */ 2875 if (sfs.f_type == 0x1373 /* devfs */
2622 || sfs.f_type == 0xEF53 /* ext2/3 */ 2876 || sfs.f_type == 0xEF53 /* ext2/3 */
2623 || sfs.f_type == 0x3153464a /* jfs */ 2877 || sfs.f_type == 0x3153464a /* jfs */
… …
3008embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3262embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3009{ 3263{
3010 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3264 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3011 3265
3012 { 3266 {
3013 struct ev_loop *loop = w->other; 3267 EV_P = w->other;
3014 3268
3015 while (fdchangecnt) 3269 while (fdchangecnt)
3016 { 3270 {
3017 fd_reify (EV_A); 3271 fd_reify (EV_A);
3018 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3272 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3026 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));
3027 3281
3028 ev_embed_stop (EV_A_ w); 3282 ev_embed_stop (EV_A_ w);
3029 3283
3030 { 3284 {
3031 struct ev_loop *loop = w->other; 3285 EV_P = w->other;
3032 3286
3033 ev_loop_fork (EV_A); 3287 ev_loop_fork (EV_A);
3034 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3288 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3035 } 3289 }
3036 3290
… …
3050{ 3304{
3051 if (expect_false (ev_is_active (w))) 3305 if (expect_false (ev_is_active (w)))
3052 return; 3306 return;
3053 3307
3054 { 3308 {
3055 struct ev_loop *loop = w->other; 3309 EV_P = w->other;
3056 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 ()));
3057 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);
3058 } 3312 }
3059 3313
3060 EV_FREQUENT_CHECK; 3314 EV_FREQUENT_CHECK;
… …
3172 3426
3173void 3427void
3174ev_async_send (EV_P_ ev_async *w) 3428ev_async_send (EV_P_ ev_async *w)
3175{ 3429{
3176 w->sent = 1; 3430 w->sent = 1;
3177 evpipe_write (EV_A_ &gotasync); 3431 evpipe_write (EV_A_ &async_pending);
3178} 3432}
3179#endif 3433#endif
3180 3434
3181/*****************************************************************************/ 3435/*****************************************************************************/
3182 3436
… …
3331 if (types & EV_CHECK) 3585 if (types & EV_CHECK)
3332 for (i = checkcnt; i--; ) 3586 for (i = checkcnt; i--; )
3333 cb (EV_A_ EV_CHECK, checks [i]); 3587 cb (EV_A_ EV_CHECK, checks [i]);
3334 3588
3335 if (types & EV_SIGNAL) 3589 if (types & EV_SIGNAL)
3336 for (i = 0; i < signalmax; ++i) 3590 for (i = 0; i < EV_NSIG - 1; ++i)
3337 for (wl = signals [i].head; wl; ) 3591 for (wl = signals [i].head; wl; )
3338 { 3592 {
3339 wn = wl->next; 3593 wn = wl->next;
3340 cb (EV_A_ EV_SIGNAL, wl); 3594 cb (EV_A_ EV_SIGNAL, wl);
3341 wl = wn; 3595 wl = wn;

Diff Legend

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