X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fcpu.c;h=c798f1884e8dff8df9b079d87d61c8c4259ae10c;hp=dd69cedeaff7ee438fb284198dc2b91ad5f2b785;hb=3d7174e3c4b8aa4daa36261a8e638b702fac5aba;hpb=f4e62a5f3640dfe2d2119bbe1e40bf57747f6564

diff --git a/engines/cpu.c b/engines/cpu.c
index dd69cede..c798f188 100644
--- a/engines/cpu.c
+++ b/engines/cpu.c
@@ -7,47 +7,73 @@
  */
 #include "../fio.h"
 
-static int fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u)
-{
-	__usec_sleep(td->o.cpucycle);
-	return FIO_Q_COMPLETED;
-}
+struct cpu_options {
+	struct thread_data *td;
+	unsigned int cpuload;
+	unsigned int cpucycle;
+};
+
+static struct fio_option options[] = {
+	{
+		.name	= "cpuload",
+		.lname	= "CPU load",
+		.type	= FIO_OPT_INT,
+		.off1	= offsetof(struct cpu_options, cpuload),
+		.help	= "Use this percentage of CPU",
+		.category = FIO_OPT_C_GENERAL,
+		.group	= FIO_OPT_G_INVALID,
+	},
+	{
+		.name	= "cpuchunks",
+		.lname	= "CPU chunk",
+		.type	= FIO_OPT_INT,
+		.off1	= offsetof(struct cpu_options, cpucycle),
+		.help	= "Length of the CPU burn cycles (usecs)",
+		.def	= "50000",
+		.parent = "cpuload",
+		.hide	= 1,
+		.category = FIO_OPT_C_GENERAL,
+		.group	= FIO_OPT_G_INVALID,
+	},
+	{
+		.name	= NULL,
+	},
+};
 
-static int fio_cpuio_setup(struct thread_data fio_unused *td)
+
+static int fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u)
 {
-	struct fio_file *f;
-	unsigned int i;
-
-	for_each_file(td, f, i) {
-		if (td->o.size)
-			f->real_file_size = td->o.size / td->o.nr_files;
-		else
-			f->real_file_size = -1ULL;
-	}
+	struct cpu_options *co = td->eo;
 
-	return 0;
+	usec_spin(co->cpucycle);
+	return FIO_Q_COMPLETED;
 }
 
 static int fio_cpuio_init(struct thread_data *td)
 {
 	struct thread_options *o = &td->o;
+	struct cpu_options *co = td->eo;
 
-	if (!o->cpuload) {
+	if (!co->cpuload) {
 		td_vmsg(td, EINVAL, "cpu thread needs rate (cpuload=)","cpuio");
 		return 1;
 	}
 
-	if (o->cpuload > 100)
-		o->cpuload = 100;
+	if (co->cpuload > 100)
+		co->cpuload = 100;
 
 	/*
 	 * set thinktime_sleep and thinktime_spin appropriately
 	 */
 	o->thinktime_blocks = 1;
 	o->thinktime_spin = 0;
-	o->thinktime = (o->cpucycle * (100 - o->cpuload)) / o->cpuload;
+	o->thinktime = (co->cpucycle * (100 - co->cpuload)) / co->cpuload;
 
 	o->nr_files = o->open_files = 1;
+
+	log_info("%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->o.name,
+						co->cpuload, co->cpucycle);
+
 	return 0;
 }
 
@@ -62,9 +88,10 @@ static struct ioengine_ops ioengine = {
 	.version	= FIO_IOOPS_VERSION,
 	.queue		= fio_cpuio_queue,
 	.init		= fio_cpuio_init,
-	.setup		= fio_cpuio_setup,
 	.open_file	= fio_cpuio_open,
-	.flags		= FIO_SYNCIO | FIO_DISKLESSIO,
+	.flags		= FIO_SYNCIO | FIO_DISKLESSIO | FIO_NOIO,
+	.options		= options,
+	.option_struct_size	= sizeof(struct cpu_options),
 };
 
 static void fio_init fio_cpuio_register(void)