#include "fio.h"
#include "smalloc.h"
#include "filehash.h"
+#include "os/os.h"
static int root_warn;
f->real_file_size);
r = posix_fallocate(f->fd, 0, f->real_file_size);
- if (r < 0) {
+ if (r > 0) {
log_err("fio: posix_fallocate fails: %s\n",
- strerror(-r));
+ strerror(r));
}
}
#endif
-
+
if (!new_layout)
goto done;
static int bdev_size(struct thread_data *td, struct fio_file *f)
{
- unsigned long long bytes;
+ unsigned long long bytes = 0;
int r;
if (td->io_ops->open_file(td, f)) {
return 1;
}
- r = blockdev_size(f->fd, &bytes);
+ r = blockdev_size(f, &bytes);
if (r) {
td_verror(td, r, "blockdev_size");
+ printf("fd is %d\n", f->fd);
goto err;
}
return 1;
}
+static int char_size(struct thread_data *td, struct fio_file *f)
+{
+#ifdef FIO_HAVE_CHARDEV_SIZE
+ unsigned long long bytes = 0;
+ int r;
+
+ if (td->io_ops->open_file(td, f)) {
+ log_err("fio: failed opening blockdev %s for size check\n",
+ f->file_name);
+ return 1;
+ }
+
+ r = chardev_size(f, &bytes);
+ if (r) {
+ td_verror(td, r, "chardev_size");
+ goto err;
+ }
+
+ if (!bytes) {
+ log_err("%s: zero sized char device?\n", f->file_name);
+ goto err;
+ }
+
+ f->real_file_size = bytes;
+ td->io_ops->close_file(td, f);
+ return 0;
+err:
+ td->io_ops->close_file(td, f);
+ return 1;
+#else
+ f->real_file_size = -1ULL;
+ return 0;
+#endif
+}
+
static int get_file_size(struct thread_data *td, struct fio_file *f)
{
int ret = 0;
ret = file_size(td, f);
else if (f->filetype == FIO_TYPE_BD)
ret = bdev_size(td, f);
+ else if (f->filetype == FIO_TYPE_CHAR)
+ ret = char_size(td, f);
else
f->real_file_size = -1;
return ret;
if (f->file_offset > f->real_file_size) {
- log_err("%s: offset extends end (%Lu > %Lu)\n", td->o.name,
+ log_err("%s: offset extends end (%llu > %llu)\n", td->o.name,
f->file_offset, f->real_file_size);
return 1;
}
* FIXME: add blockdev flushing too
*/
if (f->mmap_ptr) {
- ret = madvise(f->mmap_ptr, f->mmap_sz, MADV_DONTNEED);
+ ret = posix_madvise(f->mmap_ptr, f->mmap_sz, POSIX_MADV_DONTNEED);
#ifdef FIO_MADV_FREE
- (void) madvise(f->mmap_ptr, f->mmap_sz, FIO_MADV_FREE);
+ (void) posix_madvise(f->mmap_ptr, f->mmap_sz, FIO_MADV_FREE);
#endif
} else if (f->filetype == FIO_TYPE_FILE) {
- ret = fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
+ ret = posix_fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
} else if (f->filetype == FIO_TYPE_BD) {
- ret = blockdev_invalidate_cache(f->fd);
+ ret = blockdev_invalidate_cache(f);
if (ret < 0 && errno == EACCES && geteuid()) {
if (!root_warn) {
log_err("fio: only root may flush block "
static unsigned long long get_fs_free_counts(struct thread_data *td)
{
struct flist_head *n, *tmp;
- unsigned long long ret;
+ unsigned long long ret = 0;
struct fio_mount *fm;
FLIST_HEAD(list);
struct fio_file *f;
struct stat sb;
char buf[256];
+ if (f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_CHAR) {
+ if (f->real_file_size != -1ULL)
+ ret += f->real_file_size;
+ continue;
+ } else if (f->filetype != FIO_TYPE_FILE)
+ continue;
+
strcpy(buf, f->file_name);
if (stat(buf, &sb) < 0) {
flist_add(&fm->list, &list);
}
- ret = 0;
flist_for_each_safe(n, tmp, &list) {
unsigned long long sz;
temp_stall_ts = 1;
if (!terse_output)
log_info("%s: Laying out IO file(s) (%u file(s) /"
- " %LuMB)\n", td->o.name, need_extend,
+ " %lluMB)\n", td->o.name, need_extend,
extend_size >> 20);
for_each_file(td, f, i) {
f->filetype = FIO_TYPE_FILE;
if (!stat(f->file_name, &sb)) {
- if (S_ISBLK(sb.st_mode))
+ /* \\.\ 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)
f->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
f->filetype = FIO_TYPE_CHAR;
}
f->fd = -1;
+ fio_file_reset(f);
if (td->files_size <= td->files_index) {
int new_size = td->o.nr_files + 1;
return cur_files;
}
+int add_file_exclusive(struct thread_data *td, const char *fname)
+{
+ struct fio_file *f;
+ unsigned int i;
+
+ for_each_file(td, f, i) {
+ if (!strcmp(f->file_name, fname))
+ return i;
+ }
+
+ return add_file(td, fname);
+}
+
void get_file(struct fio_file *f)
{
dprint(FD_FILE, "get file %s, ref=%d\n", f->file_name, f->references);
assert(0);
}
__f->fd = -1;
+ fio_file_reset(__f);
if (f->file_name) {
__f->file_name = smalloc_strdup(f->file_name);