Add OS_PATH_SEPARATOR for platforms which have different path separator characters...

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 5b96c66fa739d0af845fab987452d957542175cc..cf5ec8e95585ffd004c95d3ff4f2e1188aee2ec6 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -11,6 +11,11 @@
 #include "fio.h"
 #include "smalloc.h"
 #include "filehash.h"
+#include "os/os.h"
+
+#ifdef FIO_HAVE_LINUX_FALLOCATE
+#include <linux/falloc.h>
+#endif
 
 static int root_warn;
 
@@ -66,18 +71,42 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
        }
 
 #ifdef FIO_HAVE_FALLOCATE
-       if (td->o.fallocate && !td->o.fill_device) {
-               dprint(FD_FILE, "fallocate file %s size %llu\n", f->file_name,
-                                                       f->real_file_size);
-
-               r = posix_fallocate(f->fd, 0, f->real_file_size);
-               if (r > 0) {
-                       log_err("fio: posix_fallocate fails: %s\n",
-                                       strerror(r));
+       if (!td->o.fill_device) {
+               switch (td->o.fallocate_mode) {
+               case FIO_FALLOCATE_NONE:
+                       break;
+               case FIO_FALLOCATE_POSIX:
+                       dprint(FD_FILE, "posix_fallocate file %s size %llu\n",
+                                f->file_name, f->real_file_size);
+
+                       r = posix_fallocate(f->fd, 0, f->real_file_size);
+                       if (r > 0) {
+                               log_err("fio: posix_fallocate fails: %s\n",
+                                               strerror(r));
+                       }
+                       break;
+#ifdef FIO_HAVE_LINUX_FALLOCATE
+               case FIO_FALLOCATE_KEEP_SIZE:
+                       dprint(FD_FILE,
+                               "fallocate(FALLOC_FL_KEEP_SIZE) "
+                               "file %s size %llu\n",
+                               f->file_name, f->real_file_size);
+
+                       r = fallocate(f->fd, FALLOC_FL_KEEP_SIZE, 0,
+                                       f->real_file_size);
+                       if (r != 0) {
+                               td_verror(td, errno, "fallocate");
+                       }
+                       break;
+#endif /* FIO_HAVE_LINUX_FALLOCATE */
+               default:
+                       log_err("fio: unknown fallocate mode: %d\n",
+                               td->o.fallocate_mode);
+                       assert(0);
                }
        }
-#endif
-       
+#endif /* FIO_HAVE_FALLOCATE */
+
        if (!new_layout)
                goto done;
 
@@ -207,11 +236,18 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f)
 static unsigned long long get_rand_file_size(struct thread_data *td)
 {
        unsigned long long ret, sized;
-       long r;
+       unsigned long r;
+
+       if (td->o.use_os_rand) {
+               r = os_random_long(&td->file_size_state);
+               sized = td->o.file_size_high - td->o.file_size_low;
+               ret = (unsigned long long) ((double) sized * (r / (OS_RAND_MAX + 1.0)));
+       } else {
+               r = __rand(&td->__file_size_state);
+               sized = td->o.file_size_high - td->o.file_size_low;
+               ret = (unsigned long long) ((double) sized * (r / (FRAND_MAX + 1.0)));
+       }
 
-       r = os_random_long(&td->file_size_state);
-       sized = td->o.file_size_high - td->o.file_size_low;
-       ret = (unsigned long long) ((double) sized * (r / (OS_RAND_MAX + 1.0)));
        ret += td->o.file_size_low;
        ret -= (ret % td->o.rw_min_bs);
        return ret;
@@ -232,7 +268,7 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 
 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)) {
@@ -241,10 +277,9 @@ static int bdev_size(struct thread_data *td, struct fio_file *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;
        }
 
@@ -264,7 +299,7 @@ err:
 static int char_size(struct thread_data *td, struct fio_file *f)
 {
 #ifdef FIO_HAVE_CHARDEV_SIZE
-       unsigned long long bytes;
+       unsigned long long bytes = 0;
        int r;
 
        if (td->io_ops->open_file(td, f)) {
@@ -273,7 +308,7 @@ static int char_size(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
-       r = chardev_size(f->fd, &bytes);
+       r = chardev_size(f, &bytes);
        if (r) {
                td_verror(td, r, "chardev_size");
                goto err;
@@ -351,9 +386,9 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
                (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 "
@@ -496,7 +531,7 @@ open_again:
 
        if (!from_hash && f->fd != -1) {
                if (add_file_hash(f)) {
-                       int ret;
+                       int fio_unused ret;
 
                        /*
                         * OK to ignore, we haven't done anything with it
@@ -724,6 +759,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;
 
@@ -811,11 +849,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;
-               f->file_map = smalloc(num_maps * sizeof(int));
-               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'"
@@ -885,7 +927,9 @@ static void get_file_type(struct fio_file *f)
                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;
@@ -1094,7 +1138,7 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
                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) {