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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.6 by root, Mon Jul 11 01:03:17 2005 UTC vs.
Revision 1.18 by root, Sun Jul 31 19:00:31 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>
		14
		15	#ifndef _REENTRANT
		16	# define _REENTRANT 1
		17	#endif
11	#include <endian.h>	18	#include <errno.h>
12		19
13	#include <pthread.h>	20	#include <pthread.h>
14	#include <sys/syscall.h>
15		21
16	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */	22	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 ;) */	23	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 ;) */	24	typedef void InOutStream; / hack, but 5.6.1 is simply toooo old ;) */
19		25
40	off_t offset;	46	off_t offset;
41	size_t length;	47	size_t length;
42	ssize_t result;	48	ssize_t result;
43	mode_t mode; /* open */	49	mode_t mode; /* open */
44	int errorno;	50	int errorno;
45	SV data, callback;	51	SV data, callback, *fh;
46	void *dataptr;	52	void *dataptr;
47	STRLEN dataoffset;	53	STRLEN dataoffset;
48		54
49	Stat_t *statdata;	55	Stat_t *statdata;
50	} aio_cb;	56	} aio_cb;
51		57
52	typedef aio_cb *aio_req;	58	typedef aio_cb *aio_req;
53		59
54	static int started;	60	static int started;
55	static int nreqs;	61	static volatile int nreqs;
56	static int max_outstanding = 1<<30;	62	static int max_outstanding = 1<<30;
57	static int respipe [2];	63	static int respipe [2];
58		64
59	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	65	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
60	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	66	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
…		…
64	static volatile aio_req ress, rese; /* queue start, queue end */	70	static volatile aio_req ress, rese; /* queue start, queue end */
65		71
66	static void	72	static void
67	poll_wait ()	73	poll_wait ()
68	{	74	{
69	if (!nreqs)	75	if (nreqs && !ress)
70	return;	76	{
71
72	fd_set rfd;	77	fd_set rfd;
73	FD_ZERO(&rfd);	78	FD_ZERO(&rfd);
74	FD_SET(respipe [0], &rfd);	79	FD_SET(respipe [0], &rfd);
75		80
76	select (respipe [0] + 1, &rfd, 0, 0, 0);	81	select (respipe [0] + 1, &rfd, 0, 0, 0);
		82	}
77	}	83	}
78		84
79	static int	85	static int
80	poll_cb ()	86	poll_cb ()
81	{	87	{
82	dSP;	88	dSP;
83	int count = 0;	89	int count = 0;
84	aio_req req;	90	aio_req req, prv;
85		91
		92	pthread_mutex_lock (&reslock);
		93
86	{	94	{
87	/* read and signals sent by the worker threads */	95	/* read any signals sent by the worker threads */
88	char buf [32];	96	char buf [32];
89	while (read (respipe [0], buf, 32) > 0)	97	while (read (respipe [0], buf, 32) > 0)
90	;	98	;
91	}	99	}
92		100
93	for (;;)	101	req = ress;
		102	ress = rese = 0;
		103
		104	pthread_mutex_unlock (&reslock);
		105
		106	while (req)
94	{	107	{
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--;	108	nreqs--;
111		109
112	if (req->type == REQ_QUIT)	110	if (req->type == REQ_QUIT)
113	started--;	111	started--;
114	else	112	else
…		…
121	+ req->result > 0 ? req->result : 0);	119	+ req->result > 0 ? req->result : 0);
122		120
123	if (req->data)	121	if (req->data)
124	SvREFCNT_dec (req->data);	122	SvREFCNT_dec (req->data);
125		123
		124	if (req->fh)
		125	SvREFCNT_dec (req->fh);
		126
126	if (req->type == REQ_STAT \|\| req->type == REQ_LSTAT \|\| req->type == REQ_FSTAT)	127	if (req->type == REQ_STAT \|\| req->type == REQ_LSTAT \|\| req->type == REQ_FSTAT)
127	{	128	{
128	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;	129	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
129	PL_laststatval = req->result;	130	PL_laststatval = req->result;
130	PL_statcache = *(req->statdata);	131	PL_statcache = *(req->statdata);
131		132
132	Safefree (req->statdata);	133	Safefree (req->statdata);
133	}	134	}
134		135
		136	ENTER;
135	PUSHMARK (SP);	137	PUSHMARK (SP);
136	XPUSHs (sv_2mortal (newSViv (req->result)));	138	XPUSHs (sv_2mortal (newSViv (req->result)));
137		139
138	if (req->type == REQ_OPEN)	140	if (req->type == REQ_OPEN)
139	{	141	{
…		…
142		144
143	PUTBACK;	145	PUTBACK;
144	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	146	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
145	SPAGAIN;	147	SPAGAIN;
146		148
147	fh = POPs;	149	fh = SvREFCNT_inc (POPs);
148		150
149	PUSHMARK (SP);	151	PUSHMARK (SP);
150	XPUSHs (fh);	152	XPUSHs (sv_2mortal (fh));
151	}	153	}
152		154
		155	if (SvOK (req->callback))
		156	{
153	PUTBACK;	157	PUTBACK;
154	call_sv (req->callback, G_VOID \| G_EVAL);	158	call_sv (req->callback, G_VOID \| G_EVAL);
155	SPAGAIN;	159	SPAGAIN;
		160	}
		161
		162	LEAVE;
156		163
157	if (req->callback)	164	if (req->callback)
158	SvREFCNT_dec (req->callback);	165	SvREFCNT_dec (req->callback);
159		166
160	errno = errorno;	167	errno = errorno;
161	count++;	168	count++;
162	}	169	}
163		170
		171	prv = req;
		172	req = req->next;
164	Safefree (req);	173	Safefree (prv);
		174
		175	/* TODO: croak on errors? */
165	}	176	}
166		177
167	return count;	178	return count;
168	}	179	}
169		180
…		…
224	req->type = REQ_QUIT;	235	req->type = REQ_QUIT;
225		236
226	send_req (req);	237	send_req (req);
227	}	238	}
228		239
229	static void	240	/* work around various missing functions */
230	read_write (int dowrite, int fd, off_t offset, size_t length,
231	SV data, STRLEN dataoffset, SV callback)
232	{
233	aio_req req;
234	STRLEN svlen;
235	char *svptr = SvPV (data, svlen);
236		241
237	SvUPGRADE (data, SVt_PV);	242	#if !HAVE_PREADWRITE
238	SvPOK_on (data);	243	# define pread aio_pread
		244	# define pwrite aio_pwrite
239		245
240	if (dataoffset < 0)	246	/*
241	dataoffset += svlen;	247	* make our pread/pwrite safe against themselves, but not against
		248	* normal read/write by using a mutex. slows down execution a lot,
		249	* but that's your problem, not mine.
		250	*/
		251	static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER;
242		252
243	if (dataoffset < 0 \|\| dataoffset > svlen)	253	static ssize_t
244	croak ("data offset outside of string");	254	pread (int fd, void *buf, size_t count, off_t offset)
		255	{
		256	ssize_t res;
		257	off_t ooffset;
245		258
246	if (dowrite)	259	pthread_mutex_lock (&iolock);
		260	ooffset = lseek (fd, 0, SEEK_CUR);
		261	lseek (fd, offset, SEEK_SET);
		262	res = read (fd, buf, count);
		263	lseek (fd, ooffset, SEEK_SET);
		264	pthread_mutex_unlock (&iolock);
		265
		266	return res;
		267	}
		268
		269	static ssize_t
		270	pwrite (int fd, void *buf, size_t count, off_t offset)
		271	{
		272	ssize_t res;
		273	off_t ooffset;
		274
		275	pthread_mutex_lock (&iolock);
		276	ooffset = lseek (fd, 0, SEEK_CUR);
		277	lseek (fd, offset, SEEK_SET);
		278	res = write (fd, buf, count);
		279	lseek (fd, offset, SEEK_SET);
		280	pthread_mutex_unlock (&iolock);
		281
		282	return res;
		283	}
		284	#endif
		285
		286	#if !HAVE_FDATASYNC
		287	# define fdatasync fsync
		288	#endif
		289
		290	#if !HAVE_READAHEAD
		291	# define readahead aio_readahead
		292
		293	static char readahead_buf[4096];
		294
		295	static ssize_t
		296	readahead (int fd, off_t offset, size_t count)
		297	{
		298	while (count > 0)
247	{	299	{
248	/* write: check length and adjust. */	300	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
249	if (length < 0 \|\| length + dataoffset > svlen)	301
250	length = svlen - dataoffset;	302	pread (fd, readahead_buf, len, offset);
		303	offset += len;
		304	count -= len;
251	}	305	}
252	else
253	{
254	/* read: grow scalar as necessary */
255	svptr = SvGROW (data, length + dataoffset);
256	}
257		306
258	if (length < 0)	307	errno = 0;
259	croak ("length must not be negative");
260
261	Newz (0, req, 1, aio_cb);
262
263	if (!req)
264	croak ("out of memory during aio_req allocation");
265
266	req->type = dowrite ? REQ_WRITE : REQ_READ;
267	req->fd = fd;
268	req->offset = offset;
269	req->length = length;
270	req->data = SvREFCNT_inc (data);
271	req->dataptr = (char *)svptr + dataoffset;
272	req->callback = SvREFCNT_inc (callback);
273
274	send_req (req);
275	}	308	}
		309	#endif
276		310
277	static void *	311	static void *
278	aio_proc (void *thr_arg)	312	aio_proc (void *thr_arg)
279	{	313	{
280	aio_req req;	314	aio_req req;
…		…
306		340
307	type = req->type;	341	type = req->type;
308		342
309	switch (type)	343	switch (type)
310	{	344	{
311	case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset); break;	345	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
312	case REQ_WRITE: req->result = pwrite64 (req->fd, req->dataptr, req->length, req->offset); break;	346	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
313	#if SYS_readahead	347
314	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	348	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
315	#else
316	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
317	#endif
318		349
319	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	350	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
320	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	351	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
321	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	352	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
322		353
323	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;	354	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
324	case REQ_CLOSE: req->result = close (req->fd); break;	355	case REQ_CLOSE: req->result = close (req->fd); break;
325	case REQ_UNLINK: req->result = unlink (req->dataptr); break;	356	case REQ_UNLINK: req->result = unlink (req->dataptr); break;
326		357
		358	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
327	case REQ_FSYNC: req->result = fsync (req->fd); break;	359	case REQ_FSYNC: req->result = fsync (req->fd); break;
328	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
329		360
330	case REQ_QUIT:	361	case REQ_QUIT:
331	break;	362	break;
332		363
333	default:	364	default:
…		…
361	return 0;	392	return 0;
362	}	393	}
363		394
364	MODULE = IO::AIO PACKAGE = IO::AIO	395	MODULE = IO::AIO PACKAGE = IO::AIO
365		396
		397	PROTOTYPES: ENABLE
		398
366	BOOT:	399	BOOT:
367	{	400	{
368	if (pipe (respipe))	401	if (pipe (respipe))
369	croak ("unable to initialize result pipe");	402	croak ("unable to initialize result pipe");
370		403
…		…
410	CODE:	443	CODE:
411	RETVAL = max_outstanding;	444	RETVAL = max_outstanding;
412	max_outstanding = nreqs;	445	max_outstanding = nreqs;
413		446
414	void	447	void
415	aio_open(pathname,flags,mode,callback)	448	aio_open(pathname,flags,mode,callback=&PL_sv_undef)
416	SV * pathname	449	SV * pathname
417	int flags	450	int flags
418	int mode	451	int mode
419	SV * callback	452	SV * callback
420	PROTOTYPE: $$$$	453	PROTOTYPE: $$$;$
421	CODE:	454	CODE:
422	{	455	{
423	aio_req req;	456	aio_req req;
424		457
425	Newz (0, req, 1, aio_cb);	458	Newz (0, req, 1, aio_cb);
…		…
436		469
437	send_req (req);	470	send_req (req);
438	}	471	}
439		472
440	void	473	void
441	aio_close(fh,callback)	474	aio_close(fh,callback=&PL_sv_undef)
442	InputStream fh	475	SV * fh
443	SV * callback	476	SV * callback
444	PROTOTYPE: $$	477	PROTOTYPE: $;$
445	ALIAS:	478	ALIAS:
446	aio_close = REQ_CLOSE	479	aio_close = REQ_CLOSE
447	aio_fsync = REQ_FSYNC	480	aio_fsync = REQ_FSYNC
448	aio_fdatasync = REQ_FDATASYNC	481	aio_fdatasync = REQ_FDATASYNC
449	CODE:	482	CODE:
…		…
454		487
455	if (!req)	488	if (!req)
456	croak ("out of memory during aio_req allocation");	489	croak ("out of memory during aio_req allocation");
457		490
458	req->type = ix;	491	req->type = ix;
		492	req->fh = newSVsv (fh);
459	req->fd = PerlIO_fileno (fh);	493	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
460	req->callback = SvREFCNT_inc (callback);	494	req->callback = SvREFCNT_inc (callback);
461		495
462	send_req (req);	496	send_req (req);
463	}	497	}
464		498
465	void	499	void
466	aio_read(fh,offset,length,data,dataoffset,callback)	500	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
467	InputStream fh	501	SV * fh
468	UV offset	502	UV offset
469	IV length	503	IV length
470	SV * data	504	SV * data
471	IV dataoffset	505	IV dataoffset
472	SV * callback	506	SV * callback
		507	ALIAS:
		508	aio_read = REQ_READ
		509	aio_write = REQ_WRITE
473	PROTOTYPE: $$$$$$	510	PROTOTYPE: $$$$$;$
474	CODE:	511	CODE:
475	read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
476
477	void
478	aio_write(fh,offset,length,data,dataoffset,callback)
479	OutputStream fh
480	UV offset
481	IV length
482	SV * data
483	IV dataoffset
484	SV * callback
485	PROTOTYPE: $$$$$$
486	CODE:
487	read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
488
489	void
490	aio_readahead(fh,offset,length,callback)
491	InputStream fh
492	UV offset
493	IV length
494	SV * callback
495	PROTOTYPE: $$$$
496	CODE:
497	{	512	{
498	aio_req req;	513	aio_req req;
		514	STRLEN svlen;
		515	char *svptr = SvPV (data, svlen);
		516
		517	SvUPGRADE (data, SVt_PV);
		518	SvPOK_on (data);
		519
		520	if (dataoffset < 0)
		521	dataoffset += svlen;
		522
		523	if (dataoffset < 0 \|\| dataoffset > svlen)
		524	croak ("data offset outside of string");
		525
		526	if (ix == REQ_WRITE)
		527	{
		528	/* write: check length and adjust. */
		529	if (length < 0 \|\| length + dataoffset > svlen)
		530	length = svlen - dataoffset;
		531	}
		532	else
		533	{
		534	/* read: grow scalar as necessary */
		535	svptr = SvGROW (data, length + dataoffset);
		536	}
499		537
500	if (length < 0)	538	if (length < 0)
501	croak ("length must not be negative");	539	croak ("length must not be negative");
502		540
503	Newz (0, req, 1, aio_cb);	541	Newz (0, req, 1, aio_cb);
504		542
505	if (!req)	543	if (!req)
506	croak ("out of memory during aio_req allocation");	544	croak ("out of memory during aio_req allocation");
507		545
		546	req->type = ix;
		547	req->fh = newSVsv (fh);
		548	req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
		549	: IoOFP (sv_2io (fh)));
		550	req->offset = offset;
		551	req->length = length;
		552	req->data = SvREFCNT_inc (data);
		553	req->dataptr = (char *)svptr + dataoffset;
		554	req->callback = SvREFCNT_inc (callback);
		555
		556	send_req (req);
		557	}
		558
		559	void
		560	aio_readahead(fh,offset,length,callback=&PL_sv_undef)
		561	SV * fh
		562	UV offset
		563	IV length
		564	SV * callback
		565	PROTOTYPE: $$$;$
		566	CODE:
		567	{
		568	aio_req req;
		569
		570	if (length < 0)
		571	croak ("length must not be negative");
		572
		573	Newz (0, req, 1, aio_cb);
		574
		575	if (!req)
		576	croak ("out of memory during aio_req allocation");
		577
508	req->type = REQ_READAHEAD;	578	req->type = REQ_READAHEAD;
		579	req->fh = newSVsv (fh);
509	req->fd = PerlIO_fileno (fh);	580	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
510	req->offset = offset;	581	req->offset = offset;
511	req->length = length;	582	req->length = length;
512	req->callback = SvREFCNT_inc (callback);	583	req->callback = SvREFCNT_inc (callback);
513		584
514	send_req (req);	585	send_req (req);
515	}	586	}
516		587
517	void	588	void
518	aio_stat(fh_or_path,callback)	589	aio_stat(fh_or_path,callback=&PL_sv_undef)
519	SV * fh_or_path	590	SV * fh_or_path
520	SV * callback	591	SV * callback
521	PROTOTYPE: $$
522	ALIAS:	592	ALIAS:
		593	aio_stat = REQ_STAT
523	aio_lstat = 1	594	aio_lstat = REQ_LSTAT
524	CODE:	595	CODE:
525	{	596	{
526	aio_req req;	597	aio_req req;
527		598
528	Newz (0, req, 1, aio_cb);	599	Newz (0, req, 1, aio_cb);
…		…
535	if (!req->statdata)	606	if (!req->statdata)
536	croak ("out of memory during aio_req->statdata allocation");	607	croak ("out of memory during aio_req->statdata allocation");
537		608
538	if (SvPOK (fh_or_path))	609	if (SvPOK (fh_or_path))
539	{	610	{
540	req->type = ix ? REQ_LSTAT : REQ_STAT;	611	req->type = ix;
541	req->data = newSVsv (fh_or_path);	612	req->data = newSVsv (fh_or_path);
542	req->dataptr = SvPV_nolen (req->data);	613	req->dataptr = SvPV_nolen (req->data);
543	}	614	}
544	else	615	else
545	{	616	{
546	req->type = REQ_FSTAT;	617	req->type = REQ_FSTAT;
		618	req->fh = newSVsv (fh_or_path);
547	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	619	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
548	}	620	}
549		621
550	req->callback = SvREFCNT_inc (callback);	622	req->callback = SvREFCNT_inc (callback);
551		623
552	send_req (req);	624	send_req (req);
553	}	625	}
554		626
555	void	627	void
556	aio_unlink(pathname,callback)	628	aio_unlink(pathname,callback=&PL_sv_undef)
557	SV * pathname	629	SV * pathname
558	SV * callback	630	SV * callback
559	PROTOTYPE: $$
560	CODE:	631	CODE:
561	{	632	{
562	aio_req req;	633	aio_req req;
563		634
564	Newz (0, req, 1, aio_cb);	635	Newz (0, req, 1, aio_cb);
…		…
582	{	653	{
583	poll_wait ();	654	poll_wait ();
584	poll_cb ();	655	poll_cb ();
585	}	656	}
586		657
		658	void
		659	poll()
		660	PROTOTYPE:
		661	CODE:
		662	if (nreqs)
		663	{
		664	poll_wait ();
		665	poll_cb ();
		666	}
		667
587	int	668	int
588	poll_fileno()	669	poll_fileno()
589	PROTOTYPE:	670	PROTOTYPE:
590	CODE:	671	CODE:
591	RETVAL = respipe [0];	672	RETVAL = respipe [0];

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.6 by root, Mon Jul 11 01:03:17 2005 UTC vs. Revision 1.18 by root, Sun Jul 31 19:00:31 2005 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.6 by root, Mon Jul 11 01:03:17 2005 UTC vs.
Revision 1.18 by root, Sun Jul 31 19:00:31 2005 UTC