From 23a1ba79f20b79a92eeda4721c90d2db136f92e9 Mon Sep 17 00:00:00 2001
From: "Dr. K. D. Murray" <1560490+kdm9@users.noreply.github.com>
Date: Wed, 12 Jul 2023 15:47:57 +0200
Subject: [PATCH] util/string: Allow T/G/M/K size suffixes (#724)

* util/string: Allow T/G/M/K size suffixes

This patch allows one to specify sizes to diamond (e.g. for memory usage
in deepclust) using T/G/M/K suffixes, rather than only using a G suffix.

* Match tab indendation
---
 src/util/string/string.cpp | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/util/string/string.cpp b/src/util/string/string.cpp
index a07a943c..cadb0fe6 100644
--- a/src/util/string/string.cpp
+++ b/src/util/string/string.cpp
@@ -56,13 +56,33 @@ int64_t interpret_number(const std::string& s) {
 	char c = 0;
 	ss >> c;
 	if (ss.eof())
-		throw std::runtime_error("Missing size specifier in number: " + s + ". Permitted values: 'G'");
-	if (c != 'G')
-		throw std::runtime_error(string("Invalid size specifier (") + c + ") in number: " + s + ". Permitted values: 'G'");
+		throw std::runtime_error("Missing size specifier in number: " + s + ". Permitted values: T, G, M, K");
+	double mult = 1;
+	switch(c) {
+		case 'T':
+		case 't':
+			mult = 1e12;
+			break;
+		case 'G':
+		case 'g':
+			mult = 1e9;
+			break;
+		case 'M':
+		case 'm':
+			mult = 1e6;
+			break;
+		case 'K':
+		case 'k':
+			mult = 1e3;
+			break;
+		default:
+			throw std::runtime_error(string("Invalid size specifier (") + c + ") in number: " + s + ". Permitted suffixes: T, G, M, K");
+			break;
+	}
 	ss >> c;
 	if (!ss.eof())
 		throw std::runtime_error("Invalid number format: " + s);
-	return int64_t(n * 1e9);
+	return int64_t(n * mult);
 }
 
-}}
\ No newline at end of file
+}}