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.122 by root, Tue May 13 19:35:16 2008 UTC vs.
Revision 1.145 by root, Fri Jun 12 16:55:17 2009 UTC

… …
65# include <signal.h> 65# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
67 67
68#endif 68#endif
69 69
70/* perl stupidly overrides readdir and maybe others */
71/* with thread-unsafe versions, imagine that :( */
72#undef readdir
73#undef opendir
74#undef closedir
75
70#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
71 77
72/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 79#if IVSIZE >= 8
74# define SvVAL64 SvIV 80# define SvVAL64 SvIV
75#else 81#else
76# define SvVAL64 SvNV 82# define SvVAL64 SvNV
77#endif 83#endif
78 84
85/*****************************************************************************/
86
87#if __GNUC__ >= 3
88# define expect(expr,value) __builtin_expect ((expr),(value))
89#else
90# define expect(expr,value) (expr)
91#endif
92
93#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1)
95
96/*****************************************************************************/
97
79static HV *stash; 98static HV *stash;
80typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
81 100
82#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
… …
92 111
93#include "libeio/eio.h" 112#include "libeio/eio.h"
94 113
95static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
96#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
97static void aio_grp_feed (eio_req *grp);
98#define EIO_FEED(req) aio_grp_feed (req)
99static void req_destroy (eio_req *grp); 116static void req_destroy (eio_req *grp);
100#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
101 118
102enum { 119enum {
103 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
175 192
176static void req_submit (eio_req *req) 193static void req_submit (eio_req *req)
177{ 194{
178 eio_submit (req); 195 eio_submit (req);
179 196
180 if (on_next_submit) 197 if (expect_false (on_next_submit))
181 { 198 {
182 dSP; 199 dSP;
183 SV *cb = sv_2mortal (on_next_submit); 200 SV *cb = sv_2mortal (on_next_submit);
184 201
185 on_next_submit = 0; 202 on_next_submit = 0;
… …
195 dSP; 212 dSP;
196 213
197 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
198 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
199 216
200 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
201 { 218 {
202 ENTER; 219 ENTER;
203 SAVETMPS; 220 SAVETMPS;
204 PUSHMARK (SP); 221 PUSHMARK (SP);
205 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
218 235
219 av_extend (av, req->result - 1); 236 av_extend (av, req->result - 1);
220 237
221 for (i = 0; i < req->result; ++i) 238 for (i = 0; i < req->result; ++i)
222 { 239 {
240 if (req->int1 & EIO_READDIR_DENTS)
241 {
242 eio_dirent *ent = (eio_dirent *)buf;
243 SV *namesv = newSVpvn (ent->name, ent->namelen);
244
245 if (req->int1 & EIO_READDIR_CUSTOM2)
246 {
247 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
248 AV *avent = newAV ();
249
250 av_extend (avent, 2);
251
252 if (!sv_type [ent->type])
253 {
254 sv_type [ent->type] = newSViv (ent->type);
255 SvREADONLY_on (sv_type [ent->type]);
256 }
257
258 av_store (avent, 0, namesv);
259 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
260 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
261
262 av_store (av, i, newRV_noinc ((SV *)avent));
263 }
264 else
265 av_store (av, i, namesv);
266
267 buf += sizeof (eio_dirent);
268 }
269 else
270 {
223 SV *sv = newSVpv (buf, 0); 271 SV *name = newSVpv (buf, 0);
224
225 av_store (av, i, sv); 272 av_store (av, i, name);
226 buf += SvCUR (sv) + 1; 273 buf += SvCUR (name) + 1;
274 }
227 } 275 }
228 276
229 rv = sv_2mortal (newRV_noinc ((SV *)av)); 277 rv = sv_2mortal (newRV_noinc ((SV *)av));
230 } 278 }
231 279
232 PUSHs (rv); 280 PUSHs (rv);
281
282 if (req->int1 & EIO_READDIR_CUSTOM1)
283 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
233 } 284 }
234 break; 285 break;
235 286
236 case EIO_OPEN: 287 case EIO_OPEN:
237 { 288 {
… …
243 GV *gv = (GV *)sv_newmortal (); 294 GV *gv = (GV *)sv_newmortal ();
244 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 295 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
245 char sym [64]; 296 char sym [64];
246 int symlen; 297 int symlen;
247 298
248 symlen = snprintf (sym, sizeof (sym), "fd#%d", req->result); 299 symlen = snprintf (sym, sizeof (sym), "fd#%u", (unsigned int)req->result);
249 gv_init (gv, stash, sym, symlen, 0); 300 gv_init (gv, stash, sym, symlen, 0);
250 301
251 symlen = snprintf ( 302 symlen = snprintf (
252 sym, 303 sym,
253 sizeof (sym), 304 sizeof (sym),
254 "%s&=%d", 305 "%s&=%u",
255 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<", 306 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
256 req->result 307 (unsigned int)req->result
257 ); 308 );
258 309
259 if (do_open (gv, sym, symlen, 0, 0, 0, 0)) 310 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
260 fh = (SV *)gv; 311 fh = (SV *)gv;
261 } 312 }
… …
295 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 346 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
296 PUSHs (sv_2mortal (newSViv (req->result))); 347 PUSHs (sv_2mortal (newSViv (req->result)));
297 break; 348 break;
298 349
299 case EIO_READ: 350 case EIO_READ:
351 {
300 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 352 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
301 *SvEND (req->sv2) = 0; 353 *SvEND (req->sv2) = 0;
354 SvPOK_only (req->sv2);
355 SvSETMAGIC (req->sv2);
302 PUSHs (sv_2mortal (newSViv (req->result))); 356 PUSHs (sv_2mortal (newSViv (req->result)));
357 }
303 break; 358 break;
304 359
305 case EIO_DUP2: 360 case EIO_DUP2:
306 if (req->result > 0) 361 if (req->result > 0)
307 req->result = 0; 362 req->result = 0;
… …
412 X_UNLOCK (reslock); 467 X_UNLOCK (reslock);
413 468
414 if (size) 469 if (size)
415 return; 470 return;
416 471
417 maybe_start_thread (); 472 etp_maybe_start_thread ();
418 473
419 FD_ZERO (&rfd); 474 FD_ZERO (&rfd);
420 FD_SET (respipe [0], &rfd); 475 FD_SET (respipe [0], &rfd);
421 476
422 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 477 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
423 } 478 }
424} 479}
425 480
426static int poll_cb (void) 481static int poll_cb (void)
427{ 482{
428 int res; 483 for (;;)
429
430 do
431 { 484 {
432 res = eio_poll (); 485 int res = eio_poll ();
433 486
434 if (res > 0) 487 if (res > 0)
435 croak (0); 488 croak (0);
489
490 if (!max_outstanding || max_outstanding > eio_nreqs ())
491 return res;
492
493 poll_wait ();
436 } 494 }
437 while (max_outstanding && max_outstanding <= eio_nreqs ());
438
439 return res;
440} 495}
441 496
442static void atfork_child (void) 497static void atfork_child (void)
443{ 498{
444 create_respipe (); 499 create_respipe ();
445} 500}
446 501
502static SV *
503get_cb (SV *cb_sv)
504{
505 HV *st;
506 GV *gvp;
507 CV *cv;
508
509 if (!SvOK (cb_sv))
510 return 0;
511
512 cv = sv_2cv (cb_sv, &st, &gvp, 0);
513
514 if (!cv)
515 croak ("IO::AIO callback must be undef or a CODE reference");
516
517 return (SV *)cv;
518}
519
447#define dREQ \ 520#define dREQ \
521 SV *cb_cv; \
448 aio_req req; \ 522 aio_req req; \
449 int req_pri = next_pri; \ 523 int req_pri = next_pri; \
450 next_pri = EIO_PRI_DEFAULT; \ 524 next_pri = EIO_PRI_DEFAULT; \
451 \ 525 \
452 if (SvOK (callback) && !SvROK (callback)) \ 526 cb_cv = get_cb (callback); \
453 croak ("callback must be undef or of reference type"); \
454 \ 527 \
455 Newz (0, req, 1, eio_req); \ 528 Newz (0, req, 1, eio_req); \
456 if (!req) \ 529 if (!req) \
457 croak ("out of memory during eio_req allocation"); \ 530 croak ("out of memory during eio_req allocation"); \
458 \ 531 \
459 req->callback = newSVsv (callback); \ 532 req->callback = SvREFCNT_inc (cb_cv); \
460 req->pri = req_pri 533 req->pri = req_pri
461 534
462#define REQ_SEND \ 535#define REQ_SEND \
536 PUTBACK; \
463 req_submit (req); \ 537 req_submit (req); \
538 SPAGAIN; \
464 \ 539 \
465 if (GIMME_V != G_VOID) \ 540 if (GIMME_V != G_VOID) \
466 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 541 XPUSHs (req_sv (req, AIO_REQ_KLASS));
467 542
543static int
544extract_fd (SV *fh, int wr)
545{
546 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
547
548 if (fd < 0)
549 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
550
551 return fd;
552}
553
468MODULE = IO::AIO PACKAGE = IO::AIO 554MODULE = IO::AIO PACKAGE = IO::AIO
469 555
470PROTOTYPES: ENABLE 556PROTOTYPES: ENABLE
471 557
472BOOT: 558BOOT:
473{ 559{
474 stash = gv_stashpv ("IO::AIO", 1); 560 HV *stash = gv_stashpv ("IO::AIO", 1);
475 561
476 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 562 static const struct {
477 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 563 const char *name;
478 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 564 IV iv;
479 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 565 } *civ, const_iv[] = {
480 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 566# define const_iv(name, value) { # name, (IV) value },
567# define const_eio(name) { # name, (IV) EIO_ ## name },
568 const_iv (EXDEV , EXDEV)
569 const_iv (ENOSYS , ENOSYS)
570 const_iv (O_RDONLY, O_RDONLY)
571 const_iv (O_WRONLY, O_WRONLY)
572 const_iv (O_CREAT , O_CREAT)
573 const_iv (O_TRUNC , O_TRUNC)
481#ifndef _WIN32 574#ifndef _WIN32
482 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 575 const_iv (S_IFIFO , S_IFIFO)
483#endif 576#endif
577 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
578 const_eio (SYNC_FILE_RANGE_WRITE)
579 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
484 580
581 const_eio (READDIR_DENTS)
582 const_eio (READDIR_DIRS_FIRST)
583 const_eio (READDIR_STAT_ORDER)
584 const_eio (READDIR_FOUND_UNKNOWN)
585
586 const_eio (DT_UNKNOWN)
587 const_eio (DT_FIFO)
588 const_eio (DT_CHR)
589 const_eio (DT_DIR)
590 const_eio (DT_BLK)
591 const_eio (DT_REG)
592 const_eio (DT_LNK)
593 const_eio (DT_SOCK)
594 const_eio (DT_WHT)
595 };
596
597 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
598 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
599
485 create_respipe (); 600 create_respipe ();
486 601
487 if (eio_init (want_poll, done_poll) < 0) 602 if (eio_init (want_poll, done_poll) < 0)
488 croak ("IO::AIO: unable to initialise eio library"); 603 croak ("IO::AIO: unable to initialise eio library");
489 604
490 /* atfork child called in fifo order, so before eio's handler */ 605 /* atfork child called in fifo order, so before eio's handler */
491 X_THREAD_ATFORK (0, 0, atfork_child); 606 X_THREAD_ATFORK (0, 0, atfork_child);
492} 607}
493 608
494void 609void
495max_poll_reqs (int nreqs) 610max_poll_reqs (int nreqs)
496 PROTOTYPE: $ 611 PROTOTYPE: $
… …
549 ALIAS: 664 ALIAS:
550 aio_fsync = EIO_FSYNC 665 aio_fsync = EIO_FSYNC
551 aio_fdatasync = EIO_FDATASYNC 666 aio_fdatasync = EIO_FDATASYNC
552 PPCODE: 667 PPCODE:
553{ 668{
669 int fd = extract_fd (fh, 0);
554 dREQ; 670 dREQ;
555 671
556 req->type = ix; 672 req->type = ix;
557 req->sv1 = newSVsv (fh); 673 req->sv1 = newSVsv (fh);
558 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 674 req->int1 = fd;
675
676 REQ_SEND (req);
677}
678
679void
680aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
681 PROTOTYPE: $$$$;$
682 PPCODE:
683{
684 int fd = extract_fd (fh, 0);
685 dREQ;
686
687 req->type = EIO_SYNC_FILE_RANGE;
688 req->sv1 = newSVsv (fh);
689 req->int1 = fd;
690 req->offs = SvVAL64 (offset);
691 req->size = SvVAL64 (nbytes);
692 req->int2 = flags;
559 693
560 REQ_SEND (req); 694 REQ_SEND (req);
561} 695}
562 696
563void 697void
564aio_close (SV *fh, SV *callback=&PL_sv_undef) 698aio_close (SV *fh, SV *callback=&PL_sv_undef)
565 PROTOTYPE: $;$ 699 PROTOTYPE: $;$
566 PPCODE: 700 PPCODE:
567{ 701{
568 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 702 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
703 int fd = extract_fd (fh, 0);
569 dREQ; 704 dREQ;
570 705
571 if (close_pipe < 0) 706 if (close_pipe < 0)
572 { 707 {
573 int pipefd [2]; 708 int pipefd [2];
… …
581 } 716 }
582 717
583 req->type = EIO_DUP2; 718 req->type = EIO_DUP2;
584 req->int1 = close_pipe; 719 req->int1 = close_pipe;
585 req->sv2 = newSVsv (fh); 720 req->sv2 = newSVsv (fh);
586 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 721 req->int2 = fd;
587 722
588 REQ_SEND (req); 723 REQ_SEND (req);
589} 724}
590 725
591void 726void
… …
595 aio_write = EIO_WRITE 730 aio_write = EIO_WRITE
596 PROTOTYPE: $$$$$;$ 731 PROTOTYPE: $$$$$;$
597 PPCODE: 732 PPCODE:
598{ 733{
599 STRLEN svlen; 734 STRLEN svlen;
735 int fd = extract_fd (fh, ix == EIO_WRITE);
600 char *svptr = SvPVbyte (data, svlen); 736 char *svptr = SvPVbyte (data, svlen);
601 UV len = SvUV (length); 737 UV len = SvUV (length);
602
603 SvUPGRADE (data, SVt_PV);
604 SvPOK_on (data);
605 738
606 if (dataoffset < 0) 739 if (dataoffset < 0)
607 dataoffset += svlen; 740 dataoffset += svlen;
608 741
609 if (dataoffset < 0 || dataoffset > svlen) 742 if (dataoffset < 0 || dataoffset > svlen)
… …
615 if (!SvOK (length) || len + dataoffset > svlen) 748 if (!SvOK (length) || len + dataoffset > svlen)
616 len = svlen - dataoffset; 749 len = svlen - dataoffset;
617 } 750 }
618 else 751 else
619 { 752 {
620 /* read: grow scalar as necessary */ 753 /* read: check type and grow scalar as necessary */
754 SvUPGRADE (data, SVt_PV);
621 svptr = SvGROW (data, len + dataoffset + 1); 755 svptr = SvGROW (data, len + dataoffset + 1);
622 } 756 }
623
624 if (len < 0)
625 croak ("length must not be negative");
626 757
627 { 758 {
628 dREQ; 759 dREQ;
629 760
630 req->type = ix; 761 req->type = ix;
631 req->sv1 = newSVsv (fh); 762 req->sv1 = newSVsv (fh);
632 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 763 req->int1 = fd;
633 : IoOFP (sv_2io (fh)));
634 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 764 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
635 req->size = len; 765 req->size = len;
636 req->sv2 = SvREFCNT_inc (data); 766 req->sv2 = SvREFCNT_inc (data);
637 req->ptr2 = (char *)svptr + dataoffset; 767 req->ptr2 = (char *)svptr + dataoffset;
638 req->stroffset = dataoffset; 768 req->stroffset = dataoffset;
… …
665void 795void
666aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 796aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$$;$ 797 PROTOTYPE: $$$$;$
668 PPCODE: 798 PPCODE:
669{ 799{
800 int ifd = extract_fd (in_fh , 0);
801 int ofd = extract_fd (out_fh, 0);
670 dREQ; 802 dREQ;
671 803
672 req->type = EIO_SENDFILE; 804 req->type = EIO_SENDFILE;
673 req->sv1 = newSVsv (out_fh); 805 req->sv1 = newSVsv (out_fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 806 req->int1 = ofd;
675 req->sv2 = newSVsv (in_fh); 807 req->sv2 = newSVsv (in_fh);
676 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 808 req->int2 = ifd;
677 req->offs = SvVAL64 (in_offset); 809 req->offs = SvVAL64 (in_offset);
678 req->size = length; 810 req->size = length;
679 811
680 REQ_SEND; 812 REQ_SEND;
681} 813}
… …
683void 815void
684aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 816aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
685 PROTOTYPE: $$$;$ 817 PROTOTYPE: $$$;$
686 PPCODE: 818 PPCODE:
687{ 819{
820 int fd = extract_fd (fh, 0);
688 dREQ; 821 dREQ;
689 822
690 req->type = EIO_READAHEAD; 823 req->type = EIO_READAHEAD;
691 req->sv1 = newSVsv (fh); 824 req->sv1 = newSVsv (fh);
692 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 825 req->int1 = fd;
693 req->offs = SvVAL64 (offset); 826 req->offs = SvVAL64 (offset);
694 req->size = length; 827 req->size = length;
695 828
696 REQ_SEND; 829 REQ_SEND;
697} 830}
… …
814 req->type = EIO_FCHOWN; 947 req->type = EIO_FCHOWN;
815 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 948 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
816 } 949 }
817 950
818 REQ_SEND; 951 REQ_SEND;
952}
953
954void
955aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
956 PPCODE:
957{
958 dREQ;
959
960 req->type = EIO_READDIR;
961 req->sv1 = newSVsv (pathname);
962 req->ptr1 = SvPVbyte_nolen (req->sv1);
963 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
964
965 if (flags & EIO_READDIR_DENTS)
966 req->int1 |= EIO_READDIR_CUSTOM2;
967
968 REQ_SEND;
819} 969}
820 970
821void 971void
822aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 972aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
823 ALIAS: 973 ALIAS:
… …
888{ 1038{
889 dREQ; 1039 dREQ;
890 1040
891 req->type = EIO_GROUP; 1041 req->type = EIO_GROUP;
892 1042
893 eio_submit (req); 1043 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1044 XPUSHs (req_sv (req, AIO_GRP_KLASS));
895} 1045}
896 1046
897void 1047void
898aio_nop (SV *callback=&PL_sv_undef) 1048aio_nop (SV *callback=&PL_sv_undef)
… …
1017 CODE: 1167 CODE:
1018 eio_cancel (req); 1168 eio_cancel (req);
1019 1169
1020void 1170void
1021cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1171cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1022 CODE: 1172 PPCODE:
1173{
1174 if (GIMME_V != G_VOID)
1175 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1176
1177 if (items > 1)
1178 {
1179 SV *cb_cv = get_cb (callback);
1180
1023 SvREFCNT_dec (req->callback); 1181 SvREFCNT_dec (req->callback);
1024 req->callback = newSVsv (callback); 1182 req->callback = SvREFCNT_inc (cb_cv);
1183 }
1184}
1025 1185
1026MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1186MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1027 1187
1028void 1188void
1029add (aio_req grp, ...) 1189add (aio_req grp, ...)
… …
1061 AV *av; 1221 AV *av;
1062 1222
1063 grp->errorno = errno; 1223 grp->errorno = errno;
1064 1224
1065 av = newAV (); 1225 av = newAV ();
1226 av_extend (av, items - 1);
1066 1227
1067 for (i = 1; i < items; ++i ) 1228 for (i = 1; i < items; ++i )
1068 av_push (av, newSVsv (ST (i))); 1229 av_push (av, newSVsv (ST (i)));
1069 1230
1070 SvREFCNT_dec (grp->sv1); 1231 SvREFCNT_dec (grp->sv1);
… …
1084void 1245void
1085feed (aio_req grp, SV *callback=&PL_sv_undef) 1246feed (aio_req grp, SV *callback=&PL_sv_undef)
1086 CODE: 1247 CODE:
1087{ 1248{
1088 SvREFCNT_dec (grp->sv2); 1249 SvREFCNT_dec (grp->sv2);
1089 grp->sv2 = newSVsv (callback); 1250 grp->sv2 = newSVsv (callback);
1251 grp->feed = aio_grp_feed;
1090 1252
1091 if (grp->int2 <= 0) 1253 if (grp->int2 <= 0)
1092 grp->int2 = 2; 1254 grp->int2 = 2;
1093 1255
1094 eio_grp_limit (grp, grp->int2); 1256 eio_grp_limit (grp, grp->int2);

Diff Legend

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