[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.273 by root, Mon Nov 3 14:27:06 2008 UTC

…		…
154	#ifndef _WIN32	154	#ifndef _WIN32
155	# include <sys/time.h>	155	# include <sys/time.h>
156	# include <sys/wait.h>	156	# include <sys/wait.h>
157	# include <unistd.h>	157	# include <unistd.h>
158	#else	158	#else
		159	# include <io.h>
159	# define WIN32_LEAN_AND_MEAN	160	# define WIN32_LEAN_AND_MEAN
160	# include <windows.h>	161	# include <windows.h>
161	# ifndef EV_SELECT_IS_WINSOCKET	162	# ifndef EV_SELECT_IS_WINSOCKET
162	# define EV_SELECT_IS_WINSOCKET 1	163	# define EV_SELECT_IS_WINSOCKET 1
163	# endif	164	# endif
…		…
285	# include <sys/select.h>	286	# include <sys/select.h>
286	# endif	287	# endif
287	#endif	288	#endif
288		289
289	#if EV_USE_INOTIFY	290	#if EV_USE_INOTIFY
		291	# include <sys/utsname.h>
		292	# include <sys/statfs.h>
290	# include <sys/inotify.h>	293	# include <sys/inotify.h>
		294	/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
		295	# ifndef IN_DONT_FOLLOW
		296	# undef EV_USE_INOTIFY
		297	# define EV_USE_INOTIFY 0
		298	# endif
291	#endif	299	#endif
292		300
293	#if EV_SELECT_IS_WINSOCKET	301	#if EV_SELECT_IS_WINSOCKET
294	# include <winsock.h>	302	# include <winsock.h>
295	#endif	303	#endif
…		…
381	{	389	{
382	syserr_cb = cb;	390	syserr_cb = cb;
383	}	391	}
384		392
385	static void noinline	393	static void noinline
386	syserr (const char *msg)	394	ev_syserr (const char *msg)
387	{	395	{
388	if (!msg)	396	if (!msg)
389	msg = "(libev) system error";	397	msg = "(libev) system error";
390		398
391	if (syserr_cb)	399	if (syserr_cb)
…		…
442	typedef struct	450	typedef struct
443	{	451	{
444	WL head;	452	WL head;
445	unsigned char events;	453	unsigned char events;
446	unsigned char reify;	454	unsigned char reify;
		455	unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
		456	unsigned char unused;
		457	#if EV_USE_EPOLL
		458	unsigned int egen; /* generation counter to counter epoll bugs */
		459	#endif
447	#if EV_SELECT_IS_WINSOCKET	460	#if EV_SELECT_IS_WINSOCKET
448	SOCKET handle;	461	SOCKET handle;
449	#endif	462	#endif
450	} ANFD;	463	} ANFD;
451		464
…		…
564	struct timeval tv;	577	struct timeval tv;
565		578
566	tv.tv_sec = (time_t)delay;	579	tv.tv_sec = (time_t)delay;
567	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);	580	tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
568		581
		582	/* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
		583	/* somehting nto guaranteed by newer posix versions, but guaranteed */
		584	/* by older ones */
569	select (0, 0, 0, 0, &tv);	585	select (0, 0, 0, 0, &tv);
570	#endif	586	#endif
571	}	587	}
572	}	588	}
573		589
…		…
600	array_realloc (int elem, void base, int cur, int cnt)	616	array_realloc (int elem, void base, int cur, int cnt)
601	{	617	{
602	cur = array_nextsize (elem, cur, cnt);	618	cur = array_nextsize (elem, cur, cnt);
603	return ev_realloc (base, elem * *cur);	619	return ev_realloc (base, elem * *cur);
604	}	620	}
		621
		622	#define array_init_zero(base,count) \
		623	memset ((void )(base), 0, sizeof ((base)) * (count))
605		624
606	#define array_needsize(type,base,cur,cnt,init) \	625	#define array_needsize(type,base,cur,cnt,init) \
607	if (expect_false ((cnt) > (cur))) \	626	if (expect_false ((cnt) > (cur))) \
608	{ \	627	{ \
609	int ocur_ = (cur); \	628	int ocur_ = (cur); \
…		…
652	for (i = 0; i < eventcnt; ++i)	671	for (i = 0; i < eventcnt; ++i)
653	ev_feed_event (EV_A_ events [i], type);	672	ev_feed_event (EV_A_ events [i], type);
654	}	673	}
655		674
656	/*****************************************************************************/	675	/*****************************************************************************/
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		676
671	void inline_speed	677	void inline_speed
672	fd_event (EV_P_ int fd, int revents)	678	fd_event (EV_P_ int fd, int revents)
673	{	679	{
674	ANFD *anfd = anfds + fd;	680	ANFD *anfd = anfds + fd;
…		…
804		810
805	for (fd = 0; fd < anfdmax; ++fd)	811	for (fd = 0; fd < anfdmax; ++fd)
806	if (anfds [fd].events)	812	if (anfds [fd].events)
807	{	813	{
808	anfds [fd].events = 0;	814	anfds [fd].events = 0;
		815	anfds [fd].emask = 0;
809	fd_change (EV_A_ fd, EV_IOFDSET \| 1);	816	fd_change (EV_A_ fd, EV_IOFDSET \| 1);
810	}	817	}
811	}	818	}
812		819
813	/*****************************************************************************/	820	/*****************************************************************************/
…		…
965	static ANSIG *signals;	972	static ANSIG *signals;
966	static int signalmax;	973	static int signalmax;
967		974
968	static EV_ATOMIC_T gotsig;	975	static EV_ATOMIC_T gotsig;
969		976
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	/*****************************************************************************/	977	/*****************************************************************************/
983		978
984	void inline_speed	979	void inline_speed
985	fd_intern (int fd)	980	fd_intern (int fd)
986	{	981	{
…		…
1007	}	1002	}
1008	else	1003	else
1009	#endif	1004	#endif
1010	{	1005	{
1011	while (pipe (evpipe))	1006	while (pipe (evpipe))
1012	syserr ("(libev) error creating signal/async pipe");	1007	ev_syserr ("(libev) error creating signal/async pipe");
1013		1008
1014	fd_intern (evpipe [0]);	1009	fd_intern (evpipe [0]);
1015	fd_intern (evpipe [1]);	1010	fd_intern (evpipe [1]);
1016	ev_io_set (&pipeev, evpipe [0], EV_READ);	1011	ev_io_set (&pipeev, evpipe [0], EV_READ);
1017	}	1012	}
…		…
1507	{	1502	{
1508	postfork = 1; /* must be in line with ev_default_fork */	1503	postfork = 1; /* must be in line with ev_default_fork */
1509	}	1504	}
1510		1505
1511	#if EV_VERIFY	1506	#if EV_VERIFY
1512	void noinline	1507	static void noinline
1513	verify_watcher (EV_P_ W w)	1508	verify_watcher (EV_P_ W w)
1514	{	1509	{
1515	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));	1510	assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1516		1511
1517	if (w->pending)	1512	if (w->pending)
…		…
1648	{	1643	{
1649	#if EV_MULTIPLICITY	1644	#if EV_MULTIPLICITY
1650	struct ev_loop *loop = ev_default_loop_ptr;	1645	struct ev_loop *loop = ev_default_loop_ptr;
1651	#endif	1646	#endif
1652		1647
		1648	ev_default_loop_ptr = 0;
		1649
1653	#ifndef _WIN32	1650	#ifndef _WIN32
1654	ev_ref (EV_A); /* child watcher */	1651	ev_ref (EV_A); /* child watcher */
1655	ev_signal_stop (EV_A_ &childev);	1652	ev_signal_stop (EV_A_ &childev);
1656	#endif	1653	#endif
1657		1654
…		…
1663	{	1660	{
1664	#if EV_MULTIPLICITY	1661	#if EV_MULTIPLICITY
1665	struct ev_loop *loop = ev_default_loop_ptr;	1662	struct ev_loop *loop = ev_default_loop_ptr;
1666	#endif	1663	#endif
1667		1664
1668	if (backend)
1669	postfork = 1; /* must be in line with ev_loop_fork */	1665	postfork = 1; /* must be in line with ev_loop_fork */
1670	}	1666	}
1671		1667
1672	/*****************************************************************************/	1668	/*****************************************************************************/
1673		1669
1674	void	1670	void
…		…
1905	ev_unref (EV_P)	1901	ev_unref (EV_P)
1906	{	1902	{
1907	--activecnt;	1903	--activecnt;
1908	}	1904	}
1909		1905
		1906	void
		1907	ev_now_update (EV_P)
		1908	{
		1909	time_update (EV_A_ 1e100);
		1910	}
		1911
1910	static int loop_done;	1912	static int loop_done;
1911		1913
1912	void	1914	void
1913	ev_loop (EV_P_ int flags)	1915	ev_loop (EV_P_ int flags)
1914	{	1916	{
…		…
2123		2125
2124	if (expect_false (ev_is_active (w)))	2126	if (expect_false (ev_is_active (w)))
2125	return;	2127	return;
2126		2128
2127	assert (("ev_io_start called with negative fd", fd >= 0));	2129	assert (("ev_io_start called with negative fd", fd >= 0));
		2130	assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET \| EV_READ \| EV_WRITE))));
2128		2131
2129	EV_FREQUENT_CHECK;	2132	EV_FREQUENT_CHECK;
2130		2133
2131	ev_start (EV_A_ (W)w, 1);	2134	ev_start (EV_A_ (W)w, 1);
2132	array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);	2135	array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2133	wlist_add (&anfds[fd].head, (WL)w);	2136	wlist_add (&anfds[fd].head, (WL)w);
2134		2137
2135	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);	2138	fd_change (EV_A_ fd, w->events & EV_IOFDSET \| 1);
2136	w->events &= ~EV_IOFDSET;	2139	w->events &= ~EV_IOFDSET;
2137		2140
…		…
2329	sigset_t full, prev;	2332	sigset_t full, prev;
2330	sigfillset (&full);	2333	sigfillset (&full);
2331	sigprocmask (SIG_SETMASK, &full, &prev);	2334	sigprocmask (SIG_SETMASK, &full, &prev);
2332	#endif	2335	#endif
2333		2336
2334	array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);	2337	array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
2335		2338
2336	#ifndef _WIN32	2339	#ifndef _WIN32
2337	sigprocmask (SIG_SETMASK, &prev, 0);	2340	sigprocmask (SIG_SETMASK, &prev, 0);
2338	#endif	2341	#endif
2339	}	2342	}
…		…
2412	# ifdef _WIN32	2415	# ifdef _WIN32
2413	# undef lstat	2416	# undef lstat
2414	# define lstat(a,b) _stati64 (a,b)	2417	# define lstat(a,b) _stati64 (a,b)
2415	# endif	2418	# endif
2416		2419
2417	#define DEF_STAT_INTERVAL 5.0074891	2420	#define DEF_STAT_INTERVAL 5.0074891
		2421	#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2418	#define MIN_STAT_INTERVAL 0.1074891	2422	#define MIN_STAT_INTERVAL 0.1074891
2419		2423
2420	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);	2424	static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2421		2425
2422	#if EV_USE_INOTIFY	2426	#if EV_USE_INOTIFY
2423	# define EV_INOTIFY_BUFSIZE 8192	2427	# define EV_INOTIFY_BUFSIZE 8192
…		…
2427	{	2431	{
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);	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);
2429		2433
2430	if (w->wd < 0)	2434	if (w->wd < 0)
2431	{	2435	{
		2436	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 */	2437	ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2433		2438
2434	/* monitor some parent directory for speedup hints */	2439	/* monitor some parent directory for speedup hints */
2435	/* note that exceeding the hardcoded limit is not a correctness issue, */	2440	/* note that exceeding the hardcoded path limit is not a correctness issue, */
2436	/* but an efficiency issue only */	2441	/* but an efficiency issue only */
2437	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)	2442	if ((errno == ENOENT \|\| errno == EACCES) && strlen (w->path) < 4096)
2438	{	2443	{
2439	char path [4096];	2444	char path [4096];
2440	strcpy (path, w->path);	2445	strcpy (path, w->path);
…		…
2454	}	2459	}
2455	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));	2460	while (w->wd < 0 && (errno == ENOENT \|\| errno == EACCES));
2456	}	2461	}
2457	}	2462	}
2458	else	2463	else
2459	ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */	2464	{
2460
2461	if (w->wd >= 0)
2462	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);	2465	wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
		2466
		2467	/* now local changes will be tracked by inotify, but remote changes won't */
		2468	/* unless the filesystem it known to be local, we therefore still poll */
		2469	/* also do poll on <2.6.25, but with normal frequency */
		2470	struct statfs sfs;
		2471
		2472	if (fs_2625 && !statfs (w->path, &sfs))
		2473	if (sfs.f_type == 0x1373 /* devfs */
		2474	\|\| sfs.f_type == 0xEF53 /* ext2/3 */
		2475	\|\| sfs.f_type == 0x3153464a /* jfs */
		2476	\|\| sfs.f_type == 0x52654973 /* reiser3 */
		2477	\|\| sfs.f_type == 0x01021994 /* tempfs */
		2478	\|\| sfs.f_type == 0x58465342 /* xfs */)
		2479	return;
		2480
		2481	w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
		2482	ev_timer_again (EV_A_ &w->timer);
		2483	}
2463	}	2484	}
2464		2485
2465	static void noinline	2486	static void noinline
2466	infy_del (EV_P_ ev_stat *w)	2487	infy_del (EV_P_ ev_stat *w)
2467	{	2488	{
…		…
2481		2502
2482	static void noinline	2503	static void noinline
2483	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)	2504	infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
2484	{	2505	{
2485	if (slot < 0)	2506	if (slot < 0)
2486	/* overflow, need to check for all hahs slots */	2507	/* overflow, need to check for all hash slots */
2487	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)	2508	for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
2488	infy_wd (EV_A_ slot, wd, ev);	2509	infy_wd (EV_A_ slot, wd, ev);
2489	else	2510	else
2490	{	2511	{
2491	WL w_;	2512	WL w_;
…		…
2520	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)	2541	for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2521	infy_wd (EV_A_ ev->wd, ev->wd, ev);	2542	infy_wd (EV_A_ ev->wd, ev->wd, ev);
2522	}	2543	}
2523		2544
2524	void inline_size	2545	void inline_size
		2546	check_2625 (EV_P)
		2547	{
		2548	/* kernels < 2.6.25 are borked
		2549	* http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
		2550	*/
		2551	struct utsname buf;
		2552	int major, minor, micro;
		2553
		2554	if (uname (&buf))
		2555	return;
		2556
		2557	if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
		2558	return;
		2559
		2560	if (major < 2
		2561	\|\| (major == 2 && minor < 6)
		2562	\|\| (major == 2 && minor == 6 && micro < 25))
		2563	return;
		2564
		2565	fs_2625 = 1;
		2566	}
		2567
		2568	void inline_size
2525	infy_init (EV_P)	2569	infy_init (EV_P)
2526	{	2570	{
2527	if (fs_fd != -2)	2571	if (fs_fd != -2)
2528	return;	2572	return;
		2573
		2574	fs_fd = -1;
		2575
		2576	check_2625 (EV_A);
2529		2577
2530	fs_fd = inotify_init ();	2578	fs_fd = inotify_init ();
2531		2579
2532	if (fs_fd >= 0)	2580	if (fs_fd >= 0)
2533	{	2581	{
…		…
2561	w->wd = -1;	2609	w->wd = -1;
2562		2610
2563	if (fs_fd >= 0)	2611	if (fs_fd >= 0)
2564	infy_add (EV_A_ w); /* re-add, no matter what */	2612	infy_add (EV_A_ w); /* re-add, no matter what */
2565	else	2613	else
2566	ev_timer_start (EV_A_ &w->timer);	2614	ev_timer_again (EV_A_ &w->timer);
2567	}	2615	}
2568
2569	}	2616	}
2570	}	2617	}
2571		2618
2572	#endif	2619	#endif
2573		2620
…		…
2609	\|\| w->prev.st_atime != w->attr.st_atime	2656	\|\| w->prev.st_atime != w->attr.st_atime
2610	\|\| w->prev.st_mtime != w->attr.st_mtime	2657	\|\| w->prev.st_mtime != w->attr.st_mtime
2611	\|\| w->prev.st_ctime != w->attr.st_ctime	2658	\|\| w->prev.st_ctime != w->attr.st_ctime
2612	) {	2659	) {
2613	#if EV_USE_INOTIFY	2660	#if EV_USE_INOTIFY
		2661	if (fs_fd >= 0)
		2662	{
2614	infy_del (EV_A_ w);	2663	infy_del (EV_A_ w);
2615	infy_add (EV_A_ w);	2664	infy_add (EV_A_ w);
2616	ev_stat_stat (EV_A_ w); /* avoid race... */	2665	ev_stat_stat (EV_A_ w); /* avoid race... */
		2666	}
2617	#endif	2667	#endif
2618		2668
2619	ev_feed_event (EV_A_ w, EV_STAT);	2669	ev_feed_event (EV_A_ w, EV_STAT);
2620	}	2670	}
2621	}	2671	}
…		…
2624	ev_stat_start (EV_P_ ev_stat *w)	2674	ev_stat_start (EV_P_ ev_stat *w)
2625	{	2675	{
2626	if (expect_false (ev_is_active (w)))	2676	if (expect_false (ev_is_active (w)))
2627	return;	2677	return;
2628		2678
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);	2679	ev_stat_stat (EV_A_ w);
2634		2680
		2681	if (w->interval < MIN_STAT_INTERVAL && w->interval)
2635	if (w->interval < MIN_STAT_INTERVAL)	2682	w->interval = MIN_STAT_INTERVAL;
2636	w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2637		2683
2638	ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);	2684	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));	2685	ev_set_priority (&w->timer, ev_priority (w));
2640		2686
2641	#if EV_USE_INOTIFY	2687	#if EV_USE_INOTIFY
2642	infy_init (EV_A);	2688	infy_init (EV_A);
2643		2689
2644	if (fs_fd >= 0)	2690	if (fs_fd >= 0)
2645	infy_add (EV_A_ w);	2691	infy_add (EV_A_ w);
2646	else	2692	else
2647	#endif	2693	#endif
2648	ev_timer_start (EV_A_ &w->timer);	2694	ev_timer_again (EV_A_ &w->timer);
2649		2695
2650	ev_start (EV_A_ (W)w, 1);	2696	ev_start (EV_A_ (W)w, 1);
2651		2697
2652	EV_FREQUENT_CHECK;	2698	EV_FREQUENT_CHECK;
2653	}	2699	}
…		…
2823	ev_loop (EV_A_ EVLOOP_NONBLOCK);	2869	ev_loop (EV_A_ EVLOOP_NONBLOCK);
2824	}	2870	}
2825	}	2871	}
2826	}	2872	}
2827		2873
		2874	static void
		2875	embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
		2876	{
		2877	ev_embed w = (ev_embed )(((char *)fork_w) - offsetof (ev_embed, fork));
		2878
		2879	{
		2880	struct ev_loop *loop = w->other;
		2881
		2882	ev_loop_fork (EV_A);
		2883	}
		2884	}
		2885
2828	#if 0	2886	#if 0
2829	static void	2887	static void
2830	embed_idle_cb (EV_P_ ev_idle *idle, int revents)	2888	embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2831	{	2889	{
2832	ev_idle_stop (EV_A_ idle);	2890	ev_idle_stop (EV_A_ idle);
…		…
2852		2910
2853	ev_prepare_init (&w->prepare, embed_prepare_cb);	2911	ev_prepare_init (&w->prepare, embed_prepare_cb);
2854	ev_set_priority (&w->prepare, EV_MINPRI);	2912	ev_set_priority (&w->prepare, EV_MINPRI);
2855	ev_prepare_start (EV_A_ &w->prepare);	2913	ev_prepare_start (EV_A_ &w->prepare);
2856		2914
		2915	ev_fork_init (&w->fork, embed_fork_cb);
		2916	ev_fork_start (EV_A_ &w->fork);
		2917
2857	/ev_idle_init (&w->idle, e,bed_idle_cb);/	2918	/ev_idle_init (&w->idle, e,bed_idle_cb);/
2858		2919
2859	ev_start (EV_A_ (W)w, 1);	2920	ev_start (EV_A_ (W)w, 1);
2860		2921
2861	EV_FREQUENT_CHECK;	2922	EV_FREQUENT_CHECK;
…		…
2868	if (expect_false (!ev_is_active (w)))	2929	if (expect_false (!ev_is_active (w)))
2869	return;	2930	return;
2870		2931
2871	EV_FREQUENT_CHECK;	2932	EV_FREQUENT_CHECK;
2872		2933
2873	ev_io_stop (EV_A_ &w->io);	2934	ev_io_stop (EV_A_ &w->io);
2874	ev_prepare_stop (EV_A_ &w->prepare);	2935	ev_prepare_stop (EV_A_ &w->prepare);
2875		2936	ev_fork_stop (EV_A_ &w->fork);
2876	ev_stop (EV_A_ (W)w);
2877		2937
2878	EV_FREQUENT_CHECK;	2938	EV_FREQUENT_CHECK;
2879	}	2939	}
2880	#endif	2940	#endif
2881		2941
…		…
2978	once_cb (EV_P_ struct ev_once *once, int revents)	3038	once_cb (EV_P_ struct ev_once *once, int revents)
2979	{	3039	{
2980	void (cb)(int revents, void arg) = once->cb;	3040	void (cb)(int revents, void arg) = once->cb;
2981	void *arg = once->arg;	3041	void *arg = once->arg;
2982		3042
2983	ev_io_stop (EV_A_ &once->io);	3043	ev_io_stop (EV_A_ &once->io);
2984	ev_timer_stop (EV_A_ &once->to);	3044	ev_timer_stop (EV_A_ &once->to);
2985	ev_free (once);	3045	ev_free (once);
2986		3046
2987	cb (revents, arg);	3047	cb (revents, arg);
2988	}	3048	}
2989		3049
2990	static void	3050	static void
2991	once_cb_io (EV_P_ ev_io *w, int revents)	3051	once_cb_io (EV_P_ ev_io *w, int revents)
2992	{	3052	{
2993	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, io)), revents);	3053	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, io));
		3054
		3055	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->to));
2994	}	3056	}
2995		3057
2996	static void	3058	static void
2997	once_cb_to (EV_P_ ev_timer *w, int revents)	3059	once_cb_to (EV_P_ ev_timer *w, int revents)
2998	{	3060	{
2999	once_cb (EV_A_ (struct ev_once )(((char )w) - offsetof (struct ev_once, to)), revents);	3061	struct ev_once once = (struct ev_once )(((char *)w) - offsetof (struct ev_once, to));
		3062
		3063	once_cb (EV_A_ once, revents \| ev_clear_pending (EV_A_ &once->io));
3000	}	3064	}
3001		3065
3002	void	3066	void
3003	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)	3067	ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (cb)(int revents, void arg), void *arg)
3004	{	3068	{

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.273 by root, Mon Nov 3 14:27:06 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.273 by root, Mon Nov 3 14:27:06 2008 UTC