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

Comparing libev/ev.c (file contents):
Revision 1.298 by root, Fri Jul 10 19:10:19 2009 UTC vs.
Revision 1.316 by root, Fri Sep 18 21:02:12 2009 UTC

… …
133# else 133# else
134# define EV_USE_INOTIFY 0 134# define EV_USE_INOTIFY 0
135# endif 135# endif
136# endif 136# endif
137 137
138# ifndef EV_USE_SIGNALFD
139# if HAVE_SIGNALFD && HAVE_SYS_SIGNALFD_H
140# define EV_USE_SIGNALFD 1
141# else
142# define EV_USE_SIGNALFD 0
143# endif
144# endif
145
138# ifndef EV_USE_EVENTFD 146# ifndef EV_USE_EVENTFD
139# if HAVE_EVENTFD 147# if HAVE_EVENTFD
140# define EV_USE_EVENTFD 1 148# define EV_USE_EVENTFD 1
141# else 149# else
142# define EV_USE_EVENTFD 0 150# define EV_USE_EVENTFD 0
… …
178# endif 186# endif
179#endif 187#endif
180 188
181/* this block tries to deduce configuration from header-defined symbols and defaults */ 189/* this block tries to deduce configuration from header-defined symbols and defaults */
182 190
191/* try to deduce the maximum number of signals on this platform */
192#if defined (EV_NSIG)
193/* use what's provided */
194#elif defined (NSIG)
195# define EV_NSIG (NSIG)
196#elif defined(_NSIG)
197# define EV_NSIG (_NSIG)
198#elif defined (SIGMAX)
199# define EV_NSIG (SIGMAX+1)
200#elif defined (SIG_MAX)
201# define EV_NSIG (SIG_MAX+1)
202#elif defined (_SIG_MAX)
203# define EV_NSIG (_SIG_MAX+1)
204#elif defined (MAXSIG)
205# define EV_NSIG (MAXSIG+1)
206#elif defined (MAX_SIG)
207# define EV_NSIG (MAX_SIG+1)
208#elif defined (SIGARRAYSIZE)
209# define EV_NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
210#elif defined (_sys_nsig)
211# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
212#else
213# error "unable to find value for NSIG, please report"
214/* to make it compile regardless, just remove the above line */
215# define EV_NSIG 65
216#endif
217
183#ifndef EV_USE_CLOCK_SYSCALL 218#ifndef EV_USE_CLOCK_SYSCALL
184# if __linux && __GLIBC__ >= 2 219# if __linux && __GLIBC__ >= 2
185# define EV_USE_CLOCK_SYSCALL 1 220# define EV_USE_CLOCK_SYSCALL 1
186# else 221# else
187# define EV_USE_CLOCK_SYSCALL 0 222# define EV_USE_CLOCK_SYSCALL 0
… …
263#ifndef EV_USE_EVENTFD 298#ifndef EV_USE_EVENTFD
264# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 299# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
265# define EV_USE_EVENTFD 1 300# define EV_USE_EVENTFD 1
266# else 301# else
267# define EV_USE_EVENTFD 0 302# define EV_USE_EVENTFD 0
303# endif
304#endif
305
306#ifndef EV_USE_SIGNALFD
307# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
308# define EV_USE_SIGNALFD 1
309# else
310# define EV_USE_SIGNALFD 0
268# endif 311# endif
269#endif 312#endif
270 313
271#if 0 /* debugging */ 314#if 0 /* debugging */
272# define EV_VERIFY 3 315# define EV_VERIFY 3
… …
339#endif 382#endif
340 383
341#if EV_USE_EVENTFD 384#if EV_USE_EVENTFD
342/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 385/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
343# include <stdint.h> 386# include <stdint.h>
387# ifndef EFD_NONBLOCK
388# define EFD_NONBLOCK O_NONBLOCK
389# endif
390# ifndef EFD_CLOEXEC
391# ifdef O_CLOEXEC
392# define EFD_CLOEXEC O_CLOEXEC
393# else
394# define EFD_CLOEXEC 02000000
395# endif
396# endif
344# ifdef __cplusplus 397# ifdef __cplusplus
345extern "C" { 398extern "C" {
346# endif 399# endif
347int eventfd (unsigned int initval, int flags); 400int eventfd (unsigned int initval, int flags);
348# ifdef __cplusplus 401# ifdef __cplusplus
349} 402}
350# endif 403# endif
351#endif 404#endif
405
406#if EV_USE_SIGNALFD
407/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
408# include <stdint.h>
409# ifndef SFD_NONBLOCK
410# define SFD_NONBLOCK O_NONBLOCK
411# endif
412# ifndef SFD_CLOEXEC
413# ifdef O_CLOEXEC
414# define SFD_CLOEXEC O_CLOEXEC
415# else
416# define SFD_CLOEXEC 02000000
417# endif
418# endif
419# ifdef __cplusplus
420extern "C" {
421# endif
422int signalfd (int fd, const sigset_t *mask, int flags);
423
424struct signalfd_siginfo
425{
426 uint32_t ssi_signo;
427 char pad[128 - sizeof (uint32_t)];
428};
429# ifdef __cplusplus
430}
431# endif
432#endif
433
352 434
353/**/ 435/**/
354 436
355#if EV_VERIFY >= 3 437#if EV_VERIFY >= 3
356# define EV_FREQUENT_CHECK ev_loop_verify (EV_A) 438# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
… …
368 */ 450 */
369#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 451#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
370 452
371#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 453#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
372#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 454#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
373/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
374 455
375#if __GNUC__ >= 4 456#if __GNUC__ >= 4
376# define expect(expr,value) __builtin_expect ((expr),(value)) 457# define expect(expr,value) __builtin_expect ((expr),(value))
377# define noinline __attribute__ ((noinline)) 458# define noinline __attribute__ ((noinline))
378#else 459#else
… …
417static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */ 498static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
418#endif 499#endif
419 500
420#if EV_USE_MONOTONIC 501#if EV_USE_MONOTONIC
421static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 502static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
503#endif
504
505#ifndef EV_FD_TO_WIN32_HANDLE
506# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
507#endif
508#ifndef EV_WIN32_HANDLE_TO_FD
509# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
510#endif
511#ifndef EV_WIN32_CLOSE_FD
512# define EV_WIN32_CLOSE_FD(fd) close (fd)
422#endif 513#endif
423 514
424#ifdef _WIN32 515#ifdef _WIN32
425# include "ev_win32.c" 516# include "ev_win32.c"
426#endif 517#endif
… …
647 738
648 tv.tv_sec = (time_t)delay; 739 tv.tv_sec = (time_t)delay;
649 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 740 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
650 741
651 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */ 742 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
652 /* somehting not guaranteed by newer posix versions, but guaranteed */ 743 /* something not guaranteed by newer posix versions, but guaranteed */
653 /* by older ones */ 744 /* by older ones */
654 select (0, 0, 0, 0, &tv); 745 select (0, 0, 0, 0, &tv);
655#endif 746#endif
656 } 747 }
657} 748}
… …
819 910
820#if EV_SELECT_IS_WINSOCKET 911#if EV_SELECT_IS_WINSOCKET
821 if (events) 912 if (events)
822 { 913 {
823 unsigned long arg; 914 unsigned long arg;
824 #ifdef EV_FD_TO_WIN32_HANDLE
825 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 915 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
826 #else
827 anfd->handle = _get_osfhandle (fd);
828 #endif
829 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 916 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
830 } 917 }
831#endif 918#endif
832 919
833 { 920 {
… …
904 991
905 for (fd = anfdmax; fd--; ) 992 for (fd = anfdmax; fd--; )
906 if (anfds [fd].events) 993 if (anfds [fd].events)
907 { 994 {
908 fd_kill (EV_A_ fd); 995 fd_kill (EV_A_ fd);
909 return; 996 break;
910 } 997 }
911} 998}
912 999
913/* usually called after fork if backend needs to re-arm all fds from scratch */ 1000/* usually called after fork if backend needs to re-arm all fds from scratch */
914static void noinline 1001static void noinline
… …
1004 1091
1005 for (;;) 1092 for (;;)
1006 { 1093 {
1007 int c = k << 1; 1094 int c = k << 1;
1008 1095
1009 if (c > N + HEAP0 - 1) 1096 if (c >= N + HEAP0)
1010 break; 1097 break;
1011 1098
1012 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1099 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1013 ? 1 : 0; 1100 ? 1 : 0;
1014 1101
… …
1050 1137
1051/* move an element suitably so it is in a correct place */ 1138/* move an element suitably so it is in a correct place */
1052inline_size void 1139inline_size void
1053adjustheap (ANHE *heap, int N, int k) 1140adjustheap (ANHE *heap, int N, int k)
1054{ 1141{
1055 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1142 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1056 upheap (heap, k); 1143 upheap (heap, k);
1057 else 1144 else
1058 downheap (heap, N, k); 1145 downheap (heap, N, k);
1059} 1146}
1060 1147
… …
1073/*****************************************************************************/ 1160/*****************************************************************************/
1074 1161
1075/* associate signal watchers to a signal signal */ 1162/* associate signal watchers to a signal signal */
1076typedef struct 1163typedef struct
1077{ 1164{
1165 EV_ATOMIC_T pending;
1166#if EV_MULTIPLICITY
1167 EV_P;
1168#endif
1078 WL head; 1169 WL head;
1079 EV_ATOMIC_T gotsig;
1080} ANSIG; 1170} ANSIG;
1081 1171
1082static ANSIG *signals; 1172static ANSIG signals [EV_NSIG - 1];
1083static int signalmax;
1084
1085static EV_ATOMIC_T gotsig;
1086 1173
1087/*****************************************************************************/ 1174/*****************************************************************************/
1088 1175
1089/* used to prepare libev internal fd's */ 1176/* used to prepare libev internal fd's */
1090/* this is not fork-safe */ 1177/* this is not fork-safe */
… …
1104evpipe_init (EV_P) 1191evpipe_init (EV_P)
1105{ 1192{
1106 if (!ev_is_active (&pipe_w)) 1193 if (!ev_is_active (&pipe_w))
1107 { 1194 {
1108#if EV_USE_EVENTFD 1195#if EV_USE_EVENTFD
1196 evfd = eventfd (0, EFD_NONBLOCK | EFD_CLOEXEC);
1197 if (evfd < 0 && errno == EINVAL)
1109 if ((evfd = eventfd (0, 0)) >= 0) 1198 evfd = eventfd (0, 0);
1199
1200 if (evfd >= 0)
1110 { 1201 {
1111 evpipe [0] = -1; 1202 evpipe [0] = -1;
1112 fd_intern (evfd); 1203 fd_intern (evfd); /* doing it twice doesn't hurt */
1113 ev_io_set (&pipe_w, evfd, EV_READ); 1204 ev_io_set (&pipe_w, evfd, EV_READ);
1114 } 1205 }
1115 else 1206 else
1116#endif 1207#endif
1117 { 1208 {
… …
1154/* called whenever the libev signal pipe */ 1245/* called whenever the libev signal pipe */
1155/* got some events (signal, async) */ 1246/* got some events (signal, async) */
1156static void 1247static void
1157pipecb (EV_P_ ev_io *iow, int revents) 1248pipecb (EV_P_ ev_io *iow, int revents)
1158{ 1249{
1250 int i;
1251
1159#if EV_USE_EVENTFD 1252#if EV_USE_EVENTFD
1160 if (evfd >= 0) 1253 if (evfd >= 0)
1161 { 1254 {
1162 uint64_t counter; 1255 uint64_t counter;
1163 read (evfd, &counter, sizeof (uint64_t)); 1256 read (evfd, &counter, sizeof (uint64_t));
… …
1167 { 1260 {
1168 char dummy; 1261 char dummy;
1169 read (evpipe [0], &dummy, 1); 1262 read (evpipe [0], &dummy, 1);
1170 } 1263 }
1171 1264
1172 if (gotsig && ev_is_default_loop (EV_A)) 1265 if (sig_pending)
1173 { 1266 {
1174 int signum; 1267 sig_pending = 0;
1175 gotsig = 0;
1176 1268
1177 for (signum = signalmax; signum--; ) 1269 for (i = EV_NSIG - 1; i--; )
1178 if (signals [signum].gotsig) 1270 if (expect_false (signals [i].pending))
1179 ev_feed_signal_event (EV_A_ signum + 1); 1271 ev_feed_signal_event (EV_A_ i + 1);
1180 } 1272 }
1181 1273
1182#if EV_ASYNC_ENABLE 1274#if EV_ASYNC_ENABLE
1183 if (gotasync) 1275 if (async_pending)
1184 { 1276 {
1185 int i; 1277 async_pending = 0;
1186 gotasync = 0;
1187 1278
1188 for (i = asynccnt; i--; ) 1279 for (i = asynccnt; i--; )
1189 if (asyncs [i]->sent) 1280 if (asyncs [i]->sent)
1190 { 1281 {
1191 asyncs [i]->sent = 0; 1282 asyncs [i]->sent = 0;
… …
1199 1290
1200static void 1291static void
1201ev_sighandler (int signum) 1292ev_sighandler (int signum)
1202{ 1293{
1203#if EV_MULTIPLICITY 1294#if EV_MULTIPLICITY
1204 struct ev_loop *loop = &default_loop_struct; 1295 EV_P = signals [signum - 1].loop;
1205#endif 1296#endif
1206 1297
1207#if _WIN32 1298#if _WIN32
1208 signal (signum, ev_sighandler); 1299 signal (signum, ev_sighandler);
1209#endif 1300#endif
1210 1301
1211 signals [signum - 1].gotsig = 1; 1302 signals [signum - 1].pending = 1;
1212 evpipe_write (EV_A_ &gotsig); 1303 evpipe_write (EV_A_ &sig_pending);
1213} 1304}
1214 1305
1215void noinline 1306void noinline
1216ev_feed_signal_event (EV_P_ int signum) 1307ev_feed_signal_event (EV_P_ int signum)
1217{ 1308{
1218 WL w; 1309 WL w;
1219 1310
1311 if (expect_false (signum <= 0 || signum > EV_NSIG))
1312 return;
1313
1314 --signum;
1315
1220#if EV_MULTIPLICITY 1316#if EV_MULTIPLICITY
1221 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1317 /* it is permissible to try to feed a signal to the wrong loop */
1222#endif 1318 /* or, likely more useful, feeding a signal nobody is waiting for */
1223 1319
1224 --signum; 1320 if (expect_false (signals [signum].loop != EV_A))
1225
1226 if (signum < 0 || signum >= signalmax)
1227 return; 1321 return;
1322#endif
1228 1323
1229 signals [signum].gotsig = 0; 1324 signals [signum].pending = 0;
1230 1325
1231 for (w = signals [signum].head; w; w = w->next) 1326 for (w = signals [signum].head; w; w = w->next)
1232 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 1327 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233} 1328}
1329
1330#if EV_USE_SIGNALFD
1331static void
1332sigfdcb (EV_P_ ev_io *iow, int revents)
1333{
1334 struct signalfd_siginfo si[2], *sip; /* these structs are big */
1335
1336 for (;;)
1337 {
1338 ssize_t res = read (sigfd, si, sizeof (si));
1339
1340 /* not ISO-C, as res might be -1, but works with SuS */
1341 for (sip = si; (char *)sip < (char *)si + res; ++sip)
1342 ev_feed_signal_event (EV_A_ sip->ssi_signo);
1343
1344 if (res < (ssize_t)sizeof (si))
1345 break;
1346 }
1347}
1348#endif
1234 1349
1235/*****************************************************************************/ 1350/*****************************************************************************/
1236 1351
1237static WL childs [EV_PID_HASHSIZE]; 1352static WL childs [EV_PID_HASHSIZE];
1238 1353
… …
1458 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1573 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459 have_monotonic = 1; 1574 have_monotonic = 1;
1460 } 1575 }
1461#endif 1576#endif
1462 1577
1578 /* pid check not overridable via env */
1579#ifndef _WIN32
1580 if (flags & EVFLAG_FORKCHECK)
1581 curpid = getpid ();
1582#endif
1583
1584 if (!(flags & EVFLAG_NOENV)
1585 && !enable_secure ()
1586 && getenv ("LIBEV_FLAGS"))
1587 flags = atoi (getenv ("LIBEV_FLAGS"));
1588
1463 ev_rt_now = ev_time (); 1589 ev_rt_now = ev_time ();
1464 mn_now = get_clock (); 1590 mn_now = get_clock ();
1465 now_floor = mn_now; 1591 now_floor = mn_now;
1466 rtmn_diff = ev_rt_now - mn_now; 1592 rtmn_diff = ev_rt_now - mn_now;
1467#if EV_MINIMAL < 2 1593#if EV_MINIMAL < 2
… …
1470 1596
1471 io_blocktime = 0.; 1597 io_blocktime = 0.;
1472 timeout_blocktime = 0.; 1598 timeout_blocktime = 0.;
1473 backend = 0; 1599 backend = 0;
1474 backend_fd = -1; 1600 backend_fd = -1;
1475 gotasync = 0; 1601 sig_pending = 0;
1602#if EV_ASYNC_ENABLE
1603 async_pending = 0;
1604#endif
1476#if EV_USE_INOTIFY 1605#if EV_USE_INOTIFY
1477 fs_fd = -2; 1606 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478#endif 1607#endif
1479 1608#if EV_USE_SIGNALFD
1480 /* pid check not overridable via env */ 1609 sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1481#ifndef _WIN32
1482 if (flags & EVFLAG_FORKCHECK)
1483 curpid = getpid ();
1484#endif 1610#endif
1485
1486 if (!(flags & EVFLAG_NOENV)
1487 && !enable_secure ()
1488 && getenv ("LIBEV_FLAGS"))
1489 flags = atoi (getenv ("LIBEV_FLAGS"));
1490 1611
1491 if (!(flags & 0x0000ffffU)) 1612 if (!(flags & 0x0000ffffU))
1492 flags |= ev_recommended_backends (); 1613 flags |= ev_recommended_backends ();
1493 1614
1494#if EV_USE_PORT 1615#if EV_USE_PORT
… …
1520{ 1641{
1521 int i; 1642 int i;
1522 1643
1523 if (ev_is_active (&pipe_w)) 1644 if (ev_is_active (&pipe_w))
1524 { 1645 {
1525 ev_ref (EV_A); /* signal watcher */ 1646 /*ev_ref (EV_A);*/
1526 ev_io_stop (EV_A_ &pipe_w); 1647 /*ev_io_stop (EV_A_ &pipe_w);*/
1527 1648
1528#if EV_USE_EVENTFD 1649#if EV_USE_EVENTFD
1529 if (evfd >= 0) 1650 if (evfd >= 0)
1530 close (evfd); 1651 close (evfd);
1531#endif 1652#endif
1532 1653
1533 if (evpipe [0] >= 0) 1654 if (evpipe [0] >= 0)
1534 { 1655 {
1535 close (evpipe [0]); 1656 EV_WIN32_CLOSE_FD (evpipe [0]);
1536 close (evpipe [1]); 1657 EV_WIN32_CLOSE_FD (evpipe [1]);
1537 } 1658 }
1538 } 1659 }
1660
1661#if EV_USE_SIGNALFD
1662 if (ev_is_active (&sigfd_w))
1663 {
1664 /*ev_ref (EV_A);*/
1665 /*ev_io_stop (EV_A_ &sigfd_w);*/
1666
1667 close (sigfd);
1668 }
1669#endif
1539 1670
1540#if EV_USE_INOTIFY 1671#if EV_USE_INOTIFY
1541 if (fs_fd >= 0) 1672 if (fs_fd >= 0)
1542 close (fs_fd); 1673 close (fs_fd);
1543#endif 1674#endif
… …
1567#if EV_IDLE_ENABLE 1698#if EV_IDLE_ENABLE
1568 array_free (idle, [i]); 1699 array_free (idle, [i]);
1569#endif 1700#endif
1570 } 1701 }
1571 1702
1572 ev_free (anfds); anfdmax = 0; 1703 ev_free (anfds); anfds = 0; anfdmax = 0;
1573 1704
1574 /* have to use the microsoft-never-gets-it-right macro */ 1705 /* have to use the microsoft-never-gets-it-right macro */
1575 array_free (rfeed, EMPTY); 1706 array_free (rfeed, EMPTY);
1576 array_free (fdchange, EMPTY); 1707 array_free (fdchange, EMPTY);
1577 array_free (timer, EMPTY); 1708 array_free (timer, EMPTY);
… …
1612 1743
1613 if (ev_is_active (&pipe_w)) 1744 if (ev_is_active (&pipe_w))
1614 { 1745 {
1615 /* this "locks" the handlers against writing to the pipe */ 1746 /* this "locks" the handlers against writing to the pipe */
1616 /* while we modify the fd vars */ 1747 /* while we modify the fd vars */
1617 gotsig = 1; 1748 sig_pending = 1;
1618#if EV_ASYNC_ENABLE 1749#if EV_ASYNC_ENABLE
1619 gotasync = 1; 1750 async_pending = 1;
1620#endif 1751#endif
1621 1752
1622 ev_ref (EV_A); 1753 ev_ref (EV_A);
1623 ev_io_stop (EV_A_ &pipe_w); 1754 ev_io_stop (EV_A_ &pipe_w);
1624 1755
… …
1627 close (evfd); 1758 close (evfd);
1628#endif 1759#endif
1629 1760
1630 if (evpipe [0] >= 0) 1761 if (evpipe [0] >= 0)
1631 { 1762 {
1632 close (evpipe [0]); 1763 EV_WIN32_CLOSE_FD (evpipe [0]);
1633 close (evpipe [1]); 1764 EV_WIN32_CLOSE_FD (evpipe [1]);
1634 } 1765 }
1635 1766
1636 evpipe_init (EV_A); 1767 evpipe_init (EV_A);
1637 /* now iterate over everything, in case we missed something */ 1768 /* now iterate over everything, in case we missed something */
1638 pipecb (EV_A_ &pipe_w, EV_READ); 1769 pipecb (EV_A_ &pipe_w, EV_READ);
… …
1644#if EV_MULTIPLICITY 1775#if EV_MULTIPLICITY
1645 1776
1646struct ev_loop * 1777struct ev_loop *
1647ev_loop_new (unsigned int flags) 1778ev_loop_new (unsigned int flags)
1648{ 1779{
1649 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1780 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650 1781
1651 memset (loop, 0, sizeof (struct ev_loop)); 1782 memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653 loop_init (EV_A_ flags); 1783 loop_init (EV_A_ flags);
1654 1784
1655 if (ev_backend (EV_A)) 1785 if (ev_backend (EV_A))
1656 return loop; 1786 return EV_A;
1657 1787
1658 return 0; 1788 return 0;
1659} 1789}
1660 1790
1661void 1791void
… …
1765 assert (checkmax >= checkcnt); 1895 assert (checkmax >= checkcnt);
1766 array_verify (EV_A_ (W *)checks, checkcnt); 1896 array_verify (EV_A_ (W *)checks, checkcnt);
1767 1897
1768# if 0 1898# if 0
1769 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1899 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
1770 for (signum = signalmax; signum--; ) if (signals [signum].gotsig) 1900 for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1771# endif 1901# endif
1772#endif 1902#endif
1773} 1903}
1774#endif 1904#endif
1775 1905
… …
1782#endif 1912#endif
1783{ 1913{
1784 if (!ev_default_loop_ptr) 1914 if (!ev_default_loop_ptr)
1785 { 1915 {
1786#if EV_MULTIPLICITY 1916#if EV_MULTIPLICITY
1787 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; 1917 EV_P = ev_default_loop_ptr = &default_loop_struct;
1788#else 1918#else
1789 ev_default_loop_ptr = 1; 1919 ev_default_loop_ptr = 1;
1790#endif 1920#endif
1791 1921
1792 loop_init (EV_A_ flags); 1922 loop_init (EV_A_ flags);
… …
1809 1939
1810void 1940void
1811ev_default_destroy (void) 1941ev_default_destroy (void)
1812{ 1942{
1813#if EV_MULTIPLICITY 1943#if EV_MULTIPLICITY
1814 struct ev_loop *loop = ev_default_loop_ptr; 1944 EV_P = ev_default_loop_ptr;
1815#endif 1945#endif
1816 1946
1817 ev_default_loop_ptr = 0; 1947 ev_default_loop_ptr = 0;
1818 1948
1819#ifndef _WIN32 1949#ifndef _WIN32
… …
1826 1956
1827void 1957void
1828ev_default_fork (void) 1958ev_default_fork (void)
1829{ 1959{
1830#if EV_MULTIPLICITY 1960#if EV_MULTIPLICITY
1831 struct ev_loop *loop = ev_default_loop_ptr; 1961 EV_P = ev_default_loop_ptr;
1832#endif 1962#endif
1833 1963
1834 postfork = 1; /* must be in line with ev_loop_fork */ 1964 postfork = 1; /* must be in line with ev_loop_fork */
1835} 1965}
1836 1966
… …
1838 1968
1839void 1969void
1840ev_invoke (EV_P_ void *w, int revents) 1970ev_invoke (EV_P_ void *w, int revents)
1841{ 1971{
1842 EV_CB_INVOKE ((W)w, revents); 1972 EV_CB_INVOKE ((W)w, revents);
1973}
1974
1975unsigned int
1976ev_pending_count (EV_P)
1977{
1978 int pri;
1979 unsigned int count = 0;
1980
1981 for (pri = NUMPRI; pri--; )
1982 count += pendingcnt [pri];
1983
1984 return count;
1843} 1985}
1844 1986
1845void noinline 1987void noinline
1846ev_invoke_pending (EV_P) 1988ev_invoke_pending (EV_P)
1847{ 1989{
… …
2290inline_size void 2432inline_size void
2291wlist_del (WL *head, WL elem) 2433wlist_del (WL *head, WL elem)
2292{ 2434{
2293 while (*head) 2435 while (*head)
2294 { 2436 {
2295 if (*head == elem) 2437 if (expect_true (*head == elem))
2296 { 2438 {
2297 *head = elem->next; 2439 *head = elem->next;
2298 return; 2440 break;
2299 } 2441 }
2300 2442
2301 head = &(*head)->next; 2443 head = &(*head)->next;
2302 } 2444 }
2303} 2445}
… …
2475 } 2617 }
2476 2618
2477 EV_FREQUENT_CHECK; 2619 EV_FREQUENT_CHECK;
2478} 2620}
2479 2621
2622ev_tstamp
2623ev_timer_remaining (EV_P_ ev_timer *w)
2624{
2625 return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
2626}
2627
2480#if EV_PERIODIC_ENABLE 2628#if EV_PERIODIC_ENABLE
2481void noinline 2629void noinline
2482ev_periodic_start (EV_P_ ev_periodic *w) 2630ev_periodic_start (EV_P_ ev_periodic *w)
2483{ 2631{
2484 if (expect_false (ev_is_active (w))) 2632 if (expect_false (ev_is_active (w)))
… …
2551#endif 2699#endif
2552 2700
2553void noinline 2701void noinline
2554ev_signal_start (EV_P_ ev_signal *w) 2702ev_signal_start (EV_P_ ev_signal *w)
2555{ 2703{
2556#if EV_MULTIPLICITY
2557 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2558#endif
2559 if (expect_false (ev_is_active (w))) 2704 if (expect_false (ev_is_active (w)))
2560 return; 2705 return;
2561 2706
2562 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0)); 2707 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2563 2708
2564 evpipe_init (EV_A); 2709#if EV_MULTIPLICITY
2710 assert (("libev: a signal must not be attached to two different loops",
2711 !signals [w->signum - 1].loop || signals [w->signum - 1].loop == loop));
2565 2712
2566 EV_FREQUENT_CHECK; 2713 signals [w->signum - 1].loop = EV_A;
2714#endif
2567 2715
2716 EV_FREQUENT_CHECK;
2717
2718#if EV_USE_SIGNALFD
2719 if (sigfd == -2)
2568 { 2720 {
2569#ifndef _WIN32 2721 sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK | SFD_CLOEXEC);
2570 sigset_t full, prev; 2722 if (sigfd < 0 && errno == EINVAL)
2571 sigfillset (&full); 2723 sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2572 sigprocmask (SIG_SETMASK, &full, &prev);
2573#endif
2574 2724
2575 array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero); 2725 if (sigfd >= 0)
2726 {
2727 fd_intern (sigfd); /* doing it twice will not hurt */
2576 2728
2577#ifndef _WIN32 2729 sigemptyset (&sigfd_set);
2578 sigprocmask (SIG_SETMASK, &prev, 0); 2730
2579#endif 2731 ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
2732 ev_set_priority (&sigfd_w, EV_MAXPRI);
2733 ev_io_start (EV_A_ &sigfd_w);
2734 ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
2735 }
2580 } 2736 }
2737
2738 if (sigfd >= 0)
2739 {
2740 /* TODO: check .head */
2741 sigaddset (&sigfd_set, w->signum);
2742 sigprocmask (SIG_BLOCK, &sigfd_set, 0);
2743
2744 signalfd (sigfd, &sigfd_set, 0);
2745 }
2746#endif
2581 2747
2582 ev_start (EV_A_ (W)w, 1); 2748 ev_start (EV_A_ (W)w, 1);
2583 wlist_add (&signals [w->signum - 1].head, (WL)w); 2749 wlist_add (&signals [w->signum - 1].head, (WL)w);
2584 2750
2585 if (!((WL)w)->next) 2751 if (!((WL)w)->next)
2752# if EV_USE_SIGNALFD
2753 if (sigfd < 0) /*TODO*/
2754# endif
2586 { 2755 {
2587#if _WIN32 2756# if _WIN32
2588 signal (w->signum, ev_sighandler); 2757 signal (w->signum, ev_sighandler);
2589#else 2758# else
2590 struct sigaction sa; 2759 struct sigaction sa;
2760
2761 evpipe_init (EV_A);
2762
2591 sa.sa_handler = ev_sighandler; 2763 sa.sa_handler = ev_sighandler;
2592 sigfillset (&sa.sa_mask); 2764 sigfillset (&sa.sa_mask);
2593 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2765 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2594 sigaction (w->signum, &sa, 0); 2766 sigaction (w->signum, &sa, 0);
2767
2768 sigemptyset (&sa.sa_mask);
2769 sigaddset (&sa.sa_mask, w->signum);
2770 sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2595#endif 2771#endif
2596 } 2772 }
2597 2773
2598 EV_FREQUENT_CHECK; 2774 EV_FREQUENT_CHECK;
2599} 2775}
2600 2776
2601void noinline 2777void noinline
… …
2609 2785
2610 wlist_del (&signals [w->signum - 1].head, (WL)w); 2786 wlist_del (&signals [w->signum - 1].head, (WL)w);
2611 ev_stop (EV_A_ (W)w); 2787 ev_stop (EV_A_ (W)w);
2612 2788
2613 if (!signals [w->signum - 1].head) 2789 if (!signals [w->signum - 1].head)
2790 {
2791#if EV_MULTIPLICITY
2792 signals [w->signum - 1].loop = 0; /* unattach from signal */
2793#endif
2794#if EV_USE_SIGNALFD
2795 if (sigfd >= 0)
2796 {
2797 sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
2798 sigdelset (&sigfd_set, w->signum);
2799 signalfd (sigfd, &sigfd_set, 0);
2800 sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
2801 /*TODO: maybe unblock signal? */
2802 }
2803 else
2804#endif
2614 signal (w->signum, SIG_DFL); 2805 signal (w->signum, SIG_DFL);
2806 }
2615 2807
2616 EV_FREQUENT_CHECK; 2808 EV_FREQUENT_CHECK;
2617} 2809}
2618 2810
2619void 2811void
… …
2699 } 2891 }
2700 } 2892 }
2701 2893
2702 if (w->wd >= 0) 2894 if (w->wd >= 0)
2703 { 2895 {
2896 struct statfs sfs;
2897
2704 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2898 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2705 2899
2706 /* now local changes will be tracked by inotify, but remote changes won't */ 2900 /* now local changes will be tracked by inotify, but remote changes won't */
2707 /* unless the filesystem it known to be local, we therefore still poll */ 2901 /* unless the filesystem it known to be local, we therefore still poll */
2708 /* also do poll on <2.6.25, but with normal frequency */ 2902 /* also do poll on <2.6.25, but with normal frequency */
2709 struct statfs sfs;
2710 2903
2711 if (fs_2625 && !statfs (w->path, &sfs)) 2904 if (fs_2625 && !statfs (w->path, &sfs))
2712 if (sfs.f_type == 0x1373 /* devfs */ 2905 if (sfs.f_type == 0x1373 /* devfs */
2713 || sfs.f_type == 0xEF53 /* ext2/3 */ 2906 || sfs.f_type == 0xEF53 /* ext2/3 */
2714 || sfs.f_type == 0x3153464a /* jfs */ 2907 || sfs.f_type == 0x3153464a /* jfs */
… …
2803 return; 2996 return;
2804 2997
2805 fs_2625 = 1; 2998 fs_2625 = 1;
2806} 2999}
2807 3000
3001inline_size int
3002infy_newfd (void)
3003{
3004#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
3005 int fd = inotify_init1 (IN_CLOEXEC | IN_NONBLOCK);
3006 if (fd >= 0)
3007 return fd;
3008#endif
3009 return inotify_init ();
3010}
3011
2808inline_size void 3012inline_size void
2809infy_init (EV_P) 3013infy_init (EV_P)
2810{ 3014{
2811 if (fs_fd != -2) 3015 if (fs_fd != -2)
2812 return; 3016 return;
2813 3017
2814 fs_fd = -1; 3018 fs_fd = -1;
2815 3019
2816 check_2625 (EV_A); 3020 check_2625 (EV_A);
2817 3021
2818 fs_fd = inotify_init (); 3022 fs_fd = infy_newfd ();
2819 3023
2820 if (fs_fd >= 0) 3024 if (fs_fd >= 0)
2821 { 3025 {
3026 fd_intern (fs_fd);
2822 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ); 3027 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2823 ev_set_priority (&fs_w, EV_MAXPRI); 3028 ev_set_priority (&fs_w, EV_MAXPRI);
2824 ev_io_start (EV_A_ &fs_w); 3029 ev_io_start (EV_A_ &fs_w);
2825 } 3030 }
2826} 3031}
… …
2831 int slot; 3036 int slot;
2832 3037
2833 if (fs_fd < 0) 3038 if (fs_fd < 0)
2834 return; 3039 return;
2835 3040
3041 ev_io_stop (EV_A_ &fs_w);
2836 close (fs_fd); 3042 close (fs_fd);
2837 fs_fd = inotify_init (); 3043 fs_fd = infy_newfd ();
3044
3045 if (fs_fd >= 0)
3046 {
3047 fd_intern (fs_fd);
3048 ev_io_set (&fs_w, fs_fd, EV_READ);
3049 ev_io_start (EV_A_ &fs_w);
3050 }
2838 3051
2839 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot) 3052 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2840 { 3053 {
2841 WL w_ = fs_hash [slot].head; 3054 WL w_ = fs_hash [slot].head;
2842 fs_hash [slot].head = 0; 3055 fs_hash [slot].head = 0;
… …
3099embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents) 3312embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3100{ 3313{
3101 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare)); 3314 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
3102 3315
3103 { 3316 {
3104 struct ev_loop *loop = w->other; 3317 EV_P = w->other;
3105 3318
3106 while (fdchangecnt) 3319 while (fdchangecnt)
3107 { 3320 {
3108 fd_reify (EV_A); 3321 fd_reify (EV_A);
3109 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3322 ev_loop (EV_A_ EVLOOP_NONBLOCK);
… …
3117 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 3330 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
3118 3331
3119 ev_embed_stop (EV_A_ w); 3332 ev_embed_stop (EV_A_ w);
3120 3333
3121 { 3334 {
3122 struct ev_loop *loop = w->other; 3335 EV_P = w->other;
3123 3336
3124 ev_loop_fork (EV_A); 3337 ev_loop_fork (EV_A);
3125 ev_loop (EV_A_ EVLOOP_NONBLOCK); 3338 ev_loop (EV_A_ EVLOOP_NONBLOCK);
3126 } 3339 }
3127 3340
… …
3141{ 3354{
3142 if (expect_false (ev_is_active (w))) 3355 if (expect_false (ev_is_active (w)))
3143 return; 3356 return;
3144 3357
3145 { 3358 {
3146 struct ev_loop *loop = w->other; 3359 EV_P = w->other;
3147 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3360 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3148 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3361 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3149 } 3362 }
3150 3363
3151 EV_FREQUENT_CHECK; 3364 EV_FREQUENT_CHECK;
… …
3263 3476
3264void 3477void
3265ev_async_send (EV_P_ ev_async *w) 3478ev_async_send (EV_P_ ev_async *w)
3266{ 3479{
3267 w->sent = 1; 3480 w->sent = 1;
3268 evpipe_write (EV_A_ &gotasync); 3481 evpipe_write (EV_A_ &async_pending);
3269} 3482}
3270#endif 3483#endif
3271 3484
3272/*****************************************************************************/ 3485/*****************************************************************************/
3273 3486
… …
3422 if (types & EV_CHECK) 3635 if (types & EV_CHECK)
3423 for (i = checkcnt; i--; ) 3636 for (i = checkcnt; i--; )
3424 cb (EV_A_ EV_CHECK, checks [i]); 3637 cb (EV_A_ EV_CHECK, checks [i]);
3425 3638
3426 if (types & EV_SIGNAL) 3639 if (types & EV_SIGNAL)
3427 for (i = 0; i < signalmax; ++i) 3640 for (i = 0; i < EV_NSIG - 1; ++i)
3428 for (wl = signals [i].head; wl; ) 3641 for (wl = signals [i].head; wl; )
3429 { 3642 {
3430 wn = wl->next; 3643 wn = wl->next;
3431 cb (EV_A_ EV_SIGNAL, wl); 3644 cb (EV_A_ EV_SIGNAL, wl);
3432 wl = wn; 3645 wl = wn;

Diff Legend

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