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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.132 by root, Mon Oct 13 10:38:17 2008 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	}
…		…
312	PL_statcache = (EIO_STRUCT_STAT )(req->ptr2);	377	PL_statcache = (EIO_STRUCT_STAT )(req->ptr2);
313	PUSHs (sv_2mortal (newSViv (req->result)));	378	PUSHs (sv_2mortal (newSViv (req->result)));
314	break;	379	break;
315		380
316	case EIO_READ:	381	case EIO_READ:
		382	{
317	SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));	383	SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
318	*SvEND (req->sv2) = 0;	384	*SvEND (req->sv2) = 0;
		385	SvPOK_only (req->sv2);
		386	SvSETMAGIC (req->sv2);
319	PUSHs (sv_2mortal (newSViv (req->result)));	387	PUSHs (sv_2mortal (newSViv (req->result)));
		388	}
320	break;	389	break;
321		390
322	case EIO_DUP2:	391	case EIO_DUP2:
323	if (req->result > 0)	392	if (req->result > 0)
324	req->result = 0;	393	req->result = 0;
…		…
499	req_submit (req); \	568	req_submit (req); \
500	SPAGAIN; \	569	SPAGAIN; \
501	\	570	\
502	if (GIMME_V != G_VOID) \	571	if (GIMME_V != G_VOID) \
503	XPUSHs (req_sv (req, AIO_REQ_KLASS));	572	XPUSHs (req_sv (req, AIO_REQ_KLASS));
504		573
		574	static int
		575	extract_fd (SV *fh, int wr)
		576	{
		577	int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
		578
		579	if (fd < 0)
		580	croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
		581
		582	return fd;
		583	}
		584
505	MODULE = IO::AIO PACKAGE = IO::AIO	585	MODULE = IO::AIO PACKAGE = IO::AIO
506		586
507	PROTOTYPES: ENABLE	587	PROTOTYPES: ENABLE
508		588
509	BOOT:	589	BOOT:
510	{	590	{
511	stash = gv_stashpv ("IO::AIO", 1);	591	static const struct {
512		592	const char *name;
513	newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));	593	IV iv;
514	newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));	594	} *civ, const_iv[] = {
515	newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));	595	# define const_iv(name, value) { # name, (IV) value },
516	newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));	596	# define const_eio(name) { # name, (IV) EIO_ ## name },
517	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)
518	#ifndef _WIN32	603	#ifndef _WIN32
519	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	604	const_iv (S_IFIFO , S_IFIFO)
520	#endif	605	#endif
		606	const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
		607	const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
		608	const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
		609	const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
		610	const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
		611	const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
521		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
522	create_respipe ();	638	create_respipe ();
523		639
524	if (eio_init (want_poll, done_poll) < 0)	640	if (eio_init (want_poll, done_poll) < 0)
525	croak ("IO::AIO: unable to initialise eio library");	641	croak ("IO::AIO: unable to initialise eio library");
526		642
527	/* atfork child called in fifo order, so before eio's handler */	643	/* atfork child called in fifo order, so before eio's handler */
528	X_THREAD_ATFORK (0, 0, atfork_child);	644	X_THREAD_ATFORK (0, 0, atfork_child);
529	}	645	}
530		646
531	void	647	void
532	max_poll_reqs (int nreqs)	648	max_poll_reqs (int nreqs)
533	PROTOTYPE: $	649	PROTOTYPE: $
…		…
586	ALIAS:	702	ALIAS:
587	aio_fsync = EIO_FSYNC	703	aio_fsync = EIO_FSYNC
588	aio_fdatasync = EIO_FDATASYNC	704	aio_fdatasync = EIO_FDATASYNC
589	PPCODE:	705	PPCODE:
590	{	706	{
		707	int fd = extract_fd (fh, 0);
591	dREQ;	708	dREQ;
592		709
593	req->type = ix;	710	req->type = ix;
594	req->sv1 = newSVsv (fh);	711	req->sv1 = newSVsv (fh);
595	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));	712	req->int1 = fd;
		713
		714	REQ_SEND (req);
		715	}
		716
		717	void
		718	aio_sync_file_range (SV fh, off_t offset, size_t nbytes, UV flags, SV callback=&PL_sv_undef)
		719	PROTOTYPE: $$$$;$
		720	PPCODE:
		721	{
		722	int fd = extract_fd (fh, 0);
		723	dREQ;
		724
		725	req->type = EIO_SYNC_FILE_RANGE;
		726	req->sv1 = newSVsv (fh);
		727	req->int1 = fd;
		728	req->offs = offset;
		729	req->size = nbytes;
		730	req->int2 = flags;
596		731
597	REQ_SEND (req);	732	REQ_SEND (req);
598	}	733	}
599		734
600	void	735	void
601	aio_close (SV fh, SV callback=&PL_sv_undef)	736	aio_close (SV fh, SV callback=&PL_sv_undef)
602	PROTOTYPE: $;$	737	PROTOTYPE: $;$
603	PPCODE:	738	PPCODE:
604	{	739	{
605	static int close_pipe = -1; /* dummy fd to close fds via dup2 */	740	static int close_pipe = -1; /* dummy fd to close fds via dup2 */
		741	int fd = extract_fd (fh, 0);
606	dREQ;	742	dREQ;
607		743
608	if (close_pipe < 0)	744	if (close_pipe < 0)
609	{	745	{
610	int pipefd [2];	746	int pipefd [2];
…		…
618	}	754	}
619		755
620	req->type = EIO_DUP2;	756	req->type = EIO_DUP2;
621	req->int1 = close_pipe;	757	req->int1 = close_pipe;
622	req->sv2 = newSVsv (fh);	758	req->sv2 = newSVsv (fh);
623	req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh)));	759	req->int2 = fd;
624		760
625	REQ_SEND (req);	761	REQ_SEND (req);
626	}	762	}
627		763
628	void	764	void
…		…
632	aio_write = EIO_WRITE	768	aio_write = EIO_WRITE
633	PROTOTYPE: $$$$$;$	769	PROTOTYPE: $$$$$;$
634	PPCODE:	770	PPCODE:
635	{	771	{
636	STRLEN svlen;	772	STRLEN svlen;
		773	int fd = extract_fd (fh, ix == EIO_WRITE);
637	char *svptr = SvPVbyte (data, svlen);	774	char *svptr = SvPVbyte (data, svlen);
638	UV len = SvUV (length);	775	UV len = SvUV (length);
639
640	SvUPGRADE (data, SVt_PV);
641	SvPOK_on (data);
642		776
643	if (dataoffset < 0)	777	if (dataoffset < 0)
644	dataoffset += svlen;	778	dataoffset += svlen;
645		779
646	if (dataoffset < 0 \|\| dataoffset > svlen)	780	if (dataoffset < 0 \|\| dataoffset > svlen)
…		…
652	if (!SvOK (length) \|\| len + dataoffset > svlen)	786	if (!SvOK (length) \|\| len + dataoffset > svlen)
653	len = svlen - dataoffset;	787	len = svlen - dataoffset;
654	}	788	}
655	else	789	else
656	{	790	{
657	/* read: grow scalar as necessary */	791	/* read: check type and grow scalar as necessary */
		792	SvUPGRADE (data, SVt_PV);
658	svptr = SvGROW (data, len + dataoffset + 1);	793	svptr = SvGROW (data, len + dataoffset + 1);
659	}	794	}
660
661	if (len < 0)
662	croak ("length must not be negative");
663		795
664	{	796	{
665	dREQ;	797	dREQ;
666		798
667	req->type = ix;	799	req->type = ix;
668	req->sv1 = newSVsv (fh);	800	req->sv1 = newSVsv (fh);
669	req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))	801	req->int1 = fd;
670	: IoOFP (sv_2io (fh)));
671	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;	802	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
672	req->size = len;	803	req->size = len;
673	req->sv2 = SvREFCNT_inc (data);	804	req->sv2 = SvREFCNT_inc (data);
674	req->ptr2 = (char *)svptr + dataoffset;	805	req->ptr2 = (char *)svptr + dataoffset;
675	req->stroffset = dataoffset;	806	req->stroffset = dataoffset;
…		…
698		829
699	REQ_SEND;	830	REQ_SEND;
700	}	831	}
701		832
702	void	833	void
703	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)
704	PROTOTYPE: $$$$;$	835	PROTOTYPE: $$$$;$
705	PPCODE:	836	PPCODE:
706	{	837	{
		838	int ifd = extract_fd (in_fh , 0);
		839	int ofd = extract_fd (out_fh, 0);
707	dREQ;	840	dREQ;
708		841
709	req->type = EIO_SENDFILE;	842	req->type = EIO_SENDFILE;
710	req->sv1 = newSVsv (out_fh);	843	req->sv1 = newSVsv (out_fh);
711	req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));	844	req->int1 = ofd;
712	req->sv2 = newSVsv (in_fh);	845	req->sv2 = newSVsv (in_fh);
713	req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));	846	req->int2 = ifd;
714	req->offs = SvVAL64 (in_offset);	847	req->offs = in_offset;
715	req->size = length;	848	req->size = length;
716		849
717	REQ_SEND;	850	REQ_SEND;
718	}	851	}
719		852
720	void	853	void
721	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)
722	PROTOTYPE: $$$;$	855	PROTOTYPE: $$$;$
723	PPCODE:	856	PPCODE:
724	{	857	{
		858	int fd = extract_fd (fh, 0);
725	dREQ;	859	dREQ;
726		860
727	req->type = EIO_READAHEAD;	861	req->type = EIO_READAHEAD;
728	req->sv1 = newSVsv (fh);	862	req->sv1 = newSVsv (fh);
729	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));	863	req->int1 = fd;
730	req->offs = SvVAL64 (offset);	864	req->offs = offset;
731	req->size = length;	865	req->size = length;
732		866
733	REQ_SEND;	867	REQ_SEND;
734	}	868	}
735		869
…		…
851	req->type = EIO_FCHOWN;	985	req->type = EIO_FCHOWN;
852	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	986	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
853	}	987	}
854		988
855	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;
856	}	1007	}
857		1008
858	void	1009	void
859	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)	1010	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)
860	ALIAS:	1011	ALIAS:
…		…
1038	CODE:	1189	CODE:
1039	RETVAL = eio_nthreads ();	1190	RETVAL = eio_nthreads ();
1040	OUTPUT:	1191	OUTPUT:
1041	RETVAL	1192	RETVAL
1042		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
1043	void _on_next_submit (SV *cb)	1214	void _on_next_submit (SV *cb)
1044	CODE:	1215	CODE:
1045	SvREFCNT_dec (on_next_submit);	1216	SvREFCNT_dec (on_next_submit);
1046	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1217	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1047		1218
…		…
1108	AV *av;	1279	AV *av;
1109		1280
1110	grp->errorno = errno;	1281	grp->errorno = errno;
1111		1282
1112	av = newAV ();	1283	av = newAV ();
		1284	av_extend (av, items - 1);
1113		1285
1114	for (i = 1; i < items; ++i )	1286	for (i = 1; i < items; ++i )
1115	av_push (av, newSVsv (ST (i)));	1287	av_push (av, newSVsv (ST (i)));
1116		1288
1117	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.132 by root, Mon Oct 13 10:38:17 2008 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.132 by root, Mon Oct 13 10:38:17 2008 UTC vs.
Revision 1.149 by root, Tue Jun 30 07:33:58 2009 UTC