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.211 by root, Sat Apr 7 00:50:33 2012 UTC vs.
Revision 1.234 by root, Thu Jun 25 15:20:11 2015 UTC

… …
19 19
20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
21# include <sys/mman.h> 21# include <sys/mman.h>
22#endif 22#endif
23 23
24#if __linux__ 24/* the incompetent fool that created musl keeps __linux__, refuses
25 * to implement any linux standard apis, and also has no way to test
26 * for his broken iplementation. on't complain if this fails for you.
27 */
28#if __linux__ && (defined __GLIBC__ || defined __UCLIBC__)
25# include <linux/fs.h> 29# include <linux/fs.h>
26# ifdef FS_IOC_FIEMAP 30# ifdef FS_IOC_FIEMAP
31# include <linux/types.h>
27# include <linux/fiemap.h> 32# include <linux/fiemap.h>
28# define HAVE_FIEMAP 1 33# define HAVE_FIEMAP 1
29# endif 34# endif
30#endif 35#endif
31 36
… …
152#endif 157#endif
153#ifndef minor 158#ifndef minor
154# define minor(dev) ((dev) & 0xff) 159# define minor(dev) ((dev) & 0xff)
155#endif 160#endif
156 161
157#ifndef PAGESIZE 162#if PAGESIZE <= 0
158# define PAGESIZE sysconf (_SC_PAGESIZE) 163# define PAGESIZE sysconf (_SC_PAGESIZE)
159#endif 164#endif
160 165
161/*****************************************************************************/ 166/*****************************************************************************/
162 167
… …
164fiemap (eio_req *req) 169fiemap (eio_req *req)
165{ 170{
166 req->result = -1; 171 req->result = -1;
167 172
168#if HAVE_FIEMAP 173#if HAVE_FIEMAP
174 /* assume some c99 */
175 struct fiemap *fiemap = 0;
176 size_t end_offset;
169 int count = req->int3; 177 int count = req->int3;
170 178
171 /* heuristic: first try with 64 extents if we don't know how many, */ 179 req->flags |= EIO_FLAG_PTR1_FREE;
172 /* as most files have (hopefully) fewer than this many extents */ 180
173 /* in fact, most should have <= 2, so maybe the 72 below is probably overkill */ 181 /* heuristic: start with 512 bytes (8 extents), and if that isn't enough, */
182 /* increase in 3.5kb steps */
174 if (count < 0) 183 if (count < 0)
175 count = 72; /* for what it's worth, 72 extents fit nicely into 4kb */ 184 count = 8;
185
186 fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
187 errno = ENOMEM;
188 if (!fiemap)
189 return;
190
191 req->ptr1 = fiemap;
192
193 fiemap->fm_start = req->offs;
194 fiemap->fm_length = req->size;
195 fiemap->fm_flags = req->int2;
196 fiemap->fm_extent_count = count;
197
198 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap) < 0)
199 return;
200
201 if (req->int3 >= 0 /* not autosizing */
202 || !fiemap->fm_mapped_extents /* no more extents */
203 || fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST /* hit eof */)
204 goto done;
205
206 /* else we have to loop -
207 * it would be tempting (actually I tried that first) to just query the
208 * number of extents needed, but linux often feels like not returning all
209 * extents, without telling us it left any out. this complicates
210 * this quite a bit.
211 */
212
213 end_offset = fiemap->fm_length + (fiemap->fm_length == FIEMAP_MAX_OFFSET ? 0 : fiemap->fm_start);
176 214
177 for (;;) 215 for (;;)
178 { 216 {
217 /* we go in 54 extent steps - 3kb, in the hope that this fits nicely on the eio stack (normally 16+ kb) */
218 char scratch[3072];
219 struct fiemap *incmap = (struct fiemap *)scratch;
220
221 incmap->fm_start = fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_logical
222 + fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_length;
223 incmap->fm_length = fiemap->fm_length - (incmap->fm_start - fiemap->fm_start);
224 incmap->fm_flags = fiemap->fm_flags;
225 incmap->fm_extent_count = (sizeof (scratch) - sizeof (struct fiemap)) / sizeof (struct fiemap_extent);
226
227 if (ioctl (req->int1, FS_IOC_FIEMAP, incmap) < 0)
228 return;
229
230 if (!incmap->fm_mapped_extents)
231 goto done;
232
233 count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents;
179 struct fiemap *fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); 234 fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
180 errno = ENOMEM; 235 errno = ENOMEM;
181 if (!fiemap) 236 if (!fiemap)
182 return; 237 return;
183 238
184 req->ptr1 = fiemap; 239 req->ptr1 = fiemap;
185 req->flags |= EIO_FLAG_PTR1_FREE;
186 240
187 fiemap->fm_start = req->offs; 241 for (count = 0; count < incmap->fm_mapped_extents; ++count)
188 fiemap->fm_length = req->size; 242 {
189 fiemap->fm_flags = req->int2; 243 struct fiemap_extent *e = incmap->fm_extents + count;
190 fiemap->fm_extent_count = count;
191 244
192 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap)) 245 if (e->fe_logical + e->fe_length >= end_offset)
193 return; 246 goto done;
194 247
195 if (req->int3 >= 0) 248 fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e;
196 break; /* when not autosizing we are done */
197 249
198 if (fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST) 250 if (e->fe_flags & FIEMAP_EXTENT_LAST)
199 break; /* autosizing successful, we are done */ 251 goto done;
200 252
201 fiemap->fm_flags = req->int2; 253 }
202 fiemap->fm_extent_count = 0;
203
204 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap))
205 return;
206
207 count = fiemap->fm_mapped_extents;
208
209 free (fiemap);
210 } 254 }
211 255
256done:
212 req->result = 0; 257 req->result = 0;
213 258
214#else 259#else
215 errno = ENOSYS; 260 errno = ENOSYS;
216#endif 261#endif
… …
263} 308}
264 309
265static SV * 310static SV *
266newSVaio_wd (aio_wd wd) 311newSVaio_wd (aio_wd wd)
267{ 312{
268 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash); 313 return sv_bless (newRV_noinc (newSViv ((intptr_t)wd)), aio_wd_stash);
269} 314}
270 315
271static aio_req 316static aio_req
272SvAIO_REQ (SV *sv) 317SvAIO_REQ (SV *sv)
273{ 318{
… …
292 || SvTYPE (SvRV (sv)) != SVt_PVMG 337 || SvTYPE (SvRV (sv)) != SVt_PVMG
293 || SvSTASH (SvRV (sv)) != aio_wd_stash) 338 || SvSTASH (SvRV (sv)) != aio_wd_stash)
294 croak ("IO::AIO: expected a working directory object as returned by aio_wd"); 339 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
295 340
296 return (aio_wd)(long)SvIVX (SvRV (sv)); 341 return (aio_wd)(long)SvIVX (SvRV (sv));
342}
343
344static SV *
345newmortalFH (int fd, int flags)
346{
347 if (fd < 0)
348 return &PL_sv_undef;
349
350 GV *gv = (GV *)sv_newmortal ();
351 char sym[64];
352 int symlen;
353
354 symlen = snprintf (sym, sizeof (sym), "fd#%d", fd);
355 gv_init (gv, aio_stash, sym, symlen, 0);
356
357 symlen = snprintf (
358 sym,
359 sizeof (sym),
360 "%s&=%d",
361 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
362 fd
363 );
364
365 return do_open (gv, sym, symlen, 0, 0, 0, 0)
366 ? (SV *)gv : &PL_sv_undef;
297} 367}
298 368
299static void 369static void
300aio_grp_feed (aio_req grp) 370aio_grp_feed (aio_req grp)
301{ 371{
… …
429 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2)))); 499 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
430 } 500 }
431 break; 501 break;
432 502
433 case EIO_OPEN: 503 case EIO_OPEN:
434 { 504 PUSHs (newmortalFH (req->result, req->int1 & (O_RDONLY | O_WRONLY | O_RDWR)));
435 /* convert fd to fh */
436 SV *fh = &PL_sv_undef;
437
438 if (req->result >= 0)
439 {
440 GV *gv = (GV *)sv_newmortal ();
441 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
442 char sym [64];
443 int symlen;
444
445 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
446 gv_init (gv, aio_stash, sym, symlen, 0);
447
448 symlen = snprintf (
449 sym,
450 sizeof (sym),
451 "%s&=%d",
452 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
453 (int)req->result
454 );
455
456 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
457 fh = (SV *)gv;
458 }
459
460 PUSHs (fh);
461 }
462 break; 505 break;
463 506
464 case EIO_STATVFS: 507 case EIO_STATVFS:
465 case EIO_FSTATVFS: 508 case EIO_FSTATVFS:
466 { 509 {
… …
469#ifndef _WIN32 512#ifndef _WIN32
470 if (req->result >= 0) 513 if (req->result >= 0)
471 { 514 {
472 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 515 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
473 HV *hv = newHV (); 516 HV *hv = newHV ();
517 /* POSIX requires fsid to be unsigned long, but AIX in its infinite wisdom
518 * chooses to make it a struct.
519 */
520 unsigned long fsid = 0;
521 memcpy (&fsid, &f->f_fsid, sizeof (unsigned long) < sizeof (f->f_fsid) ? sizeof (unsigned long) : sizeof (f->f_fsid));
474 522
475 rv = sv_2mortal (newRV_noinc ((SV *)hv)); 523 rv = sv_2mortal (newRV_noinc ((SV *)hv));
476 524
477 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0); 525 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
478 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0); 526 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
… …
480 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0); 528 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
481 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0); 529 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
482 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0); 530 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
483 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0); 531 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
484 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 532 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
485 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 533 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (fsid ), 0);
486 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); 534 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
487 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); 535 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
488 } 536 }
489#endif 537#endif
490 538
… …
697} 745}
698 746
699/*****************************************************************************/ 747/*****************************************************************************/
700 748
701#if !_POSIX_MAPPED_FILES 749#if !_POSIX_MAPPED_FILES
702# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 750# define mmap(addr,length,prot,flags,fd,offs) EIO_ENOSYS ()
703# define munmap(addr,length) (errno = ENOSYS, -1) 751# define munmap(addr,length) EIO_ENOSYS ()
704#endif 752#endif
705 753
706#if !_POSIX_MEMORY_PROTECTION 754#if !_POSIX_MEMORY_PROTECTION
707# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 755# define mprotect(addr,len,prot) EIO_ENOSYS ()
708# define PROT_NONE 0 756# define PROT_NONE 0
709# define PROT_WRITE 0 757# define PROT_WRITE 0
710# define MAP_PRIVATE 0 758# define MAP_PRIVATE 0
711# define MAP_SHARED 0 759# define MAP_SHARED 0
712# define MAP_FIXED 0 760# define MAP_FIXED 0
… …
885 const_iv (O_SEARCH) 933 const_iv (O_SEARCH)
886 const_iv (O_DIRECTORY) 934 const_iv (O_DIRECTORY)
887 const_iv (O_DSYNC) 935 const_iv (O_DSYNC)
888 const_iv (O_RSYNC) 936 const_iv (O_RSYNC)
889 const_iv (O_SYNC) 937 const_iv (O_SYNC)
938 const_iv (O_PATH)
939 const_iv (O_TMPFILE)
890 const_iv (O_TTY_INIT) 940 const_iv (O_TTY_INIT)
891 941
892 const_iv (S_IFIFO) 942 const_iv (S_IFIFO)
893 const_iv (S_IFCHR) 943 const_iv (S_IFCHR)
894 const_iv (S_IFBLK) 944 const_iv (S_IFBLK)
… …
955 const_iv (FIEMAP_EXTENT_DATA_TAIL) 1005 const_iv (FIEMAP_EXTENT_DATA_TAIL)
956 const_iv (FIEMAP_EXTENT_UNWRITTEN) 1006 const_iv (FIEMAP_EXTENT_UNWRITTEN)
957 const_iv (FIEMAP_EXTENT_MERGED) 1007 const_iv (FIEMAP_EXTENT_MERGED)
958 const_iv (FIEMAP_EXTENT_SHARED) 1008 const_iv (FIEMAP_EXTENT_SHARED)
959 1009
1010 const_iv (SPLICE_F_MOVE)
1011 const_iv (SPLICE_F_NONBLOCK)
1012 const_iv (SPLICE_F_MORE)
1013 const_iv (SPLICE_F_GIFT)
1014
1015 const_iv (SEEK_DATA)
1016 const_iv (SEEK_HOLE)
1017
1018 /* libeio constants */
960 const_eio (SEEK_SET) 1019 const_eio (SEEK_SET)
961 const_eio (SEEK_CUR) 1020 const_eio (SEEK_CUR)
962 const_eio (SEEK_END) 1021 const_eio (SEEK_END)
963 1022
964 const_eio (MCL_FUTURE) 1023 const_eio (MCL_FUTURE)
… …
973 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 1032 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
974 const_eio (SYNC_FILE_RANGE_WRITE) 1033 const_eio (SYNC_FILE_RANGE_WRITE)
975 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 1034 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
976 1035
977 const_eio (FALLOC_FL_KEEP_SIZE) 1036 const_eio (FALLOC_FL_KEEP_SIZE)
1037 const_eio (FALLOC_FL_PUNCH_HOLE)
1038 const_eio (FALLOC_FL_COLLAPSE_RANGE)
1039 const_eio (FALLOC_FL_ZERO_RANGE)
978 1040
979 const_eio (READDIR_DENTS) 1041 const_eio (READDIR_DENTS)
980 const_eio (READDIR_DIRS_FIRST) 1042 const_eio (READDIR_DIRS_FIRST)
981 const_eio (READDIR_STAT_ORDER) 1043 const_eio (READDIR_STAT_ORDER)
982 const_eio (READDIR_FOUND_UNKNOWN) 1044 const_eio (READDIR_FOUND_UNKNOWN)
… …
1050 PROTOTYPE: $ 1112 PROTOTYPE: $
1051 CODE: 1113 CODE:
1052 max_outstanding = maxreqs; 1114 max_outstanding = maxreqs;
1053 1115
1054void 1116void
1055aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef) 1117aio_wd (SV8 *pathname, SV *callback = &PL_sv_undef)
1056 PPCODE: 1118 PPCODE:
1057{ 1119{
1058 dREQ; 1120 dREQ;
1059 1121
1060 req->type = EIO_WD_OPEN; 1122 req->type = EIO_WD_OPEN;
… …
1062 1124
1063 REQ_SEND; 1125 REQ_SEND;
1064} 1126}
1065 1127
1066void 1128void
1067aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1129aio_open (SV8 *pathname, int flags, int mode, SV *callback = &PL_sv_undef)
1068 PPCODE: 1130 PPCODE:
1069{ 1131{
1070 dREQ; 1132 dREQ;
1071 1133
1072 req->type = EIO_OPEN; 1134 req->type = EIO_OPEN;
… …
1076 1138
1077 REQ_SEND; 1139 REQ_SEND;
1078} 1140}
1079 1141
1080void 1142void
1081aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1143aio_fsync (SV *fh, SV *callback = &PL_sv_undef)
1082 ALIAS: 1144 ALIAS:
1083 aio_fsync = EIO_FSYNC 1145 aio_fsync = EIO_FSYNC
1084 aio_fdatasync = EIO_FDATASYNC 1146 aio_fdatasync = EIO_FDATASYNC
1085 aio_syncfs = EIO_SYNCFS 1147 aio_syncfs = EIO_SYNCFS
1086 PPCODE: 1148 PPCODE:
1087{ 1149{
1088 int fd = s_fileno_croak (fh, 0); 1150 int fd = s_fileno_croak (fh, 0);
1089 dREQ; 1151 dREQ;
1090 1152
1091 req->type = ix; 1153 req->type = ix;
1092 req->sv1 = newSVsv (fh); 1154 req->sv1 = newSVsv (fh);
1093 req->int1 = fd; 1155 req->int1 = fd;
1094 1156
1095 REQ_SEND; 1157 REQ_SEND;
1096} 1158}
1097 1159
1098void 1160void
1099aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) 1161aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback = &PL_sv_undef)
1100 PPCODE: 1162 PPCODE:
1101{ 1163{
1102 int fd = s_fileno_croak (fh, 0); 1164 int fd = s_fileno_croak (fh, 0);
1103 dREQ; 1165 dREQ;
1104 1166
1105 req->type = EIO_SYNC_FILE_RANGE; 1167 req->type = EIO_SYNC_FILE_RANGE;
1106 req->sv1 = newSVsv (fh); 1168 req->sv1 = newSVsv (fh);
1107 req->int1 = fd; 1169 req->int1 = fd;
… …
1111 1173
1112 REQ_SEND; 1174 REQ_SEND;
1113} 1175}
1114 1176
1115void 1177void
1116aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) 1178aio_allocate (SV *fh, int mode, off_t offset, size_t len, SV *callback = &PL_sv_undef)
1117 PPCODE: 1179 PPCODE:
1118{ 1180{
1119 int fd = s_fileno_croak (fh, 0); 1181 int fd = s_fileno_croak (fh, 0);
1120 dREQ; 1182 dREQ;
1121 1183
1122 req->type = EIO_FALLOCATE; 1184 req->type = EIO_FALLOCATE;
1123 req->sv1 = newSVsv (fh); 1185 req->sv1 = newSVsv (fh);
1124 req->int1 = fd; 1186 req->int1 = fd;
… …
1128 1190
1129 REQ_SEND; 1191 REQ_SEND;
1130} 1192}
1131 1193
1132void 1194void
1133aio_close (SV *fh, SV *callback=&PL_sv_undef) 1195aio_close (SV *fh, SV *callback = &PL_sv_undef)
1134 PPCODE: 1196 PPCODE:
1135{ 1197{
1136 static int close_fd = -1; /* dummy fd to close fds via dup2 */ 1198 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1137 int fd = s_fileno_croak (fh, 0); 1199 int fd = s_fileno_croak (fh, 0);
1138 dREQ; 1200 dREQ;
1139 1201
1140 if (expect_false (close_fd < 0)) 1202 if (expect_false (close_fd < 0))
1141 { 1203 {
1142 int pipefd [2]; 1204 int pipefd [2];
… …
1162 1224
1163 REQ_SEND; 1225 REQ_SEND;
1164} 1226}
1165 1227
1166void 1228void
1167aio_seek (SV *fh, SV *offset, int whence, SV *callback=&PL_sv_undef) 1229aio_seek (SV *fh, SV *offset, int whence, SV *callback = &PL_sv_undef)
1168 PPCODE: 1230 PPCODE:
1169{ 1231{
1170 int fd = s_fileno_croak (fh, 0); 1232 int fd = s_fileno_croak (fh, 0);
1171 dREQ; 1233 dREQ;
1172 1234
… …
1178 1240
1179 REQ_SEND; 1241 REQ_SEND;
1180} 1242}
1181 1243
1182void 1244void
1183aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 1245aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback = &PL_sv_undef)
1184 ALIAS: 1246 ALIAS:
1185 aio_read = EIO_READ 1247 aio_read = EIO_READ
1186 aio_write = EIO_WRITE 1248 aio_write = EIO_WRITE
1187 PPCODE: 1249 PPCODE:
1188{ 1250{
… …
1204 len = svlen - dataoffset; 1266 len = svlen - dataoffset;
1205 } 1267 }
1206 else 1268 else
1207 { 1269 {
1208 /* read: check type and grow scalar as necessary */ 1270 /* read: check type and grow scalar as necessary */
1209 SvUPGRADE (data, SVt_PV); 1271 if (!SvPOK (data) || SvLEN (data) >= SvCUR (data))
1210 svptr = SvGROW (data, len + dataoffset + 1); 1272 svptr = sv_grow (data, len + dataoffset + 1);
1273 else if (SvCUR (data) < len + dataoffset)
1274 croak ("length + dataoffset outside of scalar, and cannot grow");
1211 } 1275 }
1212 1276
1213 { 1277 {
1214 dREQ; 1278 dREQ;
1215 1279
… …
1231 REQ_SEND; 1295 REQ_SEND;
1232 } 1296 }
1233} 1297}
1234 1298
1235void 1299void
1236aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1300aio_readlink (SV8 *pathname, SV *callback = &PL_sv_undef)
1237 ALIAS: 1301 ALIAS:
1238 aio_readlink = EIO_READLINK 1302 aio_readlink = EIO_READLINK
1239 aio_realpath = EIO_REALPATH 1303 aio_realpath = EIO_REALPATH
1240 PPCODE: 1304 PPCODE:
1241{ 1305{
… …
1246 1310
1247 REQ_SEND; 1311 REQ_SEND;
1248} 1312}
1249 1313
1250void 1314void
1251aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) 1315aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback = &PL_sv_undef)
1252 PPCODE: 1316 PPCODE:
1253{ 1317{
1254 int ifd = s_fileno_croak (in_fh , 0); 1318 int ifd = s_fileno_croak (in_fh , 0);
1255 int ofd = s_fileno_croak (out_fh, 1); 1319 int ofd = s_fileno_croak (out_fh, 1);
1256 dREQ; 1320 dREQ;
1257 1321
1258 req->type = EIO_SENDFILE; 1322 req->type = EIO_SENDFILE;
1259 req->sv1 = newSVsv (out_fh); 1323 req->sv1 = newSVsv (out_fh);
1260 req->int1 = ofd; 1324 req->int1 = ofd;
… …
1265 1329
1266 REQ_SEND; 1330 REQ_SEND;
1267} 1331}
1268 1332
1269void 1333void
1270aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) 1334aio_readahead (SV *fh, off_t offset, size_t length, SV *callback = &PL_sv_undef)
1271 PPCODE: 1335 PPCODE:
1272{ 1336{
1273 int fd = s_fileno_croak (fh, 0); 1337 int fd = s_fileno_croak (fh, 0);
1274 dREQ; 1338 dREQ;
1275 1339
1276 req->type = EIO_READAHEAD; 1340 req->type = EIO_READAHEAD;
1277 req->sv1 = newSVsv (fh); 1341 req->sv1 = newSVsv (fh);
1278 req->int1 = fd; 1342 req->int1 = fd;
… …
1281 1345
1282 REQ_SEND; 1346 REQ_SEND;
1283} 1347}
1284 1348
1285void 1349void
1286aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1350aio_stat (SV8 *fh_or_path, SV *callback = &PL_sv_undef)
1287 ALIAS: 1351 ALIAS:
1288 aio_stat = EIO_STAT 1352 aio_stat = EIO_STAT
1289 aio_lstat = EIO_LSTAT 1353 aio_lstat = EIO_LSTAT
1290 aio_statvfs = EIO_STATVFS 1354 aio_statvfs = EIO_STATVFS
1291 PPCODE: 1355 PPCODE:
… …
1312 RETVAL = makedev (maj, min); 1376 RETVAL = makedev (maj, min);
1313 OUTPUT: 1377 OUTPUT:
1314 RETVAL 1378 RETVAL
1315 1379
1316void 1380void
1317aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) 1381aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback = &PL_sv_undef)
1318 PPCODE: 1382 PPCODE:
1319{ 1383{
1320 dREQ; 1384 dREQ;
1321 1385
1322 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1386 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
… …
1325 1389
1326 REQ_SEND; 1390 REQ_SEND;
1327} 1391}
1328 1392
1329void 1393void
1330aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1394aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback = &PL_sv_undef)
1331 PPCODE: 1395 PPCODE:
1332{ 1396{
1333 dREQ; 1397 dREQ;
1334 1398
1335 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1399 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
… …
1337 1401
1338 REQ_SEND; 1402 REQ_SEND;
1339} 1403}
1340 1404
1341void 1405void
1342aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1406aio_chmod (SV8 *fh_or_path, int mode, SV *callback = &PL_sv_undef)
1343 PPCODE: 1407 PPCODE:
1344{ 1408{
1345 dREQ; 1409 dREQ;
1346 1410
1347 req->int2 = mode; 1411 req->int2 = mode;
… …
1349 1413
1350 REQ_SEND; 1414 REQ_SEND;
1351} 1415}
1352 1416
1353void 1417void
1354aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef) 1418aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback = &PL_sv_undef)
1355 PPCODE: 1419 PPCODE:
1356{ 1420{
1357 dREQ; 1421 dREQ;
1358 1422
1359 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1423 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
… …
1362 1426
1363 REQ_SEND; 1427 REQ_SEND;
1364} 1428}
1365 1429
1366void 1430void
1367aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef) 1431aio_readdirx (SV8 *pathname, IV flags, SV *callback = &PL_sv_undef)
1368 PPCODE: 1432 PPCODE:
1369{ 1433{
1370 dREQ; 1434 dREQ;
1371 1435
1372 req->type = EIO_READDIR; 1436 req->type = EIO_READDIR;
… …
1379 1443
1380 REQ_SEND; 1444 REQ_SEND;
1381} 1445}
1382 1446
1383void 1447void
1384aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef) 1448aio_mkdir (SV8 *pathname, int mode, SV *callback = &PL_sv_undef)
1385 PPCODE: 1449 PPCODE:
1386{ 1450{
1387 dREQ; 1451 dREQ;
1388 1452
1389 req->type = EIO_MKDIR; 1453 req->type = EIO_MKDIR;
… …
1392 1456
1393 REQ_SEND; 1457 REQ_SEND;
1394} 1458}
1395 1459
1396void 1460void
1397aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1461aio_unlink (SV8 *pathname, SV *callback = &PL_sv_undef)
1398 ALIAS: 1462 ALIAS:
1399 aio_unlink = EIO_UNLINK 1463 aio_unlink = EIO_UNLINK
1400 aio_rmdir = EIO_RMDIR 1464 aio_rmdir = EIO_RMDIR
1401 aio_readdir = EIO_READDIR 1465 aio_readdir = EIO_READDIR
1402 PPCODE: 1466 PPCODE:
… …
1408 1472
1409 REQ_SEND; 1473 REQ_SEND;
1410} 1474}
1411 1475
1412void 1476void
1413aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef) 1477aio_link (SV8 *oldpath, SV8 *newpath, SV *callback = &PL_sv_undef)
1414 ALIAS: 1478 ALIAS:
1415 aio_link = EIO_LINK 1479 aio_link = EIO_LINK
1416 aio_symlink = EIO_SYMLINK 1480 aio_symlink = EIO_SYMLINK
1417 aio_rename = EIO_RENAME 1481 aio_rename = EIO_RENAME
1418 PPCODE: 1482 PPCODE:
… …
1427 1491
1428 REQ_SEND; 1492 REQ_SEND;
1429} 1493}
1430 1494
1431void 1495void
1432aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef) 1496aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback = &PL_sv_undef)
1433 PPCODE: 1497 PPCODE:
1434{ 1498{
1435 dREQ; 1499 dREQ;
1436 1500
1437 req->type = EIO_MKNOD; 1501 req->type = EIO_MKNOD;
… …
1441 1505
1442 REQ_SEND; 1506 REQ_SEND;
1443} 1507}
1444 1508
1445void 1509void
1446aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef) 1510aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback = &PL_sv_undef)
1447 ALIAS: 1511 ALIAS:
1448 aio_mtouch = EIO_MTOUCH 1512 aio_mtouch = EIO_MTOUCH
1449 aio_msync = EIO_MSYNC 1513 aio_msync = EIO_MSYNC
1450 PPCODE: 1514 PPCODE:
1451{ 1515{
… …
1474 REQ_SEND; 1538 REQ_SEND;
1475 } 1539 }
1476} 1540}
1477 1541
1478void 1542void
1479aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef) 1543aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback = &PL_sv_undef)
1480 PPCODE: 1544 PPCODE:
1481{ 1545{
1482 STRLEN svlen; 1546 STRLEN svlen;
1483 char *svptr = SvPVbyte (data, svlen); 1547 char *svptr = SvPVbyte (data, svlen);
1484 UV len = SvUV (length); 1548 UV len = SvUV (length);
… …
1503 REQ_SEND; 1567 REQ_SEND;
1504 } 1568 }
1505} 1569}
1506 1570
1507void 1571void
1508aio_mlockall (IV flags, SV *callback=&PL_sv_undef) 1572aio_mlockall (IV flags, SV *callback = &PL_sv_undef)
1509 PPCODE: 1573 PPCODE:
1510{ 1574{
1511 dREQ; 1575 dREQ;
1512 1576
1513 req->type = EIO_MLOCKALL; 1577 req->type = EIO_MLOCKALL;
… …
1515 1579
1516 REQ_SEND; 1580 REQ_SEND;
1517} 1581}
1518 1582
1519void 1583void
1520aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef) 1584aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback = &PL_sv_undef)
1521 PPCODE: 1585 PPCODE:
1522{ 1586{
1523 int fd = s_fileno_croak (fh, 0); 1587 int fd = s_fileno_croak (fh, 0);
1524 dREQ; 1588 dREQ;
1525 1589
1526 req->type = EIO_CUSTOM; 1590 req->type = EIO_CUSTOM;
1527 req->sv1 = newSVsv (fh); 1591 req->sv1 = newSVsv (fh);
1528 req->int1 = fd; 1592 req->int1 = fd;
… …
1538 1602
1539 REQ_SEND; 1603 REQ_SEND;
1540} 1604}
1541 1605
1542void 1606void
1543aio_busy (double delay, SV *callback=&PL_sv_undef) 1607aio_busy (double delay, SV *callback = &PL_sv_undef)
1544 PPCODE: 1608 PPCODE:
1545{ 1609{
1546 dREQ; 1610 dREQ;
1547 1611
1548 req->type = EIO_BUSY; 1612 req->type = EIO_BUSY;
… …
1550 1614
1551 REQ_SEND; 1615 REQ_SEND;
1552} 1616}
1553 1617
1554void 1618void
1555aio_group (SV *callback=&PL_sv_undef) 1619aio_group (SV *callback = &PL_sv_undef)
1556 PPCODE: 1620 PPCODE:
1557{ 1621{
1558 dREQ; 1622 dREQ;
1559 1623
1560 req->type = EIO_GROUP; 1624 req->type = EIO_GROUP;
1561 1625
1626 PUTBACK;
1562 req_submit (req); 1627 req_submit (req);
1628 SPAGAIN;
1629
1563 XPUSHs (req_sv (req, aio_grp_stash)); 1630 XPUSHs (req_sv (req, aio_grp_stash));
1564} 1631}
1565 1632
1566void 1633void
1567aio_nop (SV *callback=&PL_sv_undef) 1634aio_nop (SV *callback = &PL_sv_undef)
1568 ALIAS: 1635 ALIAS:
1569 aio_nop = EIO_NOP 1636 aio_nop = EIO_NOP
1570 aio_sync = EIO_SYNC 1637 aio_sync = EIO_SYNC
1571 PPCODE: 1638 PPCODE:
1572{ 1639{
… …
1576 1643
1577 REQ_SEND; 1644 REQ_SEND;
1578} 1645}
1579 1646
1580int 1647int
1581aioreq_pri (int pri = 0) 1648aioreq_pri (int pri = NO_INIT)
1582 CODE: 1649 CODE:
1583 RETVAL = next_pri; 1650 RETVAL = next_pri;
1584 if (items > 0) 1651 if (items > 0)
1585 { 1652 {
1586 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1653 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
… …
1676 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1743 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1677 OUTPUT: 1744 OUTPUT:
1678 RETVAL 1745 RETVAL
1679 1746
1680void 1747void
1681mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0) 1748mmap (SV *scalar, STRLEN length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
1682 PPCODE: 1749 PPCODE:
1683 sv_unmagic (scalar, MMAP_MAGIC); 1750 sv_unmagic (scalar, MMAP_MAGIC);
1684{ 1751{
1685 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1752 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1686 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1753 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
… …
1713munmap (SV *scalar) 1780munmap (SV *scalar)
1714 CODE: 1781 CODE:
1715 sv_unmagic (scalar, MMAP_MAGIC); 1782 sv_unmagic (scalar, MMAP_MAGIC);
1716 1783
1717int 1784int
1718madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot) 1785madvise (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
1719 ALIAS: 1786 ALIAS:
1720 mprotect = 1 1787 mprotect = 1
1721 CODE: 1788 CODE:
1722{ 1789{
1723 STRLEN svlen; 1790 STRLEN svlen;
1724 void *addr = SvPVbyte (scalar, svlen); 1791 void *addr = SvPVbyte (scalar, svlen);
1725 size_t len = SvUV (length); 1792 STRLEN len = SvUV (length);
1726 1793
1727 if (offset < 0) 1794 if (offset < 0)
1728 offset += svlen; 1795 offset += svlen;
1729 1796
1730 if (offset < 0 || offset > svlen) 1797 if (offset < 0 || offset > svlen)
… …
1744} 1811}
1745 OUTPUT: 1812 OUTPUT:
1746 RETVAL 1813 RETVAL
1747 1814
1748int 1815int
1749munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef) 1816munlock (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef)
1750 CODE: 1817 CODE:
1751{ 1818{
1752 STRLEN svlen; 1819 STRLEN svlen;
1753 void *addr = SvPVbyte (scalar, svlen); 1820 void *addr = SvPVbyte (scalar, svlen);
1754 size_t len = SvUV (length); 1821 size_t len = SvUV (length);
1755 1822
1756 if (offset < 0) 1823 if (offset < 0)
1757 offset += svlen; 1824 offset += svlen;
1758 1825
… …
1765 addr = (void *)(((intptr_t)addr) + offset); 1832 addr = (void *)(((intptr_t)addr) + offset);
1766 eio_page_align (&addr, &len); 1833 eio_page_align (&addr, &len);
1767#if _POSIX_MEMLOCK_RANGE 1834#if _POSIX_MEMLOCK_RANGE
1768 RETVAL = munlock (addr, len); 1835 RETVAL = munlock (addr, len);
1769#else 1836#else
1770 RETVAL = ((errno = ENOSYS), -1); 1837 RETVAL = EIO_ENOSYS ();
1771#endif 1838#endif
1772} 1839}
1773 OUTPUT: 1840 OUTPUT:
1774 RETVAL 1841 RETVAL
1775 1842
… …
1777munlockall () 1844munlockall ()
1778 CODE: 1845 CODE:
1779#if _POSIX_MEMLOCK 1846#if _POSIX_MEMLOCK
1780 munlockall (); 1847 munlockall ();
1781#else 1848#else
1782 RETVAL = -1; 1849 RETVAL = EIO_ENOSYS ();
1783 errno = ENOSYS;
1784#endif 1850#endif
1785 OUTPUT: 1851 OUTPUT:
1786 RETVAL 1852 RETVAL
1853
1854int
1855splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags)
1856 CODE:
1857{
1858#if HAVE_LINUX_SPLICE
1859 loff_t off_in_, off_out_;
1860 RETVAL = splice (
1861 rfh, SvOK (off_in ) ? (off_in_ = SvVAL64 (off_in )), &off_in_ : 0,
1862 wfh, SvOK (off_out) ? (off_out_ = SvVAL64 (off_out)), &off_out_ : 0,
1863 length, flags
1864 );
1865#else
1866 RETVAL = EIO_ENOSYS ();
1867#endif
1868}
1869 OUTPUT:
1870 RETVAL
1871
1872int
1873tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags)
1874 CODE:
1875#if HAVE_LINUX_SPLICE
1876 RETVAL = tee (rfh, wfh, length, flags);
1877#else
1878 RETVAL = EIO_ENOSYS ();
1879#endif
1880 OUTPUT:
1881 RETVAL
1882
1883int
1884pipesize (aio_rfd rfh, int new_size = -1)
1885 PROTOTYPE: $;$
1886 CODE:
1887#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ)
1888 if (new_size >= 0)
1889 RETVAL = fcntl (rfh, F_SETPIPE_SZ, new_size);
1890 else
1891 RETVAL = fcntl (rfh, F_GETPIPE_SZ);
1892#else
1893 errno = ENOSYS;
1894 RETVAL = -1;
1895#endif
1896 OUTPUT:
1897 RETVAL
1898
1899void
1900pipe2 (int flags = 0)
1901 PROTOTYPE: ;$
1902 PPCODE:
1903{
1904 int fd[2];
1905 int res;
1906
1907 if (flags)
1908#if HAVE_PIPE2
1909 res = pipe2 (fd, flags);
1910#else
1911 res = (errno = ENOSYS, -1);
1912#endif
1913 else
1914 res = pipe (fd);
1915
1916 if (!res)
1917 {
1918 EXTEND (SP, 2);
1919 PUSHs (newmortalFH (fd[0], O_RDONLY));
1920 PUSHs (newmortalFH (fd[1], O_WRONLY));
1921 }
1922}
1787 1923
1788void _on_next_submit (SV *cb) 1924void _on_next_submit (SV *cb)
1789 CODE: 1925 CODE:
1790 SvREFCNT_dec (on_next_submit); 1926 SvREFCNT_dec (on_next_submit);
1791 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1927 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
… …
1826cancel (aio_req_ornot req) 1962cancel (aio_req_ornot req)
1827 CODE: 1963 CODE:
1828 eio_cancel (req); 1964 eio_cancel (req);
1829 1965
1830void 1966void
1831cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1967cb (aio_req_ornot req, SV *callback = NO_INIT)
1832 PPCODE: 1968 PPCODE:
1833{ 1969{
1834 if (GIMME_V != G_VOID) 1970 if (GIMME_V != G_VOID)
1835 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1971 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1836 1972
1837 if (items > 1) 1973 if (items > 1)
1838 { 1974 {
1839 SV *cb_cv =get_cb (callback); 1975 SV *cb_cv = get_cb (callback);
1840 1976
1841 SvREFCNT_dec (req->callback); 1977 SvREFCNT_dec (req->callback);
1842 req->callback = SvREFCNT_inc (cb_cv); 1978 req->callback = SvREFCNT_inc (cb_cv);
1843 } 1979 }
1844} 1980}
… …
1901limit (aio_req grp, int limit) 2037limit (aio_req grp, int limit)
1902 CODE: 2038 CODE:
1903 eio_grp_limit (grp, limit); 2039 eio_grp_limit (grp, limit);
1904 2040
1905void 2041void
1906feed (aio_req grp, SV *callback=&PL_sv_undef) 2042feed (aio_req grp, SV *callback = &PL_sv_undef)
1907 CODE: 2043 CODE:
1908{ 2044{
1909 SvREFCNT_dec (grp->sv2); 2045 SvREFCNT_dec (grp->sv2);
1910 grp->sv2 = newSVsv (callback); 2046 grp->sv2 = newSVsv (callback);
1911 grp->feed = aio_grp_feed; 2047 grp->feed = aio_grp_feed;

Diff Legend

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