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.50 by root, Sun Oct 22 21:13:47 2006 UTC vs.
Revision 1.61 by root, Mon Oct 23 22:44:21 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];
… …
118 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 133 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
119} 134}
120 135
121static aio_req SvAIO_REQ (SV *sv) 136static aio_req SvAIO_REQ (SV *sv)
122{ 137{
138 MAGIC *mg;
139
123 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 140 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
124 croak ("object of class " AIO_REQ_KLASS " expected"); 141 croak ("object of class " AIO_REQ_KLASS " expected");
125 142
126 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 143 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
127 144
128 return mg ? (aio_req)mg->mg_ptr : 0; 145 return mg ? (aio_req)mg->mg_ptr : 0;
129} 146}
130 147
131static void aio_grp_feed (aio_req grp) 148static void aio_grp_feed (aio_req grp)
132{ 149{
133 while (grp->length < grp->fd2) 150 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
134 { 151 {
135 int old_len = grp->length; 152 int old_len = grp->length;
136 153
137 if (grp->fh2 && SvOK (grp->fh2)) 154 if (grp->fh2 && SvOK (grp->fh2))
138 { 155 {
… …
174 } 191 }
175} 192}
176 193
177static void poll_wait () 194static void poll_wait ()
178{ 195{
179 if (nreqs && !ress) 196 while (nreqs)
180 { 197 {
198 aio_req req;
199 pthread_mutex_lock (&reslock);
200 req = ress;
201 pthread_mutex_unlock (&reslock);
202
203 if (req)
204 return;
205
181 fd_set rfd; 206 fd_set rfd;
182 FD_ZERO(&rfd); 207 FD_ZERO(&rfd);
183 FD_SET(respipe [0], &rfd); 208 FD_SET(respipe [0], &rfd);
184 209
185 select (respipe [0] + 1, &rfd, 0, 0, 0); 210 select (respipe [0] + 1, &rfd, 0, 0, 0);
… …
189static void req_invoke (aio_req req) 214static void req_invoke (aio_req req)
190{ 215{
191 dSP; 216 dSP;
192 int errorno = errno; 217 int errorno = errno;
193 218
194 if (req->cancelled || !SvOK (req->callback)) 219 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
195 return; 220 return;
196 221
197 errno = req->errorno; 222 errno = req->errorno;
198 223
199 ENTER; 224 ENTER;
… …
257 for (i = 0; i <= AvFILL (av); ++i) 282 for (i = 0; i <= AvFILL (av); ++i)
258 PUSHs (*av_fetch (av, i, 0)); 283 PUSHs (*av_fetch (av, i, 0));
259 } 284 }
260 break; 285 break;
261 286
287 case REQ_NOP:
262 case REQ_SLEEP: 288 case REQ_SLEEP:
263 break; 289 break;
264 290
265 default: 291 default:
266 PUSHs (sv_2mortal (newSViv (req->result))); 292 PUSHs (sv_2mortal (newSViv (req->result)));
… …
270 296
271 PUTBACK; 297 PUTBACK;
272 call_sv (req->callback, G_VOID | G_EVAL); 298 call_sv (req->callback, G_VOID | G_EVAL);
273 SPAGAIN; 299 SPAGAIN;
274 300
301 FREETMPS;
302 LEAVE;
303
304 errno = errorno;
305
275 if (SvTRUE (ERRSV)) 306 if (SvTRUE (ERRSV))
276 { 307 {
277 req_free (req); 308 req_free (req);
278 croak (0); 309 croak (0);
279 } 310 }
280
281 FREETMPS;
282 LEAVE;
283
284 errno = errorno;
285} 311}
286 312
287static void req_free (aio_req req) 313static void req_free (aio_req req)
288{ 314{
289 if (req->grp) 315 if (req->grp)
… …
318 Safefree (req); 344 Safefree (req);
319} 345}
320 346
321static void req_cancel (aio_req req) 347static void req_cancel (aio_req req)
322{ 348{
323 req->cancelled = 1; 349 req->flags |= FLAG_CANCELLED;
324 350
325 if (req->type == REQ_GROUP) 351 if (req->type == REQ_GROUP)
326 { 352 {
327 aio_req sub; 353 aio_req sub;
328 354
… …
782 } 808 }
783 809
784 pthread_mutex_unlock (&reqlock); 810 pthread_mutex_unlock (&reqlock);
785 811
786 errno = 0; /* strictly unnecessary */ 812 errno = 0; /* strictly unnecessary */
787
788 if (!req->cancelled)
789 switch (type = req->type) /* remember type for QUIT check */ 813 type = req->type; /* remember type for QUIT check */
814
815 if (!(req->flags & FLAG_CANCELLED))
816 switch (type)
790 { 817 {
791 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 818 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break;
792 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 819 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
793 820
794 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 821 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break;
… …
818 tv.tv_usec = req->fd2; 845 tv.tv_usec = req->fd2;
819 846
820 req->result = select (0, 0, 0, 0, &tv); 847 req->result = select (0, 0, 0, 0, &tv);
821 } 848 }
822 849
850 case REQ_GROUP:
851 case REQ_NOP:
823 case REQ_QUIT: 852 case REQ_QUIT:
824 break; 853 break;
825 854
826 default: 855 default:
827 req->result = ENOSYS; 856 req->result = ENOSYS;
… …
911 atfork_parent (); 940 atfork_parent ();
912} 941}
913 942
914#define dREQ \ 943#define dREQ \
915 aio_req req; \ 944 aio_req req; \
945 int req_pri = next_pri; \
946 next_pri = DEFAULT_PRI + PRI_BIAS; \
916 \ 947 \
917 if (SvOK (callback) && !SvROK (callback)) \ 948 if (SvOK (callback) && !SvROK (callback)) \
918 croak ("callback must be undef or of reference type"); \ 949 croak ("callback must be undef or of reference type"); \
919 \ 950 \
920 Newz (0, req, 1, aio_cb); \ 951 Newz (0, req, 1, aio_cb); \
921 if (!req) \ 952 if (!req) \
922 croak ("out of memory during aio_req allocation"); \ 953 croak ("out of memory during aio_req allocation"); \
923 \ 954 \
924 req->callback = newSVsv (callback) 955 req->callback = newSVsv (callback); \
956 req->pri = req_pri
925 957
926#define REQ_SEND \ 958#define REQ_SEND \
927 req_send (req); \ 959 req_send (req); \
928 \ 960 \
929 if (GIMME_V != G_VOID) \ 961 if (GIMME_V != G_VOID) \
… …
1204 SV * callback 1236 SV * callback
1205 PROTOTYPE: ;$ 1237 PROTOTYPE: ;$
1206 PPCODE: 1238 PPCODE:
1207{ 1239{
1208 dREQ; 1240 dREQ;
1241
1209 req->type = REQ_GROUP; 1242 req->type = REQ_GROUP;
1210 req_send (req); 1243 req_send (req);
1244
1211 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1245 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1212} 1246}
1247
1248void
1249aio_nop (callback=&PL_sv_undef)
1250 SV * callback
1251 PPCODE:
1252{
1253 dREQ;
1254
1255 req->type = REQ_NOP;
1256
1257 REQ_SEND;
1258}
1259
1260#if 0
1261
1262void
1263aio_pri (int pri = DEFAULT_PRI)
1264 CODE:
1265 if (pri < PRI_MIN) pri = PRI_MIN;
1266 if (pri > PRI_MAX) pri = PRI_MAX;
1267 next_pri = pri + PRI_BIAS;
1268
1269#endif
1213 1270
1214void 1271void
1215flush () 1272flush ()
1216 PROTOTYPE: 1273 PROTOTYPE:
1217 CODE: 1274 CODE:
… …
1270cancel (aio_req_ornot req) 1327cancel (aio_req_ornot req)
1271 PROTOTYPE: 1328 PROTOTYPE:
1272 CODE: 1329 CODE:
1273 req_cancel (req); 1330 req_cancel (req);
1274 1331
1332void
1333cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1334 CODE:
1335 SvREFCNT_dec (req->callback);
1336 req->callback = newSVsv (callback);
1337
1275MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1338MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1276 1339
1277void 1340void
1278add (aio_req grp, ...) 1341add (aio_req grp, ...)
1279 PPCODE: 1342 PPCODE:
1280{ 1343{
1281 int i; 1344 int i;
1345 aio_req req;
1282 1346
1283 if (grp->fd == 2) 1347 if (grp->fd == 2)
1284 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1348 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1285 1349
1286 for (i = 1; i < items; ++i ) 1350 for (i = 1; i < items; ++i )
1287 { 1351 {
1288 if (GIMME_V != G_VOID) 1352 if (GIMME_V != G_VOID)
1289 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1353 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1290 1354
1291 aio_req req = SvAIO_REQ (ST (i)); 1355 req = SvAIO_REQ (ST (i));
1292 1356
1293 if (req) 1357 if (req)
1294 { 1358 {
1295 ++grp->length; 1359 ++grp->length;
1296 req->grp = grp; 1360 req->grp = grp;
… …
1305 } 1369 }
1306 } 1370 }
1307} 1371}
1308 1372
1309void 1373void
1310lock (aio_req grp) 1374result (aio_req grp, ...)
1311 CODE: 1375 CODE:
1312 ++grp->length; 1376{
1377 int i;
1378 AV *av = newAV ();
1313 1379
1314void 1380 for (i = 1; i < items; ++i )
1315unlock (aio_req grp) 1381 av_push (av, newSVsv (ST (i)));
1316 CODE:
1317 aio_grp_dec (grp);
1318 1382
1383 SvREFCNT_dec (grp->data);
1384 grp->data = (SV *)av;
1385}
1386
1319void 1387void
1320feeder_limit (aio_req grp, int limit) 1388feed_limit (aio_req grp, int limit)
1321 CODE: 1389 CODE:
1322 grp->fd2 = limit; 1390 grp->fd2 = limit;
1323 aio_grp_feed (grp); 1391 aio_grp_feed (grp);
1324 1392
1325void 1393void
1326set_feeder (aio_req grp, SV *callback=&PL_sv_undef) 1394feed (aio_req grp, SV *callback=&PL_sv_undef)
1327 CODE: 1395 CODE:
1328{ 1396{
1329 SvREFCNT_dec (grp->fh2); 1397 SvREFCNT_dec (grp->fh2);
1330 grp->fh2 = newSVsv (callback); 1398 grp->fh2 = newSVsv (callback);
1331 1399

Diff Legend

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