projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oslib/libmtd: Removing useless err assigment
[fio.git]
/
engines
/
cpu.c
diff --git
a/engines/cpu.c
b/engines/cpu.c
index 85598ef77fb9acd8d4868d6e15de1d9f64bee83f..d0b4a895afcb78c3619adebb15854236a324785c 100644
(file)
--- a/
engines/cpu.c
+++ b/
engines/cpu.c
@@
-6,9
+6,10
@@
*
*/
#include "../fio.h"
*
*/
#include "../fio.h"
+#include "../optgroup.h"
struct cpu_options {
struct cpu_options {
-
struct thread_data *t
d;
+
void *pa
d;
unsigned int cpuload;
unsigned int cpucycle;
unsigned int exit_io_done;
unsigned int cpuload;
unsigned int cpucycle;
unsigned int exit_io_done;
@@
-21,7
+22,7
@@
static struct fio_option options[] = {
.type = FIO_OPT_INT,
.off1 = offsetof(struct cpu_options, cpuload),
.help = "Use this percentage of CPU",
.type = FIO_OPT_INT,
.off1 = offsetof(struct cpu_options, cpuload),
.help = "Use this percentage of CPU",
- .category = FIO_OPT_C_
GENERAL
,
+ .category = FIO_OPT_C_
ENGINE
,
.group = FIO_OPT_G_INVALID,
},
{
.group = FIO_OPT_G_INVALID,
},
{
@@
-33,7
+34,7
@@
static struct fio_option options[] = {
.def = "50000",
.parent = "cpuload",
.hide = 1,
.def = "50000",
.parent = "cpuload",
.hide = 1,
- .category = FIO_OPT_C_
GENERAL
,
+ .category = FIO_OPT_C_
ENGINE
,
.group = FIO_OPT_G_INVALID,
},
{
.group = FIO_OPT_G_INVALID,
},
{
@@
-43,7
+44,7
@@
static struct fio_option options[] = {
.off1 = offsetof(struct cpu_options, exit_io_done),
.help = "Exit when IO threads finish",
.def = "0",
.off1 = offsetof(struct cpu_options, exit_io_done),
.help = "Exit when IO threads finish",
.def = "0",
- .category = FIO_OPT_C_
GENERAL
,
+ .category = FIO_OPT_C_
ENGINE
,
.group = FIO_OPT_G_INVALID,
},
{
.group = FIO_OPT_G_INVALID,
},
{
@@
-87,8
+88,8
@@
static int fio_cpuio_init(struct thread_data *td)
o->nr_files = o->open_files = 1;
o->nr_files = o->open_files = 1;
- log_info("%s: ioengine=
cpu, cpuload=%u, cpucycle=%u\n", td->o.name
,
-
co->cpuload, co->cpucycle);
+ log_info("%s: ioengine=
%s, cpuload=%u, cpucycle=%u\n"
,
+
td->o.name, td->io_ops->name,
co->cpuload, co->cpucycle);
return 0;
}
return 0;
}