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.127 by root, Tue Sep 30 13:17:32 2008 UTC vs.
Revision 1.136 by root, Sun Apr 19 13:15:55 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 */
… …
214 dSP; 212 dSP;
215 213
216 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
217 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
218 216
219 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
220 { 218 {
221 ENTER; 219 ENTER;
222 SAVETMPS; 220 SAVETMPS;
223 PUSHMARK (SP); 221 PUSHMARK (SP);
224 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
461static void atfork_child (void) 459static void atfork_child (void)
462{ 460{
463 create_respipe (); 461 create_respipe ();
464} 462}
465 463
464static SV *
465get_cb (SV *cb_sv)
466{
467 HV *st;
468 GV *gvp;
469 CV *cv;
470
471 if (!SvOK (cb_sv))
472 return 0;
473
474 cv = sv_2cv (cb_sv, &st, &gvp, 0);
475
476 if (!cv)
477 croak ("IO::AIO callback must be undef or a CODE reference");
478
479 return (SV *)cv;
480}
481
466#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
467 aio_req req; \ 484 aio_req req; \
468 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
469 next_pri = EIO_PRI_DEFAULT; \ 486 next_pri = EIO_PRI_DEFAULT; \
470 \ 487 \
471 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
472 croak ("callback must be undef or of reference type"); \
473 \ 489 \
474 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
475 if (!req) \ 491 if (!req) \
476 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
477 \ 493 \
478 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
479 req->pri = req_pri 495 req->pri = req_pri
480 496
481#define REQ_SEND \ 497#define REQ_SEND \
482 PUTBACK; \ 498 PUTBACK; \
483 req_submit (req); \ 499 req_submit (req); \
484 SPAGAIN; \ 500 SPAGAIN; \
485 \ 501 \
486 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
487 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
488 504
505static int
506extract_fd (SV *fh, int wr)
507{
508 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
509
510 if (fd < 0)
511 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
512
513 return fd;
514}
515
489MODULE = IO::AIO PACKAGE = IO::AIO 516MODULE = IO::AIO PACKAGE = IO::AIO
490 517
491PROTOTYPES: ENABLE 518PROTOTYPES: ENABLE
492 519
493BOOT: 520BOOT:
… …
500 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 527 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
501 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 528 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
502#ifndef _WIN32 529#ifndef _WIN32
503 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 530 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
504#endif 531#endif
532 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
533 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
534 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
535 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
505 536
506 create_respipe (); 537 create_respipe ();
507 538
508 if (eio_init (want_poll, done_poll) < 0) 539 if (eio_init (want_poll, done_poll) < 0)
509 croak ("IO::AIO: unable to initialise eio library"); 540 croak ("IO::AIO: unable to initialise eio library");
… …
570 ALIAS: 601 ALIAS:
571 aio_fsync = EIO_FSYNC 602 aio_fsync = EIO_FSYNC
572 aio_fdatasync = EIO_FDATASYNC 603 aio_fdatasync = EIO_FDATASYNC
573 PPCODE: 604 PPCODE:
574{ 605{
606 int fd = extract_fd (fh, 0);
575 dREQ; 607 dREQ;
576 608
577 req->type = ix; 609 req->type = ix;
578 req->sv1 = newSVsv (fh); 610 req->sv1 = newSVsv (fh);
579 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 611 req->int1 = fd;
612
613 REQ_SEND (req);
614}
615
616void
617aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
618 PROTOTYPE: $$$$;$
619 PPCODE:
620{
621 int fd = extract_fd (fh, 0);
622 dREQ;
623
624 req->type = EIO_SYNC_FILE_RANGE;
625 req->sv1 = newSVsv (fh);
626 req->int1 = fd;
627 req->offs = SvVAL64 (offset);
628 req->size = SvVAL64 (nbytes);
629 req->int2 = flags;
580 630
581 REQ_SEND (req); 631 REQ_SEND (req);
582} 632}
583 633
584void 634void
585aio_close (SV *fh, SV *callback=&PL_sv_undef) 635aio_close (SV *fh, SV *callback=&PL_sv_undef)
586 PROTOTYPE: $;$ 636 PROTOTYPE: $;$
587 PPCODE: 637 PPCODE:
588{ 638{
589 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 639 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
640 int fd = extract_fd (fh, 0);
590 dREQ; 641 dREQ;
591 642
592 if (close_pipe < 0) 643 if (close_pipe < 0)
593 { 644 {
594 int pipefd [2]; 645 int pipefd [2];
… …
602 } 653 }
603 654
604 req->type = EIO_DUP2; 655 req->type = EIO_DUP2;
605 req->int1 = close_pipe; 656 req->int1 = close_pipe;
606 req->sv2 = newSVsv (fh); 657 req->sv2 = newSVsv (fh);
607 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 658 req->int2 = fd;
608 659
609 REQ_SEND (req); 660 REQ_SEND (req);
610} 661}
611 662
612void 663void
… …
618 PPCODE: 669 PPCODE:
619{ 670{
620 STRLEN svlen; 671 STRLEN svlen;
621 char *svptr = SvPVbyte (data, svlen); 672 char *svptr = SvPVbyte (data, svlen);
622 UV len = SvUV (length); 673 UV len = SvUV (length);
674 int fd;
675
676 if (SvTYPE (data) > SVt_PVMG)
677 croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data));
623 678
624 SvUPGRADE (data, SVt_PV); 679 SvUPGRADE (data, SVt_PV);
625 SvPOK_on (data); 680 SvPOK_only (data);
626 681
627 if (dataoffset < 0) 682 if (dataoffset < 0)
628 dataoffset += svlen; 683 dataoffset += svlen;
629 684
630 if (dataoffset < 0 || dataoffset > svlen) 685 if (dataoffset < 0 || dataoffset > svlen)
… …
643 } 698 }
644 699
645 if (len < 0) 700 if (len < 0)
646 croak ("length must not be negative"); 701 croak ("length must not be negative");
647 702
703 fd = extract_fd (fh, ix == EIO_WRITE);
704
648 { 705 {
649 dREQ; 706 dREQ;
650 707
651 req->type = ix; 708 req->type = ix;
652 req->sv1 = newSVsv (fh); 709 req->sv1 = newSVsv (fh);
653 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 710 req->int1 = fd;
654 : IoOFP (sv_2io (fh)));
655 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 711 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
656 req->size = len; 712 req->size = len;
657 req->sv2 = SvREFCNT_inc (data); 713 req->sv2 = SvREFCNT_inc (data);
658 req->ptr2 = (char *)svptr + dataoffset; 714 req->ptr2 = (char *)svptr + dataoffset;
659 req->stroffset = dataoffset; 715 req->stroffset = dataoffset;
… …
686void 742void
687aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 743aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
688 PROTOTYPE: $$$$;$ 744 PROTOTYPE: $$$$;$
689 PPCODE: 745 PPCODE:
690{ 746{
747 int ifd = extract_fd (in_fh , 0);
748 int ofd = extract_fd (out_fh, 0);
691 dREQ; 749 dREQ;
692 750
693 req->type = EIO_SENDFILE; 751 req->type = EIO_SENDFILE;
694 req->sv1 = newSVsv (out_fh); 752 req->sv1 = newSVsv (out_fh);
695 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 753 req->int1 = ofd;
696 req->sv2 = newSVsv (in_fh); 754 req->sv2 = newSVsv (in_fh);
697 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 755 req->int2 = ifd;
698 req->offs = SvVAL64 (in_offset); 756 req->offs = SvVAL64 (in_offset);
699 req->size = length; 757 req->size = length;
700 758
701 REQ_SEND; 759 REQ_SEND;
702} 760}
… …
704void 762void
705aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 763aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
706 PROTOTYPE: $$$;$ 764 PROTOTYPE: $$$;$
707 PPCODE: 765 PPCODE:
708{ 766{
767 int fd = extract_fd (fh, 0);
709 dREQ; 768 dREQ;
710 769
711 req->type = EIO_READAHEAD; 770 req->type = EIO_READAHEAD;
712 req->sv1 = newSVsv (fh); 771 req->sv1 = newSVsv (fh);
713 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 772 req->int1 = fd;
714 req->offs = SvVAL64 (offset); 773 req->offs = SvVAL64 (offset);
715 req->size = length; 774 req->size = length;
716 775
717 REQ_SEND; 776 REQ_SEND;
718} 777}
… …
1038 CODE: 1097 CODE:
1039 eio_cancel (req); 1098 eio_cancel (req);
1040 1099
1041void 1100void
1042cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1101cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1043 CODE: 1102 PPCODE:
1103{
1104 if (GIMME_V != G_VOID)
1105 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1106
1107 if (items > 1)
1108 {
1109 SV *cb_cv = get_cb (callback);
1110
1044 SvREFCNT_dec (req->callback); 1111 SvREFCNT_dec (req->callback);
1045 req->callback = newSVsv (callback); 1112 req->callback = SvREFCNT_inc (cb_cv);
1113 }
1114}
1046 1115
1047MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1116MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1048 1117
1049void 1118void
1050add (aio_req grp, ...) 1119add (aio_req grp, ...)
… …
1105void 1174void
1106feed (aio_req grp, SV *callback=&PL_sv_undef) 1175feed (aio_req grp, SV *callback=&PL_sv_undef)
1107 CODE: 1176 CODE:
1108{ 1177{
1109 SvREFCNT_dec (grp->sv2); 1178 SvREFCNT_dec (grp->sv2);
1110 grp->sv2 = newSVsv (callback); 1179 grp->sv2 = newSVsv (callback);
1180 grp->feed = aio_grp_feed;
1111 1181
1112 if (grp->int2 <= 0) 1182 if (grp->int2 <= 0)
1113 grp->int2 = 2; 1183 grp->int2 = 2;
1114 1184
1115 eio_grp_limit (grp, grp->int2); 1185 eio_grp_limit (grp, grp->int2);

Diff Legend

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