[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.61 by root, Mon Oct 23 22:44:21 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;
93	typedef aio_cb *aio_group;	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;
94		108
95	static int started, wanted;	109	static int started, wanted;
96	static volatile int nreqs;	110	static volatile int nreqs;
97	static int max_outstanding = 1<<30;	111	static int max_outstanding = 1<<30;
98	static int respipe [2];	112	static int respipe [2];
…		…
102	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;	116	static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
103		117
104	static volatile aio_req reqs, reqe; /* queue start, queue end */	118	static volatile aio_req reqs, reqe; /* queue start, queue end */
105	static volatile aio_req ress, rese; /* queue start, queue end */	119	static volatile aio_req ress, rese; /* queue start, queue end */
106		120
		121	static void req_invoke (aio_req req);
107	static void req_free (aio_req req);	122	static void req_free (aio_req req);
108		123
109	/* must be called at most once */	124	/* must be called at most once */
110	static SV req_sv (aio_req req, const char klass)	125	static SV req_sv (aio_req req, const char klass)
111	{	126	{
		127	if (!req->self)
		128	{
112	req->self = (SV *)newHV ();	129	req->self = (SV *)newHV ();
113	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);	130	sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
		131	}
114		132
115	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)));
116	}	134	}
117		135
118	static aio_req SvAIO_REQ (SV *sv)	136	static aio_req SvAIO_REQ (SV *sv)
119	{	137	{
		138	MAGIC *mg;
		139
120	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))	140	if (!sv_derived_from (sv, AIO_REQ_KLASS) \|\| !SvROK (sv))
121	croak ("object of class " AIO_REQ_KLASS " expected");	141	croak ("object of class " AIO_REQ_KLASS " expected");
122		142
123	MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);	143	mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
124		144
125	return mg ? (aio_req)mg->mg_ptr : 0;	145	return mg ? (aio_req)mg->mg_ptr : 0;
126	}	146	}
127		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
128	static void poll_wait ()	194	static void poll_wait ()
129	{	195	{
130	if (nreqs && !ress)	196	while (nreqs)
131	{	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
132	fd_set rfd;	206	fd_set rfd;
133	FD_ZERO(&rfd);	207	FD_ZERO(&rfd);
134	FD_SET(respipe [0], &rfd);	208	FD_SET(respipe [0], &rfd);
135		209
136	select (respipe [0] + 1, &rfd, 0, 0, 0);	210	select (respipe [0] + 1, &rfd, 0, 0, 0);
…		…
140	static void req_invoke (aio_req req)	214	static void req_invoke (aio_req req)
141	{	215	{
142	dSP;	216	dSP;
143	int errorno = errno;	217	int errorno = errno;
144		218
145	if (req->cancelled \|\| !SvOK (req->callback))	219	if (req->flags & FLAG_CANCELLED \|\| !SvOK (req->callback))
146	return;	220	return;
147		221
148	errno = req->errorno;	222	errno = req->errorno;
149		223
150	ENTER;	224	ENTER;
		225	SAVETMPS;
151	PUSHMARK (SP);	226	PUSHMARK (SP);
		227	EXTEND (SP, 1);
152		228
153	switch (req->type)	229	switch (req->type)
154	{	230	{
155	case REQ_READDIR:	231	case REQ_READDIR:
156	{	232	{
…		…
171	}	247	}
172		248
173	rv = sv_2mortal (newRV_noinc ((SV *)av));	249	rv = sv_2mortal (newRV_noinc ((SV *)av));
174	}	250	}
175		251
176	XPUSHs (rv);	252	PUSHs (rv);
177	}	253	}
178	break;	254	break;
179		255
180	case REQ_OPEN:	256	case REQ_OPEN:
181	{	257	{
182	/* convert fd to fh */	258	/* convert fd to fh */
183	SV *fh;	259	SV *fh;
184		260
185	XPUSHs (sv_2mortal (newSViv (req->result)));	261	PUSHs (sv_2mortal (newSViv (req->result)));
186	PUTBACK;	262	PUTBACK;
187	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);	263	call_pv ("IO::AIO::_fd2fh", G_SCALAR \| G_EVAL);
188	SPAGAIN;	264	SPAGAIN;
189		265
190	fh = SvREFCNT_inc (POPs);	266	fh = SvREFCNT_inc (POPs);
…		…
192	PUSHMARK (SP);	268	PUSHMARK (SP);
193	XPUSHs (sv_2mortal (fh));	269	XPUSHs (sv_2mortal (fh));
194	}	270	}
195	break;	271	break;
196		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:
197	case REQ_SLEEP:	288	case REQ_SLEEP:
198	case REQ_GROUP:
199	break;	289	break;
200		290
201	default:	291	default:
202	XPUSHs (sv_2mortal (newSViv (req->result)));	292	PUSHs (sv_2mortal (newSViv (req->result)));
203	break;	293	break;
204	}	294	}
205		295
206		296
207	PUTBACK;	297	PUTBACK;
208	call_sv (req->callback, G_VOID \| G_EVAL);	298	call_sv (req->callback, G_VOID \| G_EVAL);
209	SPAGAIN;	299	SPAGAIN;
210		300
		301	FREETMPS;
		302	LEAVE;
		303
		304	errno = errorno;
		305
211	if (SvTRUE (ERRSV))	306	if (SvTRUE (ERRSV))
212	{	307	{
213	req_free (req);	308	req_free (req);
214	croak (0);	309	croak (0);
215	}	310	}
216
217	LEAVE;
218
219	errno = errorno;
220	}	311	}
221		312
222	static void req_free (aio_req req)	313	static void req_free (aio_req req)
223	{	314	{
224	if (req->grp)	315	if (req->grp)
225	{	316	{
226	aio_req grp = req->grp;	317	aio_req grp = req->grp;
227		318
228	/* unlink request */	319	/* unlink request */
229	req->grp_next->grp_prev = req->grp_prev;	320	if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
230	req->grp_prev->grp_next = req->grp_next;	321	if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
231		322
232	if (grp->grp_next == grp)	323	if (grp->grp_first == req)
233	{	324	grp->grp_first = req->grp_next;
234	req_invoke (grp);	325
235	req_free (grp);	326	aio_grp_dec (grp);
236	}
237	}	327	}
238		328
239	if (req->self)	329	if (req->self)
240	{	330	{
241	sv_unmagic (req->self, PERL_MAGIC_ext);	331	sv_unmagic (req->self, PERL_MAGIC_ext);
242	SvREFCNT_dec (req->self);	332	SvREFCNT_dec (req->self);
243	}	333	}
244		334
245	if (req->data)
246	SvREFCNT_dec (req->data);	335	SvREFCNT_dec (req->data);
247
248	if (req->fh)
249	SvREFCNT_dec (req->fh);	336	SvREFCNT_dec (req->fh);
250
251	if (req->fh2)
252	SvREFCNT_dec (req->fh2);	337	SvREFCNT_dec (req->fh2);
253
254	if (req->statdata)
255	Safefree (req->statdata);
256
257	if (req->callback)
258	SvREFCNT_dec (req->callback);	338	SvREFCNT_dec (req->callback);
		339	Safefree (req->statdata);
259		340
260	if (req->type == REQ_READDIR && req->result >= 0)	341	if (req->type == REQ_READDIR && req->result >= 0)
261	free (req->data2ptr);	342	free (req->data2ptr);
262		343
263	Safefree (req);	344	Safefree (req);
264	}	345	}
265		346
266	static void req_cancel (aio_req req)	347	static void req_cancel (aio_req req)
267	{	348	{
268	req->cancelled = 1;	349	req->flags \|= FLAG_CANCELLED;
269		350
270	if (req->type == REQ_GROUP)	351	if (req->type == REQ_GROUP)
271	{	352	{
272	aio_req sub;	353	aio_req sub;
273		354
274	for (sub = req->grp_next; sub != req; sub = sub->grp_next)	355	for (sub = req->grp_first; sub; sub = sub->grp_next)
275	req_cancel (sub);	356	req_cancel (sub);
276	}	357	}
277	}	358	}
278		359
279	static int poll_cb ()	360	static int poll_cb ()
…		…
306	pthread_mutex_unlock (&reslock);	387	pthread_mutex_unlock (&reslock);
307		388
308	if (!req)	389	if (!req)
309	break;	390	break;
310		391
311	nreqs--;	392	--nreqs;
312		393
313	if (req->type == REQ_QUIT)	394	if (req->type == REQ_QUIT)
314	started--;	395	started--;
315	else if (req->type == REQ_GROUP && req->grp_next != req)	396	else if (req->type == REQ_GROUP && req->length)
		397	{
		398	req->fd = 1; /* mark request as delayed */
316	continue;	399	continue;
		400	}
317	else	401	else
318	{	402	{
319	if (req->type == REQ_READ)	403	if (req->type == REQ_READ)
320	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));	404	SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
321		405
…		…
364	static void req_send (aio_req req)	448	static void req_send (aio_req req)
365	{	449	{
366	while (started < wanted && nreqs >= started)	450	while (started < wanted && nreqs >= started)
367	start_thread ();	451	start_thread ();
368		452
369	nreqs++;	453	++nreqs;
370		454
371	pthread_mutex_lock (&reqlock);	455	pthread_mutex_lock (&reqlock);
372		456
373	req->next = 0;	457	req->next = 0;
374		458
…		…
724	}	808	}
725		809
726	pthread_mutex_unlock (&reqlock);	810	pthread_mutex_unlock (&reqlock);
727		811
728	errno = 0; /* strictly unnecessary */	812	errno = 0; /* strictly unnecessary */
		813	type = req->type; /* remember type for QUIT check */
729		814
730	if (!req->cancelled)	815	if (!(req->flags & FLAG_CANCELLED))
731	switch (req->type)	816	switch (type)
732	{	817	{
733	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;
734	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;
735		820
736	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;
…		…
760	tv.tv_usec = req->fd2;	845	tv.tv_usec = req->fd2;
761		846
762	req->result = select (0, 0, 0, 0, &tv);	847	req->result = select (0, 0, 0, 0, &tv);
763	}	848	}
764		849
		850	case REQ_GROUP:
		851	case REQ_NOP:
765	case REQ_QUIT:	852	case REQ_QUIT:
766	break;	853	break;
767		854
768	default:	855	default:
769	req->result = ENOSYS;	856	req->result = ENOSYS;
…		…
853	atfork_parent ();	940	atfork_parent ();
854	}	941	}
855		942
856	#define dREQ \	943	#define dREQ \
857	aio_req req; \	944	aio_req req; \
		945	int req_pri = next_pri; \
		946	next_pri = DEFAULT_PRI + PRI_BIAS; \
858	\	947	\
859	if (SvOK (callback) && !SvROK (callback)) \	948	if (SvOK (callback) && !SvROK (callback)) \
860	croak ("callback must be undef or of reference type"); \	949	croak ("callback must be undef or of reference type"); \
861	\	950	\
862	Newz (0, req, 1, aio_cb); \	951	Newz (0, req, 1, aio_cb); \
863	if (!req) \	952	if (!req) \
864	croak ("out of memory during aio_req allocation"); \	953	croak ("out of memory during aio_req allocation"); \
865	\	954	\
866	req->callback = newSVsv (callback)	955	req->callback = newSVsv (callback); \
		956	req->pri = req_pri
867		957
868	#define REQ_SEND \	958	#define REQ_SEND \
869	req_send (req); \	959	req_send (req); \
870	\	960	\
871	if (GIMME_V != G_VOID) \	961	if (GIMME_V != G_VOID) \
…		…
1142	}	1232	}
1143		1233
1144	void	1234	void
1145	aio_group (callback=&PL_sv_undef)	1235	aio_group (callback=&PL_sv_undef)
1146	SV * callback	1236	SV * callback
1147	PROTOTYPE: ;&	1237	PROTOTYPE: ;$
1148	PPCODE:	1238	PPCODE:
1149	{	1239	{
1150	dREQ;	1240	dREQ;
		1241
1151	req->type = REQ_GROUP;	1242	req->type = REQ_GROUP;
1152	req->grp_next = req;
1153	req->grp_prev = req;
1154
1155	req_send (req);	1243	req_send (req);
		1244
1156	XPUSHs (req_sv (req, AIO_GRP_KLASS));	1245	XPUSHs (req_sv (req, AIO_GRP_KLASS));
1157	}	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
1158		1270
1159	void	1271	void
1160	flush ()	1272	flush ()
1161	PROTOTYPE:	1273	PROTOTYPE:
1162	CODE:	1274	CODE:
…		…
1205	CODE:	1317	CODE:
1206	RETVAL = nreqs;	1318	RETVAL = nreqs;
1207	OUTPUT:	1319	OUTPUT:
1208	RETVAL	1320	RETVAL
1209		1321
		1322	PROTOTYPES: DISABLE
		1323
1210	MODULE = IO::AIO PACKAGE = IO::AIO::REQ	1324	MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1211		1325
1212	void	1326	void
1213	cancel (aio_req_ornot req)	1327	cancel (aio_req_ornot req)
1214	PROTOTYPE:	1328	PROTOTYPE:
1215	CODE:	1329	CODE:
1216	req_cancel (req);	1330	req_cancel (req);
1217		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
1218	MODULE = IO::AIO PACKAGE = IO::AIO::GRP	1338	MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1219		1339
1220	void	1340	void
1221	add (aio_req grp, ...)	1341	add (aio_req grp, ...)
1222	PROTOTYPE: $;@
1223	PPCODE:	1342	PPCODE:
1224	{	1343	{
1225	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");
1226		1349
1227	for (i = 1; i < items; ++i )	1350	for (i = 1; i < items; ++i )
1228	{	1351	{
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)	1352	if (GIMME_V != G_VOID)
1239	XPUSHs (sv_2mortal (newSVsv (ST (i))));	1353	XPUSHs (sv_2mortal (newSVsv (ST (i))));
		1354
		1355	req = SvAIO_REQ (ST (i));
		1356
		1357	if (req)
		1358	{
		1359	++grp->length;
		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;
		1369	}
1240	}	1370	}
1241	}	1371	}
1242		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.45 by root, Sun Oct 22 00:19:05 2006 UTC vs. Revision 1.61 by root, Mon Oct 23 22:44:21 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.61 by root, Mon Oct 23 22:44:21 2006 UTC