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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.191 by root, Tue Jul 19 05:00:11 2011 UTC vs.
Revision 1.199 by root, Thu Sep 29 09:47:13 2011 UTC

…		…
102		102
103	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 */	104	typedef int aio_rfd; /* read file desriptor */
105	typedef int aio_wfd; /* write file descriptor */	105	typedef int aio_wfd; /* write file descriptor */
106		106
107	static HV aio_stash, aio_req_stash, *aio_grp_stash;	107	static HV aio_stash, aio_req_stash, aio_grp_stash, aio_wd_stash;
108		108
109	#define EIO_REQ_MEMBERS \	109	#define EIO_REQ_MEMBERS \
110	SV *callback; \	110	SV *callback; \
111	SV sv1, sv2; \	111	SV sv1, sv2; \
		112	SV sv3, sv4; \
112	STRLEN stroffset; \	113	STRLEN stroffset; \
113	SV *self;	114	SV *self;
114		115
115	#define EIO_NO_WRAPPERS 1	116	#define EIO_NO_WRAPPERS 1
116		117
…		…
329	FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */	330	FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
330	};	331	};
331		332
332	typedef eio_req *aio_req;	333	typedef eio_req *aio_req;
333	typedef eio_req *aio_req_ornot;	334	typedef eio_req *aio_req_ornot;
		335	typedef eio_wd aio_wd;
334		336
335	static SV *on_next_submit;	337	static SV *on_next_submit;
336	static int next_pri = EIO_PRI_DEFAULT;	338	static int next_pri = EIO_PRI_DEFAULT;
337	static int max_outstanding;	339	static int max_outstanding;
338		340
…		…
363	}	365	}
364		366
365	return sv_2mortal (sv_bless (newRV_inc (req->self), stash));	367	return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
366	}	368	}
367		369
		370	static SV *
		371	newSVaio_wd (aio_wd wd)
		372	{
		373	return sv_bless (newRV_noinc (newSViv ((long)wd)), aio_wd_stash);
		374	}
		375
368	static aio_req SvAIO_REQ (SV *sv)	376	static aio_req SvAIO_REQ (SV *sv)
369	{	377	{
370	MAGIC *mg;	378	MAGIC *mg;
371		379
372	if (!SvROK (sv)	380	if (!SvROK (sv)
…		…
376	croak ("object of class IO::AIO::REQ expected");	384	croak ("object of class IO::AIO::REQ expected");
377		385
378	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	386	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
379		387
380	return mg ? (aio_req)mg->mg_ptr : 0;	388	return mg ? (aio_req)mg->mg_ptr : 0;
		389	}
		390
		391	static aio_wd SvAIO_WD (SV *sv)
		392	{
		393	if (!SvROK (sv)
		394	\|\| SvSTASH (SvRV (sv)) != aio_wd_stash
		395	\|\| SvTYPE (SvRV (sv)) != SVt_PVMG)
		396	croak ("IO::AIO: expected a working directory object as returned by aio_wd");
		397
		398	return (aio_wd)(long)SvIVX (SvRV (sv));
381	}	399	}
382		400
383	static void aio_grp_feed (aio_req grp)	401	static void aio_grp_feed (aio_req grp)
384	{	402	{
385	if (grp->sv2 && SvOK (grp->sv2))	403	if (grp->sv2 && SvOK (grp->sv2))
…		…
444	SvREADONLY_on (sv_result);	462	SvREADONLY_on (sv_result);
445	}	463	}
446		464
447	switch (req->type)	465	switch (req->type)
448	{	466	{
		467	case EIO_WD_OPEN:
		468	PUSHs (sv_2mortal (newSVaio_wd (req->wd)));
		469	break;
		470
449	case EIO_READDIR:	471	case EIO_READDIR:
450	{	472	{
451	SV *rv = &PL_sv_undef;	473	SV *rv = &PL_sv_undef;
452		474
453	if (req->result >= 0)	475	if (req->result >= 0)
…		…
595	break;	617	break;
596		618
597	case EIO_STAT:	619	case EIO_STAT:
598	case EIO_LSTAT:	620	case EIO_LSTAT:
599	case EIO_FSTAT:	621	case EIO_FSTAT:
600	PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;	622	PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
		623
601	PL_laststatval = req->result;	624	if (!(PL_laststatval = req->result))
602	/* if compilation fails here then perl's Stat_t is not struct _stati64 */	625	/* if compilation fails here then perl's Stat_t is not struct _stati64 */
603	PL_statcache = (EIO_STRUCT_STAT )(req->ptr2);	626	PL_statcache = (EIO_STRUCT_STAT )(req->ptr2);
		627
604	PUSHs (sv_result);	628	PUSHs (sv_result);
605	break;	629	break;
606		630
607	case EIO_READ:	631	case EIO_READ:
608	{	632	{
…		…
652	SvREFCNT_dec (req->self);	676	SvREFCNT_dec (req->self);
653	}	677	}
654		678
655	SvREFCNT_dec (req->sv1);	679	SvREFCNT_dec (req->sv1);
656	SvREFCNT_dec (req->sv2);	680	SvREFCNT_dec (req->sv2);
		681	SvREFCNT_dec (req->sv3);
		682	SvREFCNT_dec (req->sv4);
657	SvREFCNT_dec (req->callback);	683	SvREFCNT_dec (req->callback);
658		684
659	Safefree (req);	685	Safefree (req);
660	}	686	}
661		687
…		…
790	req_submit (req); \	816	req_submit (req); \
791	SPAGAIN; \	817	SPAGAIN; \
792	\	818	\
793	if (GIMME_V != G_VOID) \	819	if (GIMME_V != G_VOID) \
794	XPUSHs (req_sv (req, aio_req_stash));	820	XPUSHs (req_sv (req, aio_req_stash));
		821
		822	static void
		823	req_set_path (aio_req req, SV path, SV wdsv, SV pathsv, eio_wd wd, void **ptr)
		824	{
		825	if (expect_false (SvROK (path)))
		826	{
		827	AV av = (AV )SvRV (path);
		828	SV *wdob;
		829
		830	if (SvTYPE (av) != SVt_PVAV \|\| AvFILLp (av) != 1)
		831	croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
		832
		833	path = AvARRAY (av)[1];
		834	wdob = AvARRAY (av)[0];
		835
		836	if (SvOK (wdob))
		837	{
		838	*wd = SvAIO_WD (wdob);
		839	*wdsv = SvREFCNT_inc_NN (SvRV (wdob));
		840	}
		841	else
		842	*wd = EIO_INVALID_WD;
		843	}
		844
		845	*pathsv = newSVsv (path);
		846	ptr = SvPVbyte_nolen (pathsv);
		847	}
		848
		849	static void
		850	req_set_path1 (aio_req req, SV *path)
		851	{
		852	req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
		853	}
		854
		855	static void
		856	req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
		857	{
		858	SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
		859
		860	switch (SvTYPE (rv))
		861	{
		862	case SVt_PVIO:
		863	case SVt_PVLV:
		864	case SVt_PVGV:
		865	req->type = type_fh;
		866	req->sv1 = newSVsv (fh_or_path);
		867	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
		868	break;
		869
		870	default:
		871	req->type = type_path;
		872	req_set_path1 (req, fh_or_path);
		873	break;
		874	}
		875
		876	}
795		877
796	MODULE = IO::AIO PACKAGE = IO::AIO	878	MODULE = IO::AIO PACKAGE = IO::AIO
797		879
798	PROTOTYPES: ENABLE	880	PROTOTYPES: ENABLE
799		881
…		…
917	};	999	};
918		1000
919	aio_stash = gv_stashpv ("IO::AIO" , 1);	1001	aio_stash = gv_stashpv ("IO::AIO" , 1);
920	aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);	1002	aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
921	aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);	1003	aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
		1004	aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
922		1005
923	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1006	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
924	newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));	1007	newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
925		1008
926	newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));	1009	newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
927		1010
928	reinit ();	1011	reinit ();
929	}	1012	}
930		1013
931	void	1014	void
932	reinit ()	1015	reinit ()
933	PROTOTYPE:	1016	PROTOTYPE:
934	CODE:
935	reinit ();
936		1017
937	void	1018	void
938	max_poll_reqs (unsigned int nreqs)	1019	max_poll_reqs (unsigned int nreqs)
939	PROTOTYPE: $	1020	PROTOTYPE: $
940	CODE:	1021	CODE:
…		…
975	PROTOTYPE: $	1056	PROTOTYPE: $
976	CODE:	1057	CODE:
977	max_outstanding = maxreqs;	1058	max_outstanding = maxreqs;
978		1059
979	void	1060	void
		1061	aio_wd (SV8 pathname, SV callback=&PL_sv_undef)
		1062	PPCODE:
		1063	{
		1064	dREQ;
		1065
		1066	req->type = EIO_WD_OPEN;
		1067	req_set_path1 (req, pathname);
		1068
		1069	REQ_SEND;
		1070	}
		1071
		1072	void
980	aio_open (SV8 pathname, int flags, int mode, SV callback=&PL_sv_undef)	1073	aio_open (SV8 pathname, int flags, int mode, SV callback=&PL_sv_undef)
981	PPCODE:	1074	PPCODE:
982	{	1075	{
983	dREQ;	1076	dREQ;
984		1077
985	req->type = EIO_OPEN;	1078	req->type = EIO_OPEN;
986	req->sv1 = newSVsv (pathname);	1079	req_set_path1 (req, pathname);
987	req->ptr1 = SvPVbyte_nolen (req->sv1);
988	req->int1 = flags;	1080	req->int1 = flags;
989	req->int2 = mode;	1081	req->int2 = mode;
990		1082
991	REQ_SEND;	1083	REQ_SEND;
992	}	1084	}
…		…
994	void	1086	void
995	aio_fsync (SV fh, SV callback=&PL_sv_undef)	1087	aio_fsync (SV fh, SV callback=&PL_sv_undef)
996	ALIAS:	1088	ALIAS:
997	aio_fsync = EIO_FSYNC	1089	aio_fsync = EIO_FSYNC
998	aio_fdatasync = EIO_FDATASYNC	1090	aio_fdatasync = EIO_FDATASYNC
		1091	aio_syncfs = EIO_SYNCFS
999	PPCODE:	1092	PPCODE:
1000	{	1093	{
1001	int fd = s_fileno_croak (fh, 0);	1094	int fd = s_fileno_croak (fh, 0);
1002	dREQ;	1095	dREQ;
1003		1096
…		…
1128	REQ_SEND;	1221	REQ_SEND;
1129	}	1222	}
1130	}	1223	}
1131		1224
1132	void	1225	void
1133	aio_readlink (SV8 path, SV callback=&PL_sv_undef)	1226	aio_readlink (SV8 pathname, SV callback=&PL_sv_undef)
1134	ALIAS:	1227	ALIAS:
1135	aio_readlink = EIO_READLINK	1228	aio_readlink = EIO_READLINK
1136	aio_realpath = EIO_REALPATH	1229	aio_realpath = EIO_REALPATH
1137	PPCODE:	1230	PPCODE:
1138	{	1231	{
1139	dREQ;	1232	dREQ;
1140		1233
1141	req->type = ix;	1234	req->type = ix;
1142	req->sv1 = newSVsv (path);	1235	req_set_path1 (req, pathname);
1143	req->ptr1 = SvPVbyte_nolen (req->sv1);
1144		1236
1145	REQ_SEND;	1237	REQ_SEND;
1146	}	1238	}
1147		1239
1148	void	1240	void
…		…
1189	PPCODE:	1281	PPCODE:
1190	{	1282	{
1191	dREQ;	1283	dREQ;
1192		1284
1193	req->sv1 = newSVsv (fh_or_path);	1285	req->sv1 = newSVsv (fh_or_path);
1194		1286	req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1195	if (SvPOK (req->sv1))
1196	{
1197	req->type = ix;
1198	req->ptr1 = SvPVbyte_nolen (req->sv1);
1199	}
1200	else
1201	{
1202	req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1203	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1204	}
1205
1206	REQ_SEND;	1287	REQ_SEND;
1207	}	1288	}
1208		1289
1209	UV	1290	UV
1210	major (UV dev)	1291	major (UV dev)
…		…
1228	{	1309	{
1229	dREQ;	1310	dREQ;
1230		1311
1231	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;	1312	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1232	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;	1313	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1233	req->sv1 = newSVsv (fh_or_path);	1314	req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1234
1235	if (SvPOK (req->sv1))
1236	{
1237	req->type = EIO_UTIME;
1238	req->ptr1 = SvPVbyte_nolen (req->sv1);
1239	}
1240	else
1241	{
1242	req->type = EIO_FUTIME;
1243	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1244	}
1245		1315
1246	REQ_SEND;	1316	REQ_SEND;
1247	}	1317	}
1248		1318
1249	void	1319	void
1250	aio_truncate (SV8 fh_or_path, SV offset, SV *callback=&PL_sv_undef)	1320	aio_truncate (SV8 fh_or_path, SV offset, SV *callback=&PL_sv_undef)
1251	PPCODE:	1321	PPCODE:
1252	{	1322	{
1253	dREQ;	1323	dREQ;
1254		1324
1255	req->sv1 = newSVsv (fh_or_path);
1256	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;	1325	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1257		1326	req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1258	if (SvPOK (req->sv1))
1259	{
1260	req->type = EIO_TRUNCATE;
1261	req->ptr1 = SvPVbyte_nolen (req->sv1);
1262	}
1263	else
1264	{
1265	req->type = EIO_FTRUNCATE;
1266	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1267	}
1268		1327
1269	REQ_SEND;	1328	REQ_SEND;
1270	}	1329	}
1271		1330
1272	void	1331	void
…		…
1277	PPCODE:	1336	PPCODE:
1278	{	1337	{
1279	dREQ;	1338	dREQ;
1280		1339
1281	req->int2 = mode;	1340	req->int2 = mode;
1282	req->sv1 = newSVsv (fh_or_path);	1341	req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1283
1284	if (SvPOK (req->sv1))
1285	{
1286	req->type = ix;
1287	req->ptr1 = SvPVbyte_nolen (req->sv1);
1288	}
1289	else
1290	{
1291	req->type = EIO_FCHMOD;
1292	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1293	}
1294		1342
1295	REQ_SEND;	1343	REQ_SEND;
1296	}	1344	}
1297		1345
1298	void	1346	void
…		…
1301	{	1349	{
1302	dREQ;	1350	dREQ;
1303		1351
1304	req->int2 = SvOK (uid) ? SvIV (uid) : -1;	1352	req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1305	req->int3 = SvOK (gid) ? SvIV (gid) : -1;	1353	req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1306	req->sv1 = newSVsv (fh_or_path);	1354	req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1307
1308	if (SvPOK (req->sv1))
1309	{
1310	req->type = EIO_CHOWN;
1311	req->ptr1 = SvPVbyte_nolen (req->sv1);
1312	}
1313	else
1314	{
1315	req->type = EIO_FCHOWN;
1316	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1317	}
1318		1355
1319	REQ_SEND;	1356	REQ_SEND;
1320	}	1357	}
1321		1358
1322	void	1359	void
…		…
1324	PPCODE:	1361	PPCODE:
1325	{	1362	{
1326	dREQ;	1363	dREQ;
1327		1364
1328	req->type = EIO_READDIR;	1365	req->type = EIO_READDIR;
1329	req->sv1 = newSVsv (pathname);
1330	req->ptr1 = SvPVbyte_nolen (req->sv1);
1331	req->int1 = flags \| EIO_READDIR_DENTS \| EIO_READDIR_CUSTOM1;	1366	req->int1 = flags \| EIO_READDIR_DENTS \| EIO_READDIR_CUSTOM1;
1332		1367
1333	if (flags & EIO_READDIR_DENTS)	1368	if (flags & EIO_READDIR_DENTS)
1334	req->int1 \|= EIO_READDIR_CUSTOM2;	1369	req->int1 \|= EIO_READDIR_CUSTOM2;
		1370
		1371	req_set_path1 (req, pathname);
1335		1372
1336	REQ_SEND;	1373	REQ_SEND;
1337	}	1374	}
1338		1375
1339	void	1376	void
…		…
1345	PPCODE:	1382	PPCODE:
1346	{	1383	{
1347	dREQ;	1384	dREQ;
1348		1385
1349	req->type = ix;	1386	req->type = ix;
1350	req->sv1 = newSVsv (pathname);	1387	req_set_path1 (req, pathname);
1351	req->ptr1 = SvPVbyte_nolen (req->sv1);
1352		1388
1353	REQ_SEND;	1389	REQ_SEND;
1354	}	1390	}
1355		1391
1356	void	1392	void
…		…
1360	aio_symlink = EIO_SYMLINK	1396	aio_symlink = EIO_SYMLINK
1361	aio_rename = EIO_RENAME	1397	aio_rename = EIO_RENAME
1362	PPCODE:	1398	PPCODE:
1363	{	1399	{
1364	dREQ;	1400	dREQ;
		1401	eio_wd wd2 = 0;
1365		1402
1366	req->type = ix;	1403	req->type = ix;
1367	req->sv1 = newSVsv (oldpath);	1404	req_set_path1 (req, oldpath);
1368	req->ptr1 = SvPVbyte_nolen (req->sv1);	1405	req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1369	req->sv2 = newSVsv (newpath);	1406	req->int3 = (long)wd2;
1370	req->ptr2 = SvPVbyte_nolen (req->sv2);
1371		1407
1372	REQ_SEND;	1408	REQ_SEND;
1373	}	1409	}
1374		1410
1375	void	1411	void
…		…
1377	PPCODE:	1413	PPCODE:
1378	{	1414	{
1379	dREQ;	1415	dREQ;
1380		1416
1381	req->type = EIO_MKNOD;	1417	req->type = EIO_MKNOD;
1382	req->sv1 = newSVsv (pathname);
1383	req->ptr1 = SvPVbyte_nolen (req->sv1);
1384	req->int2 = (mode_t)mode;	1418	req->int2 = (mode_t)mode;
1385	req->offs = dev;	1419	req->offs = dev;
		1420	req_set_path1 (req, pathname);
1386		1421
1387	REQ_SEND;	1422	REQ_SEND;
1388	}	1423	}
1389		1424
1390	void	1425	void
…		…
1712	SvREFCNT_dec (on_next_submit);	1747	SvREFCNT_dec (on_next_submit);
1713	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1748	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1714		1749
1715	PROTOTYPES: DISABLE	1750	PROTOTYPES: DISABLE
1716		1751
		1752	MODULE = IO::AIO PACKAGE = IO::AIO::WD
		1753
		1754	BOOT:
		1755	{
		1756	newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
		1757	newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
		1758	}
		1759
		1760	void
		1761	DESTROY (SV *self)
		1762	CODE:
		1763	{
		1764	aio_wd wd = SvAIO_WD (self);
		1765	#if HAVE_AT
		1766	SV *callback = &PL_sv_undef;
		1767	dREQ; /* clobbers next_pri :/ */
		1768	req->type = EIO_WD_CLOSE;
		1769	req->wd = wd;
		1770	REQ_SEND;
		1771	#else
		1772	eio_wd_close_sync (wd);
		1773	#endif
		1774	}
		1775
1717	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1776	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1718		1777
1719	void	1778	void
1720	cancel (aio_req_ornot req)	1779	cancel (aio_req_ornot req)
1721	CODE:	1780	CODE:

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.191 by root, Tue Jul 19 05:00:11 2011 UTC vs. Revision 1.199 by root, Thu Sep 29 09:47:13 2011 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.191 by root, Tue Jul 19 05:00:11 2011 UTC vs.
Revision 1.199 by root, Thu Sep 29 09:47:13 2011 UTC