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.89 by root, Tue Oct 31 00:11:52 2006 UTC

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

Diff Legend

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