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.42 by root, Fri Jul 21 07:35:31 2006 UTC vs.
Revision 1.43 by root, Sat Oct 21 23:06:04 2006 UTC

… …
55 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 55 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
56 REQ_READDIR, 56 REQ_READDIR,
57 REQ_LINK, REQ_SYMLINK, 57 REQ_LINK, REQ_SYMLINK,
58}; 58};
59 59
60#define AIO_CB_KLASS "IO::AIO::CB"
61
60typedef struct aio_cb { 62typedef struct aio_cb
63{
64 struct aio_cb *grp_prev, *grp_next;
65 struct aio_grp *grp;
66
61 struct aio_cb *volatile next; 67 struct aio_cb *volatile next;
62 68
63 int type; 69 SV *self; /* the perl counterpart of this request, if any */
64 70
65 /* should receive a cleanup, with unions */ 71 SV *data, *callback;
66 int fd, fd2; 72 SV *fh, *fh2;
73 void *dataptr, *data2ptr;
74 Stat_t *statdata;
67 off_t offset; 75 off_t offset;
68 size_t length; 76 size_t length;
69 ssize_t result; 77 ssize_t result;
78
79 int type;
80 int fd, fd2;
81 int errorno;
82 STRLEN dataoffset;
70 mode_t mode; /* open */ 83 mode_t mode; /* open */
71 int errorno; 84 unsigned char cancelled;
72 SV *data, *callback;
73 SV *fh, *fh2;
74 void *dataptr, *data2ptr;
75 STRLEN dataoffset;
76
77 Stat_t *statdata;
78} aio_cb; 85} aio_cb;
79 86
80typedef aio_cb *aio_req; 87typedef aio_cb *aio_req;
88typedef aio_cb *aio_req_ornot;
81 89
82static int started, wanted; 90static int started, wanted;
83static volatile int nreqs; 91static volatile int nreqs;
84static int max_outstanding = 1<<30; 92static int max_outstanding = 1<<30;
85static int respipe [2]; 93static int respipe [2];
… …
89static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; 97static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER;
90 98
91static volatile aio_req reqs, reqe; /* queue start, queue end */ 99static volatile aio_req reqs, reqe; /* queue start, queue end */
92static volatile aio_req ress, rese; /* queue start, queue end */ 100static volatile aio_req ress, rese; /* queue start, queue end */
93 101
102typedef struct aio_grp
103{
104 struct aio_cb *first, *last;
105 SV *callback;
106 int busycount;
107} aio_grp;
108
109static void aio_grp_begin (aio_grp *grp)
110{
111 ++grp->busycount;
112}
113
114static void aio_grp_end (aio_grp *grp)
115{
116 --grp->busycount;
117
118 if (grp->busycount)
119 return;
120
121 SvREFCNT_dec (grp->callback);
122 grp->callback = 0;
123}
124
125static aio_grp *aio_grp_new ()
126{
127 aio_grp *grp;
128
129 Newz (0, grp, 1, aio_grp);
130 aio_grp_begin (grp);
131
132 return grp;
133}
134
135/* must be called at most once */
136static SV *req_sv (aio_req req)
137{
138 req->self = (SV *)newHV ();
139 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
140
141 return sv_bless (newRV_noinc (req->self), gv_stashpv (AIO_CB_KLASS, 1));
142}
143
144static aio_req SvAIO_REQ (SV *sv)
145{
146 if (!sv_derived_from (sv, AIO_CB_KLASS) || !SvROK (sv))
147 croak ("object of class " AIO_CB_KLASS " expected");
148
149 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
150
151 return mg ? (aio_req)mg->mg_ptr : 0;
152}
153
94static void free_req (aio_req req) 154static void req_free (aio_req req)
95{ 155{
156 if (req->self)
157 {
158 sv_unmagic (req->self, PERL_MAGIC_ext);
159 SvREFCNT_dec (req->self);
160 }
161
96 if (req->data) 162 if (req->data)
97 SvREFCNT_dec (req->data); 163 SvREFCNT_dec (req->data);
98 164
99 if (req->fh) 165 if (req->fh)
100 SvREFCNT_dec (req->fh); 166 SvREFCNT_dec (req->fh);
… …
226 PUSHMARK (SP); 292 PUSHMARK (SP);
227 XPUSHs (sv_2mortal (fh)); 293 XPUSHs (sv_2mortal (fh));
228 } 294 }
229 } 295 }
230 296
231 if (SvOK (req->callback)) 297 if (SvOK (req->callback) && !req->cancelled)
232 { 298 {
233 PUTBACK; 299 PUTBACK;
234 call_sv (req->callback, G_VOID | G_EVAL); 300 call_sv (req->callback, G_VOID | G_EVAL);
235 SPAGAIN; 301 SPAGAIN;
236 302
237 if (SvTRUE (ERRSV)) 303 if (SvTRUE (ERRSV))
238 { 304 {
239 free_req (req); 305 req_free (req);
240 croak (0); 306 croak (0);
241 } 307 }
242 } 308 }
243 309
244 LEAVE; 310 LEAVE;
245 311
246 errno = errorno; 312 errno = errorno;
247 count++; 313 count++;
248 } 314 }
249 315
250 free_req (req); 316 req_free (req);
251 } 317 }
252 318
253 return count; 319 return count;
254} 320}
255 321
… …
274 340
275 sigprocmask (SIG_SETMASK, &oldsigset, 0); 341 sigprocmask (SIG_SETMASK, &oldsigset, 0);
276} 342}
277 343
278static void 344static void
279send_req (aio_req req) 345req_send (aio_req req)
280{ 346{
281 while (started < wanted && nreqs >= started) 347 while (started < wanted && nreqs >= started)
282 start_thread (); 348 start_thread ();
283 349
284 nreqs++; 350 nreqs++;
… …
315{ 381{
316 aio_req req; 382 aio_req req;
317 Newz (0, req, 1, aio_cb); 383 Newz (0, req, 1, aio_cb);
318 req->type = REQ_QUIT; 384 req->type = REQ_QUIT;
319 385
320 send_req (req); 386 req_send (req);
321} 387}
322 388
323static void min_parallel (int nthreads) 389static void min_parallel (int nthreads)
324{ 390{
325 if (wanted < nthreads) 391 if (wanted < nthreads)
… …
648 714
649 pthread_mutex_unlock (&reqlock); 715 pthread_mutex_unlock (&reqlock);
650 716
651 errno = 0; /* strictly unnecessary */ 717 errno = 0; /* strictly unnecessary */
652 718
653 type = req->type; 719 if (!req->cancelled)
654
655 switch (type) 720 switch (req->type)
656 { 721 {
657 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 722 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
658 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 723 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
659 724
660 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 725 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
661 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break; 726 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length); break;
662 727
663 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 728 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break;
664 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 729 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break;
665 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 730 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break;
666 731
667 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 732 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break;
668 case REQ_CLOSE: req->result = close (req->fd); break; 733 case REQ_CLOSE: req->result = close (req->fd); break;
669 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 734 case REQ_UNLINK: req->result = unlink (req->dataptr); break;
670 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 735 case REQ_RMDIR: req->result = rmdir (req->dataptr); break;
671 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 736 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break;
672 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 737 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break;
673 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 738 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break;
674 739
675 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 740 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break;
676 case REQ_FSYNC: req->result = fsync (req->fd); break; 741 case REQ_FSYNC: req->result = fsync (req->fd); break;
677 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break; 742 case REQ_READDIR: req->result = scandir_ (req->dataptr, &req->data2ptr); break;
678 743
679 case REQ_QUIT: 744 case REQ_QUIT:
680 break; 745 break;
681 746
682 default: 747 default:
683 req->result = ENOSYS; 748 req->result = ENOSYS;
684 break; 749 break;
685 } 750 }
686 751
687 req->errorno = errno; 752 req->errorno = errno;
688 753
689 pthread_mutex_lock (&reslock); 754 pthread_mutex_lock (&reslock);
690 755
… …
744 809
745 while (reqs) 810 while (reqs)
746 { 811 {
747 prv = reqs; 812 prv = reqs;
748 reqs = prv->next; 813 reqs = prv->next;
749 free_req (prv); 814 req_free (prv);
750 } 815 }
751 816
752 reqs = reqe = 0; 817 reqs = reqe = 0;
753 818
754 while (ress) 819 while (ress)
755 { 820 {
756 prv = ress; 821 prv = ress;
757 ress = prv->next; 822 ress = prv->next;
758 free_req (prv); 823 req_free (prv);
759 } 824 }
760 825
761 ress = rese = 0; 826 ress = rese = 0;
762 827
763 close (respipe [0]); 828 close (respipe [0]);
… …
769 834
770#define dREQ \ 835#define dREQ \
771 aio_req req; \ 836 aio_req req; \
772 \ 837 \
773 if (SvOK (callback) && !SvROK (callback)) \ 838 if (SvOK (callback) && !SvROK (callback)) \
774 croak ("clalback must be undef or of reference type"); \ 839 croak ("callback must be undef or of reference type"); \
775 \ 840 \
776 Newz (0, req, 1, aio_cb); \ 841 Newz (0, req, 1, aio_cb); \
777 if (!req) \ 842 if (!req) \
778 croak ("out of memory during aio_req allocation"); \ 843 croak ("out of memory during aio_req allocation"); \
779 \ 844 \
780 req->callback = newSVsv (callback); 845 req->callback = newSVsv (callback)
846
847#define REQ_SEND \
848 req_send (req); \
849 \
850 if (GIMME_V != G_VOID) \
851 XPUSHs (req_sv (req));
781 852
782MODULE = IO::AIO PACKAGE = IO::AIO 853MODULE = IO::AIO PACKAGE = IO::AIO
783 854
784PROTOTYPES: ENABLE 855PROTOTYPES: ENABLE
785 856
… …
817 SV * pathname 888 SV * pathname
818 int flags 889 int flags
819 int mode 890 int mode
820 SV * callback 891 SV * callback
821 PROTOTYPE: $$$;$ 892 PROTOTYPE: $$$;$
822 CODE: 893 PPCODE:
823{ 894{
824 dREQ; 895 dREQ;
825 896
826 req->type = REQ_OPEN; 897 req->type = REQ_OPEN;
827 req->data = newSVsv (pathname); 898 req->data = newSVsv (pathname);
828 req->dataptr = SvPVbyte_nolen (req->data); 899 req->dataptr = SvPVbyte_nolen (req->data);
829 req->fd = flags; 900 req->fd = flags;
830 req->mode = mode; 901 req->mode = mode;
831 902
832 send_req (req); 903 REQ_SEND;
833} 904}
834 905
835void 906void
836aio_close (fh,callback=&PL_sv_undef) 907aio_close (fh,callback=&PL_sv_undef)
837 SV * fh 908 SV * fh
… …
839 PROTOTYPE: $;$ 910 PROTOTYPE: $;$
840 ALIAS: 911 ALIAS:
841 aio_close = REQ_CLOSE 912 aio_close = REQ_CLOSE
842 aio_fsync = REQ_FSYNC 913 aio_fsync = REQ_FSYNC
843 aio_fdatasync = REQ_FDATASYNC 914 aio_fdatasync = REQ_FDATASYNC
844 CODE: 915 PPCODE:
845{ 916{
846 dREQ; 917 dREQ;
847 918
848 req->type = ix; 919 req->type = ix;
849 req->fh = newSVsv (fh); 920 req->fh = newSVsv (fh);
850 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 921 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
851 922
852 send_req (req); 923 REQ_SEND (req);
853} 924}
854 925
855void 926void
856aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 927aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
857 SV * fh 928 SV * fh
… …
862 SV * callback 933 SV * callback
863 ALIAS: 934 ALIAS:
864 aio_read = REQ_READ 935 aio_read = REQ_READ
865 aio_write = REQ_WRITE 936 aio_write = REQ_WRITE
866 PROTOTYPE: $$$$$;$ 937 PROTOTYPE: $$$$$;$
867 CODE: 938 PPCODE:
868{ 939{
869 aio_req req; 940 aio_req req;
870 STRLEN svlen; 941 STRLEN svlen;
871 char *svptr = SvPVbyte (data, svlen); 942 char *svptr = SvPVbyte (data, svlen);
872 943
… …
910 { 981 {
911 SvREADONLY_on (data); 982 SvREADONLY_on (data);
912 req->data2ptr = (void *)data; 983 req->data2ptr = (void *)data;
913 } 984 }
914 985
915 send_req (req); 986 REQ_SEND;
916 } 987 }
917} 988}
918 989
919void 990void
920aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 991aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
… …
922 SV * in_fh 993 SV * in_fh
923 UV in_offset 994 UV in_offset
924 UV length 995 UV length
925 SV * callback 996 SV * callback
926 PROTOTYPE: $$$$;$ 997 PROTOTYPE: $$$$;$
927 CODE: 998 PPCODE:
928{ 999{
929 dREQ; 1000 dREQ;
930 1001
931 req->type = REQ_SENDFILE; 1002 req->type = REQ_SENDFILE;
932 req->fh = newSVsv (out_fh); 1003 req->fh = newSVsv (out_fh);
… …
934 req->fh2 = newSVsv (in_fh); 1005 req->fh2 = newSVsv (in_fh);
935 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1006 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
936 req->offset = in_offset; 1007 req->offset = in_offset;
937 req->length = length; 1008 req->length = length;
938 1009
939 send_req (req); 1010 REQ_SEND;
940} 1011}
941 1012
942void 1013void
943aio_readahead (fh,offset,length,callback=&PL_sv_undef) 1014aio_readahead (fh,offset,length,callback=&PL_sv_undef)
944 SV * fh 1015 SV * fh
945 UV offset 1016 UV offset
946 IV length 1017 IV length
947 SV * callback 1018 SV * callback
948 PROTOTYPE: $$$;$ 1019 PROTOTYPE: $$$;$
949 CODE: 1020 PPCODE:
950{ 1021{
951 dREQ; 1022 dREQ;
952 1023
953 req->type = REQ_READAHEAD; 1024 req->type = REQ_READAHEAD;
954 req->fh = newSVsv (fh); 1025 req->fh = newSVsv (fh);
955 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1026 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh)));
956 req->offset = offset; 1027 req->offset = offset;
957 req->length = length; 1028 req->length = length;
958 1029
959 send_req (req); 1030 REQ_SEND;
960} 1031}
961 1032
962void 1033void
963aio_stat (fh_or_path,callback=&PL_sv_undef) 1034aio_stat (fh_or_path,callback=&PL_sv_undef)
964 SV * fh_or_path 1035 SV * fh_or_path
965 SV * callback 1036 SV * callback
966 ALIAS: 1037 ALIAS:
967 aio_stat = REQ_STAT 1038 aio_stat = REQ_STAT
968 aio_lstat = REQ_LSTAT 1039 aio_lstat = REQ_LSTAT
969 CODE: 1040 PPCODE:
970{ 1041{
971 dREQ; 1042 dREQ;
972 1043
973 New (0, req->statdata, 1, Stat_t); 1044 New (0, req->statdata, 1, Stat_t);
974 if (!req->statdata) 1045 if (!req->statdata)
975 { 1046 {
976 free_req (req); 1047 req_free (req);
977 croak ("out of memory during aio_req->statdata allocation"); 1048 croak ("out of memory during aio_req->statdata allocation");
978 } 1049 }
979 1050
980 if (SvPOK (fh_or_path)) 1051 if (SvPOK (fh_or_path))
981 { 1052 {
… …
988 req->type = REQ_FSTAT; 1059 req->type = REQ_FSTAT;
989 req->fh = newSVsv (fh_or_path); 1060 req->fh = newSVsv (fh_or_path);
990 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1061 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
991 } 1062 }
992 1063
993 send_req (req); 1064 REQ_SEND;
994} 1065}
995 1066
996void 1067void
997aio_unlink (pathname,callback=&PL_sv_undef) 1068aio_unlink (pathname,callback=&PL_sv_undef)
998 SV * pathname 1069 SV * pathname
999 SV * callback 1070 SV * callback
1000 ALIAS: 1071 ALIAS:
1001 aio_unlink = REQ_UNLINK 1072 aio_unlink = REQ_UNLINK
1002 aio_rmdir = REQ_RMDIR 1073 aio_rmdir = REQ_RMDIR
1003 aio_readdir = REQ_READDIR 1074 aio_readdir = REQ_READDIR
1004 CODE: 1075 PPCODE:
1005{ 1076{
1006 dREQ; 1077 dREQ;
1007 1078
1008 req->type = ix; 1079 req->type = ix;
1009 req->data = newSVsv (pathname); 1080 req->data = newSVsv (pathname);
1010 req->dataptr = SvPVbyte_nolen (req->data); 1081 req->dataptr = SvPVbyte_nolen (req->data);
1011 1082
1012 send_req (req); 1083 REQ_SEND;
1013} 1084}
1014 1085
1015void 1086void
1016aio_link (oldpath,newpath,callback=&PL_sv_undef) 1087aio_link (oldpath,newpath,callback=&PL_sv_undef)
1017 SV * oldpath 1088 SV * oldpath
… …
1019 SV * callback 1090 SV * callback
1020 ALIAS: 1091 ALIAS:
1021 aio_link = REQ_LINK 1092 aio_link = REQ_LINK
1022 aio_symlink = REQ_SYMLINK 1093 aio_symlink = REQ_SYMLINK
1023 aio_rename = REQ_RENAME 1094 aio_rename = REQ_RENAME
1024 CODE: 1095 PPCODE:
1025{ 1096{
1026 dREQ; 1097 dREQ;
1027 1098
1028 req->type = ix; 1099 req->type = ix;
1029 req->fh = newSVsv (oldpath); 1100 req->fh = newSVsv (oldpath);
1030 req->data2ptr = SvPVbyte_nolen (req->fh); 1101 req->data2ptr = SvPVbyte_nolen (req->fh);
1031 req->data = newSVsv (newpath); 1102 req->data = newSVsv (newpath);
1032 req->dataptr = SvPVbyte_nolen (req->data); 1103 req->dataptr = SvPVbyte_nolen (req->data);
1033 1104
1034 send_req (req); 1105 REQ_SEND;
1035} 1106}
1036 1107
1037#if 0 1108#if 0
1038 1109
1039# undocumented, because it does not cancel active requests 1110# undocumented, because it does not cancel active requests
… …
1106 CODE: 1177 CODE:
1107 RETVAL = nreqs; 1178 RETVAL = nreqs;
1108 OUTPUT: 1179 OUTPUT:
1109 RETVAL 1180 RETVAL
1110 1181
1182MODULE = IO::AIO PACKAGE = IO::AIO::CB
1183
1184void
1185cancel (aio_req_ornot req)
1186 PROTOTYPE:
1187 CODE:
1188 req->cancelled = 1;
1189

Diff Legend

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