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.213 by root, Tue Apr 10 05:01:33 2012 UTC vs.
Revision 1.227 by root, Sat Sep 7 23:18:23 2013 UTC

… …
153#endif 153#endif
154#ifndef minor 154#ifndef minor
155# define minor(dev) ((dev) & 0xff) 155# define minor(dev) ((dev) & 0xff)
156#endif 156#endif
157 157
158#ifndef PAGESIZE 158#if PAGESIZE <= 0
159# define PAGESIZE sysconf (_SC_PAGESIZE) 159# define PAGESIZE sysconf (_SC_PAGESIZE)
160#endif 160#endif
161 161
162/*****************************************************************************/ 162/*****************************************************************************/
163 163
… …
165fiemap (eio_req *req) 165fiemap (eio_req *req)
166{ 166{
167 req->result = -1; 167 req->result = -1;
168 168
169#if HAVE_FIEMAP 169#if HAVE_FIEMAP
170 /* assume some c99 */
171 struct fiemap *fiemap = 0;
172 size_t end_offset;
170 int count = req->int3; 173 int count = req->int3;
171 174
172 /* heuristic: first try with 64 extents if we don't know how many, */ 175 req->flags |= EIO_FLAG_PTR1_FREE;
173 /* as most files have (hopefully) fewer than this many extents */ 176
174 /* in fact, most should have <= 2, so maybe the 72 below is probably overkill */ 177 /* heuristic: start with 512 bytes (8 extents), and if that isn't enough, */
178 /* increase in 3.5kb steps */
175 if (count < 0) 179 if (count < 0)
176 count = 72; /* for what it's worth, 72 extents fit nicely into 4kb */ 180 count = 8;
181
182 fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
183 errno = ENOMEM;
184 if (!fiemap)
185 return;
186
187 req->ptr1 = fiemap;
188
189 fiemap->fm_start = req->offs;
190 fiemap->fm_length = req->size;
191 fiemap->fm_flags = req->int2;
192 fiemap->fm_extent_count = count;
193
194 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap) < 0)
195 return;
196
197 if (req->int3 >= 0 /* not autosizing */
198 || !fiemap->fm_mapped_extents /* no more extents */
199 || fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST /* hit eof */)
200 goto done;
201
202 /* else we have to loop -
203 * it would be tempting (actually I tried that first) to just query the
204 * number of extents needed, but linux often feels like not returning all
205 * extents, without telling us it left any out. this complicates
206 * this quite a bit.
207 */
208
209 end_offset = fiemap->fm_length + (fiemap->fm_length == FIEMAP_MAX_OFFSET ? 0 : fiemap->fm_start);
177 210
178 for (;;) 211 for (;;)
179 { 212 {
213 /* we go in 54 extent steps - 3kb, in the hope that this fits nicely on the eio stack (normally 16+ kb) */
214 char scratch[3072];
215 struct fiemap *incmap = (struct fiemap *)scratch;
216
217 incmap->fm_start = fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_logical
218 + fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_length;
219 incmap->fm_length = fiemap->fm_length - (incmap->fm_start - fiemap->fm_start);
220 incmap->fm_flags = fiemap->fm_flags;
221 incmap->fm_extent_count = (sizeof (scratch) - sizeof (struct fiemap)) / sizeof (struct fiemap_extent);
222
223 if (ioctl (req->int1, FS_IOC_FIEMAP, incmap) < 0)
224 return;
225
226 if (!incmap->fm_mapped_extents)
227 goto done;
228
229 count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents;
180 struct fiemap *fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); 230 fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
181 errno = ENOMEM; 231 errno = ENOMEM;
182 if (!fiemap) 232 if (!fiemap)
183 return; 233 return;
184 234
185 req->ptr1 = fiemap; 235 req->ptr1 = fiemap;
186 req->flags |= EIO_FLAG_PTR1_FREE;
187 236
188 fiemap->fm_start = req->offs; 237 for (count = 0; count < incmap->fm_mapped_extents; ++count)
189 fiemap->fm_length = req->size; 238 {
190 fiemap->fm_flags = req->int2; 239 struct fiemap_extent *e = incmap->fm_extents + count;
191 fiemap->fm_extent_count = count;
192 240
193 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap)) 241 if (e->fe_logical + e->fe_length >= end_offset)
194 return; 242 goto done;
195 243
196 if (req->int3 >= 0) 244 fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e;
197 break; /* when not autosizing we are done */
198 245
199 if (fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST) 246 if (e->fe_flags & FIEMAP_EXTENT_LAST)
200 break; /* autosizing successful, we are done */ 247 goto done;
201 248
202 fiemap->fm_flags = req->int2; 249 }
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 } 250 }
212 251
252done:
213 req->result = 0; 253 req->result = 0;
214 254
215#else 255#else
216 errno = ENOSYS; 256 errno = ENOSYS;
217#endif 257#endif
… …
470#ifndef _WIN32 510#ifndef _WIN32
471 if (req->result >= 0) 511 if (req->result >= 0)
472 { 512 {
473 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 513 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
474 HV *hv = newHV (); 514 HV *hv = newHV ();
515 /* POSIX requires fsid to be unsigned long, but AIX in its infinite wisdom
516 * chooses to make it a struct.
517 */
518 unsigned long fsid = 0;
519 memcpy (&fsid, &f->f_fsid, sizeof (unsigned long) < sizeof (f->f_fsid) ? sizeof (unsigned long) : sizeof (f->f_fsid));
475 520
476 rv = sv_2mortal (newRV_noinc ((SV *)hv)); 521 rv = sv_2mortal (newRV_noinc ((SV *)hv));
477 522
478 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0); 523 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); 524 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); 526 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); 527 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); 528 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); 529 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); 530 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); 531 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (fsid ), 0);
487 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); 532 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); 533 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
489 } 534 }
490#endif 535#endif
491 536
… …
983 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 1028 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
984 const_eio (SYNC_FILE_RANGE_WRITE) 1029 const_eio (SYNC_FILE_RANGE_WRITE)
985 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 1030 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
986 1031
987 const_eio (FALLOC_FL_KEEP_SIZE) 1032 const_eio (FALLOC_FL_KEEP_SIZE)
1033 const_eio (FALLOC_FL_PUNCH_HOLE)
988 1034
989 const_eio (READDIR_DENTS) 1035 const_eio (READDIR_DENTS)
990 const_eio (READDIR_DIRS_FIRST) 1036 const_eio (READDIR_DIRS_FIRST)
991 const_eio (READDIR_STAT_ORDER) 1037 const_eio (READDIR_STAT_ORDER)
992 const_eio (READDIR_FOUND_UNKNOWN) 1038 const_eio (READDIR_FOUND_UNKNOWN)
… …
1093 aio_fsync = EIO_FSYNC 1139 aio_fsync = EIO_FSYNC
1094 aio_fdatasync = EIO_FDATASYNC 1140 aio_fdatasync = EIO_FDATASYNC
1095 aio_syncfs = EIO_SYNCFS 1141 aio_syncfs = EIO_SYNCFS
1096 PPCODE: 1142 PPCODE:
1097{ 1143{
1098 int fd = s_fileno_croak (fh, 0); 1144 int fd = s_fileno_croak (fh, 0);
1099 dREQ; 1145 dREQ;
1100 1146
1101 req->type = ix; 1147 req->type = ix;
1102 req->sv1 = newSVsv (fh); 1148 req->sv1 = newSVsv (fh);
1103 req->int1 = fd; 1149 req->int1 = fd;
… …
1107 1153
1108void 1154void
1109aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) 1155aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
1110 PPCODE: 1156 PPCODE:
1111{ 1157{
1112 int fd = s_fileno_croak (fh, 0); 1158 int fd = s_fileno_croak (fh, 0);
1113 dREQ; 1159 dREQ;
1114 1160
1115 req->type = EIO_SYNC_FILE_RANGE; 1161 req->type = EIO_SYNC_FILE_RANGE;
1116 req->sv1 = newSVsv (fh); 1162 req->sv1 = newSVsv (fh);
1117 req->int1 = fd; 1163 req->int1 = fd;
… …
1121 1167
1122 REQ_SEND; 1168 REQ_SEND;
1123} 1169}
1124 1170
1125void 1171void
1126aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) 1172aio_allocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1127 PPCODE: 1173 PPCODE:
1128{ 1174{
1129 int fd = s_fileno_croak (fh, 0); 1175 int fd = s_fileno_croak (fh, 0);
1130 dREQ; 1176 dREQ;
1131 1177
1132 req->type = EIO_FALLOCATE; 1178 req->type = EIO_FALLOCATE;
1133 req->sv1 = newSVsv (fh); 1179 req->sv1 = newSVsv (fh);
1134 req->int1 = fd; 1180 req->int1 = fd;
… …
1142void 1188void
1143aio_close (SV *fh, SV *callback=&PL_sv_undef) 1189aio_close (SV *fh, SV *callback=&PL_sv_undef)
1144 PPCODE: 1190 PPCODE:
1145{ 1191{
1146 static int close_fd = -1; /* dummy fd to close fds via dup2 */ 1192 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1147 int fd = s_fileno_croak (fh, 0); 1193 int fd = s_fileno_croak (fh, 0);
1148 dREQ; 1194 dREQ;
1149 1195
1150 if (expect_false (close_fd < 0)) 1196 if (expect_false (close_fd < 0))
1151 { 1197 {
1152 int pipefd [2]; 1198 int pipefd [2];
… …
1215 } 1261 }
1216 else 1262 else
1217 { 1263 {
1218 /* read: check type and grow scalar as necessary */ 1264 /* read: check type and grow scalar as necessary */
1219 SvUPGRADE (data, SVt_PV); 1265 SvUPGRADE (data, SVt_PV);
1266 if (SvLEN (data) >= SvCUR (data))
1220 svptr = SvGROW (data, len + dataoffset + 1); 1267 svptr = SvGROW (data, len + dataoffset + 1);
1268 else if (SvCUR (data) < len + dataoffset)
1269 croak ("length + dataoffset outside of scalar, and cannot grow");
1221 } 1270 }
1222 1271
1223 { 1272 {
1224 dREQ; 1273 dREQ;
1225 1274
… …
1259 1308
1260void 1309void
1261aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) 1310aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
1262 PPCODE: 1311 PPCODE:
1263{ 1312{
1264 int ifd = s_fileno_croak (in_fh , 0); 1313 int ifd = s_fileno_croak (in_fh , 0);
1265 int ofd = s_fileno_croak (out_fh, 1); 1314 int ofd = s_fileno_croak (out_fh, 1);
1266 dREQ; 1315 dREQ;
1267 1316
1268 req->type = EIO_SENDFILE; 1317 req->type = EIO_SENDFILE;
1269 req->sv1 = newSVsv (out_fh); 1318 req->sv1 = newSVsv (out_fh);
1270 req->int1 = ofd; 1319 req->int1 = ofd;
… …
1278 1327
1279void 1328void
1280aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) 1329aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
1281 PPCODE: 1330 PPCODE:
1282{ 1331{
1283 int fd = s_fileno_croak (fh, 0); 1332 int fd = s_fileno_croak (fh, 0);
1284 dREQ; 1333 dREQ;
1285 1334
1286 req->type = EIO_READAHEAD; 1335 req->type = EIO_READAHEAD;
1287 req->sv1 = newSVsv (fh); 1336 req->sv1 = newSVsv (fh);
1288 req->int1 = fd; 1337 req->int1 = fd;
… …
1528 1577
1529void 1578void
1530aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef) 1579aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef)
1531 PPCODE: 1580 PPCODE:
1532{ 1581{
1533 int fd = s_fileno_croak (fh, 0); 1582 int fd = s_fileno_croak (fh, 0);
1534 dREQ; 1583 dREQ;
1535 1584
1536 req->type = EIO_CUSTOM; 1585 req->type = EIO_CUSTOM;
1537 req->sv1 = newSVsv (fh); 1586 req->sv1 = newSVsv (fh);
1538 req->int1 = fd; 1587 req->int1 = fd;
… …
1686 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1735 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1687 OUTPUT: 1736 OUTPUT:
1688 RETVAL 1737 RETVAL
1689 1738
1690void 1739void
1691mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0) 1740mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
1692 PPCODE: 1741 PPCODE:
1693 sv_unmagic (scalar, MMAP_MAGIC); 1742 sv_unmagic (scalar, MMAP_MAGIC);
1694{ 1743{
1695 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1744 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1696 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1745 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
… …
1729 ALIAS: 1778 ALIAS:
1730 mprotect = 1 1779 mprotect = 1
1731 CODE: 1780 CODE:
1732{ 1781{
1733 STRLEN svlen; 1782 STRLEN svlen;
1734 void *addr = SvPVbyte (scalar, svlen); 1783 void *addr = SvPVbyte (scalar, svlen);
1735 size_t len = SvUV (length); 1784 size_t len = SvUV (length);
1736 1785
1737 if (offset < 0) 1786 if (offset < 0)
1738 offset += svlen; 1787 offset += svlen;
1739 1788
… …
1758int 1807int
1759munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef) 1808munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
1760 CODE: 1809 CODE:
1761{ 1810{
1762 STRLEN svlen; 1811 STRLEN svlen;
1763 void *addr = SvPVbyte (scalar, svlen); 1812 void *addr = SvPVbyte (scalar, svlen);
1764 size_t len = SvUV (length); 1813 size_t len = SvUV (length);
1765 1814
1766 if (offset < 0) 1815 if (offset < 0)
1767 offset += svlen; 1816 offset += svlen;
1768 1817
… …
1819 RETVAL = tee (rfh, wfh, length, flags); 1868 RETVAL = tee (rfh, wfh, length, flags);
1820#else 1869#else
1821 RETVAL = EIO_ENOSYS (); 1870 RETVAL = EIO_ENOSYS ();
1822#endif 1871#endif
1823 OUTPUT: 1872 OUTPUT:
1873 RETVAL
1874
1875int
1876pipesize (aio_rfd rfh, int new_size = -1)
1877 PROTOTYPE: $;$
1878 CODE:
1879#if defined(F_SETPIPE_SZ) && defined(F_GETPIPE_SZ)
1880 if (new_size >= 0)
1881 RETVAL = fcntl (rfh, F_SETPIPE_SZ, new_size);
1882 else
1883 RETVAL = fcntl (rfh, F_GETPIPE_SZ);
1884#else
1885 errno = ENOSYS;
1886 RETVAL = -1;
1887#endif
1888 OUTPUT:
1824 RETVAL 1889 RETVAL
1825 1890
1826void _on_next_submit (SV *cb) 1891void _on_next_submit (SV *cb)
1827 CODE: 1892 CODE:
1828 SvREFCNT_dec (on_next_submit); 1893 SvREFCNT_dec (on_next_submit);

Diff Legend

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