Commit Graph

322 Commits

Author SHA1 Message Date
Jeff Sharkey
c831ede3ac am 33e3710a: am 35226c4c: Merge "Bootstrap stats before registering listeners." into ics-mr1
* commit '33e3710aafb68125f05ab30d61e324c894f0a3bb':
  Bootstrap stats before registering listeners.
2011-11-09 21:51:40 +00:00
Jeff Sharkey
ef47cd1331 am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
* commit '489b431273500db81d35ed43440915187c238f92':
  Make operation counts monotonically increase.
2011-11-09 21:51:38 +00:00
The Android Automerger
50fab4d508 merge in ics-mr1-release history after reset to ics-mr1 2011-11-09 06:47:03 -08:00
Jeff Sharkey
35226c4c27 Merge "Bootstrap stats before registering listeners." into ics-mr1 2011-11-08 23:43:58 -08:00
Jeff Sharkey
29f15bb4b3 Bootstrap stats before registering listeners.
Also move ISE to handled NonMonotonicException.

Bug: 5570872
Change-Id: I793f349287ef5589185f117dfbec6f1fad73a661
2011-11-08 18:24:12 -08:00
Jeff Sharkey
e2de8f08d4 Make operation counts monotonically increase.
Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca
2011-11-08 17:35:28 -08:00
The Android Automerger
67240b3dba merge in ics-release history after reset to master 2011-11-08 06:53:51 -08:00
The Android Automerger
42567048c8 merge in ics-release history after reset to master 2011-11-03 06:59:11 -07:00
The Android Automerger
77f0af6f1f merge in ics-mr1-release history after reset to ics-mr1 2011-11-03 06:44:18 -07:00
Jeff Sharkey
cd5559a856 Correct proc file reader, optimizations.
Moved away from BufferedReader, which only reads the first 8KB of
some proc files because it aggresively fills its buffer.  Optimized
proc parsing, now double the speed.  Tests to cover.

Log when NetworkStats counters roll backwards when subtracting, and
optimizations around findIndex().  When system removes UID, also
remove from last stats snapshot to avoid xt counters from rolling
backwards.

Bug: 5472949, 5458380
Change-Id: I07c08fe5233156fac2b84450f6291868bf9bfaf2
2011-11-02 15:14:11 -07:00
The Android Automerger
dc3324602a merge in ics-mr1-release history after reset to ics-mr1 2011-11-02 06:46:08 -07:00
Robert Greenwalt
061658c2c7 Add cdma_rmnet4 to list of monitored interfaces
Lets the data traffic arrows work on LTE device on 1x,
but also lets telephony monitor for hung radios on 1X.

bug:5531630
Change-Id: I9fa25a5223afaa2e37373668c899ac28a95783fa
2011-11-01 11:51:27 -07:00
The Android Automerger
78e89a0cd8 merge in ics-release history after reset to master 2011-10-18 07:00:16 -07:00
Jeff Sharkey
92c7838ca3 Validate commands and arguments.
Bug: 5465176
Change-Id: I9402054c20ea6cae42781c35bfc2ade90aac31ce
2011-10-17 14:51:42 -07:00
The Android Automerger
29886072c9 merge in ics-release history after reset to master 2011-10-10 07:00:11 -07:00
Jeff Sharkey
27f58b3e26 Move battery stats to xt_qtaguid for data stats.
Replace TrafficStats calls by reading values from xt_qtaguid kernel
module. To keep BatteryStatsImpl changes lightweight, cache recently
parsed stats. Tracks mobile ifaces from ConnectivityService.

Refactor xt_qtaguid parsing into factory outside of NMS. Add stats
grouping based on UID, and total based on limiting filters like iface
prefix and UID.

Bug: 4902271
Change-Id: I533f116c434b77f93355bf95b839e7478528505b
2011-10-09 13:49:08 -07:00
The Android Automerger
ec60f276f4 merge in ics-release history after reset to master 2011-10-06 07:00:40 -07:00
Jeff Sharkey
0787a3616f Refine random stats generation.
Offer parameters to pick out specific list of packages, and to change
duration and total data.

Bug: 5416742
Change-Id: I6970a5e76f3198ef23a400c079037212b000ca6b
2011-10-05 23:31:57 -07:00
The Android Automerger
77622cdc0b merge in ics-release history after reset to master 2011-10-05 06:58:56 -07:00
Jeff Sharkey
f1369459ed 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
2011-10-03 17:21:05 -07:00
The Android Automerger
cc800bb2d2 merge in ics-release history after reset to master 2011-09-27 07:00:12 -07:00
Jeff Sharkey
8cddd4a5c7 Overlay to configure data usage network types.
Specify which network types should be counted when computing data
usage totals.

Bug: 5361005
Change-Id: I830caed1a29199892d209a692b50f8b3e144cafe
2011-09-26 10:50:30 -07:00
The Android Automerger
a3bcf5f03c merge in ics-release history after reset to master 2011-09-26 06:59:53 -07:00
Jeff Sharkey
6a2cbb63b3 Watch network subtype, tethering teardown, empty.
Watch for changes to telephony network subtype, and update iface
mapping to persist stats under correct type.  Update network stats
before removing tethering NAT rules.

Skip recording that would create empty historical buckets.  Query UID
stats before iface stats to always skew positive when counters are
actively rolling forward.

Bug: 5360042, 5359860, 5335674, 5334448
Change-Id: I8aa37b568e8ffb70647218aa1aff5195d3e44d5a
2011-09-22 16:19:06 -07:00
The Android Automerger
39fba68103 merge in ics-release history after reset to master 2011-09-22 07:00:05 -07:00
The Android Open Source Project
f7d44fa995 Reconcile with ics-factoryrom-release
Change-Id: I401a78a2216c8c4042f6f48b4e882035cbccfc82
2011-09-21 06:19:16 -07:00
The Android Automerger
97fb953b02 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-20 20:43:04 -07:00
The Android Automerger
9e76007b3d merge in ics-release history after reset to master 2011-09-20 07:00:19 -07:00
Jeff Sharkey
8d000c17f9 am 88b18eb8: Merge "Upload correct txPackets count." into ics-factoryrom
* commit '88b18eb8c2034e9de35482cc737ef8d608d55867':
  Upload correct txPackets count.
2011-09-19 21:44:00 -07:00
Jeff Sharkey
ed94a3c766 Upload correct txPackets count.
Bug: 5321340
Change-Id: Ie4dc7a91bf1cdc4d64c75ff09ae0cdd0fb141b5d
2011-09-19 18:37:11 -07:00
The Android Automerger
fac40c2576 merge in ics-release history after reset to master 2011-09-19 06:59:57 -07:00
Jeff Sharkey
8d8ecaef37 Sample atomic network stats buckets, full poll.
When sampling network stats, always use atomic buckets instead of
interpolating.  Always poll iface and UID together so we distribute
into buckets equally.  Move stale bucket trimming to just before
writing stats.

Bug: 5321340
Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4
2011-09-18 16:27:21 -07:00
Jeff Sharkey
ffa6efd8e0 am aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
* commit 'aaf301736e923db15918617145069658696be453':
  DO NOT MERGE: Sample atomic network stats buckets, full poll.
2011-09-18 16:21:38 -07:00
Jeff Sharkey
b10824574c DO NOT MERGE: Sample atomic network stats buckets, full poll.
When sampling network stats, always use atomic buckets instead of
interpolating.  Always poll iface and UID together so we distribute
into buckets equally.  Move stale bucket trimming to just before
writing stats.

Bug: 5321340
Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4
2011-09-18 16:17:51 -07:00
Jeff Sharkey
c65812835d am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom
* commit '3d1d57dcdb02ace6af5810bd4ec3f8fad5fc1799':
  Collect and persist tethering stats.
2011-09-18 16:17:39 -07:00
The Android Automerger
9ccf078edb merge in ics-release history after reset to master 2011-09-18 07:00:21 -07:00
Jeff Sharkey
987f5ff357 Collect and persist tethering stats.
Use new "gettetherstats" netd command to retrieve statistics for
active tethering connections.  Keep tethering poll events separate
from UID poll, even though they end up same historical structures.

Bug: 5244846
Change-Id: Ia0c5165f6712c12b51586f86c331a2aad4ad6afb
2011-09-16 16:05:51 -07:00
Ashish Sharma
468a90a808 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)." 2011-09-15 14:30:40 -07:00
Ashish Sharma
4b8629c4bd 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
2011-09-15 12:20:27 -07:00
The Android Automerger
e6116f9f87 merge in ics-release history after reset to master 2011-09-15 06:34:24 -07:00
Jeff Sharkey
4d675fdcf6 Network stats flag to force complete poll.
Devices currently delay collecting UID stats during common operations
like global alerts to reduce parsing load.  Here we introduce a flag
to always collect UID and iface stats together to aid debugging.

Bug: 5321340
Change-Id: Ia8e1daf1a6f9d5f5cf1f64a04b6b6766ee965ab6
2011-09-14 19:47:05 -07:00
The Android Automerger
7988f6d310 merge in ics-release history after reset to master 2011-09-14 06:34:13 -07:00
Jeff Sharkey
23f0af822a Remove deprecated TrafficStats API.
Bug: 5314214
Change-Id: If7dc3ef012a0e998e83ab4fef27ff19398d3e14c
2011-09-13 20:43:10 -07:00
The Android Automerger
58841dde81 merge in ics-release history after reset to master 2011-09-13 06:34:10 -07:00
Jeff Sharkey
869f9e165b Data usage structure optimizations.
Driven by traceview hotspots found in Settings UI.

Change-Id: I614a049523c526b7fcd12fffdf53a3e4723623e4
2011-09-12 16:13:20 -07:00
The Android Automerger
71454d62da merge in ics-release history after reset to master 2011-09-08 06:34:13 -07:00
Jeff Sharkey
ede64a7a65 Merge "Poll UID stats during iface changes, enforce idx." 2011-09-07 21:41:05 -07:00
Jeff Sharkey
d905762784 Poll UID stats during iface changes, enforce idx.
When ifaces change, poll UID stats without persisting, since they
depend on knowing active iface to store correctly.  Log dropped UID
stats when iface is unknown.  Switch to using flags when calling
performPoll().

Enforce that "idx" values are consistent from xt_qtaguid.  Transition
to using Log.wtf() for important checks, mostly around file I/O,
kernel stats parsing, and kernel module control.  Increase stats
persist threshold to 2MB to reduce churn.

Bug: 5269476, 5270106
Change-Id: I721215bfb65127f95775c71cf135e907cd567e92
2011-09-07 18:06:30 -07:00
Irfan Sheriff
459657bab0 Use hasSystemFeature() API to check for p2p
Bug: 5267396
Change-Id: I4ff3f77c15322564f63beea793c4585cece596e0
2011-09-07 14:36:32 -07:00
The Android Automerger
6ee8c33aa8 merge in ics-release history after reset to master 2011-09-02 16:02:32 -07:00