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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.257 by root, Tue Jul 17 23:20:09 2018 UTC vs.
Revision 1.272 by root, Wed Jan 2 16:32:57 2019 UTC

…		…
3	#include <errno.h>	3	#include <errno.h>
4		4
5	#include "EXTERN.h"	5	#include "EXTERN.h"
6	#include "perl.h"	6	#include "perl.h"
7	#include "XSUB.h"	7	#include "XSUB.h"
		8	#include "perliol.h"
		9
		10	#if !defined mg_findext
		11	# define mg_findext(sv,type,vtbl) mg_find (sv, type)
		12	#endif
8		13
9	#include <stddef.h>	14	#include <stddef.h>
10	#include <stdlib.h>	15	#include <stdlib.h>
11	#include <errno.h>	16	#include <errno.h>
12	#include <sys/types.h>	17	#include <sys/types.h>
		18	#include <sys/socket.h>
13	#include <sys/stat.h>	19	#include <sys/stat.h>
14	#include <limits.h>	20	#include <limits.h>
15	#include <fcntl.h>	21	#include <fcntl.h>
16	#include <sched.h>	22	#include <sched.h>
17
18	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES
19	# include <sys/mman.h>
20	#endif
21		23
22	/* the incompetent fool that created musl keeps __linux__, refuses	24	/* the incompetent fool that created musl keeps __linux__, refuses
23	* to implement any linux standard apis, and also has no way to test	25	* to implement any linux standard apis, and also has no way to test
24	* for his broken iplementation. don't complain to me if this fails	26	* for his broken iplementation. don't complain to me if this fails
25	* for you.	27	* for you.
…		…
73	#undef fchmod	75	#undef fchmod
74	#undef dup	76	#undef dup
75	#undef dup2	77	#undef dup2
76	#undef abort	78	#undef abort
77	#undef pipe	79	#undef pipe
		80	#undef utime
78		81
79	#define EIO_STRUCT_STAT struct _stati64	82	#define EIO_STRUCT_STAT struct _stati64
80	#define EIO_STRUCT_STATI64	83	#define EIO_STRUCT_STATI64
81		84
82	#else	85	#else
…		…
102	#define expect_false(expr) expect ((expr) != 0, 0)	105	#define expect_false(expr) expect ((expr) != 0, 0)
103	#define expect_true(expr) expect ((expr) != 0, 1)	106	#define expect_true(expr) expect ((expr) != 0, 1)
104		107
105	/*****************************************************************************/	108	/*****************************************************************************/
106		109
107	#include "libeio/config.h"	110	#include "config.h"
		111
		112	#if HAVE_SYS_MKDEV_H
		113	# include <sys/mkdev.h>
		114	#elif HAVE_SYS_SYSMACROS_H
		115	# include <sys/sysmacros.h>
		116	#endif
		117
		118	#if _POSIX_MEMLOCK \|\| _POSIX_MEMLOCK_RANGE \|\| _POSIX_MAPPED_FILES
		119	# include <sys/mman.h>
		120	#endif
		121
		122	#if HAVE_ST_XTIMENSEC
		123	# define ATIMENSEC PL_statcache.st_atimensec
		124	# define MTIMENSEC PL_statcache.st_mtimensec
		125	# define CTIMENSEC PL_statcache.st_ctimensec
		126	#elif HAVE_ST_XTIMESPEC
		127	# define ATIMENSEC PL_statcache.st_atim.tv_nsec
		128	# define MTIMENSEC PL_statcache.st_mtim.tv_nsec
		129	# define CTIMENSEC PL_statcache.st_ctim.tv_nsec
		130	#else
		131	# define ATIMENSEC 0
		132	# define MTIMENSEC 0
		133	# define CTIMENSEC 0
		134	#endif
		135
		136	#if HAVE_ST_BIRTHTIMENSEC
		137	# define BTIMESEC PL_statcache.st_birthtime
		138	# define BTIMENSEC PL_statcache.st_birthtimensec
		139	#elif HAVE_ST_BIRTHTIMESPEC
		140	# define BTIMESEC PL_statcache.st_birthtim.tv_sec
		141	# define BTIMENSEC PL_statcache.st_birthtim.tv_nsec
		142	#else
		143	# define BTIMESEC 0
		144	# define BTIMENSEC 0
		145	#endif
		146
		147	#if HAVE_ST_GEN
		148	# define ST_GEN PL_statcache.st_gen
		149	#else
		150	# define ST_GEN 0
		151	#endif
108		152
109	#include "schmorp.h"	153	#include "schmorp.h"
110		154
111	#if HAVE_EVENTFD	155	#if HAVE_EVENTFD
112	# include <sys/eventfd.h>	156	# include <sys/eventfd.h>
…		…
159	# else	203	# else
160	# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */	204	# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
161	# endif	205	# endif
162	#endif	206	#endif
163		207
164	/* defines all sorts of constants to 0 unless they are already defined */
165	/* also provides const_iv_ and const_niv_ macros for them */
166	#include "def0.h"
167
168	#ifndef makedev	208	#ifndef makedev
169	# define makedev(maj,min) (((maj) << 8) \| (min))	209	# define makedev(maj,min) (((maj) << 8) \| (min))
170	#endif	210	#endif
171	#ifndef major	211	#ifndef major
172	# define major(dev) ((dev) >> 8)	212	# define major(dev) ((dev) >> 8)
173	#endif	213	#endif
174	#ifndef minor	214	#ifndef minor
175	# define minor(dev) ((dev) & 0xff)	215	# define minor(dev) ((dev) & 0xff)
176	#endif	216	#endif
177		217
		218	/* solaris has a non-posix/unix compliant PAGESIZE that breaks compilation */
		219	#ifdef __sun
		220	# undef PAGESIZE
		221	#endif
		222
178	#if PAGESIZE <= 0	223	#if PAGESIZE <= 0
179	# define PAGESIZE sysconf (_SC_PAGESIZE)	224	# define PAGESIZE sysconf (_SC_PAGESIZE)
180	#endif	225	#endif
181		226
182	/*****************************************************************************/	227	/*****************************************************************************/
183		228
184	#if !_POSIX_MAPPED_FILES	229	#if !_POSIX_MAPPED_FILES
185	# define mmap(addr,length,prot,flags,fd,offs) EIO_ENOSYS ()	230	# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, (void *)-1)
186	# define munmap(addr,length) EIO_ENOSYS ()	231	# define munmap(addr,length) EIO_ENOSYS ()
187	#endif	232	#endif
188		233
189	#if !_POSIX_MEMORY_PROTECTION	234	#if !_POSIX_MEMORY_PROTECTION
190	# define mprotect(addr,len,prot) EIO_ENOSYS ()	235	# define mprotect(addr,len,prot) EIO_ENOSYS ()
…		…
271	{	316	{
272	/* todo: iterate over magic and only free ours, but of course */	317	/* todo: iterate over magic and only free ours, but of course */
273	/* the perl5porters will call that (correct) behaviour buggy */	318	/* the perl5porters will call that (correct) behaviour buggy */
274	sv_unmagic (sv, FOREIGN_MAGIC);	319	sv_unmagic (sv, FOREIGN_MAGIC);
275	}	320	}
		321
		322	/*****************************************************************************/
		323
		324	/* defines all sorts of constants to 0 unless they are already defined */
		325	/* also provides const_iv_ and const_niv_ macros for them */
		326	#include "def0.h"
276		327
277	/*****************************************************************************/	328	/*****************************************************************************/
278		329
279	static void	330	static void
280	fiemap (eio_req *req)	331	fiemap (eio_req *req)
…		…
371	errno = ENOSYS;	422	errno = ENOSYS;
372	#endif	423	#endif
373	}	424	}
374		425
375	/*****************************************************************************/	426	/*****************************************************************************/
		427
		428	static int close_fd; /* dummy fd to close fds via dup2 */
376		429
377	enum {	430	enum {
378	FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */	431	FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
379	};	432	};
380		433
…		…
1038	const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)	1091	const_niv (MADV_RANDOM , POSIX_MADV_RANDOM)
1039	const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)	1092	const_niv (MADV_WILLNEED , POSIX_MADV_WILLNEED)
1040	const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)	1093	const_niv (MADV_DONTNEED , POSIX_MADV_DONTNEED)
1041		1094
1042	/* the second block will be 0 when missing */	1095	/* the second block will be 0 when missing */
		1096	const_iv (O_ACCMODE)
		1097
1043	const_iv (O_RDONLY)	1098	const_iv (O_RDONLY)
1044	const_iv (O_WRONLY)	1099	const_iv (O_WRONLY)
1045	const_iv (O_RDWR)	1100	const_iv (O_RDWR)
1046	const_iv (O_CREAT)	1101	const_iv (O_CREAT)
1047	const_iv (O_TRUNC)	1102	const_iv (O_TRUNC)
…		…
1111		1166
1112	const_iv (MREMAP_MAYMOVE)	1167	const_iv (MREMAP_MAYMOVE)
1113	const_iv (MREMAP_FIXED)	1168	const_iv (MREMAP_FIXED)
1114		1169
1115	const_iv (F_DUPFD_CLOEXEC)	1170	const_iv (F_DUPFD_CLOEXEC)
		1171
		1172	const_iv (MSG_CMSG_CLOEXEC)
		1173	const_iv (SOCK_CLOEXEC)
1116		1174
1117	const_iv (F_OFD_GETLK)	1175	const_iv (F_OFD_GETLK)
1118	const_iv (F_OFD_SETLK)	1176	const_iv (F_OFD_SETLK)
1119	const_iv (F_OFD_GETLKW)	1177	const_iv (F_OFD_GETLKW)
1120		1178
…		…
1216	const_eio (SEEK_CUR)	1274	const_eio (SEEK_CUR)
1217	const_eio (SEEK_END)	1275	const_eio (SEEK_END)
1218		1276
1219	const_eio (MCL_FUTURE)	1277	const_eio (MCL_FUTURE)
1220	const_eio (MCL_CURRENT)	1278	const_eio (MCL_CURRENT)
		1279	const_eio (MCL_ONFAULT)
1221		1280
1222	const_eio (MS_ASYNC)	1281	const_eio (MS_ASYNC)
1223	const_eio (MS_INVALIDATE)	1282	const_eio (MS_INVALIDATE)
1224	const_eio (MS_SYNC)	1283	const_eio (MS_SYNC)
1225		1284
…		…
1264	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)	1323	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
1265	newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));	1324	newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
1266		1325
1267	newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));	1326	newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
1268		1327
		1328	/* allocate dummy pipe fd for aio_close */
		1329	{
		1330	int pipefd [2];
		1331
		1332	if (
		1333	#ifdef _WIN32
		1334	_pipe (pipefd, 1, _O_BINARY) < 0
		1335	#else
		1336	pipe (pipefd) < 0
		1337	\|\| fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
		1338	#endif
		1339	\|\| close (pipefd [1]) < 0
		1340	)
		1341	croak ("IO::AIO: unable to create dummy pipe for aio_close");
		1342
		1343	close_fd = pipefd [0];
		1344	}
		1345
1269	reinit ();	1346	reinit ();
1270	}	1347	}
1271		1348
1272	void	1349	void
1273	reinit ()	1350	reinit ()
…		…
1395		1472
1396	void	1473	void
1397	aio_close (SV fh, SV callback = &PL_sv_undef)	1474	aio_close (SV fh, SV callback = &PL_sv_undef)
1398	PPCODE:	1475	PPCODE:
1399	{	1476	{
1400	static int close_fd = -1; /* dummy fd to close fds via dup2 */	1477	dREQ;
1401	int fd = s_fileno_croak (fh, 0);	1478	int fd = s_fileno_croak (fh, 0);
1402	dREQ;
1403		1479
1404	if (expect_false (close_fd < 0))	1480	/* partially duplicate logic in s_fileno */
		1481	SvGETMAGIC (fh);
		1482
		1483	if (SvROK (fh))
		1484	{
		1485	fh = SvRV (fh);
		1486	SvGETMAGIC (fh);
		1487	}
		1488
		1489	if (SvTYPE (fh) == SVt_PVGV)
1405	{	1490	{
1406	int pipefd [2];	1491	/* perl filehandle */
		1492	PerlIOUnix_refcnt_inc (fd);
		1493	do_close ((GV *)fh, 1);
1407		1494
1408	if (	1495	req->type = EIO_CLOSE;
1409	#ifdef _WIN32	1496	req->int1 = fd;
1410	_pipe (pipefd, 1, _O_BINARY) < 0	1497	/req->sv2 = newSVsv (fh);/ /* since we stole the fd, no need to keep the fh */
1411	#else
1412	pipe (pipefd) < 0
1413	\|\| fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1414	#endif
1415	\|\| close (pipefd [1]) < 0
1416	)
1417	abort (); /D/
1418
1419	close_fd = pipefd [0];
1420	}	1498	}
1421		1499	else
		1500	{
		1501	/* fd number */
1422	req->type = EIO_DUP2;	1502	req->type = EIO_DUP2;
1423	req->int1 = close_fd;	1503	req->int1 = close_fd;
1424	req->sv2 = newSVsv (fh);	1504	req->sv2 = newSVsv (fh);
1425	req->int2 = fd;	1505	req->int2 = fd;
		1506	}
1426		1507
1427	REQ_SEND;	1508	REQ_SEND;
1428	}	1509	}
1429		1510
1430	void	1511	void
…		…
1601	req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);	1682	req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1602		1683
1603	REQ_SEND;	1684	REQ_SEND;
1604	}	1685	}
1605		1686
		1687	void
		1688	st_xtime ()
		1689	ALIAS:
		1690	st_atime = 0x01
		1691	st_mtime = 0x02
		1692	st_ctime = 0x04
		1693	st_btime = 0x08
		1694	st_xtime = 0x0f
		1695	PPCODE:
		1696	EXTEND (SP, 4);
		1697	if (ix & 0x01) PUSHs (newSVnv (PL_statcache.st_atime + 1e-9 * ATIMENSEC));
		1698	if (ix & 0x02) PUSHs (newSVnv (PL_statcache.st_mtime + 1e-9 * MTIMENSEC));
		1699	if (ix & 0x04) PUSHs (newSVnv (PL_statcache.st_ctime + 1e-9 * CTIMENSEC));
		1700	if (ix & 0x08) PUSHs (newSVnv (BTIMESEC + 1e-9 * BTIMENSEC));
		1701
		1702	void
		1703	st_xtimensec ()
		1704	ALIAS:
		1705	st_atimensec = 0x01
		1706	st_mtimensec = 0x02
		1707	st_ctimensec = 0x04
		1708	st_btimensec = 0x08
		1709	st_xtimensec = 0x0f
		1710	st_btimesec = 0x10
		1711	st_gen = 0x20
		1712	PPCODE:
		1713	EXTEND (SP, 4);
		1714	if (ix & 0x01) PUSHs (newSViv (ATIMENSEC));
		1715	if (ix & 0x02) PUSHs (newSViv (MTIMENSEC));
		1716	if (ix & 0x04) PUSHs (newSViv (CTIMENSEC));
		1717	if (ix & 0x08) PUSHs (newSViv (BTIMENSEC));
		1718	if (ix & 0x10) PUSHs (newSVuv (BTIMESEC));
		1719	if (ix & 0x20) PUSHs (newSVuv (ST_GEN));
		1720
1606	UV	1721	UV
1607	major (UV dev)	1722	major (UV dev)
1608	ALIAS:	1723	ALIAS:
1609	minor = 1	1724	minor = 1
1610	CODE:	1725	CODE:
…		…
2065	munmap (SV *scalar)	2180	munmap (SV *scalar)
2066	CODE:	2181	CODE:
2067	sv_clear_foreign (scalar);	2182	sv_clear_foreign (scalar);
2068		2183
2069	SV *	2184	SV *
2070	mremap (SV *scalar, STRLEN new_length, int flags = 0, IV new_address = 0)	2185	mremap (SV *scalar, STRLEN new_length, int flags = MREMAP_MAYMOVE, IV new_address = 0)
2071	CODE:	2186	CODE:
2072	{	2187	{
2073	MAGIC *mg = mg_findext (scalar, FOREIGN_MAGIC, &mmap_vtbl);	2188	MAGIC *mg = mg_findext (scalar, FOREIGN_MAGIC, &mmap_vtbl);
2074	void *new;	2189	void *new;
2075		2190
…		…
2095	}	2210	}
2096	OUTPUT:	2211	OUTPUT:
2097	RETVAL	2212	RETVAL
2098		2213
2099	int	2214	int
2100	madvise (SV scalar, STRLEN offset = 0, SV length = &PL_sv_undef, IV advice_or_prot)	2215	madvise (SV scalar, IV offset = 0, SV length = &PL_sv_undef, IV advice_or_prot)
2101	ALIAS:	2216	ALIAS:
2102	mprotect = 1	2217	mprotect = 1
2103	CODE:	2218	CODE:
2104	{	2219	{
2105	STRLEN svlen;	2220	STRLEN svlen;
…		…
2126	}	2241	}
2127	OUTPUT:	2242	OUTPUT:
2128	RETVAL	2243	RETVAL
2129		2244
2130	int	2245	int
2131	munlock (SV scalar, STRLEN offset = 0, SV length = &PL_sv_undef)	2246	munlock (SV scalar, IV offset = 0, SV length = &PL_sv_undef)
2132	CODE:	2247	CODE:
2133	{	2248	{
2134	STRLEN svlen;	2249	STRLEN svlen;
2135	void *addr = SvPVbyte (scalar, svlen);	2250	void *addr = SvPVbyte (scalar, svlen);
2136	size_t len = SvUV (length);	2251	size_t len = SvUV (length);
…		…
2151	#else	2266	#else
2152	RETVAL = EIO_ENOSYS ();	2267	RETVAL = EIO_ENOSYS ();
2153	#endif	2268	#endif
2154	}	2269	}
2155	OUTPUT:	2270	OUTPUT:
		2271	RETVAL
		2272
		2273	int
		2274	mlockall (int flags)
		2275	PROTOTYPE: $;
		2276	CODE:
		2277	RETVAL = eio_mlockall_sync (flags);
		2278	OUTPUT:
2156	RETVAL	2279	RETVAL
2157		2280
2158	int	2281	int
2159	munlockall ()	2282	munlockall ()
2160	CODE:	2283	CODE:

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.257 by root, Tue Jul 17 23:20:09 2018 UTC vs. Revision 1.272 by root, Wed Jan 2 16:32:57 2019 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.257 by root, Tue Jul 17 23:20:09 2018 UTC vs.
Revision 1.272 by root, Wed Jan 2 16:32:57 2019 UTC