Update statistics display

PiSCSI · Oct 5, 2023 · 8e7c0be · 8e7c0be
1 parent 1810b2a
commit 8e7c0be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cpp/piscsi_interface.proto b/cpp/piscsi_interface.proto
@@ -318,7 +318,7 @@ enum PbStatisticsCategory {
     NO_CATEGORY = 0;
     INFO = 1;
     ERROR = 2;
-}
+ }
 
 message PbStatistics {
     PbStatisticsCategory category = 1;

diff --git a/cpp/scsictl/scsictl_display.cpp b/cpp/scsictl/scsictl_display.cpp
@@ -237,13 +237,13 @@ string ScsictlDisplay::DisplayStatisticsInfo(const PbStatisticsInfo& statistics_
 
 	s << "Statistics:\n";
 
-	map<string, PbStatistics, less<>> sorted_statistics;
+	multimap<string, PbStatistics, less<>> sorted_statistics;
 	for (const auto& statistics : statistics_info.statistics()) {
-		sorted_statistics[statistics.key()] = statistics;
+		sorted_statistics.emplace(PbStatisticsCategory_Name(statistics.category()), statistics);
 	}
 
-	for (const auto& [key, statistics] : sorted_statistics) {
-		s << "  " << key << ": " << statistics.value() << " (" << PbStatisticsCategory_Name(statistics.category()) << ")\n";
+	for (const auto& [category, statistics] : sorted_statistics) {
+		s << "  " << category << "  " << statistics.key() << ": " << statistics.value() << '\n';
 	}
 
 	return s.str();