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.123 by root, Sat May 17 12:17:25 2008 UTC vs.
Revision 1.136 by root, Sun Apr 19 13:15:55 2009 UTC

… …
65# include <signal.h> 65# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
67 67
68#endif 68#endif
69 69
70/* perl stupidly overrides readdir and maybe others */
71/* with thread-unsafe versions, imagine that :( */
72#undef readdir
73#undef opendir
74#undef closedir
75
70#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
71 77
72/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 79#if IVSIZE >= 8
74# define SvVAL64 SvIV 80# define SvVAL64 SvIV
75#else 81#else
76# define SvVAL64 SvNV 82# define SvVAL64 SvNV
77#endif 83#endif
78 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
79static HV *stash; 98static HV *stash;
80typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
81 100
82#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
… …
92 111
93#include "libeio/eio.h" 112#include "libeio/eio.h"
94 113
95static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
96#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
97static void aio_grp_feed (eio_req *grp);
98#define EIO_FEED(req) aio_grp_feed (req)
99static void req_destroy (eio_req *grp); 116static void req_destroy (eio_req *grp);
100#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
101 118
102enum { 119enum {
103 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
175 192
176static void req_submit (eio_req *req) 193static void req_submit (eio_req *req)
177{ 194{
178 eio_submit (req); 195 eio_submit (req);
179 196
180 if (on_next_submit) 197 if (expect_false (on_next_submit))
181 { 198 {
182 dSP; 199 dSP;
183 SV *cb = sv_2mortal (on_next_submit); 200 SV *cb = sv_2mortal (on_next_submit);
184 201
185 on_next_submit = 0; 202 on_next_submit = 0;
… …
195 dSP; 212 dSP;
196 213
197 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
198 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
199 216
200 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
201 { 218 {
202 ENTER; 219 ENTER;
203 SAVETMPS; 220 SAVETMPS;
204 PUSHMARK (SP); 221 PUSHMARK (SP);
205 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
423 } 440 }
424} 441}
425 442
426static int poll_cb (void) 443static int poll_cb (void)
427{ 444{
428 int res; 445 for (;;)
429
430 do
431 { 446 {
432 res = eio_poll (); 447 int res = eio_poll ();
433 448
434 if (res > 0) 449 if (res > 0)
435 croak (0); 450 croak (0);
451
452 if (!max_outstanding || max_outstanding > eio_nreqs ())
453 return res;
454
455 poll_wait ();
436 } 456 }
437 while (max_outstanding && max_outstanding <= eio_nreqs ());
438
439 return res;
440} 457}
441 458
442static void atfork_child (void) 459static void atfork_child (void)
443{ 460{
444 create_respipe (); 461 create_respipe ();
445} 462}
446 463
464static SV *
465get_cb (SV *cb_sv)
466{
467 HV *st;
468 GV *gvp;
469 CV *cv;
470
471 if (!SvOK (cb_sv))
472 return 0;
473
474 cv = sv_2cv (cb_sv, &st, &gvp, 0);
475
476 if (!cv)
477 croak ("IO::AIO callback must be undef or a CODE reference");
478
479 return (SV *)cv;
480}
481
447#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
448 aio_req req; \ 484 aio_req req; \
449 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
450 next_pri = EIO_PRI_DEFAULT; \ 486 next_pri = EIO_PRI_DEFAULT; \
451 \ 487 \
452 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
453 croak ("callback must be undef or of reference type"); \
454 \ 489 \
455 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
456 if (!req) \ 491 if (!req) \
457 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
458 \ 493 \
459 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
460 req->pri = req_pri 495 req->pri = req_pri
461 496
462#define REQ_SEND \ 497#define REQ_SEND \
498 PUTBACK; \
463 req_submit (req); \ 499 req_submit (req); \
500 SPAGAIN; \
464 \ 501 \
465 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
466 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
467 504
505static int
506extract_fd (SV *fh, int wr)
507{
508 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
509
510 if (fd < 0)
511 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
512
513 return fd;
514}
515
468MODULE = IO::AIO PACKAGE = IO::AIO 516MODULE = IO::AIO PACKAGE = IO::AIO
469 517
470PROTOTYPES: ENABLE 518PROTOTYPES: ENABLE
471 519
472BOOT: 520BOOT:
… …
479 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 527 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
480 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 528 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
481#ifndef _WIN32 529#ifndef _WIN32
482 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 530 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
483#endif 531#endif
532 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
533 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
534 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
535 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
484 536
485 create_respipe (); 537 create_respipe ();
486 538
487 if (eio_init (want_poll, done_poll) < 0) 539 if (eio_init (want_poll, done_poll) < 0)
488 croak ("IO::AIO: unable to initialise eio library"); 540 croak ("IO::AIO: unable to initialise eio library");
… …
549 ALIAS: 601 ALIAS:
550 aio_fsync = EIO_FSYNC 602 aio_fsync = EIO_FSYNC
551 aio_fdatasync = EIO_FDATASYNC 603 aio_fdatasync = EIO_FDATASYNC
552 PPCODE: 604 PPCODE:
553{ 605{
606 int fd = extract_fd (fh, 0);
554 dREQ; 607 dREQ;
555 608
556 req->type = ix; 609 req->type = ix;
557 req->sv1 = newSVsv (fh); 610 req->sv1 = newSVsv (fh);
558 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 611 req->int1 = fd;
612
613 REQ_SEND (req);
614}
615
616void
617aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
618 PROTOTYPE: $$$$;$
619 PPCODE:
620{
621 int fd = extract_fd (fh, 0);
622 dREQ;
623
624 req->type = EIO_SYNC_FILE_RANGE;
625 req->sv1 = newSVsv (fh);
626 req->int1 = fd;
627 req->offs = SvVAL64 (offset);
628 req->size = SvVAL64 (nbytes);
629 req->int2 = flags;
559 630
560 REQ_SEND (req); 631 REQ_SEND (req);
561} 632}
562 633
563void 634void
564aio_close (SV *fh, SV *callback=&PL_sv_undef) 635aio_close (SV *fh, SV *callback=&PL_sv_undef)
565 PROTOTYPE: $;$ 636 PROTOTYPE: $;$
566 PPCODE: 637 PPCODE:
567{ 638{
568 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 639 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
640 int fd = extract_fd (fh, 0);
569 dREQ; 641 dREQ;
570 642
571 if (close_pipe < 0) 643 if (close_pipe < 0)
572 { 644 {
573 int pipefd [2]; 645 int pipefd [2];
… …
581 } 653 }
582 654
583 req->type = EIO_DUP2; 655 req->type = EIO_DUP2;
584 req->int1 = close_pipe; 656 req->int1 = close_pipe;
585 req->sv2 = newSVsv (fh); 657 req->sv2 = newSVsv (fh);
586 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 658 req->int2 = fd;
587 659
588 REQ_SEND (req); 660 REQ_SEND (req);
589} 661}
590 662
591void 663void
… …
597 PPCODE: 669 PPCODE:
598{ 670{
599 STRLEN svlen; 671 STRLEN svlen;
600 char *svptr = SvPVbyte (data, svlen); 672 char *svptr = SvPVbyte (data, svlen);
601 UV len = SvUV (length); 673 UV len = SvUV (length);
674 int fd;
675
676 if (SvTYPE (data) > SVt_PVMG)
677 croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data));
602 678
603 SvUPGRADE (data, SVt_PV); 679 SvUPGRADE (data, SVt_PV);
604 SvPOK_on (data); 680 SvPOK_only (data);
605 681
606 if (dataoffset < 0) 682 if (dataoffset < 0)
607 dataoffset += svlen; 683 dataoffset += svlen;
608 684
609 if (dataoffset < 0 || dataoffset > svlen) 685 if (dataoffset < 0 || dataoffset > svlen)
… …
622 } 698 }
623 699
624 if (len < 0) 700 if (len < 0)
625 croak ("length must not be negative"); 701 croak ("length must not be negative");
626 702
703 fd = extract_fd (fh, ix == EIO_WRITE);
704
627 { 705 {
628 dREQ; 706 dREQ;
629 707
630 req->type = ix; 708 req->type = ix;
631 req->sv1 = newSVsv (fh); 709 req->sv1 = newSVsv (fh);
632 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 710 req->int1 = fd;
633 : IoOFP (sv_2io (fh)));
634 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 711 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
635 req->size = len; 712 req->size = len;
636 req->sv2 = SvREFCNT_inc (data); 713 req->sv2 = SvREFCNT_inc (data);
637 req->ptr2 = (char *)svptr + dataoffset; 714 req->ptr2 = (char *)svptr + dataoffset;
638 req->stroffset = dataoffset; 715 req->stroffset = dataoffset;
… …
665void 742void
666aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 743aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$$;$ 744 PROTOTYPE: $$$$;$
668 PPCODE: 745 PPCODE:
669{ 746{
747 int ifd = extract_fd (in_fh , 0);
748 int ofd = extract_fd (out_fh, 0);
670 dREQ; 749 dREQ;
671 750
672 req->type = EIO_SENDFILE; 751 req->type = EIO_SENDFILE;
673 req->sv1 = newSVsv (out_fh); 752 req->sv1 = newSVsv (out_fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 753 req->int1 = ofd;
675 req->sv2 = newSVsv (in_fh); 754 req->sv2 = newSVsv (in_fh);
676 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 755 req->int2 = ifd;
677 req->offs = SvVAL64 (in_offset); 756 req->offs = SvVAL64 (in_offset);
678 req->size = length; 757 req->size = length;
679 758
680 REQ_SEND; 759 REQ_SEND;
681} 760}
… …
683void 762void
684aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 763aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
685 PROTOTYPE: $$$;$ 764 PROTOTYPE: $$$;$
686 PPCODE: 765 PPCODE:
687{ 766{
767 int fd = extract_fd (fh, 0);
688 dREQ; 768 dREQ;
689 769
690 req->type = EIO_READAHEAD; 770 req->type = EIO_READAHEAD;
691 req->sv1 = newSVsv (fh); 771 req->sv1 = newSVsv (fh);
692 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 772 req->int1 = fd;
693 req->offs = SvVAL64 (offset); 773 req->offs = SvVAL64 (offset);
694 req->size = length; 774 req->size = length;
695 775
696 REQ_SEND; 776 REQ_SEND;
697} 777}
… …
888{ 968{
889 dREQ; 969 dREQ;
890 970
891 req->type = EIO_GROUP; 971 req->type = EIO_GROUP;
892 972
893 eio_submit (req); 973 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 974 XPUSHs (req_sv (req, AIO_GRP_KLASS));
895} 975}
896 976
897void 977void
898aio_nop (SV *callback=&PL_sv_undef) 978aio_nop (SV *callback=&PL_sv_undef)
… …
1017 CODE: 1097 CODE:
1018 eio_cancel (req); 1098 eio_cancel (req);
1019 1099
1020void 1100void
1021cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1101cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1022 CODE: 1102 PPCODE:
1103{
1104 if (GIMME_V != G_VOID)
1105 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1106
1107 if (items > 1)
1108 {
1109 SV *cb_cv = get_cb (callback);
1110
1023 SvREFCNT_dec (req->callback); 1111 SvREFCNT_dec (req->callback);
1024 req->callback = newSVsv (callback); 1112 req->callback = SvREFCNT_inc (cb_cv);
1113 }
1114}
1025 1115
1026MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1116MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1027 1117
1028void 1118void
1029add (aio_req grp, ...) 1119add (aio_req grp, ...)
… …
1084void 1174void
1085feed (aio_req grp, SV *callback=&PL_sv_undef) 1175feed (aio_req grp, SV *callback=&PL_sv_undef)
1086 CODE: 1176 CODE:
1087{ 1177{
1088 SvREFCNT_dec (grp->sv2); 1178 SvREFCNT_dec (grp->sv2);
1089 grp->sv2 = newSVsv (callback); 1179 grp->sv2 = newSVsv (callback);
1180 grp->feed = aio_grp_feed;
1090 1181
1091 if (grp->int2 <= 0) 1182 if (grp->int2 <= 0)
1092 grp->int2 = 2; 1183 grp->int2 = 2;
1093 1184
1094 eio_grp_limit (grp, grp->int2); 1185 eio_grp_limit (grp, grp->int2);

Diff Legend

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