ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/IO-AIO/AIO.xs

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.13 by root, Fri Jul 22 08:25:22 2005 UTC vs.
Revision 1.52 by root, Sun Oct 22 22:14:54 2006 UTC

1	#define _XOPEN_SOURCE 500	1	#define _REENTRANT 1
		2	#include <errno.h>
2		3
3	#include "EXTERN.h"	4	#include "EXTERN.h"
4	#include "perl.h"	5	#include "perl.h"
5	#include "XSUB.h"	6	#include "XSUB.h"
6		7
		8	#include "autoconf/config.h"
		9
		10	#include <pthread.h>
		11
		12	#include <stddef.h>
		13	#include <errno.h>
		14	#include <sys/time.h>
		15	#include <sys/select.h>
7	#include <sys/types.h>	16	#include <sys/types.h>
8	#include <sys/stat.h>	17	#include <sys/stat.h>
9		18	#include <limits.h>
10	#include <unistd.h>	19	#include <unistd.h>
11	#include <fcntl.h>	20	#include <fcntl.h>
12	#include <signal.h>	21	#include <signal.h>
13	#include <sched.h>	22	#include <sched.h>
		23
		24	#if HAVE_SENDFILE
14	#if __linux	25	# if __linux
		26	# include <sys/sendfile.h>
		27	# elif __freebsd
15	#include <sys/syscall.h>	28	# include <sys/socket.h>
		29	# include <sys/uio.h>
		30	# elif __hpux
		31	# include <sys/socket.h>
		32	# elif __solaris /* not yet */
		33	# include <sys/sendfile.h>
		34	# else
		35	# error sendfile support requested but not available
		36	# endif
16	#endif	37	#endif
17		38
18	#include <pthread.h>	39	/* used for struct dirent, AIX doesn't provide it */
19		40	#ifndef NAME_MAX
20	typedef void *InputStream; /* hack, but 5.6.1 is simply toooo old ;) */	41	# define NAME_MAX 4096
21	typedef void *OutputStream; /* hack, but 5.6.1 is simply toooo old ;) */	42	#endif
22	typedef void *InOutStream; /* hack, but 5.6.1 is simply toooo old ;) */
23		43
24	#if __ia64	44	#if __ia64
25	# define STACKSIZE 65536	45	# define STACKSIZE 65536
26	#else	46	#else
27	# define STACKSIZE 4096	47	# define STACKSIZE 8192
28	#endif	48	#endif
29		49
30	enum {	50	enum {
31	REQ_QUIT,	51	REQ_QUIT,
32	REQ_OPEN, REQ_CLOSE,	52	REQ_OPEN, REQ_CLOSE,
33	REQ_READ, REQ_WRITE, REQ_READAHEAD,	53	REQ_READ, REQ_WRITE, REQ_READAHEAD,
		54	REQ_SENDFILE,
34	REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK,	55	REQ_STAT, REQ_LSTAT, REQ_FSTAT,
35	REQ_FSYNC, REQ_FDATASYNC,	56	REQ_FSYNC, REQ_FDATASYNC,
		57	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
		58	REQ_READDIR,
		59	REQ_LINK, REQ_SYMLINK,
		60	REQ_SLEEP,
		61	REQ_GROUP,
36	};	62	};
37		63
		64	#define AIO_REQ_KLASS "IO::AIO::REQ"
		65	#define AIO_GRP_KLASS "IO::AIO::GRP"
		66
38	typedef struct aio_cb {	67	typedef struct aio_cb
		68	{
39	struct aio_cb *volatile next;	69	struct aio_cb *volatile next;
40		70
41	int type;	71	struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
42		72
43	int fd;	73	SV *self; /* the perl counterpart of this request, if any */
		74
		75	SV *data, *callback;
		76	SV *fh, *fh2;
		77	void *dataptr, *data2ptr;
		78	Stat_t *statdata;
44	off_t offset;	79	off_t offset;
45	size_t length;	80	size_t length;
46	ssize_t result;	81	ssize_t result;
		82
		83	int type;
		84	int fd, fd2;
		85	int errorno;
		86	STRLEN dataoffset;
47	mode_t mode; /* open */	87	mode_t mode; /* open */
48	int errorno;	88	unsigned char cancelled;
49	SV *data, *callback, *fh;
50	void *dataptr;
51	STRLEN dataoffset;
52
53	Stat_t *statdata;
54	} aio_cb;	89	} aio_cb;
55		90
56	typedef aio_cb *aio_req;	91	typedef aio_cb *aio_req;
		92	typedef aio_cb *aio_req_ornot;
57		93
58	static int started;	94	static int started, wanted;
59	static volatile int nreqs;	95	static volatile int nreqs;
60	static int max_outstanding = 1<<30;	96	static int max_outstanding = 1<<30;
61	static int respipe [2];	97	static int respipe [2];
62		98
63	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	99	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
…		…
65	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	101	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
66		102
67	static volatile aio_req reqs, reqe; /* queue start, queue end */	103	static volatile aio_req reqs, reqe; /* queue start, queue end */
68	static volatile aio_req ress, rese; /* queue start, queue end */	104	static volatile aio_req ress, rese; /* queue start, queue end */
69		105
70	static void	106	static void req_invoke (aio_req req);
71	poll_wait ()	107	static void req_free (aio_req req);
		108
		109	/* must be called at most once */
		110	static SV *req_sv (aio_req req, const char *klass)
		111	{
		112	if (!req->self)
		113	{
		114	req->self = (SV *)newHV ();
		115	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		116	}
		117
		118	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
		119	}
		120
		121	static aio_req SvAIO_REQ (SV *sv)
		122	{
		123	if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
		124	croak ("object of class " AIO_REQ_KLASS " expected");
		125
		126	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
		127
		128	return mg ? (aio_req)mg->mg_ptr : 0;
		129	}
		130
		131	static void aio_grp_feed (aio_req grp)
		132	{
		133	while (grp->length < grp->fd2)
		134	{
		135	int old_len = grp->length;
		136
		137	if (grp->fh2 && SvOK (grp->fh2))
		138	{
		139	dSP;
		140
		141	ENTER;
		142	SAVETMPS;
		143	PUSHMARK (SP);
		144	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
		145	PUTBACK;
		146	call_sv (grp->fh2, G_VOID | G_EVAL);
		147	SPAGAIN;
		148	FREETMPS;
		149	LEAVE;
		150	}
		151
		152	/* stop if no progress has been made */
		153	if (old_len == grp->length)
		154	{
		155	SvREFCNT_dec (grp->fh2);
		156	grp->fh2 = 0;
		157	break;
		158	}
		159	}
		160	}
		161
		162	static void aio_grp_dec (aio_req grp)
		163	{
		164	--grp->length;
		165
		166	/* call feeder, if applicable */
		167	aio_grp_feed (grp);
		168
		169	/* finish, if done */
		170	if (!grp->length && grp->fd)
		171	{
		172	req_invoke (grp);
		173	req_free (grp);
		174	}
		175	}
		176
		177	static void poll_wait ()
72	{	178	{
73	if (nreqs && !ress)	179	if (nreqs && !ress)
74	{	180	{
75	fd_set rfd;	181	fd_set rfd;
76	FD_ZERO(&rfd);	182	FD_ZERO(&rfd);
…		…
78		184
79	select (respipe [0] + 1, &rfd, 0, 0, 0);	185	select (respipe [0] + 1, &rfd, 0, 0, 0);
80	}	186	}
81	}	187	}
82		188
83	static int	189	static void req_invoke (aio_req req)
84	poll_cb ()	190	{
		191	dSP;
		192	int errorno = errno;
		193
		194	if (req->cancelled || !SvOK (req->callback))
		195	return;
		196
		197	errno = req->errorno;
		198
		199	ENTER;
		200	SAVETMPS;
		201	PUSHMARK (SP);
		202	EXTEND (SP, 1);
		203
		204	switch (req->type)
		205	{
		206	case REQ_READDIR:
		207	{
		208	SV *rv = &PL_sv_undef;
		209
		210	if (req->result >= 0)
		211	{
		212	char *buf = req->data2ptr;
		213	AV *av = newAV ();
		214
		215	while (req->result)
		216	{
		217	SV *sv = newSVpv (buf, 0);
		218
		219	av_push (av, sv);
		220	buf += SvCUR (sv) + 1;
		221	req->result--;
		222	}
		223
		224	rv = sv_2mortal (newRV_noinc ((SV *)av));
		225	}
		226
		227	PUSHs (rv);
		228	}
		229	break;
		230
		231	case REQ_OPEN:
		232	{
		233	/* convert fd to fh */
		234	SV *fh;
		235
		236	PUSHs (sv_2mortal (newSViv (req->result)));
		237	PUTBACK;
		238	call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
		239	SPAGAIN;
		240
		241	fh = SvREFCNT_inc (POPs);
		242
		243	PUSHMARK (SP);
		244	XPUSHs (sv_2mortal (fh));
		245	}
		246	break;
		247
		248	case REQ_GROUP:
		249	req->fd = 2; /* mark group as finished */
		250
		251	if (req->data)
		252	{
		253	int i;
		254	AV *av = (AV *)req->data;
		255
		256	EXTEND (SP, AvFILL (av) + 1);
		257	for (i = 0; i <= AvFILL (av); ++i)
		258	PUSHs (*av_fetch (av, i, 0));
		259	}
		260	break;
		261
		262	case REQ_SLEEP:
		263	break;
		264
		265	default:
		266	PUSHs (sv_2mortal (newSViv (req->result)));
		267	break;
		268	}
		269
		270
		271	PUTBACK;
		272	call_sv (req->callback, G_VOID | G_EVAL);
		273	SPAGAIN;
		274
		275	FREETMPS;
		276	LEAVE;
		277
		278	errno = errorno;
		279
		280	if (SvTRUE (ERRSV))
		281	{
		282	req_free (req);
		283	croak (0);
		284	}
		285	}
		286
		287	static void req_free (aio_req req)
		288	{
		289	if (req->grp)
		290	{
		291	aio_req grp = req->grp;
		292
		293	/* unlink request */
		294	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
		295	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
		296
		297	if (grp->grp_first == req)
		298	grp->grp_first = req->grp_next;
		299
		300	aio_grp_dec (grp);
		301	}
		302
		303	if (req->self)
		304	{
		305	sv_unmagic (req->self, PERL_MAGIC_ext);
		306	SvREFCNT_dec (req->self);
		307	}
		308
		309	SvREFCNT_dec (req->data);
		310	SvREFCNT_dec (req->fh);
		311	SvREFCNT_dec (req->fh2);
		312	SvREFCNT_dec (req->callback);
		313	Safefree (req->statdata);
		314
		315	if (req->type == REQ_READDIR && req->result >= 0)
		316	free (req->data2ptr);
		317
		318	Safefree (req);
		319	}
		320
		321	static void req_cancel (aio_req req)
		322	{
		323	req->cancelled = 1;
		324
		325	if (req->type == REQ_GROUP)
		326	{
		327	aio_req sub;
		328
		329	for (sub = req->grp_first; sub; sub = sub->grp_next)
		330	req_cancel (sub);
		331	}
		332	}
		333
		334	static int poll_cb ()
85	{	335	{
86	dSP;	336	dSP;
87	int count = 0;	337	int count = 0;
		338	int do_croak = 0;
88	aio_req req, prv;	339	aio_req req;
89		340
		341	for (;;)
		342	{
90	pthread_mutex_lock (&reslock);	343	pthread_mutex_lock (&reslock);
		344	req = ress;
91		345
92	{	346	if (req)
		347	{
		348	ress = req->next;
		349
		350	if (!ress)
		351	{
93	/* read any signals sent by the worker threads */	352	/* read any signals sent by the worker threads */
94	char buf [32];	353	char buf [32];
95	while (read (respipe [0], buf, 32) > 0)	354	while (read (respipe [0], buf, 32) == 32)
		355	;
		356
		357	rese = 0;
		358	}
96	;	359	}
97	}
98		360
99	req = ress;
100	ress = rese = 0;
101
102	pthread_mutex_unlock (&reslock);	361	pthread_mutex_unlock (&reslock);
103		362
104	while (req)	363	if (!req)
105	{	364	break;
		365
106	nreqs--;	366	--nreqs;
107		367
108	if (req->type == REQ_QUIT)	368	if (req->type == REQ_QUIT)
109	started--;	369	started--;
		370	else if (req->type == REQ_GROUP && req->length)
		371	{
		372	req->fd = 1; /* mark request as delayed */
		373	continue;
		374	}
110	else	375	else
111	{	376	{
112	int errorno = errno;
113	errno = req->errorno;
114
115	if (req->type == REQ_READ)	377	if (req->type == REQ_READ)
116	SvCUR_set (req->data, req->dataoffset	378	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
117	+ req->result > 0 ? req->result : 0);
118		379
		380	if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
		381	SvREADONLY_off (req->data);
		382
119	if (req->data)	383	if (req->statdata)
120	SvREFCNT_dec (req->data);
121
122	if (req->fh)
123	SvREFCNT_dec (req->fh);
124
125	if (req->type == REQ_STAT || req->type == REQ_LSTAT || req->type == REQ_FSTAT)
126	{	384	{
127	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;	385	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
128	PL_laststatval = req->result;	386	PL_laststatval = req->result;
129	PL_statcache = *(req->statdata);	387	PL_statcache = *(req->statdata);
130
131	Safefree (req->statdata);
132	}	388	}
133		389
134	ENTER;	390	req_invoke (req);
135	PUSHMARK (SP);
136	XPUSHs (sv_2mortal (newSViv (req->result)));
137		391
138	if (req->type == REQ_OPEN)
139	{
140	/* convert fd to fh */
141	SV *fh;
142
143	PUTBACK;
144	call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
145	SPAGAIN;
146
147	fh = SvREFCNT_inc (POPs);
148
149	PUSHMARK (SP);
150	XPUSHs (sv_2mortal (fh));
151	}
152
153	if (SvOK (req->callback))
154	{
155	PUTBACK;
156	call_sv (req->callback, G_VOID | G_EVAL);
157	SPAGAIN;
158	}
159
160	LEAVE;
161
162	if (req->callback)
163	SvREFCNT_dec (req->callback);
164
165	errno = errorno;
166	count++;	392	count++;
167	}	393	}
168		394
169	prv = req;
170	req = req->next;
171	Safefree (prv);	395	req_free (req);
172
173	/* TODO: croak on errors? */
174	}	396	}
175		397
176	return count;	398	return count;
177	}	399	}
178		400
179	static void *aio_proc(void *arg);	401	static void *aio_proc(void *arg);
180		402
181	static void
182	start_thread (void)	403	static void start_thread (void)
183	{	404	{
184	sigset_t fullsigset, oldsigset;	405	sigset_t fullsigset, oldsigset;
185	pthread_t tid;	406	pthread_t tid;
186	pthread_attr_t attr;	407	pthread_attr_t attr;
187		408
…		…
196	started++;	417	started++;
197		418
198	sigprocmask (SIG_SETMASK, &oldsigset, 0);	419	sigprocmask (SIG_SETMASK, &oldsigset, 0);
199	}	420	}
200		421
201	static void	422	static void req_send (aio_req req)
202	send_req (aio_req req)
203	{	423	{
		424	while (started < wanted && nreqs >= started)
		425	start_thread ();
		426
204	nreqs++;	427	++nreqs;
205		428
206	pthread_mutex_lock (&reqlock);	429	pthread_mutex_lock (&reqlock);
207		430
208	req->next = 0;	431	req->next = 0;
209		432
…		…
216	reqe = reqs = req;	439	reqe = reqs = req;
217		440
218	pthread_cond_signal (&reqwait);	441	pthread_cond_signal (&reqwait);
219	pthread_mutex_unlock (&reqlock);	442	pthread_mutex_unlock (&reqlock);
220		443
221	while (nreqs > max_outstanding)	444	if (nreqs > max_outstanding)
		445	for (;;)
		446	{
		447	poll_cb ();
		448
		449	if (nreqs <= max_outstanding)
		450	break;
		451
		452	poll_wait ();
		453	}
		454	}
		455
		456	static void end_thread (void)
		457	{
		458	aio_req req;
		459	Newz (0, req, 1, aio_cb);
		460	req->type = REQ_QUIT;
		461
		462	req_send (req);
		463	}
		464
		465	static void min_parallel (int nthreads)
		466	{
		467	if (wanted < nthreads)
		468	wanted = nthreads;
		469	}
		470
		471	static void max_parallel (int nthreads)
		472	{
		473	int cur = started;
		474
		475	if (wanted > nthreads)
		476	wanted = nthreads;
		477
		478	while (cur > wanted)
		479	{
		480	end_thread ();
		481	cur--;
		482	}
		483
		484	while (started > wanted)
222	{	485	{
223	poll_wait ();	486	poll_wait ();
224	poll_cb ();	487	poll_cb ();
225	}	488	}
226	}	489	}
227		490
228	static void	491	static void create_pipe ()
229	end_thread (void)
230	{	492	{
231	aio_req req;	493	if (pipe (respipe))
232	New (0, req, 1, aio_cb);	494	croak ("unable to initialize result pipe");
233	req->type = REQ_QUIT;
234		495
235	send_req (req);	496	if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
236	}	497	croak ("cannot set result pipe to nonblocking mode");
237		498
238	static void *	499	if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
		500	croak ("cannot set result pipe to nonblocking mode");
		501	}
		502
		503	/*****************************************************************************/
		504	/* work around various missing functions */
		505
		506	#if !HAVE_PREADWRITE
		507	# define pread aio_pread
		508	# define pwrite aio_pwrite
		509
		510	/*
		511	* make our pread/pwrite safe against themselves, but not against
		512	* normal read/write by using a mutex. slows down execution a lot,
		513	* but that's your problem, not mine.
		514	*/
		515	static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER;
		516
		517	static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
		518	{
		519	ssize_t res;
		520	off_t ooffset;
		521
		522	pthread_mutex_lock (&preadwritelock);
		523	ooffset = lseek (fd, 0, SEEK_CUR);
		524	lseek (fd, offset, SEEK_SET);
		525	res = read (fd, buf, count);
		526	lseek (fd, ooffset, SEEK_SET);
		527	pthread_mutex_unlock (&preadwritelock);
		528
		529	return res;
		530	}
		531
		532	static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
		533	{
		534	ssize_t res;
		535	off_t ooffset;
		536
		537	pthread_mutex_lock (&preadwritelock);
		538	ooffset = lseek (fd, 0, SEEK_CUR);
		539	lseek (fd, offset, SEEK_SET);
		540	res = write (fd, buf, count);
		541	lseek (fd, offset, SEEK_SET);
		542	pthread_mutex_unlock (&preadwritelock);
		543
		544	return res;
		545	}
		546	#endif
		547
		548	#if !HAVE_FDATASYNC
		549	# define fdatasync fsync
		550	#endif
		551
		552	#if !HAVE_READAHEAD
		553	# define readahead aio_readahead
		554
		555	static ssize_t readahead (int fd, off_t offset, size_t count)
		556	{
		557	char readahead_buf[4096];
		558
		559	while (count > 0)
		560	{
		561	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
		562
		563	pread (fd, readahead_buf, len, offset);
		564	offset += len;
		565	count -= len;
		566	}
		567
		568	errno = 0;
		569	}
		570	#endif
		571
		572	#if !HAVE_READDIR_R
		573	# define readdir_r aio_readdir_r
		574
		575	static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER;
		576
		577	static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
		578	{
		579	struct dirent *e;
		580	int errorno;
		581
		582	pthread_mutex_lock (&readdirlock);
		583
		584	e = readdir (dirp);
		585	errorno = errno;
		586
		587	if (e)
		588	{
		589	*res = ent;
		590	strcpy (ent->d_name, e->d_name);
		591	}
		592	else
		593	*res = 0;
		594
		595	pthread_mutex_unlock (&readdirlock);
		596
		597	errno = errorno;
		598	return e ? 0 : -1;
		599	}
		600	#endif
		601
		602	/* sendfile always needs emulation */
		603	static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count)
		604	{
		605	ssize_t res;
		606
		607	if (!count)
		608	return 0;
		609
		610	#if HAVE_SENDFILE
		611	# if __linux
		612	res = sendfile (ofd, ifd, &offset, count);
		613
		614	# elif __freebsd
		615	/*
		616	* Of course, the freebsd sendfile is a dire hack with no thoughts
		617	* wasted on making it similar to other I/O functions.
		618	*/
		619	{
		620	off_t sbytes;
		621	res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
		622
		623	if (res < 0 && sbytes)
		624	/* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */
		625	res = sbytes;
		626	}
		627
		628	# elif __hpux
		629	res = sendfile (ofd, ifd, offset, count, 0, 0);
		630
		631	# elif __solaris
		632	{
		633	struct sendfilevec vec;
		634	size_t sbytes;
		635
		636	vec.sfv_fd = ifd;
		637	vec.sfv_flag = 0;
		638	vec.sfv_off = offset;
		639	vec.sfv_len = count;
		640
		641	res = sendfilev (ofd, &vec, 1, &sbytes);
		642
		643	if (res < 0 && sbytes)
		644	res = sbytes;
		645	}
		646
		647	# endif
		648	#else
		649	res = -1;
		650	errno = ENOSYS;
		651	#endif
		652
		653	if (res < 0
		654	&& (errno == ENOSYS || errno == EINVAL || errno == ENOTSOCK
		655	#if __solaris
		656	|| errno == EAFNOSUPPORT || errno == EPROTOTYPE
		657	#endif
		658	)
		659	)
		660	{
		661	/* emulate sendfile. this is a major pain in the ass */
		662	char buf[4096];
		663	res = 0;
		664
		665	while (count)
		666	{
		667	ssize_t cnt;
		668
		669	cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset);
		670
		671	if (cnt <= 0)
		672	{
		673	if (cnt && !res) res = -1;
		674	break;
		675	}
		676
		677	cnt = write (ofd, buf, cnt);
		678
		679	if (cnt <= 0)
		680	{
		681	if (cnt && !res) res = -1;
		682	break;
		683	}
		684
		685	offset += cnt;
		686	res += cnt;
		687	count -= cnt;
		688	}
		689	}
		690
		691	return res;
		692	}
		693
		694	/* read a full directory */
		695	static int scandir_ (const char *path, void **namesp)
		696	{
		697	DIR *dirp = opendir (path);
		698	union
		699	{
		700	struct dirent d;
		701	char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
		702	} u;
		703	struct dirent *entp;
		704	char *name, *names;
		705	int memlen = 4096;
		706	int memofs = 0;
		707	int res = 0;
		708	int errorno;
		709
		710	if (!dirp)
		711	return -1;
		712
		713	names = malloc (memlen);
		714
		715	for (;;)
		716	{
		717	errno = 0, readdir_r (dirp, &u.d, &entp);
		718
		719	if (!entp)
		720	break;
		721
		722	name = entp->d_name;
		723
		724	if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
		725	{
		726	int len = strlen (name) + 1;
		727
		728	res++;
		729
		730	while (memofs + len > memlen)
		731	{
		732	memlen *= 2;
		733	names = realloc (names, memlen);
		734	if (!names)
		735	break;
		736	}
		737
		738	memcpy (names + memofs, name, len);
		739	memofs += len;
		740	}
		741	}
		742
		743	errorno = errno;
		744	closedir (dirp);
		745
		746	if (errorno)
		747	{
		748	free (names);
		749	errno = errorno;
		750	res = -1;
		751	}
		752
		753	*namesp = (void *)names;
		754	return res;
		755	}
		756
		757	/*****************************************************************************/
		758
239	aio_proc (void *thr_arg)	759	static void *aio_proc (void *thr_arg)
240	{	760	{
241	aio_req req;	761	aio_req req;
242	int type;	762	int type;
243		763
244	do	764	do
…		…
263		783
264	pthread_mutex_unlock (&reqlock);	784	pthread_mutex_unlock (&reqlock);
265		785
266	errno = 0; /* strictly unnecessary */	786	errno = 0; /* strictly unnecessary */
267		787
268	type = req->type;	788	if (!req->cancelled)
269		789	switch (type = req->type) /* remember type for QUIT check */
270	switch (type)
271	{	790	{
272	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	791	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
273	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	792	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
274	#if SYS_readahead	793
275	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	794	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
276	#else	795	case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
277	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
278	#endif
279		796
280	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	797	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
281	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	798	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
282	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	799	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
283		800
284	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;	801	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
285	case REQ_CLOSE: req->result = close (req->fd); break;	802	case REQ_CLOSE: req->result = close (req->fd); break;
286	case REQ_UNLINK: req->result = unlink (req->dataptr); break;	803	case REQ_UNLINK: req->result = unlink (req->dataptr); break;
287
288	case REQ_FSYNC: req->result = fsync (req->fd); break;	804	case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
		805	case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break;
		806	case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
		807	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
		808
289	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;	809	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
		810	case REQ_FSYNC: req->result = fsync (req->fd); break;
		811	case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
290		812
		813	case REQ_SLEEP:
		814	{
		815	struct timeval tv;
		816
		817	tv.tv_sec = req->fd;
		818	tv.tv_usec = req->fd2;
		819
		820	req->result = select (0, 0, 0, 0, &tv);
		821	}
		822
291	case REQ_QUIT:	823	case REQ_QUIT:
292	break;	824	break;
293		825
294	default:	826	default:
295	req->result = ENOSYS;	827	req->result = ENOSYS;
296	break;	828	break;
297	}	829	}
298		830
299	req->errorno = errno;	831	req->errorno = errno;
300		832
301	pthread_mutex_lock (&reslock);	833	pthread_mutex_lock (&reslock);
302		834
…		…
320	while (type != REQ_QUIT);	852	while (type != REQ_QUIT);
321		853
322	return 0;	854	return 0;
323	}	855	}
324		856
		857	/*****************************************************************************/
		858
		859	static void atfork_prepare (void)
		860	{
		861	pthread_mutex_lock (&reqlock);
		862	pthread_mutex_lock (&reslock);
		863	#if !HAVE_PREADWRITE
		864	pthread_mutex_lock (&preadwritelock);
		865	#endif
		866	#if !HAVE_READDIR_R
		867	pthread_mutex_lock (&readdirlock);
		868	#endif
		869	}
		870
		871	static void atfork_parent (void)
		872	{
		873	#if !HAVE_READDIR_R
		874	pthread_mutex_unlock (&readdirlock);
		875	#endif
		876	#if !HAVE_PREADWRITE
		877	pthread_mutex_unlock (&preadwritelock);
		878	#endif
		879	pthread_mutex_unlock (&reslock);
		880	pthread_mutex_unlock (&reqlock);
		881	}
		882
		883	static void atfork_child (void)
		884	{
		885	aio_req prv;
		886
		887	started = 0;
		888
		889	while (reqs)
		890	{
		891	prv = reqs;
		892	reqs = prv->next;
		893	req_free (prv);
		894	}
		895
		896	reqs = reqe = 0;
		897
		898	while (ress)
		899	{
		900	prv = ress;
		901	ress = prv->next;
		902	req_free (prv);
		903	}
		904
		905	ress = rese = 0;
		906
		907	close (respipe [0]);
		908	close (respipe [1]);
		909	create_pipe ();
		910
		911	atfork_parent ();
		912	}
		913
		914	#define dREQ \
		915	aio_req req; \
		916	\
		917	if (SvOK (callback) && !SvROK (callback)) \
		918	croak ("callback must be undef or of reference type"); \
		919	\
		920	Newz (0, req, 1, aio_cb); \
		921	if (!req) \
		922	croak ("out of memory during aio_req allocation"); \
		923	\
		924	req->callback = newSVsv (callback)
		925
		926	#define REQ_SEND \
		927	req_send (req); \
		928	\
		929	if (GIMME_V != G_VOID) \
		930	XPUSHs (req_sv (req, AIO_REQ_KLASS));
		931
325	MODULE = IO::AIO PACKAGE = IO::AIO	932	MODULE = IO::AIO PACKAGE = IO::AIO
326		933
327	PROTOTYPES: ENABLE	934	PROTOTYPES: ENABLE
328		935
329	BOOT:	936	BOOT:
330	{	937	{
331	if (pipe (respipe))	938	HV *stash = gv_stashpv ("IO::AIO", 1);
332	croak ("unable to initialize result pipe");	939	newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
		940	newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
		941	newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
333		942
334	if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))	943	create_pipe ();
335	croak ("cannot set result pipe to nonblocking mode");	944	pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
336
337	if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
338	croak ("cannot set result pipe to nonblocking mode");
339	}	945	}
340		946
341	void	947	void
342	min_parallel(nthreads)	948	min_parallel (nthreads)
343	int nthreads	949	int nthreads
344	PROTOTYPE: $	950	PROTOTYPE: $
345	CODE:
346	while (nthreads > started)
347	start_thread ();
348		951
349	void	952	void
350	max_parallel(nthreads)	953	max_parallel (nthreads)
351	int nthreads	954	int nthreads
352	PROTOTYPE: $	955	PROTOTYPE: $
353	CODE:
354	{
355	int cur = started;
356	while (cur > nthreads)
357	{
358	end_thread ();
359	cur--;
360	}
361
362	while (started > nthreads)
363	{
364	poll_wait ();
365	poll_cb ();
366	}
367	}
368		956
369	int	957	int
370	max_outstanding(nreqs)	958	max_outstanding (nreqs)
371	int nreqs	959	int nreqs
372	PROTOTYPE: $	960	PROTOTYPE: $
373	CODE:	961	CODE:
374	RETVAL = max_outstanding;	962	RETVAL = max_outstanding;
375	max_outstanding = nreqs;	963	max_outstanding = nreqs;
376		964
377	void	965	void
378	aio_open(pathname,flags,mode,callback=&PL_sv_undef)	966	aio_open (pathname,flags,mode,callback=&PL_sv_undef)
379	SV * pathname	967	SV * pathname
380	int flags	968	int flags
381	int mode	969	int mode
382	SV * callback	970	SV * callback
383	PROTOTYPE: $$$;$	971	PROTOTYPE: $$$;$
384	CODE:	972	PPCODE:
385	{	973	{
386	aio_req req;	974	dREQ;
387
388	Newz (0, req, 1, aio_cb);
389
390	if (!req)
391	croak ("out of memory during aio_req allocation");
392		975
393	req->type = REQ_OPEN;	976	req->type = REQ_OPEN;
394	req->data = newSVsv (pathname);	977	req->data = newSVsv (pathname);
395	req->dataptr = SvPV_nolen (req->data);	978	req->dataptr = SvPVbyte_nolen (req->data);
396	req->fd = flags;	979	req->fd = flags;
397	req->mode = mode;	980	req->mode = mode;
398	req->callback = SvREFCNT_inc (callback);
399		981
400	send_req (req);	982	REQ_SEND;
401	}	983	}
402		984
403	void	985	void
404	aio_close(fh,callback=&PL_sv_undef)	986	aio_close (fh,callback=&PL_sv_undef)
405	SV * fh	987	SV * fh
406	SV * callback	988	SV * callback
407	PROTOTYPE: $;$	989	PROTOTYPE: $;$
408	ALIAS:	990	ALIAS:
409	aio_close = REQ_CLOSE	991	aio_close = REQ_CLOSE
410	aio_fsync = REQ_FSYNC	992	aio_fsync = REQ_FSYNC
411	aio_fdatasync = REQ_FDATASYNC	993	aio_fdatasync = REQ_FDATASYNC
412	CODE:	994	PPCODE:
413	{	995	{
414	aio_req req;	996	dREQ;
415
416	Newz (0, req, 1, aio_cb);
417
418	if (!req)
419	croak ("out of memory during aio_req allocation");
420		997
421	req->type = ix;	998	req->type = ix;
422	req->fh = newSVsv (fh);	999	req->fh = newSVsv (fh);
423	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));	1000	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
424	req->callback = SvREFCNT_inc (callback);
425		1001
426	send_req (req);	1002	REQ_SEND (req);
427	}	1003	}
428		1004
429	void	1005	void
430	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)	1006	aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
431	SV * fh	1007	SV * fh
432	UV offset	1008	UV offset
433	IV length	1009	UV length
434	SV * data	1010	SV * data
435	IV dataoffset	1011	UV dataoffset
436	SV * callback	1012	SV * callback
437	ALIAS:	1013	ALIAS:
438	aio_read = REQ_READ	1014	aio_read = REQ_READ
439	aio_write = REQ_WRITE	1015	aio_write = REQ_WRITE
440	PROTOTYPE: $$$$$;$	1016	PROTOTYPE: $$$$$;$
441	CODE:	1017	PPCODE:
442	{	1018	{
443	aio_req req;	1019	aio_req req;
444	STRLEN svlen;	1020	STRLEN svlen;
445	char *svptr = SvPV (data, svlen);	1021	char *svptr = SvPVbyte (data, svlen);
446		1022
447	SvUPGRADE (data, SVt_PV);	1023	SvUPGRADE (data, SVt_PV);
448	SvPOK_on (data);	1024	SvPOK_on (data);
449		1025
450	if (dataoffset < 0)	1026	if (dataoffset < 0)
…		…
466	}	1042	}
467		1043
468	if (length < 0)	1044	if (length < 0)
469	croak ("length must not be negative");	1045	croak ("length must not be negative");
470		1046
471	Newz (0, req, 1, aio_cb);	1047	{
		1048	dREQ;
472		1049
473	if (!req)
474	croak ("out of memory during aio_req allocation");
475
476	req->type = ix;	1050	req->type = ix;
477	req->fh = newSVsv (fh);	1051	req->fh = newSVsv (fh);
478	req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))	1052	req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
479	: IoOFP (sv_2io (fh)));	1053	: IoOFP (sv_2io (fh)));
480	req->offset = offset;	1054	req->offset = offset;
		1055	req->length = length;
		1056	req->data = SvREFCNT_inc (data);
		1057	req->dataptr = (char *)svptr + dataoffset;
		1058
		1059	if (!SvREADONLY (data))
		1060	{
		1061	SvREADONLY_on (data);
		1062	req->data2ptr = (void *)data;
		1063	}
		1064
		1065	REQ_SEND;
		1066	}
		1067	}
		1068
		1069	void
		1070	aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
		1071	SV * out_fh
		1072	SV * in_fh
		1073	UV in_offset
		1074	UV length
		1075	SV * callback
		1076	PROTOTYPE: $$$$;$
		1077	PPCODE:
		1078	{
		1079	dREQ;
		1080
		1081	req->type = REQ_SENDFILE;
		1082	req->fh = newSVsv (out_fh);
		1083	req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
		1084	req->fh2 = newSVsv (in_fh);
		1085	req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
		1086	req->offset = in_offset;
481	req->length = length;	1087	req->length = length;
482	req->data = SvREFCNT_inc (data);
483	req->dataptr = (char *)svptr + dataoffset;
484	req->callback = SvREFCNT_inc (callback);
485		1088
486	send_req (req);	1089	REQ_SEND;
487	}	1090	}
488		1091
489	void	1092	void
490	aio_readahead(fh,offset,length,callback=&PL_sv_undef)	1093	aio_readahead (fh,offset,length,callback=&PL_sv_undef)
491	SV * fh	1094	SV * fh
492	UV offset	1095	UV offset
493	IV length	1096	IV length
494	SV * callback	1097	SV * callback
495	PROTOTYPE: $$$;$	1098	PROTOTYPE: $$$;$
496	CODE:	1099	PPCODE:
497	{	1100	{
498	aio_req req;	1101	dREQ;
499
500	if (length < 0)
501	croak ("length must not be negative");
502
503	Newz (0, req, 1, aio_cb);
504
505	if (!req)
506	croak ("out of memory during aio_req allocation");
507		1102
508	req->type = REQ_READAHEAD;	1103	req->type = REQ_READAHEAD;
509	req->fh = newSVsv (fh);	1104	req->fh = newSVsv (fh);
510	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));	1105	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
511	req->offset = offset;	1106	req->offset = offset;
512	req->length = length;	1107	req->length = length;
513	req->callback = SvREFCNT_inc (callback);
514		1108
515	send_req (req);	1109	REQ_SEND;
516	}	1110	}
517		1111
518	void	1112	void
519	aio_stat(fh_or_path,callback=&PL_sv_undef)	1113	aio_stat (fh_or_path,callback=&PL_sv_undef)
520	SV * fh_or_path	1114	SV * fh_or_path
521	SV * callback	1115	SV * callback
522	ALIAS:	1116	ALIAS:
523	aio_stat = REQ_STAT	1117	aio_stat = REQ_STAT
524	aio_lstat = REQ_LSTAT	1118	aio_lstat = REQ_LSTAT
525	CODE:	1119	PPCODE:
526	{	1120	{
527	aio_req req;	1121	dREQ;
528
529	Newz (0, req, 1, aio_cb);
530
531	if (!req)
532	croak ("out of memory during aio_req allocation");
533		1122
534	New (0, req->statdata, 1, Stat_t);	1123	New (0, req->statdata, 1, Stat_t);
535
536	if (!req->statdata)	1124	if (!req->statdata)
		1125	{
		1126	req_free (req);
537	croak ("out of memory during aio_req->statdata allocation");	1127	croak ("out of memory during aio_req->statdata allocation");
		1128	}
538		1129
539	if (SvPOK (fh_or_path))	1130	if (SvPOK (fh_or_path))
540	{	1131	{
541	req->type = ix;	1132	req->type = ix;
542	req->data = newSVsv (fh_or_path);	1133	req->data = newSVsv (fh_or_path);
543	req->dataptr = SvPV_nolen (req->data);	1134	req->dataptr = SvPVbyte_nolen (req->data);
544	}	1135	}
545	else	1136	else
546	{	1137	{
547	req->type = REQ_FSTAT;	1138	req->type = REQ_FSTAT;
548	req->fh = newSVsv (fh_or_path);	1139	req->fh = newSVsv (fh_or_path);
549	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	1140	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
550	}	1141	}
551		1142
552	req->callback = SvREFCNT_inc (callback);	1143	REQ_SEND;
553
554	send_req (req);
555	}	1144	}
556		1145
557	void	1146	void
558	aio_unlink(pathname,callback=&PL_sv_undef)	1147	aio_unlink (pathname,callback=&PL_sv_undef)
559	SV * pathname	1148	SV * pathname
560	SV * callback	1149	SV * callback
		1150	ALIAS:
		1151	aio_unlink = REQ_UNLINK
		1152	aio_rmdir = REQ_RMDIR
		1153	aio_readdir = REQ_READDIR
561	CODE:	1154	PPCODE:
562	{	1155	{
563	aio_req req;	1156	dREQ;
564		1157
565	Newz (0, req, 1, aio_cb);	1158	req->type = ix;
		1159	req->data = newSVsv (pathname);
		1160	req->dataptr = SvPVbyte_nolen (req->data);
566		1161
567	if (!req)	1162	REQ_SEND;
568	croak ("out of memory during aio_req allocation");	1163	}
		1164
		1165	void
		1166	aio_link (oldpath,newpath,callback=&PL_sv_undef)
		1167	SV * oldpath
		1168	SV * newpath
		1169	SV * callback
		1170	ALIAS:
		1171	aio_link = REQ_LINK
		1172	aio_symlink = REQ_SYMLINK
		1173	aio_rename = REQ_RENAME
		1174	PPCODE:
		1175	{
		1176	dREQ;
569		1177
570	req->type = REQ_UNLINK;	1178	req->type = ix;
		1179	req->fh = newSVsv (oldpath);
		1180	req->data2ptr = SvPVbyte_nolen (req->fh);
571	req->data = newSVsv (pathname);	1181	req->data = newSVsv (newpath);
572	req->dataptr = SvPV_nolen (req->data);	1182	req->dataptr = SvPVbyte_nolen (req->data);
573	req->callback = SvREFCNT_inc (callback);
574		1183
575	send_req (req);	1184	REQ_SEND;
576	}	1185	}
577		1186
578	void	1187	void
		1188	aio_sleep (delay,callback=&PL_sv_undef)
		1189	double delay
		1190	SV * callback
		1191	PPCODE:
		1192	{
		1193	dREQ;
		1194
		1195	req->type = REQ_SLEEP;
		1196	req->fd = delay < 0. ? 0 : delay;
		1197	req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
		1198
		1199	REQ_SEND;
		1200	}
		1201
		1202	void
		1203	aio_group (callback=&PL_sv_undef)
		1204	SV * callback
		1205	PROTOTYPE: ;$
		1206	PPCODE:
		1207	{
		1208	dREQ;
		1209	req->type = REQ_GROUP;
		1210	req_send (req);
		1211	XPUSHs (req_sv (req, AIO_GRP_KLASS));
		1212	}
		1213
		1214	void
579	flush()	1215	flush ()
580	PROTOTYPE:	1216	PROTOTYPE:
581	CODE:	1217	CODE:
582	while (nreqs)	1218	while (nreqs)
583	{	1219	{
584	poll_wait ();	1220	poll_wait ();
…		…
624	CODE:	1260	CODE:
625	RETVAL = nreqs;	1261	RETVAL = nreqs;
626	OUTPUT:	1262	OUTPUT:
627	RETVAL	1263	RETVAL
628		1264
		1265	PROTOTYPES: DISABLE
		1266
		1267	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
		1268
		1269	void
		1270	cancel (aio_req_ornot req)
		1271	PROTOTYPE:
		1272	CODE:
		1273	req_cancel (req);
		1274
		1275	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
		1276
		1277	void
		1278	add (aio_req grp, ...)
		1279	PPCODE:
		1280	{
		1281	int i;
		1282
		1283	if (grp->fd == 2)
		1284	croak ("cannot add requests to IO::AIO::GRP after the group finished");
		1285
		1286	for (i = 1; i < items; ++i )
		1287	{
		1288	if (GIMME_V != G_VOID)
		1289	XPUSHs (sv_2mortal (newSVsv (ST (i))));
		1290
		1291	aio_req req = SvAIO_REQ (ST (i));
		1292
		1293	if (req)
		1294	{
		1295	++grp->length;
		1296	req->grp = grp;
		1297
		1298	req->grp_prev = 0;
		1299	req->grp_next = grp->grp_first;
		1300
		1301	if (grp->grp_first)
		1302	grp->grp_first->grp_prev = req;
		1303
		1304	grp->grp_first = req;
		1305	}
		1306	}
		1307	}
		1308
		1309	void
		1310	result (aio_req grp, ...)
		1311	CODE:
		1312	{
		1313	int i;
		1314	AV *av = newAV ();
		1315
		1316	for (i = 1; i < items; ++i )
		1317	av_push (av, newSVsv (ST (i)));
		1318
		1319	SvREFCNT_dec (grp->data);
		1320	grp->data = (SV *)av;
		1321	}
		1322
		1323	void
		1324	lock (aio_req grp)
		1325	CODE:
		1326	++grp->length;
		1327
		1328	void
		1329	unlock (aio_req grp)
		1330	CODE:
		1331	aio_grp_dec (grp);
		1332
		1333	void
		1334	feeder_limit (aio_req grp, int limit)
		1335	CODE:
		1336	grp->fd2 = limit;
		1337	aio_grp_feed (grp);
		1338
		1339	void
		1340	set_feeder (aio_req grp, SV *callback=&PL_sv_undef)
		1341	CODE:
		1342	{
		1343	SvREFCNT_dec (grp->fh2);
		1344	grp->fh2 = newSVsv (callback);
		1345
		1346	if (grp->fd2 <= 0)
		1347	grp->fd2 = 2;
		1348
		1349	aio_grp_feed (grp);
		1350	}
		1351

Diff Legend

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