static int root_warn;
+/*
+ * Leaves f->fd open on success, caller must close
+ */
static int extend_file(struct thread_data *td, struct fio_file *f)
{
int r, new_layout = 0, unlink_file = 0, flags;
unlink_file = 1;
if (unlink_file || new_layout) {
+ dprint(FD_FILE, "layout unlink %s\n", f->file_name);
if ((unlink(f->file_name) < 0) && (errno != ENOENT)) {
td_verror(td, errno, "unlink");
return 1;
goto err;
}
+#ifdef FIO_HAVE_FALLOCATE
dprint(FD_FILE, "fallocate file %s, size %llu\n", f->file_name,
f->real_file_size);
- if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) {
- td_verror(td, errno, "posix_fallocate");
- goto err;
- }
+ r = posix_fallocate(f->fd, 0, f->real_file_size);
+ if (r < 0)
+ log_err("fio: posix_fallocate fails: %s\n", strerror(-r));
+#endif
b = malloc(td->o.max_bs[DDIR_WRITE]);
memset(b, 0, td->o.max_bs[DDIR_WRITE]);
free(b);
done:
- close(f->fd);
- f->fd = -1;
return 0;
err:
close(f->fd);
return 1;
}
- dprint(FD_FILE, "layout unlink %s\n", f->file_name);
static unsigned long long get_rand_file_size(struct thread_data *td)
{
- unsigned long long ret, size_d;
+ unsigned long long ret, sized;
long r;
r = os_random_long(&td->file_size_state);
- size_d = td->o.file_size_high - td->o.file_size_low;
- ret = (unsigned long long) ((double) size_d * (r / (RAND_MAX + 1.0)));
+ sized = td->o.file_size_high - td->o.file_size_low;
+ ret = (unsigned long long) ((double) sized * (r / (OS_RAND_MAX + 1.0)));
ret += td->o.file_size_low;
ret -= (ret % td->o.rw_min_bs);
return ret;
return 0;
}
-int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
+static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
+ unsigned long long off,
+ unsigned long long len)
{
int ret = 0;
- dprint(FD_IO, "invalidate cache (%d)\n", td->o.odirect);
+ if (len == -1ULL)
+ len = f->io_size;
+ if (off == -1ULL)
+ off = f->file_offset;
- if (td->o.odirect)
- return 0;
+ dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off,
+ len);
/*
* FIXME: add blockdev flushing too
*/
if (f->mmap)
- ret = madvise(f->mmap, f->io_size, MADV_DONTNEED);
+ ret = madvise(f->mmap, len, MADV_DONTNEED);
else if (f->filetype == FIO_TYPE_FILE) {
- ret = fadvise(f->fd, f->file_offset, f->io_size,
- POSIX_FADV_DONTNEED);
+ ret = fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
} else if (f->filetype == FIO_TYPE_BD) {
ret = blockdev_invalidate_cache(f->fd);
if (ret < 0 && errno == EACCES && geteuid()) {
if (ret < 0) {
td_verror(td, errno, "invalidate_cache");
return 1;
+ } else if (ret > 0) {
+ td_verror(td, ret, "invalidate_cache");
+ return 1;
}
return ret;
+
+}
+
+int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
+{
+ if (!(f->flags & FIO_FILE_OPEN))
+ return 0;
+
+ return __file_invalidate_cache(td, f, -1, -1);
}
int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
if (td->o.sync_io)
flags |= O_SYNC;
if (f->filetype != FIO_TYPE_FILE)
- flags |= O_NOATIME;
+ flags |= FIO_O_NOATIME;
open_again:
if (td_write(td)) {
char buf[FIO_VERROR_SIZE];
int __e = errno;
- if (errno == EPERM && (flags & O_NOATIME)) {
- flags &= ~O_NOATIME;
+ if (errno == EPERM && (flags & FIO_O_NOATIME)) {
+ flags &= ~FIO_O_NOATIME;
goto open_again;
}
*/
if (need_extend) {
temp_stall_ts = 1;
- log_info("%s: Laying out IO file(s) (%u file(s) / %LuMiB)\n",
- td->o.name, need_extend, extend_size >> 20);
+ if (!terse_output)
+ log_info("%s: Laying out IO file(s) (%u file(s) /"
+ " %LuMiB)\n", td->o.name, need_extend,
+ extend_size >> 20);
for_each_file(td, f, i) {
+ unsigned long long old_len, extend_len;
+
if (!(f->flags & FIO_FILE_EXTEND))
continue;
assert(f->filetype == FIO_TYPE_FILE);
f->flags &= ~FIO_FILE_EXTEND;
+ old_len = f->real_file_size;
+ extend_len = f->io_size + f->file_offset - old_len;
f->real_file_size = (f->io_size + f->file_offset);
err = extend_file(td, f);
if (err)
break;
+
+ err = __file_invalidate_cache(td, f, old_len,
+ extend_len);
+ close(f->fd);
+ f->fd = -1;
+ if (err)
+ break;
}
temp_stall_ts = 0;
}
(unsigned long long) td->o.rw_min_bs;
num_maps = (blocks + BLOCKS_PER_MAP - 1) /
(unsigned long long) BLOCKS_PER_MAP;
- f->file_map = smalloc(num_maps * sizeof(long));
- if (!f->file_map) {
+ f->file_map = smalloc(num_maps * sizeof(int));
+ if (f->file_map) {
+ f->num_maps = num_maps;
+ continue;
+ }
+ if (!td->o.softrandommap) {
log_err("fio: failed allocating random map. If running"
" a large number of jobs, try the 'norandommap'"
- " option\n");
+ " option or set 'softrandommap'. Or give"
+ " a larger --alloc-size to fio.\n");
return 1;
}
- f->num_maps = num_maps;
+
+ log_info("fio: file %s failed allocating random map. Running "
+ "job without.\n", f->file_name);
+ f->num_maps = 0;
}
return 0;
}
td_io_close_file(td, f);
+ remove_file_hash(f);
sfree(f->file_name);
f->file_name = NULL;
dprint(FD_FILE, "add file %s\n", fname);
f = smalloc(sizeof(*f));
+ if (!f) {
+ log_err("fio: smalloc OOM\n");
+ assert(0);
+ }
+
f->fd = -1;
dprint(FD_FILE, "resize file array to %d files\n", cur_files + 1);
sprintf(file_name + len, "%s", fname);
f->file_name = smalloc_strdup(file_name);
-
+ if (!f->file_name) {
+ log_err("fio: smalloc OOM\n");
+ assert(0);
+ }
+
get_file_type(f);
switch (td->o.file_lock_mode) {
ret = td->io_ops->close_file(td, f);
if (!ret)
- ret = !f_ret;
+ ret = f_ret;
td->nr_open_files--;
f->flags &= ~FIO_FILE_OPEN;
struct fio_file *__f;
__f = smalloc(sizeof(*__f));
-
- if (f->file_name)
+ if (!__f) {
+ log_err("fio: smalloc OOM\n");
+ assert(0);
+ }
+
+ if (f->file_name) {
__f->file_name = smalloc_strdup(f->file_name);
+ if (!__f->file_name) {
+ log_err("fio: smalloc OOM\n");
+ assert(0);
+ }
+
+ __f->filetype = f->filetype;
+ }
td->files[i] = __f;
}
projects / fio.git / blobdiff