[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.300 by root, Tue Jul 14 20:31:21 2009 UTC vs.
Revision 1.315 by root, Wed Aug 26 17:46:22 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
345	extern "C" {	398	extern "C" {
346	# endif	399	# endif
347	int eventfd (unsigned int initval, int flags);	400	int 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
		420	extern "C" {
		421	# endif
		422	int signalfd (int fd, const sigset_t *mask, int flags);
		423
		424	struct 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)
…		…
419		501
420	#if EV_USE_MONOTONIC	502	#if EV_USE_MONOTONIC
421	static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */	503	static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
422	#endif	504	#endif
423		505
		506	#ifndef EV_FD_TO_WIN32_HANDLE
		507	# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
		508	#endif
		509	#ifndef EV_WIN32_HANDLE_TO_FD
		510	# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (fd, 0)
		511	#endif
		512	#ifndef EV_WIN32_CLOSE_FD
		513	# define EV_WIN32_CLOSE_FD(fd) close (fd)
		514	#endif
		515
424	#ifdef _WIN32	516	#ifdef _WIN32
425	# include "ev_win32.c"	517	# include "ev_win32.c"
426	#endif	518	#endif
427		519
428	/*****************************************************************************/	520	/*****************************************************************************/
…		…
647		739
648	tv.tv_sec = (time_t)delay;	740	tv.tv_sec = (time_t)delay;
649	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	741	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
650		742
651	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */	743	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
652	/* somehting not guaranteed by newer posix versions, but guaranteed */	744	/* something not guaranteed by newer posix versions, but guaranteed */
653	/* by older ones */	745	/* by older ones */
654	select (0, 0, 0, 0, &tv);	746	select (0, 0, 0, 0, &tv);
655	#endif	747	#endif
656	}	748	}
657	}	749	}
…		…
819		911
820	#if EV_SELECT_IS_WINSOCKET	912	#if EV_SELECT_IS_WINSOCKET
821	if (events)	913	if (events)
822	{	914	{
823	unsigned long arg;	915	unsigned long arg;
824	#ifdef EV_FD_TO_WIN32_HANDLE
825	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);	916	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));	917	assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
830	}	918	}
831	#endif	919	#endif
832		920
833	{	921	{
…		…
904		992
905	for (fd = anfdmax; fd--; )	993	for (fd = anfdmax; fd--; )
906	if (anfds [fd].events)	994	if (anfds [fd].events)
907	{	995	{
908	fd_kill (EV_A_ fd);	996	fd_kill (EV_A_ fd);
909	return;	997	break;
910	}	998	}
911	}	999	}
912		1000
913	/* usually called after fork if backend needs to re-arm all fds from scratch */	1001	/* usually called after fork if backend needs to re-arm all fds from scratch */
914	static void noinline	1002	static void noinline
…		…
1004		1092
1005	for (;;)	1093	for (;;)
1006	{	1094	{
1007	int c = k << 1;	1095	int c = k << 1;
1008		1096
1009	if (c > N + HEAP0 - 1)	1097	if (c >= N + HEAP0)
1010	break;	1098	break;
1011		1099
1012	c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])	1100	c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1013	? 1 : 0;	1101	? 1 : 0;
1014		1102
…		…
1050		1138
1051	/* move an element suitably so it is in a correct place */	1139	/* move an element suitably so it is in a correct place */
1052	inline_size void	1140	inline_size void
1053	adjustheap (ANHE *heap, int N, int k)	1141	adjustheap (ANHE *heap, int N, int k)
1054	{	1142	{
1055	if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))	1143	if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1056	upheap (heap, k);	1144	upheap (heap, k);
1057	else	1145	else
1058	downheap (heap, N, k);	1146	downheap (heap, N, k);
1059	}	1147	}
1060		1148
…		…
1073	/*****************************************************************************/	1161	/*****************************************************************************/
1074		1162
1075	/* associate signal watchers to a signal signal */	1163	/* associate signal watchers to a signal signal */
1076	typedef struct	1164	typedef struct
1077	{	1165	{
		1166	EV_ATOMIC_T pending;
		1167	#if EV_MULTIPLICITY
		1168	EV_P;
		1169	#endif
1078	WL head;	1170	WL head;
1079	EV_ATOMIC_T gotsig;
1080	} ANSIG;	1171	} ANSIG;
1081		1172
1082	static ANSIG *signals;	1173	static ANSIG signals [EV_NSIG - 1];
1083	static int signalmax;
1084
1085	static EV_ATOMIC_T gotsig;
1086		1174
1087	/*****************************************************************************/	1175	/*****************************************************************************/
1088		1176
1089	/* used to prepare libev internal fd's */	1177	/* used to prepare libev internal fd's */
1090	/* this is not fork-safe */	1178	/* this is not fork-safe */
…		…
1104	evpipe_init (EV_P)	1192	evpipe_init (EV_P)
1105	{	1193	{
1106	if (!ev_is_active (&pipe_w))	1194	if (!ev_is_active (&pipe_w))
1107	{	1195	{
1108	#if EV_USE_EVENTFD	1196	#if EV_USE_EVENTFD
		1197	evfd = eventfd (0, EFD_NONBLOCK \| EFD_CLOEXEC);
		1198	if (evfd < 0 && errno == EINVAL)
1109	if ((evfd = eventfd (0, 0)) >= 0)	1199	evfd = eventfd (0, 0);
		1200
		1201	if (evfd >= 0)
1110	{	1202	{
1111	evpipe [0] = -1;	1203	evpipe [0] = -1;
1112	fd_intern (evfd);	1204	fd_intern (evfd); /* doing it twice doesn't hurt */
1113	ev_io_set (&pipe_w, evfd, EV_READ);	1205	ev_io_set (&pipe_w, evfd, EV_READ);
1114	}	1206	}
1115	else	1207	else
1116	#endif	1208	#endif
1117	{	1209	{
…		…
1154	/* called whenever the libev signal pipe */	1246	/* called whenever the libev signal pipe */
1155	/* got some events (signal, async) */	1247	/* got some events (signal, async) */
1156	static void	1248	static void
1157	pipecb (EV_P_ ev_io *iow, int revents)	1249	pipecb (EV_P_ ev_io *iow, int revents)
1158	{	1250	{
		1251	int i;
		1252
1159	#if EV_USE_EVENTFD	1253	#if EV_USE_EVENTFD
1160	if (evfd >= 0)	1254	if (evfd >= 0)
1161	{	1255	{
1162	uint64_t counter;	1256	uint64_t counter;
1163	read (evfd, &counter, sizeof (uint64_t));	1257	read (evfd, &counter, sizeof (uint64_t));
…		…
1167	{	1261	{
1168	char dummy;	1262	char dummy;
1169	read (evpipe [0], &dummy, 1);	1263	read (evpipe [0], &dummy, 1);
1170	}	1264	}
1171		1265
1172	if (gotsig && ev_is_default_loop (EV_A))	1266	if (sig_pending)
1173	{	1267	{
1174	int signum;	1268	sig_pending = 0;
1175	gotsig = 0;
1176		1269
1177	for (signum = signalmax; signum--; )	1270	for (i = EV_NSIG - 1; i--; )
1178	if (signals [signum].gotsig)	1271	if (expect_false (signals [i].pending))
1179	ev_feed_signal_event (EV_A_ signum + 1);	1272	ev_feed_signal_event (EV_A_ i + 1);
1180	}	1273	}
1181		1274
1182	#if EV_ASYNC_ENABLE	1275	#if EV_ASYNC_ENABLE
1183	if (gotasync)	1276	if (async_pending)
1184	{	1277	{
1185	int i;	1278	async_pending = 0;
1186	gotasync = 0;
1187		1279
1188	for (i = asynccnt; i--; )	1280	for (i = asynccnt; i--; )
1189	if (asyncs [i]->sent)	1281	if (asyncs [i]->sent)
1190	{	1282	{
1191	asyncs [i]->sent = 0;	1283	asyncs [i]->sent = 0;
…		…
1199		1291
1200	static void	1292	static void
1201	ev_sighandler (int signum)	1293	ev_sighandler (int signum)
1202	{	1294	{
1203	#if EV_MULTIPLICITY	1295	#if EV_MULTIPLICITY
1204	struct ev_loop *loop = &default_loop_struct;	1296	EV_P = signals [signum - 1].loop;
1205	#endif	1297	#endif
1206		1298
1207	#if _WIN32	1299	#if _WIN32
1208	signal (signum, ev_sighandler);	1300	signal (signum, ev_sighandler);
1209	#endif	1301	#endif
1210		1302
1211	signals [signum - 1].gotsig = 1;	1303	signals [signum - 1].pending = 1;
1212	evpipe_write (EV_A_ &gotsig);	1304	evpipe_write (EV_A_ &sig_pending);
1213	}	1305	}
1214		1306
1215	void noinline	1307	void noinline
1216	ev_feed_signal_event (EV_P_ int signum)	1308	ev_feed_signal_event (EV_P_ int signum)
1217	{	1309	{
1218	WL w;	1310	WL w;
1219		1311
		1312	if (expect_false (signum <= 0 \|\| signum > EV_NSIG))
		1313	return;
		1314
		1315	--signum;
		1316
1220	#if EV_MULTIPLICITY	1317	#if EV_MULTIPLICITY
1221	assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));	1318	/* it is permissible to try to feed a signal to the wrong loop */
1222	#endif	1319	/* or, likely more useful, feeding a signal nobody is waiting for */
1223		1320
1224	--signum;	1321	if (expect_false (signals [signum].loop != EV_A))
1225
1226	if (signum < 0 \|\| signum >= signalmax)
1227	return;	1322	return;
		1323	#endif
1228		1324
1229	signals [signum].gotsig = 0;	1325	signals [signum].pending = 0;
1230		1326
1231	for (w = signals [signum].head; w; w = w->next)	1327	for (w = signals [signum].head; w; w = w->next)
1232	ev_feed_event (EV_A_ (W)w, EV_SIGNAL);	1328	ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1233	}	1329	}
		1330
		1331	#if EV_USE_SIGNALFD
		1332	static void
		1333	sigfdcb (EV_P_ ev_io *iow, int revents)
		1334	{
		1335	struct signalfd_siginfo si[2], sip; / these structs are big */
		1336
		1337	for (;;)
		1338	{
		1339	ssize_t res = read (sigfd, si, sizeof (si));
		1340
		1341	/* not ISO-C, as res might be -1, but works with SuS */
		1342	for (sip = si; (char )sip < (char )si + res; ++sip)
		1343	ev_feed_signal_event (EV_A_ sip->ssi_signo);
		1344
		1345	if (res < (ssize_t)sizeof (si))
		1346	break;
		1347	}
		1348	}
		1349	#endif
1234		1350
1235	/*****************************************************************************/	1351	/*****************************************************************************/
1236		1352
1237	static WL childs [EV_PID_HASHSIZE];	1353	static WL childs [EV_PID_HASHSIZE];
1238		1354
…		…
1458	if (!clock_gettime (CLOCK_MONOTONIC, &ts))	1574	if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1459	have_monotonic = 1;	1575	have_monotonic = 1;
1460	}	1576	}
1461	#endif	1577	#endif
1462		1578
		1579	/* pid check not overridable via env */
		1580	#ifndef _WIN32
		1581	if (flags & EVFLAG_FORKCHECK)
		1582	curpid = getpid ();
		1583	#endif
		1584
		1585	if (!(flags & EVFLAG_NOENV)
		1586	&& !enable_secure ()
		1587	&& getenv ("LIBEV_FLAGS"))
		1588	flags = atoi (getenv ("LIBEV_FLAGS"));
		1589
1463	ev_rt_now = ev_time ();	1590	ev_rt_now = ev_time ();
1464	mn_now = get_clock ();	1591	mn_now = get_clock ();
1465	now_floor = mn_now;	1592	now_floor = mn_now;
1466	rtmn_diff = ev_rt_now - mn_now;	1593	rtmn_diff = ev_rt_now - mn_now;
1467	#if EV_MINIMAL < 2	1594	#if EV_MINIMAL < 2
…		…
1470		1597
1471	io_blocktime = 0.;	1598	io_blocktime = 0.;
1472	timeout_blocktime = 0.;	1599	timeout_blocktime = 0.;
1473	backend = 0;	1600	backend = 0;
1474	backend_fd = -1;	1601	backend_fd = -1;
1475	gotasync = 0;	1602	sig_pending = 0;
		1603	#if EV_ASYNC_ENABLE
		1604	async_pending = 0;
		1605	#endif
1476	#if EV_USE_INOTIFY	1606	#if EV_USE_INOTIFY
1477	fs_fd = -2;	1607	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1478	#endif	1608	#endif
1479		1609	#if EV_USE_SIGNALFD
1480	/* pid check not overridable via env */	1610	sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1481	#ifndef _WIN32
1482	if (flags & EVFLAG_FORKCHECK)
1483	curpid = getpid ();
1484	#endif	1611	#endif
1485
1486	if (!(flags & EVFLAG_NOENV)
1487	&& !enable_secure ()
1488	&& getenv ("LIBEV_FLAGS"))
1489	flags = atoi (getenv ("LIBEV_FLAGS"));
1490		1612
1491	if (!(flags & 0x0000ffffU))	1613	if (!(flags & 0x0000ffffU))
1492	flags \|= ev_recommended_backends ();	1614	flags \|= ev_recommended_backends ();
1493		1615
1494	#if EV_USE_PORT	1616	#if EV_USE_PORT
…		…
1520	{	1642	{
1521	int i;	1643	int i;
1522		1644
1523	if (ev_is_active (&pipe_w))	1645	if (ev_is_active (&pipe_w))
1524	{	1646	{
1525	ev_ref (EV_A); /* signal watcher */	1647	/ev_ref (EV_A);/
1526	ev_io_stop (EV_A_ &pipe_w);	1648	/ev_io_stop (EV_A_ &pipe_w);/
1527		1649
1528	#if EV_USE_EVENTFD	1650	#if EV_USE_EVENTFD
1529	if (evfd >= 0)	1651	if (evfd >= 0)
1530	close (evfd);	1652	close (evfd);
1531	#endif	1653	#endif
1532		1654
1533	if (evpipe [0] >= 0)	1655	if (evpipe [0] >= 0)
1534	{	1656	{
1535	close (evpipe [0]);	1657	EV_WIN32_CLOSE_FD (evpipe [0]);
1536	close (evpipe [1]);	1658	EV_WIN32_CLOSE_FD (evpipe [1]);
1537	}	1659	}
1538	}	1660	}
		1661
		1662	#if EV_USE_SIGNALFD
		1663	if (ev_is_active (&sigfd_w))
		1664	{
		1665	/ev_ref (EV_A);/
		1666	/ev_io_stop (EV_A_ &sigfd_w);/
		1667
		1668	close (sigfd);
		1669	}
		1670	#endif
1539		1671
1540	#if EV_USE_INOTIFY	1672	#if EV_USE_INOTIFY
1541	if (fs_fd >= 0)	1673	if (fs_fd >= 0)
1542	close (fs_fd);	1674	close (fs_fd);
1543	#endif	1675	#endif
…		…
1567	#if EV_IDLE_ENABLE	1699	#if EV_IDLE_ENABLE
1568	array_free (idle, [i]);	1700	array_free (idle, [i]);
1569	#endif	1701	#endif
1570	}	1702	}
1571		1703
1572	ev_free (anfds); anfdmax = 0;	1704	ev_free (anfds); anfds = 0; anfdmax = 0;
1573		1705
1574	/* have to use the microsoft-never-gets-it-right macro */	1706	/* have to use the microsoft-never-gets-it-right macro */
1575	array_free (rfeed, EMPTY);	1707	array_free (rfeed, EMPTY);
1576	array_free (fdchange, EMPTY);	1708	array_free (fdchange, EMPTY);
1577	array_free (timer, EMPTY);	1709	array_free (timer, EMPTY);
…		…
1612		1744
1613	if (ev_is_active (&pipe_w))	1745	if (ev_is_active (&pipe_w))
1614	{	1746	{
1615	/* this "locks" the handlers against writing to the pipe */	1747	/* this "locks" the handlers against writing to the pipe */
1616	/* while we modify the fd vars */	1748	/* while we modify the fd vars */
1617	gotsig = 1;	1749	sig_pending = 1;
1618	#if EV_ASYNC_ENABLE	1750	#if EV_ASYNC_ENABLE
1619	gotasync = 1;	1751	async_pending = 1;
1620	#endif	1752	#endif
1621		1753
1622	ev_ref (EV_A);	1754	ev_ref (EV_A);
1623	ev_io_stop (EV_A_ &pipe_w);	1755	ev_io_stop (EV_A_ &pipe_w);
1624		1756
…		…
1627	close (evfd);	1759	close (evfd);
1628	#endif	1760	#endif
1629		1761
1630	if (evpipe [0] >= 0)	1762	if (evpipe [0] >= 0)
1631	{	1763	{
1632	close (evpipe [0]);	1764	EV_WIN32_CLOSE_FD (evpipe [0]);
1633	close (evpipe [1]);	1765	EV_WIN32_CLOSE_FD (evpipe [1]);
1634	}	1766	}
1635		1767
1636	evpipe_init (EV_A);	1768	evpipe_init (EV_A);
1637	/* now iterate over everything, in case we missed something */	1769	/* now iterate over everything, in case we missed something */
1638	pipecb (EV_A_ &pipe_w, EV_READ);	1770	pipecb (EV_A_ &pipe_w, EV_READ);
…		…
1644	#if EV_MULTIPLICITY	1776	#if EV_MULTIPLICITY
1645		1777
1646	struct ev_loop *	1778	struct ev_loop *
1647	ev_loop_new (unsigned int flags)	1779	ev_loop_new (unsigned int flags)
1648	{	1780	{
1649	struct ev_loop loop = (struct ev_loop )ev_malloc (sizeof (struct ev_loop));	1781	EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1650		1782
1651	memset (loop, 0, sizeof (struct ev_loop));	1783	memset (EV_A, 0, sizeof (struct ev_loop));
1652
1653	loop_init (EV_A_ flags);	1784	loop_init (EV_A_ flags);
1654		1785
1655	if (ev_backend (EV_A))	1786	if (ev_backend (EV_A))
1656	return loop;	1787	return EV_A;
1657		1788
1658	return 0;	1789	return 0;
1659	}	1790	}
1660		1791
1661	void	1792	void
…		…
1765	assert (checkmax >= checkcnt);	1896	assert (checkmax >= checkcnt);
1766	array_verify (EV_A_ (W *)checks, checkcnt);	1897	array_verify (EV_A_ (W *)checks, checkcnt);
1767		1898
1768	# if 0	1899	# if 0
1769	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)	1900	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)
1770	for (signum = signalmax; signum--; ) if (signals [signum].gotsig)	1901	for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1771	# endif	1902	# endif
1772	#endif	1903	#endif
1773	}	1904	}
1774	#endif	1905	#endif
1775		1906
…		…
1782	#endif	1913	#endif
1783	{	1914	{
1784	if (!ev_default_loop_ptr)	1915	if (!ev_default_loop_ptr)
1785	{	1916	{
1786	#if EV_MULTIPLICITY	1917	#if EV_MULTIPLICITY
1787	struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;	1918	EV_P = ev_default_loop_ptr = &default_loop_struct;
1788	#else	1919	#else
1789	ev_default_loop_ptr = 1;	1920	ev_default_loop_ptr = 1;
1790	#endif	1921	#endif
1791		1922
1792	loop_init (EV_A_ flags);	1923	loop_init (EV_A_ flags);
…		…
1809		1940
1810	void	1941	void
1811	ev_default_destroy (void)	1942	ev_default_destroy (void)
1812	{	1943	{
1813	#if EV_MULTIPLICITY	1944	#if EV_MULTIPLICITY
1814	struct ev_loop *loop = ev_default_loop_ptr;	1945	EV_P = ev_default_loop_ptr;
1815	#endif	1946	#endif
1816		1947
1817	ev_default_loop_ptr = 0;	1948	ev_default_loop_ptr = 0;
1818		1949
1819	#ifndef _WIN32	1950	#ifndef _WIN32
…		…
1826		1957
1827	void	1958	void
1828	ev_default_fork (void)	1959	ev_default_fork (void)
1829	{	1960	{
1830	#if EV_MULTIPLICITY	1961	#if EV_MULTIPLICITY
1831	struct ev_loop *loop = ev_default_loop_ptr;	1962	EV_P = ev_default_loop_ptr;
1832	#endif	1963	#endif
1833		1964
1834	postfork = 1; /* must be in line with ev_loop_fork */	1965	postfork = 1; /* must be in line with ev_loop_fork */
1835	}	1966	}
1836		1967
…		…
2302	inline_size void	2433	inline_size void
2303	wlist_del (WL *head, WL elem)	2434	wlist_del (WL *head, WL elem)
2304	{	2435	{
2305	while (*head)	2436	while (*head)
2306	{	2437	{
2307	if (*head == elem)	2438	if (expect_true (*head == elem))
2308	{	2439	{
2309	*head = elem->next;	2440	*head = elem->next;
2310	return;	2441	break;
2311	}	2442	}
2312		2443
2313	head = &(*head)->next;	2444	head = &(*head)->next;
2314	}	2445	}
2315	}	2446	}
…		…
2487	}	2618	}
2488		2619
2489	EV_FREQUENT_CHECK;	2620	EV_FREQUENT_CHECK;
2490	}	2621	}
2491		2622
		2623	ev_tstamp
		2624	ev_timer_remaining (EV_P_ ev_timer *w)
		2625	{
		2626	return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
		2627	}
		2628
2492	#if EV_PERIODIC_ENABLE	2629	#if EV_PERIODIC_ENABLE
2493	void noinline	2630	void noinline
2494	ev_periodic_start (EV_P_ ev_periodic *w)	2631	ev_periodic_start (EV_P_ ev_periodic *w)
2495	{	2632	{
2496	if (expect_false (ev_is_active (w)))	2633	if (expect_false (ev_is_active (w)))
…		…
2563	#endif	2700	#endif
2564		2701
2565	void noinline	2702	void noinline
2566	ev_signal_start (EV_P_ ev_signal *w)	2703	ev_signal_start (EV_P_ ev_signal *w)
2567	{	2704	{
2568	#if EV_MULTIPLICITY
2569	assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2570	#endif
2571	if (expect_false (ev_is_active (w)))	2705	if (expect_false (ev_is_active (w)))
2572	return;	2706	return;
2573		2707
2574	assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));	2708	assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2575		2709
2576	evpipe_init (EV_A);	2710	#if EV_MULTIPLICITY
		2711	assert (("libev: a signal must not be attached to two different loops",
		2712	!signals [w->signum - 1].loop \|\| signals [w->signum - 1].loop == loop));
2577		2713
2578	EV_FREQUENT_CHECK;	2714	signals [w->signum - 1].loop = EV_A;
		2715	#endif
2579		2716
		2717	EV_FREQUENT_CHECK;
		2718
		2719	#if EV_USE_SIGNALFD
		2720	if (sigfd == -2)
2580	{	2721	{
2581	#ifndef _WIN32	2722	sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK \| SFD_CLOEXEC);
2582	sigset_t full, prev;	2723	if (sigfd < 0 && errno == EINVAL)
2583	sigfillset (&full);	2724	sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2584	sigprocmask (SIG_SETMASK, &full, &prev);
2585	#endif
2586		2725
2587	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);	2726	if (sigfd >= 0)
		2727	{
		2728	fd_intern (sigfd); /* doing it twice will not hurt */
2588		2729
2589	#ifndef _WIN32	2730	sigemptyset (&sigfd_set);
2590	sigprocmask (SIG_SETMASK, &prev, 0);	2731
2591	#endif	2732	ev_io_init (&sigfd_w, sigfdcb, sigfd, EV_READ);
		2733	ev_set_priority (&sigfd_w, EV_MAXPRI);
		2734	ev_io_start (EV_A_ &sigfd_w);
		2735	ev_unref (EV_A); /* signalfd watcher should not keep loop alive */
		2736	}
2592	}	2737	}
		2738
		2739	if (sigfd >= 0)
		2740	{
		2741	/* TODO: check .head */
		2742	sigaddset (&sigfd_set, w->signum);
		2743	sigprocmask (SIG_BLOCK, &sigfd_set, 0);
		2744
		2745	signalfd (sigfd, &sigfd_set, 0);
		2746	}
		2747	#endif
2593		2748
2594	ev_start (EV_A_ (W)w, 1);	2749	ev_start (EV_A_ (W)w, 1);
2595	wlist_add (&signals [w->signum - 1].head, (WL)w);	2750	wlist_add (&signals [w->signum - 1].head, (WL)w);
2596		2751
2597	if (!((WL)w)->next)	2752	if (!((WL)w)->next)
		2753	# if EV_USE_SIGNALFD
		2754	if (sigfd < 0) /TODO/
		2755	# endif
2598	{	2756	{
2599	#if _WIN32	2757	# if _WIN32
2600	signal (w->signum, ev_sighandler);	2758	signal (w->signum, ev_sighandler);
2601	#else	2759	# else
2602	struct sigaction sa = { };	2760	struct sigaction sa;
		2761
		2762	evpipe_init (EV_A);
		2763
2603	sa.sa_handler = ev_sighandler;	2764	sa.sa_handler = ev_sighandler;
2604	sigfillset (&sa.sa_mask);	2765	sigfillset (&sa.sa_mask);
2605	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */	2766	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
2606	sigaction (w->signum, &sa, 0);	2767	sigaction (w->signum, &sa, 0);
		2768
		2769	sigemptyset (&sa.sa_mask);
		2770	sigaddset (&sa.sa_mask, w->signum);
		2771	sigprocmask (SIG_UNBLOCK, &sa.sa_mask, 0);
2607	#endif	2772	#endif
2608	}	2773	}
2609		2774
2610	EV_FREQUENT_CHECK;	2775	EV_FREQUENT_CHECK;
2611	}	2776	}
2612		2777
2613	void noinline	2778	void noinline
…		…
2621		2786
2622	wlist_del (&signals [w->signum - 1].head, (WL)w);	2787	wlist_del (&signals [w->signum - 1].head, (WL)w);
2623	ev_stop (EV_A_ (W)w);	2788	ev_stop (EV_A_ (W)w);
2624		2789
2625	if (!signals [w->signum - 1].head)	2790	if (!signals [w->signum - 1].head)
		2791	{
		2792	#if EV_MULTIPLICITY
		2793	signals [w->signum - 1].loop = 0; /* unattach from signal */
		2794	#endif
		2795	#if EV_USE_SIGNALFD
		2796	if (sigfd >= 0)
		2797	{
		2798	sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
		2799	sigdelset (&sigfd_set, w->signum);
		2800	signalfd (sigfd, &sigfd_set, 0);
		2801	sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
		2802	/TODO: maybe unblock signal? /
		2803	}
		2804	else
		2805	#endif
2626	signal (w->signum, SIG_DFL);	2806	signal (w->signum, SIG_DFL);
		2807	}
2627		2808
2628	EV_FREQUENT_CHECK;	2809	EV_FREQUENT_CHECK;
2629	}	2810	}
2630		2811
2631	void	2812	void
…		…
2711	}	2892	}
2712	}	2893	}
2713		2894
2714	if (w->wd >= 0)	2895	if (w->wd >= 0)
2715	{	2896	{
		2897	struct statfs sfs;
		2898
2716	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);	2899	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2717		2900
2718	/* now local changes will be tracked by inotify, but remote changes won't */	2901	/* now local changes will be tracked by inotify, but remote changes won't */
2719	/* unless the filesystem it known to be local, we therefore still poll */	2902	/* unless the filesystem it known to be local, we therefore still poll */
2720	/* also do poll on <2.6.25, but with normal frequency */	2903	/* also do poll on <2.6.25, but with normal frequency */
2721	struct statfs sfs;
2722		2904
2723	if (fs_2625 && !statfs (w->path, &sfs))	2905	if (fs_2625 && !statfs (w->path, &sfs))
2724	if (sfs.f_type == 0x1373 /* devfs */	2906	if (sfs.f_type == 0x1373 /* devfs */
2725	\|\| sfs.f_type == 0xEF53 /* ext2/3 */	2907	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
2726	\|\| sfs.f_type == 0x3153464a /* jfs */	2908	\|\| sfs.f_type == 0x3153464a /* jfs */
…		…
2815	return;	2997	return;
2816		2998
2817	fs_2625 = 1;	2999	fs_2625 = 1;
2818	}	3000	}
2819		3001
		3002	inline_size int
		3003	infy_newfd (void)
		3004	{
		3005	#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
		3006	int fd = inotify_init1 (IN_CLOEXEC \| IN_NONBLOCK);
		3007	if (fd >= 0)
		3008	return fd;
		3009	#endif
		3010	return inotify_init ();
		3011	}
		3012
2820	inline_size void	3013	inline_size void
2821	infy_init (EV_P)	3014	infy_init (EV_P)
2822	{	3015	{
2823	if (fs_fd != -2)	3016	if (fs_fd != -2)
2824	return;	3017	return;
2825		3018
2826	fs_fd = -1;	3019	fs_fd = -1;
2827		3020
2828	check_2625 (EV_A);	3021	check_2625 (EV_A);
2829		3022
2830	fs_fd = inotify_init ();	3023	fs_fd = infy_newfd ();
2831		3024
2832	if (fs_fd >= 0)	3025	if (fs_fd >= 0)
2833	{	3026	{
		3027	fd_intern (fs_fd);
2834	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	3028	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2835	ev_set_priority (&fs_w, EV_MAXPRI);	3029	ev_set_priority (&fs_w, EV_MAXPRI);
2836	ev_io_start (EV_A_ &fs_w);	3030	ev_io_start (EV_A_ &fs_w);
2837	}	3031	}
2838	}	3032	}
…		…
2843	int slot;	3037	int slot;
2844		3038
2845	if (fs_fd < 0)	3039	if (fs_fd < 0)
2846	return;	3040	return;
2847		3041
		3042	ev_io_stop (EV_A_ &fs_w);
2848	close (fs_fd);	3043	close (fs_fd);
2849	fs_fd = inotify_init ();	3044	fs_fd = infy_newfd ();
		3045
		3046	if (fs_fd >= 0)
		3047	{
		3048	fd_intern (fs_fd);
		3049	ev_io_set (&fs_w, fs_fd, EV_READ);
		3050	ev_io_start (EV_A_ &fs_w);
		3051	}
2850		3052
2851	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	3053	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2852	{	3054	{
2853	WL w_ = fs_hash [slot].head;	3055	WL w_ = fs_hash [slot].head;
2854	fs_hash [slot].head = 0;	3056	fs_hash [slot].head = 0;
…		…
3111	embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)	3313	embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3112	{	3314	{
3113	ev_embed w = (ev_embed )(((char *)prepare) - offsetof (ev_embed, prepare));	3315	ev_embed w = (ev_embed )(((char *)prepare) - offsetof (ev_embed, prepare));
3114		3316
3115	{	3317	{
3116	struct ev_loop *loop = w->other;	3318	EV_P = w->other;
3117		3319
3118	while (fdchangecnt)	3320	while (fdchangecnt)
3119	{	3321	{
3120	fd_reify (EV_A);	3322	fd_reify (EV_A);
3121	ev_loop (EV_A_ EVLOOP_NONBLOCK);	3323	ev_loop (EV_A_ EVLOOP_NONBLOCK);
…		…
3129	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));	3331	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
3130		3332
3131	ev_embed_stop (EV_A_ w);	3333	ev_embed_stop (EV_A_ w);
3132		3334
3133	{	3335	{
3134	struct ev_loop *loop = w->other;	3336	EV_P = w->other;
3135		3337
3136	ev_loop_fork (EV_A);	3338	ev_loop_fork (EV_A);
3137	ev_loop (EV_A_ EVLOOP_NONBLOCK);	3339	ev_loop (EV_A_ EVLOOP_NONBLOCK);
3138	}	3340	}
3139		3341
…		…
3153	{	3355	{
3154	if (expect_false (ev_is_active (w)))	3356	if (expect_false (ev_is_active (w)))
3155	return;	3357	return;
3156		3358
3157	{	3359	{
3158	struct ev_loop *loop = w->other;	3360	EV_P = w->other;
3159	assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));	3361	assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
3160	ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);	3362	ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
3161	}	3363	}
3162		3364
3163	EV_FREQUENT_CHECK;	3365	EV_FREQUENT_CHECK;
…		…
3275		3477
3276	void	3478	void
3277	ev_async_send (EV_P_ ev_async *w)	3479	ev_async_send (EV_P_ ev_async *w)
3278	{	3480	{
3279	w->sent = 1;	3481	w->sent = 1;
3280	evpipe_write (EV_A_ &gotasync);	3482	evpipe_write (EV_A_ &async_pending);
3281	}	3483	}
3282	#endif	3484	#endif
3283		3485
3284	/*****************************************************************************/	3486	/*****************************************************************************/
3285		3487
…		…
3434	if (types & EV_CHECK)	3636	if (types & EV_CHECK)
3435	for (i = checkcnt; i--; )	3637	for (i = checkcnt; i--; )
3436	cb (EV_A_ EV_CHECK, checks [i]);	3638	cb (EV_A_ EV_CHECK, checks [i]);
3437		3639
3438	if (types & EV_SIGNAL)	3640	if (types & EV_SIGNAL)
3439	for (i = 0; i < signalmax; ++i)	3641	for (i = 0; i < EV_NSIG - 1; ++i)
3440	for (wl = signals [i].head; wl; )	3642	for (wl = signals [i].head; wl; )
3441	{	3643	{
3442	wn = wl->next;	3644	wn = wl->next;
3443	cb (EV_A_ EV_SIGNAL, wl);	3645	cb (EV_A_ EV_SIGNAL, wl);
3444	wl = wn;	3646	wl = wn;

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.300 by root, Tue Jul 14 20:31:21 2009 UTC vs. Revision 1.315 by root, Wed Aug 26 17:46:22 2009 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.300 by root, Tue Jul 14 20:31:21 2009 UTC vs.
Revision 1.315 by root, Wed Aug 26 17:46:22 2009 UTC