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.212 by root, Sun Apr 8 00:11:50 2012 UTC vs.
Revision 1.226 by root, Sun Jan 6 11:48:14 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
… …
698} 743}
699 744
700/*****************************************************************************/ 745/*****************************************************************************/
701 746
702#if !_POSIX_MAPPED_FILES 747#if !_POSIX_MAPPED_FILES
703# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 748# define mmap(addr,length,prot,flags,fd,offs) EIO_ENOSYS ()
704# define munmap(addr,length) (errno = ENOSYS, -1) 749# define munmap(addr,length) EIO_ENOSYS ()
705#endif 750#endif
706 751
707#if !_POSIX_MEMORY_PROTECTION 752#if !_POSIX_MEMORY_PROTECTION
708# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 753# define mprotect(addr,len,prot) EIO_ENOSYS ()
709# define PROT_NONE 0 754# define PROT_NONE 0
710# define PROT_WRITE 0 755# define PROT_WRITE 0
711# define MAP_PRIVATE 0 756# define MAP_PRIVATE 0
712# define MAP_SHARED 0 757# define MAP_SHARED 0
713# define MAP_FIXED 0 758# define MAP_FIXED 0
… …
956 const_iv (FIEMAP_EXTENT_DATA_TAIL) 1001 const_iv (FIEMAP_EXTENT_DATA_TAIL)
957 const_iv (FIEMAP_EXTENT_UNWRITTEN) 1002 const_iv (FIEMAP_EXTENT_UNWRITTEN)
958 const_iv (FIEMAP_EXTENT_MERGED) 1003 const_iv (FIEMAP_EXTENT_MERGED)
959 const_iv (FIEMAP_EXTENT_SHARED) 1004 const_iv (FIEMAP_EXTENT_SHARED)
960 1005
1006 const_iv (SPLICE_F_MOVE)
1007 const_iv (SPLICE_F_NONBLOCK)
1008 const_iv (SPLICE_F_MORE)
1009 const_iv (SPLICE_F_GIFT)
1010
1011 const_iv (SEEK_DATA)
1012 const_iv (SEEK_HOLE)
1013
1014 /* libeio constants */
961 const_eio (SEEK_SET) 1015 const_eio (SEEK_SET)
962 const_eio (SEEK_CUR) 1016 const_eio (SEEK_CUR)
963 const_eio (SEEK_END) 1017 const_eio (SEEK_END)
964 1018
965 const_eio (MCL_FUTURE) 1019 const_eio (MCL_FUTURE)
… …
974 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 1028 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
975 const_eio (SYNC_FILE_RANGE_WRITE) 1029 const_eio (SYNC_FILE_RANGE_WRITE)
976 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 1030 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
977 1031
978 const_eio (FALLOC_FL_KEEP_SIZE) 1032 const_eio (FALLOC_FL_KEEP_SIZE)
1033 const_eio (FALLOC_FL_PUNCH_HOLE)
979 1034
980 const_eio (READDIR_DENTS) 1035 const_eio (READDIR_DENTS)
981 const_eio (READDIR_DIRS_FIRST) 1036 const_eio (READDIR_DIRS_FIRST)
982 const_eio (READDIR_STAT_ORDER) 1037 const_eio (READDIR_STAT_ORDER)
983 const_eio (READDIR_FOUND_UNKNOWN) 1038 const_eio (READDIR_FOUND_UNKNOWN)
… …
1084 aio_fsync = EIO_FSYNC 1139 aio_fsync = EIO_FSYNC
1085 aio_fdatasync = EIO_FDATASYNC 1140 aio_fdatasync = EIO_FDATASYNC
1086 aio_syncfs = EIO_SYNCFS 1141 aio_syncfs = EIO_SYNCFS
1087 PPCODE: 1142 PPCODE:
1088{ 1143{
1089 int fd = s_fileno_croak (fh, 0); 1144 int fd = s_fileno_croak (fh, 0);
1090 dREQ; 1145 dREQ;
1091 1146
1092 req->type = ix; 1147 req->type = ix;
1093 req->sv1 = newSVsv (fh); 1148 req->sv1 = newSVsv (fh);
1094 req->int1 = fd; 1149 req->int1 = fd;
… …
1098 1153
1099void 1154void
1100aio_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)
1101 PPCODE: 1156 PPCODE:
1102{ 1157{
1103 int fd = s_fileno_croak (fh, 0); 1158 int fd = s_fileno_croak (fh, 0);
1104 dREQ; 1159 dREQ;
1105 1160
1106 req->type = EIO_SYNC_FILE_RANGE; 1161 req->type = EIO_SYNC_FILE_RANGE;
1107 req->sv1 = newSVsv (fh); 1162 req->sv1 = newSVsv (fh);
1108 req->int1 = fd; 1163 req->int1 = fd;
… …
1112 1167
1113 REQ_SEND; 1168 REQ_SEND;
1114} 1169}
1115 1170
1116void 1171void
1117aio_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)
1118 PPCODE: 1173 PPCODE:
1119{ 1174{
1120 int fd = s_fileno_croak (fh, 0); 1175 int fd = s_fileno_croak (fh, 0);
1121 dREQ; 1176 dREQ;
1122 1177
1123 req->type = EIO_FALLOCATE; 1178 req->type = EIO_FALLOCATE;
1124 req->sv1 = newSVsv (fh); 1179 req->sv1 = newSVsv (fh);
1125 req->int1 = fd; 1180 req->int1 = fd;
… …
1133void 1188void
1134aio_close (SV *fh, SV *callback=&PL_sv_undef) 1189aio_close (SV *fh, SV *callback=&PL_sv_undef)
1135 PPCODE: 1190 PPCODE:
1136{ 1191{
1137 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 */
1138 int fd = s_fileno_croak (fh, 0); 1193 int fd = s_fileno_croak (fh, 0);
1139 dREQ; 1194 dREQ;
1140 1195
1141 if (expect_false (close_fd < 0)) 1196 if (expect_false (close_fd < 0))
1142 { 1197 {
1143 int pipefd [2]; 1198 int pipefd [2];
… …
1206 } 1261 }
1207 else 1262 else
1208 { 1263 {
1209 /* read: check type and grow scalar as necessary */ 1264 /* read: check type and grow scalar as necessary */
1210 SvUPGRADE (data, SVt_PV); 1265 SvUPGRADE (data, SVt_PV);
1266 if (SvLEN (data) >= SvCUR (data))
1211 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");
1212 } 1270 }
1213 1271
1214 { 1272 {
1215 dREQ; 1273 dREQ;
1216 1274
… …
1250 1308
1251void 1309void
1252aio_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)
1253 PPCODE: 1311 PPCODE:
1254{ 1312{
1255 int ifd = s_fileno_croak (in_fh , 0); 1313 int ifd = s_fileno_croak (in_fh , 0);
1256 int ofd = s_fileno_croak (out_fh, 1); 1314 int ofd = s_fileno_croak (out_fh, 1);
1257 dREQ; 1315 dREQ;
1258 1316
1259 req->type = EIO_SENDFILE; 1317 req->type = EIO_SENDFILE;
1260 req->sv1 = newSVsv (out_fh); 1318 req->sv1 = newSVsv (out_fh);
1261 req->int1 = ofd; 1319 req->int1 = ofd;
… …
1269 1327
1270void 1328void
1271aio_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)
1272 PPCODE: 1330 PPCODE:
1273{ 1331{
1274 int fd = s_fileno_croak (fh, 0); 1332 int fd = s_fileno_croak (fh, 0);
1275 dREQ; 1333 dREQ;
1276 1334
1277 req->type = EIO_READAHEAD; 1335 req->type = EIO_READAHEAD;
1278 req->sv1 = newSVsv (fh); 1336 req->sv1 = newSVsv (fh);
1279 req->int1 = fd; 1337 req->int1 = fd;
… …
1519 1577
1520void 1578void
1521aio_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)
1522 PPCODE: 1580 PPCODE:
1523{ 1581{
1524 int fd = s_fileno_croak (fh, 0); 1582 int fd = s_fileno_croak (fh, 0);
1525 dREQ; 1583 dREQ;
1526 1584
1527 req->type = EIO_CUSTOM; 1585 req->type = EIO_CUSTOM;
1528 req->sv1 = newSVsv (fh); 1586 req->sv1 = newSVsv (fh);
1529 req->int1 = fd; 1587 req->int1 = fd;
… …
1677 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1735 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1678 OUTPUT: 1736 OUTPUT:
1679 RETVAL 1737 RETVAL
1680 1738
1681void 1739void
1682mmap (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)
1683 PPCODE: 1741 PPCODE:
1684 sv_unmagic (scalar, MMAP_MAGIC); 1742 sv_unmagic (scalar, MMAP_MAGIC);
1685{ 1743{
1686 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;
1687 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1745 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
… …
1720 ALIAS: 1778 ALIAS:
1721 mprotect = 1 1779 mprotect = 1
1722 CODE: 1780 CODE:
1723{ 1781{
1724 STRLEN svlen; 1782 STRLEN svlen;
1725 void *addr = SvPVbyte (scalar, svlen); 1783 void *addr = SvPVbyte (scalar, svlen);
1726 size_t len = SvUV (length); 1784 size_t len = SvUV (length);
1727 1785
1728 if (offset < 0) 1786 if (offset < 0)
1729 offset += svlen; 1787 offset += svlen;
1730 1788
… …
1749int 1807int
1750munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef) 1808munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
1751 CODE: 1809 CODE:
1752{ 1810{
1753 STRLEN svlen; 1811 STRLEN svlen;
1754 void *addr = SvPVbyte (scalar, svlen); 1812 void *addr = SvPVbyte (scalar, svlen);
1755 size_t len = SvUV (length); 1813 size_t len = SvUV (length);
1756 1814
1757 if (offset < 0) 1815 if (offset < 0)
1758 offset += svlen; 1816 offset += svlen;
1759 1817
… …
1766 addr = (void *)(((intptr_t)addr) + offset); 1824 addr = (void *)(((intptr_t)addr) + offset);
1767 eio_page_align (&addr, &len); 1825 eio_page_align (&addr, &len);
1768#if _POSIX_MEMLOCK_RANGE 1826#if _POSIX_MEMLOCK_RANGE
1769 RETVAL = munlock (addr, len); 1827 RETVAL = munlock (addr, len);
1770#else 1828#else
1771 RETVAL = ((errno = ENOSYS), -1); 1829 RETVAL = EIO_ENOSYS ();
1772#endif 1830#endif
1773} 1831}
1774 OUTPUT: 1832 OUTPUT:
1775 RETVAL 1833 RETVAL
1776 1834
… …
1778munlockall () 1836munlockall ()
1779 CODE: 1837 CODE:
1780#if _POSIX_MEMLOCK 1838#if _POSIX_MEMLOCK
1781 munlockall (); 1839 munlockall ();
1782#else 1840#else
1783 RETVAL = -1; 1841 RETVAL = EIO_ENOSYS ();
1784 errno = ENOSYS;
1785#endif 1842#endif
1786 OUTPUT: 1843 OUTPUT:
1844 RETVAL
1845
1846int
1847splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags)
1848 CODE:
1849{
1850#if HAVE_LINUX_SPLICE
1851 loff_t off_in_, off_out_;
1852 RETVAL = splice (
1853 rfh, SvOK (off_in ) ? (off_in_ = SvVAL64 (off_in )), &off_in_ : 0,
1854 wfh, SvOK (off_out) ? (off_out_ = SvVAL64 (off_out)), &off_out_ : 0,
1855 length, flags
1856 );
1857#else
1858 RETVAL = EIO_ENOSYS ();
1859#endif
1860}
1861 OUTPUT:
1862 RETVAL
1863
1864int
1865tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags)
1866 CODE:
1867#if HAVE_LINUX_SPLICE
1868 RETVAL = tee (rfh, wfh, length, flags);
1869#else
1870 RETVAL = EIO_ENOSYS ();
1871#endif
1872 OUTPUT:
1787 RETVAL 1873 RETVAL
1788 1874
1789void _on_next_submit (SV *cb) 1875void _on_next_submit (SV *cb)
1790 CODE: 1876 CODE:
1791 SvREFCNT_dec (on_next_submit); 1877 SvREFCNT_dec (on_next_submit);

Diff Legend

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