json: don't use named initializers for anonymous unions

[fio.git] / zbd.c

diff --git a/zbd.c b/zbd.c
index 99ac72cab71cbcbdec4c32f755367aff94a8669a..8dc3c39792931803b07d714ec222b1807c353102 100644 (file)
--- a/zbd.c
+++ b/zbd.c
@@ -687,6 +687,22 @@ static int zbd_reset_zone(struct thread_data *td, struct fio_file *f,
        return zbd_reset_range(td, f, z->start, (z+1)->start - z->start);
 }
 
+/* The caller must hold f->zbd_info->mutex */
+static void zbd_close_zone(struct thread_data *td, const struct fio_file *f,
+                          unsigned int open_zone_idx)
+{
+       uint32_t zone_idx;
+
+       assert(open_zone_idx < f->zbd_info->num_open_zones);
+       zone_idx = f->zbd_info->open_zones[open_zone_idx];
+       memmove(f->zbd_info->open_zones + open_zone_idx,
+               f->zbd_info->open_zones + open_zone_idx + 1,
+               (ZBD_MAX_OPEN_ZONES - (open_zone_idx + 1)) *
+               sizeof(f->zbd_info->open_zones[0]));
+       f->zbd_info->num_open_zones--;
+       f->zbd_info->zone_info[zone_idx].open = 0;
+}
+
 /*
  * Reset a range of zones. Returns 0 upon success and 1 upon failure.
  * @td: fio thread data.
@@ -710,12 +726,26 @@ static int zbd_reset_zones(struct thread_data *td, struct fio_file *f,
        dprint(FD_ZBD, "%s: examining zones %u .. %u\n", f->file_name,
                zbd_zone_nr(f->zbd_info, zb), zbd_zone_nr(f->zbd_info, ze));
        for (z = zb; z < ze; z++) {
+               uint32_t nz = z - f->zbd_info->zone_info;
+
                if (!zbd_zone_swr(z))
                        continue;
                zone_lock(td, z);
-               reset_wp = all_zones ? z->wp != z->start :
-                               (td->o.td_ddir & TD_DDIR_WRITE) &&
-                               z->wp % min_bs != 0;
+               if (all_zones) {
+                       unsigned int i;
+
+                       pthread_mutex_lock(&f->zbd_info->mutex);
+                       for (i = 0; i < f->zbd_info->num_open_zones; i++) {
+                               if (f->zbd_info->open_zones[i] == nz)
+                                       zbd_close_zone(td, f, i);
+                       }
+                       pthread_mutex_unlock(&f->zbd_info->mutex);
+
+                       reset_wp = z->wp != z->start;
+               } else {
+                       reset_wp = (td->o.td_ddir & TD_DDIR_WRITE) &&
+                                       z->wp % min_bs != 0;
+               }
                if (reset_wp) {
                        dprint(FD_ZBD, "%s: resetting zone %u\n",
                               f->file_name,
@@ -905,22 +935,6 @@ out:
        return res;
 }
 
-/* The caller must hold f->zbd_info->mutex */
-static void zbd_close_zone(struct thread_data *td, const struct fio_file *f,
-                          unsigned int open_zone_idx)
-{
-       uint32_t zone_idx;
-
-       assert(open_zone_idx < f->zbd_info->num_open_zones);
-       zone_idx = f->zbd_info->open_zones[open_zone_idx];
-       memmove(f->zbd_info->open_zones + open_zone_idx,
-               f->zbd_info->open_zones + open_zone_idx + 1,
-               (ZBD_MAX_OPEN_ZONES - (open_zone_idx + 1)) *
-               sizeof(f->zbd_info->open_zones[0]));
-       f->zbd_info->num_open_zones--;
-       f->zbd_info->zone_info[zone_idx].open = 0;
-}
-
 /* Anything goes as long as it is not a constant. */
 static uint32_t pick_random_zone_idx(const struct fio_file *f,
                                     const struct io_u *io_u)
@@ -1317,6 +1331,36 @@ void setup_zbd_zone_mode(struct thread_data *td, struct io_u *io_u)
        }
 }
 
+/**
+ * zbd_adjust_ddir - Adjust an I/O direction for zonedmode=zbd.
+ *
+ * @td: FIO thread data.
+ * @io_u: FIO I/O unit.
+ * @ddir: I/O direction before adjustment.
+ *
+ * Return adjusted I/O direction.
+ */
+enum fio_ddir zbd_adjust_ddir(struct thread_data *td, struct io_u *io_u,
+                             enum fio_ddir ddir)
+{
+       /*
+        * In case read direction is chosen for the first random I/O, fio with
+        * zonemode=zbd stops because no data can be read from zoned block
+        * devices with all empty zones. Overwrite the first I/O direction as
+        * write to make sure data to read exists.
+        */
+       if (td->o.zone_mode != ZONE_MODE_ZBD ||
+           ddir != DDIR_READ ||
+           !td_rw(td))
+               return ddir;
+
+       if (io_u->file->zbd_info->sectors_with_data ||
+           td->o.read_beyond_wp)
+               return DDIR_READ;
+
+       return DDIR_WRITE;
+}
+
 /**
  * zbd_adjust_block - adjust the offset and length as necessary for ZBD drives
  * @td: FIO thread data.
@@ -1350,16 +1394,6 @@ enum io_u_action zbd_adjust_block(struct thread_data *td, struct io_u *io_u)
        if (!zbd_zone_swr(zb))
                return io_u_accept;
 
-       /*
-        * In case read direction is chosen for the first random I/O, fio with
-        * zonemode=zbd stops because no data can be read from zoned block
-        * devices with all empty zones. Overwrite the first I/O direction as
-        * write to make sure data to read exists.
-        */
-       if (td_rw(td) && !f->zbd_info->sectors_with_data
-           && !td->o.read_beyond_wp)
-               io_u->ddir = DDIR_WRITE;
-
        /*
         * Accept the I/O offset for reads if reading beyond the write pointer
         * is enabled.