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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.45 by root, Sun Oct 22 00:19:05 2006 UTC vs.
Revision 1.62 by root, Mon Oct 23 22:45:18 2006 UTC

…		…
55	REQ_STAT, REQ_LSTAT, REQ_FSTAT,	55	REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56	REQ_FSYNC, REQ_FDATASYNC,	56	REQ_FSYNC, REQ_FDATASYNC,
57	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,	57	REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58	REQ_READDIR,	58	REQ_READDIR,
59	REQ_LINK, REQ_SYMLINK,	59	REQ_LINK, REQ_SYMLINK,
		60	REQ_GROUP, REQ_NOP,
60	REQ_SLEEP,	61	REQ_SLEEP,
61	REQ_GROUP,
62	};	62	};
63		63
64	#define AIO_REQ_KLASS "IO::AIO::REQ"	64	#define AIO_REQ_KLASS "IO::AIO::REQ"
65	#define AIO_GRP_KLASS "IO::AIO::GRP"	65	#define AIO_GRP_KLASS "IO::AIO::GRP"
66		66
67	typedef struct aio_cb	67	typedef struct aio_cb
68	{	68	{
69	struct aio_cb grp, grp_prev, *grp_next;
70
71	struct aio_cb *volatile next;	69	struct aio_cb *volatile next;
72
73	SV self; / the perl counterpart of this request, if any */
74		70
75	SV data, callback;	71	SV data, callback;
76	SV fh, fh2;	72	SV fh, fh2;
77	void dataptr, data2ptr;	73	void dataptr, data2ptr;
78	Stat_t *statdata;	74	Stat_t *statdata;
79	off_t offset;	75	off_t offset;
80	size_t length;	76	size_t length;
81	ssize_t result;	77	ssize_t result;
82		78
		79	STRLEN dataoffset;
83	int type;	80	int type;
84	int fd, fd2;	81	int fd, fd2;
85	int errorno;	82	int errorno;
86	STRLEN dataoffset;
87	mode_t mode; /* open */	83	mode_t mode; /* open */
		84
88	unsigned char cancelled;	85	unsigned char flags;
		86	unsigned char pri;
		87
		88	SV self; / the perl counterpart of this request, if any */
		89	struct aio_cb grp, grp_prev, grp_next, grp_first;
89	} aio_cb;	90	} aio_cb;
		91
		92	enum {
		93	FLAG_CANCELLED = 0x01,
		94	};
90		95
91	typedef aio_cb *aio_req;	96	typedef aio_cb *aio_req;
92	typedef aio_cb *aio_req_ornot;	97	typedef aio_cb *aio_req_ornot;
93	typedef aio_cb *aio_group;	98
		99	enum {
		100	PRI_MIN = -4,
		101	PRI_MAX = 4,
		102
		103	DEFAULT_PRI = 0,
		104	PRI_BIAS = -PRI_MIN,
		105	};
		106
		107	static int next_pri = DEFAULT_PRI + PRI_BIAS;
94		108
95	static int started, wanted;	109	static int started, wanted;
96	static volatile int nreqs;	110	static volatile int nreqs;
97	static int max_outstanding = 1<<30;	111	static int max_outstanding = 1<<30;
98	static int respipe [2];	112	static int respipe [2];
…		…
102	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	116	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
103		117
104	static volatile aio_req reqs, reqe; /* queue start, queue end */	118	static volatile aio_req reqs, reqe; /* queue start, queue end */
105	static volatile aio_req ress, rese; /* queue start, queue end */	119	static volatile aio_req ress, rese; /* queue start, queue end */
106		120
		121	static void req_invoke (aio_req req);
107	static void req_free (aio_req req);	122	static void req_free (aio_req req);
108		123
109	/* must be called at most once */	124	/* must be called at most once */
110	static SV req_sv (aio_req req, const char klass)	125	static SV req_sv (aio_req req, const char klass)
111	{	126	{
		127	if (!req->self)
		128	{
112	req->self = (SV *)newHV ();	129	req->self = (SV *)newHV ();
113	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	130	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		131	}
114		132
115	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));	133	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
116	}	134	}
117		135
118	static aio_req SvAIO_REQ (SV *sv)	136	static aio_req SvAIO_REQ (SV *sv)
119	{	137	{
		138	MAGIC *mg;
		139
120	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))	140	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))
121	croak ("object of class " AIO_REQ_KLASS " expected");	141	croak ("object of class " AIO_REQ_KLASS " expected");
122		142
123	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	143	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
124		144
125	return mg ? (aio_req)mg->mg_ptr : 0;	145	return mg ? (aio_req)mg->mg_ptr : 0;
126	}	146	}
127		147
		148	static void aio_grp_feed (aio_req grp)
		149	{
		150	while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
		151	{
		152	int old_len = grp->length;
		153
		154	if (grp->fh2 && SvOK (grp->fh2))
		155	{
		156	dSP;
		157
		158	ENTER;
		159	SAVETMPS;
		160	PUSHMARK (SP);
		161	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
		162	PUTBACK;
		163	call_sv (grp->fh2, G_VOID \| G_EVAL);
		164	SPAGAIN;
		165	FREETMPS;
		166	LEAVE;
		167	}
		168
		169	/* stop if no progress has been made */
		170	if (old_len == grp->length)
		171	{
		172	SvREFCNT_dec (grp->fh2);
		173	grp->fh2 = 0;
		174	break;
		175	}
		176	}
		177	}
		178
		179	static void aio_grp_dec (aio_req grp)
		180	{
		181	--grp->length;
		182
		183	/* call feeder, if applicable */
		184	aio_grp_feed (grp);
		185
		186	/* finish, if done */
		187	if (!grp->length && grp->fd)
		188	{
		189	req_invoke (grp);
		190	req_free (grp);
		191	}
		192	}
		193
128	static void poll_wait ()	194	static void poll_wait ()
129	{	195	{
130	if (nreqs && !ress)
131	{
132	fd_set rfd;	196	fd_set rfd;
		197
		198	while (nreqs)
		199	{
		200	aio_req req;
		201	pthread_mutex_lock (&reslock);
		202	req = ress;
		203	pthread_mutex_unlock (&reslock);
		204
		205	if (req)
		206	return;
		207
133	FD_ZERO(&rfd);	208	FD_ZERO(&rfd);
134	FD_SET(respipe [0], &rfd);	209	FD_SET(respipe [0], &rfd);
135		210
136	select (respipe [0] + 1, &rfd, 0, 0, 0);	211	select (respipe [0] + 1, &rfd, 0, 0, 0);
137	}	212	}
…		…
140	static void req_invoke (aio_req req)	215	static void req_invoke (aio_req req)
141	{	216	{
142	dSP;	217	dSP;
143	int errorno = errno;	218	int errorno = errno;
144		219
145	if (req->cancelled \|\| !SvOK (req->callback))	220	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))
146	return;	221	return;
147		222
148	errno = req->errorno;	223	errno = req->errorno;
149		224
150	ENTER;	225	ENTER;
		226	SAVETMPS;
151	PUSHMARK (SP);	227	PUSHMARK (SP);
		228	EXTEND (SP, 1);
152		229
153	switch (req->type)	230	switch (req->type)
154	{	231	{
155	case REQ_READDIR:	232	case REQ_READDIR:
156	{	233	{
…		…
171	}	248	}
172		249
173	rv = sv_2mortal (newRV_noinc ((SV *)av));	250	rv = sv_2mortal (newRV_noinc ((SV *)av));
174	}	251	}
175		252
176	XPUSHs (rv);	253	PUSHs (rv);
177	}	254	}
178	break;	255	break;
179		256
180	case REQ_OPEN:	257	case REQ_OPEN:
181	{	258	{
182	/* convert fd to fh */	259	/* convert fd to fh */
183	SV *fh;	260	SV *fh;
184		261
185	XPUSHs (sv_2mortal (newSViv (req->result)));	262	PUSHs (sv_2mortal (newSViv (req->result)));
186	PUTBACK;	263	PUTBACK;
187	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	264	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
188	SPAGAIN;	265	SPAGAIN;
189		266
190	fh = SvREFCNT_inc (POPs);	267	fh = SvREFCNT_inc (POPs);
…		…
192	PUSHMARK (SP);	269	PUSHMARK (SP);
193	XPUSHs (sv_2mortal (fh));	270	XPUSHs (sv_2mortal (fh));
194	}	271	}
195	break;	272	break;
196		273
		274	case REQ_GROUP:
		275	req->fd = 2; /* mark group as finished */
		276
		277	if (req->data)
		278	{
		279	int i;
		280	AV av = (AV )req->data;
		281
		282	EXTEND (SP, AvFILL (av) + 1);
		283	for (i = 0; i <= AvFILL (av); ++i)
		284	PUSHs (*av_fetch (av, i, 0));
		285	}
		286	break;
		287
		288	case REQ_NOP:
197	case REQ_SLEEP:	289	case REQ_SLEEP:
198	case REQ_GROUP:
199	break;	290	break;
200		291
201	default:	292	default:
202	XPUSHs (sv_2mortal (newSViv (req->result)));	293	PUSHs (sv_2mortal (newSViv (req->result)));
203	break;	294	break;
204	}	295	}
205		296
206		297
207	PUTBACK;	298	PUTBACK;
208	call_sv (req->callback, G_VOID \| G_EVAL);	299	call_sv (req->callback, G_VOID \| G_EVAL);
209	SPAGAIN;	300	SPAGAIN;
210		301
		302	FREETMPS;
		303	LEAVE;
		304
		305	errno = errorno;
		306
211	if (SvTRUE (ERRSV))	307	if (SvTRUE (ERRSV))
212	{	308	{
213	req_free (req);	309	req_free (req);
214	croak (0);	310	croak (0);
215	}	311	}
216
217	LEAVE;
218
219	errno = errorno;
220	}	312	}
221		313
222	static void req_free (aio_req req)	314	static void req_free (aio_req req)
223	{	315	{
224	if (req->grp)	316	if (req->grp)
225	{	317	{
226	aio_req grp = req->grp;	318	aio_req grp = req->grp;
227		319
228	/* unlink request */	320	/* unlink request */
229	req->grp_next->grp_prev = req->grp_prev;	321	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
230	req->grp_prev->grp_next = req->grp_next;	322	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
231		323
232	if (grp->grp_next == grp)	324	if (grp->grp_first == req)
233	{	325	grp->grp_first = req->grp_next;
234	req_invoke (grp);	326
235	req_free (grp);	327	aio_grp_dec (grp);
236	}
237	}	328	}
238		329
239	if (req->self)	330	if (req->self)
240	{	331	{
241	sv_unmagic (req->self, PERL_MAGIC_ext);	332	sv_unmagic (req->self, PERL_MAGIC_ext);
242	SvREFCNT_dec (req->self);	333	SvREFCNT_dec (req->self);
243	}	334	}
244		335
245	if (req->data)
246	SvREFCNT_dec (req->data);	336	SvREFCNT_dec (req->data);
247
248	if (req->fh)
249	SvREFCNT_dec (req->fh);	337	SvREFCNT_dec (req->fh);
250
251	if (req->fh2)
252	SvREFCNT_dec (req->fh2);	338	SvREFCNT_dec (req->fh2);
253
254	if (req->statdata)
255	Safefree (req->statdata);
256
257	if (req->callback)
258	SvREFCNT_dec (req->callback);	339	SvREFCNT_dec (req->callback);
		340	Safefree (req->statdata);
259		341
260	if (req->type == REQ_READDIR && req->result >= 0)	342	if (req->type == REQ_READDIR && req->result >= 0)
261	free (req->data2ptr);	343	free (req->data2ptr);
262		344
263	Safefree (req);	345	Safefree (req);
264	}	346	}
265		347
266	static void req_cancel (aio_req req)	348	static void req_cancel (aio_req req)
267	{	349	{
268	req->cancelled = 1;	350	req->flags \|= FLAG_CANCELLED;
269		351
270	if (req->type == REQ_GROUP)	352	if (req->type == REQ_GROUP)
271	{	353	{
272	aio_req sub;	354	aio_req sub;
273		355
274	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	356	for (sub = req->grp_first; sub; sub = sub->grp_next)
275	req_cancel (sub);	357	req_cancel (sub);
276	}	358	}
277	}	359	}
278		360
279	static int poll_cb ()	361	static int poll_cb ()
…		…
306	pthread_mutex_unlock (&reslock);	388	pthread_mutex_unlock (&reslock);
307		389
308	if (!req)	390	if (!req)
309	break;	391	break;
310		392
311	nreqs--;	393	--nreqs;
312		394
313	if (req->type == REQ_QUIT)	395	if (req->type == REQ_QUIT)
314	started--;	396	started--;
315	else if (req->type == REQ_GROUP && req->grp_next != req)	397	else if (req->type == REQ_GROUP && req->length)
		398	{
		399	req->fd = 1; /* mark request as delayed */
316	continue;	400	continue;
		401	}
317	else	402	else
318	{	403	{
319	if (req->type == REQ_READ)	404	if (req->type == REQ_READ)
320	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));	405	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
321		406
…		…
364	static void req_send (aio_req req)	449	static void req_send (aio_req req)
365	{	450	{
366	while (started < wanted && nreqs >= started)	451	while (started < wanted && nreqs >= started)
367	start_thread ();	452	start_thread ();
368		453
369	nreqs++;	454	++nreqs;
370		455
371	pthread_mutex_lock (&reqlock);	456	pthread_mutex_lock (&reqlock);
372		457
373	req->next = 0;	458	req->next = 0;
374		459
…		…
724	}	809	}
725		810
726	pthread_mutex_unlock (&reqlock);	811	pthread_mutex_unlock (&reqlock);
727		812
728	errno = 0; /* strictly unnecessary */	813	errno = 0; /* strictly unnecessary */
		814	type = req->type; /* remember type for QUIT check */
729		815
730	if (!req->cancelled)	816	if (!(req->flags & FLAG_CANCELLED))
731	switch (req->type)	817	switch (type)
732	{	818	{
733	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	819	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
734	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	820	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
735		821
736	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	822	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
…		…
760	tv.tv_usec = req->fd2;	846	tv.tv_usec = req->fd2;
761		847
762	req->result = select (0, 0, 0, 0, &tv);	848	req->result = select (0, 0, 0, 0, &tv);
763	}	849	}
764		850
		851	case REQ_GROUP:
		852	case REQ_NOP:
765	case REQ_QUIT:	853	case REQ_QUIT:
766	break;	854	break;
767		855
768	default:	856	default:
769	req->result = ENOSYS;	857	req->result = ENOSYS;
…		…
853	atfork_parent ();	941	atfork_parent ();
854	}	942	}
855		943
856	#define dREQ \	944	#define dREQ \
857	aio_req req; \	945	aio_req req; \
		946	int req_pri = next_pri; \
		947	next_pri = DEFAULT_PRI + PRI_BIAS; \
858	\	948	\
859	if (SvOK (callback) && !SvROK (callback)) \	949	if (SvOK (callback) && !SvROK (callback)) \
860	croak ("callback must be undef or of reference type"); \	950	croak ("callback must be undef or of reference type"); \
861	\	951	\
862	Newz (0, req, 1, aio_cb); \	952	Newz (0, req, 1, aio_cb); \
863	if (!req) \	953	if (!req) \
864	croak ("out of memory during aio_req allocation"); \	954	croak ("out of memory during aio_req allocation"); \
865	\	955	\
866	req->callback = newSVsv (callback)	956	req->callback = newSVsv (callback); \
		957	req->pri = req_pri
867		958
868	#define REQ_SEND \	959	#define REQ_SEND \
869	req_send (req); \	960	req_send (req); \
870	\	961	\
871	if (GIMME_V != G_VOID) \	962	if (GIMME_V != G_VOID) \
…		…
1142	}	1233	}
1143		1234
1144	void	1235	void
1145	aio_group (callback=&PL_sv_undef)	1236	aio_group (callback=&PL_sv_undef)
1146	SV * callback	1237	SV * callback
1147	PROTOTYPE: ;&	1238	PROTOTYPE: ;$
1148	PPCODE:	1239	PPCODE:
1149	{	1240	{
1150	dREQ;	1241	dREQ;
		1242
1151	req->type = REQ_GROUP;	1243	req->type = REQ_GROUP;
1152	req->grp_next = req;
1153	req->grp_prev = req;
1154
1155	req_send (req);	1244	req_send (req);
		1245
1156	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1246	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1157	}	1247	}
		1248
		1249	void
		1250	aio_nop (callback=&PL_sv_undef)
		1251	SV * callback
		1252	PPCODE:
		1253	{
		1254	dREQ;
		1255
		1256	req->type = REQ_NOP;
		1257
		1258	REQ_SEND;
		1259	}
		1260
		1261	#if 0
		1262
		1263	void
		1264	aio_pri (int pri = DEFAULT_PRI)
		1265	CODE:
		1266	if (pri < PRI_MIN) pri = PRI_MIN;
		1267	if (pri > PRI_MAX) pri = PRI_MAX;
		1268	next_pri = pri + PRI_BIAS;
		1269
		1270	#endif
1158		1271
1159	void	1272	void
1160	flush ()	1273	flush ()
1161	PROTOTYPE:	1274	PROTOTYPE:
1162	CODE:	1275	CODE:
…		…
1205	CODE:	1318	CODE:
1206	RETVAL = nreqs;	1319	RETVAL = nreqs;
1207	OUTPUT:	1320	OUTPUT:
1208	RETVAL	1321	RETVAL
1209		1322
		1323	PROTOTYPES: DISABLE
		1324
1210	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1325	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1211		1326
1212	void	1327	void
1213	cancel (aio_req_ornot req)	1328	cancel (aio_req_ornot req)
1214	PROTOTYPE:	1329	PROTOTYPE:
1215	CODE:	1330	CODE:
1216	req_cancel (req);	1331	req_cancel (req);
1217		1332
		1333	void
		1334	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
		1335	CODE:
		1336	SvREFCNT_dec (req->callback);
		1337	req->callback = newSVsv (callback);
		1338
1218	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1339	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1219		1340
1220	void	1341	void
1221	add (aio_req grp, ...)	1342	add (aio_req grp, ...)
1222	PROTOTYPE: $;@
1223	PPCODE:	1343	PPCODE:
1224	{	1344	{
1225	int i;	1345	int i;
		1346	aio_req req;
		1347
		1348	if (grp->fd == 2)
		1349	croak ("cannot add requests to IO::AIO::GRP after the group finished");
1226		1350
1227	for (i = 1; i < items; ++i )	1351	for (i = 1; i < items; ++i )
1228	{	1352	{
1229	aio_req req = SvAIO_REQ (ST (i));
1230
1231	req->grp_prev = grp;
1232	req->grp_next = grp->grp_next;
1233	grp->grp_next->grp_prev = req;
1234	grp->grp_next = req;
1235
1236	req->grp = grp;
1237
1238	if (GIMME_V != G_VOID)	1353	if (GIMME_V != G_VOID)
1239	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1354	XPUSHs (sv_2mortal (newSVsv (ST (i))));
		1355
		1356	req = SvAIO_REQ (ST (i));
		1357
		1358	if (req)
		1359	{
		1360	++grp->length;
		1361	req->grp = grp;
		1362
		1363	req->grp_prev = 0;
		1364	req->grp_next = grp->grp_first;
		1365
		1366	if (grp->grp_first)
		1367	grp->grp_first->grp_prev = req;
		1368
		1369	grp->grp_first = req;
		1370	}
1240	}	1371	}
1241	}	1372	}
1242		1373
		1374	void
		1375	result (aio_req grp, ...)
		1376	CODE:
		1377	{
		1378	int i;
		1379	AV *av = newAV ();
		1380
		1381	for (i = 1; i < items; ++i )
		1382	av_push (av, newSVsv (ST (i)));
		1383
		1384	SvREFCNT_dec (grp->data);
		1385	grp->data = (SV *)av;
		1386	}
		1387
		1388	void
		1389	feed_limit (aio_req grp, int limit)
		1390	CODE:
		1391	grp->fd2 = limit;
		1392	aio_grp_feed (grp);
		1393
		1394	void
		1395	feed (aio_req grp, SV *callback=&PL_sv_undef)
		1396	CODE:
		1397	{
		1398	SvREFCNT_dec (grp->fh2);
		1399	grp->fh2 = newSVsv (callback);
		1400
		1401	if (grp->fd2 <= 0)
		1402	grp->fd2 = 2;
		1403
		1404	aio_grp_feed (grp);
		1405	}
		1406

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.45 by root, Sun Oct 22 00:19:05 2006 UTC vs. Revision 1.62 by root, Mon Oct 23 22:45:18 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.45 by root, Sun Oct 22 00:19:05 2006 UTC vs.
Revision 1.62 by root, Mon Oct 23 22:45:18 2006 UTC