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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.171 by root, Wed Aug 4 17:16:19 2010 UTC vs.
Revision 1.173 by root, Mon Sep 13 01:59:05 2010 UTC

…		…
207	#ifndef ST_NODIRATIME	207	#ifndef ST_NODIRATIME
208	# define ST_NODIRATIME 0	208	# define ST_NODIRATIME 0
209	#endif	209	#endif
210	#ifndef ST_RELATIME	210	#ifndef ST_RELATIME
211	# define ST_RELATIME 0	211	# define ST_RELATIME 0
212	#endif
213
214	#ifndef MCL_CURRENT
215	# define MCL_CURRENT 0
216	#endif
217	#ifndef MCL_FUTURE
218	# define MCL_FUTURE 0
219	#endif	212	#endif
220		213
221	#ifndef MAP_ANONYMOUS	214	#ifndef MAP_ANONYMOUS
222	# ifdef MAP_ANON	215	# ifdef MAP_ANON
223	# define MAP_ANONYMOUS MAP_ANON	216	# define MAP_ANONYMOUS MAP_ANON
…		…
774	const_iv (MAP_LOCKED)	767	const_iv (MAP_LOCKED)
775	const_iv (MAP_NORESERVE)	768	const_iv (MAP_NORESERVE)
776	const_iv (MAP_POPULATE)	769	const_iv (MAP_POPULATE)
777	const_iv (MAP_NONBLOCK)	770	const_iv (MAP_NONBLOCK)
778		771
779	const_iv (MCL_FUTURE)	772	const_eio (MCL_FUTURE)
780	const_iv (MCL_CURRENT)	773	const_eio (MCL_CURRENT)
781		774
782	const_eio (MS_ASYNC)	775	const_eio (MS_ASYNC)
783	const_eio (MS_INVALIDATE)	776	const_eio (MS_INVALIDATE)
784	const_eio (MS_SYNC)	777	const_eio (MS_SYNC)
785		778
…		…
859	CODE:	852	CODE:
860	max_outstanding = maxreqs;	853	max_outstanding = maxreqs;
861		854
862	void	855	void
863	aio_open (SV8 pathname, int flags, int mode, SV callback=&PL_sv_undef)	856	aio_open (SV8 pathname, int flags, int mode, SV callback=&PL_sv_undef)
864	PROTOTYPE: $$$;$
865	PPCODE:	857	PPCODE:
866	{	858	{
867	dREQ;	859	dREQ;
868		860
869	req->type = EIO_OPEN;	861	req->type = EIO_OPEN;
…		…
875	REQ_SEND;	867	REQ_SEND;
876	}	868	}
877		869
878	void	870	void
879	aio_fsync (SV fh, SV callback=&PL_sv_undef)	871	aio_fsync (SV fh, SV callback=&PL_sv_undef)
880	PROTOTYPE: $;$
881	ALIAS:	872	ALIAS:
882	aio_fsync = EIO_FSYNC	873	aio_fsync = EIO_FSYNC
883	aio_fdatasync = EIO_FDATASYNC	874	aio_fdatasync = EIO_FDATASYNC
884	PPCODE:	875	PPCODE:
885	{	876	{
…		…
893	REQ_SEND (req);	884	REQ_SEND (req);
894	}	885	}
895		886
896	void	887	void
897	aio_sync_file_range (SV fh, off_t offset, size_t nbytes, UV flags, SV callback=&PL_sv_undef)	888	aio_sync_file_range (SV fh, off_t offset, size_t nbytes, UV flags, SV callback=&PL_sv_undef)
898	PROTOTYPE: $$$$;$
899	PPCODE:	889	PPCODE:
900	{	890	{
901	int fd = s_fileno_croak (fh, 0);	891	int fd = s_fileno_croak (fh, 0);
902	dREQ;	892	dREQ;
903		893
…		…
911	REQ_SEND (req);	901	REQ_SEND (req);
912	}	902	}
913		903
914	void	904	void
915	aio_close (SV fh, SV callback=&PL_sv_undef)	905	aio_close (SV fh, SV callback=&PL_sv_undef)
916	PROTOTYPE: $;$
917	PPCODE:	906	PPCODE:
918	{	907	{
919	static int close_pipe = -1; /* dummy fd to close fds via dup2 */	908	static int close_pipe = -1; /* dummy fd to close fds via dup2 */
920	int fd = s_fileno_croak (fh, 0);	909	int fd = s_fileno_croak (fh, 0);
921	dREQ;	910	dREQ;
…		…
943	void	932	void
944	aio_read (SV fh, SV offset, SV length, SV8 data, IV dataoffset, SV *callback=&PL_sv_undef)	933	aio_read (SV fh, SV offset, SV length, SV8 data, IV dataoffset, SV *callback=&PL_sv_undef)
945	ALIAS:	934	ALIAS:
946	aio_read = EIO_READ	935	aio_read = EIO_READ
947	aio_write = EIO_WRITE	936	aio_write = EIO_WRITE
948	PROTOTYPE: $$$$$;$
949	PPCODE:	937	PPCODE:
950	{	938	{
951	STRLEN svlen;	939	STRLEN svlen;
952	int fd = s_fileno_croak (fh, ix == EIO_WRITE);	940	int fd = s_fileno_croak (fh, ix == EIO_WRITE);
953	char *svptr = SvPVbyte (data, svlen);	941	char *svptr = SvPVbyte (data, svlen);
…		…
994	}	982	}
995	}	983	}
996		984
997	void	985	void
998	aio_readlink (SV8 path, SV callback=&PL_sv_undef)	986	aio_readlink (SV8 path, SV callback=&PL_sv_undef)
999	PROTOTYPE: $$;$
1000	PPCODE:	987	PPCODE:
1001	{	988	{
1002	SV *data;	989	SV *data;
1003	dREQ;	990	dREQ;
1004		991
…		…
1009	REQ_SEND;	996	REQ_SEND;
1010	}	997	}
1011		998
1012	void	999	void
1013	aio_sendfile (SV out_fh, SV in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)	1000	aio_sendfile (SV out_fh, SV in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
1014	PROTOTYPE: $$$$;$
1015	PPCODE:	1001	PPCODE:
1016	{	1002	{
1017	int ifd = s_fileno_croak (in_fh , 0);	1003	int ifd = s_fileno_croak (in_fh , 0);
1018	int ofd = s_fileno_croak (out_fh, 1);	1004	int ofd = s_fileno_croak (out_fh, 1);
1019	dREQ;	1005	dREQ;
…		…
1029	REQ_SEND;	1015	REQ_SEND;
1030	}	1016	}
1031		1017
1032	void	1018	void
1033	aio_readahead (SV fh, off_t offset, size_t length, SV callback=&PL_sv_undef)	1019	aio_readahead (SV fh, off_t offset, size_t length, SV callback=&PL_sv_undef)
1034	PROTOTYPE: $$$;$
1035	PPCODE:	1020	PPCODE:
1036	{	1021	{
1037	int fd = s_fileno_croak (fh, 0);	1022	int fd = s_fileno_croak (fh, 0);
1038	dREQ;	1023	dREQ;
1039		1024
…		…
1240	void	1225	void
1241	aio_mtouch (SV8 data, IV offset = 0, SV length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)	1226	aio_mtouch (SV8 data, IV offset = 0, SV length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1242	ALIAS:	1227	ALIAS:
1243	aio_mtouch = EIO_MTOUCH	1228	aio_mtouch = EIO_MTOUCH
1244	aio_msync = EIO_MSYNC	1229	aio_msync = EIO_MSYNC
1245	PROTOTYPE: $$$$;$
1246	PPCODE:	1230	PPCODE:
1247	{	1231	{
1248	STRLEN svlen;	1232	STRLEN svlen;
		1233	char *svptr = SvPVbyte (data, svlen);
1249	UV len = SvUV (length);	1234	UV len = SvUV (length);
1250	char *svptr = SvPVbyte (data, svlen);
1251		1235
1252	if (offset < 0)	1236	if (offset < 0)
1253	offset += svlen;	1237	offset += svlen;
1254		1238
1255	if (offset < 0 \|\| offset > svlen)	1239	if (offset < 0 \|\| offset > svlen)
…		…
1260		1244
1261	{	1245	{
1262	dREQ;	1246	dREQ;
1263		1247
1264	req->type = ix;	1248	req->type = ix;
1265	req->size = len;
1266	req->sv2 = SvREFCNT_inc (data);	1249	req->sv2 = SvREFCNT_inc (data);
1267	req->ptr2 = (char *)svptr + offset;	1250	req->ptr2 = (char *)svptr + offset;
		1251	req->size = len;
1268	req->int1 = flags;	1252	req->int1 = flags;
1269		1253
1270	REQ_SEND;	1254	REQ_SEND;
1271	}	1255	}
1272	}	1256	}
1273		1257
1274	void	1258	void
		1259	aio_mlock (SV8 data, IV offset = 0, SV length = &PL_sv_undef, SV *callback=&PL_sv_undef)
		1260	PPCODE:
		1261	{
		1262	STRLEN svlen;
		1263	char *svptr = SvPVbyte (data, svlen);
		1264	UV len = SvUV (length);
		1265
		1266	if (offset < 0)
		1267	offset += svlen;
		1268
		1269	if (offset < 0 \|\| offset > svlen)
		1270	croak ("offset outside of scalar");
		1271
		1272	if (!SvOK (length) \|\| len + offset > svlen)
		1273	len = svlen - offset;
		1274
		1275	{
		1276	dREQ;
		1277
		1278	req->type = EIO_MLOCK;
		1279	req->sv2 = SvREFCNT_inc (data);
		1280	req->ptr2 = (char *)svptr + offset;
		1281	req->size = len;
		1282
		1283	REQ_SEND;
		1284	}
		1285	}
		1286
		1287	void
		1288	aio_mlockall (IV flags, SV *callback=&PL_sv_undef)
		1289	PPCODE:
		1290	{
		1291	dREQ;
		1292
		1293	req->type = EIO_MLOCKALL;
		1294	req->int1 = flags;
		1295
		1296	REQ_SEND;
		1297	}
		1298
		1299	void
1275	aio_busy (double delay, SV *callback=&PL_sv_undef)	1300	aio_busy (double delay, SV *callback=&PL_sv_undef)
1276	PPCODE:	1301	PPCODE:
1277	{	1302	{
1278	dREQ;	1303	dREQ;
1279		1304
…		…
1283	REQ_SEND;	1308	REQ_SEND;
1284	}	1309	}
1285		1310
1286	void	1311	void
1287	aio_group (SV *callback=&PL_sv_undef)	1312	aio_group (SV *callback=&PL_sv_undef)
1288	PROTOTYPE: ;$
1289	PPCODE:	1313	PPCODE:
1290	{	1314	{
1291	dREQ;	1315	dREQ;
1292		1316
1293	req->type = EIO_GROUP;	1317	req->type = EIO_GROUP;
…		…
1310	REQ_SEND;	1334	REQ_SEND;
1311	}	1335	}
1312		1336
1313	int	1337	int
1314	aioreq_pri (int pri = 0)	1338	aioreq_pri (int pri = 0)
1315	PROTOTYPE: ;$
1316	CODE:	1339	CODE:
1317	RETVAL = next_pri;	1340	RETVAL = next_pri;
1318	if (items > 0)	1341	if (items > 0)
1319	{	1342	{
1320	if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;	1343	if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
…		…
1332	if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;	1355	if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
1333	next_pri = nice;	1356	next_pri = nice;
1334		1357
1335	void	1358	void
1336	flush ()	1359	flush ()
1337	PROTOTYPE:
1338	CODE:	1360	CODE:
1339	while (eio_nreqs ())	1361	while (eio_nreqs ())
1340	{	1362	{
1341	poll_wait ();	1363	poll_wait ();
1342	poll_cb ();	1364	poll_cb ();
1343	}	1365	}
1344		1366
1345	int	1367	int
1346	poll()	1368	poll ()
1347	PROTOTYPE:
1348	CODE:	1369	CODE:
1349	poll_wait ();	1370	poll_wait ();
1350	RETVAL = poll_cb ();	1371	RETVAL = poll_cb ();
1351	OUTPUT:	1372	OUTPUT:
1352	RETVAL	1373	RETVAL
1353		1374
1354	int	1375	int
1355	poll_fileno()	1376	poll_fileno ()
1356	PROTOTYPE:
1357	CODE:	1377	CODE:
1358	RETVAL = s_epipe_fd (&respipe);	1378	RETVAL = s_epipe_fd (&respipe);
1359	OUTPUT:	1379	OUTPUT:
1360	RETVAL	1380	RETVAL
1361		1381
1362	int	1382	int
1363	poll_cb(...)	1383	poll_cb (...)
1364	PROTOTYPE:	1384	PROTOTYPE:
1365	CODE:	1385	CODE:
1366	RETVAL = poll_cb ();	1386	RETVAL = poll_cb ();
1367	OUTPUT:	1387	OUTPUT:
1368	RETVAL	1388	RETVAL
1369		1389
1370	void	1390	void
1371	poll_wait()	1391	poll_wait ()
1372	PROTOTYPE:
1373	CODE:	1392	CODE:
1374	poll_wait ();	1393	poll_wait ();
1375		1394
1376	int	1395	int
1377	nreqs()	1396	nreqs ()
1378	PROTOTYPE:
1379	CODE:	1397	CODE:
1380	RETVAL = eio_nreqs ();	1398	RETVAL = eio_nreqs ();
1381	OUTPUT:	1399	OUTPUT:
1382	RETVAL	1400	RETVAL
1383		1401
1384	int	1402	int
1385	nready()	1403	nready ()
1386	PROTOTYPE:
1387	CODE:	1404	CODE:
1388	RETVAL = eio_nready ();	1405	RETVAL = eio_nready ();
1389	OUTPUT:	1406	OUTPUT:
1390	RETVAL	1407	RETVAL
1391		1408
1392	int	1409	int
1393	npending()	1410	npending ()
1394	PROTOTYPE:
1395	CODE:	1411	CODE:
1396	RETVAL = eio_npending ();	1412	RETVAL = eio_npending ();
1397	OUTPUT:	1413	OUTPUT:
1398	RETVAL	1414	RETVAL
1399		1415
1400	int	1416	int
1401	nthreads()	1417	nthreads ()
1402	PROTOTYPE:
1403	CODE:	1418	CODE:
1404	RETVAL = eio_nthreads ();	1419	RETVAL = eio_nthreads ();
1405	OUTPUT:	1420	OUTPUT:
1406	RETVAL	1421	RETVAL
1407		1422
1408	int	1423	int
1409	fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)	1424	fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1410	PROTOTYPE: $$$$
1411	CODE:	1425	CODE:
1412	RETVAL = posix_fadvise (fh, offset, length, advice);	1426	RETVAL = posix_fadvise (fh, offset, length, advice);
1413	OUTPUT:	1427	OUTPUT:
1414	RETVAL	1428	RETVAL
1415		1429
1416	ssize_t	1430	ssize_t
1417	sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)	1431	sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1418	PROTOTYPE: $$$$
1419	CODE:	1432	CODE:
1420	RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);	1433	RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1421	OUTPUT:	1434	OUTPUT:
1422	RETVAL	1435	RETVAL
1423		1436
1424	void	1437	void
1425	mmap (SV scalar, size_t length, int prot, int flags, SV fh, off_t offset = 0)	1438	mmap (SV scalar, size_t length, int prot, int flags, SV fh, off_t offset = 0)
1426	PROTOTYPE: $$$$$;$
1427	PPCODE:	1439	PPCODE:
1428	sv_unmagic (scalar, MMAP_MAGIC);	1440	sv_unmagic (scalar, MMAP_MAGIC);
1429	{	1441	{
1430	int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;	1442	int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1431	void addr = (void )mmap (0, length, prot, flags, fd, offset);	1443	void addr = (void )mmap (0, length, prot, flags, fd, offset);
…		…
1454	XSRETURN_YES;	1466	XSRETURN_YES;
1455	}	1467	}
1456		1468
1457	void	1469	void
1458	munmap (SV *scalar)	1470	munmap (SV *scalar)
1459	PROTOTYPE: $
1460	CODE:	1471	CODE:
1461	sv_unmagic (scalar, MMAP_MAGIC);	1472	sv_unmagic (scalar, MMAP_MAGIC);
1462		1473
1463	int	1474	int
1464	madvise (SV *scalar, off_t offset, off_t length, IV advice_or_prot)	1475	madvise (SV scalar, off_t offset = 0, SV length = &PL_sv_undef, IV advice_or_prot)
1465	ALIAS:	1476	ALIAS:
1466	mprotect = 1	1477	mprotect = 1
1467	PROTOTYPE: $$$$
1468	CODE:	1478	CODE:
1469	{	1479	{
1470	STRLEN cur;	1480	STRLEN svlen;
1471	char *addr = SvPVbyte (scalar, cur);	1481	void *addr = SvPVbyte (scalar, svlen);
		1482	size_t len = SvUV (length);
1472		1483
1473	if (offset > cur)	1484	if (offset < 0)
1474	RETVAL = errno = EFAULT;	1485	offset += svlen;
1475	else	1486
		1487	if (offset < 0 \|\| offset > svlen)
		1488	croak ("offset outside of scalar");
		1489
		1490	if (!SvOK (length) \|\| len + offset > svlen)
		1491	len = svlen - offset;
		1492
		1493	addr = (void *)(((intptr_t)addr) + offset);
		1494	eio_page_align (&addr, &len);
		1495
		1496	switch (ix)
1476	{	1497	{
1477	if (!SvOK (ST (2)))
1478	length = cur - offset;
1479
1480	if (offset + length > cur)
1481	RETVAL = errno = EFAULT;
1482	else
1483	switch (ix)
1484	{
1485	case 0: RETVAL = posix_madvise (addr + offset, length, advice_or_prot); break;	1498	case 0: RETVAL = posix_madvise (addr, len, advice_or_prot); break;
1486	case 1: RETVAL = mprotect (addr + offset, length, advice_or_prot); break;	1499	case 1: RETVAL = mprotect (addr, len, advice_or_prot); break;
1487	}
1488	}	1500	}
1489	}	1501	}
1490	OUTPUT:	1502	OUTPUT:
1491	RETVAL	1503	RETVAL
1492		1504
1493	int	1505	int
1494	mlockall (int flags)	1506	munlock (SV scalar, off_t offset = 0, SV length = &PL_sv_undef)
1495	PROTOTYPE: $
1496	CODE:	1507	CODE:
		1508	{
		1509	STRLEN svlen;
		1510	void *addr = SvPVbyte (scalar, svlen);
		1511	size_t len = SvUV (length);
		1512
		1513	if (offset < 0)
		1514	offset += svlen;
		1515
		1516	if (offset < 0 \|\| offset > svlen)
		1517	croak ("offset outside of scalar");
		1518
		1519	if (!SvOK (length) \|\| len + offset > svlen)
		1520	len = svlen - offset;
		1521
		1522	addr = (void *)(((intptr_t)addr) + offset);
		1523	eio_page_align (&addr, &len);
1497	#if _POSIX_MEMLOCK	1524	#if _POSIX_MEMLOCK
1498	#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7	1525	RETVAL = munlock (addr, len);
1499	extern int mallopt (int, int);
1500	mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
1501	#endif
1502	mlockall (flags);
1503	#else	1526	#else
1504	RETVAL = -1;	1527	RETVAL = ((errno = ENOSYS), -1);
1505	errno = ENOSYS;
1506	#endif	1528	#endif
		1529	}
1507	OUTPUT:	1530	OUTPUT:
1508	RETVAL	1531	RETVAL
1509		1532
1510	int	1533	int
1511	munlockall ()	1534	munlockall ()
1512	PROTOTYPE:
1513	CODE:	1535	CODE:
1514	#if _POSIX_MEMLOCK	1536	#if _POSIX_MEMLOCK
1515	munlockall ();	1537	munlockall ();
1516	#else	1538	#else
1517	RETVAL = -1;	1539	RETVAL = -1;

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.171 by root, Wed Aug 4 17:16:19 2010 UTC vs. Revision 1.173 by root, Mon Sep 13 01:59:05 2010 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.171 by root, Wed Aug 4 17:16:19 2010 UTC vs.
Revision 1.173 by root, Mon Sep 13 01:59:05 2010 UTC