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.194 by root, Fri Jul 29 08:35:36 2011 UTC vs.
Revision 1.201 by root, Thu Sep 29 09:57:12 2011 UTC

102 102
103typedef SV SV8; /* byte-sv, used for argument-checking */ 103typedef SV SV8; /* byte-sv, used for argument-checking */
104typedef int aio_rfd; /* read file desriptor */ 104typedef int aio_rfd; /* read file desriptor */
105typedef int aio_wfd; /* write file descriptor */ 105typedef int aio_wfd; /* write file descriptor */
106 106
107static HV *aio_stash, *aio_req_stash, *aio_grp_stash; 107static HV *aio_stash, *aio_req_stash, *aio_grp_stash, *aio_wd_stash;
108 108
109#define EIO_REQ_MEMBERS \ 109#define EIO_REQ_MEMBERS \
110 SV *callback; \ 110 SV *callback; \
111 SV *sv1, *sv2; \ 111 SV *sv1, *sv2; \
112 SV *sv3, *sv4; \
112 STRLEN stroffset; \ 113 STRLEN stroffset; \
113 SV *self; 114 SV *self;
114 115
115#define EIO_NO_WRAPPERS 1 116#define EIO_NO_WRAPPERS 1
116 117
329 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 330 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
330}; 331};
331 332
332typedef eio_req *aio_req; 333typedef eio_req *aio_req;
333typedef eio_req *aio_req_ornot; 334typedef eio_req *aio_req_ornot;
335typedef eio_wd aio_wd;
334 336
335static SV *on_next_submit; 337static SV *on_next_submit;
336static int next_pri = EIO_PRI_DEFAULT; 338static int next_pri = EIO_PRI_DEFAULT;
337static int max_outstanding; 339static int max_outstanding;
338 340
339static s_epipe respipe; 341static s_epipe respipe;
340 342
341static void req_destroy (aio_req req); 343static void req_destroy (aio_req req);
342static void req_cancel (aio_req req); 344static void req_cancel (aio_req req);
343 345
344static void want_poll (void) 346static void
347want_poll (void)
345{ 348{
346 /* write a dummy byte to the pipe so fh becomes ready */ 349 /* write a dummy byte to the pipe so fh becomes ready */
347 s_epipe_signal (&respipe); 350 s_epipe_signal (&respipe);
348} 351}
349 352
350static void done_poll (void) 353static void
354done_poll (void)
351{ 355{
352 /* read any signals sent by the worker threads */ 356 /* read any signals sent by the worker threads */
353 s_epipe_drain (&respipe); 357 s_epipe_drain (&respipe);
354} 358}
355 359
356/* must be called at most once */ 360/* must be called at most once */
361static SV *
357static SV *req_sv (aio_req req, HV *stash) 362req_sv (aio_req req, HV *stash)
358{ 363{
359 if (!req->self) 364 if (!req->self)
360 { 365 {
361 req->self = (SV *)newHV (); 366 req->self = (SV *)newHV ();
362 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 367 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
363 } 368 }
364 369
365 return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); 370 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
366} 371}
367 372
368static aio_req SvAIO_REQ (SV *sv) 373static SV *
374newSVaio_wd (aio_wd wd)
375{
376 return sv_bless (newRV_noinc (newSViv ((long)wd)), aio_wd_stash);
377}
378
379static aio_req
380SvAIO_REQ (SV *sv)
369{ 381{
370 MAGIC *mg; 382 MAGIC *mg;
371 383
372 if (!SvROK (sv) 384 if (!SvROK (sv)
373 || (SvSTASH (SvRV (sv)) != aio_grp_stash 385 || (SvSTASH (SvRV (sv)) != aio_grp_stash
378 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 390 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
379 391
380 return mg ? (aio_req)mg->mg_ptr : 0; 392 return mg ? (aio_req)mg->mg_ptr : 0;
381} 393}
382 394
395static aio_wd
396SvAIO_WD (SV *sv)
397{
398 if (!SvROK (sv)
399 || SvSTASH (SvRV (sv)) != aio_wd_stash
400 || SvTYPE (SvRV (sv)) != SVt_PVMG)
401 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
402
403 return (aio_wd)(long)SvIVX (SvRV (sv));
404}
405
406static void
383static void aio_grp_feed (aio_req grp) 407aio_grp_feed (aio_req grp)
384{ 408{
385 if (grp->sv2 && SvOK (grp->sv2)) 409 if (grp->sv2 && SvOK (grp->sv2))
386 { 410 {
387 dSP; 411 dSP;
388 412
396 FREETMPS; 420 FREETMPS;
397 LEAVE; 421 LEAVE;
398 } 422 }
399} 423}
400 424
425static void
401static void req_submit (eio_req *req) 426req_submit (eio_req *req)
402{ 427{
403 eio_submit (req); 428 eio_submit (req);
404 429
405 if (expect_false (on_next_submit)) 430 if (expect_false (on_next_submit))
406 { 431 {
413 PUTBACK; 438 PUTBACK;
414 call_sv (cb, G_DISCARD | G_EVAL); 439 call_sv (cb, G_DISCARD | G_EVAL);
415 } 440 }
416} 441}
417 442
443static int
418static int req_invoke (eio_req *req) 444req_invoke (eio_req *req)
419{ 445{
420 if (req->flags & FLAG_SV2_RO_OFF) 446 if (req->flags & FLAG_SV2_RO_OFF)
421 SvREADONLY_off (req->sv2); 447 SvREADONLY_off (req->sv2);
422 448
423 if (!EIO_CANCELLED (req) && req->callback) 449 if (!EIO_CANCELLED (req) && req->callback)
444 SvREADONLY_on (sv_result); 470 SvREADONLY_on (sv_result);
445 } 471 }
446 472
447 switch (req->type) 473 switch (req->type)
448 { 474 {
475 case EIO_WD_OPEN:
476 PUSHs (sv_2mortal (newSVaio_wd (req->wd)));
477 break;
478
449 case EIO_READDIR: 479 case EIO_READDIR:
450 { 480 {
451 SV *rv = &PL_sv_undef; 481 SV *rv = &PL_sv_undef;
452 482
453 if (req->result >= 0) 483 if (req->result >= 0)
595 break; 625 break;
596 626
597 case EIO_STAT: 627 case EIO_STAT:
598 case EIO_LSTAT: 628 case EIO_LSTAT:
599 case EIO_FSTAT: 629 case EIO_FSTAT:
600 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 630 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
631
601 PL_laststatval = req->result; 632 if (!(PL_laststatval = req->result))
602 /* if compilation fails here then perl's Stat_t is not struct _stati64 */ 633 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
603 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 634 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
635
604 PUSHs (sv_result); 636 PUSHs (sv_result);
605 break; 637 break;
606 638
607 case EIO_READ: 639 case EIO_READ:
608 { 640 {
642 } 674 }
643 675
644 return !!SvTRUE (ERRSV); 676 return !!SvTRUE (ERRSV);
645} 677}
646 678
679static void
647static void req_destroy (aio_req req) 680req_destroy (aio_req req)
648{ 681{
649 if (req->self) 682 if (req->self)
650 { 683 {
651 sv_unmagic (req->self, PERL_MAGIC_ext); 684 sv_unmagic (req->self, PERL_MAGIC_ext);
652 SvREFCNT_dec (req->self); 685 SvREFCNT_dec (req->self);
653 } 686 }
654 687
655 SvREFCNT_dec (req->sv1); 688 SvREFCNT_dec (req->sv1);
656 SvREFCNT_dec (req->sv2); 689 SvREFCNT_dec (req->sv2);
690 SvREFCNT_dec (req->sv3);
691 SvREFCNT_dec (req->sv4);
657 SvREFCNT_dec (req->callback); 692 SvREFCNT_dec (req->callback);
658 693
659 Safefree (req); 694 Safefree (req);
660} 695}
661 696
697static void
662static void req_cancel_subs (aio_req grp) 698req_cancel_subs (aio_req grp)
663{ 699{
664 if (grp->type != EIO_GROUP) 700 if (grp->type != EIO_GROUP)
665 return; 701 return;
666 702
667 SvREFCNT_dec (grp->sv2); 703 SvREFCNT_dec (grp->sv2);
668 grp->sv2 = 0; 704 grp->sv2 = 0;
669 705
670 eio_grp_cancel (grp); 706 eio_grp_cancel (grp);
671} 707}
672 708
709static void ecb_cold
673static void create_respipe (void) 710create_respipe (void)
674{ 711{
675 if (s_epipe_renew (&respipe)) 712 if (s_epipe_renew (&respipe))
676 croak ("IO::AIO: unable to initialize result pipe"); 713 croak ("IO::AIO: unable to initialize result pipe");
677} 714}
678 715
679static void poll_wait (void) 716static void
717poll_wait (void)
680{ 718{
681 while (eio_nreqs ()) 719 while (eio_nreqs ())
682 { 720 {
683 int size; 721 int size;
684 722
693 731
694 s_epipe_wait (&respipe); 732 s_epipe_wait (&respipe);
695 } 733 }
696} 734}
697 735
698static int poll_cb (void) 736static int
737poll_cb (void)
699{ 738{
700 for (;;) 739 for (;;)
701 { 740 {
702 int res = eio_poll (); 741 int res = eio_poll ();
703 742
736# define MAP_FIXED 0 775# define MAP_FIXED 0
737#endif 776#endif
738 777
739#define MMAP_MAGIC PERL_MAGIC_ext 778#define MMAP_MAGIC PERL_MAGIC_ext
740 779
780static int ecb_cold
741static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 781mmap_free (pTHX_ SV *sv, MAGIC *mg)
742{ 782{
743 int old_errno = errno; 783 int old_errno = errno;
744 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 784 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
745 errno = old_errno; 785 errno = old_errno;
746 786
762 0, 0, 0, 0, mmap_free 802 0, 0, 0, 0, mmap_free
763}; 803};
764 804
765/*****************************************************************************/ 805/*****************************************************************************/
766 806
807static SV *
767static SV * get_cb (SV *cb_sv) 808get_cb (SV *cb_sv)
768{ 809{
769 SvGETMAGIC (cb_sv); 810 SvGETMAGIC (cb_sv);
770 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 811 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
771} 812}
772 813
790 req_submit (req); \ 831 req_submit (req); \
791 SPAGAIN; \ 832 SPAGAIN; \
792 \ 833 \
793 if (GIMME_V != G_VOID) \ 834 if (GIMME_V != G_VOID) \
794 XPUSHs (req_sv (req, aio_req_stash)); 835 XPUSHs (req_sv (req, aio_req_stash));
836
837ecb_inline void
838req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
839{
840 if (expect_false (SvROK (path)))
841 {
842 AV *av = (AV *)SvRV (path);
843 SV *wdob;
844
845 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1)
846 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
847
848 path = AvARRAY (av)[1];
849 wdob = AvARRAY (av)[0];
850
851 if (SvOK (wdob))
852 {
853 *wd = SvAIO_WD (wdob);
854 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
855 }
856 else
857 *wd = EIO_INVALID_WD;
858 }
859
860 *pathsv = newSVsv (path);
861 *ptr = SvPVbyte_nolen (*pathsv);
862}
863
864static void ecb_noinline
865req_set_path1 (aio_req req, SV *path)
866{
867 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
868}
869
870static void ecb_noinline
871req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
872{
873 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
874
875 switch (SvTYPE (rv))
876 {
877 case SVt_PVIO:
878 case SVt_PVLV:
879 case SVt_PVGV:
880 req->type = type_fh;
881 req->sv1 = newSVsv (fh_or_path);
882 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
883 break;
884
885 default:
886 req->type = type_path;
887 req_set_path1 (req, fh_or_path);
888 break;
889 }
890}
795 891
796MODULE = IO::AIO PACKAGE = IO::AIO 892MODULE = IO::AIO PACKAGE = IO::AIO
797 893
798PROTOTYPES: ENABLE 894PROTOTYPES: ENABLE
799 895
917 }; 1013 };
918 1014
919 aio_stash = gv_stashpv ("IO::AIO" , 1); 1015 aio_stash = gv_stashpv ("IO::AIO" , 1);
920 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 1016 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
921 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 1017 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
1018 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
922 1019
923 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--) 1020 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
924 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv)); 1021 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
925 1022
926 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1023 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
973 PROTOTYPE: $ 1070 PROTOTYPE: $
974 CODE: 1071 CODE:
975 max_outstanding = maxreqs; 1072 max_outstanding = maxreqs;
976 1073
977void 1074void
1075aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1076 PPCODE:
1077{
1078 dREQ;
1079
1080 req->type = EIO_WD_OPEN;
1081 req_set_path1 (req, pathname);
1082
1083 REQ_SEND;
1084}
1085
1086void
978aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1087aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
979 PPCODE: 1088 PPCODE:
980{ 1089{
981 dREQ; 1090 dREQ;
982 1091
983 req->type = EIO_OPEN; 1092 req->type = EIO_OPEN;
984 req->sv1 = newSVsv (pathname); 1093 req_set_path1 (req, pathname);
985 req->ptr1 = SvPVbyte_nolen (req->sv1);
986 req->int1 = flags; 1094 req->int1 = flags;
987 req->int2 = mode; 1095 req->int2 = mode;
988 1096
989 REQ_SEND; 1097 REQ_SEND;
990} 1098}
1127 REQ_SEND; 1235 REQ_SEND;
1128 } 1236 }
1129} 1237}
1130 1238
1131void 1239void
1132aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1240aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1133 ALIAS: 1241 ALIAS:
1134 aio_readlink = EIO_READLINK 1242 aio_readlink = EIO_READLINK
1135 aio_realpath = EIO_REALPATH 1243 aio_realpath = EIO_REALPATH
1136 PPCODE: 1244 PPCODE:
1137{ 1245{
1138 dREQ; 1246 dREQ;
1139 1247
1140 req->type = ix; 1248 req->type = ix;
1141 req->sv1 = newSVsv (path); 1249 req_set_path1 (req, pathname);
1142 req->ptr1 = SvPVbyte_nolen (req->sv1);
1143 1250
1144 REQ_SEND; 1251 REQ_SEND;
1145} 1252}
1146 1253
1147void 1254void
1188 PPCODE: 1295 PPCODE:
1189{ 1296{
1190 dREQ; 1297 dREQ;
1191 1298
1192 req->sv1 = newSVsv (fh_or_path); 1299 req->sv1 = newSVsv (fh_or_path);
1193 1300 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1194 if (SvPOK (req->sv1))
1195 {
1196 req->type = ix;
1197 req->ptr1 = SvPVbyte_nolen (req->sv1);
1198 }
1199 else
1200 {
1201 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1202 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1203 }
1204
1205 REQ_SEND; 1301 REQ_SEND;
1206} 1302}
1207 1303
1208UV 1304UV
1209major (UV dev) 1305major (UV dev)
1227{ 1323{
1228 dREQ; 1324 dREQ;
1229 1325
1230 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1326 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1231 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1327 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1232 req->sv1 = newSVsv (fh_or_path); 1328 req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1233
1234 if (SvPOK (req->sv1))
1235 {
1236 req->type = EIO_UTIME;
1237 req->ptr1 = SvPVbyte_nolen (req->sv1);
1238 }
1239 else
1240 {
1241 req->type = EIO_FUTIME;
1242 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1243 }
1244 1329
1245 REQ_SEND; 1330 REQ_SEND;
1246} 1331}
1247 1332
1248void 1333void
1249aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1334aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1250 PPCODE: 1335 PPCODE:
1251{ 1336{
1252 dREQ; 1337 dREQ;
1253 1338
1254 req->sv1 = newSVsv (fh_or_path);
1255 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1339 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1256 1340 req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1257 if (SvPOK (req->sv1))
1258 {
1259 req->type = EIO_TRUNCATE;
1260 req->ptr1 = SvPVbyte_nolen (req->sv1);
1261 }
1262 else
1263 {
1264 req->type = EIO_FTRUNCATE;
1265 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1266 }
1267 1341
1268 REQ_SEND; 1342 REQ_SEND;
1269} 1343}
1270 1344
1271void 1345void
1272aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1346aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1273 ALIAS:
1274 aio_chmod = EIO_CHMOD
1275 aio_mkdir = EIO_MKDIR
1276 PPCODE: 1347 PPCODE:
1277{ 1348{
1278 dREQ; 1349 dREQ;
1279 1350
1280 req->int2 = mode; 1351 req->int2 = mode;
1281 req->sv1 = newSVsv (fh_or_path); 1352 req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1282
1283 if (SvPOK (req->sv1))
1284 {
1285 req->type = ix;
1286 req->ptr1 = SvPVbyte_nolen (req->sv1);
1287 }
1288 else
1289 {
1290 req->type = EIO_FCHMOD;
1291 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1292 }
1293 1353
1294 REQ_SEND; 1354 REQ_SEND;
1295} 1355}
1296 1356
1297void 1357void
1300{ 1360{
1301 dREQ; 1361 dREQ;
1302 1362
1303 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1363 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1304 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1364 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1305 req->sv1 = newSVsv (fh_or_path); 1365 req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1306
1307 if (SvPOK (req->sv1))
1308 {
1309 req->type = EIO_CHOWN;
1310 req->ptr1 = SvPVbyte_nolen (req->sv1);
1311 }
1312 else
1313 {
1314 req->type = EIO_FCHOWN;
1315 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1316 }
1317 1366
1318 REQ_SEND; 1367 REQ_SEND;
1319} 1368}
1320 1369
1321void 1370void
1323 PPCODE: 1372 PPCODE:
1324{ 1373{
1325 dREQ; 1374 dREQ;
1326 1375
1327 req->type = EIO_READDIR; 1376 req->type = EIO_READDIR;
1328 req->sv1 = newSVsv (pathname);
1329 req->ptr1 = SvPVbyte_nolen (req->sv1);
1330 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; 1377 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1331 1378
1332 if (flags & EIO_READDIR_DENTS) 1379 if (flags & EIO_READDIR_DENTS)
1333 req->int1 |= EIO_READDIR_CUSTOM2; 1380 req->int1 |= EIO_READDIR_CUSTOM2;
1334 1381
1382 req_set_path1 (req, pathname);
1383
1335 REQ_SEND; 1384 REQ_SEND;
1385}
1386
1387void
1388aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1389 PPCODE:
1390{
1391 dREQ;
1392
1393 req->type = EIO_MKDIR;
1394 req->int2 = mode;
1395 req_set_path1 (req, pathname);
1396
1397 REQ_SEND;
1336} 1398}
1337 1399
1338void 1400void
1339aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1401aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1340 ALIAS: 1402 ALIAS:
1344 PPCODE: 1406 PPCODE:
1345{ 1407{
1346 dREQ; 1408 dREQ;
1347 1409
1348 req->type = ix; 1410 req->type = ix;
1349 req->sv1 = newSVsv (pathname); 1411 req_set_path1 (req, pathname);
1350 req->ptr1 = SvPVbyte_nolen (req->sv1);
1351 1412
1352 REQ_SEND; 1413 REQ_SEND;
1353} 1414}
1354 1415
1355void 1416void
1359 aio_symlink = EIO_SYMLINK 1420 aio_symlink = EIO_SYMLINK
1360 aio_rename = EIO_RENAME 1421 aio_rename = EIO_RENAME
1361 PPCODE: 1422 PPCODE:
1362{ 1423{
1363 dREQ; 1424 dREQ;
1425 eio_wd wd2 = 0;
1364 1426
1365 req->type = ix; 1427 req->type = ix;
1366 req->sv1 = newSVsv (oldpath); 1428 req_set_path1 (req, oldpath);
1367 req->ptr1 = SvPVbyte_nolen (req->sv1); 1429 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1368 req->sv2 = newSVsv (newpath); 1430 req->int3 = (long)wd2;
1369 req->ptr2 = SvPVbyte_nolen (req->sv2);
1370 1431
1371 REQ_SEND; 1432 REQ_SEND;
1372} 1433}
1373 1434
1374void 1435void
1376 PPCODE: 1437 PPCODE:
1377{ 1438{
1378 dREQ; 1439 dREQ;
1379 1440
1380 req->type = EIO_MKNOD; 1441 req->type = EIO_MKNOD;
1381 req->sv1 = newSVsv (pathname);
1382 req->ptr1 = SvPVbyte_nolen (req->sv1);
1383 req->int2 = (mode_t)mode; 1442 req->int2 = (mode_t)mode;
1384 req->offs = dev; 1443 req->offs = dev;
1444 req_set_path1 (req, pathname);
1385 1445
1386 REQ_SEND; 1446 REQ_SEND;
1387} 1447}
1388 1448
1389void 1449void
1711 SvREFCNT_dec (on_next_submit); 1771 SvREFCNT_dec (on_next_submit);
1712 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1772 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1713 1773
1714PROTOTYPES: DISABLE 1774PROTOTYPES: DISABLE
1715 1775
1776MODULE = IO::AIO PACKAGE = IO::AIO::WD
1777
1778BOOT:
1779{
1780 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1781 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1782}
1783
1784void
1785DESTROY (SV *self)
1786 CODE:
1787{
1788 aio_wd wd = SvAIO_WD (self);
1789#if HAVE_AT
1790 SV *callback = &PL_sv_undef;
1791 dREQ; /* clobbers next_pri :/ */
1792 req->type = EIO_WD_CLOSE;
1793 req->wd = wd;
1794 REQ_SEND;
1795#else
1796 eio_wd_close_sync (wd);
1797#endif
1798}
1799
1716MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1800MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1717 1801
1718void 1802void
1719cancel (aio_req_ornot req) 1803cancel (aio_req_ornot req)
1720 CODE: 1804 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines