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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.140 by root, Wed Jun 3 12:24:49 2009 UTC vs.
Revision 1.152 by root, Tue Jul 14 00:32:27 2009 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>
…		…
75		77
76	#define EIO_STRUCT_STAT Stat_t	78	#define EIO_STRUCT_STAT Stat_t
77		79
78	/* use NV for 32 bit perls as it allows larger offsets */	80	/* use NV for 32 bit perls as it allows larger offsets */
79	#if IVSIZE >= 8	81	#if IVSIZE >= 8
		82	# define VAL64 IV
80	# define SvVAL64 SvIV	83	# define SvVAL64 SvIV
		84	# define newSVval64 newSViv
81	#else	85	#else
		86	# define VAL64 NV
82	# define SvVAL64 SvNV	87	# define SvVAL64 SvNV
		88	# define newSVval64 newSVnv
83	#endif	89	#endif
84		90
85	/*****************************************************************************/	91	/*****************************************************************************/
86		92
87	#if __GNUC__ >= 3	93	#if __GNUC__ >= 3
…		…
95		101
96	/*****************************************************************************/	102	/*****************************************************************************/
97		103
98	static HV *stash;	104	static HV *stash;
99	typedef SV SV8; /* byte-sv, used for argument-checking */	105	typedef SV SV8; /* byte-sv, used for argument-checking */
		106	typedef int aio_rfd; /* read file desriptor */
		107	typedef int aio_wfd; /* write file descriptor */
100		108
101	#define AIO_REQ_KLASS "IO::AIO::REQ"	109	#define AIO_REQ_KLASS "IO::AIO::REQ"
102	#define AIO_GRP_KLASS "IO::AIO::GRP"	110	#define AIO_GRP_KLASS "IO::AIO::GRP"
103		111
104	#define EIO_REQ_MEMBERS \	112	#define EIO_REQ_MEMBERS \
…		…
108	SV *self;	116	SV *self;
109		117
110	#define EIO_NO_WRAPPERS 1	118	#define EIO_NO_WRAPPERS 1
111		119
112	#include "libeio/eio.h"	120	#include "libeio/eio.h"
		121
		122	#ifndef POSIX_FADV_NORMAL
		123	# define POSIX_FADV_NORMAL 0
		124	# define NO_FADVISE 1
		125	#endif
		126
		127	#ifndef POSIX_FADV_SEQUENTIAL
		128	# define POSIX_FADV_SEQUENTIAL 0
		129	#endif
		130
		131	#ifndef POSIX_FADV_RANDOM
		132	# define POSIX_FADV_RANDOM 0
		133	#endif
		134
		135	#ifndef POSIX_FADV_NOREUSE
		136	# define POSIX_FADV_NOREUSE 0
		137	#endif
		138
		139	#ifndef POSIX_FADV_WILLNEED
		140	# define POSIX_FADV_WILLNEED 0
		141	#endif
		142
		143	#ifndef POSIX_FADV_DONTNEED
		144	# define POSIX_FADV_DONTNEED 0
		145	#endif
113		146
114	static int req_invoke (eio_req *req);	147	static int req_invoke (eio_req *req);
115	#define EIO_FINISH(req) req_invoke (req)	148	#define EIO_FINISH(req) req_invoke (req)
116	static void req_destroy (eio_req *grp);	149	static void req_destroy (eio_req *grp);
117	#define EIO_DESTROY(req) req_destroy (req)	150	#define EIO_DESTROY(req) req_destroy (req)
…		…
228	SV *rv = &PL_sv_undef;	261	SV *rv = &PL_sv_undef;
229		262
230	if (req->result >= 0)	263	if (req->result >= 0)
231	{	264	{
232	int i;	265	int i;
233	char *buf = req->ptr2;	266	char names = (char )req->ptr2;
		267	eio_dirent ent = (eio_dirent )req->ptr1; /* might be 0 */
234	AV *av = newAV ();	268	AV *av = newAV ();
235		269
236	av_extend (av, req->result - 1);	270	av_extend (av, req->result - 1);
237		271
238	for (i = 0; i < req->result; ++i)	272	for (i = 0; i < req->result; ++i)
239	{	273	{
240	SV *sv = newSVpv (buf, 0);	274	if (req->int1 & EIO_READDIR_DENTS)
		275	{
		276	SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
241		277
		278	if (req->int1 & EIO_READDIR_CUSTOM2)
		279	{
		280	static SV sv_type [EIO_DT_MAX + 1]; / type sv cache */
		281	AV *avent = newAV ();
		282
		283	av_extend (avent, 2);
		284
		285	if (!sv_type [ent->type])
		286	{
		287	sv_type [ent->type] = newSViv (ent->type);
		288	SvREADONLY_on (sv_type [ent->type]);
		289	}
		290
		291	av_store (avent, 0, namesv);
		292	av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
		293	av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
		294
		295	av_store (av, i, newRV_noinc ((SV *)avent));
		296	}
		297	else
242	av_store (av, i, sv);	298	av_store (av, i, namesv);
		299
		300	++ent;
		301	}
		302	else
		303	{
		304	SV *name = newSVpv (names, 0);
		305	av_store (av, i, name);
243	buf += SvCUR (sv) + 1;	306	names += SvCUR (name) + 1;
		307	}
244	}	308	}
245		309
246	rv = sv_2mortal (newRV_noinc ((SV *)av));	310	rv = sv_2mortal (newRV_noinc ((SV *)av));
247	}	311	}
248		312
249	PUSHs (rv);	313	PUSHs (rv);
		314
		315	if (req->int1 & EIO_READDIR_CUSTOM1)
		316	XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 \| EIO_READDIR_CUSTOM2))));
250	}	317	}
251	break;	318	break;
252		319
253	case EIO_OPEN:	320	case EIO_OPEN:
254	{	321	{
…		…
260	GV gv = (GV )sv_newmortal ();	327	GV gv = (GV )sv_newmortal ();
261	int flags = req->int1 & (O_RDONLY \| O_WRONLY \| O_RDWR);	328	int flags = req->int1 & (O_RDONLY \| O_WRONLY \| O_RDWR);
262	char sym [64];	329	char sym [64];
263	int symlen;	330	int symlen;
264		331
265	symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);	332	symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
266	gv_init (gv, stash, sym, symlen, 0);	333	gv_init (gv, stash, sym, symlen, 0);
267		334
268	symlen = snprintf (	335	symlen = snprintf (
269	sym,	336	sym,
270	sizeof (sym),	337	sizeof (sym),
271	"%s&=%d",	338	"%s&=%d",
272	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",	339	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273	req->result	340	(int)req->result
274	);	341	);
275		342
276	if (do_open (gv, sym, symlen, 0, 0, 0, 0))	343	if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277	fh = (SV *)gv;	344	fh = (SV *)gv;
278	}	345	}
…		…
466	}	533	}
467		534
468	static SV *	535	static SV *
469	get_cb (SV *cb_sv)	536	get_cb (SV *cb_sv)
470	{	537	{
471	HV *st;	538	SvGETMAGIC (cb_sv);
472	GV *gvp;	539	return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
473	CV *cv;
474
475	if (!SvOK (cb_sv))
476	return 0;
477
478	cv = sv_2cv (cb_sv, &st, &gvp, 0);
479
480	if (!cv)
481	croak ("IO::AIO callback must be undef or a CODE reference");
482
483	return (SV *)cv;
484	}	540	}
485		541
486	#define dREQ \	542	#define dREQ \
487	SV *cb_cv; \	543	SV *cb_cv; \
488	aio_req req; \	544	aio_req req; \
…		…
504	SPAGAIN; \	560	SPAGAIN; \
505	\	561	\
506	if (GIMME_V != G_VOID) \	562	if (GIMME_V != G_VOID) \
507	XPUSHs (req_sv (req, AIO_REQ_KLASS));	563	XPUSHs (req_sv (req, AIO_REQ_KLASS));
508		564
509	static int
510	extract_fd (SV *fh, int wr)
511	{
512	int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
513
514	if (fd < 0)
515	croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
516
517	return fd;
518	}
519
520	MODULE = IO::AIO PACKAGE = IO::AIO	565	MODULE = IO::AIO PACKAGE = IO::AIO
521		566
522	PROTOTYPES: ENABLE	567	PROTOTYPES: ENABLE
523		568
524	BOOT:	569	BOOT:
525	{	570	{
526	stash = gv_stashpv ("IO::AIO", 1);	571	static const struct {
527		572	const char *name;
528	newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));	573	IV iv;
529	newCONSTSUB (stash, "ENOSYS", newSViv (ENOSYS));	574	} *civ, const_iv[] = {
530	newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));	575	# define const_iv(name, value) { # name, (IV) value },
531	newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));	576	# define const_eio(name) { # name, (IV) EIO_ ## name },
532	newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));	577	const_iv (EXDEV , EXDEV)
533	newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));	578	const_iv (ENOSYS , ENOSYS)
		579	const_iv (O_RDONLY, O_RDONLY)
		580	const_iv (O_WRONLY, O_WRONLY)
		581	const_iv (O_CREAT , O_CREAT)
		582	const_iv (O_TRUNC , O_TRUNC)
534	#ifndef _WIN32	583	#ifndef _WIN32
535	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	584	const_iv (S_IFIFO , S_IFIFO)
536	#endif	585	#endif
537	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	586	const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
538	newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));	587	const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
539	newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));	588	const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
540	newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));	589	const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
		590	const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
		591	const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
541		592
		593	const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
		594	const_eio (SYNC_FILE_RANGE_WRITE)
		595	const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
		596
		597	const_eio (READDIR_DENTS)
		598	const_eio (READDIR_DIRS_FIRST)
		599	const_eio (READDIR_STAT_ORDER)
		600	const_eio (READDIR_FOUND_UNKNOWN)
		601
		602	const_eio (DT_UNKNOWN)
		603	const_eio (DT_FIFO)
		604	const_eio (DT_CHR)
		605	const_eio (DT_DIR)
		606	const_eio (DT_BLK)
		607	const_eio (DT_REG)
		608	const_eio (DT_LNK)
		609	const_eio (DT_SOCK)
		610	const_eio (DT_WHT)
		611	};
		612
		613	stash = gv_stashpv ("IO::AIO", 1);
		614
		615	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		616	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		617
542	create_respipe ();	618	create_respipe ();
543		619
544	if (eio_init (want_poll, done_poll) < 0)	620	if (eio_init (want_poll, done_poll) < 0)
545	croak ("IO::AIO: unable to initialise eio library");	621	croak ("IO::AIO: unable to initialise eio library");
546		622
547	/* atfork child called in fifo order, so before eio's handler */	623	/* atfork child called in fifo order, so before eio's handler */
548	X_THREAD_ATFORK (0, 0, atfork_child);	624	X_THREAD_ATFORK (0, 0, atfork_child);
549	}	625	}
550		626
551	void	627	void
552	max_poll_reqs (int nreqs)	628	max_poll_reqs (int nreqs)
553	PROTOTYPE: $	629	PROTOTYPE: $
…		…
606	ALIAS:	682	ALIAS:
607	aio_fsync = EIO_FSYNC	683	aio_fsync = EIO_FSYNC
608	aio_fdatasync = EIO_FDATASYNC	684	aio_fdatasync = EIO_FDATASYNC
609	PPCODE:	685	PPCODE:
610	{	686	{
611	int fd = extract_fd (fh, 0);	687	int fd = s_fileno_croak (fh, 0);
612	dREQ;	688	dREQ;
613		689
614	req->type = ix;	690	req->type = ix;
615	req->sv1 = newSVsv (fh);	691	req->sv1 = newSVsv (fh);
616	req->int1 = fd;	692	req->int1 = fd;
617		693
618	REQ_SEND (req);	694	REQ_SEND (req);
619	}	695	}
620		696
621	void	697	void
622	aio_sync_file_range (SV fh, SV offset, SV nbytes, IV flags, SV callback=&PL_sv_undef)	698	aio_sync_file_range (SV fh, off_t offset, size_t nbytes, UV flags, SV callback=&PL_sv_undef)
623	PROTOTYPE: $$$$;$	699	PROTOTYPE: $$$$;$
624	PPCODE:	700	PPCODE:
625	{	701	{
626	int fd = extract_fd (fh, 0);	702	int fd = s_fileno_croak (fh, 0);
627	dREQ;	703	dREQ;
628		704
629	req->type = EIO_SYNC_FILE_RANGE;	705	req->type = EIO_SYNC_FILE_RANGE;
630	req->sv1 = newSVsv (fh);	706	req->sv1 = newSVsv (fh);
631	req->int1 = fd;	707	req->int1 = fd;
632	req->offs = SvVAL64 (offset);	708	req->offs = offset;
633	req->size = SvVAL64 (nbytes);	709	req->size = nbytes;
634	req->int2 = flags;	710	req->int2 = flags;
635		711
636	REQ_SEND (req);	712	REQ_SEND (req);
637	}	713	}
638		714
…		…
640	aio_close (SV fh, SV callback=&PL_sv_undef)	716	aio_close (SV fh, SV callback=&PL_sv_undef)
641	PROTOTYPE: $;$	717	PROTOTYPE: $;$
642	PPCODE:	718	PPCODE:
643	{	719	{
644	static int close_pipe = -1; /* dummy fd to close fds via dup2 */	720	static int close_pipe = -1; /* dummy fd to close fds via dup2 */
645	int fd = extract_fd (fh, 0);	721	int fd = s_fileno_croak (fh, 0);
646	dREQ;	722	dREQ;
647		723
648	if (close_pipe < 0)	724	if (close_pipe < 0)
649	{	725	{
650	int pipefd [2];	726	int pipefd [2];
…		…
672	aio_write = EIO_WRITE	748	aio_write = EIO_WRITE
673	PROTOTYPE: $$$$$;$	749	PROTOTYPE: $$$$$;$
674	PPCODE:	750	PPCODE:
675	{	751	{
676	STRLEN svlen;	752	STRLEN svlen;
677	int fd = extract_fd (fh, ix == EIO_WRITE);	753	int fd = s_fileno_croak (fh, ix == EIO_WRITE);
678	char *svptr = SvPVbyte (data, svlen);	754	char *svptr = SvPVbyte (data, svlen);
679	UV len = SvUV (length);	755	UV len = SvUV (length);
680		756
681	if (dataoffset < 0)	757	if (dataoffset < 0)
682	dataoffset += svlen;	758	dataoffset += svlen;
…		…
733		809
734	REQ_SEND;	810	REQ_SEND;
735	}	811	}
736		812
737	void	813	void
738	aio_sendfile (SV out_fh, SV in_fh, SV in_offset, UV length, SV callback=&PL_sv_undef)	814	aio_sendfile (SV out_fh, SV in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
739	PROTOTYPE: $$$$;$	815	PROTOTYPE: $$$$;$
740	PPCODE:	816	PPCODE:
741	{	817	{
742	int ifd = extract_fd (in_fh , 0);	818	int ifd = s_fileno_croak (in_fh , 0);
743	int ofd = extract_fd (out_fh, 0);	819	int ofd = s_fileno_croak (out_fh, 1);
744	dREQ;	820	dREQ;
745		821
746	req->type = EIO_SENDFILE;	822	req->type = EIO_SENDFILE;
747	req->sv1 = newSVsv (out_fh);	823	req->sv1 = newSVsv (out_fh);
748	req->int1 = ofd;	824	req->int1 = ofd;
749	req->sv2 = newSVsv (in_fh);	825	req->sv2 = newSVsv (in_fh);
750	req->int2 = ifd;	826	req->int2 = ifd;
751	req->offs = SvVAL64 (in_offset);	827	req->offs = in_offset;
752	req->size = length;	828	req->size = length;
753		829
754	REQ_SEND;	830	REQ_SEND;
755	}	831	}
756		832
757	void	833	void
758	aio_readahead (SV fh, SV offset, IV length, SV *callback=&PL_sv_undef)	834	aio_readahead (SV fh, off_t offset, size_t length, SV callback=&PL_sv_undef)
759	PROTOTYPE: $$$;$	835	PROTOTYPE: $$$;$
760	PPCODE:	836	PPCODE:
761	{	837	{
762	int fd = extract_fd (fh, 0);	838	int fd = s_fileno_croak (fh, 0);
763	dREQ;	839	dREQ;
764		840
765	req->type = EIO_READAHEAD;	841	req->type = EIO_READAHEAD;
766	req->sv1 = newSVsv (fh);	842	req->sv1 = newSVsv (fh);
767	req->int1 = fd;	843	req->int1 = fd;
768	req->offs = SvVAL64 (offset);	844	req->offs = offset;
769	req->size = length;	845	req->size = length;
770		846
771	REQ_SEND;	847	REQ_SEND;
772	}	848	}
773		849
…		…
889	req->type = EIO_FCHOWN;	965	req->type = EIO_FCHOWN;
890	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	966	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
891	}	967	}
892		968
893	REQ_SEND;	969	REQ_SEND;
		970	}
		971
		972	void
		973	aio_readdirx (SV8 pathname, IV flags, SV callback=&PL_sv_undef)
		974	PPCODE:
		975	{
		976	dREQ;
		977
		978	req->type = EIO_READDIR;
		979	req->sv1 = newSVsv (pathname);
		980	req->ptr1 = SvPVbyte_nolen (req->sv1);
		981	req->int1 = flags \| EIO_READDIR_DENTS \| EIO_READDIR_CUSTOM1;
		982
		983	if (flags & EIO_READDIR_DENTS)
		984	req->int1 \|= EIO_READDIR_CUSTOM2;
		985
		986	REQ_SEND;
894	}	987	}
895		988
896	void	989	void
897	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)	990	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)
898	ALIAS:	991	ALIAS:
…		…
1076	CODE:	1169	CODE:
1077	RETVAL = eio_nthreads ();	1170	RETVAL = eio_nthreads ();
1078	OUTPUT:	1171	OUTPUT:
1079	RETVAL	1172	RETVAL
1080		1173
		1174	int
		1175	fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
		1176	PROTOTYPE: $$$$
		1177	CODE:
		1178	#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
		1179	RETVAL = posix_fadvise (fh, offset, length, advice);
		1180	#else
		1181	RETVAL = errno = ENOSYS;
		1182	#endif
		1183	OUTPUT:
		1184	RETVAL
		1185
		1186	ssize_t
		1187	sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
		1188	PROTOTYPE: $$$$
		1189	CODE:
		1190	eio_sendfile_sync (ofh, ifh, offset, count);
		1191
1081	void _on_next_submit (SV *cb)	1192	void _on_next_submit (SV *cb)
1082	CODE:	1193	CODE:
1083	SvREFCNT_dec (on_next_submit);	1194	SvREFCNT_dec (on_next_submit);
1084	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1195	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1085		1196
…		…
1099	if (GIMME_V != G_VOID)	1210	if (GIMME_V != G_VOID)
1100	XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);	1211	XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1101		1212
1102	if (items > 1)	1213	if (items > 1)
1103	{	1214	{
1104	SV *cb_cv = get_cb (callback);	1215	SV *cb_cv =get_cb (callback);
1105		1216
1106	SvREFCNT_dec (req->callback);	1217	SvREFCNT_dec (req->callback);
1107	req->callback = SvREFCNT_inc (cb_cv);	1218	req->callback = SvREFCNT_inc (cb_cv);
1108	}	1219	}
1109	}	1220	}
…		…
1146	AV *av;	1257	AV *av;
1147		1258
1148	grp->errorno = errno;	1259	grp->errorno = errno;
1149		1260
1150	av = newAV ();	1261	av = newAV ();
		1262	av_extend (av, items - 1);
1151		1263
1152	for (i = 1; i < items; ++i )	1264	for (i = 1; i < items; ++i )
1153	av_push (av, newSVsv (ST (i)));	1265	av_push (av, newSVsv (ST (i)));
1154		1266
1155	SvREFCNT_dec (grp->sv1);	1267	SvREFCNT_dec (grp->sv1);

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.140 by root, Wed Jun 3 12:24:49 2009 UTC vs. Revision 1.152 by root, Tue Jul 14 00:32:27 2009 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.140 by root, Wed Jun 3 12:24:49 2009 UTC vs.
Revision 1.152 by root, Tue Jul 14 00:32:27 2009 UTC