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.134 by root, Sun Apr 19 13:05:06 2009 UTC vs.
Revision 1.139 by root, Tue Apr 21 20:12:56 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:
… …
590 ALIAS: 605 ALIAS:
591 aio_fsync = EIO_FSYNC 606 aio_fsync = EIO_FSYNC
592 aio_fdatasync = EIO_FDATASYNC 607 aio_fdatasync = EIO_FDATASYNC
593 PPCODE: 608 PPCODE:
594{ 609{
610 int fd = extract_fd (fh, 0);
595 dREQ; 611 dREQ;
596 612
597 req->type = ix; 613 req->type = ix;
598 req->sv1 = newSVsv (fh); 614 req->sv1 = newSVsv (fh);
599 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 615 req->int1 = fd;
600 616
601 REQ_SEND (req); 617 REQ_SEND (req);
602} 618}
603 619
604void 620void
605aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef) 621aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
606 PROTOTYPE: $$$$;$ 622 PROTOTYPE: $$$$;$
607 PPCODE: 623 PPCODE:
608{ 624{
625 int fd = extract_fd (fh, 0);
609 dREQ; 626 dREQ;
610 627
611 req->type = EIO_SYNC_FILE_RANGE; 628 req->type = EIO_SYNC_FILE_RANGE;
612 req->sv1 = newSVsv (fh); 629 req->sv1 = newSVsv (fh);
613 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 630 req->int1 = fd;
614 req->offs = SvVAL64 (offset); 631 req->offs = SvVAL64 (offset);
615 req->size = SvVAL64 (nbytes); 632 req->size = SvVAL64 (nbytes);
616 req->int2 = flags; 633 req->int2 = flags;
617 634
618 REQ_SEND (req); 635 REQ_SEND (req);
… …
622aio_close (SV *fh, SV *callback=&PL_sv_undef) 639aio_close (SV *fh, SV *callback=&PL_sv_undef)
623 PROTOTYPE: $;$ 640 PROTOTYPE: $;$
624 PPCODE: 641 PPCODE:
625{ 642{
626 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 643 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
644 int fd = extract_fd (fh, 0);
627 dREQ; 645 dREQ;
628 646
629 if (close_pipe < 0) 647 if (close_pipe < 0)
630 { 648 {
631 int pipefd [2]; 649 int pipefd [2];
… …
639 } 657 }
640 658
641 req->type = EIO_DUP2; 659 req->type = EIO_DUP2;
642 req->int1 = close_pipe; 660 req->int1 = close_pipe;
643 req->sv2 = newSVsv (fh); 661 req->sv2 = newSVsv (fh);
644 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 662 req->int2 = fd;
645 663
646 REQ_SEND (req); 664 REQ_SEND (req);
647} 665}
648 666
649void 667void
… …
653 aio_write = EIO_WRITE 671 aio_write = EIO_WRITE
654 PROTOTYPE: $$$$$;$ 672 PROTOTYPE: $$$$$;$
655 PPCODE: 673 PPCODE:
656{ 674{
657 STRLEN svlen; 675 STRLEN svlen;
676 int fd = extract_fd (fh, ix == EIO_WRITE);
658 char *svptr = SvPVbyte (data, svlen); 677 char *svptr = SvPVbyte (data, svlen);
659 UV len = SvUV (length); 678 UV len = SvUV (length);
660 int fd;
661
662 if (SvTYPE (data) > SVt_PVMG)
663 croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data));
664
665 SvUPGRADE (data, SVt_PV);
666 SvPOK_only (data);
667 679
668 if (dataoffset < 0) 680 if (dataoffset < 0)
669 dataoffset += svlen; 681 dataoffset += svlen;
670 682
671 if (dataoffset < 0 || dataoffset > svlen) 683 if (dataoffset < 0 || dataoffset > svlen)
… …
677 if (!SvOK (length) || len + dataoffset > svlen) 689 if (!SvOK (length) || len + dataoffset > svlen)
678 len = svlen - dataoffset; 690 len = svlen - dataoffset;
679 } 691 }
680 else 692 else
681 { 693 {
682 /* read: grow scalar as necessary */ 694 /* read: check type and grow scalar as necessary */
695 SvUPGRADE (data, SVt_PV);
683 svptr = SvGROW (data, len + dataoffset + 1); 696 svptr = SvGROW (data, len + dataoffset + 1);
684 } 697 }
685
686 if (len < 0)
687 croak ("length must not be negative");
688
689 fd = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))
690 : IoOFP (sv_2io (fh)));
691
692 if (fd < 0)
693 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
694 698
695 { 699 {
696 dREQ; 700 dREQ;
697 701
698 req->type = ix; 702 req->type = ix;
699 req->sv1 = newSVsv (fh); 703 req->sv1 = newSVsv (fh);
700 req->int1 = df; 704 req->int1 = fd;
701 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 705 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
702 req->size = len; 706 req->size = len;
703 req->sv2 = SvREFCNT_inc (data); 707 req->sv2 = SvREFCNT_inc (data);
704 req->ptr2 = (char *)svptr + dataoffset; 708 req->ptr2 = (char *)svptr + dataoffset;
705 req->stroffset = dataoffset; 709 req->stroffset = dataoffset;
… …
732void 736void
733aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 737aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
734 PROTOTYPE: $$$$;$ 738 PROTOTYPE: $$$$;$
735 PPCODE: 739 PPCODE:
736{ 740{
741 int ifd = extract_fd (in_fh , 0);
742 int ofd = extract_fd (out_fh, 0);
737 dREQ; 743 dREQ;
738 744
739 req->type = EIO_SENDFILE; 745 req->type = EIO_SENDFILE;
740 req->sv1 = newSVsv (out_fh); 746 req->sv1 = newSVsv (out_fh);
741 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 747 req->int1 = ofd;
742 req->sv2 = newSVsv (in_fh); 748 req->sv2 = newSVsv (in_fh);
743 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 749 req->int2 = ifd;
744 req->offs = SvVAL64 (in_offset); 750 req->offs = SvVAL64 (in_offset);
745 req->size = length; 751 req->size = length;
746 752
747 REQ_SEND; 753 REQ_SEND;
748} 754}
… …
750void 756void
751aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 757aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
752 PROTOTYPE: $$$;$ 758 PROTOTYPE: $$$;$
753 PPCODE: 759 PPCODE:
754{ 760{
761 int fd = extract_fd (fh, 0);
755 dREQ; 762 dREQ;
756 763
757 req->type = EIO_READAHEAD; 764 req->type = EIO_READAHEAD;
758 req->sv1 = newSVsv (fh); 765 req->sv1 = newSVsv (fh);
759 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 766 req->int1 = fd;
760 req->offs = SvVAL64 (offset); 767 req->offs = SvVAL64 (offset);
761 req->size = length; 768 req->size = length;
762 769
763 REQ_SEND; 770 REQ_SEND;
764} 771}

Diff Legend

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