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.138 by root, Tue Apr 21 20:06:05 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:
… …
518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 531 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
519 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 532 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
520#ifndef _WIN32 533#ifndef _WIN32
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 534 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
522#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));
523 540
524 create_respipe (); 541 create_respipe ();
525 542
526 if (eio_init (want_poll, done_poll) < 0) 543 if (eio_init (want_poll, done_poll) < 0)
527 croak ("IO::AIO: unable to initialise eio library"); 544 croak ("IO::AIO: unable to initialise eio library");
… …
588 ALIAS: 605 ALIAS:
589 aio_fsync = EIO_FSYNC 606 aio_fsync = EIO_FSYNC
590 aio_fdatasync = EIO_FDATASYNC 607 aio_fdatasync = EIO_FDATASYNC
591 PPCODE: 608 PPCODE:
592{ 609{
610 int fd = extract_fd (fh, 0);
593 dREQ; 611 dREQ;
594 612
595 req->type = ix; 613 req->type = ix;
596 req->sv1 = newSVsv (fh); 614 req->sv1 = newSVsv (fh);
597 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;
598 634
599 REQ_SEND (req); 635 REQ_SEND (req);
600} 636}
601 637
602void 638void
603aio_close (SV *fh, SV *callback=&PL_sv_undef) 639aio_close (SV *fh, SV *callback=&PL_sv_undef)
604 PROTOTYPE: $;$ 640 PROTOTYPE: $;$
605 PPCODE: 641 PPCODE:
606{ 642{
607 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);
608 dREQ; 645 dREQ;
609 646
610 if (close_pipe < 0) 647 if (close_pipe < 0)
611 { 648 {
612 int pipefd [2]; 649 int pipefd [2];
… …
620 } 657 }
621 658
622 req->type = EIO_DUP2; 659 req->type = EIO_DUP2;
623 req->int1 = close_pipe; 660 req->int1 = close_pipe;
624 req->sv2 = newSVsv (fh); 661 req->sv2 = newSVsv (fh);
625 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 662 req->int2 = fd;
626 663
627 REQ_SEND (req); 664 REQ_SEND (req);
628} 665}
629 666
630void 667void
… …
634 aio_write = EIO_WRITE 671 aio_write = EIO_WRITE
635 PROTOTYPE: $$$$$;$ 672 PROTOTYPE: $$$$$;$
636 PPCODE: 673 PPCODE:
637{ 674{
638 STRLEN svlen; 675 STRLEN svlen;
676 int fd = extract_fd (fh, ix == EIO_WRITE);
639 char *svptr = SvPVbyte (data, svlen); 677 char *svptr = SvPVbyte (data, svlen);
640 UV len = SvUV (length); 678 UV len = SvUV (length);
641
642 SvUPGRADE (data, SVt_PV);
643 SvPOK_on (data);
644 679
645 if (dataoffset < 0) 680 if (dataoffset < 0)
646 dataoffset += svlen; 681 dataoffset += svlen;
647 682
648 if (dataoffset < 0 || dataoffset > svlen) 683 if (dataoffset < 0 || dataoffset > svlen)
… …
654 if (!SvOK (length) || len + dataoffset > svlen) 689 if (!SvOK (length) || len + dataoffset > svlen)
655 len = svlen - dataoffset; 690 len = svlen - dataoffset;
656 } 691 }
657 else 692 else
658 { 693 {
659 /* read: grow scalar as necessary */ 694 /* read: check type and grow scalar as necessary */
695 SvUPGRADE (data, SVt_PV);
660 svptr = SvGROW (data, len + dataoffset + 1); 696 svptr = SvGROW (data, len + dataoffset + 1);
661 } 697 }
662 698
663 if (len < 0) 699 if (len < 0)
664 croak ("length must not be negative"); 700 croak ("length must not be negative");
… …
666 { 702 {
667 dREQ; 703 dREQ;
668 704
669 req->type = ix; 705 req->type = ix;
670 req->sv1 = newSVsv (fh); 706 req->sv1 = newSVsv (fh);
671 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 707 req->int1 = fd;
672 : IoOFP (sv_2io (fh)));
673 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 708 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
674 req->size = len; 709 req->size = len;
675 req->sv2 = SvREFCNT_inc_NN (data); 710 req->sv2 = SvREFCNT_inc (data);
676 req->ptr2 = (char *)svptr + dataoffset; 711 req->ptr2 = (char *)svptr + dataoffset;
677 req->stroffset = dataoffset; 712 req->stroffset = dataoffset;
678 713
679 if (!SvREADONLY (data)) 714 if (!SvREADONLY (data))
680 { 715 {
… …
704void 739void
705aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 740aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
706 PROTOTYPE: $$$$;$ 741 PROTOTYPE: $$$$;$
707 PPCODE: 742 PPCODE:
708{ 743{
744 int ifd = extract_fd (in_fh , 0);
745 int ofd = extract_fd (out_fh, 0);
709 dREQ; 746 dREQ;
710 747
711 req->type = EIO_SENDFILE; 748 req->type = EIO_SENDFILE;
712 req->sv1 = newSVsv (out_fh); 749 req->sv1 = newSVsv (out_fh);
713 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 750 req->int1 = ofd;
714 req->sv2 = newSVsv (in_fh); 751 req->sv2 = newSVsv (in_fh);
715 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 752 req->int2 = ifd;
716 req->offs = SvVAL64 (in_offset); 753 req->offs = SvVAL64 (in_offset);
717 req->size = length; 754 req->size = length;
718 755
719 REQ_SEND; 756 REQ_SEND;
720} 757}
… …
722void 759void
723aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 760aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
724 PROTOTYPE: $$$;$ 761 PROTOTYPE: $$$;$
725 PPCODE: 762 PPCODE:
726{ 763{
764 int fd = extract_fd (fh, 0);
727 dREQ; 765 dREQ;
728 766
729 req->type = EIO_READAHEAD; 767 req->type = EIO_READAHEAD;
730 req->sv1 = newSVsv (fh); 768 req->sv1 = newSVsv (fh);
731 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 769 req->int1 = fd;
732 req->offs = SvVAL64 (offset); 770 req->offs = SvVAL64 (offset);
733 req->size = length; 771 req->size = length;
734 772
735 REQ_SEND; 773 REQ_SEND;
736} 774}
… …
1133void 1171void
1134feed (aio_req grp, SV *callback=&PL_sv_undef) 1172feed (aio_req grp, SV *callback=&PL_sv_undef)
1135 CODE: 1173 CODE:
1136{ 1174{
1137 SvREFCNT_dec (grp->sv2); 1175 SvREFCNT_dec (grp->sv2);
1138 grp->sv2 = newSVsv (callback); 1176 grp->sv2 = newSVsv (callback);
1177 grp->feed = aio_grp_feed;
1139 1178
1140 if (grp->int2 <= 0) 1179 if (grp->int2 <= 0)
1141 grp->int2 = 2; 1180 grp->int2 = 2;
1142 1181
1143 eio_grp_limit (grp, grp->int2); 1182 eio_grp_limit (grp, grp->int2);

Diff Legend

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