f->file_offset = td->o.start_offset;
- if (f->filetype != FIO_TYPE_FILE)
- continue;
if (!total_file_size)
continue;
+ if (f->filetype != FIO_TYPE_FILE) {
+ if (!f->file_size)
+ f->file_size = total_file_size / td->o.nr_files;
+ continue;
+ }
+
if (f->flags & FIO_FILE_EXISTS) {
if ((f->file_size > td->o.size / td->o.nr_files) ||
!f->file_size)
* unless specifically asked for overwrite, let normal io extend it
*/
can_extend = !td->o.overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
- if (can_extend) {
+ if (can_extend && new_files) {
for_each_file(td, f, i) {
if (fill_file_size(td, f, &total_file_size, new_files)) {
log_info("fio: limited to %d files\n", i);
if (td->o.unlink)
f->flags |= FIO_FILE_UNLINK;
+ f->flags |= FIO_FILE_NOSORT;
err = create_file(td, f);
if (err)
break;
ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
else if (f->filetype == FIO_TYPE_FILE)
ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
- else if (f->filetype == FIO_TYPE_BD)
+ else if (f->filetype == FIO_TYPE_BD) {
ret = blockdev_invalidate_cache(f->fd);
- else if (f->filetype == FIO_TYPE_CHAR)
+ if (ret < 0 && errno == EACCES && geteuid()) {
+ log_err("fio: only root may flush block devices. Cache flush bypassed!\n");
+ ret = 0;
+ }
+ } else if (f->filetype == FIO_TYPE_CHAR)
ret = 0;
if (ret < 0) {
}
if (f->fd == -1) {
+ char buf[FIO_VERROR_SIZE];
int __e = errno;
- td_verror(td, __e, "open");
+ snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
+
+ td_verror(td, __e, buf);
if (__e == EINVAL && td->o.odirect)
log_err("fio: destination does not support O_DIRECT\n");
if (__e == EMFILE)
if (td->o.invalidate_cache && file_invalidate_cache(td, f))
goto err;
+ if (!td->o.fadvise_hint)
+ return 0;
+
if (!td_random(td)) {
if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
td_verror(td, errno, "fadvise");
unsigned int i;
for_each_file(td, f, i) {
- if (!f->file_name && (f->flags & FIO_FILE_UNLINK) &&
- f->filetype == FIO_TYPE_FILE) {
+ if ((f->flags & FIO_FILE_UNLINK) &&
+ f->filetype == FIO_TYPE_FILE)
unlink(f->file_name);
- free(f->file_name);
- f->file_name = NULL;
- }
td_io_close_file(td, f);
+ free(f->file_name);
+ f->file_name = NULL;
+
if (f->file_map) {
free(f->file_map);
f->file_map = NULL;
}
td->o.filename = NULL;
+ free(td->files);
td->files = NULL;
td->o.nr_files = 0;
}
void add_file(struct thread_data *td, const char *fname)
{
int cur_files = td->files_index;
+ char file_name[PATH_MAX];
struct fio_file *f;
+ int len = 0;
td->files = realloc(td->files, (cur_files + 1) * sizeof(*f));
f = &td->files[cur_files];
memset(f, 0, sizeof(*f));
f->fd = -1;
- f->file_name = strdup(fname);
+
+ if (td->o.directory)
+ len = sprintf(file_name, "%s/", td->o.directory);
+
+ sprintf(file_name + len, "%s", fname);
+ f->file_name = strdup(file_name);
get_file_type(f);
{
return recurse_dir(td, path);
}
+
+void dup_files(struct thread_data *td, struct thread_data *org)
+{
+ struct fio_file *f;
+ unsigned int i;
+ size_t bytes;
+
+ if (!org->files)
+ return;
+
+ bytes = org->files_index * sizeof(*f);
+ td->files = malloc(bytes);
+ memcpy(td->files, org->files, bytes);
+
+ for_each_file(td, f, i) {
+ if (f->file_name)
+ f->file_name = strdup(f->file_name);
+ }
+}