Get rid of __ prefix for internal frand state

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 6d46ca3c5e1e33caa028960296e450c1757711e6..4026f4de1bdb9ddbec833e251c9e99309ec5d16d 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -38,7 +38,7 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
        int r, new_layout = 0, unlink_file = 0, flags;
        unsigned long long left;
        unsigned int bs;
-       char *b;
+       char *b = NULL;
 
        if (read_only) {
                log_err("fio: refusing extend of file due to read-only\n");
@@ -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;
                }
@@ -69,6 +69,10 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
        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) {
@@ -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);
-               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");
@@ -189,6 +193,8 @@ done:
 err:
        close(f->fd);
        f->fd = -1;
+       if (b)
+               free(b);
        return 1;
 }
 
@@ -255,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;
@@ -384,6 +383,10 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 {
        int ret = 0;
 
+#ifdef CONFIG_ESX
+       return 0;
+#endif
+
        if (len == -1ULL)
                len = f->io_size;
        if (off == -1ULL)
@@ -395,7 +398,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);
 
-       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)
@@ -479,6 +484,10 @@ int file_lookup_open(struct fio_file *f, int flags)
                from_hash = 0;
        }
 
+#ifdef WIN32
+       flags |= _O_BINARY;
+#endif
+
        f->fd = open(f->file_name, flags, 0600);
        return from_hash;
 }
@@ -593,6 +602,7 @@ open_again:
                }
 
                td_verror(td, __e, buf);
+               return 1;
        }
 
        if (!from_hash && f->fd != -1) {
@@ -645,6 +655,7 @@ static int get_file_sizes(struct thread_data *td)
                        if (td->error != ENOENT) {
                                log_err("%s\n", td->verror);
                                err = 1;
+                               break;
                        }
                        clear_error(td);
                }
@@ -686,7 +697,8 @@ static unsigned long long get_fs_free_counts(struct thread_data *td)
                } else if (f->filetype != FIO_TYPE_FILE)
                        continue;
 
-               strcpy(buf, f->file_name);
+               buf[255] = '\0';
+               strncpy(buf, f->file_name, 255);
 
                if (stat(buf, &sb) < 0) {
                        if (errno != ENOENT)
@@ -708,8 +720,8 @@ static unsigned long long get_fs_free_counts(struct thread_data *td)
                if (fm)
                        continue;
 
-               fm = malloc(sizeof(*fm));
-               strcpy(fm->__base, buf);
+               fm = calloc(1, sizeof(*fm));
+               strncpy(fm->__base, buf, sizeof(fm->__base) - 1);
                fm->base = basename(fm->__base);
                fm->key = sb.st_dev;
                flist_add(&fm->list, &list);
@@ -739,7 +751,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;
 }
 
 /*
@@ -879,9 +891,14 @@ 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)) {
+               log_err("fio: blocksize too large for data set\n");
+               goto err_out;
+       }
+
        /*
         * See if we need to extend some files
         */
@@ -912,7 +929,13 @@ int setup_files(struct thread_data *td)
 
                        err = __file_invalidate_cache(td, f, old_len,
                                                                extend_len);
-                       close(f->fd);
+
+                       /*
+                        * Shut up static checker
+                        */
+                       if (f->fd != -1)
+                               close(f->fd);
+
                        f->fd = -1;
                        if (err)
                                break;
@@ -930,8 +953,12 @@ int setup_files(struct thread_data *td)
         * 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)
@@ -1022,7 +1049,7 @@ int init_random_map(struct thread_data *td)
                        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) {
@@ -1066,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);
 
@@ -1073,7 +1105,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);
-                       unlink(f->file_name);
+                       td_io_unlink_file(td, f);
                }
 
                sfree(f->file_name);
@@ -1323,8 +1355,11 @@ int put_file(struct thread_data *td, struct fio_file *f)
        if (--f->references)
                return 0;
 
-       if (should_fsync(td) && td->o.fsync_on_close)
+       if (should_fsync(td) && td->o.fsync_on_close) {
                f_ret = fsync(f->fd);
+               if (f_ret < 0)
+                       f_ret = errno;
+       }
 
        if (td->io_ops->close_file)
                ret = td->io_ops->close_file(td, f);
@@ -1493,6 +1528,8 @@ int get_fileno(struct thread_data *td, const char *fname)
 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;
 }