6676967 incorrectly using %lld in several places

10 files changed, 81 insertions, 71 deletions

diff --git a/usr/src/cmd/filebench/common/eventgen.c b/usr/src/cmd/filebench/common/eventgen.c
index a8ec68286b..f83c379293 100644
--- a/usr/src/cmd/filebench/common/eventgen.c
+++ b/usr/src/cmd/filebench/common/eventgen.c
@@ -104,7 +104,8 @@ eventgen_thread(void)
 		count = (filebench_shm->eventgen_hz * delta) / 1000000000;
 
 		filebench_log(LOG_DEBUG_SCRIPT,
-		    "delta %lldms count %d", delta / 1000000, count);
+		    "delta %llums count %d",
+		    (u_longlong_t)(delta / 1000000), count);
 
 		/* Send 'count' events */
 		(void) ipc_mutex_lock(&filebench_shm->eventgen_lock);
diff --git a/usr/src/cmd/filebench/common/fb_random.c b/usr/src/cmd/filebench/common/fb_random.c
index a086185772..15a66880f8 100644
--- a/usr/src/cmd/filebench/common/fb_random.c
+++ b/usr/src/cmd/filebench/common/fb_random.c
@@ -312,9 +312,9 @@ randdist_init_one(randdist_t *rndp)
 	rndp->rnd_vint_round  = avd_get_int(rndp->rnd_round);
 
 	filebench_log(LOG_DEBUG_IMPL,
-	    "init random var %s: Mean = %6.0llf, Gamma = %6.3llf, Min = %lld",
+	    "init random var %s: Mean = %6.0llf, Gamma = %6.3llf, Min = %llu",
 	    rndp->rnd_var->var_name, rndp->rnd_dbl_mean, rndp->rnd_dbl_gamma,
-	    rndp->rnd_vint_min);
+	    (u_longlong_t)rndp->rnd_vint_min);
 
 	/* initialize distribution to apply */
 	switch (rndp->rnd_type & RAND_TYPE_MASK) {
diff --git a/usr/src/cmd/filebench/common/filebench.h b/usr/src/cmd/filebench/common/filebench.h
index e41813f529..dfe193183d 100644
--- a/usr/src/cmd/filebench/common/filebench.h
+++ b/usr/src/cmd/filebench/common/filebench.h
@@ -109,7 +109,7 @@ void filebench_shutdown(int error);
 #define	MIN(x, y) ((x) < (y) ? (x) : (y))
 #endif
 
-#define	FILEBENCH_VERSION	"1.2.0"
+#define	FILEBENCH_VERSION	"1.2.1"
 #define	FILEBENCHDIR	"/usr/benchmarks/filebench"
 #define	FILEBENCH_PROMPT	"filebench> "
 #define	MAX_LINE_LEN	1024
diff --git a/usr/src/cmd/filebench/common/fileset.c b/usr/src/cmd/filebench/common/fileset.c
index 72d6bc856e..497894ccf6 100644
--- a/usr/src/cmd/filebench/common/fileset.c
+++ b/usr/src/cmd/filebench/common/fileset.c
@@ -359,7 +359,8 @@ fileset_alloc_file(filesetentry_t *entry)
 	free(buf);
 
 	filebench_log(LOG_DEBUG_IMPL,
-	    "Pre-allocated file %s size %lld", path, entry->fse_size);
+	    "Pre-allocated file %s size %llu",
+	    path, (u_longlong_t)entry->fse_size);
 
 	return (0);
 }
@@ -618,9 +619,10 @@ fileset_create(fileset_t *fileset)
 			(void) snprintf(cmd, sizeof (cmd), "rm -rf %s", path);
 			(void) system(cmd);
 			filebench_log(LOG_VERBOSE,
-			    "Removed any existing %s %s in %lld seconds",
+			    "Removed any existing %s %s in %llu seconds",
 			    fileset_entity_name(fileset), fileset_name,
-			    ((gethrtime() - start) / 1000000000) + 1);
+			    (u_longlong_t)(((gethrtime() - start) /
+			    1000000000) + 1));
 		} else {
 			/* we are re-using */
 			reusing = 1;
@@ -700,11 +702,11 @@ fileset_create(fileset_t *fileset)
 
 exit:
 	filebench_log(LOG_VERBOSE,
-	    "Preallocated %d of %lld of %s %s in %lld seconds",
+	    "Preallocated %d of %llu of %s %s in %llu seconds",
 	    preallocated,
-	    fileset->fs_constentries,
+	    (u_longlong_t)fileset->fs_constentries,
 	    fileset_entity_name(fileset), fileset_name,
-	    ((gethrtime() - start) / 1000000000) + 1);
+	    (u_longlong_t)(((gethrtime() - start) / 1000000000) + 1));
 
 	return (0);
 }
@@ -981,16 +983,16 @@ fileset_populate(fileset_t *fileset)
 
 exists:
 	if (fileset->fs_attrs & FILESET_IS_FILE) {
-		filebench_log(LOG_VERBOSE, "File %s: mbytes=%lld",
+		filebench_log(LOG_VERBOSE, "File %s: mbytes=%llu",
 		    avd_get_str(fileset->fs_name),
-		    fileset->fs_bytes / 1024UL / 1024UL);
+		    (u_longlong_t)(fileset->fs_bytes / 1024UL / 1024UL));
 	} else {
-		filebench_log(LOG_VERBOSE, "Fileset %s: %lld files, "
-		    "avg dir = %d, avg depth = %.1lf, mbytes=%lld",
+		filebench_log(LOG_VERBOSE, "Fileset %s: %d files, "
+		    "avg dir = %d, avg depth = %.1lf, mbytes=%llu",
 		    avd_get_str(fileset->fs_name), entries,
 		    meandirwidth,
 		    fileset->fs_meandepth,
-		    fileset->fs_bytes / 1024UL / 1024UL);
+		    (u_longlong_t)(fileset->fs_bytes / 1024UL / 1024UL));
 	}
 	return (0);
 }
@@ -1193,17 +1195,17 @@ fileset_print(fileset_t *fileset, int first)
 			    fileset_path, fileset_name, &pad[pathlength]);
 		} else {
 			filebench_log(LOG_INFO,
-			    "%s/%s%s%9lld     (Single File)",
+			    "%s/%s%s%9llu     (Single File)",
 			    fileset_path, fileset_name, &pad[pathlength],
-			    avd_get_int(fileset->fs_size));
+			    (u_longlong_t)avd_get_int(fileset->fs_size));
 		}
 	} else {
-		filebench_log(LOG_INFO, "%s/%s%s%9lld%12lld%10lld",
+		filebench_log(LOG_INFO, "%s/%s%s%9llu%12llu%10llu",
 		    fileset_path, fileset_name,
 		    &pad[pathlength],
-		    avd_get_int(fileset->fs_size),
-		    avd_get_int(fileset->fs_dirwidth),
-		    fileset->fs_constentries);
+		    (u_longlong_t)avd_get_int(fileset->fs_size),
+		    (u_longlong_t)avd_get_int(fileset->fs_dirwidth),
+		    (u_longlong_t)fileset->fs_constentries);
 	}
 	return (0);
 }
diff --git a/usr/src/cmd/filebench/common/flowop_library.c b/usr/src/cmd/filebench/common/flowop_library.c
index cb54bd5c9c..3dc5adf2c7 100644
--- a/usr/src/cmd/filebench/common/flowop_library.c
+++ b/usr/src/cmd/filebench/common/flowop_library.c
@@ -335,7 +335,8 @@ flowoplib_fdnum(threadflow_t *threadflow, flowop_t *flowop)
 	/* Rotate the fd on each flowop invocation */
 	if (entries > (THREADFLOW_MAXFD / 2)) {
 		filebench_log(LOG_ERROR, "Out of file descriptors in flowop %s"
-		    " (too many files : %d", flowop->fo_name, entries);
+		    " (too many files : %llu",
+		    flowop->fo_name, (u_longlong_t)entries);
 		return (FILEBENCH_ERROR);
 	}
 
@@ -522,10 +523,10 @@ flowoplib_read(threadflow_t *threadflow, flowop_t *flowop)
 		    iosize, (off64_t)fileoffset)) == -1) {
 			(void) flowop_endop(threadflow, flowop, 0);
 			filebench_log(LOG_ERROR,
-			    "read file %s failed, offset %lld "
+			    "read file %s failed, offset %llu "
 			    "io buffer %zd: %s",
 			    avd_get_str(flowop->fo_fileset->fs_name),
-			    fileoffset, iobuf, strerror(errno));
+			    (u_longlong_t)fileoffset, iobuf, strerror(errno));
 			flowop_endop(threadflow, flowop, 0);
 			return (FILEBENCH_ERROR);
 		}
@@ -682,8 +683,8 @@ flowoplib_aiowrite(threadflow_t *threadflow, flowop_t *flowop)
 		aiocb->aio_reqprio = 0;
 
 		filebench_log(LOG_DEBUG_IMPL,
-		    "aio fd=%d, bytes=%lld, offset=%lld",
-		    filedesc, iosize, fileoffset);
+		    "aio fd=%d, bytes=%llu, offset=%llu",
+		    filedesc, (u_longlong_t)iosize, (u_longlong_t)fileoffset);
 
 		flowop_beginop(threadflow, flowop);
 		if (aio_write64(aiocb) < 0) {
@@ -1191,8 +1192,8 @@ flowoplib_bwlimit(threadflow_t *threadflow, flowop_t *flowop)
 	bytes = flowop->fo_tputbucket * -1;
 	events = (bytes / MB) + 1;
 
-	filebench_log(LOG_DEBUG_IMPL, "%lld bytes, %lld events",
-	    bytes, events);
+	filebench_log(LOG_DEBUG_IMPL, "%llu bytes, %llu events",
+	    (u_longlong_t)bytes, (u_longlong_t)events);
 
 	flowop_beginop(threadflow, flowop);
 	while (filebench_shm->eventgen_hz) {
@@ -2134,8 +2135,8 @@ flowoplib_write(threadflow_t *threadflow, flowop_t *flowop)
 		if (pwrite64(filedesc, iobuf,
 		    iosize, (off64_t)fileoffset) == -1) {
 			filebench_log(LOG_ERROR, "write failed, "
-			    "offset %lld io buffer %zd: %s",
-			    fileoffset, iobuf, strerror(errno));
+			    "offset %llu io buffer %zd: %s",
+			    (u_longlong_t)fileoffset, iobuf, strerror(errno));
 			flowop_endop(threadflow, flowop, 0);
 			return (FILEBENCH_ERROR);
 		}
@@ -2273,8 +2274,8 @@ flowoplib_appendfile(threadflow_t *threadflow, flowop_t *flowop)
 	ret = write(filedesc, iobuf, iosize);
 	if (ret != iosize) {
 		filebench_log(LOG_ERROR,
-		    "Failed to write %d bytes on fd %d: %s",
-		    iosize, filedesc, strerror(errno));
+		    "Failed to write %llu bytes on fd %d: %s",
+		    (u_longlong_t)iosize, filedesc, strerror(errno));
 		flowop_endop(threadflow, flowop, ret);
 		return (FILEBENCH_ERROR);
 	}
@@ -2338,8 +2339,8 @@ flowoplib_appendfilerand(threadflow_t *threadflow, flowop_t *flowop)
 	ret = write(filedesc, iobuf, appendsize);
 	if (ret != appendsize) {
 		filebench_log(LOG_ERROR,
-		    "Failed to write %d bytes on fd %d: %s",
-		    appendsize, filedesc, strerror(errno));
+		    "Failed to write %llu bytes on fd %d: %s",
+		    (u_longlong_t)appendsize, filedesc, strerror(errno));
 		flowop_endop(threadflow, flowop, 0);
 		return (FILEBENCH_ERROR);
 	}
@@ -2431,8 +2432,8 @@ flowoplib_testrandvar_destruct(flowop_t *flowop)
 	std_dev = sqrt((mystats->sqr_sum / dbl_count) - (mean * mean)) / mean;
 
 	filebench_log(LOG_VERBOSE,
-	    "testrandvar: ops = %lld, mean = %8.2lf, stddev = %8.2lf",
-	    mystats->sample_count, mean, std_dev);
+	    "testrandvar: ops = %llu, mean = %8.2lf, stddev = %8.2lf",
+	    (u_longlong_t)mystats->sample_count, mean, std_dev);
 	free(mystats);
 }
 
diff --git a/usr/src/cmd/filebench/common/parser_gram.y b/usr/src/cmd/filebench/common/parser_gram.y
index 4f159f436a..894de5395d 100644
--- a/usr/src/cmd/filebench/common/parser_gram.y
+++ b/usr/src/cmd/filebench/common/parser_gram.y
@@ -307,9 +307,10 @@ foreach_command: FSC_FOREACH
 		    inner_cmd != NULL;
 		    inner_cmd = inner_cmd->cmd_next) {
 			filebench_log(LOG_DEBUG_IMPL,
-			    "packing foreach: %zx %s=%lld, cmd %zx",
+			    "packing foreach: %zx %s=%llu, cmd %zx",
 			    $$, $$->cmd_tgt1,
-			    avd_get_int(list->list_integer), inner_cmd);
+			    (u_longlong_t)avd_get_int(list->list_integer),
+			    inner_cmd);
 		}
 	}
 }| foreach_command FSV_VARIABLE FSK_IN string_seplist FSK_OPENLST inner_commands FSK_CLOSELST
@@ -1826,7 +1827,8 @@ parser_eventgen(cmd_t *cmd)
 		if (attr->attr_avd) {
 			rate = avd_get_int(attr->attr_avd);
 			filebench_log(LOG_VERBOSE,
-			    "Eventgen: %lld per second", rate);
+			    "Eventgen: %llu per second",
+			    (u_longlong_t)rate);
 			eventgen_setrate(rate);
 		}
 	}
@@ -1850,8 +1852,8 @@ parser_foreach_integer(cmd_t *cmd)
 		fbint_t list_int = avd_get_int(list->list_integer);
 
 		var_assign_integer(cmd->cmd_tgt1, list_int);
-		filebench_log(LOG_VERBOSE, "Iterating %s=%lld",
-		    cmd->cmd_tgt1, list_int);
+		filebench_log(LOG_VERBOSE, "Iterating %s=%llu",
+		    cmd->cmd_tgt1, (u_longlong_t)list_int);
 		for (inner_cmd = cmd->cmd_list; inner_cmd != NULL;
 		    inner_cmd = inner_cmd->cmd_next) {
 			inner_cmd->cmd(inner_cmd);
@@ -1940,7 +1942,7 @@ parser_proc_define(cmd_t *cmd)
 		var_instances = attr->attr_avd;
 		instances = avd_get_int(var_instances);
 		filebench_log(LOG_DEBUG_IMPL,
-		    "Setting instances = %lld", instances);
+		    "Setting instances = %llu", (u_longlong_t)instances);
 	} else {
 		filebench_log(LOG_DEBUG_IMPL,
 		    "Defaulting to instances = 1");
@@ -1962,8 +1964,8 @@ parser_proc_define(cmd_t *cmd)
 			    "proc_define: priority cannot be random");
 			filebench_shutdown(1);
 		}
-		filebench_log(LOG_DEBUG_IMPL, "Setting pri = %lld",
-		    avd_get_int(attr->attr_avd));
+		filebench_log(LOG_DEBUG_IMPL, "Setting pri = %llu",
+		    (u_longlong_t)avd_get_int(attr->attr_avd));
 		procflow->pf_nice = attr->attr_avd;
 	} else
 		procflow->pf_nice = avd_int_alloc(0);
@@ -2015,8 +2017,8 @@ parser_thread_define(cmd_t *cmd, procflow_t *procflow, int procinstances)
 			filebench_shutdown(1);
 		}
 		filebench_log(LOG_DEBUG_IMPL,
-		    "define thread: Setting instances = %lld",
-		    avd_get_int(attr->attr_avd));
+		    "define thread: Setting instances = %llu",
+		    (u_longlong_t)avd_get_int(attr->attr_avd));
 		instances = attr->attr_avd;
 	} else
 		instances = avd_int_alloc(1);
@@ -2029,8 +2031,8 @@ parser_thread_define(cmd_t *cmd, procflow_t *procflow, int procinstances)
 			filebench_shutdown(1);
 		}
 		filebench_log(LOG_DEBUG_IMPL,
-		    "define thread: Setting memsize = %lld",
-		    avd_get_int(attr->attr_avd));
+		    "define thread: Setting memsize = %llu",
+		    (u_longlong_t)avd_get_int(attr->attr_avd));
 		template.tf_memsize = attr->attr_avd;
 	} else
 		template.tf_memsize = avd_int_alloc(0);
@@ -2587,7 +2589,7 @@ parser_pause(int ptime)
 		}
 	}
 
-	filebench_log(LOG_INFO, "Run took %lld seconds...", timeslept);
+	filebench_log(LOG_INFO, "Run took %d seconds...", timeslept);
 }
 
 /*
@@ -3119,7 +3121,7 @@ parser_statssnap(cmd_t *cmd)
 		/* Wait for cmd and all its children */
 		while ((pid = waitpid(pidlistent->pl_pid * -1, &stat, 0)) > 0)
 			filebench_log(LOG_DEBUG_IMPL,
-			"Waited for pid %lld", pid);
+			"Waited for pid %d", (int)pid);
 	}
 
 	for (pidlistent = pidlist; pidlistent != NULL;
diff --git a/usr/src/cmd/filebench/common/procflow.c b/usr/src/cmd/filebench/common/procflow.c
index 9bf3bba057..02d92059ab 100644
--- a/usr/src/cmd/filebench/common/procflow.c
+++ b/usr/src/cmd/filebench/common/procflow.c
@@ -414,8 +414,9 @@ procflow_init(void)
 	int ret = 0;
 
 	filebench_log(LOG_DEBUG_IMPL,
-	    "procflow_init %s, %lld",
-	    procflow->pf_name, avd_get_int(procflow->pf_instances));
+	    "procflow_init %s, %llu",
+	    procflow->pf_name,
+	    (u_longlong_t)avd_get_int(procflow->pf_instances));
 
 #ifdef USE_PROCESS_MODEL
 	if ((ret = pthread_cond_init(&procflow_procs_created, NULL)) != 0)
@@ -458,7 +459,7 @@ procflow_wait(pid_t pid)
 
 	(void) waitpid(pid, &stat, 0);
 	while ((wpid = waitpid(getpid() * -1, &stat, WNOHANG)) > 0)
-		filebench_log(LOG_DEBUG_IMPL, "Waited for pid %lld", wpid);
+		filebench_log(LOG_DEBUG_IMPL, "Waited for pid %d", (int)wpid);
 }
 #endif
 
diff --git a/usr/src/cmd/filebench/common/stats.c b/usr/src/cmd/filebench/common/stats.c
index 95af3f2165..fca191dbd2 100644
--- a/usr/src/cmd/filebench/common/stats.c
+++ b/usr/src/cmd/filebench/common/stats.c
@@ -214,11 +214,11 @@ io_stats_ohead(void)
 	flowstat_t *glstat = &globalstats[FLOW_TYPE_GLOBAL];
 
 	filebench_log(LOG_DEBUG_NEVER,
-	    "Computing overhead as %lld + %lld - %lld - %lld",
-	    glstat->fs_mstate[FLOW_MSTATE_OHEAD],
-	    glstat->fs_mstate[FLOW_MSTATE_CPU],
-	    iostat->fs_mstate[FLOW_MSTATE_CPU],
-	    aiostat->fs_mstate[FLOW_MSTATE_CPU]);
+	    "Computing overhead as %llu + %llu - %llu - %llu",
+	    (u_longlong_t)glstat->fs_mstate[FLOW_MSTATE_OHEAD],
+	    (u_longlong_t)glstat->fs_mstate[FLOW_MSTATE_CPU],
+	    (u_longlong_t)iostat->fs_mstate[FLOW_MSTATE_CPU],
+	    (u_longlong_t)aiostat->fs_mstate[FLOW_MSTATE_CPU]);
 
 	return ((glstat->fs_mstate[FLOW_MSTATE_OHEAD] +
 	    glstat->fs_mstate[FLOW_MSTATE_CPU] -
@@ -259,8 +259,8 @@ stats_findvar(var_t *var, char *name)
 
 		stat = iostat->fs_count + aiostat->fs_count;
 		VAR_SET_INT(var, stat);
-		filebench_log(LOG_DEBUG_IMPL, "reading stats %s = %lld",
-		    name, stat);
+		filebench_log(LOG_DEBUG_IMPL, "reading stats %s = %llu",
+		    name, (u_longlong_t)stat);
 		return (var);
 	}
 
@@ -502,9 +502,9 @@ stats_snap(void)
 #endif /* HAVE_LIBKSTAT */
 
 	filebench_log(LOG_DEBUG_IMPL,
-	    "cputime = %lld, ohead = %lld",
-	    cputime / 1000000000,
-	    io_stats_ohead() / 1000000000);
+	    "cputime = %llu, ohead = %llu",
+	    (u_longlong_t)(cputime / 1000000000),
+	    (u_longlong_t)(io_stats_ohead() / 1000000000));
 	iostat->fs_syscpu =
 	    (cputime > io_stats_ohead()) ?
 	    (cputime - io_stats_ohead()) : 0;
diff --git a/usr/src/cmd/filebench/common/threadflow.c b/usr/src/cmd/filebench/common/threadflow.c
index 4feaa3147b..eb2e7ad665 100644
--- a/usr/src/cmd/filebench/common/threadflow.c
+++ b/usr/src/cmd/filebench/common/threadflow.c
@@ -169,7 +169,7 @@ threadflow_init(procflow_t *procflow)
 
 		instances = avd_get_int(threadflow->tf_instances);
 		filebench_log(LOG_VERBOSE,
-		    "Starting %lld %s threads",
+		    "Starting %d %s threads",
 		    instances, threadflow->tf_name);
 
 		for (i = 1; i < instances; i++) {
diff --git a/usr/src/cmd/filebench/common/vars.c b/usr/src/cmd/filebench/common/vars.c
index ae00ee53f9..f3c26e562c 100644
--- a/usr/src/cmd/filebench/common/vars.c
+++ b/usr/src/cmd/filebench/common/vars.c
@@ -413,7 +413,8 @@ avd_int_alloc(fbint_t integer)
 	avd->avd_type = AVD_VAL_INT;
 	avd->avd_val.intval = integer;
 
-	filebench_log(LOG_DEBUG_IMPL, "Alloc integer %lld", integer);
+	filebench_log(LOG_DEBUG_IMPL, "Alloc integer %llu",
+	    (u_longlong_t)integer);
 
 	return (avd);
 }
@@ -676,8 +677,8 @@ var_assign_integer(char *name, fbint_t integer)
 
 	VAR_SET_INT(var, integer);
 
-	filebench_log(LOG_DEBUG_SCRIPT, "Assign integer %s=%lld",
-	    name, integer);
+	filebench_log(LOG_DEBUG_SCRIPT, "Assign integer %s=%llu",
+	    name, (u_longlong_t)integer);
 
 	return (0);
 }
@@ -826,8 +827,8 @@ var_to_string(char *name)
 	}
 
 	if (VAR_HAS_INTEGER(var)) {
-		(void) snprintf(tmp, sizeof (tmp), "%lld",
-		    var->var_val.integer);
+		(void) snprintf(tmp, sizeof (tmp), "%llu",
+		    (u_longlong_t)var->var_val.integer);
 		return (fb_stralloc(tmp));
 	}
 
@@ -950,7 +951,8 @@ var_randvar_to_string(char *name, int param_name)
 	{
 		char tmp[128];
 
-		(void) snprintf(tmp, sizeof (tmp), "%lld", value);
+		(void) snprintf(tmp, sizeof (tmp), "%llu",
+		    (u_longlong_t)value);
 		return (fb_stralloc(tmp));
 	}
 }
@@ -1002,7 +1004,8 @@ var_assign_var(char *name, char *src_name)
 	if (VAR_HAS_INTEGER(src_var)) {
 		VAR_SET_INT(dst_var, src_var->var_val.integer);
 		filebench_log(LOG_VERBOSE,
-		    "Assign var %s=%lld", name, src_var->var_val.integer);
+		    "Assign var %s=%llu",
+		    name, (u_longlong_t)src_var->var_val.integer);
 	}
 
 	if (VAR_HAS_DOUBLE(src_var)) {