X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fcpu.c;h=3d855e363c3212ba3d0c656ac5e2e92de1da1c05;hp=c908cab8af55aff7f86a58c35483af973450800d;hb=2403767a46a027bc7fdbb6ff27fc0da109ee1179;hpb=2dc1bbeb58edc85f2829eed6729862c438ea2353

diff --git a/engines/cpu.c b/engines/cpu.c
index c908cab8..3d855e36 100644
--- a/engines/cpu.c
+++ b/engines/cpu.c
@@ -6,57 +6,97 @@
  *
  */
 #include "../fio.h"
-#include "../os.h"
+#include "../optgroup.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 {
+	void *pad;
+	unsigned int cpuload;
+	unsigned int cpucycle;
+	unsigned int exit_io_done;
+};
 
-static int fio_cpuio_setup(struct thread_data fio_unused *td)
-{
-	struct fio_file *f;
-	unsigned int i;
+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	= "exit_on_io_done",
+		.lname	= "Exit when IO threads are done",
+		.type	= FIO_OPT_BOOL,
+		.off1	= offsetof(struct cpu_options, exit_io_done),
+		.help	= "Exit when IO threads finish",
+		.def	= "0",
+		.category = FIO_OPT_C_GENERAL,
+		.group	= FIO_OPT_G_INVALID,
+	},
+	{
+		.name	= NULL,
+	},
+};
 
-	td->o.size = -1;
-	td->io_size = td->o.size;
-	td->total_io_size = td->io_size;
 
-	for_each_file(td, f, i) {
-		f->real_file_size = -1;
-		f->file_size = -1;
+static int fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u)
+{
+	struct cpu_options *co = td->eo;
+
+	if (co->exit_io_done && !fio_running_or_pending_io_threads()) {
+		td->done = 1;
+		return FIO_Q_BUSY;
 	}
 
-	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=%s, cpuload=%u, cpucycle=%u\n",
+		td->o.name, td->io_ops->name, co->cpuload, co->cpucycle);
+
 	return 0;
 }
 
-static int fio_cpuio_open(struct thread_data fio_unused *td, struct fio_file *f)
+static int fio_cpuio_open(struct thread_data fio_unused *td,
+			  struct fio_file fio_unused *f)
 {
-	f->fd = 0;
 	return 0;
 }
 
@@ -65,9 +105,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)