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

Diff Legend

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