projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing wraparound behavior for time-based sequential read jobs
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index 2a79e7452d083f36b9cb0e4777ea8bfe94de01d5..3594a80faf3bfe8300e29fc7cc04f7c892e826f8 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-526,6
+526,11
@@
open_again:
snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
+ if (__e == EINVAL && (flags & OS_O_DIRECT)) {
+ log_err("fio: looks like your file system does not " \
+ "support direct=1/buffered=0\n");
+ }
+
td_verror(td, __e, buf);
}
td_verror(td, __e, buf);
}
@@
-652,6
+657,12
@@
static unsigned long long get_fs_free_counts(struct thread_data *td)
return ret;
}
return ret;
}
+unsigned long long get_start_offset(struct thread_data *td)
+{
+ return td->o.start_offset +
+ (td->thread_number - 1) * td->o.offset_increment;
+}
+
/*
* Open the files and setup files sizes, creating files if necessary.
*/
/*
* Open the files and setup files sizes, creating files if necessary.
*/
@@
-665,7
+676,7
@@
int setup_files(struct thread_data *td)
dprint(FD_FILE, "setup files\n");
if (td->o.read_iolog_file)
dprint(FD_FILE, "setup files\n");
if (td->o.read_iolog_file)
-
return 0
;
+
goto done
;
/*
* if ioengine defines a setup() method, it's responsible for
/*
* if ioengine defines a setup() method, it's responsible for
@@
-713,7
+724,7
@@
int setup_files(struct thread_data *td)
extend_size = total_size = 0;
need_extend = 0;
for_each_file(td, f, i) {
extend_size = total_size = 0;
need_extend = 0;
for_each_file(td, f, i) {
- f->file_offset =
td->o.start_offset
;
+ f->file_offset =
get_start_offset(td)
;
if (!td->o.file_size_low) {
/*
if (!td->o.file_size_low) {
/*
@@
-759,6
+770,9
@@
int setup_files(struct thread_data *td)
}
}
}
}
+ if (td->o.size_percent)
+ total_size = (total_size * td->o.size_percent) / 100;
+
if (!td->o.size || td->o.size > total_size)
td->o.size = total_size;
if (!td->o.size || td->o.size > total_size)
td->o.size = total_size;
@@
-812,6
+826,11
@@
int setup_files(struct thread_data *td)
*/
if (!td->o.read_iolog_file)
td->total_io_size = td->o.size * td->o.loops;
*/
if (!td->o.read_iolog_file)
td->total_io_size = td->o.size * td->o.loops;
+
+done:
+ if (td->o.create_only)
+ td->done = 1;
+
return 0;
err_offset:
log_err("%s: you need to specify valid offset=\n", td->o.name);
return 0;
err_offset:
log_err("%s: you need to specify valid offset=\n", td->o.name);
@@
-846,11
+865,15
@@
int init_random_map(struct thread_data *td)
(unsigned long long) td->o.rw_min_bs;
num_maps = (blocks + BLOCKS_PER_MAP - 1) /
(unsigned long long) BLOCKS_PER_MAP;
(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(unsigned long));
- if (f->file_map) {
- f->num_maps = num_maps;
- continue;
- }
+ if (num_maps == (unsigned long) num_maps) {
+ f->file_map = smalloc(num_maps * sizeof(unsigned long));
+ if (f->file_map) {
+ f->num_maps = num_maps;
+ continue;
+ }
+ } else
+ f->file_map = NULL;
+
if (!td->o.softrandommap) {
log_err("fio: failed allocating random map. If running"
" a large number of jobs, try the 'norandommap'"
if (!td->o.softrandommap) {
log_err("fio: failed allocating random map. If running"
" a large number of jobs, try the 'norandommap'"
@@
-919,10
+942,13
@@
static void get_file_type(struct fio_file *f)
else
f->filetype = FIO_TYPE_FILE;
else
f->filetype = FIO_TYPE_FILE;
+ /* \\.\ is the device namespace in Windows, where every file is
+ * a block device */
+ if (strncmp(f->file_name, "\\\\.\\", 4) == 0)
+ f->filetype = FIO_TYPE_BD;
+
if (!stat(f->file_name, &sb)) {
if (!stat(f->file_name, &sb)) {
- /* \\.\ is the device namespace in Windows, where every file is
- * a block device */
- if (S_ISBLK(sb.st_mode) || strncmp(f->file_name, "\\\\.\\", 4) == 0)
+ if (S_ISBLK(sb.st_mode))
f->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
f->filetype = FIO_TYPE_CHAR;
f->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
f->filetype = FIO_TYPE_CHAR;
@@
-958,6
+984,7
@@
int add_file(struct thread_data *td, const char *fname)
td->files_size = new_size;
}
td->files[cur_files] = f;
td->files_size = new_size;
}
td->files[cur_files] = f;
+ f->fileno = cur_files;
/*
* init function, io engine may not be loaded yet
/*
* init function, io engine may not be loaded yet
@@
-984,7
+1011,7
@@
int add_file(struct thread_data *td, const char *fname)
f->lock = fio_mutex_rw_init();
break;
case FILE_LOCK_EXCLUSIVE:
f->lock = fio_mutex_rw_init();
break;
case FILE_LOCK_EXCLUSIVE:
- f->lock = fio_mutex_init(
1
);
+ f->lock = fio_mutex_init(
FIO_MUTEX_UNLOCKED
);
break;
default:
log_err("fio: unknown lock mode: %d\n", td->o.file_lock_mode);
break;
default:
log_err("fio: unknown lock mode: %d\n", td->o.file_lock_mode);
@@
-1131,7
+1158,7
@@
static int recurse_dir(struct thread_data *td, const char *dirname)
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
continue;
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
continue;
- sprintf(full_path, "%s
/%s", dirname
, dir->d_name);
+ sprintf(full_path, "%s
%s%s", dirname, FIO_OS_PATH_SEPARATOR
, dir->d_name);
if (lstat(full_path, &sb) == -1) {
if (errno != ENOENT) {
if (lstat(full_path, &sb) == -1) {
if (errno != ENOENT) {