Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ca915793: Merge "Increase sampling data size limits" into klp-dev

Browse Source 
* commit 'ca915793500c5db9476e21d029e836b78d580863':
  Increase sampling data size limits
This commit is contained in:
Vinit Deshapnde
2013-08-26 17:27:17 -07:00
committed by Android Git Automerger
parent 81d9379b43 ca91579350
commit 4bdda52818
3 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/net/LinkInfo.java
View File

@@ -30,7 +30,7 @@ import android.os.Parcelable;
*/ */
public class LinkInfo implements Parcelable public class LinkInfo implements Parcelable
{ {
public static final int UNKNOWN = Integer.MAX_VALUE; public static final int UNKNOWN = -1;
public static final int NORMALIZED_MIN_SIGNAL_STRENGTH = 0; public static final int NORMALIZED_MIN_SIGNAL_STRENGTH = 0;
@@ -43,8 +43,8 @@ public class LinkInfo implements Parcelable
public int mNormalizedSignalStrength = UNKNOWN; public int mNormalizedSignalStrength = UNKNOWN;
public int mPacketCount = UNKNOWN; public long mPacketCount = UNKNOWN;
public int mPacketErrorCount = UNKNOWN; public long mPacketErrorCount = UNKNOWN;
public int mTheoreticalTxBandwidth = UNKNOWN; public int mTheoreticalTxBandwidth = UNKNOWN;
public int mTheoreticalRxBandwidth = UNKNOWN; public int mTheoreticalRxBandwidth = UNKNOWN;
public int mTheoreticalLatency = UNKNOWN; public int mTheoreticalLatency = UNKNOWN;
@@ -82,8 +82,8 @@ public class LinkInfo implements Parcelable
dest.writeInt(objectType); dest.writeInt(objectType);
dest.writeInt(mNetworkType); dest.writeInt(mNetworkType);
dest.writeInt(mNormalizedSignalStrength); dest.writeInt(mNormalizedSignalStrength);
dest.writeInt(mPacketCount); dest.writeLong(mPacketCount);
dest.writeInt(mPacketErrorCount); dest.writeLong(mPacketErrorCount);
dest.writeInt(mTheoreticalTxBandwidth); dest.writeInt(mTheoreticalTxBandwidth);
dest.writeInt(mTheoreticalRxBandwidth); dest.writeInt(mTheoreticalRxBandwidth);
dest.writeInt(mTheoreticalLatency); dest.writeInt(mTheoreticalLatency);
@@ -116,8 +116,8 @@ public class LinkInfo implements Parcelable
protected void initializeFromParcel(Parcel in) { protected void initializeFromParcel(Parcel in) {
mNetworkType = in.readInt(); mNetworkType = in.readInt();
mNormalizedSignalStrength = in.readInt(); mNormalizedSignalStrength = in.readInt();
mPacketCount = in.readInt(); mPacketCount = in.readLong();
mPacketErrorCount = in.readInt(); mPacketErrorCount = in.readLong();
mTheoreticalTxBandwidth = in.readInt(); mTheoreticalTxBandwidth = in.readInt();
mTheoreticalRxBandwidth = in.readInt(); mTheoreticalRxBandwidth = in.readInt();
mTheoreticalLatency = in.readInt(); mTheoreticalLatency = in.readInt();

87
core/java/android/net/SamplingDataTracker.java
View File

@@ -37,12 +37,12 @@ public class SamplingDataTracker
public static class SamplingSnapshot public static class SamplingSnapshot
{ {
public int mTxByteCount; public long mTxByteCount;
public int mRxByteCount; public long mRxByteCount;
public int mTxPacketCount; public long mTxPacketCount;
public int mRxPacketCount; public long mRxPacketCount;
public int mTxPacketErrorCount; public long mTxPacketErrorCount;
public int mRxPacketErrorCount; public long mRxPacketErrorCount;
public long mTimestamp; public long mTimestamp;
} }
@@ -76,32 +76,37 @@ public class SamplingDataTracker
if (DBG) Slog.d(TAG, "Found data for interface " + currentIface); if (DBG) Slog.d(TAG, "Found data for interface " + currentIface);
if (mapIfaceToSample.containsKey(currentIface)) { if (mapIfaceToSample.containsKey(currentIface)) {
SamplingSnapshot ss = new SamplingSnapshot(); try {
SamplingSnapshot ss = new SamplingSnapshot();
ss.mTxByteCount = Integer.parseInt(tokens[1]); ss.mTxByteCount = Long.parseLong(tokens[1]);
ss.mTxPacketCount = Integer.parseInt(tokens[2]); ss.mTxPacketCount = Long.parseLong(tokens[2]);
ss.mTxPacketErrorCount = Integer.parseInt(tokens[3]); ss.mTxPacketErrorCount = Long.parseLong(tokens[3]);
ss.mRxByteCount = Integer.parseInt(tokens[9]); ss.mRxByteCount = Long.parseLong(tokens[9]);
ss.mRxPacketCount = Integer.parseInt(tokens[10]); ss.mRxPacketCount = Long.parseLong(tokens[10]);
ss.mRxPacketErrorCount = Integer.parseInt(tokens[11]); ss.mRxPacketErrorCount = Long.parseLong(tokens[11]);
ss.mTimestamp = SystemClock.elapsedRealtime(); ss.mTimestamp = SystemClock.elapsedRealtime();
if (DBG) { if (DBG) {
Slog.d(TAG, "Interface = " + currentIface); Slog.d(TAG, "Interface = " + currentIface);
Slog.d(TAG, "ByteCount = " + String.valueOf(ss.mTxByteCount)); Slog.d(TAG, "ByteCount = " + String.valueOf(ss.mTxByteCount));
Slog.d(TAG, "TxPacketCount = " + String.valueOf(ss.mTxPacketCount)); Slog.d(TAG, "TxPacketCount = " + String.valueOf(ss.mTxPacketCount));
Slog.d(TAG, "TxPacketErrorCount = " Slog.d(TAG, "TxPacketErrorCount = "
+ String.valueOf(ss.mTxPacketErrorCount)); + String.valueOf(ss.mTxPacketErrorCount));
Slog.d(TAG, "RxByteCount = " + String.valueOf(ss.mRxByteCount)); Slog.d(TAG, "RxByteCount = " + String.valueOf(ss.mRxByteCount));
Slog.d(TAG, "RxPacketCount = " + String.valueOf(ss.mRxPacketCount)); Slog.d(TAG, "RxPacketCount = " + String.valueOf(ss.mRxPacketCount));
Slog.d(TAG, "RxPacketErrorCount = " Slog.d(TAG, "RxPacketErrorCount = "
+ String.valueOf(ss.mRxPacketErrorCount)); + String.valueOf(ss.mRxPacketErrorCount));
Slog.d(TAG, "Timestamp = " + String.valueOf(ss.mTimestamp)); Slog.d(TAG, "Timestamp = " + String.valueOf(ss.mTimestamp));
Slog.d(TAG, "---------------------------"); Slog.d(TAG, "---------------------------");
}
mapIfaceToSample.put(currentIface, ss);
} catch (NumberFormatException e) {
// just ignore this data point
} }
mapIfaceToSample.put(currentIface, ss);
} }
} }
@@ -179,7 +184,7 @@ public class SamplingDataTracker
} }
} }
public int getSampledTxByteCount() { public long getSampledTxByteCount() {
synchronized(mSamplingDataLock) { synchronized(mSamplingDataLock) {
if (mBeginningSample != null && mEndingSample != null) { if (mBeginningSample != null && mEndingSample != null) {
return mEndingSample.mTxByteCount - mBeginningSample.mTxByteCount; return mEndingSample.mTxByteCount - mBeginningSample.mTxByteCount;
@@ -189,7 +194,7 @@ public class SamplingDataTracker
} }
} }
public int getSampledTxPacketCount() { public long getSampledTxPacketCount() {
synchronized(mSamplingDataLock) { synchronized(mSamplingDataLock) {
if (mBeginningSample != null && mEndingSample != null) { if (mBeginningSample != null && mEndingSample != null) {
return mEndingSample.mTxPacketCount - mBeginningSample.mTxPacketCount; return mEndingSample.mTxPacketCount - mBeginningSample.mTxPacketCount;
@@ -199,7 +204,7 @@ public class SamplingDataTracker
} }
} }
public int getSampledTxPacketErrorCount() { public long getSampledTxPacketErrorCount() {
synchronized(mSamplingDataLock) { synchronized(mSamplingDataLock) {
if (mBeginningSample != null && mEndingSample != null) { if (mBeginningSample != null && mEndingSample != null) {
return mEndingSample.mTxPacketErrorCount - mBeginningSample.mTxPacketErrorCount; return mEndingSample.mTxPacketErrorCount - mBeginningSample.mTxPacketErrorCount;
@@ -209,7 +214,7 @@ public class SamplingDataTracker
} }
} }
public int getSampledRxByteCount() { public long getSampledRxByteCount() {
synchronized(mSamplingDataLock) { synchronized(mSamplingDataLock) {
if (mBeginningSample != null && mEndingSample != null) { if (mBeginningSample != null && mEndingSample != null) {
return mEndingSample.mRxByteCount - mBeginningSample.mRxByteCount; return mEndingSample.mRxByteCount - mBeginningSample.mRxByteCount;
@@ -219,7 +224,7 @@ public class SamplingDataTracker
} }
} }
public int getSampledRxPacketCount() { public long getSampledRxPacketCount() {
synchronized(mSamplingDataLock) { synchronized(mSamplingDataLock) {
if (mBeginningSample != null && mEndingSample != null) { if (mBeginningSample != null && mEndingSample != null) {
return mEndingSample.mRxPacketCount - mBeginningSample.mRxPacketCount; return mEndingSample.mRxPacketCount - mBeginningSample.mRxPacketCount;
@@ -229,31 +234,31 @@ public class SamplingDataTracker
} }
} }
public int getSampledPacketCount() { public long getSampledPacketCount() {
return getSampledPacketCount(mBeginningSample, mEndingSample); return getSampledPacketCount(mBeginningSample, mEndingSample);
} }
public int getSampledPacketCount(SamplingSnapshot begin, SamplingSnapshot end) { public long getSampledPacketCount(SamplingSnapshot begin, SamplingSnapshot end) {
if (begin != null && end != null) { if (begin != null && end != null) {
int rxPacketCount = end.mRxPacketCount - begin.mRxPacketCount; long rxPacketCount = end.mRxPacketCount - begin.mRxPacketCount;
int txPacketCount = end.mTxPacketCount - begin.mTxPacketCount; long txPacketCount = end.mTxPacketCount - begin.mTxPacketCount;
return rxPacketCount + txPacketCount; return rxPacketCount + txPacketCount;
} else { } else {
return LinkInfo.UNKNOWN; return LinkInfo.UNKNOWN;
} }
} }
public int getSampledPacketErrorCount() { public long getSampledPacketErrorCount() {
if (mBeginningSample != null && mEndingSample != null) { if (mBeginningSample != null && mEndingSample != null) {
int rxPacketErrorCount = getSampledRxPacketErrorCount(); long rxPacketErrorCount = getSampledRxPacketErrorCount();
int txPacketErrorCount = getSampledTxPacketErrorCount(); long txPacketErrorCount = getSampledTxPacketErrorCount();
return rxPacketErrorCount + txPacketErrorCount; return rxPacketErrorCount + txPacketErrorCount;
} else { } else {
return LinkInfo.UNKNOWN; return LinkInfo.UNKNOWN;
} }
} }
public int getSampledRxPacketErrorCount() { public long getSampledRxPacketErrorCount() {
synchronized(mSamplingDataLock) { synchronized(mSamplingDataLock) {
if (mBeginningSample != null && mEndingSample != null) { if (mBeginningSample != null && mEndingSample != null) {
return mEndingSample.mRxPacketErrorCount - mBeginningSample.mRxPacketErrorCount; return mEndingSample.mRxPacketErrorCount - mBeginningSample.mRxPacketErrorCount;

12
core/java/android/net/WifiLinkInfo.java
View File

@@ -39,8 +39,8 @@ public final class WifiLinkInfo extends LinkInfo
public int mRssi = UNKNOWN; public int mRssi = UNKNOWN;
/* packet statistics */ /* packet statistics */
public int mTxGood = UNKNOWN; public long mTxGood = UNKNOWN;
public int mTxBad = UNKNOWN; public long mTxBad = UNKNOWN;
/** /**
* Implement the Parcelable interface. * Implement the Parcelable interface.
@@ -51,8 +51,8 @@ public final class WifiLinkInfo extends LinkInfo
dest.writeInt(mType); dest.writeInt(mType);
dest.writeInt(mRssi); dest.writeInt(mRssi);
dest.writeInt(mTxGood); dest.writeLong(mTxGood);
dest.writeInt(mTxBad); dest.writeLong(mTxBad);
dest.writeString(mBssid); dest.writeString(mBssid);
} }
@@ -65,8 +65,8 @@ public final class WifiLinkInfo extends LinkInfo
li.mType = in.readInt(); li.mType = in.readInt();
li.mRssi = in.readInt(); li.mRssi = in.readInt();
li.mTxGood = in.readInt(); li.mTxGood = in.readLong();
li.mTxBad = in.readInt(); li.mTxBad = in.readLong();
li.mBssid = in.readString(); li.mBssid = in.readString();