LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add a lock to protect persistent stats snapshot" am: f31face531

Browse Source 
am: 57f207b1c7

Change-Id: Ia91b71536447e65725a85ebf2ac4f411aebe86c8
This commit is contained in:
Chenbo Feng
2019-04-12 05:59:36 -07:00
committed by android-build-merger
parent 80e078d789 57f207b1c7
commit 24e9a313cd
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/net/NetworkStatsFactory.java
View File

@@ -28,6 +28,7 @@ import android.net.NetworkStats;
import android.os.StrictMode; import android.os.StrictMode;
import android.os.SystemClock; import android.os.SystemClock;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.internal.util.ProcFileReader; import com.android.internal.util.ProcFileReader;
@@ -65,6 +66,7 @@ public class NetworkStatsFactory {
private boolean mUseBpfStats; private boolean mUseBpfStats;
// A persistent Snapshot since device start for eBPF stats // A persistent Snapshot since device start for eBPF stats
@GuardedBy("mPersistSnapshot")
private final NetworkStats mPersistSnapshot; private final NetworkStats mPersistSnapshot;
// TODO: only do adjustments in NetworkStatsService and remove this. // TODO: only do adjustments in NetworkStatsService and remove this.
@@ -284,6 +286,7 @@ public class NetworkStatsFactory {
stats = new NetworkStats(SystemClock.elapsedRealtime(), -1); stats = new NetworkStats(SystemClock.elapsedRealtime(), -1);
} }
if (mUseBpfStats) { if (mUseBpfStats) {
synchronized (mPersistSnapshot) {
if (nativeReadNetworkStatsDetail(stats, mStatsXtUid.getAbsolutePath(), UID_ALL, if (nativeReadNetworkStatsDetail(stats, mStatsXtUid.getAbsolutePath(), UID_ALL,
null, TAG_ALL, mUseBpfStats) != 0) { null, TAG_ALL, mUseBpfStats) != 0) {
throw new IOException("Failed to parse network stats"); throw new IOException("Failed to parse network stats");
@@ -293,6 +296,7 @@ public class NetworkStatsFactory {
NetworkStats result = mPersistSnapshot.clone(); NetworkStats result = mPersistSnapshot.clone();
result.filter(limitUid, limitIfaces, limitTag); result.filter(limitUid, limitIfaces, limitTag);
return result; return result;
}
} else { } else {
if (nativeReadNetworkStatsDetail(stats, mStatsXtUid.getAbsolutePath(), limitUid, if (nativeReadNetworkStatsDetail(stats, mStatsXtUid.getAbsolutePath(), limitUid,
limitIfaces, limitTag, mUseBpfStats) != 0) { limitIfaces, limitTag, mUseBpfStats) != 0) {