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.131 by root, Sun Oct 12 22:30:33 2008 UTC vs.
Revision 1.143 by root, Sat Jun 6 19:44:17 2009 UTC

… …
235 235
236 av_extend (av, req->result - 1); 236 av_extend (av, req->result - 1);
237 237
238 for (i = 0; i < req->result; ++i) 238 for (i = 0; i < req->result; ++i)
239 { 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, SvREFCNT_inc (sv_type [ent->type]));
260 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
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 {
240 SV *sv = newSVpv (buf, 0); 271 SV *name = newSVpv (buf, 0);
241
242 av_store (av, i, sv); 272 av_store (av, i, name);
243 buf += SvCUR (sv) + 1; 273 buf += SvCUR (name) + 1;
274 }
244 } 275 }
245 276
246 rv = sv_2mortal (newRV_noinc ((SV *)av)); 277 rv = sv_2mortal (newRV_noinc ((SV *)av));
247 } 278 }
248 279
249 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))));
250 } 284 }
251 break; 285 break;
252 286
253 case EIO_OPEN: 287 case EIO_OPEN:
254 { 288 {
… …
312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 346 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
313 PUSHs (sv_2mortal (newSViv (req->result))); 347 PUSHs (sv_2mortal (newSViv (req->result)));
314 break; 348 break;
315 349
316 case EIO_READ: 350 case EIO_READ:
351 {
317 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));
318 *SvEND (req->sv2) = 0; 353 *SvEND (req->sv2) = 0;
354 SvPOK_only (req->sv2);
355 SvSETMAGIC (req->sv2);
319 PUSHs (sv_2mortal (newSViv (req->result))); 356 PUSHs (sv_2mortal (newSViv (req->result)));
357 }
320 break; 358 break;
321 359
322 case EIO_DUP2: 360 case EIO_DUP2:
323 if (req->result > 0) 361 if (req->result > 0)
324 req->result = 0; 362 req->result = 0;
… …
499 req_submit (req); \ 537 req_submit (req); \
500 SPAGAIN; \ 538 SPAGAIN; \
501 \ 539 \
502 if (GIMME_V != G_VOID) \ 540 if (GIMME_V != G_VOID) \
503 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 541 XPUSHs (req_sv (req, AIO_REQ_KLASS));
504 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
505MODULE = IO::AIO PACKAGE = IO::AIO 554MODULE = IO::AIO PACKAGE = IO::AIO
506 555
507PROTOTYPES: ENABLE 556PROTOTYPES: ENABLE
508 557
509BOOT: 558BOOT:
510{ 559{
511 stash = gv_stashpv ("IO::AIO", 1); 560 stash = gv_stashpv ("IO::AIO", 1);
512 561
513 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 562 static const struct {
514 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 563 const char *name;
515 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 564 IV iv;
516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 565 } *civ, const_iv[] = {
517 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)
518#ifndef _WIN32 574#ifndef _WIN32
519 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 575 const_iv (S_IFIFO , S_IFIFO)
520#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)
521 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
522 create_respipe (); 600 create_respipe ();
523 601
524 if (eio_init (want_poll, done_poll) < 0) 602 if (eio_init (want_poll, done_poll) < 0)
525 croak ("IO::AIO: unable to initialise eio library"); 603 croak ("IO::AIO: unable to initialise eio library");
526 604
527 /* atfork child called in fifo order, so before eio's handler */ 605 /* atfork child called in fifo order, so before eio's handler */
528 X_THREAD_ATFORK (0, 0, atfork_child); 606 X_THREAD_ATFORK (0, 0, atfork_child);
529} 607}
530 608
531void 609void
532max_poll_reqs (int nreqs) 610max_poll_reqs (int nreqs)
533 PROTOTYPE: $ 611 PROTOTYPE: $
… …
586 ALIAS: 664 ALIAS:
587 aio_fsync = EIO_FSYNC 665 aio_fsync = EIO_FSYNC
588 aio_fdatasync = EIO_FDATASYNC 666 aio_fdatasync = EIO_FDATASYNC
589 PPCODE: 667 PPCODE:
590{ 668{
669 int fd = extract_fd (fh, 0);
591 dREQ; 670 dREQ;
592 671
593 req->type = ix; 672 req->type = ix;
594 req->sv1 = newSVsv (fh); 673 req->sv1 = newSVsv (fh);
595 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;
596 693
597 REQ_SEND (req); 694 REQ_SEND (req);
598} 695}
599 696
600void 697void
601aio_close (SV *fh, SV *callback=&PL_sv_undef) 698aio_close (SV *fh, SV *callback=&PL_sv_undef)
602 PROTOTYPE: $;$ 699 PROTOTYPE: $;$
603 PPCODE: 700 PPCODE:
604{ 701{
605 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);
606 dREQ; 704 dREQ;
607 705
608 if (close_pipe < 0) 706 if (close_pipe < 0)
609 { 707 {
610 int pipefd [2]; 708 int pipefd [2];
… …
618 } 716 }
619 717
620 req->type = EIO_DUP2; 718 req->type = EIO_DUP2;
621 req->int1 = close_pipe; 719 req->int1 = close_pipe;
622 req->sv2 = newSVsv (fh); 720 req->sv2 = newSVsv (fh);
623 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 721 req->int2 = fd;
624 722
625 REQ_SEND (req); 723 REQ_SEND (req);
626} 724}
627 725
628void 726void
… …
632 aio_write = EIO_WRITE 730 aio_write = EIO_WRITE
633 PROTOTYPE: $$$$$;$ 731 PROTOTYPE: $$$$$;$
634 PPCODE: 732 PPCODE:
635{ 733{
636 STRLEN svlen; 734 STRLEN svlen;
735 int fd = extract_fd (fh, ix == EIO_WRITE);
637 char *svptr = SvPVbyte (data, svlen); 736 char *svptr = SvPVbyte (data, svlen);
638 UV len = SvUV (length); 737 UV len = SvUV (length);
639
640 SvUPGRADE (data, SVt_PV);
641 SvPOK_on (data);
642 738
643 if (dataoffset < 0) 739 if (dataoffset < 0)
644 dataoffset += svlen; 740 dataoffset += svlen;
645 741
646 if (dataoffset < 0 || dataoffset > svlen) 742 if (dataoffset < 0 || dataoffset > svlen)
… …
652 if (!SvOK (length) || len + dataoffset > svlen) 748 if (!SvOK (length) || len + dataoffset > svlen)
653 len = svlen - dataoffset; 749 len = svlen - dataoffset;
654 } 750 }
655 else 751 else
656 { 752 {
657 /* read: grow scalar as necessary */ 753 /* read: check type and grow scalar as necessary */
754 SvUPGRADE (data, SVt_PV);
658 svptr = SvGROW (data, len + dataoffset + 1); 755 svptr = SvGROW (data, len + dataoffset + 1);
659 } 756 }
660
661 if (len < 0)
662 croak ("length must not be negative");
663 757
664 { 758 {
665 dREQ; 759 dREQ;
666 760
667 req->type = ix; 761 req->type = ix;
668 req->sv1 = newSVsv (fh); 762 req->sv1 = newSVsv (fh);
669 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 763 req->int1 = fd;
670 : IoOFP (sv_2io (fh)));
671 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 764 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
672 req->size = len; 765 req->size = len;
673 req->sv2 = SvREFCNT_inc_NN (data); 766 req->sv2 = SvREFCNT_inc (data);
674 req->ptr2 = (char *)svptr + dataoffset; 767 req->ptr2 = (char *)svptr + dataoffset;
675 req->stroffset = dataoffset; 768 req->stroffset = dataoffset;
676 769
677 if (!SvREADONLY (data)) 770 if (!SvREADONLY (data))
678 { 771 {
… …
702void 795void
703aio_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)
704 PROTOTYPE: $$$$;$ 797 PROTOTYPE: $$$$;$
705 PPCODE: 798 PPCODE:
706{ 799{
800 int ifd = extract_fd (in_fh , 0);
801 int ofd = extract_fd (out_fh, 0);
707 dREQ; 802 dREQ;
708 803
709 req->type = EIO_SENDFILE; 804 req->type = EIO_SENDFILE;
710 req->sv1 = newSVsv (out_fh); 805 req->sv1 = newSVsv (out_fh);
711 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 806 req->int1 = ofd;
712 req->sv2 = newSVsv (in_fh); 807 req->sv2 = newSVsv (in_fh);
713 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 808 req->int2 = ifd;
714 req->offs = SvVAL64 (in_offset); 809 req->offs = SvVAL64 (in_offset);
715 req->size = length; 810 req->size = length;
716 811
717 REQ_SEND; 812 REQ_SEND;
718} 813}
… …
720void 815void
721aio_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)
722 PROTOTYPE: $$$;$ 817 PROTOTYPE: $$$;$
723 PPCODE: 818 PPCODE:
724{ 819{
820 int fd = extract_fd (fh, 0);
725 dREQ; 821 dREQ;
726 822
727 req->type = EIO_READAHEAD; 823 req->type = EIO_READAHEAD;
728 req->sv1 = newSVsv (fh); 824 req->sv1 = newSVsv (fh);
729 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 825 req->int1 = fd;
730 req->offs = SvVAL64 (offset); 826 req->offs = SvVAL64 (offset);
731 req->size = length; 827 req->size = length;
732 828
733 REQ_SEND; 829 REQ_SEND;
734} 830}
… …
851 req->type = EIO_FCHOWN; 947 req->type = EIO_FCHOWN;
852 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 948 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
853 } 949 }
854 950
855 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 req->int1 |= EIO_READDIR_CUSTOM2;
967
968 REQ_SEND;
856} 969}
857 970
858void 971void
859aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 972aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
860 ALIAS: 973 ALIAS:
… …
1108 AV *av; 1221 AV *av;
1109 1222
1110 grp->errorno = errno; 1223 grp->errorno = errno;
1111 1224
1112 av = newAV (); 1225 av = newAV ();
1226 av_extend (av, items - 1);
1113 1227
1114 for (i = 1; i < items; ++i ) 1228 for (i = 1; i < items; ++i )
1115 av_push (av, newSVsv (ST (i))); 1229 av_push (av, newSVsv (ST (i)));
1116 1230
1117 SvREFCNT_dec (grp->sv1); 1231 SvREFCNT_dec (grp->sv1);

Diff Legend

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