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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.127 by root, Tue Sep 30 13:17:32 2008 UTC vs.
Revision 1.146 by root, Fri Jun 12 17:07:00 2009 UTC

…		…
111		111
112	#include "libeio/eio.h"	112	#include "libeio/eio.h"
113		113
114	static int req_invoke (eio_req *req);	114	static int req_invoke (eio_req *req);
115	#define EIO_FINISH(req) req_invoke (req)	115	#define EIO_FINISH(req) req_invoke (req)
116	static void aio_grp_feed (eio_req *grp);
117	#define EIO_FEED(req) aio_grp_feed (req)
118	static void req_destroy (eio_req *grp);	116	static void req_destroy (eio_req *grp);
119	#define EIO_DESTROY(req) req_destroy (req)	117	#define EIO_DESTROY(req) req_destroy (req)
120		118
121	enum {	119	enum {
122	FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */	120	FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
…		…
214	dSP;	212	dSP;
215		213
216	if (req->flags & FLAG_SV2_RO_OFF)	214	if (req->flags & FLAG_SV2_RO_OFF)
217	SvREADONLY_off (req->sv2);	215	SvREADONLY_off (req->sv2);
218		216
219	if (!EIO_CANCELLED (req) && SvOK (req->callback))	217	if (!EIO_CANCELLED (req) && req->callback)
220	{	218	{
221	ENTER;	219	ENTER;
222	SAVETMPS;	220	SAVETMPS;
223	PUSHMARK (SP);	221	PUSHMARK (SP);
224	EXTEND (SP, 1);	222	EXTEND (SP, 1);
…		…
237		235
238	av_extend (av, req->result - 1);	236	av_extend (av, req->result - 1);
239		237
240	for (i = 0; i < req->result; ++i)	238	for (i = 0; i < req->result; ++i)
241	{	239	{
		240	if (req->int1 & EIO_READDIR_DENTS)
		241	{
		242	eio_dirent ent = (eio_dirent )buf;
		243	SV *namesv = newSVpvn (ent->name, ent->namelen);
		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
		265	av_store (av, i, namesv);
		266
		267	buf += sizeof (eio_dirent);
		268	}
		269	else
		270	{
242	SV *sv = newSVpv (buf, 0);	271	SV *name = newSVpv (buf, 0);
243
244	av_store (av, i, sv);	272	av_store (av, i, name);
245	buf += SvCUR (sv) + 1;	273	buf += SvCUR (name) + 1;
		274	}
246	}	275	}
247		276
248	rv = sv_2mortal (newRV_noinc ((SV *)av));	277	rv = sv_2mortal (newRV_noinc ((SV *)av));
249	}	278	}
250		279
251	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))));
252	}	284	}
253	break;	285	break;
254		286
255	case EIO_OPEN:	287	case EIO_OPEN:
256	{	288	{
…		…
262	GV gv = (GV )sv_newmortal ();	294	GV gv = (GV )sv_newmortal ();
263	int flags = req->int1 & (O_RDONLY \| O_WRONLY \| O_RDWR);	295	int flags = req->int1 & (O_RDONLY \| O_WRONLY \| O_RDWR);
264	char sym [64];	296	char sym [64];
265	int symlen;	297	int symlen;
266		298
267	symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);	299	symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
268	gv_init (gv, stash, sym, symlen, 0);	300	gv_init (gv, stash, sym, symlen, 0);
269		301
270	symlen = snprintf (	302	symlen = snprintf (
271	sym,	303	sym,
272	sizeof (sym),	304	sizeof (sym),
273	"%s&=%d",	305	"%s&=%d",
274	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",	306	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
275	req->result	307	(int)req->result
276	);	308	);
277		309
278	if (do_open (gv, sym, symlen, 0, 0, 0, 0))	310	if (do_open (gv, sym, symlen, 0, 0, 0, 0))
279	fh = (SV *)gv;	311	fh = (SV *)gv;
280	}	312	}
…		…
314	PL_statcache = (EIO_STRUCT_STAT )(req->ptr2);	346	PL_statcache = (EIO_STRUCT_STAT )(req->ptr2);
315	PUSHs (sv_2mortal (newSViv (req->result)));	347	PUSHs (sv_2mortal (newSViv (req->result)));
316	break;	348	break;
317		349
318	case EIO_READ:	350	case EIO_READ:
		351	{
319	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));
320	*SvEND (req->sv2) = 0;	353	*SvEND (req->sv2) = 0;
		354	SvPOK_only (req->sv2);
		355	SvSETMAGIC (req->sv2);
321	PUSHs (sv_2mortal (newSViv (req->result)));	356	PUSHs (sv_2mortal (newSViv (req->result)));
		357	}
322	break;	358	break;
323		359
324	case EIO_DUP2:	360	case EIO_DUP2:
325	if (req->result > 0)	361	if (req->result > 0)
326	req->result = 0;	362	req->result = 0;
…		…
461	static void atfork_child (void)	497	static void atfork_child (void)
462	{	498	{
463	create_respipe ();	499	create_respipe ();
464	}	500	}
465		501
		502	static SV *
		503	get_cb (SV *cb_sv)
		504	{
		505	HV *st;
		506	GV *gvp;
		507	CV *cv;
		508
		509	if (!SvOK (cb_sv))
		510	return 0;
		511
		512	cv = sv_2cv (cb_sv, &st, &gvp, 0);
		513
		514	if (!cv)
		515	croak ("IO::AIO callback must be undef or a CODE reference");
		516
		517	return (SV *)cv;
		518	}
		519
466	#define dREQ \	520	#define dREQ \
		521	SV *cb_cv; \
467	aio_req req; \	522	aio_req req; \
468	int req_pri = next_pri; \	523	int req_pri = next_pri; \
469	next_pri = EIO_PRI_DEFAULT; \	524	next_pri = EIO_PRI_DEFAULT; \
470	\	525	\
471	if (SvOK (callback) && !SvROK (callback)) \	526	cb_cv = get_cb (callback); \
472	croak ("callback must be undef or of reference type"); \
473	\	527	\
474	Newz (0, req, 1, eio_req); \	528	Newz (0, req, 1, eio_req); \
475	if (!req) \	529	if (!req) \
476	croak ("out of memory during eio_req allocation"); \	530	croak ("out of memory during eio_req allocation"); \
477	\	531	\
478	req->callback = newSVsv (callback); \	532	req->callback = SvREFCNT_inc (cb_cv); \
479	req->pri = req_pri	533	req->pri = req_pri
480		534
481	#define REQ_SEND \	535	#define REQ_SEND \
482	PUTBACK; \	536	PUTBACK; \
483	req_submit (req); \	537	req_submit (req); \
484	SPAGAIN; \	538	SPAGAIN; \
485	\	539	\
486	if (GIMME_V != G_VOID) \	540	if (GIMME_V != G_VOID) \
487	XPUSHs (req_sv (req, AIO_REQ_KLASS));	541	XPUSHs (req_sv (req, AIO_REQ_KLASS));
488		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
489	MODULE = IO::AIO PACKAGE = IO::AIO	554	MODULE = IO::AIO PACKAGE = IO::AIO
490		555
491	PROTOTYPES: ENABLE	556	PROTOTYPES: ENABLE
492		557
493	BOOT:	558	BOOT:
494	{	559	{
495	stash = gv_stashpv ("IO::AIO", 1);	560	static const struct {
496		561	const char *name;
497	newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));	562	IV iv;
498	newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));	563	} *civ, const_iv[] = {
499	newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));	564	# define const_iv(name, value) { # name, (IV) value },
500	newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));	565	# define const_eio(name) { # name, (IV) EIO_ ## name },
501	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)
502	#ifndef _WIN32	572	#ifndef _WIN32
503	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	573	const_iv (S_IFIFO , S_IFIFO)
504	#endif	574	#endif
		575	const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
		576	const_eio (SYNC_FILE_RANGE_WRITE)
		577	const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
505		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
506	create_respipe ();	600	create_respipe ();
507		601
508	if (eio_init (want_poll, done_poll) < 0)	602	if (eio_init (want_poll, done_poll) < 0)
509	croak ("IO::AIO: unable to initialise eio library");	603	croak ("IO::AIO: unable to initialise eio library");
510		604
511	/* atfork child called in fifo order, so before eio's handler */	605	/* atfork child called in fifo order, so before eio's handler */
512	X_THREAD_ATFORK (0, 0, atfork_child);	606	X_THREAD_ATFORK (0, 0, atfork_child);
513	}	607	}
514		608
515	void	609	void
516	max_poll_reqs (int nreqs)	610	max_poll_reqs (int nreqs)
517	PROTOTYPE: $	611	PROTOTYPE: $
…		…
570	ALIAS:	664	ALIAS:
571	aio_fsync = EIO_FSYNC	665	aio_fsync = EIO_FSYNC
572	aio_fdatasync = EIO_FDATASYNC	666	aio_fdatasync = EIO_FDATASYNC
573	PPCODE:	667	PPCODE:
574	{	668	{
		669	int fd = extract_fd (fh, 0);
575	dREQ;	670	dREQ;
576		671
577	req->type = ix;	672	req->type = ix;
578	req->sv1 = newSVsv (fh);	673	req->sv1 = newSVsv (fh);
579	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));	674	req->int1 = fd;
		675
		676	REQ_SEND (req);
		677	}
		678
		679	void
		680	aio_sync_file_range (SV fh, SV offset, SV nbytes, IV flags, SV callback=&PL_sv_undef)
		681	PROTOTYPE: $$$$;$
		682	PPCODE:
		683	{
		684	int fd = extract_fd (fh, 0);
		685	dREQ;
		686
		687	req->type = EIO_SYNC_FILE_RANGE;
		688	req->sv1 = newSVsv (fh);
		689	req->int1 = fd;
		690	req->offs = SvVAL64 (offset);
		691	req->size = SvVAL64 (nbytes);
		692	req->int2 = flags;
580		693
581	REQ_SEND (req);	694	REQ_SEND (req);
582	}	695	}
583		696
584	void	697	void
585	aio_close (SV fh, SV callback=&PL_sv_undef)	698	aio_close (SV fh, SV callback=&PL_sv_undef)
586	PROTOTYPE: $;$	699	PROTOTYPE: $;$
587	PPCODE:	700	PPCODE:
588	{	701	{
589	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);
590	dREQ;	704	dREQ;
591		705
592	if (close_pipe < 0)	706	if (close_pipe < 0)
593	{	707	{
594	int pipefd [2];	708	int pipefd [2];
…		…
602	}	716	}
603		717
604	req->type = EIO_DUP2;	718	req->type = EIO_DUP2;
605	req->int1 = close_pipe;	719	req->int1 = close_pipe;
606	req->sv2 = newSVsv (fh);	720	req->sv2 = newSVsv (fh);
607	req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh)));	721	req->int2 = fd;
608		722
609	REQ_SEND (req);	723	REQ_SEND (req);
610	}	724	}
611		725
612	void	726	void
…		…
616	aio_write = EIO_WRITE	730	aio_write = EIO_WRITE
617	PROTOTYPE: $$$$$;$	731	PROTOTYPE: $$$$$;$
618	PPCODE:	732	PPCODE:
619	{	733	{
620	STRLEN svlen;	734	STRLEN svlen;
		735	int fd = extract_fd (fh, ix == EIO_WRITE);
621	char *svptr = SvPVbyte (data, svlen);	736	char *svptr = SvPVbyte (data, svlen);
622	UV len = SvUV (length);	737	UV len = SvUV (length);
623
624	SvUPGRADE (data, SVt_PV);
625	SvPOK_on (data);
626		738
627	if (dataoffset < 0)	739	if (dataoffset < 0)
628	dataoffset += svlen;	740	dataoffset += svlen;
629		741
630	if (dataoffset < 0 \|\| dataoffset > svlen)	742	if (dataoffset < 0 \|\| dataoffset > svlen)
…		…
636	if (!SvOK (length) \|\| len + dataoffset > svlen)	748	if (!SvOK (length) \|\| len + dataoffset > svlen)
637	len = svlen - dataoffset;	749	len = svlen - dataoffset;
638	}	750	}
639	else	751	else
640	{	752	{
641	/* read: grow scalar as necessary */	753	/* read: check type and grow scalar as necessary */
		754	SvUPGRADE (data, SVt_PV);
642	svptr = SvGROW (data, len + dataoffset + 1);	755	svptr = SvGROW (data, len + dataoffset + 1);
643	}	756	}
644
645	if (len < 0)
646	croak ("length must not be negative");
647		757
648	{	758	{
649	dREQ;	759	dREQ;
650		760
651	req->type = ix;	761	req->type = ix;
652	req->sv1 = newSVsv (fh);	762	req->sv1 = newSVsv (fh);
653	req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))	763	req->int1 = fd;
654	: IoOFP (sv_2io (fh)));
655	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;	764	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
656	req->size = len;	765	req->size = len;
657	req->sv2 = SvREFCNT_inc (data);	766	req->sv2 = SvREFCNT_inc (data);
658	req->ptr2 = (char *)svptr + dataoffset;	767	req->ptr2 = (char *)svptr + dataoffset;
659	req->stroffset = dataoffset;	768	req->stroffset = dataoffset;
…		…
686	void	795	void
687	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)
688	PROTOTYPE: $$$$;$	797	PROTOTYPE: $$$$;$
689	PPCODE:	798	PPCODE:
690	{	799	{
		800	int ifd = extract_fd (in_fh , 0);
		801	int ofd = extract_fd (out_fh, 0);
691	dREQ;	802	dREQ;
692		803
693	req->type = EIO_SENDFILE;	804	req->type = EIO_SENDFILE;
694	req->sv1 = newSVsv (out_fh);	805	req->sv1 = newSVsv (out_fh);
695	req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));	806	req->int1 = ofd;
696	req->sv2 = newSVsv (in_fh);	807	req->sv2 = newSVsv (in_fh);
697	req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));	808	req->int2 = ifd;
698	req->offs = SvVAL64 (in_offset);	809	req->offs = SvVAL64 (in_offset);
699	req->size = length;	810	req->size = length;
700		811
701	REQ_SEND;	812	REQ_SEND;
702	}	813	}
…		…
704	void	815	void
705	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)
706	PROTOTYPE: $$$;$	817	PROTOTYPE: $$$;$
707	PPCODE:	818	PPCODE:
708	{	819	{
		820	int fd = extract_fd (fh, 0);
709	dREQ;	821	dREQ;
710		822
711	req->type = EIO_READAHEAD;	823	req->type = EIO_READAHEAD;
712	req->sv1 = newSVsv (fh);	824	req->sv1 = newSVsv (fh);
713	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));	825	req->int1 = fd;
714	req->offs = SvVAL64 (offset);	826	req->offs = SvVAL64 (offset);
715	req->size = length;	827	req->size = length;
716		828
717	REQ_SEND;	829	REQ_SEND;
718	}	830	}
…		…
835	req->type = EIO_FCHOWN;	947	req->type = EIO_FCHOWN;
836	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	948	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
837	}	949	}
838		950
839	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;
840	}	969	}
841		970
842	void	971	void
843	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)	972	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)
844	ALIAS:	973	ALIAS:
…		…
1038	CODE:	1167	CODE:
1039	eio_cancel (req);	1168	eio_cancel (req);
1040		1169
1041	void	1170	void
1042	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)	1171	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1043	CODE:	1172	PPCODE:
		1173	{
		1174	if (GIMME_V != G_VOID)
		1175	XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
		1176
		1177	if (items > 1)
		1178	{
		1179	SV *cb_cv = get_cb (callback);
		1180
1044	SvREFCNT_dec (req->callback);	1181	SvREFCNT_dec (req->callback);
1045	req->callback = newSVsv (callback);	1182	req->callback = SvREFCNT_inc (cb_cv);
		1183	}
		1184	}
1046		1185
1047	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1186	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1048		1187
1049	void	1188	void
1050	add (aio_req grp, ...)	1189	add (aio_req grp, ...)
…		…
1082	AV *av;	1221	AV *av;
1083		1222
1084	grp->errorno = errno;	1223	grp->errorno = errno;
1085		1224
1086	av = newAV ();	1225	av = newAV ();
		1226	av_extend (av, items - 1);
1087		1227
1088	for (i = 1; i < items; ++i )	1228	for (i = 1; i < items; ++i )
1089	av_push (av, newSVsv (ST (i)));	1229	av_push (av, newSVsv (ST (i)));
1090		1230
1091	SvREFCNT_dec (grp->sv1);	1231	SvREFCNT_dec (grp->sv1);
…		…
1105	void	1245	void
1106	feed (aio_req grp, SV *callback=&PL_sv_undef)	1246	feed (aio_req grp, SV *callback=&PL_sv_undef)
1107	CODE:	1247	CODE:
1108	{	1248	{
1109	SvREFCNT_dec (grp->sv2);	1249	SvREFCNT_dec (grp->sv2);
1110	grp->sv2 = newSVsv (callback);	1250	grp->sv2 = newSVsv (callback);
		1251	grp->feed = aio_grp_feed;
1111		1252
1112	if (grp->int2 <= 0)	1253	if (grp->int2 <= 0)
1113	grp->int2 = 2;	1254	grp->int2 = 2;
1114		1255
1115	eio_grp_limit (grp, grp->int2);	1256	eio_grp_limit (grp, grp->int2);

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.127 by root, Tue Sep 30 13:17:32 2008 UTC vs. Revision 1.146 by root, Fri Jun 12 17:07:00 2009 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.127 by root, Tue Sep 30 13:17:32 2008 UTC vs.
Revision 1.146 by root, Fri Jun 12 17:07:00 2009 UTC