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

Comparing libev/ev.c (file contents):
Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs.
Revision 1.274 by root, Thu Nov 20 00:35:10 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
…		…
565	struct timeval tv;	606	struct timeval tv;
566		607
567	tv.tv_sec = (time_t)delay;	608	tv.tv_sec = (time_t)delay;
568	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	609	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
569		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 */
570	select (0, 0, 0, 0, &tv);	614	select (0, 0, 0, 0, &tv);
571	#endif	615	#endif
572	}	616	}
573	}	617	}
574		618
…		…
601	array_realloc (int elem, void base, int cur, int cnt)	645	array_realloc (int elem, void base, int cur, int cnt)
602	{	646	{
603	cur = array_nextsize (elem, cur, cnt);	647	cur = array_nextsize (elem, cur, cnt);
604	return ev_realloc (base, elem * *cur);	648	return ev_realloc (base, elem * *cur);
605	}	649	}
		650
		651	#define array_init_zero(base,count) \
		652	memset ((void )(base), 0, sizeof ((base)) * (count))
606		653
607	#define array_needsize(type,base,cur,cnt,init) \	654	#define array_needsize(type,base,cur,cnt,init) \
608	if (expect_false ((cnt) > (cur))) \	655	if (expect_false ((cnt) > (cur))) \
609	{ \	656	{ \
610	int ocur_ = (cur); \	657	int ocur_ = (cur); \
…		…
653	for (i = 0; i < eventcnt; ++i)	700	for (i = 0; i < eventcnt; ++i)
654	ev_feed_event (EV_A_ events [i], type);	701	ev_feed_event (EV_A_ events [i], type);
655	}	702	}
656		703
657	/*****************************************************************************/	704	/*****************************************************************************/
658
659	void inline_size
660	anfds_init (ANFD *base, int count)
661	{
662	while (count--)
663	{
664	base->head = 0;
665	base->events = EV_NONE;
666	base->reify = 0;
667
668	++base;
669	}
670	}
671		705
672	void inline_speed	706	void inline_speed
673	fd_event (EV_P_ int fd, int revents)	707	fd_event (EV_P_ int fd, int revents)
674	{	708	{
675	ANFD *anfd = anfds + fd;	709	ANFD *anfd = anfds + fd;
…		…
805		839
806	for (fd = 0; fd < anfdmax; ++fd)	840	for (fd = 0; fd < anfdmax; ++fd)
807	if (anfds [fd].events)	841	if (anfds [fd].events)
808	{	842	{
809	anfds [fd].events = 0;	843	anfds [fd].events = 0;
		844	anfds [fd].emask = 0;
810	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	845	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
811	}	846	}
812	}	847	}
813		848
814	/*****************************************************************************/	849	/*****************************************************************************/
…		…
966	static ANSIG *signals;	1001	static ANSIG *signals;
967	static int signalmax;	1002	static int signalmax;
968		1003
969	static EV_ATOMIC_T gotsig;	1004	static EV_ATOMIC_T gotsig;
970		1005
971	void inline_size
972	signals_init (ANSIG *base, int count)
973	{
974	while (count--)
975	{
976	base->head = 0;
977	base->gotsig = 0;
978
979	++base;
980	}
981	}
982
983	/*****************************************************************************/	1006	/*****************************************************************************/
984		1007
985	void inline_speed	1008	void inline_speed
986	fd_intern (int fd)	1009	fd_intern (int fd)
987	{	1010	{
…		…
1008	}	1031	}
1009	else	1032	else
1010	#endif	1033	#endif
1011	{	1034	{
1012	while (pipe (evpipe))	1035	while (pipe (evpipe))
1013	syserr ("(libev) error creating signal/async pipe");	1036	ev_syserr ("(libev) error creating signal/async pipe");
1014		1037
1015	fd_intern (evpipe [0]);	1038	fd_intern (evpipe [0]);
1016	fd_intern (evpipe [1]);	1039	fd_intern (evpipe [1]);
1017	ev_io_set (&pipeev, evpipe [0], EV_READ);	1040	ev_io_set (&pipeev, evpipe [0], EV_READ);
1018	}	1041	}
…		…
1508	{	1531	{
1509	postfork = 1; /* must be in line with ev_default_fork */	1532	postfork = 1; /* must be in line with ev_default_fork */
1510	}	1533	}
1511		1534
1512	#if EV_VERIFY	1535	#if EV_VERIFY
1513	void noinline	1536	static void noinline
1514	verify_watcher (EV_P_ W w)	1537	verify_watcher (EV_P_ W w)
1515	{	1538	{
1516	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1539	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1517		1540
1518	if (w->pending)	1541	if (w->pending)
…		…
1649	{	1672	{
1650	#if EV_MULTIPLICITY	1673	#if EV_MULTIPLICITY
1651	struct ev_loop *loop = ev_default_loop_ptr;	1674	struct ev_loop *loop = ev_default_loop_ptr;
1652	#endif	1675	#endif
1653		1676
		1677	ev_default_loop_ptr = 0;
		1678
1654	#ifndef _WIN32	1679	#ifndef _WIN32
1655	ev_ref (EV_A); /* child watcher */	1680	ev_ref (EV_A); /* child watcher */
1656	ev_signal_stop (EV_A_ &childev);	1681	ev_signal_stop (EV_A_ &childev);
1657	#endif	1682	#endif
1658		1683
…		…
1664	{	1689	{
1665	#if EV_MULTIPLICITY	1690	#if EV_MULTIPLICITY
1666	struct ev_loop *loop = ev_default_loop_ptr;	1691	struct ev_loop *loop = ev_default_loop_ptr;
1667	#endif	1692	#endif
1668		1693
1669	if (backend)
1670	postfork = 1; /* must be in line with ev_loop_fork */	1694	postfork = 1; /* must be in line with ev_loop_fork */
1671	}	1695	}
1672		1696
1673	/*****************************************************************************/	1697	/*****************************************************************************/
1674		1698
1675	void	1699	void
…		…
1906	ev_unref (EV_P)	1930	ev_unref (EV_P)
1907	{	1931	{
1908	--activecnt;	1932	--activecnt;
1909	}	1933	}
1910		1934
		1935	void
		1936	ev_now_update (EV_P)
		1937	{
		1938	time_update (EV_A_ 1e100);
		1939	}
		1940
1911	static int loop_done;	1941	static int loop_done;
1912		1942
1913	void	1943	void
1914	ev_loop (EV_P_ int flags)	1944	ev_loop (EV_P_ int flags)
1915	{	1945	{
…		…
2124		2154
2125	if (expect_false (ev_is_active (w)))	2155	if (expect_false (ev_is_active (w)))
2126	return;	2156	return;
2127		2157
2128	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))));
2129		2160
2130	EV_FREQUENT_CHECK;	2161	EV_FREQUENT_CHECK;
2131		2162
2132	ev_start (EV_A_ (W)w, 1);	2163	ev_start (EV_A_ (W)w, 1);
2133	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2164	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2134	wlist_add (&anfds[fd].head, (WL)w);	2165	wlist_add (&anfds[fd].head, (WL)w);
2135		2166
2136	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2167	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2137	w->events &= ~EV_IOFDSET;	2168	w->events &= ~EV_IOFDSET;
2138		2169
…		…
2330	sigset_t full, prev;	2361	sigset_t full, prev;
2331	sigfillset (&full);	2362	sigfillset (&full);
2332	sigprocmask (SIG_SETMASK, &full, &prev);	2363	sigprocmask (SIG_SETMASK, &full, &prev);
2333	#endif	2364	#endif
2334		2365
2335	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2366	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2336		2367
2337	#ifndef _WIN32	2368	#ifndef _WIN32
2338	sigprocmask (SIG_SETMASK, &prev, 0);	2369	sigprocmask (SIG_SETMASK, &prev, 0);
2339	#endif	2370	#endif
2340	}	2371	}
…		…
2413	# ifdef _WIN32	2444	# ifdef _WIN32
2414	# undef lstat	2445	# undef lstat
2415	# define lstat(a,b) _stati64 (a,b)	2446	# define lstat(a,b) _stati64 (a,b)
2416	# endif	2447	# endif
2417		2448
2418	#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 */
2419	#define MIN_STAT_INTERVAL 0.1074891	2451	#define MIN_STAT_INTERVAL 0.1074891
2420		2452
2421	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);
2422		2454
2423	#if EV_USE_INOTIFY	2455	#if EV_USE_INOTIFY
2424	# define EV_INOTIFY_BUFSIZE 8192	2456	# define EV_INOTIFY_BUFSIZE 8192
…		…
2428	{	2460	{
2429	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);
2430		2462
2431	if (w->wd < 0)	2463	if (w->wd < 0)
2432	{	2464	{
		2465	w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2433	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 */
2434		2467
2435	/* monitor some parent directory for speedup hints */	2468	/* monitor some parent directory for speedup hints */
2436	/* note that exceeding the hardcoded limit is not a correctness issue, */	2469	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2437	/* but an efficiency issue only */	2470	/* but an efficiency issue only */
2438	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2471	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2439	{	2472	{
2440	char path [4096];	2473	char path [4096];
2441	strcpy (path, w->path);	2474	strcpy (path, w->path);
…		…
2455	}	2488	}
2456	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2489	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2457	}	2490	}
2458	}	2491	}
2459	else	2492	else
2460	ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */	2493	{
2461
2462	if (w->wd >= 0)
2463	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);	2494	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
		2495
		2496	/* now local changes will be tracked by inotify, but remote changes won't */
		2497	/* unless the filesystem it known to be local, we therefore still poll */
		2498	/* also do poll on <2.6.25, but with normal frequency */
		2499	struct statfs sfs;
		2500
		2501	if (fs_2625 && !statfs (w->path, &sfs))
		2502	if (sfs.f_type == 0x1373 /* devfs */
		2503	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
		2504	\|\| sfs.f_type == 0x3153464a /* jfs */
		2505	\|\| sfs.f_type == 0x52654973 /* reiser3 */
		2506	\|\| sfs.f_type == 0x01021994 /* tempfs */
		2507	\|\| sfs.f_type == 0x58465342 /* xfs */)
		2508	return;
		2509
		2510	w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
		2511	ev_timer_again (EV_A_ &w->timer);
		2512	}
2464	}	2513	}
2465		2514
2466	static void noinline	2515	static void noinline
2467	infy_del (EV_P_ ev_stat *w)	2516	infy_del (EV_P_ ev_stat *w)
2468	{	2517	{
…		…
2482		2531
2483	static void noinline	2532	static void noinline
2484	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)	2533	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2485	{	2534	{
2486	if (slot < 0)	2535	if (slot < 0)
2487	/* overflow, need to check for all hahs slots */	2536	/* overflow, need to check for all hash slots */
2488	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2537	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2489	infy_wd (EV_A_ slot, wd, ev);	2538	infy_wd (EV_A_ slot, wd, ev);
2490	else	2539	else
2491	{	2540	{
2492	WL w_;	2541	WL w_;
…		…
2521	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)	2570	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2522	infy_wd (EV_A_ ev->wd, ev->wd, ev);	2571	infy_wd (EV_A_ ev->wd, ev->wd, ev);
2523	}	2572	}
2524		2573
2525	void inline_size	2574	void inline_size
		2575	check_2625 (EV_P)
		2576	{
		2577	/* kernels < 2.6.25 are borked
		2578	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
		2579	*/
		2580	struct utsname buf;
		2581	int major, minor, micro;
		2582
		2583	if (uname (&buf))
		2584	return;
		2585
		2586	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
		2587	return;
		2588
		2589	if (major < 2
		2590	\|\| (major == 2 && minor < 6)
		2591	\|\| (major == 2 && minor == 6 && micro < 25))
		2592	return;
		2593
		2594	fs_2625 = 1;
		2595	}
		2596
		2597	void inline_size
2526	infy_init (EV_P)	2598	infy_init (EV_P)
2527	{	2599	{
2528	if (fs_fd != -2)	2600	if (fs_fd != -2)
2529	return;	2601	return;
		2602
		2603	fs_fd = -1;
		2604
		2605	check_2625 (EV_A);
2530		2606
2531	fs_fd = inotify_init ();	2607	fs_fd = inotify_init ();
2532		2608
2533	if (fs_fd >= 0)	2609	if (fs_fd >= 0)
2534	{	2610	{
…		…
2562	w->wd = -1;	2638	w->wd = -1;
2563		2639
2564	if (fs_fd >= 0)	2640	if (fs_fd >= 0)
2565	infy_add (EV_A_ w); /* re-add, no matter what */	2641	infy_add (EV_A_ w); /* re-add, no matter what */
2566	else	2642	else
2567	ev_timer_start (EV_A_ &w->timer);	2643	ev_timer_again (EV_A_ &w->timer);
2568	}	2644	}
2569
2570	}	2645	}
2571	}	2646	}
2572		2647
2573	#endif	2648	#endif
2574		2649
…		…
2610	\|\| w->prev.st_atime != w->attr.st_atime	2685	\|\| w->prev.st_atime != w->attr.st_atime
2611	\|\| w->prev.st_mtime != w->attr.st_mtime	2686	\|\| w->prev.st_mtime != w->attr.st_mtime
2612	\|\| w->prev.st_ctime != w->attr.st_ctime	2687	\|\| w->prev.st_ctime != w->attr.st_ctime
2613	) {	2688	) {
2614	#if EV_USE_INOTIFY	2689	#if EV_USE_INOTIFY
		2690	if (fs_fd >= 0)
		2691	{
2615	infy_del (EV_A_ w);	2692	infy_del (EV_A_ w);
2616	infy_add (EV_A_ w);	2693	infy_add (EV_A_ w);
2617	ev_stat_stat (EV_A_ w); /* avoid race... */	2694	ev_stat_stat (EV_A_ w); /* avoid race... */
		2695	}
2618	#endif	2696	#endif
2619		2697
2620	ev_feed_event (EV_A_ w, EV_STAT);	2698	ev_feed_event (EV_A_ w, EV_STAT);
2621	}	2699	}
2622	}	2700	}
…		…
2625	ev_stat_start (EV_P_ ev_stat *w)	2703	ev_stat_start (EV_P_ ev_stat *w)
2626	{	2704	{
2627	if (expect_false (ev_is_active (w)))	2705	if (expect_false (ev_is_active (w)))
2628	return;	2706	return;
2629		2707
2630	/* since we use memcmp, we need to clear any padding data etc. */
2631	memset (&w->prev, 0, sizeof (ev_statdata));
2632	memset (&w->attr, 0, sizeof (ev_statdata));
2633
2634	ev_stat_stat (EV_A_ w);	2708	ev_stat_stat (EV_A_ w);
2635		2709
		2710	if (w->interval < MIN_STAT_INTERVAL && w->interval)
2636	if (w->interval < MIN_STAT_INTERVAL)	2711	w->interval = MIN_STAT_INTERVAL;
2637	w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2638		2712
2639	ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);	2713	ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2640	ev_set_priority (&w->timer, ev_priority (w));	2714	ev_set_priority (&w->timer, ev_priority (w));
2641		2715
2642	#if EV_USE_INOTIFY	2716	#if EV_USE_INOTIFY
2643	infy_init (EV_A);	2717	infy_init (EV_A);
2644		2718
2645	if (fs_fd >= 0)	2719	if (fs_fd >= 0)
2646	infy_add (EV_A_ w);	2720	infy_add (EV_A_ w);
2647	else	2721	else
2648	#endif	2722	#endif
2649	ev_timer_start (EV_A_ &w->timer);	2723	ev_timer_again (EV_A_ &w->timer);
2650		2724
2651	ev_start (EV_A_ (W)w, 1);	2725	ev_start (EV_A_ (W)w, 1);
2652		2726
2653	EV_FREQUENT_CHECK;	2727	EV_FREQUENT_CHECK;
2654	}	2728	}
…		…
2824	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2898	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2825	}	2899	}
2826	}	2900	}
2827	}	2901	}
2828		2902
		2903	static void
		2904	embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
		2905	{
		2906	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
		2907
		2908	{
		2909	struct ev_loop *loop = w->other;
		2910
		2911	ev_loop_fork (EV_A);
		2912	}
		2913	}
		2914
2829	#if 0	2915	#if 0
2830	static void	2916	static void
2831	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2917	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2832	{	2918	{
2833	ev_idle_stop (EV_A_ idle);	2919	ev_idle_stop (EV_A_ idle);
…		…
2853		2939
2854	ev_prepare_init (&w->prepare, embed_prepare_cb);	2940	ev_prepare_init (&w->prepare, embed_prepare_cb);
2855	ev_set_priority (&w->prepare, EV_MINPRI);	2941	ev_set_priority (&w->prepare, EV_MINPRI);
2856	ev_prepare_start (EV_A_ &w->prepare);	2942	ev_prepare_start (EV_A_ &w->prepare);
2857		2943
		2944	ev_fork_init (&w->fork, embed_fork_cb);
		2945	ev_fork_start (EV_A_ &w->fork);
		2946
2858	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2947	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2859		2948
2860	ev_start (EV_A_ (W)w, 1);	2949	ev_start (EV_A_ (W)w, 1);
2861		2950
2862	EV_FREQUENT_CHECK;	2951	EV_FREQUENT_CHECK;
…		…
2869	if (expect_false (!ev_is_active (w)))	2958	if (expect_false (!ev_is_active (w)))
2870	return;	2959	return;
2871		2960
2872	EV_FREQUENT_CHECK;	2961	EV_FREQUENT_CHECK;
2873		2962
2874	ev_io_stop (EV_A_ &w->io);	2963	ev_io_stop (EV_A_ &w->io);
2875	ev_prepare_stop (EV_A_ &w->prepare);	2964	ev_prepare_stop (EV_A_ &w->prepare);
2876		2965	ev_fork_stop (EV_A_ &w->fork);
2877	ev_stop (EV_A_ (W)w);
2878		2966
2879	EV_FREQUENT_CHECK;	2967	EV_FREQUENT_CHECK;
2880	}	2968	}
2881	#endif	2969	#endif
2882		2970
…		…
2979	once_cb (EV_P_ struct ev_once *once, int revents)	3067	once_cb (EV_P_ struct ev_once *once, int revents)
2980	{	3068	{
2981	void (cb)(int revents, void arg) = once->cb;	3069	void (cb)(int revents, void arg) = once->cb;
2982	void *arg = once->arg;	3070	void *arg = once->arg;
2983		3071
2984	ev_io_stop (EV_A_ &once->io);	3072	ev_io_stop (EV_A_ &once->io);
2985	ev_timer_stop (EV_A_ &once->to);	3073	ev_timer_stop (EV_A_ &once->to);
2986	ev_free (once);	3074	ev_free (once);
2987		3075
2988	cb (revents, arg);	3076	cb (revents, arg);
2989	}	3077	}
2990		3078
2991	static void	3079	static void
2992	once_cb_io (EV_P_ ev_io *w, int revents)	3080	once_cb_io (EV_P_ ev_io *w, int revents)
2993	{	3081	{
2994	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3082	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3083
		3084	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2995	}	3085	}
2996		3086
2997	static void	3087	static void
2998	once_cb_to (EV_P_ ev_timer *w, int revents)	3088	once_cb_to (EV_P_ ev_timer *w, int revents)
2999	{	3089	{
3000	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3090	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3091
		3092	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
3001	}	3093	}
3002		3094
3003	void	3095	void
3004	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3096	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
3005	{	3097	{

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs. Revision 1.274 by root, Thu Nov 20 00:35:10 2008 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.256 by root, Thu Jun 19 06:53:49 2008 UTC vs.
Revision 1.274 by root, Thu Nov 20 00:35:10 2008 UTC