commit c675d6fc01d417e9ca4321437f675a452681af4b
author Motomu Utsumi <motomuman@google.com> Fri Sep 02 18:15:25 2022 +0900
committer Motomu Utsumi <motomuman@google.com> Tue Oct 04 15:02:43 2022 +0900
tree 13bffd8a98ab285cc0bdd74dcd694221f946f9fe
parent 956d86ccdf32fbc8d3d1b2a657cb02a6ce902e27

Move current StatsMap dump to BpfNetMaps

Information in the dump does not change
....
current statsMap configuration: 0 SELECT_MAP_A
....

Bug: 217624062
Test: dumpsys connectivity trafficcontroller, atest BpfNetMapsTest
Change-Id: I42a844227f258b91ba5b368d8e8abf82a773a801

service/src/com/android/server/BpfNetMaps.java

diff --git a/service/src/com/android/server/BpfNetMaps.java b/service/src/com/android/server/BpfNetMaps.java
index e571415..e53bce1 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -984,6 +984,17 @@
         return sj.toString();
     }
 
+    private void dumpCurrentStatsMapConfig(final IndentingPrintWriter pw) {
+        try {
+            final long config = sConfigurationMap.getValue(CURRENT_STATS_MAP_CONFIGURATION_KEY).val;
+            final String currentStatsMap =
+                    (config == STATS_SELECT_MAP_A) ? "SELECT_MAP_A" : "SELECT_MAP_B";
+            pw.println("current statsMap configuration: " + config + " " + currentStatsMap);
+        } catch (ErrnoException e) {
+            pw.println("Falied to read current statsMap configuration: " + e);
+        }
+    }
+
     /**
      * Dump BPF maps
      *
@@ -1003,6 +1014,9 @@
         mDeps.nativeDump(fd, verbose);
 
         if (verbose) {
+            dumpCurrentStatsMapConfig(pw);
+            pw.println();
+
             BpfDump.dumpMap(sUidOwnerMap, pw, "sUidOwnerMap",
                     (uid, match) -> {
                         if ((match.rule & IIF_MATCH) != 0) {