__f = lookup_file_hash(f->file_name);
if (__f) {
+ dprint(FD_FILE, "found file in hash %s\n", f->file_name);
/*
* racy, need the __f->lock locked
*/
f->references++;
from_hash = 1;
} else {
+ dprint(FD_FILE, "file not found in hash %s\n", f->file_name);
f->fd = open(f->file_name, flags, 0600);
from_hash = 0;
}
int err = 0;
for_each_file(td, f, i) {
+ dprint(FD_FILE, "get file size for %p/%d/%p\n", f, i, f->file_name);
+
if (td->io_ops->open_file(td, f)) {
if (td->error != ENOENT) {
log_err("%s\n", td->verror);
td->o.filename = NULL;
free(td->files);
+ td->files_index = 0;
td->files = NULL;
td->o.nr_files = 0;
}
f = smalloc(sizeof(*f));
f->fd = -1;
- td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
+ dprint(FD_FILE, "resize file array to %d files\n", cur_files + 1);
+ td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
td->files[cur_files] = f;
/*
if (f->filetype == FIO_TYPE_FILE)
td->nr_normal_files++;
+ dprint(FD_FILE, "file %p \"%s\" added at %d\n", f, f->file_name, cur_files);
+
return cur_files;
}
{
struct fio_file *f;
unsigned int i;
- size_t bytes;
+
+ dprint(FD_FILE, "dup files: %d\n", org->files_index);
if (!org->files)
return;
- bytes = org->files_index * sizeof(f);
- td->files = malloc(bytes);
- memcpy(td->files, org->files, bytes);
+ td->files = malloc(org->files_index * sizeof(f));
- for_each_file(td, f, i) {
+ for_each_file(org, f, i) {
struct fio_file *__f;
__f = smalloc(sizeof(*__f));
#define for_each_td(td, i) \
for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
#define for_each_file(td, f, i) \
- for ((i) = 0, (f) = (td)->files[0]; (i) < (td)->o.nr_files; (i)++, (f)++)
+ for ((i) = 0, (f) = (td)->files[0]; (i) < (td)->o.nr_files; (i)++, (f) = (td)->files[i])
#define fio_assert(td, cond) do { \
if (!(cond)) { \