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.217 by root, Fri Jul 27 17:24:06 2012 UTC vs.
Revision 1.233 by root, Thu Jun 25 13:34:28 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
27# include <linux/types.h> 31# include <linux/types.h>
28# include <linux/fiemap.h> 32# include <linux/fiemap.h>
29# define HAVE_FIEMAP 1 33# define HAVE_FIEMAP 1
… …
153#endif 157#endif
154#ifndef minor 158#ifndef minor
155# define minor(dev) ((dev) & 0xff) 159# define minor(dev) ((dev) & 0xff)
156#endif 160#endif
157 161
158#ifndef PAGESIZE 162#if PAGESIZE <= 0
159# define PAGESIZE sysconf (_SC_PAGESIZE) 163# define PAGESIZE sysconf (_SC_PAGESIZE)
160#endif 164#endif
161 165
162/*****************************************************************************/ 166/*****************************************************************************/
163 167
… …
165fiemap (eio_req *req) 169fiemap (eio_req *req)
166{ 170{
167 req->result = -1; 171 req->result = -1;
168 172
169#if HAVE_FIEMAP 173#if HAVE_FIEMAP
174 /* assume some c99 */
175 struct fiemap *fiemap = 0;
176 size_t end_offset;
170 int count = req->int3; 177 int count = req->int3;
171 178
172 /* heuristic: first try with 64 extents if we don't know how many, */ 179 req->flags |= EIO_FLAG_PTR1_FREE;
173 /* as most files have (hopefully) fewer than this many extents */ 180
174 /* 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 */
175 if (count < 0) 183 if (count < 0)
176 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);
177 214
178 for (;;) 215 for (;;)
179 { 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;
180 struct fiemap *fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); 234 fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
181 errno = ENOMEM; 235 errno = ENOMEM;
182 if (!fiemap) 236 if (!fiemap)
183 return; 237 return;
184 238
185 req->ptr1 = fiemap; 239 req->ptr1 = fiemap;
186 req->flags |= EIO_FLAG_PTR1_FREE;
187 240
188 fiemap->fm_start = req->offs; 241 for (count = 0; count < incmap->fm_mapped_extents; ++count)
189 fiemap->fm_length = req->size; 242 {
190 fiemap->fm_flags = req->int2; 243 struct fiemap_extent *e = incmap->fm_extents + count;
191 fiemap->fm_extent_count = count;
192 244
193 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap)) 245 if (e->fe_logical + e->fe_length >= end_offset)
194 return; 246 goto done;
195 247
196 if (req->int3 >= 0) 248 fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e;
197 break; /* when not autosizing we are done */
198 249
199 if (fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST) 250 if (e->fe_flags & FIEMAP_EXTENT_LAST)
200 break; /* autosizing successful, we are done */ 251 goto done;
201 252
202 fiemap->fm_flags = req->int2; 253 }
203 fiemap->fm_extent_count = 0;
204
205 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap))
206 return;
207
208 count = fiemap->fm_mapped_extents;
209
210 free (fiemap);
211 } 254 }
212 255
256done:
213 req->result = 0; 257 req->result = 0;
214 258
215#else 259#else
216 errno = ENOSYS; 260 errno = ENOSYS;
217#endif 261#endif
… …
264} 308}
265 309
266static SV * 310static SV *
267newSVaio_wd (aio_wd wd) 311newSVaio_wd (aio_wd wd)
268{ 312{
269 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash); 313 return sv_bless (newRV_noinc (newSViv ((intptr_t)wd)), aio_wd_stash);
270} 314}
271 315
272static aio_req 316static aio_req
273SvAIO_REQ (SV *sv) 317SvAIO_REQ (SV *sv)
274{ 318{
… …
293 || SvTYPE (SvRV (sv)) != SVt_PVMG 337 || SvTYPE (SvRV (sv)) != SVt_PVMG
294 || SvSTASH (SvRV (sv)) != aio_wd_stash) 338 || SvSTASH (SvRV (sv)) != aio_wd_stash)
295 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");
296 340
297 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;
298} 367}
299 368
300static void 369static void
301aio_grp_feed (aio_req grp) 370aio_grp_feed (aio_req grp)
302{ 371{
… …
430 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))));
431 } 500 }
432 break; 501 break;
433 502
434 case EIO_OPEN: 503 case EIO_OPEN:
435 { 504 PUSHs (newmortalFH (req->result, req->int1 & (O_RDONLY | O_WRONLY | O_RDWR)));
436 /* convert fd to fh */
437 SV *fh = &PL_sv_undef;
438
439 if (req->result >= 0)
440 {
441 GV *gv = (GV *)sv_newmortal ();
442 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
443 char sym [64];
444 int symlen;
445
446 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
447 gv_init (gv, aio_stash, sym, symlen, 0);
448
449 symlen = snprintf (
450 sym,
451 sizeof (sym),
452 "%s&=%d",
453 flags == O_RDONLY ? "<" : flags == O_WRONLY ? ">" : "+<",
454 (int)req->result
455 );
456
457 if (do_open (gv, sym, symlen, 0, 0, 0, 0))
458 fh = (SV *)gv;
459 }
460
461 PUSHs (fh);
462 }
463 break; 505 break;
464 506
465 case EIO_STATVFS: 507 case EIO_STATVFS:
466 case EIO_FSTATVFS: 508 case EIO_FSTATVFS:
467 { 509 {
… …
470#ifndef _WIN32 512#ifndef _WIN32
471 if (req->result >= 0) 513 if (req->result >= 0)
472 { 514 {
473 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 515 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
474 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));
475 522
476 rv = sv_2mortal (newRV_noinc ((SV *)hv)); 523 rv = sv_2mortal (newRV_noinc ((SV *)hv));
477 524
478 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);
479 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);
… …
481 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);
482 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);
483 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);
484 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);
485 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);
486 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 533 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (fsid ), 0);
487 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);
488 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);
489 } 536 }
490#endif 537#endif
491 538
… …
984 const_eio (SYNC_FILE_RANGE_WRITE) 1031 const_eio (SYNC_FILE_RANGE_WRITE)
985 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 1032 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
986 1033
987 const_eio (FALLOC_FL_KEEP_SIZE) 1034 const_eio (FALLOC_FL_KEEP_SIZE)
988 const_eio (FALLOC_FL_PUNCH_HOLE) 1035 const_eio (FALLOC_FL_PUNCH_HOLE)
1036 const_eio (FALLOC_FL_COLLAPSE_RANGE)
1037 const_eio (FALLOC_FL_ZERO_RANGE)
989 1038
990 const_eio (READDIR_DENTS) 1039 const_eio (READDIR_DENTS)
991 const_eio (READDIR_DIRS_FIRST) 1040 const_eio (READDIR_DIRS_FIRST)
992 const_eio (READDIR_STAT_ORDER) 1041 const_eio (READDIR_STAT_ORDER)
993 const_eio (READDIR_FOUND_UNKNOWN) 1042 const_eio (READDIR_FOUND_UNKNOWN)
… …
1061 PROTOTYPE: $ 1110 PROTOTYPE: $
1062 CODE: 1111 CODE:
1063 max_outstanding = maxreqs; 1112 max_outstanding = maxreqs;
1064 1113
1065void 1114void
1066aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef) 1115aio_wd (SV8 *pathname, SV *callback = &PL_sv_undef)
1067 PPCODE: 1116 PPCODE:
1068{ 1117{
1069 dREQ; 1118 dREQ;
1070 1119
1071 req->type = EIO_WD_OPEN; 1120 req->type = EIO_WD_OPEN;
… …
1073 1122
1074 REQ_SEND; 1123 REQ_SEND;
1075} 1124}
1076 1125
1077void 1126void
1078aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1127aio_open (SV8 *pathname, int flags, int mode, SV *callback = &PL_sv_undef)
1079 PPCODE: 1128 PPCODE:
1080{ 1129{
1081 dREQ; 1130 dREQ;
1082 1131
1083 req->type = EIO_OPEN; 1132 req->type = EIO_OPEN;
… …
1087 1136
1088 REQ_SEND; 1137 REQ_SEND;
1089} 1138}
1090 1139
1091void 1140void
1092aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1141aio_fsync (SV *fh, SV *callback = &PL_sv_undef)
1093 ALIAS: 1142 ALIAS:
1094 aio_fsync = EIO_FSYNC 1143 aio_fsync = EIO_FSYNC
1095 aio_fdatasync = EIO_FDATASYNC 1144 aio_fdatasync = EIO_FDATASYNC
1096 aio_syncfs = EIO_SYNCFS 1145 aio_syncfs = EIO_SYNCFS
1097 PPCODE: 1146 PPCODE:
1098{ 1147{
1099 int fd = s_fileno_croak (fh, 0); 1148 int fd = s_fileno_croak (fh, 0);
1100 dREQ; 1149 dREQ;
1101 1150
1102 req->type = ix; 1151 req->type = ix;
1103 req->sv1 = newSVsv (fh); 1152 req->sv1 = newSVsv (fh);
1104 req->int1 = fd; 1153 req->int1 = fd;
1105 1154
1106 REQ_SEND; 1155 REQ_SEND;
1107} 1156}
1108 1157
1109void 1158void
1110aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) 1159aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback = &PL_sv_undef)
1111 PPCODE: 1160 PPCODE:
1112{ 1161{
1113 int fd = s_fileno_croak (fh, 0); 1162 int fd = s_fileno_croak (fh, 0);
1114 dREQ; 1163 dREQ;
1115 1164
1116 req->type = EIO_SYNC_FILE_RANGE; 1165 req->type = EIO_SYNC_FILE_RANGE;
1117 req->sv1 = newSVsv (fh); 1166 req->sv1 = newSVsv (fh);
1118 req->int1 = fd; 1167 req->int1 = fd;
… …
1122 1171
1123 REQ_SEND; 1172 REQ_SEND;
1124} 1173}
1125 1174
1126void 1175void
1127aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) 1176aio_allocate (SV *fh, int mode, off_t offset, size_t len, SV *callback = &PL_sv_undef)
1128 PPCODE: 1177 PPCODE:
1129{ 1178{
1130 int fd = s_fileno_croak (fh, 0); 1179 int fd = s_fileno_croak (fh, 0);
1131 dREQ; 1180 dREQ;
1132 1181
1133 req->type = EIO_FALLOCATE; 1182 req->type = EIO_FALLOCATE;
1134 req->sv1 = newSVsv (fh); 1183 req->sv1 = newSVsv (fh);
1135 req->int1 = fd; 1184 req->int1 = fd;
… …
1139 1188
1140 REQ_SEND; 1189 REQ_SEND;
1141} 1190}
1142 1191
1143void 1192void
1144aio_close (SV *fh, SV *callback=&PL_sv_undef) 1193aio_close (SV *fh, SV *callback = &PL_sv_undef)
1145 PPCODE: 1194 PPCODE:
1146{ 1195{
1147 static int close_fd = -1; /* dummy fd to close fds via dup2 */ 1196 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1148 int fd = s_fileno_croak (fh, 0); 1197 int fd = s_fileno_croak (fh, 0);
1149 dREQ; 1198 dREQ;
1150 1199
1151 if (expect_false (close_fd < 0)) 1200 if (expect_false (close_fd < 0))
1152 { 1201 {
1153 int pipefd [2]; 1202 int pipefd [2];
… …
1173 1222
1174 REQ_SEND; 1223 REQ_SEND;
1175} 1224}
1176 1225
1177void 1226void
1178aio_seek (SV *fh, SV *offset, int whence, SV *callback=&PL_sv_undef) 1227aio_seek (SV *fh, SV *offset, int whence, SV *callback = &PL_sv_undef)
1179 PPCODE: 1228 PPCODE:
1180{ 1229{
1181 int fd = s_fileno_croak (fh, 0); 1230 int fd = s_fileno_croak (fh, 0);
1182 dREQ; 1231 dREQ;
1183 1232
… …
1189 1238
1190 REQ_SEND; 1239 REQ_SEND;
1191} 1240}
1192 1241
1193void 1242void
1194aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback=&PL_sv_undef) 1243aio_read (SV *fh, SV *offset, SV *length, SV8 *data, IV dataoffset, SV *callback = &PL_sv_undef)
1195 ALIAS: 1244 ALIAS:
1196 aio_read = EIO_READ 1245 aio_read = EIO_READ
1197 aio_write = EIO_WRITE 1246 aio_write = EIO_WRITE
1198 PPCODE: 1247 PPCODE:
1199{ 1248{
… …
1215 len = svlen - dataoffset; 1264 len = svlen - dataoffset;
1216 } 1265 }
1217 else 1266 else
1218 { 1267 {
1219 /* read: check type and grow scalar as necessary */ 1268 /* read: check type and grow scalar as necessary */
1220 SvUPGRADE (data, SVt_PV);
1221 if (SvLEN (data) >= SvCUR (data)) 1269 if (!SvPOK (data) || SvLEN (data) >= SvCUR (data))
1222 svptr = SvGROW (data, len + dataoffset + 1); 1270 svptr = sv_grow (data, len + dataoffset + 1);
1223 else if (SvCUR (data) < len + dataoffset) 1271 else if (SvCUR (data) < len + dataoffset)
1224 croak ("length + dataoffset outside of scalar, and cannot grow"); 1272 croak ("length + dataoffset outside of scalar, and cannot grow");
1225 } 1273 }
1226 1274
1227 { 1275 {
… …
1245 REQ_SEND; 1293 REQ_SEND;
1246 } 1294 }
1247} 1295}
1248 1296
1249void 1297void
1250aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1298aio_readlink (SV8 *pathname, SV *callback = &PL_sv_undef)
1251 ALIAS: 1299 ALIAS:
1252 aio_readlink = EIO_READLINK 1300 aio_readlink = EIO_READLINK
1253 aio_realpath = EIO_REALPATH 1301 aio_realpath = EIO_REALPATH
1254 PPCODE: 1302 PPCODE:
1255{ 1303{
… …
1260 1308
1261 REQ_SEND; 1309 REQ_SEND;
1262} 1310}
1263 1311
1264void 1312void
1265aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) 1313aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback = &PL_sv_undef)
1266 PPCODE: 1314 PPCODE:
1267{ 1315{
1268 int ifd = s_fileno_croak (in_fh , 0); 1316 int ifd = s_fileno_croak (in_fh , 0);
1269 int ofd = s_fileno_croak (out_fh, 1); 1317 int ofd = s_fileno_croak (out_fh, 1);
1270 dREQ; 1318 dREQ;
1271 1319
1272 req->type = EIO_SENDFILE; 1320 req->type = EIO_SENDFILE;
1273 req->sv1 = newSVsv (out_fh); 1321 req->sv1 = newSVsv (out_fh);
1274 req->int1 = ofd; 1322 req->int1 = ofd;
… …
1279 1327
1280 REQ_SEND; 1328 REQ_SEND;
1281} 1329}
1282 1330
1283void 1331void
1284aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) 1332aio_readahead (SV *fh, off_t offset, size_t length, SV *callback = &PL_sv_undef)
1285 PPCODE: 1333 PPCODE:
1286{ 1334{
1287 int fd = s_fileno_croak (fh, 0); 1335 int fd = s_fileno_croak (fh, 0);
1288 dREQ; 1336 dREQ;
1289 1337
1290 req->type = EIO_READAHEAD; 1338 req->type = EIO_READAHEAD;
1291 req->sv1 = newSVsv (fh); 1339 req->sv1 = newSVsv (fh);
1292 req->int1 = fd; 1340 req->int1 = fd;
… …
1295 1343
1296 REQ_SEND; 1344 REQ_SEND;
1297} 1345}
1298 1346
1299void 1347void
1300aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) 1348aio_stat (SV8 *fh_or_path, SV *callback = &PL_sv_undef)
1301 ALIAS: 1349 ALIAS:
1302 aio_stat = EIO_STAT 1350 aio_stat = EIO_STAT
1303 aio_lstat = EIO_LSTAT 1351 aio_lstat = EIO_LSTAT
1304 aio_statvfs = EIO_STATVFS 1352 aio_statvfs = EIO_STATVFS
1305 PPCODE: 1353 PPCODE:
… …
1326 RETVAL = makedev (maj, min); 1374 RETVAL = makedev (maj, min);
1327 OUTPUT: 1375 OUTPUT:
1328 RETVAL 1376 RETVAL
1329 1377
1330void 1378void
1331aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) 1379aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback = &PL_sv_undef)
1332 PPCODE: 1380 PPCODE:
1333{ 1381{
1334 dREQ; 1382 dREQ;
1335 1383
1336 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1384 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
… …
1339 1387
1340 REQ_SEND; 1388 REQ_SEND;
1341} 1389}
1342 1390
1343void 1391void
1344aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1392aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback = &PL_sv_undef)
1345 PPCODE: 1393 PPCODE:
1346{ 1394{
1347 dREQ; 1395 dREQ;
1348 1396
1349 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1397 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
… …
1351 1399
1352 REQ_SEND; 1400 REQ_SEND;
1353} 1401}
1354 1402
1355void 1403void
1356aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1404aio_chmod (SV8 *fh_or_path, int mode, SV *callback = &PL_sv_undef)
1357 PPCODE: 1405 PPCODE:
1358{ 1406{
1359 dREQ; 1407 dREQ;
1360 1408
1361 req->int2 = mode; 1409 req->int2 = mode;
… …
1363 1411
1364 REQ_SEND; 1412 REQ_SEND;
1365} 1413}
1366 1414
1367void 1415void
1368aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef) 1416aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback = &PL_sv_undef)
1369 PPCODE: 1417 PPCODE:
1370{ 1418{
1371 dREQ; 1419 dREQ;
1372 1420
1373 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1421 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
… …
1376 1424
1377 REQ_SEND; 1425 REQ_SEND;
1378} 1426}
1379 1427
1380void 1428void
1381aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef) 1429aio_readdirx (SV8 *pathname, IV flags, SV *callback = &PL_sv_undef)
1382 PPCODE: 1430 PPCODE:
1383{ 1431{
1384 dREQ; 1432 dREQ;
1385 1433
1386 req->type = EIO_READDIR; 1434 req->type = EIO_READDIR;
… …
1393 1441
1394 REQ_SEND; 1442 REQ_SEND;
1395} 1443}
1396 1444
1397void 1445void
1398aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef) 1446aio_mkdir (SV8 *pathname, int mode, SV *callback = &PL_sv_undef)
1399 PPCODE: 1447 PPCODE:
1400{ 1448{
1401 dREQ; 1449 dREQ;
1402 1450
1403 req->type = EIO_MKDIR; 1451 req->type = EIO_MKDIR;
… …
1406 1454
1407 REQ_SEND; 1455 REQ_SEND;
1408} 1456}
1409 1457
1410void 1458void
1411aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1459aio_unlink (SV8 *pathname, SV *callback = &PL_sv_undef)
1412 ALIAS: 1460 ALIAS:
1413 aio_unlink = EIO_UNLINK 1461 aio_unlink = EIO_UNLINK
1414 aio_rmdir = EIO_RMDIR 1462 aio_rmdir = EIO_RMDIR
1415 aio_readdir = EIO_READDIR 1463 aio_readdir = EIO_READDIR
1416 PPCODE: 1464 PPCODE:
… …
1422 1470
1423 REQ_SEND; 1471 REQ_SEND;
1424} 1472}
1425 1473
1426void 1474void
1427aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef) 1475aio_link (SV8 *oldpath, SV8 *newpath, SV *callback = &PL_sv_undef)
1428 ALIAS: 1476 ALIAS:
1429 aio_link = EIO_LINK 1477 aio_link = EIO_LINK
1430 aio_symlink = EIO_SYMLINK 1478 aio_symlink = EIO_SYMLINK
1431 aio_rename = EIO_RENAME 1479 aio_rename = EIO_RENAME
1432 PPCODE: 1480 PPCODE:
… …
1441 1489
1442 REQ_SEND; 1490 REQ_SEND;
1443} 1491}
1444 1492
1445void 1493void
1446aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef) 1494aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback = &PL_sv_undef)
1447 PPCODE: 1495 PPCODE:
1448{ 1496{
1449 dREQ; 1497 dREQ;
1450 1498
1451 req->type = EIO_MKNOD; 1499 req->type = EIO_MKNOD;
… …
1455 1503
1456 REQ_SEND; 1504 REQ_SEND;
1457} 1505}
1458 1506
1459void 1507void
1460aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef) 1508aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback = &PL_sv_undef)
1461 ALIAS: 1509 ALIAS:
1462 aio_mtouch = EIO_MTOUCH 1510 aio_mtouch = EIO_MTOUCH
1463 aio_msync = EIO_MSYNC 1511 aio_msync = EIO_MSYNC
1464 PPCODE: 1512 PPCODE:
1465{ 1513{
… …
1488 REQ_SEND; 1536 REQ_SEND;
1489 } 1537 }
1490} 1538}
1491 1539
1492void 1540void
1493aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback=&PL_sv_undef) 1541aio_mlock (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, SV *callback = &PL_sv_undef)
1494 PPCODE: 1542 PPCODE:
1495{ 1543{
1496 STRLEN svlen; 1544 STRLEN svlen;
1497 char *svptr = SvPVbyte (data, svlen); 1545 char *svptr = SvPVbyte (data, svlen);
1498 UV len = SvUV (length); 1546 UV len = SvUV (length);
… …
1517 REQ_SEND; 1565 REQ_SEND;
1518 } 1566 }
1519} 1567}
1520 1568
1521void 1569void
1522aio_mlockall (IV flags, SV *callback=&PL_sv_undef) 1570aio_mlockall (IV flags, SV *callback = &PL_sv_undef)
1523 PPCODE: 1571 PPCODE:
1524{ 1572{
1525 dREQ; 1573 dREQ;
1526 1574
1527 req->type = EIO_MLOCKALL; 1575 req->type = EIO_MLOCKALL;
… …
1529 1577
1530 REQ_SEND; 1578 REQ_SEND;
1531} 1579}
1532 1580
1533void 1581void
1534aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef) 1582aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback = &PL_sv_undef)
1535 PPCODE: 1583 PPCODE:
1536{ 1584{
1537 int fd = s_fileno_croak (fh, 0); 1585 int fd = s_fileno_croak (fh, 0);
1538 dREQ; 1586 dREQ;
1539 1587
… …
1552 1600
1553 REQ_SEND; 1601 REQ_SEND;
1554} 1602}
1555 1603
1556void 1604void
1557aio_busy (double delay, SV *callback=&PL_sv_undef) 1605aio_busy (double delay, SV *callback = &PL_sv_undef)
1558 PPCODE: 1606 PPCODE:
1559{ 1607{
1560 dREQ; 1608 dREQ;
1561 1609
1562 req->type = EIO_BUSY; 1610 req->type = EIO_BUSY;
… …
1564 1612
1565 REQ_SEND; 1613 REQ_SEND;
1566} 1614}
1567 1615
1568void 1616void
1569aio_group (SV *callback=&PL_sv_undef) 1617aio_group (SV *callback = &PL_sv_undef)
1570 PPCODE: 1618 PPCODE:
1571{ 1619{
1572 dREQ; 1620 dREQ;
1573 1621
1574 req->type = EIO_GROUP; 1622 req->type = EIO_GROUP;
1575 1623
1624 PUTBACK;
1576 req_submit (req); 1625 req_submit (req);
1626 SPAGAIN;
1627
1577 XPUSHs (req_sv (req, aio_grp_stash)); 1628 XPUSHs (req_sv (req, aio_grp_stash));
1578} 1629}
1579 1630
1580void 1631void
1581aio_nop (SV *callback=&PL_sv_undef) 1632aio_nop (SV *callback = &PL_sv_undef)
1582 ALIAS: 1633 ALIAS:
1583 aio_nop = EIO_NOP 1634 aio_nop = EIO_NOP
1584 aio_sync = EIO_SYNC 1635 aio_sync = EIO_SYNC
1585 PPCODE: 1636 PPCODE:
1586{ 1637{
… …
1590 1641
1591 REQ_SEND; 1642 REQ_SEND;
1592} 1643}
1593 1644
1594int 1645int
1595aioreq_pri (int pri = 0) 1646aioreq_pri (int pri = NO_INIT)
1596 CODE: 1647 CODE:
1597 RETVAL = next_pri; 1648 RETVAL = next_pri;
1598 if (items > 0) 1649 if (items > 0)
1599 { 1650 {
1600 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1651 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
… …
1690 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1741 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1691 OUTPUT: 1742 OUTPUT:
1692 RETVAL 1743 RETVAL
1693 1744
1694void 1745void
1695mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0) 1746mmap (SV *scalar, STRLEN length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
1696 PPCODE: 1747 PPCODE:
1697 sv_unmagic (scalar, MMAP_MAGIC); 1748 sv_unmagic (scalar, MMAP_MAGIC);
1698{ 1749{
1699 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1750 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1700 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1751 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
… …
1727munmap (SV *scalar) 1778munmap (SV *scalar)
1728 CODE: 1779 CODE:
1729 sv_unmagic (scalar, MMAP_MAGIC); 1780 sv_unmagic (scalar, MMAP_MAGIC);
1730 1781
1731int 1782int
1732madvise (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot) 1783madvise (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef, IV advice_or_prot)
1733 ALIAS: 1784 ALIAS:
1734 mprotect = 1 1785 mprotect = 1
1735 CODE: 1786 CODE:
1736{ 1787{
1737 STRLEN svlen; 1788 STRLEN svlen;
1738 void *addr = SvPVbyte (scalar, svlen); 1789 void *addr = SvPVbyte (scalar, svlen);
1739 size_t len = SvUV (length); 1790 STRLEN len = SvUV (length);
1740 1791
1741 if (offset < 0) 1792 if (offset < 0)
1742 offset += svlen; 1793 offset += svlen;
1743 1794
1744 if (offset < 0 || offset > svlen) 1795 if (offset < 0 || offset > svlen)
… …
1758} 1809}
1759 OUTPUT: 1810 OUTPUT:
1760 RETVAL 1811 RETVAL
1761 1812
1762int 1813int
1763munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef) 1814munlock (SV *scalar, STRLEN offset = 0, SV *length = &PL_sv_undef)
1764 CODE: 1815 CODE:
1765{ 1816{
1766 STRLEN svlen; 1817 STRLEN svlen;
1767 void *addr = SvPVbyte (scalar, svlen); 1818 void *addr = SvPVbyte (scalar, svlen);
1768 size_t len = SvUV (length); 1819 size_t len = SvUV (length);
1769 1820
1770 if (offset < 0) 1821 if (offset < 0)
1771 offset += svlen; 1822 offset += svlen;
1772 1823
… …
1824#else 1875#else
1825 RETVAL = EIO_ENOSYS (); 1876 RETVAL = EIO_ENOSYS ();
1826#endif 1877#endif
1827 OUTPUT: 1878 OUTPUT:
1828 RETVAL 1879 RETVAL
1880
1881int
1882pipesize (aio_rfd rfh, int new_size = -1)
1883 PROTOTYPE: $;$
1884 CODE:
1885#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ)
1886 if (new_size >= 0)
1887 RETVAL = fcntl (rfh, F_SETPIPE_SZ, new_size);
1888 else
1889 RETVAL = fcntl (rfh, F_GETPIPE_SZ);
1890#else
1891 errno = ENOSYS;
1892 RETVAL = -1;
1893#endif
1894 OUTPUT:
1895 RETVAL
1896
1897void
1898pipe2 (int flags = 0)
1899 PROTOTYPE: ;$
1900 PPCODE:
1901{
1902 int fd[2];
1903 int res;
1904
1905 if (flags)
1906#if HAVE_PIPE2
1907 res = pipe2 (fd, flags);
1908#else
1909 res = (errno = ENOSYS, -1);
1910#endif
1911 else
1912 res = pipe (fd);
1913
1914 if (!res)
1915 {
1916 EXTEND (SP, 2);
1917 PUSHs (newmortalFH (fd[0], O_RDONLY));
1918 PUSHs (newmortalFH (fd[1], O_WRONLY));
1919 }
1920}
1829 1921
1830void _on_next_submit (SV *cb) 1922void _on_next_submit (SV *cb)
1831 CODE: 1923 CODE:
1832 SvREFCNT_dec (on_next_submit); 1924 SvREFCNT_dec (on_next_submit);
1833 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1925 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
… …
1868cancel (aio_req_ornot req) 1960cancel (aio_req_ornot req)
1869 CODE: 1961 CODE:
1870 eio_cancel (req); 1962 eio_cancel (req);
1871 1963
1872void 1964void
1873cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1965cb (aio_req_ornot req, SV *callback = NO_INIT)
1874 PPCODE: 1966 PPCODE:
1875{ 1967{
1876 if (GIMME_V != G_VOID) 1968 if (GIMME_V != G_VOID)
1877 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1969 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1878 1970
1879 if (items > 1) 1971 if (items > 1)
1880 { 1972 {
1881 SV *cb_cv =get_cb (callback); 1973 SV *cb_cv = get_cb (callback);
1882 1974
1883 SvREFCNT_dec (req->callback); 1975 SvREFCNT_dec (req->callback);
1884 req->callback = SvREFCNT_inc (cb_cv); 1976 req->callback = SvREFCNT_inc (cb_cv);
1885 } 1977 }
1886} 1978}
… …
1943limit (aio_req grp, int limit) 2035limit (aio_req grp, int limit)
1944 CODE: 2036 CODE:
1945 eio_grp_limit (grp, limit); 2037 eio_grp_limit (grp, limit);
1946 2038
1947void 2039void
1948feed (aio_req grp, SV *callback=&PL_sv_undef) 2040feed (aio_req grp, SV *callback = &PL_sv_undef)
1949 CODE: 2041 CODE:
1950{ 2042{
1951 SvREFCNT_dec (grp->sv2); 2043 SvREFCNT_dec (grp->sv2);
1952 grp->sv2 = newSVsv (callback); 2044 grp->sv2 = newSVsv (callback);
1953 grp->feed = aio_grp_feed; 2045 grp->feed = aio_grp_feed;

Diff Legend

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