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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.14 by root, Sat Jul 23 18:15:36 2005 UTC vs.
Revision 1.25 by root, Wed Aug 17 03:16:56 2005 UTC

…		…
		1	#define _REENTRANT 1
		2	#include <errno.h>
		3
		4	#include "EXTERN.h"
1	#include "perl.h"	5	#include "perl.h"
2	#include "XSUB.h"	6	#include "XSUB.h"
		7
		8	#include "autoconf/config.h"
3		9
4	#include <sys/types.h>	10	#include <sys/types.h>
5	#include <sys/stat.h>	11	#include <sys/stat.h>
6		12
7	#include <unistd.h>	13	#include <unistd.h>
8	#include <fcntl.h>	14	#include <fcntl.h>
9	#include <signal.h>	15	#include <signal.h>
10	#include <sched.h>	16	#include <sched.h>
11	#if __linux
12	#include <sys/syscall.h>
13	#endif
14		17
15	#include <pthread.h>	18	#include <pthread.h>
16		19
17	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */	20	typedef void InputStream; / hack, but 5.6.1 is simply toooo old ;) */
18	typedef void OutputStream; / hack, but 5.6.1 is simply toooo old ;) */	21	typedef void OutputStream; / hack, but 5.6.1 is simply toooo old ;) */
26		29
27	enum {	30	enum {
28	REQ_QUIT,	31	REQ_QUIT,
29	REQ_OPEN, REQ_CLOSE,	32	REQ_OPEN, REQ_CLOSE,
30	REQ_READ, REQ_WRITE, REQ_READAHEAD,	33	REQ_READ, REQ_WRITE, REQ_READAHEAD,
31	REQ_STAT, REQ_LSTAT, REQ_FSTAT, REQ_UNLINK,	34	REQ_STAT, REQ_LSTAT, REQ_FSTAT,
32	REQ_FSYNC, REQ_FDATASYNC,	35	REQ_FSYNC, REQ_FDATASYNC,
		36	REQ_UNLINK, REQ_RMDIR,
		37	REQ_SYMLINK,
33	};	38	};
34		39
35	typedef struct aio_cb {	40	typedef struct aio_cb {
36	struct aio_cb *volatile next;	41	struct aio_cb *volatile next;
37		42
…		…
42	size_t length;	47	size_t length;
43	ssize_t result;	48	ssize_t result;
44	mode_t mode; /* open */	49	mode_t mode; /* open */
45	int errorno;	50	int errorno;
46	SV data, callback, *fh;	51	SV data, callback, *fh;
47	void *dataptr;	52	void dataptr, data2ptr;
48	STRLEN dataoffset;	53	STRLEN dataoffset;
49		54
50	Stat_t *statdata;	55	Stat_t *statdata;
51	} aio_cb;	56	} aio_cb;
52		57
…		…
57	static int max_outstanding = 1<<30;	62	static int max_outstanding = 1<<30;
58	static int respipe [2];	63	static int respipe [2];
59		64
60	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;	65	static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER;
61	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;	66	static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER;
		67	static pthread_mutex_t frklock = PTHREAD_MUTEX_INITIALIZER;
62	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	68	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
63		69
64	static volatile aio_req reqs, reqe; /* queue start, queue end */	70	static volatile aio_req reqs, reqe; /* queue start, queue end */
65	static volatile aio_req ress, rese; /* queue start, queue end */	71	static volatile aio_req ress, rese; /* queue start, queue end */
66		72
…		…
80	static int	86	static int
81	poll_cb ()	87	poll_cb ()
82	{	88	{
83	dSP;	89	dSP;
84	int count = 0;	90	int count = 0;
		91	int do_croak = 0;
85	aio_req req, prv;	92	aio_req req, prv;
86		93
87	pthread_mutex_lock (&reslock);	94	pthread_mutex_lock (&reslock);
88		95
89	{	96	{
90	/* read any signals sent by the worker threads */	97	/* read any signals sent by the worker threads */
91	char buf [32];	98	char buf [32];
92	while (read (respipe [0], buf, 32) > 0)	99	while (read (respipe [0], buf, 32) == 32)
93	;	100	;
94	}	101	}
95		102
96	req = ress;	103	req = ress;
97	ress = rese = 0;	104	ress = rese = 0;
…		…
152	PUTBACK;	159	PUTBACK;
153	call_sv (req->callback, G_VOID \| G_EVAL);	160	call_sv (req->callback, G_VOID \| G_EVAL);
154	SPAGAIN;	161	SPAGAIN;
155	}	162	}
156		163
		164	do_croak = SvTRUE (ERRSV);
		165
157	LEAVE;	166	LEAVE;
158		167
159	if (req->callback)	168	if (req->callback)
160	SvREFCNT_dec (req->callback);	169	SvREFCNT_dec (req->callback);
161		170
…		…
165		174
166	prv = req;	175	prv = req;
167	req = req->next;	176	req = req->next;
168	Safefree (prv);	177	Safefree (prv);
169		178
170	/* TODO: croak on errors? */	179	if (do_croak)
		180	croak (0);
171	}	181	}
172		182
173	return count;	183	return count;
174	}	184	}
175		185
…		…
230	req->type = REQ_QUIT;	240	req->type = REQ_QUIT;
231		241
232	send_req (req);	242	send_req (req);
233	}	243	}
234		244
		245
		246	static void min_parallel (int nthreads)
		247	{
		248	while (nthreads > started)
		249	start_thread ();
		250	}
		251
		252	static void max_parallel (int nthreads)
		253	{
		254	int cur = started;
		255	while (cur > nthreads)
		256	{
		257	end_thread ();
		258	cur--;
		259	}
		260
		261	while (started > nthreads)
		262	{
		263	poll_wait ();
		264	poll_cb ();
		265	}
		266	}
		267
		268	static int fork_started;
		269
		270	static void atfork_prepare (void)
		271	{
		272	int nstarted;
		273
		274	for (;;) {
		275	while (nreqs)
		276	{
		277	poll_wait ();
		278	poll_cb ();
		279	}
		280
		281	nstarted = started;
		282	max_parallel (0);
		283
		284	pthread_mutex_lock (&reqlock);
		285
		286	if (!nreqs && !started)
		287	break;
		288
		289	pthread_mutex_unlock (&reqlock);
		290
		291	min_parallel (fork_started);
		292	}
		293
		294	pthread_mutex_lock (&frklock);
		295	fork_started = nstarted;
		296	pthread_mutex_lock (&reslock);
		297
		298	assert (!started);
		299	assert (!nreqs);
		300	assert (!reqs && !reqe);
		301	assert (!ress && !rese);
		302	}
		303
		304	static void atfork_parent (void)
		305	{
		306	pthread_mutex_unlock (&reslock);
		307	pthread_mutex_unlock (&frklock);
		308	pthread_mutex_unlock (&reqlock);
		309
		310	min_parallel (fork_started);
		311	}
		312
		313	#define atfork_child atfork_parent
		314
		315	/*****************************************************************************/
		316	/* work around various missing functions */
		317
		318	#if !HAVE_PREADWRITE
		319	# define pread aio_pread
		320	# define pwrite aio_pwrite
		321
		322	/*
		323	* make our pread/pwrite safe against themselves, but not against
		324	* normal read/write by using a mutex. slows down execution a lot,
		325	* but that's your problem, not mine.
		326	*/
		327	static pthread_mutex_t iolock = PTHREAD_MUTEX_INITIALIZER;
		328
		329	static ssize_t
		330	pread (int fd, void *buf, size_t count, off_t offset)
		331	{
		332	ssize_t res;
		333	off_t ooffset;
		334
		335	pthread_mutex_lock (&iolock);
		336	ooffset = lseek (fd, 0, SEEK_CUR);
		337	lseek (fd, offset, SEEK_SET);
		338	res = read (fd, buf, count);
		339	lseek (fd, ooffset, SEEK_SET);
		340	pthread_mutex_unlock (&iolock);
		341
		342	return res;
		343	}
		344
		345	static ssize_t
		346	pwrite (int fd, void *buf, size_t count, off_t offset)
		347	{
		348	ssize_t res;
		349	off_t ooffset;
		350
		351	pthread_mutex_lock (&iolock);
		352	ooffset = lseek (fd, 0, SEEK_CUR);
		353	lseek (fd, offset, SEEK_SET);
		354	res = write (fd, buf, count);
		355	lseek (fd, offset, SEEK_SET);
		356	pthread_mutex_unlock (&iolock);
		357
		358	return res;
		359	}
		360	#endif
		361
		362	#if !HAVE_FDATASYNC
		363	# define fdatasync fsync
		364	#endif
		365
		366	#if !HAVE_READAHEAD
		367	# define readahead aio_readahead
		368
		369	static char readahead_buf[4096];
		370
		371	static ssize_t
		372	readahead (int fd, off_t offset, size_t count)
		373	{
		374	while (count > 0)
		375	{
		376	size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf);
		377
		378	pread (fd, readahead_buf, len, offset);
		379	offset += len;
		380	count -= len;
		381	}
		382
		383	errno = 0;
		384	}
		385	#endif
		386
		387	/*****************************************************************************/
		388
235	static void *	389	static void *
236	aio_proc (void *thr_arg)	390	aio_proc (void *thr_arg)
237	{	391	{
238	aio_req req;	392	aio_req req;
239	int type;	393	int type;
…		…
266		420
267	switch (type)	421	switch (type)
268	{	422	{
269	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	423	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
270	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	424	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
271	#if SYS_readahead	425
272	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	426	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
273	#else
274	case REQ_READAHEAD: req->result = -1; errno = ENOSYS; break;
275	#endif
276		427
277	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;	428	case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
278	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;	429	case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
279	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;	430	case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
280		431
281	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;	432	case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
282	case REQ_CLOSE: req->result = close (req->fd); break;	433	case REQ_CLOSE: req->result = close (req->fd); break;
283	case REQ_UNLINK: req->result = unlink (req->dataptr); break;	434	case REQ_UNLINK: req->result = unlink (req->dataptr); break;
		435	case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
		436	case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
284		437
		438	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
285	case REQ_FSYNC: req->result = fsync (req->fd); break;	439	case REQ_FSYNC: req->result = fsync (req->fd); break;
286	case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
287		440
288	case REQ_QUIT:	441	case REQ_QUIT:
289	break;	442	break;
290		443
291	default:	444	default:
…		…
317	while (type != REQ_QUIT);	470	while (type != REQ_QUIT);
318		471
319	return 0;	472	return 0;
320	}	473	}
321		474
		475	#define dREQ \
		476	aio_req req; \
		477	\
		478	if (SvOK (callback) && !SvROK (callback)) \
		479	croak ("clalback must be undef or of reference type"); \
		480	\
		481	Newz (0, req, 1, aio_cb); \
		482	if (!req) \
		483	croak ("out of memory during aio_req allocation"); \
		484	\
		485	req->callback = SvREFCNT_inc (callback);
		486
322	MODULE = IO::AIO PACKAGE = IO::AIO	487	MODULE = IO::AIO PACKAGE = IO::AIO
323		488
324	PROTOTYPES: ENABLE	489	PROTOTYPES: ENABLE
325		490
326	BOOT:	491	BOOT:
…		…
331	if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))	496	if (fcntl (respipe [0], F_SETFL, O_NONBLOCK))
332	croak ("cannot set result pipe to nonblocking mode");	497	croak ("cannot set result pipe to nonblocking mode");
333		498
334	if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))	499	if (fcntl (respipe [1], F_SETFL, O_NONBLOCK))
335	croak ("cannot set result pipe to nonblocking mode");	500	croak ("cannot set result pipe to nonblocking mode");
		501
		502	pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
336	}	503	}
337		504
338	void	505	void
339	min_parallel(nthreads)	506	min_parallel(nthreads)
340	int nthreads	507	int nthreads
341	PROTOTYPE: $	508	PROTOTYPE: $
342	CODE:
343	while (nthreads > started)
344	start_thread ();
345		509
346	void	510	void
347	max_parallel(nthreads)	511	max_parallel(nthreads)
348	int nthreads	512	int nthreads
349	PROTOTYPE: $	513	PROTOTYPE: $
350	CODE:
351	{
352	int cur = started;
353	while (cur > nthreads)
354	{
355	end_thread ();
356	cur--;
357	}
358
359	while (started > nthreads)
360	{
361	poll_wait ();
362	poll_cb ();
363	}
364	}
365		514
366	int	515	int
367	max_outstanding(nreqs)	516	max_outstanding(nreqs)
368	int nreqs	517	int nreqs
369	PROTOTYPE: $	518	PROTOTYPE: $
…		…
378	int mode	527	int mode
379	SV * callback	528	SV * callback
380	PROTOTYPE: $$$;$	529	PROTOTYPE: $$$;$
381	CODE:	530	CODE:
382	{	531	{
383	aio_req req;	532	dREQ;
384
385	Newz (0, req, 1, aio_cb);
386
387	if (!req)
388	croak ("out of memory during aio_req allocation");
389		533
390	req->type = REQ_OPEN;	534	req->type = REQ_OPEN;
391	req->data = newSVsv (pathname);	535	req->data = newSVsv (pathname);
392	req->dataptr = SvPV_nolen (req->data);	536	req->dataptr = SvPVbyte_nolen (req->data);
393	req->fd = flags;	537	req->fd = flags;
394	req->mode = mode;	538	req->mode = mode;
395	req->callback = SvREFCNT_inc (callback);
396		539
397	send_req (req);	540	send_req (req);
398	}	541	}
399		542
400	void	543	void
…		…
406	aio_close = REQ_CLOSE	549	aio_close = REQ_CLOSE
407	aio_fsync = REQ_FSYNC	550	aio_fsync = REQ_FSYNC
408	aio_fdatasync = REQ_FDATASYNC	551	aio_fdatasync = REQ_FDATASYNC
409	CODE:	552	CODE:
410	{	553	{
411	aio_req req;	554	dREQ;
412
413	Newz (0, req, 1, aio_cb);
414
415	if (!req)
416	croak ("out of memory during aio_req allocation");
417		555
418	req->type = ix;	556	req->type = ix;
419	req->fh = newSVsv (fh);	557	req->fh = newSVsv (fh);
420	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));	558	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
421	req->callback = SvREFCNT_inc (callback);
422		559
423	send_req (req);	560	send_req (req);
424	}	561	}
425		562
426	void	563	void
…		…
437	PROTOTYPE: $$$$$;$	574	PROTOTYPE: $$$$$;$
438	CODE:	575	CODE:
439	{	576	{
440	aio_req req;	577	aio_req req;
441	STRLEN svlen;	578	STRLEN svlen;
442	char *svptr = SvPV (data, svlen);	579	char *svptr = SvPVbyte (data, svlen);
443		580
444	SvUPGRADE (data, SVt_PV);	581	SvUPGRADE (data, SVt_PV);
445	SvPOK_on (data);	582	SvPOK_on (data);
446		583
447	if (dataoffset < 0)	584	if (dataoffset < 0)
…		…
463	}	600	}
464		601
465	if (length < 0)	602	if (length < 0)
466	croak ("length must not be negative");	603	croak ("length must not be negative");
467		604
468	Newz (0, req, 1, aio_cb);	605	{
		606	dREQ;
469		607
470	if (!req)
471	croak ("out of memory during aio_req allocation");
472
473	req->type = ix;	608	req->type = ix;
474	req->fh = newSVsv (fh);	609	req->fh = newSVsv (fh);
475	req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))	610	req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
476	: IoOFP (sv_2io (fh)));	611	: IoOFP (sv_2io (fh)));
477	req->offset = offset;	612	req->offset = offset;
478	req->length = length;	613	req->length = length;
479	req->data = SvREFCNT_inc (data);	614	req->data = SvREFCNT_inc (data);
480	req->dataptr = (char *)svptr + dataoffset;	615	req->dataptr = (char *)svptr + dataoffset;
481	req->callback = SvREFCNT_inc (callback);	616	req->callback = SvREFCNT_inc (callback);
482		617
483	send_req (req);	618	send_req (req);
		619	}
484	}	620	}
485		621
486	void	622	void
487	aio_readahead(fh,offset,length,callback=&PL_sv_undef)	623	aio_readahead(fh,offset,length,callback=&PL_sv_undef)
488	SV * fh	624	SV * fh
…		…
490	IV length	626	IV length
491	SV * callback	627	SV * callback
492	PROTOTYPE: $$$;$	628	PROTOTYPE: $$$;$
493	CODE:	629	CODE:
494	{	630	{
495	aio_req req;	631	dREQ;
496
497	if (length < 0)
498	croak ("length must not be negative");
499
500	Newz (0, req, 1, aio_cb);
501
502	if (!req)
503	croak ("out of memory during aio_req allocation");
504		632
505	req->type = REQ_READAHEAD;	633	req->type = REQ_READAHEAD;
506	req->fh = newSVsv (fh);	634	req->fh = newSVsv (fh);
507	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));	635	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
508	req->offset = offset;	636	req->offset = offset;
509	req->length = length;	637	req->length = length;
510	req->callback = SvREFCNT_inc (callback);
511		638
512	send_req (req);	639	send_req (req);
513	}	640	}
514		641
515	void	642	void
…		…
519	ALIAS:	646	ALIAS:
520	aio_stat = REQ_STAT	647	aio_stat = REQ_STAT
521	aio_lstat = REQ_LSTAT	648	aio_lstat = REQ_LSTAT
522	CODE:	649	CODE:
523	{	650	{
524	aio_req req;	651	dREQ;
525
526	Newz (0, req, 1, aio_cb);
527
528	if (!req)
529	croak ("out of memory during aio_req allocation");
530		652
531	New (0, req->statdata, 1, Stat_t);	653	New (0, req->statdata, 1, Stat_t);
532
533	if (!req->statdata)	654	if (!req->statdata)
534	croak ("out of memory during aio_req->statdata allocation");	655	croak ("out of memory during aio_req->statdata allocation (sorry, i just leaked memory, too)");
535		656
536	if (SvPOK (fh_or_path))	657	if (SvPOK (fh_or_path))
537	{	658	{
538	req->type = ix;	659	req->type = ix;
539	req->data = newSVsv (fh_or_path);	660	req->data = newSVsv (fh_or_path);
540	req->dataptr = SvPV_nolen (req->data);	661	req->dataptr = SvPVbyte_nolen (req->data);
541	}	662	}
542	else	663	else
543	{	664	{
544	req->type = REQ_FSTAT;	665	req->type = REQ_FSTAT;
545	req->fh = newSVsv (fh_or_path);	666	req->fh = newSVsv (fh_or_path);
546	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	667	req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
547	}	668	}
548		669
549	req->callback = SvREFCNT_inc (callback);
550
551	send_req (req);	670	send_req (req);
552	}	671	}
553		672
554	void	673	void
555	aio_unlink(pathname,callback=&PL_sv_undef)	674	aio_unlink(pathname,callback=&PL_sv_undef)
556	SV * pathname	675	SV * pathname
557	SV * callback	676	SV * callback
		677	ALIAS:
		678	aio_unlink = REQ_UNLINK
		679	aio_rmdir = REQ_RMDIR
558	CODE:	680	CODE:
559	{	681	{
560	aio_req req;	682	dREQ;
561		683
562	Newz (0, req, 1, aio_cb);	684	req->type = ix;
		685	req->data = newSVsv (pathname);
		686	req->dataptr = SvPVbyte_nolen (req->data);
563		687
564	if (!req)	688	send_req (req);
565	croak ("out of memory during aio_req allocation");	689	}
		690
		691	void
		692	aio_symlink(oldpath,newpath,callback=&PL_sv_undef)
		693	SV * oldpath
		694	SV * newpath
		695	SV * callback
		696	CODE:
		697	{
		698	dREQ;
566		699
567	req->type = REQ_UNLINK;	700	req->type = REQ_SYMLINK;
		701	req->fh = newSVsv (oldpath);
		702	req->data2ptr = SvPVbyte_nolen (req->fh);
568	req->data = newSVsv (pathname);	703	req->data = newSVsv (newpath);
569	req->dataptr = SvPV_nolen (req->data);	704	req->dataptr = SvPVbyte_nolen (req->data);
570	req->callback = SvREFCNT_inc (callback);
571		705
572	send_req (req);	706	send_req (req);
573	}	707	}
574		708
575	void	709	void

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.14 by root, Sat Jul 23 18:15:36 2005 UTC vs. Revision 1.25 by root, Wed Aug 17 03:16:56 2005 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.14 by root, Sat Jul 23 18:15:36 2005 UTC vs.
Revision 1.25 by root, Wed Aug 17 03:16:56 2005 UTC