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

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.53 by root, Mon Oct 23 00:17:07 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.53 by root, Mon Oct 23 00:17:07 2006 UTC