[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.51 by root, Sun Oct 22 22:14:33 2006 UTC

…		…
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;
		70
		71	struct aio_cb grp, grp_prev, grp_next, grp_first;
72		72
73	SV self; / the perl counterpart of this request, if any */	73	SV self; / the perl counterpart of this request, if any */
74		74
75	SV data, callback;	75	SV data, callback;
76	SV fh, fh2;	76	SV fh, fh2;
…		…
88	unsigned char cancelled;	88	unsigned char cancelled;
89	} aio_cb;	89	} aio_cb;
90		90
91	typedef aio_cb *aio_req;	91	typedef aio_cb *aio_req;
92	typedef aio_cb *aio_req_ornot;	92	typedef aio_cb *aio_req_ornot;
93	typedef aio_cb *aio_group;
94		93
95	static int started, wanted;	94	static int started, wanted;
96	static volatile int nreqs;	95	static volatile int nreqs;
97	static int max_outstanding = 1<<30;	96	static int max_outstanding = 1<<30;
98	static int respipe [2];	97	static int respipe [2];
…		…
102	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	101	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
103		102
104	static volatile aio_req reqs, reqe; /* queue start, queue end */	103	static volatile aio_req reqs, reqe; /* queue start, queue end */
105	static volatile aio_req ress, rese; /* queue start, queue end */	104	static volatile aio_req ress, rese; /* queue start, queue end */
106		105
		106	static void req_invoke (aio_req req);
107	static void req_free (aio_req req);	107	static void req_free (aio_req req);
108		108
109	/* must be called at most once */	109	/* must be called at most once */
110	static SV req_sv (aio_req req, const char klass)	110	static SV req_sv (aio_req req, const char klass)
111	{	111	{
		112	if (!req->self)
		113	{
112	req->self = (SV *)newHV ();	114	req->self = (SV *)newHV ();
113	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	115	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		116	}
114		117
115	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));	118	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
116	}	119	}
117		120
118	static aio_req SvAIO_REQ (SV *sv)	121	static aio_req SvAIO_REQ (SV *sv)
…		…
121	croak ("object of class " AIO_REQ_KLASS " expected");	124	croak ("object of class " AIO_REQ_KLASS " expected");
122		125
123	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	126	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
124		127
125	return mg ? (aio_req)mg->mg_ptr : 0;	128	return mg ? (aio_req)mg->mg_ptr : 0;
		129	}
		130
		131	static void aio_grp_feed (aio_req grp)
		132	{
		133	while (grp->length < grp->fd2)
		134	{
		135	int old_len = grp->length;
		136
		137	if (grp->fh2 && SvOK (grp->fh2))
		138	{
		139	dSP;
		140
		141	ENTER;
		142	SAVETMPS;
		143	PUSHMARK (SP);
		144	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
		145	PUTBACK;
		146	call_sv (grp->fh2, G_VOID \| G_EVAL);
		147	SPAGAIN;
		148	FREETMPS;
		149	LEAVE;
		150	}
		151
		152	/* stop if no progress has been made */
		153	if (old_len == grp->length)
		154	{
		155	SvREFCNT_dec (grp->fh2);
		156	grp->fh2 = 0;
		157	break;
		158	}
		159	}
		160	}
		161
		162	static void aio_grp_dec (aio_req grp)
		163	{
		164	--grp->length;
		165
		166	/* call feeder, if applicable */
		167	aio_grp_feed (grp);
		168
		169	/* finish, if done */
		170	if (!grp->length && grp->fd)
		171	{
		172	req_invoke (grp);
		173	req_free (grp);
		174	}
126	}	175	}
127		176
128	static void poll_wait ()	177	static void poll_wait ()
129	{	178	{
130	if (nreqs && !ress)	179	if (nreqs && !ress)
…		…
146	return;	195	return;
147		196
148	errno = req->errorno;	197	errno = req->errorno;
149		198
150	ENTER;	199	ENTER;
		200	SAVETMPS;
151	PUSHMARK (SP);	201	PUSHMARK (SP);
		202	EXTEND (SP, 1);
152		203
153	switch (req->type)	204	switch (req->type)
154	{	205	{
155	case REQ_READDIR:	206	case REQ_READDIR:
156	{	207	{
…		…
171	}	222	}
172		223
173	rv = sv_2mortal (newRV_noinc ((SV *)av));	224	rv = sv_2mortal (newRV_noinc ((SV *)av));
174	}	225	}
175		226
176	XPUSHs (rv);	227	PUSHs (rv);
177	}	228	}
178	break;	229	break;
179		230
180	case REQ_OPEN:	231	case REQ_OPEN:
181	{	232	{
182	/* convert fd to fh */	233	/* convert fd to fh */
183	SV *fh;	234	SV *fh;
184		235
185	XPUSHs (sv_2mortal (newSViv (req->result)));	236	PUSHs (sv_2mortal (newSViv (req->result)));
186	PUTBACK;	237	PUTBACK;
187	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	238	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
188	SPAGAIN;	239	SPAGAIN;
189		240
190	fh = SvREFCNT_inc (POPs);	241	fh = SvREFCNT_inc (POPs);
…		…
192	PUSHMARK (SP);	243	PUSHMARK (SP);
193	XPUSHs (sv_2mortal (fh));	244	XPUSHs (sv_2mortal (fh));
194	}	245	}
195	break;	246	break;
196		247
		248	case REQ_GROUP:
		249	req->fd = 2; /* mark group as finished */
		250
		251	if (req->data)
		252	{
		253	int i;
		254	AV av = (AV )req->data;
		255
		256	EXTEND (SP, AvFILL (av) + 1);
		257	for (i = 0; i <= AvFILL (av); ++i)
		258	PUSHs (*av_fetch (av, i, 0));
		259	}
		260	break;
		261
197	case REQ_SLEEP:	262	case REQ_SLEEP:
198	case REQ_GROUP:
199	break;	263	break;
200		264
201	default:	265	default:
202	XPUSHs (sv_2mortal (newSViv (req->result)));	266	PUSHs (sv_2mortal (newSViv (req->result)));
203	break;	267	break;
204	}	268	}
205		269
206		270
207	PUTBACK;	271	PUTBACK;
208	call_sv (req->callback, G_VOID \| G_EVAL);	272	call_sv (req->callback, G_VOID \| G_EVAL);
209	SPAGAIN;	273	SPAGAIN;
210		274
		275	FREETMPS;
		276	LEAVE;
		277
		278	errno = errorno;
		279
211	if (SvTRUE (ERRSV))	280	if (SvTRUE (ERRSV))
212	{	281	{
213	req_free (req);	282	req_free (req);
214	croak (0);	283	croak (0);
215	}	284	}
216
217	LEAVE;
218
219	errno = errorno;
220	}	285	}
221		286
222	static void req_free (aio_req req)	287	static void req_free (aio_req req)
223	{	288	{
224	if (req->grp)	289	if (req->grp)
225	{	290	{
226	aio_req grp = req->grp;	291	aio_req grp = req->grp;
227		292
228	/* unlink request */	293	/* unlink request */
229	req->grp_next->grp_prev = req->grp_prev;	294	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
230	req->grp_prev->grp_next = req->grp_next;	295	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
231		296
232	if (grp->grp_next == grp)	297	if (grp->grp_first == req)
233	{	298	grp->grp_first = req->grp_next;
234	req_invoke (grp);	299
235	req_free (grp);	300	aio_grp_dec (grp);
236	}
237	}	301	}
238		302
239	if (req->self)	303	if (req->self)
240	{	304	{
241	sv_unmagic (req->self, PERL_MAGIC_ext);	305	sv_unmagic (req->self, PERL_MAGIC_ext);
242	SvREFCNT_dec (req->self);	306	SvREFCNT_dec (req->self);
243	}	307	}
244		308
245	if (req->data)
246	SvREFCNT_dec (req->data);	309	SvREFCNT_dec (req->data);
247
248	if (req->fh)
249	SvREFCNT_dec (req->fh);	310	SvREFCNT_dec (req->fh);
250
251	if (req->fh2)
252	SvREFCNT_dec (req->fh2);	311	SvREFCNT_dec (req->fh2);
253
254	if (req->statdata)
255	Safefree (req->statdata);
256
257	if (req->callback)
258	SvREFCNT_dec (req->callback);	312	SvREFCNT_dec (req->callback);
		313	Safefree (req->statdata);
259		314
260	if (req->type == REQ_READDIR && req->result >= 0)	315	if (req->type == REQ_READDIR && req->result >= 0)
261	free (req->data2ptr);	316	free (req->data2ptr);
262		317
263	Safefree (req);	318	Safefree (req);
…		…
269		324
270	if (req->type == REQ_GROUP)	325	if (req->type == REQ_GROUP)
271	{	326	{
272	aio_req sub;	327	aio_req sub;
273		328
274	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	329	for (sub = req->grp_first; sub; sub = sub->grp_next)
275	req_cancel (sub);	330	req_cancel (sub);
276	}	331	}
277	}	332	}
278		333
279	static int poll_cb ()	334	static int poll_cb ()
…		…
306	pthread_mutex_unlock (&reslock);	361	pthread_mutex_unlock (&reslock);
307		362
308	if (!req)	363	if (!req)
309	break;	364	break;
310		365
311	nreqs--;	366	--nreqs;
312		367
313	if (req->type == REQ_QUIT)	368	if (req->type == REQ_QUIT)
314	started--;	369	started--;
315	else if (req->type == REQ_GROUP && req->grp_next != req)	370	else if (req->type == REQ_GROUP && req->length)
		371	{
		372	req->fd = 1; /* mark request as delayed */
316	continue;	373	continue;
		374	}
317	else	375	else
318	{	376	{
319	if (req->type == REQ_READ)	377	if (req->type == REQ_READ)
320	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));	378	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
321		379
…		…
364	static void req_send (aio_req req)	422	static void req_send (aio_req req)
365	{	423	{
366	while (started < wanted && nreqs >= started)	424	while (started < wanted && nreqs >= started)
367	start_thread ();	425	start_thread ();
368		426
369	nreqs++;	427	++nreqs;
370		428
371	pthread_mutex_lock (&reqlock);	429	pthread_mutex_lock (&reqlock);
372		430
373	req->next = 0;	431	req->next = 0;
374		432
…		…
726	pthread_mutex_unlock (&reqlock);	784	pthread_mutex_unlock (&reqlock);
727		785
728	errno = 0; /* strictly unnecessary */	786	errno = 0; /* strictly unnecessary */
729		787
730	if (!req->cancelled)	788	if (!req->cancelled)
731	switch (req->type)	789	switch (type = req->type) /* remember type for QUIT check */
732	{	790	{
733	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	791	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;	792	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
735		793
736	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	794	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
…		…
774		832
775	pthread_mutex_lock (&reslock);	833	pthread_mutex_lock (&reslock);
776		834
777	req->next = 0;	835	req->next = 0;
778		836
		837	printf ("queue rese %p\n", rese);//D
779	if (rese)	838	if (rese)
780	{	839	{
781	rese->next = req;	840	rese->next = req;
782	rese = req;	841	rese = req;
783	}	842	}
…		…
1142	}	1201	}
1143		1202
1144	void	1203	void
1145	aio_group (callback=&PL_sv_undef)	1204	aio_group (callback=&PL_sv_undef)
1146	SV * callback	1205	SV * callback
1147	PROTOTYPE: ;&	1206	PROTOTYPE: ;$
1148	PPCODE:	1207	PPCODE:
1149	{	1208	{
1150	dREQ;	1209	dREQ;
1151	req->type = REQ_GROUP;	1210	req->type = REQ_GROUP;
1152	req->grp_next = req;
1153	req->grp_prev = req;
1154
1155	req_send (req);	1211	req_send (req);
1156	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1212	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1157	}	1213	}
1158		1214
1159	void	1215	void
…		…
1205	CODE:	1261	CODE:
1206	RETVAL = nreqs;	1262	RETVAL = nreqs;
1207	OUTPUT:	1263	OUTPUT:
1208	RETVAL	1264	RETVAL
1209		1265
		1266	PROTOTYPES: DISABLE
		1267
1210	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1268	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1211		1269
1212	void	1270	void
1213	cancel (aio_req_ornot req)	1271	cancel (aio_req_ornot req)
1214	PROTOTYPE:	1272	PROTOTYPE:
…		…
1217		1275
1218	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1276	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1219		1277
1220	void	1278	void
1221	add (aio_req grp, ...)	1279	add (aio_req grp, ...)
1222	PROTOTYPE: $;@
1223	PPCODE:	1280	PPCODE:
1224	{	1281	{
1225	int i;	1282	int i;
		1283
		1284	if (grp->fd == 2)
		1285	croak ("cannot add requests to IO::AIO::GRP after the group finished");
1226		1286
1227	for (i = 1; i < items; ++i )	1287	for (i = 1; i < items; ++i )
1228	{	1288	{
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)	1289	if (GIMME_V != G_VOID)
1239	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1290	XPUSHs (sv_2mortal (newSVsv (ST (i))));
		1291
		1292	aio_req req = SvAIO_REQ (ST (i));
		1293
		1294	if (req)
		1295	{
		1296	++grp->length;
		1297	req->grp = grp;
		1298
		1299	req->grp_prev = 0;
		1300	req->grp_next = grp->grp_first;
		1301
		1302	if (grp->grp_first)
		1303	grp->grp_first->grp_prev = req;
		1304
		1305	grp->grp_first = req;
		1306	}
1240	}	1307	}
1241	}	1308	}
1242		1309
		1310	void
		1311	result (aio_req grp, ...)
		1312	CODE:
		1313	{
		1314	int i;
		1315	AV *av = newAV ();
		1316
		1317	for (i = 1; i < items; ++i )
		1318	av_push (av, newSVsv (ST (i)));
		1319
		1320	SvREFCNT_dec (grp->data);
		1321	grp->data = (SV *)av;
		1322	}
		1323
		1324	void
		1325	lock (aio_req grp)
		1326	CODE:
		1327	++grp->length;
		1328
		1329	void
		1330	unlock (aio_req grp)
		1331	CODE:
		1332	aio_grp_dec (grp);
		1333
		1334	void
		1335	feeder_limit (aio_req grp, int limit)
		1336	CODE:
		1337	grp->fd2 = limit;
		1338	aio_grp_feed (grp);
		1339
		1340	void
		1341	set_feeder (aio_req grp, SV *callback=&PL_sv_undef)
		1342	CODE:
		1343	{
		1344	SvREFCNT_dec (grp->fh2);
		1345	grp->fh2 = newSVsv (callback);
		1346
		1347	if (grp->fd2 <= 0)
		1348	grp->fd2 = 2;
		1349
		1350	aio_grp_feed (grp);
		1351	}
		1352

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.51 by root, Sun Oct 22 22:14:33 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.51 by root, Sun Oct 22 22:14:33 2006 UTC