Add support for normal/gaussian random distributions

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 39c276a3d2203180772a1e9a88974dc545d360fd..7dceddbbf4dc21077d312dace3fa2321ba04f037 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(f->file_name) < 0) && (errno != ENOENT)) {
+               if ((td_io_unlink_file(td, f) < 0) && (errno != ENOENT)) {
                        td_verror(td, errno, "unlink");
                        return 1;
                }
@@ -172,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);
-               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");
@@ -261,16 +261,9 @@ static unsigned long long get_rand_file_size(struct thread_data *td)
        unsigned long long ret, sized;
        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 = __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)));
        ret += td->o.file_size_low;
        ret -= (ret % td->o.rw_min_bs);
        return ret;
@@ -407,15 +400,9 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 
        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)
-                       (void) posix_madvise(f->mmap_ptr, f->mmap_sz, FIO_MADV_FREE);
-#endif
-       } else if (f->filetype == FIO_TYPE_FILE) {
+       else if (f->filetype == FIO_TYPE_FILE)
                ret = posix_fadvise(f->fd, off, len, POSIX_FADV_DONTNEED);
-       } else if (f->filetype == FIO_TYPE_BD) {
+       else if (f->filetype == FIO_TYPE_BD) {
                ret = blockdev_invalidate_cache(f);
                if (ret < 0 && errno == EACCES && geteuid()) {
                        if (!root_warn) {
@@ -758,7 +745,7 @@ uint64_t get_start_offset(struct thread_data *td, struct fio_file *f)
                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;
 }
 
 /*
@@ -898,7 +885,7 @@ int setup_files(struct thread_data *td)
                }
        }
 
-       if (!o->size || o->size > total_size)
+       if (!o->size || (total_size && o->size > total_size))
                o->size = total_size;
 
        if (o->size < td_min_bs(td)) {
@@ -998,12 +985,12 @@ static int __init_rand_distribution(struct thread_data *td, struct fio_file *f)
 {
        unsigned int range_size, seed;
        unsigned long nranges;
-       uint64_t file_size;
+       uint64_t fsize;
 
        range_size = min(td->o.min_bs[DDIR_READ], td->o.min_bs[DDIR_WRITE]);
-       file_size = min(f->real_file_size, f->io_size);
+       fsize = min(f->real_file_size, f->io_size);
 
-       nranges = (file_size + range_size - 1) / range_size;
+       nranges = (fsize + range_size - 1) / range_size;
 
        seed = jhash(f->file_name, strlen(f->file_name), 0) * td->thread_number;
        if (!td->o.rand_repeatable)
@@ -1011,8 +998,10 @@ static int __init_rand_distribution(struct thread_data *td, struct fio_file *f)
 
        if (td->o.random_distribution == FIO_RAND_DIST_ZIPF)
                zipf_init(&f->zipf, nranges, td->o.zipf_theta.u.f, seed);
-       else
+       else if (td->o.random_distribution == FIO_RAND_DIST_PARETO)
                pareto_init(&f->zipf, nranges, td->o.pareto_h.u.f, seed);
+       else if (td->o.random_distribution == FIO_RAND_DIST_GAUSS)
+               gauss_init(&f->gauss, nranges, td->o.gauss_dev, seed);
 
        return 1;
 }
@@ -1048,21 +1037,25 @@ int init_random_map(struct thread_data *td)
                return 0;
 
        for_each_file(td, f, i) {
-               uint64_t file_size = min(f->real_file_size, f->io_size);
+               uint64_t fsize = min(f->real_file_size, f->io_size);
 
-               blocks = file_size / (unsigned long long) td->o.rw_min_bs;
+               blocks = fsize / (unsigned long long) td->o.rw_min_bs;
 
                if (td->o.random_generator == FIO_RAND_GEN_LFSR) {
                        unsigned long seed;
 
                        seed = td->rand_seeds[FIO_RAND_BLOCK_OFF];
 
-                       if (!lfsr_init(&f->lfsr, blocks, seed, 0))
+                       if (!lfsr_init(&f->lfsr, blocks, seed, 0)) {
+                               fio_file_set_lfsr(f);
                                continue;
+                       }
                } else if (!td->o.norandommap) {
                        f->io_axmap = axmap_new(blocks);
-                       if (f->io_axmap)
+                       if (f->io_axmap) {
+                               fio_file_set_axmap(f);
                                continue;
+                       }
                } else if (td->o.norandommap)
                        continue;
 
@@ -1100,6 +1093,11 @@ void close_and_free_files(struct thread_data *td)
        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);
 
@@ -1107,13 +1105,15 @@ 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);
-                       unlink(f->file_name);
+                       td_io_unlink_file(td, f);
                }
 
                sfree(f->file_name);
                f->file_name = NULL;
-               axmap_free(f->io_axmap);
-               f->io_axmap = NULL;
+               if (fio_file_axmap(f)) {
+                       axmap_free(f->io_axmap);
+                       f->io_axmap = NULL;
+               }
                sfree(f);
        }
 
@@ -1538,11 +1538,16 @@ void free_release_files(struct thread_data *td)
 
 void fio_file_reset(struct thread_data *td, struct fio_file *f)
 {
-       f->last_pos = f->file_offset;
-       f->last_start = -1ULL;
-       if (f->io_axmap)
+       int i;
+
+       for (i = 0; i < DDIR_RWDIR_CNT; i++) {
+               f->last_pos[i] = f->file_offset;
+               f->last_start[i] = -1ULL;
+       }
+
+       if (fio_file_axmap(f))
                axmap_reset(f->io_axmap);
-       if (td->o.random_generator == FIO_RAND_GEN_LFSR)
+       else if (fio_file_lfsr(f))
                lfsr_reset(&f->lfsr, td->rand_seeds[FIO_RAND_BLOCK_OFF]);
 }