[ViewVC] Diff of: cvs/IO-AIO/AIO.xs

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.139 by root, Tue Apr 21 20:12:56 2009 UTC vs.
Revision 1.149 by root, Tue Jun 30 07:33:58 2009 UTC

…		…
75		75
76	#define EIO_STRUCT_STAT Stat_t	76	#define EIO_STRUCT_STAT Stat_t
77		77
78	/* use NV for 32 bit perls as it allows larger offsets */	78	/* use NV for 32 bit perls as it allows larger offsets */
79	#if IVSIZE >= 8	79	#if IVSIZE >= 8
		80	# define VAL64 IV
80	# define SvVAL64 SvIV	81	# define SvVAL64 SvIV
		82	# define newSVval64 newSViv
81	#else	83	#else
		84	# define VAL64 NV
82	# define SvVAL64 SvNV	85	# define SvVAL64 SvNV
		86	# define newSVval64 newSVnv
83	#endif	87	#endif
84		88
85	/*****************************************************************************/	89	/*****************************************************************************/
86		90
87	#if __GNUC__ >= 3	91	#if __GNUC__ >= 3
…		…
95		99
96	/*****************************************************************************/	100	/*****************************************************************************/
97		101
98	static HV *stash;	102	static HV *stash;
99	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 */
100		106
101	#define AIO_REQ_KLASS "IO::AIO::REQ"	107	#define AIO_REQ_KLASS "IO::AIO::REQ"
102	#define AIO_GRP_KLASS "IO::AIO::GRP"	108	#define AIO_GRP_KLASS "IO::AIO::GRP"
103		109
104	#define EIO_REQ_MEMBERS \	110	#define EIO_REQ_MEMBERS \
…		…
108	SV *self;	114	SV *self;
109		115
110	#define EIO_NO_WRAPPERS 1	116	#define EIO_NO_WRAPPERS 1
111		117
112	#include "libeio/eio.h"	118	#include "libeio/eio.h"
		119
		120	#ifndef POSIX_FADV_NORMAL
		121	# define POSIX_FADV_NORMAL 0
		122	# define NO_FADVISE 1
		123	#endif
		124
		125	#ifndef POSIX_FADV_SEQUENTIAL
		126	# define POSIX_FADV_SEQUENTIAL 0
		127	#endif
		128
		129	#ifndef POSIX_FADV_RANDOM
		130	# define POSIX_FADV_RANDOM 0
		131	#endif
		132
		133	#ifndef POSIX_FADV_NOREUSE
		134	# define POSIX_FADV_NOREUSE 0
		135	#endif
		136
		137	#ifndef POSIX_FADV_WILLNEED
		138	# define POSIX_FADV_WILLNEED 0
		139	#endif
		140
		141	#ifndef POSIX_FADV_DONTNEED
		142	# define POSIX_FADV_DONTNEED 0
		143	#endif
113		144
114	static int req_invoke (eio_req *req);	145	static int req_invoke (eio_req *req);
115	#define EIO_FINISH(req) req_invoke (req)	146	#define EIO_FINISH(req) req_invoke (req)
116	static void req_destroy (eio_req *grp);	147	static void req_destroy (eio_req *grp);
117	#define EIO_DESTROY(req) req_destroy (req)	148	#define EIO_DESTROY(req) req_destroy (req)
…		…
228	SV *rv = &PL_sv_undef;	259	SV *rv = &PL_sv_undef;
229		260
230	if (req->result >= 0)	261	if (req->result >= 0)
231	{	262	{
232	int i;	263	int i;
233	char *buf = req->ptr2;	264	char names = (char )req->ptr2;
		265	eio_dirent ent = (eio_dirent )req->ptr1; /* might be 0 */
234	AV *av = newAV ();	266	AV *av = newAV ();
235		267
236	av_extend (av, req->result - 1);	268	av_extend (av, req->result - 1);
237		269
238	for (i = 0; i < req->result; ++i)	270	for (i = 0; i < req->result; ++i)
239	{	271	{
240	SV *sv = newSVpv (buf, 0);	272	if (req->int1 & EIO_READDIR_DENTS)
		273	{
		274	SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
241		275
		276	if (req->int1 & EIO_READDIR_CUSTOM2)
		277	{
		278	static SV sv_type [EIO_DT_MAX + 1]; / type sv cache */
		279	AV *avent = newAV ();
		280
		281	av_extend (avent, 2);
		282
		283	if (!sv_type [ent->type])
		284	{
		285	sv_type [ent->type] = newSViv (ent->type);
		286	SvREADONLY_on (sv_type [ent->type]);
		287	}
		288
		289	av_store (avent, 0, namesv);
		290	av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
		291	av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
		292
		293	av_store (av, i, newRV_noinc ((SV *)avent));
		294	}
		295	else
242	av_store (av, i, sv);	296	av_store (av, i, namesv);
		297
		298	++ent;
		299	}
		300	else
		301	{
		302	SV *name = newSVpv (names, 0);
		303	av_store (av, i, name);
243	buf += SvCUR (sv) + 1;	304	names += SvCUR (name) + 1;
		305	}
244	}	306	}
245		307
246	rv = sv_2mortal (newRV_noinc ((SV *)av));	308	rv = sv_2mortal (newRV_noinc ((SV *)av));
247	}	309	}
248		310
249	PUSHs (rv);	311	PUSHs (rv);
		312
		313	if (req->int1 & EIO_READDIR_CUSTOM1)
		314	XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 \| EIO_READDIR_CUSTOM2))));
250	}	315	}
251	break;	316	break;
252		317
253	case EIO_OPEN:	318	case EIO_OPEN:
254	{	319	{
…		…
260	GV gv = (GV )sv_newmortal ();	325	GV gv = (GV )sv_newmortal ();
261	int flags = req->int1 & (O_RDONLY \| O_WRONLY \| O_RDWR);	326	int flags = req->int1 & (O_RDONLY \| O_WRONLY \| O_RDWR);
262	char sym [64];	327	char sym [64];
263	int symlen;	328	int symlen;
264		329
265	symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);	330	symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
266	gv_init (gv, stash, sym, symlen, 0);	331	gv_init (gv, stash, sym, symlen, 0);
267		332
268	symlen = snprintf (	333	symlen = snprintf (
269	sym,	334	sym,
270	sizeof (sym),	335	sizeof (sym),
271	"%s&=%d",	336	"%s&=%d",
272	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",	337	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273	req->result	338	(int)req->result
274	);	339	);
275		340
276	if (do_open (gv, sym, symlen, 0, 0, 0, 0))	341	if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277	fh = (SV *)gv;	342	fh = (SV *)gv;
278	}	343	}
…		…
521		586
522	PROTOTYPES: ENABLE	587	PROTOTYPES: ENABLE
523		588
524	BOOT:	589	BOOT:
525	{	590	{
526	stash = gv_stashpv ("IO::AIO", 1);	591	static const struct {
527		592	const char *name;
528	newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));	593	IV iv;
529	newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));	594	} *civ, const_iv[] = {
530	newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));	595	# define const_iv(name, value) { # name, (IV) value },
531	newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));	596	# define const_eio(name) { # name, (IV) EIO_ ## name },
532	newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));	597	const_iv (EXDEV , EXDEV)
		598	const_iv (ENOSYS , ENOSYS)
		599	const_iv (O_RDONLY, O_RDONLY)
		600	const_iv (O_WRONLY, O_WRONLY)
		601	const_iv (O_CREAT , O_CREAT)
		602	const_iv (O_TRUNC , O_TRUNC)
533	#ifndef _WIN32	603	#ifndef _WIN32
534	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	604	const_iv (S_IFIFO , S_IFIFO)
535	#endif	605	#endif
536	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	606	const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
537	newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));	607	const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
538	newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));	608	const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
539	newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));	609	const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
		610	const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
		611	const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
540		612
		613	const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
		614	const_eio (SYNC_FILE_RANGE_WRITE)
		615	const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
		616
		617	const_eio (READDIR_DENTS)
		618	const_eio (READDIR_DIRS_FIRST)
		619	const_eio (READDIR_STAT_ORDER)
		620	const_eio (READDIR_FOUND_UNKNOWN)
		621
		622	const_eio (DT_UNKNOWN)
		623	const_eio (DT_FIFO)
		624	const_eio (DT_CHR)
		625	const_eio (DT_DIR)
		626	const_eio (DT_BLK)
		627	const_eio (DT_REG)
		628	const_eio (DT_LNK)
		629	const_eio (DT_SOCK)
		630	const_eio (DT_WHT)
		631	};
		632
		633	stash = gv_stashpv ("IO::AIO", 1);
		634
		635	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		636	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		637
541	create_respipe ();	638	create_respipe ();
542		639
543	if (eio_init (want_poll, done_poll) < 0)	640	if (eio_init (want_poll, done_poll) < 0)
544	croak ("IO::AIO: unable to initialise eio library");	641	croak ("IO::AIO: unable to initialise eio library");
545		642
546	/* atfork child called in fifo order, so before eio's handler */	643	/* atfork child called in fifo order, so before eio's handler */
547	X_THREAD_ATFORK (0, 0, atfork_child);	644	X_THREAD_ATFORK (0, 0, atfork_child);
548	}	645	}
549		646
550	void	647	void
551	max_poll_reqs (int nreqs)	648	max_poll_reqs (int nreqs)
552	PROTOTYPE: $	649	PROTOTYPE: $
…		…
616		713
617	REQ_SEND (req);	714	REQ_SEND (req);
618	}	715	}
619		716
620	void	717	void
621	aio_sync_file_range (SV fh, SV offset, SV nbytes, IV flags, SV callback=&PL_sv_undef)	718	aio_sync_file_range (SV fh, off_t offset, size_t nbytes, UV flags, SV callback=&PL_sv_undef)
622	PROTOTYPE: $$$$;$	719	PROTOTYPE: $$$$;$
623	PPCODE:	720	PPCODE:
624	{	721	{
625	int fd = extract_fd (fh, 0);	722	int fd = extract_fd (fh, 0);
626	dREQ;	723	dREQ;
627		724
628	req->type = EIO_SYNC_FILE_RANGE;	725	req->type = EIO_SYNC_FILE_RANGE;
629	req->sv1 = newSVsv (fh);	726	req->sv1 = newSVsv (fh);
630	req->int1 = fd;	727	req->int1 = fd;
631	req->offs = SvVAL64 (offset);	728	req->offs = offset;
632	req->size = SvVAL64 (nbytes);	729	req->size = nbytes;
633	req->int2 = flags;	730	req->int2 = flags;
634		731
635	REQ_SEND (req);	732	REQ_SEND (req);
636	}	733	}
637		734
…		…
732		829
733	REQ_SEND;	830	REQ_SEND;
734	}	831	}
735		832
736	void	833	void
737	aio_sendfile (SV out_fh, SV in_fh, SV in_offset, UV length, SV callback=&PL_sv_undef)	834	aio_sendfile (SV out_fh, SV in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
738	PROTOTYPE: $$$$;$	835	PROTOTYPE: $$$$;$
739	PPCODE:	836	PPCODE:
740	{	837	{
741	int ifd = extract_fd (in_fh , 0);	838	int ifd = extract_fd (in_fh , 0);
742	int ofd = extract_fd (out_fh, 0);	839	int ofd = extract_fd (out_fh, 0);
…		…
745	req->type = EIO_SENDFILE;	842	req->type = EIO_SENDFILE;
746	req->sv1 = newSVsv (out_fh);	843	req->sv1 = newSVsv (out_fh);
747	req->int1 = ofd;	844	req->int1 = ofd;
748	req->sv2 = newSVsv (in_fh);	845	req->sv2 = newSVsv (in_fh);
749	req->int2 = ifd;	846	req->int2 = ifd;
750	req->offs = SvVAL64 (in_offset);	847	req->offs = in_offset;
751	req->size = length;	848	req->size = length;
752		849
753	REQ_SEND;	850	REQ_SEND;
754	}	851	}
755		852
756	void	853	void
757	aio_readahead (SV fh, SV offset, IV length, SV *callback=&PL_sv_undef)	854	aio_readahead (SV fh, off_t offset, size_t length, SV callback=&PL_sv_undef)
758	PROTOTYPE: $$$;$	855	PROTOTYPE: $$$;$
759	PPCODE:	856	PPCODE:
760	{	857	{
761	int fd = extract_fd (fh, 0);	858	int fd = extract_fd (fh, 0);
762	dREQ;	859	dREQ;
763		860
764	req->type = EIO_READAHEAD;	861	req->type = EIO_READAHEAD;
765	req->sv1 = newSVsv (fh);	862	req->sv1 = newSVsv (fh);
766	req->int1 = fd;	863	req->int1 = fd;
767	req->offs = SvVAL64 (offset);	864	req->offs = offset;
768	req->size = length;	865	req->size = length;
769		866
770	REQ_SEND;	867	REQ_SEND;
771	}	868	}
772		869
…		…
888	req->type = EIO_FCHOWN;	985	req->type = EIO_FCHOWN;
889	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	986	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
890	}	987	}
891		988
892	REQ_SEND;	989	REQ_SEND;
		990	}
		991
		992	void
		993	aio_readdirx (SV8 pathname, IV flags, SV callback=&PL_sv_undef)
		994	PPCODE:
		995	{
		996	dREQ;
		997
		998	req->type = EIO_READDIR;
		999	req->sv1 = newSVsv (pathname);
		1000	req->ptr1 = SvPVbyte_nolen (req->sv1);
		1001	req->int1 = flags \| EIO_READDIR_DENTS \| EIO_READDIR_CUSTOM1;
		1002
		1003	if (flags & EIO_READDIR_DENTS)
		1004	req->int1 \|= EIO_READDIR_CUSTOM2;
		1005
		1006	REQ_SEND;
893	}	1007	}
894		1008
895	void	1009	void
896	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)	1010	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)
897	ALIAS:	1011	ALIAS:
…		…
1075	CODE:	1189	CODE:
1076	RETVAL = eio_nthreads ();	1190	RETVAL = eio_nthreads ();
1077	OUTPUT:	1191	OUTPUT:
1078	RETVAL	1192	RETVAL
1079		1193
		1194	int
		1195	fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
		1196	PROTOTYPE: $$$$
		1197	CODE:
		1198	{
		1199	#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
		1200	RETVAL = posix_fadvise (fh, offset, length, advice);
		1201	#else
		1202	RETVAL = errno = ENOSYS;
		1203	#endif
		1204	}
		1205	OUTPUT:
		1206	RETVAL
		1207
		1208	ssize_t
		1209	sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
		1210	PROTOTYPE: $$$$
		1211	CODE:
		1212	eio_sendfile_sync (ofh, ifh, offset, count);
		1213
1080	void _on_next_submit (SV *cb)	1214	void _on_next_submit (SV *cb)
1081	CODE:	1215	CODE:
1082	SvREFCNT_dec (on_next_submit);	1216	SvREFCNT_dec (on_next_submit);
1083	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1217	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1084		1218
…		…
1145	AV *av;	1279	AV *av;
1146		1280
1147	grp->errorno = errno;	1281	grp->errorno = errno;
1148		1282
1149	av = newAV ();	1283	av = newAV ();
		1284	av_extend (av, items - 1);
1150		1285
1151	for (i = 1; i < items; ++i )	1286	for (i = 1; i < items; ++i )
1152	av_push (av, newSVsv (ST (i)));	1287	av_push (av, newSVsv (ST (i)));
1153		1288
1154	SvREFCNT_dec (grp->sv1);	1289	SvREFCNT_dec (grp->sv1);

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.139 by root, Tue Apr 21 20:12:56 2009 UTC vs. Revision 1.149 by root, Tue Jun 30 07:33:58 2009 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.139 by root, Tue Apr 21 20:12:56 2009 UTC vs.
Revision 1.149 by root, Tue Jun 30 07:33:58 2009 UTC