[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.196 by root, Tue Sep 27 00:41:51 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)
…		…
652	SvREFCNT_dec (req->self);	674	SvREFCNT_dec (req->self);
653	}	675	}
654		676
655	SvREFCNT_dec (req->sv1);	677	SvREFCNT_dec (req->sv1);
656	SvREFCNT_dec (req->sv2);	678	SvREFCNT_dec (req->sv2);
		679	SvREFCNT_dec (req->sv3);
		680	SvREFCNT_dec (req->sv4);
657	SvREFCNT_dec (req->callback);	681	SvREFCNT_dec (req->callback);
658		682
659	Safefree (req);	683	Safefree (req);
660	}	684	}
661		685
…		…
790	req_submit (req); \	814	req_submit (req); \
791	SPAGAIN; \	815	SPAGAIN; \
792	\	816	\
793	if (GIMME_V != G_VOID) \	817	if (GIMME_V != G_VOID) \
794	XPUSHs (req_sv (req, aio_req_stash));	818	XPUSHs (req_sv (req, aio_req_stash));
		819
		820	static void
		821	req_set_path (aio_req req, SV path, SV wdsv, SV pathsv, eio_wd wd, void **ptr)
		822	{
		823	if (SvROK (path))
		824	{
		825	AV av = (AV )SvRV (path);
		826	SV *wdob;
		827
		828	if (SvTYPE (av) != SVt_PVAV \|\| AvFILLp (av) != 1)
		829	croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
		830
		831	path = AvARRAY (av)[1];
		832	wdob = AvARRAY (av)[0];
		833
		834	if (SvOK (wdob))
		835	{
		836	*wd = SvAIO_WD (wdob);
		837	*wdsv = SvREFCNT_inc_NN (SvRV (wdob));
		838	}
		839	else
		840	*wd = EIO_INVALID_WD;
		841	}
		842
		843	*pathsv = newSVsv (path);
		844	ptr = SvPVbyte_nolen (pathsv);
		845	}
		846
		847	static void
		848	req_set_path1 (aio_req req, SV *path)
		849	{
		850	req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
		851	}
		852
		853	static void
		854	req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
		855	{
		856	SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
		857
		858	switch (SvTYPE (rv))
		859	{
		860	case SVt_PVIO:
		861	case SVt_PVLV:
		862	case SVt_PVGV:
		863	req->type = type_fh;
		864	req->sv1 = newSVsv (fh_or_path);
		865	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
		866	break;
		867
		868	default:
		869	req->type = type_path;
		870	req_set_path1 (req, fh_or_path);
		871	break;
		872	}
		873
		874	}
795		875
796	MODULE = IO::AIO PACKAGE = IO::AIO	876	MODULE = IO::AIO PACKAGE = IO::AIO
797		877
798	PROTOTYPES: ENABLE	878	PROTOTYPES: ENABLE
799		879
…		…
917	};	997	};
918		998
919	aio_stash = gv_stashpv ("IO::AIO" , 1);	999	aio_stash = gv_stashpv ("IO::AIO" , 1);
920	aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);	1000	aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
921	aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);	1001	aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
		1002	aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
922		1003
923	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)	1004	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));	1005	newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
925		1006
926	newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));	1007	newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
…		…
973	PROTOTYPE: $	1054	PROTOTYPE: $
974	CODE:	1055	CODE:
975	max_outstanding = maxreqs;	1056	max_outstanding = maxreqs;
976		1057
977	void	1058	void
		1059	aio_wd (SV8 pathname, SV callback=&PL_sv_undef)
		1060	PPCODE:
		1061	{
		1062	dREQ;
		1063
		1064	req->type = EIO_WD_OPEN;
		1065	req_set_path1 (req, pathname);
		1066
		1067	REQ_SEND;
		1068	}
		1069
		1070	void
978	aio_open (SV8 pathname, int flags, int mode, SV callback=&PL_sv_undef)	1071	aio_open (SV8 pathname, int flags, int mode, SV callback=&PL_sv_undef)
979	PPCODE:	1072	PPCODE:
980	{	1073	{
981	dREQ;	1074	dREQ;
982		1075
983	req->type = EIO_OPEN;	1076	req->type = EIO_OPEN;
984	req->sv1 = newSVsv (pathname);	1077	req_set_path1 (req, pathname);
985	req->ptr1 = SvPVbyte_nolen (req->sv1);
986	req->int1 = flags;	1078	req->int1 = flags;
987	req->int2 = mode;	1079	req->int2 = mode;
988		1080
989	REQ_SEND;	1081	REQ_SEND;
990	}	1082	}
…		…
1127	REQ_SEND;	1219	REQ_SEND;
1128	}	1220	}
1129	}	1221	}
1130		1222
1131	void	1223	void
1132	aio_readlink (SV8 path, SV callback=&PL_sv_undef)	1224	aio_readlink (SV8 pathname, SV callback=&PL_sv_undef)
1133	ALIAS:	1225	ALIAS:
1134	aio_readlink = EIO_READLINK	1226	aio_readlink = EIO_READLINK
1135	aio_realpath = EIO_REALPATH	1227	aio_realpath = EIO_REALPATH
1136	PPCODE:	1228	PPCODE:
1137	{	1229	{
1138	dREQ;	1230	dREQ;
1139		1231
1140	req->type = ix;	1232	req->type = ix;
1141	req->sv1 = newSVsv (path);	1233	req_set_path1 (req, pathname);
1142	req->ptr1 = SvPVbyte_nolen (req->sv1);
1143		1234
1144	REQ_SEND;	1235	REQ_SEND;
1145	}	1236	}
1146		1237
1147	void	1238	void
…		…
1188	PPCODE:	1279	PPCODE:
1189	{	1280	{
1190	dREQ;	1281	dREQ;
1191		1282
1192	req->sv1 = newSVsv (fh_or_path);	1283	req->sv1 = newSVsv (fh_or_path);
1193		1284	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;	1285	REQ_SEND;
1206	}	1286	}
1207		1287
1208	UV	1288	UV
1209	major (UV dev)	1289	major (UV dev)
…		…
1227	{	1307	{
1228	dREQ;	1308	dREQ;
1229		1309
1230	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;	1310	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1231	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;	1311	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1232	req->sv1 = newSVsv (fh_or_path);	1312	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		1313
1245	REQ_SEND;	1314	REQ_SEND;
1246	}	1315	}
1247		1316
1248	void	1317	void
1249	aio_truncate (SV8 fh_or_path, SV offset, SV *callback=&PL_sv_undef)	1318	aio_truncate (SV8 fh_or_path, SV offset, SV *callback=&PL_sv_undef)
1250	PPCODE:	1319	PPCODE:
1251	{	1320	{
1252	dREQ;	1321	dREQ;
1253		1322
1254	req->sv1 = newSVsv (fh_or_path);
1255	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;	1323	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1256		1324	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		1325
1268	REQ_SEND;	1326	REQ_SEND;
1269	}	1327	}
1270		1328
1271	void	1329	void
…		…
1276	PPCODE:	1334	PPCODE:
1277	{	1335	{
1278	dREQ;	1336	dREQ;
1279		1337
1280	req->int2 = mode;	1338	req->int2 = mode;
1281	req->sv1 = newSVsv (fh_or_path);	1339	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		1340
1294	REQ_SEND;	1341	REQ_SEND;
1295	}	1342	}
1296		1343
1297	void	1344	void
…		…
1300	{	1347	{
1301	dREQ;	1348	dREQ;
1302		1349
1303	req->int2 = SvOK (uid) ? SvIV (uid) : -1;	1350	req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1304	req->int3 = SvOK (gid) ? SvIV (gid) : -1;	1351	req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1305	req->sv1 = newSVsv (fh_or_path);	1352	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		1353
1318	REQ_SEND;	1354	REQ_SEND;
1319	}	1355	}
1320		1356
1321	void	1357	void
…		…
1344	PPCODE:	1380	PPCODE:
1345	{	1381	{
1346	dREQ;	1382	dREQ;
1347		1383
1348	req->type = ix;	1384	req->type = ix;
1349	req->sv1 = newSVsv (pathname);	1385	req_set_path1 (req, pathname);
1350	req->ptr1 = SvPVbyte_nolen (req->sv1);
1351		1386
1352	REQ_SEND;	1387	REQ_SEND;
1353	}	1388	}
1354		1389
1355	void	1390	void
…		…
1359	aio_symlink = EIO_SYMLINK	1394	aio_symlink = EIO_SYMLINK
1360	aio_rename = EIO_RENAME	1395	aio_rename = EIO_RENAME
1361	PPCODE:	1396	PPCODE:
1362	{	1397	{
1363	dREQ;	1398	dREQ;
		1399	eio_wd wd2;
1364		1400
1365	req->type = ix;	1401	req->type = ix;
1366	req->sv1 = newSVsv (oldpath);	1402	req_set_path1 (req, oldpath);
1367	req->ptr1 = SvPVbyte_nolen (req->sv1);	1403	req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1368	req->sv2 = newSVsv (newpath);	1404	req->int3 = (long)wd2;
1369	req->ptr2 = SvPVbyte_nolen (req->sv2);
1370		1405
1371	REQ_SEND;	1406	REQ_SEND;
1372	}	1407	}
1373		1408
1374	void	1409	void
…		…
1376	PPCODE:	1411	PPCODE:
1377	{	1412	{
1378	dREQ;	1413	dREQ;
1379		1414
1380	req->type = EIO_MKNOD;	1415	req->type = EIO_MKNOD;
1381	req->sv1 = newSVsv (pathname);
1382	req->ptr1 = SvPVbyte_nolen (req->sv1);
1383	req->int2 = (mode_t)mode;	1416	req->int2 = (mode_t)mode;
1384	req->offs = dev;	1417	req->offs = dev;
		1418	req_set_path1 (req, pathname);
1385		1419
1386	REQ_SEND;	1420	REQ_SEND;
1387	}	1421	}
1388		1422
1389	void	1423	void
…		…
1711	SvREFCNT_dec (on_next_submit);	1745	SvREFCNT_dec (on_next_submit);
1712	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1746	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1713		1747
1714	PROTOTYPES: DISABLE	1748	PROTOTYPES: DISABLE
1715		1749
		1750	MODULE = IO::AIO PACKAGE = IO::AIO::WD
		1751
		1752	BOOT:
		1753	{
		1754	newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
		1755	newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
		1756	}
		1757
		1758	void
		1759	DESTROY (SV *self)
		1760	CODE:
		1761	{
		1762	aio_wd wd = SvAIO_WD (self);
		1763	#if HAVE_AT
		1764	SV *callback = &PL_sv_undef;
		1765	dREQ; /* clobbers next_pri :/ */
		1766	req->type = EIO_WD_CLOSE;
		1767	req->wd = wd;
		1768	REQ_SEND;
		1769	#else
		1770	eio_wd_close_sync (wd);
		1771	#endif
		1772	}
		1773
1716	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1774	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1717		1775
1718	void	1776	void
1719	cancel (aio_req_ornot req)	1777	cancel (aio_req_ornot req)
1720	CODE:	1778	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.196 by root, Tue Sep 27 00:41:51 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.196 by root, Tue Sep 27 00:41:51 2011 UTC