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

Comparing libev/ev.c (file contents):
Revision 1.257 by root, Sun Jun 29 22:32:51 2008 UTC vs.
Revision 1.275 by root, Fri Dec 12 20:35:21 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
…		…
164	# endif	176	# endif
165	#endif	177	#endif
166		178
167	/* 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 */
168		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
		188
169	#ifndef EV_USE_MONOTONIC	189	#ifndef EV_USE_MONOTONIC
170	# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0	190	# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171	# define EV_USE_MONOTONIC 1	191	# define EV_USE_MONOTONIC 1
172	# else	192	# else
173	# define EV_USE_MONOTONIC 0	193	# define EV_USE_MONOTONIC 0
…		…
286	# include <sys/select.h>	306	# include <sys/select.h>
287	# endif	307	# endif
288	#endif	308	#endif
289		309
290	#if EV_USE_INOTIFY	310	#if EV_USE_INOTIFY
		311	# include <sys/utsname.h>
		312	# include <sys/statfs.h>
291	# 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
292	#endif	319	#endif
293		320
294	#if EV_SELECT_IS_WINSOCKET	321	#if EV_SELECT_IS_WINSOCKET
295	# 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
296	#endif	332	#endif
297		333
298	#if EV_USE_EVENTFD	334	#if EV_USE_EVENTFD
299	/* 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 */
300	# include <stdint.h>	336	# include <stdint.h>
…		…
382	{	418	{
383	syserr_cb = cb;	419	syserr_cb = cb;
384	}	420	}
385		421
386	static void noinline	422	static void noinline
387	syserr (const char *msg)	423	ev_syserr (const char *msg)
388	{	424	{
389	if (!msg)	425	if (!msg)
390	msg = "(libev) system error";	426	msg = "(libev) system error";
391		427
392	if (syserr_cb)	428	if (syserr_cb)
…		…
443	typedef struct	479	typedef struct
444	{	480	{
445	WL head;	481	WL head;
446	unsigned char events;	482	unsigned char events;
447	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
448	#if EV_SELECT_IS_WINSOCKET	489	#if EV_SELECT_IS_WINSOCKET
449	SOCKET handle;	490	SOCKET handle;
450	#endif	491	#endif
451	} ANFD;	492	} ANFD;
452		493
…		…
605	{	646	{
606	cur = array_nextsize (elem, cur, cnt);	647	cur = array_nextsize (elem, cur, cnt);
607	return ev_realloc (base, elem * *cur);	648	return ev_realloc (base, elem * *cur);
608	}	649	}
609		650
		651	#define array_init_zero(base,count) \
		652	memset ((void )(base), 0, sizeof ((base)) * (count))
		653
610	#define array_needsize(type,base,cur,cnt,init) \	654	#define array_needsize(type,base,cur,cnt,init) \
611	if (expect_false ((cnt) > (cur))) \	655	if (expect_false ((cnt) > (cur))) \
612	{ \	656	{ \
613	int ocur_ = (cur); \	657	int ocur_ = (cur); \
614	(base) = (type *)array_realloc \	658	(base) = (type *)array_realloc \
…		…
656	for (i = 0; i < eventcnt; ++i)	700	for (i = 0; i < eventcnt; ++i)
657	ev_feed_event (EV_A_ events [i], type);	701	ev_feed_event (EV_A_ events [i], type);
658	}	702	}
659		703
660	/*****************************************************************************/	704	/*****************************************************************************/
661
662	void inline_size
663	anfds_init (ANFD *base, int count)
664	{
665	while (count--)
666	{
667	base->head = 0;
668	base->events = EV_NONE;
669	base->reify = 0;
670
671	++base;
672	}
673	}
674		705
675	void inline_speed	706	void inline_speed
676	fd_event (EV_P_ int fd, int revents)	707	fd_event (EV_P_ int fd, int revents)
677	{	708	{
678	ANFD *anfd = anfds + fd;	709	ANFD *anfd = anfds + fd;
…		…
808		839
809	for (fd = 0; fd < anfdmax; ++fd)	840	for (fd = 0; fd < anfdmax; ++fd)
810	if (anfds [fd].events)	841	if (anfds [fd].events)
811	{	842	{
812	anfds [fd].events = 0;	843	anfds [fd].events = 0;
		844	anfds [fd].emask = 0;
813	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	845	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
814	}	846	}
815	}	847	}
816		848
817	/*****************************************************************************/	849	/*****************************************************************************/
…		…
969	static ANSIG *signals;	1001	static ANSIG *signals;
970	static int signalmax;	1002	static int signalmax;
971		1003
972	static EV_ATOMIC_T gotsig;	1004	static EV_ATOMIC_T gotsig;
973		1005
974	void inline_size
975	signals_init (ANSIG *base, int count)
976	{
977	while (count--)
978	{
979	base->head = 0;
980	base->gotsig = 0;
981
982	++base;
983	}
984	}
985
986	/*****************************************************************************/	1006	/*****************************************************************************/
987		1007
988	void inline_speed	1008	void inline_speed
989	fd_intern (int fd)	1009	fd_intern (int fd)
990	{	1010	{
…		…
1011	}	1031	}
1012	else	1032	else
1013	#endif	1033	#endif
1014	{	1034	{
1015	while (pipe (evpipe))	1035	while (pipe (evpipe))
1016	syserr ("(libev) error creating signal/async pipe");	1036	ev_syserr ("(libev) error creating signal/async pipe");
1017		1037
1018	fd_intern (evpipe [0]);	1038	fd_intern (evpipe [0]);
1019	fd_intern (evpipe [1]);	1039	fd_intern (evpipe [1]);
1020	ev_io_set (&pipeev, evpipe [0], EV_READ);	1040	ev_io_set (&pipeev, evpipe [0], EV_READ);
1021	}	1041	}
…		…
1511	{	1531	{
1512	postfork = 1; /* must be in line with ev_default_fork */	1532	postfork = 1; /* must be in line with ev_default_fork */
1513	}	1533	}
1514		1534
1515	#if EV_VERIFY	1535	#if EV_VERIFY
1516	void noinline	1536	static void noinline
1517	verify_watcher (EV_P_ W w)	1537	verify_watcher (EV_P_ W w)
1518	{	1538	{
1519	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1539	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1520		1540
1521	if (w->pending)	1541	if (w->pending)
…		…
1652	{	1672	{
1653	#if EV_MULTIPLICITY	1673	#if EV_MULTIPLICITY
1654	struct ev_loop *loop = ev_default_loop_ptr;	1674	struct ev_loop *loop = ev_default_loop_ptr;
1655	#endif	1675	#endif
1656		1676
		1677	ev_default_loop_ptr = 0;
		1678
1657	#ifndef _WIN32	1679	#ifndef _WIN32
1658	ev_ref (EV_A); /* child watcher */	1680	ev_ref (EV_A); /* child watcher */
1659	ev_signal_stop (EV_A_ &childev);	1681	ev_signal_stop (EV_A_ &childev);
1660	#endif	1682	#endif
1661		1683
…		…
1667	{	1689	{
1668	#if EV_MULTIPLICITY	1690	#if EV_MULTIPLICITY
1669	struct ev_loop *loop = ev_default_loop_ptr;	1691	struct ev_loop *loop = ev_default_loop_ptr;
1670	#endif	1692	#endif
1671		1693
1672	if (backend)
1673	postfork = 1; /* must be in line with ev_loop_fork */	1694	postfork = 1; /* must be in line with ev_loop_fork */
1674	}	1695	}
1675		1696
1676	/*****************************************************************************/	1697	/*****************************************************************************/
1677		1698
1678	void	1699	void
…		…
1909	ev_unref (EV_P)	1930	ev_unref (EV_P)
1910	{	1931	{
1911	--activecnt;	1932	--activecnt;
1912	}	1933	}
1913		1934
		1935	void
		1936	ev_now_update (EV_P)
		1937	{
		1938	time_update (EV_A_ 1e100);
		1939	}
		1940
1914	static int loop_done;	1941	static int loop_done;
1915		1942
1916	void	1943	void
1917	ev_loop (EV_P_ int flags)	1944	ev_loop (EV_P_ int flags)
1918	{	1945	{
…		…
2127		2154
2128	if (expect_false (ev_is_active (w)))	2155	if (expect_false (ev_is_active (w)))
2129	return;	2156	return;
2130		2157
2131	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))));
2132		2160
2133	EV_FREQUENT_CHECK;	2161	EV_FREQUENT_CHECK;
2134		2162
2135	ev_start (EV_A_ (W)w, 1);	2163	ev_start (EV_A_ (W)w, 1);
2136	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2164	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2137	wlist_add (&anfds[fd].head, (WL)w);	2165	wlist_add (&anfds[fd].head, (WL)w);
2138		2166
2139	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2167	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2140	w->events &= ~EV_IOFDSET;	2168	w->events &= ~EV_IOFDSET;
2141		2169
…		…
2333	sigset_t full, prev;	2361	sigset_t full, prev;
2334	sigfillset (&full);	2362	sigfillset (&full);
2335	sigprocmask (SIG_SETMASK, &full, &prev);	2363	sigprocmask (SIG_SETMASK, &full, &prev);
2336	#endif	2364	#endif
2337		2365
2338	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2366	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2339		2367
2340	#ifndef _WIN32	2368	#ifndef _WIN32
2341	sigprocmask (SIG_SETMASK, &prev, 0);	2369	sigprocmask (SIG_SETMASK, &prev, 0);
2342	#endif	2370	#endif
2343	}	2371	}
…		…
2416	# ifdef _WIN32	2444	# ifdef _WIN32
2417	# undef lstat	2445	# undef lstat
2418	# define lstat(a,b) _stati64 (a,b)	2446	# define lstat(a,b) _stati64 (a,b)
2419	# endif	2447	# endif
2420		2448
2421	#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 */
2422	#define MIN_STAT_INTERVAL 0.1074891	2451	#define MIN_STAT_INTERVAL 0.1074891
2423		2452
2424	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);
2425		2454
2426	#if EV_USE_INOTIFY	2455	#if EV_USE_INOTIFY
2427	# define EV_INOTIFY_BUFSIZE 8192	2456	# define EV_INOTIFY_BUFSIZE 8192
…		…
2431	{	2460	{
2432	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);
2433		2462
2434	if (w->wd < 0)	2463	if (w->wd < 0)
2435	{	2464	{
		2465	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2436	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 */
2437		2467
2438	/* monitor some parent directory for speedup hints */	2468	/* monitor some parent directory for speedup hints */
2439	/* note that exceeding the hardcoded limit is not a correctness issue, */	2469	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2440	/* but an efficiency issue only */	2470	/* but an efficiency issue only */
2441	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2471	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2442	{	2472	{
2443	char path [4096];	2473	char path [4096];
2444	strcpy (path, w->path);	2474	strcpy (path, w->path);
…		…
2448	int mask = IN_MASK_ADD \| IN_DELETE_SELF \| IN_MOVE_SELF	2478	int mask = IN_MASK_ADD \| IN_DELETE_SELF \| IN_MOVE_SELF
2449	\| (errno == EACCES ? IN_ATTRIB : IN_CREATE \| IN_MOVED_TO);	2479	\| (errno == EACCES ? IN_ATTRIB : IN_CREATE \| IN_MOVED_TO);
2450		2480
2451	char *pend = strrchr (path, '/');	2481	char *pend = strrchr (path, '/');
2452		2482
2453	if (!pend)	2483	if (!pend \|\| pend == path)
2454	break; /* whoops, no '/', complain to your admin */	2484	break;
2455		2485
2456	*pend = 0;	2486	*pend = 0;
2457	w->wd = inotify_add_watch (fs_fd, path, mask);	2487	w->wd = inotify_add_watch (fs_fd, path, mask);
2458	}	2488	}
2459	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2489	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2460	}	2490	}
2461	}	2491	}
2462	else
2463	ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2464		2492
2465	if (w->wd >= 0)	2493	if (w->wd >= 0)
		2494	{
2466	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	}
2467	}	2514	}
2468		2515
2469	static void noinline	2516	static void noinline
2470	infy_del (EV_P_ ev_stat *w)	2517	infy_del (EV_P_ ev_stat *w)
2471	{	2518	{
…		…
2485		2532
2486	static void noinline	2533	static void noinline
2487	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)
2488	{	2535	{
2489	if (slot < 0)	2536	if (slot < 0)
2490	/* overflow, need to check for all hahs slots */	2537	/* overflow, need to check for all hash slots */
2491	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2538	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2492	infy_wd (EV_A_ slot, wd, ev);	2539	infy_wd (EV_A_ slot, wd, ev);
2493	else	2540	else
2494	{	2541	{
2495	WL w_;	2542	WL w_;
…		…
2501		2548
2502	if (w->wd == wd \|\| wd == -1)	2549	if (w->wd == wd \|\| wd == -1)
2503	{	2550	{
2504	if (ev->mask & (IN_IGNORED \| IN_UNMOUNT \| IN_DELETE_SELF))	2551	if (ev->mask & (IN_IGNORED \| IN_UNMOUNT \| IN_DELETE_SELF))
2505	{	2552	{
		2553	wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2506	w->wd = -1;	2554	w->wd = -1;
2507	infy_add (EV_A_ w); /* re-add, no matter what */	2555	infy_add (EV_A_ w); /* re-add, no matter what */
2508	}	2556	}
2509		2557
2510	stat_timer_cb (EV_A_ &w->timer, 0);	2558	stat_timer_cb (EV_A_ &w->timer, 0);
…		…
2524	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)
2525	infy_wd (EV_A_ ev->wd, ev->wd, ev);	2573	infy_wd (EV_A_ ev->wd, ev->wd, ev);
2526	}	2574	}
2527		2575
2528	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
2529	infy_init (EV_P)	2600	infy_init (EV_P)
2530	{	2601	{
2531	if (fs_fd != -2)	2602	if (fs_fd != -2)
2532	return;	2603	return;
		2604
		2605	fs_fd = -1;
		2606
		2607	check_2625 (EV_A);
2533		2608
2534	fs_fd = inotify_init ();	2609	fs_fd = inotify_init ();
2535		2610
2536	if (fs_fd >= 0)	2611	if (fs_fd >= 0)
2537	{	2612	{
…		…
2565	w->wd = -1;	2640	w->wd = -1;
2566		2641
2567	if (fs_fd >= 0)	2642	if (fs_fd >= 0)
2568	infy_add (EV_A_ w); /* re-add, no matter what */	2643	infy_add (EV_A_ w); /* re-add, no matter what */
2569	else	2644	else
2570	ev_timer_start (EV_A_ &w->timer);	2645	ev_timer_again (EV_A_ &w->timer);
2571	}	2646	}
2572
2573	}	2647	}
2574	}	2648	}
2575		2649
2576	#endif	2650	#endif
2577		2651
…		…
2613	\|\| w->prev.st_atime != w->attr.st_atime	2687	\|\| w->prev.st_atime != w->attr.st_atime
2614	\|\| w->prev.st_mtime != w->attr.st_mtime	2688	\|\| w->prev.st_mtime != w->attr.st_mtime
2615	\|\| w->prev.st_ctime != w->attr.st_ctime	2689	\|\| w->prev.st_ctime != w->attr.st_ctime
2616	) {	2690	) {
2617	#if EV_USE_INOTIFY	2691	#if EV_USE_INOTIFY
		2692	if (fs_fd >= 0)
		2693	{
2618	infy_del (EV_A_ w);	2694	infy_del (EV_A_ w);
2619	infy_add (EV_A_ w);	2695	infy_add (EV_A_ w);
2620	ev_stat_stat (EV_A_ w); /* avoid race... */	2696	ev_stat_stat (EV_A_ w); /* avoid race... */
		2697	}
2621	#endif	2698	#endif
2622		2699
2623	ev_feed_event (EV_A_ w, EV_STAT);	2700	ev_feed_event (EV_A_ w, EV_STAT);
2624	}	2701	}
2625	}	2702	}
…		…
2628	ev_stat_start (EV_P_ ev_stat *w)	2705	ev_stat_start (EV_P_ ev_stat *w)
2629	{	2706	{
2630	if (expect_false (ev_is_active (w)))	2707	if (expect_false (ev_is_active (w)))
2631	return;	2708	return;
2632		2709
2633	/* since we use memcmp, we need to clear any padding data etc. */
2634	memset (&w->prev, 0, sizeof (ev_statdata));
2635	memset (&w->attr, 0, sizeof (ev_statdata));
2636
2637	ev_stat_stat (EV_A_ w);	2710	ev_stat_stat (EV_A_ w);
2638		2711
		2712	if (w->interval < MIN_STAT_INTERVAL && w->interval)
2639	if (w->interval < MIN_STAT_INTERVAL)	2713	w->interval = MIN_STAT_INTERVAL;
2640	w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2641		2714
2642	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);
2643	ev_set_priority (&w->timer, ev_priority (w));	2716	ev_set_priority (&w->timer, ev_priority (w));
2644		2717
2645	#if EV_USE_INOTIFY	2718	#if EV_USE_INOTIFY
2646	infy_init (EV_A);	2719	infy_init (EV_A);
2647		2720
2648	if (fs_fd >= 0)	2721	if (fs_fd >= 0)
2649	infy_add (EV_A_ w);	2722	infy_add (EV_A_ w);
2650	else	2723	else
2651	#endif	2724	#endif
2652	ev_timer_start (EV_A_ &w->timer);	2725	ev_timer_again (EV_A_ &w->timer);
2653		2726
2654	ev_start (EV_A_ (W)w, 1);	2727	ev_start (EV_A_ (W)w, 1);
2655		2728
2656	EV_FREQUENT_CHECK;	2729	EV_FREQUENT_CHECK;
2657	}	2730	}
…		…
2827	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2900	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2828	}	2901	}
2829	}	2902	}
2830	}	2903	}
2831		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	{
		2911	struct ev_loop *loop = w->other;
		2912
		2913	ev_loop_fork (EV_A);
		2914	}
		2915	}
		2916
2832	#if 0	2917	#if 0
2833	static void	2918	static void
2834	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2919	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2835	{	2920	{
2836	ev_idle_stop (EV_A_ idle);	2921	ev_idle_stop (EV_A_ idle);
…		…
2856		2941
2857	ev_prepare_init (&w->prepare, embed_prepare_cb);	2942	ev_prepare_init (&w->prepare, embed_prepare_cb);
2858	ev_set_priority (&w->prepare, EV_MINPRI);	2943	ev_set_priority (&w->prepare, EV_MINPRI);
2859	ev_prepare_start (EV_A_ &w->prepare);	2944	ev_prepare_start (EV_A_ &w->prepare);
2860		2945
		2946	ev_fork_init (&w->fork, embed_fork_cb);
		2947	ev_fork_start (EV_A_ &w->fork);
		2948
2861	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2949	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2862		2950
2863	ev_start (EV_A_ (W)w, 1);	2951	ev_start (EV_A_ (W)w, 1);
2864		2952
2865	EV_FREQUENT_CHECK;	2953	EV_FREQUENT_CHECK;
…		…
2872	if (expect_false (!ev_is_active (w)))	2960	if (expect_false (!ev_is_active (w)))
2873	return;	2961	return;
2874		2962
2875	EV_FREQUENT_CHECK;	2963	EV_FREQUENT_CHECK;
2876		2964
2877	ev_io_stop (EV_A_ &w->io);	2965	ev_io_stop (EV_A_ &w->io);
2878	ev_prepare_stop (EV_A_ &w->prepare);	2966	ev_prepare_stop (EV_A_ &w->prepare);
2879		2967	ev_fork_stop (EV_A_ &w->fork);
2880	ev_stop (EV_A_ (W)w);
2881		2968
2882	EV_FREQUENT_CHECK;	2969	EV_FREQUENT_CHECK;
2883	}	2970	}
2884	#endif	2971	#endif
2885		2972
…		…
2982	once_cb (EV_P_ struct ev_once *once, int revents)	3069	once_cb (EV_P_ struct ev_once *once, int revents)
2983	{	3070	{
2984	void (cb)(int revents, void arg) = once->cb;	3071	void (cb)(int revents, void arg) = once->cb;
2985	void *arg = once->arg;	3072	void *arg = once->arg;
2986		3073
2987	ev_io_stop (EV_A_ &once->io);	3074	ev_io_stop (EV_A_ &once->io);
2988	ev_timer_stop (EV_A_ &once->to);	3075	ev_timer_stop (EV_A_ &once->to);
2989	ev_free (once);	3076	ev_free (once);
2990		3077
2991	cb (revents, arg);	3078	cb (revents, arg);
2992	}	3079	}
2993		3080
2994	static void	3081	static void
2995	once_cb_io (EV_P_ ev_io *w, int revents)	3082	once_cb_io (EV_P_ ev_io *w, int revents)
2996	{	3083	{
2997	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3084	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3085
		3086	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2998	}	3087	}
2999		3088
3000	static void	3089	static void
3001	once_cb_to (EV_P_ ev_timer *w, int revents)	3090	once_cb_to (EV_P_ ev_timer *w, int revents)
3002	{	3091	{
3003	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3092	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3093
		3094	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
3004	}	3095	}
3005		3096
3006	void	3097	void
3007	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3098	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
3008	{	3099	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.257 by root, Sun Jun 29 22:32:51 2008 UTC vs. Revision 1.275 by root, Fri Dec 12 20:35:21 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.257 by root, Sun Jun 29 22:32:51 2008 UTC vs.
Revision 1.275 by root, Fri Dec 12 20:35:21 2008 UTC