X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=78218615b79246a50c02107b7907ef747dd95476;hp=2a49b63c1065c30bde38bd664f6bd622f859f04b;hb=11f97f307bbba7c320b0dab0a55ef6795b72e3d6;hpb=b09da8fa5be85634a3e8331d6e5ce07cd427a5a2

diff --git a/parse.c b/parse.c
index 2a49b63c..78218615 100644
--- a/parse.c
+++ b/parse.c
@@ -14,6 +14,7 @@
 #include "debug.h"
 
 static struct fio_option *fio_options;
+extern unsigned int fio_get_kb_base(void *);
 
 static int vp_cmp(const void *p1, const void *p2)
 {
@@ -112,33 +113,39 @@ static unsigned long get_mult_time(char c)
 	}
 }
 
-static unsigned long long get_mult_bytes(char c)
+static unsigned long long get_mult_bytes(char c, void *data)
 {
+	unsigned int kb_base = fio_get_kb_base(data);
+	unsigned long long ret = 1;
+
 	switch (c) {
-	case 'k':
-	case 'K':
-		return 1024;
-	case 'm':
-	case 'M':
-		return 1024 * 1024;
-	case 'g':
-	case 'G':
-		return 1024 * 1024 * 1024;
-	case 't':
-	case 'T':
-		return 1024 * 1024 * 1024 * 1024UL;
+	default:
+		break;
 	case 'p':
 	case 'P':
-		return 1024 * 1024 * 1024 * 1024ULL * 1024ULL;
-	default:
-		return 1;
+		ret *= (unsigned long long) kb_base;
+	case 't':
+	case 'T':
+		ret *= (unsigned long long) kb_base;
+	case 'g':
+	case 'G':
+		ret *= (unsigned long long) kb_base;
+	case 'm':
+	case 'M':
+		ret *= (unsigned long long) kb_base;
+	case 'k':
+	case 'K':
+		ret *= (unsigned long long) kb_base;
+		break;
 	}
+
+	return ret;
 }
 
 /*
  * convert string into decimal value, noting any size suffix
  */
-int str_to_decimal(const char *str, long long *val, int kilo)
+int str_to_decimal(const char *str, long long *val, int kilo, void *data)
 {
 	int len, base;
 
@@ -156,21 +163,21 @@ int str_to_decimal(const char *str, long long *val, int kilo)
 		return 1;
 
 	if (kilo)
-		*val *= get_mult_bytes(str[len - 1]);
+		*val *= get_mult_bytes(str[len - 1], data);
 	else
 		*val *= get_mult_time(str[len - 1]);
 
 	return 0;
 }
 
-static int check_str_bytes(const char *p, long long *val)
+static int check_str_bytes(const char *p, long long *val, void *data)
 {
-	return str_to_decimal(p, val, 1);
+	return str_to_decimal(p, val, 1, data);
 }
 
 static int check_str_time(const char *p, long long *val)
 {
-	return str_to_decimal(p, val, 0);
+	return str_to_decimal(p, val, 0, NULL);
 }
 
 void strip_blank_front(char **p)
@@ -203,7 +210,7 @@ void strip_blank_end(char *p)
 	*(s + 1) = '\0';
 }
 
-static int check_range_bytes(const char *str, long *val)
+static int check_range_bytes(const char *str, long *val, void *data)
 {
 	char suffix;
 
@@ -211,7 +218,7 @@ static int check_range_bytes(const char *str, long *val)
 		return 1;
 
 	if (sscanf(str, "%lu%c", val, &suffix) == 2) {
-		*val *= get_mult_bytes(suffix);
+		*val *= get_mult_bytes(suffix, data);
 		return 0;
 	}
 
@@ -312,7 +319,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		if (is_time)
 			ret = check_str_time(ptr, &ull);
 		else
-			ret = check_str_bytes(ptr, &ull);
+			ret = check_str_bytes(ptr, &ull, data);
 
 		if (ret)
 			break;
@@ -379,8 +386,8 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		p1 = tmp;
 
 		ret = 1;
-		if (!check_range_bytes(p1, &ul1) &&
-		    !check_range_bytes(p2, &ul2)) {
+		if (!check_range_bytes(p1, &ul1, data) &&
+		    !check_range_bytes(p2, &ul2, data)) {
 			ret = 0;
 			if (ul1 > ul2) {
 				unsigned long foo = ul1;
@@ -550,7 +557,7 @@ static int opt_cmp(const void *p1, const void *p2)
 
 	o1 = get_option(s1, fio_options, &foo);
 	o2 = get_option(s2, fio_options, &foo);
-	
+
 	prio1 = prio2 = 0;
 	if (o1)
 		prio1 = o1->prio;