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.219 by root, Fri Jul 27 18:43:25 2012 UTC vs.
Revision 1.225 by root, Sat Dec 29 09:35:39 2012 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 72 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 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 (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);
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 count = fiemap->fm_mapped_extents + incmap->fm_mapped_extents;
180 struct fiemap *fiemap = malloc (sizeof (*fiemap) + sizeof (struct fiemap_extent) * count); 227 fiemap = realloc (fiemap, sizeof (*fiemap) + sizeof (struct fiemap_extent) * count);
181 errno = ENOMEM; 228 errno = ENOMEM;
182 if (!fiemap) 229 if (!fiemap)
183 return; 230 return;
184 231
185 req->ptr1 = fiemap; 232 req->ptr1 = fiemap;
186 req->flags |= EIO_FLAG_PTR1_FREE;
187 233
188 fiemap->fm_start = req->offs; 234 for (count = 0; count < incmap->fm_mapped_extents; ++count)
189 fiemap->fm_length = req->size; 235 {
190 fiemap->fm_flags = req->int2; 236 struct fiemap_extent *e = incmap->fm_extents + count;
191 fiemap->fm_extent_count = count;
192 237
193 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap)) 238 if (e->fe_logical + e->fe_length >= end_offset)
194 return; 239 goto done;
195 240
196 if (req->int3 >= 0) 241 fiemap->fm_extents [fiemap->fm_mapped_extents++] = *e;
197 break; /* when not autosizing we are done */
198 242
199 if (fiemap->fm_mapped_extents < count) 243 if (e->fe_flags & FIEMAP_EXTENT_LAST)
200 /* either autosizing succeeded, 244 goto done;
201 * or the file had no extents
202 * or we luckily had enough space */
203 break;
204 245
205 /* some kernels overwrite fm_length, so just reset everything */ 246 }
206 fiemap->fm_start = req->offs;
207 fiemap->fm_length = req->size;
208 fiemap->fm_flags = req->int2;
209 fiemap->fm_extent_count = 0;
210
211 if (ioctl (req->int1, FS_IOC_FIEMAP, fiemap))
212 return;
213
214 /* to work around a kernel bug, we allocate one more */
215 count = fiemap->fm_mapped_extents + 1;
216
217 free (fiemap);
218 } 247 }
219 248
249done:
220 req->result = 0; 250 req->result = 0;
221 251
222#else 252#else
223 errno = ENOSYS; 253 errno = ENOSYS;
224#endif 254#endif
… …
477#ifndef _WIN32 507#ifndef _WIN32
478 if (req->result >= 0) 508 if (req->result >= 0)
479 { 509 {
480 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 510 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
481 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));
482 517
483 rv = sv_2mortal (newRV_noinc ((SV *)hv)); 518 rv = sv_2mortal (newRV_noinc ((SV *)hv));
484 519
485 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);
486 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);
… …
488 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);
489 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);
490 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);
491 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);
492 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);
493 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 528 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (fsid ), 0);
494 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);
495 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);
496 } 531 }
497#endif 532#endif
498 533
… …
1101 aio_fsync = EIO_FSYNC 1136 aio_fsync = EIO_FSYNC
1102 aio_fdatasync = EIO_FDATASYNC 1137 aio_fdatasync = EIO_FDATASYNC
1103 aio_syncfs = EIO_SYNCFS 1138 aio_syncfs = EIO_SYNCFS
1104 PPCODE: 1139 PPCODE:
1105{ 1140{
1106 int fd = s_fileno_croak (fh, 0); 1141 int fd = s_fileno_croak (fh, 0);
1107 dREQ; 1142 dREQ;
1108 1143
1109 req->type = ix; 1144 req->type = ix;
1110 req->sv1 = newSVsv (fh); 1145 req->sv1 = newSVsv (fh);
1111 req->int1 = fd; 1146 req->int1 = fd;
… …
1115 1150
1116void 1151void
1117aio_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)
1118 PPCODE: 1153 PPCODE:
1119{ 1154{
1120 int fd = s_fileno_croak (fh, 0); 1155 int fd = s_fileno_croak (fh, 0);
1121 dREQ; 1156 dREQ;
1122 1157
1123 req->type = EIO_SYNC_FILE_RANGE; 1158 req->type = EIO_SYNC_FILE_RANGE;
1124 req->sv1 = newSVsv (fh); 1159 req->sv1 = newSVsv (fh);
1125 req->int1 = fd; 1160 req->int1 = fd;
… …
1129 1164
1130 REQ_SEND; 1165 REQ_SEND;
1131} 1166}
1132 1167
1133void 1168void
1134aio_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)
1135 PPCODE: 1170 PPCODE:
1136{ 1171{
1137 int fd = s_fileno_croak (fh, 0); 1172 int fd = s_fileno_croak (fh, 0);
1138 dREQ; 1173 dREQ;
1139 1174
1140 req->type = EIO_FALLOCATE; 1175 req->type = EIO_FALLOCATE;
1141 req->sv1 = newSVsv (fh); 1176 req->sv1 = newSVsv (fh);
1142 req->int1 = fd; 1177 req->int1 = fd;
… …
1150void 1185void
1151aio_close (SV *fh, SV *callback=&PL_sv_undef) 1186aio_close (SV *fh, SV *callback=&PL_sv_undef)
1152 PPCODE: 1187 PPCODE:
1153{ 1188{
1154 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 */
1155 int fd = s_fileno_croak (fh, 0); 1190 int fd = s_fileno_croak (fh, 0);
1156 dREQ; 1191 dREQ;
1157 1192
1158 if (expect_false (close_fd < 0)) 1193 if (expect_false (close_fd < 0))
1159 { 1194 {
1160 int pipefd [2]; 1195 int pipefd [2];
… …
1270 1305
1271void 1306void
1272aio_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)
1273 PPCODE: 1308 PPCODE:
1274{ 1309{
1275 int ifd = s_fileno_croak (in_fh , 0); 1310 int ifd = s_fileno_croak (in_fh , 0);
1276 int ofd = s_fileno_croak (out_fh, 1); 1311 int ofd = s_fileno_croak (out_fh, 1);
1277 dREQ; 1312 dREQ;
1278 1313
1279 req->type = EIO_SENDFILE; 1314 req->type = EIO_SENDFILE;
1280 req->sv1 = newSVsv (out_fh); 1315 req->sv1 = newSVsv (out_fh);
1281 req->int1 = ofd; 1316 req->int1 = ofd;
… …
1289 1324
1290void 1325void
1291aio_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)
1292 PPCODE: 1327 PPCODE:
1293{ 1328{
1294 int fd = s_fileno_croak (fh, 0); 1329 int fd = s_fileno_croak (fh, 0);
1295 dREQ; 1330 dREQ;
1296 1331
1297 req->type = EIO_READAHEAD; 1332 req->type = EIO_READAHEAD;
1298 req->sv1 = newSVsv (fh); 1333 req->sv1 = newSVsv (fh);
1299 req->int1 = fd; 1334 req->int1 = fd;
… …
1769int 1804int
1770munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef) 1805munlock (SV *scalar, off_t offset = 0, SV *length = &PL_sv_undef)
1771 CODE: 1806 CODE:
1772{ 1807{
1773 STRLEN svlen; 1808 STRLEN svlen;
1774 void *addr = SvPVbyte (scalar, svlen); 1809 void *addr = SvPVbyte (scalar, svlen);
1775 size_t len = SvUV (length); 1810 size_t len = SvUV (length);
1776 1811
1777 if (offset < 0) 1812 if (offset < 0)
1778 offset += svlen; 1813 offset += svlen;
1779 1814

Diff Legend

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