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.141 by root, Sat Jun 6 17:25:13 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);
… …
224 235
225 av_extend (av, req->result - 1); 236 av_extend (av, req->result - 1);
226 237
227 for (i = 0; i < req->result; ++i) 238 for (i = 0; i < req->result; ++i)
228 { 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 {
229 SV *sv = newSVpv (buf, 0); 271 SV *name = newSVpv (buf, 0);
230
231 av_store (av, i, sv); 272 av_store (av, i, name);
232 buf += SvCUR (sv) + 1; 273 buf += SvCUR (name) + 1;
274 }
233 } 275 }
234 276
235 rv = sv_2mortal (newRV_noinc ((SV *)av)); 277 rv = sv_2mortal (newRV_noinc ((SV *)av));
236 } 278 }
237 279
238 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))));
239 } 284 }
240 break; 285 break;
241 286
242 case EIO_OPEN: 287 case EIO_OPEN:
243 { 288 {
… …
301 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 346 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
302 PUSHs (sv_2mortal (newSViv (req->result))); 347 PUSHs (sv_2mortal (newSViv (req->result)));
303 break; 348 break;
304 349
305 case EIO_READ: 350 case EIO_READ:
351 {
306 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));
307 *SvEND (req->sv2) = 0; 353 *SvEND (req->sv2) = 0;
354 SvPOK_only (req->sv2);
355 SvSETMAGIC (req->sv2);
308 PUSHs (sv_2mortal (newSViv (req->result))); 356 PUSHs (sv_2mortal (newSViv (req->result)));
357 }
309 break; 358 break;
310 359
311 case EIO_DUP2: 360 case EIO_DUP2:
312 if (req->result > 0) 361 if (req->result > 0)
313 req->result = 0; 362 req->result = 0;
… …
448static void atfork_child (void) 497static void atfork_child (void)
449{ 498{
450 create_respipe (); 499 create_respipe ();
451} 500}
452 501
502static SV *
503get_cb (SV *cb_sv)
504{
505 HV *st;
506 GV *gvp;
507 CV *cv;
508
509 if (!SvOK (cb_sv))
510 return 0;
511
512 cv = sv_2cv (cb_sv, &st, &gvp, 0);
513
514 if (!cv)
515 croak ("IO::AIO callback must be undef or a CODE reference");
516
517 return (SV *)cv;
518}
519
453#define dREQ \ 520#define dREQ \
521 SV *cb_cv; \
454 aio_req req; \ 522 aio_req req; \
455 int req_pri = next_pri; \ 523 int req_pri = next_pri; \
456 next_pri = EIO_PRI_DEFAULT; \ 524 next_pri = EIO_PRI_DEFAULT; \
457 \ 525 \
458 if (SvOK (callback) && !SvROK (callback)) \ 526 cb_cv = get_cb (callback); \
459 croak ("callback must be undef or of reference type"); \
460 \ 527 \
461 Newz (0, req, 1, eio_req); \ 528 Newz (0, req, 1, eio_req); \
462 if (!req) \ 529 if (!req) \
463 croak ("out of memory during eio_req allocation"); \ 530 croak ("out of memory during eio_req allocation"); \
464 \ 531 \
465 req->callback = newSVsv (callback); \ 532 req->callback = SvREFCNT_inc (cb_cv); \
466 req->pri = req_pri 533 req->pri = req_pri
467 534
468#define REQ_SEND \ 535#define REQ_SEND \
469 PUTBACK; \ 536 PUTBACK; \
470 req_submit (req); \ 537 req_submit (req); \
471 SPAGAIN; \ 538 SPAGAIN; \
472 \ 539 \
473 if (GIMME_V != G_VOID) \ 540 if (GIMME_V != G_VOID) \
474 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 541 XPUSHs (req_sv (req, AIO_REQ_KLASS));
475 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
476MODULE = IO::AIO PACKAGE = IO::AIO 554MODULE = IO::AIO PACKAGE = IO::AIO
477 555
478PROTOTYPES: ENABLE 556PROTOTYPES: ENABLE
479 557
480BOOT: 558BOOT:
481{ 559{
482 stash = gv_stashpv ("IO::AIO", 1); 560 stash = gv_stashpv ("IO::AIO", 1);
483 561
484 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 562 static const struct {
485 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 563 const char *name;
486 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 564 IV iv;
487 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 565 } *civ, const_iv[] = {
488 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)
489#ifndef _WIN32 574#ifndef _WIN32
490 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 575 const_iv (S_IFIFO , S_IFIFO)
491#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)
492 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
493 create_respipe (); 600 create_respipe ();
494 601
495 if (eio_init (want_poll, done_poll) < 0) 602 if (eio_init (want_poll, done_poll) < 0)
496 croak ("IO::AIO: unable to initialise eio library"); 603 croak ("IO::AIO: unable to initialise eio library");
497 604
498 /* atfork child called in fifo order, so before eio's handler */ 605 /* atfork child called in fifo order, so before eio's handler */
499 X_THREAD_ATFORK (0, 0, atfork_child); 606 X_THREAD_ATFORK (0, 0, atfork_child);
500} 607}
501 608
502void 609void
503max_poll_reqs (int nreqs) 610max_poll_reqs (int nreqs)
504 PROTOTYPE: $ 611 PROTOTYPE: $
… …
557 ALIAS: 664 ALIAS:
558 aio_fsync = EIO_FSYNC 665 aio_fsync = EIO_FSYNC
559 aio_fdatasync = EIO_FDATASYNC 666 aio_fdatasync = EIO_FDATASYNC
560 PPCODE: 667 PPCODE:
561{ 668{
669 int fd = extract_fd (fh, 0);
562 dREQ; 670 dREQ;
563 671
564 req->type = ix; 672 req->type = ix;
565 req->sv1 = newSVsv (fh); 673 req->sv1 = newSVsv (fh);
566 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;
567 693
568 REQ_SEND (req); 694 REQ_SEND (req);
569} 695}
570 696
571void 697void
572aio_close (SV *fh, SV *callback=&PL_sv_undef) 698aio_close (SV *fh, SV *callback=&PL_sv_undef)
573 PROTOTYPE: $;$ 699 PROTOTYPE: $;$
574 PPCODE: 700 PPCODE:
575{ 701{
576 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);
577 dREQ; 704 dREQ;
578 705
579 if (close_pipe < 0) 706 if (close_pipe < 0)
580 { 707 {
581 int pipefd [2]; 708 int pipefd [2];
… …
589 } 716 }
590 717
591 req->type = EIO_DUP2; 718 req->type = EIO_DUP2;
592 req->int1 = close_pipe; 719 req->int1 = close_pipe;
593 req->sv2 = newSVsv (fh); 720 req->sv2 = newSVsv (fh);
594 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 721 req->int2 = fd;
595 722
596 REQ_SEND (req); 723 REQ_SEND (req);
597} 724}
598 725
599void 726void
… …
603 aio_write = EIO_WRITE 730 aio_write = EIO_WRITE
604 PROTOTYPE: $$$$$;$ 731 PROTOTYPE: $$$$$;$
605 PPCODE: 732 PPCODE:
606{ 733{
607 STRLEN svlen; 734 STRLEN svlen;
735 int fd = extract_fd (fh, ix == EIO_WRITE);
608 char *svptr = SvPVbyte (data, svlen); 736 char *svptr = SvPVbyte (data, svlen);
609 UV len = SvUV (length); 737 UV len = SvUV (length);
610
611 SvUPGRADE (data, SVt_PV);
612 SvPOK_on (data);
613 738
614 if (dataoffset < 0) 739 if (dataoffset < 0)
615 dataoffset += svlen; 740 dataoffset += svlen;
616 741
617 if (dataoffset < 0 || dataoffset > svlen) 742 if (dataoffset < 0 || dataoffset > svlen)
… …
623 if (!SvOK (length) || len + dataoffset > svlen) 748 if (!SvOK (length) || len + dataoffset > svlen)
624 len = svlen - dataoffset; 749 len = svlen - dataoffset;
625 } 750 }
626 else 751 else
627 { 752 {
628 /* read: grow scalar as necessary */ 753 /* read: check type and grow scalar as necessary */
754 SvUPGRADE (data, SVt_PV);
629 svptr = SvGROW (data, len + dataoffset + 1); 755 svptr = SvGROW (data, len + dataoffset + 1);
630 } 756 }
631
632 if (len < 0)
633 croak ("length must not be negative");
634 757
635 { 758 {
636 dREQ; 759 dREQ;
637 760
638 req->type = ix; 761 req->type = ix;
639 req->sv1 = newSVsv (fh); 762 req->sv1 = newSVsv (fh);
640 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 763 req->int1 = fd;
641 : IoOFP (sv_2io (fh)));
642 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 764 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
643 req->size = len; 765 req->size = len;
644 req->sv2 = SvREFCNT_inc (data); 766 req->sv2 = SvREFCNT_inc (data);
645 req->ptr2 = (char *)svptr + dataoffset; 767 req->ptr2 = (char *)svptr + dataoffset;
646 req->stroffset = dataoffset; 768 req->stroffset = dataoffset;
… …
673void 795void
674aio_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)
675 PROTOTYPE: $$$$;$ 797 PROTOTYPE: $$$$;$
676 PPCODE: 798 PPCODE:
677{ 799{
800 int ifd = extract_fd (in_fh , 0);
801 int ofd = extract_fd (out_fh, 0);
678 dREQ; 802 dREQ;
679 803
680 req->type = EIO_SENDFILE; 804 req->type = EIO_SENDFILE;
681 req->sv1 = newSVsv (out_fh); 805 req->sv1 = newSVsv (out_fh);
682 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 806 req->int1 = ofd;
683 req->sv2 = newSVsv (in_fh); 807 req->sv2 = newSVsv (in_fh);
684 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 808 req->int2 = ifd;
685 req->offs = SvVAL64 (in_offset); 809 req->offs = SvVAL64 (in_offset);
686 req->size = length; 810 req->size = length;
687 811
688 REQ_SEND; 812 REQ_SEND;
689} 813}
… …
691void 815void
692aio_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)
693 PROTOTYPE: $$$;$ 817 PROTOTYPE: $$$;$
694 PPCODE: 818 PPCODE:
695{ 819{
820 int fd = extract_fd (fh, 0);
696 dREQ; 821 dREQ;
697 822
698 req->type = EIO_READAHEAD; 823 req->type = EIO_READAHEAD;
699 req->sv1 = newSVsv (fh); 824 req->sv1 = newSVsv (fh);
700 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 825 req->int1 = fd;
701 req->offs = SvVAL64 (offset); 826 req->offs = SvVAL64 (offset);
702 req->size = length; 827 req->size = length;
703 828
704 REQ_SEND; 829 REQ_SEND;
705} 830}
… …
822 req->type = EIO_FCHOWN; 947 req->type = EIO_FCHOWN;
823 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 948 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
824 } 949 }
825 950
826 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;
827} 969}
828 970
829void 971void
830aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 972aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
831 ALIAS: 973 ALIAS:
… …
896{ 1038{
897 dREQ; 1039 dREQ;
898 1040
899 req->type = EIO_GROUP; 1041 req->type = EIO_GROUP;
900 1042
901 eio_submit (req); 1043 req_submit (req);
902 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1044 XPUSHs (req_sv (req, AIO_GRP_KLASS));
903} 1045}
904 1046
905void 1047void
906aio_nop (SV *callback=&PL_sv_undef) 1048aio_nop (SV *callback=&PL_sv_undef)
… …
1025 CODE: 1167 CODE:
1026 eio_cancel (req); 1168 eio_cancel (req);
1027 1169
1028void 1170void
1029cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1171cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1030 CODE: 1172 PPCODE:
1173{
1174 if (GIMME_V != G_VOID)
1175 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1176
1177 if (items > 1)
1178 {
1179 SV *cb_cv = get_cb (callback);
1180
1031 SvREFCNT_dec (req->callback); 1181 SvREFCNT_dec (req->callback);
1032 req->callback = newSVsv (callback); 1182 req->callback = SvREFCNT_inc (cb_cv);
1183 }
1184}
1033 1185
1034MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1186MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1035 1187
1036void 1188void
1037add (aio_req grp, ...) 1189add (aio_req grp, ...)
… …
1069 AV *av; 1221 AV *av;
1070 1222
1071 grp->errorno = errno; 1223 grp->errorno = errno;
1072 1224
1073 av = newAV (); 1225 av = newAV ();
1226 av_extend (av, items - 1);
1074 1227
1075 for (i = 1; i < items; ++i ) 1228 for (i = 1; i < items; ++i )
1076 av_push (av, newSVsv (ST (i))); 1229 av_push (av, newSVsv (ST (i)));
1077 1230
1078 SvREFCNT_dec (grp->sv1); 1231 SvREFCNT_dec (grp->sv1);
… …
1092void 1245void
1093feed (aio_req grp, SV *callback=&PL_sv_undef) 1246feed (aio_req grp, SV *callback=&PL_sv_undef)
1094 CODE: 1247 CODE:
1095{ 1248{
1096 SvREFCNT_dec (grp->sv2); 1249 SvREFCNT_dec (grp->sv2);
1097 grp->sv2 = newSVsv (callback); 1250 grp->sv2 = newSVsv (callback);
1251 grp->feed = aio_grp_feed;
1098 1252
1099 if (grp->int2 <= 0) 1253 if (grp->int2 <= 0)
1100 grp->int2 = 2; 1254 grp->int2 = 2;
1101 1255
1102 eio_grp_limit (grp, grp->int2); 1256 eio_grp_limit (grp, grp->int2);

Diff Legend

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