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.118 by root, Sun May 11 00:01:03 2008 UTC vs.
Revision 1.133 by root, Wed Oct 22 18:15:36 2008 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"
84 103
85#define EIO_COMMON \ 104#define EIO_REQ_MEMBERS \
86 SV *callback; \ 105 SV *callback; \
87 SV *sv1, *sv2; \ 106 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 107 STRLEN stroffset; \
89 SV *self 108 SV *self;
109
110#define EIO_NO_WRAPPERS 1
90 111
91#include "libeio/eio.h" 112#include "libeio/eio.h"
92 113
93static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
95static void aio_grp_feed (eio_req *grp);
96#define EIO_FEED(req) aio_grp_feed (req)
97static void req_destroy (eio_req *grp); 116static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
99 118
100enum { 119enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
105 124
106typedef eio_req *aio_req; 125typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 126typedef eio_req *aio_req_ornot;
108 127
109static SV *on_next_submit; 128static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 129static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 130static int max_outstanding;
112 131
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 132static int respipe_osf [2], respipe [2] = { -1, -1 };
114 133
115static void req_destroy (aio_req req); 134static void req_destroy (aio_req req);
… …
173 192
174static void req_submit (eio_req *req) 193static void req_submit (eio_req *req)
175{ 194{
176 eio_submit (req); 195 eio_submit (req);
177 196
178 if (on_next_submit) 197 if (expect_false (on_next_submit))
179 { 198 {
180 dSP; 199 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 200 SV *cb = sv_2mortal (on_next_submit);
182 201
183 on_next_submit = 0; 202 on_next_submit = 0;
… …
193 dSP; 212 dSP;
194 213
195 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
197 216
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
199 { 218 {
200 ENTER; 219 ENTER;
201 SAVETMPS; 220 SAVETMPS;
202 PUSHMARK (SP); 221 PUSHMARK (SP);
203 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
280 case EIO_BUSY: 299 case EIO_BUSY:
281 break; 300 break;
282 301
283 case EIO_READLINK: 302 case EIO_READLINK:
284 if (req->result > 0) 303 if (req->result > 0)
285 { 304 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
286 SvCUR_set (req->sv2, req->result);
287 *SvEND (req->sv2) = 0;
288 PUSHs (req->sv2);
289 }
290 break; 305 break;
291 306
292 case EIO_STAT: 307 case EIO_STAT:
293 case EIO_LSTAT: 308 case EIO_LSTAT:
294 case EIO_FSTAT: 309 case EIO_FSTAT:
… …
414 X_UNLOCK (reslock); 429 X_UNLOCK (reslock);
415 430
416 if (size) 431 if (size)
417 return; 432 return;
418 433
419 maybe_start_thread (); 434 etp_maybe_start_thread ();
420 435
421 FD_ZERO (&rfd); 436 FD_ZERO (&rfd);
422 FD_SET (respipe [0], &rfd); 437 FD_SET (respipe [0], &rfd);
423 438
424 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
425 } 440 }
426} 441}
427 442
428static int poll_cb (void) 443static int poll_cb (void)
429{ 444{
430 int res; 445 for (;;)
431
432 do
433 { 446 {
434 res = eio_poll (); 447 int res = eio_poll ();
435 448
436 if (res > 0) 449 if (res > 0)
437 croak (0); 450 croak (0);
451
452 if (!max_outstanding || max_outstanding > eio_nreqs ())
453 return res;
454
455 poll_wait ();
438 } 456 }
439 while (max_outstanding && max_outstanding <= eio_nreqs ());
440
441 return res;
442} 457}
443 458
444static void atfork_child (void) 459static void atfork_child (void)
445{ 460{
446 create_respipe (); 461 create_respipe ();
447} 462}
448 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
449#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
450 aio_req req; \ 484 aio_req req; \
451 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
452 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 486 next_pri = EIO_PRI_DEFAULT; \
453 \ 487 \
454 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
455 croak ("callback must be undef or of reference type"); \
456 \ 489 \
457 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
458 if (!req) \ 491 if (!req) \
459 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
460 \ 493 \
461 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
462 req->pri = req_pri 495 req->pri = req_pri
463 496
464#define REQ_SEND \ 497#define REQ_SEND \
498 PUTBACK; \
465 req_submit (req); \ 499 req_submit (req); \
500 SPAGAIN; \
466 \ 501 \
467 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
468 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
469 504
470MODULE = IO::AIO PACKAGE = IO::AIO 505MODULE = IO::AIO PACKAGE = IO::AIO
… …
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 513 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 514 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 515 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 517 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
483#ifdef _WIN32 518#ifndef _WIN32
484 X_MUTEX_CHECK (wrklock);
485 X_MUTEX_CHECK (reslock);
486 X_MUTEX_CHECK (reqlock);
487 X_MUTEX_CHECK (reqwait);
488 X_MUTEX_CHECK (preadwritelock);
489 X_MUTEX_CHECK (readdirlock);
490
491 X_COND_CHECK (reqwait);
492#else
493 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 519 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif 520#endif
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
522 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
523 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
524 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
495 525
496 create_respipe (); 526 create_respipe ();
497 527
498 if (eio_init (want_poll, done_poll) < 0) 528 if (eio_init (want_poll, done_poll) < 0)
499 croak ("IO::AIO: unable to initialise eio library"); 529 croak ("IO::AIO: unable to initialise eio library");
… …
565 dREQ; 595 dREQ;
566 596
567 req->type = ix; 597 req->type = ix;
568 req->sv1 = newSVsv (fh); 598 req->sv1 = newSVsv (fh);
569 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 599 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
600
601 REQ_SEND (req);
602}
603
604void
605aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
606 PROTOTYPE: $$$$;$
607 PPCODE:
608{
609 dREQ;
610
611 req->type = EIO_SYNC_FILE_RANGE;
612 req->sv1 = newSVsv (fh);
613 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
614 req->offs = SvVAL64 (offset);
615 req->size = SvVAL64 (nbytes);
616 req->int2 = flags;
570 617
571 REQ_SEND (req); 618 REQ_SEND (req);
572} 619}
573 620
574void 621void
… …
664 PPCODE: 711 PPCODE:
665{ 712{
666 SV *data; 713 SV *data;
667 dREQ; 714 dREQ;
668 715
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 716 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 717 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 718 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 719
678 REQ_SEND; 720 REQ_SEND;
679} 721}
680 722
681void 723void
… …
719 aio_lstat = EIO_LSTAT 761 aio_lstat = EIO_LSTAT
720 PPCODE: 762 PPCODE:
721{ 763{
722 dREQ; 764 dREQ;
723 765
724 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
725 if (!req->ptr2)
726 {
727 req_destroy (req);
728 croak ("out of memory during aio_stat statdata allocation");
729 }
730
731 req->flags |= EIO_FLAG_PTR2_FREE;
732 req->sv1 = newSVsv (fh_or_path); 766 req->sv1 = newSVsv (fh_or_path);
733 767
734 if (SvPOK (fh_or_path)) 768 if (SvPOK (req->sv1))
735 { 769 {
736 req->type = ix; 770 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 771 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 772 }
739 else 773 else
… …
753 787
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 788 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 789 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 790 req->sv1 = newSVsv (fh_or_path);
757 791
758 if (SvPOK (fh_or_path)) 792 if (SvPOK (req->sv1))
759 { 793 {
760 req->type = EIO_UTIME; 794 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 795 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 796 }
763 else 797 else
… …
776 dREQ; 810 dREQ;
777 811
778 req->sv1 = newSVsv (fh_or_path); 812 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 813 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 814
781 if (SvPOK (fh_or_path)) 815 if (SvPOK (req->sv1))
782 { 816 {
783 req->type = EIO_TRUNCATE; 817 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 818 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 819 }
786 else 820 else
… …
794 828
795void 829void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 830aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 831 ALIAS:
798 aio_chmod = EIO_CHMOD 832 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 833 aio_mkdir = EIO_MKDIR
801 PPCODE: 834 PPCODE:
802{ 835{
803 dREQ; 836 dREQ;
804 837
805 req->type = ix;
806 req->int2 = mode; 838 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 839 req->sv1 = newSVsv (fh_or_path);
808 840
809 if (ix == EIO_FCHMOD) 841 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 842 {
843 req->type = ix;
844 req->ptr1 = SvPVbyte_nolen (req->sv1);
845 }
811 else 846 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 847 {
848 req->type = EIO_FCHMOD;
849 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
850 }
813 851
814 REQ_SEND; 852 REQ_SEND;
815} 853}
816 854
817void 855void
… …
822 860
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 861 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 862 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 863 req->sv1 = newSVsv (fh_or_path);
826 864
827 if (SvPOK (fh_or_path)) 865 if (SvPOK (req->sv1))
828 { 866 {
829 req->type = EIO_CHOWN; 867 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 868 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 869 }
832 else 870 else
… …
908{ 946{
909 dREQ; 947 dREQ;
910 948
911 req->type = EIO_GROUP; 949 req->type = EIO_GROUP;
912 950
913 eio_submit (req); 951 req_submit (req);
914 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 952 XPUSHs (req_sv (req, AIO_GRP_KLASS));
915} 953}
916 954
917void 955void
918aio_nop (SV *callback=&PL_sv_undef) 956aio_nop (SV *callback=&PL_sv_undef)
… …
930 968
931int 969int
932aioreq_pri (int pri = 0) 970aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 971 PROTOTYPE: ;$
934 CODE: 972 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 973 RETVAL = next_pri;
936 if (items > 0) 974 if (items > 0)
937 { 975 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 976 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 977 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 978 next_pri = pri;
941 } 979 }
942 OUTPUT: 980 OUTPUT:
943 RETVAL 981 RETVAL
944 982
945void 983void
946aioreq_nice (int nice = 0) 984aioreq_nice (int nice = 0)
947 CODE: 985 CODE:
948 nice = next_pri - nice; 986 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 987 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 988 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 989 next_pri = nice;
952 990
953void 991void
954flush () 992flush ()
955 PROTOTYPE: 993 PROTOTYPE:
956 CODE: 994 CODE:
… …
1017 1055
1018int 1056int
1019nthreads() 1057nthreads()
1020 PROTOTYPE: 1058 PROTOTYPE:
1021 CODE: 1059 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1060 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1061 OUTPUT:
1026 RETVAL 1062 RETVAL
1027 1063
1028void _on_next_submit (SV *cb) 1064void _on_next_submit (SV *cb)
1029 CODE: 1065 CODE:
… …
1039 CODE: 1075 CODE:
1040 eio_cancel (req); 1076 eio_cancel (req);
1041 1077
1042void 1078void
1043cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1079cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1044 CODE: 1080 PPCODE:
1081{
1082 if (GIMME_V != G_VOID)
1083 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1084
1085 if (items > 1)
1086 {
1087 SV *cb_cv = get_cb (callback);
1088
1045 SvREFCNT_dec (req->callback); 1089 SvREFCNT_dec (req->callback);
1046 req->callback = newSVsv (callback); 1090 req->callback = SvREFCNT_inc (cb_cv);
1091 }
1092}
1047 1093
1048MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1094MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1049 1095
1050void 1096void
1051add (aio_req grp, ...) 1097add (aio_req grp, ...)
… …
1106void 1152void
1107feed (aio_req grp, SV *callback=&PL_sv_undef) 1153feed (aio_req grp, SV *callback=&PL_sv_undef)
1108 CODE: 1154 CODE:
1109{ 1155{
1110 SvREFCNT_dec (grp->sv2); 1156 SvREFCNT_dec (grp->sv2);
1111 grp->sv2 = newSVsv (callback); 1157 grp->sv2 = newSVsv (callback);
1158 grp->feed = aio_grp_feed;
1112 1159
1113 if (grp->int2 <= 0) 1160 if (grp->int2 <= 0)
1114 grp->int2 = 2; 1161 grp->int2 = 2;
1115 1162
1116 eio_grp_limit (grp, grp->int2); 1163 eio_grp_limit (grp, grp->int2);

Diff Legend

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