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.133 by root, Wed Oct 22 18:15:36 2008 UTC vs.
Revision 1.140 by root, Wed Jun 3 12:24:49 2009 UTC

… …
312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
313 PUSHs (sv_2mortal (newSViv (req->result))); 313 PUSHs (sv_2mortal (newSViv (req->result)));
314 break; 314 break;
315 315
316 case EIO_READ: 316 case EIO_READ:
317 {
317 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 318 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
318 *SvEND (req->sv2) = 0; 319 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2);
319 PUSHs (sv_2mortal (newSViv (req->result))); 322 PUSHs (sv_2mortal (newSViv (req->result)));
323 }
320 break; 324 break;
321 325
322 case EIO_DUP2: 326 case EIO_DUP2:
323 if (req->result > 0) 327 if (req->result > 0)
324 req->result = 0; 328 req->result = 0;
… …
499 req_submit (req); \ 503 req_submit (req); \
500 SPAGAIN; \ 504 SPAGAIN; \
501 \ 505 \
502 if (GIMME_V != G_VOID) \ 506 if (GIMME_V != G_VOID) \
503 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
504 508
509static int
510extract_fd (SV *fh, int wr)
511{
512 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
513
514 if (fd < 0)
515 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
516
517 return fd;
518}
519
505MODULE = IO::AIO PACKAGE = IO::AIO 520MODULE = IO::AIO PACKAGE = IO::AIO
506 521
507PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
508 523
509BOOT: 524BOOT:
510{ 525{
511 stash = gv_stashpv ("IO::AIO", 1); 526 stash = gv_stashpv ("IO::AIO", 1);
512 527
513 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
529 newCONSTSUB (stash, "ENOSYS", newSViv (ENOSYS));
514 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 530 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
515 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 531 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 532 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
517 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 533 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
518#ifndef _WIN32 534#ifndef _WIN32
… …
590 ALIAS: 606 ALIAS:
591 aio_fsync = EIO_FSYNC 607 aio_fsync = EIO_FSYNC
592 aio_fdatasync = EIO_FDATASYNC 608 aio_fdatasync = EIO_FDATASYNC
593 PPCODE: 609 PPCODE:
594{ 610{
611 int fd = extract_fd (fh, 0);
595 dREQ; 612 dREQ;
596 613
597 req->type = ix; 614 req->type = ix;
598 req->sv1 = newSVsv (fh); 615 req->sv1 = newSVsv (fh);
599 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 616 req->int1 = fd;
600 617
601 REQ_SEND (req); 618 REQ_SEND (req);
602} 619}
603 620
604void 621void
605aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef) 622aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
606 PROTOTYPE: $$$$;$ 623 PROTOTYPE: $$$$;$
607 PPCODE: 624 PPCODE:
608{ 625{
626 int fd = extract_fd (fh, 0);
609 dREQ; 627 dREQ;
610 628
611 req->type = EIO_SYNC_FILE_RANGE; 629 req->type = EIO_SYNC_FILE_RANGE;
612 req->sv1 = newSVsv (fh); 630 req->sv1 = newSVsv (fh);
613 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 631 req->int1 = fd;
614 req->offs = SvVAL64 (offset); 632 req->offs = SvVAL64 (offset);
615 req->size = SvVAL64 (nbytes); 633 req->size = SvVAL64 (nbytes);
616 req->int2 = flags; 634 req->int2 = flags;
617 635
618 REQ_SEND (req); 636 REQ_SEND (req);
… …
622aio_close (SV *fh, SV *callback=&PL_sv_undef) 640aio_close (SV *fh, SV *callback=&PL_sv_undef)
623 PROTOTYPE: $;$ 641 PROTOTYPE: $;$
624 PPCODE: 642 PPCODE:
625{ 643{
626 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 644 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
645 int fd = extract_fd (fh, 0);
627 dREQ; 646 dREQ;
628 647
629 if (close_pipe < 0) 648 if (close_pipe < 0)
630 { 649 {
631 int pipefd [2]; 650 int pipefd [2];
… …
639 } 658 }
640 659
641 req->type = EIO_DUP2; 660 req->type = EIO_DUP2;
642 req->int1 = close_pipe; 661 req->int1 = close_pipe;
643 req->sv2 = newSVsv (fh); 662 req->sv2 = newSVsv (fh);
644 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 663 req->int2 = fd;
645 664
646 REQ_SEND (req); 665 REQ_SEND (req);
647} 666}
648 667
649void 668void
… …
653 aio_write = EIO_WRITE 672 aio_write = EIO_WRITE
654 PROTOTYPE: $$$$$;$ 673 PROTOTYPE: $$$$$;$
655 PPCODE: 674 PPCODE:
656{ 675{
657 STRLEN svlen; 676 STRLEN svlen;
677 int fd = extract_fd (fh, ix == EIO_WRITE);
658 char *svptr = SvPVbyte (data, svlen); 678 char *svptr = SvPVbyte (data, svlen);
659 UV len = SvUV (length); 679 UV len = SvUV (length);
660
661 SvUPGRADE (data, SVt_PV);
662 SvPOK_on (data);
663 680
664 if (dataoffset < 0) 681 if (dataoffset < 0)
665 dataoffset += svlen; 682 dataoffset += svlen;
666 683
667 if (dataoffset < 0 || dataoffset > svlen) 684 if (dataoffset < 0 || dataoffset > svlen)
… …
673 if (!SvOK (length) || len + dataoffset > svlen) 690 if (!SvOK (length) || len + dataoffset > svlen)
674 len = svlen - dataoffset; 691 len = svlen - dataoffset;
675 } 692 }
676 else 693 else
677 { 694 {
678 /* read: grow scalar as necessary */ 695 /* read: check type and grow scalar as necessary */
696 SvUPGRADE (data, SVt_PV);
679 svptr = SvGROW (data, len + dataoffset + 1); 697 svptr = SvGROW (data, len + dataoffset + 1);
680 } 698 }
681
682 if (len < 0)
683 croak ("length must not be negative");
684 699
685 { 700 {
686 dREQ; 701 dREQ;
687 702
688 req->type = ix; 703 req->type = ix;
689 req->sv1 = newSVsv (fh); 704 req->sv1 = newSVsv (fh);
690 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 705 req->int1 = fd;
691 : IoOFP (sv_2io (fh)));
692 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 706 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
693 req->size = len; 707 req->size = len;
694 req->sv2 = SvREFCNT_inc (data); 708 req->sv2 = SvREFCNT_inc (data);
695 req->ptr2 = (char *)svptr + dataoffset; 709 req->ptr2 = (char *)svptr + dataoffset;
696 req->stroffset = dataoffset; 710 req->stroffset = dataoffset;
… …
723void 737void
724aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 738aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
725 PROTOTYPE: $$$$;$ 739 PROTOTYPE: $$$$;$
726 PPCODE: 740 PPCODE:
727{ 741{
742 int ifd = extract_fd (in_fh , 0);
743 int ofd = extract_fd (out_fh, 0);
728 dREQ; 744 dREQ;
729 745
730 req->type = EIO_SENDFILE; 746 req->type = EIO_SENDFILE;
731 req->sv1 = newSVsv (out_fh); 747 req->sv1 = newSVsv (out_fh);
732 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 748 req->int1 = ofd;
733 req->sv2 = newSVsv (in_fh); 749 req->sv2 = newSVsv (in_fh);
734 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 750 req->int2 = ifd;
735 req->offs = SvVAL64 (in_offset); 751 req->offs = SvVAL64 (in_offset);
736 req->size = length; 752 req->size = length;
737 753
738 REQ_SEND; 754 REQ_SEND;
739} 755}
… …
741void 757void
742aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 758aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
743 PROTOTYPE: $$$;$ 759 PROTOTYPE: $$$;$
744 PPCODE: 760 PPCODE:
745{ 761{
762 int fd = extract_fd (fh, 0);
746 dREQ; 763 dREQ;
747 764
748 req->type = EIO_READAHEAD; 765 req->type = EIO_READAHEAD;
749 req->sv1 = newSVsv (fh); 766 req->sv1 = newSVsv (fh);
750 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 767 req->int1 = fd;
751 req->offs = SvVAL64 (offset); 768 req->offs = SvVAL64 (offset);
752 req->size = length; 769 req->size = length;
753 770
754 REQ_SEND; 771 REQ_SEND;
755} 772}

Diff Legend

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