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

Merge "AudioService: log routing cache clear time, cache sync" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-30 21:30:27 +00:00
committed by Android (Google) Code Review
parent 53c820562e 4cb32ce66b
commit 8e013de073
1 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
services/core/java/com/android/server/audio/AudioSystemAdapter.java
View File

@@ -29,8 +29,12 @@ import android.util.Pair;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@@ -60,8 +64,12 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback,
private String[] mMethodNames = {"getDevicesForAttributes"}; private String[] mMethodNames = {"getDevicesForAttributes"};
private static final boolean USE_CACHE_FOR_GETDEVICES = true; private static final boolean USE_CACHE_FOR_GETDEVICES = true;
private static final Object sDeviceCacheLock = new Object();
@GuardedBy("sDeviceCacheLock")
private ConcurrentHashMap<Pair<AudioAttributes, Boolean>, ArrayList<AudioDeviceAttributes>> private ConcurrentHashMap<Pair<AudioAttributes, Boolean>, ArrayList<AudioDeviceAttributes>>
mDevicesForAttrCache; mDevicesForAttrCache;
@GuardedBy("sDeviceCacheLock")
private long mDevicesForAttributesCacheClearTimeMs = System.currentTimeMillis();
private int[] mMethodCacheHit; private int[] mMethodCacheHit;
private static final Object sRoutingListenerLock = new Object(); private static final Object sRoutingListenerLock = new Object();
@GuardedBy("sRoutingListenerLock") @GuardedBy("sRoutingListenerLock")
@@ -147,9 +155,11 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback,
AudioSystem.setRoutingCallback(sSingletonDefaultAdapter); AudioSystem.setRoutingCallback(sSingletonDefaultAdapter);
AudioSystem.setVolumeRangeInitRequestCallback(sSingletonDefaultAdapter); AudioSystem.setVolumeRangeInitRequestCallback(sSingletonDefaultAdapter);
if (USE_CACHE_FOR_GETDEVICES) { if (USE_CACHE_FOR_GETDEVICES) {
sSingletonDefaultAdapter.mDevicesForAttrCache = synchronized (sDeviceCacheLock) {
new ConcurrentHashMap<>(AudioSystem.getNumStreamTypes()); sSingletonDefaultAdapter.mDevicesForAttrCache =
sSingletonDefaultAdapter.mMethodCacheHit = new int[NB_MEASUREMENTS]; new ConcurrentHashMap<>(AudioSystem.getNumStreamTypes());
sSingletonDefaultAdapter.mMethodCacheHit = new int[NB_MEASUREMENTS];
}
} }
if (ENABLE_GETDEVICES_STATS) { if (ENABLE_GETDEVICES_STATS) {
sSingletonDefaultAdapter.mMethodCallCounter = new int[NB_MEASUREMENTS]; sSingletonDefaultAdapter.mMethodCallCounter = new int[NB_MEASUREMENTS];
@@ -163,8 +173,9 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback,
if (DEBUG_CACHE) { if (DEBUG_CACHE) {
Log.d(TAG, "---- clearing cache ----------"); Log.d(TAG, "---- clearing cache ----------");
} }
if (mDevicesForAttrCache != null) { synchronized (sDeviceCacheLock) {
synchronized (mDevicesForAttrCache) { if (mDevicesForAttrCache != null) {
mDevicesForAttributesCacheClearTimeMs = System.currentTimeMillis();
mDevicesForAttrCache.clear(); mDevicesForAttrCache.clear();
} }
} }
@@ -193,7 +204,7 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback,
if (USE_CACHE_FOR_GETDEVICES) { if (USE_CACHE_FOR_GETDEVICES) {
ArrayList<AudioDeviceAttributes> res; ArrayList<AudioDeviceAttributes> res;
final Pair<AudioAttributes, Boolean> key = new Pair(attributes, forVolume); final Pair<AudioAttributes, Boolean> key = new Pair(attributes, forVolume);
synchronized (mDevicesForAttrCache) { synchronized (sDeviceCacheLock) {
res = mDevicesForAttrCache.get(key); res = mDevicesForAttrCache.get(key);
if (res == null) { if (res == null) {
// result from AudioSystem guaranteed non-null, but could be invalid // result from AudioSystem guaranteed non-null, but could be invalid
@@ -508,23 +519,31 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback,
*/ */
public void dump(PrintWriter pw) { public void dump(PrintWriter pw) {
pw.println("\nAudioSystemAdapter:"); pw.println("\nAudioSystemAdapter:");
pw.println(" mDevicesForAttrCache:"); final DateTimeFormatter formatter = DateTimeFormatter
if (mDevicesForAttrCache != null) { .ofPattern("MM-dd HH:mm:ss:SSS")
for (Map.Entry<Pair<AudioAttributes, Boolean>, ArrayList<AudioDeviceAttributes>> .withLocale(Locale.US)
entry : mDevicesForAttrCache.entrySet()) { .withZone(ZoneId.systemDefault());
final AudioAttributes attributes = entry.getKey().first; synchronized (sDeviceCacheLock) {
try { pw.println(" last cache clear time: " + formatter.format(
final int stream = attributes.getVolumeControlStream(); Instant.ofEpochMilli(mDevicesForAttributesCacheClearTimeMs)));
pw.println("\t" + attributes + " forVolume: " + entry.getKey().second pw.println(" mDevicesForAttrCache:");
+ " stream: " if (mDevicesForAttrCache != null) {
+ AudioSystem.STREAM_NAMES[stream] + "(" + stream + ")"); for (Map.Entry<Pair<AudioAttributes, Boolean>, ArrayList<AudioDeviceAttributes>>
for (AudioDeviceAttributes devAttr : entry.getValue()) { entry : mDevicesForAttrCache.entrySet()) {
pw.println("\t\t" + devAttr); final AudioAttributes attributes = entry.getKey().first;
try {
final int stream = attributes.getVolumeControlStream();
pw.println("\t" + attributes + " forVolume: " + entry.getKey().second
+ " stream: "
+ AudioSystem.STREAM_NAMES[stream] + "(" + stream + ")");
for (AudioDeviceAttributes devAttr : entry.getValue()) {
pw.println("\t\t" + devAttr);
}
} catch (IllegalArgumentException e) {
// dump could fail if attributes do not map to a stream.
pw.println("\t dump failed for attributes: " + attributes);
Log.e(TAG, "dump failed", e);
} }
} catch (IllegalArgumentException e) {
// dump could fail if attributes do not map to a stream.
pw.println("\t dump failed for attributes: " + attributes);
Log.e(TAG, "dump failed", e);
} }
} }
} }