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.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 */
… …
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);
… …
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;
… …
461static void atfork_child (void) 463static void atfork_child (void)
462{ 464{
463 create_respipe (); 465 create_respipe ();
464} 466}
465 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
466#define dREQ \ 486#define dREQ \
487 SV *cb_cv; \
467 aio_req req; \ 488 aio_req req; \
468 int req_pri = next_pri; \ 489 int req_pri = next_pri; \
469 next_pri = EIO_PRI_DEFAULT; \ 490 next_pri = EIO_PRI_DEFAULT; \
470 \ 491 \
471 if (SvOK (callback) && !SvROK (callback)) \ 492 cb_cv = get_cb (callback); \
472 croak ("callback must be undef or of reference type"); \
473 \ 493 \
474 Newz (0, req, 1, eio_req); \ 494 Newz (0, req, 1, eio_req); \
475 if (!req) \ 495 if (!req) \
476 croak ("out of memory during eio_req allocation"); \ 496 croak ("out of memory during eio_req allocation"); \
477 \ 497 \
478 req->callback = newSVsv (callback); \ 498 req->callback = SvREFCNT_inc (cb_cv); \
479 req->pri = req_pri 499 req->pri = req_pri
480 500
481#define REQ_SEND \ 501#define REQ_SEND \
482 PUTBACK; \ 502 PUTBACK; \
483 req_submit (req); \ 503 req_submit (req); \
484 SPAGAIN; \ 504 SPAGAIN; \
485 \ 505 \
486 if (GIMME_V != G_VOID) \ 506 if (GIMME_V != G_VOID) \
487 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
488 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
489MODULE = IO::AIO PACKAGE = IO::AIO 520MODULE = IO::AIO PACKAGE = IO::AIO
490 521
491PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
492 523
493BOOT: 524BOOT:
494{ 525{
495 stash = gv_stashpv ("IO::AIO", 1); 526 stash = gv_stashpv ("IO::AIO", 1);
496 527
497 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
529 newCONSTSUB (stash, "ENOSYS", newSViv (ENOSYS));
498 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 530 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
499 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 531 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
500 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 532 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
501 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 533 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
502#ifndef _WIN32 534#ifndef _WIN32
503 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 535 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
504#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));
505 541
506 create_respipe (); 542 create_respipe ();
507 543
508 if (eio_init (want_poll, done_poll) < 0) 544 if (eio_init (want_poll, done_poll) < 0)
509 croak ("IO::AIO: unable to initialise eio library"); 545 croak ("IO::AIO: unable to initialise eio library");
… …
570 ALIAS: 606 ALIAS:
571 aio_fsync = EIO_FSYNC 607 aio_fsync = EIO_FSYNC
572 aio_fdatasync = EIO_FDATASYNC 608 aio_fdatasync = EIO_FDATASYNC
573 PPCODE: 609 PPCODE:
574{ 610{
611 int fd = extract_fd (fh, 0);
575 dREQ; 612 dREQ;
576 613
577 req->type = ix; 614 req->type = ix;
578 req->sv1 = newSVsv (fh); 615 req->sv1 = newSVsv (fh);
579 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;
580 635
581 REQ_SEND (req); 636 REQ_SEND (req);
582} 637}
583 638
584void 639void
585aio_close (SV *fh, SV *callback=&PL_sv_undef) 640aio_close (SV *fh, SV *callback=&PL_sv_undef)
586 PROTOTYPE: $;$ 641 PROTOTYPE: $;$
587 PPCODE: 642 PPCODE:
588{ 643{
589 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);
590 dREQ; 646 dREQ;
591 647
592 if (close_pipe < 0) 648 if (close_pipe < 0)
593 { 649 {
594 int pipefd [2]; 650 int pipefd [2];
… …
602 } 658 }
603 659
604 req->type = EIO_DUP2; 660 req->type = EIO_DUP2;
605 req->int1 = close_pipe; 661 req->int1 = close_pipe;
606 req->sv2 = newSVsv (fh); 662 req->sv2 = newSVsv (fh);
607 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 663 req->int2 = fd;
608 664
609 REQ_SEND (req); 665 REQ_SEND (req);
610} 666}
611 667
612void 668void
… …
616 aio_write = EIO_WRITE 672 aio_write = EIO_WRITE
617 PROTOTYPE: $$$$$;$ 673 PROTOTYPE: $$$$$;$
618 PPCODE: 674 PPCODE:
619{ 675{
620 STRLEN svlen; 676 STRLEN svlen;
677 int fd = extract_fd (fh, ix == EIO_WRITE);
621 char *svptr = SvPVbyte (data, svlen); 678 char *svptr = SvPVbyte (data, svlen);
622 UV len = SvUV (length); 679 UV len = SvUV (length);
623
624 SvUPGRADE (data, SVt_PV);
625 SvPOK_on (data);
626 680
627 if (dataoffset < 0) 681 if (dataoffset < 0)
628 dataoffset += svlen; 682 dataoffset += svlen;
629 683
630 if (dataoffset < 0 || dataoffset > svlen) 684 if (dataoffset < 0 || dataoffset > svlen)
… …
636 if (!SvOK (length) || len + dataoffset > svlen) 690 if (!SvOK (length) || len + dataoffset > svlen)
637 len = svlen - dataoffset; 691 len = svlen - dataoffset;
638 } 692 }
639 else 693 else
640 { 694 {
641 /* read: grow scalar as necessary */ 695 /* read: check type and grow scalar as necessary */
696 SvUPGRADE (data, SVt_PV);
642 svptr = SvGROW (data, len + dataoffset + 1); 697 svptr = SvGROW (data, len + dataoffset + 1);
643 } 698 }
644
645 if (len < 0)
646 croak ("length must not be negative");
647 699
648 { 700 {
649 dREQ; 701 dREQ;
650 702
651 req->type = ix; 703 req->type = ix;
652 req->sv1 = newSVsv (fh); 704 req->sv1 = newSVsv (fh);
653 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 705 req->int1 = fd;
654 : IoOFP (sv_2io (fh)));
655 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 706 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
656 req->size = len; 707 req->size = len;
657 req->sv2 = SvREFCNT_inc (data); 708 req->sv2 = SvREFCNT_inc (data);
658 req->ptr2 = (char *)svptr + dataoffset; 709 req->ptr2 = (char *)svptr + dataoffset;
659 req->stroffset = dataoffset; 710 req->stroffset = dataoffset;
… …
686void 737void
687aio_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)
688 PROTOTYPE: $$$$;$ 739 PROTOTYPE: $$$$;$
689 PPCODE: 740 PPCODE:
690{ 741{
742 int ifd = extract_fd (in_fh , 0);
743 int ofd = extract_fd (out_fh, 0);
691 dREQ; 744 dREQ;
692 745
693 req->type = EIO_SENDFILE; 746 req->type = EIO_SENDFILE;
694 req->sv1 = newSVsv (out_fh); 747 req->sv1 = newSVsv (out_fh);
695 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 748 req->int1 = ofd;
696 req->sv2 = newSVsv (in_fh); 749 req->sv2 = newSVsv (in_fh);
697 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 750 req->int2 = ifd;
698 req->offs = SvVAL64 (in_offset); 751 req->offs = SvVAL64 (in_offset);
699 req->size = length; 752 req->size = length;
700 753
701 REQ_SEND; 754 REQ_SEND;
702} 755}
… …
704void 757void
705aio_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)
706 PROTOTYPE: $$$;$ 759 PROTOTYPE: $$$;$
707 PPCODE: 760 PPCODE:
708{ 761{
762 int fd = extract_fd (fh, 0);
709 dREQ; 763 dREQ;
710 764
711 req->type = EIO_READAHEAD; 765 req->type = EIO_READAHEAD;
712 req->sv1 = newSVsv (fh); 766 req->sv1 = newSVsv (fh);
713 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 767 req->int1 = fd;
714 req->offs = SvVAL64 (offset); 768 req->offs = SvVAL64 (offset);
715 req->size = length; 769 req->size = length;
716 770
717 REQ_SEND; 771 REQ_SEND;
718} 772}
… …
1038 CODE: 1092 CODE:
1039 eio_cancel (req); 1093 eio_cancel (req);
1040 1094
1041void 1095void
1042cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1096cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1043 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
1044 SvREFCNT_dec (req->callback); 1106 SvREFCNT_dec (req->callback);
1045 req->callback = newSVsv (callback); 1107 req->callback = SvREFCNT_inc (cb_cv);
1108 }
1109}
1046 1110
1047MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1111MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1048 1112
1049void 1113void
1050add (aio_req grp, ...) 1114add (aio_req grp, ...)
… …
1105void 1169void
1106feed (aio_req grp, SV *callback=&PL_sv_undef) 1170feed (aio_req grp, SV *callback=&PL_sv_undef)
1107 CODE: 1171 CODE:
1108{ 1172{
1109 SvREFCNT_dec (grp->sv2); 1173 SvREFCNT_dec (grp->sv2);
1110 grp->sv2 = newSVsv (callback); 1174 grp->sv2 = newSVsv (callback);
1175 grp->feed = aio_grp_feed;
1111 1176
1112 if (grp->int2 <= 0) 1177 if (grp->int2 <= 0)
1113 grp->int2 = 2; 1178 grp->int2 = 2;
1114 1179
1115 eio_grp_limit (grp, grp->int2); 1180 eio_grp_limit (grp, grp->int2);

Diff Legend

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