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.85 by root, Sat Oct 28 23:32:29 2006 UTC vs.
Revision 1.93 by root, Wed Nov 8 02:01:02 2006 UTC

… …
87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \ 87 self->dbuf = aio_buf = malloc (AIO_BUFSIZE); \
88 UNLOCK (wrklock); \ 88 UNLOCK (wrklock); \
89 if (!aio_buf) \ 89 if (!aio_buf) \
90 return -1; 90 return -1;
91 91
92typedef SV SV8; /* byte-sv, used for argument-checking */
93
92enum { 94enum {
93 REQ_QUIT, 95 REQ_QUIT,
94 REQ_OPEN, REQ_CLOSE, 96 REQ_OPEN, REQ_CLOSE,
95 REQ_READ, REQ_WRITE, REQ_READAHEAD, 97 REQ_READ, REQ_WRITE, REQ_READAHEAD,
96 REQ_SENDFILE, 98 REQ_SENDFILE,
97 REQ_STAT, REQ_LSTAT, REQ_FSTAT, 99 REQ_STAT, REQ_LSTAT, REQ_FSTAT,
98 REQ_FSYNC, REQ_FDATASYNC, 100 REQ_FSYNC, REQ_FDATASYNC,
99 REQ_UNLINK, REQ_RMDIR, REQ_RENAME, 101 REQ_UNLINK, REQ_RMDIR, REQ_RENAME,
100 REQ_MKNOD, REQ_READDIR, 102 REQ_MKNOD, REQ_READDIR,
101 REQ_LINK, REQ_SYMLINK, 103 REQ_LINK, REQ_SYMLINK, REQ_READLINK,
102 REQ_GROUP, REQ_NOP, 104 REQ_GROUP, REQ_NOP,
103 REQ_BUSY, 105 REQ_BUSY,
104}; 106};
105 107
106#define AIO_REQ_KLASS "IO::AIO::REQ" 108#define AIO_REQ_KLASS "IO::AIO::REQ"
… …
108 110
109typedef struct aio_cb 111typedef struct aio_cb
110{ 112{
111 struct aio_cb *volatile next; 113 struct aio_cb *volatile next;
112 114
113 SV *data, *callback; 115 SV *callback, *fh;
114 SV *fh, *fh2; 116 SV *sv1, *sv2;
115 void *dataptr, *data2ptr; 117 void *ptr1, *ptr2;
116 Stat_t *statdata;
117 off_t offset; 118 off_t offs;
118 size_t length; 119 size_t size;
119 ssize_t result; 120 ssize_t result;
120 121
121 STRLEN dataoffset; 122 STRLEN stroffset;
122 int type; 123 int type;
123 int fd, fd2; 124 int int1, int2;
124 int errorno; 125 int errorno;
125 mode_t mode; /* open */ 126 mode_t mode; /* open */
126 127
127 unsigned char flags; 128 unsigned char flags;
128 unsigned char pri; 129 unsigned char pri;
… …
130 SV *self; /* the perl counterpart of this request, if any */ 131 SV *self; /* the perl counterpart of this request, if any */
131 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first; 132 struct aio_cb *grp, *grp_prev, *grp_next, *grp_first;
132} aio_cb; 133} aio_cb;
133 134
134enum { 135enum {
135 FLAG_CANCELLED = 0x01, 136 FLAG_CANCELLED = 0x01, /* request was cancelled */
137 FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */
138 FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */
136}; 139};
137 140
138typedef aio_cb *aio_req; 141typedef aio_cb *aio_req;
139typedef aio_cb *aio_req_ornot; 142typedef aio_cb *aio_req_ornot;
140 143
… …
347 return mg ? (aio_req)mg->mg_ptr : 0; 350 return mg ? (aio_req)mg->mg_ptr : 0;
348} 351}
349 352
350static void aio_grp_feed (aio_req grp) 353static void aio_grp_feed (aio_req grp)
351{ 354{
352 while (grp->length < grp->fd2 && !(grp->flags & FLAG_CANCELLED)) 355 while (grp->size < grp->int2 && !(grp->flags & FLAG_CANCELLED))
353 { 356 {
354 int old_len = grp->length; 357 int old_len = grp->size;
355 358
356 if (grp->fh2 && SvOK (grp->fh2)) 359 if (grp->sv2 && SvOK (grp->sv2))
357 { 360 {
358 dSP; 361 dSP;
359 362
360 ENTER; 363 ENTER;
361 SAVETMPS; 364 SAVETMPS;
362 PUSHMARK (SP); 365 PUSHMARK (SP);
363 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 366 XPUSHs (req_sv (grp, AIO_GRP_KLASS));
364 PUTBACK; 367 PUTBACK;
365 call_sv (grp->fh2, G_VOID | G_EVAL | G_KEEPERR); 368 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
366 SPAGAIN; 369 SPAGAIN;
367 FREETMPS; 370 FREETMPS;
368 LEAVE; 371 LEAVE;
369 } 372 }
370 373
371 /* stop if no progress has been made */ 374 /* stop if no progress has been made */
372 if (old_len == grp->length) 375 if (old_len == grp->size)
373 { 376 {
374 SvREFCNT_dec (grp->fh2); 377 SvREFCNT_dec (grp->sv2);
375 grp->fh2 = 0; 378 grp->sv2 = 0;
376 break; 379 break;
377 } 380 }
378 } 381 }
379} 382}
380 383
381static void aio_grp_dec (aio_req grp) 384static void aio_grp_dec (aio_req grp)
382{ 385{
383 --grp->length; 386 --grp->size;
384 387
385 /* call feeder, if applicable */ 388 /* call feeder, if applicable */
386 aio_grp_feed (grp); 389 aio_grp_feed (grp);
387 390
388 /* finish, if done */ 391 /* finish, if done */
389 if (!grp->length && grp->fd) 392 if (!grp->size && grp->int1)
390 { 393 {
391 req_invoke (grp); 394 req_invoke (grp);
392 req_free (grp); 395 req_free (grp);
393 } 396 }
394} 397}
395 398
396static void req_invoke (aio_req req) 399static void req_invoke (aio_req req)
397{ 400{
398 dSP; 401 dSP;
402
403 if (req->flags & FLAG_SV1_RO_OFF)
404 SvREADONLY_off (req->sv1);
399 405
400 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) 406 if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback))
401 { 407 {
402 ENTER; 408 ENTER;
403 SAVETMPS; 409 SAVETMPS;
… …
411 SV *rv = &PL_sv_undef; 417 SV *rv = &PL_sv_undef;
412 418
413 if (req->result >= 0) 419 if (req->result >= 0)
414 { 420 {
415 int i; 421 int i;
416 char *buf = req->data2ptr; 422 char *buf = req->ptr2;
417 AV *av = newAV (); 423 AV *av = newAV ();
418 424
419 av_extend (av, req->result - 1); 425 av_extend (av, req->result - 1);
420 426
421 for (i = 0; i < req->result; ++i) 427 for (i = 0; i < req->result; ++i)
… …
441 PUSHs (sv_2mortal (newSViv (req->result))); 447 PUSHs (sv_2mortal (newSViv (req->result)));
442 PUTBACK; 448 PUTBACK;
443 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL); 449 call_pv ("IO::AIO::_fd2fh", G_SCALAR | G_EVAL);
444 SPAGAIN; 450 SPAGAIN;
445 451
446 fh = SvREFCNT_inc (POPs); 452 fh = POPs;
447
448 PUSHMARK (SP); 453 PUSHMARK (SP);
449 XPUSHs (sv_2mortal (fh)); 454 XPUSHs (fh);
450 } 455 }
451 break; 456 break;
452 457
453 case REQ_GROUP: 458 case REQ_GROUP:
454 req->fd = 2; /* mark group as finished */ 459 req->int1 = 2; /* mark group as finished */
455 460
456 if (req->data) 461 if (req->sv1)
457 { 462 {
458 int i; 463 int i;
459 AV *av = (AV *)req->data; 464 AV *av = (AV *)req->sv1;
460 465
461 EXTEND (SP, AvFILL (av) + 1); 466 EXTEND (SP, AvFILL (av) + 1);
462 for (i = 0; i <= AvFILL (av); ++i) 467 for (i = 0; i <= AvFILL (av); ++i)
463 PUSHs (*av_fetch (av, i, 0)); 468 PUSHs (*av_fetch (av, i, 0));
464 } 469 }
… …
466 471
467 case REQ_NOP: 472 case REQ_NOP:
468 case REQ_BUSY: 473 case REQ_BUSY:
469 break; 474 break;
470 475
476 case REQ_READLINK:
477 if (req->result > 0)
478 {
479 SvCUR_set (req->sv1, req->result);
480 *SvEND (req->sv1) = 0;
481 PUSHs (req->sv1);
482 }
483 break;
484
485 case REQ_STAT:
486 case REQ_LSTAT:
487 case REQ_FSTAT:
488 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
489 PL_laststatval = req->result;
490 PL_statcache = *(Stat_t *)(req->ptr2);
491 PUSHs (sv_2mortal (newSViv (req->result)));
492 break;
493
494 case REQ_READ:
495 SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0));
496 *SvEND (req->sv1) = 0;
497 PUSHs (sv_2mortal (newSViv (req->result)));
498 break;
499
471 default: 500 default:
472 PUSHs (sv_2mortal (newSViv (req->result))); 501 PUSHs (sv_2mortal (newSViv (req->result)));
473 break; 502 break;
474 } 503 }
475 504
… …
510 { 539 {
511 sv_unmagic (req->self, PERL_MAGIC_ext); 540 sv_unmagic (req->self, PERL_MAGIC_ext);
512 SvREFCNT_dec (req->self); 541 SvREFCNT_dec (req->self);
513 } 542 }
514 543
515 SvREFCNT_dec (req->data);
516 SvREFCNT_dec (req->fh); 544 SvREFCNT_dec (req->fh);
545 SvREFCNT_dec (req->sv1);
517 SvREFCNT_dec (req->fh2); 546 SvREFCNT_dec (req->sv2);
518 SvREFCNT_dec (req->callback); 547 SvREFCNT_dec (req->callback);
519 Safefree (req->statdata);
520 548
521 if (req->type == REQ_READDIR) 549 if (req->flags & FLAG_PTR2_FREE)
522 free (req->data2ptr); 550 free (req->ptr2);
523 551
524 Safefree (req); 552 Safefree (req);
525} 553}
526 554
527static void req_cancel_subs (aio_req grp) 555static void req_cancel_subs (aio_req grp)
… …
529 aio_req sub; 557 aio_req sub;
530 558
531 if (grp->type != REQ_GROUP) 559 if (grp->type != REQ_GROUP)
532 return; 560 return;
533 561
534 SvREFCNT_dec (grp->fh2); 562 SvREFCNT_dec (grp->sv2);
535 grp->fh2 = 0; 563 grp->sv2 = 0;
536 564
537 for (sub = grp->grp_first; sub; sub = sub->grp_next) 565 for (sub = grp->grp_first; sub; sub = sub->grp_next)
538 req_cancel (sub); 566 req_cancel (sub);
539} 567}
540 568
… …
712 if (!req) 740 if (!req)
713 break; 741 break;
714 742
715 --nreqs; 743 --nreqs;
716 744
717 if (req->type == REQ_GROUP && req->length) 745 if (req->type == REQ_GROUP && req->size)
718 { 746 {
719 req->fd = 1; /* mark request as delayed */ 747 req->int1 = 1; /* mark request as delayed */
720 continue; 748 continue;
721 } 749 }
722 else 750 else
723 { 751 {
724 if (req->type == REQ_READ)
725 SvCUR_set (req->data, req->dataoffset + (req->result > 0 ? req->result : 0));
726
727 if (req->data2ptr && (req->type == REQ_READ || req->type == REQ_WRITE))
728 SvREADONLY_off (req->data);
729
730 if (req->statdata)
731 {
732 PL_laststype = req->type == REQ_LSTAT ? OP_LSTAT : OP_STAT;
733 PL_laststatval = req->result;
734 PL_statcache = *(req->statdata);
735 }
736
737 req_invoke (req); 752 req_invoke (req);
738 753
739 count++; 754 count++;
740 } 755 }
741 756
… …
984 int memofs = 0; 999 int memofs = 0;
985 int res = 0; 1000 int res = 0;
986 int errorno; 1001 int errorno;
987 1002
988 LOCK (wrklock); 1003 LOCK (wrklock);
989 self->dirp = dirp = opendir (req->dataptr); 1004 self->dirp = dirp = opendir (req->ptr1);
990 self->dbuf = u = malloc (sizeof (*u)); 1005 self->dbuf = u = malloc (sizeof (*u));
1006 req->flags |= FLAG_PTR2_FREE;
991 req->data2ptr = names = malloc (memlen); 1007 req->ptr2 = names = malloc (memlen);
992 UNLOCK (wrklock); 1008 UNLOCK (wrklock);
993 1009
994 if (dirp && u && names) 1010 if (dirp && u && names)
995 for (;;) 1011 for (;;)
996 { 1012 {
… …
1010 1026
1011 while (memofs + len > memlen) 1027 while (memofs + len > memlen)
1012 { 1028 {
1013 memlen *= 2; 1029 memlen *= 2;
1014 LOCK (wrklock); 1030 LOCK (wrklock);
1015 req->data2ptr = names = realloc (names, memlen); 1031 req->ptr2 = names = realloc (names, memlen);
1016 UNLOCK (wrklock); 1032 UNLOCK (wrklock);
1017 1033
1018 if (!names) 1034 if (!names)
1019 break; 1035 break;
1020 } 1036 }
… …
1085 errno = 0; /* strictly unnecessary */ 1101 errno = 0; /* strictly unnecessary */
1086 1102
1087 if (!(req->flags & FLAG_CANCELLED)) 1103 if (!(req->flags & FLAG_CANCELLED))
1088 switch (req->type) 1104 switch (req->type)
1089 { 1105 {
1090 case REQ_READ: req->result = pread (req->fd, req->dataptr, req->length, req->offset); break; 1106 case REQ_READ: req->result = pread (req->int1, req->ptr1, req->size, req->offs); break;
1091 case REQ_WRITE: req->result = pwrite (req->fd, req->dataptr, req->length, req->offset); break; 1107 case REQ_WRITE: req->result = pwrite (req->int1, req->ptr1, req->size, req->offs); break;
1092 1108
1093 case REQ_READAHEAD: req->result = readahead (req->fd, req->offset, req->length); break; 1109 case REQ_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break;
1094 case REQ_SENDFILE: req->result = sendfile_ (req->fd, req->fd2, req->offset, req->length, self); break; 1110 case REQ_SENDFILE: req->result = sendfile_ (req->int1, req->int2, req->offs, req->size, self); break;
1095 1111
1096 case REQ_STAT: req->result = stat (req->dataptr, req->statdata); break; 1112 case REQ_STAT: req->result = stat (req->ptr1, (Stat_t *)req->ptr2); break;
1097 case REQ_LSTAT: req->result = lstat (req->dataptr, req->statdata); break; 1113 case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break;
1098 case REQ_FSTAT: req->result = fstat (req->fd , req->statdata); break; 1114 case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break;
1099 1115
1100 case REQ_OPEN: req->result = open (req->dataptr, req->fd, req->mode); break; 1116 case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break;
1101 case REQ_CLOSE: req->result = close (req->fd); break; 1117 case REQ_CLOSE: req->result = close (req->int1); break;
1102 case REQ_UNLINK: req->result = unlink (req->dataptr); break; 1118 case REQ_UNLINK: req->result = unlink (req->ptr1); break;
1103 case REQ_RMDIR: req->result = rmdir (req->dataptr); break; 1119 case REQ_RMDIR: req->result = rmdir (req->ptr1); break;
1104 case REQ_RENAME: req->result = rename (req->data2ptr, req->dataptr); break; 1120 case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break;
1105 case REQ_LINK: req->result = link (req->data2ptr, req->dataptr); break; 1121 case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break;
1106 case REQ_SYMLINK: req->result = symlink (req->data2ptr, req->dataptr); break; 1122 case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break;
1107 case REQ_MKNOD: req->result = mknod (req->data2ptr, req->mode, (dev_t)req->offset); break; 1123 case REQ_MKNOD: req->result = mknod (req->ptr2, req->mode, (dev_t)req->offs); break;
1124 case REQ_READLINK: req->result = readlink (req->ptr2, req->ptr1, NAME_MAX); break;
1108 1125
1109 case REQ_FDATASYNC: req->result = fdatasync (req->fd); break; 1126 case REQ_FDATASYNC: req->result = fdatasync (req->int1); break;
1110 case REQ_FSYNC: req->result = fsync (req->fd); break; 1127 case REQ_FSYNC: req->result = fsync (req->int1); break;
1111 case REQ_READDIR: scandir_ (req, self); break; 1128 case REQ_READDIR: scandir_ (req, self); break;
1112 1129
1113 case REQ_BUSY: 1130 case REQ_BUSY:
1114 { 1131 {
1115 struct timeval tv; 1132 struct timeval tv;
1116 1133
1117 tv.tv_sec = req->fd; 1134 tv.tv_sec = req->int1;
1118 tv.tv_usec = req->fd2; 1135 tv.tv_usec = req->int2;
1119 1136
1120 req->result = select (0, 0, 0, 0, &tv); 1137 req->result = select (0, 0, 0, 0, &tv);
1121 } 1138 }
1122 1139
1123 case REQ_GROUP: 1140 case REQ_GROUP:
… …
1293 OUTPUT: 1310 OUTPUT:
1294 RETVAL 1311 RETVAL
1295 1312
1296void 1313void
1297aio_open (pathname,flags,mode,callback=&PL_sv_undef) 1314aio_open (pathname,flags,mode,callback=&PL_sv_undef)
1298 SV * pathname 1315 SV8 * pathname
1299 int flags 1316 int flags
1300 int mode 1317 int mode
1301 SV * callback 1318 SV * callback
1302 PROTOTYPE: $$$;$ 1319 PROTOTYPE: $$$;$
1303 PPCODE: 1320 PPCODE:
1304{ 1321{
1305 dREQ; 1322 dREQ;
1306 1323
1307 req->type = REQ_OPEN; 1324 req->type = REQ_OPEN;
1308 req->data = newSVsv (pathname); 1325 req->sv1 = newSVsv (pathname);
1309 req->dataptr = SvPVbyte_nolen (req->data); 1326 req->ptr1 = SvPVbyte_nolen (req->sv1);
1310 req->fd = flags; 1327 req->int1 = flags;
1311 req->mode = mode; 1328 req->mode = mode;
1312 1329
1313 REQ_SEND; 1330 REQ_SEND;
1314} 1331}
1315 1332
… …
1325 PPCODE: 1342 PPCODE:
1326{ 1343{
1327 dREQ; 1344 dREQ;
1328 1345
1329 req->type = ix; 1346 req->type = ix;
1330 req->fh = newSVsv (fh); 1347 req->fh = newSVsv (fh);
1331 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1348 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1332 1349
1333 REQ_SEND (req); 1350 REQ_SEND (req);
1334} 1351}
1335 1352
1336void 1353void
1337aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) 1354aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
1338 SV * fh 1355 SV * fh
1339 UV offset 1356 UV offset
1340 UV length 1357 UV length
1341 SV * data 1358 SV8 * data
1342 UV dataoffset 1359 UV dataoffset
1343 SV * callback 1360 SV * callback
1344 ALIAS: 1361 ALIAS:
1345 aio_read = REQ_READ 1362 aio_read = REQ_READ
1346 aio_write = REQ_WRITE 1363 aio_write = REQ_WRITE
1347 PROTOTYPE: $$$$$;$ 1364 PROTOTYPE: $$$$$;$
1348 PPCODE: 1365 PPCODE:
1349{ 1366{
1350 aio_req req;
1351 STRLEN svlen; 1367 STRLEN svlen;
1352 char *svptr = SvPVbyte (data, svlen); 1368 char *svptr = SvPVbyte (data, svlen);
1353 1369
1354 SvUPGRADE (data, SVt_PV); 1370 SvUPGRADE (data, SVt_PV);
1355 SvPOK_on (data); 1371 SvPOK_on (data);
… …
1377 1393
1378 { 1394 {
1379 dREQ; 1395 dREQ;
1380 1396
1381 req->type = ix; 1397 req->type = ix;
1382 req->fh = newSVsv (fh); 1398 req->fh = newSVsv (fh);
1383 req->fd = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) 1399 req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh))
1384 : IoOFP (sv_2io (fh))); 1400 : IoOFP (sv_2io (fh)));
1385 req->offset = offset; 1401 req->offs = offset;
1386 req->length = length; 1402 req->size = length;
1387 req->data = SvREFCNT_inc (data); 1403 req->sv1 = SvREFCNT_inc (data);
1388 req->dataptr = (char *)svptr + dataoffset; 1404 req->ptr1 = (char *)svptr + dataoffset;
1405 req->stroffset = dataoffset;
1389 1406
1390 if (!SvREADONLY (data)) 1407 if (!SvREADONLY (data))
1391 { 1408 {
1392 SvREADONLY_on (data); 1409 SvREADONLY_on (data);
1393 req->data2ptr = (void *)data; 1410 req->flags |= FLAG_SV1_RO_OFF;
1394 } 1411 }
1395 1412
1396 REQ_SEND; 1413 REQ_SEND;
1397 } 1414 }
1415}
1416
1417void
1418aio_readlink (path,callback=&PL_sv_undef)
1419 SV8 * path
1420 SV * callback
1421 PROTOTYPE: $$;$
1422 PPCODE:
1423{
1424 SV *data;
1425 dREQ;
1426
1427 data = newSV (NAME_MAX);
1428 SvPOK_on (data);
1429
1430 req->type = REQ_READLINK;
1431 req->fh = newSVsv (path);
1432 req->ptr2 = SvPVbyte_nolen (req->fh);
1433 req->sv1 = data;
1434 req->ptr1 = SvPVbyte_nolen (data);
1435
1436 REQ_SEND;
1398} 1437}
1399 1438
1400void 1439void
1401aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) 1440aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef)
1402 SV * out_fh 1441 SV * out_fh
… …
1408 PPCODE: 1447 PPCODE:
1409{ 1448{
1410 dREQ; 1449 dREQ;
1411 1450
1412 req->type = REQ_SENDFILE; 1451 req->type = REQ_SENDFILE;
1413 req->fh = newSVsv (out_fh); 1452 req->fh = newSVsv (out_fh);
1414 req->fd = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 1453 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh)));
1415 req->fh2 = newSVsv (in_fh); 1454 req->sv2 = newSVsv (in_fh);
1416 req->fd2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 1455 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh)));
1417 req->offset = in_offset; 1456 req->offs = in_offset;
1418 req->length = length; 1457 req->size = length;
1419 1458
1420 REQ_SEND; 1459 REQ_SEND;
1421} 1460}
1422 1461
1423void 1462void
… …
1430 PPCODE: 1469 PPCODE:
1431{ 1470{
1432 dREQ; 1471 dREQ;
1433 1472
1434 req->type = REQ_READAHEAD; 1473 req->type = REQ_READAHEAD;
1435 req->fh = newSVsv (fh); 1474 req->fh = newSVsv (fh);
1436 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh))); 1475 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
1437 req->offset = offset; 1476 req->offs = offset;
1438 req->length = length; 1477 req->size = length;
1439 1478
1440 REQ_SEND; 1479 REQ_SEND;
1441} 1480}
1442 1481
1443void 1482void
1444aio_stat (fh_or_path,callback=&PL_sv_undef) 1483aio_stat (fh_or_path,callback=&PL_sv_undef)
1445 SV * fh_or_path 1484 SV8 * fh_or_path
1446 SV * callback 1485 SV * callback
1447 ALIAS: 1486 ALIAS:
1448 aio_stat = REQ_STAT 1487 aio_stat = REQ_STAT
1449 aio_lstat = REQ_LSTAT 1488 aio_lstat = REQ_LSTAT
1450 PPCODE: 1489 PPCODE:
1451{ 1490{
1452 dREQ; 1491 dREQ;
1453 1492
1454 New (0, req->statdata, 1, Stat_t); 1493 req->ptr2 = malloc (sizeof (Stat_t));
1455 if (!req->statdata) 1494 if (!req->ptr2)
1456 { 1495 {
1457 req_free (req); 1496 req_free (req);
1458 croak ("out of memory during aio_req->statdata allocation"); 1497 croak ("out of memory during aio_stat statdata allocation");
1459 } 1498 }
1499
1500 req->flags |= FLAG_PTR2_FREE;
1460 1501
1461 if (SvPOK (fh_or_path)) 1502 if (SvPOK (fh_or_path))
1462 { 1503 {
1463 req->type = ix; 1504 req->type = ix;
1464 req->data = newSVsv (fh_or_path); 1505 req->sv1 = newSVsv (fh_or_path);
1465 req->dataptr = SvPVbyte_nolen (req->data); 1506 req->ptr1 = SvPVbyte_nolen (req->sv1);
1466 } 1507 }
1467 else 1508 else
1468 { 1509 {
1469 req->type = REQ_FSTAT; 1510 req->type = REQ_FSTAT;
1470 req->fh = newSVsv (fh_or_path); 1511 req->fh = newSVsv (fh_or_path);
1471 req->fd = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 1512 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1472 } 1513 }
1473 1514
1474 REQ_SEND; 1515 REQ_SEND;
1475} 1516}
1476 1517
1477void 1518void
1478aio_unlink (pathname,callback=&PL_sv_undef) 1519aio_unlink (pathname,callback=&PL_sv_undef)
1479 SV * pathname 1520 SV8 * pathname
1480 SV * callback 1521 SV * callback
1481 ALIAS: 1522 ALIAS:
1482 aio_unlink = REQ_UNLINK 1523 aio_unlink = REQ_UNLINK
1483 aio_rmdir = REQ_RMDIR 1524 aio_rmdir = REQ_RMDIR
1484 aio_readdir = REQ_READDIR 1525 aio_readdir = REQ_READDIR
1485 PPCODE: 1526 PPCODE:
1486{ 1527{
1487 dREQ; 1528 dREQ;
1488 1529
1489 req->type = ix; 1530 req->type = ix;
1490 req->data = newSVsv (pathname); 1531 req->sv1 = newSVsv (pathname);
1491 req->dataptr = SvPVbyte_nolen (req->data); 1532 req->ptr1 = SvPVbyte_nolen (req->sv1);
1492 1533
1493 REQ_SEND; 1534 REQ_SEND;
1494} 1535}
1495 1536
1496void 1537void
1497aio_link (oldpath,newpath,callback=&PL_sv_undef) 1538aio_link (oldpath,newpath,callback=&PL_sv_undef)
1498 SV * oldpath 1539 SV8 * oldpath
1499 SV * newpath 1540 SV8 * newpath
1500 SV * callback 1541 SV * callback
1501 ALIAS: 1542 ALIAS:
1502 aio_link = REQ_LINK 1543 aio_link = REQ_LINK
1503 aio_symlink = REQ_SYMLINK 1544 aio_symlink = REQ_SYMLINK
1504 aio_rename = REQ_RENAME 1545 aio_rename = REQ_RENAME
1505 PPCODE: 1546 PPCODE:
1506{ 1547{
1507 dREQ; 1548 dREQ;
1508 1549
1509 req->type = ix; 1550 req->type = ix;
1510 req->fh = newSVsv (oldpath); 1551 req->fh = newSVsv (oldpath);
1511 req->data2ptr = SvPVbyte_nolen (req->fh); 1552 req->ptr2 = SvPVbyte_nolen (req->fh);
1512 req->data = newSVsv (newpath); 1553 req->sv1 = newSVsv (newpath);
1513 req->dataptr = SvPVbyte_nolen (req->data); 1554 req->ptr1 = SvPVbyte_nolen (req->sv1);
1514 1555
1515 REQ_SEND; 1556 REQ_SEND;
1516} 1557}
1517 1558
1518void 1559void
1519aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) 1560aio_mknod (pathname,mode,dev,callback=&PL_sv_undef)
1520 SV * pathname 1561 SV8 * pathname
1521 SV * callback 1562 SV * callback
1522 UV mode 1563 UV mode
1523 UV dev 1564 UV dev
1524 PPCODE: 1565 PPCODE:
1525{ 1566{
1526 dREQ; 1567 dREQ;
1527 1568
1528 req->type = REQ_MKNOD; 1569 req->type = REQ_MKNOD;
1529 req->data = newSVsv (pathname); 1570 req->sv1 = newSVsv (pathname);
1530 req->dataptr = SvPVbyte_nolen (req->data); 1571 req->ptr1 = SvPVbyte_nolen (req->sv1);
1531 req->mode = (mode_t)mode; 1572 req->mode = (mode_t)mode;
1532 req->offset = dev; 1573 req->offs = dev;
1533 1574
1534 REQ_SEND; 1575 REQ_SEND;
1535} 1576}
1536 1577
1537void 1578void
1538aio_busy (delay,callback=&PL_sv_undef) 1579aio_busy (delay,callback=&PL_sv_undef)
1539 double delay 1580 double delay
1540 SV * callback 1581 SV * callback
1541 PPCODE: 1582 PPCODE:
1542{ 1583{
1543 dREQ; 1584 dREQ;
1544 1585
1545 req->type = REQ_BUSY; 1586 req->type = REQ_BUSY;
1546 req->fd = delay < 0. ? 0 : delay; 1587 req->int1 = delay < 0. ? 0 : delay;
1547 req->fd2 = delay < 0. ? 0 : 1000. * (delay - req->fd); 1588 req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1);
1548 1589
1549 REQ_SEND; 1590 REQ_SEND;
1550} 1591}
1551 1592
1552void 1593void
… …
1556 PPCODE: 1597 PPCODE:
1557{ 1598{
1558 dREQ; 1599 dREQ;
1559 1600
1560 req->type = REQ_GROUP; 1601 req->type = REQ_GROUP;
1602
1561 req_send (req); 1603 req_send (req);
1562
1563 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1604 XPUSHs (req_sv (req, AIO_GRP_KLASS));
1564} 1605}
1565 1606
1566void 1607void
1567aio_nop (callback=&PL_sv_undef) 1608aio_nop (callback=&PL_sv_undef)
1568 SV * callback 1609 SV * callback
1569 PPCODE: 1610 PPCODE:
1570{ 1611{
1571 dREQ; 1612 dREQ;
1572 1613
1573 req->type = REQ_NOP; 1614 req->type = REQ_NOP;
… …
1602 PROTOTYPE: 1643 PROTOTYPE:
1603 CODE: 1644 CODE:
1604 while (nreqs) 1645 while (nreqs)
1605 { 1646 {
1606 poll_wait (); 1647 poll_wait ();
1607 poll_cb (0); 1648 poll_cb ();
1608 } 1649 }
1609 1650
1610void 1651int
1611poll() 1652poll()
1612 PROTOTYPE: 1653 PROTOTYPE:
1613 CODE: 1654 CODE:
1614 if (nreqs)
1615 {
1616 poll_wait (); 1655 poll_wait ();
1617 poll_cb (0); 1656 RETVAL = poll_cb ();
1618 } 1657 OUTPUT:
1658 RETVAL
1619 1659
1620int 1660int
1621poll_fileno() 1661poll_fileno()
1622 PROTOTYPE: 1662 PROTOTYPE:
1623 CODE: 1663 CODE:
… …
1635 1675
1636void 1676void
1637poll_wait() 1677poll_wait()
1638 PROTOTYPE: 1678 PROTOTYPE:
1639 CODE: 1679 CODE:
1640 if (nreqs)
1641 poll_wait (); 1680 poll_wait ();
1642 1681
1643int 1682int
1644nreqs() 1683nreqs()
1645 PROTOTYPE: 1684 PROTOTYPE:
1646 CODE: 1685 CODE:
… …
1696 PPCODE: 1735 PPCODE:
1697{ 1736{
1698 int i; 1737 int i;
1699 aio_req req; 1738 aio_req req;
1700 1739
1701 if (grp->fd == 2) 1740 if (grp->int1 == 2)
1702 croak ("cannot add requests to IO::AIO::GRP after the group finished"); 1741 croak ("cannot add requests to IO::AIO::GRP after the group finished");
1703 1742
1704 for (i = 1; i < items; ++i ) 1743 for (i = 1; i < items; ++i )
1705 { 1744 {
1706 if (GIMME_V != G_VOID) 1745 if (GIMME_V != G_VOID)
… …
1708 1747
1709 req = SvAIO_REQ (ST (i)); 1748 req = SvAIO_REQ (ST (i));
1710 1749
1711 if (req) 1750 if (req)
1712 { 1751 {
1713 ++grp->length; 1752 ++grp->size;
1714 req->grp = grp; 1753 req->grp = grp;
1715 1754
1716 req->grp_prev = 0; 1755 req->grp_prev = 0;
1717 req->grp_next = grp->grp_first; 1756 req->grp_next = grp->grp_first;
1718 1757
… …
1741 av = newAV (); 1780 av = newAV ();
1742 1781
1743 for (i = 1; i < items; ++i ) 1782 for (i = 1; i < items; ++i )
1744 av_push (av, newSVsv (ST (i))); 1783 av_push (av, newSVsv (ST (i)));
1745 1784
1746 SvREFCNT_dec (grp->data); 1785 SvREFCNT_dec (grp->sv1);
1747 grp->data = (SV *)av; 1786 grp->sv1 = (SV *)av;
1748} 1787}
1749 1788
1750void 1789void
1751errno (aio_req grp, int errorno = errno) 1790errno (aio_req grp, int errorno = errno)
1752 CODE: 1791 CODE:
1753 grp->errorno = errorno; 1792 grp->errorno = errorno;
1754 1793
1755void 1794void
1756limit (aio_req grp, int limit) 1795limit (aio_req grp, int limit)
1757 CODE: 1796 CODE:
1758 grp->fd2 = limit; 1797 grp->int2 = limit;
1759 aio_grp_feed (grp); 1798 aio_grp_feed (grp);
1760 1799
1761void 1800void
1762feed (aio_req grp, SV *callback=&PL_sv_undef) 1801feed (aio_req grp, SV *callback=&PL_sv_undef)
1763 CODE: 1802 CODE:
1764{ 1803{
1765 SvREFCNT_dec (grp->fh2); 1804 SvREFCNT_dec (grp->sv2);
1766 grp->fh2 = newSVsv (callback); 1805 grp->sv2 = newSVsv (callback);
1767 1806
1768 if (grp->fd2 <= 0) 1807 if (grp->int2 <= 0)
1769 grp->fd2 = 2; 1808 grp->int2 = 2;
1770 1809
1771 aio_grp_feed (grp); 1810 aio_grp_feed (grp);
1772} 1811}
1773 1812

Diff Legend

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