commit 91df4360f6721a7b6354a350018308a42c626637
author Maciej Żenczykowski <maze@google.com> Sat Aug 12 11:16:36 2023 +0000
committer Maciej Żenczykowski <maze@google.com> Sat Aug 12 11:17:06 2023 +0000
tree f2eed375c1e9a8c1652c59030c4346eb522171db
parent 15b63b308e1130282c5e60667e25b9742d130be9

eliminate InitStats

Bug: 294604315
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie39de2b30a824f86c80517a64c76841980aa9739

service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp

diff --git a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
index 317c3f9..d6cec91 100644
--- a/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
+++ b/service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
@@ -40,26 +40,20 @@
 
 using base::Result;
 
-// This explicitly zero-initializes the relevant Stats fields.
-void InitStats(Stats* stats) {
-    stats->rxBytes = 0;
-    stats->rxPackets = 0;
-    stats->txBytes = 0;
-    stats->txPackets = 0;
-}
-
 int bpfGetUidStatsInternal(uid_t uid, Stats* stats,
                            const BpfMap<uint32_t, StatsValue>& appUidStatsMap) {
-    InitStats(stats);
     auto statsEntry = appUidStatsMap.readValue(uid);
-    if (statsEntry.ok()) {
-        stats->rxPackets = statsEntry.value().rxPackets;
-        stats->txPackets = statsEntry.value().txPackets;
-        stats->rxBytes = statsEntry.value().rxBytes;
-        stats->txBytes = statsEntry.value().txBytes;
+    if (!statsEntry.ok()) {
+        *stats = {};
+        return (statsEntry.error().code() == ENOENT) ? 0 : -statsEntry.error().code();
     }
-    return (statsEntry.ok() || statsEntry.error().code() == ENOENT) ? 0
-                                                                    : -statsEntry.error().code();
+    *stats = {
+        .rxPackets = statsEntry.value().rxPackets,
+        .txPackets = statsEntry.value().txPackets,
+        .rxBytes = statsEntry.value().rxBytes,
+        .txBytes = statsEntry.value().txBytes,
+    };
+    return 0;
 }
 
 int bpfGetUidStats(uid_t uid, Stats* stats) {
@@ -70,7 +64,7 @@
 int bpfGetIfaceStatsInternal(const char* iface, Stats* stats,
                              const BpfMap<uint32_t, StatsValue>& ifaceStatsMap,
                              const BpfMap<uint32_t, IfaceValue>& ifaceNameMap) {
-    InitStats(stats);
+    *stats = {};
     int64_t unknownIfaceBytesTotal = 0;
     const auto processIfaceStats =
             [iface, stats, &ifaceNameMap, &unknownIfaceBytesTotal](
@@ -105,16 +99,18 @@
 
 int bpfGetIfIndexStatsInternal(uint32_t ifindex, Stats* stats,
                                const BpfMap<uint32_t, StatsValue>& ifaceStatsMap) {
-    InitStats(stats);
     auto statsEntry = ifaceStatsMap.readValue(ifindex);
-    if (statsEntry.ok()) {
-        stats->rxPackets = statsEntry.value().rxPackets;
-        stats->txPackets = statsEntry.value().txPackets;
-        stats->rxBytes = statsEntry.value().rxBytes;
-        stats->txBytes = statsEntry.value().txBytes;
-        return 0;
+    if (!statsEntry.ok()) {
+        *stats = {};
+        return (statsEntry.error().code() == ENOENT) ? 0 : -statsEntry.error().code();
     }
-    return (statsEntry.error().code() == ENOENT) ? 0 : -statsEntry.error().code();
+    *stats = {
+        .rxPackets = statsEntry.value().rxPackets,
+        .txPackets = statsEntry.value().txPackets,
+        .rxBytes = statsEntry.value().rxBytes,
+        .txBytes = statsEntry.value().txBytes,
+    };
+    return 0;
 }
 
 int bpfGetIfIndexStats(int ifindex, Stats* stats) {