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

Comparing libev/ev.c (file contents):
Revision 1.36 by root, Thu Nov 1 13:11:11 2007 UTC vs.
Revision 1.48 by root, Sat Nov 3 12:19:31 2007 UTC

…		…
42	#include <stdio.h>	42	#include <stdio.h>
43		43
44	#include <assert.h>	44	#include <assert.h>
45	#include <errno.h>	45	#include <errno.h>
46	#include <sys/types.h>	46	#include <sys/types.h>
		47	#ifndef WIN32
47	#include <sys/wait.h>	48	# include <sys/wait.h>
		49	#endif
48	#include <sys/time.h>	50	#include <sys/time.h>
49	#include <time.h>	51	#include <time.h>
50		52
		53	/**/
		54
51	#ifndef EV_USE_MONOTONIC	55	#ifndef EV_USE_MONOTONIC
52	# ifdef CLOCK_MONOTONIC
53	# define EV_USE_MONOTONIC 1	56	# define EV_USE_MONOTONIC 1
54	# endif
55	#endif	57	#endif
56		58
57	#ifndef EV_USE_SELECT	59	#ifndef EV_USE_SELECT
58	# define EV_USE_SELECT 1	60	# define EV_USE_SELECT 1
59	#endif	61	#endif
60		62
		63	#ifndef EV_USE_POLL
		64	# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
		65	#endif
		66
61	#ifndef EV_USE_EPOLL	67	#ifndef EV_USE_EPOLL
62	# define EV_USE_EPOLL 0	68	# define EV_USE_EPOLL 0
63	#endif	69	#endif
64		70
		71	#ifndef EV_USE_KQUEUE
		72	# define EV_USE_KQUEUE 0
		73	#endif
		74
		75	#ifndef EV_USE_REALTIME
		76	# define EV_USE_REALTIME 1
		77	#endif
		78
		79	/**/
		80
		81	#ifndef CLOCK_MONOTONIC
		82	# undef EV_USE_MONOTONIC
		83	# define EV_USE_MONOTONIC 0
		84	#endif
		85
65	#ifndef CLOCK_REALTIME	86	#ifndef CLOCK_REALTIME
		87	# undef EV_USE_REALTIME
66	# define EV_USE_REALTIME 0	88	# define EV_USE_REALTIME 0
67	#endif	89	#endif
68	#ifndef EV_USE_REALTIME	90
69	# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */	91	/**/
70	#endif
71		92
72	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */	93	#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
73	#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */	94	#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
74	#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */	95	#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
75	#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */	96	/#define CLEANUP_INTERVAL 300. / how often to try to free memory and re-check fds */
76		97
77	#include "ev.h"	98	#include "ev.h"
		99
		100	#if __GNUC__ >= 3
		101	# define expect(expr,value) __builtin_expect ((expr),(value))
		102	# define inline inline
		103	#else
		104	# define expect(expr,value) (expr)
		105	# define inline static
		106	#endif
		107
		108	#define expect_false(expr) expect ((expr) != 0, 0)
		109	#define expect_true(expr) expect ((expr) != 0, 1)
		110
		111	#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
		112	#define ABSPRI(w) ((w)->priority - EV_MINPRI)
78		113
79	typedef struct ev_watcher *W;	114	typedef struct ev_watcher *W;
80	typedef struct ev_watcher_list *WL;	115	typedef struct ev_watcher_list *WL;
81	typedef struct ev_watcher_time *WT;	116	typedef struct ev_watcher_time *WT;
82		117
83	static ev_tstamp now, diff; /* monotonic clock */	118	static ev_tstamp now_floor, now, diff; /* monotonic clock */
84	ev_tstamp ev_now;	119	ev_tstamp ev_now;
85	int ev_method;	120	int ev_method;
86		121
87	static int have_monotonic; /* runtime */	122	static int have_monotonic; /* runtime */
88		123
…		…
108		143
109	static ev_tstamp	144	static ev_tstamp
110	get_clock (void)	145	get_clock (void)
111	{	146	{
112	#if EV_USE_MONOTONIC	147	#if EV_USE_MONOTONIC
113	if (have_monotonic)	148	if (expect_true (have_monotonic))
114	{	149	{
115	struct timespec ts;	150	struct timespec ts;
116	clock_gettime (CLOCK_MONOTONIC, &ts);	151	clock_gettime (CLOCK_MONOTONIC, &ts);
117	return ts.tv_sec + ts.tv_nsec * 1e-9;	152	return ts.tv_sec + ts.tv_nsec * 1e-9;
118	}	153	}
…		…
122	}	157	}
123		158
124	#define array_roundsize(base,n) ((n) \| 4 & ~3)	159	#define array_roundsize(base,n) ((n) \| 4 & ~3)
125		160
126	#define array_needsize(base,cur,cnt,init) \	161	#define array_needsize(base,cur,cnt,init) \
127	if ((cnt) > cur) \	162	if (expect_false ((cnt) > cur)) \
128	{ \	163	{ \
129	int newcnt = cur; \	164	int newcnt = cur; \
130	do \	165	do \
131	{ \	166	{ \
132	newcnt = array_roundsize (base, newcnt << 1); \	167	newcnt = array_roundsize (base, newcnt << 1); \
…		…
167	{	202	{
168	W w;	203	W w;
169	int events;	204	int events;
170	} ANPENDING;	205	} ANPENDING;
171		206
172	static ANPENDING *pendings;	207	static ANPENDING *pendings [NUMPRI];
173	static int pendingmax, pendingcnt;	208	static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
174		209
175	static void	210	static void
176	event (W w, int events)	211	event (W w, int events)
177	{	212	{
178	if (w->pending)	213	if (w->pending)
179	{	214	{
180	pendings [w->pending - 1].events \|= events;	215	pendings [ABSPRI (w)][w->pending - 1].events \|= events;
181	return;	216	return;
182	}	217	}
183		218
184	w->pending = ++pendingcnt;	219	w->pending = ++pendingcnt [ABSPRI (w)];
185	array_needsize (pendings, pendingmax, pendingcnt, );	220	array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
186	pendings [pendingcnt - 1].w = w;	221	pendings [ABSPRI (w)][w->pending - 1].w = w;
187	pendings [pendingcnt - 1].events = events;	222	pendings [ABSPRI (w)][w->pending - 1].events = events;
188	}	223	}
189		224
190	static void	225	static void
191	queue_events (W *events, int eventcnt, int type)	226	queue_events (W *events, int eventcnt, int type)
192	{	227	{
…		…
255	++fdchangecnt;	290	++fdchangecnt;
256	array_needsize (fdchanges, fdchangemax, fdchangecnt, );	291	array_needsize (fdchanges, fdchangemax, fdchangecnt, );
257	fdchanges [fdchangecnt - 1] = fd;	292	fdchanges [fdchangecnt - 1] = fd;
258	}	293	}
259		294
		295	static void
		296	fd_kill (int fd)
		297	{
		298	struct ev_io *w;
		299
		300	printf ("killing fd %d\n", fd);//D
		301	while ((w = anfds [fd].head))
		302	{
		303	ev_io_stop (w);
		304	event ((W)w, EV_ERROR \| EV_READ \| EV_WRITE);
		305	}
		306	}
		307
260	/* called on EBADF to verify fds */	308	/* called on EBADF to verify fds */
261	static void	309	static void
262	fd_recheck (void)	310	fd_ebadf (void)
263	{	311	{
264	int fd;	312	int fd;
265		313
266	for (fd = 0; fd < anfdmax; ++fd)	314	for (fd = 0; fd < anfdmax; ++fd)
267	if (anfds [fd].events)	315	if (anfds [fd].events)
268	if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)	316	if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
269	while (anfds [fd].head)	317	fd_kill (fd);
		318	}
		319
		320	/* called on ENOMEM in select/poll to kill some fds and retry */
		321	static void
		322	fd_enomem (void)
		323	{
		324	int fd = anfdmax;
		325
		326	while (fd--)
		327	if (anfds [fd].events)
270	{	328	{
271	ev_io_stop (anfds [fd].head);	329	close (fd);
272	event ((W)anfds [fd].head, EV_ERROR \| EV_READ \| EV_WRITE);	330	fd_kill (fd);
		331	return;
273	}	332	}
274	}	333	}
275		334
276	/*****************************************************************************/	335	/*****************************************************************************/
277		336
278	static struct ev_timer **timers;	337	static struct ev_timer **timers;
…		…
354	{	413	{
355	signals [signum - 1].gotsig = 1;	414	signals [signum - 1].gotsig = 1;
356		415
357	if (!gotsig)	416	if (!gotsig)
358	{	417	{
		418	int old_errno = errno;
359	gotsig = 1;	419	gotsig = 1;
360	write (sigpipe [1], &signum, 1);	420	write (sigpipe [1], &signum, 1);
		421	errno = old_errno;
361	}	422	}
362	}	423	}
363		424
364	static void	425	static void
365	sigcb (struct ev_io *iow, int revents)	426	sigcb (struct ev_io *iow, int revents)
366	{	427	{
367	struct ev_signal *w;	428	struct ev_signal *w;
368	int sig;	429	int signum;
369		430
370	read (sigpipe [0], &revents, 1);	431	read (sigpipe [0], &revents, 1);
371	gotsig = 0;	432	gotsig = 0;
372		433
373	for (sig = signalmax; sig--; )	434	for (signum = signalmax; signum--; )
374	if (signals [sig].gotsig)	435	if (signals [signum].gotsig)
375	{	436	{
376	signals [sig].gotsig = 0;	437	signals [signum].gotsig = 0;
377		438
378	for (w = signals [sig].head; w; w = w->next)	439	for (w = signals [signum].head; w; w = w->next)
379	event ((W)w, EV_SIGNAL);	440	event ((W)w, EV_SIGNAL);
380	}	441	}
381	}	442	}
382		443
383	static void	444	static void
384	siginit (void)	445	siginit (void)
385	{	446	{
		447	#ifndef WIN32
386	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);	448	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
387	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);	449	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
388		450
389	/* rather than sort out wether we really need nb, set it */	451	/* rather than sort out wether we really need nb, set it */
390	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);	452	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
391	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);	453	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
		454	#endif
392		455
393	ev_io_set (&sigev, sigpipe [0], EV_READ);	456	ev_io_set (&sigev, sigpipe [0], EV_READ);
394	ev_io_start (&sigev);	457	ev_io_start (&sigev);
395	}	458	}
396		459
…		…
408	/*****************************************************************************/	471	/*****************************************************************************/
409		472
410	static struct ev_child *childs [PID_HASHSIZE];	473	static struct ev_child *childs [PID_HASHSIZE];
411	static struct ev_signal childev;	474	static struct ev_signal childev;
412		475
		476	#ifndef WIN32
		477
413	#ifndef WCONTINUED	478	#ifndef WCONTINUED
414	# define WCONTINUED 0	479	# define WCONTINUED 0
415	#endif	480	#endif
416		481
417	static void	482	static void
		483	child_reap (struct ev_signal *sw, int chain, int pid, int status)
		484	{
		485	struct ev_child *w;
		486
		487	for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next)
		488	if (w->pid == pid \|\| !w->pid)
		489	{
		490	w->priority = sw->priority; /* need to do it now */
		491	w->rpid = pid;
		492	w->rstatus = status;
		493	printf ("rpid %p %d %d\n", w, pid, w->pid);//D
		494	event ((W)w, EV_CHILD);
		495	}
		496	}
		497
		498	static void
418	childcb (struct ev_signal *sw, int revents)	499	childcb (struct ev_signal *sw, int revents)
419	{	500	{
420	struct ev_child *w;
421	int pid, status;	501	int pid, status;
422		502
		503	printf ("chld %x\n", revents);//D
423	while ((pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)) != -1)	504	if (0 < (pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)))
424	for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)	505	{
425	if (w->pid == pid \|\| w->pid == -1)	506	/* make sure we are called again until all childs have been reaped */
426	{
427	w->status = status;
428	event ((W)w, EV_CHILD);	507	event ((W)sw, EV_SIGNAL);
429	}	508
		509	child_reap (sw, pid, pid, status);
		510	child_reap (sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
		511	}
430	}	512	}
		513
		514	#endif
431		515
432	/*****************************************************************************/	516	/*****************************************************************************/
433		517
		518	#if EV_USE_KQUEUE
		519	# include "ev_kqueue.c"
		520	#endif
434	#if EV_USE_EPOLL	521	#if EV_USE_EPOLL
435	# include "ev_epoll.c"	522	# include "ev_epoll.c"
436	#endif	523	#endif
		524	#if EV_USE_POLL
		525	# include "ev_poll.c"
		526	#endif
437	#if EV_USE_SELECT	527	#if EV_USE_SELECT
438	# include "ev_select.c"	528	# include "ev_select.c"
439	#endif	529	#endif
440		530
441	int	531	int
…		…
448	ev_version_minor (void)	538	ev_version_minor (void)
449	{	539	{
450	return EV_VERSION_MINOR;	540	return EV_VERSION_MINOR;
451	}	541	}
452		542
		543	/* return true if we are running with elevated privileges and ignore env variables */
		544	static int
		545	enable_secure ()
		546	{
		547	return getuid () != geteuid ()
		548	\|\| getgid () != getegid ();
		549	}
		550
453	int ev_init (int flags)	551	int ev_init (int methods)
454	{	552	{
455	if (!ev_method)	553	if (!ev_method)
456	{	554	{
457	#if EV_USE_MONOTONIC	555	#if EV_USE_MONOTONIC
458	{	556	{
…		…
460	if (!clock_gettime (CLOCK_MONOTONIC, &ts))	558	if (!clock_gettime (CLOCK_MONOTONIC, &ts))
461	have_monotonic = 1;	559	have_monotonic = 1;
462	}	560	}
463	#endif	561	#endif
464		562
465	ev_now = ev_time ();	563	ev_now = ev_time ();
466	now = get_clock ();	564	now = get_clock ();
		565	now_floor = now;
467	diff = ev_now - now;	566	diff = ev_now - now;
468		567
469	if (pipe (sigpipe))	568	if (pipe (sigpipe))
470	return 0;	569	return 0;
471		570
		571	if (methods == EVMETHOD_AUTO)
		572	if (!enable_secure () && getenv ("LIBEV_METHODS"))
		573	methods = atoi (getenv ("LIBEV_METHODS"));
		574	else
472	ev_method = EVMETHOD_NONE;	575	methods = EVMETHOD_ANY;
		576
		577	ev_method = 0;
		578	#if EV_USE_KQUEUE
		579	if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
		580	#endif
473	#if EV_USE_EPOLL	581	#if EV_USE_EPOLL
474	if (ev_method == EVMETHOD_NONE) epoll_init (flags);	582	if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
		583	#endif
		584	#if EV_USE_POLL
		585	if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
475	#endif	586	#endif
476	#if EV_USE_SELECT	587	#if EV_USE_SELECT
477	if (ev_method == EVMETHOD_NONE) select_init (flags);	588	if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
478	#endif	589	#endif
479		590
480	if (ev_method)	591	if (ev_method)
481	{	592	{
482	ev_watcher_init (&sigev, sigcb);	593	ev_watcher_init (&sigev, sigcb);
		594	ev_set_priority (&sigev, EV_MAXPRI);
483	siginit ();	595	siginit ();
484		596
		597	#ifndef WIN32
485	ev_signal_init (&childev, childcb, SIGCHLD);	598	ev_signal_init (&childev, childcb, SIGCHLD);
		599	ev_set_priority (&childev, EV_MAXPRI);
486	ev_signal_start (&childev);	600	ev_signal_start (&childev);
		601	#endif
487	}	602	}
488	}	603	}
489		604
490	return ev_method;	605	return ev_method;
491	}	606	}
…		…
522	/*****************************************************************************/	637	/*****************************************************************************/
523		638
524	static void	639	static void
525	call_pending (void)	640	call_pending (void)
526	{	641	{
		642	int pri;
		643
		644	for (pri = NUMPRI; pri--; )
527	while (pendingcnt)	645	while (pendingcnt [pri])
528	{	646	{
529	ANPENDING *p = pendings + --pendingcnt;	647	ANPENDING *p = pendings [pri] + --pendingcnt [pri];
530		648
531	if (p->w)	649	if (p->w)
532	{	650	{
533	p->w->pending = 0;	651	p->w->pending = 0;
534	p->w->cb (p->w, p->events);	652	p->w->cb (p->w, p->events);
535	}	653	}
536	}	654	}
537	}	655	}
538		656
539	static void	657	static void
540	timers_reify (void)	658	timers_reify (void)
541	{	659	{
…		…
601	}	719	}
602	}	720	}
603	}	721	}
604	}	722	}
605		723
		724	static int
		725	time_update_monotonic (void)
		726	{
		727	now = get_clock ();
		728
		729	if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
		730	{
		731	ev_now = now + diff;
		732	return 0;
		733	}
		734	else
		735	{
		736	now_floor = now;
		737	ev_now = ev_time ();
		738	return 1;
		739	}
		740	}
		741
606	static void	742	static void
607	time_update (void)	743	time_update (void)
608	{	744	{
609	int i;	745	int i;
610		746
611	ev_now = ev_time ();	747	#if EV_USE_MONOTONIC
612
613	if (have_monotonic)	748	if (expect_true (have_monotonic))
614	{	749	{
615	ev_tstamp odiff = diff;	750	if (time_update_monotonic ())
616
617	for (i = 4; --i; ) /* loop a few times, before making important decisions */
618	{	751	{
619	now = get_clock ();	752	ev_tstamp odiff = diff;
		753
		754	for (i = 4; --i; ) /* loop a few times, before making important decisions */
		755	{
620	diff = ev_now - now;	756	diff = ev_now - now;
621		757
622	if (fabs (odiff - diff) < MIN_TIMEJUMP)	758	if (fabs (odiff - diff) < MIN_TIMEJUMP)
623	return; /* all is well */	759	return; /* all is well */
624		760
625	ev_now = ev_time ();	761	ev_now = ev_time ();
		762	now = get_clock ();
		763	now_floor = now;
		764	}
		765
		766	periodics_reschedule (diff - odiff);
		767	/* no timer adjustment, as the monotonic clock doesn't jump */
626	}	768	}
627
628	periodics_reschedule (diff - odiff);
629	/* no timer adjustment, as the monotonic clock doesn't jump */
630	}	769	}
631	else	770	else
		771	#endif
632	{	772	{
		773	ev_now = ev_time ();
		774
633	if (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)	775	if (expect_false (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
634	{	776	{
635	periodics_reschedule (ev_now - now);	777	periodics_reschedule (ev_now - now);
636		778
637	/* adjust timers. this is easy, as the offset is the same for all */	779	/* adjust timers. this is easy, as the offset is the same for all */
638	for (i = 0; i < timercnt; ++i)	780	for (i = 0; i < timercnt; ++i)
…		…
651	ev_loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;	793	ev_loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;
652		794
653	do	795	do
654	{	796	{
655	/* queue check watchers (and execute them) */	797	/* queue check watchers (and execute them) */
656	if (preparecnt)	798	if (expect_false (preparecnt))
657	{	799	{
658	queue_events ((W *)prepares, preparecnt, EV_PREPARE);	800	queue_events ((W *)prepares, preparecnt, EV_PREPARE);
659	call_pending ();	801	call_pending ();
660	}	802	}
661		803
…		…
664		806
665	/* calculate blocking time */	807	/* calculate blocking time */
666		808
667	/* we only need this for !monotonic clockor timers, but as we basically	809	/* we only need this for !monotonic clockor timers, but as we basically
668	always have timers, we just calculate it always */	810	always have timers, we just calculate it always */
		811	#if EV_USE_MONOTONIC
		812	if (expect_true (have_monotonic))
		813	time_update_monotonic ();
		814	else
		815	#endif
		816	{
669	ev_now = ev_time ();	817	ev_now = ev_time ();
		818	now = ev_now;
		819	}
670		820
671	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)	821	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)
672	block = 0.;	822	block = 0.;
673	else	823	else
674	{	824	{
675	block = MAX_BLOCKTIME;	825	block = MAX_BLOCKTIME;
676		826
677	if (timercnt)	827	if (timercnt)
678	{	828	{
679	ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;	829	ev_tstamp to = timers [0]->at - now + method_fudge;
680	if (block > to) block = to;	830	if (block > to) block = to;
681	}	831	}
682		832
683	if (periodiccnt)	833	if (periodiccnt)
684	{	834	{
…		…
741	static void	891	static void
742	ev_clear_pending (W w)	892	ev_clear_pending (W w)
743	{	893	{
744	if (w->pending)	894	if (w->pending)
745	{	895	{
746	pendings [w->pending - 1].w = 0;	896	pendings [ABSPRI (w)][w->pending - 1].w = 0;
747	w->pending = 0;	897	w->pending = 0;
748	}	898	}
749	}	899	}
750		900
751	static void	901	static void
752	ev_start (W w, int active)	902	ev_start (W w, int active)
753	{	903	{
		904	if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
		905	if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
		906
754	w->active = active;	907	w->active = active;
755	}	908	}
756		909
757	static void	910	static void
758	ev_stop (W w)	911	ev_stop (W w)
…		…
763	/*****************************************************************************/	916	/*****************************************************************************/
764		917
765	void	918	void
766	ev_io_start (struct ev_io *w)	919	ev_io_start (struct ev_io *w)
767	{	920	{
		921	int fd = w->fd;
		922
768	if (ev_is_active (w))	923	if (ev_is_active (w))
769	return;	924	return;
770
771	int fd = w->fd;
772		925
773	assert (("ev_io_start called with negative fd", fd >= 0));	926	assert (("ev_io_start called with negative fd", fd >= 0));
774		927
775	ev_start ((W)w, 1);	928	ev_start ((W)w, 1);
776	array_needsize (anfds, anfdmax, fd + 1, anfds_init);	929	array_needsize (anfds, anfdmax, fd + 1, anfds_init);
…		…
875	}	1028	}
876		1029
877	ev_stop ((W)w);	1030	ev_stop ((W)w);
878	}	1031	}
879		1032
		1033	#ifndef SA_RESTART
		1034	# define SA_RESTART 0
		1035	#endif
		1036
880	void	1037	void
881	ev_signal_start (struct ev_signal *w)	1038	ev_signal_start (struct ev_signal *w)
882	{	1039	{
883	if (ev_is_active (w))	1040	if (ev_is_active (w))
884	return;	1041	return;
…		…
892	if (!w->next)	1049	if (!w->next)
893	{	1050	{
894	struct sigaction sa;	1051	struct sigaction sa;
895	sa.sa_handler = sighandler;	1052	sa.sa_handler = sighandler;
896	sigfillset (&sa.sa_mask);	1053	sigfillset (&sa.sa_mask);
897	sa.sa_flags = 0;	1054	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
898	sigaction (w->signum, &sa, 0);	1055	sigaction (w->signum, &sa, 0);
899	}	1056	}
900	}	1057	}
901		1058
902	void	1059	void

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.36 by root, Thu Nov 1 13:11:11 2007 UTC vs. Revision 1.48 by root, Sat Nov 3 12:19:31 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.36 by root, Thu Nov 1 13:11:11 2007 UTC vs.
Revision 1.48 by root, Sat Nov 3 12:19:31 2007 UTC