Add support for trim as a workload type

[fio.git] / init.c

diff --git a/init.c b/init.c
index 9f597a95864cde76707df74c329f2679ca0b68b5..1840c8f82e530283e97ccbd8a6c6a36819194063 100644 (file)
--- a/init.c
+++ b/init.c
@@ -362,6 +362,8 @@ static int setup_rate(struct thread_data *td)
                ret = __setup_rate(td, DDIR_READ);
        if (td->o.rate[DDIR_WRITE] || td->o.rate_iops[DDIR_WRITE])
                ret |= __setup_rate(td, DDIR_WRITE);
+       if (td->o.rate[DDIR_TRIM] || td->o.rate_iops[DDIR_TRIM])
+               ret |= __setup_rate(td, DDIR_TRIM);
 
        return ret;
 }
@@ -370,7 +372,9 @@ static int fixed_block_size(struct thread_options *o)
 {
        return o->min_bs[DDIR_READ] == o->max_bs[DDIR_READ] &&
                o->min_bs[DDIR_WRITE] == o->max_bs[DDIR_WRITE] &&
-               o->min_bs[DDIR_READ] == o->min_bs[DDIR_WRITE];
+               o->min_bs[DDIR_TRIM] == o->max_bs[DDIR_TRIM] &&
+               o->min_bs[DDIR_READ] == o->min_bs[DDIR_WRITE] &&
+               o->min_bs[DDIR_READ] == o->min_bs[DDIR_TRIM];
 }
 
 /*
@@ -426,8 +430,14 @@ static int fixup_options(struct thread_data *td)
                o->min_bs[DDIR_WRITE] = o->bs[DDIR_WRITE];
        if (!o->max_bs[DDIR_WRITE])
                o->max_bs[DDIR_WRITE] = o->bs[DDIR_WRITE];
+       if (!o->min_bs[DDIR_TRIM])
+               o->min_bs[DDIR_TRIM] = o->bs[DDIR_TRIM];
+       if (!o->max_bs[DDIR_TRIM])
+               o->max_bs[DDIR_TRIM] = o->bs[DDIR_TRIM];
+
 
        o->rw_min_bs = min(o->min_bs[DDIR_READ], o->min_bs[DDIR_WRITE]);
+       o->rw_min_bs = min(o->min_bs[DDIR_TRIM], o->rw_min_bs);
 
        /*
         * For random IO, allow blockalign offset other than min_bs.
@@ -436,9 +446,12 @@ static int fixup_options(struct thread_data *td)
                o->ba[DDIR_READ] = o->min_bs[DDIR_READ];
        if (!o->ba[DDIR_WRITE] || !td_random(td))
                o->ba[DDIR_WRITE] = o->min_bs[DDIR_WRITE];
+       if (!o->ba[DDIR_TRIM] || !td_random(td))
+               o->ba[DDIR_TRIM] = o->min_bs[DDIR_TRIM];
 
        if ((o->ba[DDIR_READ] != o->min_bs[DDIR_READ] ||
-           o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE]) &&
+           o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE] ||
+           o->ba[DDIR_TRIM] != o->min_bs[DDIR_TRIM]) &&
            !o->norandommap) {
                log_err("fio: Any use of blockalign= turns off randommap\n");
                o->norandommap = 1;
@@ -491,15 +504,19 @@ static int fixup_options(struct thread_data *td)
        if (o->open_files > o->nr_files || !o->open_files)
                o->open_files = o->nr_files;
 
-       if (((o->rate[0] + o->rate[1]) && (o->rate_iops[0] + o->rate_iops[1]))||
-           ((o->ratemin[0] + o->ratemin[1]) && (o->rate_iops_min[0] +
-               o->rate_iops_min[1]))) {
+       if (((o->rate[DDIR_READ] + o->rate[DDIR_WRITE] + o->rate[DDIR_TRIM]) &&
+           (o->rate_iops[DDIR_READ] + o->rate_iops[DDIR_WRITE] + o->rate_iops[DDIR_TRIM])) ||
+           ((o->ratemin[DDIR_READ] + o->ratemin[DDIR_WRITE] + o->ratemin[DDIR_TRIM]) &&
+           (o->rate_iops_min[DDIR_READ] + o->rate_iops_min[DDIR_WRITE] + o->rate_iops_min[DDIR_TRIM]))) {
                log_err("fio: rate and rate_iops are mutually exclusive\n");
                ret = 1;
        }
-       if ((o->rate[0] < o->ratemin[0]) || (o->rate[1] < o->ratemin[1]) ||
-           (o->rate_iops[0] < o->rate_iops_min[0]) ||
-           (o->rate_iops[1] < o->rate_iops_min[1])) {
+       if ((o->rate[DDIR_READ] < o->ratemin[DDIR_READ]) ||
+           (o->rate[DDIR_WRITE] < o->ratemin[DDIR_WRITE]) ||
+           (o->rate[DDIR_TRIM] < o->ratemin[DDIR_TRIM]) ||
+           (o->rate_iops[DDIR_READ] < o->rate_iops_min[DDIR_READ]) ||
+           (o->rate_iops[DDIR_WRITE] < o->rate_iops_min[DDIR_WRITE]) ||
+           (o->rate_iops[DDIR_TRIM] < o->rate_iops_min[DDIR_TRIM])) {
                log_err("fio: minimum rate exceeds rate\n");
                ret = 1;
        }
@@ -740,7 +757,8 @@ int ioengine_load(struct thread_data *td)
 static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 {
        const char *ddir_str[] = { NULL, "read", "write", "rw", NULL,
-                                  "randread", "randwrite", "randrw" };
+                                  "randread", "randwrite", "randrw",
+                                  "trim", NULL, NULL, NULL, "randtrim" };
        unsigned int i;
        char fname[PATH_MAX];
        int numjobs, file_alloced;
@@ -815,10 +833,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        else
                memcpy(td->ts.percentile_list, def_percentile_list, sizeof(def_percentile_list));
 
-       td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
-       td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
-       td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX;
-       td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
+       for (i = 0; i < DDIR_RWDIR_CNT; i++) {
+               td->ts.clat_stat[i].min_val = ULONG_MAX;
+               td->ts.slat_stat[i].min_val = ULONG_MAX;
+               td->ts.lat_stat[i].min_val = ULONG_MAX;
+               td->ts.bw_stat[i].min_val = ULONG_MAX;
+       }
        td->ddir_seq_nr = td->o.ddir_seq_nr;
 
        if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) {
@@ -858,18 +878,20 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                                                        td->o.cpuload,
                                                        td->o.cpucycle);
                        } else {
-                               char *c1, *c2, *c3, *c4;
+                               char *c1, *c2, *c3, *c4, *c5, *c6;
 
                                c1 = to_kmg(td->o.min_bs[DDIR_READ]);
                                c2 = to_kmg(td->o.max_bs[DDIR_READ]);
                                c3 = to_kmg(td->o.min_bs[DDIR_WRITE]);
                                c4 = to_kmg(td->o.max_bs[DDIR_WRITE]);
+                               c5 = to_kmg(td->o.min_bs[DDIR_TRIM]);
+                               c6 = to_kmg(td->o.max_bs[DDIR_TRIM]);
 
-                               log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s,"
+                               log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s/%s-%s,"
                                         " ioengine=%s, iodepth=%u\n",
                                                td->o.name, td->groupid,
                                                ddir_str[td->o.td_ddir],
-                                               c1, c2, c3, c4,
+                                               c1, c2, c3, c4, c5, c6,
                                                td->io_ops->name,
                                                td->o.iodepth);
 
@@ -877,6 +899,8 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                                free(c2);
                                free(c3);
                                free(c4);
+                               free(c5);
+                               free(c6);
                        }
                } else if (job_add_num == 1)
                        log_info("...\n");