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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.192 by root, Sun Jul 24 03:32:52 2011 UTC vs.
Revision 1.200 by root, Thu Sep 29 09:51:24 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	}
…		…
1129	REQ_SEND;	1221	REQ_SEND;
1130	}	1222	}
1131	}	1223	}
1132		1224
1133	void	1225	void
1134	aio_readlink (SV8 path, SV callback=&PL_sv_undef)	1226	aio_readlink (SV8 pathname, SV callback=&PL_sv_undef)
1135	ALIAS:	1227	ALIAS:
1136	aio_readlink = EIO_READLINK	1228	aio_readlink = EIO_READLINK
1137	aio_realpath = EIO_REALPATH	1229	aio_realpath = EIO_REALPATH
1138	PPCODE:	1230	PPCODE:
1139	{	1231	{
1140	dREQ;	1232	dREQ;
1141		1233
1142	req->type = ix;	1234	req->type = ix;
1143	req->sv1 = newSVsv (path);	1235	req_set_path1 (req, pathname);
1144	req->ptr1 = SvPVbyte_nolen (req->sv1);
1145		1236
1146	REQ_SEND;	1237	REQ_SEND;
1147	}	1238	}
1148		1239
1149	void	1240	void
…		…
1190	PPCODE:	1281	PPCODE:
1191	{	1282	{
1192	dREQ;	1283	dREQ;
1193		1284
1194	req->sv1 = newSVsv (fh_or_path);	1285	req->sv1 = newSVsv (fh_or_path);
1195		1286	req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1196	if (SvPOK (req->sv1))
1197	{
1198	req->type = ix;
1199	req->ptr1 = SvPVbyte_nolen (req->sv1);
1200	}
1201	else
1202	{
1203	req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1204	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1205	}
1206
1207	REQ_SEND;	1287	REQ_SEND;
1208	}	1288	}
1209		1289
1210	UV	1290	UV
1211	major (UV dev)	1291	major (UV dev)
…		…
1229	{	1309	{
1230	dREQ;	1310	dREQ;
1231		1311
1232	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;	1312	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1233	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;	1313	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1234	req->sv1 = newSVsv (fh_or_path);	1314	req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1235
1236	if (SvPOK (req->sv1))
1237	{
1238	req->type = EIO_UTIME;
1239	req->ptr1 = SvPVbyte_nolen (req->sv1);
1240	}
1241	else
1242	{
1243	req->type = EIO_FUTIME;
1244	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1245	}
1246		1315
1247	REQ_SEND;	1316	REQ_SEND;
1248	}	1317	}
1249		1318
1250	void	1319	void
1251	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)
1252	PPCODE:	1321	PPCODE:
1253	{	1322	{
1254	dREQ;	1323	dREQ;
1255		1324
1256	req->sv1 = newSVsv (fh_or_path);
1257	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;	1325	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1258		1326	req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1259	if (SvPOK (req->sv1))
1260	{
1261	req->type = EIO_TRUNCATE;
1262	req->ptr1 = SvPVbyte_nolen (req->sv1);
1263	}
1264	else
1265	{
1266	req->type = EIO_FTRUNCATE;
1267	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1268	}
1269		1327
1270	REQ_SEND;	1328	REQ_SEND;
1271	}	1329	}
1272		1330
1273	void	1331	void
1274	aio_chmod (SV8 fh_or_path, int mode, SV callback=&PL_sv_undef)	1332	aio_chmod (SV8 fh_or_path, int mode, SV callback=&PL_sv_undef)
1275	ALIAS:
1276	aio_chmod = EIO_CHMOD
1277	aio_mkdir = EIO_MKDIR
1278	PPCODE:	1333	PPCODE:
1279	{	1334	{
1280	dREQ;	1335	dREQ;
1281		1336
1282	req->int2 = mode;	1337	req->int2 = mode;
1283	req->sv1 = newSVsv (fh_or_path);	1338	req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1284
1285	if (SvPOK (req->sv1))
1286	{
1287	req->type = ix;
1288	req->ptr1 = SvPVbyte_nolen (req->sv1);
1289	}
1290	else
1291	{
1292	req->type = EIO_FCHMOD;
1293	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1294	}
1295		1339
1296	REQ_SEND;	1340	REQ_SEND;
1297	}	1341	}
1298		1342
1299	void	1343	void
…		…
1302	{	1346	{
1303	dREQ;	1347	dREQ;
1304		1348
1305	req->int2 = SvOK (uid) ? SvIV (uid) : -1;	1349	req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1306	req->int3 = SvOK (gid) ? SvIV (gid) : -1;	1350	req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1307	req->sv1 = newSVsv (fh_or_path);	1351	req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1308
1309	if (SvPOK (req->sv1))
1310	{
1311	req->type = EIO_CHOWN;
1312	req->ptr1 = SvPVbyte_nolen (req->sv1);
1313	}
1314	else
1315	{
1316	req->type = EIO_FCHOWN;
1317	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1318	}
1319		1352
1320	REQ_SEND;	1353	REQ_SEND;
1321	}	1354	}
1322		1355
1323	void	1356	void
…		…
1325	PPCODE:	1358	PPCODE:
1326	{	1359	{
1327	dREQ;	1360	dREQ;
1328		1361
1329	req->type = EIO_READDIR;	1362	req->type = EIO_READDIR;
1330	req->sv1 = newSVsv (pathname);
1331	req->ptr1 = SvPVbyte_nolen (req->sv1);
1332	req->int1 = flags \| EIO_READDIR_DENTS \| EIO_READDIR_CUSTOM1;	1363	req->int1 = flags \| EIO_READDIR_DENTS \| EIO_READDIR_CUSTOM1;
1333		1364
1334	if (flags & EIO_READDIR_DENTS)	1365	if (flags & EIO_READDIR_DENTS)
1335	req->int1 \|= EIO_READDIR_CUSTOM2;	1366	req->int1 \|= EIO_READDIR_CUSTOM2;
1336		1367
		1368	req_set_path1 (req, pathname);
		1369
1337	REQ_SEND;	1370	REQ_SEND;
		1371	}
		1372
		1373	void
		1374	aio_mkdir (SV8 pathname, int mode, SV callback=&PL_sv_undef)
		1375	PPCODE:
		1376	{
		1377	dREQ;
		1378
		1379	req->type = EIO_MKDIR;
		1380	req->int2 = mode;
		1381	req_set_path1 (req, pathname);
		1382
		1383	REQ_SEND;
1338	}	1384	}
1339		1385
1340	void	1386	void
1341	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)	1387	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)
1342	ALIAS:	1388	ALIAS:
…		…
1346	PPCODE:	1392	PPCODE:
1347	{	1393	{
1348	dREQ;	1394	dREQ;
1349		1395
1350	req->type = ix;	1396	req->type = ix;
1351	req->sv1 = newSVsv (pathname);	1397	req_set_path1 (req, pathname);
1352	req->ptr1 = SvPVbyte_nolen (req->sv1);
1353		1398
1354	REQ_SEND;	1399	REQ_SEND;
1355	}	1400	}
1356		1401
1357	void	1402	void
…		…
1361	aio_symlink = EIO_SYMLINK	1406	aio_symlink = EIO_SYMLINK
1362	aio_rename = EIO_RENAME	1407	aio_rename = EIO_RENAME
1363	PPCODE:	1408	PPCODE:
1364	{	1409	{
1365	dREQ;	1410	dREQ;
		1411	eio_wd wd2 = 0;
1366		1412
1367	req->type = ix;	1413	req->type = ix;
1368	req->sv1 = newSVsv (oldpath);	1414	req_set_path1 (req, oldpath);
1369	req->ptr1 = SvPVbyte_nolen (req->sv1);	1415	req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1370	req->sv2 = newSVsv (newpath);	1416	req->int3 = (long)wd2;
1371	req->ptr2 = SvPVbyte_nolen (req->sv2);
1372		1417
1373	REQ_SEND;	1418	REQ_SEND;
1374	}	1419	}
1375		1420
1376	void	1421	void
…		…
1378	PPCODE:	1423	PPCODE:
1379	{	1424	{
1380	dREQ;	1425	dREQ;
1381		1426
1382	req->type = EIO_MKNOD;	1427	req->type = EIO_MKNOD;
1383	req->sv1 = newSVsv (pathname);
1384	req->ptr1 = SvPVbyte_nolen (req->sv1);
1385	req->int2 = (mode_t)mode;	1428	req->int2 = (mode_t)mode;
1386	req->offs = dev;	1429	req->offs = dev;
		1430	req_set_path1 (req, pathname);
1387		1431
1388	REQ_SEND;	1432	REQ_SEND;
1389	}	1433	}
1390		1434
1391	void	1435	void
…		…
1713	SvREFCNT_dec (on_next_submit);	1757	SvREFCNT_dec (on_next_submit);
1714	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1758	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1715		1759
1716	PROTOTYPES: DISABLE	1760	PROTOTYPES: DISABLE
1717		1761
		1762	MODULE = IO::AIO PACKAGE = IO::AIO::WD
		1763
		1764	BOOT:
		1765	{
		1766	newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
		1767	newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
		1768	}
		1769
		1770	void
		1771	DESTROY (SV *self)
		1772	CODE:
		1773	{
		1774	aio_wd wd = SvAIO_WD (self);
		1775	#if HAVE_AT
		1776	SV *callback = &PL_sv_undef;
		1777	dREQ; /* clobbers next_pri :/ */
		1778	req->type = EIO_WD_CLOSE;
		1779	req->wd = wd;
		1780	REQ_SEND;
		1781	#else
		1782	eio_wd_close_sync (wd);
		1783	#endif
		1784	}
		1785
1718	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1786	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1719		1787
1720	void	1788	void
1721	cancel (aio_req_ornot req)	1789	cancel (aio_req_ornot req)
1722	CODE:	1790	CODE:

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.192 by root, Sun Jul 24 03:32:52 2011 UTC vs. Revision 1.200 by root, Thu Sep 29 09:51:24 2011 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.192 by root, Sun Jul 24 03:32:52 2011 UTC vs.
Revision 1.200 by root, Thu Sep 29 09:51:24 2011 UTC