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.126 by root, Thu Sep 25 07:56:07 2008 UTC vs.
Revision 1.136 by root, Sun Apr 19 13:15:55 2009 UTC

… …
80# define SvVAL64 SvIV 80# define SvVAL64 SvIV
81#else 81#else
82# define SvVAL64 SvNV 82# define SvVAL64 SvNV
83#endif 83#endif
84 84
85/*****************************************************************************/
86
87#if __GNUC__ >= 3
88# define expect(expr,value) __builtin_expect ((expr),(value))
89#else
90# define expect(expr,value) (expr)
91#endif
92
93#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1)
95
96/*****************************************************************************/
97
85static HV *stash; 98static HV *stash;
86typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
87 100
88#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
89#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
… …
98 111
99#include "libeio/eio.h" 112#include "libeio/eio.h"
100 113
101static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
102#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
103static void aio_grp_feed (eio_req *grp);
104#define EIO_FEED(req) aio_grp_feed (req)
105static void req_destroy (eio_req *grp); 116static void req_destroy (eio_req *grp);
106#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
107 118
108enum { 119enum {
109 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
181 192
182static void req_submit (eio_req *req) 193static void req_submit (eio_req *req)
183{ 194{
184 eio_submit (req); 195 eio_submit (req);
185 196
186 if (on_next_submit) 197 if (expect_false (on_next_submit))
187 { 198 {
188 dSP; 199 dSP;
189 SV *cb = sv_2mortal (on_next_submit); 200 SV *cb = sv_2mortal (on_next_submit);
190 201
191 on_next_submit = 0; 202 on_next_submit = 0;
… …
201 dSP; 212 dSP;
202 213
203 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
204 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
205 216
206 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
207 { 218 {
208 ENTER; 219 ENTER;
209 SAVETMPS; 220 SAVETMPS;
210 PUSHMARK (SP); 221 PUSHMARK (SP);
211 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
448static void atfork_child (void) 459static void atfork_child (void)
449{ 460{
450 create_respipe (); 461 create_respipe ();
451} 462}
452 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
453#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
454 aio_req req; \ 484 aio_req req; \
455 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
456 next_pri = EIO_PRI_DEFAULT; \ 486 next_pri = EIO_PRI_DEFAULT; \
457 \ 487 \
458 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
459 croak ("callback must be undef or of reference type"); \
460 \ 489 \
461 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
462 if (!req) \ 491 if (!req) \
463 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
464 \ 493 \
465 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
466 req->pri = req_pri 495 req->pri = req_pri
467 496
468#define REQ_SEND \ 497#define REQ_SEND \
469 PUTBACK; \ 498 PUTBACK; \
470 req_submit (req); \ 499 req_submit (req); \
471 SPAGAIN; \ 500 SPAGAIN; \
472 \ 501 \
473 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
474 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
475 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
476MODULE = IO::AIO PACKAGE = IO::AIO 516MODULE = IO::AIO PACKAGE = IO::AIO
477 517
478PROTOTYPES: ENABLE 518PROTOTYPES: ENABLE
479 519
480BOOT: 520BOOT:
… …
487 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 527 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
488 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 528 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
489#ifndef _WIN32 529#ifndef _WIN32
490 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 530 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
491#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));
492 536
493 create_respipe (); 537 create_respipe ();
494 538
495 if (eio_init (want_poll, done_poll) < 0) 539 if (eio_init (want_poll, done_poll) < 0)
496 croak ("IO::AIO: unable to initialise eio library"); 540 croak ("IO::AIO: unable to initialise eio library");
… …
557 ALIAS: 601 ALIAS:
558 aio_fsync = EIO_FSYNC 602 aio_fsync = EIO_FSYNC
559 aio_fdatasync = EIO_FDATASYNC 603 aio_fdatasync = EIO_FDATASYNC
560 PPCODE: 604 PPCODE:
561{ 605{
606 int fd = extract_fd (fh, 0);
562 dREQ; 607 dREQ;
563 608
564 req->type = ix; 609 req->type = ix;
565 req->sv1 = newSVsv (fh); 610 req->sv1 = newSVsv (fh);
566 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;
567 630
568 REQ_SEND (req); 631 REQ_SEND (req);
569} 632}
570 633
571void 634void
572aio_close (SV *fh, SV *callback=&PL_sv_undef) 635aio_close (SV *fh, SV *callback=&PL_sv_undef)
573 PROTOTYPE: $;$ 636 PROTOTYPE: $;$
574 PPCODE: 637 PPCODE:
575{ 638{
576 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);
577 dREQ; 641 dREQ;
578 642
579 if (close_pipe < 0) 643 if (close_pipe < 0)
580 { 644 {
581 int pipefd [2]; 645 int pipefd [2];
… …
589 } 653 }
590 654
591 req->type = EIO_DUP2; 655 req->type = EIO_DUP2;
592 req->int1 = close_pipe; 656 req->int1 = close_pipe;
593 req->sv2 = newSVsv (fh); 657 req->sv2 = newSVsv (fh);
594 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 658 req->int2 = fd;
595 659
596 REQ_SEND (req); 660 REQ_SEND (req);
597} 661}
598 662
599void 663void
… …
605 PPCODE: 669 PPCODE:
606{ 670{
607 STRLEN svlen; 671 STRLEN svlen;
608 char *svptr = SvPVbyte (data, svlen); 672 char *svptr = SvPVbyte (data, svlen);
609 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));
610 678
611 SvUPGRADE (data, SVt_PV); 679 SvUPGRADE (data, SVt_PV);
612 SvPOK_on (data); 680 SvPOK_only (data);
613 681
614 if (dataoffset < 0) 682 if (dataoffset < 0)
615 dataoffset += svlen; 683 dataoffset += svlen;
616 684
617 if (dataoffset < 0 || dataoffset > svlen) 685 if (dataoffset < 0 || dataoffset > svlen)
… …
630 } 698 }
631 699
632 if (len < 0) 700 if (len < 0)
633 croak ("length must not be negative"); 701 croak ("length must not be negative");
634 702
703 fd = extract_fd (fh, ix == EIO_WRITE);
704
635 { 705 {
636 dREQ; 706 dREQ;
637 707
638 req->type = ix; 708 req->type = ix;
639 req->sv1 = newSVsv (fh); 709 req->sv1 = newSVsv (fh);
640 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 710 req->int1 = fd;
641 : IoOFP (sv_2io (fh)));
642 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 711 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
643 req->size = len; 712 req->size = len;
644 req->sv2 = SvREFCNT_inc (data); 713 req->sv2 = SvREFCNT_inc (data);
645 req->ptr2 = (char *)svptr + dataoffset; 714 req->ptr2 = (char *)svptr + dataoffset;
646 req->stroffset = dataoffset; 715 req->stroffset = dataoffset;
… …
673void 742void
674aio_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)
675 PROTOTYPE: $$$$;$ 744 PROTOTYPE: $$$$;$
676 PPCODE: 745 PPCODE:
677{ 746{
747 int ifd = extract_fd (in_fh , 0);
748 int ofd = extract_fd (out_fh, 0);
678 dREQ; 749 dREQ;
679 750
680 req->type = EIO_SENDFILE; 751 req->type = EIO_SENDFILE;
681 req->sv1 = newSVsv (out_fh); 752 req->sv1 = newSVsv (out_fh);
682 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 753 req->int1 = ofd;
683 req->sv2 = newSVsv (in_fh); 754 req->sv2 = newSVsv (in_fh);
684 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 755 req->int2 = ifd;
685 req->offs = SvVAL64 (in_offset); 756 req->offs = SvVAL64 (in_offset);
686 req->size = length; 757 req->size = length;
687 758
688 REQ_SEND; 759 REQ_SEND;
689} 760}
… …
691void 762void
692aio_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)
693 PROTOTYPE: $$$;$ 764 PROTOTYPE: $$$;$
694 PPCODE: 765 PPCODE:
695{ 766{
767 int fd = extract_fd (fh, 0);
696 dREQ; 768 dREQ;
697 769
698 req->type = EIO_READAHEAD; 770 req->type = EIO_READAHEAD;
699 req->sv1 = newSVsv (fh); 771 req->sv1 = newSVsv (fh);
700 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 772 req->int1 = fd;
701 req->offs = SvVAL64 (offset); 773 req->offs = SvVAL64 (offset);
702 req->size = length; 774 req->size = length;
703 775
704 REQ_SEND; 776 REQ_SEND;
705} 777}
… …
896{ 968{
897 dREQ; 969 dREQ;
898 970
899 req->type = EIO_GROUP; 971 req->type = EIO_GROUP;
900 972
901 eio_submit (req); 973 req_submit (req);
902 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 974 XPUSHs (req_sv (req, AIO_GRP_KLASS));
903} 975}
904 976
905void 977void
906aio_nop (SV *callback=&PL_sv_undef) 978aio_nop (SV *callback=&PL_sv_undef)
… …
1025 CODE: 1097 CODE:
1026 eio_cancel (req); 1098 eio_cancel (req);
1027 1099
1028void 1100void
1029cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1101cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1030 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
1031 SvREFCNT_dec (req->callback); 1111 SvREFCNT_dec (req->callback);
1032 req->callback = newSVsv (callback); 1112 req->callback = SvREFCNT_inc (cb_cv);
1113 }
1114}
1033 1115
1034MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1116MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1035 1117
1036void 1118void
1037add (aio_req grp, ...) 1119add (aio_req grp, ...)
… …
1092void 1174void
1093feed (aio_req grp, SV *callback=&PL_sv_undef) 1175feed (aio_req grp, SV *callback=&PL_sv_undef)
1094 CODE: 1176 CODE:
1095{ 1177{
1096 SvREFCNT_dec (grp->sv2); 1178 SvREFCNT_dec (grp->sv2);
1097 grp->sv2 = newSVsv (callback); 1179 grp->sv2 = newSVsv (callback);
1180 grp->feed = aio_grp_feed;
1098 1181
1099 if (grp->int2 <= 0) 1182 if (grp->int2 <= 0)
1100 grp->int2 = 2; 1183 grp->int2 = 2;
1101 1184
1102 eio_grp_limit (grp, grp->int2); 1185 eio_grp_limit (grp, grp->int2);

Diff Legend

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