[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.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;
…		…
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
		264	case REQ_NOP:
197	case REQ_SLEEP:	265	case REQ_SLEEP:
198	case REQ_GROUP:
199	break;	266	break;
200		267
201	default:	268	default:
202	XPUSHs (sv_2mortal (newSViv (req->result)));	269	PUSHs (sv_2mortal (newSViv (req->result)));
203	break;	270	break;
204	}	271	}
205		272
206		273
207	PUTBACK;	274	PUTBACK;
208	call_sv (req->callback, G_VOID \| G_EVAL);	275	call_sv (req->callback, G_VOID \| G_EVAL);
209	SPAGAIN;	276	SPAGAIN;
210		277
		278	FREETMPS;
		279	LEAVE;
		280
		281	errno = errorno;
		282
211	if (SvTRUE (ERRSV))	283	if (SvTRUE (ERRSV))
212	{	284	{
213	req_free (req);	285	req_free (req);
214	croak (0);	286	croak (0);
215	}	287	}
216
217	LEAVE;
218
219	errno = errorno;
220	}	288	}
221		289
222	static void req_free (aio_req req)	290	static void req_free (aio_req req)
223	{	291	{
224	if (req->grp)	292	if (req->grp)
225	{	293	{
226	aio_req grp = req->grp;	294	aio_req grp = req->grp;
227		295
228	/* unlink request */	296	/* unlink request */
229	req->grp_next->grp_prev = req->grp_prev;	297	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
230	req->grp_prev->grp_next = req->grp_next;	298	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
231		299
232	if (grp->grp_next == grp)	300	if (grp->grp_first == req)
233	{	301	grp->grp_first = req->grp_next;
234	req_invoke (grp);	302
235	req_free (grp);	303	aio_grp_dec (grp);
236	}
237	}	304	}
238		305
239	if (req->self)	306	if (req->self)
240	{	307	{
241	sv_unmagic (req->self, PERL_MAGIC_ext);	308	sv_unmagic (req->self, PERL_MAGIC_ext);
242	SvREFCNT_dec (req->self);	309	SvREFCNT_dec (req->self);
243	}	310	}
244		311
245	if (req->data)
246	SvREFCNT_dec (req->data);	312	SvREFCNT_dec (req->data);
247
248	if (req->fh)
249	SvREFCNT_dec (req->fh);	313	SvREFCNT_dec (req->fh);
250
251	if (req->fh2)
252	SvREFCNT_dec (req->fh2);	314	SvREFCNT_dec (req->fh2);
253
254	if (req->statdata)
255	Safefree (req->statdata);
256
257	if (req->callback)
258	SvREFCNT_dec (req->callback);	315	SvREFCNT_dec (req->callback);
		316	Safefree (req->statdata);
259		317
260	if (req->type == REQ_READDIR && req->result >= 0)	318	if (req->type == REQ_READDIR && req->result >= 0)
261	free (req->data2ptr);	319	free (req->data2ptr);
262		320
263	Safefree (req);	321	Safefree (req);
…		…
269		327
270	if (req->type == REQ_GROUP)	328	if (req->type == REQ_GROUP)
271	{	329	{
272	aio_req sub;	330	aio_req sub;
273		331
274	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	332	for (sub = req->grp_first; sub; sub = sub->grp_next)
275	req_cancel (sub);	333	req_cancel (sub);
276	}	334	}
277	}	335	}
278		336
279	static int poll_cb ()	337	static int poll_cb ()
…		…
306	pthread_mutex_unlock (&reslock);	364	pthread_mutex_unlock (&reslock);
307		365
308	if (!req)	366	if (!req)
309	break;	367	break;
310		368
311	nreqs--;	369	--nreqs;
312		370
313	if (req->type == REQ_QUIT)	371	if (req->type == REQ_QUIT)
314	started--;	372	started--;
315	else if (req->type == REQ_GROUP && req->grp_next != req)	373	else if (req->type == REQ_GROUP && req->length)
		374	{
		375	req->fd = 1; /* mark request as delayed */
316	continue;	376	continue;
		377	}
317	else	378	else
318	{	379	{
319	if (req->type == REQ_READ)	380	if (req->type == REQ_READ)
320	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));	381	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
321		382
…		…
364	static void req_send (aio_req req)	425	static void req_send (aio_req req)
365	{	426	{
366	while (started < wanted && nreqs >= started)	427	while (started < wanted && nreqs >= started)
367	start_thread ();	428	start_thread ();
368		429
369	nreqs++;	430	++nreqs;
370		431
371	pthread_mutex_lock (&reqlock);	432	pthread_mutex_lock (&reqlock);
372		433
373	req->next = 0;	434	req->next = 0;
374		435
…		…
726	pthread_mutex_unlock (&reqlock);	787	pthread_mutex_unlock (&reqlock);
727		788
728	errno = 0; /* strictly unnecessary */	789	errno = 0; /* strictly unnecessary */
729		790
730	if (!req->cancelled)	791	if (!req->cancelled)
731	switch (req->type)	792	switch (type = req->type) /* remember type for QUIT check */
732	{	793	{
733	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;
734	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;
735		796
736	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;
…		…
760	tv.tv_usec = req->fd2;	821	tv.tv_usec = req->fd2;
761		822
762	req->result = select (0, 0, 0, 0, &tv);	823	req->result = select (0, 0, 0, 0, &tv);
763	}	824	}
764		825
		826	case REQ_GROUP:
		827	case REQ_NOP:
765	case REQ_QUIT:	828	case REQ_QUIT:
766	break;	829	break;
767		830
768	default:	831	default:
769	req->result = ENOSYS;	832	req->result = ENOSYS;
…		…
1142	}	1205	}
1143		1206
1144	void	1207	void
1145	aio_group (callback=&PL_sv_undef)	1208	aio_group (callback=&PL_sv_undef)
1146	SV * callback	1209	SV * callback
1147	PROTOTYPE: ;&	1210	PROTOTYPE: ;$
1148	PPCODE:	1211	PPCODE:
1149	{	1212	{
1150	dREQ;	1213	dREQ;
1151	req->type = REQ_GROUP;	1214	req->type = REQ_GROUP;
1152	req->grp_next = req;
1153	req->grp_prev = req;
1154
1155	req_send (req);	1215	req_send (req);
1156	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;
1157	}	1229	}
1158		1230
1159	void	1231	void
1160	flush ()	1232	flush ()
1161	PROTOTYPE:	1233	PROTOTYPE:
…		…
1205	CODE:	1277	CODE:
1206	RETVAL = nreqs;	1278	RETVAL = nreqs;
1207	OUTPUT:	1279	OUTPUT:
1208	RETVAL	1280	RETVAL
1209		1281
		1282	PROTOTYPES: DISABLE
		1283
1210	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1284	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1211		1285
1212	void	1286	void
1213	cancel (aio_req_ornot req)	1287	cancel (aio_req_ornot req)
1214	PROTOTYPE:	1288	PROTOTYPE:
…		…
1217		1291
1218	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1292	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1219		1293
1220	void	1294	void
1221	add (aio_req grp, ...)	1295	add (aio_req grp, ...)
1222	PROTOTYPE: $;@
1223	PPCODE:	1296	PPCODE:
1224	{	1297	{
1225	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");
1226		1303
1227	for (i = 1; i < items; ++i )	1304	for (i = 1; i < items; ++i )
1228	{	1305	{
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)	1306	if (GIMME_V != G_VOID)
1239	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1307	XPUSHs (sv_2mortal (newSVsv (ST (i))));
		1308
		1309	req = SvAIO_REQ (ST (i));
		1310
		1311	if (req)
		1312	{
		1313	++grp->length;
		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;
		1323	}
1240	}	1324	}
1241	}	1325	}
1242		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.45 by root, Sun Oct 22 00:19:05 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.45 by root, Sun Oct 22 00:19:05 2006 UTC vs.
Revision 1.55 by root, Mon Oct 23 00:47:29 2006 UTC