[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.60 by root, Mon Oct 23 20:05: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;
72
73	SV self; / the perl counterpart of this request, if any */
74		70
75	SV data, callback;	71	SV data, callback;
76	SV fh, fh2;	72	SV fh, fh2;
77	void dataptr, data2ptr;	73	void dataptr, data2ptr;
78	Stat_t *statdata;	74	Stat_t *statdata;
79	off_t offset;	75	off_t offset;
80	size_t length;	76	size_t length;
81	ssize_t result;	77	ssize_t result;
82		78
		79	STRLEN dataoffset;
83	int type;	80	int type;
84	int fd, fd2;	81	int fd, fd2;
85	int errorno;	82	int errorno;
86	STRLEN dataoffset;
87	mode_t mode; /* open */	83	mode_t mode; /* open */
		84
88	unsigned char cancelled;	85	unsigned char flags;
		86	unsigned char pri;
		87
		88	SV self; / the perl counterpart of this request, if any */
		89	struct aio_cb grp, grp_prev, grp_next, grp_first;
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;
		98
		99	enum {
		100	PRI_MIN = 4,
		101	PRI_MAX = -4,
		102
		103	DEFAULT_PRI = 0,
		104	PRI_BIAS = PRI_MIN,
		105	};
		106
		107	static int next_pri = DEFAULT_PRI + PRI_BIAS;
93		108
94	static int started, wanted;	109	static int started, wanted;
95	static volatile int nreqs;	110	static volatile int nreqs;
96	static int max_outstanding = 1<<30;	111	static int max_outstanding = 1<<30;
97	static int respipe [2];	112	static int respipe [2];
…		…
101	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	116	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102		117
103	static volatile aio_req reqs, reqe; /* queue start, queue end */	118	static volatile aio_req reqs, reqe; /* queue start, queue end */
104	static volatile aio_req ress, rese; /* queue start, queue end */	119	static volatile aio_req ress, rese; /* queue start, queue end */
105		120
		121	static void req_invoke (aio_req req);
106	static void req_free (aio_req req);	122	static void req_free (aio_req req);
107		123
108	/* must be called at most once */	124	/* must be called at most once */
109	static SV req_sv (aio_req req, const char klass)	125	static SV req_sv (aio_req req, const char klass)
110	{	126	{
		127	if (!req->self)
		128	{
111	req->self = (SV *)newHV ();	129	req->self = (SV *)newHV ();
112	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	130	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		131	}
113		132
114	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));	133	return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
115	}	134	}
116		135
117	static aio_req SvAIO_REQ (SV *sv)	136	static aio_req SvAIO_REQ (SV *sv)
118	{	137	{
		138	MAGIC *mg;
		139
119	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))	140	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))
120	croak ("object of class " AIO_REQ_KLASS " expected");	141	croak ("object of class " AIO_REQ_KLASS " expected");
121		142
122	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	143	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123		144
124	return mg ? (aio_req)mg->mg_ptr : 0;	145	return mg ? (aio_req)mg->mg_ptr : 0;
125	}	146	}
126		147
		148	static void aio_grp_feed (aio_req grp)
		149	{
		150	while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
		151	{
		152	int old_len = grp->length;
		153
		154	if (grp->fh2 && SvOK (grp->fh2))
		155	{
		156	dSP;
		157
		158	ENTER;
		159	SAVETMPS;
		160	PUSHMARK (SP);
		161	XPUSHs (req_sv (grp, AIO_GRP_KLASS));
		162	PUTBACK;
		163	call_sv (grp->fh2, G_VOID \| G_EVAL);
		164	SPAGAIN;
		165	FREETMPS;
		166	LEAVE;
		167	}
		168
		169	/* stop if no progress has been made */
		170	if (old_len == grp->length)
		171	{
		172	SvREFCNT_dec (grp->fh2);
		173	grp->fh2 = 0;
		174	break;
		175	}
		176	}
		177	}
		178
		179	static void aio_grp_dec (aio_req grp)
		180	{
		181	--grp->length;
		182
		183	/* call feeder, if applicable */
		184	aio_grp_feed (grp);
		185
		186	/* finish, if done */
		187	if (!grp->length && grp->fd)
		188	{
		189	req_invoke (grp);
		190	req_free (grp);
		191	}
		192	}
		193
127	static void poll_wait ()	194	static void poll_wait ()
128	{	195	{
129	if (nreqs && !ress)	196	while (nreqs)
130	{	197	{
		198	aio_req req;
		199	pthread_mutex_lock (&reslock);
		200	req = ress;
		201	pthread_mutex_unlock (&reslock);
		202
		203	if (req)
		204	return;
		205
131	fd_set rfd;	206	fd_set rfd;
132	FD_ZERO(&rfd);	207	FD_ZERO(&rfd);
133	FD_SET(respipe [0], &rfd);	208	FD_SET(respipe [0], &rfd);
134		209
135	select (respipe [0] + 1, &rfd, 0, 0, 0);	210	select (respipe [0] + 1, &rfd, 0, 0, 0);
…		…
139	static void req_invoke (aio_req req)	214	static void req_invoke (aio_req req)
140	{	215	{
141	dSP;	216	dSP;
142	int errorno = errno;	217	int errorno = errno;
143		218
144	if (req->cancelled \|\| !SvOK (req->callback))	219	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))
145	return;	220	return;
146		221
147	errno = req->errorno;	222	errno = req->errorno;
148		223
149	ENTER;	224	ENTER;
		225	SAVETMPS;
150	PUSHMARK (SP);	226	PUSHMARK (SP);
		227	EXTEND (SP, 1);
151		228
152	switch (req->type)	229	switch (req->type)
153	{	230	{
154	case REQ_READDIR:	231	case REQ_READDIR:
155	{	232	{
…		…
170	}	247	}
171		248
172	rv = sv_2mortal (newRV_noinc ((SV *)av));	249	rv = sv_2mortal (newRV_noinc ((SV *)av));
173	}	250	}
174		251
175	XPUSHs (rv);	252	PUSHs (rv);
176	}	253	}
177	break;	254	break;
178		255
179	case REQ_OPEN:	256	case REQ_OPEN:
180	{	257	{
181	/* convert fd to fh */	258	/* convert fd to fh */
182	SV *fh;	259	SV *fh;
183		260
184	XPUSHs (sv_2mortal (newSViv (req->result)));	261	PUSHs (sv_2mortal (newSViv (req->result)));
185	PUTBACK;	262	PUTBACK;
186	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	263	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
187	SPAGAIN;	264	SPAGAIN;
188		265
189	fh = SvREFCNT_inc (POPs);	266	fh = SvREFCNT_inc (POPs);
…		…
191	PUSHMARK (SP);	268	PUSHMARK (SP);
192	XPUSHs (sv_2mortal (fh));	269	XPUSHs (sv_2mortal (fh));
193	}	270	}
194	break;	271	break;
195		272
		273	case REQ_GROUP:
		274	req->fd = 2; /* mark group as finished */
		275
		276	if (req->data)
		277	{
		278	int i;
		279	AV av = (AV )req->data;
		280
		281	EXTEND (SP, AvFILL (av) + 1);
		282	for (i = 0; i <= AvFILL (av); ++i)
		283	PUSHs (*av_fetch (av, i, 0));
		284	}
		285	break;
		286
		287	case REQ_NOP:
196	case REQ_SLEEP:	288	case REQ_SLEEP:
197	case REQ_GROUP:
198	break;	289	break;
199		290
200	default:	291	default:
201	XPUSHs (sv_2mortal (newSViv (req->result)));	292	PUSHs (sv_2mortal (newSViv (req->result)));
202	break;	293	break;
203	}	294	}
204		295
205		296
206	PUTBACK;	297	PUTBACK;
207	call_sv (req->callback, G_VOID \| G_EVAL);	298	call_sv (req->callback, G_VOID \| G_EVAL);
208	SPAGAIN;	299	SPAGAIN;
209		300
		301	FREETMPS;
		302	LEAVE;
		303
		304	errno = errorno;
		305
210	if (SvTRUE (ERRSV))	306	if (SvTRUE (ERRSV))
211	{	307	{
212	req_free (req);	308	req_free (req);
213	croak (0);	309	croak (0);
214	}	310	}
215
216	LEAVE;
217
218	errno = errorno;
219	}	311	}
220		312
221	static void req_free (aio_req req)	313	static void req_free (aio_req req)
222	{	314	{
223	if (req->grp)	315	if (req->grp)
224	{	316	{
225	aio_req grp = req->grp;	317	aio_req grp = req->grp;
226		318
227	/* unlink request */	319	/* unlink request */
228	req->grp_next->grp_prev = req->grp_prev;	320	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
229	req->grp_prev->grp_next = req->grp_next;	321	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
230		322
231	if (grp->grp_next == grp && grp->fd)	323	if (grp->grp_first == req)
232	{	324	grp->grp_first = req->grp_next;
233	req_invoke (grp);	325
234	req_free (grp);	326	aio_grp_dec (grp);
235	}
236	}	327	}
237		328
238	if (req->self)	329	if (req->self)
239	{	330	{
240	sv_unmagic (req->self, PERL_MAGIC_ext);	331	sv_unmagic (req->self, PERL_MAGIC_ext);
241	SvREFCNT_dec (req->self);	332	SvREFCNT_dec (req->self);
242	}	333	}
243		334
244	if (req->data)
245	SvREFCNT_dec (req->data);	335	SvREFCNT_dec (req->data);
246
247	if (req->fh)
248	SvREFCNT_dec (req->fh);	336	SvREFCNT_dec (req->fh);
249
250	if (req->fh2)
251	SvREFCNT_dec (req->fh2);	337	SvREFCNT_dec (req->fh2);
252
253	if (req->statdata)
254	Safefree (req->statdata);
255
256	if (req->callback)
257	SvREFCNT_dec (req->callback);	338	SvREFCNT_dec (req->callback);
		339	Safefree (req->statdata);
258		340
259	if (req->type == REQ_READDIR && req->result >= 0)	341	if (req->type == REQ_READDIR && req->result >= 0)
260	free (req->data2ptr);	342	free (req->data2ptr);
261		343
262	Safefree (req);	344	Safefree (req);
263	}	345	}
264		346
265	static void req_cancel (aio_req req)	347	static void req_cancel (aio_req req)
266	{	348	{
267	req->cancelled = 1;	349	req->flags \|= FLAG_CANCELLED;
268		350
269	if (req->type == REQ_GROUP)	351	if (req->type == REQ_GROUP)
270	{	352	{
271	aio_req sub;	353	aio_req sub;
272		354
273	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	355	for (sub = req->grp_first; sub; sub = sub->grp_next)
274	req_cancel (sub);	356	req_cancel (sub);
275	}	357	}
276	}	358	}
277		359
278	static int poll_cb ()	360	static int poll_cb ()
…		…
305	pthread_mutex_unlock (&reslock);	387	pthread_mutex_unlock (&reslock);
306		388
307	if (!req)	389	if (!req)
308	break;	390	break;
309		391
310	nreqs--;	392	--nreqs;
311		393
312	if (req->type == REQ_QUIT)	394	if (req->type == REQ_QUIT)
313	started--;	395	started--;
314	else if (req->type == REQ_GROUP && req->grp_next != req)	396	else if (req->type == REQ_GROUP && req->length)
315	{	397	{
316	req->fd = 1; /* mark request as delayed */	398	req->fd = 1; /* mark request as delayed */
317	continue;	399	continue;
318	}	400	}
319	else	401	else
…		…
366	static void req_send (aio_req req)	448	static void req_send (aio_req req)
367	{	449	{
368	while (started < wanted && nreqs >= started)	450	while (started < wanted && nreqs >= started)
369	start_thread ();	451	start_thread ();
370		452
371	nreqs++;	453	++nreqs;
372		454
373	pthread_mutex_lock (&reqlock);	455	pthread_mutex_lock (&reqlock);
374		456
375	req->next = 0;	457	req->next = 0;
376		458
…		…
726	}	808	}
727		809
728	pthread_mutex_unlock (&reqlock);	810	pthread_mutex_unlock (&reqlock);
729		811
730	errno = 0; /* strictly unnecessary */	812	errno = 0; /* strictly unnecessary */
		813	type = req->type; /* remember type for QUIT check */
731		814
732	if (!req->cancelled)	815	if (!(req->flags & FLAG_CANCELLED))
733	switch (req->type)	816	switch (type)
734	{	817	{
735	case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;	818	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;	819	case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
737		820
738	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;	821	case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
…		…
762	tv.tv_usec = req->fd2;	845	tv.tv_usec = req->fd2;
763		846
764	req->result = select (0, 0, 0, 0, &tv);	847	req->result = select (0, 0, 0, 0, &tv);
765	}	848	}
766		849
		850	case REQ_GROUP:
		851	case REQ_NOP:
767	case REQ_QUIT:	852	case REQ_QUIT:
768	break;	853	break;
769		854
770	default:	855	default:
771	req->result = ENOSYS;	856	req->result = ENOSYS;
…		…
855	atfork_parent ();	940	atfork_parent ();
856	}	941	}
857		942
858	#define dREQ \	943	#define dREQ \
859	aio_req req; \	944	aio_req req; \
		945	int req_pri = next_pri; \
		946	next_pri = DEFAULT_PRI + PRI_BIAS; \
860	\	947	\
861	if (SvOK (callback) && !SvROK (callback)) \	948	if (SvOK (callback) && !SvROK (callback)) \
862	croak ("callback must be undef or of reference type"); \	949	croak ("callback must be undef or of reference type"); \
863	\	950	\
864	Newz (0, req, 1, aio_cb); \	951	Newz (0, req, 1, aio_cb); \
865	if (!req) \	952	if (!req) \
866	croak ("out of memory during aio_req allocation"); \	953	croak ("out of memory during aio_req allocation"); \
867	\	954	\
868	req->callback = newSVsv (callback)	955	req->callback = newSVsv (callback); \
		956	req->pri = req_pri
869		957
870	#define REQ_SEND \	958	#define REQ_SEND \
871	req_send (req); \	959	req_send (req); \
872	\	960	\
873	if (GIMME_V != G_VOID) \	961	if (GIMME_V != G_VOID) \
…		…
1148	SV * callback	1236	SV * callback
1149	PROTOTYPE: ;$	1237	PROTOTYPE: ;$
1150	PPCODE:	1238	PPCODE:
1151	{	1239	{
1152	dREQ;	1240	dREQ;
		1241
1153	req->type = REQ_GROUP;	1242	req->type = REQ_GROUP;
1154	req->grp_next = req;
1155	req->grp_prev = req;
1156
1157	req_send (req);	1243	req_send (req);
		1244
1158	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1245	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1159	}	1246	}
		1247
		1248	void
		1249	aio_nop (callback=&PL_sv_undef)
		1250	SV * callback
		1251	PPCODE:
		1252	{
		1253	dREQ;
		1254
		1255	req->type = REQ_NOP;
		1256
		1257	REQ_SEND;
		1258	}
		1259
		1260	#if 0
		1261
		1262	void
		1263	aio_pri (int pri = DEFAULT_PRI)
		1264	CODE:
		1265	if (pri > PRI_MIN) pri = PRI_MIN;
		1266	if (pri < PRI_MAX) pri = PRI_MAX;
		1267	next_pri = pri + PRI_BIAS;
		1268
		1269	#endif
1160		1270
1161	void	1271	void
1162	flush ()	1272	flush ()
1163	PROTOTYPE:	1273	PROTOTYPE:
1164	CODE:	1274	CODE:
…		…
1207	CODE:	1317	CODE:
1208	RETVAL = nreqs;	1318	RETVAL = nreqs;
1209	OUTPUT:	1319	OUTPUT:
1210	RETVAL	1320	RETVAL
1211		1321
		1322	PROTOTYPES: DISABLE
		1323
1212	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1324	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1213		1325
1214	void	1326	void
1215	cancel (aio_req_ornot req)	1327	cancel (aio_req_ornot req)
1216	PROTOTYPE:	1328	PROTOTYPE:
1217	CODE:	1329	CODE:
1218	req_cancel (req);	1330	req_cancel (req);
1219		1331
		1332	void
		1333	cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
		1334	CODE:
		1335	SvREFCNT_dec (req->callback);
		1336	req->callback = newSVsv (callback);
		1337
1220	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1338	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1221		1339
1222	void	1340	void
1223	add (aio_req grp, ...)	1341	add (aio_req grp, ...)
1224	PROTOTYPE: $;@
1225	PPCODE:	1342	PPCODE:
1226	{	1343	{
1227	int i;	1344	int i;
		1345	aio_req req;
		1346
		1347	if (grp->fd == 2)
		1348	croak ("cannot add requests to IO::AIO::GRP after the group finished");
1228		1349
1229	for (i = 1; i < items; ++i )	1350	for (i = 1; i < items; ++i )
1230	{	1351	{
1231	if (GIMME_V != G_VOID)	1352	if (GIMME_V != G_VOID)
1232	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1353	XPUSHs (sv_2mortal (newSVsv (ST (i))));
1233		1354
1234	aio_req req = SvAIO_REQ (ST (i));	1355	req = SvAIO_REQ (ST (i));
1235	printf ("req = %p\n", req);//D
1236		1356
1237	if (req)	1357	if (req)
1238	{	1358	{
1239	req->grp_prev = grp;	1359	++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;	1360	req->grp = grp;
		1361
		1362	req->grp_prev = 0;
		1363	req->grp_next = grp->grp_first;
		1364
		1365	if (grp->grp_first)
		1366	grp->grp_first->grp_prev = req;
		1367
		1368	grp->grp_first = req;
1245	}	1369	}
1246	}	1370	}
1247	}	1371	}
1248		1372
		1373	void
		1374	result (aio_req grp, ...)
		1375	CODE:
		1376	{
		1377	int i;
		1378	AV *av = newAV ();
		1379
		1380	for (i = 1; i < items; ++i )
		1381	av_push (av, newSVsv (ST (i)));
		1382
		1383	SvREFCNT_dec (grp->data);
		1384	grp->data = (SV *)av;
		1385	}
		1386
		1387	void
		1388	feed_limit (aio_req grp, int limit)
		1389	CODE:
		1390	grp->fd2 = limit;
		1391	aio_grp_feed (grp);
		1392
		1393	void
		1394	feed (aio_req grp, SV *callback=&PL_sv_undef)
		1395	CODE:
		1396	{
		1397	SvREFCNT_dec (grp->fh2);
		1398	grp->fh2 = newSVsv (callback);
		1399
		1400	if (grp->fd2 <= 0)
		1401	grp->fd2 = 2;
		1402
		1403	aio_grp_feed (grp);
		1404	}
		1405

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.60 by root, Mon Oct 23 20:05: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.60 by root, Mon Oct 23 20:05:27 2006 UTC