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.219 by root, Fri Jul 27 18:43:25 2012 UTC

… …
167 req->result = -1; 167 req->result = -1;
168 168
169#if HAVE_FIEMAP 169#if HAVE_FIEMAP
170 int count = req->int3; 170 int count = req->int3;
171 171
172 /* heuristic: first try with 64 extents if we don't know how many, */ 172 /* heuristic: first try with 72 extents if we don't know how many, */
173 /* as most files have (hopefully) fewer than this many extents */ 173 /* as most files have (hopefully) fewer than this many extents */
174 /* in fact, most should have <= 2, so maybe the 72 below is probably overkill */ 174 /* in fact, most should have <= 2, so the 72 below is probably overkill */
175 if (count < 0) 175 if (count < 0)
176 count = 72; /* for what it's worth, 72 extents fit nicely into 4kb */ 176 count = 72; /* for what it's worth, 72 extents fit nicely into 4kb */
177 177
178 for (;;) 178 for (;;)
179 { 179 {
… …
194 return; 194 return;
195 195
196 if (req->int3 >= 0) 196 if (req->int3 >= 0)
197 break; /* when not autosizing we are done */ 197 break; /* when not autosizing we are done */
198 198
199 if (fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST) 199 if (fiemap->fm_mapped_extents < count)
200 break; /* autosizing successful, we are done */ 200 /* either autosizing succeeded,
201 * or the file had no extents
202 * or we luckily had enough space */
203 break;
201 204
205 /* some kernels overwrite fm_length, so just reset everything */
206 fiemap->fm_start = req->offs;
207 fiemap->fm_length = req->size;
202 fiemap->fm_flags = req->int2; 208 fiemap->fm_flags = req->int2;
203 fiemap->fm_extent_count = 0; 209 fiemap->fm_extent_count = 0;
204 210
205 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap)) 211 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap))
206 return; 212 return;
207 213
214 /* to work around a kernel bug, we allocate one more */
208 count = fiemap->fm_mapped_extents; 215 count = fiemap->fm_mapped_extents + 1;
209 216
210 free (fiemap); 217 free (fiemap);
211 } 218 }
212 219
213 req->result = 0; 220 req->result = 0;
… …
698} 705}
699 706
700/*****************************************************************************/ 707/*****************************************************************************/
701 708
702#if !_POSIX_MAPPED_FILES 709#if !_POSIX_MAPPED_FILES
703# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 710# define mmap(addr,length,prot,flags,fd,offs) EIO_ENOSYS ()
704# define munmap(addr,length) (errno = ENOSYS, -1) 711# define munmap(addr,length) EIO_ENOSYS ()
705#endif 712#endif
706 713
707#if !_POSIX_MEMORY_PROTECTION 714#if !_POSIX_MEMORY_PROTECTION
708# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 715# define mprotect(addr,len,prot) EIO_ENOSYS ()
709# define PROT_NONE 0 716# define PROT_NONE 0
710# define PROT_WRITE 0 717# define PROT_WRITE 0
711# define MAP_PRIVATE 0 718# define MAP_PRIVATE 0
712# define MAP_SHARED 0 719# define MAP_SHARED 0
713# define MAP_FIXED 0 720# define MAP_FIXED 0
… …
956 const_iv (FIEMAP_EXTENT_DATA_TAIL) 963 const_iv (FIEMAP_EXTENT_DATA_TAIL)
957 const_iv (FIEMAP_EXTENT_UNWRITTEN) 964 const_iv (FIEMAP_EXTENT_UNWRITTEN)
958 const_iv (FIEMAP_EXTENT_MERGED) 965 const_iv (FIEMAP_EXTENT_MERGED)
959 const_iv (FIEMAP_EXTENT_SHARED) 966 const_iv (FIEMAP_EXTENT_SHARED)
960 967
968 const_iv (SPLICE_F_MOVE)
969 const_iv (SPLICE_F_NONBLOCK)
970 const_iv (SPLICE_F_MORE)
971 const_iv (SPLICE_F_GIFT)
972
973 const_iv (SEEK_DATA)
974 const_iv (SEEK_HOLE)
975
976 /* libeio constants */
961 const_eio (SEEK_SET) 977 const_eio (SEEK_SET)
962 const_eio (SEEK_CUR) 978 const_eio (SEEK_CUR)
963 const_eio (SEEK_END) 979 const_eio (SEEK_END)
964 980
965 const_eio (MCL_FUTURE) 981 const_eio (MCL_FUTURE)
… …
974 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 990 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
975 const_eio (SYNC_FILE_RANGE_WRITE) 991 const_eio (SYNC_FILE_RANGE_WRITE)
976 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 992 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
977 993
978 const_eio (FALLOC_FL_KEEP_SIZE) 994 const_eio (FALLOC_FL_KEEP_SIZE)
995 const_eio (FALLOC_FL_PUNCH_HOLE)
979 996
980 const_eio (READDIR_DENTS) 997 const_eio (READDIR_DENTS)
981 const_eio (READDIR_DIRS_FIRST) 998 const_eio (READDIR_DIRS_FIRST)
982 const_eio (READDIR_STAT_ORDER) 999 const_eio (READDIR_STAT_ORDER)
983 const_eio (READDIR_FOUND_UNKNOWN) 1000 const_eio (READDIR_FOUND_UNKNOWN)
… …
1206 } 1223 }
1207 else 1224 else
1208 { 1225 {
1209 /* read: check type and grow scalar as necessary */ 1226 /* read: check type and grow scalar as necessary */
1210 SvUPGRADE (data, SVt_PV); 1227 SvUPGRADE (data, SVt_PV);
1228 if (SvLEN (data) >= SvCUR (data))
1211 svptr = SvGROW (data, len + dataoffset + 1); 1229 svptr = SvGROW (data, len + dataoffset + 1);
1230 else if (SvCUR (data) < len + dataoffset)
1231 croak ("length + dataoffset outside of scalar, and cannot grow");
1212 } 1232 }
1213 1233
1214 { 1234 {
1215 dREQ; 1235 dREQ;
1216 1236
… …
1519 1539
1520void 1540void
1521aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef) 1541aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef)
1522 PPCODE: 1542 PPCODE:
1523{ 1543{
1524 int fd = s_fileno_croak (fh, 0); 1544 int fd = s_fileno_croak (fh, 0);
1525 dREQ; 1545 dREQ;
1526 1546
1527 req->type = EIO_CUSTOM; 1547 req->type = EIO_CUSTOM;
1528 req->sv1 = newSVsv (fh); 1548 req->sv1 = newSVsv (fh);
1529 req->int1 = fd; 1549 req->int1 = fd;
… …
1677 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1697 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1678 OUTPUT: 1698 OUTPUT:
1679 RETVAL 1699 RETVAL
1680 1700
1681void 1701void
1682mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0) 1702mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
1683 PPCODE: 1703 PPCODE:
1684 sv_unmagic (scalar, MMAP_MAGIC); 1704 sv_unmagic (scalar, MMAP_MAGIC);
1685{ 1705{
1686 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1706 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1687 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1707 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
… …
1720 ALIAS: 1740 ALIAS:
1721 mprotect = 1 1741 mprotect = 1
1722 CODE: 1742 CODE:
1723{ 1743{
1724 STRLEN svlen; 1744 STRLEN svlen;
1725 void *addr = SvPVbyte (scalar, svlen); 1745 void *addr = SvPVbyte (scalar, svlen);
1726 size_t len = SvUV (length); 1746 size_t len = SvUV (length);
1727 1747
1728 if (offset < 0) 1748 if (offset < 0)
1729 offset += svlen; 1749 offset += svlen;
1730 1750
… …
1766 addr = (void *)(((intptr_t)addr) + offset); 1786 addr = (void *)(((intptr_t)addr) + offset);
1767 eio_page_align (&addr, &len); 1787 eio_page_align (&addr, &len);
1768#if _POSIX_MEMLOCK_RANGE 1788#if _POSIX_MEMLOCK_RANGE
1769 RETVAL = munlock (addr, len); 1789 RETVAL = munlock (addr, len);
1770#else 1790#else
1771 RETVAL = ((errno = ENOSYS), -1); 1791 RETVAL = EIO_ENOSYS ();
1772#endif 1792#endif
1773} 1793}
1774 OUTPUT: 1794 OUTPUT:
1775 RETVAL 1795 RETVAL
1776 1796
… …
1778munlockall () 1798munlockall ()
1779 CODE: 1799 CODE:
1780#if _POSIX_MEMLOCK 1800#if _POSIX_MEMLOCK
1781 munlockall (); 1801 munlockall ();
1782#else 1802#else
1783 RETVAL = -1; 1803 RETVAL = EIO_ENOSYS ();
1784 errno = ENOSYS;
1785#endif 1804#endif
1786 OUTPUT: 1805 OUTPUT:
1806 RETVAL
1807
1808int
1809splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags)
1810 CODE:
1811{
1812#if HAVE_LINUX_SPLICE
1813 loff_t off_in_, off_out_;
1814 RETVAL = splice (
1815 rfh, SvOK (off_in ) ? (off_in_ = SvVAL64 (off_in )), &off_in_ : 0,
1816 wfh, SvOK (off_out) ? (off_out_ = SvVAL64 (off_out)), &off_out_ : 0,
1817 length, flags
1818 );
1819#else
1820 RETVAL = EIO_ENOSYS ();
1821#endif
1822}
1823 OUTPUT:
1824 RETVAL
1825
1826int
1827tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags)
1828 CODE:
1829#if HAVE_LINUX_SPLICE
1830 RETVAL = tee (rfh, wfh, length, flags);
1831#else
1832 RETVAL = EIO_ENOSYS ();
1833#endif
1834 OUTPUT:
1787 RETVAL 1835 RETVAL
1788 1836
1789void _on_next_submit (SV *cb) 1837void _on_next_submit (SV *cb)
1790 CODE: 1838 CODE:
1791 SvREFCNT_dec (on_next_submit); 1839 SvREFCNT_dec (on_next_submit);

Diff Legend

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