X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=8c9faec22f2cb5a67150d1264d600be1cdf709a9;hb=812409e9486a37ba2f51e6e23c97e6ae8e26ff9a;hp=820c30c5d0151cc2b789e16f39e20b64209d0f11;hpb=ea51b956a15dd4aee047233be892bb3607f3adbd;p=fio.git

diff --git a/init.c b/init.c
index 820c30c5..8c9faec2 100644
--- a/init.c
+++ b/init.c
@@ -74,21 +74,23 @@ static char cmd_optstr[256];
 static int did_arg;
 
 const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN] = {
-	{ .u.f	=  1.0 },
-	{ .u.f	=  5.0 },
-	{ .u.f	= 10.0 },
-	{ .u.f	= 20.0 },
-	{ .u.f	= 30.0 },
-	{ .u.f	= 40.0 },
-	{ .u.f	= 50.0 },
-	{ .u.f	= 60.0 },
-	{ .u.f	= 70.0 },
-	{ .u.f	= 80.0 },
-	{ .u.f	= 90.0 },
-	{ .u.f	= 95.0 },
-	{ .u.f	= 99.0 },
-	{ .u.f	= 99.5 },
-	{ .u.f	= 99.9 },
+	{ .u.f	=  1.00 },
+	{ .u.f	=  5.00 },
+	{ .u.f	= 10.00 },
+	{ .u.f	= 20.00 },
+	{ .u.f	= 30.00 },
+	{ .u.f	= 40.00 },
+	{ .u.f	= 50.00 },
+	{ .u.f	= 60.00 },
+	{ .u.f	= 70.00 },
+	{ .u.f	= 80.00 },
+	{ .u.f	= 90.00 },
+	{ .u.f	= 95.00 },
+	{ .u.f	= 99.00 },
+	{ .u.f	= 99.50 },
+	{ .u.f	= 99.90 },
+	{ .u.f	= 99.95 },
+	{ .u.f	= 99.99 },
 };
 
 #define FIO_CLIENT_FLAG		(1 << 16)
@@ -583,7 +585,7 @@ static int fixup_options(struct thread_data *td)
 /*
  * This function leaks the buffer
  */
-static char *to_kmg(unsigned int val)
+char *fio_uint_to_kmg(unsigned int val)
 {
 	char *buf = malloc(32);
 	char post[] = { 0, 'K', 'M', 'G', 'P', 'E', 0 };
@@ -773,11 +775,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num,
 	if (ioengine_load(td))
 		goto err;
 
-	if (td->o.use_thread)
-		nr_thread++;
-	else
-		nr_process++;
-
 	if (td->o.odirect)
 		td->io_ops->flags |= FIO_RAWIO;
 
@@ -861,7 +858,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num,
 	if (!terse_output) {
 		if (!job_add_num) {
 			if (is_backend && !recursed)
-				fio_server_send_add_job(&td->o, td->io_ops->name);
+				fio_server_send_add_job(td);
 
 			if (!strcmp(td->io_ops->name, "cpuio")) {
 				log_info("%s: ioengine=cpu, cpuload=%u,"
@@ -871,10 +868,10 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num,
 			} else {
 				char *c1, *c2, *c3, *c4;
 
-				c1 = to_kmg(td->o.min_bs[DDIR_READ]);
-				c2 = to_kmg(td->o.max_bs[DDIR_READ]);
-				c3 = to_kmg(td->o.min_bs[DDIR_WRITE]);
-				c4 = to_kmg(td->o.max_bs[DDIR_WRITE]);
+				c1 = fio_uint_to_kmg(td->o.min_bs[DDIR_READ]);
+				c2 = fio_uint_to_kmg(td->o.max_bs[DDIR_READ]);
+				c3 = fio_uint_to_kmg(td->o.min_bs[DDIR_WRITE]);
+				c4 = fio_uint_to_kmg(td->o.max_bs[DDIR_WRITE]);
 
 				log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s,"
 					 " ioengine=%s, iodepth=%u\n",