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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.12 by root, Wed Jul 20 21:57:04 2005 UTC vs.
Revision 1.16 by root, Sun Jul 31 18:20:07 2005 UTC

…		…
1	#define _XOPEN_SOURCE 500
2
3	#include "EXTERN.h"	1	#include "EXTERN.h"
4	#include "perl.h"	2	#include "perl.h"
5	#include "XSUB.h"	3	#include "XSUB.h"
		4
		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;
…		…
117	+ req->result > 0 ? req->result : 0);	114	+ req->result > 0 ? req->result : 0);
118		115
119	if (req->data)	116	if (req->data)
120	SvREFCNT_dec (req->data);	117	SvREFCNT_dec (req->data);
121		118
		119	if (req->fh)
		120	SvREFCNT_dec (req->fh);
		121
122	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)
123	{	123	{
124	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;	124	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
125	PL_laststatval = req->result;	125	PL_laststatval = req->result;
126	PL_statcache = *(req->statdata);	126	PL_statcache = *(req->statdata);
127		127
128	Safefree (req->statdata);	128	Safefree (req->statdata);
129	}	129	}
130		130
		131	ENTER;
131	PUSHMARK (SP);	132	PUSHMARK (SP);
132	XPUSHs (sv_2mortal (newSViv (req->result)));	133	XPUSHs (sv_2mortal (newSViv (req->result)));
133		134
134	if (req->type == REQ_OPEN)	135	if (req->type == REQ_OPEN)
135	{	136	{
…		…
138		139
139	PUTBACK;	140	PUTBACK;
140	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	141	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
141	SPAGAIN;	142	SPAGAIN;
142		143
143	fh = POPs;	144	fh = SvREFCNT_inc (POPs);
144		145
145	PUSHMARK (SP);	146	PUSHMARK (SP);
146	XPUSHs (fh);	147	XPUSHs (sv_2mortal (fh));
147	}	148	}
148		149
149	if (SvOK (req->callback))	150	if (SvOK (req->callback))
150	{	151	{
151	PUTBACK;	152	PUTBACK;
152	call_sv (req->callback, G_VOID \| G_EVAL);	153	call_sv (req->callback, G_VOID \| G_EVAL);
153	SPAGAIN;	154	SPAGAIN;
154	}	155	}
		156
		157	LEAVE;
155		158
156	if (req->callback)	159	if (req->callback)
157	SvREFCNT_dec (req->callback);	160	SvREFCNT_dec (req->callback);
158		161
159	errno = errorno;	162	errno = errorno;
…		…
227	req->type = REQ_QUIT;	230	req->type = REQ_QUIT;
228		231
229	send_req (req);	232	send_req (req);
230	}	233	}
231		234
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 *	235	static void *
281	aio_proc (void *thr_arg)	236	aio_proc (void *thr_arg)
282	{	237	{
283	aio_req req;	238	aio_req req;
284	int type;	239	int type;
…		…
309		264
310	type = req->type;	265	type = req->type;
311		266
312	switch (type)	267	switch (type)
313	{	268	{
		269	#if HAVE_PREADWRITE
314	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;
315	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;
316	#if SYS_readahead	272	#else
		273	# error "pread/pwrite cannot be emulated, fix your os"
		274	#endif
		275
		276	#if HAVE_READAHEAD
317	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;
318	#else	278	#else
		279	// TODO: emulate
319	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;	280	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
320	#endif	281	#endif
321		282
322	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	283	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
323	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	284	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
…		…
325		286
326	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;
327	case REQ_CLOSE: req->result = close (req->fd); break;	288	case REQ_CLOSE: req->result = close (req->fd); break;
328	case REQ_UNLINK: req->result = unlink (req->dataptr); break;	289	case REQ_UNLINK: req->result = unlink (req->dataptr); break;
329		290
		291	case REQ_FDATASYNC:
		292	#if HAVE_FDATASYNC
		293	req->result = fdatasync (req->fd); break;
		294	#endif
330	case REQ_FSYNC: req->result = fsync (req->fd); break;	295	case REQ_FSYNC: req->result = fsync (req->fd); break;
331	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
332		296
333	case REQ_QUIT:	297	case REQ_QUIT:
334	break;	298	break;
335		299
336	default:	300	default:
…		…
442	send_req (req);	406	send_req (req);
443	}	407	}
444		408
445	void	409	void
446	aio_close(fh,callback=&PL_sv_undef)	410	aio_close(fh,callback=&PL_sv_undef)
447	InputStream fh	411	SV * fh
448	SV * callback	412	SV * callback
449	PROTOTYPE: $;$	413	PROTOTYPE: $;$
450	ALIAS:	414	ALIAS:
451	aio_close = REQ_CLOSE	415	aio_close = REQ_CLOSE
452	aio_fsync = REQ_FSYNC	416	aio_fsync = REQ_FSYNC
453	aio_fdatasync = REQ_FDATASYNC	417	aio_fdatasync = REQ_FDATASYNC
…		…
459		423
460	if (!req)	424	if (!req)
461	croak ("out of memory during aio_req allocation");	425	croak ("out of memory during aio_req allocation");
462		426
463	req->type = ix;	427	req->type = ix;
		428	req->fh = newSVsv (fh);
464	req->fd = PerlIO_fileno (fh);	429	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
465	req->callback = SvREFCNT_inc (callback);	430	req->callback = SvREFCNT_inc (callback);
466		431
467	send_req (req);	432	send_req (req);
468	}	433	}
469		434
470	void	435	void
471	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)	436	aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
472	InputStream fh	437	SV * fh
473	UV offset	438	UV offset
474	IV length	439	IV length
475	SV * data	440	SV * data
476	IV dataoffset	441	IV dataoffset
477	SV * callback	442	SV * callback
		443	ALIAS:
		444	aio_read = REQ_READ
		445	aio_write = REQ_WRITE
478	PROTOTYPE: $$$$$;$	446	PROTOTYPE: $$$$$;$
479	CODE:	447	CODE:
480	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);
481		452
482	void	453	SvUPGRADE (data, SVt_PV);
483	aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)	454	SvPOK_on (data);
484	OutputStream fh	455
485	UV offset	456	if (dataoffset < 0)
486	IV length	457	dataoffset += svlen;
487	SV * data	458
488	IV dataoffset	459	if (dataoffset < 0 \|\| dataoffset > svlen)
489	SV * callback	460	croak ("data offset outside of string");
490	PROTOTYPE: $$$$$;$	461
491	CODE:	462	if (ix == REQ_WRITE)
492	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	}
493		494
494	void	495	void
495	aio_readahead(fh,offset,length,callback=&PL_sv_undef)	496	aio_readahead(fh,offset,length,callback=&PL_sv_undef)
496	InputStream fh	497	SV * fh
497	UV offset	498	UV offset
498	IV length	499	IV length
499	SV * callback	500	SV * callback
500	PROTOTYPE: $$$;$	501	PROTOTYPE: $$$;$
501	CODE:	502	CODE:
502	{	503	{
503	aio_req req;	504	aio_req req;
504		505
…		…
509		510
510	if (!req)	511	if (!req)
511	croak ("out of memory during aio_req allocation");	512	croak ("out of memory during aio_req allocation");
512		513
513	req->type = REQ_READAHEAD;	514	req->type = REQ_READAHEAD;
		515	req->fh = newSVsv (fh);
514	req->fd = PerlIO_fileno (fh);	516	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
515	req->offset = offset;	517	req->offset = offset;
516	req->length = length;	518	req->length = length;
517	req->callback = SvREFCNT_inc (callback);	519	req->callback = SvREFCNT_inc (callback);
518		520
519	send_req (req);	521	send_req (req);
…		…
547	req->dataptr = SvPV_nolen (req->data);	549	req->dataptr = SvPV_nolen (req->data);
548	}	550	}
549	else	551	else
550	{	552	{
551	req->type = REQ_FSTAT;	553	req->type = REQ_FSTAT;
		554	req->fh = newSVsv (fh_or_path);
552	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	555	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
553	}	556	}
554		557
555	req->callback = SvREFCNT_inc (callback);	558	req->callback = SvREFCNT_inc (callback);
556		559

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.12 by root, Wed Jul 20 21:57:04 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.12 by root, Wed Jul 20 21:57:04 2005 UTC vs.
Revision 1.16 by root, Sun Jul 31 18:20:07 2005 UTC