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.81 by root, Fri Oct 27 20:10:06 2006 UTC vs.
Revision 1.88 by root, Mon Oct 30 23:43:17 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
… …
65 68
66/* wether word reads are potentially non-atomic. 69/* wether word reads are potentially non-atomic.
67 * this is conservatice, likely most arches this runs 70 * this is conservatice, likely most arches this runs
68 * on have atomic word read/writes. 71 * on have atomic word read/writes.
69 */ 72 */
70#ifndef WORDREAD_UNSAFE 73#ifndef WORDACCESS_UNSAFE
71# if __i386 || __x86_64 74# if __i386 || __x86_64
72# define WORDREAD_UNSAFE 0 75# define WORDACCESS_UNSAFE 0
73# else 76# else
74# define WORDREAD_UNSAFE 1 77# define WORDACCESS_UNSAFE 1
75# endif 78# endif
76#endif 79#endif
77 80
78/* buffer size for various temporary buffers */ 81/* buffer size for various temporary buffers */
79#define AIO_BUFSIZE 65536 82#define AIO_BUFSIZE 65536
… …
93 REQ_SENDFILE, 96 REQ_SENDFILE,
94 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 97 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
95 REQ_FSYNC, REQ_FDATASYNC, 98 REQ_FSYNC, REQ_FDATASYNC,
96 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
97 REQ_MKNOD, REQ_READDIR, 100 REQ_MKNOD, REQ_READDIR,
98 REQ_LINK, REQ_SYMLINK, 101 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
99 REQ_GROUP, REQ_NOP, 102 REQ_GROUP, REQ_NOP,
100 REQ_BUSY, 103 REQ_BUSY,
101}; 104};
102 105
103#define AIO_REQ_KLASS "IO::AIO::REQ" 106#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
105 108
106typedef struct aio_cb 109typedef struct aio_cb
107{ 110{
108 struct aio_cb *volatile next; 111 struct aio_cb *volatile next;
109 112
110 SV *data, *callback; 113 SV *callback, *fh;
111 SV *fh, *fh2; 114 SV *sv1, *sv2;
112 void *dataptr, *data2ptr; 115 void *ptr1, *ptr2;
113 Stat_t *statdata;
114 off_t offset; 116 off_t offs;
115 size_t length; 117 size_t size;
116 ssize_t result; 118 ssize_t result;
117 119
118 STRLEN dataoffset; 120 STRLEN stroffset;
119 int type; 121 int type;
120 int fd, fd2; 122 int int1, int2;
121 int errorno; 123 int errorno;
122 mode_t mode; /* open */ 124 mode_t mode; /* open */
123 125
124 unsigned char flags; 126 unsigned char flags;
125 unsigned char pri; 127 unsigned char pri;
… …
127 SV *self; /* the perl counterpart of this request, if any */ 129 SV *self; /* the perl counterpart of this request, if any */
128 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 130 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
129} aio_cb; 131} aio_cb;
130 132
131enum { 133enum {
132 FLAG_CANCELLED = 0x01, 134 FLAG_CANCELLED = 0x01,
135 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
136 FLAG_PTR2_FREE = 0x80, /* need free(ptr2) */
133}; 137};
134 138
135typedef aio_cb *aio_req; 139typedef aio_cb *aio_req;
136typedef aio_cb *aio_req_ornot; 140typedef aio_cb *aio_req_ornot;
137 141
… …
142 DEFAULT_PRI = 0, 146 DEFAULT_PRI = 0,
143 PRI_BIAS = -PRI_MIN, 147 PRI_BIAS = -PRI_MIN,
144 NUM_PRI = PRI_MAX + PRI_BIAS + 1, 148 NUM_PRI = PRI_MAX + PRI_BIAS + 1,
145}; 149};
146 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
147static int next_pri = DEFAULT_PRI + PRI_BIAS; 163static int next_pri = DEFAULT_PRI + PRI_BIAS;
148 164
149static unsigned int started, wanted; 165static unsigned int started, idle, wanted;
150 166
151#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 167#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
152# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 168# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
153#else 169#else
154# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 170# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
… …
196 212
197 free (wrk); 213 free (wrk);
198} 214}
199 215
200static volatile unsigned int nreqs, nready, npending; 216static volatile unsigned int nreqs, nready, npending;
217static volatile unsigned int max_idle = 4;
201static volatile unsigned int max_outstanding = 0xffffffff; 218static volatile unsigned int max_outstanding = 0xffffffff;
202static int respipe [2]; 219static int respipe [2];
203 220
204static pthread_mutex_t reslock = AIO_MUTEX_INIT; 221static pthread_mutex_t reslock = AIO_MUTEX_INIT;
205static pthread_mutex_t reqlock = AIO_MUTEX_INIT; 222static pthread_mutex_t reqlock = AIO_MUTEX_INIT;
206static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 223static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
207 224
208#if WORDREAD_UNSAFE 225#if WORDACCESS_UNSAFE
209 226
210static unsigned int get_nready () 227static unsigned int get_nready ()
211{ 228{
212 unsigned int retval; 229 unsigned int retval;
213 230
… …
227 UNLOCK (reslock); 244 UNLOCK (reslock);
228 245
229 return retval; 246 return retval;
230} 247}
231 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
232#else 260#else
233 261
234# define get_nready() nready 262# define get_nready() nready
235# define get_npending() npending 263# define get_npending() npending
264# define get_nthreads() started
236 265
237#endif 266#endif
238 267
239/* 268/*
240 * a somewhat faster data structure might be nice, but 269 * a somewhat faster data structure might be nice, but
… …
288 } 317 }
289 318
290 abort (); 319 abort ();
291} 320}
292 321
293static int poll_cb (int max); 322static int poll_cb ();
294static void req_invoke (aio_req req); 323static void req_invoke (aio_req req);
295static void req_free (aio_req req); 324static void req_free (aio_req req);
296static void req_cancel (aio_req req); 325static void req_cancel (aio_req req);
297 326
298/* must be called at most once */ 327/* must be called at most once */
… …
319 return mg ? (aio_req)mg->mg_ptr : 0; 348 return mg ? (aio_req)mg->mg_ptr : 0;
320} 349}
321 350
322static void aio_grp_feed (aio_req grp) 351static void aio_grp_feed (aio_req grp)
323{ 352{
324 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 353 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
325 { 354 {
326 int old_len = grp->length; 355 int old_len = grp->size;
327 356
328 if (grp->fh2 && SvOK (grp->fh2)) 357 if (grp->sv2 && SvOK (grp->sv2))
329 { 358 {
330 dSP; 359 dSP;
331 360
332 ENTER; 361 ENTER;
333 SAVETMPS; 362 SAVETMPS;
334 PUSHMARK (SP); 363 PUSHMARK (SP);
335 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 364 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
336 PUTBACK; 365 PUTBACK;
337 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 366 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
338 SPAGAIN; 367 SPAGAIN;
339 FREETMPS; 368 FREETMPS;
340 LEAVE; 369 LEAVE;
341 } 370 }
342 371
343 /* stop if no progress has been made */ 372 /* stop if no progress has been made */
344 if (old_len == grp->length) 373 if (old_len == grp->size)
345 { 374 {
346 SvREFCNT_dec (grp->fh2); 375 SvREFCNT_dec (grp->sv2);
347 grp->fh2 = 0; 376 grp->sv2 = 0;
348 break; 377 break;
349 } 378 }
350 } 379 }
351} 380}
352 381
353static void aio_grp_dec (aio_req grp) 382static void aio_grp_dec (aio_req grp)
354{ 383{
355 --grp->length; 384 --grp->size;
356 385
357 /* call feeder, if applicable */ 386 /* call feeder, if applicable */
358 aio_grp_feed (grp); 387 aio_grp_feed (grp);
359 388
360 /* finish, if done */ 389 /* finish, if done */
361 if (!grp->length && grp->fd) 390 if (!grp->size && grp->int1)
362 { 391 {
363 req_invoke (grp); 392 req_invoke (grp);
364 req_free (grp); 393 req_free (grp);
365 } 394 }
366} 395}
367 396
368static void req_invoke (aio_req req) 397static void req_invoke (aio_req req)
369{ 398{
370 dSP; 399 dSP;
400
401 if (req->flags & FLAG_SV1_RO_OFF)
402 SvREADONLY_off (req->sv1);
371 403
372 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 404 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
373 { 405 {
374 ENTER; 406 ENTER;
375 SAVETMPS; 407 SAVETMPS;
… …
383 SV *rv = &PL_sv_undef; 415 SV *rv = &PL_sv_undef;
384 416
385 if (req->result >= 0) 417 if (req->result >= 0)
386 { 418 {
387 int i; 419 int i;
388 char *buf = req->data2ptr; 420 char *buf = req->ptr2;
389 AV *av = newAV (); 421 AV *av = newAV ();
390 422
391 av_extend (av, req->result - 1); 423 av_extend (av, req->result - 1);
392 424
393 for (i = 0; i < req->result; ++i) 425 for (i = 0; i < req->result; ++i)
… …
421 XPUSHs (sv_2mortal (fh)); 453 XPUSHs (sv_2mortal (fh));
422 } 454 }
423 break; 455 break;
424 456
425 case REQ_GROUP: 457 case REQ_GROUP:
426 req->fd = 2; /* mark group as finished */ 458 req->int1 = 2; /* mark group as finished */
427 459
428 if (req->data) 460 if (req->sv1)
429 { 461 {
430 int i; 462 int i;
431 AV *av = (AV *)req->data; 463 AV *av = (AV *)req->sv1;
432 464
433 EXTEND (SP, AvFILL (av) + 1); 465 EXTEND (SP, AvFILL (av) + 1);
434 for (i = 0; i <= AvFILL (av); ++i) 466 for (i = 0; i <= AvFILL (av); ++i)
435 PUSHs (*av_fetch (av, i, 0)); 467 PUSHs (*av_fetch (av, i, 0));
436 } 468 }
… …
438 470
439 case REQ_NOP: 471 case REQ_NOP:
440 case REQ_BUSY: 472 case REQ_BUSY:
441 break; 473 break;
442 474
475 case REQ_READLINK:
476 if (req->result > 0)
477 {
478 SvCUR_set (req->sv1, req->result);
479 *SvEND (req->sv1) = 0;
480 PUSHs (req->sv1);
481 }
482 break;
483
484 case REQ_STAT:
485 case REQ_LSTAT:
486 case REQ_FSTAT:
487 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
488 PL_laststatval = req->result;
489 PL_statcache = *(Stat_t *)(req->ptr2);
490 PUSHs (sv_2mortal (newSViv (req->result)));
491 break;
492
493 case REQ_READ:
494 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
495 *SvEND (req->sv1) = 0;
496 PUSHs (sv_2mortal (newSViv (req->result)));
497 break;
498
443 default: 499 default:
444 PUSHs (sv_2mortal (newSViv (req->result))); 500 PUSHs (sv_2mortal (newSViv (req->result)));
445 break; 501 break;
446 } 502 }
447 503
… …
482 { 538 {
483 sv_unmagic (req->self, PERL_MAGIC_ext); 539 sv_unmagic (req->self, PERL_MAGIC_ext);
484 SvREFCNT_dec (req->self); 540 SvREFCNT_dec (req->self);
485 } 541 }
486 542
487 SvREFCNT_dec (req->data);
488 SvREFCNT_dec (req->fh); 543 SvREFCNT_dec (req->fh);
544 SvREFCNT_dec (req->sv1);
489 SvREFCNT_dec (req->fh2); 545 SvREFCNT_dec (req->sv2);
490 SvREFCNT_dec (req->callback); 546 SvREFCNT_dec (req->callback);
491 Safefree (req->statdata);
492 547
493 if (req->type == REQ_READDIR) 548 if (req->flags & FLAG_PTR2_FREE)
494 free (req->data2ptr); 549 free (req->ptr2);
495 550
496 Safefree (req); 551 Safefree (req);
497} 552}
498 553
499static void req_cancel_subs (aio_req grp) 554static void req_cancel_subs (aio_req grp)
… …
501 aio_req sub; 556 aio_req sub;
502 557
503 if (grp->type != REQ_GROUP) 558 if (grp->type != REQ_GROUP)
504 return; 559 return;
505 560
506 SvREFCNT_dec (grp->fh2); 561 SvREFCNT_dec (grp->sv2);
507 grp->fh2 = 0; 562 grp->sv2 = 0;
508 563
509 for (sub = grp->grp_first; sub; sub = sub->grp_next) 564 for (sub = grp->grp_first; sub; sub = sub->grp_next)
510 req_cancel (sub); 565 req_cancel (sub);
511} 566}
512 567
… …
556 UNLOCK (wrklock); 611 UNLOCK (wrklock);
557} 612}
558 613
559static void maybe_start_thread () 614static void maybe_start_thread ()
560{ 615{
561#if 0 616 if (get_nthreads () >= wanted)
562 static struct timeval last;
563 struct timeval diff, now;
564#endif
565
566 if (started >= wanted)
567 return; 617 return;
568 618
569 if (nready <= nreqs - get_nready () - get_npending ()) 619 /* todo: maybe use idle here, but might be less exact */
620 if (0 <= (int)get_nthreads () + (int)get_npending () - (int)nreqs)
570 return; 621 return;
571
572#if 0
573 gettimeofday (&now, 0);
574
575 diff.tv_sec = now.tv_sec - last.tv_sec;
576 diff.tv_usec = now.tv_usec - last.tv_usec;
577
578 if (diff.tv_usec < 0)
579 {
580 --diff.tv_sec;
581 diff.tv_usec += 1000000;
582 }
583
584 if (!diff.tv_sec && diff.tv_usec < 10000)
585 return;
586
587 last = now;
588#endif
589 622
590 start_thread (); 623 start_thread ();
591} 624}
592 625
593static void req_send (aio_req req) 626static void req_send (aio_req req)
… …
610 Newz (0, req, 1, aio_cb); 643 Newz (0, req, 1, aio_cb);
611 644
612 req->type = REQ_QUIT; 645 req->type = REQ_QUIT;
613 req->pri = PRI_MAX + PRI_BIAS; 646 req->pri = PRI_MAX + PRI_BIAS;
614 647
615 req_send (req); 648 LOCK (reqlock);
649 reqq_push (&req_queue, req);
650 pthread_cond_signal (&reqwait);
651 UNLOCK (reqlock);
616 652
617 LOCK (wrklock); 653 LOCK (wrklock);
618 --started; 654 --started;
619 UNLOCK (wrklock); 655 UNLOCK (wrklock);
620} 656}
621 657
658static void set_max_idle (int nthreads)
659{
660 if (WORDACCESS_UNSAFE) LOCK (reqlock);
661 max_idle = nthreads <= 0 ? 1 : nthreads;
662 if (WORDACCESS_UNSAFE) UNLOCK (reqlock);
663}
664
622static void min_parallel (int nthreads) 665static void min_parallel (int nthreads)
623{ 666{
624 if (wanted < nthreads) 667 if (wanted < nthreads)
625 wanted = nthreads; 668 wanted = nthreads;
626} 669}
… …
639 fd_set rfd; 682 fd_set rfd;
640 683
641 while (nreqs) 684 while (nreqs)
642 { 685 {
643 int size; 686 int size;
644 if (WORDREAD_UNSAFE) LOCK (reslock); 687 if (WORDACCESS_UNSAFE) LOCK (reslock);
645 size = res_queue.size; 688 size = res_queue.size;
646 if (WORDREAD_UNSAFE) UNLOCK (reslock); 689 if (WORDACCESS_UNSAFE) UNLOCK (reslock);
647 690
648 if (size) 691 if (size)
649 return; 692 return;
650 693
651 maybe_start_thread (); 694 maybe_start_thread ();
… …
655 698
656 select (respipe [0] + 1, &rfd, 0, 0, 0); 699 select (respipe [0] + 1, &rfd, 0, 0, 0);
657 } 700 }
658} 701}
659 702
660static int poll_cb (int max) 703static int poll_cb ()
661{ 704{
662 dSP; 705 dSP;
663 int count = 0; 706 int count = 0;
707 int maxreqs = max_poll_reqs;
664 int do_croak = 0; 708 int do_croak = 0;
709 struct timeval tv_start, tv_now;
665 aio_req req; 710 aio_req req;
711
712 if (max_poll_time)
713 gettimeofday (&tv_start, 0);
666 714
667 for (;;) 715 for (;;)
668 { 716 {
669 while (max <= 0 || count < max) 717 for (;;)
670 { 718 {
671 maybe_start_thread (); 719 maybe_start_thread ();
672 720
673 LOCK (reslock); 721 LOCK (reslock);
674 req = reqq_shift (&res_queue); 722 req = reqq_shift (&res_queue);
… …
691 if (!req) 739 if (!req)
692 break; 740 break;
693 741
694 --nreqs; 742 --nreqs;
695 743
696 if (req->type == REQ_GROUP && req->length) 744 if (req->type == REQ_GROUP && req->size)
697 { 745 {
698 req->fd = 1; /* mark request as delayed */ 746 req->int1 = 1; /* mark request as delayed */
699 continue; 747 continue;
700 } 748 }
701 else 749 else
702 { 750 {
703 if (req->type == REQ_READ)
704 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
705
706 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
707 SvREADONLY_off (req->data);
708
709 if (req->statdata)
710 {
711 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
712 PL_laststatval = req->result;
713 PL_statcache = *(req->statdata);
714 }
715
716 req_invoke (req); 751 req_invoke (req);
717 752
718 count++; 753 count++;
719 } 754 }
720 755
721 req_free (req); 756 req_free (req);
757
758 if (maxreqs && !--maxreqs)
759 break;
760
761 if (max_poll_time)
762 {
763 gettimeofday (&tv_now, 0);
764
765 if (tvdiff (&tv_start, &tv_now) >= max_poll_time)
766 break;
767 }
722 } 768 }
723 769
724 if (nreqs <= max_outstanding) 770 if (nreqs <= max_outstanding)
725 break; 771 break;
726 772
727 poll_wait (); 773 poll_wait ();
728 774
729 max = 0; 775 ++maxreqs;
730 } 776 }
731 777
732 return count; 778 return count;
733} 779}
734 780
… …
952 int memofs = 0; 998 int memofs = 0;
953 int res = 0; 999 int res = 0;
954 int errorno; 1000 int errorno;
955 1001
956 LOCK (wrklock); 1002 LOCK (wrklock);
957 self->dirp = dirp = opendir (req->dataptr); 1003 self->dirp = dirp = opendir (req->ptr1);
958 self->dbuf = u = malloc (sizeof (*u)); 1004 self->dbuf = u = malloc (sizeof (*u));
1005 req->flags |= FLAG_PTR2_FREE;
959 req->data2ptr = names = malloc (memlen); 1006 req->ptr2 = names = malloc (memlen);
960 UNLOCK (wrklock); 1007 UNLOCK (wrklock);
961 1008
962 if (dirp && u && names) 1009 if (dirp && u && names)
963 for (;;) 1010 for (;;)
964 { 1011 {
… …
978 1025
979 while (memofs + len > memlen) 1026 while (memofs + len > memlen)
980 { 1027 {
981 memlen *= 2; 1028 memlen *= 2;
982 LOCK (wrklock); 1029 LOCK (wrklock);
983 req->data2ptr = names = realloc (names, memlen); 1030 req->ptr2 = names = realloc (names, memlen);
984 UNLOCK (wrklock); 1031 UNLOCK (wrklock);
985 1032
986 if (!names) 1033 if (!names)
987 break; 1034 break;
988 } 1035 }
… …
1001/*****************************************************************************/ 1048/*****************************************************************************/
1002 1049
1003static void *aio_proc (void *thr_arg) 1050static void *aio_proc (void *thr_arg)
1004{ 1051{
1005 aio_req req; 1052 aio_req req;
1053 struct timespec ts;
1006 worker *self = (worker *)thr_arg; 1054 worker *self = (worker *)thr_arg;
1055
1056 /* try to distribute timeouts somewhat evenly */
1057 ts.tv_nsec = (((unsigned long)self + (unsigned long)ts.tv_sec) & 1023UL)
1058 * (1000000000UL / 1024UL);
1007 1059
1008 for (;;) 1060 for (;;)
1009 { 1061 {
1062 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1063
1010 LOCK (reqlock); 1064 LOCK (reqlock);
1011 1065
1012 for (;;) 1066 for (;;)
1013 { 1067 {
1014 self->req = req = reqq_shift (&req_queue); 1068 self->req = req = reqq_shift (&req_queue);
1015 1069
1016 if (req) 1070 if (req)
1017 break; 1071 break;
1018 1072
1073 ++idle;
1074
1075 if (pthread_cond_timedwait (&reqwait, &reqlock, &ts)
1076 == ETIMEDOUT)
1077 {
1078 if (idle > max_idle)
1079 {
1080 --idle;
1081 UNLOCK (reqlock);
1082 LOCK (wrklock);
1083 --started;
1084 UNLOCK (wrklock);
1085 goto quit;
1086 }
1087
1088 /* we are allowed to idle, so do so without any timeout */
1019 pthread_cond_wait (&reqwait, &reqlock); 1089 pthread_cond_wait (&reqwait, &reqlock);
1090 ts.tv_sec = time (0) + IDLE_TIMEOUT;
1091 }
1092
1093 --idle;
1020 } 1094 }
1021 1095
1022 --nready; 1096 --nready;
1023 1097
1024 UNLOCK (reqlock); 1098 UNLOCK (reqlock);
… …
1026 errno = 0; /* strictly unnecessary */ 1100 errno = 0; /* strictly unnecessary */
1027 1101
1028 if (!(req->flags & FLAG_CANCELLED)) 1102 if (!(req->flags & FLAG_CANCELLED))
1029 switch (req->type) 1103 switch (req->type)
1030 { 1104 {
1031 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1105 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1032 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1106 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1033 1107
1034 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1108 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1035 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1109 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1036 1110
1037 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1111 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1038 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1112 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1039 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1113 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1040 1114
1041 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1115 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1042 case REQ_CLOSE: req->result = close (req->fd); break; 1116 case REQ_CLOSE: req->result = close (req->int1); break;
1043 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1117 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1044 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1118 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1045 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1119 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1046 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1120 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1047 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1121 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1048 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1122 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1123 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1049 1124
1050 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1125 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1051 case REQ_FSYNC: req->result = fsync (req->fd); break; 1126 case REQ_FSYNC: req->result = fsync (req->int1); break;
1052 case REQ_READDIR: scandir_ (req, self); break; 1127 case REQ_READDIR: scandir_ (req, self); break;
1053 1128
1054 case REQ_BUSY: 1129 case REQ_BUSY:
1055 { 1130 {
1056 struct timeval tv; 1131 struct timeval tv;
1057 1132
1058 tv.tv_sec = req->fd; 1133 tv.tv_sec = req->int1;
1059 tv.tv_usec = req->fd2; 1134 tv.tv_usec = req->int2;
1060 1135
1061 req->result = select (0, 0, 0, 0, &tv); 1136 req->result = select (0, 0, 0, 0, &tv);
1062 } 1137 }
1063 1138
1064 case REQ_GROUP: 1139 case REQ_GROUP:
1065 case REQ_NOP: 1140 case REQ_NOP:
1066 break; 1141 break;
1067 1142
1068 case REQ_QUIT: 1143 case REQ_QUIT:
1069 LOCK (wrklock); 1144 goto quit;
1070 worker_free (self);
1071 --started;
1072 UNLOCK (wrklock);
1073 return 0;
1074 1145
1075 default: 1146 default:
1076 req->result = ENOSYS; 1147 req->result = ENOSYS;
1077 break; 1148 break;
1078 } 1149 }
… …
1090 self->req = 0; 1161 self->req = 0;
1091 worker_clear (self); 1162 worker_clear (self);
1092 1163
1093 UNLOCK (reslock); 1164 UNLOCK (reslock);
1094 } 1165 }
1166
1167quit:
1168 LOCK (wrklock);
1169 worker_free (self);
1170 UNLOCK (wrklock);
1171
1172 return 0;
1095} 1173}
1096 1174
1097/*****************************************************************************/ 1175/*****************************************************************************/
1098 1176
1099static void atfork_prepare (void) 1177static void atfork_prepare (void)
… …
1141 1219
1142 worker_clear (wrk); 1220 worker_clear (wrk);
1143 worker_free (wrk); 1221 worker_free (wrk);
1144 } 1222 }
1145 1223
1146 started = 0; 1224 started = 0;
1225 idle = 0;
1147 nreqs = 0; 1226 nreqs = 0;
1227 nready = 0;
1228 npending = 0;
1148 1229
1149 close (respipe [0]); 1230 close (respipe [0]);
1150 close (respipe [1]); 1231 close (respipe [1]);
1151 create_pipe (); 1232 create_pipe ();
1152 1233
… …
1179PROTOTYPES: ENABLE 1260PROTOTYPES: ENABLE
1180 1261
1181BOOT: 1262BOOT:
1182{ 1263{
1183 HV *stash = gv_stashpv ("IO::AIO", 1); 1264 HV *stash = gv_stashpv ("IO::AIO", 1);
1265
1184 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 1266 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
1185 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 1267 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
1186 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 1268 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
1187 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 1269 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
1188 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 1270 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
1271 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
1189 1272
1190 create_pipe (); 1273 create_pipe ();
1191 pthread_atfork (atfork_prepare, atfork_parent, atfork_child); 1274 pthread_atfork (atfork_prepare, atfork_parent, atfork_child);
1192
1193 start_thread ();
1194} 1275}
1276
1277void
1278max_poll_reqs (int nreqs)
1279 PROTOTYPE: $
1280 CODE:
1281 max_poll_reqs = nreqs;
1282
1283void
1284max_poll_time (double nseconds)
1285 PROTOTYPE: $
1286 CODE:
1287 max_poll_time = nseconds * AIO_TICKS;
1195 1288
1196void 1289void
1197min_parallel (int nthreads) 1290min_parallel (int nthreads)
1198 PROTOTYPE: $ 1291 PROTOTYPE: $
1199 1292
1200void 1293void
1201max_parallel (int nthreads) 1294max_parallel (int nthreads)
1202 PROTOTYPE: $ 1295 PROTOTYPE: $
1296
1297void
1298max_idle (int nthreads)
1299 PROTOTYPE: $
1300 CODE:
1301 set_max_idle (nthreads);
1203 1302
1204int 1303int
1205max_outstanding (int maxreqs) 1304max_outstanding (int maxreqs)
1206 PROTOTYPE: $ 1305 PROTOTYPE: $
1207 CODE: 1306 CODE:
… …
1220 PPCODE: 1319 PPCODE:
1221{ 1320{
1222 dREQ; 1321 dREQ;
1223 1322
1224 req->type = REQ_OPEN; 1323 req->type = REQ_OPEN;
1225 req->data = newSVsv (pathname); 1324 req->sv1 = newSVsv (pathname);
1226 req->dataptr = SvPVbyte_nolen (req->data); 1325 req->ptr1 = SvPVbyte_nolen (pathname);
1227 req->fd = flags; 1326 req->int1 = flags;
1228 req->mode = mode; 1327 req->mode = mode;
1229 1328
1230 REQ_SEND; 1329 REQ_SEND;
1231} 1330}
1232 1331
… …
1242 PPCODE: 1341 PPCODE:
1243{ 1342{
1244 dREQ; 1343 dREQ;
1245 1344
1246 req->type = ix; 1345 req->type = ix;
1247 req->fh = newSVsv (fh); 1346 req->fh = newSVsv (fh);
1248 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1347 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1249 1348
1250 REQ_SEND (req); 1349 REQ_SEND (req);
1251} 1350}
1252 1351
1253void 1352void
… …
1262 aio_read = REQ_READ 1361 aio_read = REQ_READ
1263 aio_write = REQ_WRITE 1362 aio_write = REQ_WRITE
1264 PROTOTYPE: $$$$$;$ 1363 PROTOTYPE: $$$$$;$
1265 PPCODE: 1364 PPCODE:
1266{ 1365{
1267 aio_req req;
1268 STRLEN svlen; 1366 STRLEN svlen;
1269 char *svptr = SvPVbyte (data, svlen); 1367 char *svptr = SvPVbyte (data, svlen);
1270 1368
1271 SvUPGRADE (data, SVt_PV); 1369 SvUPGRADE (data, SVt_PV);
1272 SvPOK_on (data); 1370 SvPOK_on (data);
… …
1294 1392
1295 { 1393 {
1296 dREQ; 1394 dREQ;
1297 1395
1298 req->type = ix; 1396 req->type = ix;
1299 req->fh = newSVsv (fh); 1397 req->fh = newSVsv (fh);
1300 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1398 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1301 : IoOFP (sv_2io (fh))); 1399 : IoOFP (sv_2io (fh)));
1302 req->offset = offset; 1400 req->offs = offset;
1303 req->length = length; 1401 req->size = length;
1304 req->data = SvREFCNT_inc (data); 1402 req->sv1 = SvREFCNT_inc (data);
1305 req->dataptr = (char *)svptr + dataoffset; 1403 req->ptr1 = (char *)svptr + dataoffset;
1404 req->stroffset = dataoffset;
1306 1405
1307 if (!SvREADONLY (data)) 1406 if (!SvREADONLY (data))
1308 { 1407 {
1309 SvREADONLY_on (data); 1408 SvREADONLY_on (data);
1310 req->data2ptr = (void *)data; 1409 req->flags |= FLAG_SV1_RO_OFF;
1311 } 1410 }
1312 1411
1313 REQ_SEND; 1412 REQ_SEND;
1314 } 1413 }
1414}
1415
1416void
1417aio_readlink (path,callback=&PL_sv_undef)
1418 SV * path
1419 SV * callback
1420 PROTOTYPE: $$;$
1421 PPCODE:
1422{
1423 SV *data;
1424 dREQ;
1425
1426 data = newSV (NAME_MAX);
1427 SvPOK_on (data);
1428
1429 req->type = REQ_READLINK;
1430 req->fh = newSVsv (path);
1431 req->ptr2 = SvPVbyte_nolen (path);
1432 req->sv1 = data;
1433 req->ptr1 = SvPVbyte_nolen (data);
1434
1435 REQ_SEND;
1315} 1436}
1316 1437
1317void 1438void
1318aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1439aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1319 SV * out_fh 1440 SV * out_fh
… …
1325 PPCODE: 1446 PPCODE:
1326{ 1447{
1327 dREQ; 1448 dREQ;
1328 1449
1329 req->type = REQ_SENDFILE; 1450 req->type = REQ_SENDFILE;
1330 req->fh = newSVsv (out_fh); 1451 req->fh = newSVsv (out_fh);
1331 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1452 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1332 req->fh2 = newSVsv (in_fh); 1453 req->sv2 = newSVsv (in_fh);
1333 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1454 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1334 req->offset = in_offset; 1455 req->offs = in_offset;
1335 req->length = length; 1456 req->size = length;
1336 1457
1337 REQ_SEND; 1458 REQ_SEND;
1338} 1459}
1339 1460
1340void 1461void
… …
1347 PPCODE: 1468 PPCODE:
1348{ 1469{
1349 dREQ; 1470 dREQ;
1350 1471
1351 req->type = REQ_READAHEAD; 1472 req->type = REQ_READAHEAD;
1352 req->fh = newSVsv (fh); 1473 req->fh = newSVsv (fh);
1353 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1474 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1354 req->offset = offset; 1475 req->offs = offset;
1355 req->length = length; 1476 req->size = length;
1356 1477
1357 REQ_SEND; 1478 REQ_SEND;
1358} 1479}
1359 1480
1360void 1481void
… …
1366 aio_lstat = REQ_LSTAT 1487 aio_lstat = REQ_LSTAT
1367 PPCODE: 1488 PPCODE:
1368{ 1489{
1369 dREQ; 1490 dREQ;
1370 1491
1371 New (0, req->statdata, 1, Stat_t); 1492 req->ptr2 = malloc (sizeof (Stat_t));
1372 if (!req->statdata) 1493 if (!req->ptr2)
1373 { 1494 {
1374 req_free (req); 1495 req_free (req);
1375 croak ("out of memory during aio_req->statdata allocation"); 1496 croak ("out of memory during aio_stat statdata allocation");
1376 } 1497 }
1498
1499 req->flags |= FLAG_PTR2_FREE;
1377 1500
1378 if (SvPOK (fh_or_path)) 1501 if (SvPOK (fh_or_path))
1379 { 1502 {
1380 req->type = ix; 1503 req->type = ix;
1381 req->data = newSVsv (fh_or_path); 1504 req->sv1 = newSVsv (fh_or_path);
1382 req->dataptr = SvPVbyte_nolen (req->data); 1505 req->ptr1 = SvPVbyte_nolen (fh_or_path);
1383 } 1506 }
1384 else 1507 else
1385 { 1508 {
1386 req->type = REQ_FSTAT; 1509 req->type = REQ_FSTAT;
1387 req->fh = newSVsv (fh_or_path); 1510 req->fh = newSVsv (fh_or_path);
1388 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1511 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1389 } 1512 }
1390 1513
1391 REQ_SEND; 1514 REQ_SEND;
1392} 1515}
1393 1516
1394void 1517void
1395aio_unlink (pathname,callback=&PL_sv_undef) 1518aio_unlink (pathname,callback=&PL_sv_undef)
1396 SV * pathname 1519 SV * pathname
1397 SV * callback 1520 SV * callback
1398 ALIAS: 1521 ALIAS:
1399 aio_unlink = REQ_UNLINK 1522 aio_unlink = REQ_UNLINK
1400 aio_rmdir = REQ_RMDIR 1523 aio_rmdir = REQ_RMDIR
1401 aio_readdir = REQ_READDIR 1524 aio_readdir = REQ_READDIR
1402 PPCODE: 1525 PPCODE:
1403{ 1526{
1404 dREQ; 1527 dREQ;
1405 1528
1406 req->type = ix; 1529 req->type = ix;
1407 req->data = newSVsv (pathname); 1530 req->sv1 = newSVsv (pathname);
1408 req->dataptr = SvPVbyte_nolen (req->data); 1531 req->ptr1 = SvPVbyte_nolen (pathname);
1409 1532
1410 REQ_SEND; 1533 REQ_SEND;
1411} 1534}
1412 1535
1413void 1536void
1414aio_link (oldpath,newpath,callback=&PL_sv_undef) 1537aio_link (oldpath,newpath,callback=&PL_sv_undef)
1415 SV * oldpath 1538 SV * oldpath
1416 SV * newpath 1539 SV * newpath
1417 SV * callback 1540 SV * callback
1418 ALIAS: 1541 ALIAS:
1419 aio_link = REQ_LINK 1542 aio_link = REQ_LINK
1420 aio_symlink = REQ_SYMLINK 1543 aio_symlink = REQ_SYMLINK
1421 aio_rename = REQ_RENAME 1544 aio_rename = REQ_RENAME
1422 PPCODE: 1545 PPCODE:
1423{ 1546{
1424 dREQ; 1547 dREQ;
1425 1548
1426 req->type = ix; 1549 req->type = ix;
1427 req->fh = newSVsv (oldpath); 1550 req->fh = newSVsv (oldpath);
1428 req->data2ptr = SvPVbyte_nolen (req->fh); 1551 req->ptr2 = SvPVbyte_nolen (req->fh);
1429 req->data = newSVsv (newpath); 1552 req->sv1 = newSVsv (newpath);
1430 req->dataptr = SvPVbyte_nolen (req->data); 1553 req->ptr1 = SvPVbyte_nolen (newpath);
1431 1554
1432 REQ_SEND; 1555 REQ_SEND;
1433} 1556}
1434 1557
1435void 1558void
1436aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1559aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1437 SV * pathname 1560 SV * pathname
1438 SV * callback 1561 SV * callback
1439 UV mode 1562 UV mode
1440 UV dev 1563 UV dev
1441 PPCODE: 1564 PPCODE:
1442{ 1565{
1443 dREQ; 1566 dREQ;
1444 1567
1445 req->type = REQ_MKNOD; 1568 req->type = REQ_MKNOD;
1446 req->data = newSVsv (pathname); 1569 req->sv1 = newSVsv (pathname);
1447 req->dataptr = SvPVbyte_nolen (req->data); 1570 req->ptr1 = SvPVbyte_nolen (pathname);
1448 req->mode = (mode_t)mode; 1571 req->mode = (mode_t)mode;
1449 req->offset = dev; 1572 req->offs = dev;
1450 1573
1451 REQ_SEND; 1574 REQ_SEND;
1452} 1575}
1453 1576
1454void 1577void
1455aio_busy (delay,callback=&PL_sv_undef) 1578aio_busy (delay,callback=&PL_sv_undef)
1456 double delay 1579 double delay
1457 SV * callback 1580 SV * callback
1458 PPCODE: 1581 PPCODE:
1459{ 1582{
1460 dREQ; 1583 dREQ;
1461 1584
1462 req->type = REQ_BUSY; 1585 req->type = REQ_BUSY;
1463 req->fd = delay < 0. ? 0 : delay; 1586 req->int1 = delay < 0. ? 0 : delay;
1464 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1587 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1465 1588
1466 REQ_SEND; 1589 REQ_SEND;
1467} 1590}
1468 1591
1469void 1592void
… …
1473 PPCODE: 1596 PPCODE:
1474{ 1597{
1475 dREQ; 1598 dREQ;
1476 1599
1477 req->type = REQ_GROUP; 1600 req->type = REQ_GROUP;
1601
1478 req_send (req); 1602 req_send (req);
1479
1480 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1603 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1481} 1604}
1482 1605
1483void 1606void
1484aio_nop (callback=&PL_sv_undef) 1607aio_nop (callback=&PL_sv_undef)
1485 SV * callback 1608 SV * callback
1486 PPCODE: 1609 PPCODE:
1487{ 1610{
1488 dREQ; 1611 dREQ;
1489 1612
1490 req->type = REQ_NOP; 1613 req->type = REQ_NOP;
… …
1544 1667
1545int 1668int
1546poll_cb(...) 1669poll_cb(...)
1547 PROTOTYPE: 1670 PROTOTYPE:
1548 CODE: 1671 CODE:
1549 RETVAL = poll_cb (0); 1672 RETVAL = poll_cb ();
1550 OUTPUT:
1551 RETVAL
1552
1553int
1554poll_some(int max = 0)
1555 PROTOTYPE: $
1556 CODE:
1557 RETVAL = poll_cb (max);
1558 OUTPUT: 1673 OUTPUT:
1559 RETVAL 1674 RETVAL
1560 1675
1561void 1676void
1562poll_wait() 1677poll_wait()
… …
1587 CODE: 1702 CODE:
1588 RETVAL = get_npending (); 1703 RETVAL = get_npending ();
1589 OUTPUT: 1704 OUTPUT:
1590 RETVAL 1705 RETVAL
1591 1706
1707int
1708nthreads()
1709 PROTOTYPE:
1710 CODE:
1711 if (WORDACCESS_UNSAFE) LOCK (wrklock);
1712 RETVAL = started;
1713 if (WORDACCESS_UNSAFE) UNLOCK (wrklock);
1714 OUTPUT:
1715 RETVAL
1716
1592PROTOTYPES: DISABLE 1717PROTOTYPES: DISABLE
1593 1718
1594MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1719MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1595 1720
1596void 1721void
… …
1611 PPCODE: 1736 PPCODE:
1612{ 1737{
1613 int i; 1738 int i;
1614 aio_req req; 1739 aio_req req;
1615 1740
1616 if (grp->fd == 2) 1741 if (grp->int1 == 2)
1617 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1742 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1618 1743
1619 for (i = 1; i < items; ++i ) 1744 for (i = 1; i < items; ++i )
1620 { 1745 {
1621 if (GIMME_V != G_VOID) 1746 if (GIMME_V != G_VOID)
… …
1623 1748
1624 req = SvAIO_REQ (ST (i)); 1749 req = SvAIO_REQ (ST (i));
1625 1750
1626 if (req) 1751 if (req)
1627 { 1752 {
1628 ++grp->length; 1753 ++grp->size;
1629 req->grp = grp; 1754 req->grp = grp;
1630 1755
1631 req->grp_prev = 0; 1756 req->grp_prev = 0;
1632 req->grp_next = grp->grp_first; 1757 req->grp_next = grp->grp_first;
1633 1758
… …
1656 av = newAV (); 1781 av = newAV ();
1657 1782
1658 for (i = 1; i < items; ++i ) 1783 for (i = 1; i < items; ++i )
1659 av_push (av, newSVsv (ST (i))); 1784 av_push (av, newSVsv (ST (i)));
1660 1785
1661 SvREFCNT_dec (grp->data); 1786 SvREFCNT_dec (grp->sv1);
1662 grp->data = (SV *)av; 1787 grp->sv1 = (SV *)av;
1663} 1788}
1664 1789
1665void 1790void
1666errno (aio_req grp, int errorno = errno) 1791errno (aio_req grp, int errorno = errno)
1667 CODE: 1792 CODE:
1668 grp->errorno = errorno; 1793 grp->errorno = errorno;
1669 1794
1670void 1795void
1671limit (aio_req grp, int limit) 1796limit (aio_req grp, int limit)
1672 CODE: 1797 CODE:
1673 grp->fd2 = limit; 1798 grp->int2 = limit;
1674 aio_grp_feed (grp); 1799 aio_grp_feed (grp);
1675 1800
1676void 1801void
1677feed (aio_req grp, SV *callback=&PL_sv_undef) 1802feed (aio_req grp, SV *callback=&PL_sv_undef)
1678 CODE: 1803 CODE:
1679{ 1804{
1680 SvREFCNT_dec (grp->fh2); 1805 SvREFCNT_dec (grp->sv2);
1681 grp->fh2 = newSVsv (callback); 1806 grp->sv2 = newSVsv (callback);
1682 1807
1683 if (grp->fd2 <= 0) 1808 if (grp->int2 <= 0)
1684 grp->fd2 = 2; 1809 grp->int2 = 2;
1685 1810
1686 aio_grp_feed (grp); 1811 aio_grp_feed (grp);
1687} 1812}
1688 1813

Diff Legend

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