X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=profiles%2Fact.c;h=4d2ec5c33c2a4d9a99b34b686be0e1649b9731da;hb=bddc8d161ac433712d601765dbf455349f9dada1;hp=2080602a237f4abd5b6ac73b7cd4782a2defddb9;hpb=4a88752ad8e0b67ef9499262998d221559d6dac1;p=fio.git

diff --git a/profiles/act.c b/profiles/act.c
index 2080602a..4d2ec5c3 100644
--- a/profiles/act.c
+++ b/profiles/act.c
@@ -31,29 +31,34 @@ static struct act_pass_criteria act_pass[ACT_MAX_CRIT] = {
 	},
 };
 
+struct act_slice {
+	uint64_t lat_buckets[ACT_MAX_CRIT];
+	uint64_t total_ios;
+};
+
 struct act_run_data {
 	struct fio_mutex *mutex;
 	unsigned int pending;
 
-	uint64_t lat_buckets[ACT_MAX_CRIT];
-	uint64_t total_ios;
+	struct act_slice *slices;
+	unsigned int nr_slices;
 };
 static struct act_run_data *act_run_data;
 
 struct act_prof_data {
 	struct timeval sample_tv;
-	uint64_t lat_buckets[ACT_MAX_CRIT];
-	uint64_t total_ios;
-	uint64_t cum_lat_buckets[ACT_MAX_CRIT];
-	uint64_t cum_total_ios;
+	struct act_slice *slices;
+	unsigned int cur_slice;
+	unsigned int nr_slices;
 };
 
 static char *device_names;
-static unsigned int load = 1;
+static unsigned int load;
 static unsigned int prep;
 static unsigned int threads_per_queue;
 static unsigned int num_read_blocks;
 static unsigned int write_size;
+static unsigned long long test_duration;
 
 #define ACT_MAX_OPTS	128
 static const char *act_opts[ACT_MAX_OPTS] = {
@@ -69,12 +74,25 @@ static unsigned int org_idx;
 
 static int act_add_opt(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
 
+struct act_options {
+	unsigned int pad;
+	char *device_names;
+	unsigned int load;
+	unsigned int prep;
+	unsigned int threads_per_queue;
+	unsigned int num_read_blocks;
+	unsigned int write_size;
+	unsigned long long test_duration;
+};
+
+static struct act_options act_options;
+
 static struct fio_option options[] = {
 	{
 		.name	= "device-names",
 		.lname	= "device-names",
 		.type	= FIO_OPT_STR_STORE,
-		.roff1	= &device_names,
+		.off1	= offsetof(struct act_options, device_names),
 		.help	= "Devices to use",
 		.category = FIO_OPT_C_PROFILE,
 		.group	= FIO_OPT_G_ACT,
@@ -83,17 +101,27 @@ static struct fio_option options[] = {
 		.name	= "load",
 		.lname	= "Load multiplier",
 		.type	= FIO_OPT_INT,
-		.roff1	= &load,
+		.off1	= offsetof(struct act_options, load),
 		.help	= "ACT load multipler (default 1x)",
 		.def	= "1",
 		.category = FIO_OPT_C_PROFILE,
 		.group	= FIO_OPT_G_ACT,
 	},
+	{
+		.name	= "test-duration",
+		.lname	= "Test duration",
+		.type	= FIO_OPT_STR_VAL_TIME,
+		.off1	= offsetof(struct act_options, test_duration),
+		.help	= "How long the entire test takes to run",
+		.def	= "24h",
+		.category = FIO_OPT_C_PROFILE,
+		.group	= FIO_OPT_G_ACT,
+	},
 	{
 		.name	= "threads-per-queue",
 		.lname	= "Number of read IO threads per device",
 		.type	= FIO_OPT_INT,
-		.roff1	= &threads_per_queue,
+		.off1	= offsetof(struct act_options, threads_per_queue),
 		.help	= "Number of read IO threads per device",
 		.def	= "8",
 		.category = FIO_OPT_C_PROFILE,
@@ -103,7 +131,7 @@ static struct fio_option options[] = {
 		.name	= "read-req-num-512-blocks",
 		.lname	= "Number of 512b blocks to read",
 		.type	= FIO_OPT_INT,
-		.roff1	= &num_read_blocks,
+		.off1	= offsetof(struct act_options, num_read_blocks),
 		.help	= "Number of 512b blocks to read at the time",
 		.def	= "3",
 		.category = FIO_OPT_C_PROFILE,
@@ -113,7 +141,7 @@ static struct fio_option options[] = {
 		.name	= "large-block-op-kbytes",
 		.lname	= "Size of large block ops (writes)",
 		.type	= FIO_OPT_INT,
-		.roff1	= &write_size,
+		.off1	= offsetof(struct act_options, write_size),
 		.help	= "Size of large block ops (writes)",
 		.def	= "128k",
 		.category = FIO_OPT_C_PROFILE,
@@ -123,7 +151,7 @@ static struct fio_option options[] = {
 		.name	= "prep",
 		.lname	= "Run ACT prep phase",
 		.type	= FIO_OPT_STR_SET,
-		.roff1	= &prep,
+		.off1	= offsetof(struct act_options, prep),
 		.help	= "Set to run ACT prep phase",
 		.category = FIO_OPT_C_PROFILE,
 		.group	= FIO_OPT_G_ACT,
@@ -222,7 +250,7 @@ static int act_add_dev(const char *dev)
 	if (prep)
 		return act_add_dev_prep(dev);
 
-	if (act_add_opt("runtime=24h"))
+	if (act_add_opt("runtime=%llus", test_duration))
 		return 1;
 	if (act_add_opt("time_based=1"))
 		return 1;
@@ -241,7 +269,8 @@ static int act_add_dev(const char *dev)
 static int act_prep_cmdline(void)
 {
 	if (!device_names) {
-		log_err("act: need device-names\n");
+		log_err("act: you need to set IO target(s) with the "
+			"device-names option.\n");
 		return 1;
 	}
 
@@ -266,17 +295,26 @@ static int act_prep_cmdline(void)
 static int act_io_u_lat(struct thread_data *td, uint64_t usec)
 {
 	struct act_prof_data *apd = td->prof_data;
+	struct act_slice *slice;
 	int i, ret = 0;
 	double perm;
 
 	if (prep)
 		return 0;
 
-	apd->total_ios++;
+	/*
+	 * Really should not happen, but lets not let jitter at the end
+	 * ruin our day.
+	 */
+	if (apd->cur_slice >= apd->nr_slices)
+		return 0;
+
+	slice = &apd->slices[apd->cur_slice];
+	slice->total_ios++;
 
 	for (i = ACT_MAX_CRIT - 1; i >= 0; i--) {
 		if (usec > act_pass[i].max_usec) {
-			apd->lat_buckets[i]++;
+			slice->lat_buckets[i]++;
 			break;
 		}
 	}
@@ -286,7 +324,7 @@ static int act_io_u_lat(struct thread_data *td, uint64_t usec)
 
 	/* SAMPLE_SEC has passed, check criteria for pass */
 	for (i = 0; i < ACT_MAX_CRIT; i++) {
-		perm = (1000.0 * apd->lat_buckets[i]) / apd->total_ios;
+		perm = (1000.0 * slice->lat_buckets[i]) / slice->total_ios;
 		if (perm < act_pass[i].max_perm)
 			continue;
 
@@ -295,15 +333,8 @@ static int act_io_u_lat(struct thread_data *td, uint64_t usec)
 		break;
 	}
 
-	for (i = 0; i < ACT_MAX_CRIT; i++) {
-		apd->cum_lat_buckets[i] += apd->lat_buckets[i];
-		apd->lat_buckets[i] = 0;
-	}
-
-	apd->cum_total_ios += apd->total_ios;
-	apd->total_ios = 0;
-
 	fio_gettime(&apd->sample_tv, NULL);
+	apd->cur_slice++;
 	return ret;
 }
 
@@ -314,51 +345,76 @@ static void get_act_ref(void)
 	fio_mutex_up(act_run_data->mutex);
 }
 
-static void act_show_all_stats(void)
+static int show_slice(struct act_slice *slice, unsigned int slice_num)
 {
-	unsigned int i;
-
-	log_info("         trans                  device\n");
-	log_info("         %%>(ms)                 %%>(ms)\n");
-	log_info(" slice");
+	unsigned int i, failed = 0;
 
-	for (i = 0; i < ACT_MAX_CRIT; i++)
-		log_info("\t%2u", act_pass[i].max_usec / 1000);
-	for (i = 0; i < ACT_MAX_CRIT; i++)
-		log_info("\t%2u", act_pass[i].max_usec / 1000);
-
-	log_info("\n");
-	log_info(" -----   ------ ------ ------   ------ ------ ------\n");
-	log_info("     1");
+	log_info("   %2u", slice_num);
 
 	for (i = 0; i < ACT_MAX_CRIT; i++) {
-		double perc;
+		double perc = 0.0;
 
-		perc = 100.0 * (double) act_run_data->lat_buckets[i] / (double) act_run_data->total_ios;
+		if (slice->total_ios)
+			perc = 100.0 * (double) slice->lat_buckets[i] / (double) slice->total_ios;
+		if ((perc * 10.0) >= act_pass[i].max_perm)
+			failed++;
 		log_info("\t%2.2f", perc);
 	}
 	for (i = 0; i < ACT_MAX_CRIT; i++) {
-		double perc;
+		double perc = 0.0;
 
-		perc = 100.0 * (double) act_run_data->lat_buckets[i] / (double) act_run_data->total_ios;
+		if (slice->total_ios)
+			perc = 100.0 * (double) slice->lat_buckets[i] / (double) slice->total_ios;
 		log_info("\t%2.2f", perc);
 	}
+	log_info("\n");
+
+	return failed;
+}
+
+static void act_show_all_stats(void)
+{
+	unsigned int i, fails = 0;
+
+	log_info("        trans                   device\n");
+	log_info("        %%>(ms)                  %%>(ms)\n");
+	log_info(" slice");
 
+	for (i = 0; i < ACT_MAX_CRIT; i++)
+		log_info("\t %2u", act_pass[i].max_usec / 1000);
+	for (i = 0; i < ACT_MAX_CRIT; i++)
+		log_info("\t %2u", act_pass[i].max_usec / 1000);
+
+	log_info("\n");
+	log_info(" -----  -----   -----  ------   -----   -----  ------\n");
+
+	for (i = 0; i < act_run_data->nr_slices; i++)
+		fails += show_slice(&act_run_data->slices[i], i + 1);
+
+	log_info("\nact: test complete, device(s): %s\n", fails ? "FAILED" : "PASSED");
 }
 
 static void put_act_ref(struct thread_data *td)
 {
 	struct act_prof_data *apd = td->prof_data;
-	unsigned int i;
+	unsigned int i, slice;
 
 	fio_mutex_down(act_run_data->mutex);
 
-	for (i = 0; i < ACT_MAX_CRIT; i++) {
-		act_run_data->lat_buckets[i] += apd->cum_lat_buckets[i];
-		act_run_data->lat_buckets[i] += apd->lat_buckets[i];
+	if (!act_run_data->slices) {
+		act_run_data->slices = calloc(apd->nr_slices, sizeof(struct act_slice));
+		act_run_data->nr_slices = apd->nr_slices;
 	}
 
-	act_run_data->total_ios += apd->cum_total_ios + apd->total_ios;
+	for (slice = 0; slice < apd->nr_slices; slice++) {
+		struct act_slice *dst = &act_run_data->slices[slice];
+		struct act_slice *src = &apd->slices[slice];
+
+		dst->total_ios += src->total_ios;
+
+		for (i = 0; i < ACT_MAX_CRIT; i++)
+			dst->lat_buckets[i] += src->lat_buckets[i];
+	}
 
 	if (!--act_run_data->pending)
 		act_show_all_stats();
@@ -369,10 +425,14 @@ static void put_act_ref(struct thread_data *td)
 static int act_td_init(struct thread_data *td)
 {
 	struct act_prof_data *apd;
+	unsigned int nr_slices;
 
 	get_act_ref();
 
-	apd = calloc(sizeof(*apd), 1);
+	apd = calloc(1, sizeof(*apd));
+	nr_slices = (test_duration + SAMPLE_SEC - 1) / SAMPLE_SEC;
+	apd->slices = calloc(nr_slices, sizeof(struct act_slice));
+	apd->nr_slices = nr_slices;
 	fio_gettime(&apd->sample_tv, NULL);
 	td->prof_data = apd;
 	return 0;
@@ -380,8 +440,11 @@ static int act_td_init(struct thread_data *td)
 
 static void act_td_exit(struct thread_data *td)
 {
+	struct act_prof_data *apd = td->prof_data;
+
 	put_act_ref(td);
-	free(td->prof_data);
+	free(apd->slices);
+	free(apd);
 	td->prof_data = NULL;
 }
 
@@ -395,6 +458,7 @@ static struct profile_ops act_profile = {
 	.name		= "act",
 	.desc		= "ACT Aerospike like benchmark",
 	.options	= options,
+	.opt_data	= &act_options,
 	.prep_cmd	= act_prep_cmdline,
 	.cmdline	= act_opts,
 	.io_ops		= &act_io_ops,
@@ -402,7 +466,7 @@ static struct profile_ops act_profile = {
 
 static void fio_init act_register(void)
 {
-	act_run_data = calloc(sizeof(*act_run_data), 1);
+	act_run_data = calloc(1, sizeof(*act_run_data));
 	act_run_data->mutex = fio_mutex_init(FIO_MUTEX_UNLOCKED);
 
 	if (register_profile(&act_profile))
@@ -416,6 +480,7 @@ static void fio_exit act_unregister(void)
 
 	unregister_profile(&act_profile);
 	fio_mutex_remove(act_run_data->mutex);
+	free(act_run_data->slices);
 	free(act_run_data);
 	act_run_data = NULL;
 }