Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add packet counts to uid and iface stats. Needed to add Ethernet overhead to uid_stats (IP level) to compare with interface stats (Ethernet level)."

Browse Source
This commit is contained in:
Ashish Sharma
2011-09-15 14:30:40 -07:00
committed by Android (Google) Code Review
parent 98c8b52b0a baf4c85723
commit 2e4a560f29
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/EventLogTags.logtags
View File

@@ -142,5 +142,5 @@ option java_package com.android.server
# --------------------------- # ---------------------------
# NetworkStatsService.java # NetworkStatsService.java
# --------------------------- # ---------------------------
51100 netstats_mobile_sample (iface_rx|2|2),(iface_tx|2|2),(uid_rx|2|2),(uid_tx|2|2) 51100 netstats_mobile_sample (iface_rx_bytes|2|2),(iface_tx_bytes|2|2),(iface_rx_pkts|2|1),(iface_tx_pkts|2|1),(uid_rx_bytes|2|2),(uid_tx_bytes|2|2),(uid_rx_pkts|2|1),(uid_tx_pkts|2|1)
51101 netstats_wifi_sample (iface_rx|2|2),(iface_tx|2|2),(uid_rx|2|2),(uid_tx|2|2) 51101 netstats_wifi_sample (iface_rx_bytes|2|2),(iface_tx_bytes|2|2),(iface_rx_pkts|2|1),(iface_tx_pkts|2|1),(uid_rx_bytes|2|2),(uid_tx_bytes|2|2),(uid_rx_pkts|2|1),(uid_tx_pkts|2|1)

10
services/java/com/android/server/net/NetworkStatsService.java
View File

@@ -865,14 +865,20 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
ifaceTotal = getSummaryForNetwork(template, start, end).getTotal(ifaceTotal); ifaceTotal = getSummaryForNetwork(template, start, end).getTotal(ifaceTotal);
uidTotal = getSummaryForAllUid(template, start, end, false).getTotal(uidTotal); uidTotal = getSummaryForAllUid(template, start, end, false).getTotal(uidTotal);
EventLogTags.writeNetstatsMobileSample( EventLogTags.writeNetstatsMobileSample(
ifaceTotal.rxBytes, ifaceTotal.txBytes, uidTotal.rxBytes, uidTotal.txBytes); ifaceTotal.rxBytes, ifaceTotal.txBytes,
ifaceTotal.rxPackets, ifaceTotal.txPackets,
uidTotal.rxBytes, uidTotal.txBytes,
uidTotal.rxPackets, uidTotal.txPackets);
// collect wifi sample // collect wifi sample
template = buildTemplateWifi(); template = buildTemplateWifi();
ifaceTotal = getSummaryForNetwork(template, start, end).getTotal(ifaceTotal); ifaceTotal = getSummaryForNetwork(template, start, end).getTotal(ifaceTotal);
uidTotal = getSummaryForAllUid(template, start, end, false).getTotal(uidTotal); uidTotal = getSummaryForAllUid(template, start, end, false).getTotal(uidTotal);
EventLogTags.writeNetstatsWifiSample( EventLogTags.writeNetstatsWifiSample(
ifaceTotal.rxBytes, ifaceTotal.txBytes, uidTotal.rxBytes, uidTotal.txBytes); ifaceTotal.rxBytes, ifaceTotal.txBytes,
ifaceTotal.rxPackets, ifaceTotal.txPackets,
uidTotal.rxBytes, uidTotal.txBytes,
uidTotal.rxPackets, uidTotal.txPackets);
} }
/** /**