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.131 by root, Sun Oct 12 22:30:33 2008 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:
… …
516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 531 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
517 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 532 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
518#ifndef _WIN32 533#ifndef _WIN32
519 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 534 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
520#endif 535#endif
536 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
537 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
538 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
539 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
521 540
522 create_respipe (); 541 create_respipe ();
523 542
524 if (eio_init (want_poll, done_poll) < 0) 543 if (eio_init (want_poll, done_poll) < 0)
525 croak ("IO::AIO: unable to initialise eio library"); 544 croak ("IO::AIO: unable to initialise eio library");
… …
586 ALIAS: 605 ALIAS:
587 aio_fsync = EIO_FSYNC 606 aio_fsync = EIO_FSYNC
588 aio_fdatasync = EIO_FDATASYNC 607 aio_fdatasync = EIO_FDATASYNC
589 PPCODE: 608 PPCODE:
590{ 609{
610 int fd = extract_fd (fh, 0);
591 dREQ; 611 dREQ;
592 612
593 req->type = ix; 613 req->type = ix;
594 req->sv1 = newSVsv (fh); 614 req->sv1 = newSVsv (fh);
595 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 615 req->int1 = fd;
616
617 REQ_SEND (req);
618}
619
620void
621aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
622 PROTOTYPE: $$$$;$
623 PPCODE:
624{
625 int fd = extract_fd (fh, 0);
626 dREQ;
627
628 req->type = EIO_SYNC_FILE_RANGE;
629 req->sv1 = newSVsv (fh);
630 req->int1 = fd;
631 req->offs = SvVAL64 (offset);
632 req->size = SvVAL64 (nbytes);
633 req->int2 = flags;
596 634
597 REQ_SEND (req); 635 REQ_SEND (req);
598} 636}
599 637
600void 638void
601aio_close (SV *fh, SV *callback=&PL_sv_undef) 639aio_close (SV *fh, SV *callback=&PL_sv_undef)
602 PROTOTYPE: $;$ 640 PROTOTYPE: $;$
603 PPCODE: 641 PPCODE:
604{ 642{
605 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);
606 dREQ; 645 dREQ;
607 646
608 if (close_pipe < 0) 647 if (close_pipe < 0)
609 { 648 {
610 int pipefd [2]; 649 int pipefd [2];
… …
618 } 657 }
619 658
620 req->type = EIO_DUP2; 659 req->type = EIO_DUP2;
621 req->int1 = close_pipe; 660 req->int1 = close_pipe;
622 req->sv2 = newSVsv (fh); 661 req->sv2 = newSVsv (fh);
623 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 662 req->int2 = fd;
624 663
625 REQ_SEND (req); 664 REQ_SEND (req);
626} 665}
627 666
628void 667void
… …
632 aio_write = EIO_WRITE 671 aio_write = EIO_WRITE
633 PROTOTYPE: $$$$$;$ 672 PROTOTYPE: $$$$$;$
634 PPCODE: 673 PPCODE:
635{ 674{
636 STRLEN svlen; 675 STRLEN svlen;
676 int fd = extract_fd (fh, ix == EIO_WRITE);
637 char *svptr = SvPVbyte (data, svlen); 677 char *svptr = SvPVbyte (data, svlen);
638 UV len = SvUV (length); 678 UV len = SvUV (length);
639
640 SvUPGRADE (data, SVt_PV);
641 SvPOK_on (data);
642 679
643 if (dataoffset < 0) 680 if (dataoffset < 0)
644 dataoffset += svlen; 681 dataoffset += svlen;
645 682
646 if (dataoffset < 0 || dataoffset > svlen) 683 if (dataoffset < 0 || dataoffset > svlen)
… …
652 if (!SvOK (length) || len + dataoffset > svlen) 689 if (!SvOK (length) || len + dataoffset > svlen)
653 len = svlen - dataoffset; 690 len = svlen - dataoffset;
654 } 691 }
655 else 692 else
656 { 693 {
657 /* read: grow scalar as necessary */ 694 /* read: check type and grow scalar as necessary */
695 SvUPGRADE (data, SVt_PV);
658 svptr = SvGROW (data, len + dataoffset + 1); 696 svptr = SvGROW (data, len + dataoffset + 1);
659 } 697 }
660
661 if (len < 0)
662 croak ("length must not be negative");
663 698
664 { 699 {
665 dREQ; 700 dREQ;
666 701
667 req->type = ix; 702 req->type = ix;
668 req->sv1 = newSVsv (fh); 703 req->sv1 = newSVsv (fh);
669 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 704 req->int1 = fd;
670 : IoOFP (sv_2io (fh)));
671 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 705 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
672 req->size = len; 706 req->size = len;
673 req->sv2 = SvREFCNT_inc_NN (data); 707 req->sv2 = SvREFCNT_inc (data);
674 req->ptr2 = (char *)svptr + dataoffset; 708 req->ptr2 = (char *)svptr + dataoffset;
675 req->stroffset = dataoffset; 709 req->stroffset = dataoffset;
676 710
677 if (!SvREADONLY (data)) 711 if (!SvREADONLY (data))
678 { 712 {
… …
702void 736void
703aio_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)
704 PROTOTYPE: $$$$;$ 738 PROTOTYPE: $$$$;$
705 PPCODE: 739 PPCODE:
706{ 740{
741 int ifd = extract_fd (in_fh , 0);
742 int ofd = extract_fd (out_fh, 0);
707 dREQ; 743 dREQ;
708 744
709 req->type = EIO_SENDFILE; 745 req->type = EIO_SENDFILE;
710 req->sv1 = newSVsv (out_fh); 746 req->sv1 = newSVsv (out_fh);
711 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 747 req->int1 = ofd;
712 req->sv2 = newSVsv (in_fh); 748 req->sv2 = newSVsv (in_fh);
713 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 749 req->int2 = ifd;
714 req->offs = SvVAL64 (in_offset); 750 req->offs = SvVAL64 (in_offset);
715 req->size = length; 751 req->size = length;
716 752
717 REQ_SEND; 753 REQ_SEND;
718} 754}
… …
720void 756void
721aio_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)
722 PROTOTYPE: $$$;$ 758 PROTOTYPE: $$$;$
723 PPCODE: 759 PPCODE:
724{ 760{
761 int fd = extract_fd (fh, 0);
725 dREQ; 762 dREQ;
726 763
727 req->type = EIO_READAHEAD; 764 req->type = EIO_READAHEAD;
728 req->sv1 = newSVsv (fh); 765 req->sv1 = newSVsv (fh);
729 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 766 req->int1 = fd;
730 req->offs = SvVAL64 (offset); 767 req->offs = SvVAL64 (offset);
731 req->size = length; 768 req->size = length;
732 769
733 REQ_SEND; 770 REQ_SEND;
734} 771}

Diff Legend

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