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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.135 by root, Sun Apr 19 13:06:15 2009 UTC vs.
Revision 1.147 by root, Mon Jun 15 05:34:49 2009 UTC

…		…
228	SV *rv = &PL_sv_undef;	228	SV *rv = &PL_sv_undef;
229		229
230	if (req->result >= 0)	230	if (req->result >= 0)
231	{	231	{
232	int i;	232	int i;
233	char *buf = req->ptr2;	233	char names = (char )req->ptr2;
		234	eio_dirent ent = (eio_dirent )req->ptr1; /* might be 0 */
234	AV *av = newAV ();	235	AV *av = newAV ();
235		236
236	av_extend (av, req->result - 1);	237	av_extend (av, req->result - 1);
237		238
238	for (i = 0; i < req->result; ++i)	239	for (i = 0; i < req->result; ++i)
239	{	240	{
240	SV *sv = newSVpv (buf, 0);	241	if (req->int1 & EIO_READDIR_DENTS)
		242	{
		243	SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
241		244
		245	if (req->int1 & EIO_READDIR_CUSTOM2)
		246	{
		247	static SV sv_type [EIO_DT_MAX + 1]; / type sv cache */
		248	AV *avent = newAV ();
		249
		250	av_extend (avent, 2);
		251
		252	if (!sv_type [ent->type])
		253	{
		254	sv_type [ent->type] = newSViv (ent->type);
		255	SvREADONLY_on (sv_type [ent->type]);
		256	}
		257
		258	av_store (avent, 0, namesv);
		259	av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
		260	av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
		261
		262	av_store (av, i, newRV_noinc ((SV *)avent));
		263	}
		264	else
242	av_store (av, i, sv);	265	av_store (av, i, namesv);
		266
		267	++ent;
		268	}
		269	else
		270	{
		271	SV *name = newSVpv (names, 0);
		272	av_store (av, i, name);
243	buf += SvCUR (sv) + 1;	273	names += SvCUR (name) + 1;
		274	}
244	}	275	}
245		276
246	rv = sv_2mortal (newRV_noinc ((SV *)av));	277	rv = sv_2mortal (newRV_noinc ((SV *)av));
247	}	278	}
248		279
249	PUSHs (rv);	280	PUSHs (rv);
		281
		282	if (req->int1 & EIO_READDIR_CUSTOM1)
		283	XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 \| EIO_READDIR_CUSTOM2))));
250	}	284	}
251	break;	285	break;
252		286
253	case EIO_OPEN:	287	case EIO_OPEN:
254	{	288	{
…		…
260	GV gv = (GV )sv_newmortal ();	294	GV gv = (GV )sv_newmortal ();
261	int flags = req->int1 & (O_RDONLY \| O_WRONLY \| O_RDWR);	295	int flags = req->int1 & (O_RDONLY \| O_WRONLY \| O_RDWR);
262	char sym [64];	296	char sym [64];
263	int symlen;	297	int symlen;
264		298
265	symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);	299	symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
266	gv_init (gv, stash, sym, symlen, 0);	300	gv_init (gv, stash, sym, symlen, 0);
267		301
268	symlen = snprintf (	302	symlen = snprintf (
269	sym,	303	sym,
270	sizeof (sym),	304	sizeof (sym),
271	"%s&=%d",	305	"%s&=%d",
272	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",	306	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273	req->result	307	(int)req->result
274	);	308	);
275		309
276	if (do_open (gv, sym, symlen, 0, 0, 0, 0))	310	if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277	fh = (SV *)gv;	311	fh = (SV *)gv;
278	}	312	}
…		…
312	PL_statcache = (EIO_STRUCT_STAT )(req->ptr2);	346	PL_statcache = (EIO_STRUCT_STAT )(req->ptr2);
313	PUSHs (sv_2mortal (newSViv (req->result)));	347	PUSHs (sv_2mortal (newSViv (req->result)));
314	break;	348	break;
315		349
316	case EIO_READ:	350	case EIO_READ:
		351	{
317	SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));	352	SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
318	*SvEND (req->sv2) = 0;	353	*SvEND (req->sv2) = 0;
		354	SvPOK_only (req->sv2);
		355	SvSETMAGIC (req->sv2);
319	PUSHs (sv_2mortal (newSViv (req->result)));	356	PUSHs (sv_2mortal (newSViv (req->result)));
		357	}
320	break;	358	break;
321		359
322	case EIO_DUP2:	360	case EIO_DUP2:
323	if (req->result > 0)	361	if (req->result > 0)
324	req->result = 0;	362	req->result = 0;
…		…
499	req_submit (req); \	537	req_submit (req); \
500	SPAGAIN; \	538	SPAGAIN; \
501	\	539	\
502	if (GIMME_V != G_VOID) \	540	if (GIMME_V != G_VOID) \
503	XPUSHs (req_sv (req, AIO_REQ_KLASS));	541	XPUSHs (req_sv (req, AIO_REQ_KLASS));
504		542
		543	static int
		544	extract_fd (SV *fh, int wr)
		545	{
		546	int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
		547
		548	if (fd < 0)
		549	croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
		550
		551	return fd;
		552	}
		553
505	MODULE = IO::AIO PACKAGE = IO::AIO	554	MODULE = IO::AIO PACKAGE = IO::AIO
506		555
507	PROTOTYPES: ENABLE	556	PROTOTYPES: ENABLE
508		557
509	BOOT:	558	BOOT:
510	{	559	{
511	stash = gv_stashpv ("IO::AIO", 1);	560	static const struct {
512		561	const char *name;
513	newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));	562	IV iv;
514	newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));	563	} *civ, const_iv[] = {
515	newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));	564	# define const_iv(name, value) { # name, (IV) value },
516	newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));	565	# define const_eio(name) { # name, (IV) EIO_ ## name },
517	newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));	566	const_iv (EXDEV , EXDEV)
		567	const_iv (ENOSYS , ENOSYS)
		568	const_iv (O_RDONLY, O_RDONLY)
		569	const_iv (O_WRONLY, O_WRONLY)
		570	const_iv (O_CREAT , O_CREAT)
		571	const_iv (O_TRUNC , O_TRUNC)
518	#ifndef _WIN32	572	#ifndef _WIN32
519	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	573	const_iv (S_IFIFO , S_IFIFO)
520	#endif	574	#endif
521	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	575	const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
522	newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));	576	const_eio (SYNC_FILE_RANGE_WRITE)
523	newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));	577	const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
524	newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
525		578
		579	const_eio (READDIR_DENTS)
		580	const_eio (READDIR_DIRS_FIRST)
		581	const_eio (READDIR_STAT_ORDER)
		582	const_eio (READDIR_FOUND_UNKNOWN)
		583
		584	const_eio (DT_UNKNOWN)
		585	const_eio (DT_FIFO)
		586	const_eio (DT_CHR)
		587	const_eio (DT_DIR)
		588	const_eio (DT_BLK)
		589	const_eio (DT_REG)
		590	const_eio (DT_LNK)
		591	const_eio (DT_SOCK)
		592	const_eio (DT_WHT)
		593	};
		594
		595	stash = gv_stashpv ("IO::AIO", 1);
		596
		597	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		598	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		599
526	create_respipe ();	600	create_respipe ();
527		601
528	if (eio_init (want_poll, done_poll) < 0)	602	if (eio_init (want_poll, done_poll) < 0)
529	croak ("IO::AIO: unable to initialise eio library");	603	croak ("IO::AIO: unable to initialise eio library");
530		604
531	/* atfork child called in fifo order, so before eio's handler */	605	/* atfork child called in fifo order, so before eio's handler */
532	X_THREAD_ATFORK (0, 0, atfork_child);	606	X_THREAD_ATFORK (0, 0, atfork_child);
533	}	607	}
534		608
535	void	609	void
536	max_poll_reqs (int nreqs)	610	max_poll_reqs (int nreqs)
537	PROTOTYPE: $	611	PROTOTYPE: $
…		…
590	ALIAS:	664	ALIAS:
591	aio_fsync = EIO_FSYNC	665	aio_fsync = EIO_FSYNC
592	aio_fdatasync = EIO_FDATASYNC	666	aio_fdatasync = EIO_FDATASYNC
593	PPCODE:	667	PPCODE:
594	{	668	{
		669	int fd = extract_fd (fh, 0);
595	dREQ;	670	dREQ;
596		671
597	req->type = ix;	672	req->type = ix;
598	req->sv1 = newSVsv (fh);	673	req->sv1 = newSVsv (fh);
599	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));	674	req->int1 = fd;
600		675
601	REQ_SEND (req);	676	REQ_SEND (req);
602	}	677	}
603		678
604	void	679	void
605	aio_sync_file_range (SV fh, SV offset, SV nbytes, IV flags, SV callback=&PL_sv_undef)	680	aio_sync_file_range (SV fh, SV offset, SV nbytes, IV flags, SV callback=&PL_sv_undef)
606	PROTOTYPE: $$$$;$	681	PROTOTYPE: $$$$;$
607	PPCODE:	682	PPCODE:
608	{	683	{
		684	int fd = extract_fd (fh, 0);
609	dREQ;	685	dREQ;
610		686
611	req->type = EIO_SYNC_FILE_RANGE;	687	req->type = EIO_SYNC_FILE_RANGE;
612	req->sv1 = newSVsv (fh);	688	req->sv1 = newSVsv (fh);
613	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));	689	req->int1 = fd;
614	req->offs = SvVAL64 (offset);	690	req->offs = SvVAL64 (offset);
615	req->size = SvVAL64 (nbytes);	691	req->size = SvVAL64 (nbytes);
616	req->int2 = flags;	692	req->int2 = flags;
617		693
618	REQ_SEND (req);	694	REQ_SEND (req);
…		…
622	aio_close (SV fh, SV callback=&PL_sv_undef)	698	aio_close (SV fh, SV callback=&PL_sv_undef)
623	PROTOTYPE: $;$	699	PROTOTYPE: $;$
624	PPCODE:	700	PPCODE:
625	{	701	{
626	static int close_pipe = -1; /* dummy fd to close fds via dup2 */	702	static int close_pipe = -1; /* dummy fd to close fds via dup2 */
		703	int fd = extract_fd (fh, 0);
627	dREQ;	704	dREQ;
628		705
629	if (close_pipe < 0)	706	if (close_pipe < 0)
630	{	707	{
631	int pipefd [2];	708	int pipefd [2];
…		…
639	}	716	}
640		717
641	req->type = EIO_DUP2;	718	req->type = EIO_DUP2;
642	req->int1 = close_pipe;	719	req->int1 = close_pipe;
643	req->sv2 = newSVsv (fh);	720	req->sv2 = newSVsv (fh);
644	req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh)));	721	req->int2 = fd;
645		722
646	REQ_SEND (req);	723	REQ_SEND (req);
647	}	724	}
648		725
649	void	726	void
…		…
653	aio_write = EIO_WRITE	730	aio_write = EIO_WRITE
654	PROTOTYPE: $$$$$;$	731	PROTOTYPE: $$$$$;$
655	PPCODE:	732	PPCODE:
656	{	733	{
657	STRLEN svlen;	734	STRLEN svlen;
		735	int fd = extract_fd (fh, ix == EIO_WRITE);
658	char *svptr = SvPVbyte (data, svlen);	736	char *svptr = SvPVbyte (data, svlen);
659	UV len = SvUV (length);	737	UV len = SvUV (length);
660	int fd;
661
662	if (SvTYPE (data) > SVt_PVMG)
663	croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data));
664
665	SvUPGRADE (data, SVt_PV);
666	SvPOK_only (data);
667		738
668	if (dataoffset < 0)	739	if (dataoffset < 0)
669	dataoffset += svlen;	740	dataoffset += svlen;
670		741
671	if (dataoffset < 0 \|\| dataoffset > svlen)	742	if (dataoffset < 0 \|\| dataoffset > svlen)
…		…
677	if (!SvOK (length) \|\| len + dataoffset > svlen)	748	if (!SvOK (length) \|\| len + dataoffset > svlen)
678	len = svlen - dataoffset;	749	len = svlen - dataoffset;
679	}	750	}
680	else	751	else
681	{	752	{
682	/* read: grow scalar as necessary */	753	/* read: check type and grow scalar as necessary */
		754	SvUPGRADE (data, SVt_PV);
683	svptr = SvGROW (data, len + dataoffset + 1);	755	svptr = SvGROW (data, len + dataoffset + 1);
684	}	756	}
685
686	if (len < 0)
687	croak ("length must not be negative");
688
689	fd = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))
690	: IoOFP (sv_2io (fh)));
691
692	if (fd < 0)
693	croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
694		757
695	{	758	{
696	dREQ;	759	dREQ;
697		760
698	req->type = ix;	761	req->type = ix;
…		…
732	void	795	void
733	aio_sendfile (SV out_fh, SV in_fh, SV in_offset, UV length, SV callback=&PL_sv_undef)	796	aio_sendfile (SV out_fh, SV in_fh, SV in_offset, UV length, SV callback=&PL_sv_undef)
734	PROTOTYPE: $$$$;$	797	PROTOTYPE: $$$$;$
735	PPCODE:	798	PPCODE:
736	{	799	{
		800	int ifd = extract_fd (in_fh , 0);
		801	int ofd = extract_fd (out_fh, 0);
737	dREQ;	802	dREQ;
738		803
739	req->type = EIO_SENDFILE;	804	req->type = EIO_SENDFILE;
740	req->sv1 = newSVsv (out_fh);	805	req->sv1 = newSVsv (out_fh);
741	req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));	806	req->int1 = ofd;
742	req->sv2 = newSVsv (in_fh);	807	req->sv2 = newSVsv (in_fh);
743	req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));	808	req->int2 = ifd;
744	req->offs = SvVAL64 (in_offset);	809	req->offs = SvVAL64 (in_offset);
745	req->size = length;	810	req->size = length;
746		811
747	REQ_SEND;	812	REQ_SEND;
748	}	813	}
…		…
750	void	815	void
751	aio_readahead (SV fh, SV offset, IV length, SV *callback=&PL_sv_undef)	816	aio_readahead (SV fh, SV offset, IV length, SV *callback=&PL_sv_undef)
752	PROTOTYPE: $$$;$	817	PROTOTYPE: $$$;$
753	PPCODE:	818	PPCODE:
754	{	819	{
		820	int fd = extract_fd (fh, 0);
755	dREQ;	821	dREQ;
756		822
757	req->type = EIO_READAHEAD;	823	req->type = EIO_READAHEAD;
758	req->sv1 = newSVsv (fh);	824	req->sv1 = newSVsv (fh);
759	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));	825	req->int1 = fd;
760	req->offs = SvVAL64 (offset);	826	req->offs = SvVAL64 (offset);
761	req->size = length;	827	req->size = length;
762		828
763	REQ_SEND;	829	REQ_SEND;
764	}	830	}
…		…
881	req->type = EIO_FCHOWN;	947	req->type = EIO_FCHOWN;
882	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	948	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
883	}	949	}
884		950
885	REQ_SEND;	951	REQ_SEND;
		952	}
		953
		954	void
		955	aio_readdirx (SV8 pathname, IV flags, SV callback=&PL_sv_undef)
		956	PPCODE:
		957	{
		958	dREQ;
		959
		960	req->type = EIO_READDIR;
		961	req->sv1 = newSVsv (pathname);
		962	req->ptr1 = SvPVbyte_nolen (req->sv1);
		963	req->int1 = flags \| EIO_READDIR_DENTS \| EIO_READDIR_CUSTOM1;
		964
		965	if (flags & EIO_READDIR_DENTS)
		966	req->int1 \|= EIO_READDIR_CUSTOM2;
		967
		968	REQ_SEND;
886	}	969	}
887		970
888	void	971	void
889	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)	972	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)
890	ALIAS:	973	ALIAS:
…		…
1138	AV *av;	1221	AV *av;
1139		1222
1140	grp->errorno = errno;	1223	grp->errorno = errno;
1141		1224
1142	av = newAV ();	1225	av = newAV ();
		1226	av_extend (av, items - 1);
1143		1227
1144	for (i = 1; i < items; ++i )	1228	for (i = 1; i < items; ++i )
1145	av_push (av, newSVsv (ST (i)));	1229	av_push (av, newSVsv (ST (i)));
1146		1230
1147	SvREFCNT_dec (grp->sv1);	1231	SvREFCNT_dec (grp->sv1);

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.135 by root, Sun Apr 19 13:06:15 2009 UTC vs. Revision 1.147 by root, Mon Jun 15 05:34:49 2009 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.135 by root, Sun Apr 19 13:06:15 2009 UTC vs.
Revision 1.147 by root, Mon Jun 15 05:34:49 2009 UTC