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.210 by root, Fri Apr 6 11:39:25 2012 UTC vs.
Revision 1.223 by root, Tue Aug 28 03:13:33 2012 UTC

… …
22#endif 22#endif
23 23
24#if __linux__ 24#if __linux__
25# include <linux/fs.h> 25# include <linux/fs.h>
26# ifdef FS_IOC_FIEMAP 26# ifdef FS_IOC_FIEMAP
27# include <linux/types.h>
27# include <linux/fiemap.h> 28# include <linux/fiemap.h>
28# define HAVE_FIEMAP 1 29# define HAVE_FIEMAP 1
29# endif 30# endif
30#endif 31#endif
31 32
… …
164fiemap (eio_req *req) 165fiemap (eio_req *req)
165{ 166{
166 req->result = -1; 167 req->result = -1;
167 168
168#if HAVE_FIEMAP 169#if HAVE_FIEMAP
170 /* assume some c99 */
171 struct fiemap *fiemap = 0;
172 size_t end_offset;
173 int count = req->int3;
174
175 req->flags |= EIO_FLAG_PTR1_FREE;
176
177 /* heuristic: start with 512 bytes (8 extents), and if that isn't enough, */
178 /* increase in 3.5kb steps */
179 if (count < 0)
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 (atcually 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);
210
169 for (;;) 211 for (;;)
170 { 212 {
171 int count = req->int3; 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;
172 216
173 if (count < 0) 217 incmap->fm_start = fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_logical
174 { 218 + fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_length;
175 struct fiemap fiemap; 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);
176 222
177 fiemap.fm_start = req->offs;
178 fiemap.fm_length = req->size;
179 fiemap.fm_flags = req->int2;
180 fiemap.fm_extent_count = 0;
181
182 if (ioctl (req->int1, FS_IOC_FIEMAP, &fiemap)) 223 if (ioctl (req->int1, FS_IOC_FIEMAP, incmap) < 0)
183 return; 224 return;
184 225
185 count = fiemap.fm_mapped_extents; 226 count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents;
186 }
187
188 struct fiemap *fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); 227 fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
189 errno = ENOMEM; 228 errno = ENOMEM;
190 if (!fiemap) 229 if (!fiemap)
191 return; 230 return;
192 231
193 req->ptr1 = fiemap; 232 req->ptr1 = fiemap;
194 req->flags |= EIO_FLAG_PTR1_FREE;
195 233
196 fiemap->fm_start = req->offs; 234 for (count = 0; count < incmap->fm_mapped_extents; ++count)
197 fiemap->fm_length = req->size; 235 {
198 fiemap->fm_flags = req->int2; 236 struct fiemap_extent *e = incmap->fm_extents + count;
199 fiemap->fm_extent_count = count;
200 237
201 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap)) 238 if (e->fe_logical + e->fe_length >= end_offset)
202 return; 239 goto done;
203 240
204 if (req->int3 >= 0) 241 fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e;
205 break; /* when not autosizing we are done */
206 242
207 if (fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST) 243 if (e->fe_flags & FIEMAP_EXTENT_LAST)
208 break; /* autosizing successful, we are done */ 244 goto done;
209 245
210 free (fiemap); 246 }
211 } 247 }
212 248
249done:
213 req->result = 0; 250 req->result = 0;
214 251
215#else 252#else
216 errno = ENOSYS; 253 errno = ENOSYS;
217#endif 254#endif
… …
545 break; 582 break;
546 583
547 case EIO_CUSTOM: 584 case EIO_CUSTOM:
548 if (req->feed == fiemap) 585 if (req->feed == fiemap)
549 { 586 {
587#if HAVE_FIEMAP
550 if (!req->result) 588 if (!req->result)
551 { 589 {
552 struct fiemap *fiemap = (struct fiemap *)req->ptr1; 590 struct fiemap *fiemap = (struct fiemap *)req->ptr1;
553 591
554 if (fiemap->fm_extent_count) 592 if (fiemap->fm_extent_count)
… …
575 { 613 {
576 SvIV_set (sv_result, fiemap->fm_mapped_extents); 614 SvIV_set (sv_result, fiemap->fm_mapped_extents);
577 PUSHs (sv_result); 615 PUSHs (sv_result);
578 } 616 }
579 } 617 }
618#endif
580 } 619 }
581 else 620 else
582 PUSHs (sv_result); 621 PUSHs (sv_result);
583 break; 622 break;
584 623
… …
696} 735}
697 736
698/*****************************************************************************/ 737/*****************************************************************************/
699 738
700#if !_POSIX_MAPPED_FILES 739#if !_POSIX_MAPPED_FILES
701# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 740# define mmap(addr,length,prot,flags,fd,offs) EIO_ENOSYS ()
702# define munmap(addr,length) (errno = ENOSYS, -1) 741# define munmap(addr,length) EIO_ENOSYS ()
703#endif 742#endif
704 743
705#if !_POSIX_MEMORY_PROTECTION 744#if !_POSIX_MEMORY_PROTECTION
706# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 745# define mprotect(addr,len,prot) EIO_ENOSYS ()
707# define PROT_NONE 0 746# define PROT_NONE 0
708# define PROT_WRITE 0 747# define PROT_WRITE 0
709# define MAP_PRIVATE 0 748# define MAP_PRIVATE 0
710# define MAP_SHARED 0 749# define MAP_SHARED 0
711# define MAP_FIXED 0 750# define MAP_FIXED 0
… …
954 const_iv (FIEMAP_EXTENT_DATA_TAIL) 993 const_iv (FIEMAP_EXTENT_DATA_TAIL)
955 const_iv (FIEMAP_EXTENT_UNWRITTEN) 994 const_iv (FIEMAP_EXTENT_UNWRITTEN)
956 const_iv (FIEMAP_EXTENT_MERGED) 995 const_iv (FIEMAP_EXTENT_MERGED)
957 const_iv (FIEMAP_EXTENT_SHARED) 996 const_iv (FIEMAP_EXTENT_SHARED)
958 997
998 const_iv (SPLICE_F_MOVE)
999 const_iv (SPLICE_F_NONBLOCK)
1000 const_iv (SPLICE_F_MORE)
1001 const_iv (SPLICE_F_GIFT)
1002
1003 const_iv (SEEK_DATA)
1004 const_iv (SEEK_HOLE)
1005
1006 /* libeio constants */
959 const_eio (SEEK_SET) 1007 const_eio (SEEK_SET)
960 const_eio (SEEK_CUR) 1008 const_eio (SEEK_CUR)
961 const_eio (SEEK_END) 1009 const_eio (SEEK_END)
962 1010
963 const_eio (MCL_FUTURE) 1011 const_eio (MCL_FUTURE)
… …
972 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 1020 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
973 const_eio (SYNC_FILE_RANGE_WRITE) 1021 const_eio (SYNC_FILE_RANGE_WRITE)
974 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 1022 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
975 1023
976 const_eio (FALLOC_FL_KEEP_SIZE) 1024 const_eio (FALLOC_FL_KEEP_SIZE)
1025 const_eio (FALLOC_FL_PUNCH_HOLE)
977 1026
978 const_eio (READDIR_DENTS) 1027 const_eio (READDIR_DENTS)
979 const_eio (READDIR_DIRS_FIRST) 1028 const_eio (READDIR_DIRS_FIRST)
980 const_eio (READDIR_STAT_ORDER) 1029 const_eio (READDIR_STAT_ORDER)
981 const_eio (READDIR_FOUND_UNKNOWN) 1030 const_eio (READDIR_FOUND_UNKNOWN)
… …
1082 aio_fsync = EIO_FSYNC 1131 aio_fsync = EIO_FSYNC
1083 aio_fdatasync = EIO_FDATASYNC 1132 aio_fdatasync = EIO_FDATASYNC
1084 aio_syncfs = EIO_SYNCFS 1133 aio_syncfs = EIO_SYNCFS
1085 PPCODE: 1134 PPCODE:
1086{ 1135{
1087 int fd = s_fileno_croak (fh, 0); 1136 int fd = s_fileno_croak (fh, 0);
1088 dREQ; 1137 dREQ;
1089 1138
1090 req->type = ix; 1139 req->type = ix;
1091 req->sv1 = newSVsv (fh); 1140 req->sv1 = newSVsv (fh);
1092 req->int1 = fd; 1141 req->int1 = fd;
… …
1096 1145
1097void 1146void
1098aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) 1147aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
1099 PPCODE: 1148 PPCODE:
1100{ 1149{
1101 int fd = s_fileno_croak (fh, 0); 1150 int fd = s_fileno_croak (fh, 0);
1102 dREQ; 1151 dREQ;
1103 1152
1104 req->type = EIO_SYNC_FILE_RANGE; 1153 req->type = EIO_SYNC_FILE_RANGE;
1105 req->sv1 = newSVsv (fh); 1154 req->sv1 = newSVsv (fh);
1106 req->int1 = fd; 1155 req->int1 = fd;
… …
1110 1159
1111 REQ_SEND; 1160 REQ_SEND;
1112} 1161}
1113 1162
1114void 1163void
1115aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) 1164aio_allocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1116 PPCODE: 1165 PPCODE:
1117{ 1166{
1118 int fd = s_fileno_croak (fh, 0); 1167 int fd = s_fileno_croak (fh, 0);
1119 dREQ; 1168 dREQ;
1120 1169
1121 req->type = EIO_FALLOCATE; 1170 req->type = EIO_FALLOCATE;
1122 req->sv1 = newSVsv (fh); 1171 req->sv1 = newSVsv (fh);
1123 req->int1 = fd; 1172 req->int1 = fd;
… …
1131void 1180void
1132aio_close (SV *fh, SV *callback=&PL_sv_undef) 1181aio_close (SV *fh, SV *callback=&PL_sv_undef)
1133 PPCODE: 1182 PPCODE:
1134{ 1183{
1135 static int close_fd = -1; /* dummy fd to close fds via dup2 */ 1184 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1136 int fd = s_fileno_croak (fh, 0); 1185 int fd = s_fileno_croak (fh, 0);
1137 dREQ; 1186 dREQ;
1138 1187
1139 if (expect_false (close_fd < 0)) 1188 if (expect_false (close_fd < 0))
1140 { 1189 {
1141 int pipefd [2]; 1190 int pipefd [2];
… …
1164 1213
1165void 1214void
1166aio_seek (SV *fh, SV *offset, int whence, SV *callback=&PL_sv_undef) 1215aio_seek (SV *fh, SV *offset, int whence, SV *callback=&PL_sv_undef)
1167 PPCODE: 1216 PPCODE:
1168{ 1217{
1169 STRLEN svlen;
1170 int fd = s_fileno_croak (fh, 0); 1218 int fd = s_fileno_croak (fh, 0);
1171 dREQ; 1219 dREQ;
1172 1220
1173 req->type = EIO_SEEK; 1221 req->type = EIO_SEEK;
1174 req->sv1 = newSVsv (fh); 1222 req->sv1 = newSVsv (fh);
… …
1205 } 1253 }
1206 else 1254 else
1207 { 1255 {
1208 /* read: check type and grow scalar as necessary */ 1256 /* read: check type and grow scalar as necessary */
1209 SvUPGRADE (data, SVt_PV); 1257 SvUPGRADE (data, SVt_PV);
1258 if (SvLEN (data) >= SvCUR (data))
1210 svptr = SvGROW (data, len + dataoffset + 1); 1259 svptr = SvGROW (data, len + dataoffset + 1);
1260 else if (SvCUR (data) < len + dataoffset)
1261 croak ("length + dataoffset outside of scalar, and cannot grow");
1211 } 1262 }
1212 1263
1213 { 1264 {
1214 dREQ; 1265 dREQ;
1215 1266
… …
1249 1300
1250void 1301void
1251aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) 1302aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
1252 PPCODE: 1303 PPCODE:
1253{ 1304{
1254 int ifd = s_fileno_croak (in_fh , 0); 1305 int ifd = s_fileno_croak (in_fh , 0);
1255 int ofd = s_fileno_croak (out_fh, 1); 1306 int ofd = s_fileno_croak (out_fh, 1);
1256 dREQ; 1307 dREQ;
1257 1308
1258 req->type = EIO_SENDFILE; 1309 req->type = EIO_SENDFILE;
1259 req->sv1 = newSVsv (out_fh); 1310 req->sv1 = newSVsv (out_fh);
1260 req->int1 = ofd; 1311 req->int1 = ofd;
… …
1268 1319
1269void 1320void
1270aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) 1321aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
1271 PPCODE: 1322 PPCODE:
1272{ 1323{
1273 int fd = s_fileno_croak (fh, 0); 1324 int fd = s_fileno_croak (fh, 0);
1274 dREQ; 1325 dREQ;
1275 1326
1276 req->type = EIO_READAHEAD; 1327 req->type = EIO_READAHEAD;
1277 req->sv1 = newSVsv (fh); 1328 req->sv1 = newSVsv (fh);
1278 req->int1 = fd; 1329 req->int1 = fd;
… …
1518 1569
1519void 1570void
1520aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef) 1571aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef)
1521 PPCODE: 1572 PPCODE:
1522{ 1573{
1523 int fd = s_fileno_croak (fh, 0); 1574 int fd = s_fileno_croak (fh, 0);
1524 dREQ; 1575 dREQ;
1525 1576
1526 req->type = EIO_CUSTOM; 1577 req->type = EIO_CUSTOM;
1527 req->sv1 = newSVsv (fh); 1578 req->sv1 = newSVsv (fh);
1528 req->int1 = fd; 1579 req->int1 = fd;
1529 1580
1530 req->feed = fiemap; 1581 req->feed = fiemap;
1582#if HAVE_FIEMAP
1531 /* keep our fingers crossed that the next two types are 64 bit */ 1583 /* keep our fingers crossed that the next two types are 64 bit */
1532 req->offs = start; 1584 req->offs = start;
1533 req->size = SvOK (length) ? SvVAL64 (length) : ~0ULL; 1585 req->size = SvOK (length) ? SvVAL64 (length) : ~0ULL;
1534 req->int2 = flags; 1586 req->int2 = flags;
1535 req->int3 = SvOK (count) ? SvIV (count) : -1; 1587 req->int3 = SvOK (count) ? SvIV (count) : -1;
1588#endif
1536 1589
1537 REQ_SEND; 1590 REQ_SEND;
1538} 1591}
1539 1592
1540void 1593void
… …
1674 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1727 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1675 OUTPUT: 1728 OUTPUT:
1676 RETVAL 1729 RETVAL
1677 1730
1678void 1731void
1679mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0) 1732mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
1680 PPCODE: 1733 PPCODE:
1681 sv_unmagic (scalar, MMAP_MAGIC); 1734 sv_unmagic (scalar, MMAP_MAGIC);
1682{ 1735{
1683 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1736 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1684 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1737 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
… …
1717 ALIAS: 1770 ALIAS:
1718 mprotect = 1 1771 mprotect = 1
1719 CODE: 1772 CODE:
1720{ 1773{
1721 STRLEN svlen; 1774 STRLEN svlen;
1722 void *addr = SvPVbyte (scalar, svlen); 1775 void *addr = SvPVbyte (scalar, svlen);
1723 size_t len = SvUV (length); 1776 size_t len = SvUV (length);
1724 1777
1725 if (offset < 0) 1778 if (offset < 0)
1726 offset += svlen; 1779 offset += svlen;
1727 1780
… …
1746int 1799int
1747munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef) 1800munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
1748 CODE: 1801 CODE:
1749{ 1802{
1750 STRLEN svlen; 1803 STRLEN svlen;
1751 void *addr = SvPVbyte (scalar, svlen); 1804 void *addr = SvPVbyte (scalar, svlen);
1752 size_t len = SvUV (length); 1805 size_t len = SvUV (length);
1753 1806
1754 if (offset < 0) 1807 if (offset < 0)
1755 offset += svlen; 1808 offset += svlen;
1756 1809
… …
1763 addr = (void *)(((intptr_t)addr) + offset); 1816 addr = (void *)(((intptr_t)addr) + offset);
1764 eio_page_align (&addr, &len); 1817 eio_page_align (&addr, &len);
1765#if _POSIX_MEMLOCK_RANGE 1818#if _POSIX_MEMLOCK_RANGE
1766 RETVAL = munlock (addr, len); 1819 RETVAL = munlock (addr, len);
1767#else 1820#else
1768 RETVAL = ((errno = ENOSYS), -1); 1821 RETVAL = EIO_ENOSYS ();
1769#endif 1822#endif
1770} 1823}
1771 OUTPUT: 1824 OUTPUT:
1772 RETVAL 1825 RETVAL
1773 1826
… …
1775munlockall () 1828munlockall ()
1776 CODE: 1829 CODE:
1777#if _POSIX_MEMLOCK 1830#if _POSIX_MEMLOCK
1778 munlockall (); 1831 munlockall ();
1779#else 1832#else
1780 RETVAL = -1; 1833 RETVAL = EIO_ENOSYS ();
1781 errno = ENOSYS;
1782#endif 1834#endif
1783 OUTPUT: 1835 OUTPUT:
1836 RETVAL
1837
1838int
1839splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags)
1840 CODE:
1841{
1842#if HAVE_LINUX_SPLICE
1843 loff_t off_in_, off_out_;
1844 RETVAL = splice (
1845 rfh, SvOK (off_in ) ? (off_in_ = SvVAL64 (off_in )), &off_in_ : 0,
1846 wfh, SvOK (off_out) ? (off_out_ = SvVAL64 (off_out)), &off_out_ : 0,
1847 length, flags
1848 );
1849#else
1850 RETVAL = EIO_ENOSYS ();
1851#endif
1852}
1853 OUTPUT:
1854 RETVAL
1855
1856int
1857tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags)
1858 CODE:
1859#if HAVE_LINUX_SPLICE
1860 RETVAL = tee (rfh, wfh, length, flags);
1861#else
1862 RETVAL = EIO_ENOSYS ();
1863#endif
1864 OUTPUT:
1784 RETVAL 1865 RETVAL
1785 1866
1786void _on_next_submit (SV *cb) 1867void _on_next_submit (SV *cb)
1787 CODE: 1868 CODE:
1788 SvREFCNT_dec (on_next_submit); 1869 SvREFCNT_dec (on_next_submit);

Diff Legend

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