From baf4c857237b1905d4b8035337997160a93430bd Mon Sep 17 00:00:00 2001 From: Ashish Sharma Date: Wed, 14 Sep 2011 23:13:55 -0700 Subject: [PATCH] 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). Change-Id: Ia6324c21a868eea5ad3b67f546c9d10c7fb64172 --- services/java/com/android/server/EventLogTags.logtags | 4 ++-- .../com/android/server/net/NetworkStatsService.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/services/java/com/android/server/EventLogTags.logtags b/services/java/com/android/server/EventLogTags.logtags index f0b5958abc3e7..99f6b8ef3eb55 100644 --- a/services/java/com/android/server/EventLogTags.logtags +++ b/services/java/com/android/server/EventLogTags.logtags @@ -142,5 +142,5 @@ option java_package com.android.server # --------------------------- # NetworkStatsService.java # --------------------------- -51100 netstats_mobile_sample (iface_rx|2|2),(iface_tx|2|2),(uid_rx|2|2),(uid_tx|2|2) -51101 netstats_wifi_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_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) diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java index af29d85ac61fa..5a0e1e41870bc 100644 --- a/services/java/com/android/server/net/NetworkStatsService.java +++ b/services/java/com/android/server/net/NetworkStatsService.java @@ -855,14 +855,20 @@ public class NetworkStatsService extends INetworkStatsService.Stub { ifaceTotal = getSummaryForNetwork(template, start, end).getTotal(ifaceTotal); uidTotal = getSummaryForAllUid(template, start, end, false).getTotal(uidTotal); 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 template = buildTemplateWifi(); ifaceTotal = getSummaryForNetwork(template, start, end).getTotal(ifaceTotal); uidTotal = getSummaryForAllUid(template, start, end, false).getTotal(uidTotal); 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); } /**