projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce enum fio_q_status
[fio.git]
/
engines
/
cpu.c
diff --git
a/engines/cpu.c
b/engines/cpu.c
index 7e4d7374accd24399a6d780639f5c94f05c5c9a3..37f9bbad501a113e0f4f4fc0c4ebcd22fca2bb5b 100644
(file)
--- a/
engines/cpu.c
+++ b/
engines/cpu.c
@@
-6,6
+6,7
@@
*
*/
#include "../fio.h"
*
*/
#include "../fio.h"
+#include "../optgroup.h"
struct cpu_options {
void *pad;
struct cpu_options {
void *pad;
@@
-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,
},
{
@@
-52,7
+53,8
@@
static struct fio_option options[] = {
};
};
-static int fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u)
+static enum fio_q_status
+fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u)
{
struct cpu_options *co = td->eo;
{
struct cpu_options *co = td->eo;
@@
-87,8
+89,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;
}