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

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.335 by root, Tue Mar 9 09:02:03 2010 UTC

…		…
1	/*	1	/*
2	* libev event processing core, watcher management	2	* libev event processing core, watcher management
3	*	3	*
4	* Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>	4	* Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Redistribution and use in source and binary forms, with or without modifica-	7	* Redistribution and use in source and binary forms, with or without modifica-
8	* tion, are permitted provided that the following conditions are met:	8	* tion, are permitted provided that the following conditions are met:
9	*	9	*
110	# define EV_USE_EPOLL 0	110	# define EV_USE_EPOLL 0
111	# endif	111	# endif
112	# endif	112	# endif
113		113
114	# ifndef EV_USE_KQUEUE	114	# ifndef EV_USE_KQUEUE
115	# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H	115	# if HAVE_KQUEUE && HAVE_SYS_EVENT_H
116	# define EV_USE_KQUEUE 1	116	# define EV_USE_KQUEUE 1
117	# else	117	# else
118	# define EV_USE_KQUEUE 0	118	# define EV_USE_KQUEUE 0
119	# endif	119	# endif
120	# endif	120	# endif
…		…
153		153
154	#endif	154	#endif
155		155
156	#include <math.h>	156	#include <math.h>
157	#include <stdlib.h>	157	#include <stdlib.h>
		158	#include <string.h>
158	#include <fcntl.h>	159	#include <fcntl.h>
159	#include <stddef.h>	160	#include <stddef.h>
160		161
161	#include <stdio.h>	162	#include <stdio.h>
162		163
163	#include <assert.h>	164	#include <assert.h>
164	#include <errno.h>	165	#include <errno.h>
165	#include <sys/types.h>	166	#include <sys/types.h>
166	#include <time.h>	167	#include <time.h>
		168	#include <limits.h>
167		169
168	#include <signal.h>	170	#include <signal.h>
169		171
170	#ifdef EV_H	172	#ifdef EV_H
171	# include EV_H	173	# include EV_H
…		…
182	# define WIN32_LEAN_AND_MEAN	184	# define WIN32_LEAN_AND_MEAN
183	# include <windows.h>	185	# include <windows.h>
184	# ifndef EV_SELECT_IS_WINSOCKET	186	# ifndef EV_SELECT_IS_WINSOCKET
185	# define EV_SELECT_IS_WINSOCKET 1	187	# define EV_SELECT_IS_WINSOCKET 1
186	# endif	188	# endif
		189	# undef EV_AVOID_STDIO
187	#endif	190	#endif
188		191
189	/* this block tries to deduce configuration from header-defined symbols and defaults */	192	/* this block tries to deduce configuration from header-defined symbols and defaults */
190		193
191	/* try to deduce the maximum number of signals on this platform */	194	/* try to deduce the maximum number of signals on this platform */
192	/* one some platforms, NSIG is one too large. we do not bother */
193	#if defined (EV_NSIG)	195	#if defined (EV_NSIG)
194	/* use what's provided */	196	/* use what's provided */
195	#elif defined (NSIG)	197	#elif defined (NSIG)
196	# define EV_NSIG (NSIG)	198	# define EV_NSIG (NSIG)
197	#elif defined(_NSIG)	199	#elif defined(_NSIG)
…		…
303	# define EV_USE_EVENTFD 0	305	# define EV_USE_EVENTFD 0
304	# endif	306	# endif
305	#endif	307	#endif
306		308
307	#ifndef EV_USE_SIGNALFD	309	#ifndef EV_USE_SIGNALFD
308	# if __linux && (__GLIBC__ > 2 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9))	310	# if __linux && (__GLIBC__ > 2 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
309	# define EV_USE_SIGNALFD 1	311	# define EV_USE_SIGNALFD 1
310	# else	312	# else
311	# define EV_USE_SIGNALFD 0	313	# define EV_USE_SIGNALFD 0
312	# endif	314	# endif
313	#endif	315	#endif
…		…
344	# endif	346	# endif
345	#endif	347	#endif
346		348
347	/* this block fixes any misconfiguration where we know we run into trouble otherwise */	349	/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348		350
		351	#ifdef _AIX
		352	/* AIX has a completely broken poll.h header */
		353	# undef EV_USE_POLL
		354	# define EV_USE_POLL 0
		355	#endif
		356
349	#ifndef CLOCK_MONOTONIC	357	#ifndef CLOCK_MONOTONIC
350	# undef EV_USE_MONOTONIC	358	# undef EV_USE_MONOTONIC
351	# define EV_USE_MONOTONIC 0	359	# define EV_USE_MONOTONIC 0
352	#endif	360	#endif
353		361
…		…
387	# include <stdint.h>	395	# include <stdint.h>
388	# ifndef EFD_NONBLOCK	396	# ifndef EFD_NONBLOCK
389	# define EFD_NONBLOCK O_NONBLOCK	397	# define EFD_NONBLOCK O_NONBLOCK
390	# endif	398	# endif
391	# ifndef EFD_CLOEXEC	399	# ifndef EFD_CLOEXEC
		400	# ifdef O_CLOEXEC
392	# define EFD_CLOEXEC O_CLOEXEC	401	# define EFD_CLOEXEC O_CLOEXEC
		402	# else
		403	# define EFD_CLOEXEC 02000000
		404	# endif
393	# endif	405	# endif
394	# ifdef __cplusplus	406	# ifdef __cplusplus
395	extern "C" {	407	extern "C" {
396	# endif	408	# endif
397	int eventfd (unsigned int initval, int flags);	409	int (eventfd) (unsigned int initval, int flags);
398	# ifdef __cplusplus	410	# ifdef __cplusplus
399	}	411	}
400	# endif	412	# endif
401	#endif	413	#endif
402		414
403	#if EV_USE_SIGNALFD	415	#if EV_USE_SIGNALFD
404	# include <sys/signalfd.h>	416	/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
		417	# include <stdint.h>
		418	# ifndef SFD_NONBLOCK
		419	# define SFD_NONBLOCK O_NONBLOCK
405	#endif	420	# endif
		421	# ifndef SFD_CLOEXEC
		422	# ifdef O_CLOEXEC
		423	# define SFD_CLOEXEC O_CLOEXEC
		424	# else
		425	# define SFD_CLOEXEC 02000000
		426	# endif
		427	# endif
		428	# ifdef __cplusplus
		429	extern "C" {
		430	# endif
		431	int signalfd (int fd, const sigset_t *mask, int flags);
		432
		433	struct signalfd_siginfo
		434	{
		435	uint32_t ssi_signo;
		436	char pad[128 - sizeof (uint32_t)];
		437	};
		438	# ifdef __cplusplus
		439	}
		440	# endif
		441	#endif
		442
406		443
407	/**/	444	/**/
408		445
409	#if EV_VERIFY >= 3	446	#if EV_VERIFY >= 3
410	# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)	447	# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
…		…
422	*/	459	*/
423	#define TIME_EPSILON 0.0001220703125 /* 1/8192 */	460	#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
424		461
425	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */	462	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
426	#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */	463	#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
427	/#define CLEANUP_INTERVAL (MAX_BLOCKTIME 5.) /* how often to try to free memory and re-check fds, TODO */
428		464
429	#if __GNUC__ >= 4	465	#if __GNUC__ >= 4
430	# define expect(expr,value) __builtin_expect ((expr),(value))	466	# define expect(expr,value) __builtin_expect ((expr),(value))
431	# define noinline __attribute__ ((noinline))	467	# define noinline __attribute__ ((noinline))
432	#else	468	#else
…		…
473		509
474	#if EV_USE_MONOTONIC	510	#if EV_USE_MONOTONIC
475	static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */	511	static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
476	#endif	512	#endif
477		513
		514	#ifndef EV_FD_TO_WIN32_HANDLE
		515	# define EV_FD_TO_WIN32_HANDLE(fd) _get_osfhandle (fd)
		516	#endif
		517	#ifndef EV_WIN32_HANDLE_TO_FD
		518	# define EV_WIN32_HANDLE_TO_FD(handle) _open_osfhandle (handle, 0)
		519	#endif
		520	#ifndef EV_WIN32_CLOSE_FD
		521	# define EV_WIN32_CLOSE_FD(fd) close (fd)
		522	#endif
		523
478	#ifdef _WIN32	524	#ifdef _WIN32
479	# include "ev_win32.c"	525	# include "ev_win32.c"
480	#endif	526	#endif
481		527
482	/*****************************************************************************/	528	/*****************************************************************************/
		529
		530	#if EV_AVOID_STDIO
		531	static void noinline
		532	ev_printerr (const char *msg)
		533	{
		534	write (STDERR_FILENO, msg, strlen (msg));
		535	}
		536	#endif
483		537
484	static void (syserr_cb)(const char msg);	538	static void (syserr_cb)(const char msg);
485		539
486	void	540	void
487	ev_set_syserr_cb (void (cb)(const char msg))	541	ev_set_syserr_cb (void (cb)(const char msg))
…		…
497		551
498	if (syserr_cb)	552	if (syserr_cb)
499	syserr_cb (msg);	553	syserr_cb (msg);
500	else	554	else
501	{	555	{
		556	#if EV_AVOID_STDIO
		557	const char *err = strerror (errno);
		558
		559	ev_printerr (msg);
		560	ev_printerr (": ");
		561	ev_printerr (err);
		562	ev_printerr ("\n");
		563	#else
502	perror (msg);	564	perror (msg);
		565	#endif
503	abort ();	566	abort ();
504	}	567	}
505	}	568	}
506		569
507	static void *	570	static void *
508	ev_realloc_emul (void *ptr, long size)	571	ev_realloc_emul (void *ptr, long size)
509	{	572	{
		573	#if __GLIBC__
		574	return realloc (ptr, size);
		575	#else
510	/* some systems, notably openbsd and darwin, fail to properly	576	/* some systems, notably openbsd and darwin, fail to properly
511	* implement realloc (x, 0) (as required by both ansi c-98 and	577	* implement realloc (x, 0) (as required by both ansi c-89 and
512	* the single unix specification, so work around them here.	578	* the single unix specification, so work around them here.
513	*/	579	*/
514		580
515	if (size)	581	if (size)
516	return realloc (ptr, size);	582	return realloc (ptr, size);
517		583
518	free (ptr);	584	free (ptr);
519	return 0;	585	return 0;
		586	#endif
520	}	587	}
521		588
522	static void (alloc)(void *ptr, long size) = ev_realloc_emul;	589	static void (alloc)(void *ptr, long size) = ev_realloc_emul;
523		590
524	void	591	void
…		…
532	{	599	{
533	ptr = alloc (ptr, size);	600	ptr = alloc (ptr, size);
534		601
535	if (!ptr && size)	602	if (!ptr && size)
536	{	603	{
		604	#if EV_AVOID_STDIO
		605	ev_printerr ("libev: memory allocation failed, aborting.\n");
		606	#else
537	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);	607	fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
		608	#endif
538	abort ();	609	abort ();
539	}	610	}
540		611
541	return ptr;	612	return ptr;
542	}	613	}
…		…
873		944
874	#if EV_SELECT_IS_WINSOCKET	945	#if EV_SELECT_IS_WINSOCKET
875	if (events)	946	if (events)
876	{	947	{
877	unsigned long arg;	948	unsigned long arg;
878	#ifdef EV_FD_TO_WIN32_HANDLE
879	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);	949	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
880	#else
881	anfd->handle = _get_osfhandle (fd);
882	#endif
883	assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));	950	assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
884	}	951	}
885	#endif	952	#endif
886		953
887	{	954	{
…		…
930	/* check whether the given fd is atcually valid, for error recovery */	997	/* check whether the given fd is atcually valid, for error recovery */
931	inline_size int	998	inline_size int
932	fd_valid (int fd)	999	fd_valid (int fd)
933	{	1000	{
934	#ifdef _WIN32	1001	#ifdef _WIN32
935	return _get_osfhandle (fd) != -1;	1002	return EV_FD_TO_WIN32_HANDLE (fd) != -1;
936	#else	1003	#else
937	return fcntl (fd, F_GETFD) != -1;	1004	return fcntl (fd, F_GETFD) != -1;
938	#endif	1005	#endif
939	}	1006	}
940		1007
…		…
958		1025
959	for (fd = anfdmax; fd--; )	1026	for (fd = anfdmax; fd--; )
960	if (anfds [fd].events)	1027	if (anfds [fd].events)
961	{	1028	{
962	fd_kill (EV_A_ fd);	1029	fd_kill (EV_A_ fd);
963	return;	1030	break;
964	}	1031	}
965	}	1032	}
966		1033
967	/* usually called after fork if backend needs to re-arm all fds from scratch */	1034	/* usually called after fork if backend needs to re-arm all fds from scratch */
968	static void noinline	1035	static void noinline
…		…
1058		1125
1059	for (;;)	1126	for (;;)
1060	{	1127	{
1061	int c = k << 1;	1128	int c = k << 1;
1062		1129
1063	if (c > N + HEAP0 - 1)	1130	if (c >= N + HEAP0)
1064	break;	1131	break;
1065		1132
1066	c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])	1133	c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1067	? 1 : 0;	1134	? 1 : 0;
1068		1135
…		…
1104		1171
1105	/* move an element suitably so it is in a correct place */	1172	/* move an element suitably so it is in a correct place */
1106	inline_size void	1173	inline_size void
1107	adjustheap (ANHE *heap, int N, int k)	1174	adjustheap (ANHE *heap, int N, int k)
1108	{	1175	{
1109	if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))	1176	if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1110	upheap (heap, k);	1177	upheap (heap, k);
1111	else	1178	else
1112	downheap (heap, N, k);	1179	downheap (heap, N, k);
1113	}	1180	}
1114		1181
…		…
1127	/*****************************************************************************/	1194	/*****************************************************************************/
1128		1195
1129	/* associate signal watchers to a signal signal */	1196	/* associate signal watchers to a signal signal */
1130	typedef struct	1197	typedef struct
1131	{	1198	{
		1199	EV_ATOMIC_T pending;
1132	#if EV_MULTIPLICITY	1200	#if EV_MULTIPLICITY
1133	EV_P;	1201	EV_P;
1134	#endif	1202	#endif
1135	WL head;	1203	WL head;
1136	EV_ATOMIC_T gotsig;
1137	} ANSIG;	1204	} ANSIG;
1138		1205
1139	static ANSIG signals [EV_NSIG - 1];	1206	static ANSIG signals [EV_NSIG - 1];
1140	static EV_ATOMIC_T gotsig;
1141		1207
1142	/*****************************************************************************/	1208	/*****************************************************************************/
1143		1209
1144	/* used to prepare libev internal fd's */	1210	/* used to prepare libev internal fd's */
1145	/* this is not fork-safe */	1211	/* this is not fork-safe */
1146	inline_speed void	1212	inline_speed void
1147	fd_intern (int fd)	1213	fd_intern (int fd)
1148	{	1214	{
1149	#ifdef _WIN32	1215	#ifdef _WIN32
1150	unsigned long arg = 1;	1216	unsigned long arg = 1;
1151	ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);	1217	ioctlsocket (EV_FD_TO_WIN32_HANDLE (fd), FIONBIO, &arg);
1152	#else	1218	#else
1153	fcntl (fd, F_SETFD, FD_CLOEXEC);	1219	fcntl (fd, F_SETFD, FD_CLOEXEC);
1154	fcntl (fd, F_SETFL, O_NONBLOCK);	1220	fcntl (fd, F_SETFL, O_NONBLOCK);
1155	#endif	1221	#endif
1156	}	1222	}
…		…
1213	/* called whenever the libev signal pipe */	1279	/* called whenever the libev signal pipe */
1214	/* got some events (signal, async) */	1280	/* got some events (signal, async) */
1215	static void	1281	static void
1216	pipecb (EV_P_ ev_io *iow, int revents)	1282	pipecb (EV_P_ ev_io *iow, int revents)
1217	{	1283	{
		1284	int i;
		1285
1218	#if EV_USE_EVENTFD	1286	#if EV_USE_EVENTFD
1219	if (evfd >= 0)	1287	if (evfd >= 0)
1220	{	1288	{
1221	uint64_t counter;	1289	uint64_t counter;
1222	read (evfd, &counter, sizeof (uint64_t));	1290	read (evfd, &counter, sizeof (uint64_t));
…		…
1226	{	1294	{
1227	char dummy;	1295	char dummy;
1228	read (evpipe [0], &dummy, 1);	1296	read (evpipe [0], &dummy, 1);
1229	}	1297	}
1230		1298
1231	if (gotsig && ev_is_default_loop (EV_A))	1299	if (sig_pending)
1232	{	1300	{
1233	int signum;	1301	sig_pending = 0;
1234	gotsig = 0;
1235		1302
1236	for (signum = EV_NSIG - 1; signum--; )	1303	for (i = EV_NSIG - 1; i--; )
1237	if (signals [signum].gotsig)	1304	if (expect_false (signals [i].pending))
1238	ev_feed_signal_event (EV_A_ signum + 1);	1305	ev_feed_signal_event (EV_A_ i + 1);
1239	}	1306	}
1240		1307
1241	#if EV_ASYNC_ENABLE	1308	#if EV_ASYNC_ENABLE
1242	if (gotasync)	1309	if (async_pending)
1243	{	1310	{
1244	int i;	1311	async_pending = 0;
1245	gotasync = 0;
1246		1312
1247	for (i = asynccnt; i--; )	1313	for (i = asynccnt; i--; )
1248	if (asyncs [i]->sent)	1314	if (asyncs [i]->sent)
1249	{	1315	{
1250	asyncs [i]->sent = 0;	1316	asyncs [i]->sent = 0;
…		…
1261	{	1327	{
1262	#if EV_MULTIPLICITY	1328	#if EV_MULTIPLICITY
1263	EV_P = signals [signum - 1].loop;	1329	EV_P = signals [signum - 1].loop;
1264	#endif	1330	#endif
1265		1331
1266	#if _WIN32	1332	#ifdef _WIN32
1267	signal (signum, ev_sighandler);	1333	signal (signum, ev_sighandler);
1268	#endif	1334	#endif
1269		1335
1270	signals [signum - 1].gotsig = 1;	1336	signals [signum - 1].pending = 1;
1271	evpipe_write (EV_A_ &gotsig);	1337	evpipe_write (EV_A_ &sig_pending);
1272	}	1338	}
1273		1339
1274	void noinline	1340	void noinline
1275	ev_feed_signal_event (EV_P_ int signum)	1341	ev_feed_signal_event (EV_P_ int signum)
1276	{	1342	{
1277	WL w;	1343	WL w;
1278		1344
		1345	if (expect_false (signum <= 0 \|\| signum > EV_NSIG))
		1346	return;
		1347
		1348	--signum;
		1349
1279	#if EV_MULTIPLICITY	1350	#if EV_MULTIPLICITY
1280	assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));	1351	/* it is permissible to try to feed a signal to the wrong loop */
1281	#endif	1352	/* or, likely more useful, feeding a signal nobody is waiting for */
1282		1353
1283	if (signum <= 0 \|\| signum > EV_NSIG)	1354	if (expect_false (signals [signum].loop != EV_A))
1284	return;	1355	return;
		1356	#endif
1285		1357
1286	--signum;
1287
1288	signals [signum].gotsig = 0;	1358	signals [signum].pending = 0;
1289		1359
1290	for (w = signals [signum].head; w; w = w->next)	1360	for (w = signals [signum].head; w; w = w->next)
1291	ev_feed_event (EV_A_ (W)w, EV_SIGNAL);	1361	ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1292	}	1362	}
1293		1363
…		…
1560		1630
1561	io_blocktime = 0.;	1631	io_blocktime = 0.;
1562	timeout_blocktime = 0.;	1632	timeout_blocktime = 0.;
1563	backend = 0;	1633	backend = 0;
1564	backend_fd = -1;	1634	backend_fd = -1;
1565	gotasync = 0;	1635	sig_pending = 0;
		1636	#if EV_ASYNC_ENABLE
		1637	async_pending = 0;
		1638	#endif
1566	#if EV_USE_INOTIFY	1639	#if EV_USE_INOTIFY
1567	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;	1640	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1568	#endif	1641	#endif
1569	#if EV_USE_SIGNALFD	1642	#if EV_USE_SIGNALFD
1570	sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;	1643	sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1571	#endif	1644	#endif
1572		1645
1573	if (!(flags & 0x0000ffffU))	1646	if (!(flags & 0x0000ffffU))
1574	flags \|= ev_recommended_backends ();	1647	flags \|= ev_recommended_backends ();
1575		1648
…		…
1612	close (evfd);	1685	close (evfd);
1613	#endif	1686	#endif
1614		1687
1615	if (evpipe [0] >= 0)	1688	if (evpipe [0] >= 0)
1616	{	1689	{
1617	close (evpipe [0]);	1690	EV_WIN32_CLOSE_FD (evpipe [0]);
1618	close (evpipe [1]);	1691	EV_WIN32_CLOSE_FD (evpipe [1]);
1619	}	1692	}
1620	}	1693	}
1621		1694
1622	#if EV_USE_SIGNALFD	1695	#if EV_USE_SIGNALFD
1623	if (ev_is_active (&sigfd_w))	1696	if (ev_is_active (&sigfd_w))
1624	{
1625	/ev_ref (EV_A);/
1626	/ev_io_stop (EV_A_ &sigfd_w);/
1627
1628	close (sigfd);	1697	close (sigfd);
1629	}
1630	#endif	1698	#endif
1631		1699
1632	#if EV_USE_INOTIFY	1700	#if EV_USE_INOTIFY
1633	if (fs_fd >= 0)	1701	if (fs_fd >= 0)
1634	close (fs_fd);	1702	close (fs_fd);
…		…
1704		1772
1705	if (ev_is_active (&pipe_w))	1773	if (ev_is_active (&pipe_w))
1706	{	1774	{
1707	/* this "locks" the handlers against writing to the pipe */	1775	/* this "locks" the handlers against writing to the pipe */
1708	/* while we modify the fd vars */	1776	/* while we modify the fd vars */
1709	gotsig = 1;	1777	sig_pending = 1;
1710	#if EV_ASYNC_ENABLE	1778	#if EV_ASYNC_ENABLE
1711	gotasync = 1;	1779	async_pending = 1;
1712	#endif	1780	#endif
1713		1781
1714	ev_ref (EV_A);	1782	ev_ref (EV_A);
1715	ev_io_stop (EV_A_ &pipe_w);	1783	ev_io_stop (EV_A_ &pipe_w);
1716		1784
…		…
1719	close (evfd);	1787	close (evfd);
1720	#endif	1788	#endif
1721		1789
1722	if (evpipe [0] >= 0)	1790	if (evpipe [0] >= 0)
1723	{	1791	{
1724	close (evpipe [0]);	1792	EV_WIN32_CLOSE_FD (evpipe [0]);
1725	close (evpipe [1]);	1793	EV_WIN32_CLOSE_FD (evpipe [1]);
1726	}	1794	}
1727		1795
1728	evpipe_init (EV_A);	1796	evpipe_init (EV_A);
1729	/* now iterate over everything, in case we missed something */	1797	/* now iterate over everything, in case we missed something */
1730	pipecb (EV_A_ &pipe_w, EV_READ);	1798	pipecb (EV_A_ &pipe_w, EV_READ);
…		…
1856	assert (checkmax >= checkcnt);	1924	assert (checkmax >= checkcnt);
1857	array_verify (EV_A_ (W *)checks, checkcnt);	1925	array_verify (EV_A_ (W *)checks, checkcnt);
1858		1926
1859	# if 0	1927	# if 0
1860	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)	1928	for (w = (ev_child )childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child )((WL)w)->next)
1861	for (signum = EV_NSIG; signum--; ) if (signals [signum].gotsig)	1929	for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1862	# endif	1930	# endif
1863	#endif	1931	#endif
1864	}	1932	}
1865	#endif	1933	#endif
1866		1934
…		…
2122	ANHE_at_cache (*he);	2190	ANHE_at_cache (*he);
2123	}	2191	}
2124	}	2192	}
2125		2193
2126	/* fetch new monotonic and realtime times from the kernel */	2194	/* fetch new monotonic and realtime times from the kernel */
2127	/* also detetc if there was a timejump, and act accordingly */	2195	/* also detect if there was a timejump, and act accordingly */
2128	inline_speed void	2196	inline_speed void
2129	time_update (EV_P_ ev_tstamp max_block)	2197	time_update (EV_P_ ev_tstamp max_block)
2130	{	2198	{
2131	#if EV_USE_MONOTONIC	2199	#if EV_USE_MONOTONIC
2132	if (expect_true (have_monotonic))	2200	if (expect_true (have_monotonic))
…		…
2393	inline_size void	2461	inline_size void
2394	wlist_del (WL *head, WL elem)	2462	wlist_del (WL *head, WL elem)
2395	{	2463	{
2396	while (*head)	2464	while (*head)
2397	{	2465	{
2398	if (*head == elem)	2466	if (expect_true (*head == elem))
2399	{	2467	{
2400	*head = elem->next;	2468	*head = elem->next;
2401	return;	2469	break;
2402	}	2470	}
2403		2471
2404	head = &(*head)->next;	2472	head = &(*head)->next;
2405	}	2473	}
2406	}	2474	}
…		…
2466		2534
2467	if (expect_false (ev_is_active (w)))	2535	if (expect_false (ev_is_active (w)))
2468	return;	2536	return;
2469		2537
2470	assert (("libev: ev_io_start called with negative fd", fd >= 0));	2538	assert (("libev: ev_io_start called with negative fd", fd >= 0));
2471	assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET \| EV_READ \| EV_WRITE))));	2539	assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET \| EV_READ \| EV_WRITE))));
2472		2540
2473	EV_FREQUENT_CHECK;	2541	EV_FREQUENT_CHECK;
2474		2542
2475	ev_start (EV_A_ (W)w, 1);	2543	ev_start (EV_A_ (W)w, 1);
2476	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);	2544	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
…		…
2546	timers [active] = timers [timercnt + HEAP0];	2614	timers [active] = timers [timercnt + HEAP0];
2547	adjustheap (timers, timercnt, active);	2615	adjustheap (timers, timercnt, active);
2548	}	2616	}
2549	}	2617	}
2550		2618
2551	EV_FREQUENT_CHECK;
2552
2553	ev_at (w) -= mn_now;	2619	ev_at (w) -= mn_now;
2554		2620
2555	ev_stop (EV_A_ (W)w);	2621	ev_stop (EV_A_ (W)w);
		2622
		2623	EV_FREQUENT_CHECK;
2556	}	2624	}
2557		2625
2558	void noinline	2626	void noinline
2559	ev_timer_again (EV_P_ ev_timer *w)	2627	ev_timer_again (EV_P_ ev_timer *w)
2560	{	2628	{
…		…
2639	periodics [active] = periodics [periodiccnt + HEAP0];	2707	periodics [active] = periodics [periodiccnt + HEAP0];
2640	adjustheap (periodics, periodiccnt, active);	2708	adjustheap (periodics, periodiccnt, active);
2641	}	2709	}
2642	}	2710	}
2643		2711
2644	EV_FREQUENT_CHECK;
2645
2646	ev_stop (EV_A_ (W)w);	2712	ev_stop (EV_A_ (W)w);
		2713
		2714	EV_FREQUENT_CHECK;
2647	}	2715	}
2648		2716
2649	void noinline	2717	void noinline
2650	ev_periodic_again (EV_P_ ev_periodic *w)	2718	ev_periodic_again (EV_P_ ev_periodic *w)
2651	{	2719	{
…		…
2666	return;	2734	return;
2667		2735
2668	assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));	2736	assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0 && w->signum < EV_NSIG));
2669		2737
2670	#if EV_MULTIPLICITY	2738	#if EV_MULTIPLICITY
2671	assert (("libev: tried to attach to a signal from two different loops",	2739	assert (("libev: a signal must not be attached to two different loops",
2672	!signals [w->signum - 1].loop \|\| signals [w->signum - 1].loop == loop));	2740	!signals [w->signum - 1].loop \|\| signals [w->signum - 1].loop == loop));
2673		2741
2674	signals [w->signum - 1].loop = EV_A;	2742	signals [w->signum - 1].loop = EV_A;
2675	#endif	2743	#endif
2676		2744
…		…
2712	if (!((WL)w)->next)	2780	if (!((WL)w)->next)
2713	# if EV_USE_SIGNALFD	2781	# if EV_USE_SIGNALFD
2714	if (sigfd < 0) /TODO/	2782	if (sigfd < 0) /TODO/
2715	# endif	2783	# endif
2716	{	2784	{
2717	# if _WIN32	2785	# ifdef _WIN32
		2786	evpipe_init (EV_A);
		2787
2718	signal (w->signum, ev_sighandler);	2788	signal (w->signum, ev_sighandler);
2719	# else	2789	# else
2720	struct sigaction sa;	2790	struct sigaction sa;
2721		2791
2722	evpipe_init (EV_A);	2792	evpipe_init (EV_A);
…		…
2747	wlist_del (&signals [w->signum - 1].head, (WL)w);	2817	wlist_del (&signals [w->signum - 1].head, (WL)w);
2748	ev_stop (EV_A_ (W)w);	2818	ev_stop (EV_A_ (W)w);
2749		2819
2750	if (!signals [w->signum - 1].head)	2820	if (!signals [w->signum - 1].head)
2751	{	2821	{
2752	#if EV_MULTIPLICITY	2822	#if EV_MULTIPLICITY
2753	signals [w->signum - 1].loop = 0; /* unattach from signal */	2823	signals [w->signum - 1].loop = 0; /* unattach from signal */
2754	#endif	2824	#endif
2755	#if EV_USE_SIGNALFD	2825	#if EV_USE_SIGNALFD
2756	if (sigfd >= 0)	2826	if (sigfd >= 0)
2757	{	2827	{
2758	sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D	2828	sigset_t ss;
		2829
		2830	sigemptyset (&ss);
		2831	sigaddset (&ss, w->signum);
2759	sigdelset (&sigfd_set, w->signum);	2832	sigdelset (&sigfd_set, w->signum);
		2833
2760	signalfd (sigfd, &sigfd_set, 0);	2834	signalfd (sigfd, &sigfd_set, 0);
2761	sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D	2835	sigprocmask (SIG_UNBLOCK, &ss, 0);
2762	/TODO: maybe unblock signal? /
2763	}	2836	}
2764	else	2837	else
2765	#endif	2838	#endif
2766	signal (w->signum, SIG_DFL);	2839	signal (w->signum, SIG_DFL);
2767	}	2840	}
2768		2841
2769	EV_FREQUENT_CHECK;	2842	EV_FREQUENT_CHECK;
2770	}	2843	}
…		…
2813	#define MIN_STAT_INTERVAL 0.1074891	2886	#define MIN_STAT_INTERVAL 0.1074891
2814		2887
2815	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);	2888	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2816		2889
2817	#if EV_USE_INOTIFY	2890	#if EV_USE_INOTIFY
2818	# define EV_INOTIFY_BUFSIZE 8192	2891
		2892	/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
		2893	# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2819		2894
2820	static void noinline	2895	static void noinline
2821	infy_add (EV_P_ ev_stat *w)	2896	infy_add (EV_P_ ev_stat *w)
2822	{	2897	{
2823	w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB \| IN_DELETE_SELF \| IN_MOVE_SELF \| IN_MODIFY \| IN_DONT_FOLLOW \| IN_MASK_ADD);	2898	w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB \| IN_DELETE_SELF \| IN_MOVE_SELF \| IN_MODIFY \| IN_DONT_FOLLOW \| IN_MASK_ADD);
2824		2899
2825	if (w->wd < 0)	2900	if (w->wd >= 0)
		2901	{
		2902	struct statfs sfs;
		2903
		2904	/* now local changes will be tracked by inotify, but remote changes won't */
		2905	/* unless the filesystem is known to be local, we therefore still poll */
		2906	/* also do poll on <2.6.25, but with normal frequency */
		2907
		2908	if (!fs_2625)
		2909	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
		2910	else if (!statfs (w->path, &sfs)
		2911	&& (sfs.f_type == 0x1373 /* devfs */
		2912	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
		2913	\|\| sfs.f_type == 0x3153464a /* jfs */
		2914	\|\| sfs.f_type == 0x52654973 /* reiser3 */
		2915	\|\| sfs.f_type == 0x01021994 /* tempfs */
		2916	\|\| sfs.f_type == 0x58465342 /* xfs */))
		2917	w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
		2918	else
		2919	w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
2826	{	2920	}
		2921	else
		2922	{
		2923	/* can't use inotify, continue to stat */
2827	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;	2924	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2828	ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2829		2925
2830	/* monitor some parent directory for speedup hints */	2926	/* if path is not there, monitor some parent directory for speedup hints */
2831	/* note that exceeding the hardcoded path limit is not a correctness issue, */	2927	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2832	/* but an efficiency issue only */	2928	/* but an efficiency issue only */
2833	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2929	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2834	{	2930	{
2835	char path [4096];	2931	char path [4096];
…		…
2851	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2947	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2852	}	2948	}
2853	}	2949	}
2854		2950
2855	if (w->wd >= 0)	2951	if (w->wd >= 0)
2856	{
2857	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);	2952	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2858		2953
2859	/* now local changes will be tracked by inotify, but remote changes won't */	2954	/* now re-arm timer, if required */
2860	/* unless the filesystem it known to be local, we therefore still poll */	2955	if (ev_is_active (&w->timer)) ev_ref (EV_A);
2861	/* also do poll on <2.6.25, but with normal frequency */
2862	struct statfs sfs;
2863
2864	if (fs_2625 && !statfs (w->path, &sfs))
2865	if (sfs.f_type == 0x1373 /* devfs */
2866	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
2867	\|\| sfs.f_type == 0x3153464a /* jfs */
2868	\|\| sfs.f_type == 0x52654973 /* reiser3 */
2869	\|\| sfs.f_type == 0x01021994 /* tempfs */
2870	\|\| sfs.f_type == 0x58465342 /* xfs */)
2871	return;
2872
2873	w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2874	ev_timer_again (EV_A_ &w->timer);	2956	ev_timer_again (EV_A_ &w->timer);
2875	}	2957	if (ev_is_active (&w->timer)) ev_unref (EV_A);
2876	}	2958	}
2877		2959
2878	static void noinline	2960	static void noinline
2879	infy_del (EV_P_ ev_stat *w)	2961	infy_del (EV_P_ ev_stat *w)
2880	{	2962	{
…		…
2925		3007
2926	static void	3008	static void
2927	infy_cb (EV_P_ ev_io *w, int revents)	3009	infy_cb (EV_P_ ev_io *w, int revents)
2928	{	3010	{
2929	char buf [EV_INOTIFY_BUFSIZE];	3011	char buf [EV_INOTIFY_BUFSIZE];
2930	struct inotify_event ev = (struct inotify_event )buf;
2931	int ofs;	3012	int ofs;
2932	int len = read (fs_fd, buf, sizeof (buf));	3013	int len = read (fs_fd, buf, sizeof (buf));
2933		3014
2934	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)	3015	for (ofs = 0; ofs < len; )
		3016	{
		3017	struct inotify_event ev = (struct inotify_event )(buf + ofs);
2935	infy_wd (EV_A_ ev->wd, ev->wd, ev);	3018	infy_wd (EV_A_ ev->wd, ev->wd, ev);
		3019	ofs += sizeof (struct inotify_event) + ev->len;
		3020	}
		3021	}
		3022
		3023	inline_size unsigned int
		3024	ev_linux_version (void)
		3025	{
		3026	struct utsname buf;
		3027	unsigned int v;
		3028	int i;
		3029	char *p = buf.release;
		3030
		3031	if (uname (&buf))
		3032	return 0;
		3033
		3034	for (i = 3+1; --i; )
		3035	{
		3036	unsigned int c = 0;
		3037
		3038	for (;;)
		3039	{
		3040	if (p >= '0' && p <= '9')
		3041	c = c * 10 + *p++ - '0';
		3042	else
		3043	{
		3044	p += *p == '.';
		3045	break;
		3046	}
		3047	}
		3048
		3049	v = (v << 8) \| c;
		3050	}
		3051
		3052	return v;
2936	}	3053	}
2937		3054
2938	inline_size void	3055	inline_size void
2939	check_2625 (EV_P)	3056	ev_check_2625 (EV_P)
2940	{	3057	{
2941	/* kernels < 2.6.25 are borked	3058	/* kernels < 2.6.25 are borked
2942	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html	3059	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2943	*/	3060	*/
2944	struct utsname buf;	3061	if (ev_linux_version () < 0x020619)
2945	int major, minor, micro;
2946
2947	if (uname (&buf))
2948	return;	3062	return;
2949		3063
2950	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2951	return;
2952
2953	if (major < 2
2954	\|\| (major == 2 && minor < 6)
2955	\|\| (major == 2 && minor == 6 && micro < 25))
2956	return;
2957
2958	fs_2625 = 1;	3064	fs_2625 = 1;
		3065	}
		3066
		3067	inline_size int
		3068	infy_newfd (void)
		3069	{
		3070	#if defined (IN_CLOEXEC) && defined (IN_NONBLOCK)
		3071	int fd = inotify_init1 (IN_CLOEXEC \| IN_NONBLOCK);
		3072	if (fd >= 0)
		3073	return fd;
		3074	#endif
		3075	return inotify_init ();
2959	}	3076	}
2960		3077
2961	inline_size void	3078	inline_size void
2962	infy_init (EV_P)	3079	infy_init (EV_P)
2963	{	3080	{
2964	if (fs_fd != -2)	3081	if (fs_fd != -2)
2965	return;	3082	return;
2966		3083
2967	fs_fd = -1;	3084	fs_fd = -1;
2968		3085
2969	check_2625 (EV_A);	3086	ev_check_2625 (EV_A);
2970		3087
2971	fs_fd = inotify_init ();	3088	fs_fd = infy_newfd ();
2972		3089
2973	if (fs_fd >= 0)	3090	if (fs_fd >= 0)
2974	{	3091	{
		3092	fd_intern (fs_fd);
2975	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	3093	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2976	ev_set_priority (&fs_w, EV_MAXPRI);	3094	ev_set_priority (&fs_w, EV_MAXPRI);
2977	ev_io_start (EV_A_ &fs_w);	3095	ev_io_start (EV_A_ &fs_w);
		3096	ev_unref (EV_A);
2978	}	3097	}
2979	}	3098	}
2980		3099
2981	inline_size void	3100	inline_size void
2982	infy_fork (EV_P)	3101	infy_fork (EV_P)
…		…
2984	int slot;	3103	int slot;
2985		3104
2986	if (fs_fd < 0)	3105	if (fs_fd < 0)
2987	return;	3106	return;
2988		3107
		3108	ev_ref (EV_A);
		3109	ev_io_stop (EV_A_ &fs_w);
2989	close (fs_fd);	3110	close (fs_fd);
2990	fs_fd = inotify_init ();	3111	fs_fd = infy_newfd ();
		3112
		3113	if (fs_fd >= 0)
		3114	{
		3115	fd_intern (fs_fd);
		3116	ev_io_set (&fs_w, fs_fd, EV_READ);
		3117	ev_io_start (EV_A_ &fs_w);
		3118	ev_unref (EV_A);
		3119	}
2991		3120
2992	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	3121	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2993	{	3122	{
2994	WL w_ = fs_hash [slot].head;	3123	WL w_ = fs_hash [slot].head;
2995	fs_hash [slot].head = 0;	3124	fs_hash [slot].head = 0;
…		…
3002	w->wd = -1;	3131	w->wd = -1;
3003		3132
3004	if (fs_fd >= 0)	3133	if (fs_fd >= 0)
3005	infy_add (EV_A_ w); /* re-add, no matter what */	3134	infy_add (EV_A_ w); /* re-add, no matter what */
3006	else	3135	else
		3136	{
		3137	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
		3138	if (ev_is_active (&w->timer)) ev_ref (EV_A);
3007	ev_timer_again (EV_A_ &w->timer);	3139	ev_timer_again (EV_A_ &w->timer);
		3140	if (ev_is_active (&w->timer)) ev_unref (EV_A);
		3141	}
3008	}	3142	}
3009	}	3143	}
3010	}	3144	}
3011		3145
3012	#endif	3146	#endif
…		…
3029	static void noinline	3163	static void noinline
3030	stat_timer_cb (EV_P_ ev_timer *w_, int revents)	3164	stat_timer_cb (EV_P_ ev_timer *w_, int revents)
3031	{	3165	{
3032	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));	3166	ev_stat w = (ev_stat )(((char *)w_) - offsetof (ev_stat, timer));
3033		3167
3034	/* we copy this here each the time so that */	3168	ev_statdata prev = w->attr;
3035	/* prev has the old value when the callback gets invoked */
3036	w->prev = w->attr;
3037	ev_stat_stat (EV_A_ w);	3169	ev_stat_stat (EV_A_ w);
3038		3170
3039	/* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */	3171	/* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
3040	if (	3172	if (
3041	w->prev.st_dev != w->attr.st_dev	3173	prev.st_dev != w->attr.st_dev
3042	\|\| w->prev.st_ino != w->attr.st_ino	3174	\|\| prev.st_ino != w->attr.st_ino
3043	\|\| w->prev.st_mode != w->attr.st_mode	3175	\|\| prev.st_mode != w->attr.st_mode
3044	\|\| w->prev.st_nlink != w->attr.st_nlink	3176	\|\| prev.st_nlink != w->attr.st_nlink
3045	\|\| w->prev.st_uid != w->attr.st_uid	3177	\|\| prev.st_uid != w->attr.st_uid
3046	\|\| w->prev.st_gid != w->attr.st_gid	3178	\|\| prev.st_gid != w->attr.st_gid
3047	\|\| w->prev.st_rdev != w->attr.st_rdev	3179	\|\| prev.st_rdev != w->attr.st_rdev
3048	\|\| w->prev.st_size != w->attr.st_size	3180	\|\| prev.st_size != w->attr.st_size
3049	\|\| w->prev.st_atime != w->attr.st_atime	3181	\|\| prev.st_atime != w->attr.st_atime
3050	\|\| w->prev.st_mtime != w->attr.st_mtime	3182	\|\| prev.st_mtime != w->attr.st_mtime
3051	\|\| w->prev.st_ctime != w->attr.st_ctime	3183	\|\| prev.st_ctime != w->attr.st_ctime
3052	) {	3184	) {
		3185	/* we only update w->prev on actual differences */
		3186	/* in case we test more often than invoke the callback, */
		3187	/* to ensure that prev is always different to attr */
		3188	w->prev = prev;
		3189
3053	#if EV_USE_INOTIFY	3190	#if EV_USE_INOTIFY
3054	if (fs_fd >= 0)	3191	if (fs_fd >= 0)
3055	{	3192	{
3056	infy_del (EV_A_ w);	3193	infy_del (EV_A_ w);
3057	infy_add (EV_A_ w);	3194	infy_add (EV_A_ w);
…		…
3082		3219
3083	if (fs_fd >= 0)	3220	if (fs_fd >= 0)
3084	infy_add (EV_A_ w);	3221	infy_add (EV_A_ w);
3085	else	3222	else
3086	#endif	3223	#endif
		3224	{
3087	ev_timer_again (EV_A_ &w->timer);	3225	ev_timer_again (EV_A_ &w->timer);
		3226	ev_unref (EV_A);
		3227	}
3088		3228
3089	ev_start (EV_A_ (W)w, 1);	3229	ev_start (EV_A_ (W)w, 1);
3090		3230
3091	EV_FREQUENT_CHECK;	3231	EV_FREQUENT_CHECK;
3092	}	3232	}
…		…
3101	EV_FREQUENT_CHECK;	3241	EV_FREQUENT_CHECK;
3102		3242
3103	#if EV_USE_INOTIFY	3243	#if EV_USE_INOTIFY
3104	infy_del (EV_A_ w);	3244	infy_del (EV_A_ w);
3105	#endif	3245	#endif
		3246
		3247	if (ev_is_active (&w->timer))
		3248	{
		3249	ev_ref (EV_A);
3106	ev_timer_stop (EV_A_ &w->timer);	3250	ev_timer_stop (EV_A_ &w->timer);
		3251	}
3107		3252
3108	ev_stop (EV_A_ (W)w);	3253	ev_stop (EV_A_ (W)w);
3109		3254
3110	EV_FREQUENT_CHECK;	3255	EV_FREQUENT_CHECK;
3111	}	3256	}
…		…
3331		3476
3332	ev_io_stop (EV_A_ &w->io);	3477	ev_io_stop (EV_A_ &w->io);
3333	ev_prepare_stop (EV_A_ &w->prepare);	3478	ev_prepare_stop (EV_A_ &w->prepare);
3334	ev_fork_stop (EV_A_ &w->fork);	3479	ev_fork_stop (EV_A_ &w->fork);
3335		3480
		3481	ev_stop (EV_A_ (W)w);
		3482
3336	EV_FREQUENT_CHECK;	3483	EV_FREQUENT_CHECK;
3337	}	3484	}
3338	#endif	3485	#endif
3339		3486
3340	#if EV_FORK_ENABLE	3487	#if EV_FORK_ENABLE
…		…
3416		3563
3417	void	3564	void
3418	ev_async_send (EV_P_ ev_async *w)	3565	ev_async_send (EV_P_ ev_async *w)
3419	{	3566	{
3420	w->sent = 1;	3567	w->sent = 1;
3421	evpipe_write (EV_A_ &gotasync);	3568	evpipe_write (EV_A_ &async_pending);
3422	}	3569	}
3423	#endif	3570	#endif
3424		3571
3425	/*****************************************************************************/	3572	/*****************************************************************************/
3426		3573

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs. Revision 1.335 by root, Tue Mar 9 09:02:03 2010 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.306 by root, Sun Jul 19 06:35:25 2009 UTC vs.
Revision 1.335 by root, Tue Mar 9 09:02:03 2010 UTC