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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.10 by root, Wed Jul 13 00:13:09 2005 UTC vs.
Revision 1.16 by root, Sun Jul 31 18:20:07 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	#define _XOPEN_SOURCE 500	5	#include "autoconf/config.h"
6		6
7	#include <sys/types.h>	7	#include <sys/types.h>
8	#include <sys/stat.h>	8	#include <sys/stat.h>
9		9
10	#include <unistd.h>	10	#include <unistd.h>
11	#include <fcntl.h>	11	#include <fcntl.h>
12	#include <signal.h>	12	#include <signal.h>
13	#include <sched.h>	13	#include <sched.h>
14	#if __linux
15	#include <sys/syscall.h>
16	#endif
17		14
18	#include <pthread.h>	15	#include <pthread.h>
19		16
20	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 ;) */
21	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 ;) */
44	off_t offset;	41	off_t offset;
45	size_t length;	42	size_t length;
46	ssize_t result;	43	ssize_t result;
47	mode_t mode; /* open */	44	mode_t mode; /* open */
48	int errorno;	45	int errorno;
49	SV data, callback;	46	SV data, callback, *fh;
50	void *dataptr;	47	void *dataptr;
51	STRLEN dataoffset;	48	STRLEN dataoffset;
52		49
53	Stat_t *statdata;	50	Stat_t *statdata;
54	} aio_cb;	51	} aio_cb;
55		52
56	typedef aio_cb *aio_req;	53	typedef aio_cb *aio_req;
57		54
58	static int started;	55	static int started;
59	static int nreqs;	56	static volatile int nreqs;
60	static int max_outstanding = 1<<30;	57	static int max_outstanding = 1<<30;
61	static int respipe [2];	58	static int respipe [2];
62		59
63	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	60	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
64	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	61	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
…		…
68	static volatile aio_req ress, rese; /* queue start, queue end */	65	static volatile aio_req ress, rese; /* queue start, queue end */
69		66
70	static void	67	static void
71	poll_wait ()	68	poll_wait ()
72	{	69	{
73	if (!nreqs)	70	if (nreqs && !ress)
74	return;	71	{
75
76	fd_set rfd;	72	fd_set rfd;
77	FD_ZERO(&rfd);	73	FD_ZERO(&rfd);
78	FD_SET(respipe [0], &rfd);	74	FD_SET(respipe [0], &rfd);
79		75
80	select (respipe [0] + 1, &rfd, 0, 0, 0);	76	select (respipe [0] + 1, &rfd, 0, 0, 0);
		77	}
81	}	78	}
82		79
83	static int	80	static int
84	poll_cb ()	81	poll_cb ()
85	{	82	{
86	dSP;	83	dSP;
87	int count = 0;	84	int count = 0;
88	aio_req req;	85	aio_req req, prv;
89		86
		87	pthread_mutex_lock (&reslock);
		88
90	{	89	{
91	/* read and signals sent by the worker threads */	90	/* read any signals sent by the worker threads */
92	char buf [32];	91	char buf [32];
93	while (read (respipe [0], buf, 32) > 0)	92	while (read (respipe [0], buf, 32) > 0)
94	;	93	;
95	}	94	}
96		95
97	for (;;)	96	req = ress;
		97	ress = rese = 0;
		98
		99	pthread_mutex_unlock (&reslock);
		100
		101	while (req)
98	{	102	{
99	pthread_mutex_lock (&reslock);
100
101	req = ress;
102
103	if (ress)
104	{
105	ress = ress->next;
106	if (!ress) rese = 0;
107	}
108
109	pthread_mutex_unlock (&reslock);
110
111	if (!req)
112	break;
113
114	nreqs--;	103	nreqs--;
115		104
116	if (req->type == REQ_QUIT)	105	if (req->type == REQ_QUIT)
117	started--;	106	started--;
118	else	107	else
…		…
125	+ req->result > 0 ? req->result : 0);	114	+ req->result > 0 ? req->result : 0);
126		115
127	if (req->data)	116	if (req->data)
128	SvREFCNT_dec (req->data);	117	SvREFCNT_dec (req->data);
129		118
		119	if (req->fh)
		120	SvREFCNT_dec (req->fh);
		121
130	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)
131	{	123	{
132	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;	124	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
133	PL_laststatval = req->result;	125	PL_laststatval = req->result;
134	PL_statcache = *(req->statdata);	126	PL_statcache = *(req->statdata);
135		127
136	Safefree (req->statdata);	128	Safefree (req->statdata);
137	}	129	}
138		130
		131	ENTER;
139	PUSHMARK (SP);	132	PUSHMARK (SP);
140	XPUSHs (sv_2mortal (newSViv (req->result)));	133	XPUSHs (sv_2mortal (newSViv (req->result)));
141		134
142	if (req->type == REQ_OPEN)	135	if (req->type == REQ_OPEN)
143	{	136	{
…		…
146		139
147	PUTBACK;	140	PUTBACK;
148	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	141	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
149	SPAGAIN;	142	SPAGAIN;
150		143
151	fh = POPs;	144	fh = SvREFCNT_inc (POPs);
152		145
153	PUSHMARK (SP);	146	PUSHMARK (SP);
154	XPUSHs (fh);	147	XPUSHs (sv_2mortal (fh));
155	}	148	}
156		149
157	if (SvOK (req->callback))	150	if (SvOK (req->callback))
158	{	151	{
159	PUTBACK;	152	PUTBACK;
160	call_sv (req->callback, G_VOID \| G_EVAL);	153	call_sv (req->callback, G_VOID \| G_EVAL);
161	SPAGAIN;	154	SPAGAIN;
162	}	155	}
		156
		157	LEAVE;
163		158
164	if (req->callback)	159	if (req->callback)
165	SvREFCNT_dec (req->callback);	160	SvREFCNT_dec (req->callback);
166		161
167	errno = errorno;	162	errno = errorno;
168	count++;	163	count++;
169	}	164	}
170		165
		166	prv = req;
		167	req = req->next;
171	Safefree (req);	168	Safefree (prv);
		169
		170	/* TODO: croak on errors? */
172	}	171	}
173		172
174	return count;	173	return count;
175	}	174	}
176		175
…		…
231	req->type = REQ_QUIT;	230	req->type = REQ_QUIT;
232		231
233	send_req (req);	232	send_req (req);
234	}	233	}
235		234
236	static void
237	read_write (int dowrite, int fd, off_t offset, size_t length,
238	SV data, STRLEN dataoffset, SV callback)
239	{
240	aio_req req;
241	STRLEN svlen;
242	char *svptr = SvPV (data, svlen);
243
244	SvUPGRADE (data, SVt_PV);
245	SvPOK_on (data);
246
247	if (dataoffset < 0)
248	dataoffset += svlen;
249
250	if (dataoffset < 0 \|\| dataoffset > svlen)
251	croak ("data offset outside of string");
252
253	if (dowrite)
254	{
255	/* write: check length and adjust. */
256	if (length < 0 \|\| length + dataoffset > svlen)
257	length = svlen - dataoffset;
258	}
259	else
260	{
261	/* read: grow scalar as necessary */
262	svptr = SvGROW (data, length + dataoffset);
263	}
264
265	if (length < 0)
266	croak ("length must not be negative");
267
268	Newz (0, req, 1, aio_cb);
269
270	if (!req)
271	croak ("out of memory during aio_req allocation");
272
273	req->type = dowrite ? REQ_WRITE : REQ_READ;
274	req->fd = fd;
275	req->offset = offset;
276	req->length = length;
277	req->data = SvREFCNT_inc (data);
278	req->dataptr = (char *)svptr + dataoffset;
279	req->callback = SvREFCNT_inc (callback);
280
281	send_req (req);
282	}
283
284	static void *	235	static void *
285	aio_proc (void *thr_arg)	236	aio_proc (void *thr_arg)
286	{	237	{
287	aio_req req;	238	aio_req req;
288	int type;	239	int type;
…		…
313		264
314	type = req->type;	265	type = req->type;
315		266
316	switch (type)	267	switch (type)
317	{	268	{
		269	#if HAVE_PREADWRITE
318	case REQ_READ: req->result = pread (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;
319	case REQ_WRITE: req->result = pwrite (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;
320	#if SYS_readahead	272	#else
		273	# error "pread/pwrite cannot be emulated, fix your os"
		274	#endif
		275
		276	#if HAVE_READAHEAD
321	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	277	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
322	#else	278	#else
		279	// TODO: emulate
323	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;	280	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
324	#endif	281	#endif
325		282
326	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	283	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
327	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	284	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
…		…
329		286
330	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;	287	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
331	case REQ_CLOSE: req->result = close (req->fd); break;	288	case REQ_CLOSE: req->result = close (req->fd); break;
332	case REQ_UNLINK: req->result = unlink (req->dataptr); break;	289	case REQ_UNLINK: req->result = unlink (req->dataptr); break;
333		290
		291	case REQ_FDATASYNC:
		292	#if HAVE_FDATASYNC
		293	req->result = fdatasync (req->fd); break;
		294	#endif
334	case REQ_FSYNC: req->result = fsync (req->fd); break;	295	case REQ_FSYNC: req->result = fsync (req->fd); break;
335	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
336		296
337	case REQ_QUIT:	297	case REQ_QUIT:
338	break;	298	break;
339		299
340	default:	300	default:
…		…
446	send_req (req);	406	send_req (req);
447	}	407	}
448		408
449	void	409	void
450	aio_close(fh,callback=&PL_sv_undef)	410	aio_close(fh,callback=&PL_sv_undef)
451	InputStream fh	411	SV * fh
452	SV * callback	412	SV * callback
453	PROTOTYPE: $;$	413	PROTOTYPE: $;$
454	ALIAS:	414	ALIAS:
455	aio_close = REQ_CLOSE	415	aio_close = REQ_CLOSE
456	aio_fsync = REQ_FSYNC	416	aio_fsync = REQ_FSYNC
457	aio_fdatasync = REQ_FDATASYNC	417	aio_fdatasync = REQ_FDATASYNC
…		…
463		423
464	if (!req)	424	if (!req)
465	croak ("out of memory during aio_req allocation");	425	croak ("out of memory during aio_req allocation");
466		426
467	req->type = ix;	427	req->type = ix;
		428	req->fh = newSVsv (fh);
468	req->fd = PerlIO_fileno (fh);	429	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
469	req->callback = SvREFCNT_inc (callback);	430	req->callback = SvREFCNT_inc (callback);
470		431
471	send_req (req);	432	send_req (req);
472	}	433	}
473		434
474	void	435	void
475	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)	436	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
476	InputStream fh	437	SV * fh
477	UV offset	438	UV offset
478	IV length	439	IV length
479	SV * data	440	SV * data
480	IV dataoffset	441	IV dataoffset
481	SV * callback	442	SV * callback
		443	ALIAS:
		444	aio_read = REQ_READ
		445	aio_write = REQ_WRITE
482	PROTOTYPE: $$$$$;$	446	PROTOTYPE: $$$$$;$
483	CODE:	447	CODE:
484	read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);	448	{
		449	aio_req req;
		450	STRLEN svlen;
		451	char *svptr = SvPV (data, svlen);
485		452
486	void	453	SvUPGRADE (data, SVt_PV);
487	aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)	454	SvPOK_on (data);
488	OutputStream fh	455
489	UV offset	456	if (dataoffset < 0)
490	IV length	457	dataoffset += svlen;
491	SV * data	458
492	IV dataoffset	459	if (dataoffset < 0 \|\| dataoffset > svlen)
493	SV * callback	460	croak ("data offset outside of string");
494	PROTOTYPE: $$$$$;$	461
495	CODE:	462	if (ix == REQ_WRITE)
496	read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);	463	{
		464	/* write: check length and adjust. */
		465	if (length < 0 \|\| length + dataoffset > svlen)
		466	length = svlen - dataoffset;
		467	}
		468	else
		469	{
		470	/* read: grow scalar as necessary */
		471	svptr = SvGROW (data, length + dataoffset);
		472	}
		473
		474	if (length < 0)
		475	croak ("length must not be negative");
		476
		477	Newz (0, req, 1, aio_cb);
		478
		479	if (!req)
		480	croak ("out of memory during aio_req allocation");
		481
		482	req->type = ix;
		483	req->fh = newSVsv (fh);
		484	req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
		485	: IoOFP (sv_2io (fh)));
		486	req->offset = offset;
		487	req->length = length;
		488	req->data = SvREFCNT_inc (data);
		489	req->dataptr = (char *)svptr + dataoffset;
		490	req->callback = SvREFCNT_inc (callback);
		491
		492	send_req (req);
		493	}
497		494
498	void	495	void
499	aio_readahead(fh,offset,length,callback=&PL_sv_undef)	496	aio_readahead(fh,offset,length,callback=&PL_sv_undef)
500	InputStream fh	497	SV * fh
501	UV offset	498	UV offset
502	IV length	499	IV length
503	SV * callback	500	SV * callback
504	PROTOTYPE: $$$;$	501	PROTOTYPE: $$$;$
505	CODE:	502	CODE:
506	{	503	{
507	aio_req req;	504	aio_req req;
508		505
…		…
513		510
514	if (!req)	511	if (!req)
515	croak ("out of memory during aio_req allocation");	512	croak ("out of memory during aio_req allocation");
516		513
517	req->type = REQ_READAHEAD;	514	req->type = REQ_READAHEAD;
		515	req->fh = newSVsv (fh);
518	req->fd = PerlIO_fileno (fh);	516	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
519	req->offset = offset;	517	req->offset = offset;
520	req->length = length;	518	req->length = length;
521	req->callback = SvREFCNT_inc (callback);	519	req->callback = SvREFCNT_inc (callback);
522		520
523	send_req (req);	521	send_req (req);
…		…
551	req->dataptr = SvPV_nolen (req->data);	549	req->dataptr = SvPV_nolen (req->data);
552	}	550	}
553	else	551	else
554	{	552	{
555	req->type = REQ_FSTAT;	553	req->type = REQ_FSTAT;
		554	req->fh = newSVsv (fh_or_path);
556	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	555	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
557	}	556	}
558		557
559	req->callback = SvREFCNT_inc (callback);	558	req->callback = SvREFCNT_inc (callback);
560		559

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.10 by root, Wed Jul 13 00:13:09 2005 UTC vs. Revision 1.16 by root, Sun Jul 31 18:20:07 2005 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.10 by root, Wed Jul 13 00:13:09 2005 UTC vs.
Revision 1.16 by root, Sun Jul 31 18:20:07 2005 UTC