Use log_info() throughout

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 0f1a3402237a265d2480b5e865837938959ad6c1..faef907aeefd44429896aa156f2fa4944593cac4 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -97,13 +97,36 @@ err:
        return 1;
 }
 
+static unsigned long long set_rand_file_size(struct thread_data *td,
+                                            unsigned long long total_size)
+{
+       unsigned long long upper = total_size;
+       unsigned long long ret;
+       long r;
+
+       if (upper > td->file_size_high)
+               upper = td->file_size_high;
+       else if (upper < td->file_size_low)
+               return 0;
+       else if (!upper)
+               return 0;
+
+       r = os_random_long(&td->file_size_state);
+       ret = td->file_size_low + (unsigned long long) ((double) upper * (r / (RAND_MAX + 1.0)));
+       ret -= (ret % td->rw_min_bs);
+       if (ret > upper)
+               ret = upper;
+       return ret;
+}
+
 static int create_files(struct thread_data *td)
 {
        struct fio_file *f;
        int err, need_create, can_extend;
-       unsigned long long total_file_size;
-       unsigned int i;
+       unsigned long long total_file_size, local_file_size;
+       unsigned int i, new_files;
 
+       new_files = 0;
        total_file_size = td->total_file_size;
        for_each_file(td, f, i) {
                unsigned long long s;
@@ -119,7 +142,8 @@ static int create_files(struct thread_data *td)
                                s = total_file_size;
 
                        total_file_size -= s;
-               }
+               } else
+                       new_files++;
        }
 
        /*
@@ -130,6 +154,10 @@ static int create_files(struct thread_data *td)
                return 0;
 
        need_create = 0;
+       local_file_size = total_file_size;
+       if (!local_file_size)
+               local_file_size = -1;
+
        for_each_file(td, f, i) {
                int file_there;
 
@@ -138,7 +166,23 @@ static int create_files(struct thread_data *td)
                if (f->flags & FIO_FILE_EXISTS)
                        continue;
 
-               f->file_size = total_file_size / td->nr_normal_files;
+               if (!td->file_size_low)
+                       f->file_size = total_file_size / new_files;
+               else {
+                       /*
+                        * If we don't have enough space left for a file
+                        * of the minimum size, bail.
+                        */
+                       if (local_file_size < td->file_size_low) {
+                               log_info("fio: limited to %d files\n", i);
+                               new_files -= (td->nr_files - i);
+                               td->nr_files = i;
+                               break;
+                       }
+
+                       f->file_size = set_rand_file_size(td, local_file_size);
+                       local_file_size -= f->file_size;
+               }
 
                file_there = !file_ok(td, f);
 
@@ -160,10 +204,8 @@ static int create_files(struct thread_data *td)
        }
 
        temp_stall_ts = 1;
-       fprintf(f_out, "%s: Laying out IO file(s) (%u x %LuMiB == %LuMiB)\n",
-                               td->name, td->nr_normal_files,
-                               (td->total_file_size >> 20) / td->nr_normal_files,
-                               td->total_file_size >> 20);
+       log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n",
+                               td->name, new_files, total_file_size >> 20);
 
        err = 0;
        for_each_file(td, f, i) {
@@ -433,7 +475,6 @@ void close_files(struct thread_data *td)
        }
 
        td->filename = NULL;
-       free(td->files);
        td->files = NULL;
        td->nr_files = 0;
 }