pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix threading bugs"

This commit is contained in:
Treehugger Robot 2022-11-09 11:14:42 +00:00 committed by Gerrit Code Review
parent dd91f0fadc 0719e1ae2e
commit f2175fa423
2 changed files with 512 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

905
javalib/src/android/system/virtualmachine/VirtualMachine.java
View File

File diff suppressed because it is too large Load Diff

18
javalib/src/android/system/virtualmachine/VirtualMachineManager.java
View File

@ -26,6 +26,8 @@ import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.sysprop.HypervisorProperties; import android.sysprop.HypervisorProperties;
import com.android.internal.annotations.GuardedBy;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@ -51,6 +53,7 @@ public class VirtualMachineManager {
mContext = context; mContext = context;
} }
@GuardedBy("sInstances")
private static final Map<Context, WeakReference<VirtualMachineManager>> sInstances = private static final Map<Context, WeakReference<VirtualMachineManager>> sInstances =
new WeakHashMap<>(); new WeakHashMap<>();
@ -96,9 +99,6 @@ public class VirtualMachineManager {
} }
} }
/** A lock used to synchronize the creation of virtual machines */
private static final Object sCreateLock = new Object();
/** /**
* Returns a set of flags indicating what this implementation of virtualization is capable of. * Returns a set of flags indicating what this implementation of virtualization is capable of.
* *
@ -136,7 +136,7 @@ public class VirtualMachineManager {
public VirtualMachine create( public VirtualMachine create(
@NonNull String name, @NonNull VirtualMachineConfig config) @NonNull String name, @NonNull VirtualMachineConfig config)
throws VirtualMachineException { throws VirtualMachineException {
synchronized (sCreateLock) { synchronized (VirtualMachine.sCreateLock) {
return VirtualMachine.create(mContext, name, config); return VirtualMachine.create(mContext, name, config);
} }
} }
@ -151,7 +151,9 @@ public class VirtualMachineManager {
*/ */
@Nullable @Nullable
public VirtualMachine get(@NonNull String name) throws VirtualMachineException { public VirtualMachine get(@NonNull String name) throws VirtualMachineException {
return VirtualMachine.load(mContext, name); synchronized (VirtualMachine.sCreateLock) {
return VirtualMachine.load(mContext, name);
}
} }
/** /**
@ -166,7 +168,7 @@ public class VirtualMachineManager {
@NonNull String name, @NonNull VirtualMachineConfig config) @NonNull String name, @NonNull VirtualMachineConfig config)
throws VirtualMachineException { throws VirtualMachineException {
VirtualMachine vm; VirtualMachine vm;
synchronized (sCreateLock) { synchronized (VirtualMachine.sCreateLock) {
vm = get(name); vm = get(name);
if (vm == null) { if (vm == null) {
vm = create(name, config); vm = create(name, config);
@ -188,6 +190,8 @@ public class VirtualMachineManager {
*/ */
public void delete(@NonNull String name) throws VirtualMachineException { public void delete(@NonNull String name) throws VirtualMachineException {
requireNonNull(name); requireNonNull(name);
VirtualMachine.delete(mContext, name); synchronized (VirtualMachine.sCreateLock) {
VirtualMachine.delete(mContext, name);
}
} }
} }