[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.17 by root, Sun Jul 31 18:45:48 2005 UTC

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

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.17 by root, Sun Jul 31 18:45:48 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.17 by root, Sun Jul 31 18:45:48 2005 UTC