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.52 by root, Sun Oct 22 22:14:54 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)
… …
120 croak ("object of class " AIO_REQ_KLASS " expected"); 124 croak ("object of class " AIO_REQ_KLASS " expected");
121 125
122 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 126 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
123 127
124 return mg ? (aio_req)mg->mg_ptr : 0; 128 return mg ? (aio_req)mg->mg_ptr : 0;
129}
130
131static void aio_grp_feed (aio_req grp)
132{
133 while (grp->length < grp->fd2)
134 {
135 int old_len = grp->length;
136
137 if (grp->fh2 && SvOK (grp->fh2))
138 {
139 dSP;
140
141 ENTER;
142 SAVETMPS;
143 PUSHMARK (SP);
144 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
145 PUTBACK;
146 call_sv (grp->fh2, G_VOID | G_EVAL);
147 SPAGAIN;
148 FREETMPS;
149 LEAVE;
150 }
151
152 /* stop if no progress has been made */
153 if (old_len == grp->length)
154 {
155 SvREFCNT_dec (grp->fh2);
156 grp->fh2 = 0;
157 break;
158 }
159 }
160}
161
162static void aio_grp_dec (aio_req grp)
163{
164 --grp->length;
165
166 /* call feeder, if applicable */
167 aio_grp_feed (grp);
168
169 /* finish, if done */
170 if (!grp->length && grp->fd)
171 {
172 req_invoke (grp);
173 req_free (grp);
174 }
125} 175}
126 176
127static void poll_wait () 177static void poll_wait ()
128{ 178{
129 if (nreqs && !ress) 179 if (nreqs && !ress)
… …
145 return; 195 return;
146 196
147 errno = req->errorno; 197 errno = req->errorno;
148 198
149 ENTER; 199 ENTER;
200 SAVETMPS;
150 PUSHMARK (SP); 201 PUSHMARK (SP);
151 EXTEND (SP, 1); 202 EXTEND (SP, 1);
152 203
153 switch (req->type) 204 switch (req->type)
154 { 205 {
… …
193 XPUSHs (sv_2mortal (fh)); 244 XPUSHs (sv_2mortal (fh));
194 } 245 }
195 break; 246 break;
196 247
197 case REQ_GROUP: 248 case REQ_GROUP:
249 req->fd = 2; /* mark group as finished */
250
198 if (req->data) 251 if (req->data)
199 { 252 {
200 int i; 253 int i;
201 AV *av = (AV *)req->data; 254 AV *av = (AV *)req->data;
202 255
… …
217 270
218 PUTBACK; 271 PUTBACK;
219 call_sv (req->callback, G_VOID | G_EVAL); 272 call_sv (req->callback, G_VOID | G_EVAL);
220 SPAGAIN; 273 SPAGAIN;
221 274
275 FREETMPS;
276 LEAVE;
277
278 errno = errorno;
279
222 if (SvTRUE (ERRSV)) 280 if (SvTRUE (ERRSV))
223 { 281 {
224 req_free (req); 282 req_free (req);
225 croak (0); 283 croak (0);
226 } 284 }
227
228 LEAVE;
229
230 errno = errorno;
231} 285}
232 286
233static void req_free (aio_req req) 287static void req_free (aio_req req)
234{ 288{
235 if (req->grp) 289 if (req->grp)
236 { 290 {
237 aio_req grp = req->grp; 291 aio_req grp = req->grp;
238 292
239 /* unlink request */ 293 /* unlink request */
240 req->grp_next->grp_prev = req->grp_prev; 294 if (req->grp_next) req->grp_next->grp_prev = req->grp_prev;
241 req->grp_prev->grp_next = req->grp_next; 295 if (req->grp_prev) req->grp_prev->grp_next = req->grp_next;
242 296
243 if (grp->grp_next == grp && grp->fd) 297 if (grp->grp_first == req)
244 { 298 grp->grp_first = req->grp_next;
245 req_invoke (grp); 299
246 req_free (grp); 300 aio_grp_dec (grp);
247 }
248 } 301 }
249 302
250 if (req->self) 303 if (req->self)
251 { 304 {
252 sv_unmagic (req->self, PERL_MAGIC_ext); 305 sv_unmagic (req->self, PERL_MAGIC_ext);
253 SvREFCNT_dec (req->self); 306 SvREFCNT_dec (req->self);
254 } 307 }
255 308
256 if (req->data)
257 SvREFCNT_dec (req->data); 309 SvREFCNT_dec (req->data);
258
259 if (req->fh)
260 SvREFCNT_dec (req->fh); 310 SvREFCNT_dec (req->fh);
261
262 if (req->fh2)
263 SvREFCNT_dec (req->fh2); 311 SvREFCNT_dec (req->fh2);
264
265 if (req->statdata)
266 Safefree (req->statdata);
267
268 if (req->callback)
269 SvREFCNT_dec (req->callback); 312 SvREFCNT_dec (req->callback);
313 Safefree (req->statdata);
270 314
271 if (req->type == REQ_READDIR && req->result >= 0) 315 if (req->type == REQ_READDIR && req->result >= 0)
272 free (req->data2ptr); 316 free (req->data2ptr);
273 317
274 Safefree (req); 318 Safefree (req);
… …
280 324
281 if (req->type == REQ_GROUP) 325 if (req->type == REQ_GROUP)
282 { 326 {
283 aio_req sub; 327 aio_req sub;
284 328
285 for (sub = req->grp_next; sub != req; sub = sub->grp_next) 329 for (sub = req->grp_first; sub; sub = sub->grp_next)
286 req_cancel (sub); 330 req_cancel (sub);
287 } 331 }
288} 332}
289 333
290static int poll_cb () 334static int poll_cb ()
… …
317 pthread_mutex_unlock (&reslock); 361 pthread_mutex_unlock (&reslock);
318 362
319 if (!req) 363 if (!req)
320 break; 364 break;
321 365
322 nreqs--; 366 --nreqs;
323 367
324 if (req->type == REQ_QUIT) 368 if (req->type == REQ_QUIT)
325 started--; 369 started--;
326 else if (req->type == REQ_GROUP && req->grp_next != req) 370 else if (req->type == REQ_GROUP && req->length)
327 { 371 {
328 req->fd = 1; /* mark request as delayed */ 372 req->fd = 1; /* mark request as delayed */
329 continue; 373 continue;
330 } 374 }
331 else 375 else
… …
378static void req_send (aio_req req) 422static void req_send (aio_req req)
379{ 423{
380 while (started < wanted && nreqs >= started) 424 while (started < wanted && nreqs >= started)
381 start_thread (); 425 start_thread ();
382 426
383 nreqs++; 427 ++nreqs;
384 428
385 pthread_mutex_lock (&reqlock); 429 pthread_mutex_lock (&reqlock);
386 430
387 req->next = 0; 431 req->next = 0;
388 432
… …
740 pthread_mutex_unlock (&reqlock); 784 pthread_mutex_unlock (&reqlock);
741 785
742 errno = 0; /* strictly unnecessary */ 786 errno = 0; /* strictly unnecessary */
743 787
744 if (!req->cancelled) 788 if (!req->cancelled)
745 switch (req->type) 789 switch (type = req->type) /* remember type for QUIT check */
746 { 790 {
747 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 791 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; 792 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
749 793
750 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 794 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
… …
1161 PROTOTYPE: ;$ 1205 PROTOTYPE: ;$
1162 PPCODE: 1206 PPCODE:
1163{ 1207{
1164 dREQ; 1208 dREQ;
1165 req->type = REQ_GROUP; 1209 req->type = REQ_GROUP;
1166 req->grp_next = req;
1167 req->grp_prev = req;
1168
1169 req_send (req); 1210 req_send (req);
1170 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1211 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1171} 1212}
1172 1213
1173void 1214void
… …
1237add (aio_req grp, ...) 1278add (aio_req grp, ...)
1238 PPCODE: 1279 PPCODE:
1239{ 1280{
1240 int i; 1281 int i;
1241 1282
1283 if (grp->fd == 2)
1284 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1285
1242 for (i = 1; i < items; ++i ) 1286 for (i = 1; i < items; ++i )
1243 { 1287 {
1244 if (GIMME_V != G_VOID) 1288 if (GIMME_V != G_VOID)
1245 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1289 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1246 1290
1247 aio_req req = SvAIO_REQ (ST (i)); 1291 aio_req req = SvAIO_REQ (ST (i));
1248 1292
1249 if (req) 1293 if (req)
1250 { 1294 {
1251 req->grp_prev = grp; 1295 ++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; 1296 req->grp = grp;
1297
1298 req->grp_prev = 0;
1299 req->grp_next = grp->grp_first;
1300
1301 if (grp->grp_first)
1302 grp->grp_first->grp_prev = req;
1303
1304 grp->grp_first = req;
1257 } 1305 }
1258 } 1306 }
1259} 1307}
1260 1308
1261void 1309void
1262result (aio_req grp, ...) 1310result (aio_req grp, ...)
1311 CODE:
1312{
1313 int i;
1314 AV *av = newAV ();
1315
1316 for (i = 1; i < items; ++i )
1317 av_push (av, newSVsv (ST (i)));
1318
1319 SvREFCNT_dec (grp->data);
1320 grp->data = (SV *)av;
1321}
1322
1323void
1324lock (aio_req grp)
1263 CODE: 1325 CODE:
1264{ 1326 ++grp->length;
1265 int i;
1266 AV *av = newAV ();
1267 1327
1268 if (grp->data) 1328void
1329unlock (aio_req grp)
1330 CODE:
1331 aio_grp_dec (grp);
1332
1333void
1334feeder_limit (aio_req grp, int limit)
1335 CODE:
1336 grp->fd2 = limit;
1337 aio_grp_feed (grp);
1338
1339void
1340set_feeder (aio_req grp, SV *callback=&PL_sv_undef)
1341 CODE:
1342{
1269 SvREFCNT_dec (grp->data); 1343 SvREFCNT_dec (grp->fh2);
1344 grp->fh2 = newSVsv (callback);
1270 1345
1271 for (i = 1; i < items; ++i ) 1346 if (grp->fd2 <= 0)
1272 av_push (av, newSVsv (ST (i))); 1347 grp->fd2 = 2;
1273 1348
1274 grp->data = (SV *)av; 1349 aio_grp_feed (grp);
1275} 1350}
1276 1351

Diff Legend

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