int r, new_layout = 0, unlink_file = 0, flags;
unsigned long long left;
unsigned int bs;
- char *b;
+ char *b = NULL;
if (read_only) {
log_err("fio: refusing extend of file due to read-only\n");
err:
close(f->fd);
f->fd = -1;
+ if (b)
+ free(b);
return 1;
}
static int pre_read_file(struct thread_data *td, struct fio_file *f)
{
- int r, did_open = 0, old_runstate;
+ int ret = 0, r, did_open = 0, old_runstate;
unsigned long long left;
unsigned int bs;
char *b;
b = malloc(bs);
memset(b, 0, bs);
- lseek(f->fd, f->file_offset, SEEK_SET);
+ if (lseek(f->fd, f->file_offset, SEEK_SET) < 0) {
+ td_verror(td, errno, "lseek");
+ log_err("fio: failed to lseek pre-read file\n");
+ ret = 1;
+ goto error;
+ }
+
left = f->io_size;
while (left && !td->terminate) {
}
}
+error:
td_restore_runstate(td, old_runstate);
if (did_open)
td->io_ops->close_file(td, f);
+
free(b);
- return 0;
+ return ret;
}
static unsigned long long get_rand_file_size(struct thread_data *td)
dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off,
len);
- /*
- * FIXME: add blockdev flushing too
- */
if (f->mmap_ptr) {
ret = posix_madvise(f->mmap_ptr, f->mmap_sz, POSIX_MADV_DONTNEED);
#ifdef FIO_MADV_FREE
} else if (f->filetype == FIO_TYPE_CHAR || f->filetype == FIO_TYPE_PIPE)
ret = 0;
- if (ret < 0) {
- td_verror(td, errno, "invalidate_cache");
- return 1;
- } else if (ret > 0) {
- td_verror(td, ret, "invalidate_cache");
- return 1;
+ /*
+ * Cache flushing isn't a fatal condition, and we know it will
+ * happen on some platforms where we don't have the proper
+ * function to flush eg block device caches. So just warn and
+ * continue on our way.
+ */
+ if (ret) {
+ log_info("fio: cache invalidation of %s failed: %s\n", f->file_name, strerror(errno));
+ ret = 0;
}
- return ret;
+ return 0;
}
} else if (f->filetype != FIO_TYPE_FILE)
continue;
- strcpy(buf, f->file_name);
+ buf[255] = '\0';
+ strncpy(buf, f->file_name, 255);
if (stat(buf, &sb) < 0) {
if (errno != ENOENT)
* Calculate per-file size and potential extra size for the
* first files, if needed.
*/
- if (!o->file_size_low) {
+ if (!o->file_size_low && o->nr_files) {
uint64_t all_fs;
fs = o->size / o->nr_files;
fio_file_hash_unlock();
}
+static struct fio_file *alloc_new_file(struct thread_data *td)
+{
+ struct fio_file *f;
+
+ f = smalloc(sizeof(*f));
+ if (!f) {
+ log_err("fio: smalloc OOM\n");
+ assert(0);
+ return NULL;
+ }
+
+ f->fd = -1;
+ f->shadow_fd = -1;
+ fio_file_reset(td, f);
+ return f;
+}
+
int add_file(struct thread_data *td, const char *fname, int numjob, int inc)
{
int cur_files = td->files_index;
if (numjob && is_already_allocated(file_name))
return 0;
- f = smalloc(sizeof(*f));
- if (!f) {
- log_err("fio: smalloc OOM\n");
- assert(0);
- }
-
- f->fd = -1;
- f->shadow_fd = -1;
- fio_file_reset(td, f);
+ f = alloc_new_file(td);
if (td->files_size <= td->files_index) {
unsigned int new_size = td->o.nr_files + 1;
set_already_allocated(file_name);
- /*
- * For adding files after the fact - if openfiles= isn't
- * given as an option, ensure we allow at least one file open
- */
- if (!td->o.open_files)
- td->o.open_files = 1;
-
if (inc)
td->o.nr_files++;
if (--f->references)
return 0;
- if (should_fsync(td) && td->o.fsync_on_close)
+ if (should_fsync(td) && td->o.fsync_on_close) {
f_ret = fsync(f->fd);
+ if (f_ret < 0)
+ f_ret = errno;
+ }
if (td->io_ops->close_file)
ret = td->io_ops->close_file(td, f);
if (lstat(full_path, &sb) == -1) {
if (errno != ENOENT) {
td_verror(td, errno, "stat");
- return 1;
+ ret = 1;
+ break;
}
}
for_each_file(org, f, i) {
struct fio_file *__f;
- __f = smalloc(sizeof(*__f));
- if (!__f) {
- log_err("fio: smalloc OOM\n");
- assert(0);
- }
- __f->fd = -1;
- __f->shadow_fd = -1;
- fio_file_reset(td, __f);
+ __f = alloc_new_file(td);
if (f->file_name) {
__f->file_name = smalloc_strdup(f->file_name);