[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.15 by root, Sat Jul 23 18:19:56 2005 UTC

…		…
2	#include "perl.h"	2	#include "perl.h"
3	#include "XSUB.h"	3	#include "XSUB.h"
4		4
5	#include <sys/types.h>	5	#include <sys/types.h>
6	#include <sys/stat.h>	6	#include <sys/stat.h>
		7
7	#include <unistd.h>	8	#include <unistd.h>
8	#include <fcntl.h>	9	#include <fcntl.h>
9	#include <signal.h>	10	#include <signal.h>
10	#include <sched.h>	11	#include <sched.h>
11	#include <endian.h>	12	#if __linux
		13	#include <sys/syscall.h>
		14	#endif
12		15
13	#include <pthread.h>	16	#include <pthread.h>
14	#include <sys/syscall.h>
15		17
16	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */	18	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 ;) */	19	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 ;) */	20	typedef void InOutStream; / hack, but 5.6.1 is simply toooo old ;) */
19		21
…		…
40	off_t offset;	42	off_t offset;
41	size_t length;	43	size_t length;
42	ssize_t result;	44	ssize_t result;
43	mode_t mode; /* open */	45	mode_t mode; /* open */
44	int errorno;	46	int errorno;
45	SV data, callback;	47	SV data, callback, *fh;
46	void *dataptr;	48	void *dataptr;
47	STRLEN dataoffset;	49	STRLEN dataoffset;
48		50
49	Stat_t *statdata;	51	Stat_t *statdata;
50	} aio_cb;	52	} aio_cb;
51		53
52	typedef aio_cb *aio_req;	54	typedef aio_cb *aio_req;
53		55
54	static int started;	56	static int started;
55	static int nreqs;	57	static volatile int nreqs;
56	static int max_outstanding = 1<<30;	58	static int max_outstanding = 1<<30;
57	static int respipe [2];	59	static int respipe [2];
58		60
59	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	61	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
60	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	62	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
…		…
64	static volatile aio_req ress, rese; /* queue start, queue end */	66	static volatile aio_req ress, rese; /* queue start, queue end */
65		67
66	static void	68	static void
67	poll_wait ()	69	poll_wait ()
68	{	70	{
69	if (!nreqs)	71	if (nreqs && !ress)
70	return;	72	{
71
72	fd_set rfd;	73	fd_set rfd;
73	FD_ZERO(&rfd);	74	FD_ZERO(&rfd);
74	FD_SET(respipe [0], &rfd);	75	FD_SET(respipe [0], &rfd);
75		76
76	select (respipe [0] + 1, &rfd, 0, 0, 0);	77	select (respipe [0] + 1, &rfd, 0, 0, 0);
		78	}
77	}	79	}
78		80
79	static int	81	static int
80	poll_cb ()	82	poll_cb ()
81	{	83	{
82	dSP;	84	dSP;
83	int count = 0;	85	int count = 0;
84	aio_req req;	86	aio_req req, prv;
85		87
		88	pthread_mutex_lock (&reslock);
		89
86	{	90	{
87	/* read and signals sent by the worker threads */	91	/* read any signals sent by the worker threads */
88	char buf [32];	92	char buf [32];
89	while (read (respipe [0], buf, 32) > 0)	93	while (read (respipe [0], buf, 32) > 0)
90	;	94	;
91	}	95	}
92		96
93	for (;;)	97	req = ress;
		98	ress = rese = 0;
		99
		100	pthread_mutex_unlock (&reslock);
		101
		102	while (req)
94	{	103	{
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--;	104	nreqs--;
111		105
112	if (req->type == REQ_QUIT)	106	if (req->type == REQ_QUIT)
113	started--;	107	started--;
114	else	108	else
…		…
121	+ req->result > 0 ? req->result : 0);	115	+ req->result > 0 ? req->result : 0);
122		116
123	if (req->data)	117	if (req->data)
124	SvREFCNT_dec (req->data);	118	SvREFCNT_dec (req->data);
125		119
		120	if (req->fh)
		121	SvREFCNT_dec (req->fh);
		122
126	if (req->type == REQ_STAT \|\| req->type == REQ_LSTAT \|\| req->type == REQ_FSTAT)	123	if (req->type == REQ_STAT \|\| req->type == REQ_LSTAT \|\| req->type == REQ_FSTAT)
127	{	124	{
128	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;	125	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
129	PL_laststatval = req->result;	126	PL_laststatval = req->result;
130	PL_statcache = *(req->statdata);	127	PL_statcache = *(req->statdata);
131		128
132	Safefree (req->statdata);	129	Safefree (req->statdata);
133	}	130	}
134		131
		132	ENTER;
135	PUSHMARK (SP);	133	PUSHMARK (SP);
136	XPUSHs (sv_2mortal (newSViv (req->result)));	134	XPUSHs (sv_2mortal (newSViv (req->result)));
137		135
138	if (req->type == REQ_OPEN)	136	if (req->type == REQ_OPEN)
139	{	137	{
…		…
142		140
143	PUTBACK;	141	PUTBACK;
144	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	142	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
145	SPAGAIN;	143	SPAGAIN;
146		144
147	fh = POPs;	145	fh = SvREFCNT_inc (POPs);
148		146
149	PUSHMARK (SP);	147	PUSHMARK (SP);
150	XPUSHs (fh);	148	XPUSHs (sv_2mortal (fh));
151	}	149	}
152		150
153	if (SvOK (req->callback))	151	if (SvOK (req->callback))
154	{	152	{
155	PUTBACK;	153	PUTBACK;
156	call_sv (req->callback, G_VOID \| G_EVAL);	154	call_sv (req->callback, G_VOID \| G_EVAL);
157	SPAGAIN;	155	SPAGAIN;
158	}	156	}
		157
		158	LEAVE;
159		159
160	if (req->callback)	160	if (req->callback)
161	SvREFCNT_dec (req->callback);	161	SvREFCNT_dec (req->callback);
162		162
163	errno = errorno;	163	errno = errorno;
164	count++;	164	count++;
165	}	165	}
166		166
		167	prv = req;
		168	req = req->next;
167	Safefree (req);	169	Safefree (prv);
		170
		171	/* TODO: croak on errors? */
168	}	172	}
169		173
170	return count;	174	return count;
171	}	175	}
172		176
…		…
227	req->type = REQ_QUIT;	231	req->type = REQ_QUIT;
228		232
229	send_req (req);	233	send_req (req);
230	}	234	}
231		235
232	static void
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
240	SvUPGRADE (data, SVt_PV);
241	SvPOK_on (data);
242
243	if (dataoffset < 0)
244	dataoffset += svlen;
245
246	if (dataoffset < 0 \|\| dataoffset > svlen)
247	croak ("data offset outside of string");
248
249	if (dowrite)
250	{
251	/* write: check length and adjust. */
252	if (length < 0 \|\| length + dataoffset > svlen)
253	length = svlen - dataoffset;
254	}
255	else
256	{
257	/* read: grow scalar as necessary */
258	svptr = SvGROW (data, length + dataoffset);
259	}
260
261	if (length < 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	}
279
280	static void *	236	static void *
281	aio_proc (void *thr_arg)	237	aio_proc (void *thr_arg)
282	{	238	{
283	aio_req req;	239	aio_req req;
284	int type;	240	int type;
…		…
309		265
310	type = req->type;	266	type = req->type;
311		267
312	switch (type)	268	switch (type)
313	{	269	{
314	case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset); break;	270	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;	271	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
316	#if SYS_readahead	272	#if SYS_readahead
317	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	273	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
318	#else	274	#else
319	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;	275	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
320	#endif	276	#endif
…		…
442	send_req (req);	398	send_req (req);
443	}	399	}
444		400
445	void	401	void
446	aio_close(fh,callback=&PL_sv_undef)	402	aio_close(fh,callback=&PL_sv_undef)
447	InputStream fh	403	SV * fh
448	SV * callback	404	SV * callback
449	PROTOTYPE: $;$	405	PROTOTYPE: $;$
450	ALIAS:	406	ALIAS:
451	aio_close = REQ_CLOSE	407	aio_close = REQ_CLOSE
452	aio_fsync = REQ_FSYNC	408	aio_fsync = REQ_FSYNC
453	aio_fdatasync = REQ_FDATASYNC	409	aio_fdatasync = REQ_FDATASYNC
…		…
459		415
460	if (!req)	416	if (!req)
461	croak ("out of memory during aio_req allocation");	417	croak ("out of memory during aio_req allocation");
462		418
463	req->type = ix;	419	req->type = ix;
		420	req->fh = newSVsv (fh);
464	req->fd = PerlIO_fileno (fh);	421	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
465	req->callback = SvREFCNT_inc (callback);	422	req->callback = SvREFCNT_inc (callback);
466		423
467	send_req (req);	424	send_req (req);
468	}	425	}
469		426
470	void	427	void
471	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)	428	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
472	InputStream fh	429	SV * fh
473	UV offset	430	UV offset
474	IV length	431	IV length
475	SV * data	432	SV * data
476	IV dataoffset	433	IV dataoffset
477	SV * callback	434	SV * callback
		435	ALIAS:
		436	aio_read = REQ_READ
		437	aio_write = REQ_WRITE
478	PROTOTYPE: $$$$$;$	438	PROTOTYPE: $$$$$;$
479	CODE:	439	CODE:
480	read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);	440	{
		441	aio_req req;
		442	STRLEN svlen;
		443	char *svptr = SvPV (data, svlen);
481		444
482	void	445	SvUPGRADE (data, SVt_PV);
483	aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)	446	SvPOK_on (data);
484	OutputStream fh	447
485	UV offset	448	if (dataoffset < 0)
486	IV length	449	dataoffset += svlen;
487	SV * data	450
488	IV dataoffset	451	if (dataoffset < 0 \|\| dataoffset > svlen)
489	SV * callback	452	croak ("data offset outside of string");
490	PROTOTYPE: $$$$$;$	453
491	CODE:	454	if (ix == REQ_WRITE)
492	read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);	455	{
		456	/* write: check length and adjust. */
		457	if (length < 0 \|\| length + dataoffset > svlen)
		458	length = svlen - dataoffset;
		459	}
		460	else
		461	{
		462	/* read: grow scalar as necessary */
		463	svptr = SvGROW (data, length + dataoffset);
		464	}
		465
		466	if (length < 0)
		467	croak ("length must not be negative");
		468
		469	Newz (0, req, 1, aio_cb);
		470
		471	if (!req)
		472	croak ("out of memory during aio_req allocation");
		473
		474	req->type = ix;
		475	req->fh = newSVsv (fh);
		476	req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
		477	: IoOFP (sv_2io (fh)));
		478	req->offset = offset;
		479	req->length = length;
		480	req->data = SvREFCNT_inc (data);
		481	req->dataptr = (char *)svptr + dataoffset;
		482	req->callback = SvREFCNT_inc (callback);
		483
		484	send_req (req);
		485	}
493		486
494	void	487	void
495	aio_readahead(fh,offset,length,callback=&PL_sv_undef)	488	aio_readahead(fh,offset,length,callback=&PL_sv_undef)
496	InputStream fh	489	SV * fh
497	UV offset	490	UV offset
498	IV length	491	IV length
499	SV * callback	492	SV * callback
500	PROTOTYPE: $$$;$	493	PROTOTYPE: $$$;$
501	CODE:	494	CODE:
502	{	495	{
503	aio_req req;	496	aio_req req;
504		497
…		…
509		502
510	if (!req)	503	if (!req)
511	croak ("out of memory during aio_req allocation");	504	croak ("out of memory during aio_req allocation");
512		505
513	req->type = REQ_READAHEAD;	506	req->type = REQ_READAHEAD;
		507	req->fh = newSVsv (fh);
514	req->fd = PerlIO_fileno (fh);	508	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
515	req->offset = offset;	509	req->offset = offset;
516	req->length = length;	510	req->length = length;
517	req->callback = SvREFCNT_inc (callback);	511	req->callback = SvREFCNT_inc (callback);
518		512
519	send_req (req);	513	send_req (req);
…		…
547	req->dataptr = SvPV_nolen (req->data);	541	req->dataptr = SvPV_nolen (req->data);
548	}	542	}
549	else	543	else
550	{	544	{
551	req->type = REQ_FSTAT;	545	req->type = REQ_FSTAT;
		546	req->fh = newSVsv (fh_or_path);
552	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	547	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
553	}	548	}
554		549
555	req->callback = SvREFCNT_inc (callback);	550	req->callback = SvREFCNT_inc (callback);
556		551

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.15 by root, Sat Jul 23 18:19:56 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.15 by root, Sat Jul 23 18:19:56 2005 UTC