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

Comparing libev/ev.c (file contents):
Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC vs.
Revision 1.313 by root, Wed Aug 19 23:44:51 2009 UTC

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

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC vs. Revision 1.313 by root, Wed Aug 19 23:44:51 2009 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC vs.
Revision 1.313 by root, Wed Aug 19 23:44:51 2009 UTC