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

Comparing libev/ev.c (file contents):
Revision 1.297 by root, Fri Jul 10 00:36: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	/*****************************************************************************/
…		…
490	#define ev_malloc(size) ev_realloc (0, (size))	582	#define ev_malloc(size) ev_realloc (0, (size))
491	#define ev_free(ptr) ev_realloc ((ptr), 0)	583	#define ev_free(ptr) ev_realloc ((ptr), 0)
492		584
493	/*****************************************************************************/	585	/*****************************************************************************/
494		586
		587	/* set in reify when reification needed */
		588	#define EV_ANFD_REIFY 1
		589
495	/* file descriptor info structure */	590	/* file descriptor info structure */
496	typedef struct	591	typedef struct
497	{	592	{
498	WL head;	593	WL head;
499	unsigned char events; /* the events watched for */	594	unsigned char events; /* the events watched for */
500	unsigned char reify; /* flag set when this ANFD needs reification */	595	unsigned char reify; /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
501	unsigned char emask; /* the epoll backend stores the actual kernel mask in here */	596	unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
502	unsigned char unused;	597	unsigned char unused;
503	#if EV_USE_EPOLL	598	#if EV_USE_EPOLL
504	unsigned int egen; /* generation counter to counter epoll bugs */	599	unsigned int egen; /* generation counter to counter epoll bugs */
505	#endif	600	#endif
…		…
568	static int ev_default_loop_ptr;	663	static int ev_default_loop_ptr;
569		664
570	#endif	665	#endif
571		666
572	#if EV_MINIMAL < 2	667	#if EV_MINIMAL < 2
573	# define EV_SUSPEND_CB if (expect_false (suspend_cb)) suspend_cb (EV_A)
574	# define EV_RESUME_CB if (expect_false (resume_cb )) resume_cb (EV_A)	668	# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
		669	# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
575	# define EV_INVOKE_PENDING invoke_cb (EV_A)	670	# define EV_INVOKE_PENDING invoke_cb (EV_A)
576	#else	671	#else
577	# define EV_SUSPEND_CB (void)0
578	# define EV_RESUME_CB (void)0	672	# define EV_RELEASE_CB (void)0
		673	# define EV_ACQUIRE_CB (void)0
579	# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)	674	# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
580	#endif	675	#endif
		676
		677	#define EVUNLOOP_RECURSE 0x80
581		678
582	/*****************************************************************************/	679	/*****************************************************************************/
583		680
584	#ifndef EV_HAVE_EV_TIME	681	#ifndef EV_HAVE_EV_TIME
585	ev_tstamp	682	ev_tstamp
…		…
642		739
643	tv.tv_sec = (time_t)delay;	740	tv.tv_sec = (time_t)delay;
644	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	741	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
645		742
646	/* 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 */
647	/* somehting not guaranteed by newer posix versions, but guaranteed */	744	/* something not guaranteed by newer posix versions, but guaranteed */
648	/* by older ones */	745	/* by older ones */
649	select (0, 0, 0, 0, &tv);	746	select (0, 0, 0, 0, &tv);
650	#endif	747	#endif
651	}	748	}
652	}	749	}
…		…
760	}	857	}
761		858
762	/*****************************************************************************/	859	/*****************************************************************************/
763		860
764	inline_speed void	861	inline_speed void
765	fd_event (EV_P_ int fd, int revents)	862	fd_event_nc (EV_P_ int fd, int revents)
766	{	863	{
767	ANFD *anfd = anfds + fd;	864	ANFD *anfd = anfds + fd;
768	ev_io *w;	865	ev_io *w;
769		866
770	for (w = (ev_io )anfd->head; w; w = (ev_io )((WL)w)->next)	867	for (w = (ev_io )anfd->head; w; w = (ev_io )((WL)w)->next)
…		…
774	if (ev)	871	if (ev)
775	ev_feed_event (EV_A_ (W)w, ev);	872	ev_feed_event (EV_A_ (W)w, ev);
776	}	873	}
777	}	874	}
778		875
		876	/* do not submit kernel events for fds that have reify set */
		877	/* because that means they changed while we were polling for new events */
		878	inline_speed void
		879	fd_event (EV_P_ int fd, int revents)
		880	{
		881	ANFD *anfd = anfds + fd;
		882
		883	if (expect_true (!anfd->reify))
		884	fd_event_nc (EV_A_ fd, revents);
		885	}
		886
779	void	887	void
780	ev_feed_fd_event (EV_P_ int fd, int revents)	888	ev_feed_fd_event (EV_P_ int fd, int revents)
781	{	889	{
782	if (fd >= 0 && fd < anfdmax)	890	if (fd >= 0 && fd < anfdmax)
783	fd_event (EV_A_ fd, revents);	891	fd_event_nc (EV_A_ fd, revents);
784	}	892	}
785		893
786	/* make sure the external fd watch events are in-sync */	894	/* make sure the external fd watch events are in-sync */
787	/* with the kernel/libev internal state */	895	/* with the kernel/libev internal state */
788	inline_size void	896	inline_size void
…		…
803		911
804	#if EV_SELECT_IS_WINSOCKET	912	#if EV_SELECT_IS_WINSOCKET
805	if (events)	913	if (events)
806	{	914	{
807	unsigned long arg;	915	unsigned long arg;
808	#ifdef EV_FD_TO_WIN32_HANDLE
809	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);	916	anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
810	#else
811	anfd->handle = _get_osfhandle (fd);
812	#endif
813	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));
814	}	918	}
815	#endif	919	#endif
816		920
817	{	921	{
…		…
888		992
889	for (fd = anfdmax; fd--; )	993	for (fd = anfdmax; fd--; )
890	if (anfds [fd].events)	994	if (anfds [fd].events)
891	{	995	{
892	fd_kill (EV_A_ fd);	996	fd_kill (EV_A_ fd);
893	return;	997	break;
894	}	998	}
895	}	999	}
896		1000
897	/* 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 */
898	static void noinline	1002	static void noinline
…		…
903	for (fd = 0; fd < anfdmax; ++fd)	1007	for (fd = 0; fd < anfdmax; ++fd)
904	if (anfds [fd].events)	1008	if (anfds [fd].events)
905	{	1009	{
906	anfds [fd].events = 0;	1010	anfds [fd].events = 0;
907	anfds [fd].emask = 0;	1011	anfds [fd].emask = 0;
908	fd_change (EV_A_ fd, EV__IOFDSET \| 1);	1012	fd_change (EV_A_ fd, EV__IOFDSET \| EV_ANFD_REIFY);
909	}	1013	}
910	}	1014	}
911		1015
912	/*****************************************************************************/	1016	/*****************************************************************************/
913		1017
…		…
988		1092
989	for (;;)	1093	for (;;)
990	{	1094	{
991	int c = k << 1;	1095	int c = k << 1;
992		1096
993	if (c > N + HEAP0 - 1)	1097	if (c >= N + HEAP0)
994	break;	1098	break;
995		1099
996	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])
997	? 1 : 0;	1101	? 1 : 0;
998		1102
…		…
1034		1138
1035	/* move an element suitably so it is in a correct place */	1139	/* move an element suitably so it is in a correct place */
1036	inline_size void	1140	inline_size void
1037	adjustheap (ANHE *heap, int N, int k)	1141	adjustheap (ANHE *heap, int N, int k)
1038	{	1142	{
1039	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)]))
1040	upheap (heap, k);	1144	upheap (heap, k);
1041	else	1145	else
1042	downheap (heap, N, k);	1146	downheap (heap, N, k);
1043	}	1147	}
1044		1148
…		…
1057	/*****************************************************************************/	1161	/*****************************************************************************/
1058		1162
1059	/* associate signal watchers to a signal signal */	1163	/* associate signal watchers to a signal signal */
1060	typedef struct	1164	typedef struct
1061	{	1165	{
		1166	EV_ATOMIC_T pending;
		1167	#if EV_MULTIPLICITY
		1168	EV_P;
		1169	#endif
1062	WL head;	1170	WL head;
1063	EV_ATOMIC_T gotsig;
1064	} ANSIG;	1171	} ANSIG;
1065		1172
1066	static ANSIG *signals;	1173	static ANSIG signals [EV_NSIG - 1];
1067	static int signalmax;
1068
1069	static EV_ATOMIC_T gotsig;
1070		1174
1071	/*****************************************************************************/	1175	/*****************************************************************************/
1072		1176
1073	/* used to prepare libev internal fd's */	1177	/* used to prepare libev internal fd's */
1074	/* this is not fork-safe */	1178	/* this is not fork-safe */
…		…
1088	evpipe_init (EV_P)	1192	evpipe_init (EV_P)
1089	{	1193	{
1090	if (!ev_is_active (&pipe_w))	1194	if (!ev_is_active (&pipe_w))
1091	{	1195	{
1092	#if EV_USE_EVENTFD	1196	#if EV_USE_EVENTFD
		1197	evfd = eventfd (0, EFD_NONBLOCK \| EFD_CLOEXEC);
		1198	if (evfd < 0 && errno == EINVAL)
1093	if ((evfd = eventfd (0, 0)) >= 0)	1199	evfd = eventfd (0, 0);
		1200
		1201	if (evfd >= 0)
1094	{	1202	{
1095	evpipe [0] = -1;	1203	evpipe [0] = -1;
1096	fd_intern (evfd);	1204	fd_intern (evfd); /* doing it twice doesn't hurt */
1097	ev_io_set (&pipe_w, evfd, EV_READ);	1205	ev_io_set (&pipe_w, evfd, EV_READ);
1098	}	1206	}
1099	else	1207	else
1100	#endif	1208	#endif
1101	{	1209	{
…		…
1138	/* called whenever the libev signal pipe */	1246	/* called whenever the libev signal pipe */
1139	/* got some events (signal, async) */	1247	/* got some events (signal, async) */
1140	static void	1248	static void
1141	pipecb (EV_P_ ev_io *iow, int revents)	1249	pipecb (EV_P_ ev_io *iow, int revents)
1142	{	1250	{
		1251	int i;
		1252
1143	#if EV_USE_EVENTFD	1253	#if EV_USE_EVENTFD
1144	if (evfd >= 0)	1254	if (evfd >= 0)
1145	{	1255	{
1146	uint64_t counter;	1256	uint64_t counter;
1147	read (evfd, &counter, sizeof (uint64_t));	1257	read (evfd, &counter, sizeof (uint64_t));
…		…
1151	{	1261	{
1152	char dummy;	1262	char dummy;
1153	read (evpipe [0], &dummy, 1);	1263	read (evpipe [0], &dummy, 1);
1154	}	1264	}
1155		1265
1156	if (gotsig && ev_is_default_loop (EV_A))	1266	if (sig_pending)
1157	{	1267	{
1158	int signum;	1268	sig_pending = 0;
1159	gotsig = 0;
1160		1269
1161	for (signum = signalmax; signum--; )	1270	for (i = EV_NSIG - 1; i--; )
1162	if (signals [signum].gotsig)	1271	if (expect_false (signals [i].pending))
1163	ev_feed_signal_event (EV_A_ signum + 1);	1272	ev_feed_signal_event (EV_A_ i + 1);
1164	}	1273	}
1165		1274
1166	#if EV_ASYNC_ENABLE	1275	#if EV_ASYNC_ENABLE
1167	if (gotasync)	1276	if (async_pending)
1168	{	1277	{
1169	int i;	1278	async_pending = 0;
1170	gotasync = 0;
1171		1279
1172	for (i = asynccnt; i--; )	1280	for (i = asynccnt; i--; )
1173	if (asyncs [i]->sent)	1281	if (asyncs [i]->sent)
1174	{	1282	{
1175	asyncs [i]->sent = 0;	1283	asyncs [i]->sent = 0;
…		…
1183		1291
1184	static void	1292	static void
1185	ev_sighandler (int signum)	1293	ev_sighandler (int signum)
1186	{	1294	{
1187	#if EV_MULTIPLICITY	1295	#if EV_MULTIPLICITY
1188	struct ev_loop *loop = &default_loop_struct;	1296	EV_P = signals [signum - 1].loop;
1189	#endif	1297	#endif
1190		1298
1191	#if _WIN32	1299	#if _WIN32
1192	signal (signum, ev_sighandler);	1300	signal (signum, ev_sighandler);
1193	#endif	1301	#endif
1194		1302
1195	signals [signum - 1].gotsig = 1;	1303	signals [signum - 1].pending = 1;
1196	evpipe_write (EV_A_ &gotsig);	1304	evpipe_write (EV_A_ &sig_pending);
1197	}	1305	}
1198		1306
1199	void noinline	1307	void noinline
1200	ev_feed_signal_event (EV_P_ int signum)	1308	ev_feed_signal_event (EV_P_ int signum)
1201	{	1309	{
1202	WL w;	1310	WL w;
1203		1311
		1312	if (expect_false (signum <= 0 \|\| signum > EV_NSIG))
		1313	return;
		1314
		1315	--signum;
		1316
1204	#if EV_MULTIPLICITY	1317	#if EV_MULTIPLICITY
1205	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 */
1206	#endif	1319	/* or, likely more useful, feeding a signal nobody is waiting for */
1207		1320
1208	--signum;	1321	if (expect_false (signals [signum].loop != EV_A))
1209
1210	if (signum < 0 \|\| signum >= signalmax)
1211	return;	1322	return;
		1323	#endif
1212		1324
1213	signals [signum].gotsig = 0;	1325	signals [signum].pending = 0;
1214		1326
1215	for (w = signals [signum].head; w; w = w->next)	1327	for (w = signals [signum].head; w; w = w->next)
1216	ev_feed_event (EV_A_ (W)w, EV_SIGNAL);	1328	ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
1217	}	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
1218		1350
1219	/*****************************************************************************/	1351	/*****************************************************************************/
1220		1352
1221	static WL childs [EV_PID_HASHSIZE];	1353	static WL childs [EV_PID_HASHSIZE];
1222		1354
…		…
1409	void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))	1541	void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1410	{	1542	{
1411	invoke_cb = invoke_pending_cb;	1543	invoke_cb = invoke_pending_cb;
1412	}	1544	}
1413		1545
1414	void ev_set_blocking_cb (EV_P_ void (suspend_cb_)(EV_P), void (resume_cb_)(EV_P))	1546	void ev_set_loop_release_cb (EV_P_ void (release)(EV_P), void (acquire)(EV_P))
1415	{	1547	{
1416	suspend_cb = suspend_cb_;	1548	release_cb = release;
1417	resume_cb = resume_cb_;	1549	acquire_cb = acquire;
1418	}	1550	}
1419	#endif	1551	#endif
1420		1552
1421	/* initialise a loop structure, must be zero-initialised */	1553	/* initialise a loop structure, must be zero-initialised */
1422	static void noinline	1554	static void noinline
…		…
1441		1573
1442	if (!clock_gettime (CLOCK_MONOTONIC, &ts))	1574	if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1443	have_monotonic = 1;	1575	have_monotonic = 1;
1444	}	1576	}
1445	#endif	1577	#endif
		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"));
1446		1589
1447	ev_rt_now = ev_time ();	1590	ev_rt_now = ev_time ();
1448	mn_now = get_clock ();	1591	mn_now = get_clock ();
1449	now_floor = mn_now;	1592	now_floor = mn_now;
1450	rtmn_diff = ev_rt_now - mn_now;	1593	rtmn_diff = ev_rt_now - mn_now;
…		…
1454		1597
1455	io_blocktime = 0.;	1598	io_blocktime = 0.;
1456	timeout_blocktime = 0.;	1599	timeout_blocktime = 0.;
1457	backend = 0;	1600	backend = 0;
1458	backend_fd = -1;	1601	backend_fd = -1;
1459	gotasync = 0;	1602	sig_pending = 0;
		1603	#if EV_ASYNC_ENABLE
		1604	async_pending = 0;
		1605	#endif
1460	#if EV_USE_INOTIFY	1606	#if EV_USE_INOTIFY
1461	fs_fd = -2;	1607	fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1462	#endif	1608	#endif
1463		1609	#if EV_USE_SIGNALFD
1464	/* pid check not overridable via env */	1610	sigfd = flags & EVFLAG_NOSIGFD ? -1 : -2;
1465	#ifndef _WIN32
1466	if (flags & EVFLAG_FORKCHECK)
1467	curpid = getpid ();
1468	#endif	1611	#endif
1469
1470	if (!(flags & EVFLAG_NOENV)
1471	&& !enable_secure ()
1472	&& getenv ("LIBEV_FLAGS"))
1473	flags = atoi (getenv ("LIBEV_FLAGS"));
1474		1612
1475	if (!(flags & 0x0000ffffU))	1613	if (!(flags & 0x0000ffffU))
1476	flags \|= ev_recommended_backends ();	1614	flags \|= ev_recommended_backends ();
1477		1615
1478	#if EV_USE_PORT	1616	#if EV_USE_PORT
…		…
1504	{	1642	{
1505	int i;	1643	int i;
1506		1644
1507	if (ev_is_active (&pipe_w))	1645	if (ev_is_active (&pipe_w))
1508	{	1646	{
1509	ev_ref (EV_A); /* signal watcher */	1647	/ev_ref (EV_A);/
1510	ev_io_stop (EV_A_ &pipe_w);	1648	/ev_io_stop (EV_A_ &pipe_w);/
1511		1649
1512	#if EV_USE_EVENTFD	1650	#if EV_USE_EVENTFD
1513	if (evfd >= 0)	1651	if (evfd >= 0)
1514	close (evfd);	1652	close (evfd);
1515	#endif	1653	#endif
1516		1654
1517	if (evpipe [0] >= 0)	1655	if (evpipe [0] >= 0)
1518	{	1656	{
1519	close (evpipe [0]);	1657	EV_WIN32_CLOSE_FD (evpipe [0]);
1520	close (evpipe [1]);	1658	EV_WIN32_CLOSE_FD (evpipe [1]);
1521	}	1659	}
1522	}	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
1523		1671
1524	#if EV_USE_INOTIFY	1672	#if EV_USE_INOTIFY
1525	if (fs_fd >= 0)	1673	if (fs_fd >= 0)
1526	close (fs_fd);	1674	close (fs_fd);
1527	#endif	1675	#endif
…		…
1551	#if EV_IDLE_ENABLE	1699	#if EV_IDLE_ENABLE
1552	array_free (idle, [i]);	1700	array_free (idle, [i]);
1553	#endif	1701	#endif
1554	}	1702	}
1555		1703
1556	ev_free (anfds); anfdmax = 0;	1704	ev_free (anfds); anfds = 0; anfdmax = 0;
1557		1705
1558	/* have to use the microsoft-never-gets-it-right macro */	1706	/* have to use the microsoft-never-gets-it-right macro */
1559	array_free (rfeed, EMPTY);	1707	array_free (rfeed, EMPTY);
1560	array_free (fdchange, EMPTY);	1708	array_free (fdchange, EMPTY);
1561	array_free (timer, EMPTY);	1709	array_free (timer, EMPTY);
…		…
1596		1744
1597	if (ev_is_active (&pipe_w))	1745	if (ev_is_active (&pipe_w))
1598	{	1746	{
1599	/* this "locks" the handlers against writing to the pipe */	1747	/* this "locks" the handlers against writing to the pipe */
1600	/* while we modify the fd vars */	1748	/* while we modify the fd vars */
1601	gotsig = 1;	1749	sig_pending = 1;
1602	#if EV_ASYNC_ENABLE	1750	#if EV_ASYNC_ENABLE
1603	gotasync = 1;	1751	async_pending = 1;
1604	#endif	1752	#endif
1605		1753
1606	ev_ref (EV_A);	1754	ev_ref (EV_A);
1607	ev_io_stop (EV_A_ &pipe_w);	1755	ev_io_stop (EV_A_ &pipe_w);
1608		1756
…		…
1611	close (evfd);	1759	close (evfd);
1612	#endif	1760	#endif
1613		1761
1614	if (evpipe [0] >= 0)	1762	if (evpipe [0] >= 0)
1615	{	1763	{
1616	close (evpipe [0]);	1764	EV_WIN32_CLOSE_FD (evpipe [0]);
1617	close (evpipe [1]);	1765	EV_WIN32_CLOSE_FD (evpipe [1]);
1618	}	1766	}
1619		1767
1620	evpipe_init (EV_A);	1768	evpipe_init (EV_A);
1621	/* now iterate over everything, in case we missed something */	1769	/* now iterate over everything, in case we missed something */
1622	pipecb (EV_A_ &pipe_w, EV_READ);	1770	pipecb (EV_A_ &pipe_w, EV_READ);
…		…
1628	#if EV_MULTIPLICITY	1776	#if EV_MULTIPLICITY
1629		1777
1630	struct ev_loop *	1778	struct ev_loop *
1631	ev_loop_new (unsigned int flags)	1779	ev_loop_new (unsigned int flags)
1632	{	1780	{
1633	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));
1634		1782
1635	memset (loop, 0, sizeof (struct ev_loop));	1783	memset (EV_A, 0, sizeof (struct ev_loop));
1636
1637	loop_init (EV_A_ flags);	1784	loop_init (EV_A_ flags);
1638		1785
1639	if (ev_backend (EV_A))	1786	if (ev_backend (EV_A))
1640	return loop;	1787	return EV_A;
1641		1788
1642	return 0;	1789	return 0;
1643	}	1790	}
1644		1791
1645	void	1792	void
…		…
1749	assert (checkmax >= checkcnt);	1896	assert (checkmax >= checkcnt);
1750	array_verify (EV_A_ (W *)checks, checkcnt);	1897	array_verify (EV_A_ (W *)checks, checkcnt);
1751		1898
1752	# if 0	1899	# if 0
1753	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)
1754	for (signum = signalmax; signum--; ) if (signals [signum].gotsig)	1901	for (signum = EV_NSIG; signum--; ) if (signals [signum].pending)
1755	# endif	1902	# endif
1756	#endif	1903	#endif
1757	}	1904	}
1758	#endif	1905	#endif
1759		1906
…		…
1766	#endif	1913	#endif
1767	{	1914	{
1768	if (!ev_default_loop_ptr)	1915	if (!ev_default_loop_ptr)
1769	{	1916	{
1770	#if EV_MULTIPLICITY	1917	#if EV_MULTIPLICITY
1771	struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;	1918	EV_P = ev_default_loop_ptr = &default_loop_struct;
1772	#else	1919	#else
1773	ev_default_loop_ptr = 1;	1920	ev_default_loop_ptr = 1;
1774	#endif	1921	#endif
1775		1922
1776	loop_init (EV_A_ flags);	1923	loop_init (EV_A_ flags);
…		…
1793		1940
1794	void	1941	void
1795	ev_default_destroy (void)	1942	ev_default_destroy (void)
1796	{	1943	{
1797	#if EV_MULTIPLICITY	1944	#if EV_MULTIPLICITY
1798	struct ev_loop *loop = ev_default_loop_ptr;	1945	EV_P = ev_default_loop_ptr;
1799	#endif	1946	#endif
1800		1947
1801	ev_default_loop_ptr = 0;	1948	ev_default_loop_ptr = 0;
1802		1949
1803	#ifndef _WIN32	1950	#ifndef _WIN32
…		…
1810		1957
1811	void	1958	void
1812	ev_default_fork (void)	1959	ev_default_fork (void)
1813	{	1960	{
1814	#if EV_MULTIPLICITY	1961	#if EV_MULTIPLICITY
1815	struct ev_loop *loop = ev_default_loop_ptr;	1962	EV_P = ev_default_loop_ptr;
1816	#endif	1963	#endif
1817		1964
1818	postfork = 1; /* must be in line with ev_loop_fork */	1965	postfork = 1; /* must be in line with ev_loop_fork */
1819	}	1966	}
1820		1967
…		…
1822		1969
1823	void	1970	void
1824	ev_invoke (EV_P_ void *w, int revents)	1971	ev_invoke (EV_P_ void *w, int revents)
1825	{	1972	{
1826	EV_CB_INVOKE ((W)w, revents);	1973	EV_CB_INVOKE ((W)w, revents);
		1974	}
		1975
		1976	unsigned int
		1977	ev_pending_count (EV_P)
		1978	{
		1979	int pri;
		1980	unsigned int count = 0;
		1981
		1982	for (pri = NUMPRI; pri--; )
		1983	count += pendingcnt [pri];
		1984
		1985	return count;
1827	}	1986	}
1828		1987
1829	void noinline	1988	void noinline
1830	ev_invoke_pending (EV_P)	1989	ev_invoke_pending (EV_P)
1831	{	1990	{
…		…
2077	{	2236	{
2078	#if EV_MINIMAL < 2	2237	#if EV_MINIMAL < 2
2079	++loop_depth;	2238	++loop_depth;
2080	#endif	2239	#endif
2081		2240
		2241	assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
		2242
2082	loop_done = EVUNLOOP_CANCEL;	2243	loop_done = EVUNLOOP_CANCEL;
2083		2244
2084	EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */	2245	EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
2085		2246
2086	do	2247	do
…		…
2113	{	2274	{
2114	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);	2275	queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
2115	EV_INVOKE_PENDING;	2276	EV_INVOKE_PENDING;
2116	}	2277	}
2117		2278
		2279	if (expect_false (loop_done))
		2280	break;
		2281
2118	/* we might have forked, so reify kernel state if necessary */	2282	/* we might have forked, so reify kernel state if necessary */
2119	if (expect_false (postfork))	2283	if (expect_false (postfork))
2120	loop_fork (EV_A);	2284	loop_fork (EV_A);
2121		2285
2122	/* update fd-related kernel structures */	2286	/* update fd-related kernel structures */
…		…
2172	}	2336	}
2173		2337
2174	#if EV_MINIMAL < 2	2338	#if EV_MINIMAL < 2
2175	++loop_count;	2339	++loop_count;
2176	#endif	2340	#endif
		2341	assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
2177	backend_poll (EV_A_ waittime);	2342	backend_poll (EV_A_ waittime);
		2343	assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
2178		2344
2179	/* update ev_rt_now, do magic */	2345	/* update ev_rt_now, do magic */
2180	time_update (EV_A_ waittime + sleeptime);	2346	time_update (EV_A_ waittime + sleeptime);
2181	}	2347	}
2182		2348
…		…
2267	inline_size void	2433	inline_size void
2268	wlist_del (WL *head, WL elem)	2434	wlist_del (WL *head, WL elem)
2269	{	2435	{
2270	while (*head)	2436	while (*head)
2271	{	2437	{
2272	if (*head == elem)	2438	if (expect_true (*head == elem))
2273	{	2439	{
2274	*head = elem->next;	2440	*head = elem->next;
2275	return;	2441	break;
2276	}	2442	}
2277		2443
2278	head = &(*head)->next;	2444	head = &(*head)->next;
2279	}	2445	}
2280	}	2446	}
…		…
2348		2514
2349	ev_start (EV_A_ (W)w, 1);	2515	ev_start (EV_A_ (W)w, 1);
2350	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);	2516	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2351	wlist_add (&anfds[fd].head, (WL)w);	2517	wlist_add (&anfds[fd].head, (WL)w);
2352		2518
2353	fd_change (EV_A_ fd, w->events & EV__IOFDSET \| 1);	2519	fd_change (EV_A_ fd, w->events & EV__IOFDSET \| EV_ANFD_REIFY);
2354	w->events &= ~EV__IOFDSET;	2520	w->events &= ~EV__IOFDSET;
2355		2521
2356	EV_FREQUENT_CHECK;	2522	EV_FREQUENT_CHECK;
2357	}	2523	}
2358		2524
…		…
2452	}	2618	}
2453		2619
2454	EV_FREQUENT_CHECK;	2620	EV_FREQUENT_CHECK;
2455	}	2621	}
2456		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
2457	#if EV_PERIODIC_ENABLE	2629	#if EV_PERIODIC_ENABLE
2458	void noinline	2630	void noinline
2459	ev_periodic_start (EV_P_ ev_periodic *w)	2631	ev_periodic_start (EV_P_ ev_periodic *w)
2460	{	2632	{
2461	if (expect_false (ev_is_active (w)))	2633	if (expect_false (ev_is_active (w)))
…		…
2528	#endif	2700	#endif
2529		2701
2530	void noinline	2702	void noinline
2531	ev_signal_start (EV_P_ ev_signal *w)	2703	ev_signal_start (EV_P_ ev_signal *w)
2532	{	2704	{
2533	#if EV_MULTIPLICITY
2534	assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2535	#endif
2536	if (expect_false (ev_is_active (w)))	2705	if (expect_false (ev_is_active (w)))
2537	return;	2706	return;
2538		2707
2539	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));
2540		2709
2541	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));
2542		2713
2543	EV_FREQUENT_CHECK;	2714	signals [w->signum - 1].loop = EV_A;
		2715	#endif
2544		2716
		2717	EV_FREQUENT_CHECK;
		2718
		2719	#if EV_USE_SIGNALFD
		2720	if (sigfd == -2)
2545	{	2721	{
2546	#ifndef _WIN32	2722	sigfd = signalfd (-1, &sigfd_set, SFD_NONBLOCK \| SFD_CLOEXEC);
2547	sigset_t full, prev;	2723	if (sigfd < 0 && errno == EINVAL)
2548	sigfillset (&full);	2724	sigfd = signalfd (-1, &sigfd_set, 0); /* retry without flags */
2549	sigprocmask (SIG_SETMASK, &full, &prev);
2550	#endif
2551		2725
2552	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 */
2553		2729
2554	#ifndef _WIN32	2730	sigemptyset (&sigfd_set);
2555	sigprocmask (SIG_SETMASK, &prev, 0);	2731
2556	#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	}
2557	}	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
2558		2748
2559	ev_start (EV_A_ (W)w, 1);	2749	ev_start (EV_A_ (W)w, 1);
2560	wlist_add (&signals [w->signum - 1].head, (WL)w);	2750	wlist_add (&signals [w->signum - 1].head, (WL)w);
2561		2751
2562	if (!((WL)w)->next)	2752	if (!((WL)w)->next)
		2753	# if EV_USE_SIGNALFD
		2754	if (sigfd < 0) /TODO/
		2755	# endif
2563	{	2756	{
2564	#if _WIN32	2757	# if _WIN32
2565	signal (w->signum, ev_sighandler);	2758	signal (w->signum, ev_sighandler);
2566	#else	2759	# else
2567	struct sigaction sa;	2760	struct sigaction sa;
		2761
		2762	evpipe_init (EV_A);
		2763
2568	sa.sa_handler = ev_sighandler;	2764	sa.sa_handler = ev_sighandler;
2569	sigfillset (&sa.sa_mask);	2765	sigfillset (&sa.sa_mask);
2570	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 */
2571	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);
2572	#endif	2772	#endif
2573	}	2773	}
2574		2774
2575	EV_FREQUENT_CHECK;	2775	EV_FREQUENT_CHECK;
2576	}	2776	}
2577		2777
2578	void noinline	2778	void noinline
…		…
2586		2786
2587	wlist_del (&signals [w->signum - 1].head, (WL)w);	2787	wlist_del (&signals [w->signum - 1].head, (WL)w);
2588	ev_stop (EV_A_ (W)w);	2788	ev_stop (EV_A_ (W)w);
2589		2789
2590	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
2591	signal (w->signum, SIG_DFL);	2806	signal (w->signum, SIG_DFL);
		2807	}
2592		2808
2593	EV_FREQUENT_CHECK;	2809	EV_FREQUENT_CHECK;
2594	}	2810	}
2595		2811
2596	void	2812	void
…		…
2676	}	2892	}
2677	}	2893	}
2678		2894
2679	if (w->wd >= 0)	2895	if (w->wd >= 0)
2680	{	2896	{
		2897	struct statfs sfs;
		2898
2681	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);
2682		2900
2683	/* 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 */
2684	/* 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 */
2685	/* also do poll on <2.6.25, but with normal frequency */	2903	/* also do poll on <2.6.25, but with normal frequency */
2686	struct statfs sfs;
2687		2904
2688	if (fs_2625 && !statfs (w->path, &sfs))	2905	if (fs_2625 && !statfs (w->path, &sfs))
2689	if (sfs.f_type == 0x1373 /* devfs */	2906	if (sfs.f_type == 0x1373 /* devfs */
2690	\|\| sfs.f_type == 0xEF53 /* ext2/3 */	2907	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
2691	\|\| sfs.f_type == 0x3153464a /* jfs */	2908	\|\| sfs.f_type == 0x3153464a /* jfs */
…		…
2780	return;	2997	return;
2781		2998
2782	fs_2625 = 1;	2999	fs_2625 = 1;
2783	}	3000	}
2784		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
2785	inline_size void	3013	inline_size void
2786	infy_init (EV_P)	3014	infy_init (EV_P)
2787	{	3015	{
2788	if (fs_fd != -2)	3016	if (fs_fd != -2)
2789	return;	3017	return;
2790		3018
2791	fs_fd = -1;	3019	fs_fd = -1;
2792		3020
2793	check_2625 (EV_A);	3021	check_2625 (EV_A);
2794		3022
2795	fs_fd = inotify_init ();	3023	fs_fd = infy_newfd ();
2796		3024
2797	if (fs_fd >= 0)	3025	if (fs_fd >= 0)
2798	{	3026	{
		3027	fd_intern (fs_fd);
2799	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);	3028	ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
2800	ev_set_priority (&fs_w, EV_MAXPRI);	3029	ev_set_priority (&fs_w, EV_MAXPRI);
2801	ev_io_start (EV_A_ &fs_w);	3030	ev_io_start (EV_A_ &fs_w);
2802	}	3031	}
2803	}	3032	}
…		…
2808	int slot;	3037	int slot;
2809		3038
2810	if (fs_fd < 0)	3039	if (fs_fd < 0)
2811	return;	3040	return;
2812		3041
		3042	ev_io_stop (EV_A_ &fs_w);
2813	close (fs_fd);	3043	close (fs_fd);
2814	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	}
2815		3052
2816	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	3053	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2817	{	3054	{
2818	WL w_ = fs_hash [slot].head;	3055	WL w_ = fs_hash [slot].head;
2819	fs_hash [slot].head = 0;	3056	fs_hash [slot].head = 0;
…		…
3076	embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)	3313	embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
3077	{	3314	{
3078	ev_embed w = (ev_embed )(((char *)prepare) - offsetof (ev_embed, prepare));	3315	ev_embed w = (ev_embed )(((char *)prepare) - offsetof (ev_embed, prepare));
3079		3316
3080	{	3317	{
3081	struct ev_loop *loop = w->other;	3318	EV_P = w->other;
3082		3319
3083	while (fdchangecnt)	3320	while (fdchangecnt)
3084	{	3321	{
3085	fd_reify (EV_A);	3322	fd_reify (EV_A);
3086	ev_loop (EV_A_ EVLOOP_NONBLOCK);	3323	ev_loop (EV_A_ EVLOOP_NONBLOCK);
…		…
3094	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));
3095		3332
3096	ev_embed_stop (EV_A_ w);	3333	ev_embed_stop (EV_A_ w);
3097		3334
3098	{	3335	{
3099	struct ev_loop *loop = w->other;	3336	EV_P = w->other;
3100		3337
3101	ev_loop_fork (EV_A);	3338	ev_loop_fork (EV_A);
3102	ev_loop (EV_A_ EVLOOP_NONBLOCK);	3339	ev_loop (EV_A_ EVLOOP_NONBLOCK);
3103	}	3340	}
3104		3341
…		…
3118	{	3355	{
3119	if (expect_false (ev_is_active (w)))	3356	if (expect_false (ev_is_active (w)))
3120	return;	3357	return;
3121		3358
3122	{	3359	{
3123	struct ev_loop *loop = w->other;	3360	EV_P = w->other;
3124	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 ()));
3125	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);
3126	}	3363	}
3127		3364
3128	EV_FREQUENT_CHECK;	3365	EV_FREQUENT_CHECK;
…		…
3240		3477
3241	void	3478	void
3242	ev_async_send (EV_P_ ev_async *w)	3479	ev_async_send (EV_P_ ev_async *w)
3243	{	3480	{
3244	w->sent = 1;	3481	w->sent = 1;
3245	evpipe_write (EV_A_ &gotasync);	3482	evpipe_write (EV_A_ &async_pending);
3246	}	3483	}
3247	#endif	3484	#endif
3248		3485
3249	/*****************************************************************************/	3486	/*****************************************************************************/
3250		3487
…		…
3399	if (types & EV_CHECK)	3636	if (types & EV_CHECK)
3400	for (i = checkcnt; i--; )	3637	for (i = checkcnt; i--; )
3401	cb (EV_A_ EV_CHECK, checks [i]);	3638	cb (EV_A_ EV_CHECK, checks [i]);
3402		3639
3403	if (types & EV_SIGNAL)	3640	if (types & EV_SIGNAL)
3404	for (i = 0; i < signalmax; ++i)	3641	for (i = 0; i < EV_NSIG - 1; ++i)
3405	for (wl = signals [i].head; wl; )	3642	for (wl = signals [i].head; wl; )
3406	{	3643	{
3407	wn = wl->next;	3644	wn = wl->next;
3408	cb (EV_A_ EV_SIGNAL, wl);	3645	cb (EV_A_ EV_SIGNAL, wl);
3409	wl = wn;	3646	wl = wn;

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.297 by root, Fri Jul 10 00:36: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.297 by root, Fri Jul 10 00:36:21 2009 UTC vs.
Revision 1.315 by root, Wed Aug 26 17:46:22 2009 UTC