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.76 by root, Thu Oct 26 12:38:04 2006 UTC vs.
Revision 1.90 by root, Tue Oct 31 00:32:19 2006 UTC

… …
43# else 43# else
44# error sendfile support requested but not available 44# error sendfile support requested but not available
45# endif 45# endif
46#endif 46#endif
47 47
48/* number of seconds after which idle threads exit */
49#define IDLE_TIMEOUT 10
50
48/* used for struct dirent, AIX doesn't provide it */ 51/* used for struct dirent, AIX doesn't provide it */
49#ifndef NAME_MAX 52#ifndef NAME_MAX
50# define NAME_MAX 4096 53# define NAME_MAX 4096
51#endif 54#endif
52 55
… …
61# define STACKSIZE PTHREAD_STACK_MIN 64# define STACKSIZE PTHREAD_STACK_MIN
62#else 65#else
63# define STACKSIZE 16384 66# define STACKSIZE 16384
64#endif 67#endif
65 68
69/* wether word reads are potentially non-atomic.
70 * this is conservatice, likely most arches this runs
71 * on have atomic word read/writes.
72 */
73#ifndef WORDACCESS_UNSAFE
74# if __i386 || __x86_64
75# define WORDACCESS_UNSAFE 0
76# else
77# define WORDACCESS_UNSAFE 1
78# endif
79#endif
80
66/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
67#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
68 83
69#define dBUF \ 84#define dBUF \
70 char *aio_buf; \ 85 char *aio_buf; \
71 LOCK (wrklock); \ 86 LOCK (wrklock); \
72 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
73 UNLOCK (wrklock); \ 88 UNLOCK (wrklock); \
74 if (!aio_buf) \ 89 if (!aio_buf) \
75 return -1; 90 return -1;
91
92typedef SV SV8; /* byte-sv, used for argument-checking */
76 93
77enum { 94enum {
78 REQ_QUIT, 95 REQ_QUIT,
79 REQ_OPEN, REQ_CLOSE, 96 REQ_OPEN, REQ_CLOSE,
80 REQ_READ, REQ_WRITE, REQ_READAHEAD, 97 REQ_READ, REQ_WRITE, REQ_READAHEAD,
81 REQ_SENDFILE, 98 REQ_SENDFILE,
82 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 99 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
83 REQ_FSYNC, REQ_FDATASYNC, 100 REQ_FSYNC, REQ_FDATASYNC,
84 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
85 REQ_READDIR, 102 REQ_MKNOD, REQ_READDIR,
86 REQ_LINK, REQ_SYMLINK, 103 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
87 REQ_GROUP, REQ_NOP, 104 REQ_GROUP, REQ_NOP,
88 REQ_BUSY, 105 REQ_BUSY,
89}; 106};
90 107
91#define AIO_REQ_KLASS "IO::AIO::REQ" 108#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
93 110
94typedef struct aio_cb 111typedef struct aio_cb
95{ 112{
96 struct aio_cb *volatile next; 113 struct aio_cb *volatile next;
97 114
98 SV *data, *callback; 115 SV *callback, *fh;
99 SV *fh, *fh2; 116 SV *sv1, *sv2;
100 void *dataptr, *data2ptr; 117 void *ptr1, *ptr2;
101 Stat_t *statdata;
102 off_t offset; 118 off_t offs;
103 size_t length; 119 size_t size;
104 ssize_t result; 120 ssize_t result;
105 121
106 STRLEN dataoffset; 122 STRLEN stroffset;
107 int type; 123 int type;
108 int fd, fd2; 124 int int1, int2;
109 int errorno; 125 int errorno;
110 mode_t mode; /* open */ 126 mode_t mode; /* open */
111 127
112 unsigned char flags; 128 unsigned char flags;
113 unsigned char pri; 129 unsigned char pri;
… …
115 SV *self; /* the perl counterpart of this request, if any */ 131 SV *self; /* the perl counterpart of this request, if any */
116 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 132 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
117} aio_cb; 133} aio_cb;
118 134
119enum { 135enum {
120 FLAG_CANCELLED = 0x01, 136 FLAG_CANCELLED = 0x01, /* request was cancelled */
137 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
138 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
121}; 139};
122 140
123typedef aio_cb *aio_req; 141typedef aio_cb *aio_req;
124typedef aio_cb *aio_req_ornot; 142typedef aio_cb *aio_req_ornot;
125 143
… …
130 DEFAULT_PRI = 0, 148 DEFAULT_PRI = 0,
131 PRI_BIAS = -PRI_MIN, 149 PRI_BIAS = -PRI_MIN,
132 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 150 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
133}; 151};
134 152
153#define AIO_TICKS ((1000000 + 1023) >> 10)
154
155static unsigned int max_poll_time = 0;
156static unsigned int max_poll_reqs = 0;
157
158/* calculcate time difference in ~1/AIO_TICKS of a second */
159static int tvdiff (struct timeval *tv1, struct timeval *tv2)
160{
161 return (tv2->tv_sec - tv1->tv_sec ) * AIO_TICKS
162 + ((tv2->tv_usec - tv1->tv_usec) >> 10);
163}
164
135static int next_pri = DEFAULT_PRI + PRI_BIAS; 165static int next_pri = DEFAULT_PRI + PRI_BIAS;
136 166
137static int started, wanted; 167static unsigned int started, idle, wanted;
138static volatile int nreqs;
139static int respipe [2];
140 168
141#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 169#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
142# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 170# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
143#else 171#else
144# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 172# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
… …
185 wrk->prev->next = wrk->next; 213 wrk->prev->next = wrk->next;
186 214
187 free (wrk); 215 free (wrk);
188} 216}
189 217
218static volatile unsigned int nreqs, nready, npending;
219static volatile unsigned int max_idle = 4;
220static volatile unsigned int max_outstanding = 0xffffffff;
221static int respipe [2];
222
190static pthread_mutex_t reslock = AIO_MUTEX_INIT; 223static pthread_mutex_t reslock = AIO_MUTEX_INIT;
191static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 224static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
192static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 225static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
226
227#if WORDACCESS_UNSAFE
228
229static unsigned int get_nready ()
230{
231 unsigned int retval;
232
233 LOCK (reqlock);
234 retval = nready;
235 UNLOCK (reqlock);
236
237 return retval;
238}
239
240static unsigned int get_npending ()
241{
242 unsigned int retval;
243
244 LOCK (reslock);
245 retval = npending;
246 UNLOCK (reslock);
247
248 return retval;
249}
250
251static unsigned int get_nthreads ()
252{
253 unsigned int retval;
254
255 LOCK (wrklock);
256 retval = started;
257 UNLOCK (wrklock);
258
259 return retval;
260}
261
262#else
263
264# define get_nready() nready
265# define get_npending() npending
266# define get_nthreads() started
267
268#endif
193 269
194/* 270/*
195 * a somewhat faster data structure might be nice, but 271 * a somewhat faster data structure might be nice, but
196 * with 8 priorities this actually needs <20 insns 272 * with 8 priorities this actually needs <20 insns
197 * per shift, the most expensive operation. 273 * per shift, the most expensive operation.
… …
243 } 319 }
244 320
245 abort (); 321 abort ();
246} 322}
247 323
248static int poll_cb (int max); 324static int poll_cb ();
249static void req_invoke (aio_req req); 325static void req_invoke (aio_req req);
250static void req_free (aio_req req); 326static void req_free (aio_req req);
251static void req_cancel (aio_req req); 327static void req_cancel (aio_req req);
252 328
253/* must be called at most once */ 329/* must be called at most once */
… …
274 return mg ? (aio_req)mg->mg_ptr : 0; 350 return mg ? (aio_req)mg->mg_ptr : 0;
275} 351}
276 352
277static void aio_grp_feed (aio_req grp) 353static void aio_grp_feed (aio_req grp)
278{ 354{
279 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
280 { 356 {
281 int old_len = grp->length; 357 int old_len = grp->size;
282 358
283 if (grp->fh2 && SvOK (grp->fh2)) 359 if (grp->sv2 && SvOK (grp->sv2))
284 { 360 {
285 dSP; 361 dSP;
286 362
287 ENTER; 363 ENTER;
288 SAVETMPS; 364 SAVETMPS;
289 PUSHMARK (SP); 365 PUSHMARK (SP);
290 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 366 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
291 PUTBACK; 367 PUTBACK;
292 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 368 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
293 SPAGAIN; 369 SPAGAIN;
294 FREETMPS; 370 FREETMPS;
295 LEAVE; 371 LEAVE;
296 } 372 }
297 373
298 /* stop if no progress has been made */ 374 /* stop if no progress has been made */
299 if (old_len == grp->length) 375 if (old_len == grp->size)
300 { 376 {
301 SvREFCNT_dec (grp->fh2); 377 SvREFCNT_dec (grp->sv2);
302 grp->fh2 = 0; 378 grp->sv2 = 0;
303 break; 379 break;
304 } 380 }
305 } 381 }
306} 382}
307 383
308static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
309{ 385{
310 --grp->length; 386 --grp->size;
311 387
312 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
313 aio_grp_feed (grp); 389 aio_grp_feed (grp);
314 390
315 /* finish, if done */ 391 /* finish, if done */
316 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
317 { 393 {
318 req_invoke (grp); 394 req_invoke (grp);
319 req_free (grp); 395 req_free (grp);
320 } 396 }
321} 397}
322 398
323static void poll_wait ()
324{
325 fd_set rfd;
326
327 while (nreqs)
328 {
329 int size;
330#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
331 LOCK (reslock);
332#endif
333 size = res_queue.size;
334#if !(__i386 || __x86_64) /* safe without sempahore on these archs */
335 UNLOCK (reslock);
336#endif
337
338 if (size)
339 return;
340
341 FD_ZERO(&rfd);
342 FD_SET(respipe [0], &rfd);
343
344 select (respipe [0] + 1, &rfd, 0, 0, 0);
345 }
346}
347
348static void req_invoke (aio_req req) 399static void req_invoke (aio_req req)
349{ 400{
350 dSP; 401 dSP;
402
403 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1);
351 405
352 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
353 { 407 {
354 errno = req->errorno;
355
356 ENTER; 408 ENTER;
357 SAVETMPS; 409 SAVETMPS;
358 PUSHMARK (SP); 410 PUSHMARK (SP);
359 EXTEND (SP, 1); 411 EXTEND (SP, 1);
360 412
… …
365 SV *rv = &PL_sv_undef; 417 SV *rv = &PL_sv_undef;
366 418
367 if (req->result >= 0) 419 if (req->result >= 0)
368 { 420 {
369 int i; 421 int i;
370 char *buf = req->data2ptr; 422 char *buf = req->ptr2;
371 AV *av = newAV (); 423 AV *av = newAV ();
372 424
373 av_extend (av, req->result - 1); 425 av_extend (av, req->result - 1);
374 426
375 for (i = 0; i < req->result; ++i) 427 for (i = 0; i < req->result; ++i)
… …
403 XPUSHs (sv_2mortal (fh)); 455 XPUSHs (sv_2mortal (fh));
404 } 456 }
405 break; 457 break;
406 458
407 case REQ_GROUP: 459 case REQ_GROUP:
408 req->fd = 2; /* mark group as finished */ 460 req->int1 = 2; /* mark group as finished */
409 461
410 if (req->data) 462 if (req->sv1)
411 { 463 {
412 int i; 464 int i;
413 AV *av = (AV *)req->data; 465 AV *av = (AV *)req->sv1;
414 466
415 EXTEND (SP, AvFILL (av) + 1); 467 EXTEND (SP, AvFILL (av) + 1);
416 for (i = 0; i <= AvFILL (av); ++i) 468 for (i = 0; i <= AvFILL (av); ++i)
417 PUSHs (*av_fetch (av, i, 0)); 469 PUSHs (*av_fetch (av, i, 0));
418 } 470 }
… …
420 472
421 case REQ_NOP: 473 case REQ_NOP:
422 case REQ_BUSY: 474 case REQ_BUSY:
423 break; 475 break;
424 476
477 case REQ_READLINK:
478 if (req->result > 0)
479 {
480 SvCUR_set (req->sv1, req->result);
481 *SvEND (req->sv1) = 0;
482 PUSHs (req->sv1);
483 }
484 break;
485
486 case REQ_STAT:
487 case REQ_LSTAT:
488 case REQ_FSTAT:
489 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
490 PL_laststatval = req->result;
491 PL_statcache = *(Stat_t *)(req->ptr2);
492 PUSHs (sv_2mortal (newSViv (req->result)));
493 break;
494
495 case REQ_READ:
496 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
497 *SvEND (req->sv1) = 0;
498 PUSHs (sv_2mortal (newSViv (req->result)));
499 break;
500
425 default: 501 default:
426 PUSHs (sv_2mortal (newSViv (req->result))); 502 PUSHs (sv_2mortal (newSViv (req->result)));
427 break; 503 break;
428 } 504 }
429 505
506 errno = req->errorno;
430 507
431 PUTBACK; 508 PUTBACK;
432 call_sv (req->callback, G_VOID | G_EVAL); 509 call_sv (req->callback, G_VOID | G_EVAL);
433 SPAGAIN; 510 SPAGAIN;
434 511
… …
463 { 540 {
464 sv_unmagic (req->self, PERL_MAGIC_ext); 541 sv_unmagic (req->self, PERL_MAGIC_ext);
465 SvREFCNT_dec (req->self); 542 SvREFCNT_dec (req->self);
466 } 543 }
467 544
468 SvREFCNT_dec (req->data);
469 SvREFCNT_dec (req->fh); 545 SvREFCNT_dec (req->fh);
546 SvREFCNT_dec (req->sv1);
470 SvREFCNT_dec (req->fh2); 547 SvREFCNT_dec (req->sv2);
471 SvREFCNT_dec (req->callback); 548 SvREFCNT_dec (req->callback);
472 Safefree (req->statdata);
473 549
474 if (req->type == REQ_READDIR) 550 if (req->flags & FLAG_PTR2_FREE)
475 free (req->data2ptr); 551 free (req->ptr2);
476 552
477 Safefree (req); 553 Safefree (req);
478} 554}
479 555
480static void req_cancel_subs (aio_req grp) 556static void req_cancel_subs (aio_req grp)
… …
482 aio_req sub; 558 aio_req sub;
483 559
484 if (grp->type != REQ_GROUP) 560 if (grp->type != REQ_GROUP)
485 return; 561 return;
486 562
487 SvREFCNT_dec (grp->fh2); 563 SvREFCNT_dec (grp->sv2);
488 grp->fh2 = 0; 564 grp->sv2 = 0;
489 565
490 for (sub = grp->grp_first; sub; sub = sub->grp_next) 566 for (sub = grp->grp_first; sub; sub = sub->grp_next)
491 req_cancel (sub); 567 req_cancel (sub);
492} 568}
493 569
494static void req_cancel (aio_req req) 570static void req_cancel (aio_req req)
495{ 571{
496 req->flags |= FLAG_CANCELLED; 572 req->flags |= FLAG_CANCELLED;
497 573
498 req_cancel_subs (req); 574 req_cancel_subs (req);
499}
500
501static int poll_cb (int max)
502{
503 dSP;
504 int count = 0;
505 int do_croak = 0;
506 aio_req req;
507
508 while (max <= 0 || count < max)
509 {
510 LOCK (reslock);
511 req = reqq_shift (&res_queue);
512
513 if (req)
514 {
515 if (!res_queue.size)
516 {
517 /* read any signals sent by the worker threads */
518 char buf [32];
519 while (read (respipe [0], buf, 32) == 32)
520 ;
521 }
522 }
523
524 UNLOCK (reslock);
525
526 if (!req)
527 break;
528
529 --nreqs;
530
531 if (req->type == REQ_QUIT)
532 started--;
533 else if (req->type == REQ_GROUP && req->length)
534 {
535 req->fd = 1; /* mark request as delayed */
536 continue;
537 }
538 else
539 {
540 if (req->type == REQ_READ)
541 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
542
543 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
544 SvREADONLY_off (req->data);
545
546 if (req->statdata)
547 {
548 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
549 PL_laststatval = req->result;
550 PL_statcache = *(req->statdata);
551 }
552
553 req_invoke (req);
554
555 count++;
556 }
557
558 req_free (req);
559 }
560
561 return count;
562} 575}
563 576
564static void *aio_proc(void *arg); 577static void *aio_proc(void *arg);
565 578
566static void start_thread (void) 579static void start_thread (void)
… …
574 croak ("unable to allocate worker thread data"); 587 croak ("unable to allocate worker thread data");
575 588
576 pthread_attr_init (&attr); 589 pthread_attr_init (&attr);
577 pthread_attr_setstacksize (&attr, STACKSIZE); 590 pthread_attr_setstacksize (&attr, STACKSIZE);
578 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 591 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
592#ifdef PTHREAD_SCOPE_PROCESS
593 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
594#endif
579 595
580 sigfillset (&fullsigset); 596 sigfillset (&fullsigset);
581 597
582 LOCK (wrklock); 598 LOCK (wrklock);
583 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset); 599 sigprocmask (SIG_SETMASK, &fullsigset, &oldsigset);
… …
586 { 602 {
587 wrk->prev = &wrk_first; 603 wrk->prev = &wrk_first;
588 wrk->next = wrk_first.next; 604 wrk->next = wrk_first.next;
589 wrk_first.next->prev = wrk; 605 wrk_first.next->prev = wrk;
590 wrk_first.next = wrk; 606 wrk_first.next = wrk;
591 started++; 607 ++started;
592 } 608 }
593 else 609 else
594 free (wrk); 610 free (wrk);
595 611
596 sigprocmask (SIG_SETMASK, &oldsigset, 0); 612 sigprocmask (SIG_SETMASK, &oldsigset, 0);
597 UNLOCK (wrklock); 613 UNLOCK (wrklock);
598} 614}
599 615
616static void maybe_start_thread ()
617{
618 if (get_nthreads () >= wanted)
619 return;
620
621 /* todo: maybe use idle here, but might be less exact */
622 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
623 return;
624
625 start_thread ();
626}
627
600static void req_send (aio_req req) 628static void req_send (aio_req req)
601{ 629{
602 while (started < wanted && nreqs >= started)
603 start_thread ();
604
605 ++nreqs; 630 ++nreqs;
631
632 LOCK (reqlock);
633 ++nready;
634 reqq_push (&req_queue, req);
635 pthread_cond_signal (&reqwait);
636 UNLOCK (reqlock);
637
638 maybe_start_thread ();
639}
640
641static void end_thread (void)
642{
643 aio_req req;
644
645 Newz (0, req, 1, aio_cb);
646
647 req->type = REQ_QUIT;
648 req->pri = PRI_MAX + PRI_BIAS;
606 649
607 LOCK (reqlock); 650 LOCK (reqlock);
608 reqq_push (&req_queue, req); 651 reqq_push (&req_queue, req);
609 pthread_cond_signal (&reqwait); 652 pthread_cond_signal (&reqwait);
610 UNLOCK (reqlock); 653 UNLOCK (reqlock);
611}
612 654
613static void end_thread (void) 655 LOCK (wrklock);
614{ 656 --started;
615 aio_req req; 657 UNLOCK (wrklock);
658}
616 659
617 Newz (0, req, 1, aio_cb); 660static void set_max_idle (int nthreads)
618 661{
619 req->type = REQ_QUIT; 662 if (WORDACCESS_UNSAFE) LOCK (reqlock);
620 req->pri = PRI_MAX + PRI_BIAS; 663 max_idle = nthreads <= 0 ? 1 : nthreads;
621 664 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
622 req_send (req);
623} 665}
624 666
625static void min_parallel (int nthreads) 667static void min_parallel (int nthreads)
626{ 668{
627 if (wanted < nthreads) 669 if (wanted < nthreads)
628 wanted = nthreads; 670 wanted = nthreads;
629} 671}
630 672
631static void max_parallel (int nthreads) 673static void max_parallel (int nthreads)
632{ 674{
633 int cur = started;
634
635 if (wanted > nthreads) 675 if (wanted > nthreads)
636 wanted = nthreads; 676 wanted = nthreads;
637 677
638 while (cur > wanted) 678 while (started > wanted)
679 end_thread ();
680}
681
682static void poll_wait ()
683{
684 fd_set rfd;
685
686 while (nreqs)
639 { 687 {
688 int size;
689 if (WORDACCESS_UNSAFE) LOCK (reslock);
690 size = res_queue.size;
691 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
692
693 if (size)
694 return;
695
640 end_thread (); 696 maybe_start_thread ();
641 cur--; 697
698 FD_ZERO(&rfd);
699 FD_SET(respipe [0], &rfd);
700
701 select (respipe [0] + 1, &rfd, 0, 0, 0);
642 } 702 }
703}
643 704
644 while (started > wanted) 705static int poll_cb ()
706{
707 dSP;
708 int count = 0;
709 int maxreqs = max_poll_reqs;
710 int do_croak = 0;
711 struct timeval tv_start, tv_now;
712 aio_req req;
713
714 if (max_poll_time)
715 gettimeofday (&tv_start, 0);
716
717 for (;;)
645 { 718 {
719 for (;;)
720 {
721 maybe_start_thread ();
722
723 LOCK (reslock);
724 req = reqq_shift (&res_queue);
725
726 if (req)
727 {
728 --npending;
729
730 if (!res_queue.size)
731 {
732 /* read any signals sent by the worker threads */
733 char buf [32];
734 while (read (respipe [0], buf, 32) == 32)
735 ;
736 }
737 }
738
739 UNLOCK (reslock);
740
741 if (!req)
742 break;
743
744 --nreqs;
745
746 if (req->type == REQ_GROUP && req->size)
747 {
748 req->int1 = 1; /* mark request as delayed */
749 continue;
750 }
751 else
752 {
753 req_invoke (req);
754
755 count++;
756 }
757
758 req_free (req);
759
760 if (maxreqs && !--maxreqs)
761 break;
762
763 if (max_poll_time)
764 {
765 gettimeofday (&tv_now, 0);
766
767 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
768 break;
769 }
770 }
771
772 if (nreqs <= max_outstanding)
773 break;
774
646 poll_wait (); 775 poll_wait ();
647 poll_cb (0); 776
777 ++maxreqs;
648 } 778 }
779
780 return count;
649} 781}
650 782
651static void create_pipe () 783static void create_pipe ()
652{ 784{
653 if (pipe (respipe)) 785 if (pipe (respipe))
… …
780 { 912 {
781 off_t sbytes; 913 off_t sbytes;
782 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0); 914 res = sendfile (ifd, ofd, offset, count, 0, &sbytes, 0);
783 915
784 if (res < 0 && sbytes) 916 if (res < 0 && sbytes)
785 /* maybe only on EAGAIN only: as usual, the manpage leaves you guessing */ 917 /* maybe only on EAGAIN: as usual, the manpage leaves you guessing */
786 res = sbytes; 918 res = sbytes;
787 } 919 }
788 920
789# elif __hpux 921# elif __hpux
790 res = sendfile (ofd, ifd, offset, count, 0, 0); 922 res = sendfile (ofd, ifd, offset, count, 0, 0);
… …
868 int memofs = 0; 1000 int memofs = 0;
869 int res = 0; 1001 int res = 0;
870 int errorno; 1002 int errorno;
871 1003
872 LOCK (wrklock); 1004 LOCK (wrklock);
873 self->dirp = dirp = opendir (req->dataptr); 1005 self->dirp = dirp = opendir (req->ptr1);
874 self->dbuf = u = malloc (sizeof (*u)); 1006 self->dbuf = u = malloc (sizeof (*u));
1007 req->flags |= FLAG_PTR2_FREE;
875 req->data2ptr = names = malloc (memlen); 1008 req->ptr2 = names = malloc (memlen);
876 UNLOCK (wrklock); 1009 UNLOCK (wrklock);
877 1010
878 if (dirp && u && names) 1011 if (dirp && u && names)
879 for (;;) 1012 for (;;)
880 { 1013 {
… …
894 1027
895 while (memofs + len > memlen) 1028 while (memofs + len > memlen)
896 { 1029 {
897 memlen *= 2; 1030 memlen *= 2;
898 LOCK (wrklock); 1031 LOCK (wrklock);
899 req->data2ptr = names = realloc (names, memlen); 1032 req->ptr2 = names = realloc (names, memlen);
900 UNLOCK (wrklock); 1033 UNLOCK (wrklock);
901 1034
902 if (!names) 1035 if (!names)
903 break; 1036 break;
904 } 1037 }
… …
917/*****************************************************************************/ 1050/*****************************************************************************/
918 1051
919static void *aio_proc (void *thr_arg) 1052static void *aio_proc (void *thr_arg)
920{ 1053{
921 aio_req req; 1054 aio_req req;
922 int type; 1055 struct timespec ts;
923 worker *self = (worker *)thr_arg; 1056 worker *self = (worker *)thr_arg;
924 1057
925 do 1058 /* try to distribute timeouts somewhat evenly */
1059 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1060 * (1000000000UL / 1024UL);
1061
1062 for (;;)
926 { 1063 {
1064 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1065
927 LOCK (reqlock); 1066 LOCK (reqlock);
928 1067
929 for (;;) 1068 for (;;)
930 { 1069 {
931 self->req = req = reqq_shift (&req_queue); 1070 self->req = req = reqq_shift (&req_queue);
932 1071
933 if (req) 1072 if (req)
934 break; 1073 break;
935 1074
1075 ++idle;
1076
1077 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1078 == ETIMEDOUT)
1079 {
1080 if (idle > max_idle)
1081 {
1082 --idle;
1083 UNLOCK (reqlock);
1084 LOCK (wrklock);
1085 --started;
1086 UNLOCK (wrklock);
1087 goto quit;
1088 }
1089
1090 /* we are allowed to idle, so do so without any timeout */
936 pthread_cond_wait (&reqwait, &reqlock); 1091 pthread_cond_wait (&reqwait, &reqlock);
1092 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1093 }
1094
1095 --idle;
937 } 1096 }
1097
1098 --nready;
938 1099
939 UNLOCK (reqlock); 1100 UNLOCK (reqlock);
940 1101
941 errno = 0; /* strictly unnecessary */ 1102 errno = 0; /* strictly unnecessary */
942 type = req->type; /* remember type for QUIT check */
943 1103
944 if (!(req->flags & FLAG_CANCELLED)) 1104 if (!(req->flags & FLAG_CANCELLED))
945 switch (type) 1105 switch (req->type)
946 { 1106 {
947 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1107 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
948 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1108 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
949 1109
950 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1110 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
951 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1111 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
952 1112
953 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1113 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
954 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1114 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
955 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1115 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
956 1116
957 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1117 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
958 case REQ_CLOSE: req->result = close (req->fd); break; 1118 case REQ_CLOSE: req->result = close (req->int1); break;
959 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1119 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
960 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1120 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
961 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1121 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
962 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1122 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
963 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1123 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1124 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1125 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
964 1126
965 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1127 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
966 case REQ_FSYNC: req->result = fsync (req->fd); break; 1128 case REQ_FSYNC: req->result = fsync (req->int1); break;
967 case REQ_READDIR: scandir_ (req, self); break; 1129 case REQ_READDIR: scandir_ (req, self); break;
968 1130
969 case REQ_BUSY: 1131 case REQ_BUSY:
970 { 1132 {
971 struct timeval tv; 1133 struct timeval tv;
972 1134
973 tv.tv_sec = req->fd; 1135 tv.tv_sec = req->int1;
974 tv.tv_usec = req->fd2; 1136 tv.tv_usec = req->int2;
975 1137
976 req->result = select (0, 0, 0, 0, &tv); 1138 req->result = select (0, 0, 0, 0, &tv);
977 } 1139 }
978 1140
979 case REQ_GROUP: 1141 case REQ_GROUP:
980 case REQ_NOP: 1142 case REQ_NOP:
1143 break;
1144
981 case REQ_QUIT: 1145 case REQ_QUIT:
982 break; 1146 goto quit;
983 1147
984 default: 1148 default:
985 req->result = ENOSYS; 1149 req->result = ENOSYS;
986 break; 1150 break;
987 } 1151 }
988 1152
989 req->errorno = errno; 1153 req->errorno = errno;
990 1154
991 LOCK (reslock); 1155 LOCK (reslock);
992 1156
1157 ++npending;
1158
993 if (!reqq_push (&res_queue, req)) 1159 if (!reqq_push (&res_queue, req))
994 /* write a dummy byte to the pipe so fh becomes ready */ 1160 /* write a dummy byte to the pipe so fh becomes ready */
995 write (respipe [1], &respipe, 1); 1161 write (respipe [1], &respipe, 1);
996 1162
997 self->req = 0; 1163 self->req = 0;
998 worker_clear (self); 1164 worker_clear (self);
999 1165
1000 UNLOCK (reslock); 1166 UNLOCK (reslock);
1001 } 1167 }
1002 while (type != REQ_QUIT);
1003 1168
1169quit:
1004 LOCK (wrklock); 1170 LOCK (wrklock);
1005 worker_free (self); 1171 worker_free (self);
1006 UNLOCK (wrklock); 1172 UNLOCK (wrklock);
1007 1173
1008 return 0; 1174 return 0;
… …
1055 1221
1056 worker_clear (wrk); 1222 worker_clear (wrk);
1057 worker_free (wrk); 1223 worker_free (wrk);
1058 } 1224 }
1059 1225
1060 started = 0; 1226 started = 0;
1227 idle = 0;
1061 nreqs = 0; 1228 nreqs = 0;
1229 nready = 0;
1230 npending = 0;
1062 1231
1063 close (respipe [0]); 1232 close (respipe [0]);
1064 close (respipe [1]); 1233 close (respipe [1]);
1065 create_pipe (); 1234 create_pipe ();
1066 1235
… …
1093PROTOTYPES: ENABLE 1262PROTOTYPES: ENABLE
1094 1263
1095BOOT: 1264BOOT:
1096{ 1265{
1097 HV *stash = gv_stashpv ("IO::AIO", 1); 1266 HV *stash = gv_stashpv ("IO::AIO", 1);
1267
1098 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1268 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1099 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1269 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1100 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1270 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1271 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1272 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1273 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1101 1274
1102 create_pipe (); 1275 create_pipe ();
1103 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1276 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1104} 1277}
1105 1278
1106void 1279void
1107min_parallel (nthreads) 1280max_poll_reqs (int nreqs)
1108 int nthreads
1109 PROTOTYPE: $ 1281 PROTOTYPE: $
1282 CODE:
1283 max_poll_reqs = nreqs;
1110 1284
1111void 1285void
1112max_parallel (nthreads) 1286max_poll_time (double nseconds)
1113 int nthreads
1114 PROTOTYPE: $ 1287 PROTOTYPE: $
1288 CODE:
1289 max_poll_time = nseconds * AIO_TICKS;
1290
1291void
1292min_parallel (int nthreads)
1293 PROTOTYPE: $
1294
1295void
1296max_parallel (int nthreads)
1297 PROTOTYPE: $
1298
1299void
1300max_idle (int nthreads)
1301 PROTOTYPE: $
1302 CODE:
1303 set_max_idle (nthreads);
1304
1305int
1306max_outstanding (int maxreqs)
1307 PROTOTYPE: $
1308 CODE:
1309 RETVAL = max_outstanding;
1310 max_outstanding = maxreqs;
1311 OUTPUT:
1312 RETVAL
1115 1313
1116void 1314void
1117aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1315aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1118 SV * pathname 1316 SV8 * pathname
1119 int flags 1317 int flags
1120 int mode 1318 int mode
1121 SV * callback 1319 SV * callback
1122 PROTOTYPE: $$$;$ 1320 PROTOTYPE: $$$;$
1123 PPCODE: 1321 PPCODE:
1124{ 1322{
1125 dREQ; 1323 dREQ;
1126 1324
1127 req->type = REQ_OPEN; 1325 req->type = REQ_OPEN;
1128 req->data = newSVsv (pathname); 1326 req->sv1 = newSVsv (pathname);
1129 req->dataptr = SvPVbyte_nolen (req->data); 1327 req->ptr1 = SvPVbyte_nolen (req->sv1);
1130 req->fd = flags; 1328 req->int1 = flags;
1131 req->mode = mode; 1329 req->mode = mode;
1132 1330
1133 REQ_SEND; 1331 REQ_SEND;
1134} 1332}
1135 1333
… …
1145 PPCODE: 1343 PPCODE:
1146{ 1344{
1147 dREQ; 1345 dREQ;
1148 1346
1149 req->type = ix; 1347 req->type = ix;
1150 req->fh = newSVsv (fh); 1348 req->fh = newSVsv (fh);
1151 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1349 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1152 1350
1153 REQ_SEND (req); 1351 REQ_SEND (req);
1154} 1352}
1155 1353
1156void 1354void
1157aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1355aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1158 SV * fh 1356 SV * fh
1159 UV offset 1357 UV offset
1160 UV length 1358 UV length
1161 SV * data 1359 SV8 * data
1162 UV dataoffset 1360 UV dataoffset
1163 SV * callback 1361 SV * callback
1164 ALIAS: 1362 ALIAS:
1165 aio_read = REQ_READ 1363 aio_read = REQ_READ
1166 aio_write = REQ_WRITE 1364 aio_write = REQ_WRITE
1167 PROTOTYPE: $$$$$;$ 1365 PROTOTYPE: $$$$$;$
1168 PPCODE: 1366 PPCODE:
1169{ 1367{
1170 aio_req req;
1171 STRLEN svlen; 1368 STRLEN svlen;
1172 char *svptr = SvPVbyte (data, svlen); 1369 char *svptr = SvPVbyte (data, svlen);
1173 1370
1174 SvUPGRADE (data, SVt_PV); 1371 SvUPGRADE (data, SVt_PV);
1175 SvPOK_on (data); 1372 SvPOK_on (data);
… …
1197 1394
1198 { 1395 {
1199 dREQ; 1396 dREQ;
1200 1397
1201 req->type = ix; 1398 req->type = ix;
1202 req->fh = newSVsv (fh); 1399 req->fh = newSVsv (fh);
1203 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1400 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1204 : IoOFP (sv_2io (fh))); 1401 : IoOFP (sv_2io (fh)));
1205 req->offset = offset; 1402 req->offs = offset;
1206 req->length = length; 1403 req->size = length;
1207 req->data = SvREFCNT_inc (data); 1404 req->sv1 = SvREFCNT_inc (data);
1208 req->dataptr = (char *)svptr + dataoffset; 1405 req->ptr1 = (char *)svptr + dataoffset;
1406 req->stroffset = dataoffset;
1209 1407
1210 if (!SvREADONLY (data)) 1408 if (!SvREADONLY (data))
1211 { 1409 {
1212 SvREADONLY_on (data); 1410 SvREADONLY_on (data);
1213 req->data2ptr = (void *)data; 1411 req->flags |= FLAG_SV1_RO_OFF;
1214 } 1412 }
1215 1413
1216 REQ_SEND; 1414 REQ_SEND;
1217 } 1415 }
1416}
1417
1418void
1419aio_readlink (path,callback=&PL_sv_undef)
1420 SV8 * path
1421 SV * callback
1422 PROTOTYPE: $$;$
1423 PPCODE:
1424{
1425 SV *data;
1426 dREQ;
1427
1428 data = newSV (NAME_MAX);
1429 SvPOK_on (data);
1430
1431 req->type = REQ_READLINK;
1432 req->fh = newSVsv (path);
1433 req->ptr2 = SvPVbyte_nolen (req->fh);
1434 req->sv1 = data;
1435 req->ptr1 = SvPVbyte_nolen (data);
1436
1437 REQ_SEND;
1218} 1438}
1219 1439
1220void 1440void
1221aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1441aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1222 SV * out_fh 1442 SV * out_fh
… …
1228 PPCODE: 1448 PPCODE:
1229{ 1449{
1230 dREQ; 1450 dREQ;
1231 1451
1232 req->type = REQ_SENDFILE; 1452 req->type = REQ_SENDFILE;
1233 req->fh = newSVsv (out_fh); 1453 req->fh = newSVsv (out_fh);
1234 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1454 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1235 req->fh2 = newSVsv (in_fh); 1455 req->sv2 = newSVsv (in_fh);
1236 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1456 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1237 req->offset = in_offset; 1457 req->offs = in_offset;
1238 req->length = length; 1458 req->size = length;
1239 1459
1240 REQ_SEND; 1460 REQ_SEND;
1241} 1461}
1242 1462
1243void 1463void
… …
1250 PPCODE: 1470 PPCODE:
1251{ 1471{
1252 dREQ; 1472 dREQ;
1253 1473
1254 req->type = REQ_READAHEAD; 1474 req->type = REQ_READAHEAD;
1255 req->fh = newSVsv (fh); 1475 req->fh = newSVsv (fh);
1256 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1476 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1257 req->offset = offset; 1477 req->offs = offset;
1258 req->length = length; 1478 req->size = length;
1259 1479
1260 REQ_SEND; 1480 REQ_SEND;
1261} 1481}
1262 1482
1263void 1483void
1264aio_stat (fh_or_path,callback=&PL_sv_undef) 1484aio_stat (fh_or_path,callback=&PL_sv_undef)
1265 SV * fh_or_path 1485 SV8 * fh_or_path
1266 SV * callback 1486 SV * callback
1267 ALIAS: 1487 ALIAS:
1268 aio_stat = REQ_STAT 1488 aio_stat = REQ_STAT
1269 aio_lstat = REQ_LSTAT 1489 aio_lstat = REQ_LSTAT
1270 PPCODE: 1490 PPCODE:
1271{ 1491{
1272 dREQ; 1492 dREQ;
1273 1493
1274 New (0, req->statdata, 1, Stat_t); 1494 req->ptr2 = malloc (sizeof (Stat_t));
1275 if (!req->statdata) 1495 if (!req->ptr2)
1276 { 1496 {
1277 req_free (req); 1497 req_free (req);
1278 croak ("out of memory during aio_req->statdata allocation"); 1498 croak ("out of memory during aio_stat statdata allocation");
1279 } 1499 }
1500
1501 req->flags |= FLAG_PTR2_FREE;
1280 1502
1281 if (SvPOK (fh_or_path)) 1503 if (SvPOK (fh_or_path))
1282 { 1504 {
1283 req->type = ix; 1505 req->type = ix;
1284 req->data = newSVsv (fh_or_path); 1506 req->sv1 = newSVsv (fh_or_path);
1285 req->dataptr = SvPVbyte_nolen (req->data); 1507 req->ptr1 = SvPVbyte_nolen (req->sv1);
1286 } 1508 }
1287 else 1509 else
1288 { 1510 {
1289 req->type = REQ_FSTAT; 1511 req->type = REQ_FSTAT;
1290 req->fh = newSVsv (fh_or_path); 1512 req->fh = newSVsv (fh_or_path);
1291 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1513 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1292 } 1514 }
1293 1515
1294 REQ_SEND; 1516 REQ_SEND;
1295} 1517}
1296 1518
1297void 1519void
1298aio_unlink (pathname,callback=&PL_sv_undef) 1520aio_unlink (pathname,callback=&PL_sv_undef)
1299 SV * pathname 1521 SV8 * pathname
1300 SV * callback 1522 SV * callback
1301 ALIAS: 1523 ALIAS:
1302 aio_unlink = REQ_UNLINK 1524 aio_unlink = REQ_UNLINK
1303 aio_rmdir = REQ_RMDIR 1525 aio_rmdir = REQ_RMDIR
1304 aio_readdir = REQ_READDIR 1526 aio_readdir = REQ_READDIR
1305 PPCODE: 1527 PPCODE:
1306{ 1528{
1307 dREQ; 1529 dREQ;
1308 1530
1309 req->type = ix; 1531 req->type = ix;
1310 req->data = newSVsv (pathname); 1532 req->sv1 = newSVsv (pathname);
1311 req->dataptr = SvPVbyte_nolen (req->data); 1533 req->ptr1 = SvPVbyte_nolen (req->sv1);
1312 1534
1313 REQ_SEND; 1535 REQ_SEND;
1314} 1536}
1315 1537
1316void 1538void
1317aio_link (oldpath,newpath,callback=&PL_sv_undef) 1539aio_link (oldpath,newpath,callback=&PL_sv_undef)
1318 SV * oldpath 1540 SV8 * oldpath
1319 SV * newpath 1541 SV8 * newpath
1320 SV * callback 1542 SV * callback
1321 ALIAS: 1543 ALIAS:
1322 aio_link = REQ_LINK 1544 aio_link = REQ_LINK
1323 aio_symlink = REQ_SYMLINK 1545 aio_symlink = REQ_SYMLINK
1324 aio_rename = REQ_RENAME 1546 aio_rename = REQ_RENAME
1325 PPCODE: 1547 PPCODE:
1326{ 1548{
1327 dREQ; 1549 dREQ;
1328 1550
1329 req->type = ix; 1551 req->type = ix;
1330 req->fh = newSVsv (oldpath); 1552 req->fh = newSVsv (oldpath);
1331 req->data2ptr = SvPVbyte_nolen (req->fh); 1553 req->ptr2 = SvPVbyte_nolen (req->fh);
1332 req->data = newSVsv (newpath); 1554 req->sv1 = newSVsv (newpath);
1333 req->dataptr = SvPVbyte_nolen (req->data); 1555 req->ptr1 = SvPVbyte_nolen (req->sv1);
1334 1556
1335 REQ_SEND; 1557 REQ_SEND;
1336} 1558}
1337 1559
1338void 1560void
1561aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1562 SV8 * pathname
1563 SV * callback
1564 UV mode
1565 UV dev
1566 PPCODE:
1567{
1568 dREQ;
1569
1570 req->type = REQ_MKNOD;
1571 req->sv1 = newSVsv (pathname);
1572 req->ptr1 = SvPVbyte_nolen (req->sv1);
1573 req->mode = (mode_t)mode;
1574 req->offs = dev;
1575
1576 REQ_SEND;
1577}
1578
1579void
1339aio_busy (delay,callback=&PL_sv_undef) 1580aio_busy (delay,callback=&PL_sv_undef)
1340 double delay 1581 double delay
1341 SV * callback 1582 SV * callback
1342 PPCODE: 1583 PPCODE:
1343{ 1584{
1344 dREQ; 1585 dREQ;
1345 1586
1346 req->type = REQ_BUSY; 1587 req->type = REQ_BUSY;
1347 req->fd = delay < 0. ? 0 : delay; 1588 req->int1 = delay < 0. ? 0 : delay;
1348 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1589 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1349 1590
1350 REQ_SEND; 1591 REQ_SEND;
1351} 1592}
1352 1593
1353void 1594void
… …
1357 PPCODE: 1598 PPCODE:
1358{ 1599{
1359 dREQ; 1600 dREQ;
1360 1601
1361 req->type = REQ_GROUP; 1602 req->type = REQ_GROUP;
1603
1362 req_send (req); 1604 req_send (req);
1363
1364 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1605 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1365} 1606}
1366 1607
1367void 1608void
1368aio_nop (callback=&PL_sv_undef) 1609aio_nop (callback=&PL_sv_undef)
1369 SV * callback 1610 SV * callback
1370 PPCODE: 1611 PPCODE:
1371{ 1612{
1372 dREQ; 1613 dREQ;
1373 1614
1374 req->type = REQ_NOP; 1615 req->type = REQ_NOP;
1375 1616
1376 REQ_SEND; 1617 REQ_SEND;
1377} 1618}
1378 1619
1379void 1620int
1380aioreq_pri (int pri = DEFAULT_PRI) 1621aioreq_pri (int pri = 0)
1381 CODE: 1622 PROTOTYPE: ;$
1623 CODE:
1624 RETVAL = next_pri - PRI_BIAS;
1625 if (items > 0)
1626 {
1382 if (pri < PRI_MIN) pri = PRI_MIN; 1627 if (pri < PRI_MIN) pri = PRI_MIN;
1383 if (pri > PRI_MAX) pri = PRI_MAX; 1628 if (pri > PRI_MAX) pri = PRI_MAX;
1384 next_pri = pri + PRI_BIAS; 1629 next_pri = pri + PRI_BIAS;
1630 }
1631 OUTPUT:
1632 RETVAL
1385 1633
1386void 1634void
1387aioreq_nice (int nice = 0) 1635aioreq_nice (int nice = 0)
1388 CODE: 1636 CODE:
1389 nice = next_pri - nice; 1637 nice = next_pri - nice;
1390 if (nice < PRI_MIN) nice = PRI_MIN; 1638 if (nice < PRI_MIN) nice = PRI_MIN;
1391 if (nice > PRI_MAX) nice = PRI_MAX; 1639 if (nice > PRI_MAX) nice = PRI_MAX;
1392 next_pri = nice + PRI_BIAS; 1640 next_pri = nice + PRI_BIAS;
1393 1641
1394void 1642void
1395flush () 1643flush ()
1396 PROTOTYPE: 1644 PROTOTYPE:
1397 CODE: 1645 CODE:
… …
1421 1669
1422int 1670int
1423poll_cb(...) 1671poll_cb(...)
1424 PROTOTYPE: 1672 PROTOTYPE:
1425 CODE: 1673 CODE:
1426 RETVAL = poll_cb (0); 1674 RETVAL = poll_cb ();
1427 OUTPUT:
1428 RETVAL
1429
1430int
1431poll_some(int max = 0)
1432 PROTOTYPE: $
1433 CODE:
1434 RETVAL = poll_cb (max);
1435 OUTPUT: 1675 OUTPUT:
1436 RETVAL 1676 RETVAL
1437 1677
1438void 1678void
1439poll_wait() 1679poll_wait()
… …
1448 CODE: 1688 CODE:
1449 RETVAL = nreqs; 1689 RETVAL = nreqs;
1450 OUTPUT: 1690 OUTPUT:
1451 RETVAL 1691 RETVAL
1452 1692
1693int
1694nready()
1695 PROTOTYPE:
1696 CODE:
1697 RETVAL = get_nready ();
1698 OUTPUT:
1699 RETVAL
1700
1701int
1702npending()
1703 PROTOTYPE:
1704 CODE:
1705 RETVAL = get_npending ();
1706 OUTPUT:
1707 RETVAL
1708
1709int
1710nthreads()
1711 PROTOTYPE:
1712 CODE:
1713 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1714 RETVAL = started;
1715 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1716 OUTPUT:
1717 RETVAL
1718
1453PROTOTYPES: DISABLE 1719PROTOTYPES: DISABLE
1454 1720
1455MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1721MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1456 1722
1457void 1723void
… …
1472 PPCODE: 1738 PPCODE:
1473{ 1739{
1474 int i; 1740 int i;
1475 aio_req req; 1741 aio_req req;
1476 1742
1477 if (grp->fd == 2) 1743 if (grp->int1 == 2)
1478 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1744 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1479 1745
1480 for (i = 1; i < items; ++i ) 1746 for (i = 1; i < items; ++i )
1481 { 1747 {
1482 if (GIMME_V != G_VOID) 1748 if (GIMME_V != G_VOID)
… …
1484 1750
1485 req = SvAIO_REQ (ST (i)); 1751 req = SvAIO_REQ (ST (i));
1486 1752
1487 if (req) 1753 if (req)
1488 { 1754 {
1489 ++grp->length; 1755 ++grp->size;
1490 req->grp = grp; 1756 req->grp = grp;
1491 1757
1492 req->grp_prev = 0; 1758 req->grp_prev = 0;
1493 req->grp_next = grp->grp_first; 1759 req->grp_next = grp->grp_first;
1494 1760
… …
1508void 1774void
1509result (aio_req grp, ...) 1775result (aio_req grp, ...)
1510 CODE: 1776 CODE:
1511{ 1777{
1512 int i; 1778 int i;
1779 AV *av;
1780
1781 grp->errorno = errno;
1782
1513 AV *av = newAV (); 1783 av = newAV ();
1514 1784
1515 for (i = 1; i < items; ++i ) 1785 for (i = 1; i < items; ++i )
1516 av_push (av, newSVsv (ST (i))); 1786 av_push (av, newSVsv (ST (i)));
1517 1787
1518 SvREFCNT_dec (grp->data); 1788 SvREFCNT_dec (grp->sv1);
1519 grp->data = (SV *)av; 1789 grp->sv1 = (SV *)av;
1520} 1790}
1791
1792void
1793errno (aio_req grp, int errorno = errno)
1794 CODE:
1795 grp->errorno = errorno;
1521 1796
1522void 1797void
1523limit (aio_req grp, int limit) 1798limit (aio_req grp, int limit)
1524 CODE: 1799 CODE:
1525 grp->fd2 = limit; 1800 grp->int2 = limit;
1526 aio_grp_feed (grp); 1801 aio_grp_feed (grp);
1527 1802
1528void 1803void
1529feed (aio_req grp, SV *callback=&PL_sv_undef) 1804feed (aio_req grp, SV *callback=&PL_sv_undef)
1530 CODE: 1805 CODE:
1531{ 1806{
1532 SvREFCNT_dec (grp->fh2); 1807 SvREFCNT_dec (grp->sv2);
1533 grp->fh2 = newSVsv (callback); 1808 grp->sv2 = newSVsv (callback);
1534 1809
1535 if (grp->fd2 <= 0) 1810 if (grp->int2 <= 0)
1536 grp->fd2 = 2; 1811 grp->int2 = 2;
1537 1812
1538 aio_grp_feed (grp); 1813 aio_grp_feed (grp);
1539} 1814}
1540 1815

Diff Legend

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