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.53 by root, Mon Oct 23 00:17:07 2006 UTC vs.
Revision 1.78 by root, Thu Oct 26 14:35:34 2006 UTC

1/* solaris */
2#define _POSIX_PTHREAD_SEMANTICS 1
3
4#if __linux && !defined(_GNU_SOURCE)
5# define _GNU_SOURCE
6#endif
7
8/* just in case */
1#define _REENTRANT 1 9#define _REENTRANT 1
10
2#include <errno.h> 11#include <errno.h>
3 12
4#include "EXTERN.h" 13#include "EXTERN.h"
5#include "perl.h" 14#include "perl.h"
6#include "XSUB.h" 15#include "XSUB.h"
39/* used for struct dirent, AIX doesn't provide it */ 48/* used for struct dirent, AIX doesn't provide it */
40#ifndef NAME_MAX 49#ifndef NAME_MAX
41# define NAME_MAX 4096 50# define NAME_MAX 4096
42#endif 51#endif
43 52
53#ifndef PTHREAD_STACK_MIN
54/* care for broken platforms, e.g. windows */
55# define PTHREAD_STACK_MIN 16384
56#endif
57
44#if __ia64 58#if __ia64
45# define STACKSIZE 65536 59# define STACKSIZE 65536
60#elif __i386 || __x86_64 /* 16k is unreasonably high :( */
61# define STACKSIZE PTHREAD_STACK_MIN
46#else 62#else
47# define STACKSIZE 8192 63# define STACKSIZE 16384
48#endif 64#endif
65
66/* buffer size for various temporary buffers */
67#define AIO_BUFSIZE 65536
68
69#define dBUF \
70 char *aio_buf; \
71 LOCK (wrklock); \
72 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
73 UNLOCK (wrklock); \
74 if (!aio_buf) \
75 return -1;
49 76
50enum { 77enum {
51 REQ_QUIT, 78 REQ_QUIT,
52 REQ_OPEN, REQ_CLOSE, 79 REQ_OPEN, REQ_CLOSE,
53 REQ_READ, REQ_WRITE, REQ_READAHEAD, 80 REQ_READ, REQ_WRITE, REQ_READAHEAD,
55 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 82 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56 REQ_FSYNC, REQ_FDATASYNC, 83 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 84 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 85 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 86 REQ_LINK, REQ_SYMLINK,
60 REQ_SLEEP, 87 REQ_GROUP, REQ_NOP,
61 REQ_GROUP, 88 REQ_BUSY,
62}; 89};
63 90
64#define AIO_REQ_KLASS "IO::AIO::REQ" 91#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 92#define AIO_GRP_KLASS "IO::AIO::GRP"
66 93
67typedef struct aio_cb 94typedef struct aio_cb
68{ 95{
69 struct aio_cb *volatile next; 96 struct aio_cb *volatile next;
70
71 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
72
73 SV *self; /* the perl counterpart of this request, if any */
74 97
75 SV *data, *callback; 98 SV *data, *callback;
76 SV *fh, *fh2; 99 SV *fh, *fh2;
77 void *dataptr, *data2ptr; 100 void *dataptr, *data2ptr;
78 Stat_t *statdata; 101 Stat_t *statdata;
79 off_t offset; 102 off_t offset;
80 size_t length; 103 size_t length;
81 ssize_t result; 104 ssize_t result;
82 105
106 STRLEN dataoffset;
83 int type; 107 int type;
84 int fd, fd2; 108 int fd, fd2;
85 int errorno; 109 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */ 110 mode_t mode; /* open */
111
88 unsigned char cancelled; 112 unsigned char flags;
113 unsigned char pri;
114
115 SV *self; /* the perl counterpart of this request, if any */
116 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
89} aio_cb; 117} aio_cb;
118
119enum {
120 FLAG_CANCELLED = 0x01,
121};
90 122
91typedef aio_cb *aio_req; 123typedef aio_cb *aio_req;
92typedef aio_cb *aio_req_ornot; 124typedef aio_cb *aio_req_ornot;
93 125
126enum {
127 PRI_MIN = -4,
128 PRI_MAX = 4,
129
130 DEFAULT_PRI = 0,
131 PRI_BIAS = -PRI_MIN,
132 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
133};
134
135static int next_pri = DEFAULT_PRI + PRI_BIAS;
136
94static int started, wanted; 137static unsigned int started, wanted;
95static volatile int nreqs; 138static volatile unsigned int nreqs;
96static int max_outstanding = 1<<30; 139static volatile unsigned int max_outstanding = 0xffffffff;
97static int respipe [2]; 140static int respipe [2];
98 141
142#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
143# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
144#else
145# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
146#endif
147
148#define LOCK(mutex) pthread_mutex_lock (&(mutex))
149#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
150
151/* worker threads management */
152static pthread_mutex_t wrklock = AIO_MUTEX_INIT;
153
154typedef struct worker {
155 /* locked by wrklock */
156 struct worker *prev, *next;
157
158 pthread_t tid;
159
160 /* locked by reslock, reqlock or wrklock */
161 aio_req req; /* currently processed request */
162 void *dbuf;
163 DIR *dirp;
164} worker;
165
166static worker wrk_first = { &wrk_first, &wrk_first, 0 };
167
168static void worker_clear (worker *wrk)
169{
170 if (wrk->dirp)
171 {
172 closedir (wrk->dirp);
173 wrk->dirp = 0;
174 }
175
176 if (wrk->dbuf)
177 {
178 free (wrk->dbuf);
179 wrk->dbuf = 0;
180 }
181}
182
183static void worker_free (worker *wrk)
184{
185 wrk->next->prev = wrk->prev;
186 wrk->prev->next = wrk->next;
187
188 free (wrk);
189}
190
99static pthread_mutex_t reslock = PTHREAD_MUTEX_INITIALIZER; 191static pthread_mutex_t reslock = AIO_MUTEX_INIT;
100static pthread_mutex_t reqlock = PTHREAD_MUTEX_INITIALIZER; 192static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
101static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 193static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
102 194
103static volatile aio_req reqs, reqe; /* queue start, queue end */ 195/*
104static volatile aio_req ress, rese; /* queue start, queue end */ 196 * a somewhat faster data structure might be nice, but
197 * with 8 priorities this actually needs <20 insns
198 * per shift, the most expensive operation.
199 */
200typedef struct {
201 aio_req qs[NUM_PRI], qe[NUM_PRI]; /* qstart, qend */
202 int size;
203} reqq;
105 204
205static reqq req_queue;
206static reqq res_queue;
207
208int reqq_push (reqq *q, aio_req req)
209{
210 int pri = req->pri;
211 req->next = 0;
212
213 if (q->qe[pri])
214 {
215 q->qe[pri]->next = req;
216 q->qe[pri] = req;
217 }
218 else
219 q->qe[pri] = q->qs[pri] = req;
220
221 return q->size++;
222}
223
224aio_req reqq_shift (reqq *q)
225{
226 int pri;
227
228 if (!q->size)
229 return 0;
230
231 --q->size;
232
233 for (pri = NUM_PRI; pri--; )
234 {
235 aio_req req = q->qs[pri];
236
237 if (req)
238 {
239 if (!(q->qs[pri] = req->next))
240 q->qe[pri] = 0;
241
242 return req;
243 }
244 }
245
246 abort ();
247}
248
249static int poll_cb (int max);
106static void req_invoke (aio_req req); 250static void req_invoke (aio_req req);
107static void req_free (aio_req req); 251static void req_free (aio_req req);
252static void req_cancel (aio_req req);
108 253
109/* must be called at most once */ 254/* must be called at most once */
110static SV *req_sv (aio_req req, const char *klass) 255static SV *req_sv (aio_req req, const char *klass)
111{ 256{
112 if (!req->self) 257 if (!req->self)
130 return mg ? (aio_req)mg->mg_ptr : 0; 275 return mg ? (aio_req)mg->mg_ptr : 0;
131} 276}
132 277
133static void aio_grp_feed (aio_req grp) 278static void aio_grp_feed (aio_req grp)
134{ 279{
135 while (grp->length < grp->fd2) 280 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
136 { 281 {
137 int old_len = grp->length; 282 int old_len = grp->length;
138 283
139 if (grp->fh2 && SvOK (grp->fh2)) 284 if (grp->fh2 && SvOK (grp->fh2))
140 { 285 {
143 ENTER; 288 ENTER;
144 SAVETMPS; 289 SAVETMPS;
145 PUSHMARK (SP); 290 PUSHMARK (SP);
146 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 291 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
147 PUTBACK; 292 PUTBACK;
148 call_sv (grp->fh2, G_VOID | G_EVAL); 293 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR);
149 SPAGAIN; 294 SPAGAIN;
150 FREETMPS; 295 FREETMPS;
151 LEAVE; 296 LEAVE;
152 } 297 }
153 298
176 } 321 }
177} 322}
178 323
179static void poll_wait () 324static void poll_wait ()
180{ 325{
181 if (nreqs && !ress)
182 {
183 fd_set rfd; 326 fd_set rfd;
327
328 while (nreqs)
329 {
330 int size;
331#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
332 LOCK (reslock);
333#endif
334 size = res_queue.size;
335#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
336 UNLOCK (reslock);
337#endif
338
339 if (size)
340 return;
341
184 FD_ZERO(&rfd); 342 FD_ZERO(&rfd);
185 FD_SET(respipe [0], &rfd); 343 FD_SET(respipe [0], &rfd);
186 344
187 select (respipe [0] + 1, &rfd, 0, 0, 0); 345 select (respipe [0] + 1, &rfd, 0, 0, 0);
188 } 346 }
189} 347}
190 348
191static void req_invoke (aio_req req) 349static void req_invoke (aio_req req)
192{ 350{
193 dSP; 351 dSP;
194 int errorno = errno;
195 352
196 if (req->cancelled || !SvOK (req->callback)) 353 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
197 return; 354 {
198
199 errno = req->errorno; 355 errno = req->errorno;
200 356
201 ENTER; 357 ENTER;
202 SAVETMPS; 358 SAVETMPS;
203 PUSHMARK (SP); 359 PUSHMARK (SP);
204 EXTEND (SP, 1); 360 EXTEND (SP, 1);
205 361
206 switch (req->type) 362 switch (req->type)
207 {
208 case REQ_READDIR:
209 { 363 {
210 SV *rv = &PL_sv_undef; 364 case REQ_READDIR:
211
212 if (req->result >= 0)
213 { 365 {
214 char *buf = req->data2ptr; 366 SV *rv = &PL_sv_undef;
215 AV *av = newAV ();
216 367
217 while (req->result) 368 if (req->result >= 0)
218 { 369 {
370 int i;
371 char *buf = req->data2ptr;
372 AV *av = newAV ();
373
374 av_extend (av, req->result - 1);
375
376 for (i = 0; i < req->result; ++i)
377 {
219 SV *sv = newSVpv (buf, 0); 378 SV *sv = newSVpv (buf, 0);
220 379
221 av_push (av, sv); 380 av_store (av, i, sv);
222 buf += SvCUR (sv) + 1; 381 buf += SvCUR (sv) + 1;
223 req->result--; 382 }
383
384 rv = sv_2mortal (newRV_noinc ((SV *)av));
224 } 385 }
225 386
226 rv = sv_2mortal (newRV_noinc ((SV *)av)); 387 PUSHs (rv);
227 } 388 }
389 break;
228 390
229 PUSHs (rv); 391 case REQ_OPEN:
392 {
393 /* convert fd to fh */
394 SV *fh;
395
396 PUSHs (sv_2mortal (newSViv (req->result)));
397 PUTBACK;
398 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
399 SPAGAIN;
400
401 fh = SvREFCNT_inc (POPs);
402
403 PUSHMARK (SP);
404 XPUSHs (sv_2mortal (fh));
405 }
406 break;
407
408 case REQ_GROUP:
409 req->fd = 2; /* mark group as finished */
410
411 if (req->data)
412 {
413 int i;
414 AV *av = (AV *)req->data;
415
416 EXTEND (SP, AvFILL (av) + 1);
417 for (i = 0; i <= AvFILL (av); ++i)
418 PUSHs (*av_fetch (av, i, 0));
419 }
420 break;
421
422 case REQ_NOP:
423 case REQ_BUSY:
424 break;
425
426 default:
427 PUSHs (sv_2mortal (newSViv (req->result)));
428 break;
230 } 429 }
231 break;
232 430
233 case REQ_OPEN:
234 {
235 /* convert fd to fh */
236 SV *fh;
237 431
238 PUSHs (sv_2mortal (newSViv (req->result)));
239 PUTBACK; 432 PUTBACK;
240 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
241 SPAGAIN;
242
243 fh = SvREFCNT_inc (POPs);
244
245 PUSHMARK (SP);
246 XPUSHs (sv_2mortal (fh));
247 }
248 break;
249
250 case REQ_GROUP:
251 req->fd = 2; /* mark group as finished */
252
253 if (req->data)
254 {
255 int i;
256 AV *av = (AV *)req->data;
257
258 EXTEND (SP, AvFILL (av) + 1);
259 for (i = 0; i <= AvFILL (av); ++i)
260 PUSHs (*av_fetch (av, i, 0));
261 }
262 break;
263
264 case REQ_SLEEP:
265 break;
266
267 default:
268 PUSHs (sv_2mortal (newSViv (req->result)));
269 break;
270 }
271
272
273 PUTBACK;
274 call_sv (req->callback, G_VOID | G_EVAL); 433 call_sv (req->callback, G_VOID | G_EVAL);
275 SPAGAIN; 434 SPAGAIN;
276 435
277 FREETMPS; 436 FREETMPS;
278 LEAVE; 437 LEAVE;
279
280 errno = errorno;
281
282 if (SvTRUE (ERRSV))
283 { 438 }
284 req_free (req);
285 croak (0);
286 }
287}
288 439
289static void req_free (aio_req req)
290{
291 if (req->grp) 440 if (req->grp)
292 { 441 {
293 aio_req grp = req->grp; 442 aio_req grp = req->grp;
294 443
295 /* unlink request */ 444 /* unlink request */
300 grp->grp_first = req->grp_next; 449 grp->grp_first = req->grp_next;
301 450
302 aio_grp_dec (grp); 451 aio_grp_dec (grp);
303 } 452 }
304 453
454 if (SvTRUE (ERRSV))
455 {
456 req_free (req);
457 croak (0);
458 }
459}
460
461static void req_free (aio_req req)
462{
305 if (req->self) 463 if (req->self)
306 { 464 {
307 sv_unmagic (req->self, PERL_MAGIC_ext); 465 sv_unmagic (req->self, PERL_MAGIC_ext);
308 SvREFCNT_dec (req->self); 466 SvREFCNT_dec (req->self);
309 } 467 }
312 SvREFCNT_dec (req->fh); 470 SvREFCNT_dec (req->fh);
313 SvREFCNT_dec (req->fh2); 471 SvREFCNT_dec (req->fh2);
314 SvREFCNT_dec (req->callback); 472 SvREFCNT_dec (req->callback);
315 Safefree (req->statdata); 473 Safefree (req->statdata);
316 474
317 if (req->type == REQ_READDIR && req->result >= 0) 475 if (req->type == REQ_READDIR)
318 free (req->data2ptr); 476 free (req->data2ptr);
319 477
320 Safefree (req); 478 Safefree (req);
321} 479}
322 480
481static void req_cancel_subs (aio_req grp)
482{
483 aio_req sub;
484
485 if (grp->type != REQ_GROUP)
486 return;
487
488 SvREFCNT_dec (grp->fh2);
489 grp->fh2 = 0;
490
491 for (sub = grp->grp_first; sub; sub = sub->grp_next)
492 req_cancel (sub);
493}
494
323static void req_cancel (aio_req req) 495static void req_cancel (aio_req req)
324{ 496{
325 req->cancelled = 1; 497 req->flags |= FLAG_CANCELLED;
326 498
327 if (req->type == REQ_GROUP) 499 req_cancel_subs (req);
328 {
329 aio_req sub;
330
331 for (sub = req->grp_first; sub; sub = sub->grp_next)
332 req_cancel (sub);
333 }
334} 500}
335 501
336static int poll_cb () 502static int poll_cb (int max)
337{ 503{
338 dSP; 504 dSP;
339 int count = 0; 505 int count = 0;
340 int do_croak = 0; 506 int do_croak = 0;
341 aio_req req; 507 aio_req req;
342 508
343 for (;;) 509 for (;;)
344 { 510 {
345 pthread_mutex_lock (&reslock); 511 while (max <= 0 || count < max)
346 req = ress;
347
348 if (req)
349 { 512 {
350 ress = req->next; 513 LOCK (reslock);
514 req = reqq_shift (&res_queue);
351 515
352 if (!ress) 516 if (req)
353 { 517 {
518 if (!res_queue.size)
519 {
354 /* read any signals sent by the worker threads */ 520 /* read any signals sent by the worker threads */
355 char buf [32]; 521 char buf [32];
356 while (read (respipe [0], buf, 32) == 32) 522 while (read (respipe [0], buf, 32) == 32)
523 ;
357 ; 524 }
358
359 rese = 0;
360 } 525 }
526
527 UNLOCK (reslock);
528
529 if (!req)
530 break;
531
532 --nreqs;
533
534 if (req->type == REQ_QUIT)
535 --started;
536 else if (req->type == REQ_GROUP && req->length)
537 {
538 req->fd = 1; /* mark request as delayed */
539 continue;
540 }
541 else
542 {
543 if (req->type == REQ_READ)
544 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
545
546 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
547 SvREADONLY_off (req->data);
548
549 if (req->statdata)
550 {
551 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
552 PL_laststatval = req->result;
553 PL_statcache = *(req->statdata);
554 }
555
556 req_invoke (req);
557
558 count++;
559 }
560
561 req_free (req);
361 } 562 }
362 563
363 pthread_mutex_unlock (&reslock); 564 if (nreqs <= max_outstanding)
364
365 if (!req)
366 break; 565 break;
367 566
368 --nreqs; 567 poll_wait ();
369 568
370 if (req->type == REQ_QUIT) 569 max = 0;
371 started--;
372 else if (req->type == REQ_GROUP && req->length)
373 {
374 req->fd = 1; /* mark request as delayed */
375 continue;
376 }
377 else
378 {
379 if (req->type == REQ_READ)
380 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
381
382 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
383 SvREADONLY_off (req->data);
384
385 if (req->statdata)
386 {
387 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
388 PL_laststatval = req->result;
389 PL_statcache = *(req->statdata);
390 }
391
392 req_invoke (req);
393
394 count++;
395 }
396
397 req_free (req);
398 } 570 }
399 571
400 return count; 572 return count;
401} 573}
402 574
403static void *aio_proc(void *arg); 575static void *aio_proc(void *arg);
404 576
405static void start_thread (void) 577static void start_thread (void)
406{ 578{
407 sigset_t fullsigset, oldsigset; 579 sigset_t fullsigset, oldsigset;
408 pthread_t tid;
409 pthread_attr_t attr; 580 pthread_attr_t attr;
581
582 worker *wrk = calloc (1, sizeof (worker));
583
584 if (!wrk)
585 croak ("unable to allocate worker thread data");
410 586
411 pthread_attr_init (&attr); 587 pthread_attr_init (&attr);
412 pthread_attr_setstacksize (&attr, STACKSIZE); 588 pthread_attr_setstacksize (&attr, STACKSIZE);
413 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 589 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
414 590
415 sigfillset (&fullsigset); 591 sigfillset (&fullsigset);
592
593 LOCK (wrklock);
416 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 594 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
417 595
418 if (pthread_create (&tid, &attr, aio_proc, 0) == 0) 596 if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0)
597 {
598 wrk->prev = &wrk_first;
599 wrk->next = wrk_first.next;
600 wrk_first.next->prev = wrk;
601 wrk_first.next = wrk;
419 started++; 602 ++started;
603 }
604 else
605 free (wrk);
420 606
421 sigprocmask (SIG_SETMASK, &oldsigset, 0); 607 sigprocmask (SIG_SETMASK, &oldsigset, 0);
608 UNLOCK (wrklock);
422} 609}
423 610
424static void req_send (aio_req req) 611static void req_send (aio_req req)
425{ 612{
426 while (started < wanted && nreqs >= started) 613 while (started < wanted && nreqs >= started)
427 start_thread (); 614 start_thread ();
428 615
429 ++nreqs; 616 ++nreqs;
430 617
431 pthread_mutex_lock (&reqlock); 618 LOCK (reqlock);
432 619 reqq_push (&req_queue, req);
433 req->next = 0;
434
435 if (reqe)
436 {
437 reqe->next = req;
438 reqe = req;
439 }
440 else
441 reqe = reqs = req;
442
443 pthread_cond_signal (&reqwait); 620 pthread_cond_signal (&reqwait);
444 pthread_mutex_unlock (&reqlock); 621 UNLOCK (reqlock);
445
446 if (nreqs > max_outstanding)
447 for (;;)
448 {
449 poll_cb ();
450
451 if (nreqs <= max_outstanding)
452 break;
453
454 poll_wait ();
455 }
456} 622}
457 623
458static void end_thread (void) 624static void end_thread (void)
459{ 625{
460 aio_req req; 626 aio_req req;
627
461 Newz (0, req, 1, aio_cb); 628 Newz (0, req, 1, aio_cb);
629
462 req->type = REQ_QUIT; 630 req->type = REQ_QUIT;
631 req->pri = PRI_MAX + PRI_BIAS;
463 632
464 req_send (req); 633 req_send (req);
465} 634}
466 635
467static void min_parallel (int nthreads) 636static void min_parallel (int nthreads)
484 } 653 }
485 654
486 while (started > wanted) 655 while (started > wanted)
487 { 656 {
488 poll_wait (); 657 poll_wait ();
489 poll_cb (); 658 poll_cb (0);
490 } 659 }
491} 660}
492 661
493static void create_pipe () 662static void create_pipe ()
494{ 663{
519static ssize_t pread (int fd, void *buf, size_t count, off_t offset) 688static ssize_t pread (int fd, void *buf, size_t count, off_t offset)
520{ 689{
521 ssize_t res; 690 ssize_t res;
522 off_t ooffset; 691 off_t ooffset;
523 692
524 pthread_mutex_lock (&preadwritelock); 693 LOCK (preadwritelock);
525 ooffset = lseek (fd, 0, SEEK_CUR); 694 ooffset = lseek (fd, 0, SEEK_CUR);
526 lseek (fd, offset, SEEK_SET); 695 lseek (fd, offset, SEEK_SET);
527 res = read (fd, buf, count); 696 res = read (fd, buf, count);
528 lseek (fd, ooffset, SEEK_SET); 697 lseek (fd, ooffset, SEEK_SET);
529 pthread_mutex_unlock (&preadwritelock); 698 UNLOCK (preadwritelock);
530 699
531 return res; 700 return res;
532} 701}
533 702
534static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset) 703static ssize_t pwrite (int fd, void *buf, size_t count, off_t offset)
535{ 704{
536 ssize_t res; 705 ssize_t res;
537 off_t ooffset; 706 off_t ooffset;
538 707
539 pthread_mutex_lock (&preadwritelock); 708 LOCK (preadwritelock);
540 ooffset = lseek (fd, 0, SEEK_CUR); 709 ooffset = lseek (fd, 0, SEEK_CUR);
541 lseek (fd, offset, SEEK_SET); 710 lseek (fd, offset, SEEK_SET);
542 res = write (fd, buf, count); 711 res = write (fd, buf, count);
543 lseek (fd, offset, SEEK_SET); 712 lseek (fd, offset, SEEK_SET);
544 pthread_mutex_unlock (&preadwritelock); 713 UNLOCK (preadwritelock);
545 714
546 return res; 715 return res;
547} 716}
548#endif 717#endif
549 718
550#if !HAVE_FDATASYNC 719#if !HAVE_FDATASYNC
551# define fdatasync fsync 720# define fdatasync fsync
552#endif 721#endif
553 722
554#if !HAVE_READAHEAD 723#if !HAVE_READAHEAD
555# define readahead aio_readahead 724# define readahead(fd,offset,count) aio_readahead (fd, offset, count, self)
556 725
557static ssize_t readahead (int fd, off_t offset, size_t count) 726static ssize_t aio_readahead (int fd, off_t offset, size_t count, worker *self)
558{ 727{
559 char readahead_buf[4096]; 728 dBUF;
560 729
561 while (count > 0) 730 while (count > 0)
562 { 731 {
563 size_t len = count < sizeof (readahead_buf) ? count : sizeof (readahead_buf); 732 size_t len = count < AIO_BUFSIZE ? count : AIO_BUFSIZE;
564 733
565 pread (fd, readahead_buf, len, offset); 734 pread (fd, aio_buf, len, offset);
566 offset += len; 735 offset += len;
567 count -= len; 736 count -= len;
568 } 737 }
569 738
570 errno = 0; 739 errno = 0;
571} 740}
741
572#endif 742#endif
573 743
574#if !HAVE_READDIR_R 744#if !HAVE_READDIR_R
575# define readdir_r aio_readdir_r 745# define readdir_r aio_readdir_r
576 746
579static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) 749static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res)
580{ 750{
581 struct dirent *e; 751 struct dirent *e;
582 int errorno; 752 int errorno;
583 753
584 pthread_mutex_lock (&readdirlock); 754 LOCK (readdirlock);
585 755
586 e = readdir (dirp); 756 e = readdir (dirp);
587 errorno = errno; 757 errorno = errno;
588 758
589 if (e) 759 if (e)
592 strcpy (ent->d_name, e->d_name); 762 strcpy (ent->d_name, e->d_name);
593 } 763 }
594 else 764 else
595 *res = 0; 765 *res = 0;
596 766
597 pthread_mutex_unlock (&readdirlock); 767 UNLOCK (readdirlock);
598 768
599 errno = errorno; 769 errno = errorno;
600 return e ? 0 : -1; 770 return e ? 0 : -1;
601} 771}
602#endif 772#endif
603 773
604/* sendfile always needs emulation */ 774/* sendfile always needs emulation */
605static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count) 775static ssize_t sendfile_ (int ofd, int ifd, off_t offset, size_t count, worker *self)
606{ 776{
607 ssize_t res; 777 ssize_t res;
608 778
609 if (!count) 779 if (!count)
610 return 0; 780 return 0;
621 { 791 {
622 off_t sbytes; 792 off_t sbytes;
623 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 793 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
624 794
625 if (res < 0 && sbytes) 795 if (res < 0 && sbytes)
626 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 796 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
627 res = sbytes; 797 res = sbytes;
628 } 798 }
629 799
630# elif __hpux 800# elif __hpux
631 res = sendfile (ofd, ifd, offset, count, 0, 0); 801 res = sendfile (ofd, ifd, offset, count, 0, 0);
659#endif 829#endif
660 ) 830 )
661 ) 831 )
662 { 832 {
663 /* emulate sendfile. this is a major pain in the ass */ 833 /* emulate sendfile. this is a major pain in the ass */
664 char buf[4096]; 834 dBUF;
835
665 res = 0; 836 res = 0;
666 837
667 while (count) 838 while (count)
668 { 839 {
669 ssize_t cnt; 840 ssize_t cnt;
670 841
671 cnt = pread (ifd, buf, count > 4096 ? 4096 : count, offset); 842 cnt = pread (ifd, aio_buf, count > AIO_BUFSIZE ? AIO_BUFSIZE : count, offset);
672 843
673 if (cnt <= 0) 844 if (cnt <= 0)
674 { 845 {
675 if (cnt && !res) res = -1; 846 if (cnt && !res) res = -1;
676 break; 847 break;
677 } 848 }
678 849
679 cnt = write (ofd, buf, cnt); 850 cnt = write (ofd, aio_buf, cnt);
680 851
681 if (cnt <= 0) 852 if (cnt <= 0)
682 { 853 {
683 if (cnt && !res) res = -1; 854 if (cnt && !res) res = -1;
684 break; 855 break;
692 863
693 return res; 864 return res;
694} 865}
695 866
696/* read a full directory */ 867/* read a full directory */
697static int scandir_ (const char *path, void **namesp) 868static void scandir_ (aio_req req, worker *self)
698{ 869{
699 DIR *dirp = opendir (path); 870 DIR *dirp;
700 union 871 union
701 { 872 {
702 struct dirent d; 873 struct dirent d;
703 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1]; 874 char b [offsetof (struct dirent, d_name) + NAME_MAX + 1];
704 } u; 875 } *u;
705 struct dirent *entp; 876 struct dirent *entp;
706 char *name, *names; 877 char *name, *names;
707 int memlen = 4096; 878 int memlen = 4096;
708 int memofs = 0; 879 int memofs = 0;
709 int res = 0; 880 int res = 0;
710 int errorno; 881 int errorno;
711 882
712 if (!dirp) 883 LOCK (wrklock);
713 return -1; 884 self->dirp = dirp = opendir (req->dataptr);
714 885 self->dbuf = u = malloc (sizeof (*u));
715 names = malloc (memlen); 886 req->data2ptr = names = malloc (memlen);
887 UNLOCK (wrklock);
716 888
889 if (dirp && u && names)
717 for (;;) 890 for (;;)
718 { 891 {
892 errno = 0;
719 errno = 0, readdir_r (dirp, &u.d, &entp); 893 readdir_r (dirp, &u->d, &entp);
720 894
721 if (!entp) 895 if (!entp)
722 break; 896 break;
723 897
724 name = entp->d_name; 898 name = entp->d_name;
725 899
726 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2]))) 900 if (name [0] != '.' || (name [1] && (name [1] != '.' || name [2])))
727 { 901 {
728 int len = strlen (name) + 1; 902 int len = strlen (name) + 1;
729 903
730 res++; 904 res++;
731 905
732 while (memofs + len > memlen) 906 while (memofs + len > memlen)
733 { 907 {
734 memlen *= 2; 908 memlen *= 2;
909 LOCK (wrklock);
735 names = realloc (names, memlen); 910 req->data2ptr = names = realloc (names, memlen);
911 UNLOCK (wrklock);
912
736 if (!names) 913 if (!names)
737 break; 914 break;
738 } 915 }
739 916
740 memcpy (names + memofs, name, len); 917 memcpy (names + memofs, name, len);
741 memofs += len; 918 memofs += len;
742 } 919 }
743 } 920 }
744 921
745 errorno = errno;
746 closedir (dirp);
747
748 if (errorno) 922 if (errno)
749 {
750 free (names);
751 errno = errorno;
752 res = -1; 923 res = -1;
753 } 924
754 925 req->result = res;
755 *namesp = (void *)names;
756 return res;
757} 926}
758 927
759/*****************************************************************************/ 928/*****************************************************************************/
760 929
761static void *aio_proc (void *thr_arg) 930static void *aio_proc (void *thr_arg)
762{ 931{
763 aio_req req; 932 aio_req req;
764 int type; 933 int type;
934 worker *self = (worker *)thr_arg;
765 935
766 do 936 do
767 { 937 {
768 pthread_mutex_lock (&reqlock); 938 LOCK (reqlock);
769 939
770 for (;;) 940 for (;;)
771 { 941 {
772 req = reqs; 942 self->req = req = reqq_shift (&req_queue);
773
774 if (reqs)
775 {
776 reqs = reqs->next;
777 if (!reqs) reqe = 0;
778 }
779 943
780 if (req) 944 if (req)
781 break; 945 break;
782 946
783 pthread_cond_wait (&reqwait, &reqlock); 947 pthread_cond_wait (&reqwait, &reqlock);
784 } 948 }
785 949
786 pthread_mutex_unlock (&reqlock); 950 UNLOCK (reqlock);
787 951
788 errno = 0; /* strictly unnecessary */ 952 errno = 0; /* strictly unnecessary */
789
790 if (!req->cancelled)
791 switch (type = req->type) /* remember type for QUIT check */ 953 type = req->type; /* remember type for QUIT check */
954
955 if (!(req->flags & FLAG_CANCELLED))
956 switch (type)
792 { 957 {
793 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 958 case REQ_READ: req->result = pread (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; 959 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
795 960
796 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 961 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
797 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 962 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break;
798 963
799 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 964 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
800 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 965 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
801 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 966 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
802 967
808 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 973 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
809 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 974 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
810 975
811 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 976 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
812 case REQ_FSYNC: req->result = fsync (req->fd); break; 977 case REQ_FSYNC: req->result = fsync (req->fd); break;
813 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 978 case REQ_READDIR: scandir_ (req, self); break;
814 979
815 case REQ_SLEEP: 980 case REQ_BUSY:
816 { 981 {
817 struct timeval tv; 982 struct timeval tv;
818 983
819 tv.tv_sec = req->fd; 984 tv.tv_sec = req->fd;
820 tv.tv_usec = req->fd2; 985 tv.tv_usec = req->fd2;
821 986
822 req->result = select (0, 0, 0, 0, &tv); 987 req->result = select (0, 0, 0, 0, &tv);
823 } 988 }
824 989
990 case REQ_GROUP:
991 case REQ_NOP:
825 case REQ_QUIT: 992 case REQ_QUIT:
826 break; 993 break;
827 994
828 default: 995 default:
829 req->result = ENOSYS; 996 req->result = ENOSYS;
830 break; 997 break;
831 } 998 }
832 999
833 req->errorno = errno; 1000 req->errorno = errno;
834 1001
835 pthread_mutex_lock (&reslock); 1002 LOCK (reslock);
836 1003
837 req->next = 0; 1004 if (!reqq_push (&res_queue, req))
838
839 if (rese)
840 {
841 rese->next = req;
842 rese = req;
843 }
844 else
845 {
846 rese = ress = req;
847
848 /* write a dummy byte to the pipe so fh becomes ready */ 1005 /* write a dummy byte to the pipe so fh becomes ready */
849 write (respipe [1], &respipe, 1); 1006 write (respipe [1], &respipe, 1);
850 }
851 1007
852 pthread_mutex_unlock (&reslock); 1008 self->req = 0;
1009 worker_clear (self);
1010
1011 UNLOCK (reslock);
853 } 1012 }
854 while (type != REQ_QUIT); 1013 while (type != REQ_QUIT);
855 1014
1015 LOCK (wrklock);
1016 worker_free (self);
1017 UNLOCK (wrklock);
1018
856 return 0; 1019 return 0;
857} 1020}
858 1021
859/*****************************************************************************/ 1022/*****************************************************************************/
860 1023
861static void atfork_prepare (void) 1024static void atfork_prepare (void)
862{ 1025{
863 pthread_mutex_lock (&reqlock); 1026 LOCK (wrklock);
864 pthread_mutex_lock (&reslock); 1027 LOCK (reqlock);
1028 LOCK (reslock);
865#if !HAVE_PREADWRITE 1029#if !HAVE_PREADWRITE
866 pthread_mutex_lock (&preadwritelock); 1030 LOCK (preadwritelock);
867#endif 1031#endif
868#if !HAVE_READDIR_R 1032#if !HAVE_READDIR_R
869 pthread_mutex_lock (&readdirlock); 1033 LOCK (readdirlock);
870#endif 1034#endif
871} 1035}
872 1036
873static void atfork_parent (void) 1037static void atfork_parent (void)
874{ 1038{
875#if !HAVE_READDIR_R 1039#if !HAVE_READDIR_R
876 pthread_mutex_unlock (&readdirlock); 1040 UNLOCK (readdirlock);
877#endif 1041#endif
878#if !HAVE_PREADWRITE 1042#if !HAVE_PREADWRITE
879 pthread_mutex_unlock (&preadwritelock); 1043 UNLOCK (preadwritelock);
880#endif 1044#endif
881 pthread_mutex_unlock (&reslock); 1045 UNLOCK (reslock);
882 pthread_mutex_unlock (&reqlock); 1046 UNLOCK (reqlock);
1047 UNLOCK (wrklock);
883} 1048}
884 1049
885static void atfork_child (void) 1050static void atfork_child (void)
886{ 1051{
887 aio_req prv; 1052 aio_req prv;
888 1053
1054 while (prv = reqq_shift (&req_queue))
1055 req_free (prv);
1056
1057 while (prv = reqq_shift (&res_queue))
1058 req_free (prv);
1059
1060 while (wrk_first.next != &wrk_first)
1061 {
1062 worker *wrk = wrk_first.next;
1063
1064 if (wrk->req)
1065 req_free (wrk->req);
1066
1067 worker_clear (wrk);
1068 worker_free (wrk);
1069 }
1070
889 started = 0; 1071 started = 0;
890 1072 nreqs = 0;
891 while (reqs)
892 {
893 prv = reqs;
894 reqs = prv->next;
895 req_free (prv);
896 }
897
898 reqs = reqe = 0;
899
900 while (ress)
901 {
902 prv = ress;
903 ress = prv->next;
904 req_free (prv);
905 }
906
907 ress = rese = 0;
908 1073
909 close (respipe [0]); 1074 close (respipe [0]);
910 close (respipe [1]); 1075 close (respipe [1]);
911 create_pipe (); 1076 create_pipe ();
912 1077
913 atfork_parent (); 1078 atfork_parent ();
914} 1079}
915 1080
916#define dREQ \ 1081#define dREQ \
917 aio_req req; \ 1082 aio_req req; \
1083 int req_pri = next_pri; \
1084 next_pri = DEFAULT_PRI + PRI_BIAS; \
918 \ 1085 \
919 if (SvOK (callback) && !SvROK (callback)) \ 1086 if (SvOK (callback) && !SvROK (callback)) \
920 croak ("callback must be undef or of reference type"); \ 1087 croak ("callback must be undef or of reference type"); \
921 \ 1088 \
922 Newz (0, req, 1, aio_cb); \ 1089 Newz (0, req, 1, aio_cb); \
923 if (!req) \ 1090 if (!req) \
924 croak ("out of memory during aio_req allocation"); \ 1091 croak ("out of memory during aio_req allocation"); \
925 \ 1092 \
926 req->callback = newSVsv (callback) 1093 req->callback = newSVsv (callback); \
1094 req->pri = req_pri
927 1095
928#define REQ_SEND \ 1096#define REQ_SEND \
929 req_send (req); \ 1097 req_send (req); \
930 \ 1098 \
931 if (GIMME_V != G_VOID) \ 1099 if (GIMME_V != G_VOID) \
945 create_pipe (); 1113 create_pipe ();
946 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1114 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
947} 1115}
948 1116
949void 1117void
950min_parallel (nthreads) 1118min_parallel (int nthreads)
951 int nthreads
952 PROTOTYPE: $ 1119 PROTOTYPE: $
953 1120
954void 1121void
955max_parallel (nthreads) 1122max_parallel (int nthreads)
956 int nthreads
957 PROTOTYPE: $ 1123 PROTOTYPE: $
958 1124
959int 1125int
960max_outstanding (nreqs) 1126max_outstanding (int maxreqs)
961 int nreqs 1127 PROTOTYPE: $
962 PROTOTYPE: $
963 CODE: 1128 CODE:
964 RETVAL = max_outstanding; 1129 RETVAL = max_outstanding;
965 max_outstanding = nreqs; 1130 max_outstanding = maxreqs;
1131 OUTPUT:
1132 RETVAL
966 1133
967void 1134void
968aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1135aio_open (pathname,flags,mode,callback=&PL_sv_undef)
969 SV * pathname 1136 SV * pathname
970 int flags 1137 int flags
1185 1352
1186 REQ_SEND; 1353 REQ_SEND;
1187} 1354}
1188 1355
1189void 1356void
1190aio_sleep (delay,callback=&PL_sv_undef) 1357aio_busy (delay,callback=&PL_sv_undef)
1191 double delay 1358 double delay
1192 SV * callback 1359 SV * callback
1193 PPCODE: 1360 PPCODE:
1194{ 1361{
1195 dREQ; 1362 dREQ;
1196 1363
1197 req->type = REQ_SLEEP; 1364 req->type = REQ_BUSY;
1198 req->fd = delay < 0. ? 0 : delay; 1365 req->fd = delay < 0. ? 0 : delay;
1199 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1366 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd);
1200 1367
1201 REQ_SEND; 1368 REQ_SEND;
1202} 1369}
1206 SV * callback 1373 SV * callback
1207 PROTOTYPE: ;$ 1374 PROTOTYPE: ;$
1208 PPCODE: 1375 PPCODE:
1209{ 1376{
1210 dREQ; 1377 dREQ;
1378
1211 req->type = REQ_GROUP; 1379 req->type = REQ_GROUP;
1212 req_send (req); 1380 req_send (req);
1381
1213 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1382 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1214} 1383}
1384
1385void
1386aio_nop (callback=&PL_sv_undef)
1387 SV * callback
1388 PPCODE:
1389{
1390 dREQ;
1391
1392 req->type = REQ_NOP;
1393
1394 REQ_SEND;
1395}
1396
1397void
1398aioreq_pri (int pri = DEFAULT_PRI)
1399 CODE:
1400 if (pri < PRI_MIN) pri = PRI_MIN;
1401 if (pri > PRI_MAX) pri = PRI_MAX;
1402 next_pri = pri + PRI_BIAS;
1403
1404void
1405aioreq_nice (int nice = 0)
1406 CODE:
1407 nice = next_pri - nice;
1408 if (nice < PRI_MIN) nice = PRI_MIN;
1409 if (nice > PRI_MAX) nice = PRI_MAX;
1410 next_pri = nice + PRI_BIAS;
1215 1411
1216void 1412void
1217flush () 1413flush ()
1218 PROTOTYPE: 1414 PROTOTYPE:
1219 CODE: 1415 CODE:
1220 while (nreqs) 1416 while (nreqs)
1221 { 1417 {
1222 poll_wait (); 1418 poll_wait ();
1223 poll_cb (); 1419 poll_cb (0);
1224 } 1420 }
1225 1421
1226void 1422void
1227poll() 1423poll()
1228 PROTOTYPE: 1424 PROTOTYPE:
1229 CODE: 1425 CODE:
1230 if (nreqs) 1426 if (nreqs)
1231 { 1427 {
1232 poll_wait (); 1428 poll_wait ();
1233 poll_cb (); 1429 poll_cb (0);
1234 } 1430 }
1235 1431
1236int 1432int
1237poll_fileno() 1433poll_fileno()
1238 PROTOTYPE: 1434 PROTOTYPE:
1243 1439
1244int 1440int
1245poll_cb(...) 1441poll_cb(...)
1246 PROTOTYPE: 1442 PROTOTYPE:
1247 CODE: 1443 CODE:
1248 RETVAL = poll_cb (); 1444 RETVAL = poll_cb (0);
1445 OUTPUT:
1446 RETVAL
1447
1448int
1449poll_some(int max = 0)
1450 PROTOTYPE: $
1451 CODE:
1452 RETVAL = poll_cb (max);
1249 OUTPUT: 1453 OUTPUT:
1250 RETVAL 1454 RETVAL
1251 1455
1252void 1456void
1253poll_wait() 1457poll_wait()
1268 1472
1269MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1473MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1270 1474
1271void 1475void
1272cancel (aio_req_ornot req) 1476cancel (aio_req_ornot req)
1273 PROTOTYPE:
1274 CODE: 1477 CODE:
1275 req_cancel (req); 1478 req_cancel (req);
1479
1480void
1481cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1482 CODE:
1483 SvREFCNT_dec (req->callback);
1484 req->callback = newSVsv (callback);
1276 1485
1277MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1486MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1278 1487
1279void 1488void
1280add (aio_req grp, ...) 1489add (aio_req grp, ...)
1308 } 1517 }
1309 } 1518 }
1310} 1519}
1311 1520
1312void 1521void
1522cancel_subs (aio_req_ornot req)
1523 CODE:
1524 req_cancel_subs (req);
1525
1526void
1313result (aio_req grp, ...) 1527result (aio_req grp, ...)
1314 CODE: 1528 CODE:
1315{ 1529{
1316 int i; 1530 int i;
1317 AV *av = newAV (); 1531 AV *av = newAV ();
1322 SvREFCNT_dec (grp->data); 1536 SvREFCNT_dec (grp->data);
1323 grp->data = (SV *)av; 1537 grp->data = (SV *)av;
1324} 1538}
1325 1539
1326void 1540void
1327lock (aio_req grp)
1328 CODE:
1329 ++grp->length;
1330
1331void
1332unlock (aio_req grp)
1333 CODE:
1334 aio_grp_dec (grp);
1335
1336void
1337feeder_limit (aio_req grp, int limit) 1541limit (aio_req grp, int limit)
1338 CODE: 1542 CODE:
1339 grp->fd2 = limit; 1543 grp->fd2 = limit;
1340 aio_grp_feed (grp); 1544 aio_grp_feed (grp);
1341 1545
1342void 1546void
1343set_feeder (aio_req grp, SV *callback=&PL_sv_undef) 1547feed (aio_req grp, SV *callback=&PL_sv_undef)
1344 CODE: 1548 CODE:
1345{ 1549{
1346 SvREFCNT_dec (grp->fh2); 1550 SvREFCNT_dec (grp->fh2);
1347 grp->fh2 = newSVsv (callback); 1551 grp->fh2 = newSVsv (callback);
1348 1552

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines