Normal vs special files fixups

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 948cecda7fb56e70de64c0c00ef9723e7564be74..4beb06e369c5061a364ed052d791c73fa2a99057 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -101,8 +101,13 @@ static int create_files(struct thread_data *td)
        int err, need_create, can_extend;
        unsigned int i;
 
-       for_each_file(td, f, i)
-               f->file_size = td->total_file_size / td->nr_files;
+       for_each_file(td, f, i) {
+               if (f->filetype != FIO_TYPE_FILE)
+                       continue;
+
+               f->file_size = td->total_file_size / td->nr_normal_files;
+               f->file_offset = td->start_offset;
+       }
 
        /*
         * unless specifically asked for overwrite, let normal io extend it
@@ -139,8 +144,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_uniq_files,
-                               (td->total_file_size >> 20) / td->nr_uniq_files,
+                               td->name, td->nr_normal_files,
+                               (td->total_file_size >> 20) / td->nr_normal_files,
                                td->total_file_size >> 20);
 
        err = 0;
@@ -148,9 +153,11 @@ static int create_files(struct thread_data *td)
                /*
                 * Only unlink files that we created.
                 */
-               f->unlink = 0;
+               f->flags &= ~FIO_FILE_UNLINK;
                if (file_ok(td, f)) {
-                       f->unlink = td->unlink;
+                       if (td->unlink)
+                               f->flags |= FIO_FILE_UNLINK;
+
                        err = create_file(td, f);
                        if (err)
                                break;
@@ -394,9 +401,10 @@ void close_files(struct thread_data *td)
        unsigned int i;
 
        for_each_file(td, f, i) {
-               if (!td->filename && f->unlink &&
+               if (!f->file_name && (f->flags & FIO_FILE_UNLINK) &&
                    f->filetype == FIO_TYPE_FILE) {
                        unlink(f->file_name);
+                       free(f->file_name);
                        f->file_name = NULL;
                }
 
@@ -412,13 +420,13 @@ void close_files(struct thread_data *td)
        td->nr_files = 0;
 }
 
-static void get_file_type(struct thread_data *td, struct fio_file *f)
+static void get_file_type(struct fio_file *f)
 {
        struct stat sb;
 
        f->filetype = FIO_TYPE_FILE;
 
-       if (!lstat(td->filename, &sb)) {
+       if (!lstat(f->file_name, &sb)) {
                if (S_ISBLK(sb.st_mode))
                        f->filetype = FIO_TYPE_BD;
                else if (S_ISCHR(sb.st_mode))
@@ -436,10 +444,31 @@ void add_file(struct thread_data *td, const char *fname)
        f = &td->files[cur_files];
        memset(f, 0, sizeof(*f));
        f->fd = -1;
-       f->file_name = fname;
+       f->file_name = strdup(fname);
 
-       get_file_type(td, f);
+       get_file_type(f);
 
        td->open_files++;
-       td->nr_uniq_files = td->open_files;
+       if (f->filetype == FIO_TYPE_FILE)
+               td->nr_normal_files++;
+}
+
+void get_file(struct fio_file *f)
+{
+       f->references++;
+}
+
+void put_file(struct thread_data *td, struct fio_file *f)
+{
+       if (!(f->flags & FIO_FILE_OPEN))
+               return;
+
+       assert(f->references);
+       if (--f->references)
+               return;
+
+       if (td->io_ops->close_file)
+               td->io_ops->close_file(td, f);
+       td->nr_open_files--;
+       f->flags &= ~FIO_FILE_OPEN;
 }