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.130 by root, Thu Oct 2 11:35:03 2008 UTC vs.
Revision 1.140 by root, Wed Jun 3 12:24:49 2009 UTC

… …
111 111
112#include "libeio/eio.h" 112#include "libeio/eio.h"
113 113
114static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
115#define EIO_FINISH(req) req_invoke (req) 115#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); 116static void req_destroy (eio_req *grp);
119#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
120 118
121enum { 119enum {
122 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
314 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
315 PUSHs (sv_2mortal (newSViv (req->result))); 313 PUSHs (sv_2mortal (newSViv (req->result)));
316 break; 314 break;
317 315
318 case EIO_READ: 316 case EIO_READ:
317 {
319 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));
320 *SvEND (req->sv2) = 0; 319 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2);
321 PUSHs (sv_2mortal (newSViv (req->result))); 322 PUSHs (sv_2mortal (newSViv (req->result)));
323 }
322 break; 324 break;
323 325
324 case EIO_DUP2: 326 case EIO_DUP2:
325 if (req->result > 0) 327 if (req->result > 0)
326 req->result = 0; 328 req->result = 0;
… …
501 req_submit (req); \ 503 req_submit (req); \
502 SPAGAIN; \ 504 SPAGAIN; \
503 \ 505 \
504 if (GIMME_V != G_VOID) \ 506 if (GIMME_V != G_VOID) \
505 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
506 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
507MODULE = IO::AIO PACKAGE = IO::AIO 520MODULE = IO::AIO PACKAGE = IO::AIO
508 521
509PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
510 523
511BOOT: 524BOOT:
512{ 525{
513 stash = gv_stashpv ("IO::AIO", 1); 526 stash = gv_stashpv ("IO::AIO", 1);
514 527
515 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
529 newCONSTSUB (stash, "ENOSYS", newSViv (ENOSYS));
516 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 530 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
517 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 531 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 532 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
519 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 533 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
520#ifndef _WIN32 534#ifndef _WIN32
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 535 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
522#endif 536#endif
537 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
538 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
539 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
540 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
523 541
524 create_respipe (); 542 create_respipe ();
525 543
526 if (eio_init (want_poll, done_poll) < 0) 544 if (eio_init (want_poll, done_poll) < 0)
527 croak ("IO::AIO: unable to initialise eio library"); 545 croak ("IO::AIO: unable to initialise eio library");
… …
588 ALIAS: 606 ALIAS:
589 aio_fsync = EIO_FSYNC 607 aio_fsync = EIO_FSYNC
590 aio_fdatasync = EIO_FDATASYNC 608 aio_fdatasync = EIO_FDATASYNC
591 PPCODE: 609 PPCODE:
592{ 610{
611 int fd = extract_fd (fh, 0);
593 dREQ; 612 dREQ;
594 613
595 req->type = ix; 614 req->type = ix;
596 req->sv1 = newSVsv (fh); 615 req->sv1 = newSVsv (fh);
597 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 616 req->int1 = fd;
617
618 REQ_SEND (req);
619}
620
621void
622aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
623 PROTOTYPE: $$$$;$
624 PPCODE:
625{
626 int fd = extract_fd (fh, 0);
627 dREQ;
628
629 req->type = EIO_SYNC_FILE_RANGE;
630 req->sv1 = newSVsv (fh);
631 req->int1 = fd;
632 req->offs = SvVAL64 (offset);
633 req->size = SvVAL64 (nbytes);
634 req->int2 = flags;
598 635
599 REQ_SEND (req); 636 REQ_SEND (req);
600} 637}
601 638
602void 639void
603aio_close (SV *fh, SV *callback=&PL_sv_undef) 640aio_close (SV *fh, SV *callback=&PL_sv_undef)
604 PROTOTYPE: $;$ 641 PROTOTYPE: $;$
605 PPCODE: 642 PPCODE:
606{ 643{
607 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);
608 dREQ; 646 dREQ;
609 647
610 if (close_pipe < 0) 648 if (close_pipe < 0)
611 { 649 {
612 int pipefd [2]; 650 int pipefd [2];
… …
620 } 658 }
621 659
622 req->type = EIO_DUP2; 660 req->type = EIO_DUP2;
623 req->int1 = close_pipe; 661 req->int1 = close_pipe;
624 req->sv2 = newSVsv (fh); 662 req->sv2 = newSVsv (fh);
625 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 663 req->int2 = fd;
626 664
627 REQ_SEND (req); 665 REQ_SEND (req);
628} 666}
629 667
630void 668void
… …
634 aio_write = EIO_WRITE 672 aio_write = EIO_WRITE
635 PROTOTYPE: $$$$$;$ 673 PROTOTYPE: $$$$$;$
636 PPCODE: 674 PPCODE:
637{ 675{
638 STRLEN svlen; 676 STRLEN svlen;
677 int fd = extract_fd (fh, ix == EIO_WRITE);
639 char *svptr = SvPVbyte (data, svlen); 678 char *svptr = SvPVbyte (data, svlen);
640 UV len = SvUV (length); 679 UV len = SvUV (length);
641
642 SvUPGRADE (data, SVt_PV);
643 SvPOK_on (data);
644 680
645 if (dataoffset < 0) 681 if (dataoffset < 0)
646 dataoffset += svlen; 682 dataoffset += svlen;
647 683
648 if (dataoffset < 0 || dataoffset > svlen) 684 if (dataoffset < 0 || dataoffset > svlen)
… …
654 if (!SvOK (length) || len + dataoffset > svlen) 690 if (!SvOK (length) || len + dataoffset > svlen)
655 len = svlen - dataoffset; 691 len = svlen - dataoffset;
656 } 692 }
657 else 693 else
658 { 694 {
659 /* read: grow scalar as necessary */ 695 /* read: check type and grow scalar as necessary */
696 SvUPGRADE (data, SVt_PV);
660 svptr = SvGROW (data, len + dataoffset + 1); 697 svptr = SvGROW (data, len + dataoffset + 1);
661 } 698 }
662
663 if (len < 0)
664 croak ("length must not be negative");
665 699
666 { 700 {
667 dREQ; 701 dREQ;
668 702
669 req->type = ix; 703 req->type = ix;
670 req->sv1 = newSVsv (fh); 704 req->sv1 = newSVsv (fh);
671 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 705 req->int1 = fd;
672 : IoOFP (sv_2io (fh)));
673 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 706 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
674 req->size = len; 707 req->size = len;
675 req->sv2 = SvREFCNT_inc_NN (data); 708 req->sv2 = SvREFCNT_inc (data);
676 req->ptr2 = (char *)svptr + dataoffset; 709 req->ptr2 = (char *)svptr + dataoffset;
677 req->stroffset = dataoffset; 710 req->stroffset = dataoffset;
678 711
679 if (!SvREADONLY (data)) 712 if (!SvREADONLY (data))
680 { 713 {
… …
704void 737void
705aio_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)
706 PROTOTYPE: $$$$;$ 739 PROTOTYPE: $$$$;$
707 PPCODE: 740 PPCODE:
708{ 741{
742 int ifd = extract_fd (in_fh , 0);
743 int ofd = extract_fd (out_fh, 0);
709 dREQ; 744 dREQ;
710 745
711 req->type = EIO_SENDFILE; 746 req->type = EIO_SENDFILE;
712 req->sv1 = newSVsv (out_fh); 747 req->sv1 = newSVsv (out_fh);
713 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 748 req->int1 = ofd;
714 req->sv2 = newSVsv (in_fh); 749 req->sv2 = newSVsv (in_fh);
715 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 750 req->int2 = ifd;
716 req->offs = SvVAL64 (in_offset); 751 req->offs = SvVAL64 (in_offset);
717 req->size = length; 752 req->size = length;
718 753
719 REQ_SEND; 754 REQ_SEND;
720} 755}
… …
722void 757void
723aio_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)
724 PROTOTYPE: $$$;$ 759 PROTOTYPE: $$$;$
725 PPCODE: 760 PPCODE:
726{ 761{
762 int fd = extract_fd (fh, 0);
727 dREQ; 763 dREQ;
728 764
729 req->type = EIO_READAHEAD; 765 req->type = EIO_READAHEAD;
730 req->sv1 = newSVsv (fh); 766 req->sv1 = newSVsv (fh);
731 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 767 req->int1 = fd;
732 req->offs = SvVAL64 (offset); 768 req->offs = SvVAL64 (offset);
733 req->size = length; 769 req->size = length;
734 770
735 REQ_SEND; 771 REQ_SEND;
736} 772}
… …
1133void 1169void
1134feed (aio_req grp, SV *callback=&PL_sv_undef) 1170feed (aio_req grp, SV *callback=&PL_sv_undef)
1135 CODE: 1171 CODE:
1136{ 1172{
1137 SvREFCNT_dec (grp->sv2); 1173 SvREFCNT_dec (grp->sv2);
1138 grp->sv2 = newSVsv (callback); 1174 grp->sv2 = newSVsv (callback);
1175 grp->feed = aio_grp_feed;
1139 1176
1140 if (grp->int2 <= 0) 1177 if (grp->int2 <= 0)
1141 grp->int2 = 2; 1178 grp->int2 = 2;
1142 1179
1143 eio_grp_limit (grp, grp->int2); 1180 eio_grp_limit (grp, grp->int2);

Diff Legend

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