[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.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
…		…
710	poll_wait ();	734	poll_wait ();
711	}	735	}
712	}	736	}
713		737
714	static void ecb_cold	738	static void ecb_cold
715	atfork_child (void)	739	reinit (void)
716	{	740	{
717	create_respipe ();	741	create_respipe ();
718		742
719	if (eio_init (want_poll, done_poll) < 0)	743	if (eio_init (want_poll, done_poll) < 0)
720	croak ("IO::AIO: unable to initialise eio library");	744	croak ("IO::AIO: unable to initialise eio library");
…		…
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; )	1004	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));	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));
927		1008
928	X_THREAD_ATFORK (0, 0, atfork_child);	1009	reinit ();
929	atfork_child (); /* calls create_respipe and eio_init */
930	}	1010	}
		1011
		1012	void
		1013	reinit ()
		1014	PROTOTYPE:
931		1015
932	void	1016	void
933	max_poll_reqs (unsigned int nreqs)	1017	max_poll_reqs (unsigned int nreqs)
934	PROTOTYPE: $	1018	PROTOTYPE: $
935	CODE:	1019	CODE:
…		…
970	PROTOTYPE: $	1054	PROTOTYPE: $
971	CODE:	1055	CODE:
972	max_outstanding = maxreqs;	1056	max_outstanding = maxreqs;
973		1057
974	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
975	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)
976	PPCODE:	1072	PPCODE:
977	{	1073	{
978	dREQ;	1074	dREQ;
979		1075
980	req->type = EIO_OPEN;	1076	req->type = EIO_OPEN;
981	req->sv1 = newSVsv (pathname);	1077	req_set_path1 (req, pathname);
982	req->ptr1 = SvPVbyte_nolen (req->sv1);
983	req->int1 = flags;	1078	req->int1 = flags;
984	req->int2 = mode;	1079	req->int2 = mode;
985		1080
986	REQ_SEND;	1081	REQ_SEND;
987	}	1082	}
…		…
989	void	1084	void
990	aio_fsync (SV fh, SV callback=&PL_sv_undef)	1085	aio_fsync (SV fh, SV callback=&PL_sv_undef)
991	ALIAS:	1086	ALIAS:
992	aio_fsync = EIO_FSYNC	1087	aio_fsync = EIO_FSYNC
993	aio_fdatasync = EIO_FDATASYNC	1088	aio_fdatasync = EIO_FDATASYNC
		1089	aio_syncfs = EIO_SYNCFS
994	PPCODE:	1090	PPCODE:
995	{	1091	{
996	int fd = s_fileno_croak (fh, 0);	1092	int fd = s_fileno_croak (fh, 0);
997	dREQ;	1093	dREQ;
998		1094
…		…
1123	REQ_SEND;	1219	REQ_SEND;
1124	}	1220	}
1125	}	1221	}
1126		1222
1127	void	1223	void
1128	aio_readlink (SV8 path, SV callback=&PL_sv_undef)	1224	aio_readlink (SV8 pathname, SV callback=&PL_sv_undef)
1129	ALIAS:	1225	ALIAS:
1130	aio_readlink = EIO_READLINK	1226	aio_readlink = EIO_READLINK
1131	aio_realpath = EIO_REALPATH	1227	aio_realpath = EIO_REALPATH
1132	PPCODE:	1228	PPCODE:
1133	{	1229	{
1134	dREQ;	1230	dREQ;
1135		1231
1136	req->type = ix;	1232	req->type = ix;
1137	req->sv1 = newSVsv (path);	1233	req_set_path1 (req, pathname);
1138	req->ptr1 = SvPVbyte_nolen (req->sv1);
1139		1234
1140	REQ_SEND;	1235	REQ_SEND;
1141	}	1236	}
1142		1237
1143	void	1238	void
…		…
1184	PPCODE:	1279	PPCODE:
1185	{	1280	{
1186	dREQ;	1281	dREQ;
1187		1282
1188	req->sv1 = newSVsv (fh_or_path);	1283	req->sv1 = newSVsv (fh_or_path);
1189		1284	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;	1285	REQ_SEND;
1202	}	1286	}
1203		1287
1204	UV	1288	UV
1205	major (UV dev)	1289	major (UV dev)
…		…
1223	{	1307	{
1224	dREQ;	1308	dREQ;
1225		1309
1226	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;	1310	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1227	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;	1311	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1228	req->sv1 = newSVsv (fh_or_path);	1312	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		1313
1241	REQ_SEND;	1314	REQ_SEND;
1242	}	1315	}
1243		1316
1244	void	1317	void
1245	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)
1246	PPCODE:	1319	PPCODE:
1247	{	1320	{
1248	dREQ;	1321	dREQ;
1249		1322
1250	req->sv1 = newSVsv (fh_or_path);
1251	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;	1323	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1252		1324	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		1325
1264	REQ_SEND;	1326	REQ_SEND;
1265	}	1327	}
1266		1328
1267	void	1329	void
…		…
1272	PPCODE:	1334	PPCODE:
1273	{	1335	{
1274	dREQ;	1336	dREQ;
1275		1337
1276	req->int2 = mode;	1338	req->int2 = mode;
1277	req->sv1 = newSVsv (fh_or_path);	1339	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		1340
1290	REQ_SEND;	1341	REQ_SEND;
1291	}	1342	}
1292		1343
1293	void	1344	void
…		…
1296	{	1347	{
1297	dREQ;	1348	dREQ;
1298		1349
1299	req->int2 = SvOK (uid) ? SvIV (uid) : -1;	1350	req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1300	req->int3 = SvOK (gid) ? SvIV (gid) : -1;	1351	req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1301	req->sv1 = newSVsv (fh_or_path);	1352	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		1353
1314	REQ_SEND;	1354	REQ_SEND;
1315	}	1355	}
1316		1356
1317	void	1357	void
…		…
1340	PPCODE:	1380	PPCODE:
1341	{	1381	{
1342	dREQ;	1382	dREQ;
1343		1383
1344	req->type = ix;	1384	req->type = ix;
1345	req->sv1 = newSVsv (pathname);	1385	req_set_path1 (req, pathname);
1346	req->ptr1 = SvPVbyte_nolen (req->sv1);
1347		1386
1348	REQ_SEND;	1387	REQ_SEND;
1349	}	1388	}
1350		1389
1351	void	1390	void
…		…
1355	aio_symlink = EIO_SYMLINK	1394	aio_symlink = EIO_SYMLINK
1356	aio_rename = EIO_RENAME	1395	aio_rename = EIO_RENAME
1357	PPCODE:	1396	PPCODE:
1358	{	1397	{
1359	dREQ;	1398	dREQ;
		1399	eio_wd wd2;
1360		1400
1361	req->type = ix;	1401	req->type = ix;
1362	req->sv1 = newSVsv (oldpath);	1402	req_set_path1 (req, oldpath);
1363	req->ptr1 = SvPVbyte_nolen (req->sv1);	1403	req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1364	req->sv2 = newSVsv (newpath);	1404	req->int3 = (long)wd2;
1365	req->ptr2 = SvPVbyte_nolen (req->sv2);
1366		1405
1367	REQ_SEND;	1406	REQ_SEND;
1368	}	1407	}
1369		1408
1370	void	1409	void
…		…
1372	PPCODE:	1411	PPCODE:
1373	{	1412	{
1374	dREQ;	1413	dREQ;
1375		1414
1376	req->type = EIO_MKNOD;	1415	req->type = EIO_MKNOD;
1377	req->sv1 = newSVsv (pathname);
1378	req->ptr1 = SvPVbyte_nolen (req->sv1);
1379	req->int2 = (mode_t)mode;	1416	req->int2 = (mode_t)mode;
1380	req->offs = dev;	1417	req->offs = dev;
		1418	req_set_path1 (req, pathname);
1381		1419
1382	REQ_SEND;	1420	REQ_SEND;
1383	}	1421	}
1384		1422
1385	void	1423	void
…		…
1585	CODE:	1623	CODE:
1586	RETVAL = posix_fadvise (fh, offset, length, advice);	1624	RETVAL = posix_fadvise (fh, offset, length, advice);
1587	OUTPUT:	1625	OUTPUT:
1588	RETVAL	1626	RETVAL
1589		1627
1590	ssize_t	1628	IV
1591	sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)	1629	sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1592	CODE:	1630	CODE:
1593	RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);	1631	RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1594	OUTPUT:	1632	OUTPUT:
1595	RETVAL	1633	RETVAL
…		…
1707	SvREFCNT_dec (on_next_submit);	1745	SvREFCNT_dec (on_next_submit);
1708	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1746	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1709		1747
1710	PROTOTYPES: DISABLE	1748	PROTOTYPES: DISABLE
1711		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
1712	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1774	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1713		1775
1714	void	1776	void
1715	cancel (aio_req_ornot req)	1777	cancel (aio_req_ornot req)
1716	CODE:	1778	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.196 by root, Tue Sep 27 00:41:51 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.196 by root, Tue Sep 27 00:41:51 2011 UTC