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.140 by root, Wed Jun 3 12:24:49 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);
… …
301 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
302 PUSHs (sv_2mortal (newSViv (req->result))); 313 PUSHs (sv_2mortal (newSViv (req->result)));
303 break; 314 break;
304 315
305 case EIO_READ: 316 case EIO_READ:
317 {
306 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));
307 *SvEND (req->sv2) = 0; 319 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2);
308 PUSHs (sv_2mortal (newSViv (req->result))); 322 PUSHs (sv_2mortal (newSViv (req->result)));
323 }
309 break; 324 break;
310 325
311 case EIO_DUP2: 326 case EIO_DUP2:
312 if (req->result > 0) 327 if (req->result > 0)
313 req->result = 0; 328 req->result = 0;
… …
448static void atfork_child (void) 463static void atfork_child (void)
449{ 464{
450 create_respipe (); 465 create_respipe ();
451} 466}
452 467
468static SV *
469get_cb (SV *cb_sv)
470{
471 HV *st;
472 GV *gvp;
473 CV *cv;
474
475 if (!SvOK (cb_sv))
476 return 0;
477
478 cv = sv_2cv (cb_sv, &st, &gvp, 0);
479
480 if (!cv)
481 croak ("IO::AIO callback must be undef or a CODE reference");
482
483 return (SV *)cv;
484}
485
453#define dREQ \ 486#define dREQ \
487 SV *cb_cv; \
454 aio_req req; \ 488 aio_req req; \
455 int req_pri = next_pri; \ 489 int req_pri = next_pri; \
456 next_pri = EIO_PRI_DEFAULT; \ 490 next_pri = EIO_PRI_DEFAULT; \
457 \ 491 \
458 if (SvOK (callback) && !SvROK (callback)) \ 492 cb_cv = get_cb (callback); \
459 croak ("callback must be undef or of reference type"); \
460 \ 493 \
461 Newz (0, req, 1, eio_req); \ 494 Newz (0, req, 1, eio_req); \
462 if (!req) \ 495 if (!req) \
463 croak ("out of memory during eio_req allocation"); \ 496 croak ("out of memory during eio_req allocation"); \
464 \ 497 \
465 req->callback = newSVsv (callback); \ 498 req->callback = SvREFCNT_inc (cb_cv); \
466 req->pri = req_pri 499 req->pri = req_pri
467 500
468#define REQ_SEND \ 501#define REQ_SEND \
469 PUTBACK; \ 502 PUTBACK; \
470 req_submit (req); \ 503 req_submit (req); \
471 SPAGAIN; \ 504 SPAGAIN; \
472 \ 505 \
473 if (GIMME_V != G_VOID) \ 506 if (GIMME_V != G_VOID) \
474 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
475 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
476MODULE = IO::AIO PACKAGE = IO::AIO 520MODULE = IO::AIO PACKAGE = IO::AIO
477 521
478PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
479 523
480BOOT: 524BOOT:
481{ 525{
482 stash = gv_stashpv ("IO::AIO", 1); 526 stash = gv_stashpv ("IO::AIO", 1);
483 527
484 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
529 newCONSTSUB (stash, "ENOSYS", newSViv (ENOSYS));
485 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 530 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
486 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 531 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
487 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 532 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
488 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 533 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
489#ifndef _WIN32 534#ifndef _WIN32
490 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 535 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
491#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));
492 541
493 create_respipe (); 542 create_respipe ();
494 543
495 if (eio_init (want_poll, done_poll) < 0) 544 if (eio_init (want_poll, done_poll) < 0)
496 croak ("IO::AIO: unable to initialise eio library"); 545 croak ("IO::AIO: unable to initialise eio library");
… …
557 ALIAS: 606 ALIAS:
558 aio_fsync = EIO_FSYNC 607 aio_fsync = EIO_FSYNC
559 aio_fdatasync = EIO_FDATASYNC 608 aio_fdatasync = EIO_FDATASYNC
560 PPCODE: 609 PPCODE:
561{ 610{
611 int fd = extract_fd (fh, 0);
562 dREQ; 612 dREQ;
563 613
564 req->type = ix; 614 req->type = ix;
565 req->sv1 = newSVsv (fh); 615 req->sv1 = newSVsv (fh);
566 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;
567 635
568 REQ_SEND (req); 636 REQ_SEND (req);
569} 637}
570 638
571void 639void
572aio_close (SV *fh, SV *callback=&PL_sv_undef) 640aio_close (SV *fh, SV *callback=&PL_sv_undef)
573 PROTOTYPE: $;$ 641 PROTOTYPE: $;$
574 PPCODE: 642 PPCODE:
575{ 643{
576 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);
577 dREQ; 646 dREQ;
578 647
579 if (close_pipe < 0) 648 if (close_pipe < 0)
580 { 649 {
581 int pipefd [2]; 650 int pipefd [2];
… …
589 } 658 }
590 659
591 req->type = EIO_DUP2; 660 req->type = EIO_DUP2;
592 req->int1 = close_pipe; 661 req->int1 = close_pipe;
593 req->sv2 = newSVsv (fh); 662 req->sv2 = newSVsv (fh);
594 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 663 req->int2 = fd;
595 664
596 REQ_SEND (req); 665 REQ_SEND (req);
597} 666}
598 667
599void 668void
… …
603 aio_write = EIO_WRITE 672 aio_write = EIO_WRITE
604 PROTOTYPE: $$$$$;$ 673 PROTOTYPE: $$$$$;$
605 PPCODE: 674 PPCODE:
606{ 675{
607 STRLEN svlen; 676 STRLEN svlen;
677 int fd = extract_fd (fh, ix == EIO_WRITE);
608 char *svptr = SvPVbyte (data, svlen); 678 char *svptr = SvPVbyte (data, svlen);
609 UV len = SvUV (length); 679 UV len = SvUV (length);
610
611 SvUPGRADE (data, SVt_PV);
612 SvPOK_on (data);
613 680
614 if (dataoffset < 0) 681 if (dataoffset < 0)
615 dataoffset += svlen; 682 dataoffset += svlen;
616 683
617 if (dataoffset < 0 || dataoffset > svlen) 684 if (dataoffset < 0 || dataoffset > svlen)
… …
623 if (!SvOK (length) || len + dataoffset > svlen) 690 if (!SvOK (length) || len + dataoffset > svlen)
624 len = svlen - dataoffset; 691 len = svlen - dataoffset;
625 } 692 }
626 else 693 else
627 { 694 {
628 /* read: grow scalar as necessary */ 695 /* read: check type and grow scalar as necessary */
696 SvUPGRADE (data, SVt_PV);
629 svptr = SvGROW (data, len + dataoffset + 1); 697 svptr = SvGROW (data, len + dataoffset + 1);
630 } 698 }
631
632 if (len < 0)
633 croak ("length must not be negative");
634 699
635 { 700 {
636 dREQ; 701 dREQ;
637 702
638 req->type = ix; 703 req->type = ix;
639 req->sv1 = newSVsv (fh); 704 req->sv1 = newSVsv (fh);
640 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 705 req->int1 = fd;
641 : IoOFP (sv_2io (fh)));
642 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 706 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
643 req->size = len; 707 req->size = len;
644 req->sv2 = SvREFCNT_inc (data); 708 req->sv2 = SvREFCNT_inc (data);
645 req->ptr2 = (char *)svptr + dataoffset; 709 req->ptr2 = (char *)svptr + dataoffset;
646 req->stroffset = dataoffset; 710 req->stroffset = dataoffset;
… …
673void 737void
674aio_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)
675 PROTOTYPE: $$$$;$ 739 PROTOTYPE: $$$$;$
676 PPCODE: 740 PPCODE:
677{ 741{
742 int ifd = extract_fd (in_fh , 0);
743 int ofd = extract_fd (out_fh, 0);
678 dREQ; 744 dREQ;
679 745
680 req->type = EIO_SENDFILE; 746 req->type = EIO_SENDFILE;
681 req->sv1 = newSVsv (out_fh); 747 req->sv1 = newSVsv (out_fh);
682 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 748 req->int1 = ofd;
683 req->sv2 = newSVsv (in_fh); 749 req->sv2 = newSVsv (in_fh);
684 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 750 req->int2 = ifd;
685 req->offs = SvVAL64 (in_offset); 751 req->offs = SvVAL64 (in_offset);
686 req->size = length; 752 req->size = length;
687 753
688 REQ_SEND; 754 REQ_SEND;
689} 755}
… …
691void 757void
692aio_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)
693 PROTOTYPE: $$$;$ 759 PROTOTYPE: $$$;$
694 PPCODE: 760 PPCODE:
695{ 761{
762 int fd = extract_fd (fh, 0);
696 dREQ; 763 dREQ;
697 764
698 req->type = EIO_READAHEAD; 765 req->type = EIO_READAHEAD;
699 req->sv1 = newSVsv (fh); 766 req->sv1 = newSVsv (fh);
700 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 767 req->int1 = fd;
701 req->offs = SvVAL64 (offset); 768 req->offs = SvVAL64 (offset);
702 req->size = length; 769 req->size = length;
703 770
704 REQ_SEND; 771 REQ_SEND;
705} 772}
… …
896{ 963{
897 dREQ; 964 dREQ;
898 965
899 req->type = EIO_GROUP; 966 req->type = EIO_GROUP;
900 967
901 eio_submit (req); 968 req_submit (req);
902 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 969 XPUSHs (req_sv (req, AIO_GRP_KLASS));
903} 970}
904 971
905void 972void
906aio_nop (SV *callback=&PL_sv_undef) 973aio_nop (SV *callback=&PL_sv_undef)
… …
1025 CODE: 1092 CODE:
1026 eio_cancel (req); 1093 eio_cancel (req);
1027 1094
1028void 1095void
1029cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1096cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1030 CODE: 1097 PPCODE:
1098{
1099 if (GIMME_V != G_VOID)
1100 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1101
1102 if (items > 1)
1103 {
1104 SV *cb_cv = get_cb (callback);
1105
1031 SvREFCNT_dec (req->callback); 1106 SvREFCNT_dec (req->callback);
1032 req->callback = newSVsv (callback); 1107 req->callback = SvREFCNT_inc (cb_cv);
1108 }
1109}
1033 1110
1034MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1111MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1035 1112
1036void 1113void
1037add (aio_req grp, ...) 1114add (aio_req grp, ...)
… …
1092void 1169void
1093feed (aio_req grp, SV *callback=&PL_sv_undef) 1170feed (aio_req grp, SV *callback=&PL_sv_undef)
1094 CODE: 1171 CODE:
1095{ 1172{
1096 SvREFCNT_dec (grp->sv2); 1173 SvREFCNT_dec (grp->sv2);
1097 grp->sv2 = newSVsv (callback); 1174 grp->sv2 = newSVsv (callback);
1175 grp->feed = aio_grp_feed;
1098 1176
1099 if (grp->int2 <= 0) 1177 if (grp->int2 <= 0)
1100 grp->int2 = 2; 1178 grp->int2 = 2;
1101 1179
1102 eio_grp_limit (grp, grp->int2); 1180 eio_grp_limit (grp, grp->int2);

Diff Legend

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