X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=dfd8695779ef320480ade345c4e2db0f0970808a;hp=de76e6599cacbb5d29e2f0edbf33988cc460375d;hb=ef5249d5e5f0bb5f0adfb182b1dbc988aee976de;hpb=38dad62d5154ffaad445bd0231b271b9a46a5190

diff --git a/fio.h b/fio.h
index de76e659..dfd86957 100644
--- a/fio.h
+++ b/fio.h
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
-#include <getopt.h>
 #include <inttypes.h>
 #include <assert.h>
 
@@ -32,6 +31,7 @@
 #include "options.h"
 #include "profile.h"
 #include "time.h"
+#include "lib/getopt.h"
 
 #ifdef FIO_HAVE_GUASI
 #include <guasi.h>
@@ -120,8 +120,8 @@ struct thread_stat {
 	unsigned int io_u_complete[FIO_IO_U_MAP_NR];
 	unsigned int io_u_lat_u[FIO_IO_U_LAT_U_NR];
 	unsigned int io_u_lat_m[FIO_IO_U_LAT_M_NR];
-	unsigned long total_io_u[2];
-	unsigned long short_io_u[2];
+	unsigned long total_io_u[3];
+	unsigned long short_io_u[3];
 	unsigned long total_submit;
 	unsigned long total_complete;
 
@@ -254,11 +254,17 @@ struct thread_options {
 	unsigned int gtod_cpu;
 	unsigned int gtod_offload;
 	enum fio_cs clocksource;
+	unsigned int no_stall;
+	unsigned int trim_percentage;
+	unsigned int trim_batch;
+	unsigned int trim_zero;
+	unsigned long long trim_backlog;
 
 	char *read_iolog_file;
 	char *write_iolog_file;
 	char *bw_log_file;
 	char *lat_log_file;
+	char *replay_redirect;
 
 	/*
 	 * Pre-run and post-run shell
@@ -345,12 +351,14 @@ struct thread_data {
 
 	char *sysfs_root;
 
-	unsigned long rand_seeds[6];
+	unsigned long rand_seeds[7];
 
 	os_random_state_t bsrange_state;
 	os_random_state_t verify_state;
+	os_random_state_t trim_state;
 
 	unsigned int verify_batch;
+	unsigned int trim_batch;
 
 	int shm_id;
 
@@ -434,6 +442,12 @@ struct thread_data {
 	 */
 	struct flist_head io_log_list;
 
+	/*
+	 * For tracking/handling discards
+	 */
+	struct flist_head trim_list;
+	unsigned long trim_entries;
+
 	/*
 	 * for fileservice, how often to switch to a new file
 	 */
@@ -647,7 +661,7 @@ static inline char *num2str(unsigned long num, int maxlen, int base, int pow2)
 	char postfix[] = { ' ', 'K', 'M', 'G', 'P', 'E' };
 	unsigned int thousand;
 	char *buf;
-	int i;
+	int i, mod = 0;
 
 	if (pow2)
 		thousand = 1024;
@@ -665,6 +679,19 @@ static inline char *num2str(unsigned long num, int maxlen, int base, int pow2)
 		len = sprintf(buf, "%'lu", num);
 		if (len <= maxlen) {
 			if (i >= 1) {
+				char dec[4];
+				int j = 0;
+
+				sprintf(dec, "%u", mod);
+				if (maxlen - len >= 2) {
+					buf[len++] = '.';
+					while (maxlen - len) {
+						buf[len++] = dec[j++];
+						if (j == sizeof(dec) - 1)
+							break;
+					}
+				}
+
 				buf[len] = postfix[i];
 				buf[len + 1] = '\0';
 			}
@@ -674,6 +701,7 @@ static inline char *num2str(unsigned long num, int maxlen, int base, int pow2)
 		if ((num % thousand) >= (thousand / 2))
 			carry = 1;
 
+		mod = num % thousand;
 		num /= thousand;
 		num += carry;
 		i++;