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.186 by root, Thu Jul 14 22:36:17 2011 UTC vs.
Revision 1.195 by root, Mon Sep 26 20:19:08 2011 UTC

… …
22#endif 22#endif
23 23
24/* perl namespace pollution */ 24/* perl namespace pollution */
25#undef VERSION 25#undef VERSION
26 26
27#ifdef _WIN32
28
29# define EIO_STRUCT_DIRENT Direntry_t
30# undef malloc
31# undef free
32
33// perl overrides all those nice win32 functions
34# undef open
35# undef read
36# undef write
37# undef send
38# undef recv
39# undef stat
40# undef fstat
41# define lstat stat
42# undef truncate
43# undef ftruncate
44# undef open
45# undef close
46# undef unlink
47# undef rmdir
48# undef rename
49# undef lseek
50
51# define opendir(fd) (errno = ENOSYS, 0)
52# define readdir(fd) (errno = ENOSYS, -1)
53# define closedir(fd) (errno = ENOSYS, -1)
54
55#else
56
57# include <sys/time.h>
58# include <sys/select.h>
59# include <unistd.h>
60# include <utime.h>
61# include <signal.h>
62# define EIO_STRUCT_DIRENT struct dirent
63
64#endif
65
66/* perl stupidly overrides readdir and maybe others */ 27/* perl stupidly overrides readdir and maybe others */
67/* with thread-unsafe versions, imagine that :( */ 28/* with thread-unsafe versions, imagine that :( */
68#undef readdir 29#undef readdir
69#undef opendir 30#undef opendir
70#undef closedir 31#undef closedir
32
33#ifdef _WIN32
34
35 // perl overrides all those nice libc functions
36
37 #undef malloc
38 #undef free
39 #undef open
40 #undef read
41 #undef write
42 #undef send
43 #undef recv
44 #undef stat
45 #undef lstat
46 #undef fstat
47 #undef truncate
48 #undef ftruncate
49 #undef open
50 #undef link
51 #undef close
52 #undef unlink
53 #undef mkdir
54 #undef rmdir
55 #undef rename
56 #undef lseek
57 #undef opendir
58 #undef readdir
59 #undef closedir
60 #undef chmod
61 #undef fchmod
62 #undef dup
63 #undef dup2
64 #undef abort
65 #undef pipe
66
67#else
68
69 #include <sys/time.h>
70 #include <sys/select.h>
71 #include <unistd.h>
72 #include <utime.h>
73 #include <signal.h>
74
75#endif
71 76
72#define EIO_STRUCT_STAT Stat_t 77#define EIO_STRUCT_STAT Stat_t
73 78
74/* use NV for 32 bit perls as it allows larger offsets */ 79/* use NV for 32 bit perls as it allows larger offsets */
75#if IVSIZE >= 8 80#if IVSIZE >= 8
… …
97 102
98typedef SV SV8; /* byte-sv, used for argument-checking */ 103typedef SV SV8; /* byte-sv, used for argument-checking */
99typedef int aio_rfd; /* read file desriptor */ 104typedef int aio_rfd; /* read file desriptor */
100typedef int aio_wfd; /* write file descriptor */ 105typedef int aio_wfd; /* write file descriptor */
101 106
102static HV *aio_stash, *aio_req_stash, *aio_grp_stash; 107static HV *aio_stash, *aio_req_stash, *aio_grp_stash, *aio_wd_stash;
103 108
104#define EIO_REQ_MEMBERS \ 109#define EIO_REQ_MEMBERS \
105 SV *callback; \ 110 SV *callback; \
106 SV *sv1, *sv2; \ 111 SV *sv1, *sv2; \
112 SV *sv3, *sv4; \
107 STRLEN stroffset; \ 113 STRLEN stroffset; \
108 SV *self; 114 SV *self;
109 115
110#define EIO_NO_WRAPPERS 1 116#define EIO_NO_WRAPPERS 1
111 117
112#include "libeio/config.h" 118#include "libeio/config.h"
113#include "libeio/eio.h" 119#include "libeio/eio.h"
120
121static int req_invoke (eio_req *req);
122#define EIO_FINISH(req) req_invoke (req)
123static void req_destroy (eio_req *grp);
124#define EIO_DESTROY(req) req_destroy (req)
125
126#include "libeio/eio.c"
114 127
115/* Linux/others */ 128/* Linux/others */
116#ifndef O_ASYNC 129#ifndef O_ASYNC
117# define O_ASYNC 0 130# define O_ASYNC 0
118#endif 131#endif
… …
212#endif 225#endif
213#ifndef PROT_EXEC 226#ifndef PROT_EXEC
214# define PROT_EXEC 0 227# define PROT_EXEC 0
215#endif 228#endif
216 229
230#ifndef ST_RDONLY
231# define ST_RDONLY 0
232#endif
233#ifndef ST_NOSUID
234# define ST_NOSUID 0
235#endif
217#ifndef ST_NODEV 236#ifndef ST_NODEV
218# define ST_NODEV 0 237# define ST_NODEV 0
219#endif 238#endif
220#ifndef ST_NOEXEC 239#ifndef ST_NOEXEC
221# define ST_NOEXEC 0 240# define ST_NOEXEC 0
… …
305 324
306#ifndef PAGESIZE 325#ifndef PAGESIZE
307# define PAGESIZE sysconf (_SC_PAGESIZE) 326# define PAGESIZE sysconf (_SC_PAGESIZE)
308#endif 327#endif
309 328
310static int req_invoke (eio_req *req);
311#define EIO_FINISH(req) req_invoke (req)
312static void req_destroy (eio_req *grp);
313#define EIO_DESTROY(req) req_destroy (req)
314
315enum { 329enum {
316 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 330 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
317}; 331};
318 332
319#include "libeio/eio.c"
320
321typedef eio_req *aio_req; 333typedef eio_req *aio_req;
322typedef eio_req *aio_req_ornot; 334typedef eio_req *aio_req_ornot;
335typedef eio_wd *aio_wd;
323 336
324static SV *on_next_submit; 337static SV *on_next_submit;
325static int next_pri = EIO_PRI_DEFAULT; 338static int next_pri = EIO_PRI_DEFAULT;
326static int max_outstanding; 339static int max_outstanding;
327 340
… …
365 croak ("object of class IO::AIO::REQ expected"); 378 croak ("object of class IO::AIO::REQ expected");
366 379
367 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 380 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
368 381
369 return mg ? (aio_req)mg->mg_ptr : 0; 382 return mg ? (aio_req)mg->mg_ptr : 0;
383}
384
385static aio_wd SvAIO_WD (SV *sv)
386{
387 if (!SvROK (sv)
388 || SvSTASH (SvRV (sv)) != aio_wd_stash
389 || SvTYPE (SvRV (sv)) != SVt_PVMG)
390 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
391
392 return (aio_wd)(long)SvIVX (SvRV (sv));
370} 393}
371 394
372static void aio_grp_feed (aio_req grp) 395static void aio_grp_feed (aio_req grp)
373{ 396{
374 if (grp->sv2 && SvOK (grp->sv2)) 397 if (grp->sv2 && SvOK (grp->sv2))
… …
433 SvREADONLY_on (sv_result); 456 SvREADONLY_on (sv_result);
434 } 457 }
435 458
436 switch (req->type) 459 switch (req->type)
437 { 460 {
461 case EIO_WD_OPEN:
462 PUSHs (sv_2mortal (sv_bless (newRV_noinc (newSViv (((long)req->wd))), aio_wd_stash)));
463 break;
464
438 case EIO_READDIR: 465 case EIO_READDIR:
439 { 466 {
440 SV *rv = &PL_sv_undef; 467 SV *rv = &PL_sv_undef;
441 468
442 if (req->result >= 0) 469 if (req->result >= 0)
… …
530 case EIO_STATVFS: 557 case EIO_STATVFS:
531 case EIO_FSTATVFS: 558 case EIO_FSTATVFS:
532 { 559 {
533 SV *rv = &PL_sv_undef; 560 SV *rv = &PL_sv_undef;
534 561
562#ifndef _WIN32
535 if (req->result >= 0) 563 if (req->result >= 0)
536 { 564 {
537 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 565 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
538 HV *hv = newHV (); 566 HV *hv = newHV ();
539 567
… …
549 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 577 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
550 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 578 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
551 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); 579 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
552 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); 580 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
553 } 581 }
582#endif
554 583
555 PUSHs (rv); 584 PUSHs (rv);
556 } 585 }
557 586
558 break; 587 break;
… …
584 case EIO_STAT: 613 case EIO_STAT:
585 case EIO_LSTAT: 614 case EIO_LSTAT:
586 case EIO_FSTAT: 615 case EIO_FSTAT:
587 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 616 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
588 PL_laststatval = req->result; 617 PL_laststatval = req->result;
618 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
589 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 619 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
590 PUSHs (sv_result); 620 PUSHs (sv_result);
591 break; 621 break;
592 622
593 case EIO_READ: 623 case EIO_READ:
… …
638 SvREFCNT_dec (req->self); 668 SvREFCNT_dec (req->self);
639 } 669 }
640 670
641 SvREFCNT_dec (req->sv1); 671 SvREFCNT_dec (req->sv1);
642 SvREFCNT_dec (req->sv2); 672 SvREFCNT_dec (req->sv2);
673 SvREFCNT_dec (req->sv3);
674 SvREFCNT_dec (req->sv4);
643 SvREFCNT_dec (req->callback); 675 SvREFCNT_dec (req->callback);
644 676
645 Safefree (req); 677 Safefree (req);
646} 678}
647 679
648static void req_cancel_subs (aio_req grp) 680static void req_cancel_subs (aio_req grp)
649{ 681{
650 aio_req sub;
651
652 if (grp->type != EIO_GROUP) 682 if (grp->type != EIO_GROUP)
653 return; 683 return;
654 684
655 SvREFCNT_dec (grp->sv2); 685 SvREFCNT_dec (grp->sv2);
656 grp->sv2 = 0; 686 grp->sv2 = 0;
… …
697 727
698 poll_wait (); 728 poll_wait ();
699 } 729 }
700} 730}
701 731
702static void atfork_child (void) 732static void ecb_cold
733reinit (void)
703{ 734{
704 create_respipe (); 735 create_respipe ();
736
737 if (eio_init (want_poll, done_poll) < 0)
738 croak ("IO::AIO: unable to initialise eio library");
705} 739}
706 740
707/*****************************************************************************/ 741/*****************************************************************************/
708 742
709#if !_POSIX_MAPPED_FILES 743#if !_POSIX_MAPPED_FILES
… …
774 req_submit (req); \ 808 req_submit (req); \
775 SPAGAIN; \ 809 SPAGAIN; \
776 \ 810 \
777 if (GIMME_V != G_VOID) \ 811 if (GIMME_V != G_VOID) \
778 XPUSHs (req_sv (req, aio_req_stash)); 812 XPUSHs (req_sv (req, aio_req_stash));
813
814static void
815req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
816{
817 if (SvROK (path))
818 {
819 AV *av = (AV *)SvRV (path);
820 SV *wdob;
821
822 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1)
823 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
824
825 path = AvARRAY (av)[1];
826 wdob = AvARRAY (av)[0];
827
828 *wd = SvAIO_WD (wdob);
829 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
830 }
831
832 *pathsv = newSVsv (path);
833 *ptr = SvPVbyte_nolen (*pathsv);
834}
835
836static void
837req_set_path1 (aio_req req, SV *path)
838{
839 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
840}
841
842static void
843req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
844{
845 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
846
847 switch (SvTYPE (rv))
848 {
849 case SVt_PVIO:
850 case SVt_PVLV:
851 case SVt_PVGV:
852 req->type = type_fh;
853 req->sv1 = newSVsv (fh_or_path);
854 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
855 break;
856
857 default:
858 req->type = type_path;
859 req_set_path1 (req, fh_or_path);
860 break;
861 }
862
863}
779 864
780MODULE = IO::AIO PACKAGE = IO::AIO 865MODULE = IO::AIO PACKAGE = IO::AIO
781 866
782PROTOTYPES: ENABLE 867PROTOTYPES: ENABLE
783 868
… …
901 }; 986 };
902 987
903 aio_stash = gv_stashpv ("IO::AIO" , 1); 988 aio_stash = gv_stashpv ("IO::AIO" , 1);
904 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 989 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
905 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 990 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
991 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
906 992
907 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 993 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
908 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); 994 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
909 995
910 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 996 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
911 997
912 create_respipe (); 998 reinit ();
913
914 if (eio_init (want_poll, done_poll) < 0)
915 croak ("IO::AIO: unable to initialise eio library");
916
917 /* atfork child called in fifo order, so before eio's handler */
918 X_THREAD_ATFORK (0, 0, atfork_child);
919} 999}
1000
1001void
1002reinit ()
1003 PROTOTYPE:
920 1004
921void 1005void
922max_poll_reqs (unsigned int nreqs) 1006max_poll_reqs (unsigned int nreqs)
923 PROTOTYPE: $ 1007 PROTOTYPE: $
924 CODE: 1008 CODE:
… …
959 PROTOTYPE: $ 1043 PROTOTYPE: $
960 CODE: 1044 CODE:
961 max_outstanding = maxreqs; 1045 max_outstanding = maxreqs;
962 1046
963void 1047void
1048aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1049 PPCODE:
1050{
1051 dREQ;
1052
1053 req->type = EIO_WD_OPEN;
1054 req_set_path1 (req, pathname);
1055
1056 REQ_SEND;
1057}
1058
1059void
964aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1060aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
965 PPCODE: 1061 PPCODE:
966{ 1062{
967 dREQ; 1063 dREQ;
968 1064
969 req->type = EIO_OPEN; 1065 req->type = EIO_OPEN;
970 req->sv1 = newSVsv (pathname); 1066 req_set_path1 (req, pathname);
971 req->ptr1 = SvPVbyte_nolen (req->sv1);
972 req->int1 = flags; 1067 req->int1 = flags;
973 req->int2 = mode; 1068 req->int2 = mode;
974 1069
975 REQ_SEND; 1070 REQ_SEND;
976} 1071}
… …
978void 1073void
979aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1074aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
980 ALIAS: 1075 ALIAS:
981 aio_fsync = EIO_FSYNC 1076 aio_fsync = EIO_FSYNC
982 aio_fdatasync = EIO_FDATASYNC 1077 aio_fdatasync = EIO_FDATASYNC
1078 aio_syncfs = EIO_SYNCFS
983 PPCODE: 1079 PPCODE:
984{ 1080{
985 int fd = s_fileno_croak (fh, 0); 1081 int fd = s_fileno_croak (fh, 0);
986 dREQ; 1082 dREQ;
987 1083
… …
1028 1124
1029void 1125void
1030aio_close (SV *fh, SV *callback=&PL_sv_undef) 1126aio_close (SV *fh, SV *callback=&PL_sv_undef)
1031 PPCODE: 1127 PPCODE:
1032{ 1128{
1033 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1129 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1034 int fd = s_fileno_croak (fh, 0); 1130 int fd = s_fileno_croak (fh, 0);
1035 dREQ; 1131 dREQ;
1036 1132
1037 if (close_pipe < 0) 1133 if (expect_false (close_fd < 0))
1038 { 1134 {
1039 int pipefd [2]; 1135 int pipefd [2];
1040 1136
1137 if (
1138#ifdef _WIN32
1139 _pipe (pipefd, 1, _O_BINARY) < 0
1140#else
1041 if (pipe (pipefd) < 0 1141 pipe (pipefd) < 0
1042 || close (pipefd [1]) < 0
1043 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1142 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1143#endif
1144 || close (pipefd [1]) < 0
1145 )
1044 abort (); /*D*/ 1146 abort (); /*D*/
1045 1147
1046 close_pipe = pipefd [0]; 1148 close_fd = pipefd [0];
1047 } 1149 }
1048 1150
1049 req->type = EIO_DUP2; 1151 req->type = EIO_DUP2;
1050 req->int1 = close_pipe; 1152 req->int1 = close_fd;
1051 req->sv2 = newSVsv (fh); 1153 req->sv2 = newSVsv (fh);
1052 req->int2 = fd; 1154 req->int2 = fd;
1053 1155
1054 REQ_SEND (req); 1156 REQ_SEND (req);
1055} 1157}
… …
1106 REQ_SEND; 1208 REQ_SEND;
1107 } 1209 }
1108} 1210}
1109 1211
1110void 1212void
1111aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1213aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1112 ALIAS: 1214 ALIAS:
1113 aio_readlink = EIO_READLINK 1215 aio_readlink = EIO_READLINK
1114 aio_realpath = EIO_REALPATH 1216 aio_realpath = EIO_REALPATH
1115 PPCODE: 1217 PPCODE:
1116{ 1218{
1117 SV *data;
1118 dREQ; 1219 dREQ;
1119 1220
1120 req->type = ix; 1221 req->type = ix;
1121 req->sv1 = newSVsv (path); 1222 req_set_path1 (req, pathname);
1122 req->ptr1 = SvPVbyte_nolen (req->sv1);
1123 1223
1124 REQ_SEND; 1224 REQ_SEND;
1125} 1225}
1126 1226
1127void 1227void
… …
1168 PPCODE: 1268 PPCODE:
1169{ 1269{
1170 dREQ; 1270 dREQ;
1171 1271
1172 req->sv1 = newSVsv (fh_or_path); 1272 req->sv1 = newSVsv (fh_or_path);
1173 1273 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1174 if (SvPOK (req->sv1))
1175 {
1176 req->type = ix;
1177 req->ptr1 = SvPVbyte_nolen (req->sv1);
1178 }
1179 else
1180 {
1181 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1182 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1183 }
1184
1185 REQ_SEND; 1274 REQ_SEND;
1186} 1275}
1187 1276
1188UV 1277UV
1189major (UV dev) 1278major (UV dev)
… …
1207{ 1296{
1208 dREQ; 1297 dREQ;
1209 1298
1210 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1299 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1211 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1300 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1212 req->sv1 = newSVsv (fh_or_path); 1301 req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1213
1214 if (SvPOK (req->sv1))
1215 {
1216 req->type = EIO_UTIME;
1217 req->ptr1 = SvPVbyte_nolen (req->sv1);
1218 }
1219 else
1220 {
1221 req->type = EIO_FUTIME;
1222 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1223 }
1224 1302
1225 REQ_SEND; 1303 REQ_SEND;
1226} 1304}
1227 1305
1228void 1306void
1229aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1307aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1230 PPCODE: 1308 PPCODE:
1231{ 1309{
1232 dREQ; 1310 dREQ;
1233 1311
1234 req->sv1 = newSVsv (fh_or_path);
1235 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1312 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1236 1313 req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1237 if (SvPOK (req->sv1))
1238 {
1239 req->type = EIO_TRUNCATE;
1240 req->ptr1 = SvPVbyte_nolen (req->sv1);
1241 }
1242 else
1243 {
1244 req->type = EIO_FTRUNCATE;
1245 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1246 }
1247 1314
1248 REQ_SEND; 1315 REQ_SEND;
1249} 1316}
1250 1317
1251void 1318void
… …
1256 PPCODE: 1323 PPCODE:
1257{ 1324{
1258 dREQ; 1325 dREQ;
1259 1326
1260 req->int2 = mode; 1327 req->int2 = mode;
1261 req->sv1 = newSVsv (fh_or_path); 1328 req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1262
1263 if (SvPOK (req->sv1))
1264 {
1265 req->type = ix;
1266 req->ptr1 = SvPVbyte_nolen (req->sv1);
1267 }
1268 else
1269 {
1270 req->type = EIO_FCHMOD;
1271 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1272 }
1273 1329
1274 REQ_SEND; 1330 REQ_SEND;
1275} 1331}
1276 1332
1277void 1333void
… …
1280{ 1336{
1281 dREQ; 1337 dREQ;
1282 1338
1283 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1339 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1284 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1340 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1285 req->sv1 = newSVsv (fh_or_path); 1341 req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1286
1287 if (SvPOK (req->sv1))
1288 {
1289 req->type = EIO_CHOWN;
1290 req->ptr1 = SvPVbyte_nolen (req->sv1);
1291 }
1292 else
1293 {
1294 req->type = EIO_FCHOWN;
1295 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1296 }
1297 1342
1298 REQ_SEND; 1343 REQ_SEND;
1299} 1344}
1300 1345
1301void 1346void
… …
1324 PPCODE: 1369 PPCODE:
1325{ 1370{
1326 dREQ; 1371 dREQ;
1327 1372
1328 req->type = ix; 1373 req->type = ix;
1329 req->sv1 = newSVsv (pathname); 1374 req_set_path1 (req, pathname);
1330 req->ptr1 = SvPVbyte_nolen (req->sv1);
1331 1375
1332 REQ_SEND; 1376 REQ_SEND;
1333} 1377}
1334 1378
1335void 1379void
… …
1339 aio_symlink = EIO_SYMLINK 1383 aio_symlink = EIO_SYMLINK
1340 aio_rename = EIO_RENAME 1384 aio_rename = EIO_RENAME
1341 PPCODE: 1385 PPCODE:
1342{ 1386{
1343 dREQ; 1387 dREQ;
1388 eio_wd wd2;
1344 1389
1345 req->type = ix; 1390 req->type = ix;
1346 req->sv1 = newSVsv (oldpath); 1391 req_set_path1 (req, oldpath);
1347 req->ptr1 = SvPVbyte_nolen (req->sv1); 1392 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1348 req->sv2 = newSVsv (newpath); 1393 req->int3 = (long)wd2;
1349 req->ptr2 = SvPVbyte_nolen (req->sv2);
1350 1394
1351 REQ_SEND; 1395 REQ_SEND;
1352} 1396}
1353 1397
1354void 1398void
… …
1356 PPCODE: 1400 PPCODE:
1357{ 1401{
1358 dREQ; 1402 dREQ;
1359 1403
1360 req->type = EIO_MKNOD; 1404 req->type = EIO_MKNOD;
1361 req->sv1 = newSVsv (pathname);
1362 req->ptr1 = SvPVbyte_nolen (req->sv1);
1363 req->int2 = (mode_t)mode; 1405 req->int2 = (mode_t)mode;
1364 req->offs = dev; 1406 req->offs = dev;
1407 req_set_path1 (req, pathname);
1365 1408
1366 REQ_SEND; 1409 REQ_SEND;
1367} 1410}
1368 1411
1369void 1412void
… …
1569 CODE: 1612 CODE:
1570 RETVAL = posix_fadvise (fh, offset, length, advice); 1613 RETVAL = posix_fadvise (fh, offset, length, advice);
1571 OUTPUT: 1614 OUTPUT:
1572 RETVAL 1615 RETVAL
1573 1616
1574ssize_t 1617IV
1575sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1618sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1576 CODE: 1619 CODE:
1577 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1620 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1578 OUTPUT: 1621 OUTPUT:
1579 RETVAL 1622 RETVAL
… …
1691 SvREFCNT_dec (on_next_submit); 1734 SvREFCNT_dec (on_next_submit);
1692 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1735 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1693 1736
1694PROTOTYPES: DISABLE 1737PROTOTYPES: DISABLE
1695 1738
1739MODULE = IO::AIO PACKAGE = IO::AIO::WD
1740
1741void
1742DESTROY (SV *self)
1743 CODE:
1744{
1745 aio_wd wd = SvAIO_WD (self);
1746#if HAVE_AT
1747 SV *callback = &PL_sv_undef;
1748 dREQ; /* clobbers next_pri :/ */
1749 req->type = EIO_WD_CLOSE;
1750 req->wd = wd;
1751 REQ_SEND;
1752#else
1753 eio_wd_close_sync (wd);
1754#endif
1755}
1756
1696MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1757MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1697 1758
1698void 1759void
1699cancel (aio_req_ornot req) 1760cancel (aio_req_ornot req)
1700 CODE: 1761 CODE:

Diff Legend

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