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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.47 by root, Sun Oct 22 10:10:23 2006 UTC vs.
Revision 1.55 by root, Mon Oct 23 00:47:29 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;
		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;
…		…
101	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	101	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102		102
103	static volatile aio_req reqs, reqe; /* queue start, queue end */	103	static volatile aio_req reqs, reqe; /* queue start, queue end */
104	static volatile aio_req ress, rese; /* queue start, queue end */	104	static volatile aio_req ress, rese; /* queue start, queue end */
105		105
		106	static void req_invoke (aio_req req);
106	static void req_free (aio_req req);	107	static void req_free (aio_req req);
107		108
108	/* must be called at most once */	109	/* must be called at most once */
109	static SV req_sv (aio_req req, const char klass)	110	static SV req_sv (aio_req req, const char klass)
110	{	111	{
		112	if (!req->self)
		113	{
111	req->self = (SV *)newHV ();	114	req->self = (SV *)newHV ();
112	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	115	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		116	}
113		117
114	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)));
115	}	119	}
116		120
117	static aio_req SvAIO_REQ (SV *sv)	121	static aio_req SvAIO_REQ (SV *sv)
118	{	122	{
		123	MAGIC *mg;
		124
119	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))	125	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))
120	croak ("object of class " AIO_REQ_KLASS " expected");	126	croak ("object of class " AIO_REQ_KLASS " expected");
121		127
122	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	128	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123		129
124	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	}
125	}	177	}
126		178
127	static void poll_wait ()	179	static void poll_wait ()
128	{	180	{
129	if (nreqs && !ress)	181	if (nreqs && !ress)
…		…
145	return;	197	return;
146		198
147	errno = req->errorno;	199	errno = req->errorno;
148		200
149	ENTER;	201	ENTER;
		202	SAVETMPS;
150	PUSHMARK (SP);	203	PUSHMARK (SP);
		204	EXTEND (SP, 1);
151		205
152	switch (req->type)	206	switch (req->type)
153	{	207	{
154	case REQ_READDIR:	208	case REQ_READDIR:
155	{	209	{
…		…
170	}	224	}
171		225
172	rv = sv_2mortal (newRV_noinc ((SV *)av));	226	rv = sv_2mortal (newRV_noinc ((SV *)av));
173	}	227	}
174		228
175	XPUSHs (rv);	229	PUSHs (rv);
176	}	230	}
177	break;	231	break;
178		232
179	case REQ_OPEN:	233	case REQ_OPEN:
180	{	234	{
181	/* convert fd to fh */	235	/* convert fd to fh */
182	SV *fh;	236	SV *fh;
183		237
184	XPUSHs (sv_2mortal (newSViv (req->result)));	238	PUSHs (sv_2mortal (newSViv (req->result)));
185	PUTBACK;	239	PUTBACK;
186	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	240	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
187	SPAGAIN;	241	SPAGAIN;
188		242
189	fh = SvREFCNT_inc (POPs);	243	fh = SvREFCNT_inc (POPs);
…		…
191	PUSHMARK (SP);	245	PUSHMARK (SP);
192	XPUSHs (sv_2mortal (fh));	246	XPUSHs (sv_2mortal (fh));
193	}	247	}
194	break;	248	break;
195		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
		264	case REQ_NOP:
196	case REQ_SLEEP:	265	case REQ_SLEEP:
197	case REQ_GROUP:
198	break;	266	break;
199		267
200	default:	268	default:
201	XPUSHs (sv_2mortal (newSViv (req->result)));	269	PUSHs (sv_2mortal (newSViv (req->result)));
202	break;	270	break;
203	}	271	}
204		272
205		273
206	PUTBACK;	274	PUTBACK;
207	call_sv (req->callback, G_VOID \| G_EVAL);	275	call_sv (req->callback, G_VOID \| G_EVAL);
208	SPAGAIN;	276	SPAGAIN;
209		277
		278	FREETMPS;
		279	LEAVE;
		280
		281	errno = errorno;
		282
210	if (SvTRUE (ERRSV))	283	if (SvTRUE (ERRSV))
211	{	284	{
212	req_free (req);	285	req_free (req);
213	croak (0);	286	croak (0);
214	}	287	}
215
216	LEAVE;
217
218	errno = errorno;
219	}	288	}
220		289
221	static void req_free (aio_req req)	290	static void req_free (aio_req req)
222	{	291	{
223	if (req->grp)	292	if (req->grp)
224	{	293	{
225	aio_req grp = req->grp;	294	aio_req grp = req->grp;
226		295
227	/* unlink request */	296	/* unlink request */
228	req->grp_next->grp_prev = req->grp_prev;	297	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
229	req->grp_prev->grp_next = req->grp_next;	298	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
230		299
231	if (grp->grp_next == grp && grp->fd)	300	if (grp->grp_first == req)
232	{	301	grp->grp_first = req->grp_next;
233	req_invoke (grp);	302
234	req_free (grp);	303	aio_grp_dec (grp);
235	}
236	}	304	}
237		305
238	if (req->self)	306	if (req->self)
239	{	307	{
240	sv_unmagic (req->self, PERL_MAGIC_ext);	308	sv_unmagic (req->self, PERL_MAGIC_ext);
241	SvREFCNT_dec (req->self);	309	SvREFCNT_dec (req->self);
242	}	310	}
243		311
244	if (req->data)
245	SvREFCNT_dec (req->data);	312	SvREFCNT_dec (req->data);
246
247	if (req->fh)
248	SvREFCNT_dec (req->fh);	313	SvREFCNT_dec (req->fh);
249
250	if (req->fh2)
251	SvREFCNT_dec (req->fh2);	314	SvREFCNT_dec (req->fh2);
252
253	if (req->statdata)
254	Safefree (req->statdata);
255
256	if (req->callback)
257	SvREFCNT_dec (req->callback);	315	SvREFCNT_dec (req->callback);
		316	Safefree (req->statdata);
258		317
259	if (req->type == REQ_READDIR && req->result >= 0)	318	if (req->type == REQ_READDIR && req->result >= 0)
260	free (req->data2ptr);	319	free (req->data2ptr);
261		320
262	Safefree (req);	321	Safefree (req);
…		…
268		327
269	if (req->type == REQ_GROUP)	328	if (req->type == REQ_GROUP)
270	{	329	{
271	aio_req sub;	330	aio_req sub;
272		331
273	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	332	for (sub = req->grp_first; sub; sub = sub->grp_next)
274	req_cancel (sub);	333	req_cancel (sub);
275	}	334	}
276	}	335	}
277		336
278	static int poll_cb ()	337	static int poll_cb ()
…		…
305	pthread_mutex_unlock (&reslock);	364	pthread_mutex_unlock (&reslock);
306		365
307	if (!req)	366	if (!req)
308	break;	367	break;
309		368
310	nreqs--;	369	--nreqs;
311		370
312	if (req->type == REQ_QUIT)	371	if (req->type == REQ_QUIT)
313	started--;	372	started--;
314	else if (req->type == REQ_GROUP && req->grp_next != req)	373	else if (req->type == REQ_GROUP && req->length)
315	{	374	{
316	req->fd = 1; /* mark request as delayed */	375	req->fd = 1; /* mark request as delayed */
317	continue;	376	continue;
318	}	377	}
319	else	378	else
…		…
366	static void req_send (aio_req req)	425	static void req_send (aio_req req)
367	{	426	{
368	while (started < wanted && nreqs >= started)	427	while (started < wanted && nreqs >= started)
369	start_thread ();	428	start_thread ();
370		429
371	nreqs++;	430	++nreqs;
372		431
373	pthread_mutex_lock (&reqlock);	432	pthread_mutex_lock (&reqlock);
374		433
375	req->next = 0;	434	req->next = 0;
376		435
…		…
728	pthread_mutex_unlock (&reqlock);	787	pthread_mutex_unlock (&reqlock);
729		788
730	errno = 0; /* strictly unnecessary */	789	errno = 0; /* strictly unnecessary */
731		790
732	if (!req->cancelled)	791	if (!req->cancelled)
733	switch (req->type)	792	switch (type = req->type) /* remember type for QUIT check */
734	{	793	{
735	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	794	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
736	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;	795	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
737		796
738	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	797	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
…		…
762	tv.tv_usec = req->fd2;	821	tv.tv_usec = req->fd2;
763		822
764	req->result = select (0, 0, 0, 0, &tv);	823	req->result = select (0, 0, 0, 0, &tv);
765	}	824	}
766		825
		826	case REQ_GROUP:
		827	case REQ_NOP:
767	case REQ_QUIT:	828	case REQ_QUIT:
768	break;	829	break;
769		830
770	default:	831	default:
771	req->result = ENOSYS;	832	req->result = ENOSYS;
…		…
1149	PROTOTYPE: ;$	1210	PROTOTYPE: ;$
1150	PPCODE:	1211	PPCODE:
1151	{	1212	{
1152	dREQ;	1213	dREQ;
1153	req->type = REQ_GROUP;	1214	req->type = REQ_GROUP;
1154	req->grp_next = req;
1155	req->grp_prev = req;
1156
1157	req_send (req);	1215	req_send (req);
1158	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1216	XPUSHs (req_sv (req, AIO_GRP_KLASS));
		1217	}
		1218
		1219	void
		1220	aio_nop (callback=&PL_sv_undef)
		1221	SV * callback
		1222	PPCODE:
		1223	{
		1224	dREQ;
		1225
		1226	req->type = REQ_NOP;
		1227
		1228	REQ_SEND;
1159	}	1229	}
1160		1230
1161	void	1231	void
1162	flush ()	1232	flush ()
1163	PROTOTYPE:	1233	PROTOTYPE:
…		…
1207	CODE:	1277	CODE:
1208	RETVAL = nreqs;	1278	RETVAL = nreqs;
1209	OUTPUT:	1279	OUTPUT:
1210	RETVAL	1280	RETVAL
1211		1281
		1282	PROTOTYPES: DISABLE
		1283
1212	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1284	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1213		1285
1214	void	1286	void
1215	cancel (aio_req_ornot req)	1287	cancel (aio_req_ornot req)
1216	PROTOTYPE:	1288	PROTOTYPE:
…		…
1219		1291
1220	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1292	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1221		1293
1222	void	1294	void
1223	add (aio_req grp, ...)	1295	add (aio_req grp, ...)
1224	PROTOTYPE: $;@
1225	PPCODE:	1296	PPCODE:
1226	{	1297	{
1227	int i;	1298	int i;
		1299	aio_req req;
		1300
		1301	if (grp->fd == 2)
		1302	croak ("cannot add requests to IO::AIO::GRP after the group finished");
1228		1303
1229	for (i = 1; i < items; ++i )	1304	for (i = 1; i < items; ++i )
1230	{	1305	{
1231	if (GIMME_V != G_VOID)	1306	if (GIMME_V != G_VOID)
1232	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1307	XPUSHs (sv_2mortal (newSVsv (ST (i))));
1233		1308
1234	aio_req req = SvAIO_REQ (ST (i));	1309	req = SvAIO_REQ (ST (i));
1235		1310
1236	if (req)	1311	if (req)
1237	{	1312	{
1238	req->grp_prev = grp;	1313	++grp->length;
1239	req->grp_next = grp->grp_next;
1240	grp->grp_next->grp_prev = req;
1241	grp->grp_next = req;
1242
1243	req->grp = grp;	1314	req->grp = grp;
		1315
		1316	req->grp_prev = 0;
		1317	req->grp_next = grp->grp_first;
		1318
		1319	if (grp->grp_first)
		1320	grp->grp_first->grp_prev = req;
		1321
		1322	grp->grp_first = req;
1244	}	1323	}
1245	}	1324	}
1246	}	1325	}
1247		1326
		1327	void
		1328	result (aio_req grp, ...)
		1329	CODE:
		1330	{
		1331	int i;
		1332	AV *av = newAV ();
		1333
		1334	for (i = 1; i < items; ++i )
		1335	av_push (av, newSVsv (ST (i)));
		1336
		1337	SvREFCNT_dec (grp->data);
		1338	grp->data = (SV *)av;
		1339	}
		1340
		1341	void
		1342	lock (aio_req grp)
		1343	CODE:
		1344	++grp->length;
		1345
		1346	void
		1347	unlock (aio_req grp)
		1348	CODE:
		1349	aio_grp_dec (grp);
		1350
		1351	void
		1352	feeder_limit (aio_req grp, int limit)
		1353	CODE:
		1354	grp->fd2 = limit;
		1355	aio_grp_feed (grp);
		1356
		1357	void
		1358	set_feeder (aio_req grp, SV *callback=&PL_sv_undef)
		1359	CODE:
		1360	{
		1361	SvREFCNT_dec (grp->fh2);
		1362	grp->fh2 = newSVsv (callback);
		1363
		1364	if (grp->fd2 <= 0)
		1365	grp->fd2 = 2;
		1366
		1367	aio_grp_feed (grp);
		1368	}
		1369

Diff Legend

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

Comparing IO-AIO/AIO.xs (file contents): Revision 1.47 by root, Sun Oct 22 10:10:23 2006 UTC vs. Revision 1.55 by root, Mon Oct 23 00:47:29 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.47 by root, Sun Oct 22 10:10:23 2006 UTC vs.
Revision 1.55 by root, Mon Oct 23 00:47:29 2006 UTC