[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.47 by root, Sat Nov 3 11:44:44 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;
…		…
363		422
364	static void	423	static void
365	sigcb (struct ev_io *iow, int revents)	424	sigcb (struct ev_io *iow, int revents)
366	{	425	{
367	struct ev_signal *w;	426	struct ev_signal *w;
368	int sig;	427	int signum;
369		428
370	read (sigpipe [0], &revents, 1);	429	read (sigpipe [0], &revents, 1);
371	gotsig = 0;	430	gotsig = 0;
372		431
373	for (sig = signalmax; sig--; )	432	for (signum = signalmax; signum--; )
374	if (signals [sig].gotsig)	433	if (signals [signum].gotsig)
375	{	434	{
376	signals [sig].gotsig = 0;	435	signals [signum].gotsig = 0;
377		436
378	for (w = signals [sig].head; w; w = w->next)	437	for (w = signals [signum].head; w; w = w->next)
379	event ((W)w, EV_SIGNAL);	438	event ((W)w, EV_SIGNAL);
380	}	439	}
381	}	440	}
382		441
383	static void	442	static void
384	siginit (void)	443	siginit (void)
385	{	444	{
		445	#ifndef WIN32
386	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);	446	fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
387	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);	447	fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
388		448
389	/* rather than sort out wether we really need nb, set it */	449	/* rather than sort out wether we really need nb, set it */
390	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);	450	fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
391	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);	451	fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
		452	#endif
392		453
393	ev_io_set (&sigev, sigpipe [0], EV_READ);	454	ev_io_set (&sigev, sigpipe [0], EV_READ);
394	ev_io_start (&sigev);	455	ev_io_start (&sigev);
395	}	456	}
396		457
…		…
408	/*****************************************************************************/	469	/*****************************************************************************/
409		470
410	static struct ev_child *childs [PID_HASHSIZE];	471	static struct ev_child *childs [PID_HASHSIZE];
411	static struct ev_signal childev;	472	static struct ev_signal childev;
412		473
		474	#ifndef WIN32
		475
413	#ifndef WCONTINUED	476	#ifndef WCONTINUED
414	# define WCONTINUED 0	477	# define WCONTINUED 0
415	#endif	478	#endif
416		479
417	static void	480	static void
		481	child_reap (struct ev_signal *sw, int chain, int pid, int status)
		482	{
		483	struct ev_child *w;
		484
		485	for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next)
		486	if (w->pid == pid \|\| !w->pid)
		487	{
		488	w->priority = sw->priority; /* need to do it now */
		489	w->rpid = pid;
		490	w->rstatus = status;
		491	printf ("rpid %p %d %d\n", w, pid, w->pid);//D
		492	event ((W)w, EV_CHILD);
		493	}
		494	}
		495
		496	static void
418	childcb (struct ev_signal *sw, int revents)	497	childcb (struct ev_signal *sw, int revents)
419	{	498	{
420	struct ev_child *w;
421	int pid, status;	499	int pid, status;
422		500
		501	printf ("chld %x\n", revents);//D
423	while ((pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)) != -1)	502	if (0 < (pid = waitpid (-1, &status, WNOHANG \| WUNTRACED \| WCONTINUED)))
424	for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)	503	{
425	if (w->pid == pid \|\| w->pid == -1)	504	/* make sure we are called again until all childs have been reaped */
426	{
427	w->status = status;
428	event ((W)w, EV_CHILD);	505	event ((W)sw, EV_SIGNAL);
429	}	506
		507	child_reap (sw, pid, pid, status);
		508	child_reap (sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
		509	}
430	}	510	}
		511
		512	#endif
431		513
432	/*****************************************************************************/	514	/*****************************************************************************/
433		515
		516	#if EV_USE_KQUEUE
		517	# include "ev_kqueue.c"
		518	#endif
434	#if EV_USE_EPOLL	519	#if EV_USE_EPOLL
435	# include "ev_epoll.c"	520	# include "ev_epoll.c"
436	#endif	521	#endif
		522	#if EV_USE_POLL
		523	# include "ev_poll.c"
		524	#endif
437	#if EV_USE_SELECT	525	#if EV_USE_SELECT
438	# include "ev_select.c"	526	# include "ev_select.c"
439	#endif	527	#endif
440		528
441	int	529	int
…		…
448	ev_version_minor (void)	536	ev_version_minor (void)
449	{	537	{
450	return EV_VERSION_MINOR;	538	return EV_VERSION_MINOR;
451	}	539	}
452		540
		541	/* return true if we are running with elevated privileges and ignore env variables */
		542	static int
		543	enable_secure ()
		544	{
		545	return getuid () != geteuid ()
		546	\|\| getgid () != getegid ();
		547	}
		548
453	int ev_init (int flags)	549	int ev_init (int methods)
454	{	550	{
455	if (!ev_method)	551	if (!ev_method)
456	{	552	{
457	#if EV_USE_MONOTONIC	553	#if EV_USE_MONOTONIC
458	{	554	{
…		…
460	if (!clock_gettime (CLOCK_MONOTONIC, &ts))	556	if (!clock_gettime (CLOCK_MONOTONIC, &ts))
461	have_monotonic = 1;	557	have_monotonic = 1;
462	}	558	}
463	#endif	559	#endif
464		560
465	ev_now = ev_time ();	561	ev_now = ev_time ();
466	now = get_clock ();	562	now = get_clock ();
		563	now_floor = now;
467	diff = ev_now - now;	564	diff = ev_now - now;
468		565
469	if (pipe (sigpipe))	566	if (pipe (sigpipe))
470	return 0;	567	return 0;
471		568
		569	if (methods == EVMETHOD_AUTO)
		570	if (!enable_secure () && getenv ("LIBEV_METHODS"))
		571	methods = atoi (getenv ("LIBEV_METHODS"));
		572	else
472	ev_method = EVMETHOD_NONE;	573	methods = EVMETHOD_ANY;
		574
		575	ev_method = 0;
		576	#if EV_USE_KQUEUE
		577	if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
		578	#endif
473	#if EV_USE_EPOLL	579	#if EV_USE_EPOLL
474	if (ev_method == EVMETHOD_NONE) epoll_init (flags);	580	if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
		581	#endif
		582	#if EV_USE_POLL
		583	if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
475	#endif	584	#endif
476	#if EV_USE_SELECT	585	#if EV_USE_SELECT
477	if (ev_method == EVMETHOD_NONE) select_init (flags);	586	if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
478	#endif	587	#endif
479		588
480	if (ev_method)	589	if (ev_method)
481	{	590	{
482	ev_watcher_init (&sigev, sigcb);	591	ev_watcher_init (&sigev, sigcb);
		592	ev_set_priority (&sigev, EV_MAXPRI);
483	siginit ();	593	siginit ();
484		594
		595	#ifndef WIN32
485	ev_signal_init (&childev, childcb, SIGCHLD);	596	ev_signal_init (&childev, childcb, SIGCHLD);
		597	ev_set_priority (&childev, EV_MAXPRI);
486	ev_signal_start (&childev);	598	ev_signal_start (&childev);
		599	#endif
487	}	600	}
488	}	601	}
489		602
490	return ev_method;	603	return ev_method;
491	}	604	}
…		…
522	/*****************************************************************************/	635	/*****************************************************************************/
523		636
524	static void	637	static void
525	call_pending (void)	638	call_pending (void)
526	{	639	{
		640	int pri;
		641
		642	for (pri = NUMPRI; pri--; )
527	while (pendingcnt)	643	while (pendingcnt [pri])
528	{	644	{
529	ANPENDING *p = pendings + --pendingcnt;	645	ANPENDING *p = pendings [pri] + --pendingcnt [pri];
530		646
531	if (p->w)	647	if (p->w)
532	{	648	{
533	p->w->pending = 0;	649	p->w->pending = 0;
534	p->w->cb (p->w, p->events);	650	p->w->cb (p->w, p->events);
535	}	651	}
536	}	652	}
537	}	653	}
538		654
539	static void	655	static void
540	timers_reify (void)	656	timers_reify (void)
541	{	657	{
…		…
601	}	717	}
602	}	718	}
603	}	719	}
604	}	720	}
605		721
		722	static int
		723	time_update_monotonic (void)
		724	{
		725	now = get_clock ();
		726
		727	if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
		728	{
		729	ev_now = now + diff;
		730	return 0;
		731	}
		732	else
		733	{
		734	now_floor = now;
		735	ev_now = ev_time ();
		736	return 1;
		737	}
		738	}
		739
606	static void	740	static void
607	time_update (void)	741	time_update (void)
608	{	742	{
609	int i;	743	int i;
610		744
611	ev_now = ev_time ();	745	#if EV_USE_MONOTONIC
612
613	if (have_monotonic)	746	if (expect_true (have_monotonic))
614	{	747	{
615	ev_tstamp odiff = diff;	748	if (time_update_monotonic ())
616
617	for (i = 4; --i; ) /* loop a few times, before making important decisions */
618	{	749	{
619	now = get_clock ();	750	ev_tstamp odiff = diff;
		751
		752	for (i = 4; --i; ) /* loop a few times, before making important decisions */
		753	{
620	diff = ev_now - now;	754	diff = ev_now - now;
621		755
622	if (fabs (odiff - diff) < MIN_TIMEJUMP)	756	if (fabs (odiff - diff) < MIN_TIMEJUMP)
623	return; /* all is well */	757	return; /* all is well */
624		758
625	ev_now = ev_time ();	759	ev_now = ev_time ();
		760	now = get_clock ();
		761	now_floor = now;
		762	}
		763
		764	periodics_reschedule (diff - odiff);
		765	/* no timer adjustment, as the monotonic clock doesn't jump */
626	}	766	}
627
628	periodics_reschedule (diff - odiff);
629	/* no timer adjustment, as the monotonic clock doesn't jump */
630	}	767	}
631	else	768	else
		769	#endif
632	{	770	{
		771	ev_now = ev_time ();
		772
633	if (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)	773	if (expect_false (now > ev_now \|\| now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
634	{	774	{
635	periodics_reschedule (ev_now - now);	775	periodics_reschedule (ev_now - now);
636		776
637	/* adjust timers. this is easy, as the offset is the same for all */	777	/* adjust timers. this is easy, as the offset is the same for all */
638	for (i = 0; i < timercnt; ++i)	778	for (i = 0; i < timercnt; ++i)
…		…
651	ev_loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;	791	ev_loop_done = flags & (EVLOOP_ONESHOT \| EVLOOP_NONBLOCK) ? 1 : 0;
652		792
653	do	793	do
654	{	794	{
655	/* queue check watchers (and execute them) */	795	/* queue check watchers (and execute them) */
656	if (preparecnt)	796	if (expect_false (preparecnt))
657	{	797	{
658	queue_events ((W *)prepares, preparecnt, EV_PREPARE);	798	queue_events ((W *)prepares, preparecnt, EV_PREPARE);
659	call_pending ();	799	call_pending ();
660	}	800	}
661		801
…		…
664		804
665	/* calculate blocking time */	805	/* calculate blocking time */
666		806
667	/* we only need this for !monotonic clockor timers, but as we basically	807	/* we only need this for !monotonic clockor timers, but as we basically
668	always have timers, we just calculate it always */	808	always have timers, we just calculate it always */
		809	#if EV_USE_MONOTONIC
		810	if (expect_true (have_monotonic))
		811	time_update_monotonic ();
		812	else
		813	#endif
		814	{
669	ev_now = ev_time ();	815	ev_now = ev_time ();
		816	now = ev_now;
		817	}
670		818
671	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)	819	if (flags & EVLOOP_NONBLOCK \|\| idlecnt)
672	block = 0.;	820	block = 0.;
673	else	821	else
674	{	822	{
675	block = MAX_BLOCKTIME;	823	block = MAX_BLOCKTIME;
676		824
677	if (timercnt)	825	if (timercnt)
678	{	826	{
679	ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;	827	ev_tstamp to = timers [0]->at - now + method_fudge;
680	if (block > to) block = to;	828	if (block > to) block = to;
681	}	829	}
682		830
683	if (periodiccnt)	831	if (periodiccnt)
684	{	832	{
…		…
741	static void	889	static void
742	ev_clear_pending (W w)	890	ev_clear_pending (W w)
743	{	891	{
744	if (w->pending)	892	if (w->pending)
745	{	893	{
746	pendings [w->pending - 1].w = 0;	894	pendings [ABSPRI (w)][w->pending - 1].w = 0;
747	w->pending = 0;	895	w->pending = 0;
748	}	896	}
749	}	897	}
750		898
751	static void	899	static void
752	ev_start (W w, int active)	900	ev_start (W w, int active)
753	{	901	{
		902	if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
		903	if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
		904
754	w->active = active;	905	w->active = active;
755	}	906	}
756		907
757	static void	908	static void
758	ev_stop (W w)	909	ev_stop (W w)
…		…
763	/*****************************************************************************/	914	/*****************************************************************************/
764		915
765	void	916	void
766	ev_io_start (struct ev_io *w)	917	ev_io_start (struct ev_io *w)
767	{	918	{
		919	int fd = w->fd;
		920
768	if (ev_is_active (w))	921	if (ev_is_active (w))
769	return;	922	return;
770
771	int fd = w->fd;
772		923
773	assert (("ev_io_start called with negative fd", fd >= 0));	924	assert (("ev_io_start called with negative fd", fd >= 0));
774		925
775	ev_start ((W)w, 1);	926	ev_start ((W)w, 1);
776	array_needsize (anfds, anfdmax, fd + 1, anfds_init);	927	array_needsize (anfds, anfdmax, fd + 1, anfds_init);
…		…
875	}	1026	}
876		1027
877	ev_stop ((W)w);	1028	ev_stop ((W)w);
878	}	1029	}
879		1030
		1031	#ifndef SA_RESTART
		1032	# define SA_RESTART 0
		1033	#endif
		1034
880	void	1035	void
881	ev_signal_start (struct ev_signal *w)	1036	ev_signal_start (struct ev_signal *w)
882	{	1037	{
883	if (ev_is_active (w))	1038	if (ev_is_active (w))
884	return;	1039	return;
…		…
892	if (!w->next)	1047	if (!w->next)
893	{	1048	{
894	struct sigaction sa;	1049	struct sigaction sa;
895	sa.sa_handler = sighandler;	1050	sa.sa_handler = sighandler;
896	sigfillset (&sa.sa_mask);	1051	sigfillset (&sa.sa_mask);
897	sa.sa_flags = 0;	1052	sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
898	sigaction (w->signum, &sa, 0);	1053	sigaction (w->signum, &sa, 0);
899	}	1054	}
900	}	1055	}
901		1056
902	void	1057	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.47 by root, Sat Nov 3 11:44:44 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.47 by root, Sat Nov 3 11:44:44 2007 UTC