ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/IO-AIO/AIO.xs

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.125 by root, Thu Jun 19 09:05:43 2008 UTC vs.
Revision 1.193 by root, Mon Jul 25 16:51:07 2011 UTC

…		…
3	#include <errno.h>	3	#include <errno.h>
4		4
5	#include "EXTERN.h"	5	#include "EXTERN.h"
6	#include "perl.h"	6	#include "perl.h"
7	#include "XSUB.h"	7	#include "XSUB.h"
		8
		9	#include "schmorp.h"
8		10
9	#include <stddef.h>	11	#include <stddef.h>
10	#include <stdlib.h>	12	#include <stdlib.h>
11	#include <errno.h>	13	#include <errno.h>
12	#include <sys/types.h>	14	#include <sys/types.h>
13	#include <sys/stat.h>	15	#include <sys/stat.h>
14	#include <limits.h>	16	#include <limits.h>
15	#include <fcntl.h>	17	#include <fcntl.h>
16	#include <sched.h>	18	#include <sched.h>
17		19
		20	#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
		21	# include <sys/mman.h>
		22	#endif
		23
18	/* perl namespace pollution */	24	/* perl namespace pollution */
19	#undef VERSION	25	#undef VERSION
20
21	#ifdef _WIN32
22
23	# define EIO_STRUCT_DIRENT Direntry_t
24	# undef malloc
25	# undef free
26
27	// perl overrides all those nice win32 functions
28	# undef open
29	# undef read
30	# undef write
31	# undef send
32	# undef recv
33	# undef stat
34	# undef fstat
35	# define lstat stat
36	# undef truncate
37	# undef ftruncate
38	# undef open
39	# undef close
40	# undef unlink
41	# undef rmdir
42	# undef rename
43	# undef lseek
44
45	# define chown(a,b,c) (errno = ENOSYS, -1)
46	# define fchown(a,b,c) (errno = ENOSYS, -1)
47	# define fchmod(a,b) (errno = ENOSYS, -1)
48	# define symlink(a,b) (errno = ENOSYS, -1)
49	# define readlink(a,b,c) (errno = ENOSYS, -1)
50	# define mknod(a,b,c) (errno = ENOSYS, -1)
51	# define truncate(a,b) (errno = ENOSYS, -1)
52	# define ftruncate(fd,o) chsize ((fd), (o))
53	# define fsync(fd) _commit (fd)
54	# define opendir(fd) (errno = ENOSYS, 0)
55	# define readdir(fd) (errno = ENOSYS, -1)
56	# define closedir(fd) (errno = ENOSYS, -1)
57	# define mkdir(a,b) mkdir (a)
58
59	#else
60
61	# include <sys/time.h>
62	# include <sys/select.h>
63	# include <unistd.h>
64	# include <utime.h>
65	# include <signal.h>
66	# define EIO_STRUCT_DIRENT struct dirent
67
68	#endif
69		26
70	/* perl stupidly overrides readdir and maybe others */	27	/* perl stupidly overrides readdir and maybe others */
71	/* with thread-unsafe versions, imagine that :( */	28	/* with thread-unsafe versions, imagine that :( */
72	#undef readdir	29	#undef readdir
73	#undef opendir	30	#undef opendir
74	#undef closedir	31	#undef closedir
75		32
		33	#ifdef _WIN32
		34
		35	// perl overrides all those nice libc functions
		36
		37	#undef malloc
		38	#undef free
		39	#undef open
		40	#undef read
		41	#undef write
		42	#undef send
		43	#undef recv
		44	#undef stat
		45	#undef lstat
		46	#undef fstat
		47	#undef truncate
		48	#undef ftruncate
		49	#undef open
		50	#undef link
		51	#undef close
		52	#undef unlink
		53	#undef mkdir
		54	#undef rmdir
		55	#undef rename
		56	#undef lseek
		57	#undef opendir
		58	#undef readdir
		59	#undef closedir
		60	#undef chmod
		61	#undef fchmod
		62	#undef dup
		63	#undef dup2
		64	#undef abort
		65	#undef pipe
		66
		67	#else
		68
		69	#include <sys/time.h>
		70	#include <sys/select.h>
		71	#include <unistd.h>
		72	#include <utime.h>
		73	#include <signal.h>
		74
		75	#endif
		76
76	#define EIO_STRUCT_STAT Stat_t	77	#define EIO_STRUCT_STAT Stat_t
77		78
78	/* use NV for 32 bit perls as it allows larger offsets */	79	/* use NV for 32 bit perls as it allows larger offsets */
79	#if IVSIZE >= 8	80	#if IVSIZE >= 8
		81	# define VAL64 IV
80	# define SvVAL64 SvIV	82	# define SvVAL64 SvIV
		83	# define newSVval64 newSViv
81	#else	84	#else
		85	# define VAL64 NV
82	# define SvVAL64 SvNV	86	# define SvVAL64 SvNV
		87	# define newSVval64 newSVnv
83	#endif	88	#endif
84		89
85	static HV *stash;	90	/*****************************************************************************/
		91
		92	#if __GNUC__ >= 3
		93	# define expect(expr,value) __builtin_expect ((expr),(value))
		94	#else
		95	# define expect(expr,value) (expr)
		96	#endif
		97
		98	#define expect_false(expr) expect ((expr) != 0, 0)
		99	#define expect_true(expr) expect ((expr) != 0, 1)
		100
		101	/*****************************************************************************/
		102
86	typedef SV SV8; /* byte-sv, used for argument-checking */	103	typedef SV SV8; /* byte-sv, used for argument-checking */
		104	typedef int aio_rfd; /* read file desriptor */
		105	typedef int aio_wfd; /* write file descriptor */
87		106
88	#define AIO_REQ_KLASS "IO::AIO::REQ"	107	static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
89	#define AIO_GRP_KLASS "IO::AIO::GRP"
90		108
91	#define EIO_REQ_MEMBERS \	109	#define EIO_REQ_MEMBERS \
92	SV *callback; \	110	SV *callback; \
93	SV *sv1, *sv2; \	111	SV *sv1, *sv2; \
94	STRLEN stroffset; \	112	STRLEN stroffset; \
95	SV *self;	113	SV *self;
96		114
97	#define EIO_NO_WRAPPERS 1	115	#define EIO_NO_WRAPPERS 1
98		116
		117	#include "libeio/config.h"
99	#include "libeio/eio.h"	118	#include "libeio/eio.h"
100		119
101	static int req_invoke (eio_req *req);	120	static int req_invoke (eio_req *req);
102	#define EIO_FINISH(req) req_invoke (req)	121	#define EIO_FINISH(req) req_invoke (req)
103	static void aio_grp_feed (eio_req *grp);
104	#define EIO_FEED(req) aio_grp_feed (req)
105	static void req_destroy (eio_req *grp);	122	static void req_destroy (eio_req *grp);
106	#define EIO_DESTROY(req) req_destroy (req)	123	#define EIO_DESTROY(req) req_destroy (req)
		124
		125	#include "libeio/eio.c"
		126
		127	/* Linux/others */
		128	#ifndef O_ASYNC
		129	# define O_ASYNC 0
		130	#endif
		131	#ifndef O_DIRECT
		132	# define O_DIRECT 0
		133	#endif
		134	#ifndef O_NOATIME
		135	# define O_NOATIME 0
		136	#endif
		137
		138	/* POSIX */
		139	#ifndef O_CLOEXEC
		140	# define O_CLOEXEC 0
		141	#endif
		142	#ifndef O_NOFOLLOW
		143	# define O_NOFOLLOW 0
		144	#endif
		145	#ifndef O_NOCTTY
		146	# define O_NOCTTY 0
		147	#endif
		148	#ifndef O_NONBLOCK
		149	# define O_NONBLOCK 0
		150	#endif
		151	#ifndef O_EXEC
		152	# define O_EXEC 0
		153	#endif
		154	#ifndef O_SEARCH
		155	# define O_SEARCH 0
		156	#endif
		157	#ifndef O_DIRECTORY
		158	# define O_DIRECTORY 0
		159	#endif
		160	#ifndef O_DSYNC
		161	# define O_DSYNC 0
		162	#endif
		163	#ifndef O_RSYNC
		164	# define O_RSYNC 0
		165	#endif
		166	#ifndef O_SYNC
		167	# define O_SYNC 0
		168	#endif
		169	#ifndef O_TTY_INIT
		170	# define O_TTY_INIT 0
		171	#endif
		172
		173	#ifndef POSIX_FADV_NORMAL
		174	# define POSIX_FADV_NORMAL 0
		175	#endif
		176	#ifndef POSIX_FADV_SEQUENTIAL
		177	# define POSIX_FADV_SEQUENTIAL 0
		178	#endif
		179	#ifndef POSIX_FADV_RANDOM
		180	# define POSIX_FADV_RANDOM 0
		181	#endif
		182	#ifndef POSIX_FADV_NOREUSE
		183	# define POSIX_FADV_NOREUSE 0
		184	#endif
		185	#ifndef POSIX_FADV_WILLNEED
		186	# define POSIX_FADV_WILLNEED 0
		187	#endif
		188	#ifndef POSIX_FADV_DONTNEED
		189	# define POSIX_FADV_DONTNEED 0
		190	#endif
		191
		192	#if !HAVE_POSIX_FADVISE
		193	# define posix_fadvise(a,b,c,d) errno = ENOSYS /* also return ENOSYS */
		194	#endif
		195
		196	#ifndef POSIX_MADV_NORMAL
		197	# define POSIX_MADV_NORMAL 0
		198	#endif
		199	#ifndef POSIX_MADV_SEQUENTIAL
		200	# define POSIX_MADV_SEQUENTIAL 0
		201	#endif
		202	#ifndef POSIX_MADV_RANDOM
		203	# define POSIX_MADV_RANDOM 0
		204	#endif
		205	#ifndef POSIX_MADV_WILLNEED
		206	# define POSIX_MADV_WILLNEED 0
		207	#endif
		208	#ifndef POSIX_MADV_DONTNEED
		209	# define POSIX_MADV_DONTNEED 0
		210	#endif
		211
		212	#if !HAVE_POSIX_MADVISE
		213	# define posix_madvise(a,b,c) errno = ENOSYS /* also return ENOSYS */
		214	#endif
		215
		216	#ifndef PROT_NONE
		217	# define PROT_NONE 0
		218	#endif
		219	#ifndef PROT_READ
		220	# define PROT_READ 0
		221	#endif
		222	#ifndef PROT_WRITE
		223	# define PROT_READ 0
		224	#endif
		225	#ifndef PROT_EXEC
		226	# define PROT_EXEC 0
		227	#endif
		228
		229	#ifndef ST_RDONLY
		230	# define ST_RDONLY 0
		231	#endif
		232	#ifndef ST_NOSUID
		233	# define ST_NOSUID 0
		234	#endif
		235	#ifndef ST_NODEV
		236	# define ST_NODEV 0
		237	#endif
		238	#ifndef ST_NOEXEC
		239	# define ST_NOEXEC 0
		240	#endif
		241	#ifndef ST_SYNCHRONOUS
		242	# define ST_SYNCHRONOUS 0
		243	#endif
		244	#ifndef ST_MANDLOCK
		245	# define ST_MANDLOCK 0
		246	#endif
		247	#ifndef ST_WRITE
		248	# define ST_WRITE 0
		249	#endif
		250	#ifndef ST_APPEND
		251	# define ST_APPEND 0
		252	#endif
		253	#ifndef ST_IMMUTABLE
		254	# define ST_IMMUTABLE 0
		255	#endif
		256	#ifndef ST_NOATIME
		257	# define ST_NOATIME 0
		258	#endif
		259	#ifndef ST_NODIRATIME
		260	# define ST_NODIRATIME 0
		261	#endif
		262	#ifndef ST_RELATIME
		263	# define ST_RELATIME 0
		264	#endif
		265
		266	#ifndef S_IFIFO
		267	# define S_IFIFO 0
		268	#endif
		269	#ifndef S_IFCHR
		270	# define S_IFCHR 0
		271	#endif
		272	#ifndef S_IFBLK
		273	# define S_IFBLK 0
		274	#endif
		275	#ifndef S_IFLNK
		276	# define S_IFLNK 0
		277	#endif
		278	#ifndef S_IFREG
		279	# define S_IFREG 0
		280	#endif
		281	#ifndef S_IFDIR
		282	# define S_IFDIR 0
		283	#endif
		284	#ifndef S_IFWHT
		285	# define S_IFWHT 0
		286	#endif
		287	#ifndef S_IFSOCK
		288	# define S_IFSOCK 0
		289	#endif
		290
		291	#ifndef MAP_ANONYMOUS
		292	# ifdef MAP_ANON
		293	# define MAP_ANONYMOUS MAP_ANON
		294	# else
		295	# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
		296	# endif
		297	#endif
		298	#ifndef MAP_HUGETLB
		299	# define MAP_HUGETLB 0
		300	#endif
		301	#ifndef MAP_LOCKED
		302	# define MAP_LOCKED 0
		303	#endif
		304	#ifndef MAP_NORESERVE
		305	# define MAP_NORESERVE 0
		306	#endif
		307	#ifndef MAP_POPULATE
		308	# define MAP_POPULATE 0
		309	#endif
		310	#ifndef MAP_NONBLOCK
		311	# define MAP_NONBLOCK 0
		312	#endif
		313
		314	#ifndef makedev
		315	# define makedev(maj,min) (((maj) << 8) | (min))
		316	#endif
		317	#ifndef major
		318	# define major(dev) ((dev) >> 8)
		319	#endif
		320	#ifndef minor
		321	# define minor(dev) ((dev) & 0xff)
		322	#endif
		323
		324	#ifndef PAGESIZE
		325	# define PAGESIZE sysconf (_SC_PAGESIZE)
		326	#endif
107		327
108	enum {	328	enum {
109	FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */	329	FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
110	};	330	};
111		331
112	#include "libeio/eio.c"
113
114	typedef eio_req *aio_req;	332	typedef eio_req *aio_req;
115	typedef eio_req *aio_req_ornot;	333	typedef eio_req *aio_req_ornot;
116		334
117	static SV *on_next_submit;	335	static SV *on_next_submit;
118	static int next_pri = EIO_PRI_DEFAULT;	336	static int next_pri = EIO_PRI_DEFAULT;
119	static int max_outstanding;	337	static int max_outstanding;
120		338
121	static int respipe_osf [2], respipe [2] = { -1, -1 };	339	static s_epipe respipe;
122		340
123	static void req_destroy (aio_req req);	341	static void req_destroy (aio_req req);
124	static void req_cancel (aio_req req);	342	static void req_cancel (aio_req req);
125		343
126	static void want_poll (void)	344	static void want_poll (void)
127	{	345	{
128	/* write a dummy byte to the pipe so fh becomes ready */	346	/* write a dummy byte to the pipe so fh becomes ready */
129	respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1);	347	s_epipe_signal (&respipe);
130	}	348	}
131		349
132	static void done_poll (void)	350	static void done_poll (void)
133	{	351	{
134	/* read any signals sent by the worker threads */	352	/* read any signals sent by the worker threads */
135	char buf [4];	353	s_epipe_drain (&respipe);
136	while (respipe_read (respipe [0], buf, 4) == 4)
137	;
138	}	354	}
139		355
140	/* must be called at most once */	356	/* must be called at most once */
141	static SV *req_sv (aio_req req, const char *klass)	357	static SV *req_sv (aio_req req, HV *stash)
142	{	358	{
143	if (!req->self)	359	if (!req->self)
144	{	360	{
145	req->self = (SV *)newHV ();	361	req->self = (SV *)newHV ();
146	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	362	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
147	}	363	}
148		364
149	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));	365	return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
150	}	366	}
151		367
152	static aio_req SvAIO_REQ (SV *sv)	368	static aio_req SvAIO_REQ (SV *sv)
153	{	369	{
154	MAGIC *mg;	370	MAGIC *mg;
155		371
156	if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))	372	if (!SvROK (sv)
		373	|| (SvSTASH (SvRV (sv)) != aio_grp_stash
		374	&& SvSTASH (SvRV (sv)) != aio_req_stash
		375	&& !sv_derived_from (sv, "IO::AIO::REQ")))
157	croak ("object of class " AIO_REQ_KLASS " expected");	376	croak ("object of class IO::AIO::REQ expected");
158		377
159	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	378	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
160		379
161	return mg ? (aio_req)mg->mg_ptr : 0;	380	return mg ? (aio_req)mg->mg_ptr : 0;
162	}	381	}
…		…
168	dSP;	387	dSP;
169		388
170	ENTER;	389	ENTER;
171	SAVETMPS;	390	SAVETMPS;
172	PUSHMARK (SP);	391	PUSHMARK (SP);
173	XPUSHs (req_sv (grp, AIO_GRP_KLASS));	392	XPUSHs (req_sv (grp, aio_grp_stash));
174	PUTBACK;	393	PUTBACK;
175	call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);	394	call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
176	SPAGAIN;	395	SPAGAIN;
177	FREETMPS;	396	FREETMPS;
178	LEAVE;	397	LEAVE;
…		…
181		400
182	static void req_submit (eio_req *req)	401	static void req_submit (eio_req *req)
183	{	402	{
184	eio_submit (req);	403	eio_submit (req);
185		404
186	if (on_next_submit)	405	if (expect_false (on_next_submit))
187	{	406	{
188	dSP;	407	dSP;
189	SV *cb = sv_2mortal (on_next_submit);	408	SV *cb = sv_2mortal (on_next_submit);
190		409
191	on_next_submit = 0;	410	on_next_submit = 0;
…		…
196	}	415	}
197	}	416	}
198		417
199	static int req_invoke (eio_req *req)	418	static int req_invoke (eio_req *req)
200	{	419	{
201	dSP;
202
203	if (req->flags & FLAG_SV2_RO_OFF)	420	if (req->flags & FLAG_SV2_RO_OFF)
204	SvREADONLY_off (req->sv2);	421	SvREADONLY_off (req->sv2);
205		422
206	if (!EIO_CANCELLED (req) && SvOK (req->callback))	423	if (!EIO_CANCELLED (req) && req->callback)
207	{	424	{
		425	dSP;
		426	static SV *sv_result_cache; /* caches the result integer SV */
		427	SV *sv_result;
		428
208	ENTER;	429	ENTER;
209	SAVETMPS;	430	SAVETMPS;
210	PUSHMARK (SP);	431	PUSHMARK (SP);
211	EXTEND (SP, 1);	432	EXTEND (SP, 1);
		433
		434	/* do not recreate the result IV from scratch each time */
		435	if (expect_true (sv_result_cache))
		436	{
		437	sv_result = sv_result_cache; sv_result_cache = 0;
		438	SvIV_set (sv_result, req->result);
		439	SvIOK_only (sv_result);
		440	}
		441	else
		442	{
		443	sv_result = newSViv (req->result);
		444	SvREADONLY_on (sv_result);
		445	}
212		446
213	switch (req->type)	447	switch (req->type)
214	{	448	{
215	case EIO_READDIR:	449	case EIO_READDIR:
216	{	450	{
217	SV *rv = &PL_sv_undef;	451	SV *rv = &PL_sv_undef;
218		452
219	if (req->result >= 0)	453	if (req->result >= 0)
220	{	454	{
221	int i;	455	int i;
222	char *buf = req->ptr2;	456	char *names = (char *)req->ptr2;
		457	eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
223	AV *av = newAV ();	458	AV *av = newAV ();
224		459
225	av_extend (av, req->result - 1);	460	av_extend (av, req->result - 1);
226		461
227	for (i = 0; i < req->result; ++i)	462	for (i = 0; i < req->result; ++i)
228	{	463	{
229	SV *sv = newSVpv (buf, 0);	464	if (req->int1 & EIO_READDIR_DENTS)
		465	{
		466	SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
230		467
		468	if (req->int1 & EIO_READDIR_CUSTOM2)
		469	{
		470	static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
		471	AV *avent = newAV ();
		472
		473	av_extend (avent, 2);
		474
		475	if (!sv_type [ent->type])
		476	{
		477	sv_type [ent->type] = newSViv (ent->type);
		478	SvREADONLY_on (sv_type [ent->type]);
		479	}
		480
		481	av_store (avent, 0, namesv);
		482	av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
		483	av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
		484
		485	av_store (av, i, newRV_noinc ((SV *)avent));
		486	}
		487	else
231	av_store (av, i, sv);	488	av_store (av, i, namesv);
		489
		490	++ent;
		491	}
		492	else
		493	{
		494	SV *name = newSVpv (names, 0);
		495	av_store (av, i, name);
232	buf += SvCUR (sv) + 1;	496	names += SvCUR (name) + 1;
		497	}
233	}	498	}
234		499
235	rv = sv_2mortal (newRV_noinc ((SV *)av));	500	rv = sv_2mortal (newRV_noinc ((SV *)av));
236	}	501	}
237		502
238	PUSHs (rv);	503	PUSHs (rv);
		504
		505	if (req->int1 & EIO_READDIR_CUSTOM1)
		506	XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
239	}	507	}
240	break;	508	break;
241		509
242	case EIO_OPEN:	510	case EIO_OPEN:
243	{	511	{
…		…
249	GV *gv = (GV *)sv_newmortal ();	517	GV *gv = (GV *)sv_newmortal ();
250	int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);	518	int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
251	char sym [64];	519	char sym [64];
252	int symlen;	520	int symlen;
253		521
254	symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);	522	symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
255	gv_init (gv, stash, sym, symlen, 0);	523	gv_init (gv, aio_stash, sym, symlen, 0);
256		524
257	symlen = snprintf (	525	symlen = snprintf (
258	sym,	526	sym,
259	sizeof (sym),	527	sizeof (sym),
260	"%s&=%d",	528	"%s&=%d",
261	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",	529	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
262	req->result	530	(int)req->result
263	);	531	);
264		532
265	if (do_open (gv, sym, symlen, 0, 0, 0, 0))	533	if (do_open (gv, sym, symlen, 0, 0, 0, 0))
266	fh = (SV *)gv;	534	fh = (SV *)gv;
267	}	535	}
268		536
269	PUSHs (fh);	537	PUSHs (fh);
270	}	538	}
		539	break;
		540
		541	case EIO_STATVFS:
		542	case EIO_FSTATVFS:
		543	{
		544	SV *rv = &PL_sv_undef;
		545
		546	#ifndef _WIN32
		547	if (req->result >= 0)
		548	{
		549	EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
		550	HV *hv = newHV ();
		551
		552	rv = sv_2mortal (newRV_noinc ((SV *)hv));
		553
		554	hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
		555	hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
		556	hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
		557	hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
		558	hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
		559	hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
		560	hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
		561	hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
		562	hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
		563	hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
		564	hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
		565	}
		566	#endif
		567
		568	PUSHs (rv);
		569	}
		570
271	break;	571	break;
272		572
273	case EIO_GROUP:	573	case EIO_GROUP:
274	req->int1 = 2; /* mark group as finished */	574	req->int1 = 2; /* mark group as finished */
275		575
…		…
287	case EIO_NOP:	587	case EIO_NOP:
288	case EIO_BUSY:	588	case EIO_BUSY:
289	break;	589	break;
290		590
291	case EIO_READLINK:	591	case EIO_READLINK:
		592	case EIO_REALPATH:
292	if (req->result > 0)	593	if (req->result > 0)
293	PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));	594	PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
294	break;	595	break;
295		596
296	case EIO_STAT:	597	case EIO_STAT:
297	case EIO_LSTAT:	598	case EIO_LSTAT:
298	case EIO_FSTAT:	599	case EIO_FSTAT:
299	PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;	600	PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
300	PL_laststatval = req->result;	601	PL_laststatval = req->result;
		602	/* if compilation fails here then perl's Stat_t is not struct _stati64 */
301	PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);	603	PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
302	PUSHs (sv_2mortal (newSViv (req->result)));	604	PUSHs (sv_result);
303	break;	605	break;
304		606
305	case EIO_READ:	607	case EIO_READ:
		608	{
306	SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));	609	SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
307	*SvEND (req->sv2) = 0;	610	*SvEND (req->sv2) = 0;
308	PUSHs (sv_2mortal (newSViv (req->result)));	611	SvPOK_only (req->sv2);
		612	SvSETMAGIC (req->sv2);
		613	PUSHs (sv_result);
		614	}
309	break;	615	break;
310		616
311	case EIO_DUP2:	617	case EIO_DUP2: /* EIO_DUP2 actually means aio_close(), so fudge result value */
312	if (req->result > 0)	618	if (req->result > 0)
313	req->result = 0;	619	SvIV_set (sv_result, 0);
314	/* FALLTHROUGH */	620	/* FALLTHROUGH */
315		621
316	default:	622	default:
317	PUSHs (sv_2mortal (newSViv (req->result)));	623	PUSHs (sv_result);
318	break;	624	break;
319	}	625	}
320		626
321	errno = req->errorno;	627	errno = req->errorno;
322		628
323	PUTBACK;	629	PUTBACK;
324	call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);	630	call_sv (req->callback, G_VOID | G_EVAL | G_DISCARD);
325	SPAGAIN;	631	SPAGAIN;
		632
		633	if (expect_false (SvREFCNT (sv_result) != 1 || sv_result_cache))
		634	SvREFCNT_dec (sv_result);
		635	else
		636	sv_result_cache = sv_result;
326		637
327	FREETMPS;	638	FREETMPS;
328	LEAVE;	639	LEAVE;
329		640
330	PUTBACK;	641	PUTBACK;
…		…
348	Safefree (req);	659	Safefree (req);
349	}	660	}
350		661
351	static void req_cancel_subs (aio_req grp)	662	static void req_cancel_subs (aio_req grp)
352	{	663	{
353	aio_req sub;
354
355	if (grp->type != EIO_GROUP)	664	if (grp->type != EIO_GROUP)
356	return;	665	return;
357		666
358	SvREFCNT_dec (grp->sv2);	667	SvREFCNT_dec (grp->sv2);
359	grp->sv2 = 0;	668	grp->sv2 = 0;
360		669
361	eio_grp_cancel (grp);	670	eio_grp_cancel (grp);
362	}	671	}
363		672
364	#ifdef USE_SOCKETS_AS_HANDLES
365	# define TO_SOCKET(x) (win32_get_osfhandle (x))
366	#else
367	# define TO_SOCKET(x) (x)
368	#endif
369
370	static void
371	create_respipe (void)	673	static void create_respipe (void)
372	{	674	{
373	int old_readfd = respipe [0];
374
375	if (respipe [1] >= 0)
376	respipe_close (TO_SOCKET (respipe [1]));
377
378	#ifdef _WIN32
379	if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
380	#else
381	if (pipe (respipe))	675	if (s_epipe_renew (&respipe))
382	#endif
383	croak ("unable to initialize result pipe");	676	croak ("IO::AIO: unable to initialize result pipe");
384
385	if (old_readfd >= 0)
386	{
387	if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
388	croak ("unable to initialize result pipe(2)");
389
390	respipe_close (respipe [0]);
391	respipe [0] = old_readfd;
392	}
393
394	#ifdef _WIN32
395	int arg = 1;
396	if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
397	|| ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
398	#else
399	if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
400	|| fcntl (respipe [1], F_SETFL, O_NONBLOCK))
401	#endif
402	croak ("unable to initialize result pipe(3)");
403
404	respipe_osf [0] = TO_SOCKET (respipe [0]);
405	respipe_osf [1] = TO_SOCKET (respipe [1]);
406	}	677	}
407		678
408	static void poll_wait (void)	679	static void poll_wait (void)
409	{	680	{
410	fd_set rfd;
411
412	while (eio_nreqs ())	681	while (eio_nreqs ())
413	{	682	{
414	int size;	683	int size;
415		684
416	X_LOCK (reslock);	685	X_LOCK (reslock);
…		…
420	if (size)	689	if (size)
421	return;	690	return;
422		691
423	etp_maybe_start_thread ();	692	etp_maybe_start_thread ();
424		693
425	FD_ZERO (&rfd);	694	s_epipe_wait (&respipe);
426	FD_SET (respipe [0], &rfd);
427
428	PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
429	}	695	}
430	}	696	}
431		697
432	static int poll_cb (void)	698	static int poll_cb (void)
433	{	699	{
…		…
443		709
444	poll_wait ();	710	poll_wait ();
445	}	711	}
446	}	712	}
447		713
448	static void atfork_child (void)	714	static void ecb_cold
		715	reinit (void)
449	{	716	{
450	create_respipe ();	717	create_respipe ();
		718
		719	if (eio_init (want_poll, done_poll) < 0)
		720	croak ("IO::AIO: unable to initialise eio library");
		721	}
		722
		723	/*****************************************************************************/
		724
		725	#if !_POSIX_MAPPED_FILES
		726	# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
		727	# define munmap(addr,length) (errno = ENOSYS, -1)
		728	#endif
		729
		730	#if !_POSIX_MEMORY_PROTECTION
		731	# define mprotect(addr,len,prot) (errno = ENOSYS, -1)
		732	# define PROT_NONE 0
		733	# define PROT_WRITE 0
		734	# define MAP_PRIVATE 0
		735	# define MAP_SHARED 0
		736	# define MAP_FIXED 0
		737	#endif
		738
		739	#define MMAP_MAGIC PERL_MAGIC_ext
		740
		741	static int mmap_free (pTHX_ SV *sv, MAGIC *mg)
		742	{
		743	int old_errno = errno;
		744	munmap (mg->mg_ptr, (size_t)mg->mg_obj);
		745	errno = old_errno;
		746
		747	mg->mg_obj = 0; /* just in case */
		748
		749	SvREADONLY_off (sv);
		750
		751	if (SvPVX (sv) != mg->mg_ptr)
		752	croak ("ERROR: IO::AIO::mmap-mapped scalar changed location, detected");
		753
		754	SvCUR_set (sv, 0);
		755	SvPVX (sv) = 0;
		756	SvOK_off (sv);
		757
		758	return 0;
		759	}
		760
		761	static MGVTBL mmap_vtbl = {
		762	0, 0, 0, 0, mmap_free
		763	};
		764
		765	/*****************************************************************************/
		766
		767	static SV * get_cb (SV *cb_sv)
		768	{
		769	SvGETMAGIC (cb_sv);
		770	return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
451	}	771	}
452		772
453	#define dREQ \	773	#define dREQ \
		774	SV *cb_cv; \
454	aio_req req; \	775	aio_req req; \
455	int req_pri = next_pri; \	776	int req_pri = next_pri; \
456	next_pri = EIO_PRI_DEFAULT; \	777	next_pri = EIO_PRI_DEFAULT; \
457	\	778	\
458	if (SvOK (callback) && !SvROK (callback)) \	779	cb_cv = get_cb (callback); \
459	croak ("callback must be undef or of reference type"); \
460	\	780	\
461	Newz (0, req, 1, eio_req); \	781	Newz (0, req, 1, eio_req); \
462	if (!req) \	782	if (!req) \
463	croak ("out of memory during eio_req allocation"); \	783	croak ("out of memory during eio_req allocation"); \
464	\	784	\
465	req->callback = newSVsv (callback); \	785	req->callback = SvREFCNT_inc (cb_cv); \
466	req->pri = req_pri	786	req->pri = req_pri
467		787
468	#define REQ_SEND \	788	#define REQ_SEND \
		789	PUTBACK; \
469	req_submit (req); \	790	req_submit (req); \
		791	SPAGAIN; \
470	\	792	\
471	if (GIMME_V != G_VOID) \	793	if (GIMME_V != G_VOID) \
472	XPUSHs (req_sv (req, AIO_REQ_KLASS));	794	XPUSHs (req_sv (req, aio_req_stash));
473		795
474	MODULE = IO::AIO PACKAGE = IO::AIO	796	MODULE = IO::AIO PACKAGE = IO::AIO
475		797
476	PROTOTYPES: ENABLE	798	PROTOTYPES: ENABLE
477		799
478	BOOT:	800	BOOT:
479	{	801	{
		802	static const struct {
		803	const char *name;
		804	IV iv;
		805	} *civ, const_iv[] = {
		806	# define const_niv(name, value) { # name, (IV) value },
		807	# define const_iv(name) { # name, (IV) name },
		808	# define const_eio(name) { # name, (IV) EIO_ ## name },
		809	const_iv (EXDEV)
		810	const_iv (ENOSYS)
		811	const_iv (O_RDONLY)
		812	const_iv (O_WRONLY)
		813	const_iv (O_RDWR)
		814	const_iv (O_CREAT)
		815	const_iv (O_TRUNC)
		816	const_iv (O_EXCL)
		817	const_iv (O_APPEND)
		818
		819	const_iv (O_ASYNC)
		820	const_iv (O_DIRECT)
		821	const_iv (O_NOATIME)
		822
		823	const_iv (O_CLOEXEC)
		824	const_iv (O_NOCTTY)
		825	const_iv (O_NOFOLLOW)
		826	const_iv (O_NONBLOCK)
		827	const_iv (O_EXEC)
		828	const_iv (O_SEARCH)
		829	const_iv (O_DIRECTORY)
		830	const_iv (O_DSYNC)
		831	const_iv (O_RSYNC)
		832	const_iv (O_SYNC)
		833	const_iv (O_TTY_INIT)
		834
		835	const_iv (S_IFIFO)
		836	const_iv (S_IFCHR)
		837	const_iv (S_IFBLK)
		838	const_iv (S_IFLNK)
		839	const_iv (S_IFREG)
		840	const_iv (S_IFDIR)
		841	const_iv (S_IFWHT)
		842	const_iv (S_IFSOCK)
		843	const_iv (S_IFMT)
		844
		845	const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
		846	const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
		847	const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
		848	const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
		849	const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
		850	const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
		851
		852	const_niv (MADV_NORMAL , POSIX_MADV_NORMAL)
		853	const_niv (MADV_SEQUENTIAL, POSIX_MADV_SEQUENTIAL)
		854	const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)
		855	const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)
		856	const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)
		857
		858	const_iv (ST_RDONLY)
		859	const_iv (ST_NOSUID)
		860	const_iv (ST_NODEV)
		861	const_iv (ST_NOEXEC)
		862	const_iv (ST_SYNCHRONOUS)
		863	const_iv (ST_MANDLOCK)
		864	const_iv (ST_WRITE)
		865	const_iv (ST_APPEND)
		866	const_iv (ST_IMMUTABLE)
		867	const_iv (ST_NOATIME)
		868	const_iv (ST_NODIRATIME)
		869	const_iv (ST_RELATIME)
		870
		871	const_iv (PROT_NONE)
		872	const_iv (PROT_EXEC)
		873	const_iv (PROT_READ)
		874	const_iv (PROT_WRITE)
		875
		876	/*const_iv (MAP_FIXED)*/
		877	const_iv (MAP_PRIVATE)
		878	const_iv (MAP_SHARED)
		879	const_iv (MAP_ANONYMOUS)
		880
		881	/* linuxish */
		882	const_iv (MAP_HUGETLB)
		883	const_iv (MAP_LOCKED)
		884	const_iv (MAP_NORESERVE)
		885	const_iv (MAP_POPULATE)
		886	const_iv (MAP_NONBLOCK)
		887
		888	const_eio (MCL_FUTURE)
		889	const_eio (MCL_CURRENT)
		890
		891	const_eio (MS_ASYNC)
		892	const_eio (MS_INVALIDATE)
		893	const_eio (MS_SYNC)
		894
		895	const_eio (MT_MODIFY)
		896
		897	const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
		898	const_eio (SYNC_FILE_RANGE_WRITE)
		899	const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
		900
		901	const_eio (FALLOC_FL_KEEP_SIZE)
		902
		903	const_eio (READDIR_DENTS)
		904	const_eio (READDIR_DIRS_FIRST)
		905	const_eio (READDIR_STAT_ORDER)
		906	const_eio (READDIR_FOUND_UNKNOWN)
		907
		908	const_eio (DT_UNKNOWN)
		909	const_eio (DT_FIFO)
		910	const_eio (DT_CHR)
		911	const_eio (DT_DIR)
		912	const_eio (DT_BLK)
		913	const_eio (DT_REG)
		914	const_eio (DT_LNK)
		915	const_eio (DT_SOCK)
		916	const_eio (DT_WHT)
		917	};
		918
480	stash = gv_stashpv ("IO::AIO", 1);	919	aio_stash = gv_stashpv ("IO::AIO" , 1);
		920	aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
		921	aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
481		922
482	newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));	923	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
483	newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));	924	newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
484	newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
485	newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
486	newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
487	#ifndef _WIN32
488	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
489	#endif
490		925
491	create_respipe ();	926	newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
492		927
493	if (eio_init (want_poll, done_poll) < 0)	928	reinit ();
494	croak ("IO::AIO: unable to initialise eio library");
495
496	/* atfork child called in fifo order, so before eio's handler */
497	X_THREAD_ATFORK (0, 0, atfork_child);
498	}	929	}
499		930
500	void	931	void
		932	reinit ()
		933	PROTOTYPE:
		934
		935	void
501	max_poll_reqs (int nreqs)	936	max_poll_reqs (unsigned int nreqs)
502	PROTOTYPE: $	937	PROTOTYPE: $
503	CODE:	938	CODE:
504	eio_set_max_poll_reqs (nreqs);	939	eio_set_max_poll_reqs (nreqs);
505		940
506	void	941	void
…		…
508	PROTOTYPE: $	943	PROTOTYPE: $
509	CODE:	944	CODE:
510	eio_set_max_poll_time (nseconds);	945	eio_set_max_poll_time (nseconds);
511		946
512	void	947	void
513	min_parallel (int nthreads)	948	min_parallel (unsigned int nthreads)
514	PROTOTYPE: $	949	PROTOTYPE: $
515	CODE:	950	CODE:
516	eio_set_min_parallel (nthreads);	951	eio_set_min_parallel (nthreads);
517		952
518	void	953	void
519	max_parallel (int nthreads)	954	max_parallel (unsigned int nthreads)
520	PROTOTYPE: $	955	PROTOTYPE: $
521	CODE:	956	CODE:
522	eio_set_max_parallel (nthreads);	957	eio_set_max_parallel (nthreads);
523		958
524	void	959	void
525	max_idle (int nthreads)	960	max_idle (unsigned int nthreads)
526	PROTOTYPE: $	961	PROTOTYPE: $
527	CODE:	962	CODE:
528	eio_set_max_idle (nthreads);	963	eio_set_max_idle (nthreads);
529		964
530	void	965	void
		966	idle_timeout (unsigned int seconds)
		967	PROTOTYPE: $
		968	CODE:
		969	eio_set_idle_timeout (seconds);
		970
		971	void
531	max_outstanding (int maxreqs)	972	max_outstanding (unsigned int maxreqs)
532	PROTOTYPE: $	973	PROTOTYPE: $
533	CODE:	974	CODE:
534	max_outstanding = maxreqs;	975	max_outstanding = maxreqs;
535		976
536	void	977	void
537	aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)	978	aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
538	PROTOTYPE: $$$;$
539	PPCODE:	979	PPCODE:
540	{	980	{
541	dREQ;	981	dREQ;
542		982
543	req->type = EIO_OPEN;	983	req->type = EIO_OPEN;
…		…
549	REQ_SEND;	989	REQ_SEND;
550	}	990	}
551		991
552	void	992	void
553	aio_fsync (SV *fh, SV *callback=&PL_sv_undef)	993	aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
554	PROTOTYPE: $;$
555	ALIAS:	994	ALIAS:
556	aio_fsync = EIO_FSYNC	995	aio_fsync = EIO_FSYNC
557	aio_fdatasync = EIO_FDATASYNC	996	aio_fdatasync = EIO_FDATASYNC
		997	aio_syncfs = EIO_SYNCFS
558	PPCODE:	998	PPCODE:
559	{	999	{
		1000	int fd = s_fileno_croak (fh, 0);
560	dREQ;	1001	dREQ;
561		1002
562	req->type = ix;	1003	req->type = ix;
563	req->sv1 = newSVsv (fh);	1004	req->sv1 = newSVsv (fh);
564	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));	1005	req->int1 = fd;
565		1006
566	REQ_SEND (req);	1007	REQ_SEND (req);
567	}	1008	}
568		1009
569	void	1010	void
		1011	aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
		1012	PPCODE:
		1013	{
		1014	int fd = s_fileno_croak (fh, 0);
		1015	dREQ;
		1016
		1017	req->type = EIO_SYNC_FILE_RANGE;
		1018	req->sv1 = newSVsv (fh);
		1019	req->int1 = fd;
		1020	req->offs = offset;
		1021	req->size = nbytes;
		1022	req->int2 = flags;
		1023
		1024	REQ_SEND (req);
		1025	}
		1026
		1027	void
		1028	aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
		1029	PPCODE:
		1030	{
		1031	int fd = s_fileno_croak (fh, 0);
		1032	dREQ;
		1033
		1034	req->type = EIO_FALLOCATE;
		1035	req->sv1 = newSVsv (fh);
		1036	req->int1 = fd;
		1037	req->int2 = mode;
		1038	req->offs = offset;
		1039	req->size = len;
		1040
		1041	REQ_SEND (req);
		1042	}
		1043
		1044	void
570	aio_close (SV *fh, SV *callback=&PL_sv_undef)	1045	aio_close (SV *fh, SV *callback=&PL_sv_undef)
571	PROTOTYPE: $;$
572	PPCODE:	1046	PPCODE:
573	{	1047	{
574	static int close_pipe = -1; /* dummy fd to close fds via dup2 */	1048	static int close_fd = -1; /* dummy fd to close fds via dup2 */
		1049	int fd = s_fileno_croak (fh, 0);
575	dREQ;	1050	dREQ;
576		1051
577	if (close_pipe < 0)	1052	if (expect_false (close_fd < 0))
578	{	1053	{
579	int pipefd [2];	1054	int pipefd [2];
580		1055
		1056	if (
		1057	#ifdef _WIN32
		1058	_pipe (pipefd, 1, _O_BINARY) < 0
		1059	#else
581	if (pipe (pipefd) < 0	1060	pipe (pipefd) < 0
582	|| close (pipefd [1]) < 0
583	|| fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0)	1061	|| fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
		1062	#endif
		1063	|| close (pipefd [1]) < 0
		1064	)
584	abort (); /*D*/	1065	abort (); /*D*/
585		1066
586	close_pipe = pipefd [0];	1067	close_fd = pipefd [0];
587	}	1068	}
588		1069
589	req->type = EIO_DUP2;	1070	req->type = EIO_DUP2;
590	req->int1 = close_pipe;	1071	req->int1 = close_fd;
591	req->sv2 = newSVsv (fh);	1072	req->sv2 = newSVsv (fh);
592	req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh)));	1073	req->int2 = fd;
593		1074
594	REQ_SEND (req);	1075	REQ_SEND (req);
595	}	1076	}
596		1077
597	void	1078	void
598	aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)	1079	aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef)
599	ALIAS:	1080	ALIAS:
600	aio_read = EIO_READ	1081	aio_read = EIO_READ
601	aio_write = EIO_WRITE	1082	aio_write = EIO_WRITE
602	PROTOTYPE: $$$$$;$
603	PPCODE:	1083	PPCODE:
604	{	1084	{
605	STRLEN svlen;	1085	STRLEN svlen;
		1086	int fd = s_fileno_croak (fh, ix == EIO_WRITE);
606	char *svptr = SvPVbyte (data, svlen);	1087	char *svptr = SvPVbyte (data, svlen);
607	UV len = SvUV (length);	1088	UV len = SvUV (length);
608
609	SvUPGRADE (data, SVt_PV);
610	SvPOK_on (data);
611		1089
612	if (dataoffset < 0)	1090	if (dataoffset < 0)
613	dataoffset += svlen;	1091	dataoffset += svlen;
614		1092
615	if (dataoffset < 0 || dataoffset > svlen)	1093	if (dataoffset < 0 || dataoffset > svlen)
…		…
621	if (!SvOK (length) || len + dataoffset > svlen)	1099	if (!SvOK (length) || len + dataoffset > svlen)
622	len = svlen - dataoffset;	1100	len = svlen - dataoffset;
623	}	1101	}
624	else	1102	else
625	{	1103	{
626	/* read: grow scalar as necessary */	1104	/* read: check type and grow scalar as necessary */
		1105	SvUPGRADE (data, SVt_PV);
627	svptr = SvGROW (data, len + dataoffset + 1);	1106	svptr = SvGROW (data, len + dataoffset + 1);
628	}	1107	}
629		1108
630	if (len < 0)
631	croak ("length must not be negative");
632
633	{	1109	{
634	dREQ;	1110	dREQ;
635		1111
636	req->type = ix;	1112	req->type = ix;
637	req->sv1 = newSVsv (fh);	1113	req->sv1 = newSVsv (fh);
638	req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))	1114	req->int1 = fd;
639	: IoOFP (sv_2io (fh)));
640	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;	1115	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
641	req->size = len;	1116	req->size = len;
642	req->sv2 = SvREFCNT_inc (data);	1117	req->sv2 = SvREFCNT_inc (data);
643	req->ptr2 = (char *)svptr + dataoffset;	1118	req->ptr2 = (char *)svptr + dataoffset;
644	req->stroffset = dataoffset;	1119	req->stroffset = dataoffset;
…		…
653	}	1128	}
654	}	1129	}
655		1130
656	void	1131	void
657	aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)	1132	aio_readlink (SV8 *path, SV *callback=&PL_sv_undef)
658	PROTOTYPE: $$;$	1133	ALIAS:
		1134	aio_readlink = EIO_READLINK
		1135	aio_realpath = EIO_REALPATH
659	PPCODE:	1136	PPCODE:
660	{	1137	{
661	SV *data;
662	dREQ;	1138	dREQ;
663		1139
664	req->type = EIO_READLINK;	1140	req->type = ix;
665	req->sv1 = newSVsv (path);	1141	req->sv1 = newSVsv (path);
666	req->ptr1 = SvPVbyte_nolen (req->sv1);	1142	req->ptr1 = SvPVbyte_nolen (req->sv1);
667		1143
668	REQ_SEND;	1144	REQ_SEND;
669	}	1145	}
670		1146
671	void	1147	void
672	aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)	1148	aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
673	PROTOTYPE: $$$$;$
674	PPCODE:	1149	PPCODE:
675	{	1150	{
		1151	int ifd = s_fileno_croak (in_fh , 0);
		1152	int ofd = s_fileno_croak (out_fh, 1);
676	dREQ;	1153	dREQ;
677		1154
678	req->type = EIO_SENDFILE;	1155	req->type = EIO_SENDFILE;
679	req->sv1 = newSVsv (out_fh);	1156	req->sv1 = newSVsv (out_fh);
680	req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));	1157	req->int1 = ofd;
681	req->sv2 = newSVsv (in_fh);	1158	req->sv2 = newSVsv (in_fh);
682	req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));	1159	req->int2 = ifd;
683	req->offs = SvVAL64 (in_offset);	1160	req->offs = in_offset;
684	req->size = length;	1161	req->size = length;
685		1162
686	REQ_SEND;	1163	REQ_SEND;
687	}	1164	}
688		1165
689	void	1166	void
690	aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)	1167	aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
691	PROTOTYPE: $$$;$
692	PPCODE:	1168	PPCODE:
693	{	1169	{
		1170	int fd = s_fileno_croak (fh, 0);
694	dREQ;	1171	dREQ;
695		1172
696	req->type = EIO_READAHEAD;	1173	req->type = EIO_READAHEAD;
697	req->sv1 = newSVsv (fh);	1174	req->sv1 = newSVsv (fh);
698	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));	1175	req->int1 = fd;
699	req->offs = SvVAL64 (offset);	1176	req->offs = offset;
700	req->size = length;	1177	req->size = length;
701		1178
702	REQ_SEND;	1179	REQ_SEND;
703	}	1180	}
704		1181
705	void	1182	void
706	aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)	1183	aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef)
707	ALIAS:	1184	ALIAS:
708	aio_stat = EIO_STAT	1185	aio_stat = EIO_STAT
709	aio_lstat = EIO_LSTAT	1186	aio_lstat = EIO_LSTAT
		1187	aio_statvfs = EIO_STATVFS
710	PPCODE:	1188	PPCODE:
711	{	1189	{
712	dREQ;	1190	dREQ;
713		1191
714	req->sv1 = newSVsv (fh_or_path);	1192	req->sv1 = newSVsv (fh_or_path);
…		…
718	req->type = ix;	1196	req->type = ix;
719	req->ptr1 = SvPVbyte_nolen (req->sv1);	1197	req->ptr1 = SvPVbyte_nolen (req->sv1);
720	}	1198	}
721	else	1199	else
722	{	1200	{
723	req->type = EIO_FSTAT;	1201	req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
724	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	1202	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
725	}	1203	}
726		1204
727	REQ_SEND;	1205	REQ_SEND;
728	}	1206	}
		1207
		1208	UV
		1209	major (UV dev)
		1210	ALIAS:
		1211	minor = 1
		1212	CODE:
		1213	RETVAL = ix ? major (dev) : minor (dev);
		1214	OUTPUT:
		1215	RETVAL
		1216
		1217	UV
		1218	makedev (UV maj, UV min)
		1219	CODE:
		1220	RETVAL = makedev (maj, min);
		1221	OUTPUT:
		1222	RETVAL
729		1223
730	void	1224	void
731	aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)	1225	aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef)
732	PPCODE:	1226	PPCODE:
733	{	1227	{
…		…
823		1317
824	REQ_SEND;	1318	REQ_SEND;
825	}	1319	}
826		1320
827	void	1321	void
		1322	aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
		1323	PPCODE:
		1324	{
		1325	dREQ;
		1326
		1327	req->type = EIO_READDIR;
		1328	req->sv1 = newSVsv (pathname);
		1329	req->ptr1 = SvPVbyte_nolen (req->sv1);
		1330	req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
		1331
		1332	if (flags & EIO_READDIR_DENTS)
		1333	req->int1 |= EIO_READDIR_CUSTOM2;
		1334
		1335	REQ_SEND;
		1336	}
		1337
		1338	void
828	aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)	1339	aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
829	ALIAS:	1340	ALIAS:
830	aio_unlink = EIO_UNLINK	1341	aio_unlink = EIO_UNLINK
831	aio_rmdir = EIO_RMDIR	1342	aio_rmdir = EIO_RMDIR
832	aio_readdir = EIO_READDIR	1343	aio_readdir = EIO_READDIR
…		…
874		1385
875	REQ_SEND;	1386	REQ_SEND;
876	}	1387	}
877		1388
878	void	1389	void
		1390	aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
		1391	ALIAS:
		1392	aio_mtouch = EIO_MTOUCH
		1393	aio_msync = EIO_MSYNC
		1394	PPCODE:
		1395	{
		1396	STRLEN svlen;
		1397	char *svptr = SvPVbyte (data, svlen);
		1398	UV len = SvUV (length);
		1399
		1400	if (offset < 0)
		1401	offset += svlen;
		1402
		1403	if (offset < 0 || offset > svlen)
		1404	croak ("offset outside of scalar");
		1405
		1406	if (!SvOK (length) || len + offset > svlen)
		1407	len = svlen - offset;
		1408
		1409	{
		1410	dREQ;
		1411
		1412	req->type = ix;
		1413	req->sv2 = SvREFCNT_inc (data);
		1414	req->ptr2 = (char *)svptr + offset;
		1415	req->size = len;
		1416	req->int1 = flags;
		1417
		1418	REQ_SEND;
		1419	}
		1420	}
		1421
		1422	void
		1423	aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef)
		1424	PPCODE:
		1425	{
		1426	STRLEN svlen;
		1427	char *svptr = SvPVbyte (data, svlen);
		1428	UV len = SvUV (length);
		1429
		1430	if (offset < 0)
		1431	offset += svlen;
		1432
		1433	if (offset < 0 || offset > svlen)
		1434	croak ("offset outside of scalar");
		1435
		1436	if (!SvOK (length) || len + offset > svlen)
		1437	len = svlen - offset;
		1438
		1439	{
		1440	dREQ;
		1441
		1442	req->type = EIO_MLOCK;
		1443	req->sv2 = SvREFCNT_inc (data);
		1444	req->ptr2 = (char *)svptr + offset;
		1445	req->size = len;
		1446
		1447	REQ_SEND;
		1448	}
		1449	}
		1450
		1451	void
		1452	aio_mlockall (IV flags, SV *callback=&PL_sv_undef)
		1453	PPCODE:
		1454	{
		1455	dREQ;
		1456
		1457	req->type = EIO_MLOCKALL;
		1458	req->int1 = flags;
		1459
		1460	REQ_SEND;
		1461	}
		1462
		1463	void
879	aio_busy (double delay, SV *callback=&PL_sv_undef)	1464	aio_busy (double delay, SV *callback=&PL_sv_undef)
880	PPCODE:	1465	PPCODE:
881	{	1466	{
882	dREQ;	1467	dREQ;
883		1468
…		…
887	REQ_SEND;	1472	REQ_SEND;
888	}	1473	}
889		1474
890	void	1475	void
891	aio_group (SV *callback=&PL_sv_undef)	1476	aio_group (SV *callback=&PL_sv_undef)
892	PROTOTYPE: ;$
893	PPCODE:	1477	PPCODE:
894	{	1478	{
895	dREQ;	1479	dREQ;
896		1480
897	req->type = EIO_GROUP;	1481	req->type = EIO_GROUP;
898		1482
899	eio_submit (req);	1483	req_submit (req);
900	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1484	XPUSHs (req_sv (req, aio_grp_stash));
901	}	1485	}
902		1486
903	void	1487	void
904	aio_nop (SV *callback=&PL_sv_undef)	1488	aio_nop (SV *callback=&PL_sv_undef)
905	ALIAS:	1489	ALIAS:
…		…
914	REQ_SEND;	1498	REQ_SEND;
915	}	1499	}
916		1500
917	int	1501	int
918	aioreq_pri (int pri = 0)	1502	aioreq_pri (int pri = 0)
919	PROTOTYPE: ;$
920	CODE:	1503	CODE:
921	RETVAL = next_pri;	1504	RETVAL = next_pri;
922	if (items > 0)	1505	if (items > 0)
923	{	1506	{
924	if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;	1507	if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
…		…
936	if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;	1519	if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
937	next_pri = nice;	1520	next_pri = nice;
938		1521
939	void	1522	void
940	flush ()	1523	flush ()
941	PROTOTYPE:
942	CODE:	1524	CODE:
943	while (eio_nreqs ())	1525	while (eio_nreqs ())
944	{	1526	{
945	poll_wait ();	1527	poll_wait ();
946	poll_cb ();	1528	poll_cb ();
947	}	1529	}
948		1530
949	int	1531	int
950	poll()	1532	poll ()
951	PROTOTYPE:
952	CODE:	1533	CODE:
953	poll_wait ();	1534	poll_wait ();
954	RETVAL = poll_cb ();	1535	RETVAL = poll_cb ();
955	OUTPUT:	1536	OUTPUT:
956	RETVAL	1537	RETVAL
957		1538
958	int	1539	int
959	poll_fileno()	1540	poll_fileno ()
960	PROTOTYPE:
961	CODE:	1541	CODE:
962	RETVAL = respipe [0];	1542	RETVAL = s_epipe_fd (&respipe);
963	OUTPUT:	1543	OUTPUT:
964	RETVAL	1544	RETVAL
965		1545
966	int	1546	int
967	poll_cb(...)	1547	poll_cb (...)
968	PROTOTYPE:	1548	PROTOTYPE:
969	CODE:	1549	CODE:
970	RETVAL = poll_cb ();	1550	RETVAL = poll_cb ();
971	OUTPUT:	1551	OUTPUT:
972	RETVAL	1552	RETVAL
973		1553
974	void	1554	void
975	poll_wait()	1555	poll_wait ()
976	PROTOTYPE:
977	CODE:	1556	CODE:
978	poll_wait ();	1557	poll_wait ();
979		1558
980	int	1559	int
981	nreqs()	1560	nreqs ()
982	PROTOTYPE:
983	CODE:	1561	CODE:
984	RETVAL = eio_nreqs ();	1562	RETVAL = eio_nreqs ();
985	OUTPUT:	1563	OUTPUT:
986	RETVAL	1564	RETVAL
987		1565
988	int	1566	int
989	nready()	1567	nready ()
990	PROTOTYPE:
991	CODE:	1568	CODE:
992	RETVAL = eio_nready ();	1569	RETVAL = eio_nready ();
993	OUTPUT:	1570	OUTPUT:
994	RETVAL	1571	RETVAL
995		1572
996	int	1573	int
997	npending()	1574	npending ()
998	PROTOTYPE:
999	CODE:	1575	CODE:
1000	RETVAL = eio_npending ();	1576	RETVAL = eio_npending ();
1001	OUTPUT:	1577	OUTPUT:
1002	RETVAL	1578	RETVAL
1003		1579
1004	int	1580	int
1005	nthreads()	1581	nthreads ()
1006	PROTOTYPE:
1007	CODE:	1582	CODE:
1008	RETVAL = eio_nthreads ();	1583	RETVAL = eio_nthreads ();
1009	OUTPUT:	1584	OUTPUT:
1010	RETVAL	1585	RETVAL
1011		1586
		1587	int
		1588	fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
		1589	CODE:
		1590	RETVAL = posix_fadvise (fh, offset, length, advice);
		1591	OUTPUT:
		1592	RETVAL
		1593
		1594	IV
		1595	sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
		1596	CODE:
		1597	RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
		1598	OUTPUT:
		1599	RETVAL
		1600
		1601	void
		1602	mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0)
		1603	PPCODE:
		1604	sv_unmagic (scalar, MMAP_MAGIC);
		1605	{
		1606	int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
		1607	void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
		1608	if (addr == (void *)-1)
		1609	XSRETURN_NO;
		1610
		1611	sv_force_normal (scalar);
		1612
		1613	/* we store the length in mg_obj, as namlen is I32 :/ */
		1614	sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
		1615	->mg_obj = (SV *)length;
		1616
		1617	SvUPGRADE (scalar, SVt_PV); /* nop... */
		1618
		1619	if (!(prot & PROT_WRITE))
		1620	SvREADONLY_on (scalar);
		1621
		1622	if (SvLEN (scalar))
		1623	Safefree (SvPVX (scalar));
		1624
		1625	SvPVX (scalar) = (char *)addr;
		1626	SvCUR_set (scalar, length);
		1627	SvLEN_set (scalar, 0);
		1628	SvPOK_only (scalar);
		1629
		1630	XSRETURN_YES;
		1631	}
		1632
		1633	void
		1634	munmap (SV *scalar)
		1635	CODE:
		1636	sv_unmagic (scalar, MMAP_MAGIC);
		1637
		1638	int
		1639	madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
		1640	ALIAS:
		1641	mprotect = 1
		1642	CODE:
		1643	{
		1644	STRLEN svlen;
		1645	void *addr = SvPVbyte (scalar, svlen);
		1646	size_t len = SvUV (length);
		1647
		1648	if (offset < 0)
		1649	offset += svlen;
		1650
		1651	if (offset < 0 || offset > svlen)
		1652	croak ("offset outside of scalar");
		1653
		1654	if (!SvOK (length) || len + offset > svlen)
		1655	len = svlen - offset;
		1656
		1657	addr = (void *)(((intptr_t)addr) + offset);
		1658	eio_page_align (&addr, &len);
		1659
		1660	switch (ix)
		1661	{
		1662	case 0: RETVAL = posix_madvise (addr, len, advice_or_prot); break;
		1663	case 1: RETVAL = mprotect (addr, len, advice_or_prot); break;
		1664	}
		1665	}
		1666	OUTPUT:
		1667	RETVAL
		1668
		1669	int
		1670	munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
		1671	CODE:
		1672	{
		1673	STRLEN svlen;
		1674	void *addr = SvPVbyte (scalar, svlen);
		1675	size_t len = SvUV (length);
		1676
		1677	if (offset < 0)
		1678	offset += svlen;
		1679
		1680	if (offset < 0 || offset > svlen)
		1681	croak ("offset outside of scalar");
		1682
		1683	if (!SvOK (length) || len + offset > svlen)
		1684	len = svlen - offset;
		1685
		1686	addr = (void *)(((intptr_t)addr) + offset);
		1687	eio_page_align (&addr, &len);
		1688	#if _POSIX_MEMLOCK_RANGE
		1689	RETVAL = munlock (addr, len);
		1690	#else
		1691	RETVAL = ((errno = ENOSYS), -1);
		1692	#endif
		1693	}
		1694	OUTPUT:
		1695	RETVAL
		1696
		1697	int
		1698	munlockall ()
		1699	CODE:
		1700	#if _POSIX_MEMLOCK
		1701	munlockall ();
		1702	#else
		1703	RETVAL = -1;
		1704	errno = ENOSYS;
		1705	#endif
		1706	OUTPUT:
		1707	RETVAL
		1708
1012	void _on_next_submit (SV *cb)	1709	void _on_next_submit (SV *cb)
1013	CODE:	1710	CODE:
1014	SvREFCNT_dec (on_next_submit);	1711	SvREFCNT_dec (on_next_submit);
1015	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1712	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1016		1713
…		…
1023	CODE:	1720	CODE:
1024	eio_cancel (req);	1721	eio_cancel (req);
1025		1722
1026	void	1723	void
1027	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)	1724	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1028	CODE:	1725	PPCODE:
		1726	{
		1727	if (GIMME_V != G_VOID)
		1728	XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
		1729
		1730	if (items > 1)
		1731	{
		1732	SV *cb_cv =get_cb (callback);
		1733
1029	SvREFCNT_dec (req->callback);	1734	SvREFCNT_dec (req->callback);
1030	req->callback = newSVsv (callback);	1735	req->callback = SvREFCNT_inc (cb_cv);
		1736	}
		1737	}
1031		1738
1032	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1739	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1033		1740
1034	void	1741	void
1035	add (aio_req grp, ...)	1742	add (aio_req grp, ...)
…		…
1067	AV *av;	1774	AV *av;
1068		1775
1069	grp->errorno = errno;	1776	grp->errorno = errno;
1070		1777
1071	av = newAV ();	1778	av = newAV ();
		1779	av_extend (av, items - 1);
1072		1780
1073	for (i = 1; i < items; ++i )	1781	for (i = 1; i < items; ++i )
1074	av_push (av, newSVsv (ST (i)));	1782	av_push (av, newSVsv (ST (i)));
1075		1783
1076	SvREFCNT_dec (grp->sv1);	1784	SvREFCNT_dec (grp->sv1);
…		…
1090	void	1798	void
1091	feed (aio_req grp, SV *callback=&PL_sv_undef)	1799	feed (aio_req grp, SV *callback=&PL_sv_undef)
1092	CODE:	1800	CODE:
1093	{	1801	{
1094	SvREFCNT_dec (grp->sv2);	1802	SvREFCNT_dec (grp->sv2);
1095	grp->sv2 = newSVsv (callback);	1803	grp->sv2 = newSVsv (callback);
		1804	grp->feed = aio_grp_feed;
1096		1805
1097	if (grp->int2 <= 0)	1806	if (grp->int2 <= 0)
1098	grp->int2 = 2;	1807	grp->int2 = 2;
1099		1808
1100	eio_grp_limit (grp, grp->int2);	1809	eio_grp_limit (grp, grp->int2);

Diff Legend

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