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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.157 by root, Sat Jan 2 12:58:37 2010 UTC vs.
Revision 1.164 by root, Tue May 4 21:14:01 2010 UTC

…		…
11	#include <stddef.h>	11	#include <stddef.h>
12	#include <stdlib.h>	12	#include <stdlib.h>
13	#include <errno.h>	13	#include <errno.h>
14	#include <sys/types.h>	14	#include <sys/types.h>
15	#include <sys/stat.h>	15	#include <sys/stat.h>
		16	#include <sys/statvfs.h>
16	#include <limits.h>	17	#include <limits.h>
17	#include <fcntl.h>	18	#include <fcntl.h>
18	#include <sched.h>	19	#include <sched.h>
		20
		21	#if _POSIX_MEMLOCK \|\| _POSIX_MAPPED_FILES
		22	# include <sys/mman.h>
		23	#endif
19		24
20	/* perl namespace pollution */	25	/* perl namespace pollution */
21	#undef VERSION	26	#undef VERSION
22		27
23	#ifdef _WIN32	28	#ifdef _WIN32
…		…
119		124
120	#ifndef POSIX_FADV_NORMAL	125	#ifndef POSIX_FADV_NORMAL
121	# define POSIX_FADV_NORMAL 0	126	# define POSIX_FADV_NORMAL 0
122	# define NO_FADVISE 1	127	# define NO_FADVISE 1
123	#endif	128	#endif
124
125	#ifndef POSIX_FADV_SEQUENTIAL	129	#ifndef POSIX_FADV_SEQUENTIAL
126	# define POSIX_FADV_SEQUENTIAL 0	130	# define POSIX_FADV_SEQUENTIAL 0
127	#endif	131	#endif
128
129	#ifndef POSIX_FADV_RANDOM	132	#ifndef POSIX_FADV_RANDOM
130	# define POSIX_FADV_RANDOM 0	133	# define POSIX_FADV_RANDOM 0
131	#endif	134	#endif
132
133	#ifndef POSIX_FADV_NOREUSE	135	#ifndef POSIX_FADV_NOREUSE
134	# define POSIX_FADV_NOREUSE 0	136	# define POSIX_FADV_NOREUSE 0
135	#endif	137	#endif
136
137	#ifndef POSIX_FADV_WILLNEED	138	#ifndef POSIX_FADV_WILLNEED
138	# define POSIX_FADV_WILLNEED 0	139	# define POSIX_FADV_WILLNEED 0
139	#endif	140	#endif
140
141	#ifndef POSIX_FADV_DONTNEED	141	#ifndef POSIX_FADV_DONTNEED
142	# define POSIX_FADV_DONTNEED 0	142	# define POSIX_FADV_DONTNEED 0
		143	#endif
		144
		145	#ifndef ST_NODEV
		146	# define ST_NODEV 0
		147	#endif
		148	#ifndef ST_NOEXEC
		149	# define ST_NOEXEC 0
		150	#endif
		151	#ifndef ST_SYNCHRONOUS
		152	# define ST_SYNCHRONOUS 0
		153	#endif
		154	#ifndef ST_MANDLOCK
		155	# define ST_MANDLOCK 0
		156	#endif
		157	#ifndef ST_WRITE
		158	# define ST_WRITE 0
		159	#endif
		160	#ifndef ST_APPEND
		161	# define ST_APPEND 0
		162	#endif
		163	#ifndef ST_IMMUTABLE
		164	# define ST_IMMUTABLE 0
		165	#endif
		166	#ifndef ST_NOATIME
		167	# define ST_NOATIME 0
		168	#endif
		169	#ifndef ST_NODIRATIME
		170	# define ST_NODIRATIME 0
		171	#endif
		172	#ifndef ST_RELATIME
		173	# define ST_RELATIME 0
		174	#endif
		175
		176	#ifndef MCL_CURRENT
		177	# define MCL_CURRENT 0
		178	#endif
		179	#ifndef MCL_FUTURE
		180	# define MCL_FUTURE 0
		181	#endif
		182
		183	#ifndef MAP_ANONYMOUS
		184	# ifdef MAP_ANON
		185	# define MAP_ANONYMOUS MAP_ANON
		186	# else
		187	# define MAP_ANONYMOUS MAP_FIXED /* and hope this fails */
		188	# endif
		189	#endif
		190	#ifndef MAP_HUGETLB
		191	# define MAP_HUGETLB 0
		192	#endif
		193	#ifndef MAP_LOCKED
		194	# define MAP_LOCKED 0
		195	#endif
		196	#ifndef MAP_NORESERVE
		197	# define MAP_NORESERVE 0
		198	#endif
		199	#ifndef MAP_POPULATE
		200	# define MAP_POPULATE 0
		201	#endif
		202	#ifndef MAP_NONBLOCK
		203	# define MAP_NONBLOCK 0
		204	#endif
		205
		206	#ifndef PAGESIZE
		207	# define PAGESIZE sysconf (_SC_PAGESIZE)
143	#endif	208	#endif
144		209
145	static int req_invoke (eio_req *req);	210	static int req_invoke (eio_req *req);
146	#define EIO_FINISH(req) req_invoke (req)	211	#define EIO_FINISH(req) req_invoke (req)
147	static void req_destroy (eio_req *grp);	212	static void req_destroy (eio_req *grp);
…		…
345		410
346	PUSHs (fh);	411	PUSHs (fh);
347	}	412	}
348	break;	413	break;
349		414
		415	case EIO_STATVFS:
		416	case EIO_FSTATVFS:
		417	{
		418	SV *rv = &PL_sv_undef;
		419
		420	if (req->result >= 0)
		421	{
		422	EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
		423	HV *hv = newHV ();
		424
		425	rv = sv_2mortal (newRV_noinc ((SV *)hv));
		426
		427	hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
		428	hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
		429	hv_store (hv, "blocks" , sizeof ("blocks" ) - 1, newSVval64 (f->f_blocks ), 0);
		430	hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
		431	hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
		432	hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
		433	hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
		434	hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
		435	hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
		436	hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
		437	hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
		438	}
		439
		440	PUSHs (rv);
		441	}
		442
		443	break;
		444
350	case EIO_GROUP:	445	case EIO_GROUP:
351	req->int1 = 2; /* mark group as finished */	446	req->int1 = 2; /* mark group as finished */
352		447
353	if (req->sv1)	448	if (req->sv1)
354	{	449	{
…		…
486		581
487	static void atfork_child (void)	582	static void atfork_child (void)
488	{	583	{
489	create_respipe ();	584	create_respipe ();
490	}	585	}
		586
		587	/*****************************************************************************/
		588
		589	#if !_POSIX_MAPPED_FILES
		590	# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1)
		591	# define munmap(addr,length) (errno = ENOSYS, -1)
		592	#endif
		593
		594	#define MMAP_MAGIC PERL_MAGIC_ext
		595
		596	static int
		597	mmap_free (pTHX_ SV sv, MAGIC mg)
		598	{
		599	int old_errno = errno;
		600	munmap (mg->mg_ptr, (size_t)mg->mg_obj);
		601	errno = old_errno;
		602
		603	mg->mg_obj = 0; /* just in case */
		604
		605	SvREADONLY_off (sv);
		606	SvCUR_set (sv, 0);
		607	SvLEN_set (sv, 0);
		608	SvPVX (sv) = 0;
		609	SvOK_off (sv);
		610
		611	return 0;
		612	}
		613
		614	static MGVTBL mmap_vtbl = {
		615	0, 0, 0, 0, mmap_free
		616	};
		617
		618	/*****************************************************************************/
491		619
492	static SV *	620	static SV *
493	get_cb (SV *cb_sv)	621	get_cb (SV *cb_sv)
494	{	622	{
495	SvGETMAGIC (cb_sv);	623	SvGETMAGIC (cb_sv);
…		…
527	{	655	{
528	static const struct {	656	static const struct {
529	const char *name;	657	const char *name;
530	IV iv;	658	IV iv;
531	} *civ, const_iv[] = {	659	} *civ, const_iv[] = {
532	# define const_iv(name, value) { # name, (IV) value },	660	# define const_niv(name, value) { # name, (IV) value },
		661	# define const_iv(name) { # name, (IV) name },
533	# define const_eio(name) { # name, (IV) EIO_ ## name },	662	# define const_eio(name) { # name, (IV) EIO_ ## name },
534	const_iv (EXDEV , EXDEV)	663	const_iv (EXDEV)
535	const_iv (ENOSYS , ENOSYS)	664	const_iv (ENOSYS)
536	const_iv (O_RDONLY, O_RDONLY)	665	const_iv (O_RDONLY)
537	const_iv (O_WRONLY, O_WRONLY)	666	const_iv (O_WRONLY)
		667	const_iv (O_RDWR)
538	const_iv (O_CREAT , O_CREAT)	668	const_iv (O_CREAT)
539	const_iv (O_TRUNC , O_TRUNC)	669	const_iv (O_TRUNC)
		670	const_iv (O_EXCL)
		671	const_iv (O_APPEND)
540	#ifndef _WIN32	672	#ifndef _WIN32
541	const_iv (S_IFIFO , S_IFIFO)	673	const_iv (S_IFIFO)
542	#endif	674	#endif
543	const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)	675	const_niv (FADV_NORMAL , POSIX_FADV_NORMAL)
544	const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)	676	const_niv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
545	const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)	677	const_niv (FADV_RANDOM , POSIX_FADV_RANDOM)
546	const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)	678	const_niv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
547	const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)	679	const_niv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
548	const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)	680	const_niv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
		681
		682	const_iv (ST_RDONLY)
		683	const_iv (ST_NOSUID)
		684	const_iv (ST_NODEV)
		685	const_iv (ST_NOEXEC)
		686	const_iv (ST_SYNCHRONOUS)
		687	const_iv (ST_MANDLOCK)
		688	const_iv (ST_WRITE)
		689	const_iv (ST_APPEND)
		690	const_iv (ST_IMMUTABLE)
		691	const_iv (ST_NOATIME)
		692	const_iv (ST_NODIRATIME)
		693	const_iv (ST_RELATIME)
		694
		695	const_iv (PROT_EXEC)
		696	const_iv (PROT_NONE)
		697	const_iv (PROT_READ)
		698	const_iv (PROT_WRITE)
		699
		700	/const_iv (MAP_FIXED)/
		701	const_iv (MAP_PRIVATE)
		702	const_iv (MAP_SHARED)
		703	const_iv (MAP_ANONYMOUS)
		704
		705	/* linuxish */
		706	const_iv (MAP_HUGETLB)
		707	const_iv (MAP_LOCKED)
		708	const_iv (MAP_NORESERVE)
		709	const_iv (MAP_POPULATE)
		710	const_iv (MAP_NONBLOCK)
		711
		712	const_iv (MCL_FUTURE)
		713	const_iv (MCL_CURRENT)
		714
		715	const_eio (MS_ASYNC)
		716	const_eio (MS_INVALIDATE)
		717	const_eio (MS_SYNC)
		718
		719	const_eio (MT_MODIFY)
549		720
550	const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)	721	const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
551	const_eio (SYNC_FILE_RANGE_WRITE)	722	const_eio (SYNC_FILE_RANGE_WRITE)
552	const_eio (SYNC_FILE_RANGE_WAIT_AFTER)	723	const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
553		724
…		…
571	aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);	742	aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
572	aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);	743	aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
573		744
574	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	745	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
575	newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));	746	newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
		747
		748	newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
576		749
577	create_respipe ();	750	create_respipe ();
578		751
579	if (eio_init (want_poll, done_poll) < 0)	752	if (eio_init (want_poll, done_poll) < 0)
580	croak ("IO::AIO: unable to initialise eio library");	753	croak ("IO::AIO: unable to initialise eio library");
…		…
807	}	980	}
808		981
809	void	982	void
810	aio_stat (SV8 fh_or_path, SV callback=&PL_sv_undef)	983	aio_stat (SV8 fh_or_path, SV callback=&PL_sv_undef)
811	ALIAS:	984	ALIAS:
812	aio_stat = EIO_STAT	985	aio_stat = EIO_STAT
813	aio_lstat = EIO_LSTAT	986	aio_lstat = EIO_LSTAT
		987	aio_statvfs = EIO_STATVFS
814	PPCODE:	988	PPCODE:
815	{	989	{
816	dREQ;	990	dREQ;
817		991
818	req->sv1 = newSVsv (fh_or_path);	992	req->sv1 = newSVsv (fh_or_path);
…		…
822	req->type = ix;	996	req->type = ix;
823	req->ptr1 = SvPVbyte_nolen (req->sv1);	997	req->ptr1 = SvPVbyte_nolen (req->sv1);
824	}	998	}
825	else	999	else
826	{	1000	{
827	req->type = EIO_FSTAT;	1001	req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
828	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	1002	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
829	}	1003	}
830		1004
831	REQ_SEND;	1005	REQ_SEND;
832	}	1006	}
…		…
995		1169
996	REQ_SEND;	1170	REQ_SEND;
997	}	1171	}
998		1172
999	void	1173	void
		1174	aio_mtouch (SV8 data, IV offset = 0, SV length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
		1175	ALIAS:
		1176	aio_mtouch = EIO_MTOUCH
		1177	aio_msync = EIO_MSYNC
		1178	PROTOTYPE: $$$$;$
		1179	PPCODE:
		1180	{
		1181	STRLEN svlen;
		1182	UV len = SvUV (length);
		1183	char *svptr = SvPVbyte (data, svlen);
		1184
		1185	if (offset < 0)
		1186	offset += svlen;
		1187
		1188	if (offset < 0 \|\| offset > svlen)
		1189	croak ("offset outside of scalar");
		1190
		1191	if (!SvOK (length) \|\| len + offset > svlen)
		1192	len = svlen - offset;
		1193
		1194	{
		1195	dREQ;
		1196
		1197	req->type = ix;
		1198	req->size = len;
		1199	req->sv2 = SvREFCNT_inc (data);
		1200	req->ptr2 = (char *)svptr + offset;
		1201	req->int1 = flags;
		1202
		1203	REQ_SEND;
		1204	}
		1205	}
		1206
		1207	void
1000	aio_busy (double delay, SV *callback=&PL_sv_undef)	1208	aio_busy (double delay, SV *callback=&PL_sv_undef)
1001	PPCODE:	1209	PPCODE:
1002	{	1210	{
1003	dREQ;	1211	dREQ;
1004		1212
…		…
1135	PROTOTYPE: $$$$	1343	PROTOTYPE: $$$$
1136	CODE:	1344	CODE:
1137	#if _XOPEN_SOURCE >= 600 && !NO_FADVISE	1345	#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1138	RETVAL = posix_fadvise (fh, offset, length, advice);	1346	RETVAL = posix_fadvise (fh, offset, length, advice);
1139	#else	1347	#else
1140	RETVAL = errno = ENOSYS;	1348	RETVAL = errno = ENOSYS; /* yes, this is actually correct */
1141	#endif	1349	#endif
1142	OUTPUT:	1350	OUTPUT:
1143	RETVAL	1351	RETVAL
1144		1352
1145	ssize_t	1353	ssize_t
…		…
1148	CODE:	1356	CODE:
1149	RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);	1357	RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1150	OUTPUT:	1358	OUTPUT:
1151	RETVAL	1359	RETVAL
1152		1360
		1361	void
		1362	mmap (SV scalar, size_t length, int prot, int flags, SV fh, off_t offset = 0)
		1363	PROTOTYPE: $$$$$;$
		1364	PPCODE:
		1365	sv_unmagic (scalar, MMAP_MAGIC);
		1366	{
		1367	int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
		1368	void addr = (void )mmap (0, length, prot, flags, fd, offset);
		1369	if (addr == (void *)-1)
		1370	XSRETURN_NO;
		1371
		1372	/* we store the length in mg_obj, as namlen is I32 :/ */
		1373	sv_magicext (scalar, 0, MMAP_MAGIC, &mmap_vtbl, (char *)addr, 0)
		1374	->mg_obj = (SV *)length;
		1375
		1376	SvUPGRADE (scalar, SVt_PV); /* nop... */
		1377	if (!(prot & PROT_WRITE))
		1378	SvREADONLY_on (scalar);
		1379
		1380	SvPVX (scalar) = (char *)addr;
		1381	SvCUR_set (scalar, length);
		1382	SvLEN_set (scalar, 0);
		1383	SvPOK_only (scalar);
		1384
		1385	XSRETURN_YES;
		1386	}
		1387
		1388	void
		1389	munmap (SV *scalar)
		1390	PROTOTYPE: $
		1391	CODE:
		1392	sv_unmagic (scalar, MMAP_MAGIC);
		1393
		1394	int
		1395	mlockall (int flags)
		1396	PROTOTYPE: $
		1397	CODE:
		1398	#if _POSIX_MEMLOCK
		1399	#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 7
		1400	extern int mallopt (int, int);
		1401	mallopt (-6, 238); /* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473812 */
		1402	#endif
		1403	mlockall (flags);
		1404	#else
		1405	RETVAL = -1;
		1406	errno = ENOSYS;
		1407	#endif
		1408	OUTPUT:
		1409	RETVAL
		1410
		1411	int
		1412	munlockall ()
		1413	PROTOTYPE:
		1414	CODE:
		1415	#if _POSIX_MEMLOCK
		1416	munlockall ();
		1417	#else
		1418	RETVAL = -1;
		1419	errno = ENOSYS;
		1420	#endif
		1421	OUTPUT:
		1422	RETVAL
		1423
1153	void _on_next_submit (SV *cb)	1424	void _on_next_submit (SV *cb)
1154	CODE:	1425	CODE:
1155	SvREFCNT_dec (on_next_submit);	1426	SvREFCNT_dec (on_next_submit);
1156	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1427	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1157		1428

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.157 by root, Sat Jan 2 12:58:37 2010 UTC vs. Revision 1.164 by root, Tue May 4 21:14:01 2010 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.157 by root, Sat Jan 2 12:58:37 2010 UTC vs.
Revision 1.164 by root, Tue May 4 21:14:01 2010 UTC