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

Commit 905b5891 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Track xtables summary, move tether stats, time. 

Begin tracking xtables summary of data usage to compare with values
reported from /proc/net/dev.  Roll tethering directly into UID stats
to trigger UID stats persisting when crossing threshold.

Include xtables summary and authoritative time in samples.

Bug: 5373561, 5397882, 5381980
Change-Id: Ib7945522caadfbe0864fdf391582dc820f4f371e
parent b9e7e132

core/java/android/net/NetworkStats.java

+39 −0
Original line number Diff line number Diff line
@@ -271,6 +271,17 @@ public class NetworkStats implements Parcelable { 
        return this;

    }



    /**

     * Combine all values from another {@link NetworkStats} into this object.

     */

    public void combineAllValues(NetworkStats another) {

        NetworkStats.Entry entry = null;

        for (int i = 0; i < another.size; i++) {

            entry = another.getValues(i, entry);

            combineValues(entry);

        }

    }



    /**

     * Find first stats index that matches the requested parameters.

     */
@@ -456,6 +467,34 @@ public class NetworkStats implements Parcelable { 
        return result;

    }



    /**

     * Return total statistics grouped by {@link #iface}; doesn't mutate the

     * original structure.

     */

    public NetworkStats groupedByIface() {

        final NetworkStats stats = new NetworkStats(elapsedRealtime, 10);



        final Entry entry = new Entry();

        entry.uid = UID_ALL;

        entry.set = SET_ALL;

        entry.tag = TAG_NONE;

        entry.operations = 0L;



        for (int i = 0; i < size; i++) {

            // skip specific tags, since already counted in TAG_NONE

            if (tag[i] != TAG_NONE) continue;



            entry.iface = iface[i];

            entry.rxBytes = rxBytes[i];

            entry.rxPackets = rxPackets[i];

            entry.txBytes = txBytes[i];

            entry.txPackets = txPackets[i];

            stats.combineValues(entry);

        }



        return stats;

    }



    public void dump(String prefix, PrintWriter pw) {

        pw.print(prefix);

        pw.print("NetworkStats: elapsedRealtime="); pw.println(elapsedRealtime);

core/tests/coretests/src/android/net/NetworkStatsTest.java

+58 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.net; 


import static android.net.NetworkStats.SET_DEFAULT;

import static android.net.NetworkStats.SET_FOREGROUND;

import static android.net.NetworkStats.SET_ALL;

import static android.net.NetworkStats.IFACE_ALL;

import static android.net.NetworkStats.TAG_NONE;

import static android.net.NetworkStats.UID_ALL;
@@ -176,8 +178,63 @@ public class NetworkStatsTest extends TestCase { 
        assertEquals(64L, uidTag.getTotalBytes());

    }



    public void testGroupedByIfaceEmpty() throws Exception {

        final NetworkStats uidStats = new NetworkStats(TEST_START, 3);

        final NetworkStats grouped = uidStats.groupedByIface();



        assertEquals(0, uidStats.size());

        assertEquals(0, grouped.size());

    }



    public void testGroupedByIfaceAll() throws Exception {

        final NetworkStats uidStats = new NetworkStats(TEST_START, 3)

                .addValues(IFACE_ALL, 100, SET_ALL, TAG_NONE, 128L, 8L, 0L, 2L, 20L)

                .addValues(IFACE_ALL, 101, SET_FOREGROUND, TAG_NONE, 128L, 8L, 0L, 2L, 20L);

        final NetworkStats grouped = uidStats.groupedByIface();



        assertEquals(2, uidStats.size());

        assertEquals(1, grouped.size());



        assertValues(grouped, 0, IFACE_ALL, UID_ALL, SET_ALL, TAG_NONE, 256L, 16L, 0L, 4L, 0L);

    }



    public void testGroupedByIface() throws Exception {

        final NetworkStats uidStats = new NetworkStats(TEST_START, 3)

                .addValues(TEST_IFACE, 100, SET_DEFAULT, TAG_NONE, 128L, 8L, 0L, 2L, 20L)

                .addValues(TEST_IFACE2, 100, SET_DEFAULT, TAG_NONE, 512L, 32L, 0L, 0L, 0L)

                .addValues(TEST_IFACE2, 100, SET_DEFAULT, 0xF00D, 64L, 4L, 0L, 0L, 0L)

                .addValues(TEST_IFACE2, 100, SET_FOREGROUND, TAG_NONE, 512L, 32L, 0L, 0L, 0L)

                .addValues(TEST_IFACE, 101, SET_DEFAULT, TAG_NONE, 128L, 8L, 0L, 0L, 0L)

                .addValues(TEST_IFACE, 101, SET_DEFAULT, 0xF00D, 128L, 8L, 0L, 0L, 0L);



        final NetworkStats grouped = uidStats.groupedByIface();



        assertEquals(6, uidStats.size());



        assertEquals(2, grouped.size());

        assertValues(grouped, 0, TEST_IFACE, UID_ALL, SET_ALL, TAG_NONE, 256L, 16L, 0L, 2L, 0L);

        assertValues(grouped, 1, TEST_IFACE2, UID_ALL, SET_ALL, TAG_NONE, 1024L, 64L, 0L, 0L, 0L);

    }



    public void testAddAllValues() {

        final NetworkStats first = new NetworkStats(TEST_START, 5)

                .addValues(TEST_IFACE, 100, SET_DEFAULT, TAG_NONE, 32L, 0L, 0L, 0L, 0L)

                .addValues(TEST_IFACE, 100, SET_FOREGROUND, TAG_NONE, 32L, 0L, 0L, 0L, 0L);



        final NetworkStats second = new NetworkStats(TEST_START, 2)

                .addValues(TEST_IFACE, 100, SET_DEFAULT, TAG_NONE, 32L, 0L, 0L, 0L, 0L)

                .addValues(TEST_IFACE2, UID_ALL, SET_DEFAULT, TAG_NONE, 32L, 0L, 0L, 0L, 0L);



        first.combineAllValues(second);



        assertEquals(3, first.size());

        assertValues(first, 0, TEST_IFACE, 100, SET_DEFAULT, TAG_NONE, 64L, 0L, 0L, 0L, 0L);

        assertValues(first, 1, TEST_IFACE, 100, SET_FOREGROUND, TAG_NONE, 32L, 0L, 0L, 0L, 0L);

        assertValues(first, 2, TEST_IFACE2, UID_ALL, SET_DEFAULT, TAG_NONE, 32L, 0L, 0L, 0L, 0L);

    }



    private static void assertValues(NetworkStats stats, int index, String iface, int uid, int set,

            int tag, long rxBytes, long rxPackets, long txBytes, long txPackets, int operations) {

            int tag, long rxBytes, long rxPackets, long txBytes, long txPackets, long operations) {

        final NetworkStats.Entry entry = stats.getValues(index, null);

        assertEquals(iface, entry.iface);

        assertEquals(uid, entry.uid);

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_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)
 
51100 netstats_mobile_sample (dev_rx_bytes|2|2),(dev_tx_bytes|2|2),(dev_rx_pkts|2|1),(dev_tx_pkts|2|1),(xt_rx_bytes|2|2),(xt_tx_bytes|2|2),(xt_rx_pkts|2|1),(xt_tx_pkts|2|1),(uid_rx_bytes|2|2),(uid_tx_bytes|2|2),(uid_rx_pkts|2|1),(uid_tx_pkts|2|1),(trusted_time|2|3)

51101 netstats_wifi_sample (dev_rx_bytes|2|2),(dev_tx_bytes|2|2),(dev_rx_pkts|2|1),(dev_tx_pkts|2|1),(xt_rx_bytes|2|2),(xt_tx_bytes|2|2),(xt_rx_pkts|2|1),(xt_tx_pkts|2|1),(uid_rx_bytes|2|2),(uid_tx_bytes|2|2),(uid_rx_pkts|2|1),(uid_tx_pkts|2|1),(trusted_time|2|3)

services/java/com/android/server/NetworkManagementService.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.Manifest.permission.MANAGE_NETWORK_POLICY; 
import static android.net.NetworkStats.IFACE_ALL;

import static android.net.NetworkStats.SET_DEFAULT;

import static android.net.NetworkStats.TAG_NONE;

import static android.net.TrafficStats.UID_TETHERING;

import static android.net.NetworkStats.UID_ALL;

import static android.provider.Settings.Secure.NETSTATS_ENABLED;

import static com.android.server.NetworkManagementSocketTagger.PROP_QTAGUID_ENABLED;
@@ -1522,7 +1523,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
        try {

            final NetworkStats.Entry entry = new NetworkStats.Entry();

            entry.iface = ifaceIn;

            entry.uid = UID_ALL;

            entry.uid = UID_TETHERING;

            entry.set = SET_DEFAULT;

            entry.tag = TAG_NONE;

            entry.rxBytes = Long.parseLong(tok[3]);

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

+216 −117

File changed.

Preview size limit exceeded, changes collapsed.