if (td == &def_thread)
return 0;
- if (td->io_engine & FIO_SYNCIO)
+ /*
+ * Set default io engine, if none set
+ */
+ if (!td->io_ops) {
+ td->io_ops = load_ioengine(td, DEF_IO_ENGINE_NAME);
+ if (!td->io_ops) {
+ log_err("default engine %s not there?\n", DEF_IO_ENGINE_NAME);
+ return 1;
+ }
+ }
+
+ if (td->io_ops->flags & FIO_SYNCIO)
td->iodepth = 1;
else {
if (!td->iodepth)
ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
if (!terse_output) {
- if (!job_add_num)
- fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
- else if (job_add_num == 1)
+ if (!job_add_num) {
+ if (td->io_ops->flags & FIO_CPUIO)
+ fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
+ else
+ fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_ops->name, td->iodepth);
+ } else if (job_add_num == 1)
fprintf(f_out, "...\n");
}
static int str_ioengine_cb(struct thread_data *td, char *str)
{
- if (!strncmp(str, "linuxaio", 8) || !strncmp(str, "aio", 3) ||
- !strncmp(str, "libaio", 6)) {
- strcpy(td->io_engine_name, "libaio");
- td->io_engine = FIO_LIBAIO;
- return 0;
- } else if (!strncmp(str, "posixaio", 8)) {
- strcpy(td->io_engine_name, "posixaio");
- td->io_engine = FIO_POSIXAIO;
- return 0;
- } else if (!strncmp(str, "sync", 4)) {
- strcpy(td->io_engine_name, "sync");
- td->io_engine = FIO_SYNCIO;
- return 0;
- } else if (!strncmp(str, "mmap", 4)) {
- strcpy(td->io_engine_name, "mmap");
- td->io_engine = FIO_MMAPIO;
- return 0;
- } else if (!strncmp(str, "sgio", 4)) {
- strcpy(td->io_engine_name, "sgio");
- td->io_engine = FIO_SGIO;
+ td->io_ops = load_ioengine(td, str);
+ if (td->io_ops)
return 0;
- } else if (!strncmp(str, "splice", 6)) {
- strcpy(td->io_engine_name, "splice");
- td->io_engine = FIO_SPLICEIO;
- return 0;
- }
- log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice\n");
+ log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice, cpu\n");
return 1;
}
/*
* This is our [ini] type file parser.
*/
-int parse_jobs_ini(char *file)
+int parse_jobs_ini(char *file, int stonewall_flag)
{
unsigned int prioclass, prio, cpu, global, il;
unsigned long long ull;
fpos_t off;
FILE *f;
char *p;
- int ret = 0, stonewall = 1;
+ int ret = 0, stonewall;
f = fopen(file, "r");
if (!f) {
name = malloc(256);
tmpbuf = malloc(4096);
+ stonewall = stonewall_flag;
while ((p = fgets(string, 4096, f)) != NULL) {
if (ret)
break;
fgetpos(f, &off);
continue;
}
+ if (!check_int(p, "cpuload", &td->cpuload)) {
+ fgetpos(f, &off);
+ continue;
+ }
+ if (!check_int(p, "cpuchunks", &td->cpucycle)) {
+ fgetpos(f, &off);
+ continue;
+ }
if (!check_int(p, "thinktime", &td->thinktime)) {
fgetpos(f, &off);
continue;
continue;
}
if (!check_str_time(p, "timeout", &ull)) {
- td->timeout = ul1;
+ td->timeout = ull;
fgetpos(f, &off);
continue;
}
def_thread.bs = DEF_BS;
def_thread.min_bs = -1;
def_thread.max_bs = -1;
- def_thread.io_engine = DEF_IO_ENGINE;
- strcpy(def_thread.io_engine_name, DEF_IO_ENGINE_NAME);
def_thread.odirect = DEF_ODIRECT;
def_thread.ratecycle = DEF_RATE_CYCLE;
def_thread.sequential = DEF_SEQUENTIAL;
printf("\t-l Generate per-job latency logs\n");
printf("\t-w Generate per-job bandwidth logs\n");
printf("\t-m Minimal (terse) output\n");
- printf("\t-f Job file (Required)\n");
printf("\t-v Print version info and exit\n");
}
{
int c, idx = 1, ini_idx = 0;
- while ((c = getopt(argc, argv, "t:o:f:lwvhm")) != EOF) {
+ while ((c = getopt(argc, argv, "t:o:lwvhm")) != EOF) {
switch (c) {
case 't':
def_timeout = atoi(optarg);
- idx++;
- break;
- case 'f':
- ini_idx++;
- ini_file = realloc(ini_file, ini_idx * sizeof(char *));
- ini_file[ini_idx - 1] = strdup(optarg);
- idx++;
+ idx = optind;
break;
case 'l':
write_lat_log = 1;
- idx++;
+ idx = optind;
break;
case 'w':
write_bw_log = 1;
- idx++;
+ idx = optind;
break;
case 'o':
f_out = fopen(optarg, "w+");
exit(1);
}
f_err = f_out;
- idx++;
+ idx = optind;
break;
case 'm':
terse_output = 1;
- idx++;
+ idx = optind;
break;
case 'h':
usage(argv[0]);
ini_file[ini_idx - 1] = strdup(argv[idx]);
idx++;
}
-
+
if (!f_out) {
f_out = stdout;
f_err = stderr;
for (i = 0; i < job_files; i++) {
if (fill_def_thread())
return 1;
- if (parse_jobs_ini(ini_file[i]))
+ if (parse_jobs_ini(ini_file[i], i))
return 1;
free(ini_file[i]);
}