static int str_bssplit_cb(void *data, const char *input)
{
struct thread_data *td = data;
- char *str, *p, *odir;
+ char *str, *p, *odir, *ddir;
int ret = 0;
p = str = strdup(input);
odir = strchr(str, ',');
if (odir) {
- ret = bssplit_ddir(td, DDIR_WRITE, odir + 1);
+ ddir = strchr(odir + 1, ',');
+ if (ddir) {
+ ret = bssplit_ddir(td, DDIR_TRIM, ddir + 1);
+ if (!ret)
+ *ddir = '\0';
+ } else {
+ char *op;
+
+ op = strdup(odir + 1);
+ ret = bssplit_ddir(td, DDIR_TRIM, op);
+
+ free(op);
+ }
+ if (!ret)
+ ret = bssplit_ddir(td, DDIR_WRITE, odir + 1);
if (!ret) {
*odir = '\0';
ret = bssplit_ddir(td, DDIR_READ, str);
char *op;
op = strdup(str);
+ ret = bssplit_ddir(td, DDIR_WRITE, op);
+ free(op);
+ if (!ret) {
+ op = strdup(str);
+ ret = bssplit_ddir(td, DDIR_TRIM, op);
+ free(op);
+ }
ret = bssplit_ddir(td, DDIR_READ, str);
- if (!ret)
- ret = bssplit_ddir(td, DDIR_WRITE, op);
-
- free(op);
}
free(p);
return ret;
}
+static int str2error(char *str)
+{
+ const char * err[] = {"EPERM", "ENOENT", "ESRCH", "EINTR", "EIO",
+ "ENXIO", "E2BIG", "ENOEXEC", "EBADF",
+ "ECHILD", "EAGAIN", "ENOMEM", "EACCES",
+ "EFAULT", "ENOTBLK", "EBUSY", "EEXIST",
+ "EXDEV", "ENODEV", "ENOTDIR", "EISDIR",
+ "EINVAL", "ENFILE", "EMFILE", "ENOTTY",
+ "ETXTBSY","EFBIG", "ENOSPC", "ESPIPE",
+ "EROFS","EMLINK", "EPIPE", "EDOM", "ERANGE"};
+ int i = 0, num = sizeof(err) / sizeof(void *);
+
+ while( i < num) {
+ if (!strcmp(err[i], str))
+ return i + 1;
+ i++;
+ }
+ return 0;
+}
+
+static int ignore_error_type(struct thread_data *td, int etype, char *str)
+{
+ unsigned int i;
+ int *error;
+ char *fname;
+
+ if (etype >= ERROR_TYPE_CNT) {
+ log_err("Illegal error type\n");
+ return 1;
+ }
+
+ td->o.ignore_error_nr[etype] = 4;
+ error = malloc(4 * sizeof(struct bssplit));
+
+ i = 0;
+ while ((fname = strsep(&str, ":")) != NULL) {
+
+ if (!strlen(fname))
+ break;
+
+ /*
+ * grow struct buffer, if needed
+ */
+ if (i == td->o.ignore_error_nr[etype]) {
+ td->o.ignore_error_nr[etype] <<= 1;
+ error = realloc(error, td->o.ignore_error_nr[etype]
+ * sizeof(int));
+ }
+ if (fname[0] == 'E') {
+ error[i] = str2error(fname);
+ } else {
+ error[i] = atoi(fname);
+ if (error[i] < 0)
+ error[i] = error[i];
+ }
+ if (!error[i]) {
+ log_err("Unknown error %s, please use number value \n",
+ fname);
+ return 1;
+ }
+ i++;
+ }
+ if (i) {
+ td->o.continue_on_error |= 1 << etype;
+ td->o.ignore_error_nr[etype] = i;
+ td->o.ignore_error[etype] = error;
+ }
+ return 0;
+
+}
+
+static int str_ignore_error_cb(void *data, const char *input)
+{
+ struct thread_data *td = data;
+ char *str, *p, *n;
+ int type = 0, ret = 1;
+ p = str = strdup(input);
+
+ strip_blank_front(&str);
+ strip_blank_end(str);
+
+ while (p) {
+ n = strchr(p, ',');
+ if (n)
+ *n++ = '\0';
+ ret = ignore_error_type(td, type, p);
+ if (ret)
+ break;
+ p = n;
+ type++;
+ }
+ free(str);
+ return ret;
+}
+
static int str_rw_cb(void *data, const char *str)
{
struct thread_data *td = data;
.oval = TD_DDIR_WRITE,
.help = "Sequential write",
},
+ { .ival = "trim",
+ .oval = TD_DDIR_TRIM,
+ .help = "Sequential trim",
+ },
{ .ival = "randread",
.oval = TD_DDIR_RANDREAD,
.help = "Random read",
.oval = TD_DDIR_RANDWRITE,
.help = "Random write",
},
+ { .ival = "randtrim",
+ .oval = TD_DDIR_RANDTRIM,
+ .help = "Random trim",
+ },
{ .ival = "rw",
.oval = TD_DDIR_RW,
.help = "Sequential read and write mix",
{ .ival = "rdma",
.help = "RDMA IO engine",
},
+#endif
+#ifdef FIO_HAVE_FUSION_AW
+ { .ival = "fusion-aw-sync",
+ .help = "Fusion-io atomic write engine",
+ },
+#endif
+#ifdef FIO_HAVE_E4_ENG
+ { .ival = "e4defrag",
+ .help = "ext4 defrag engine",
+ },
+#endif
+#ifdef FIO_HAVE_FALLOC_ENG
+ { .ival = "falloc",
+ .help = "fallocate() file based engine",
+ },
#endif
{ .ival = "external",
.help = "Load external engine (append name)",
.type = FIO_OPT_INT,
.off1 = td_var_offset(bs[DDIR_READ]),
.off2 = td_var_offset(bs[DDIR_WRITE]),
+ .off3 = td_var_offset(bs[DDIR_TRIM]),
.minval = 1,
.help = "Block size unit",
.def = "4k",
.type = FIO_OPT_INT,
.off1 = td_var_offset(ba[DDIR_READ]),
.off2 = td_var_offset(ba[DDIR_WRITE]),
+ .off3 = td_var_offset(ba[DDIR_TRIM]),
.minval = 1,
.help = "IO block offset alignment",
.parent = "rw",
.off2 = td_var_offset(max_bs[DDIR_READ]),
.off3 = td_var_offset(min_bs[DDIR_WRITE]),
.off4 = td_var_offset(max_bs[DDIR_WRITE]),
+ .off5 = td_var_offset(min_bs[DDIR_TRIM]),
+ .off6 = td_var_offset(max_bs[DDIR_TRIM]),
.minval = 1,
.help = "Set block size range (in more detail than bs)",
.parent = "rw",
{
.name = "rate",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(rate[0]),
- .off2 = td_var_offset(rate[1]),
+ .off1 = td_var_offset(rate[DDIR_READ]),
+ .off2 = td_var_offset(rate[DDIR_WRITE]),
+ .off3 = td_var_offset(rate[DDIR_TRIM]),
.help = "Set bandwidth rate",
},
{
.name = "ratemin",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(ratemin[0]),
- .off2 = td_var_offset(ratemin[1]),
+ .off1 = td_var_offset(ratemin[DDIR_READ]),
+ .off2 = td_var_offset(ratemin[DDIR_WRITE]),
+ .off3 = td_var_offset(ratemin[DDIR_TRIM]),
.help = "Job must meet this rate or it will be shutdown",
.parent = "rate",
},
{
.name = "rate_iops",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(rate_iops[0]),
- .off2 = td_var_offset(rate_iops[1]),
+ .off1 = td_var_offset(rate_iops[DDIR_READ]),
+ .off2 = td_var_offset(rate_iops[DDIR_WRITE]),
+ .off3 = td_var_offset(rate_iops[DDIR_TRIM]),
.help = "Limit IO used to this number of IO operations/sec",
},
{
.name = "rate_iops_min",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(rate_iops_min[0]),
- .off2 = td_var_offset(rate_iops_min[1]),
+ .off1 = td_var_offset(rate_iops_min[DDIR_READ]),
+ .off2 = td_var_offset(rate_iops_min[DDIR_WRITE]),
+ .off3 = td_var_offset(rate_iops_min[DDIR_TRIM]),
.help = "Job must meet this rate or it will be shut down",
.parent = "rate_iops",
},
},
},
},
+ {
+ .name = "ignore_error",
+ .type = FIO_OPT_STR,
+ .cb = str_ignore_error_cb,
+ .help = "Set a specific list of errors to ignore",
+ .parent = "rw",
+ },
+ {
+ .name = "error_dump",
+ .type = FIO_OPT_BOOL,
+ .off1 = td_var_offset(error_dump),
+ .def = "0",
+ .help = "Dump info on each error",
+ },
+
{
.name = "profile",
.type = FIO_OPT_STR_STORE,
projects / fio.git / blobdiff