joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

BpfNetworkStats: switch final iterate(f(K)) to forAll(f(K))

Browse source 
The only real way readValue(K) can fail while iterating
is if K gets deleted *while* we're walking the map.

That shouldn't be able to happen, and even if it does,
we're better off simply continuing and getting what data we can.

Test: TreeHugger
Flag: EXEMPT mainline/noop
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia286b4067546ef550cd1d9e6864fcddd9d0e5951
This commit is contained in:
Maciej Żenczykowski 2025-08-13 12:48:35 -07:00
commit c5180c3766
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
View file

@ -129,19 +129,18 @@ int bpfGetIfaceStatsInternal(const char* iface, StatsValue* stats,
}
// Before 5.10 we try to avoid doing readValue unless needed
auto res = ifaceStatsMap.iterate(
[iface, stats, ifindex2name, &unknownIfaceBytesTotal, &ifaceStatsMap](const uint32_t& key) -> Result<void> {
auto res = ifaceStatsMap.forAll(
[iface, stats, ifindex2name, &unknownIfaceBytesTotal, &ifaceStatsMap](const uint32_t& key) {
Result<IfaceValue> ifname = ifindex2name(key);
if (!ifname.ok()) {
maybeLogUnknownIface(key, ifaceStatsMap, key, &unknownIfaceBytesTotal);
return {};
return;
}
if (!strcmp(iface, ifname.value().name)) {
Result<StatsValue> statsEntry = ifaceStatsMap.readValue(key);
if (!statsEntry.ok()) return statsEntry.error();
*stats += statsEntry.value();
// error shouldn't be possible, if it somehow does, just ignore it and keep going
if (statsEntry.ok()) *stats += statsEntry.value();
}
return {};
}
);
return res.ok() ? 0 : -res.error().code();