[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.58 by root, Mon Oct 23 18:48:08 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;
…		…
83	int type;	83	int type;
84	int fd, fd2;	84	int fd, fd2;
85	int errorno;	85	int errorno;
86	STRLEN dataoffset;	86	STRLEN dataoffset;
87	mode_t mode; /* open */	87	mode_t mode; /* open */
		88	unsigned char pri;
88	unsigned char cancelled;	89	unsigned char flags;
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;
94		98
95	static int started, wanted;	99	static int started, wanted;
96	static volatile int nreqs;	100	static volatile int nreqs;
97	static int max_outstanding = 1<<30;	101	static int max_outstanding = 1<<30;
98	static int respipe [2];	102	static int respipe [2];
…		…
102	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	106	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
103		107
104	static volatile aio_req reqs, reqe; /* queue start, queue end */	108	static volatile aio_req reqs, reqe; /* queue start, queue end */
105	static volatile aio_req ress, rese; /* queue start, queue end */	109	static volatile aio_req ress, rese; /* queue start, queue end */
106		110
		111	static void req_invoke (aio_req req);
107	static void req_free (aio_req req);	112	static void req_free (aio_req req);
108		113
109	/* must be called at most once */	114	/* must be called at most once */
110	static SV req_sv (aio_req req, const char klass)	115	static SV req_sv (aio_req req, const char klass)
111	{	116	{
		117	if (!req->self)
		118	{
112	req->self = (SV *)newHV ();	119	req->self = (SV *)newHV ();
113	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	120	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		121	}
114		122
115	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));	123	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
116	}	124	}
117		125
118	static aio_req SvAIO_REQ (SV *sv)	126	static aio_req SvAIO_REQ (SV *sv)
119	{	127	{
		128	MAGIC *mg;
		129
120	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))	130	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))
121	croak ("object of class " AIO_REQ_KLASS " expected");	131	croak ("object of class " AIO_REQ_KLASS " expected");
122		132
123	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	133	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
124		134
125	return mg ? (aio_req)mg->mg_ptr : 0;	135	return mg ? (aio_req)mg->mg_ptr : 0;
		136	}
		137
		138	static void aio_grp_feed (aio_req grp)
		139	{
		140	while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
		141	{
		142	int old_len = grp->length;
		143
		144	if (grp->fh2 && SvOK (grp->fh2))
		145	{
		146	dSP;
		147
		148	ENTER;
		149	SAVETMPS;
		150	PUSHMARK (SP);
		151	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
		152	PUTBACK;
		153	call_sv (grp->fh2, G_VOID \| G_EVAL);
		154	SPAGAIN;
		155	FREETMPS;
		156	LEAVE;
		157	}
		158
		159	/* stop if no progress has been made */
		160	if (old_len == grp->length)
		161	{
		162	SvREFCNT_dec (grp->fh2);
		163	grp->fh2 = 0;
		164	break;
		165	}
		166	}
		167	}
		168
		169	static void aio_grp_dec (aio_req grp)
		170	{
		171	--grp->length;
		172
		173	/* call feeder, if applicable */
		174	aio_grp_feed (grp);
		175
		176	/* finish, if done */
		177	if (!grp->length && grp->fd)
		178	{
		179	req_invoke (grp);
		180	req_free (grp);
		181	}
126	}	182	}
127		183
128	static void poll_wait ()	184	static void poll_wait ()
129	{	185	{
130	if (nreqs && !ress)	186	if (nreqs && !ress)
…		…
140	static void req_invoke (aio_req req)	196	static void req_invoke (aio_req req)
141	{	197	{
142	dSP;	198	dSP;
143	int errorno = errno;	199	int errorno = errno;
144		200
145	if (req->cancelled \|\| !SvOK (req->callback))	201	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))
146	return;	202	return;
147		203
148	errno = req->errorno;	204	errno = req->errorno;
149		205
150	ENTER;	206	ENTER;
		207	SAVETMPS;
151	PUSHMARK (SP);	208	PUSHMARK (SP);
		209	EXTEND (SP, 1);
152		210
153	switch (req->type)	211	switch (req->type)
154	{	212	{
155	case REQ_READDIR:	213	case REQ_READDIR:
156	{	214	{
…		…
171	}	229	}
172		230
173	rv = sv_2mortal (newRV_noinc ((SV *)av));	231	rv = sv_2mortal (newRV_noinc ((SV *)av));
174	}	232	}
175		233
176	XPUSHs (rv);	234	PUSHs (rv);
177	}	235	}
178	break;	236	break;
179		237
180	case REQ_OPEN:	238	case REQ_OPEN:
181	{	239	{
182	/* convert fd to fh */	240	/* convert fd to fh */
183	SV *fh;	241	SV *fh;
184		242
185	XPUSHs (sv_2mortal (newSViv (req->result)));	243	PUSHs (sv_2mortal (newSViv (req->result)));
186	PUTBACK;	244	PUTBACK;
187	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	245	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
188	SPAGAIN;	246	SPAGAIN;
189		247
190	fh = SvREFCNT_inc (POPs);	248	fh = SvREFCNT_inc (POPs);
…		…
192	PUSHMARK (SP);	250	PUSHMARK (SP);
193	XPUSHs (sv_2mortal (fh));	251	XPUSHs (sv_2mortal (fh));
194	}	252	}
195	break;	253	break;
196		254
		255	case REQ_GROUP:
		256	req->fd = 2; /* mark group as finished */
		257
		258	if (req->data)
		259	{
		260	int i;
		261	AV av = (AV )req->data;
		262
		263	EXTEND (SP, AvFILL (av) + 1);
		264	for (i = 0; i <= AvFILL (av); ++i)
		265	PUSHs (*av_fetch (av, i, 0));
		266	}
		267	break;
		268
		269	case REQ_NOP:
197	case REQ_SLEEP:	270	case REQ_SLEEP:
198	case REQ_GROUP:
199	break;	271	break;
200		272
201	default:	273	default:
202	XPUSHs (sv_2mortal (newSViv (req->result)));	274	PUSHs (sv_2mortal (newSViv (req->result)));
203	break;	275	break;
204	}	276	}
205		277
206		278
207	PUTBACK;	279	PUTBACK;
208	call_sv (req->callback, G_VOID \| G_EVAL);	280	call_sv (req->callback, G_VOID \| G_EVAL);
209	SPAGAIN;	281	SPAGAIN;
210		282
		283	FREETMPS;
		284	LEAVE;
		285
		286	errno = errorno;
		287
211	if (SvTRUE (ERRSV))	288	if (SvTRUE (ERRSV))
212	{	289	{
213	req_free (req);	290	req_free (req);
214	croak (0);	291	croak (0);
215	}	292	}
216
217	LEAVE;
218
219	errno = errorno;
220	}	293	}
221		294
222	static void req_free (aio_req req)	295	static void req_free (aio_req req)
223	{	296	{
224	if (req->grp)	297	if (req->grp)
225	{	298	{
226	aio_req grp = req->grp;	299	aio_req grp = req->grp;
227		300
228	/* unlink request */	301	/* unlink request */
229	req->grp_next->grp_prev = req->grp_prev;	302	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
230	req->grp_prev->grp_next = req->grp_next;	303	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
231		304
232	if (grp->grp_next == grp)	305	if (grp->grp_first == req)
233	{	306	grp->grp_first = req->grp_next;
234	req_invoke (grp);	307
235	req_free (grp);	308	aio_grp_dec (grp);
236	}
237	}	309	}
238		310
239	if (req->self)	311	if (req->self)
240	{	312	{
241	sv_unmagic (req->self, PERL_MAGIC_ext);	313	sv_unmagic (req->self, PERL_MAGIC_ext);
242	SvREFCNT_dec (req->self);	314	SvREFCNT_dec (req->self);
243	}	315	}
244		316
245	if (req->data)
246	SvREFCNT_dec (req->data);	317	SvREFCNT_dec (req->data);
247
248	if (req->fh)
249	SvREFCNT_dec (req->fh);	318	SvREFCNT_dec (req->fh);
250
251	if (req->fh2)
252	SvREFCNT_dec (req->fh2);	319	SvREFCNT_dec (req->fh2);
253
254	if (req->statdata)
255	Safefree (req->statdata);
256
257	if (req->callback)
258	SvREFCNT_dec (req->callback);	320	SvREFCNT_dec (req->callback);
		321	Safefree (req->statdata);
259		322
260	if (req->type == REQ_READDIR && req->result >= 0)	323	if (req->type == REQ_READDIR && req->result >= 0)
261	free (req->data2ptr);	324	free (req->data2ptr);
262		325
263	Safefree (req);	326	Safefree (req);
264	}	327	}
265		328
266	static void req_cancel (aio_req req)	329	static void req_cancel (aio_req req)
267	{	330	{
268	req->cancelled = 1;	331	req->flags \|= FLAG_CANCELLED;
269		332
270	if (req->type == REQ_GROUP)	333	if (req->type == REQ_GROUP)
271	{	334	{
272	aio_req sub;	335	aio_req sub;
273		336
274	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	337	for (sub = req->grp_first; sub; sub = sub->grp_next)
275	req_cancel (sub);	338	req_cancel (sub);
276	}	339	}
277	}	340	}
278		341
279	static int poll_cb ()	342	static int poll_cb ()
…		…
306	pthread_mutex_unlock (&reslock);	369	pthread_mutex_unlock (&reslock);
307		370
308	if (!req)	371	if (!req)
309	break;	372	break;
310		373
311	nreqs--;	374	--nreqs;
312		375
313	if (req->type == REQ_QUIT)	376	if (req->type == REQ_QUIT)
314	started--;	377	started--;
315	else if (req->type == REQ_GROUP && req->grp_next != req)	378	else if (req->type == REQ_GROUP && req->length)
		379	{
		380	req->fd = 1; /* mark request as delayed */
316	continue;	381	continue;
		382	}
317	else	383	else
318	{	384	{
319	if (req->type == REQ_READ)	385	if (req->type == REQ_READ)
320	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));	386	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
321		387
…		…
364	static void req_send (aio_req req)	430	static void req_send (aio_req req)
365	{	431	{
366	while (started < wanted && nreqs >= started)	432	while (started < wanted && nreqs >= started)
367	start_thread ();	433	start_thread ();
368		434
369	nreqs++;	435	++nreqs;
370		436
371	pthread_mutex_lock (&reqlock);	437	pthread_mutex_lock (&reqlock);
372		438
373	req->next = 0;	439	req->next = 0;
374		440
…		…
725		791
726	pthread_mutex_unlock (&reqlock);	792	pthread_mutex_unlock (&reqlock);
727		793
728	errno = 0; /* strictly unnecessary */	794	errno = 0; /* strictly unnecessary */
729		795
730	if (!req->cancelled)	796	if (!(req->flags & FLAG_CANCELLED))
731	switch (req->type)	797	switch (type = req->type) /* remember type for QUIT check */
732	{	798	{
733	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	799	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;	800	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
735		801
736	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	802	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
…		…
760	tv.tv_usec = req->fd2;	826	tv.tv_usec = req->fd2;
761		827
762	req->result = select (0, 0, 0, 0, &tv);	828	req->result = select (0, 0, 0, 0, &tv);
763	}	829	}
764		830
		831	case REQ_GROUP:
		832	case REQ_NOP:
765	case REQ_QUIT:	833	case REQ_QUIT:
766	break;	834	break;
767		835
768	default:	836	default:
769	req->result = ENOSYS;	837	req->result = ENOSYS;
…		…
1142	}	1210	}
1143		1211
1144	void	1212	void
1145	aio_group (callback=&PL_sv_undef)	1213	aio_group (callback=&PL_sv_undef)
1146	SV * callback	1214	SV * callback
1147	PROTOTYPE: ;&	1215	PROTOTYPE: ;$
1148	PPCODE:	1216	PPCODE:
1149	{	1217	{
1150	dREQ;	1218	dREQ;
1151	req->type = REQ_GROUP;	1219	req->type = REQ_GROUP;
1152	req->grp_next = req;
1153	req->grp_prev = req;
1154
1155	req_send (req);	1220	req_send (req);
1156	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1221	XPUSHs (req_sv (req, AIO_GRP_KLASS));
		1222	}
		1223
		1224	void
		1225	aio_nop (callback=&PL_sv_undef)
		1226	SV * callback
		1227	PPCODE:
		1228	{
		1229	dREQ;
		1230
		1231	req->type = REQ_NOP;
		1232
		1233	REQ_SEND;
1157	}	1234	}
1158		1235
1159	void	1236	void
1160	flush ()	1237	flush ()
1161	PROTOTYPE:	1238	PROTOTYPE:
…		…
1205	CODE:	1282	CODE:
1206	RETVAL = nreqs;	1283	RETVAL = nreqs;
1207	OUTPUT:	1284	OUTPUT:
1208	RETVAL	1285	RETVAL
1209		1286
		1287	PROTOTYPES: DISABLE
		1288
1210	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1289	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1211		1290
1212	void	1291	void
1213	cancel (aio_req_ornot req)	1292	cancel (aio_req_ornot req)
1214	PROTOTYPE:	1293	PROTOTYPE:
1215	CODE:	1294	CODE:
1216	req_cancel (req);	1295	req_cancel (req);
1217		1296
		1297	void
		1298	cb (aio_req req, SV *callback=&PL_sv_undef)
		1299	CODE:
		1300	SvREFCNT_dec (req->callback);
		1301	req->callback = newSVsv (callback);
		1302
1218	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1303	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1219		1304
1220	void	1305	void
1221	add (aio_req grp, ...)	1306	add (aio_req grp, ...)
1222	PROTOTYPE: $;@
1223	PPCODE:	1307	PPCODE:
1224	{	1308	{
1225	int i;	1309	int i;
		1310	aio_req req;
		1311
		1312	if (grp->fd == 2)
		1313	croak ("cannot add requests to IO::AIO::GRP after the group finished");
1226		1314
1227	for (i = 1; i < items; ++i )	1315	for (i = 1; i < items; ++i )
1228	{	1316	{
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)	1317	if (GIMME_V != G_VOID)
1239	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1318	XPUSHs (sv_2mortal (newSVsv (ST (i))));
		1319
		1320	req = SvAIO_REQ (ST (i));
		1321
		1322	if (req)
		1323	{
		1324	++grp->length;
		1325	req->grp = grp;
		1326
		1327	req->grp_prev = 0;
		1328	req->grp_next = grp->grp_first;
		1329
		1330	if (grp->grp_first)
		1331	grp->grp_first->grp_prev = req;
		1332
		1333	grp->grp_first = req;
		1334	}
1240	}	1335	}
1241	}	1336	}
1242		1337
		1338	void
		1339	result (aio_req grp, ...)
		1340	CODE:
		1341	{
		1342	int i;
		1343	AV *av = newAV ();
		1344
		1345	for (i = 1; i < items; ++i )
		1346	av_push (av, newSVsv (ST (i)));
		1347
		1348	SvREFCNT_dec (grp->data);
		1349	grp->data = (SV *)av;
		1350	}
		1351
		1352	void
		1353	feed_limit (aio_req grp, int limit)
		1354	CODE:
		1355	grp->fd2 = limit;
		1356	aio_grp_feed (grp);
		1357
		1358	void
		1359	feed (aio_req grp, SV *callback=&PL_sv_undef)
		1360	CODE:
		1361	{
		1362	SvREFCNT_dec (grp->fh2);
		1363	grp->fh2 = newSVsv (callback);
		1364
		1365	if (grp->fd2 <= 0)
		1366	grp->fd2 = 2;
		1367
		1368	aio_grp_feed (grp);
		1369	}
		1370

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.58 by root, Mon Oct 23 18:48:08 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.58 by root, Mon Oct 23 18:48:08 2006 UTC