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.211 by root, Sat Apr 7 00:50:33 2012 UTC vs.
Revision 1.225 by root, Sat Dec 29 09:35:39 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
… …
152#endif 153#endif
153#ifndef minor 154#ifndef minor
154# define minor(dev) ((dev) & 0xff) 155# define minor(dev) ((dev) & 0xff)
155#endif 156#endif
156 157
157#ifndef PAGESIZE 158#if PAGESIZE <= 0
158# define PAGESIZE sysconf (_SC_PAGESIZE) 159# define PAGESIZE sysconf (_SC_PAGESIZE)
159#endif 160#endif
160 161
161/*****************************************************************************/ 162/*****************************************************************************/
162 163
… …
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;
169 int count = req->int3; 173 int count = req->int3;
170 174
171 /* heuristic: first try with 64 extents if we don't know how many, */ 175 req->flags |= EIO_FLAG_PTR1_FREE;
172 /* as most files have (hopefully) fewer than this many extents */ 176
173 /* 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 */
174 if (count < 0) 179 if (count < 0)
175 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 (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);
176 210
177 for (;;) 211 for (;;)
178 { 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 count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents;
179 struct fiemap *fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); 227 fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
180 errno = ENOMEM; 228 errno = ENOMEM;
181 if (!fiemap) 229 if (!fiemap)
182 return; 230 return;
183 231
184 req->ptr1 = fiemap; 232 req->ptr1 = fiemap;
185 req->flags |= EIO_FLAG_PTR1_FREE;
186 233
187 fiemap->fm_start = req->offs; 234 for (count = 0; count < incmap->fm_mapped_extents; ++count)
188 fiemap->fm_length = req->size; 235 {
189 fiemap->fm_flags = req->int2; 236 struct fiemap_extent *e = incmap->fm_extents + count;
190 fiemap->fm_extent_count = count;
191 237
192 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap)) 238 if (e->fe_logical + e->fe_length >= end_offset)
193 return; 239 goto done;
194 240
195 if (req->int3 >= 0) 241 fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e;
196 break; /* when not autosizing we are done */
197 242
198 if (fiemap->fm_extents [fiemap->fm_mapped_extents - 1].fe_flags & FIEMAP_EXTENT_LAST) 243 if (e->fe_flags & FIEMAP_EXTENT_LAST)
199 break; /* autosizing successful, we are done */ 244 goto done;
200 245
201 fiemap->fm_flags = req->int2; 246 }
202 fiemap->fm_extent_count = 0;
203
204 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap))
205 return;
206
207 count = fiemap->fm_mapped_extents;
208
209 free (fiemap);
210 } 247 }
211 248
249done:
212 req->result = 0; 250 req->result = 0;
213 251
214#else 252#else
215 errno = ENOSYS; 253 errno = ENOSYS;
216#endif 254#endif
… …
469#ifndef _WIN32 507#ifndef _WIN32
470 if (req->result >= 0) 508 if (req->result >= 0)
471 { 509 {
472 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 510 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
473 HV *hv = newHV (); 511 HV *hv = newHV ();
512 /* POSIX requires fsid to be unsigned long, but AIX in its infinite wisdom
513 * chooses to make it a struct.
514 */
515 unsigned long fsid = 0;
516 memcpy (&fsid, &f->f_fsid, sizeof (unsigned long) < sizeof (f->f_fsid) ? sizeof (unsigned long) : sizeof (f->f_fsid));
474 517
475 rv = sv_2mortal (newRV_noinc ((SV *)hv)); 518 rv = sv_2mortal (newRV_noinc ((SV *)hv));
476 519
477 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0); 520 hv_store (hv, "bsize" , sizeof ("bsize" ) - 1, newSVval64 (f->f_bsize ), 0);
478 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0); 521 hv_store (hv, "frsize" , sizeof ("frsize" ) - 1, newSVval64 (f->f_frsize ), 0);
… …
480 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0); 523 hv_store (hv, "bfree" , sizeof ("bfree" ) - 1, newSVval64 (f->f_bfree ), 0);
481 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0); 524 hv_store (hv, "bavail" , sizeof ("bavail" ) - 1, newSVval64 (f->f_bavail ), 0);
482 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0); 525 hv_store (hv, "files" , sizeof ("files" ) - 1, newSVval64 (f->f_files ), 0);
483 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0); 526 hv_store (hv, "ffree" , sizeof ("ffree" ) - 1, newSVval64 (f->f_ffree ), 0);
484 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 527 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
485 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 528 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (fsid ), 0);
486 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); 529 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
487 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); 530 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
488 } 531 }
489#endif 532#endif
490 533
… …
697} 740}
698 741
699/*****************************************************************************/ 742/*****************************************************************************/
700 743
701#if !_POSIX_MAPPED_FILES 744#if !_POSIX_MAPPED_FILES
702# define mmap(addr,length,prot,flags,fd,offs) (errno = ENOSYS, -1) 745# define mmap(addr,length,prot,flags,fd,offs) EIO_ENOSYS ()
703# define munmap(addr,length) (errno = ENOSYS, -1) 746# define munmap(addr,length) EIO_ENOSYS ()
704#endif 747#endif
705 748
706#if !_POSIX_MEMORY_PROTECTION 749#if !_POSIX_MEMORY_PROTECTION
707# define mprotect(addr,len,prot) (errno = ENOSYS, -1) 750# define mprotect(addr,len,prot) EIO_ENOSYS ()
708# define PROT_NONE 0 751# define PROT_NONE 0
709# define PROT_WRITE 0 752# define PROT_WRITE 0
710# define MAP_PRIVATE 0 753# define MAP_PRIVATE 0
711# define MAP_SHARED 0 754# define MAP_SHARED 0
712# define MAP_FIXED 0 755# define MAP_FIXED 0
… …
955 const_iv (FIEMAP_EXTENT_DATA_TAIL) 998 const_iv (FIEMAP_EXTENT_DATA_TAIL)
956 const_iv (FIEMAP_EXTENT_UNWRITTEN) 999 const_iv (FIEMAP_EXTENT_UNWRITTEN)
957 const_iv (FIEMAP_EXTENT_MERGED) 1000 const_iv (FIEMAP_EXTENT_MERGED)
958 const_iv (FIEMAP_EXTENT_SHARED) 1001 const_iv (FIEMAP_EXTENT_SHARED)
959 1002
1003 const_iv (SPLICE_F_MOVE)
1004 const_iv (SPLICE_F_NONBLOCK)
1005 const_iv (SPLICE_F_MORE)
1006 const_iv (SPLICE_F_GIFT)
1007
1008 const_iv (SEEK_DATA)
1009 const_iv (SEEK_HOLE)
1010
1011 /* libeio constants */
960 const_eio (SEEK_SET) 1012 const_eio (SEEK_SET)
961 const_eio (SEEK_CUR) 1013 const_eio (SEEK_CUR)
962 const_eio (SEEK_END) 1014 const_eio (SEEK_END)
963 1015
964 const_eio (MCL_FUTURE) 1016 const_eio (MCL_FUTURE)
… …
973 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 1025 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
974 const_eio (SYNC_FILE_RANGE_WRITE) 1026 const_eio (SYNC_FILE_RANGE_WRITE)
975 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 1027 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
976 1028
977 const_eio (FALLOC_FL_KEEP_SIZE) 1029 const_eio (FALLOC_FL_KEEP_SIZE)
1030 const_eio (FALLOC_FL_PUNCH_HOLE)
978 1031
979 const_eio (READDIR_DENTS) 1032 const_eio (READDIR_DENTS)
980 const_eio (READDIR_DIRS_FIRST) 1033 const_eio (READDIR_DIRS_FIRST)
981 const_eio (READDIR_STAT_ORDER) 1034 const_eio (READDIR_STAT_ORDER)
982 const_eio (READDIR_FOUND_UNKNOWN) 1035 const_eio (READDIR_FOUND_UNKNOWN)
… …
1083 aio_fsync = EIO_FSYNC 1136 aio_fsync = EIO_FSYNC
1084 aio_fdatasync = EIO_FDATASYNC 1137 aio_fdatasync = EIO_FDATASYNC
1085 aio_syncfs = EIO_SYNCFS 1138 aio_syncfs = EIO_SYNCFS
1086 PPCODE: 1139 PPCODE:
1087{ 1140{
1088 int fd = s_fileno_croak (fh, 0); 1141 int fd = s_fileno_croak (fh, 0);
1089 dREQ; 1142 dREQ;
1090 1143
1091 req->type = ix; 1144 req->type = ix;
1092 req->sv1 = newSVsv (fh); 1145 req->sv1 = newSVsv (fh);
1093 req->int1 = fd; 1146 req->int1 = fd;
… …
1097 1150
1098void 1151void
1099aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) 1152aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
1100 PPCODE: 1153 PPCODE:
1101{ 1154{
1102 int fd = s_fileno_croak (fh, 0); 1155 int fd = s_fileno_croak (fh, 0);
1103 dREQ; 1156 dREQ;
1104 1157
1105 req->type = EIO_SYNC_FILE_RANGE; 1158 req->type = EIO_SYNC_FILE_RANGE;
1106 req->sv1 = newSVsv (fh); 1159 req->sv1 = newSVsv (fh);
1107 req->int1 = fd; 1160 req->int1 = fd;
… …
1111 1164
1112 REQ_SEND; 1165 REQ_SEND;
1113} 1166}
1114 1167
1115void 1168void
1116aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef) 1169aio_allocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1117 PPCODE: 1170 PPCODE:
1118{ 1171{
1119 int fd = s_fileno_croak (fh, 0); 1172 int fd = s_fileno_croak (fh, 0);
1120 dREQ; 1173 dREQ;
1121 1174
1122 req->type = EIO_FALLOCATE; 1175 req->type = EIO_FALLOCATE;
1123 req->sv1 = newSVsv (fh); 1176 req->sv1 = newSVsv (fh);
1124 req->int1 = fd; 1177 req->int1 = fd;
… …
1132void 1185void
1133aio_close (SV *fh, SV *callback=&PL_sv_undef) 1186aio_close (SV *fh, SV *callback=&PL_sv_undef)
1134 PPCODE: 1187 PPCODE:
1135{ 1188{
1136 static int close_fd = -1; /* dummy fd to close fds via dup2 */ 1189 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1137 int fd = s_fileno_croak (fh, 0); 1190 int fd = s_fileno_croak (fh, 0);
1138 dREQ; 1191 dREQ;
1139 1192
1140 if (expect_false (close_fd < 0)) 1193 if (expect_false (close_fd < 0))
1141 { 1194 {
1142 int pipefd [2]; 1195 int pipefd [2];
… …
1205 } 1258 }
1206 else 1259 else
1207 { 1260 {
1208 /* read: check type and grow scalar as necessary */ 1261 /* read: check type and grow scalar as necessary */
1209 SvUPGRADE (data, SVt_PV); 1262 SvUPGRADE (data, SVt_PV);
1263 if (SvLEN (data) >= SvCUR (data))
1210 svptr = SvGROW (data, len + dataoffset + 1); 1264 svptr = SvGROW (data, len + dataoffset + 1);
1265 else if (SvCUR (data) < len + dataoffset)
1266 croak ("length + dataoffset outside of scalar, and cannot grow");
1211 } 1267 }
1212 1268
1213 { 1269 {
1214 dREQ; 1270 dREQ;
1215 1271
… …
1249 1305
1250void 1306void
1251aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) 1307aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
1252 PPCODE: 1308 PPCODE:
1253{ 1309{
1254 int ifd = s_fileno_croak (in_fh , 0); 1310 int ifd = s_fileno_croak (in_fh , 0);
1255 int ofd = s_fileno_croak (out_fh, 1); 1311 int ofd = s_fileno_croak (out_fh, 1);
1256 dREQ; 1312 dREQ;
1257 1313
1258 req->type = EIO_SENDFILE; 1314 req->type = EIO_SENDFILE;
1259 req->sv1 = newSVsv (out_fh); 1315 req->sv1 = newSVsv (out_fh);
1260 req->int1 = ofd; 1316 req->int1 = ofd;
… …
1268 1324
1269void 1325void
1270aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) 1326aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
1271 PPCODE: 1327 PPCODE:
1272{ 1328{
1273 int fd = s_fileno_croak (fh, 0); 1329 int fd = s_fileno_croak (fh, 0);
1274 dREQ; 1330 dREQ;
1275 1331
1276 req->type = EIO_READAHEAD; 1332 req->type = EIO_READAHEAD;
1277 req->sv1 = newSVsv (fh); 1333 req->sv1 = newSVsv (fh);
1278 req->int1 = fd; 1334 req->int1 = fd;
… …
1518 1574
1519void 1575void
1520aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef) 1576aio_fiemap (SV *fh, off_t start, SV *length, U32 flags, SV *count, SV *callback=&PL_sv_undef)
1521 PPCODE: 1577 PPCODE:
1522{ 1578{
1523 int fd = s_fileno_croak (fh, 0); 1579 int fd = s_fileno_croak (fh, 0);
1524 dREQ; 1580 dREQ;
1525 1581
1526 req->type = EIO_CUSTOM; 1582 req->type = EIO_CUSTOM;
1527 req->sv1 = newSVsv (fh); 1583 req->sv1 = newSVsv (fh);
1528 req->int1 = fd; 1584 req->int1 = fd;
… …
1676 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1732 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1677 OUTPUT: 1733 OUTPUT:
1678 RETVAL 1734 RETVAL
1679 1735
1680void 1736void
1681mmap (SV *scalar, size_t length, int prot, int flags, SV *fh, off_t offset = 0) 1737mmap (SV *scalar, size_t length, int prot, int flags, SV *fh = &PL_sv_undef, off_t offset = 0)
1682 PPCODE: 1738 PPCODE:
1683 sv_unmagic (scalar, MMAP_MAGIC); 1739 sv_unmagic (scalar, MMAP_MAGIC);
1684{ 1740{
1685 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1; 1741 int fd = SvOK (fh) ? s_fileno_croak (fh, flags & PROT_WRITE) : -1;
1686 void *addr = (void *)mmap (0, length, prot, flags, fd, offset); 1742 void *addr = (void *)mmap (0, length, prot, flags, fd, offset);
… …
1719 ALIAS: 1775 ALIAS:
1720 mprotect = 1 1776 mprotect = 1
1721 CODE: 1777 CODE:
1722{ 1778{
1723 STRLEN svlen; 1779 STRLEN svlen;
1724 void *addr = SvPVbyte (scalar, svlen); 1780 void *addr = SvPVbyte (scalar, svlen);
1725 size_t len = SvUV (length); 1781 size_t len = SvUV (length);
1726 1782
1727 if (offset < 0) 1783 if (offset < 0)
1728 offset += svlen; 1784 offset += svlen;
1729 1785
… …
1748int 1804int
1749munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef) 1805munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
1750 CODE: 1806 CODE:
1751{ 1807{
1752 STRLEN svlen; 1808 STRLEN svlen;
1753 void *addr = SvPVbyte (scalar, svlen); 1809 void *addr = SvPVbyte (scalar, svlen);
1754 size_t len = SvUV (length); 1810 size_t len = SvUV (length);
1755 1811
1756 if (offset < 0) 1812 if (offset < 0)
1757 offset += svlen; 1813 offset += svlen;
1758 1814
… …
1765 addr = (void *)(((intptr_t)addr) + offset); 1821 addr = (void *)(((intptr_t)addr) + offset);
1766 eio_page_align (&addr, &len); 1822 eio_page_align (&addr, &len);
1767#if _POSIX_MEMLOCK_RANGE 1823#if _POSIX_MEMLOCK_RANGE
1768 RETVAL = munlock (addr, len); 1824 RETVAL = munlock (addr, len);
1769#else 1825#else
1770 RETVAL = ((errno = ENOSYS), -1); 1826 RETVAL = EIO_ENOSYS ();
1771#endif 1827#endif
1772} 1828}
1773 OUTPUT: 1829 OUTPUT:
1774 RETVAL 1830 RETVAL
1775 1831
… …
1777munlockall () 1833munlockall ()
1778 CODE: 1834 CODE:
1779#if _POSIX_MEMLOCK 1835#if _POSIX_MEMLOCK
1780 munlockall (); 1836 munlockall ();
1781#else 1837#else
1782 RETVAL = -1; 1838 RETVAL = EIO_ENOSYS ();
1783 errno = ENOSYS;
1784#endif 1839#endif
1785 OUTPUT: 1840 OUTPUT:
1841 RETVAL
1842
1843int
1844splice (aio_rfd rfh, SV *off_in, aio_wfd wfh, SV *off_out, size_t length, unsigned int flags)
1845 CODE:
1846{
1847#if HAVE_LINUX_SPLICE
1848 loff_t off_in_, off_out_;
1849 RETVAL = splice (
1850 rfh, SvOK (off_in ) ? (off_in_ = SvVAL64 (off_in )), &off_in_ : 0,
1851 wfh, SvOK (off_out) ? (off_out_ = SvVAL64 (off_out)), &off_out_ : 0,
1852 length, flags
1853 );
1854#else
1855 RETVAL = EIO_ENOSYS ();
1856#endif
1857}
1858 OUTPUT:
1859 RETVAL
1860
1861int
1862tee (aio_rfd rfh, aio_wfd wfh, size_t length, unsigned int flags)
1863 CODE:
1864#if HAVE_LINUX_SPLICE
1865 RETVAL = tee (rfh, wfh, length, flags);
1866#else
1867 RETVAL = EIO_ENOSYS ();
1868#endif
1869 OUTPUT:
1786 RETVAL 1870 RETVAL
1787 1871
1788void _on_next_submit (SV *cb) 1872void _on_next_submit (SV *cb)
1789 CODE: 1873 CODE:
1790 SvREFCNT_dec (on_next_submit); 1874 SvREFCNT_dec (on_next_submit);

Diff Legend

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