projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add small tool to check for dedupable contents in a file/device
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index 60e79474d2cba91b465c4aca3c34749096c2fbce..29a76c0c3f5a52d60d18cb9775ec8b99bc603a1a 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-59,7
+59,7
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
if (unlink_file || new_layout) {
dprint(FD_FILE, "layout unlink %s\n", f->file_name);
if (unlink_file || new_layout) {
dprint(FD_FILE, "layout unlink %s\n", f->file_name);
- if ((
unlink(f->file_name
) < 0) && (errno != ENOENT)) {
+ if ((
td_io_unlink_file(td, f
) < 0) && (errno != ENOENT)) {
td_verror(td, errno, "unlink");
return 1;
}
td_verror(td, errno, "unlink");
return 1;
}
@@
-69,6
+69,10
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
if (new_layout)
flags |= O_TRUNC;
if (new_layout)
flags |= O_TRUNC;
+#ifdef WIN32
+ flags |= _O_BINARY;
+#endif
+
dprint(FD_FILE, "open file %s, flags %x\n", f->file_name, flags);
f->fd = open(f->file_name, flags, 0644);
if (f->fd < 0) {
dprint(FD_FILE, "open file %s, flags %x\n", f->file_name, flags);
f->fd = open(f->file_name, flags, 0644);
if (f->fd < 0) {
@@
-168,7
+172,7
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
if (td->terminate) {
dprint(FD_FILE, "terminate unlink %s\n", f->file_name);
if (td->terminate) {
dprint(FD_FILE, "terminate unlink %s\n", f->file_name);
-
unlink(f->file_name
);
+
td_io_unlink_file(td, f
);
} else if (td->o.create_fsync) {
if (fsync(f->fd) < 0) {
td_verror(td, errno, "fsync");
} else if (td->o.create_fsync) {
if (fsync(f->fd) < 0) {
td_verror(td, errno, "fsync");
@@
-386,6
+390,10
@@
static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
{
int ret = 0;
{
int ret = 0;
+#ifdef CONFIG_ESX
+ return 0;
+#endif
+
if (len == -1ULL)
len = f->io_size;
if (off == -1ULL)
if (len == -1ULL)
len = f->io_size;
if (off == -1ULL)
@@
-397,7
+405,9
@@
static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off,
len);
dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off,
len);
- if (f->mmap_ptr) {
+ if (td->io_ops->invalidate)
+ ret = td->io_ops->invalidate(td, f);
+ else if (f->mmap_ptr) {
ret = posix_madvise(f->mmap_ptr, f->mmap_sz, POSIX_MADV_DONTNEED);
#ifdef FIO_MADV_FREE
if (f->filetype == FIO_TYPE_BD)
ret = posix_madvise(f->mmap_ptr, f->mmap_sz, POSIX_MADV_DONTNEED);
#ifdef FIO_MADV_FREE
if (f->filetype == FIO_TYPE_BD)
@@
-481,6
+491,10
@@
int file_lookup_open(struct fio_file *f, int flags)
from_hash = 0;
}
from_hash = 0;
}
+#ifdef WIN32
+ flags |= _O_BINARY;
+#endif
+
f->fd = open(f->file_name, flags, 0600);
return from_hash;
}
f->fd = open(f->file_name, flags, 0600);
return from_hash;
}
@@
-595,6
+609,7
@@
open_again:
}
td_verror(td, __e, buf);
}
td_verror(td, __e, buf);
+ return 1;
}
if (!from_hash && f->fd != -1) {
}
if (!from_hash && f->fd != -1) {
@@
-647,6
+662,7
@@
static int get_file_sizes(struct thread_data *td)
if (td->error != ENOENT) {
log_err("%s\n", td->verror);
err = 1;
if (td->error != ENOENT) {
log_err("%s\n", td->verror);
err = 1;
+ break;
}
clear_error(td);
}
}
clear_error(td);
}
@@
-742,7
+758,7
@@
uint64_t get_start_offset(struct thread_data *td, struct fio_file *f)
return f->real_file_size;
return td->o.start_offset +
return f->real_file_size;
return td->o.start_offset +
-
(td->thread_number - 1)
* td->o.offset_increment;
+
td->subjob_number
* td->o.offset_increment;
}
/*
}
/*
@@
-885,6
+901,11
@@
int setup_files(struct thread_data *td)
if (!o->size || o->size > total_size)
o->size = total_size;
if (!o->size || o->size > total_size)
o->size = total_size;
+ if (o->size < td_min_bs(td)) {
+ log_err("fio: blocksize too large for data set\n");
+ goto err_out;
+ }
+
/*
* See if we need to extend some files
*/
/*
* See if we need to extend some files
*/
@@
-939,8
+960,12
@@
int setup_files(struct thread_data *td)
* iolog already set the total io size, if we read back
* stored entries.
*/
* iolog already set the total io size, if we read back
* stored entries.
*/
- if (!o->read_iolog_file)
- td->total_io_size = o->size * o->loops;
+ if (!o->read_iolog_file) {
+ if (o->io_limit)
+ td->total_io_size = o->io_limit * o->loops;
+ else
+ td->total_io_size = o->size * o->loops;
+ }
done:
if (o->create_only)
done:
if (o->create_only)
@@
-1031,7
+1056,7
@@
int init_random_map(struct thread_data *td)
unsigned long seed;
seed = td->rand_seeds[FIO_RAND_BLOCK_OFF];
unsigned long seed;
seed = td->rand_seeds[FIO_RAND_BLOCK_OFF];
-
+
if (!lfsr_init(&f->lfsr, blocks, seed, 0))
continue;
} else if (!td->o.norandommap) {
if (!lfsr_init(&f->lfsr, blocks, seed, 0))
continue;
} else if (!td->o.norandommap) {
@@
-1075,6
+1100,11
@@
void close_and_free_files(struct thread_data *td)
dprint(FD_FILE, "close files\n");
for_each_file(td, f, i) {
dprint(FD_FILE, "close files\n");
for_each_file(td, f, i) {
+ if (td->o.unlink && f->filetype == FIO_TYPE_FILE) {
+ dprint(FD_FILE, "free unlink %s\n", f->file_name);
+ td_io_unlink_file(td, f);
+ }
+
if (fio_file_open(f))
td_io_close_file(td, f);
if (fio_file_open(f))
td_io_close_file(td, f);
@@
-1082,7
+1112,7
@@
void close_and_free_files(struct thread_data *td)
if (td->o.unlink && f->filetype == FIO_TYPE_FILE) {
dprint(FD_FILE, "free unlink %s\n", f->file_name);
if (td->o.unlink && f->filetype == FIO_TYPE_FILE) {
dprint(FD_FILE, "free unlink %s\n", f->file_name);
-
unlink(f->file_name
);
+
td_io_unlink_file(td, f
);
}
sfree(f->file_name);
}
sfree(f->file_name);
@@
-1505,6
+1535,8
@@
int get_fileno(struct thread_data *td, const char *fname)
void free_release_files(struct thread_data *td)
{
close_files(td);
void free_release_files(struct thread_data *td)
{
close_files(td);
+ td->o.nr_files = 0;
+ td->o.open_files = 0;
td->files_index = 0;
td->nr_normal_files = 0;
}
td->files_index = 0;
td->nr_normal_files = 0;
}