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

Comparing libev/ev.c (file contents):
Revision 1.255 by root, Mon Jun 9 14:11:30 2008 UTC vs.
Revision 1.277 by root, Sun Dec 14 21:58:08 2008 UTC

…		…
47	# include EV_CONFIG_H	47	# include EV_CONFIG_H
48	# else	48	# else
49	# include "config.h"	49	# include "config.h"
50	# endif	50	# endif
51		51
		52	# if HAVE_CLOCK_SYSCALL
		53	# ifndef EV_USE_CLOCK_SYSCALL
		54	# define EV_USE_CLOCK_SYSCALL 1
		55	# ifndef EV_USE_REALTIME
		56	# define EV_USE_REALTIME 0
		57	# endif
		58	# ifndef EV_USE_MONOTONIC
		59	# define EV_USE_MONOTONIC 1
		60	# endif
		61	# endif
		62	# endif
		63
52	# if HAVE_CLOCK_GETTIME	64	# if HAVE_CLOCK_GETTIME
53	# ifndef EV_USE_MONOTONIC	65	# ifndef EV_USE_MONOTONIC
54	# define EV_USE_MONOTONIC 1	66	# define EV_USE_MONOTONIC 1
55	# endif	67	# endif
56	# ifndef EV_USE_REALTIME	68	# ifndef EV_USE_REALTIME
…		…
154	#ifndef _WIN32	166	#ifndef _WIN32
155	# include <sys/time.h>	167	# include <sys/time.h>
156	# include <sys/wait.h>	168	# include <sys/wait.h>
157	# include <unistd.h>	169	# include <unistd.h>
158	#else	170	#else
		171	# include <io.h>
159	# define WIN32_LEAN_AND_MEAN	172	# define WIN32_LEAN_AND_MEAN
160	# include <windows.h>	173	# include <windows.h>
161	# ifndef EV_SELECT_IS_WINSOCKET	174	# ifndef EV_SELECT_IS_WINSOCKET
162	# define EV_SELECT_IS_WINSOCKET 1	175	# define EV_SELECT_IS_WINSOCKET 1
163	# endif	176	# endif
164	#endif	177	#endif
165		178
166	/* this block tries to deduce configuration from header-defined symbols and defaults */	179	/* this block tries to deduce configuration from header-defined symbols and defaults */
		180
		181	#ifndef EV_USE_CLOCK_SYSCALL
		182	# if __linux && __GLIBC__ >= 2
		183	# define EV_USE_CLOCK_SYSCALL 1
		184	# else
		185	# define EV_USE_CLOCK_SYSCALL 0
		186	# endif
		187	#endif
167		188
168	#ifndef EV_USE_MONOTONIC	189	#ifndef EV_USE_MONOTONIC
169	# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0	190	# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
170	# define EV_USE_MONOTONIC 1	191	# define EV_USE_MONOTONIC 1
171	# else	192	# else
…		…
285	# include <sys/select.h>	306	# include <sys/select.h>
286	# endif	307	# endif
287	#endif	308	#endif
288		309
289	#if EV_USE_INOTIFY	310	#if EV_USE_INOTIFY
		311	# include <sys/utsname.h>
		312	# include <sys/statfs.h>
290	# include <sys/inotify.h>	313	# include <sys/inotify.h>
		314	/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
		315	# ifndef IN_DONT_FOLLOW
		316	# undef EV_USE_INOTIFY
		317	# define EV_USE_INOTIFY 0
		318	# endif
291	#endif	319	#endif
292		320
293	#if EV_SELECT_IS_WINSOCKET	321	#if EV_SELECT_IS_WINSOCKET
294	# include <winsock.h>	322	# include <winsock.h>
		323	#endif
		324
		325	/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
		326	/* which makes programs even slower. might work on other unices, too. */
		327	#if EV_USE_CLOCK_SYSCALL
		328	# include <syscall.h>
		329	# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
		330	# undef EV_USE_MONOTONIC
		331	# define EV_USE_MONOTONIC 1
295	#endif	332	#endif
296		333
297	#if EV_USE_EVENTFD	334	#if EV_USE_EVENTFD
298	/* our minimum requirement is glibc 2.7 which has the stub, but not the header */	335	/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
299	# include <stdint.h>	336	# include <stdint.h>
…		…
381	{	418	{
382	syserr_cb = cb;	419	syserr_cb = cb;
383	}	420	}
384		421
385	static void noinline	422	static void noinline
386	syserr (const char *msg)	423	ev_syserr (const char *msg)
387	{	424	{
388	if (!msg)	425	if (!msg)
389	msg = "(libev) system error";	426	msg = "(libev) system error";
390		427
391	if (syserr_cb)	428	if (syserr_cb)
…		…
442	typedef struct	479	typedef struct
443	{	480	{
444	WL head;	481	WL head;
445	unsigned char events;	482	unsigned char events;
446	unsigned char reify;	483	unsigned char reify;
		484	unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
		485	unsigned char unused;
		486	#if EV_USE_EPOLL
		487	unsigned int egen; /* generation counter to counter epoll bugs */
		488	#endif
447	#if EV_SELECT_IS_WINSOCKET	489	#if EV_SELECT_IS_WINSOCKET
448	SOCKET handle;	490	SOCKET handle;
449	#endif	491	#endif
450	} ANFD;	492	} ANFD;
451		493
…		…
564	struct timeval tv;	606	struct timeval tv;
565		607
566	tv.tv_sec = (time_t)delay;	608	tv.tv_sec = (time_t)delay;
567	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	609	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568		610
		611	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
		612	/* somehting nto guaranteed by newer posix versions, but guaranteed */
		613	/* by older ones */
569	select (0, 0, 0, 0, &tv);	614	select (0, 0, 0, 0, &tv);
570	#endif	615	#endif
571	}	616	}
572	}	617	}
573		618
…		…
600	array_realloc (int elem, void base, int cur, int cnt)	645	array_realloc (int elem, void base, int cur, int cnt)
601	{	646	{
602	cur = array_nextsize (elem, cur, cnt);	647	cur = array_nextsize (elem, cur, cnt);
603	return ev_realloc (base, elem * *cur);	648	return ev_realloc (base, elem * *cur);
604	}	649	}
		650
		651	#define array_init_zero(base,count) \
		652	memset ((void )(base), 0, sizeof ((base)) * (count))
605		653
606	#define array_needsize(type,base,cur,cnt,init) \	654	#define array_needsize(type,base,cur,cnt,init) \
607	if (expect_false ((cnt) > (cur))) \	655	if (expect_false ((cnt) > (cur))) \
608	{ \	656	{ \
609	int ocur_ = (cur); \	657	int ocur_ = (cur); \
…		…
652	for (i = 0; i < eventcnt; ++i)	700	for (i = 0; i < eventcnt; ++i)
653	ev_feed_event (EV_A_ events [i], type);	701	ev_feed_event (EV_A_ events [i], type);
654	}	702	}
655		703
656	/*****************************************************************************/	704	/*****************************************************************************/
657
658	void inline_size
659	anfds_init (ANFD *base, int count)
660	{
661	while (count--)
662	{
663	base->head = 0;
664	base->events = EV_NONE;
665	base->reify = 0;
666
667	++base;
668	}
669	}
670		705
671	void inline_speed	706	void inline_speed
672	fd_event (EV_P_ int fd, int revents)	707	fd_event (EV_P_ int fd, int revents)
673	{	708	{
674	ANFD *anfd = anfds + fd;	709	ANFD *anfd = anfds + fd;
…		…
804		839
805	for (fd = 0; fd < anfdmax; ++fd)	840	for (fd = 0; fd < anfdmax; ++fd)
806	if (anfds [fd].events)	841	if (anfds [fd].events)
807	{	842	{
808	anfds [fd].events = 0;	843	anfds [fd].events = 0;
		844	anfds [fd].emask = 0;
809	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	845	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
810	}	846	}
811	}	847	}
812		848
813	/*****************************************************************************/	849	/*****************************************************************************/
…		…
965	static ANSIG *signals;	1001	static ANSIG *signals;
966	static int signalmax;	1002	static int signalmax;
967		1003
968	static EV_ATOMIC_T gotsig;	1004	static EV_ATOMIC_T gotsig;
969		1005
970	void inline_size
971	signals_init (ANSIG *base, int count)
972	{
973	while (count--)
974	{
975	base->head = 0;
976	base->gotsig = 0;
977
978	++base;
979	}
980	}
981
982	/*****************************************************************************/	1006	/*****************************************************************************/
983		1007
984	void inline_speed	1008	void inline_speed
985	fd_intern (int fd)	1009	fd_intern (int fd)
986	{	1010	{
…		…
1007	}	1031	}
1008	else	1032	else
1009	#endif	1033	#endif
1010	{	1034	{
1011	while (pipe (evpipe))	1035	while (pipe (evpipe))
1012	syserr ("(libev) error creating signal/async pipe");	1036	ev_syserr ("(libev) error creating signal/async pipe");
1013		1037
1014	fd_intern (evpipe [0]);	1038	fd_intern (evpipe [0]);
1015	fd_intern (evpipe [1]);	1039	fd_intern (evpipe [1]);
1016	ev_io_set (&pipeev, evpipe [0], EV_READ);	1040	ev_io_set (&pipeev, evpipe [0], EV_READ);
1017	}	1041	}
…		…
1246	/* kqueue is borked on everything but netbsd apparently */	1270	/* kqueue is borked on everything but netbsd apparently */
1247	/* it usually doesn't work correctly on anything but sockets and pipes */	1271	/* it usually doesn't work correctly on anything but sockets and pipes */
1248	flags &= ~EVBACKEND_KQUEUE;	1272	flags &= ~EVBACKEND_KQUEUE;
1249	#endif	1273	#endif
1250	#ifdef __APPLE__	1274	#ifdef __APPLE__
1251	// flags &= ~EVBACKEND_KQUEUE; for documentation	1275	// flags &= ~EVBACKEND_KQUEUE & ~EVBACKEND_POLL; for documentation
1252	flags &= ~EVBACKEND_POLL;	1276	flags &= ~EVBACKEND_SELECT;
1253	#endif	1277	#endif
1254		1278
1255	return flags;	1279	return flags;
1256	}	1280	}
1257		1281
…		…
1507	{	1531	{
1508	postfork = 1; /* must be in line with ev_default_fork */	1532	postfork = 1; /* must be in line with ev_default_fork */
1509	}	1533	}
1510		1534
1511	#if EV_VERIFY	1535	#if EV_VERIFY
1512	void noinline	1536	static void noinline
1513	verify_watcher (EV_P_ W w)	1537	verify_watcher (EV_P_ W w)
1514	{	1538	{
1515	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1539	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516		1540
1517	if (w->pending)	1541	if (w->pending)
…		…
1648	{	1672	{
1649	#if EV_MULTIPLICITY	1673	#if EV_MULTIPLICITY
1650	struct ev_loop *loop = ev_default_loop_ptr;	1674	struct ev_loop *loop = ev_default_loop_ptr;
1651	#endif	1675	#endif
1652		1676
		1677	ev_default_loop_ptr = 0;
		1678
1653	#ifndef _WIN32	1679	#ifndef _WIN32
1654	ev_ref (EV_A); /* child watcher */	1680	ev_ref (EV_A); /* child watcher */
1655	ev_signal_stop (EV_A_ &childev);	1681	ev_signal_stop (EV_A_ &childev);
1656	#endif	1682	#endif
1657		1683
…		…
1663	{	1689	{
1664	#if EV_MULTIPLICITY	1690	#if EV_MULTIPLICITY
1665	struct ev_loop *loop = ev_default_loop_ptr;	1691	struct ev_loop *loop = ev_default_loop_ptr;
1666	#endif	1692	#endif
1667		1693
1668	if (backend)
1669	postfork = 1; /* must be in line with ev_loop_fork */	1694	postfork = 1; /* must be in line with ev_loop_fork */
1670	}	1695	}
1671		1696
1672	/*****************************************************************************/	1697	/*****************************************************************************/
1673		1698
1674	void	1699	void
…		…
1905	ev_unref (EV_P)	1930	ev_unref (EV_P)
1906	{	1931	{
1907	--activecnt;	1932	--activecnt;
1908	}	1933	}
1909		1934
		1935	void
		1936	ev_now_update (EV_P)
		1937	{
		1938	time_update (EV_A_ 1e100);
		1939	}
		1940
1910	static int loop_done;	1941	static int loop_done;
1911		1942
1912	void	1943	void
1913	ev_loop (EV_P_ int flags)	1944	ev_loop (EV_P_ int flags)
1914	{	1945	{
…		…
2123		2154
2124	if (expect_false (ev_is_active (w)))	2155	if (expect_false (ev_is_active (w)))
2125	return;	2156	return;
2126		2157
2127	assert (("ev_io_start called with negative fd", fd >= 0));	2158	assert (("ev_io_start called with negative fd", fd >= 0));
		2159	assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET \| EV_READ \| EV_WRITE))));
2128		2160
2129	EV_FREQUENT_CHECK;	2161	EV_FREQUENT_CHECK;
2130		2162
2131	ev_start (EV_A_ (W)w, 1);	2163	ev_start (EV_A_ (W)w, 1);
2132	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2164	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133	wlist_add (&anfds[fd].head, (WL)w);	2165	wlist_add (&anfds[fd].head, (WL)w);
2134		2166
2135	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2167	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2136	w->events &= ~EV_IOFDSET;	2168	w->events &= ~EV_IOFDSET;
2137		2169
…		…
2329	sigset_t full, prev;	2361	sigset_t full, prev;
2330	sigfillset (&full);	2362	sigfillset (&full);
2331	sigprocmask (SIG_SETMASK, &full, &prev);	2363	sigprocmask (SIG_SETMASK, &full, &prev);
2332	#endif	2364	#endif
2333		2365
2334	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2366	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2335		2367
2336	#ifndef _WIN32	2368	#ifndef _WIN32
2337	sigprocmask (SIG_SETMASK, &prev, 0);	2369	sigprocmask (SIG_SETMASK, &prev, 0);
2338	#endif	2370	#endif
2339	}	2371	}
…		…
2412	# ifdef _WIN32	2444	# ifdef _WIN32
2413	# undef lstat	2445	# undef lstat
2414	# define lstat(a,b) _stati64 (a,b)	2446	# define lstat(a,b) _stati64 (a,b)
2415	# endif	2447	# endif
2416		2448
2417	#define DEF_STAT_INTERVAL 5.0074891	2449	#define DEF_STAT_INTERVAL 5.0074891
		2450	#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2418	#define MIN_STAT_INTERVAL 0.1074891	2451	#define MIN_STAT_INTERVAL 0.1074891
2419		2452
2420	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);	2453	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2421		2454
2422	#if EV_USE_INOTIFY	2455	#if EV_USE_INOTIFY
2423	# define EV_INOTIFY_BUFSIZE 8192	2456	# define EV_INOTIFY_BUFSIZE 8192
…		…
2427	{	2460	{
2428	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);	2461	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);
2429		2462
2430	if (w->wd < 0)	2463	if (w->wd < 0)
2431	{	2464	{
		2465	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2432	ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */	2466	ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2433		2467
2434	/* monitor some parent directory for speedup hints */	2468	/* monitor some parent directory for speedup hints */
2435	/* note that exceeding the hardcoded limit is not a correctness issue, */	2469	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2436	/* but an efficiency issue only */	2470	/* but an efficiency issue only */
2437	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2471	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2438	{	2472	{
2439	char path [4096];	2473	char path [4096];
2440	strcpy (path, w->path);	2474	strcpy (path, w->path);
…		…
2444	int mask = IN_MASK_ADD \| IN_DELETE_SELF \| IN_MOVE_SELF	2478	int mask = IN_MASK_ADD \| IN_DELETE_SELF \| IN_MOVE_SELF
2445	\| (errno == EACCES ? IN_ATTRIB : IN_CREATE \| IN_MOVED_TO);	2479	\| (errno == EACCES ? IN_ATTRIB : IN_CREATE \| IN_MOVED_TO);
2446		2480
2447	char *pend = strrchr (path, '/');	2481	char *pend = strrchr (path, '/');
2448		2482
2449	if (!pend)	2483	if (!pend \|\| pend == path)
2450	break; /* whoops, no '/', complain to your admin */	2484	break;
2451		2485
2452	*pend = 0;	2486	*pend = 0;
2453	w->wd = inotify_add_watch (fs_fd, path, mask);	2487	w->wd = inotify_add_watch (fs_fd, path, mask);
2454	}	2488	}
2455	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2489	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2456	}	2490	}
2457	}	2491	}
2458	else
2459	ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2460		2492
2461	if (w->wd >= 0)	2493	if (w->wd >= 0)
		2494	{
2462	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);	2495	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
		2496
		2497	/* now local changes will be tracked by inotify, but remote changes won't */
		2498	/* unless the filesystem it known to be local, we therefore still poll */
		2499	/* also do poll on <2.6.25, but with normal frequency */
		2500	struct statfs sfs;
		2501
		2502	if (fs_2625 && !statfs (w->path, &sfs))
		2503	if (sfs.f_type == 0x1373 /* devfs */
		2504	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
		2505	\|\| sfs.f_type == 0x3153464a /* jfs */
		2506	\|\| sfs.f_type == 0x52654973 /* reiser3 */
		2507	\|\| sfs.f_type == 0x01021994 /* tempfs */
		2508	\|\| sfs.f_type == 0x58465342 /* xfs */)
		2509	return;
		2510
		2511	w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
		2512	ev_timer_again (EV_A_ &w->timer);
		2513	}
2463	}	2514	}
2464		2515
2465	static void noinline	2516	static void noinline
2466	infy_del (EV_P_ ev_stat *w)	2517	infy_del (EV_P_ ev_stat *w)
2467	{	2518	{
…		…
2481		2532
2482	static void noinline	2533	static void noinline
2483	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)	2534	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484	{	2535	{
2485	if (slot < 0)	2536	if (slot < 0)
2486	/* overflow, need to check for all hahs slots */	2537	/* overflow, need to check for all hash slots */
2487	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2538	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488	infy_wd (EV_A_ slot, wd, ev);	2539	infy_wd (EV_A_ slot, wd, ev);
2489	else	2540	else
2490	{	2541	{
2491	WL w_;	2542	WL w_;
…		…
2497		2548
2498	if (w->wd == wd \|\| wd == -1)	2549	if (w->wd == wd \|\| wd == -1)
2499	{	2550	{
2500	if (ev->mask & (IN_IGNORED \| IN_UNMOUNT \| IN_DELETE_SELF))	2551	if (ev->mask & (IN_IGNORED \| IN_UNMOUNT \| IN_DELETE_SELF))
2501	{	2552	{
		2553	wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2502	w->wd = -1;	2554	w->wd = -1;
2503	infy_add (EV_A_ w); /* re-add, no matter what */	2555	infy_add (EV_A_ w); /* re-add, no matter what */
2504	}	2556	}
2505		2557
2506	stat_timer_cb (EV_A_ &w->timer, 0);	2558	stat_timer_cb (EV_A_ &w->timer, 0);
…		…
2520	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)	2572	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2521	infy_wd (EV_A_ ev->wd, ev->wd, ev);	2573	infy_wd (EV_A_ ev->wd, ev->wd, ev);
2522	}	2574	}
2523		2575
2524	void inline_size	2576	void inline_size
		2577	check_2625 (EV_P)
		2578	{
		2579	/* kernels < 2.6.25 are borked
		2580	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
		2581	*/
		2582	struct utsname buf;
		2583	int major, minor, micro;
		2584
		2585	if (uname (&buf))
		2586	return;
		2587
		2588	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
		2589	return;
		2590
		2591	if (major < 2
		2592	\|\| (major == 2 && minor < 6)
		2593	\|\| (major == 2 && minor == 6 && micro < 25))
		2594	return;
		2595
		2596	fs_2625 = 1;
		2597	}
		2598
		2599	void inline_size
2525	infy_init (EV_P)	2600	infy_init (EV_P)
2526	{	2601	{
2527	if (fs_fd != -2)	2602	if (fs_fd != -2)
2528	return;	2603	return;
		2604
		2605	fs_fd = -1;
		2606
		2607	check_2625 (EV_A);
2529		2608
2530	fs_fd = inotify_init ();	2609	fs_fd = inotify_init ();
2531		2610
2532	if (fs_fd >= 0)	2611	if (fs_fd >= 0)
2533	{	2612	{
…		…
2561	w->wd = -1;	2640	w->wd = -1;
2562		2641
2563	if (fs_fd >= 0)	2642	if (fs_fd >= 0)
2564	infy_add (EV_A_ w); /* re-add, no matter what */	2643	infy_add (EV_A_ w); /* re-add, no matter what */
2565	else	2644	else
2566	ev_timer_start (EV_A_ &w->timer);	2645	ev_timer_again (EV_A_ &w->timer);
2567	}	2646	}
2568
2569	}	2647	}
2570	}	2648	}
2571		2649
2572	#endif	2650	#endif
2573		2651
…		…
2609	\|\| w->prev.st_atime != w->attr.st_atime	2687	\|\| w->prev.st_atime != w->attr.st_atime
2610	\|\| w->prev.st_mtime != w->attr.st_mtime	2688	\|\| w->prev.st_mtime != w->attr.st_mtime
2611	\|\| w->prev.st_ctime != w->attr.st_ctime	2689	\|\| w->prev.st_ctime != w->attr.st_ctime
2612	) {	2690	) {
2613	#if EV_USE_INOTIFY	2691	#if EV_USE_INOTIFY
		2692	if (fs_fd >= 0)
		2693	{
2614	infy_del (EV_A_ w);	2694	infy_del (EV_A_ w);
2615	infy_add (EV_A_ w);	2695	infy_add (EV_A_ w);
2616	ev_stat_stat (EV_A_ w); /* avoid race... */	2696	ev_stat_stat (EV_A_ w); /* avoid race... */
		2697	}
2617	#endif	2698	#endif
2618		2699
2619	ev_feed_event (EV_A_ w, EV_STAT);	2700	ev_feed_event (EV_A_ w, EV_STAT);
2620	}	2701	}
2621	}	2702	}
…		…
2624	ev_stat_start (EV_P_ ev_stat *w)	2705	ev_stat_start (EV_P_ ev_stat *w)
2625	{	2706	{
2626	if (expect_false (ev_is_active (w)))	2707	if (expect_false (ev_is_active (w)))
2627	return;	2708	return;
2628		2709
2629	/* since we use memcmp, we need to clear any padding data etc. */
2630	memset (&w->prev, 0, sizeof (ev_statdata));
2631	memset (&w->attr, 0, sizeof (ev_statdata));
2632
2633	ev_stat_stat (EV_A_ w);	2710	ev_stat_stat (EV_A_ w);
2634		2711
		2712	if (w->interval < MIN_STAT_INTERVAL && w->interval)
2635	if (w->interval < MIN_STAT_INTERVAL)	2713	w->interval = MIN_STAT_INTERVAL;
2636	w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2637		2714
2638	ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);	2715	ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2639	ev_set_priority (&w->timer, ev_priority (w));	2716	ev_set_priority (&w->timer, ev_priority (w));
2640		2717
2641	#if EV_USE_INOTIFY	2718	#if EV_USE_INOTIFY
2642	infy_init (EV_A);	2719	infy_init (EV_A);
2643		2720
2644	if (fs_fd >= 0)	2721	if (fs_fd >= 0)
2645	infy_add (EV_A_ w);	2722	infy_add (EV_A_ w);
2646	else	2723	else
2647	#endif	2724	#endif
2648	ev_timer_start (EV_A_ &w->timer);	2725	ev_timer_again (EV_A_ &w->timer);
2649		2726
2650	ev_start (EV_A_ (W)w, 1);	2727	ev_start (EV_A_ (W)w, 1);
2651		2728
2652	EV_FREQUENT_CHECK;	2729	EV_FREQUENT_CHECK;
2653	}	2730	}
…		…
2823	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2900	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2824	}	2901	}
2825	}	2902	}
2826	}	2903	}
2827		2904
		2905	static void
		2906	embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
		2907	{
		2908	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
		2909
		2910	ev_embed_stop (EV_A_ w);
		2911
		2912	{
		2913	struct ev_loop *loop = w->other;
		2914
		2915	ev_loop_fork (EV_A);
		2916	ev_loop (EV_A_ EVLOOP_NONBLOCK);
		2917	}
		2918
		2919	ev_embed_start (EV_A_ w);
		2920	}
		2921
2828	#if 0	2922	#if 0
2829	static void	2923	static void
2830	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2924	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2831	{	2925	{
2832	ev_idle_stop (EV_A_ idle);	2926	ev_idle_stop (EV_A_ idle);
…		…
2852		2946
2853	ev_prepare_init (&w->prepare, embed_prepare_cb);	2947	ev_prepare_init (&w->prepare, embed_prepare_cb);
2854	ev_set_priority (&w->prepare, EV_MINPRI);	2948	ev_set_priority (&w->prepare, EV_MINPRI);
2855	ev_prepare_start (EV_A_ &w->prepare);	2949	ev_prepare_start (EV_A_ &w->prepare);
2856		2950
		2951	ev_fork_init (&w->fork, embed_fork_cb);
		2952	ev_fork_start (EV_A_ &w->fork);
		2953
2857	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2954	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2858		2955
2859	ev_start (EV_A_ (W)w, 1);	2956	ev_start (EV_A_ (W)w, 1);
2860		2957
2861	EV_FREQUENT_CHECK;	2958	EV_FREQUENT_CHECK;
…		…
2868	if (expect_false (!ev_is_active (w)))	2965	if (expect_false (!ev_is_active (w)))
2869	return;	2966	return;
2870		2967
2871	EV_FREQUENT_CHECK;	2968	EV_FREQUENT_CHECK;
2872		2969
2873	ev_io_stop (EV_A_ &w->io);	2970	ev_io_stop (EV_A_ &w->io);
2874	ev_prepare_stop (EV_A_ &w->prepare);	2971	ev_prepare_stop (EV_A_ &w->prepare);
2875		2972	ev_fork_stop (EV_A_ &w->fork);
2876	ev_stop (EV_A_ (W)w);
2877		2973
2878	EV_FREQUENT_CHECK;	2974	EV_FREQUENT_CHECK;
2879	}	2975	}
2880	#endif	2976	#endif
2881		2977
…		…
2978	once_cb (EV_P_ struct ev_once *once, int revents)	3074	once_cb (EV_P_ struct ev_once *once, int revents)
2979	{	3075	{
2980	void (cb)(int revents, void arg) = once->cb;	3076	void (cb)(int revents, void arg) = once->cb;
2981	void *arg = once->arg;	3077	void *arg = once->arg;
2982		3078
2983	ev_io_stop (EV_A_ &once->io);	3079	ev_io_stop (EV_A_ &once->io);
2984	ev_timer_stop (EV_A_ &once->to);	3080	ev_timer_stop (EV_A_ &once->to);
2985	ev_free (once);	3081	ev_free (once);
2986		3082
2987	cb (revents, arg);	3083	cb (revents, arg);
2988	}	3084	}
2989		3085
2990	static void	3086	static void
2991	once_cb_io (EV_P_ ev_io *w, int revents)	3087	once_cb_io (EV_P_ ev_io *w, int revents)
2992	{	3088	{
2993	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3089	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3090
		3091	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2994	}	3092	}
2995		3093
2996	static void	3094	static void
2997	once_cb_to (EV_P_ ev_timer *w, int revents)	3095	once_cb_to (EV_P_ ev_timer *w, int revents)
2998	{	3096	{
2999	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3097	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3098
		3099	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
3000	}	3100	}
3001		3101
3002	void	3102	void
3003	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3103	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
3004	{	3104	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.255 by root, Mon Jun 9 14:11:30 2008 UTC vs. Revision 1.277 by root, Sun Dec 14 21:58:08 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.255 by root, Mon Jun 9 14:11:30 2008 UTC vs.
Revision 1.277 by root, Sun Dec 14 21:58:08 2008 UTC