X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.c;h=dfd15e0f5db1e943a9aec595454cf1f601e97fea;hb=74929ac27bcbaa26a08a9abcda70b5ebba94166e;hp=ba9e384b6609950a8c500dab96de39d0c8bce904;hpb=86375e3446fdeb6c4dd1406cc0e4c456af954a2c;p=fio.git

diff --git a/fio.c b/fio.c
index ba9e384b..dfd15e0f 100644
--- a/fio.c
+++ b/fio.c
@@ -1105,7 +1105,10 @@ static void *thread_main(void *data)
 	clear_state = 0;
 	while (keep_running(td)) {
 		fio_gettime(&td->start, NULL);
-		memcpy(&td->ts.stat_sample_time, &td->start, sizeof(td->start));
+		memcpy(&td->ts.stat_sample_time[0], &td->start,
+				sizeof(td->start));
+		memcpy(&td->ts.stat_sample_time[1], &td->start,
+				sizeof(td->start));
 		memcpy(&td->tv_cache, &td->start, sizeof(td->start));
 
 		if (td->o.ratemin[0] || td->o.ratemin[1])
@@ -1615,12 +1618,6 @@ int main(int argc, char *argv[])
 	if (!getenv("LC_NUMERIC"))
 		setlocale(LC_NUMERIC, "en_US");
 
-	if (parse_options(argc, argv))
-		return 1;
-
-	if (!thread_number)
-		return 0;
-
 	ps = sysconf(_SC_PAGESIZE);
 	if (ps < 0) {
 		log_err("Failed to get page size\n");
@@ -1630,6 +1627,14 @@ int main(int argc, char *argv[])
 	page_size = ps;
 	page_mask = ps - 1;
 
+	fio_keywords_init();
+
+	if (parse_options(argc, argv))
+		return 1;
+
+	if (!thread_number)
+		return 0;
+
 	if (write_bw_log) {
 		setup_log(&agg_io_log[DDIR_READ]);
 		setup_log(&agg_io_log[DDIR_WRITE]);