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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.8 by root, Mon Jul 11 02:53:59 2005 UTC vs.
Revision 1.20 by root, Sun Jul 31 19:08:39 2005 UTC

…		…
		1	#define _REENTRANT 1
		2	#include <errno.h>
		3
1	#include "EXTERN.h"	4	#include "EXTERN.h"
2	#include "perl.h"	5	#include "perl.h"
3	#include "XSUB.h"	6	#include "XSUB.h"
4		7
		8	#include "autoconf/config.h"
		9
5	#include <sys/types.h>	10	#include <sys/types.h>
6	#include <sys/stat.h>	11	#include <sys/stat.h>
		12
7	#include <unistd.h>	13	#include <unistd.h>
8	#include <fcntl.h>	14	#include <fcntl.h>
9	#include <signal.h>	15	#include <signal.h>
10	#include <sched.h>	16	#include <sched.h>
11	#include <endian.h>
12		17
13	#include <pthread.h>	18	#include <pthread.h>
14	#include <sys/syscall.h>
15		19
16	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */	20	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */
17	typedef void OutputStream; / hack, but 5.6.1 is simply toooo old ;) */	21	typedef void OutputStream; / hack, but 5.6.1 is simply toooo old ;) */
18	typedef void InOutStream; / hack, but 5.6.1 is simply toooo old ;) */	22	typedef void InOutStream; / hack, but 5.6.1 is simply toooo old ;) */
19		23
40	off_t offset;	44	off_t offset;
41	size_t length;	45	size_t length;
42	ssize_t result;	46	ssize_t result;
43	mode_t mode; /* open */	47	mode_t mode; /* open */
44	int errorno;	48	int errorno;
45	SV data, callback;	49	SV data, callback, *fh;
46	void *dataptr;	50	void *dataptr;
47	STRLEN dataoffset;	51	STRLEN dataoffset;
48		52
49	Stat_t *statdata;	53	Stat_t *statdata;
50	} aio_cb;	54	} aio_cb;
51		55
52	typedef aio_cb *aio_req;	56	typedef aio_cb *aio_req;
53		57
54	static int started;	58	static int started;
55	static int nreqs;	59	static volatile int nreqs;
56	static int max_outstanding = 1<<30;	60	static int max_outstanding = 1<<30;
57	static int respipe [2];	61	static int respipe [2];
58		62
59	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	63	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
60	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	64	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
…		…
64	static volatile aio_req ress, rese; /* queue start, queue end */	68	static volatile aio_req ress, rese; /* queue start, queue end */
65		69
66	static void	70	static void
67	poll_wait ()	71	poll_wait ()
68	{	72	{
69	if (!nreqs)	73	if (nreqs && !ress)
70	return;	74	{
71
72	fd_set rfd;	75	fd_set rfd;
73	FD_ZERO(&rfd);	76	FD_ZERO(&rfd);
74	FD_SET(respipe [0], &rfd);	77	FD_SET(respipe [0], &rfd);
75		78
76	select (respipe [0] + 1, &rfd, 0, 0, 0);	79	select (respipe [0] + 1, &rfd, 0, 0, 0);
		80	}
77	}	81	}
78		82
79	static int	83	static int
80	poll_cb ()	84	poll_cb ()
81	{	85	{
82	dSP;	86	dSP;
83	int count = 0;	87	int count = 0;
84	aio_req req;	88	aio_req req, prv;
85		89
		90	pthread_mutex_lock (&reslock);
		91
86	{	92	{
87	/* read and signals sent by the worker threads */	93	/* read any signals sent by the worker threads */
88	char buf [32];	94	char buf [32];
89	while (read (respipe [0], buf, 32) > 0)	95	while (read (respipe [0], buf, 32) > 0)
90	;	96	;
91	}	97	}
92		98
93	for (;;)	99	req = ress;
		100	ress = rese = 0;
		101
		102	pthread_mutex_unlock (&reslock);
		103
		104	while (req)
94	{	105	{
95	pthread_mutex_lock (&reslock);
96
97	req = ress;
98
99	if (ress)
100	{
101	ress = ress->next;
102	if (!ress) rese = 0;
103	}
104
105	pthread_mutex_unlock (&reslock);
106
107	if (!req)
108	break;
109
110	nreqs--;	106	nreqs--;
111		107
112	if (req->type == REQ_QUIT)	108	if (req->type == REQ_QUIT)
113	started--;	109	started--;
114	else	110	else
…		…
121	+ req->result > 0 ? req->result : 0);	117	+ req->result > 0 ? req->result : 0);
122		118
123	if (req->data)	119	if (req->data)
124	SvREFCNT_dec (req->data);	120	SvREFCNT_dec (req->data);
125		121
		122	if (req->fh)
		123	SvREFCNT_dec (req->fh);
		124
126	if (req->type == REQ_STAT \|\| req->type == REQ_LSTAT \|\| req->type == REQ_FSTAT)	125	if (req->type == REQ_STAT \|\| req->type == REQ_LSTAT \|\| req->type == REQ_FSTAT)
127	{	126	{
128	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;	127	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
129	PL_laststatval = req->result;	128	PL_laststatval = req->result;
130	PL_statcache = *(req->statdata);	129	PL_statcache = *(req->statdata);
131		130
132	Safefree (req->statdata);	131	Safefree (req->statdata);
133	}	132	}
134		133
		134	ENTER;
135	PUSHMARK (SP);	135	PUSHMARK (SP);
136	XPUSHs (sv_2mortal (newSViv (req->result)));	136	XPUSHs (sv_2mortal (newSViv (req->result)));
137		137
138	if (req->type == REQ_OPEN)	138	if (req->type == REQ_OPEN)
139	{	139	{
…		…
142		142
143	PUTBACK;	143	PUTBACK;
144	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	144	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
145	SPAGAIN;	145	SPAGAIN;
146		146
147	fh = POPs;	147	fh = SvREFCNT_inc (POPs);
148		148
149	PUSHMARK (SP);	149	PUSHMARK (SP);
150	XPUSHs (fh);	150	XPUSHs (sv_2mortal (fh));
151	}	151	}
152		152
153	if (SvOK (req->callback))	153	if (SvOK (req->callback))
154	{	154	{
155	PUTBACK;	155	PUTBACK;
156	call_sv (req->callback, G_VOID \| G_EVAL);	156	call_sv (req->callback, G_VOID \| G_EVAL);
157	SPAGAIN;	157	SPAGAIN;
158	}	158	}
		159
		160	LEAVE;
159		161
160	if (req->callback)	162	if (req->callback)
161	SvREFCNT_dec (req->callback);	163	SvREFCNT_dec (req->callback);
162		164
163	errno = errorno;	165	errno = errorno;
164	count++;	166	count++;
165	}	167	}
166		168
		169	prv = req;
		170	req = req->next;
167	Safefree (req);	171	Safefree (prv);
		172
		173	/* TODO: croak on errors? */
168	}	174	}
169		175
170	return count;	176	return count;
171	}	177	}
172		178
…		…
227	req->type = REQ_QUIT;	233	req->type = REQ_QUIT;
228		234
229	send_req (req);	235	send_req (req);
230	}	236	}
231		237
232	static void	238	/* work around various missing functions */
233	read_write (int dowrite, int fd, off_t offset, size_t length,
234	SV data, STRLEN dataoffset, SV callback)
235	{
236	aio_req req;
237	STRLEN svlen;
238	char *svptr = SvPV (data, svlen);
239		239
240	SvUPGRADE (data, SVt_PV);	240	#if !HAVE_PREADWRITE
241	SvPOK_on (data);	241	# define pread aio_pread
		242	# define pwrite aio_pwrite
242		243
243	if (dataoffset < 0)	244	/*
244	dataoffset += svlen;	245	* make our pread/pwrite safe against themselves, but not against
		246	* normal read/write by using a mutex. slows down execution a lot,
		247	* but that's your problem, not mine.
		248	*/
		249	static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER;
245		250
246	if (dataoffset < 0 \|\| dataoffset > svlen)	251	static ssize_t
247	croak ("data offset outside of string");	252	pread (int fd, void *buf, size_t count, off_t offset)
		253	{
		254	ssize_t res;
		255	off_t ooffset;
248		256
249	if (dowrite)	257	pthread_mutex_lock (&iolock);
		258	ooffset = lseek (fd, 0, SEEK_CUR);
		259	lseek (fd, offset, SEEK_SET);
		260	res = read (fd, buf, count);
		261	lseek (fd, ooffset, SEEK_SET);
		262	pthread_mutex_unlock (&iolock);
		263
		264	return res;
		265	}
		266
		267	static ssize_t
		268	pwrite (int fd, void *buf, size_t count, off_t offset)
		269	{
		270	ssize_t res;
		271	off_t ooffset;
		272
		273	pthread_mutex_lock (&iolock);
		274	ooffset = lseek (fd, 0, SEEK_CUR);
		275	lseek (fd, offset, SEEK_SET);
		276	res = write (fd, buf, count);
		277	lseek (fd, offset, SEEK_SET);
		278	pthread_mutex_unlock (&iolock);
		279
		280	return res;
		281	}
		282	#endif
		283
		284	#if !HAVE_FDATASYNC
		285	# define fdatasync fsync
		286	#endif
		287
		288	#if !HAVE_READAHEAD
		289	# define readahead aio_readahead
		290
		291	static char readahead_buf[4096];
		292
		293	static ssize_t
		294	readahead (int fd, off_t offset, size_t count)
		295	{
		296	while (count > 0)
250	{	297	{
251	/* write: check length and adjust. */	298	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
252	if (length < 0 \|\| length + dataoffset > svlen)	299
253	length = svlen - dataoffset;	300	pread (fd, readahead_buf, len, offset);
		301	offset += len;
		302	count -= len;
254	}	303	}
255	else
256	{
257	/* read: grow scalar as necessary */
258	svptr = SvGROW (data, length + dataoffset);
259	}
260		304
261	if (length < 0)	305	errno = 0;
262	croak ("length must not be negative");
263
264	Newz (0, req, 1, aio_cb);
265
266	if (!req)
267	croak ("out of memory during aio_req allocation");
268
269	req->type = dowrite ? REQ_WRITE : REQ_READ;
270	req->fd = fd;
271	req->offset = offset;
272	req->length = length;
273	req->data = SvREFCNT_inc (data);
274	req->dataptr = (char *)svptr + dataoffset;
275	req->callback = SvREFCNT_inc (callback);
276
277	send_req (req);
278	}	306	}
		307	#endif
279		308
280	static void *	309	static void *
281	aio_proc (void *thr_arg)	310	aio_proc (void *thr_arg)
282	{	311	{
283	aio_req req;	312	aio_req req;
…		…
309		338
310	type = req->type;	339	type = req->type;
311		340
312	switch (type)	341	switch (type)
313	{	342	{
314	case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset); break;	343	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
315	case REQ_WRITE: req->result = pwrite64 (req->fd, req->dataptr, req->length, req->offset); break;	344	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
316	#if SYS_readahead	345
317	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	346	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
318	#else
319	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
320	#endif
321		347
322	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	348	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
323	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	349	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
324	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	350	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
325		351
326	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;	352	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
327	case REQ_CLOSE: req->result = close (req->fd); break;	353	case REQ_CLOSE: req->result = close (req->fd); break;
328	case REQ_UNLINK: req->result = unlink (req->dataptr); break;	354	case REQ_UNLINK: req->result = unlink (req->dataptr); break;
329		355
		356	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
330	case REQ_FSYNC: req->result = fsync (req->fd); break;	357	case REQ_FSYNC: req->result = fsync (req->fd); break;
331	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
332		358
333	case REQ_QUIT:	359	case REQ_QUIT:
334	break;	360	break;
335		361
336	default:	362	default:
…		…
442	send_req (req);	468	send_req (req);
443	}	469	}
444		470
445	void	471	void
446	aio_close(fh,callback=&PL_sv_undef)	472	aio_close(fh,callback=&PL_sv_undef)
447	InputStream fh	473	SV * fh
448	SV * callback	474	SV * callback
449	PROTOTYPE: $;$	475	PROTOTYPE: $;$
450	ALIAS:	476	ALIAS:
451	aio_close = REQ_CLOSE	477	aio_close = REQ_CLOSE
452	aio_fsync = REQ_FSYNC	478	aio_fsync = REQ_FSYNC
453	aio_fdatasync = REQ_FDATASYNC	479	aio_fdatasync = REQ_FDATASYNC
…		…
459		485
460	if (!req)	486	if (!req)
461	croak ("out of memory during aio_req allocation");	487	croak ("out of memory during aio_req allocation");
462		488
463	req->type = ix;	489	req->type = ix;
		490	req->fh = newSVsv (fh);
464	req->fd = PerlIO_fileno (fh);	491	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
465	req->callback = SvREFCNT_inc (callback);	492	req->callback = SvREFCNT_inc (callback);
466		493
467	send_req (req);	494	send_req (req);
468	}	495	}
469		496
470	void	497	void
471	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)	498	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
472	InputStream fh	499	SV * fh
473	UV offset	500	UV offset
474	IV length	501	IV length
475	SV * data	502	SV * data
476	IV dataoffset	503	IV dataoffset
477	SV * callback	504	SV * callback
		505	ALIAS:
		506	aio_read = REQ_READ
		507	aio_write = REQ_WRITE
478	PROTOTYPE: $$$$$;$	508	PROTOTYPE: $$$$$;$
479	CODE:	509	CODE:
480	read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);	510	{
		511	aio_req req;
		512	STRLEN svlen;
		513	char *svptr = SvPV (data, svlen);
481		514
482	void	515	SvUPGRADE (data, SVt_PV);
483	aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)	516	SvPOK_on (data);
484	OutputStream fh	517
485	UV offset	518	if (dataoffset < 0)
486	IV length	519	dataoffset += svlen;
487	SV * data	520
488	IV dataoffset	521	if (dataoffset < 0 \|\| dataoffset > svlen)
489	SV * callback	522	croak ("data offset outside of string");
490	PROTOTYPE: $$$$$;$	523
491	CODE:	524	if (ix == REQ_WRITE)
492	read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);	525	{
		526	/* write: check length and adjust. */
		527	if (length < 0 \|\| length + dataoffset > svlen)
		528	length = svlen - dataoffset;
		529	}
		530	else
		531	{
		532	/* read: grow scalar as necessary */
		533	svptr = SvGROW (data, length + dataoffset);
		534	}
		535
		536	if (length < 0)
		537	croak ("length must not be negative");
		538
		539	Newz (0, req, 1, aio_cb);
		540
		541	if (!req)
		542	croak ("out of memory during aio_req allocation");
		543
		544	req->type = ix;
		545	req->fh = newSVsv (fh);
		546	req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
		547	: IoOFP (sv_2io (fh)));
		548	req->offset = offset;
		549	req->length = length;
		550	req->data = SvREFCNT_inc (data);
		551	req->dataptr = (char *)svptr + dataoffset;
		552	req->callback = SvREFCNT_inc (callback);
		553
		554	send_req (req);
		555	}
493		556
494	void	557	void
495	aio_readahead(fh,offset,length,callback=&PL_sv_undef)	558	aio_readahead(fh,offset,length,callback=&PL_sv_undef)
496	InputStream fh	559	SV * fh
497	UV offset	560	UV offset
498	IV length	561	IV length
499	SV * callback	562	SV * callback
500	PROTOTYPE: $$$;$	563	PROTOTYPE: $$$;$
501	CODE:	564	CODE:
502	{	565	{
503	aio_req req;	566	aio_req req;
504		567
…		…
509		572
510	if (!req)	573	if (!req)
511	croak ("out of memory during aio_req allocation");	574	croak ("out of memory during aio_req allocation");
512		575
513	req->type = REQ_READAHEAD;	576	req->type = REQ_READAHEAD;
		577	req->fh = newSVsv (fh);
514	req->fd = PerlIO_fileno (fh);	578	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
515	req->offset = offset;	579	req->offset = offset;
516	req->length = length;	580	req->length = length;
517	req->callback = SvREFCNT_inc (callback);	581	req->callback = SvREFCNT_inc (callback);
518		582
519	send_req (req);	583	send_req (req);
…		…
547	req->dataptr = SvPV_nolen (req->data);	611	req->dataptr = SvPV_nolen (req->data);
548	}	612	}
549	else	613	else
550	{	614	{
551	req->type = REQ_FSTAT;	615	req->type = REQ_FSTAT;
		616	req->fh = newSVsv (fh_or_path);
552	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	617	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
553	}	618	}
554		619
555	req->callback = SvREFCNT_inc (callback);	620	req->callback = SvREFCNT_inc (callback);
556		621

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.8 by root, Mon Jul 11 02:53:59 2005 UTC vs. Revision 1.20 by root, Sun Jul 31 19:08:39 2005 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.8 by root, Mon Jul 11 02:53:59 2005 UTC vs.
Revision 1.20 by root, Sun Jul 31 19:08:39 2005 UTC