Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baf4c857 authored by Ashish Sharma's avatar Ashish Sharma
Browse files

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
parent 11fed2b2

services/java/com/android/server/EventLogTags.logtags

+2 −2
Original line number Diff line number Diff line
@@ -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)

services/java/com/android/server/net/NetworkStatsService.java

+8 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**