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.53 by root, Mon Oct 23 00:17:07 2006 UTC vs.
Revision 1.62 by root, Mon Oct 23 22:45:18 2006 UTC

… …
55 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 55 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
56 REQ_FSYNC, REQ_FDATASYNC, 56 REQ_FSYNC, REQ_FDATASYNC,
57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 57 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
58 REQ_READDIR, 58 REQ_READDIR,
59 REQ_LINK, REQ_SYMLINK, 59 REQ_LINK, REQ_SYMLINK,
60 REQ_GROUP, REQ_NOP,
60 REQ_SLEEP, 61 REQ_SLEEP,
61 REQ_GROUP,
62}; 62};
63 63
64#define AIO_REQ_KLASS "IO::AIO::REQ" 64#define AIO_REQ_KLASS "IO::AIO::REQ"
65#define AIO_GRP_KLASS "IO::AIO::GRP" 65#define AIO_GRP_KLASS "IO::AIO::GRP"
66 66
67typedef struct aio_cb 67typedef struct aio_cb
68{ 68{
69 struct aio_cb *volatile next; 69 struct aio_cb *volatile next;
70
71 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
72
73 SV *self; /* the perl counterpart of this request, if any */
74 70
75 SV *data, *callback; 71 SV *data, *callback;
76 SV *fh, *fh2; 72 SV *fh, *fh2;
77 void *dataptr, *data2ptr; 73 void *dataptr, *data2ptr;
78 Stat_t *statdata; 74 Stat_t *statdata;
79 off_t offset; 75 off_t offset;
80 size_t length; 76 size_t length;
81 ssize_t result; 77 ssize_t result;
82 78
79 STRLEN dataoffset;
83 int type; 80 int type;
84 int fd, fd2; 81 int fd, fd2;
85 int errorno; 82 int errorno;
86 STRLEN dataoffset;
87 mode_t mode; /* open */ 83 mode_t mode; /* open */
84
88 unsigned char cancelled; 85 unsigned char flags;
86 unsigned char pri;
87
88 SV *self; /* the perl counterpart of this request, if any */
89 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
89} aio_cb; 90} aio_cb;
91
92enum {
93 FLAG_CANCELLED = 0x01,
94};
90 95
91typedef aio_cb *aio_req; 96typedef aio_cb *aio_req;
92typedef aio_cb *aio_req_ornot; 97typedef aio_cb *aio_req_ornot;
98
99enum {
100 PRI_MIN = -4,
101 PRI_MAX = 4,
102
103 DEFAULT_PRI = 0,
104 PRI_BIAS = -PRI_MIN,
105};
106
107static int next_pri = DEFAULT_PRI + PRI_BIAS;
93 108
94static int started, wanted; 109static int started, wanted;
95static volatile int nreqs; 110static volatile int nreqs;
96static int max_outstanding = 1<<30; 111static int max_outstanding = 1<<30;
97static int respipe [2]; 112static int respipe [2];
… …
130 return mg ? (aio_req)mg->mg_ptr : 0; 145 return mg ? (aio_req)mg->mg_ptr : 0;
131} 146}
132 147
133static void aio_grp_feed (aio_req grp) 148static void aio_grp_feed (aio_req grp)
134{ 149{
135 while (grp->length < grp->fd2) 150 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
136 { 151 {
137 int old_len = grp->length; 152 int old_len = grp->length;
138 153
139 if (grp->fh2 && SvOK (grp->fh2)) 154 if (grp->fh2 && SvOK (grp->fh2))
140 { 155 {
… …
176 } 191 }
177} 192}
178 193
179static void poll_wait () 194static void poll_wait ()
180{ 195{
181 if (nreqs && !ress)
182 {
183 fd_set rfd; 196 fd_set rfd;
197
198 while (nreqs)
199 {
200 aio_req req;
201 pthread_mutex_lock (&reslock);
202 req = ress;
203 pthread_mutex_unlock (&reslock);
204
205 if (req)
206 return;
207
184 FD_ZERO(&rfd); 208 FD_ZERO(&rfd);
185 FD_SET(respipe [0], &rfd); 209 FD_SET(respipe [0], &rfd);
186 210
187 select (respipe [0] + 1, &rfd, 0, 0, 0); 211 select (respipe [0] + 1, &rfd, 0, 0, 0);
188 } 212 }
… …
191static void req_invoke (aio_req req) 215static void req_invoke (aio_req req)
192{ 216{
193 dSP; 217 dSP;
194 int errorno = errno; 218 int errorno = errno;
195 219
196 if (req->cancelled || !SvOK (req->callback)) 220 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
197 return; 221 return;
198 222
199 errno = req->errorno; 223 errno = req->errorno;
200 224
201 ENTER; 225 ENTER;
… …
259 for (i = 0; i <= AvFILL (av); ++i) 283 for (i = 0; i <= AvFILL (av); ++i)
260 PUSHs (*av_fetch (av, i, 0)); 284 PUSHs (*av_fetch (av, i, 0));
261 } 285 }
262 break; 286 break;
263 287
288 case REQ_NOP:
264 case REQ_SLEEP: 289 case REQ_SLEEP:
265 break; 290 break;
266 291
267 default: 292 default:
268 PUSHs (sv_2mortal (newSViv (req->result))); 293 PUSHs (sv_2mortal (newSViv (req->result)));
… …
320 Safefree (req); 345 Safefree (req);
321} 346}
322 347
323static void req_cancel (aio_req req) 348static void req_cancel (aio_req req)
324{ 349{
325 req->cancelled = 1; 350 req->flags |= FLAG_CANCELLED;
326 351
327 if (req->type == REQ_GROUP) 352 if (req->type == REQ_GROUP)
328 { 353 {
329 aio_req sub; 354 aio_req sub;
330 355
… …
784 } 809 }
785 810
786 pthread_mutex_unlock (&reqlock); 811 pthread_mutex_unlock (&reqlock);
787 812
788 errno = 0; /* strictly unnecessary */ 813 errno = 0; /* strictly unnecessary */
789
790 if (!req->cancelled)
791 switch (type = req->type) /* remember type for QUIT check */ 814 type = req->type; /* remember type for QUIT check */
815
816 if (!(req->flags & FLAG_CANCELLED))
817 switch (type)
792 { 818 {
793 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 819 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
794 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 820 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
795 821
796 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 822 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
… …
820 tv.tv_usec = req->fd2; 846 tv.tv_usec = req->fd2;
821 847
822 req->result = select (0, 0, 0, 0, &tv); 848 req->result = select (0, 0, 0, 0, &tv);
823 } 849 }
824 850
851 case REQ_GROUP:
852 case REQ_NOP:
825 case REQ_QUIT: 853 case REQ_QUIT:
826 break; 854 break;
827 855
828 default: 856 default:
829 req->result = ENOSYS; 857 req->result = ENOSYS;
… …
913 atfork_parent (); 941 atfork_parent ();
914} 942}
915 943
916#define dREQ \ 944#define dREQ \
917 aio_req req; \ 945 aio_req req; \
946 int req_pri = next_pri; \
947 next_pri = DEFAULT_PRI + PRI_BIAS; \
918 \ 948 \
919 if (SvOK (callback) && !SvROK (callback)) \ 949 if (SvOK (callback) && !SvROK (callback)) \
920 croak ("callback must be undef or of reference type"); \ 950 croak ("callback must be undef or of reference type"); \
921 \ 951 \
922 Newz (0, req, 1, aio_cb); \ 952 Newz (0, req, 1, aio_cb); \
923 if (!req) \ 953 if (!req) \
924 croak ("out of memory during aio_req allocation"); \ 954 croak ("out of memory during aio_req allocation"); \
925 \ 955 \
926 req->callback = newSVsv (callback) 956 req->callback = newSVsv (callback); \
957 req->pri = req_pri
927 958
928#define REQ_SEND \ 959#define REQ_SEND \
929 req_send (req); \ 960 req_send (req); \
930 \ 961 \
931 if (GIMME_V != G_VOID) \ 962 if (GIMME_V != G_VOID) \
… …
1206 SV * callback 1237 SV * callback
1207 PROTOTYPE: ;$ 1238 PROTOTYPE: ;$
1208 PPCODE: 1239 PPCODE:
1209{ 1240{
1210 dREQ; 1241 dREQ;
1242
1211 req->type = REQ_GROUP; 1243 req->type = REQ_GROUP;
1212 req_send (req); 1244 req_send (req);
1245
1213 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1246 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1214} 1247}
1248
1249void
1250aio_nop (callback=&PL_sv_undef)
1251 SV * callback
1252 PPCODE:
1253{
1254 dREQ;
1255
1256 req->type = REQ_NOP;
1257
1258 REQ_SEND;
1259}
1260
1261#if 0
1262
1263void
1264aio_pri (int pri = DEFAULT_PRI)
1265 CODE:
1266 if (pri < PRI_MIN) pri = PRI_MIN;
1267 if (pri > PRI_MAX) pri = PRI_MAX;
1268 next_pri = pri + PRI_BIAS;
1269
1270#endif
1215 1271
1216void 1272void
1217flush () 1273flush ()
1218 PROTOTYPE: 1274 PROTOTYPE:
1219 CODE: 1275 CODE:
… …
1272cancel (aio_req_ornot req) 1328cancel (aio_req_ornot req)
1273 PROTOTYPE: 1329 PROTOTYPE:
1274 CODE: 1330 CODE:
1275 req_cancel (req); 1331 req_cancel (req);
1276 1332
1333void
1334cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1335 CODE:
1336 SvREFCNT_dec (req->callback);
1337 req->callback = newSVsv (callback);
1338
1277MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1339MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1278 1340
1279void 1341void
1280add (aio_req grp, ...) 1342add (aio_req grp, ...)
1281 PPCODE: 1343 PPCODE:
… …
1322 SvREFCNT_dec (grp->data); 1384 SvREFCNT_dec (grp->data);
1323 grp->data = (SV *)av; 1385 grp->data = (SV *)av;
1324} 1386}
1325 1387
1326void 1388void
1327lock (aio_req grp)
1328 CODE:
1329 ++grp->length;
1330
1331void
1332unlock (aio_req grp)
1333 CODE:
1334 aio_grp_dec (grp);
1335
1336void
1337feeder_limit (aio_req grp, int limit) 1389feed_limit (aio_req grp, int limit)
1338 CODE: 1390 CODE:
1339 grp->fd2 = limit; 1391 grp->fd2 = limit;
1340 aio_grp_feed (grp); 1392 aio_grp_feed (grp);
1341 1393
1342void 1394void
1343set_feeder (aio_req grp, SV *callback=&PL_sv_undef) 1395feed (aio_req grp, SV *callback=&PL_sv_undef)
1344 CODE: 1396 CODE:
1345{ 1397{
1346 SvREFCNT_dec (grp->fh2); 1398 SvREFCNT_dec (grp->fh2);
1347 grp->fh2 = newSVsv (callback); 1399 grp->fh2 = newSVsv (callback);
1348 1400

Diff Legend

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