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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.194 by root, Fri Jul 29 08:35:36 2011 UTC vs.
Revision 1.195 by root, Mon Sep 26 20:19:08 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
…		…
376	croak ("object of class IO::AIO::REQ expected");	378	croak ("object of class IO::AIO::REQ expected");
377		379
378	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	380	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
379		381
380	return mg ? (aio_req)mg->mg_ptr : 0;	382	return mg ? (aio_req)mg->mg_ptr : 0;
		383	}
		384
		385	static aio_wd SvAIO_WD (SV *sv)
		386	{
		387	if (!SvROK (sv)
		388	\|\| SvSTASH (SvRV (sv)) != aio_wd_stash
		389	\|\| SvTYPE (SvRV (sv)) != SVt_PVMG)
		390	croak ("IO::AIO: expected a working directory object as returned by aio_wd");
		391
		392	return (aio_wd)(long)SvIVX (SvRV (sv));
381	}	393	}
382		394
383	static void aio_grp_feed (aio_req grp)	395	static void aio_grp_feed (aio_req grp)
384	{	396	{
385	if (grp->sv2 && SvOK (grp->sv2))	397	if (grp->sv2 && SvOK (grp->sv2))
…		…
444	SvREADONLY_on (sv_result);	456	SvREADONLY_on (sv_result);
445	}	457	}
446		458
447	switch (req->type)	459	switch (req->type)
448	{	460	{
		461	case EIO_WD_OPEN:
		462	PUSHs (sv_2mortal (sv_bless (newRV_noinc (newSViv (((long)req->wd))), aio_wd_stash)));
		463	break;
		464
449	case EIO_READDIR:	465	case EIO_READDIR:
450	{	466	{
451	SV *rv = &PL_sv_undef;	467	SV *rv = &PL_sv_undef;
452		468
453	if (req->result >= 0)	469	if (req->result >= 0)
…		…
652	SvREFCNT_dec (req->self);	668	SvREFCNT_dec (req->self);
653	}	669	}
654		670
655	SvREFCNT_dec (req->sv1);	671	SvREFCNT_dec (req->sv1);
656	SvREFCNT_dec (req->sv2);	672	SvREFCNT_dec (req->sv2);
		673	SvREFCNT_dec (req->sv3);
		674	SvREFCNT_dec (req->sv4);
657	SvREFCNT_dec (req->callback);	675	SvREFCNT_dec (req->callback);
658		676
659	Safefree (req);	677	Safefree (req);
660	}	678	}
661		679
…		…
790	req_submit (req); \	808	req_submit (req); \
791	SPAGAIN; \	809	SPAGAIN; \
792	\	810	\
793	if (GIMME_V != G_VOID) \	811	if (GIMME_V != G_VOID) \
794	XPUSHs (req_sv (req, aio_req_stash));	812	XPUSHs (req_sv (req, aio_req_stash));
		813
		814	static void
		815	req_set_path (aio_req req, SV path, SV wdsv, SV pathsv, eio_wd wd, void **ptr)
		816	{
		817	if (SvROK (path))
		818	{
		819	AV av = (AV )SvRV (path);
		820	SV *wdob;
		821
		822	if (SvTYPE (av) != SVt_PVAV \|\| AvFILLp (av) != 1)
		823	croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
		824
		825	path = AvARRAY (av)[1];
		826	wdob = AvARRAY (av)[0];
		827
		828	*wd = SvAIO_WD (wdob);
		829	*wdsv = SvREFCNT_inc_NN (SvRV (wdob));
		830	}
		831
		832	*pathsv = newSVsv (path);
		833	ptr = SvPVbyte_nolen (pathsv);
		834	}
		835
		836	static void
		837	req_set_path1 (aio_req req, SV *path)
		838	{
		839	req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
		840	}
		841
		842	static void
		843	req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
		844	{
		845	SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
		846
		847	switch (SvTYPE (rv))
		848	{
		849	case SVt_PVIO:
		850	case SVt_PVLV:
		851	case SVt_PVGV:
		852	req->type = type_fh;
		853	req->sv1 = newSVsv (fh_or_path);
		854	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
		855	break;
		856
		857	default:
		858	req->type = type_path;
		859	req_set_path1 (req, fh_or_path);
		860	break;
		861	}
		862
		863	}
795		864
796	MODULE = IO::AIO PACKAGE = IO::AIO	865	MODULE = IO::AIO PACKAGE = IO::AIO
797		866
798	PROTOTYPES: ENABLE	867	PROTOTYPES: ENABLE
799		868
…		…
917	};	986	};
918		987
919	aio_stash = gv_stashpv ("IO::AIO" , 1);	988	aio_stash = gv_stashpv ("IO::AIO" , 1);
920	aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);	989	aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
921	aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);	990	aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
		991	aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
922		992
923	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)	993	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
924	newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	994	newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
925		995
926	newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));	996	newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
…		…
973	PROTOTYPE: $	1043	PROTOTYPE: $
974	CODE:	1044	CODE:
975	max_outstanding = maxreqs;	1045	max_outstanding = maxreqs;
976		1046
977	void	1047	void
		1048	aio_wd (SV8 pathname, SV callback=&PL_sv_undef)
		1049	PPCODE:
		1050	{
		1051	dREQ;
		1052
		1053	req->type = EIO_WD_OPEN;
		1054	req_set_path1 (req, pathname);
		1055
		1056	REQ_SEND;
		1057	}
		1058
		1059	void
978	aio_open (SV8 pathname, int flags, int mode, SV callback=&PL_sv_undef)	1060	aio_open (SV8 pathname, int flags, int mode, SV callback=&PL_sv_undef)
979	PPCODE:	1061	PPCODE:
980	{	1062	{
981	dREQ;	1063	dREQ;
982		1064
983	req->type = EIO_OPEN;	1065	req->type = EIO_OPEN;
984	req->sv1 = newSVsv (pathname);	1066	req_set_path1 (req, pathname);
985	req->ptr1 = SvPVbyte_nolen (req->sv1);
986	req->int1 = flags;	1067	req->int1 = flags;
987	req->int2 = mode;	1068	req->int2 = mode;
988		1069
989	REQ_SEND;	1070	REQ_SEND;
990	}	1071	}
…		…
1127	REQ_SEND;	1208	REQ_SEND;
1128	}	1209	}
1129	}	1210	}
1130		1211
1131	void	1212	void
1132	aio_readlink (SV8 path, SV callback=&PL_sv_undef)	1213	aio_readlink (SV8 pathname, SV callback=&PL_sv_undef)
1133	ALIAS:	1214	ALIAS:
1134	aio_readlink = EIO_READLINK	1215	aio_readlink = EIO_READLINK
1135	aio_realpath = EIO_REALPATH	1216	aio_realpath = EIO_REALPATH
1136	PPCODE:	1217	PPCODE:
1137	{	1218	{
1138	dREQ;	1219	dREQ;
1139		1220
1140	req->type = ix;	1221	req->type = ix;
1141	req->sv1 = newSVsv (path);	1222	req_set_path1 (req, pathname);
1142	req->ptr1 = SvPVbyte_nolen (req->sv1);
1143		1223
1144	REQ_SEND;	1224	REQ_SEND;
1145	}	1225	}
1146		1226
1147	void	1227	void
…		…
1188	PPCODE:	1268	PPCODE:
1189	{	1269	{
1190	dREQ;	1270	dREQ;
1191		1271
1192	req->sv1 = newSVsv (fh_or_path);	1272	req->sv1 = newSVsv (fh_or_path);
1193		1273	req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1194	if (SvPOK (req->sv1))
1195	{
1196	req->type = ix;
1197	req->ptr1 = SvPVbyte_nolen (req->sv1);
1198	}
1199	else
1200	{
1201	req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1202	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1203	}
1204
1205	REQ_SEND;	1274	REQ_SEND;
1206	}	1275	}
1207		1276
1208	UV	1277	UV
1209	major (UV dev)	1278	major (UV dev)
…		…
1227	{	1296	{
1228	dREQ;	1297	dREQ;
1229		1298
1230	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;	1299	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1231	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;	1300	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1232	req->sv1 = newSVsv (fh_or_path);	1301	req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1233
1234	if (SvPOK (req->sv1))
1235	{
1236	req->type = EIO_UTIME;
1237	req->ptr1 = SvPVbyte_nolen (req->sv1);
1238	}
1239	else
1240	{
1241	req->type = EIO_FUTIME;
1242	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1243	}
1244		1302
1245	REQ_SEND;	1303	REQ_SEND;
1246	}	1304	}
1247		1305
1248	void	1306	void
1249	aio_truncate (SV8 fh_or_path, SV offset, SV *callback=&PL_sv_undef)	1307	aio_truncate (SV8 fh_or_path, SV offset, SV *callback=&PL_sv_undef)
1250	PPCODE:	1308	PPCODE:
1251	{	1309	{
1252	dREQ;	1310	dREQ;
1253		1311
1254	req->sv1 = newSVsv (fh_or_path);
1255	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;	1312	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1256		1313	req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1257	if (SvPOK (req->sv1))
1258	{
1259	req->type = EIO_TRUNCATE;
1260	req->ptr1 = SvPVbyte_nolen (req->sv1);
1261	}
1262	else
1263	{
1264	req->type = EIO_FTRUNCATE;
1265	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1266	}
1267		1314
1268	REQ_SEND;	1315	REQ_SEND;
1269	}	1316	}
1270		1317
1271	void	1318	void
…		…
1276	PPCODE:	1323	PPCODE:
1277	{	1324	{
1278	dREQ;	1325	dREQ;
1279		1326
1280	req->int2 = mode;	1327	req->int2 = mode;
1281	req->sv1 = newSVsv (fh_or_path);	1328	req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1282
1283	if (SvPOK (req->sv1))
1284	{
1285	req->type = ix;
1286	req->ptr1 = SvPVbyte_nolen (req->sv1);
1287	}
1288	else
1289	{
1290	req->type = EIO_FCHMOD;
1291	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1292	}
1293		1329
1294	REQ_SEND;	1330	REQ_SEND;
1295	}	1331	}
1296		1332
1297	void	1333	void
…		…
1300	{	1336	{
1301	dREQ;	1337	dREQ;
1302		1338
1303	req->int2 = SvOK (uid) ? SvIV (uid) : -1;	1339	req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1304	req->int3 = SvOK (gid) ? SvIV (gid) : -1;	1340	req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1305	req->sv1 = newSVsv (fh_or_path);	1341	req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1306
1307	if (SvPOK (req->sv1))
1308	{
1309	req->type = EIO_CHOWN;
1310	req->ptr1 = SvPVbyte_nolen (req->sv1);
1311	}
1312	else
1313	{
1314	req->type = EIO_FCHOWN;
1315	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1316	}
1317		1342
1318	REQ_SEND;	1343	REQ_SEND;
1319	}	1344	}
1320		1345
1321	void	1346	void
…		…
1344	PPCODE:	1369	PPCODE:
1345	{	1370	{
1346	dREQ;	1371	dREQ;
1347		1372
1348	req->type = ix;	1373	req->type = ix;
1349	req->sv1 = newSVsv (pathname);	1374	req_set_path1 (req, pathname);
1350	req->ptr1 = SvPVbyte_nolen (req->sv1);
1351		1375
1352	REQ_SEND;	1376	REQ_SEND;
1353	}	1377	}
1354		1378
1355	void	1379	void
…		…
1359	aio_symlink = EIO_SYMLINK	1383	aio_symlink = EIO_SYMLINK
1360	aio_rename = EIO_RENAME	1384	aio_rename = EIO_RENAME
1361	PPCODE:	1385	PPCODE:
1362	{	1386	{
1363	dREQ;	1387	dREQ;
		1388	eio_wd wd2;
1364		1389
1365	req->type = ix;	1390	req->type = ix;
1366	req->sv1 = newSVsv (oldpath);	1391	req_set_path1 (req, oldpath);
1367	req->ptr1 = SvPVbyte_nolen (req->sv1);	1392	req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1368	req->sv2 = newSVsv (newpath);	1393	req->int3 = (long)wd2;
1369	req->ptr2 = SvPVbyte_nolen (req->sv2);
1370		1394
1371	REQ_SEND;	1395	REQ_SEND;
1372	}	1396	}
1373		1397
1374	void	1398	void
…		…
1376	PPCODE:	1400	PPCODE:
1377	{	1401	{
1378	dREQ;	1402	dREQ;
1379		1403
1380	req->type = EIO_MKNOD;	1404	req->type = EIO_MKNOD;
1381	req->sv1 = newSVsv (pathname);
1382	req->ptr1 = SvPVbyte_nolen (req->sv1);
1383	req->int2 = (mode_t)mode;	1405	req->int2 = (mode_t)mode;
1384	req->offs = dev;	1406	req->offs = dev;
		1407	req_set_path1 (req, pathname);
1385		1408
1386	REQ_SEND;	1409	REQ_SEND;
1387	}	1410	}
1388		1411
1389	void	1412	void
…		…
1711	SvREFCNT_dec (on_next_submit);	1734	SvREFCNT_dec (on_next_submit);
1712	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1735	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1713		1736
1714	PROTOTYPES: DISABLE	1737	PROTOTYPES: DISABLE
1715		1738
		1739	MODULE = IO::AIO PACKAGE = IO::AIO::WD
		1740
		1741	void
		1742	DESTROY (SV *self)
		1743	CODE:
		1744	{
		1745	aio_wd wd = SvAIO_WD (self);
		1746	#if HAVE_AT
		1747	SV *callback = &PL_sv_undef;
		1748	dREQ; /* clobbers next_pri :/ */
		1749	req->type = EIO_WD_CLOSE;
		1750	req->wd = wd;
		1751	REQ_SEND;
		1752	#else
		1753	eio_wd_close_sync (wd);
		1754	#endif
		1755	}
		1756
1716	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1757	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1717		1758
1718	void	1759	void
1719	cancel (aio_req_ornot req)	1760	cancel (aio_req_ornot req)
1720	CODE:	1761	CODE:

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.194 by root, Fri Jul 29 08:35:36 2011 UTC vs. Revision 1.195 by root, Mon Sep 26 20:19:08 2011 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.194 by root, Fri Jul 29 08:35:36 2011 UTC vs.
Revision 1.195 by root, Mon Sep 26 20:19:08 2011 UTC