Slightly improve TrafficController dump output.
Before:
current ownerMatch configuration: 28
current statsMap configuration: 0
After:
current ownerMatch configuration: 28 DOZABLE_MATCH STANDBY_MATCH POWERSAVE_MATCH
current statsMap configuration: 0 SELECT_MAP_A
Test: adb shell dumpsys netd trafficcontroller
Change-Id: I5649d5f5a52e7e19be4460bb2f9861334ac60409
diff --git a/server/TrafficController.cpp b/server/TrafficController.cpp
index f7d2463..f3a2740 100644
--- a/server/TrafficController.cpp
+++ b/server/TrafficController.cpp
@@ -1074,15 +1074,28 @@
uint32_t key = UID_RULES_CONFIGURATION_KEY;
auto configuration = mConfigurationMap.readValue(key);
if (isOk(configuration)) {
- dw.println("current ownerMatch configuration: %d", configuration.value());
+ dw.println("current ownerMatch configuration: %d%s", configuration.value(),
+ uidMatchTypeToString(configuration.value()).c_str());
} else {
dw.println("mConfigurationMap read ownerMatch configure failed with error: %s",
configuration.status().msg().c_str());
}
+
key = CURRENT_STATS_MAP_CONFIGURATION_KEY;
configuration = mConfigurationMap.readValue(key);
if (isOk(configuration)) {
- dw.println("current statsMap configuration: %d", configuration.value());
+ const char* statsMapDescription = "???";
+ switch (configuration.value()) {
+ case SELECT_MAP_A:
+ statsMapDescription = "SELECT_MAP_A";
+ break;
+ case SELECT_MAP_B:
+ statsMapDescription = "SELECT_MAP_B";
+ break;
+ // No default clause, so if we ever add a third map, this code will fail to build.
+ }
+ dw.println("current statsMap configuration: %d %s", configuration.value(),
+ statsMapDescription);
} else {
dw.println("mConfigurationMap read stats map configure failed with error: %s",
configuration.status().msg().c_str());