#include <fcntl.h>
#include <string.h>
#include <assert.h>
+#include <dirent.h>
#include <sys/stat.h>
#include <sys/mman.h>
+#include <sys/types.h>
#include "fio.h"
#include "os.h"
return 1;
}
+static unsigned long long set_rand_file_size(struct thread_data *td,
+ unsigned long long total_size)
+{
+ unsigned long long upper = total_size;
+ unsigned long long ret;
+ long r;
+
+ if (upper > td->file_size_high)
+ upper = td->file_size_high;
+ else if (upper < td->file_size_low)
+ return 0;
+ else if (!upper)
+ return 0;
+
+ r = os_random_long(&td->file_size_state);
+ ret = td->file_size_low + (unsigned long long) ((double) upper * (r / (RAND_MAX + 1.0)));
+ ret -= (ret % td->rw_min_bs);
+ if (ret > upper)
+ ret = upper;
+ return ret;
+}
+
static int create_files(struct thread_data *td)
{
struct fio_file *f;
int err, need_create, can_extend;
- unsigned int i;
+ unsigned long long total_file_size, local_file_size;
+ unsigned int i, new_files;
+ new_files = 0;
+ total_file_size = td->total_file_size;
for_each_file(td, f, i) {
+ unsigned long long s;
+
+ f->file_offset = td->start_offset;
+
if (f->filetype != FIO_TYPE_FILE)
continue;
- f->file_size = td->total_file_size / td->nr_normal_files;
- f->file_offset = td->start_offset;
+ if (f->flags & FIO_FILE_EXISTS) {
+ s = f->file_size;
+ if (s > total_file_size)
+ s = total_file_size;
+
+ total_file_size -= s;
+ } else
+ new_files++;
}
/*
return 0;
need_create = 0;
+ local_file_size = total_file_size;
+ if (!local_file_size)
+ local_file_size = -1;
+
for_each_file(td, f, i) {
int file_there;
if (f->filetype != FIO_TYPE_FILE)
continue;
+ if (f->flags & FIO_FILE_EXISTS)
+ continue;
+
+ if (!td->file_size_low)
+ f->file_size = total_file_size / new_files;
+ else {
+ /*
+ * If we don't have enough space left for a file
+ * of the minimum size, bail.
+ */
+ if (local_file_size < td->file_size_low) {
+ log_info("fio: limited to %d files\n", i);
+ new_files -= (td->nr_files - i);
+ td->nr_files = i;
+ break;
+ }
+
+ f->file_size = set_rand_file_size(td, local_file_size);
+ local_file_size -= f->file_size;
+ }
file_there = !file_ok(td, f);
}
temp_stall_ts = 1;
- fprintf(f_out, "%s: Laying out IO file(s) (%u x %LuMiB == %LuMiB)\n",
- td->name, td->nr_normal_files,
- (td->total_file_size >> 20) / td->nr_normal_files,
- td->total_file_size >> 20);
+ fprintf(f_out, "%s: Laying out IO file(s) (%u files / %LuMiB)\n",
+ td->name, new_files,
+ total_file_size >> 20);
err = 0;
for_each_file(td, f, i) {
{
int ret = 0;
- if (f->filetype == FIO_TYPE_FILE)
- ret = file_size(td, f);
- else if (f->filetype == FIO_TYPE_BD)
+ if (f->filetype == FIO_TYPE_FILE) {
+ if (!(f->flags & FIO_FILE_EXISTS))
+ ret = file_size(td, f);
+ } else if (f->filetype == FIO_TYPE_BD)
ret = bdev_size(td, f);
else
f->real_file_size = -1;
td_verror(td, __e, "open");
if (__e == EINVAL && td->odirect)
log_err("fio: destination does not support O_DIRECT\n");
+ if (__e == EMFILE)
+ log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->nr_files);
return 1;
}
for_each_file(td, f, i)
td->total_file_size += f->file_size;
- td->total_file_size = (td->total_file_size * td->nr_files) / td->open_files;
-
td->io_size = td->total_file_size;
if (td->io_size == 0) {
log_err("%s: no io blocks\n", td->name);
}
td->filename = NULL;
- free(td->files);
td->files = NULL;
td->nr_files = 0;
}
f->filetype = FIO_TYPE_FILE;
if (!lstat(f->file_name, &sb)) {
+ f->flags |= FIO_FILE_EXISTS;
+
if (S_ISBLK(sb.st_mode))
f->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
f->filetype = FIO_TYPE_CHAR;
+ else {
+ /*
+ * might as well do this here, and save a stat later on
+ */
+ f->real_file_size = sb.st_size;
+ f->file_size = f->real_file_size;
+ }
}
}
if (--f->references)
return;
+ if (should_fsync(td) && td->fsync_on_close)
+ fsync(f->fd);
+
if (td->io_ops->close_file)
td->io_ops->close_file(td, f);
td->nr_open_files--;
f->flags &= ~FIO_FILE_OPEN;
}
+
+static int recurse_dir(struct thread_data *td, const char *dirname)
+{
+ struct dirent *dir;
+ int ret = 0;
+ DIR *D;
+
+ D = opendir(dirname);
+ if (!D) {
+ td_verror(td, errno, "opendir");
+ return 1;
+ }
+
+ while ((dir = readdir(D)) != NULL) {
+ char full_path[PATH_MAX];
+ struct stat sb;
+
+ if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
+ continue;
+
+ sprintf(full_path, "%s/%s", dirname, dir->d_name);
+
+ if (lstat(full_path, &sb) == -1) {
+ if (errno != ENOENT) {
+ td_verror(td, errno, "stat");
+ return 1;
+ }
+ }
+
+ if (S_ISREG(sb.st_mode)) {
+ add_file(td, full_path);
+ td->nr_files++;
+ continue;
+ }
+
+ if ((ret = recurse_dir(td, full_path)) != 0)
+ break;
+ }
+
+ closedir(D);
+ return ret;
+}
+
+int add_dir_files(struct thread_data *td, const char *path)
+{
+ return recurse_dir(td, path);
+}
projects / fio.git / blobdiff