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

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.46 by root, Sun Oct 22 00:49:29 2006 UTC vs.
Revision 1.59 by root, Mon Oct 23 18:56:27 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		98
94	static int started, wanted;	99	static int started, wanted;
…		…
101	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	106	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102		107
103	static volatile aio_req reqs, reqe; /* queue start, queue end */	108	static volatile aio_req reqs, reqe; /* queue start, queue end */
104	static volatile aio_req ress, rese; /* queue start, queue end */	109	static volatile aio_req ress, rese; /* queue start, queue end */
105		110
		111	static void req_invoke (aio_req req);
106	static void req_free (aio_req req);	112	static void req_free (aio_req req);
107		113
108	/* must be called at most once */	114	/* must be called at most once */
109	static SV req_sv (aio_req req, const char klass)	115	static SV req_sv (aio_req req, const char klass)
110	{	116	{
		117	if (!req->self)
		118	{
111	req->self = (SV *)newHV ();	119	req->self = (SV *)newHV ();
112	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	120	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		121	}
113		122
114	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)));
115	}	124	}
116		125
117	static aio_req SvAIO_REQ (SV *sv)	126	static aio_req SvAIO_REQ (SV *sv)
118	{	127	{
		128	MAGIC *mg;
		129
119	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))	130	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))
120	croak ("object of class " AIO_REQ_KLASS " expected");	131	croak ("object of class " AIO_REQ_KLASS " expected");
121		132
122	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	133	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123		134
124	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	}
125	}	182	}
126		183
127	static void poll_wait ()	184	static void poll_wait ()
128	{	185	{
129	if (nreqs && !ress)	186	if (nreqs && !ress)
…		…
139	static void req_invoke (aio_req req)	196	static void req_invoke (aio_req req)
140	{	197	{
141	dSP;	198	dSP;
142	int errorno = errno;	199	int errorno = errno;
143		200
144	if (req->cancelled \|\| !SvOK (req->callback))	201	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))
145	return;	202	return;
146		203
147	errno = req->errorno;	204	errno = req->errorno;
148		205
149	ENTER;	206	ENTER;
		207	SAVETMPS;
150	PUSHMARK (SP);	208	PUSHMARK (SP);
		209	EXTEND (SP, 1);
151		210
152	switch (req->type)	211	switch (req->type)
153	{	212	{
154	case REQ_READDIR:	213	case REQ_READDIR:
155	{	214	{
…		…
170	}	229	}
171		230
172	rv = sv_2mortal (newRV_noinc ((SV *)av));	231	rv = sv_2mortal (newRV_noinc ((SV *)av));
173	}	232	}
174		233
175	XPUSHs (rv);	234	PUSHs (rv);
176	}	235	}
177	break;	236	break;
178		237
179	case REQ_OPEN:	238	case REQ_OPEN:
180	{	239	{
181	/* convert fd to fh */	240	/* convert fd to fh */
182	SV *fh;	241	SV *fh;
183		242
184	XPUSHs (sv_2mortal (newSViv (req->result)));	243	PUSHs (sv_2mortal (newSViv (req->result)));
185	PUTBACK;	244	PUTBACK;
186	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	245	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
187	SPAGAIN;	246	SPAGAIN;
188		247
189	fh = SvREFCNT_inc (POPs);	248	fh = SvREFCNT_inc (POPs);
…		…
191	PUSHMARK (SP);	250	PUSHMARK (SP);
192	XPUSHs (sv_2mortal (fh));	251	XPUSHs (sv_2mortal (fh));
193	}	252	}
194	break;	253	break;
195		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:
196	case REQ_SLEEP:	270	case REQ_SLEEP:
197	case REQ_GROUP:
198	break;	271	break;
199		272
200	default:	273	default:
201	XPUSHs (sv_2mortal (newSViv (req->result)));	274	PUSHs (sv_2mortal (newSViv (req->result)));
202	break;	275	break;
203	}	276	}
204		277
205		278
206	PUTBACK;	279	PUTBACK;
207	call_sv (req->callback, G_VOID \| G_EVAL);	280	call_sv (req->callback, G_VOID \| G_EVAL);
208	SPAGAIN;	281	SPAGAIN;
209		282
		283	FREETMPS;
		284	LEAVE;
		285
		286	errno = errorno;
		287
210	if (SvTRUE (ERRSV))	288	if (SvTRUE (ERRSV))
211	{	289	{
212	req_free (req);	290	req_free (req);
213	croak (0);	291	croak (0);
214	}	292	}
215
216	LEAVE;
217
218	errno = errorno;
219	}	293	}
220		294
221	static void req_free (aio_req req)	295	static void req_free (aio_req req)
222	{	296	{
223	if (req->grp)	297	if (req->grp)
224	{	298	{
225	aio_req grp = req->grp;	299	aio_req grp = req->grp;
226		300
227	/* unlink request */	301	/* unlink request */
228	req->grp_next->grp_prev = req->grp_prev;	302	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
229	req->grp_prev->grp_next = req->grp_next;	303	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
230		304
231	if (grp->grp_next == grp && grp->fd)	305	if (grp->grp_first == req)
232	{	306	grp->grp_first = req->grp_next;
233	req_invoke (grp);	307
234	req_free (grp);	308	aio_grp_dec (grp);
235	}
236	}	309	}
237		310
238	if (req->self)	311	if (req->self)
239	{	312	{
240	sv_unmagic (req->self, PERL_MAGIC_ext);	313	sv_unmagic (req->self, PERL_MAGIC_ext);
241	SvREFCNT_dec (req->self);	314	SvREFCNT_dec (req->self);
242	}	315	}
243		316
244	if (req->data)
245	SvREFCNT_dec (req->data);	317	SvREFCNT_dec (req->data);
246
247	if (req->fh)
248	SvREFCNT_dec (req->fh);	318	SvREFCNT_dec (req->fh);
249
250	if (req->fh2)
251	SvREFCNT_dec (req->fh2);	319	SvREFCNT_dec (req->fh2);
252
253	if (req->statdata)
254	Safefree (req->statdata);
255
256	if (req->callback)
257	SvREFCNT_dec (req->callback);	320	SvREFCNT_dec (req->callback);
		321	Safefree (req->statdata);
258		322
259	if (req->type == REQ_READDIR && req->result >= 0)	323	if (req->type == REQ_READDIR && req->result >= 0)
260	free (req->data2ptr);	324	free (req->data2ptr);
261		325
262	Safefree (req);	326	Safefree (req);
263	}	327	}
264		328
265	static void req_cancel (aio_req req)	329	static void req_cancel (aio_req req)
266	{	330	{
267	req->cancelled = 1;	331	req->flags \|= FLAG_CANCELLED;
268		332
269	if (req->type == REQ_GROUP)	333	if (req->type == REQ_GROUP)
270	{	334	{
271	aio_req sub;	335	aio_req sub;
272		336
273	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	337	for (sub = req->grp_first; sub; sub = sub->grp_next)
274	req_cancel (sub);	338	req_cancel (sub);
275	}	339	}
276	}	340	}
277		341
278	static int poll_cb ()	342	static int poll_cb ()
…		…
305	pthread_mutex_unlock (&reslock);	369	pthread_mutex_unlock (&reslock);
306		370
307	if (!req)	371	if (!req)
308	break;	372	break;
309		373
310	nreqs--;	374	--nreqs;
311		375
312	if (req->type == REQ_QUIT)	376	if (req->type == REQ_QUIT)
313	started--;	377	started--;
314	else if (req->type == REQ_GROUP && req->grp_next != req)	378	else if (req->type == REQ_GROUP && req->length)
315	{	379	{
316	req->fd = 1; /* mark request as delayed */	380	req->fd = 1; /* mark request as delayed */
317	continue;	381	continue;
318	}	382	}
319	else	383	else
…		…
366	static void req_send (aio_req req)	430	static void req_send (aio_req req)
367	{	431	{
368	while (started < wanted && nreqs >= started)	432	while (started < wanted && nreqs >= started)
369	start_thread ();	433	start_thread ();
370		434
371	nreqs++;	435	++nreqs;
372		436
373	pthread_mutex_lock (&reqlock);	437	pthread_mutex_lock (&reqlock);
374		438
375	req->next = 0;	439	req->next = 0;
376		440
…		…
727		791
728	pthread_mutex_unlock (&reqlock);	792	pthread_mutex_unlock (&reqlock);
729		793
730	errno = 0; /* strictly unnecessary */	794	errno = 0; /* strictly unnecessary */
731		795
732	if (!req->cancelled)	796	if (!(req->flags & FLAG_CANCELLED))
733	switch (req->type)	797	switch (type = req->type) /* remember type for QUIT check */
734	{	798	{
735	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;
736	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;
737		801
738	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;
…		…
762	tv.tv_usec = req->fd2;	826	tv.tv_usec = req->fd2;
763		827
764	req->result = select (0, 0, 0, 0, &tv);	828	req->result = select (0, 0, 0, 0, &tv);
765	}	829	}
766		830
		831	case REQ_GROUP:
		832	case REQ_NOP:
767	case REQ_QUIT:	833	case REQ_QUIT:
768	break;	834	break;
769		835
770	default:	836	default:
771	req->result = ENOSYS;	837	req->result = ENOSYS;
…		…
1149	PROTOTYPE: ;$	1215	PROTOTYPE: ;$
1150	PPCODE:	1216	PPCODE:
1151	{	1217	{
1152	dREQ;	1218	dREQ;
1153	req->type = REQ_GROUP;	1219	req->type = REQ_GROUP;
1154	req->grp_next = req;
1155	req->grp_prev = req;
1156
1157	req_send (req);	1220	req_send (req);
1158	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;
1159	}	1234	}
1160		1235
1161	void	1236	void
1162	flush ()	1237	flush ()
1163	PROTOTYPE:	1238	PROTOTYPE:
…		…
1207	CODE:	1282	CODE:
1208	RETVAL = nreqs;	1283	RETVAL = nreqs;
1209	OUTPUT:	1284	OUTPUT:
1210	RETVAL	1285	RETVAL
1211		1286
		1287	PROTOTYPES: DISABLE
		1288
1212	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1289	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1213		1290
1214	void	1291	void
1215	cancel (aio_req_ornot req)	1292	cancel (aio_req_ornot req)
1216	PROTOTYPE:	1293	PROTOTYPE:
1217	CODE:	1294	CODE:
1218	req_cancel (req);	1295	req_cancel (req);
1219		1296
		1297	void
		1298	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
		1299	CODE:
		1300	SvREFCNT_dec (req->callback);
		1301	req->callback = newSVsv (callback);
		1302
1220	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1303	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1221		1304
1222	void	1305	void
1223	add (aio_req grp, ...)	1306	add (aio_req grp, ...)
1224	PROTOTYPE: $;@
1225	PPCODE:	1307	PPCODE:
1226	{	1308	{
1227	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");
1228		1314
1229	for (i = 1; i < items; ++i )	1315	for (i = 1; i < items; ++i )
1230	{	1316	{
1231	if (GIMME_V != G_VOID)	1317	if (GIMME_V != G_VOID)
1232	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1318	XPUSHs (sv_2mortal (newSVsv (ST (i))));
1233		1319
1234	aio_req req = SvAIO_REQ (ST (i));	1320	req = SvAIO_REQ (ST (i));
1235	printf ("req = %p\n", req);//D
1236		1321
1237	if (req)	1322	if (req)
1238	{	1323	{
1239	req->grp_prev = grp;	1324	++grp->length;
1240	req->grp_next = grp->grp_next;
1241	grp->grp_next->grp_prev = req;
1242	grp->grp_next = req;
1243
1244	req->grp = grp;	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;
1245	}	1334	}
1246	}	1335	}
1247	}	1336	}
1248		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.46 by root, Sun Oct 22 00:49:29 2006 UTC vs. Revision 1.59 by root, Mon Oct 23 18:56:27 2006 UTC

Diff Legend

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.46 by root, Sun Oct 22 00:49:29 2006 UTC vs.
Revision 1.59 by root, Mon Oct 23 18:56:27 2006 UTC