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.129 by root, Tue Sep 30 17:03:53 2008 UTC vs.
Revision 1.141 by root, Sat Jun 6 17:25:13 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 */
… …
237 235
238 av_extend (av, req->result - 1); 236 av_extend (av, req->result - 1);
239 237
240 for (i = 0; i < req->result; ++i) 238 for (i = 0; i < req->result; ++i)
241 { 239 {
240 if (req->int1 & EIO_READDIR_DENTS)
241 {
242 eio_dirent *ent = (eio_dirent *)buf;
243 SV *namesv = newSVpvn (ent->name, ent->namelen);
244
245 if (req->int1 & EIO_READDIR_CUSTOM2)
246 {
247 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
248 AV *avent = newAV ();
249
250 av_extend (avent, 2);
251
252 if (!sv_type [ent->type])
253 {
254 sv_type [ent->type] = newSViv (ent->type);
255 SvREADONLY_on (sv_type [ent->type]);
256 }
257
258 av_store (avent, 0, namesv);
259 av_store (avent, 1, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
260 av_store (avent, 2, SvREFCNT_inc (sv_type [ent->type]));
261
262 av_store (av, i, newRV_noinc ((SV *)avent));
263 }
264 else
265 av_store (av, i, namesv);
266
267 buf += sizeof (eio_dirent);
268 }
269 else
270 {
242 SV *sv = newSVpv (buf, 0); 271 SV *name = newSVpv (buf, 0);
243
244 av_store (av, i, sv); 272 av_store (av, i, name);
245 buf += SvCUR (sv) + 1; 273 buf += SvCUR (name) + 1;
274 }
246 } 275 }
247 276
248 rv = sv_2mortal (newRV_noinc ((SV *)av)); 277 rv = sv_2mortal (newRV_noinc ((SV *)av));
249 } 278 }
250 279
251 PUSHs (rv); 280 PUSHs (rv);
281
282 if (req->int1 & EIO_READDIR_CUSTOM1)
283 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
252 } 284 }
253 break; 285 break;
254 286
255 case EIO_OPEN: 287 case EIO_OPEN:
256 { 288 {
… …
314 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 346 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
315 PUSHs (sv_2mortal (newSViv (req->result))); 347 PUSHs (sv_2mortal (newSViv (req->result)));
316 break; 348 break;
317 349
318 case EIO_READ: 350 case EIO_READ:
351 {
319 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 352 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
320 *SvEND (req->sv2) = 0; 353 *SvEND (req->sv2) = 0;
354 SvPOK_only (req->sv2);
355 SvSETMAGIC (req->sv2);
321 PUSHs (sv_2mortal (newSViv (req->result))); 356 PUSHs (sv_2mortal (newSViv (req->result)));
357 }
322 break; 358 break;
323 359
324 case EIO_DUP2: 360 case EIO_DUP2:
325 if (req->result > 0) 361 if (req->result > 0)
326 req->result = 0; 362 req->result = 0;
… …
501 req_submit (req); \ 537 req_submit (req); \
502 SPAGAIN; \ 538 SPAGAIN; \
503 \ 539 \
504 if (GIMME_V != G_VOID) \ 540 if (GIMME_V != G_VOID) \
505 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 541 XPUSHs (req_sv (req, AIO_REQ_KLASS));
506 542
543static int
544extract_fd (SV *fh, int wr)
545{
546 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
547
548 if (fd < 0)
549 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
550
551 return fd;
552}
553
507MODULE = IO::AIO PACKAGE = IO::AIO 554MODULE = IO::AIO PACKAGE = IO::AIO
508 555
509PROTOTYPES: ENABLE 556PROTOTYPES: ENABLE
510 557
511BOOT: 558BOOT:
512{ 559{
513 stash = gv_stashpv ("IO::AIO", 1); 560 stash = gv_stashpv ("IO::AIO", 1);
514 561
515 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 562 static const struct {
516 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 563 const char *name;
517 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 564 IV iv;
518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 565 } *civ, const_iv[] = {
519 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 566# define const_iv(name, value) { # name, (IV) value },
567# define const_eio(name) { # name, (IV) EIO_ ## name },
568 const_iv (EXDEV , EXDEV)
569 const_iv (ENOSYS , ENOSYS)
570 const_iv (O_RDONLY, O_RDONLY)
571 const_iv (O_WRONLY, O_WRONLY)
572 const_iv (O_CREAT , O_CREAT)
573 const_iv (O_TRUNC , O_TRUNC)
520#ifndef _WIN32 574#ifndef _WIN32
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 575 const_iv (S_IFIFO , S_IFIFO)
522#endif 576#endif
577 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
578 const_eio (SYNC_FILE_RANGE_WRITE)
579 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
523 580
581 const_eio (READDIR_DENTS)
582 const_eio (READDIR_DIRS_FIRST)
583 const_eio (READDIR_STAT_ORDER)
584 const_eio (READDIR_FOUND_UNKNOWN)
585
586 const_eio (DT_UNKNOWN)
587 const_eio (DT_FIFO)
588 const_eio (DT_CHR)
589 const_eio (DT_DIR)
590 const_eio (DT_BLK)
591 const_eio (DT_REG)
592 const_eio (DT_LNK)
593 const_eio (DT_SOCK)
594 const_eio (DT_WHT)
595 };
596
597 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
598 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
599
524 create_respipe (); 600 create_respipe ();
525 601
526 if (eio_init (want_poll, done_poll) < 0) 602 if (eio_init (want_poll, done_poll) < 0)
527 croak ("IO::AIO: unable to initialise eio library"); 603 croak ("IO::AIO: unable to initialise eio library");
528 604
529 /* atfork child called in fifo order, so before eio's handler */ 605 /* atfork child called in fifo order, so before eio's handler */
530 X_THREAD_ATFORK (0, 0, atfork_child); 606 X_THREAD_ATFORK (0, 0, atfork_child);
531} 607}
532 608
533void 609void
534max_poll_reqs (int nreqs) 610max_poll_reqs (int nreqs)
535 PROTOTYPE: $ 611 PROTOTYPE: $
… …
588 ALIAS: 664 ALIAS:
589 aio_fsync = EIO_FSYNC 665 aio_fsync = EIO_FSYNC
590 aio_fdatasync = EIO_FDATASYNC 666 aio_fdatasync = EIO_FDATASYNC
591 PPCODE: 667 PPCODE:
592{ 668{
669 int fd = extract_fd (fh, 0);
593 dREQ; 670 dREQ;
594 671
595 req->type = ix; 672 req->type = ix;
596 req->sv1 = newSVsv (fh); 673 req->sv1 = newSVsv (fh);
597 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 674 req->int1 = fd;
675
676 REQ_SEND (req);
677}
678
679void
680aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
681 PROTOTYPE: $$$$;$
682 PPCODE:
683{
684 int fd = extract_fd (fh, 0);
685 dREQ;
686
687 req->type = EIO_SYNC_FILE_RANGE;
688 req->sv1 = newSVsv (fh);
689 req->int1 = fd;
690 req->offs = SvVAL64 (offset);
691 req->size = SvVAL64 (nbytes);
692 req->int2 = flags;
598 693
599 REQ_SEND (req); 694 REQ_SEND (req);
600} 695}
601 696
602void 697void
603aio_close (SV *fh, SV *callback=&PL_sv_undef) 698aio_close (SV *fh, SV *callback=&PL_sv_undef)
604 PROTOTYPE: $;$ 699 PROTOTYPE: $;$
605 PPCODE: 700 PPCODE:
606{ 701{
607 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 702 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
703 int fd = extract_fd (fh, 0);
608 dREQ; 704 dREQ;
609 705
610 if (close_pipe < 0) 706 if (close_pipe < 0)
611 { 707 {
612 int pipefd [2]; 708 int pipefd [2];
… …
620 } 716 }
621 717
622 req->type = EIO_DUP2; 718 req->type = EIO_DUP2;
623 req->int1 = close_pipe; 719 req->int1 = close_pipe;
624 req->sv2 = newSVsv (fh); 720 req->sv2 = newSVsv (fh);
625 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 721 req->int2 = fd;
626 722
627 REQ_SEND (req); 723 REQ_SEND (req);
628} 724}
629 725
630void 726void
… …
634 aio_write = EIO_WRITE 730 aio_write = EIO_WRITE
635 PROTOTYPE: $$$$$;$ 731 PROTOTYPE: $$$$$;$
636 PPCODE: 732 PPCODE:
637{ 733{
638 STRLEN svlen; 734 STRLEN svlen;
735 int fd = extract_fd (fh, ix == EIO_WRITE);
639 char *svptr = SvPVbyte (data, svlen); 736 char *svptr = SvPVbyte (data, svlen);
640 UV len = SvUV (length); 737 UV len = SvUV (length);
641
642 SvUPGRADE (data, SVt_PV);
643 SvPOK_on (data);
644 738
645 if (dataoffset < 0) 739 if (dataoffset < 0)
646 dataoffset += svlen; 740 dataoffset += svlen;
647 741
648 if (dataoffset < 0 || dataoffset > svlen) 742 if (dataoffset < 0 || dataoffset > svlen)
… …
654 if (!SvOK (length) || len + dataoffset > svlen) 748 if (!SvOK (length) || len + dataoffset > svlen)
655 len = svlen - dataoffset; 749 len = svlen - dataoffset;
656 } 750 }
657 else 751 else
658 { 752 {
659 /* read: grow scalar as necessary */ 753 /* read: check type and grow scalar as necessary */
754 SvUPGRADE (data, SVt_PV);
660 svptr = SvGROW (data, len + dataoffset + 1); 755 svptr = SvGROW (data, len + dataoffset + 1);
661 } 756 }
662
663 if (len < 0)
664 croak ("length must not be negative");
665 757
666 { 758 {
667 dREQ; 759 dREQ;
668 760
669 req->type = ix; 761 req->type = ix;
670 req->sv1 = newSVsv (fh); 762 req->sv1 = newSVsv (fh);
671 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 763 req->int1 = fd;
672 : IoOFP (sv_2io (fh)));
673 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 764 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
674 req->size = len; 765 req->size = len;
675 req->sv2 = SvREFCNT_inc (data); 766 req->sv2 = SvREFCNT_inc (data);
676 req->ptr2 = (char *)svptr + dataoffset; 767 req->ptr2 = (char *)svptr + dataoffset;
677 req->stroffset = dataoffset; 768 req->stroffset = dataoffset;
… …
704void 795void
705aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 796aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
706 PROTOTYPE: $$$$;$ 797 PROTOTYPE: $$$$;$
707 PPCODE: 798 PPCODE:
708{ 799{
800 int ifd = extract_fd (in_fh , 0);
801 int ofd = extract_fd (out_fh, 0);
709 dREQ; 802 dREQ;
710 803
711 req->type = EIO_SENDFILE; 804 req->type = EIO_SENDFILE;
712 req->sv1 = newSVsv (out_fh); 805 req->sv1 = newSVsv (out_fh);
713 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 806 req->int1 = ofd;
714 req->sv2 = newSVsv (in_fh); 807 req->sv2 = newSVsv (in_fh);
715 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 808 req->int2 = ifd;
716 req->offs = SvVAL64 (in_offset); 809 req->offs = SvVAL64 (in_offset);
717 req->size = length; 810 req->size = length;
718 811
719 REQ_SEND; 812 REQ_SEND;
720} 813}
… …
722void 815void
723aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 816aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
724 PROTOTYPE: $$$;$ 817 PROTOTYPE: $$$;$
725 PPCODE: 818 PPCODE:
726{ 819{
820 int fd = extract_fd (fh, 0);
727 dREQ; 821 dREQ;
728 822
729 req->type = EIO_READAHEAD; 823 req->type = EIO_READAHEAD;
730 req->sv1 = newSVsv (fh); 824 req->sv1 = newSVsv (fh);
731 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 825 req->int1 = fd;
732 req->offs = SvVAL64 (offset); 826 req->offs = SvVAL64 (offset);
733 req->size = length; 827 req->size = length;
734 828
735 REQ_SEND; 829 REQ_SEND;
736} 830}
… …
853 req->type = EIO_FCHOWN; 947 req->type = EIO_FCHOWN;
854 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 948 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
855 } 949 }
856 950
857 REQ_SEND; 951 REQ_SEND;
952}
953
954void
955aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
956 PPCODE:
957{
958 dREQ;
959
960 req->type = EIO_READDIR;
961 req->sv1 = newSVsv (pathname);
962 req->ptr1 = SvPVbyte_nolen (req->sv1);
963 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
964
965 if (flags & EIO_READDIR_DENTS)
966 flags |= EIO_READDIR_CUSTOM2;
967
968 REQ_SEND;
858} 969}
859 970
860void 971void
861aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 972aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
862 ALIAS: 973 ALIAS:
… …
1110 AV *av; 1221 AV *av;
1111 1222
1112 grp->errorno = errno; 1223 grp->errorno = errno;
1113 1224
1114 av = newAV (); 1225 av = newAV ();
1226 av_extend (av, items - 1);
1115 1227
1116 for (i = 1; i < items; ++i ) 1228 for (i = 1; i < items; ++i )
1117 av_push (av, newSVsv (ST (i))); 1229 av_push (av, newSVsv (ST (i)));
1118 1230
1119 SvREFCNT_dec (grp->sv1); 1231 SvREFCNT_dec (grp->sv1);
… …
1133void 1245void
1134feed (aio_req grp, SV *callback=&PL_sv_undef) 1246feed (aio_req grp, SV *callback=&PL_sv_undef)
1135 CODE: 1247 CODE:
1136{ 1248{
1137 SvREFCNT_dec (grp->sv2); 1249 SvREFCNT_dec (grp->sv2);
1138 grp->sv2 = newSVsv (callback); 1250 grp->sv2 = newSVsv (callback);
1251 grp->feed = aio_grp_feed;
1139 1252
1140 if (grp->int2 <= 0) 1253 if (grp->int2 <= 0)
1141 grp->int2 = 2; 1254 grp->int2 = 2;
1142 1255
1143 eio_grp_limit (grp, grp->int2); 1256 eio_grp_limit (grp, grp->int2);

Diff Legend

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