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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.189 by root, Mon Jul 18 01:27:03 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
…		…
710	poll_wait ();	728	poll_wait ();
711	}	729	}
712	}	730	}
713		731
714	static void ecb_cold	732	static void ecb_cold
715	atfork_child (void)	733	reinit (void)
716	{	734	{
717	create_respipe ();	735	create_respipe ();
718		736
719	if (eio_init (want_poll, done_poll) < 0)	737	if (eio_init (want_poll, done_poll) < 0)
720	croak ("IO::AIO: unable to initialise eio library");	738	croak ("IO::AIO: unable to initialise eio library");
…		…
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; )	993	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));	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));
927		997
928	X_THREAD_ATFORK (0, 0, atfork_child);	998	reinit ();
929	atfork_child (); /* calls create_respipe and eio_init */
930	}	999	}
		1000
		1001	void
		1002	reinit ()
		1003	PROTOTYPE:
931		1004
932	void	1005	void
933	max_poll_reqs (unsigned int nreqs)	1006	max_poll_reqs (unsigned int nreqs)
934	PROTOTYPE: $	1007	PROTOTYPE: $
935	CODE:	1008	CODE:
…		…
970	PROTOTYPE: $	1043	PROTOTYPE: $
971	CODE:	1044	CODE:
972	max_outstanding = maxreqs;	1045	max_outstanding = maxreqs;
973		1046
974	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
975	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)
976	PPCODE:	1061	PPCODE:
977	{	1062	{
978	dREQ;	1063	dREQ;
979		1064
980	req->type = EIO_OPEN;	1065	req->type = EIO_OPEN;
981	req->sv1 = newSVsv (pathname);	1066	req_set_path1 (req, pathname);
982	req->ptr1 = SvPVbyte_nolen (req->sv1);
983	req->int1 = flags;	1067	req->int1 = flags;
984	req->int2 = mode;	1068	req->int2 = mode;
985		1069
986	REQ_SEND;	1070	REQ_SEND;
987	}	1071	}
…		…
989	void	1073	void
990	aio_fsync (SV fh, SV callback=&PL_sv_undef)	1074	aio_fsync (SV fh, SV callback=&PL_sv_undef)
991	ALIAS:	1075	ALIAS:
992	aio_fsync = EIO_FSYNC	1076	aio_fsync = EIO_FSYNC
993	aio_fdatasync = EIO_FDATASYNC	1077	aio_fdatasync = EIO_FDATASYNC
		1078	aio_syncfs = EIO_SYNCFS
994	PPCODE:	1079	PPCODE:
995	{	1080	{
996	int fd = s_fileno_croak (fh, 0);	1081	int fd = s_fileno_croak (fh, 0);
997	dREQ;	1082	dREQ;
998		1083
…		…
1123	REQ_SEND;	1208	REQ_SEND;
1124	}	1209	}
1125	}	1210	}
1126		1211
1127	void	1212	void
1128	aio_readlink (SV8 path, SV callback=&PL_sv_undef)	1213	aio_readlink (SV8 pathname, SV callback=&PL_sv_undef)
1129	ALIAS:	1214	ALIAS:
1130	aio_readlink = EIO_READLINK	1215	aio_readlink = EIO_READLINK
1131	aio_realpath = EIO_REALPATH	1216	aio_realpath = EIO_REALPATH
1132	PPCODE:	1217	PPCODE:
1133	{	1218	{
1134	dREQ;	1219	dREQ;
1135		1220
1136	req->type = ix;	1221	req->type = ix;
1137	req->sv1 = newSVsv (path);	1222	req_set_path1 (req, pathname);
1138	req->ptr1 = SvPVbyte_nolen (req->sv1);
1139		1223
1140	REQ_SEND;	1224	REQ_SEND;
1141	}	1225	}
1142		1226
1143	void	1227	void
…		…
1184	PPCODE:	1268	PPCODE:
1185	{	1269	{
1186	dREQ;	1270	dREQ;
1187		1271
1188	req->sv1 = newSVsv (fh_or_path);	1272	req->sv1 = newSVsv (fh_or_path);
1189		1273	req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1190	if (SvPOK (req->sv1))
1191	{
1192	req->type = ix;
1193	req->ptr1 = SvPVbyte_nolen (req->sv1);
1194	}
1195	else
1196	{
1197	req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1198	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1199	}
1200
1201	REQ_SEND;	1274	REQ_SEND;
1202	}	1275	}
1203		1276
1204	UV	1277	UV
1205	major (UV dev)	1278	major (UV dev)
…		…
1223	{	1296	{
1224	dREQ;	1297	dREQ;
1225		1298
1226	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;	1299	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1227	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;	1300	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1228	req->sv1 = newSVsv (fh_or_path);	1301	req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1229
1230	if (SvPOK (req->sv1))
1231	{
1232	req->type = EIO_UTIME;
1233	req->ptr1 = SvPVbyte_nolen (req->sv1);
1234	}
1235	else
1236	{
1237	req->type = EIO_FUTIME;
1238	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1239	}
1240		1302
1241	REQ_SEND;	1303	REQ_SEND;
1242	}	1304	}
1243		1305
1244	void	1306	void
1245	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)
1246	PPCODE:	1308	PPCODE:
1247	{	1309	{
1248	dREQ;	1310	dREQ;
1249		1311
1250	req->sv1 = newSVsv (fh_or_path);
1251	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;	1312	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1252		1313	req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1253	if (SvPOK (req->sv1))
1254	{
1255	req->type = EIO_TRUNCATE;
1256	req->ptr1 = SvPVbyte_nolen (req->sv1);
1257	}
1258	else
1259	{
1260	req->type = EIO_FTRUNCATE;
1261	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1262	}
1263		1314
1264	REQ_SEND;	1315	REQ_SEND;
1265	}	1316	}
1266		1317
1267	void	1318	void
…		…
1272	PPCODE:	1323	PPCODE:
1273	{	1324	{
1274	dREQ;	1325	dREQ;
1275		1326
1276	req->int2 = mode;	1327	req->int2 = mode;
1277	req->sv1 = newSVsv (fh_or_path);	1328	req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1278
1279	if (SvPOK (req->sv1))
1280	{
1281	req->type = ix;
1282	req->ptr1 = SvPVbyte_nolen (req->sv1);
1283	}
1284	else
1285	{
1286	req->type = EIO_FCHMOD;
1287	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1288	}
1289		1329
1290	REQ_SEND;	1330	REQ_SEND;
1291	}	1331	}
1292		1332
1293	void	1333	void
…		…
1296	{	1336	{
1297	dREQ;	1337	dREQ;
1298		1338
1299	req->int2 = SvOK (uid) ? SvIV (uid) : -1;	1339	req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1300	req->int3 = SvOK (gid) ? SvIV (gid) : -1;	1340	req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1301	req->sv1 = newSVsv (fh_or_path);	1341	req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1302
1303	if (SvPOK (req->sv1))
1304	{
1305	req->type = EIO_CHOWN;
1306	req->ptr1 = SvPVbyte_nolen (req->sv1);
1307	}
1308	else
1309	{
1310	req->type = EIO_FCHOWN;
1311	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1312	}
1313		1342
1314	REQ_SEND;	1343	REQ_SEND;
1315	}	1344	}
1316		1345
1317	void	1346	void
…		…
1340	PPCODE:	1369	PPCODE:
1341	{	1370	{
1342	dREQ;	1371	dREQ;
1343		1372
1344	req->type = ix;	1373	req->type = ix;
1345	req->sv1 = newSVsv (pathname);	1374	req_set_path1 (req, pathname);
1346	req->ptr1 = SvPVbyte_nolen (req->sv1);
1347		1375
1348	REQ_SEND;	1376	REQ_SEND;
1349	}	1377	}
1350		1378
1351	void	1379	void
…		…
1355	aio_symlink = EIO_SYMLINK	1383	aio_symlink = EIO_SYMLINK
1356	aio_rename = EIO_RENAME	1384	aio_rename = EIO_RENAME
1357	PPCODE:	1385	PPCODE:
1358	{	1386	{
1359	dREQ;	1387	dREQ;
		1388	eio_wd wd2;
1360		1389
1361	req->type = ix;	1390	req->type = ix;
1362	req->sv1 = newSVsv (oldpath);	1391	req_set_path1 (req, oldpath);
1363	req->ptr1 = SvPVbyte_nolen (req->sv1);	1392	req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1364	req->sv2 = newSVsv (newpath);	1393	req->int3 = (long)wd2;
1365	req->ptr2 = SvPVbyte_nolen (req->sv2);
1366		1394
1367	REQ_SEND;	1395	REQ_SEND;
1368	}	1396	}
1369		1397
1370	void	1398	void
…		…
1372	PPCODE:	1400	PPCODE:
1373	{	1401	{
1374	dREQ;	1402	dREQ;
1375		1403
1376	req->type = EIO_MKNOD;	1404	req->type = EIO_MKNOD;
1377	req->sv1 = newSVsv (pathname);
1378	req->ptr1 = SvPVbyte_nolen (req->sv1);
1379	req->int2 = (mode_t)mode;	1405	req->int2 = (mode_t)mode;
1380	req->offs = dev;	1406	req->offs = dev;
		1407	req_set_path1 (req, pathname);
1381		1408
1382	REQ_SEND;	1409	REQ_SEND;
1383	}	1410	}
1384		1411
1385	void	1412	void
…		…
1585	CODE:	1612	CODE:
1586	RETVAL = posix_fadvise (fh, offset, length, advice);	1613	RETVAL = posix_fadvise (fh, offset, length, advice);
1587	OUTPUT:	1614	OUTPUT:
1588	RETVAL	1615	RETVAL
1589		1616
1590	ssize_t	1617	IV
1591	sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)	1618	sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1592	CODE:	1619	CODE:
1593	RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);	1620	RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1594	OUTPUT:	1621	OUTPUT:
1595	RETVAL	1622	RETVAL
…		…
1707	SvREFCNT_dec (on_next_submit);	1734	SvREFCNT_dec (on_next_submit);
1708	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1735	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1709		1736
1710	PROTOTYPES: DISABLE	1737	PROTOTYPES: DISABLE
1711		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
1712	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1757	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1713		1758
1714	void	1759	void
1715	cancel (aio_req_ornot req)	1760	cancel (aio_req_ornot req)
1716	CODE:	1761	CODE:

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.189 by root, Mon Jul 18 01:27:03 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.189 by root, Mon Jul 18 01:27:03 2011 UTC vs.
Revision 1.195 by root, Mon Sep 26 20:19:08 2011 UTC