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

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

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.9 by root, Tue Jul 12 11:02:54 2005 UTC vs. Revision 1.21 by root, Sun Aug 7 03:26:10 2005 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.9 by root, Tue Jul 12 11:02:54 2005 UTC vs.
Revision 1.21 by root, Sun Aug 7 03:26:10 2005 UTC