ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.48 by root, Sun Oct 22 10:33:19 2006 UTC vs.
Revision 1.53 by root, Mon Oct 23 00:17:07 2006 UTC

… …
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
67typedef struct aio_cb 67typedef 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;
… …
101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102 102
103static volatile aio_req reqs, reqe; /* queue start, queue end */ 103static volatile aio_req reqs, reqe; /* queue start, queue end */
104static volatile aio_req ress, rese; /* queue start, queue end */ 104static volatile aio_req ress, rese; /* queue start, queue end */
105 105
106static void req_invoke (aio_req req);
106static void req_free (aio_req req); 107static void req_free (aio_req req);
107 108
108/* must be called at most once */ 109/* must be called at most once */
109static SV *req_sv (aio_req req, const char *klass) 110static SV *req_sv (aio_req req, const char *klass)
110{ 111{
112 if (!req->self)
113 {
111 req->self = (SV *)newHV (); 114 req->self = (SV *)newHV ();
112 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 115 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
116 }
113 117
114 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)));
115} 119}
116 120
117static aio_req SvAIO_REQ (SV *sv) 121static aio_req SvAIO_REQ (SV *sv)
118{ 122{
123 MAGIC *mg;
124
119 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 125 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
120 croak ("object of class " AIO_REQ_KLASS " expected"); 126 croak ("object of class " AIO_REQ_KLASS " expected");
121 127
122 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 128 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123 129
124 return mg ? (aio_req)mg->mg_ptr : 0; 130 return mg ? (aio_req)mg->mg_ptr : 0;
131}
132
133static 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
164static 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 }
125} 177}
126 178
127static void poll_wait () 179static void poll_wait ()
128{ 180{
129 if (nreqs && !ress) 181 if (nreqs && !ress)
… …
145 return; 197 return;
146 198
147 errno = req->errorno; 199 errno = req->errorno;
148 200
149 ENTER; 201 ENTER;
202 SAVETMPS;
150 PUSHMARK (SP); 203 PUSHMARK (SP);
151 EXTEND (SP, 1); 204 EXTEND (SP, 1);
152 205
153 switch (req->type) 206 switch (req->type)
154 { 207 {
… …
193 XPUSHs (sv_2mortal (fh)); 246 XPUSHs (sv_2mortal (fh));
194 } 247 }
195 break; 248 break;
196 249
197 case REQ_GROUP: 250 case REQ_GROUP:
251 req->fd = 2; /* mark group as finished */
252
198 if (req->data) 253 if (req->data)
199 { 254 {
200 int i; 255 int i;
201 AV *av = (AV *)req->data; 256 AV *av = (AV *)req->data;
202 257
… …
217 272
218 PUTBACK; 273 PUTBACK;
219 call_sv (req->callback, G_VOID | G_EVAL); 274 call_sv (req->callback, G_VOID | G_EVAL);
220 SPAGAIN; 275 SPAGAIN;
221 276
277 FREETMPS;
278 LEAVE;
279
280 errno = errorno;
281
222 if (SvTRUE (ERRSV)) 282 if (SvTRUE (ERRSV))
223 { 283 {
224 req_free (req); 284 req_free (req);
225 croak (0); 285 croak (0);
226 } 286 }
227
228 LEAVE;
229
230 errno = errorno;
231} 287}
232 288
233static void req_free (aio_req req) 289static void req_free (aio_req req)
234{ 290{
235 if (req->grp) 291 if (req->grp)
236 { 292 {
237 aio_req grp = req->grp; 293 aio_req grp = req->grp;
238 294
239 /* unlink request */ 295 /* unlink request */
240 req->grp_next->grp_prev = req->grp_prev; 296 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
241 req->grp_prev->grp_next = req->grp_next; 297 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
242 298
243 if (grp->grp_next == grp && grp->fd) 299 if (grp->grp_first == req)
244 { 300 grp->grp_first = req->grp_next;
245 req_invoke (grp); 301
246 req_free (grp); 302 aio_grp_dec (grp);
247 }
248 } 303 }
249 304
250 if (req->self) 305 if (req->self)
251 { 306 {
252 sv_unmagic (req->self, PERL_MAGIC_ext); 307 sv_unmagic (req->self, PERL_MAGIC_ext);
253 SvREFCNT_dec (req->self); 308 SvREFCNT_dec (req->self);
254 } 309 }
255 310
256 if (req->data)
257 SvREFCNT_dec (req->data); 311 SvREFCNT_dec (req->data);
258
259 if (req->fh)
260 SvREFCNT_dec (req->fh); 312 SvREFCNT_dec (req->fh);
261
262 if (req->fh2)
263 SvREFCNT_dec (req->fh2); 313 SvREFCNT_dec (req->fh2);
264
265 if (req->statdata)
266 Safefree (req->statdata);
267
268 if (req->callback)
269 SvREFCNT_dec (req->callback); 314 SvREFCNT_dec (req->callback);
315 Safefree (req->statdata);
270 316
271 if (req->type == REQ_READDIR && req->result >= 0) 317 if (req->type == REQ_READDIR && req->result >= 0)
272 free (req->data2ptr); 318 free (req->data2ptr);
273 319
274 Safefree (req); 320 Safefree (req);
… …
280 326
281 if (req->type == REQ_GROUP) 327 if (req->type == REQ_GROUP)
282 { 328 {
283 aio_req sub; 329 aio_req sub;
284 330
285 for (sub = req->grp_next; sub != req; sub = sub->grp_next) 331 for (sub = req->grp_first; sub; sub = sub->grp_next)
286 req_cancel (sub); 332 req_cancel (sub);
287 } 333 }
288} 334}
289 335
290static int poll_cb () 336static int poll_cb ()
… …
317 pthread_mutex_unlock (&reslock); 363 pthread_mutex_unlock (&reslock);
318 364
319 if (!req) 365 if (!req)
320 break; 366 break;
321 367
322 nreqs--; 368 --nreqs;
323 369
324 if (req->type == REQ_QUIT) 370 if (req->type == REQ_QUIT)
325 started--; 371 started--;
326 else if (req->type == REQ_GROUP && req->grp_next != req) 372 else if (req->type == REQ_GROUP && req->length)
327 { 373 {
328 req->fd = 1; /* mark request as delayed */ 374 req->fd = 1; /* mark request as delayed */
329 continue; 375 continue;
330 } 376 }
331 else 377 else
… …
378static void req_send (aio_req req) 424static void req_send (aio_req req)
379{ 425{
380 while (started < wanted && nreqs >= started) 426 while (started < wanted && nreqs >= started)
381 start_thread (); 427 start_thread ();
382 428
383 nreqs++; 429 ++nreqs;
384 430
385 pthread_mutex_lock (&reqlock); 431 pthread_mutex_lock (&reqlock);
386 432
387 req->next = 0; 433 req->next = 0;
388 434
… …
740 pthread_mutex_unlock (&reqlock); 786 pthread_mutex_unlock (&reqlock);
741 787
742 errno = 0; /* strictly unnecessary */ 788 errno = 0; /* strictly unnecessary */
743 789
744 if (!req->cancelled) 790 if (!req->cancelled)
745 switch (req->type) 791 switch (type = req->type) /* remember type for QUIT check */
746 { 792 {
747 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 793 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
748 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 794 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
749 795
750 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 796 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
… …
1161 PROTOTYPE: ;$ 1207 PROTOTYPE: ;$
1162 PPCODE: 1208 PPCODE:
1163{ 1209{
1164 dREQ; 1210 dREQ;
1165 req->type = REQ_GROUP; 1211 req->type = REQ_GROUP;
1166 req->grp_next = req;
1167 req->grp_prev = req;
1168
1169 req_send (req); 1212 req_send (req);
1170 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1213 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1171} 1214}
1172 1215
1173void 1216void
… …
1236void 1279void
1237add (aio_req grp, ...) 1280add (aio_req grp, ...)
1238 PPCODE: 1281 PPCODE:
1239{ 1282{
1240 int i; 1283 int i;
1284 aio_req req;
1285
1286 if (grp->fd == 2)
1287 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1241 1288
1242 for (i = 1; i < items; ++i ) 1289 for (i = 1; i < items; ++i )
1243 { 1290 {
1244 if (GIMME_V != G_VOID) 1291 if (GIMME_V != G_VOID)
1245 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1292 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1246 1293
1247 aio_req req = SvAIO_REQ (ST (i)); 1294 req = SvAIO_REQ (ST (i));
1248 1295
1249 if (req) 1296 if (req)
1250 { 1297 {
1251 req->grp_prev = grp; 1298 ++grp->length;
1252 req->grp_next = grp->grp_next;
1253 grp->grp_next->grp_prev = req;
1254 grp->grp_next = req;
1255
1256 req->grp = grp; 1299 req->grp = grp;
1300
1301 req->grp_prev = 0;
1302 req->grp_next = grp->grp_first;
1303
1304 if (grp->grp_first)
1305 grp->grp_first->grp_prev = req;
1306
1307 grp->grp_first = req;
1257 } 1308 }
1258 } 1309 }
1259} 1310}
1260 1311
1261void 1312void
1262result (aio_req grp, ...) 1313result (aio_req grp, ...)
1314 CODE:
1315{
1316 int i;
1317 AV *av = newAV ();
1318
1319 for (i = 1; i < items; ++i )
1320 av_push (av, newSVsv (ST (i)));
1321
1322 SvREFCNT_dec (grp->data);
1323 grp->data = (SV *)av;
1324}
1325
1326void
1327lock (aio_req grp)
1263 CODE: 1328 CODE:
1264{ 1329 ++grp->length;
1265 int i;
1266 AV *av = newAV ();
1267 1330
1268 if (grp->data) 1331void
1332unlock (aio_req grp)
1333 CODE:
1334 aio_grp_dec (grp);
1335
1336void
1337feeder_limit (aio_req grp, int limit)
1338 CODE:
1339 grp->fd2 = limit;
1340 aio_grp_feed (grp);
1341
1342void
1343set_feeder (aio_req grp, SV *callback=&PL_sv_undef)
1344 CODE:
1345{
1269 SvREFCNT_dec (grp->data); 1346 SvREFCNT_dec (grp->fh2);
1347 grp->fh2 = newSVsv (callback);
1270 1348
1271 for (i = 1; i < items; ++i ) 1349 if (grp->fd2 <= 0)
1272 av_push (av, newSVsv (ST (i))); 1350 grp->fd2 = 2;
1273 1351
1274 grp->data = (SV *)av; 1352 aio_grp_feed (grp);
1275} 1353}
1276 1354

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines