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.129 by root, Tue Sep 30 17:03:53 2008 UTC vs.
Revision 1.152 by root, Tue Jul 14 00:32:27 2009 UTC

3#include <errno.h> 3#include <errno.h>
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8
9#include "schmorp.h"
8 10
9#include <stddef.h> 11#include <stddef.h>
10#include <stdlib.h> 12#include <stdlib.h>
11#include <errno.h> 13#include <errno.h>
12#include <sys/types.h> 14#include <sys/types.h>
75 77
76#define EIO_STRUCT_STAT Stat_t 78#define EIO_STRUCT_STAT Stat_t
77 79
78/* use NV for 32 bit perls as it allows larger offsets */ 80/* use NV for 32 bit perls as it allows larger offsets */
79#if IVSIZE >= 8 81#if IVSIZE >= 8
82# define VAL64 IV
80# define SvVAL64 SvIV 83# define SvVAL64 SvIV
84# define newSVval64 newSViv
81#else 85#else
86# define VAL64 NV
82# define SvVAL64 SvNV 87# define SvVAL64 SvNV
88# define newSVval64 newSVnv
83#endif 89#endif
84 90
85/*****************************************************************************/ 91/*****************************************************************************/
86 92
87#if __GNUC__ >= 3 93#if __GNUC__ >= 3
95 101
96/*****************************************************************************/ 102/*****************************************************************************/
97 103
98static HV *stash; 104static HV *stash;
99typedef SV SV8; /* byte-sv, used for argument-checking */ 105typedef SV SV8; /* byte-sv, used for argument-checking */
106typedef int aio_rfd; /* read file desriptor */
107typedef int aio_wfd; /* write file descriptor */
100 108
101#define AIO_REQ_KLASS "IO::AIO::REQ" 109#define AIO_REQ_KLASS "IO::AIO::REQ"
102#define AIO_GRP_KLASS "IO::AIO::GRP" 110#define AIO_GRP_KLASS "IO::AIO::GRP"
103 111
104#define EIO_REQ_MEMBERS \ 112#define EIO_REQ_MEMBERS \
109 117
110#define EIO_NO_WRAPPERS 1 118#define EIO_NO_WRAPPERS 1
111 119
112#include "libeio/eio.h" 120#include "libeio/eio.h"
113 121
122#ifndef POSIX_FADV_NORMAL
123# define POSIX_FADV_NORMAL 0
124# define NO_FADVISE 1
125#endif
126
127#ifndef POSIX_FADV_SEQUENTIAL
128# define POSIX_FADV_SEQUENTIAL 0
129#endif
130
131#ifndef POSIX_FADV_RANDOM
132# define POSIX_FADV_RANDOM 0
133#endif
134
135#ifndef POSIX_FADV_NOREUSE
136# define POSIX_FADV_NOREUSE 0
137#endif
138
139#ifndef POSIX_FADV_WILLNEED
140# define POSIX_FADV_WILLNEED 0
141#endif
142
143#ifndef POSIX_FADV_DONTNEED
144# define POSIX_FADV_DONTNEED 0
145#endif
146
114static int req_invoke (eio_req *req); 147static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 148#define EIO_FINISH(req) req_invoke (req)
116static void aio_grp_feed (eio_req *grp);
117#define EIO_FEED(req) aio_grp_feed (req)
118static void req_destroy (eio_req *grp); 149static void req_destroy (eio_req *grp);
119#define EIO_DESTROY(req) req_destroy (req) 150#define EIO_DESTROY(req) req_destroy (req)
120 151
121enum { 152enum {
122 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 153 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
230 SV *rv = &PL_sv_undef; 261 SV *rv = &PL_sv_undef;
231 262
232 if (req->result >= 0) 263 if (req->result >= 0)
233 { 264 {
234 int i; 265 int i;
235 char *buf = req->ptr2; 266 char *names = (char *)req->ptr2;
267 eio_dirent *ent = (eio_dirent *)req->ptr1; /* might be 0 */
236 AV *av = newAV (); 268 AV *av = newAV ();
237 269
238 av_extend (av, req->result - 1); 270 av_extend (av, req->result - 1);
239 271
240 for (i = 0; i < req->result; ++i) 272 for (i = 0; i < req->result; ++i)
241 { 273 {
242 SV *sv = newSVpv (buf, 0); 274 if (req->int1 & EIO_READDIR_DENTS)
275 {
276 SV *namesv = newSVpvn (names + ent->nameofs, ent->namelen);
243 277
278 if (req->int1 & EIO_READDIR_CUSTOM2)
279 {
280 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
281 AV *avent = newAV ();
282
283 av_extend (avent, 2);
284
285 if (!sv_type [ent->type])
286 {
287 sv_type [ent->type] = newSViv (ent->type);
288 SvREADONLY_on (sv_type [ent->type]);
289 }
290
291 av_store (avent, 0, namesv);
292 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
293 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
294
295 av_store (av, i, newRV_noinc ((SV *)avent));
296 }
297 else
244 av_store (av, i, sv); 298 av_store (av, i, namesv);
299
300 ++ent;
301 }
302 else
303 {
304 SV *name = newSVpv (names, 0);
305 av_store (av, i, name);
245 buf += SvCUR (sv) + 1; 306 names += SvCUR (name) + 1;
307 }
246 } 308 }
247 309
248 rv = sv_2mortal (newRV_noinc ((SV *)av)); 310 rv = sv_2mortal (newRV_noinc ((SV *)av));
249 } 311 }
250 312
251 PUSHs (rv); 313 PUSHs (rv);
314
315 if (req->int1 & EIO_READDIR_CUSTOM1)
316 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
252 } 317 }
253 break; 318 break;
254 319
255 case EIO_OPEN: 320 case EIO_OPEN:
256 { 321 {
262 GV *gv = (GV *)sv_newmortal (); 327 GV *gv = (GV *)sv_newmortal ();
263 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 328 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
264 char sym [64]; 329 char sym [64];
265 int symlen; 330 int symlen;
266 331
267 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 332 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
268 gv_init (gv, stash, sym, symlen, 0); 333 gv_init (gv, stash, sym, symlen, 0);
269 334
270 symlen = snprintf ( 335 symlen = snprintf (
271 sym, 336 sym,
272 sizeof (sym), 337 sizeof (sym),
273 "%s&=%d", 338 "%s&=%d",
274 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 339 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
275 req->result 340 (int)req->result
276 ); 341 );
277 342
278 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 343 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
279 fh = (SV *)gv; 344 fh = (SV *)gv;
280 } 345 }
314 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 379 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
315 PUSHs (sv_2mortal (newSViv (req->result))); 380 PUSHs (sv_2mortal (newSViv (req->result)));
316 break; 381 break;
317 382
318 case EIO_READ: 383 case EIO_READ:
384 {
319 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 385 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
320 *SvEND (req->sv2) = 0; 386 *SvEND (req->sv2) = 0;
387 SvPOK_only (req->sv2);
388 SvSETMAGIC (req->sv2);
321 PUSHs (sv_2mortal (newSViv (req->result))); 389 PUSHs (sv_2mortal (newSViv (req->result)));
390 }
322 break; 391 break;
323 392
324 case EIO_DUP2: 393 case EIO_DUP2:
325 if (req->result > 0) 394 if (req->result > 0)
326 req->result = 0; 395 req->result = 0;
464} 533}
465 534
466static SV * 535static SV *
467get_cb (SV *cb_sv) 536get_cb (SV *cb_sv)
468{ 537{
469 HV *st; 538 SvGETMAGIC (cb_sv);
470 GV *gvp; 539 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
471 CV *cv;
472
473 if (!SvOK (cb_sv))
474 return 0;
475
476 cv = sv_2cv (cb_sv, &st, &gvp, 0);
477
478 if (!cv)
479 croak ("IO::AIO callback must be undef or a CODE reference");
480
481 return (SV *)cv;
482} 540}
483 541
484#define dREQ \ 542#define dREQ \
485 SV *cb_cv; \ 543 SV *cb_cv; \
486 aio_req req; \ 544 aio_req req; \
501 req_submit (req); \ 559 req_submit (req); \
502 SPAGAIN; \ 560 SPAGAIN; \
503 \ 561 \
504 if (GIMME_V != G_VOID) \ 562 if (GIMME_V != G_VOID) \
505 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 563 XPUSHs (req_sv (req, AIO_REQ_KLASS));
506 564
507MODULE = IO::AIO PACKAGE = IO::AIO 565MODULE = IO::AIO PACKAGE = IO::AIO
508 566
509PROTOTYPES: ENABLE 567PROTOTYPES: ENABLE
510 568
511BOOT: 569BOOT:
512{ 570{
513 stash = gv_stashpv ("IO::AIO", 1); 571 static const struct {
514 572 const char *name;
515 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 573 IV iv;
516 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 574 } *civ, const_iv[] = {
517 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 575# define const_iv(name, value) { # name, (IV) value },
518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 576# define const_eio(name) { # name, (IV) EIO_ ## name },
519 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 577 const_iv (EXDEV , EXDEV)
578 const_iv (ENOSYS , ENOSYS)
579 const_iv (O_RDONLY, O_RDONLY)
580 const_iv (O_WRONLY, O_WRONLY)
581 const_iv (O_CREAT , O_CREAT)
582 const_iv (O_TRUNC , O_TRUNC)
520#ifndef _WIN32 583#ifndef _WIN32
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 584 const_iv (S_IFIFO , S_IFIFO)
522#endif 585#endif
586 const_iv (FADV_NORMAL , POSIX_FADV_NORMAL)
587 const_iv (FADV_SEQUENTIAL, POSIX_FADV_SEQUENTIAL)
588 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
589 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
590 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
591 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
523 592
593 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
594 const_eio (SYNC_FILE_RANGE_WRITE)
595 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
596
597 const_eio (READDIR_DENTS)
598 const_eio (READDIR_DIRS_FIRST)
599 const_eio (READDIR_STAT_ORDER)
600 const_eio (READDIR_FOUND_UNKNOWN)
601
602 const_eio (DT_UNKNOWN)
603 const_eio (DT_FIFO)
604 const_eio (DT_CHR)
605 const_eio (DT_DIR)
606 const_eio (DT_BLK)
607 const_eio (DT_REG)
608 const_eio (DT_LNK)
609 const_eio (DT_SOCK)
610 const_eio (DT_WHT)
611 };
612
613 stash = gv_stashpv ("IO::AIO", 1);
614
615 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
616 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
617
524 create_respipe (); 618 create_respipe ();
525 619
526 if (eio_init (want_poll, done_poll) < 0) 620 if (eio_init (want_poll, done_poll) < 0)
527 croak ("IO::AIO: unable to initialise eio library"); 621 croak ("IO::AIO: unable to initialise eio library");
528 622
529 /* atfork child called in fifo order, so before eio's handler */ 623 /* atfork child called in fifo order, so before eio's handler */
530 X_THREAD_ATFORK (0, 0, atfork_child); 624 X_THREAD_ATFORK (0, 0, atfork_child);
531} 625}
532 626
533void 627void
534max_poll_reqs (int nreqs) 628max_poll_reqs (int nreqs)
535 PROTOTYPE: $ 629 PROTOTYPE: $
588 ALIAS: 682 ALIAS:
589 aio_fsync = EIO_FSYNC 683 aio_fsync = EIO_FSYNC
590 aio_fdatasync = EIO_FDATASYNC 684 aio_fdatasync = EIO_FDATASYNC
591 PPCODE: 685 PPCODE:
592{ 686{
687 int fd = s_fileno_croak (fh, 0);
593 dREQ; 688 dREQ;
594 689
595 req->type = ix; 690 req->type = ix;
596 req->sv1 = newSVsv (fh); 691 req->sv1 = newSVsv (fh);
597 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 692 req->int1 = fd;
693
694 REQ_SEND (req);
695}
696
697void
698aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
699 PROTOTYPE: $$$$;$
700 PPCODE:
701{
702 int fd = s_fileno_croak (fh, 0);
703 dREQ;
704
705 req->type = EIO_SYNC_FILE_RANGE;
706 req->sv1 = newSVsv (fh);
707 req->int1 = fd;
708 req->offs = offset;
709 req->size = nbytes;
710 req->int2 = flags;
598 711
599 REQ_SEND (req); 712 REQ_SEND (req);
600} 713}
601 714
602void 715void
603aio_close (SV *fh, SV *callback=&PL_sv_undef) 716aio_close (SV *fh, SV *callback=&PL_sv_undef)
604 PROTOTYPE: $;$ 717 PROTOTYPE: $;$
605 PPCODE: 718 PPCODE:
606{ 719{
607 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 720 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
721 int fd = s_fileno_croak (fh, 0);
608 dREQ; 722 dREQ;
609 723
610 if (close_pipe < 0) 724 if (close_pipe < 0)
611 { 725 {
612 int pipefd [2]; 726 int pipefd [2];
620 } 734 }
621 735
622 req->type = EIO_DUP2; 736 req->type = EIO_DUP2;
623 req->int1 = close_pipe; 737 req->int1 = close_pipe;
624 req->sv2 = newSVsv (fh); 738 req->sv2 = newSVsv (fh);
625 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 739 req->int2 = fd;
626 740
627 REQ_SEND (req); 741 REQ_SEND (req);
628} 742}
629 743
630void 744void
634 aio_write = EIO_WRITE 748 aio_write = EIO_WRITE
635 PROTOTYPE: $$$$$;$ 749 PROTOTYPE: $$$$$;$
636 PPCODE: 750 PPCODE:
637{ 751{
638 STRLEN svlen; 752 STRLEN svlen;
753 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
639 char *svptr = SvPVbyte (data, svlen); 754 char *svptr = SvPVbyte (data, svlen);
640 UV len = SvUV (length); 755 UV len = SvUV (length);
641
642 SvUPGRADE (data, SVt_PV);
643 SvPOK_on (data);
644 756
645 if (dataoffset < 0) 757 if (dataoffset < 0)
646 dataoffset += svlen; 758 dataoffset += svlen;
647 759
648 if (dataoffset < 0 || dataoffset > svlen) 760 if (dataoffset < 0 || dataoffset > svlen)
654 if (!SvOK (length) || len + dataoffset > svlen) 766 if (!SvOK (length) || len + dataoffset > svlen)
655 len = svlen - dataoffset; 767 len = svlen - dataoffset;
656 } 768 }
657 else 769 else
658 { 770 {
659 /* read: grow scalar as necessary */ 771 /* read: check type and grow scalar as necessary */
772 SvUPGRADE (data, SVt_PV);
660 svptr = SvGROW (data, len + dataoffset + 1); 773 svptr = SvGROW (data, len + dataoffset + 1);
661 } 774 }
662
663 if (len < 0)
664 croak ("length must not be negative");
665 775
666 { 776 {
667 dREQ; 777 dREQ;
668 778
669 req->type = ix; 779 req->type = ix;
670 req->sv1 = newSVsv (fh); 780 req->sv1 = newSVsv (fh);
671 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 781 req->int1 = fd;
672 : IoOFP (sv_2io (fh)));
673 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 782 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
674 req->size = len; 783 req->size = len;
675 req->sv2 = SvREFCNT_inc (data); 784 req->sv2 = SvREFCNT_inc (data);
676 req->ptr2 = (char *)svptr + dataoffset; 785 req->ptr2 = (char *)svptr + dataoffset;
677 req->stroffset = dataoffset; 786 req->stroffset = dataoffset;
700 809
701 REQ_SEND; 810 REQ_SEND;
702} 811}
703 812
704void 813void
705aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 814aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
706 PROTOTYPE: $$$$;$ 815 PROTOTYPE: $$$$;$
707 PPCODE: 816 PPCODE:
708{ 817{
818 int ifd = s_fileno_croak (in_fh , 0);
819 int ofd = s_fileno_croak (out_fh, 1);
709 dREQ; 820 dREQ;
710 821
711 req->type = EIO_SENDFILE; 822 req->type = EIO_SENDFILE;
712 req->sv1 = newSVsv (out_fh); 823 req->sv1 = newSVsv (out_fh);
713 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 824 req->int1 = ofd;
714 req->sv2 = newSVsv (in_fh); 825 req->sv2 = newSVsv (in_fh);
715 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 826 req->int2 = ifd;
716 req->offs = SvVAL64 (in_offset); 827 req->offs = in_offset;
717 req->size = length; 828 req->size = length;
718 829
719 REQ_SEND; 830 REQ_SEND;
720} 831}
721 832
722void 833void
723aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 834aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
724 PROTOTYPE: $$$;$ 835 PROTOTYPE: $$$;$
725 PPCODE: 836 PPCODE:
726{ 837{
838 int fd = s_fileno_croak (fh, 0);
727 dREQ; 839 dREQ;
728 840
729 req->type = EIO_READAHEAD; 841 req->type = EIO_READAHEAD;
730 req->sv1 = newSVsv (fh); 842 req->sv1 = newSVsv (fh);
731 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 843 req->int1 = fd;
732 req->offs = SvVAL64 (offset); 844 req->offs = offset;
733 req->size = length; 845 req->size = length;
734 846
735 REQ_SEND; 847 REQ_SEND;
736} 848}
737 849
853 req->type = EIO_FCHOWN; 965 req->type = EIO_FCHOWN;
854 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 966 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
855 } 967 }
856 968
857 REQ_SEND; 969 REQ_SEND;
970}
971
972void
973aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
974 PPCODE:
975{
976 dREQ;
977
978 req->type = EIO_READDIR;
979 req->sv1 = newSVsv (pathname);
980 req->ptr1 = SvPVbyte_nolen (req->sv1);
981 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
982
983 if (flags & EIO_READDIR_DENTS)
984 req->int1 |= EIO_READDIR_CUSTOM2;
985
986 REQ_SEND;
858} 987}
859 988
860void 989void
861aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 990aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
862 ALIAS: 991 ALIAS:
1040 CODE: 1169 CODE:
1041 RETVAL = eio_nthreads (); 1170 RETVAL = eio_nthreads ();
1042 OUTPUT: 1171 OUTPUT:
1043 RETVAL 1172 RETVAL
1044 1173
1174int
1175fadvise (aio_rfd fh, off_t offset, off_t length, IV advice)
1176 PROTOTYPE: $$$$
1177 CODE:
1178#if _XOPEN_SOURCE >= 600 && !NO_FADVISE
1179 RETVAL = posix_fadvise (fh, offset, length, advice);
1180#else
1181 RETVAL = errno = ENOSYS;
1182#endif
1183 OUTPUT:
1184 RETVAL
1185
1186ssize_t
1187sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1188 PROTOTYPE: $$$$
1189 CODE:
1190 eio_sendfile_sync (ofh, ifh, offset, count);
1191
1045void _on_next_submit (SV *cb) 1192void _on_next_submit (SV *cb)
1046 CODE: 1193 CODE:
1047 SvREFCNT_dec (on_next_submit); 1194 SvREFCNT_dec (on_next_submit);
1048 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1195 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1049 1196
1063 if (GIMME_V != G_VOID) 1210 if (GIMME_V != G_VOID)
1064 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1211 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1065 1212
1066 if (items > 1) 1213 if (items > 1)
1067 { 1214 {
1068 SV *cb_cv = get_cb (callback); 1215 SV *cb_cv =get_cb (callback);
1069 1216
1070 SvREFCNT_dec (req->callback); 1217 SvREFCNT_dec (req->callback);
1071 req->callback = SvREFCNT_inc (cb_cv); 1218 req->callback = SvREFCNT_inc (cb_cv);
1072 } 1219 }
1073} 1220}
1110 AV *av; 1257 AV *av;
1111 1258
1112 grp->errorno = errno; 1259 grp->errorno = errno;
1113 1260
1114 av = newAV (); 1261 av = newAV ();
1262 av_extend (av, items - 1);
1115 1263
1116 for (i = 1; i < items; ++i ) 1264 for (i = 1; i < items; ++i )
1117 av_push (av, newSVsv (ST (i))); 1265 av_push (av, newSVsv (ST (i)));
1118 1266
1119 SvREFCNT_dec (grp->sv1); 1267 SvREFCNT_dec (grp->sv1);
1133void 1281void
1134feed (aio_req grp, SV *callback=&PL_sv_undef) 1282feed (aio_req grp, SV *callback=&PL_sv_undef)
1135 CODE: 1283 CODE:
1136{ 1284{
1137 SvREFCNT_dec (grp->sv2); 1285 SvREFCNT_dec (grp->sv2);
1138 grp->sv2 = newSVsv (callback); 1286 grp->sv2 = newSVsv (callback);
1287 grp->feed = aio_grp_feed;
1139 1288
1140 if (grp->int2 <= 0) 1289 if (grp->int2 <= 0)
1141 grp->int2 = 2; 1290 grp->int2 = 2;
1142 1291
1143 eio_grp_limit (grp, grp->int2); 1292 eio_grp_limit (grp, grp->int2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines