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

Commit d03fd3f0 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Persist "tagged" network stats along with UIDs. 

Now stores tags other than TAG_NONE (0x0), which are useful for app
debugging.  Combine UID and tag together into single long key, and
expose tag data through AIDL when requested.  Change NMS to track
TAG_NONE as total UID traffic, matching the kernel definition.

Added TAG_MAX_HISTORY to control how long tag-granularity statistics
are stored; overall UID usage is still kept for UID_MAX_HISTORY.  Fix
bug to trim NetworkStatsHistory outside normal polling loops to catch
non-active networks and UIDs.

Test to verify UID and tag packing, and to verify that UID traffic on
two networks are combined to match MOBILE_ALL template.

Change-Id: If0e039416d9e7f63b1a39e04cddfb1133b5a78ee
parent b09540f3

core/java/android/net/INetworkStatsService.aidl

+2 −2
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ interface INetworkStatsService { 
    /** Return historical stats for traffic that matches template. */

    NetworkStatsHistory getHistoryForNetwork(in NetworkTemplate template);

    /** Return historical stats for specific UID traffic that matches template. */

    NetworkStatsHistory getHistoryForUid(in NetworkTemplate template, int uid);

    NetworkStatsHistory getHistoryForUid(in NetworkTemplate template, int uid, int tag);



    /** Return usage summary for traffic that matches template. */

    NetworkStats getSummaryForNetwork(in NetworkTemplate template, long start, long end);

    /** Return usage summary per UID for traffic that matches template. */

    NetworkStats getSummaryForAllUid(in NetworkTemplate template, long start, long end);

    NetworkStats getSummaryForAllUid(in NetworkTemplate template, long start, long end, boolean includeTags);



}

core/java/android/provider/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -3800,6 +3800,8 @@ public final class Settings { 
        public static final String NETSTATS_UID_BUCKET_DURATION = "netstats_uid_bucket_duration";

        /** {@hide} */

        public static final String NETSTATS_UID_MAX_HISTORY = "netstats_uid_max_history";

        /** {@hide} */

        public static final String NETSTATS_TAG_MAX_HISTORY = "netstats_tag_max_history";



        /**

         * @hide

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

+1 −6
Original line number Diff line number Diff line
@@ -968,11 +968,6 @@ class NetworkManagementService extends INetworkManagementService.Stub { 


                    if (limitUid == UID_ALL || limitUid == uid) {

                        stats.addEntry(iface, uid, tag, rx, tx);

                        if (tag != TAG_NONE) {

                            // proc also counts tagged data in generic tag, so

                            // we subtract it here to avoid double-counting.

                            stats.combineEntry(iface, uid, TAG_NONE, -rx, -tx);

                        }

                    }

                } catch (NumberFormatException e) {

                    Slog.w(TAG, "problem parsing stats for idx " + idx + ": " + e);

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

+149 −66

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java

+194 −30

File changed.

Preview size limit exceeded, changes collapsed.