projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fio 1.14a
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index 0a4e77ef33e3aef63b597cc9af118d19b54a0fa9..f43efe0d395162a70bdc9319c760909ed5b27585 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-101,14
+101,27
@@
static int create_files(struct thread_data *td)
{
struct fio_file *f;
int err, need_create, can_extend;
{
struct fio_file *f;
int err, need_create, can_extend;
- unsigned int i;
+ unsigned long long total_file_size;
+ unsigned int i, new_files;
+ new_files = 0;
+ total_file_size = td->total_file_size;
for_each_file(td, f, i) {
for_each_file(td, f, i) {
+ unsigned long long s;
+
+ f->file_offset = td->start_offset;
+
if (f->filetype != FIO_TYPE_FILE)
continue;
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++;
}
/*
}
/*
@@
-124,6
+137,10
@@
static int create_files(struct thread_data *td)
if (f->filetype != FIO_TYPE_FILE)
continue;
if (f->filetype != FIO_TYPE_FILE)
continue;
+ if (f->flags & FIO_FILE_EXISTS)
+ continue;
+
+ f->file_size = total_file_size / new_files;
file_there = !file_ok(td, f);
file_there = !file_ok(td, f);
@@
-146,9
+163,9
@@
static int create_files(struct thread_data *td)
temp_stall_ts = 1;
fprintf(f_out, "%s: Laying out IO file(s) (%u x %LuMiB == %LuMiB)\n",
temp_stall_ts = 1;
fprintf(f_out, "%s: Laying out IO file(s) (%u x %LuMiB == %LuMiB)\n",
- td->name,
td->nr_normal
_files,
- (t
d->total_file_size >> 20) / td->nr_normal
_files,
- t
d->t
otal_file_size >> 20);
+ td->name,
new
_files,
+ (t
otal_file_size >> 20) / new
_files,
+ total_file_size >> 20);
err = 0;
for_each_file(td, f, i) {
err = 0;
for_each_file(td, f, i) {
@@
-217,9
+234,10
@@
static int get_file_size(struct thread_data *td, struct fio_file *f)
{
int ret = 0;
{
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;
ret = bdev_size(td, f);
else
f->real_file_size = -1;
@@
-299,6
+317,8
@@
int generic_open_file(struct thread_data *td, struct fio_file *f)
td_verror(td, __e, "open");
if (__e == EINVAL && td->odirect)
log_err("fio: destination does not support O_DIRECT\n");
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;
}
return 1;
}
@@
-415,7
+435,6
@@
void close_files(struct thread_data *td)
}
td->filename = NULL;
}
td->filename = NULL;
- free(td->files);
td->files = NULL;
td->nr_files = 0;
}
td->files = NULL;
td->nr_files = 0;
}
@@
-427,10
+446,19
@@
static void get_file_type(struct fio_file *f)
f->filetype = FIO_TYPE_FILE;
if (!lstat(f->file_name, &sb)) {
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;
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;
+ }
}
}
}
}
@@
-492,6
+520,9
@@
static int recurse_dir(struct thread_data *td, const char *dirname)
char full_path[PATH_MAX];
struct stat sb;
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) {
sprintf(full_path, "%s/%s", dirname, dir->d_name);
if (lstat(full_path, &sb) == -1) {
@@
-507,9
+538,6
@@
static int recurse_dir(struct thread_data *td, const char *dirname)
continue;
}
continue;
}
- if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
- continue;
-
if ((ret = recurse_dir(td, full_path)) != 0)
break;
}
if ((ret = recurse_dir(td, full_path)) != 0)
break;
}