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.132 by root, Mon Oct 13 10:38:17 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
495 521
496 create_respipe (); 522 create_respipe ();
497 523
… …
664 PPCODE: 690 PPCODE:
665{ 691{
666 SV *data; 692 SV *data;
667 dREQ; 693 dREQ;
668 694
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 695 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 696 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 697 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 698
678 REQ_SEND; 699 REQ_SEND;
679} 700}
680 701
681void 702void
… …
719 aio_lstat = EIO_LSTAT 740 aio_lstat = EIO_LSTAT
720 PPCODE: 741 PPCODE:
721{ 742{
722 dREQ; 743 dREQ;
723 744
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); 745 req->sv1 = newSVsv (fh_or_path);
733 746
734 if (SvPOK (fh_or_path)) 747 if (SvPOK (req->sv1))
735 { 748 {
736 req->type = ix; 749 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 750 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 751 }
739 else 752 else
… …
753 766
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 767 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 768 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 769 req->sv1 = newSVsv (fh_or_path);
757 770
758 if (SvPOK (fh_or_path)) 771 if (SvPOK (req->sv1))
759 { 772 {
760 req->type = EIO_UTIME; 773 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 774 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 775 }
763 else 776 else
… …
776 dREQ; 789 dREQ;
777 790
778 req->sv1 = newSVsv (fh_or_path); 791 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 792 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 793
781 if (SvPOK (fh_or_path)) 794 if (SvPOK (req->sv1))
782 { 795 {
783 req->type = EIO_TRUNCATE; 796 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 797 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 798 }
786 else 799 else
… …
794 807
795void 808void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 809aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 810 ALIAS:
798 aio_chmod = EIO_CHMOD 811 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 812 aio_mkdir = EIO_MKDIR
801 PPCODE: 813 PPCODE:
802{ 814{
803 dREQ; 815 dREQ;
804 816
805 req->type = ix;
806 req->int2 = mode; 817 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 818 req->sv1 = newSVsv (fh_or_path);
808 819
809 if (ix == EIO_FCHMOD) 820 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 821 {
822 req->type = ix;
823 req->ptr1 = SvPVbyte_nolen (req->sv1);
824 }
811 else 825 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 826 {
827 req->type = EIO_FCHMOD;
828 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
829 }
813 830
814 REQ_SEND; 831 REQ_SEND;
815} 832}
816 833
817void 834void
… …
822 839
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 840 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 841 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 842 req->sv1 = newSVsv (fh_or_path);
826 843
827 if (SvPOK (fh_or_path)) 844 if (SvPOK (req->sv1))
828 { 845 {
829 req->type = EIO_CHOWN; 846 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 847 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 848 }
832 else 849 else
… …
908{ 925{
909 dREQ; 926 dREQ;
910 927
911 req->type = EIO_GROUP; 928 req->type = EIO_GROUP;
912 929
913 eio_submit (req); 930 req_submit (req);
914 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 931 XPUSHs (req_sv (req, AIO_GRP_KLASS));
915} 932}
916 933
917void 934void
918aio_nop (SV *callback=&PL_sv_undef) 935aio_nop (SV *callback=&PL_sv_undef)
… …
930 947
931int 948int
932aioreq_pri (int pri = 0) 949aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 950 PROTOTYPE: ;$
934 CODE: 951 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 952 RETVAL = next_pri;
936 if (items > 0) 953 if (items > 0)
937 { 954 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 955 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 956 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 957 next_pri = pri;
941 } 958 }
942 OUTPUT: 959 OUTPUT:
943 RETVAL 960 RETVAL
944 961
945void 962void
946aioreq_nice (int nice = 0) 963aioreq_nice (int nice = 0)
947 CODE: 964 CODE:
948 nice = next_pri - nice; 965 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 966 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 967 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 968 next_pri = nice;
952 969
953void 970void
954flush () 971flush ()
955 PROTOTYPE: 972 PROTOTYPE:
956 CODE: 973 CODE:
… …
1017 1034
1018int 1035int
1019nthreads() 1036nthreads()
1020 PROTOTYPE: 1037 PROTOTYPE:
1021 CODE: 1038 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1039 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1040 OUTPUT:
1026 RETVAL 1041 RETVAL
1027 1042
1028void _on_next_submit (SV *cb) 1043void _on_next_submit (SV *cb)
1029 CODE: 1044 CODE:
… …
1039 CODE: 1054 CODE:
1040 eio_cancel (req); 1055 eio_cancel (req);
1041 1056
1042void 1057void
1043cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1058cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1044 CODE: 1059 PPCODE:
1060{
1061 if (GIMME_V != G_VOID)
1062 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1063
1064 if (items > 1)
1065 {
1066 SV *cb_cv = get_cb (callback);
1067
1045 SvREFCNT_dec (req->callback); 1068 SvREFCNT_dec (req->callback);
1046 req->callback = newSVsv (callback); 1069 req->callback = SvREFCNT_inc (cb_cv);
1070 }
1071}
1047 1072
1048MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1073MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1049 1074
1050void 1075void
1051add (aio_req grp, ...) 1076add (aio_req grp, ...)
… …
1106void 1131void
1107feed (aio_req grp, SV *callback=&PL_sv_undef) 1132feed (aio_req grp, SV *callback=&PL_sv_undef)
1108 CODE: 1133 CODE:
1109{ 1134{
1110 SvREFCNT_dec (grp->sv2); 1135 SvREFCNT_dec (grp->sv2);
1111 grp->sv2 = newSVsv (callback); 1136 grp->sv2 = newSVsv (callback);
1137 grp->feed = aio_grp_feed;
1112 1138
1113 if (grp->int2 <= 0) 1139 if (grp->int2 <= 0)
1114 grp->int2 = 2; 1140 grp->int2 = 2;
1115 1141
1116 eio_grp_limit (grp, grp->int2); 1142 eio_grp_limit (grp, grp->int2);

Diff Legend

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