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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.138 by root, Tue Apr 21 20:06:05 2009 UTC vs.
Revision 1.148 by root, Wed Jun 17 01:14:48 2009 UTC

…		…
75		75
76	#define EIO_STRUCT_STAT Stat_t	76	#define EIO_STRUCT_STAT Stat_t
77		77
78	/* use NV for 32 bit perls as it allows larger offsets */	78	/* use NV for 32 bit perls as it allows larger offsets */
79	#if IVSIZE >= 8	79	#if IVSIZE >= 8
		80	# define VAL64 IV
80	# define SvVAL64 SvIV	81	# define SvVAL64 SvIV
		82	# define newSVval64 newSViv
81	#else	83	#else
		84	# define VAL64 NV
82	# define SvVAL64 SvNV	85	# define SvVAL64 SvNV
		86	# define newSVval64 newSVnv
83	#endif	87	#endif
84		88
85	/*****************************************************************************/	89	/*****************************************************************************/
86		90
87	#if __GNUC__ >= 3	91	#if __GNUC__ >= 3
…		…
95		99
96	/*****************************************************************************/	100	/*****************************************************************************/
97		101
98	static HV *stash;	102	static HV *stash;
99	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 */
		105	typedef int aio_wfd; /* write file descriptor */
100		106
101	#define AIO_REQ_KLASS "IO::AIO::REQ"	107	#define AIO_REQ_KLASS "IO::AIO::REQ"
102	#define AIO_GRP_KLASS "IO::AIO::GRP"	108	#define AIO_GRP_KLASS "IO::AIO::GRP"
103		109
104	#define EIO_REQ_MEMBERS \	110	#define EIO_REQ_MEMBERS \
…		…
108	SV *self;	114	SV *self;
109		115
110	#define EIO_NO_WRAPPERS 1	116	#define EIO_NO_WRAPPERS 1
111		117
112	#include "libeio/eio.h"	118	#include "libeio/eio.h"
		119
		120	#ifndef POSIX_FADV_NORMAL
		121	# define POSIX_FADV_NORMAL 0
		122	#endif
		123
		124	#ifndef POSIX_FADV_SEQUENTIAL
		125	# define POSIX_FADV_SEQUENTIAL 0
		126	#endif
		127
		128	#ifndef POSIX_FADV_RANDOM
		129	# define POSIX_FADV_RANDOM 0
		130	#endif
		131
		132	#ifndef POSIX_FADV_NOREUSE
		133	# define POSIX_FADV_NOREUSE 0
		134	#endif
		135
		136	#ifndef POSIX_FADV_WILLNEED
		137	# define POSIX_FADV_WILLNEED 0
		138	#endif
		139
		140	#ifndef POSIX_FADV_DONTNEED
		141	# define POSIX_FADV_DONTNEED 0
		142	#endif
113		143
114	static int req_invoke (eio_req *req);	144	static int req_invoke (eio_req *req);
115	#define EIO_FINISH(req) req_invoke (req)	145	#define EIO_FINISH(req) req_invoke (req)
116	static void req_destroy (eio_req *grp);	146	static void req_destroy (eio_req *grp);
117	#define EIO_DESTROY(req) req_destroy (req)	147	#define EIO_DESTROY(req) req_destroy (req)
…		…
228	SV *rv = &PL_sv_undef;	258	SV *rv = &PL_sv_undef;
229		259
230	if (req->result >= 0)	260	if (req->result >= 0)
231	{	261	{
232	int i;	262	int i;
233	char *buf = req->ptr2;	263	char names = (char )req->ptr2;
		264	eio_dirent ent = (eio_dirent )req->ptr1; /* might be 0 */
234	AV *av = newAV ();	265	AV *av = newAV ();
235		266
236	av_extend (av, req->result - 1);	267	av_extend (av, req->result - 1);
237		268
238	for (i = 0; i < req->result; ++i)	269	for (i = 0; i < req->result; ++i)
239	{	270	{
240	SV *sv = newSVpv (buf, 0);	271	if (req->int1 & EIO_READDIR_DENTS)
		272	{
		273	SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
241		274
		275	if (req->int1 & EIO_READDIR_CUSTOM2)
		276	{
		277	static SV sv_type [EIO_DT_MAX + 1]; / type sv cache */
		278	AV *avent = newAV ();
		279
		280	av_extend (avent, 2);
		281
		282	if (!sv_type [ent->type])
		283	{
		284	sv_type [ent->type] = newSViv (ent->type);
		285	SvREADONLY_on (sv_type [ent->type]);
		286	}
		287
		288	av_store (avent, 0, namesv);
		289	av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
		290	av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
		291
		292	av_store (av, i, newRV_noinc ((SV *)avent));
		293	}
		294	else
242	av_store (av, i, sv);	295	av_store (av, i, namesv);
		296
		297	++ent;
		298	}
		299	else
		300	{
		301	SV *name = newSVpv (names, 0);
		302	av_store (av, i, name);
243	buf += SvCUR (sv) + 1;	303	names += SvCUR (name) + 1;
		304	}
244	}	305	}
245		306
246	rv = sv_2mortal (newRV_noinc ((SV *)av));	307	rv = sv_2mortal (newRV_noinc ((SV *)av));
247	}	308	}
248		309
249	PUSHs (rv);	310	PUSHs (rv);
		311
		312	if (req->int1 & EIO_READDIR_CUSTOM1)
		313	XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 \| EIO_READDIR_CUSTOM2))));
250	}	314	}
251	break;	315	break;
252		316
253	case EIO_OPEN:	317	case EIO_OPEN:
254	{	318	{
…		…
260	GV gv = (GV )sv_newmortal ();	324	GV gv = (GV )sv_newmortal ();
261	int flags = req->int1 & (O_RDONLY \| O_WRONLY \| O_RDWR);	325	int flags = req->int1 & (O_RDONLY \| O_WRONLY \| O_RDWR);
262	char sym [64];	326	char sym [64];
263	int symlen;	327	int symlen;
264		328
265	symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result);	329	symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
266	gv_init (gv, stash, sym, symlen, 0);	330	gv_init (gv, stash, sym, symlen, 0);
267		331
268	symlen = snprintf (	332	symlen = snprintf (
269	sym,	333	sym,
270	sizeof (sym),	334	sizeof (sym),
271	"%s&=%d",	335	"%s&=%d",
272	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",	336	flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
273	req->result	337	(int)req->result
274	);	338	);
275		339
276	if (do_open (gv, sym, symlen, 0, 0, 0, 0))	340	if (do_open (gv, sym, symlen, 0, 0, 0, 0))
277	fh = (SV *)gv;	341	fh = (SV *)gv;
278	}	342	}
…		…
521		585
522	PROTOTYPES: ENABLE	586	PROTOTYPES: ENABLE
523		587
524	BOOT:	588	BOOT:
525	{	589	{
526	stash = gv_stashpv ("IO::AIO", 1);	590	static const struct {
527		591	const char *name;
528	newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));	592	IV iv;
529	newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));	593	} *civ, const_iv[] = {
530	newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));	594	# define const_iv(name, value) { # name, (IV) value },
531	newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));	595	# define const_eio(name) { # name, (IV) EIO_ ## name },
532	newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));	596	const_iv (EXDEV , EXDEV)
		597	const_iv (ENOSYS , ENOSYS)
		598	const_iv (O_RDONLY, O_RDONLY)
		599	const_iv (O_WRONLY, O_WRONLY)
		600	const_iv (O_CREAT , O_CREAT)
		601	const_iv (O_TRUNC , O_TRUNC)
533	#ifndef _WIN32	602	#ifndef _WIN32
534	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	603	const_iv (S_IFIFO , S_IFIFO)
535	#endif	604	#endif
536	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	605	const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
537	newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));	606	const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
538	newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));	607	const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
539	newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));	608	const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
		609	const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
		610	const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
540		611
		612	const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
		613	const_eio (SYNC_FILE_RANGE_WRITE)
		614	const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
		615
		616	const_eio (READDIR_DENTS)
		617	const_eio (READDIR_DIRS_FIRST)
		618	const_eio (READDIR_STAT_ORDER)
		619	const_eio (READDIR_FOUND_UNKNOWN)
		620
		621	const_eio (DT_UNKNOWN)
		622	const_eio (DT_FIFO)
		623	const_eio (DT_CHR)
		624	const_eio (DT_DIR)
		625	const_eio (DT_BLK)
		626	const_eio (DT_REG)
		627	const_eio (DT_LNK)
		628	const_eio (DT_SOCK)
		629	const_eio (DT_WHT)
		630	};
		631
		632	stash = gv_stashpv ("IO::AIO", 1);
		633
		634	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		635	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		636
541	create_respipe ();	637	create_respipe ();
542		638
543	if (eio_init (want_poll, done_poll) < 0)	639	if (eio_init (want_poll, done_poll) < 0)
544	croak ("IO::AIO: unable to initialise eio library");	640	croak ("IO::AIO: unable to initialise eio library");
545		641
546	/* atfork child called in fifo order, so before eio's handler */	642	/* atfork child called in fifo order, so before eio's handler */
547	X_THREAD_ATFORK (0, 0, atfork_child);	643	X_THREAD_ATFORK (0, 0, atfork_child);
548	}	644	}
549		645
550	void	646	void
551	max_poll_reqs (int nreqs)	647	max_poll_reqs (int nreqs)
552	PROTOTYPE: $	648	PROTOTYPE: $
…		…
616		712
617	REQ_SEND (req);	713	REQ_SEND (req);
618	}	714	}
619		715
620	void	716	void
621	aio_sync_file_range (SV fh, SV offset, SV nbytes, IV flags, SV callback=&PL_sv_undef)	717	aio_sync_file_range (SV fh, off_t offset, size_t nbytes, UV flags, SV callback=&PL_sv_undef)
622	PROTOTYPE: $$$$;$	718	PROTOTYPE: $$$$;$
623	PPCODE:	719	PPCODE:
624	{	720	{
625	int fd = extract_fd (fh, 0);	721	int fd = extract_fd (fh, 0);
626	dREQ;	722	dREQ;
627		723
628	req->type = EIO_SYNC_FILE_RANGE;	724	req->type = EIO_SYNC_FILE_RANGE;
629	req->sv1 = newSVsv (fh);	725	req->sv1 = newSVsv (fh);
630	req->int1 = fd;	726	req->int1 = fd;
631	req->offs = SvVAL64 (offset);	727	req->offs = offset;
632	req->size = SvVAL64 (nbytes);	728	req->size = nbytes;
633	req->int2 = flags;	729	req->int2 = flags;
634		730
635	REQ_SEND (req);	731	REQ_SEND (req);
636	}	732	}
637		733
…		…
693	{	789	{
694	/* read: check type and grow scalar as necessary */	790	/* read: check type and grow scalar as necessary */
695	SvUPGRADE (data, SVt_PV);	791	SvUPGRADE (data, SVt_PV);
696	svptr = SvGROW (data, len + dataoffset + 1);	792	svptr = SvGROW (data, len + dataoffset + 1);
697	}	793	}
698
699	if (len < 0)
700	croak ("length must not be negative");
701		794
702	{	795	{
703	dREQ;	796	dREQ;
704		797
705	req->type = ix;	798	req->type = ix;
…		…
735		828
736	REQ_SEND;	829	REQ_SEND;
737	}	830	}
738		831
739	void	832	void
740	aio_sendfile (SV out_fh, SV in_fh, SV in_offset, UV length, SV callback=&PL_sv_undef)	833	aio_sendfile (SV out_fh, SV in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
741	PROTOTYPE: $$$$;$	834	PROTOTYPE: $$$$;$
742	PPCODE:	835	PPCODE:
743	{	836	{
744	int ifd = extract_fd (in_fh , 0);	837	int ifd = extract_fd (in_fh , 0);
745	int ofd = extract_fd (out_fh, 0);	838	int ofd = extract_fd (out_fh, 0);
…		…
748	req->type = EIO_SENDFILE;	841	req->type = EIO_SENDFILE;
749	req->sv1 = newSVsv (out_fh);	842	req->sv1 = newSVsv (out_fh);
750	req->int1 = ofd;	843	req->int1 = ofd;
751	req->sv2 = newSVsv (in_fh);	844	req->sv2 = newSVsv (in_fh);
752	req->int2 = ifd;	845	req->int2 = ifd;
753	req->offs = SvVAL64 (in_offset);	846	req->offs = in_offset;
754	req->size = length;	847	req->size = length;
755		848
756	REQ_SEND;	849	REQ_SEND;
757	}	850	}
758		851
759	void	852	void
760	aio_readahead (SV fh, SV offset, IV length, SV *callback=&PL_sv_undef)	853	aio_readahead (SV fh, off_t offset, size_t length, SV callback=&PL_sv_undef)
761	PROTOTYPE: $$$;$	854	PROTOTYPE: $$$;$
762	PPCODE:	855	PPCODE:
763	{	856	{
764	int fd = extract_fd (fh, 0);	857	int fd = extract_fd (fh, 0);
765	dREQ;	858	dREQ;
766		859
767	req->type = EIO_READAHEAD;	860	req->type = EIO_READAHEAD;
768	req->sv1 = newSVsv (fh);	861	req->sv1 = newSVsv (fh);
769	req->int1 = fd;	862	req->int1 = fd;
770	req->offs = SvVAL64 (offset);	863	req->offs = offset;
771	req->size = length;	864	req->size = length;
772		865
773	REQ_SEND;	866	REQ_SEND;
774	}	867	}
775		868
…		…
891	req->type = EIO_FCHOWN;	984	req->type = EIO_FCHOWN;
892	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	985	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
893	}	986	}
894		987
895	REQ_SEND;	988	REQ_SEND;
		989	}
		990
		991	void
		992	aio_readdirx (SV8 pathname, IV flags, SV callback=&PL_sv_undef)
		993	PPCODE:
		994	{
		995	dREQ;
		996
		997	req->type = EIO_READDIR;
		998	req->sv1 = newSVsv (pathname);
		999	req->ptr1 = SvPVbyte_nolen (req->sv1);
		1000	req->int1 = flags \| EIO_READDIR_DENTS \| EIO_READDIR_CUSTOM1;
		1001
		1002	if (flags & EIO_READDIR_DENTS)
		1003	req->int1 \|= EIO_READDIR_CUSTOM2;
		1004
		1005	REQ_SEND;
896	}	1006	}
897		1007
898	void	1008	void
899	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)	1009	aio_unlink (SV8 pathname, SV callback=&PL_sv_undef)
900	ALIAS:	1010	ALIAS:
…		…
1078	CODE:	1188	CODE:
1079	RETVAL = eio_nthreads ();	1189	RETVAL = eio_nthreads ();
1080	OUTPUT:	1190	OUTPUT:
1081	RETVAL	1191	RETVAL
1082		1192
		1193	int
		1194	fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
		1195	PROTOTYPE: $$$$
		1196	CODE:
		1197	{
		1198	#if _XOPEN_SOURCE >= 600
		1199	RETVAL = posix_fadvise (fh, offset, length, advice);
		1200	#else
		1201	RETVAL = errno = ENOSYS;
		1202	#endif
		1203	}
		1204	OUTPUT:
		1205	RETVAL
		1206
		1207	ssize_t
		1208	sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
		1209	PROTOTYPE: $$$$
		1210	CODE:
		1211	eio_sendfile_sync (ofh, ifh, offset, count);
		1212
1083	void _on_next_submit (SV *cb)	1213	void _on_next_submit (SV *cb)
1084	CODE:	1214	CODE:
1085	SvREFCNT_dec (on_next_submit);	1215	SvREFCNT_dec (on_next_submit);
1086	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;	1216	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1087		1217
…		…
1148	AV *av;	1278	AV *av;
1149		1279
1150	grp->errorno = errno;	1280	grp->errorno = errno;
1151		1281
1152	av = newAV ();	1282	av = newAV ();
		1283	av_extend (av, items - 1);
1153		1284
1154	for (i = 1; i < items; ++i )	1285	for (i = 1; i < items; ++i )
1155	av_push (av, newSVsv (ST (i)));	1286	av_push (av, newSVsv (ST (i)));
1156		1287
1157	SvREFCNT_dec (grp->sv1);	1288	SvREFCNT_dec (grp->sv1);

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.138 by root, Tue Apr 21 20:06:05 2009 UTC vs. Revision 1.148 by root, Wed Jun 17 01:14:48 2009 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.138 by root, Tue Apr 21 20:06:05 2009 UTC vs.
Revision 1.148 by root, Wed Jun 17 01:14:48 2009 UTC