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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.115 by root, Sat May 10 18:06:41 2008 UTC vs.
Revision 1.132 by root, Mon Oct 13 10:38:17 2008 UTC

…		…
12	#include <sys/types.h>	12	#include <sys/types.h>
13	#include <sys/stat.h>	13	#include <sys/stat.h>
14	#include <limits.h>	14	#include <limits.h>
15	#include <fcntl.h>	15	#include <fcntl.h>
16	#include <sched.h>	16	#include <sched.h>
		17
		18	/* perl namespace pollution */
		19	#undef VERSION
17		20
18	#ifdef _WIN32	21	#ifdef _WIN32
19		22
20	# define EIO_STRUCT_DIRENT Direntry_t	23	# define EIO_STRUCT_DIRENT Direntry_t
21	# undef malloc	24	# undef malloc
…		…
62	# include <signal.h>	65	# include <signal.h>
63	# define EIO_STRUCT_DIRENT struct dirent	66	# define EIO_STRUCT_DIRENT struct dirent
64		67
65	#endif	68	#endif
66		69
		70	/* perl stupidly overrides readdir and maybe others */
		71	/* with thread-unsafe versions, imagine that :( */
		72	#undef readdir
		73	#undef opendir
		74	#undef closedir
		75
67	#define EIO_STRUCT_STAT Stat_t	76	#define EIO_STRUCT_STAT Stat_t
68		77
69	/* use NV for 32 bit perls as it allows larger offsets */	78	/* use NV for 32 bit perls as it allows larger offsets */
70	#if IVSIZE >= 8	79	#if IVSIZE >= 8
71	# define SvVAL64 SvIV	80	# define SvVAL64 SvIV
72	#else	81	#else
73	# define SvVAL64 SvNV	82	# define SvVAL64 SvNV
74	#endif	83	#endif
75		84
		85	/*****************************************************************************/
		86
		87	#if __GNUC__ >= 3
		88	# define expect(expr,value) __builtin_expect ((expr),(value))
		89	#else
		90	# define expect(expr,value) (expr)
		91	#endif
		92
		93	#define expect_false(expr) expect ((expr) != 0, 0)
		94	#define expect_true(expr) expect ((expr) != 0, 1)
		95
		96	/*****************************************************************************/
		97
76	static HV *stash;	98	static HV *stash;
77	typedef SV SV8; /* byte-sv, used for argument-checking */	99	typedef SV SV8; /* byte-sv, used for argument-checking */
78		100
79	#define AIO_REQ_KLASS "IO::AIO::REQ"	101	#define AIO_REQ_KLASS "IO::AIO::REQ"
80	#define AIO_GRP_KLASS "IO::AIO::GRP"	102	#define AIO_GRP_KLASS "IO::AIO::GRP"
81		103
82	#define EIO_COMMON \	104	#define EIO_REQ_MEMBERS \
83	SV *callback; \	105	SV *callback; \
84	SV sv1, sv2; \	106	SV sv1, sv2; \
85	STRLEN stroffset; \	107	STRLEN stroffset; \
86	SV *self	108	SV *self;
		109
		110	#define EIO_NO_WRAPPERS 1
87		111
88	#include "libeio/eio.h"	112	#include "libeio/eio.h"
89		113
90	static int req_invoke (eio_req *req);	114	static int req_invoke (eio_req *req);
91	#define EIO_FINISH(req) req_invoke (req)	115	#define EIO_FINISH(req) req_invoke (req)
92	static void aio_grp_feed (eio_req *grp);
93	#define EIO_FEED(req) aio_grp_feed (req)
94	static void req_destroy (eio_req *grp);	116	static void req_destroy (eio_req *grp);
95	#define EIO_DESTROY(req) req_destroy (req)	117	#define EIO_DESTROY(req) req_destroy (req)
96		118
97	enum {	119	enum {
98	FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */	120	FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
…		…
101	#include "libeio/eio.c"	123	#include "libeio/eio.c"
102		124
103	typedef eio_req *aio_req;	125	typedef eio_req *aio_req;
104	typedef eio_req *aio_req_ornot;	126	typedef eio_req *aio_req_ornot;
105		127
106	static unsigned int max_outstanding = 0x7fffffff;	128	static SV *on_next_submit;
107		129	static int next_pri = EIO_PRI_DEFAULT;
108	static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS;	130	static int max_outstanding;
109		131
110	static int respipe_osf [2], respipe [2] = { -1, -1 };	132	static int respipe_osf [2], respipe [2] = { -1, -1 };
111		133
112	static void req_destroy (aio_req req);	134	static void req_destroy (aio_req req);
113	static void req_cancel (aio_req req);	135	static void req_cancel (aio_req req);
…		…
166	FREETMPS;	188	FREETMPS;
167	LEAVE;	189	LEAVE;
168	}	190	}
169	}	191	}
170		192
		193	static void req_submit (eio_req *req)
		194	{
		195	eio_submit (req);
		196
		197	if (expect_false (on_next_submit))
		198	{
		199	dSP;
		200	SV *cb = sv_2mortal (on_next_submit);
		201
		202	on_next_submit = 0;
		203
		204	PUSHMARK (SP);
		205	PUTBACK;
		206	call_sv (cb, G_DISCARD \| G_EVAL);
		207	}
		208	}
		209
171	static int req_invoke (eio_req *req)	210	static int req_invoke (eio_req *req)
172	{	211	{
173	dSP;	212	dSP;
174		213
175	if (req->flags & FLAG_SV2_RO_OFF)	214	if (req->flags & FLAG_SV2_RO_OFF)
176	SvREADONLY_off (req->sv2);	215	SvREADONLY_off (req->sv2);
177		216
178	if (!EIO_CANCELLED (req) && SvOK (req->callback))	217	if (!EIO_CANCELLED (req) && req->callback)
179	{	218	{
180	ENTER;	219	ENTER;
181	SAVETMPS;	220	SAVETMPS;
182	PUSHMARK (SP);	221	PUSHMARK (SP);
183	EXTEND (SP, 1);	222	EXTEND (SP, 1);
…		…
260	case EIO_BUSY:	299	case EIO_BUSY:
261	break;	300	break;
262		301
263	case EIO_READLINK:	302	case EIO_READLINK:
264	if (req->result > 0)	303	if (req->result > 0)
265	{	304	PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
266	SvCUR_set (req->sv2, req->result);
267	*SvEND (req->sv2) = 0;
268	PUSHs (req->sv2);
269	}
270	break;	305	break;
271		306
272	case EIO_STAT:	307	case EIO_STAT:
273	case EIO_LSTAT:	308	case EIO_LSTAT:
274	case EIO_FSTAT:	309	case EIO_FSTAT:
…		…
394	X_UNLOCK (reslock);	429	X_UNLOCK (reslock);
395		430
396	if (size)	431	if (size)
397	return;	432	return;
398		433
399	maybe_start_thread ();	434	etp_maybe_start_thread ();
400		435
401	FD_ZERO (&rfd);	436	FD_ZERO (&rfd);
402	FD_SET (respipe [0], &rfd);	437	FD_SET (respipe [0], &rfd);
403		438
404	PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);	439	PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405	}	440	}
406	}	441	}
407		442
408	static int poll_cb (void)	443	static int poll_cb (void)
409	{	444	{
		445	for (;;)
		446	{
410	int res = eio_poll ();	447	int res = eio_poll ();
411		448
412	if (res > 0)	449	if (res > 0)
413	croak (0);	450	croak (0);
414		451
		452	if (!max_outstanding \|\| max_outstanding > eio_nreqs ())
415	return res;	453	return res;
		454
		455	poll_wait ();
		456	}
		457	}
		458
		459	static void atfork_child (void)
		460	{
		461	create_respipe ();
		462	}
		463
		464	static SV *
		465	get_cb (SV *cb_sv)
		466	{
		467	HV *st;
		468	GV *gvp;
		469	CV *cv;
		470
		471	if (!SvOK (cb_sv))
		472	return 0;
		473
		474	cv = sv_2cv (cb_sv, &st, &gvp, 0);
		475
		476	if (!cv)
		477	croak ("IO::AIO callback must be undef or a CODE reference");
		478
		479	return (SV *)cv;
416	}	480	}
417		481
418	#define dREQ \	482	#define dREQ \
		483	SV *cb_cv; \
419	aio_req req; \	484	aio_req req; \
420	int req_pri = next_pri; \	485	int req_pri = next_pri; \
421	next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \	486	next_pri = EIO_PRI_DEFAULT; \
422	\	487	\
423	if (SvOK (callback) && !SvROK (callback)) \	488	cb_cv = get_cb (callback); \
424	croak ("callback must be undef or of reference type"); \
425	\	489	\
426	Newz (0, req, 1, eio_req); \	490	Newz (0, req, 1, eio_req); \
427	if (!req) \	491	if (!req) \
428	croak ("out of memory during eio_req allocation"); \	492	croak ("out of memory during eio_req allocation"); \
429	\	493	\
430	req->callback = newSVsv (callback); \	494	req->callback = SvREFCNT_inc (cb_cv); \
431	req->pri = req_pri	495	req->pri = req_pri
432		496
433	#define REQ_SEND \	497	#define REQ_SEND \
		498	PUTBACK; \
434	eio_submit (req); \	499	req_submit (req); \
		500	SPAGAIN; \
435	\	501	\
436	if (GIMME_V != G_VOID) \	502	if (GIMME_V != G_VOID) \
437	XPUSHs (req_sv (req, AIO_REQ_KLASS));	503	XPUSHs (req_sv (req, AIO_REQ_KLASS));
438		504
439	MODULE = IO::AIO PACKAGE = IO::AIO	505	MODULE = IO::AIO PACKAGE = IO::AIO
…		…
447	newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));	513	newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
448	newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));	514	newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
449	newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));	515	newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
450	newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));	516	newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
451	newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));	517	newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
452	#ifdef _WIN32	518	#ifndef _WIN32
453	X_MUTEX_CHECK (wrklock);
454	X_MUTEX_CHECK (reslock);
455	X_MUTEX_CHECK (reqlock);
456	X_MUTEX_CHECK (reqwait);
457	X_MUTEX_CHECK (preadwritelock);
458	X_MUTEX_CHECK (readdirlock);
459
460	X_COND_CHECK (reqwait);
461	#else
462	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));	519	newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
463	#endif	520	#endif
464		521
465	create_respipe ();	522	create_respipe ();
466		523
467	if (eio_init (want_poll, done_poll) < 0)	524	if (eio_init (want_poll, done_poll) < 0)
468	croak ("IO::AIO: unable to initialise eio library");	525	croak ("IO::AIO: unable to initialise eio library");
		526
		527	/* atfork child called in fifo order, so before eio's handler */
		528	X_THREAD_ATFORK (0, 0, atfork_child);
469	}	529	}
470		530
471	void	531	void
472	max_poll_reqs (int nreqs)	532	max_poll_reqs (int nreqs)
473	PROTOTYPE: $	533	PROTOTYPE: $
…		…
630	PPCODE:	690	PPCODE:
631	{	691	{
632	SV *data;	692	SV *data;
633	dREQ;	693	dREQ;
634		694
635	data = newSV (NAME_MAX);
636	SvPOK_on (data);
637
638	req->type = EIO_READLINK;	695	req->type = EIO_READLINK;
639	req->sv1 = newSVsv (path);	696	req->sv1 = newSVsv (path);
640	req->ptr1 = SvPVbyte_nolen (req->sv1);	697	req->ptr1 = SvPVbyte_nolen (req->sv1);
641	req->sv2 = data;
642	req->ptr2 = SvPVbyte_nolen (data);
643		698
644	REQ_SEND;	699	REQ_SEND;
645	}	700	}
646		701
647	void	702	void
…		…
685	aio_lstat = EIO_LSTAT	740	aio_lstat = EIO_LSTAT
686	PPCODE:	741	PPCODE:
687	{	742	{
688	dREQ;	743	dREQ;
689		744
690	req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
691	if (!req->ptr2)
692	{
693	req_destroy (req);
694	croak ("out of memory during aio_stat statdata allocation");
695	}
696
697	req->flags \|= EIO_FLAG_PTR2_FREE;
698	req->sv1 = newSVsv (fh_or_path);	745	req->sv1 = newSVsv (fh_or_path);
699		746
700	if (SvPOK (fh_or_path))	747	if (SvPOK (req->sv1))
701	{	748	{
702	req->type = ix;	749	req->type = ix;
703	req->ptr1 = SvPVbyte_nolen (req->sv1);	750	req->ptr1 = SvPVbyte_nolen (req->sv1);
704	}	751	}
705	else	752	else
…		…
719		766
720	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;	767	req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
721	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;	768	req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
722	req->sv1 = newSVsv (fh_or_path);	769	req->sv1 = newSVsv (fh_or_path);
723		770
724	if (SvPOK (fh_or_path))	771	if (SvPOK (req->sv1))
725	{	772	{
726	req->type = EIO_UTIME;	773	req->type = EIO_UTIME;
727	req->ptr1 = SvPVbyte_nolen (req->sv1);	774	req->ptr1 = SvPVbyte_nolen (req->sv1);
728	}	775	}
729	else	776	else
…		…
742	dREQ;	789	dREQ;
743		790
744	req->sv1 = newSVsv (fh_or_path);	791	req->sv1 = newSVsv (fh_or_path);
745	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;	792	req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
746		793
747	if (SvPOK (fh_or_path))	794	if (SvPOK (req->sv1))
748	{	795	{
749	req->type = EIO_TRUNCATE;	796	req->type = EIO_TRUNCATE;
750	req->ptr1 = SvPVbyte_nolen (req->sv1);	797	req->ptr1 = SvPVbyte_nolen (req->sv1);
751	}	798	}
752	else	799	else
…		…
760		807
761	void	808	void
762	aio_chmod (SV8 fh_or_path, int mode, SV callback=&PL_sv_undef)	809	aio_chmod (SV8 fh_or_path, int mode, SV callback=&PL_sv_undef)
763	ALIAS:	810	ALIAS:
764	aio_chmod = EIO_CHMOD	811	aio_chmod = EIO_CHMOD
765	aio_fchmod = EIO_FCHMOD
766	aio_mkdir = EIO_MKDIR	812	aio_mkdir = EIO_MKDIR
767	PPCODE:	813	PPCODE:
768	{	814	{
769	dREQ;	815	dREQ;
770		816
771	req->type = ix;
772	req->int2 = mode;	817	req->int2 = mode;
773	req->sv1 = newSVsv (fh_or_path);	818	req->sv1 = newSVsv (fh_or_path);
774		819
775	if (ix == EIO_FCHMOD)	820	if (SvPOK (req->sv1))
776	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));	821	{
		822	req->type = ix;
		823	req->ptr1 = SvPVbyte_nolen (req->sv1);
		824	}
777	else	825	else
778	req->ptr1 = SvPVbyte_nolen (req->sv1);	826	{
		827	req->type = EIO_FCHMOD;
		828	req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
		829	}
779		830
780	REQ_SEND;	831	REQ_SEND;
781	}	832	}
782		833
783	void	834	void
…		…
788		839
789	req->int2 = SvOK (uid) ? SvIV (uid) : -1;	840	req->int2 = SvOK (uid) ? SvIV (uid) : -1;
790	req->int3 = SvOK (gid) ? SvIV (gid) : -1;	841	req->int3 = SvOK (gid) ? SvIV (gid) : -1;
791	req->sv1 = newSVsv (fh_or_path);	842	req->sv1 = newSVsv (fh_or_path);
792		843
793	if (SvPOK (fh_or_path))	844	if (SvPOK (req->sv1))
794	{	845	{
795	req->type = EIO_CHOWN;	846	req->type = EIO_CHOWN;
796	req->ptr1 = SvPVbyte_nolen (req->sv1);	847	req->ptr1 = SvPVbyte_nolen (req->sv1);
797	}	848	}
798	else	849	else
…		…
874	{	925	{
875	dREQ;	926	dREQ;
876		927
877	req->type = EIO_GROUP;	928	req->type = EIO_GROUP;
878		929
879	eio_submit (req);	930	req_submit (req);
880	XPUSHs (req_sv (req, AIO_GRP_KLASS));	931	XPUSHs (req_sv (req, AIO_GRP_KLASS));
881	}	932	}
882		933
883	void	934	void
884	aio_nop (SV *callback=&PL_sv_undef)	935	aio_nop (SV *callback=&PL_sv_undef)
…		…
896		947
897	int	948	int
898	aioreq_pri (int pri = 0)	949	aioreq_pri (int pri = 0)
899	PROTOTYPE: ;$	950	PROTOTYPE: ;$
900	CODE:	951	CODE:
901	RETVAL = next_pri - EIO_PRI_BIAS;	952	RETVAL = next_pri;
902	if (items > 0)	953	if (items > 0)
903	{	954	{
904	if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;	955	if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
905	if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;	956	if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
906	next_pri = pri + EIO_PRI_BIAS;	957	next_pri = pri;
907	}	958	}
908	OUTPUT:	959	OUTPUT:
909	RETVAL	960	RETVAL
910		961
911	void	962	void
912	aioreq_nice (int nice = 0)	963	aioreq_nice (int nice = 0)
913	CODE:	964	CODE:
914	nice = next_pri - nice;	965	nice = next_pri - nice;
915	if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;	966	if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
916	if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;	967	if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
917	next_pri = nice + EIO_PRI_BIAS;	968	next_pri = nice;
918		969
919	void	970	void
920	flush ()	971	flush ()
921	PROTOTYPE:	972	PROTOTYPE:
922	CODE:	973	CODE:
923	while (nreqs)	974	while (eio_nreqs ())
924	{	975	{
925	poll_wait ();	976	poll_wait ();
926	poll_cb ();	977	poll_cb ();
927	}	978	}
928		979
…		…
983		1034
984	int	1035	int
985	nthreads()	1036	nthreads()
986	PROTOTYPE:	1037	PROTOTYPE:
987	CODE:	1038	CODE:
988	if (WORDACCESS_UNSAFE) X_LOCK (wrklock);	1039	RETVAL = eio_nthreads ();
989	RETVAL = started;
990	if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
991	OUTPUT:	1040	OUTPUT:
992	RETVAL	1041	RETVAL
993		1042
		1043	void _on_next_submit (SV *cb)
		1044	CODE:
		1045	SvREFCNT_dec (on_next_submit);
		1046	on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
		1047
994	PROTOTYPES: DISABLE	1048	PROTOTYPES: DISABLE
995		1049
996	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1050	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
997		1051
998	void	1052	void
…		…
1000	CODE:	1054	CODE:
1001	eio_cancel (req);	1055	eio_cancel (req);
1002		1056
1003	void	1057	void
1004	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)	1058	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1005	CODE:	1059	PPCODE:
		1060	{
		1061	if (GIMME_V != G_VOID)
		1062	XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
		1063
		1064	if (items > 1)
		1065	{
		1066	SV *cb_cv = get_cb (callback);
		1067
1006	SvREFCNT_dec (req->callback);	1068	SvREFCNT_dec (req->callback);
1007	req->callback = newSVsv (callback);	1069	req->callback = SvREFCNT_inc (cb_cv);
		1070	}
		1071	}
1008		1072
1009	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1073	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1010		1074
1011	void	1075	void
1012	add (aio_req grp, ...)	1076	add (aio_req grp, ...)
…		…
1067	void	1131	void
1068	feed (aio_req grp, SV *callback=&PL_sv_undef)	1132	feed (aio_req grp, SV *callback=&PL_sv_undef)
1069	CODE:	1133	CODE:
1070	{	1134	{
1071	SvREFCNT_dec (grp->sv2);	1135	SvREFCNT_dec (grp->sv2);
1072	grp->sv2 = newSVsv (callback);	1136	grp->sv2 = newSVsv (callback);
		1137	grp->feed = aio_grp_feed;
1073		1138
1074	if (grp->int2 <= 0)	1139	if (grp->int2 <= 0)
1075	grp->int2 = 2;	1140	grp->int2 = 2;
1076		1141
1077	eio_grp_limit (grp, grp->int2);	1142	eio_grp_limit (grp, grp->int2);

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.115 by root, Sat May 10 18:06:41 2008 UTC vs. Revision 1.132 by root, Mon Oct 13 10:38:17 2008 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.115 by root, Sat May 10 18:06:41 2008 UTC vs.
Revision 1.132 by root, Mon Oct 13 10:38:17 2008 UTC