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.52 by root, Sun Oct 22 22:14:54 2006 UTC vs.
Revision 1.58 by root, Mon Oct 23 18:48:08 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
… …
83 int type; 83 int type;
84 int fd, fd2; 84 int fd, fd2;
85 int errorno; 85 int errorno;
86 STRLEN dataoffset; 86 STRLEN dataoffset;
87 mode_t mode; /* open */ 87 mode_t mode; /* open */
88 unsigned char pri;
88 unsigned char cancelled; 89 unsigned char flags;
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;
93 98
94static int started, wanted; 99static int started, wanted;
… …
118 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 123 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1)));
119} 124}
120 125
121static aio_req SvAIO_REQ (SV *sv) 126static aio_req SvAIO_REQ (SV *sv)
122{ 127{
128 MAGIC *mg;
129
123 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 130 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv))
124 croak ("object of class " AIO_REQ_KLASS " expected"); 131 croak ("object of class " AIO_REQ_KLASS " expected");
125 132
126 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 133 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
127 134
128 return mg ? (aio_req)mg->mg_ptr : 0; 135 return mg ? (aio_req)mg->mg_ptr : 0;
129} 136}
130 137
131static void aio_grp_feed (aio_req grp) 138static void aio_grp_feed (aio_req grp)
132{ 139{
133 while (grp->length < grp->fd2) 140 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED))
134 { 141 {
135 int old_len = grp->length; 142 int old_len = grp->length;
136 143
137 if (grp->fh2 && SvOK (grp->fh2)) 144 if (grp->fh2 && SvOK (grp->fh2))
138 { 145 {
… …
189static void req_invoke (aio_req req) 196static void req_invoke (aio_req req)
190{ 197{
191 dSP; 198 dSP;
192 int errorno = errno; 199 int errorno = errno;
193 200
194 if (req->cancelled || !SvOK (req->callback)) 201 if (req->flags & FLAG_CANCELLED || !SvOK (req->callback))
195 return; 202 return;
196 203
197 errno = req->errorno; 204 errno = req->errorno;
198 205
199 ENTER; 206 ENTER;
… …
257 for (i = 0; i <= AvFILL (av); ++i) 264 for (i = 0; i <= AvFILL (av); ++i)
258 PUSHs (*av_fetch (av, i, 0)); 265 PUSHs (*av_fetch (av, i, 0));
259 } 266 }
260 break; 267 break;
261 268
269 case REQ_NOP:
262 case REQ_SLEEP: 270 case REQ_SLEEP:
263 break; 271 break;
264 272
265 default: 273 default:
266 PUSHs (sv_2mortal (newSViv (req->result))); 274 PUSHs (sv_2mortal (newSViv (req->result)));
… …
318 Safefree (req); 326 Safefree (req);
319} 327}
320 328
321static void req_cancel (aio_req req) 329static void req_cancel (aio_req req)
322{ 330{
323 req->cancelled = 1; 331 req->flags |= FLAG_CANCELLED;
324 332
325 if (req->type == REQ_GROUP) 333 if (req->type == REQ_GROUP)
326 { 334 {
327 aio_req sub; 335 aio_req sub;
328 336
… …
783 791
784 pthread_mutex_unlock (&reqlock); 792 pthread_mutex_unlock (&reqlock);
785 793
786 errno = 0; /* strictly unnecessary */ 794 errno = 0; /* strictly unnecessary */
787 795
788 if (!req->cancelled) 796 if (!(req->flags & FLAG_CANCELLED))
789 switch (type = req->type) /* remember type for QUIT check */ 797 switch (type = req->type) /* remember type for QUIT check */
790 { 798 {
791 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 799 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; 800 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break;
793 801
… …
818 tv.tv_usec = req->fd2; 826 tv.tv_usec = req->fd2;
819 827
820 req->result = select (0, 0, 0, 0, &tv); 828 req->result = select (0, 0, 0, 0, &tv);
821 } 829 }
822 830
831 case REQ_GROUP:
832 case REQ_NOP:
823 case REQ_QUIT: 833 case REQ_QUIT:
824 break; 834 break;
825 835
826 default: 836 default:
827 req->result = ENOSYS; 837 req->result = ENOSYS;
… …
1210 req_send (req); 1220 req_send (req);
1211 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1221 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1212} 1222}
1213 1223
1214void 1224void
1225aio_nop (callback=&PL_sv_undef)
1226 SV * callback
1227 PPCODE:
1228{
1229 dREQ;
1230
1231 req->type = REQ_NOP;
1232
1233 REQ_SEND;
1234}
1235
1236void
1215flush () 1237flush ()
1216 PROTOTYPE: 1238 PROTOTYPE:
1217 CODE: 1239 CODE:
1218 while (nreqs) 1240 while (nreqs)
1219 { 1241 {
… …
1270cancel (aio_req_ornot req) 1292cancel (aio_req_ornot req)
1271 PROTOTYPE: 1293 PROTOTYPE:
1272 CODE: 1294 CODE:
1273 req_cancel (req); 1295 req_cancel (req);
1274 1296
1297void
1298cb (aio_req req, SV *callback=&PL_sv_undef)
1299 CODE:
1300 SvREFCNT_dec (req->callback);
1301 req->callback = newSVsv (callback);
1302
1275MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1303MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1276 1304
1277void 1305void
1278add (aio_req grp, ...) 1306add (aio_req grp, ...)
1279 PPCODE: 1307 PPCODE:
1280{ 1308{
1281 int i; 1309 int i;
1310 aio_req req;
1282 1311
1283 if (grp->fd == 2) 1312 if (grp->fd == 2)
1284 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1313 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1285 1314
1286 for (i = 1; i < items; ++i ) 1315 for (i = 1; i < items; ++i )
1287 { 1316 {
1288 if (GIMME_V != G_VOID) 1317 if (GIMME_V != G_VOID)
1289 XPUSHs (sv_2mortal (newSVsv (ST (i)))); 1318 XPUSHs (sv_2mortal (newSVsv (ST (i))));
1290 1319
1291 aio_req req = SvAIO_REQ (ST (i)); 1320 req = SvAIO_REQ (ST (i));
1292 1321
1293 if (req) 1322 if (req)
1294 { 1323 {
1295 ++grp->length; 1324 ++grp->length;
1296 req->grp = grp; 1325 req->grp = grp;
… …
1319 SvREFCNT_dec (grp->data); 1348 SvREFCNT_dec (grp->data);
1320 grp->data = (SV *)av; 1349 grp->data = (SV *)av;
1321} 1350}
1322 1351
1323void 1352void
1324lock (aio_req grp)
1325 CODE:
1326 ++grp->length;
1327
1328void
1329unlock (aio_req grp)
1330 CODE:
1331 aio_grp_dec (grp);
1332
1333void
1334feeder_limit (aio_req grp, int limit) 1353feed_limit (aio_req grp, int limit)
1335 CODE: 1354 CODE:
1336 grp->fd2 = limit; 1355 grp->fd2 = limit;
1337 aio_grp_feed (grp); 1356 aio_grp_feed (grp);
1338 1357
1339void 1358void
1340set_feeder (aio_req grp, SV *callback=&PL_sv_undef) 1359feed (aio_req grp, SV *callback=&PL_sv_undef)
1341 CODE: 1360 CODE:
1342{ 1361{
1343 SvREFCNT_dec (grp->fh2); 1362 SvREFCNT_dec (grp->fh2);
1344 grp->fh2 = newSVsv (callback); 1363 grp->fh2 = newSVsv (callback);
1345 1364

Diff Legend

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