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

Comparing Linux-AIO/AIO.xs (file contents):
Revision 1.19 by root, Fri May 7 00:57:29 2004 UTC vs.
Revision 1.28 by root, Sat Jul 9 04:02:54 2005 UTC

…		…
8	#include <sys/stat.h>	8	#include <sys/stat.h>
9	#include <unistd.h>	9	#include <unistd.h>
10	#include <fcntl.h>	10	#include <fcntl.h>
11	#include <signal.h>	11	#include <signal.h>
12	#include <sched.h>	12	#include <sched.h>
		13	#include <endian.h>
13		14
14	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */	15	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */
15	typedef void OutputStream; / hack, but 5.6.1 is simply toooo old ;) */	16	typedef void OutputStream; / hack, but 5.6.1 is simply toooo old ;) */
16	typedef void InOutStream; / hack, but 5.6.1 is simply toooo old ;) */	17	typedef void InOutStream; / hack, but 5.6.1 is simply toooo old ;) */
17		18
18	#ifndef __NR_pread64	19	#if __i386 \|\| __amd64
19	# define __NR_pread64 __NR_pread	20	# define STACKSIZE ( 256 * sizeof (long))
		21	#elif __ia64
		22	# define STACKSIZE (8192 * sizeof (long))
		23	#else
		24	# define STACKSIZE ( 512 * sizeof (long))
20	#endif	25	#endif
21	#ifndef __NR_pwrite64
22	# define __NR_pwrite64 __NR_pwrite
23	#endif
24		26
25	#define STACKSIZE 1024 /* yeah */	27	enum {
26		28	REQ_QUIT,
27	enum { REQ_QUIT, REQ_OPEN, REQ_CLOSE, REQ_READ, REQ_WRITE, REQ_STAT, REQ_LSTAT, REQ_FSTAT};	29	REQ_OPEN, REQ_CLOSE, REQ_READ, REQ_WRITE,
		30	REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK
		31	};
28		32
29	typedef struct {	33	typedef struct {
30	char stack[STACKSIZE];	34	char stack[STACKSIZE];
31	} aio_thread;	35	} aio_thread;
32		36
…		…
44	int errorno;	48	int errorno;
45	SV data, callback;	49	SV data, callback;
46	void *dataptr;	50	void *dataptr;
47	STRLEN dataoffset;	51	STRLEN dataoffset;
48		52
49	struct stat64 *statdata;	53	Stat_t *statdata;
50	} aio_cb;	54	} aio_cb;
51		55
52	typedef aio_cb *aio_req;	56	typedef aio_cb *aio_req;
53		57
54	static int started;	58	static int started;
…		…
65	aio_thread *thr;	69	aio_thread *thr;
66		70
67	New (0, thr, 1, aio_thread);	71	New (0, thr, 1, aio_thread);
68		72
69	if (clone (aio_proc,	73	if (clone (aio_proc,
70	&(thr->stack[STACKSIZE]),	74	&(thr->stack[STACKSIZE - 16]),
71	CLONE_VM\|CLONE_FS\|CLONE_FILES\|CLONE_SIGHAND,	75	CLONE_VM\|CLONE_FS\|CLONE_FILES,
72	thr) >= 0)	76	thr) >= 0)
73	started++;	77	started++;
74	else	78	else
75	Safefree (thr);	79	Safefree (thr);
76	}	80	}
…		…
91	{	95	{
92	nreqs++;	96	nreqs++;
93	req->next = 0;	97	req->next = 0;
94		98
95	if (qe)	99	if (qe)
		100	{
96	qe->next = req;	101	qe->next = req;
		102	qe = req;
		103	}
97	else	104	else
98	qe = qs = req;	105	qe = qs = req;
99		106
100	send_reqs ();	107	send_reqs ();
101	}	108	}
…		…
157	req->callback = SvREFCNT_inc (callback);	164	req->callback = SvREFCNT_inc (callback);
158		165
159	send_req (req);	166	send_req (req);
160	}	167	}
161		168
		169	static void
		170	poll_wait ()
		171	{
		172	fd_set rfd;
		173	FD_ZERO(&rfd);
		174	FD_SET(respipe[0], &rfd);
		175
		176	select (respipe[0] + 1, &rfd, 0, 0, 0);
		177	}
		178
162	static int	179	static int
163	poll_cb (pTHX)	180	poll_cb (pTHX)
164	{	181	{
165	dSP;	182	dSP;
166	int count = 0;	183	int count = 0;
167	aio_req req;	184	aio_req req;
168		185
169	while (read (respipe[0], (void *)&req, sizeof (req)) == sizeof (req))	186	while (read (respipe[0], (void *)&req, sizeof (req)) == sizeof (req))
170	{	187	{
		188	nreqs--;
		189
171	if (req->type == REQ_QUIT)	190	if (req->type == REQ_QUIT)
172	{	191	{
173	Safefree (req->thread);	192	Safefree (req->thread);
174	started--;	193	started--;
175	}	194	}
…		…
185	if (req->data)	204	if (req->data)
186	SvREFCNT_dec (req->data);	205	SvREFCNT_dec (req->data);
187		206
188	if (req->type == REQ_STAT \|\| req->type == REQ_LSTAT \|\| req->type == REQ_FSTAT)	207	if (req->type == REQ_STAT \|\| req->type == REQ_LSTAT \|\| req->type == REQ_FSTAT)
189	{	208	{
190	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;	209	PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
191	PL_laststatval = req->result;	210	PL_laststatval = req->result;
192	PL_statcache.st_dev = req->statdata->st_dev;	211	PL_statcache = *(req->statdata);
193	PL_statcache.st_ino = req->statdata->st_ino;
194	PL_statcache.st_mode = req->statdata->st_mode;
195	PL_statcache.st_nlink = req->statdata->st_nlink;
196	PL_statcache.st_uid = req->statdata->st_uid;
197	PL_statcache.st_gid = req->statdata->st_gid;
198	PL_statcache.st_rdev = req->statdata->st_rdev;
199	PL_statcache.st_size = req->statdata->st_size;
200	PL_statcache.st_atime = req->statdata->st_atime;
201	PL_statcache.st_mtime = req->statdata->st_mtime;
202	PL_statcache.st_ctime = req->statdata->st_ctime;
203	PL_statcache.st_blksize = req->statdata->st_blksize;
204	PL_statcache.st_blocks = req->statdata->st_blocks;
205		212
206	Safefree (req->statdata);	213	Safefree (req->statdata);
207	}	214	}
208		215
209	PUSHMARK (SP);	216	PUSHMARK (SP);
…		…
214		221
215	if (req->callback)	222	if (req->callback)
216	SvREFCNT_dec (req->callback);	223	SvREFCNT_dec (req->callback);
217		224
218	errno = errorno;	225	errno = errorno;
219	nreqs--;
220	count++;	226	count++;
221	}	227	}
222		228
223	Safefree (req);	229	Safefree (req);
224	}	230	}
…		…
231		237
232	static sigset_t fullsigset;	238	static sigset_t fullsigset;
233		239
234	#undef errno	240	#undef errno
235	#include <asm/unistd.h>	241	#include <asm/unistd.h>
		242	#include <linux/types.h>
		243	#include <sys/prctl.h>
		244
		245	#if BYTE_ORDER == LITTLE_ENDIAN
		246	# define LONG_LONG_PAIR(HI, LO) LO, HI
		247	#elif BYTE_ORDER == BIG_ENDIAN
		248	# define LONG_LONG_PAIR(HI, LO) HI, LO
		249	#endif
		250
		251	#if __alpha \|\| __ia64 \|\| __hppa \|\| __v850__
		252	# define stat kernelstat
		253	# define stat64 kernelstat64
		254	# include <asm/stat.h>
		255	# undef stat
		256	# undef stat64
		257	#else
		258	# define kernelstat stat
		259	# define kernelstat64 stat64
		260	#endif
		261
		262	#define COPY_STATDATA \
		263	req->statdata->st_dev = statdata.st_dev; \
		264	req->statdata->st_ino = statdata.st_ino; \
		265	req->statdata->st_mode = statdata.st_mode; \
		266	req->statdata->st_nlink = statdata.st_nlink; \
		267	req->statdata->st_uid = statdata.st_uid; \
		268	req->statdata->st_gid = statdata.st_gid; \
		269	req->statdata->st_rdev = statdata.st_rdev; \
		270	req->statdata->st_size = statdata.st_size; \
		271	req->statdata->st_atime = statdata.st_atime; \
		272	req->statdata->st_mtime = statdata.st_mtime; \
		273	req->statdata->st_ctime = statdata.st_ctime; \
		274	req->statdata->st_blksize = statdata.st_blksize; \
		275	req->statdata->st_blocks = statdata.st_blocks; \
236		276
237	static int	277	static int
238	aio_proc (void *thr_arg)	278	aio_proc (void *thr_arg)
239	{	279	{
240	aio_thread *thr = thr_arg;	280	aio_thread *thr = thr_arg;
241	aio_req req;	281	aio_req req;
242	int errno;	282	int errno;
243		283
244	/* this is very much x86 and kernel-specific :(:(:( */	284	/* this is very much kernel-specific :(:(:( */
245	/* we rely on gcc's ability to create closures. */	285	/* we rely on gcc's ability to create closures. */
246	_syscall3(int,read,int,fd,char *,buf,size_t,count)	286	_syscall3(__kernel_size_t,read,unsigned int,fd,char *,buf,__kernel_size_t,count)
247	_syscall3(int,write,int,fd,char *,buf,size_t,count)	287	_syscall3(__kernel_size_t,write,unsigned int,fd,char *,buf,__kernel_size_t,count)
248		288
249	_syscall3(int,open,char *,pathname,int,flags,mode_t,mode)	289	_syscall3(int,open,char *,pathname,int,flags,int,mode)
250	_syscall1(int,close,int,fd)	290	_syscall1(int,close,unsigned int,fd)
251		291
		292	#ifndef __NR_pread64
		293	# define __NR_pread64 __NR_pread
		294	# define __NR_pwrite64 __NR_write
		295	#endif
252	_syscall5(int,pread64,int,fd,char *,buf,size_t,count,unsigned int,offset_lo,unsigned int,offset_hi)	296	_syscall5(__kernel_ssize_t,pread64,unsigned int,fd,char *,buf,__kernel_size_t,count,unsigned int,offset_lh,unsigned int,offset_hl)
253	_syscall5(int,pwrite64,int,fd,char *,buf,size_t,count,unsigned int,offset_lo,unsigned int,offset_hi)	297	_syscall5(__kernel_ssize_t,pwrite64,unsigned int,fd,char *,buf,__kernel_size_t,count,unsigned int,offset_lh,unsigned int,offset_hl)
254		298
		299	#if __NR_stat64
255	_syscall2(int,stat64, const char , filename, struct stat64 , buf)	300	_syscall2(int,stat64, const char , filename, struct kernelstat64 , buf)
256	_syscall2(int,lstat64, const char , filename, struct stat64 , buf)	301	_syscall2(int,lstat64, const char , filename, struct kernelstat64 , buf)
257	_syscall2(int,fstat64, int, fd, struct stat64 *, buf)	302	_syscall2(int,fstat64, int, fd, struct kernelstat64 *, buf)
		303	#elif __NR_stat
		304	_syscall2(int,stat, const char , filename, struct kernelstat , buf)
		305	_syscall2(int,lstat, const char , filename, struct kernelstat , buf)
		306	_syscall2(int,fstat, int, fd, struct kernelstat *, buf)
		307	#else
		308	# error "neither stat64 nor stat defined"
		309	#endif
		310
		311	_syscall1(int,unlink, char *, filename);
258		312
259	sigprocmask (SIG_SETMASK, &fullsigset, 0);	313	sigprocmask (SIG_SETMASK, &fullsigset, 0);
		314	prctl (PR_SET_PDEATHSIG, SIGKILL);
260		315
261	/* then loop */	316	/* then loop */
262	while (read (reqpipe[0], (void *)&req, sizeof (req)) == sizeof (req))	317	while (read (reqpipe[0], (void *)&req, sizeof (req)) == sizeof (req))
263	{	318	{
264	req->thread = thr;	319	req->thread = thr;
265	errno = 0; /* strictly unnecessary */	320	errno = 0; /* strictly unnecessary */
266		321
267	switch (req->type)	322	switch (req->type)
268	{	323	{
269	case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length, req->offset & 0xffffffff, req->offset >> 32); break;	324	case REQ_READ: req->result = pread64 (req->fd, req->dataptr, req->length,
		325	LONG_LONG_PAIR (req->offset >> 32, req->offset & 0xffffffff)); break;
270	case REQ_WRITE: req->result = pwrite64(req->fd, req->dataptr, req->length, req->offset & 0xffffffff, req->offset >> 32); break;	326	case REQ_WRITE: req->result = pwrite64(req->fd, req->dataptr, req->length,
		327	LONG_LONG_PAIR (req->offset >> 32, req->offset & 0xffffffff)); break;
		328	#if __NR_stat64
		329	struct kernelstat64 statdata;
		330	case REQ_STAT: req->result = stat64 (req->dataptr, &statdata); COPY_STATDATA; break;
		331	case REQ_LSTAT: req->result = lstat64 (req->dataptr, &statdata); COPY_STATDATA; break;
		332	case REQ_FSTAT: req->result = fstat64 (req->fd, &statdata); COPY_STATDATA; break;
		333	#else
		334	struct kernelstat statdata;
		335	case REQ_STAT: req->result = stat (req->dataptr, &statdata); COPY_STATDATA; break;
		336	case REQ_LSTAT: req->result = lstat (req->dataptr, &statdata); COPY_STATDATA; break;
		337	case REQ_FSTAT: req->result = fstat (req->fd, &statdata); COPY_STATDATA; break;
		338	#endif
271	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;	339	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
272	case REQ_CLOSE: req->result = close (req->fd); break;	340	case REQ_CLOSE: req->result = close (req->fd); break;
273	case REQ_STAT: req->result = stat64 (req->dataptr, req->statdata); break;
274	case REQ_LSTAT: req->result = lstat64 (req->dataptr, req->statdata); break;	341	case REQ_UNLINK: req->result = unlink (req->dataptr); break;
275	case REQ_FSTAT: req->result = fstat64 (req->fd, req->statdata); break;
276		342
277	case REQ_QUIT:	343	case REQ_QUIT:
278	default:	344	default:
279	write (respipe[1], (void *)&req, sizeof (req));	345	write (respipe[1], (void *)&req, sizeof (req));
280	return 0;	346	return 0;
…		…
327	cur--;	393	cur--;
328	}	394	}
329		395
330	while (started > nthreads)	396	while (started > nthreads)
331	{	397	{
332	fd_set rfd;	398	poll_wait ();
333	FD_ZERO(&rfd);
334	FD_SET(respipe[0], &rfd);
335
336	select (respipe[0] + 1, &rfd, 0, 0, 0);
337	poll_cb (aTHX);	399	poll_cb (aTHX);
338	}	400	}
339		401
340	void	402	void
341	aio_open(pathname,flags,mode,callback)	403	aio_open(pathname,flags,mode,callback)
…		…
417	Newz (0, req, 1, aio_cb);	479	Newz (0, req, 1, aio_cb);
418		480
419	if (!req)	481	if (!req)
420	croak ("out of memory during aio_req allocation");	482	croak ("out of memory during aio_req allocation");
421		483
422	New (0, req->statdata, 1, struct stat64);	484	New (0, req->statdata, 1, Stat_t);
423		485
424	if (!req->statdata)	486	if (!req->statdata)
425	croak ("out of memory during aio_req->statdata allocation");	487	croak ("out of memory during aio_req->statdata allocation");
426		488
427	if (SvPOK (fh_or_path))	489	if (SvPOK (fh_or_path))
…		…
438		500
439	req->callback = SvREFCNT_inc (callback);	501	req->callback = SvREFCNT_inc (callback);
440		502
441	send_req (req);	503	send_req (req);
442		504
		505	void
		506	aio_unlink(pathname,callback)
		507	SV * pathname
		508	SV * callback
		509	PROTOTYPE: $$
		510	CODE:
		511	aio_req req;
		512
		513	Newz (0, req, 1, aio_cb);
		514
		515	if (!req)
		516	croak ("out of memory during aio_req allocation");
		517
		518	req->type = REQ_UNLINK;
		519	req->data = newSVsv (pathname);
		520	req->dataptr = SvPV_nolen (req->data);
		521	req->callback = SvREFCNT_inc (callback);
		522
		523	send_req (req);
		524
443	int	525	int
444	poll_fileno()	526	poll_fileno()
445	PROTOTYPE:	527	PROTOTYPE:
446	CODE:	528	CODE:
447	RETVAL = respipe[0];	529	RETVAL = respipe[0];
…		…
454	CODE:	536	CODE:
455	RETVAL = poll_cb (aTHX);	537	RETVAL = poll_cb (aTHX);
456	OUTPUT:	538	OUTPUT:
457	RETVAL	539	RETVAL
458		540
		541	void
		542	poll_wait()
		543	PROTOTYPE:
		544	CODE:
		545	poll_wait ();
		546
459	int	547	int
460	nreqs()	548	nreqs()
461	PROTOTYPE:	549	PROTOTYPE:
462	CODE:	550	CODE:
463	RETVAL = nreqs;	551	RETVAL = nreqs;

Diff Legend

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

Comparing Linux-AIO/AIO.xs (file contents): Revision 1.19 by root, Fri May 7 00:57:29 2004 UTC vs. Revision 1.28 by root, Sat Jul 9 04:02:54 2005 UTC

Diff Legend

Comparing Linux-AIO/AIO.xs (file contents):
Revision 1.19 by root, Fri May 7 00:57:29 2004 UTC vs.
Revision 1.28 by root, Sat Jul 9 04:02:54 2005 UTC