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

Comparing libev/ev.c (file contents):
Revision 1.295 by root, Wed Jul 8 04:29:31 2009 UTC vs.
Revision 1.313 by root, Wed Aug 19 23:44:51 2009 UTC

… …
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
178# endif 186# endif
179#endif 187#endif
180 188
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
182 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
183#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
186# else 221# else
187# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
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__ >= 9))
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
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
… …
419 476
420#if EV_USE_MONOTONIC 477#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 478static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422#endif 479#endif
423 480
481#ifndef EV_FD_TO_WIN32_HANDLE
482# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
483#endif
484#ifndef EV_WIN32_HANDLE_TO_FD
485# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
486#endif
487#ifndef EV_WIN32_CLOSE_FD
488# define EV_WIN32_CLOSE_FD(fd) close (fd)
489#endif
490
424#ifdef _WIN32 491#ifdef _WIN32
425# include "ev_win32.c" 492# include "ev_win32.c"
426#endif 493#endif
427 494
428/*****************************************************************************/ 495/*****************************************************************************/
… …
490#define ev_malloc(size) ev_realloc (0, (size)) 557#define ev_malloc(size) ev_realloc (0, (size))
491#define ev_free(ptr) ev_realloc ((ptr), 0) 558#define ev_free(ptr) ev_realloc ((ptr), 0)
492 559
493/*****************************************************************************/ 560/*****************************************************************************/
494 561
562/* set in reify when reification needed */
563#define EV_ANFD_REIFY 1
564
495/* file descriptor info structure */ 565/* file descriptor info structure */
496typedef struct 566typedef struct
497{ 567{
498 WL head; 568 WL head;
499 unsigned char events; /* the events watched for */ 569 unsigned char events; /* the events watched for */
500 unsigned char reify; /* flag set when this ANFD needs reification */ 570 unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
501 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 571 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502 unsigned char unused; 572 unsigned char unused;
503#if EV_USE_EPOLL 573#if EV_USE_EPOLL
504 unsigned int egen; /* generation counter to counter epoll bugs */ 574 unsigned int egen; /* generation counter to counter epoll bugs */
505#endif 575#endif
… …
567 637
568 static int ev_default_loop_ptr; 638 static int ev_default_loop_ptr;
569 639
570#endif 640#endif
571 641
642#if EV_MINIMAL < 2
643# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
644# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
645# define EV_INVOKE_PENDING invoke_cb (EV_A)
646#else
647# define EV_RELEASE_CB (void)0
648# define EV_ACQUIRE_CB (void)0
649# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
650#endif
651
652#define EVUNLOOP_RECURSE 0x80
653
572/*****************************************************************************/ 654/*****************************************************************************/
573 655
574#ifndef EV_HAVE_EV_TIME 656#ifndef EV_HAVE_EV_TIME
575ev_tstamp 657ev_tstamp
576ev_time (void) 658ev_time (void)
… …
632 714
633 tv.tv_sec = (time_t)delay; 715 tv.tv_sec = (time_t)delay;
634 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 716 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
635 717
636 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 718 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
637 /* somehting not guaranteed by newer posix versions, but guaranteed */ 719 /* something not guaranteed by newer posix versions, but guaranteed */
638 /* by older ones */ 720 /* by older ones */
639 select (0, 0, 0, 0, &tv); 721 select (0, 0, 0, 0, &tv);
640#endif 722#endif
641 } 723 }
642} 724}
… …
750} 832}
751 833
752/*****************************************************************************/ 834/*****************************************************************************/
753 835
754inline_speed void 836inline_speed void
755fd_event (EV_P_ int fd, int revents) 837fd_event_nc (EV_P_ int fd, int revents)
756{ 838{
757 ANFD *anfd = anfds + fd; 839 ANFD *anfd = anfds + fd;
758 ev_io *w; 840 ev_io *w;
759 841
760 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 842 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
… …
764 if (ev) 846 if (ev)
765 ev_feed_event (EV_A_ (W)w, ev); 847 ev_feed_event (EV_A_ (W)w, ev);
766 } 848 }
767} 849}
768 850
851/* do not submit kernel events for fds that have reify set */
852/* because that means they changed while we were polling for new events */
853inline_speed void
854fd_event (EV_P_ int fd, int revents)
855{
856 ANFD *anfd = anfds + fd;
857
858 if (expect_true (!anfd->reify))
859 fd_event_nc (EV_A_ fd, revents);
860}
861
769void 862void
770ev_feed_fd_event (EV_P_ int fd, int revents) 863ev_feed_fd_event (EV_P_ int fd, int revents)
771{ 864{
772 if (fd >= 0 && fd < anfdmax) 865 if (fd >= 0 && fd < anfdmax)
773 fd_event (EV_A_ fd, revents); 866 fd_event_nc (EV_A_ fd, revents);
774} 867}
775 868
776/* make sure the external fd watch events are in-sync */ 869/* make sure the external fd watch events are in-sync */
777/* with the kernel/libev internal state */ 870/* with the kernel/libev internal state */
778inline_size void 871inline_size void
… …
793 886
794#if EV_SELECT_IS_WINSOCKET 887#if EV_SELECT_IS_WINSOCKET
795 if (events) 888 if (events)
796 { 889 {
797 unsigned long arg; 890 unsigned long arg;
798 #ifdef EV_FD_TO_WIN32_HANDLE
799 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 891 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
800 #else
801 anfd->handle = _get_osfhandle (fd);
802 #endif
803 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 892 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
804 } 893 }
805#endif 894#endif
806 895
807 { 896 {
… …
878 967
879 for (fd = anfdmax; fd--; ) 968 for (fd = anfdmax; fd--; )
880 if (anfds [fd].events) 969 if (anfds [fd].events)
881 { 970 {
882 fd_kill (EV_A_ fd); 971 fd_kill (EV_A_ fd);
883 return; 972 break;
884 } 973 }
885} 974}
886 975
887/* usually called after fork if backend needs to re-arm all fds from scratch */ 976/* usually called after fork if backend needs to re-arm all fds from scratch */
888static void noinline 977static void noinline
… …
893 for (fd = 0; fd < anfdmax; ++fd) 982 for (fd = 0; fd < anfdmax; ++fd)
894 if (anfds [fd].events) 983 if (anfds [fd].events)
895 { 984 {
896 anfds [fd].events = 0; 985 anfds [fd].events = 0;
897 anfds [fd].emask = 0; 986 anfds [fd].emask = 0;
898 fd_change (EV_A_ fd, EV__IOFDSET | 1); 987 fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
899 } 988 }
900} 989}
901 990
902/*****************************************************************************/ 991/*****************************************************************************/
903 992
… …
978 1067
979 for (;;) 1068 for (;;)
980 { 1069 {
981 int c = k << 1; 1070 int c = k << 1;
982 1071
983 if (c > N + HEAP0 - 1) 1072 if (c >= N + HEAP0)
984 break; 1073 break;
985 1074
986 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1075 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
987 ? 1 : 0; 1076 ? 1 : 0;
988 1077
… …
1024 1113
1025/* move an element suitably so it is in a correct place */ 1114/* move an element suitably so it is in a correct place */
1026inline_size void 1115inline_size void
1027adjustheap (ANHE *heap, int N, int k) 1116adjustheap (ANHE *heap, int N, int k)
1028{ 1117{
1029 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1118 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1030 upheap (heap, k); 1119 upheap (heap, k);
1031 else 1120 else
1032 downheap (heap, N, k); 1121 downheap (heap, N, k);
1033} 1122}
1034 1123
… …
1047/*****************************************************************************/ 1136/*****************************************************************************/
1048 1137
1049/* associate signal watchers to a signal signal */ 1138/* associate signal watchers to a signal signal */
1050typedef struct 1139typedef struct
1051{ 1140{
1141 EV_ATOMIC_T pending;
1142#if EV_MULTIPLICITY
1143 EV_P;
1144#endif
1052 WL head; 1145 WL head;
1053 EV_ATOMIC_T gotsig;
1054} ANSIG; 1146} ANSIG;
1055 1147
1056static ANSIG *signals; 1148static ANSIG signals [EV_NSIG - 1];
1057static int signalmax;
1058
1059static EV_ATOMIC_T gotsig;
1060 1149
1061/*****************************************************************************/ 1150/*****************************************************************************/
1062 1151
1063/* used to prepare libev internal fd's */ 1152/* used to prepare libev internal fd's */
1064/* this is not fork-safe */ 1153/* this is not fork-safe */
… …
1078evpipe_init (EV_P) 1167evpipe_init (EV_P)
1079{ 1168{
1080 if (!ev_is_active (&pipe_w)) 1169 if (!ev_is_active (&pipe_w))
1081 { 1170 {
1082#if EV_USE_EVENTFD 1171#if EV_USE_EVENTFD
1172 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1173 if (evfd < 0 && errno == EINVAL)
1083 if ((evfd = eventfd (0, 0)) >= 0) 1174 evfd = eventfd (0, 0);
1175
1176 if (evfd >= 0)
1084 { 1177 {
1085 evpipe [0] = -1; 1178 evpipe [0] = -1;
1086 fd_intern (evfd); 1179 fd_intern (evfd); /* doing it twice doesn't hurt */
1087 ev_io_set (&pipe_w, evfd, EV_READ); 1180 ev_io_set (&pipe_w, evfd, EV_READ);
1088 } 1181 }
1089 else 1182 else
1090#endif 1183#endif
1091 { 1184 {
… …
1128/* called whenever the libev signal pipe */ 1221/* called whenever the libev signal pipe */
1129/* got some events (signal, async) */ 1222/* got some events (signal, async) */
1130static void 1223static void
1131pipecb (EV_P_ ev_io *iow, int revents) 1224pipecb (EV_P_ ev_io *iow, int revents)
1132{ 1225{
1226 int i;
1227
1133#if EV_USE_EVENTFD 1228#if EV_USE_EVENTFD
1134 if (evfd >= 0) 1229 if (evfd >= 0)
1135 { 1230 {
1136 uint64_t counter; 1231 uint64_t counter;
1137 read (evfd, &counter, sizeof (uint64_t)); 1232 read (evfd, &counter, sizeof (uint64_t));
… …
1141 { 1236 {
1142 char dummy; 1237 char dummy;
1143 read (evpipe [0], &dummy, 1); 1238 read (evpipe [0], &dummy, 1);
1144 } 1239 }
1145 1240
1146 if (gotsig && ev_is_default_loop (EV_A)) 1241 if (sig_pending)
1147 { 1242 {
1148 int signum; 1243 sig_pending = 0;
1149 gotsig = 0;
1150 1244
1151 for (signum = signalmax; signum--; ) 1245 for (i = EV_NSIG - 1; i--; )
1152 if (signals [signum].gotsig) 1246 if (expect_false (signals [i].pending))
1153 ev_feed_signal_event (EV_A_ signum + 1); 1247 ev_feed_signal_event (EV_A_ i + 1);
1154 } 1248 }
1155 1249
1156#if EV_ASYNC_ENABLE 1250#if EV_ASYNC_ENABLE
1157 if (gotasync) 1251 if (async_pending)
1158 { 1252 {
1159 int i; 1253 async_pending = 0;
1160 gotasync = 0;
1161 1254
1162 for (i = asynccnt; i--; ) 1255 for (i = asynccnt; i--; )
1163 if (asyncs [i]->sent) 1256 if (asyncs [i]->sent)
1164 { 1257 {
1165 asyncs [i]->sent = 0; 1258 asyncs [i]->sent = 0;
… …
1173 1266
1174static void 1267static void
1175ev_sighandler (int signum) 1268ev_sighandler (int signum)
1176{ 1269{
1177#if EV_MULTIPLICITY 1270#if EV_MULTIPLICITY
1178 struct ev_loop *loop = &default_loop_struct; 1271 EV_P = signals [signum - 1].loop;
1179#endif 1272#endif
1180 1273
1181#if _WIN32 1274#if _WIN32
1182 signal (signum, ev_sighandler); 1275 signal (signum, ev_sighandler);
1183#endif 1276#endif
1184 1277
1185 signals [signum - 1].gotsig = 1; 1278 signals [signum - 1].pending = 1;
1186 evpipe_write (EV_A_ &gotsig); 1279 evpipe_write (EV_A_ &sig_pending);
1187} 1280}
1188 1281
1189void noinline 1282void noinline
1190ev_feed_signal_event (EV_P_ int signum) 1283ev_feed_signal_event (EV_P_ int signum)
1191{ 1284{
1192 WL w; 1285 WL w;
1193 1286
1287 if (expect_false (signum <= 0 || signum > EV_NSIG))
1288 return;
1289
1290 --signum;
1291
1194#if EV_MULTIPLICITY 1292#if EV_MULTIPLICITY
1195 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1293 /* it is permissible to try to feed a signal to the wrong loop */
1196#endif 1294 /* or, likely more useful, feeding a signal nobody is waiting for */
1197 1295
1198 --signum; 1296 if (expect_false (signals [signum].loop != EV_A))
1199
1200 if (signum < 0 || signum >= signalmax)
1201 return; 1297 return;
1298#endif
1202 1299
1203 signals [signum].gotsig = 0; 1300 signals [signum].pending = 0;
1204 1301
1205 for (w = signals [signum].head; w; w = w->next) 1302 for (w = signals [signum].head; w; w = w->next)
1206 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1303 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1207} 1304}
1305
1306#if EV_USE_SIGNALFD
1307static void
1308sigfdcb (EV_P_ ev_io *iow, int revents)
1309{
1310 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1311
1312 for (;;)
1313 {
1314 ssize_t res = read (sigfd, si, sizeof (si));
1315
1316 /* not ISO-C, as res might be -1, but works with SuS */
1317 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1318 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1319
1320 if (res < (ssize_t)sizeof (si))
1321 break;
1322 }
1323}
1324#endif
1208 1325
1209/*****************************************************************************/ 1326/*****************************************************************************/
1210 1327
1211static WL childs [EV_PID_HASHSIZE]; 1328static WL childs [EV_PID_HASHSIZE];
1212 1329
… …
1357ev_backend (EV_P) 1474ev_backend (EV_P)
1358{ 1475{
1359 return backend; 1476 return backend;
1360} 1477}
1361 1478
1479#if EV_MINIMAL < 2
1362unsigned int 1480unsigned int
1363ev_loop_count (EV_P) 1481ev_loop_count (EV_P)
1364{ 1482{
1365 return loop_count; 1483 return loop_count;
1366} 1484}
… …
1380void 1498void
1381ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) 1499ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1382{ 1500{
1383 timeout_blocktime = interval; 1501 timeout_blocktime = interval;
1384} 1502}
1503
1504void
1505ev_set_userdata (EV_P_ void *data)
1506{
1507 userdata = data;
1508}
1509
1510void *
1511ev_userdata (EV_P)
1512{
1513 return userdata;
1514}
1515
1516void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1517{
1518 invoke_cb = invoke_pending_cb;
1519}
1520
1521void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1522{
1523 release_cb = release;
1524 acquire_cb = acquire;
1525}
1526#endif
1385 1527
1386/* initialise a loop structure, must be zero-initialised */ 1528/* initialise a loop structure, must be zero-initialised */
1387static void noinline 1529static void noinline
1388loop_init (EV_P_ unsigned int flags) 1530loop_init (EV_P_ unsigned int flags)
1389{ 1531{
… …
1407 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1549 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1408 have_monotonic = 1; 1550 have_monotonic = 1;
1409 } 1551 }
1410#endif 1552#endif
1411 1553
1554 /* pid check not overridable via env */
1555#ifndef _WIN32
1556 if (flags & EVFLAG_FORKCHECK)
1557 curpid = getpid ();
1558#endif
1559
1560 if (!(flags & EVFLAG_NOENV)
1561 && !enable_secure ()
1562 && getenv ("LIBEV_FLAGS"))
1563 flags = atoi (getenv ("LIBEV_FLAGS"));
1564
1412 ev_rt_now = ev_time (); 1565 ev_rt_now = ev_time ();
1413 mn_now = get_clock (); 1566 mn_now = get_clock ();
1414 now_floor = mn_now; 1567 now_floor = mn_now;
1415 rtmn_diff = ev_rt_now - mn_now; 1568 rtmn_diff = ev_rt_now - mn_now;
1569#if EV_MINIMAL < 2
1570 invoke_cb = ev_invoke_pending;
1571#endif
1416 1572
1417 io_blocktime = 0.; 1573 io_blocktime = 0.;
1418 timeout_blocktime = 0.; 1574 timeout_blocktime = 0.;
1419 backend = 0; 1575 backend = 0;
1420 backend_fd = -1; 1576 backend_fd = -1;
1421 gotasync = 0; 1577 sig_pending = 0;
1578#if EV_ASYNC_ENABLE
1579 async_pending = 0;
1580#endif
1422#if EV_USE_INOTIFY 1581#if EV_USE_INOTIFY
1423 fs_fd = -2; 1582 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1424#endif 1583#endif
1425 1584#if EV_USE_SIGNALFD
1426 /* pid check not overridable via env */ 1585 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1427#ifndef _WIN32
1428 if (flags & EVFLAG_FORKCHECK)
1429 curpid = getpid ();
1430#endif 1586#endif
1431
1432 if (!(flags & EVFLAG_NOENV)
1433 && !enable_secure ()
1434 && getenv ("LIBEV_FLAGS"))
1435 flags = atoi (getenv ("LIBEV_FLAGS"));
1436 1587
1437 if (!(flags & 0x0000ffffU)) 1588 if (!(flags & 0x0000ffffU))
1438 flags |= ev_recommended_backends (); 1589 flags |= ev_recommended_backends ();
1439 1590
1440#if EV_USE_PORT 1591#if EV_USE_PORT
… …
1466{ 1617{
1467 int i; 1618 int i;
1468 1619
1469 if (ev_is_active (&pipe_w)) 1620 if (ev_is_active (&pipe_w))
1470 { 1621 {
1471 ev_ref (EV_A); /* signal watcher */ 1622 /*ev_ref (EV_A);*/
1472 ev_io_stop (EV_A_ &pipe_w); 1623 /*ev_io_stop (EV_A_ &pipe_w);*/
1473 1624
1474#if EV_USE_EVENTFD 1625#if EV_USE_EVENTFD
1475 if (evfd >= 0) 1626 if (evfd >= 0)
1476 close (evfd); 1627 close (evfd);
1477#endif 1628#endif
1478 1629
1479 if (evpipe [0] >= 0) 1630 if (evpipe [0] >= 0)
1480 { 1631 {
1481 close (evpipe [0]); 1632 EV_WIN32_CLOSE_FD (evpipe [0]);
1482 close (evpipe [1]); 1633 EV_WIN32_CLOSE_FD (evpipe [1]);
1483 } 1634 }
1484 } 1635 }
1636
1637#if EV_USE_SIGNALFD
1638 if (ev_is_active (&sigfd_w))
1639 {
1640 /*ev_ref (EV_A);*/
1641 /*ev_io_stop (EV_A_ &sigfd_w);*/
1642
1643 close (sigfd);
1644 }
1645#endif
1485 1646
1486#if EV_USE_INOTIFY 1647#if EV_USE_INOTIFY
1487 if (fs_fd >= 0) 1648 if (fs_fd >= 0)
1488 close (fs_fd); 1649 close (fs_fd);
1489#endif 1650#endif
… …
1513#if EV_IDLE_ENABLE 1674#if EV_IDLE_ENABLE
1514 array_free (idle, [i]); 1675 array_free (idle, [i]);
1515#endif 1676#endif
1516 } 1677 }
1517 1678
1518 ev_free (anfds); anfdmax = 0; 1679 ev_free (anfds); anfds = 0; anfdmax = 0;
1519 1680
1520 /* have to use the microsoft-never-gets-it-right macro */ 1681 /* have to use the microsoft-never-gets-it-right macro */
1521 array_free (rfeed, EMPTY); 1682 array_free (rfeed, EMPTY);
1522 array_free (fdchange, EMPTY); 1683 array_free (fdchange, EMPTY);
1523 array_free (timer, EMPTY); 1684 array_free (timer, EMPTY);
… …
1558 1719
1559 if (ev_is_active (&pipe_w)) 1720 if (ev_is_active (&pipe_w))
1560 { 1721 {
1561 /* this "locks" the handlers against writing to the pipe */ 1722 /* this "locks" the handlers against writing to the pipe */
1562 /* while we modify the fd vars */ 1723 /* while we modify the fd vars */
1563 gotsig = 1; 1724 sig_pending = 1;
1564#if EV_ASYNC_ENABLE 1725#if EV_ASYNC_ENABLE
1565 gotasync = 1; 1726 async_pending = 1;
1566#endif 1727#endif
1567 1728
1568 ev_ref (EV_A); 1729 ev_ref (EV_A);
1569 ev_io_stop (EV_A_ &pipe_w); 1730 ev_io_stop (EV_A_ &pipe_w);
1570 1731
… …
1573 close (evfd); 1734 close (evfd);
1574#endif 1735#endif
1575 1736
1576 if (evpipe [0] >= 0) 1737 if (evpipe [0] >= 0)
1577 { 1738 {
1578 close (evpipe [0]); 1739 EV_WIN32_CLOSE_FD (evpipe [0]);
1579 close (evpipe [1]); 1740 EV_WIN32_CLOSE_FD (evpipe [1]);
1580 } 1741 }
1581 1742
1582 evpipe_init (EV_A); 1743 evpipe_init (EV_A);
1583 /* now iterate over everything, in case we missed something */ 1744 /* now iterate over everything, in case we missed something */
1584 pipecb (EV_A_ &pipe_w, EV_READ); 1745 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1590#if EV_MULTIPLICITY 1751#if EV_MULTIPLICITY
1591 1752
1592struct ev_loop * 1753struct ev_loop *
1593ev_loop_new (unsigned int flags) 1754ev_loop_new (unsigned int flags)
1594{ 1755{
1595 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1756 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1596 1757
1597 memset (loop, 0, sizeof (struct ev_loop)); 1758 memset (EV_A, 0, sizeof (struct ev_loop));
1598
1599 loop_init (EV_A_ flags); 1759 loop_init (EV_A_ flags);
1600 1760
1601 if (ev_backend (EV_A)) 1761 if (ev_backend (EV_A))
1602 return loop; 1762 return EV_A;
1603 1763
1604 return 0; 1764 return 0;
1605} 1765}
1606 1766
1607void 1767void
… …
1614void 1774void
1615ev_loop_fork (EV_P) 1775ev_loop_fork (EV_P)
1616{ 1776{
1617 postfork = 1; /* must be in line with ev_default_fork */ 1777 postfork = 1; /* must be in line with ev_default_fork */
1618} 1778}
1779#endif /* multiplicity */
1619 1780
1620#if EV_VERIFY 1781#if EV_VERIFY
1621static void noinline 1782static void noinline
1622verify_watcher (EV_P_ W w) 1783verify_watcher (EV_P_ W w)
1623{ 1784{
… …
1651 verify_watcher (EV_A_ ws [cnt]); 1812 verify_watcher (EV_A_ ws [cnt]);
1652 } 1813 }
1653} 1814}
1654#endif 1815#endif
1655 1816
1817#if EV_MINIMAL < 2
1656void 1818void
1657ev_loop_verify (EV_P) 1819ev_loop_verify (EV_P)
1658{ 1820{
1659#if EV_VERIFY 1821#if EV_VERIFY
1660 int i; 1822 int i;
… …
1709 assert (checkmax >= checkcnt); 1871 assert (checkmax >= checkcnt);
1710 array_verify (EV_A_ (W *)checks, checkcnt); 1872 array_verify (EV_A_ (W *)checks, checkcnt);
1711 1873
1712# if 0 1874# if 0
1713 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1875 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1714 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1876 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1715# endif 1877# endif
1716#endif 1878#endif
1717} 1879}
1718 1880#endif
1719#endif /* multiplicity */
1720 1881
1721#if EV_MULTIPLICITY 1882#if EV_MULTIPLICITY
1722struct ev_loop * 1883struct ev_loop *
1723ev_default_loop_init (unsigned int flags) 1884ev_default_loop_init (unsigned int flags)
1724#else 1885#else
… …
1727#endif 1888#endif
1728{ 1889{
1729 if (!ev_default_loop_ptr) 1890 if (!ev_default_loop_ptr)
1730 { 1891 {
1731#if EV_MULTIPLICITY 1892#if EV_MULTIPLICITY
1732 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1893 EV_P = ev_default_loop_ptr = &default_loop_struct;
1733#else 1894#else
1734 ev_default_loop_ptr = 1; 1895 ev_default_loop_ptr = 1;
1735#endif 1896#endif
1736 1897
1737 loop_init (EV_A_ flags); 1898 loop_init (EV_A_ flags);
… …
1754 1915
1755void 1916void
1756ev_default_destroy (void) 1917ev_default_destroy (void)
1757{ 1918{
1758#if EV_MULTIPLICITY 1919#if EV_MULTIPLICITY
1759 struct ev_loop *loop = ev_default_loop_ptr; 1920 EV_P = ev_default_loop_ptr;
1760#endif 1921#endif
1761 1922
1762 ev_default_loop_ptr = 0; 1923 ev_default_loop_ptr = 0;
1763 1924
1764#ifndef _WIN32 1925#ifndef _WIN32
… …
1771 1932
1772void 1933void
1773ev_default_fork (void) 1934ev_default_fork (void)
1774{ 1935{
1775#if EV_MULTIPLICITY 1936#if EV_MULTIPLICITY
1776 struct ev_loop *loop = ev_default_loop_ptr; 1937 EV_P = ev_default_loop_ptr;
1777#endif 1938#endif
1778 1939
1779 postfork = 1; /* must be in line with ev_loop_fork */ 1940 postfork = 1; /* must be in line with ev_loop_fork */
1780} 1941}
1781 1942
… …
1785ev_invoke (EV_P_ void *w, int revents) 1946ev_invoke (EV_P_ void *w, int revents)
1786{ 1947{
1787 EV_CB_INVOKE ((W)w, revents); 1948 EV_CB_INVOKE ((W)w, revents);
1788} 1949}
1789 1950
1790inline_speed void 1951unsigned int
1791call_pending (EV_P) 1952ev_pending_count (EV_P)
1953{
1954 int pri;
1955 unsigned int count = 0;
1956
1957 for (pri = NUMPRI; pri--; )
1958 count += pendingcnt [pri];
1959
1960 return count;
1961}
1962
1963void noinline
1964ev_invoke_pending (EV_P)
1792{ 1965{
1793 int pri; 1966 int pri;
1794 1967
1795 for (pri = NUMPRI; pri--; ) 1968 for (pri = NUMPRI; pri--; )
1796 while (pendingcnt [pri]) 1969 while (pendingcnt [pri])
… …
2034} 2207}
2035 2208
2036void 2209void
2037ev_loop (EV_P_ int flags) 2210ev_loop (EV_P_ int flags)
2038{ 2211{
2212#if EV_MINIMAL < 2
2039 ++loop_depth; 2213 ++loop_depth;
2214#endif
2215
2216 assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
2040 2217
2041 loop_done = EVUNLOOP_CANCEL; 2218 loop_done = EVUNLOOP_CANCEL;
2042 2219
2043 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 2220 EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2044 2221
2045 do 2222 do
2046 { 2223 {
2047#if EV_VERIFY >= 2 2224#if EV_VERIFY >= 2
2048 ev_loop_verify (EV_A); 2225 ev_loop_verify (EV_A);
… …
2061 /* we might have forked, so queue fork handlers */ 2238 /* we might have forked, so queue fork handlers */
2062 if (expect_false (postfork)) 2239 if (expect_false (postfork))
2063 if (forkcnt) 2240 if (forkcnt)
2064 { 2241 {
2065 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK); 2242 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
2066 call_pending (EV_A); 2243 EV_INVOKE_PENDING;
2067 } 2244 }
2068#endif 2245#endif
2069 2246
2070 /* queue prepare watchers (and execute them) */ 2247 /* queue prepare watchers (and execute them) */
2071 if (expect_false (preparecnt)) 2248 if (expect_false (preparecnt))
2072 { 2249 {
2073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2250 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2074 call_pending (EV_A); 2251 EV_INVOKE_PENDING;
2075 } 2252 }
2253
2254 if (expect_false (loop_done))
2255 break;
2076 2256
2077 /* we might have forked, so reify kernel state if necessary */ 2257 /* we might have forked, so reify kernel state if necessary */
2078 if (expect_false (postfork)) 2258 if (expect_false (postfork))
2079 loop_fork (EV_A); 2259 loop_fork (EV_A);
2080 2260
… …
2128 waittime -= sleeptime; 2308 waittime -= sleeptime;
2129 } 2309 }
2130 } 2310 }
2131 } 2311 }
2132 2312
2313#if EV_MINIMAL < 2
2133 ++loop_count; 2314 ++loop_count;
2315#endif
2316 assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2134 backend_poll (EV_A_ waittime); 2317 backend_poll (EV_A_ waittime);
2318 assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2135 2319
2136 /* update ev_rt_now, do magic */ 2320 /* update ev_rt_now, do magic */
2137 time_update (EV_A_ waittime + sleeptime); 2321 time_update (EV_A_ waittime + sleeptime);
2138 } 2322 }
2139 2323
… …
2150 2334
2151 /* queue check watchers, to be executed first */ 2335 /* queue check watchers, to be executed first */
2152 if (expect_false (checkcnt)) 2336 if (expect_false (checkcnt))
2153 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 2337 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
2154 2338
2155 call_pending (EV_A); 2339 EV_INVOKE_PENDING;
2156 } 2340 }
2157 while (expect_true ( 2341 while (expect_true (
2158 activecnt 2342 activecnt
2159 && !loop_done 2343 && !loop_done
2160 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) 2344 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
2161 )); 2345 ));
2162 2346
2163 if (loop_done == EVUNLOOP_ONE) 2347 if (loop_done == EVUNLOOP_ONE)
2164 loop_done = EVUNLOOP_CANCEL; 2348 loop_done = EVUNLOOP_CANCEL;
2165 2349
2350#if EV_MINIMAL < 2
2166 --loop_depth; 2351 --loop_depth;
2352#endif
2167} 2353}
2168 2354
2169void 2355void
2170ev_unloop (EV_P_ int how) 2356ev_unloop (EV_P_ int how)
2171{ 2357{
… …
2222inline_size void 2408inline_size void
2223wlist_del (WL *head, WL elem) 2409wlist_del (WL *head, WL elem)
2224{ 2410{
2225 while (*head) 2411 while (*head)
2226 { 2412 {
2227 if (*head == elem) 2413 if (expect_true (*head == elem))
2228 { 2414 {
2229 *head = elem->next; 2415 *head = elem->next;
2230 return; 2416 break;
2231 } 2417 }
2232 2418
2233 head = &(*head)->next; 2419 head = &(*head)->next;
2234 } 2420 }
2235} 2421}
… …
2303 2489
2304 ev_start (EV_A_ (W)w, 1); 2490 ev_start (EV_A_ (W)w, 1);
2305 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2491 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2306 wlist_add (&anfds[fd].head, (WL)w); 2492 wlist_add (&anfds[fd].head, (WL)w);
2307 2493
2308 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1); 2494 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
2309 w->events &= ~EV__IOFDSET; 2495 w->events &= ~EV__IOFDSET;
2310 2496
2311 EV_FREQUENT_CHECK; 2497 EV_FREQUENT_CHECK;
2312} 2498}
2313 2499
… …
2407 } 2593 }
2408 2594
2409 EV_FREQUENT_CHECK; 2595 EV_FREQUENT_CHECK;
2410} 2596}
2411 2597
2598ev_tstamp
2599ev_timer_remaining (EV_P_ ev_timer *w)
2600{
2601 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2602}
2603
2412#if EV_PERIODIC_ENABLE 2604#if EV_PERIODIC_ENABLE
2413void noinline 2605void noinline
2414ev_periodic_start (EV_P_ ev_periodic *w) 2606ev_periodic_start (EV_P_ ev_periodic *w)
2415{ 2607{
2416 if (expect_false (ev_is_active (w))) 2608 if (expect_false (ev_is_active (w)))
… …
2483#endif 2675#endif
2484 2676
2485void noinline 2677void noinline
2486ev_signal_start (EV_P_ ev_signal *w) 2678ev_signal_start (EV_P_ ev_signal *w)
2487{ 2679{
2488#if EV_MULTIPLICITY
2489 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2490#endif
2491 if (expect_false (ev_is_active (w))) 2680 if (expect_false (ev_is_active (w)))
2492 return; 2681 return;
2493 2682
2494 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2683 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2495 2684
2496 evpipe_init (EV_A); 2685#if EV_MULTIPLICITY
2686 assert (("libev: a signal must not be attached to two different loops",
2687 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2497 2688
2498 EV_FREQUENT_CHECK; 2689 signals [w->signum - 1].loop = EV_A;
2690#endif
2499 2691
2692 EV_FREQUENT_CHECK;
2693
2694#if EV_USE_SIGNALFD
2695 if (sigfd == -2)
2500 { 2696 {
2501#ifndef _WIN32 2697 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2502 sigset_t full, prev; 2698 if (sigfd < 0 && errno == EINVAL)
2503 sigfillset (&full); 2699 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2504 sigprocmask (SIG_SETMASK, &full, &prev);
2505#endif
2506 2700
2507 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2701 if (sigfd >= 0)
2702 {
2703 fd_intern (sigfd); /* doing it twice will not hurt */
2508 2704
2509#ifndef _WIN32 2705 sigemptyset (&sigfd_set);
2510 sigprocmask (SIG_SETMASK, &prev, 0); 2706
2511#endif 2707 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2708 ev_set_priority (&sigfd_w, EV_MAXPRI);
2709 ev_io_start (EV_A_ &sigfd_w);
2710 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2711 }
2512 } 2712 }
2713
2714 if (sigfd >= 0)
2715 {
2716 /* TODO: check .head */
2717 sigaddset (&sigfd_set, w->signum);
2718 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2719
2720 signalfd (sigfd, &sigfd_set, 0);
2721 }
2722#endif
2513 2723
2514 ev_start (EV_A_ (W)w, 1); 2724 ev_start (EV_A_ (W)w, 1);
2515 wlist_add (&signals [w->signum - 1].head, (WL)w); 2725 wlist_add (&signals [w->signum - 1].head, (WL)w);
2516 2726
2517 if (!((WL)w)->next) 2727 if (!((WL)w)->next)
2728# if EV_USE_SIGNALFD
2729 if (sigfd < 0) /*TODO*/
2730# endif
2518 { 2731 {
2519#if _WIN32 2732# if _WIN32
2520 signal (w->signum, ev_sighandler); 2733 signal (w->signum, ev_sighandler);
2521#else 2734# else
2522 struct sigaction sa; 2735 struct sigaction sa;
2736
2737 evpipe_init (EV_A);
2738
2523 sa.sa_handler = ev_sighandler; 2739 sa.sa_handler = ev_sighandler;
2524 sigfillset (&sa.sa_mask); 2740 sigfillset (&sa.sa_mask);
2525 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2741 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2526 sigaction (w->signum, &sa, 0); 2742 sigaction (w->signum, &sa, 0);
2743
2744 sigemptyset (&sa.sa_mask);
2745 sigaddset (&sa.sa_mask, w->signum);
2746 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2527#endif 2747#endif
2528 } 2748 }
2529 2749
2530 EV_FREQUENT_CHECK; 2750 EV_FREQUENT_CHECK;
2531} 2751}
2532 2752
2533void noinline 2753void noinline
… …
2541 2761
2542 wlist_del (&signals [w->signum - 1].head, (WL)w); 2762 wlist_del (&signals [w->signum - 1].head, (WL)w);
2543 ev_stop (EV_A_ (W)w); 2763 ev_stop (EV_A_ (W)w);
2544 2764
2545 if (!signals [w->signum - 1].head) 2765 if (!signals [w->signum - 1].head)
2766 {
2767#if EV_MULTIPLICITY
2768 signals [w->signum - 1].loop = 0; /* unattach from signal */
2769#endif
2770#if EV_USE_SIGNALFD
2771 if (sigfd >= 0)
2772 {
2773 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2774 sigdelset (&sigfd_set, w->signum);
2775 signalfd (sigfd, &sigfd_set, 0);
2776 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2777 /*TODO: maybe unblock signal? */
2778 }
2779 else
2780#endif
2546 signal (w->signum, SIG_DFL); 2781 signal (w->signum, SIG_DFL);
2782 }
2547 2783
2548 EV_FREQUENT_CHECK; 2784 EV_FREQUENT_CHECK;
2549} 2785}
2550 2786
2551void 2787void
… …
2631 } 2867 }
2632 } 2868 }
2633 2869
2634 if (w->wd >= 0) 2870 if (w->wd >= 0)
2635 { 2871 {
2872 struct statfs sfs;
2873
2636 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2874 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2637 2875
2638 /* now local changes will be tracked by inotify, but remote changes won't */ 2876 /* now local changes will be tracked by inotify, but remote changes won't */
2639 /* unless the filesystem it known to be local, we therefore still poll */ 2877 /* unless the filesystem it known to be local, we therefore still poll */
2640 /* also do poll on <2.6.25, but with normal frequency */ 2878 /* also do poll on <2.6.25, but with normal frequency */
2641 struct statfs sfs;
2642 2879
2643 if (fs_2625 && !statfs (w->path, &sfs)) 2880 if (fs_2625 && !statfs (w->path, &sfs))
2644 if (sfs.f_type == 0x1373 /* devfs */ 2881 if (sfs.f_type == 0x1373 /* devfs */
2645 || sfs.f_type == 0xEF53 /* ext2/3 */ 2882 || sfs.f_type == 0xEF53 /* ext2/3 */
2646 || sfs.f_type == 0x3153464a /* jfs */ 2883 || sfs.f_type == 0x3153464a /* jfs */
… …
3031embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3268embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3032{ 3269{
3033 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3270 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3034 3271
3035 { 3272 {
3036 struct ev_loop *loop = w->other; 3273 EV_P = w->other;
3037 3274
3038 while (fdchangecnt) 3275 while (fdchangecnt)
3039 { 3276 {
3040 fd_reify (EV_A); 3277 fd_reify (EV_A);
3041 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3278 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3049 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3286 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3050 3287
3051 ev_embed_stop (EV_A_ w); 3288 ev_embed_stop (EV_A_ w);
3052 3289
3053 { 3290 {
3054 struct ev_loop *loop = w->other; 3291 EV_P = w->other;
3055 3292
3056 ev_loop_fork (EV_A); 3293 ev_loop_fork (EV_A);
3057 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3294 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3058 } 3295 }
3059 3296
… …
3073{ 3310{
3074 if (expect_false (ev_is_active (w))) 3311 if (expect_false (ev_is_active (w)))
3075 return; 3312 return;
3076 3313
3077 { 3314 {
3078 struct ev_loop *loop = w->other; 3315 EV_P = w->other;
3079 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3316 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3080 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3317 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3081 } 3318 }
3082 3319
3083 EV_FREQUENT_CHECK; 3320 EV_FREQUENT_CHECK;
… …
3195 3432
3196void 3433void
3197ev_async_send (EV_P_ ev_async *w) 3434ev_async_send (EV_P_ ev_async *w)
3198{ 3435{
3199 w->sent = 1; 3436 w->sent = 1;
3200 evpipe_write (EV_A_ &gotasync); 3437 evpipe_write (EV_A_ &async_pending);
3201} 3438}
3202#endif 3439#endif
3203 3440
3204/*****************************************************************************/ 3441/*****************************************************************************/
3205 3442
… …
3354 if (types & EV_CHECK) 3591 if (types & EV_CHECK)
3355 for (i = checkcnt; i--; ) 3592 for (i = checkcnt; i--; )
3356 cb (EV_A_ EV_CHECK, checks [i]); 3593 cb (EV_A_ EV_CHECK, checks [i]);
3357 3594
3358 if (types & EV_SIGNAL) 3595 if (types & EV_SIGNAL)
3359 for (i = 0; i < signalmax; ++i) 3596 for (i = 0; i < EV_NSIG - 1; ++i)
3360 for (wl = signals [i].head; wl; ) 3597 for (wl = signals [i].head; wl; )
3361 { 3598 {
3362 wn = wl->next; 3599 wn = wl->next;
3363 cb (EV_A_ EV_SIGNAL, wl); 3600 cb (EV_A_ EV_SIGNAL, wl);
3364 wl = wn; 3601 wl = wn;

Diff Legend

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