LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

groupNetworkStats - switch ->at() to []

Browse Source 
Test: TreeHugger
Bug: 276296921
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iecabf1de0d91627f2114ca500b66e0a5019e59e9
This commit is contained in:
Maciej Żenczykowski
2023-04-17 19:28:21 +00:00
parent d41f46d889
commit 2368f8bf32
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
service-t/native/libs/libnetworkstats/BpfNetworkStats.cpp
View File

@@ -151,7 +151,7 @@ int parseBpfNetworkStatsDetailInternal(std::vector<stats_line>* lines,
// and set, which causes NetworkStats maps wrong item to subtract. // and set, which causes NetworkStats maps wrong item to subtract.
// //
// Thus, the stats needs to be properly sorted and grouped before reported. // Thus, the stats needs to be properly sorted and grouped before reported.
groupNetworkStats(lines); groupNetworkStats(*lines);
return 0; return 0;
} }
@@ -227,7 +227,7 @@ int parseBpfNetworkStatsDevInternal(std::vector<stats_line>* lines,
return -res.error().code(); return -res.error().code();
} }
groupNetworkStats(lines); groupNetworkStats(*lines);
return 0; return 0;
} }
@@ -237,25 +237,25 @@ int parseBpfNetworkStatsDev(std::vector<stats_line>* lines) {
return parseBpfNetworkStatsDevInternal(lines, ifaceStatsMap, ifaceIndexNameMap); return parseBpfNetworkStatsDevInternal(lines, ifaceStatsMap, ifaceIndexNameMap);
} }
void groupNetworkStats(std::vector<stats_line>* lines) { void groupNetworkStats(std::vector<stats_line>& lines) {
if (lines->size() <= 1) return; if (lines.size() <= 1) return;
std::sort(lines->begin(), lines->end()); std::sort(lines.begin(), lines.end());
// Similar to std::unique(), but aggregates the duplicates rather than discarding them. // Similar to std::unique(), but aggregates the duplicates rather than discarding them.
size_t currentOutput = 0; size_t currentOutput = 0;
for (size_t i = 1; i < lines->size(); i++) { for (size_t i = 1; i < lines.size(); i++) {
// note that == operator only compares the 'key' portion: iface/uid/tag/set // note that == operator only compares the 'key' portion: iface/uid/tag/set
if (lines->at(currentOutput) == lines->at(i)) { if (lines[currentOutput] == lines[i]) {
// while += operator only affects the 'data' portion: {rx,tx}{Bytes,Packets} // while += operator only affects the 'data' portion: {rx,tx}{Bytes,Packets}
lines->at(currentOutput) += lines->at(i); lines[currentOutput] += lines[i];
} else { } else {
// okay, we're done aggregating the current line, move to the next one // okay, we're done aggregating the current line, move to the next one
lines->at(++currentOutput) = lines->at(i); lines[++currentOutput] = lines[i];
} }
} }
// possibly shrink the vector - currentOutput is the last line with valid data // possibly shrink the vector - currentOutput is the last line with valid data
lines->resize(currentOutput + 1); lines.resize(currentOutput + 1);
} }
// True if lhs equals to rhs, only compare iface, uid, tag and set. // True if lhs equals to rhs, only compare iface, uid, tag and set.

2
service-t/native/libs/libnetworkstats/include/netdbpf/BpfNetworkStats.h
View File

@@ -115,7 +115,7 @@ int bpfGetIfaceStats(const char* iface, Stats* stats);
int parseBpfNetworkStatsDetail(std::vector<stats_line>* lines); int parseBpfNetworkStatsDetail(std::vector<stats_line>* lines);
int parseBpfNetworkStatsDev(std::vector<stats_line>* lines); int parseBpfNetworkStatsDev(std::vector<stats_line>* lines);
void groupNetworkStats(std::vector<stats_line>* lines); void groupNetworkStats(std::vector<stats_line>& lines);
int cleanStatsMap(); int cleanStatsMap();
} // namespace bpf } // namespace bpf
} // namespace android } // namespace android