Merge changes Ida323bae,I3097b152,Id63cc01f
* changes:
javalib: Remove JNI boilerplate code
javalib: More eagerly terminate virtmgr
javalib: Mark mVirtualizationService field final
diff --git a/javalib/jni/android_system_virtualmachine_VirtualMachine.cpp b/javalib/jni/android_system_virtualmachine_VirtualMachine.cpp
index 3230af4..afdc944 100644
--- a/javalib/jni/android_system_virtualmachine_VirtualMachine.cpp
+++ b/javalib/jni/android_system_virtualmachine_VirtualMachine.cpp
@@ -27,7 +27,8 @@
#include "common.h"
-JNIEXPORT jobject JNICALL android_system_virtualmachine_VirtualMachine_connectToVsockServer(
+extern "C" JNIEXPORT jobject JNICALL
+Java_android_system_virtualmachine_VirtualMachine_nativeConnectToVsockServer(
JNIEnv* env, [[maybe_unused]] jclass clazz, jobject vmBinder, jint port) {
using aidl::android::system::virtualizationservice::IVirtualMachine;
using ndk::ScopedFileDescriptor;
@@ -59,32 +60,3 @@
auto client = ARpcSession_setupPreconnectedClient(session.get(), requestFunc, &args);
return AIBinder_toJavaBinder(env, client);
}
-
-JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/) {
- JNIEnv* env;
- if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
- ALOGE("%s: Failed to get the environment", __FUNCTION__);
- return JNI_ERR;
- }
-
- jclass c = env->FindClass("android/system/virtualmachine/VirtualMachine");
- if (c == nullptr) {
- ALOGE("%s: Failed to find class android.system.virtualmachine.VirtualMachine",
- __FUNCTION__);
- return JNI_ERR;
- }
-
- // Register your class' native methods.
- static const JNINativeMethod methods[] = {
- {"nativeConnectToVsockServer", "(Landroid/os/IBinder;I)Landroid/os/IBinder;",
- reinterpret_cast<void*>(
- android_system_virtualmachine_VirtualMachine_connectToVsockServer)},
- };
- int rc = env->RegisterNatives(c, methods, sizeof(methods) / sizeof(JNINativeMethod));
- if (rc != JNI_OK) {
- ALOGE("%s: Failed to register natives", __FUNCTION__);
- return rc;
- }
-
- return JNI_VERSION_1_6;
-}
diff --git a/javalib/jni/android_system_virtualmachine_VirtualizationService.cpp b/javalib/jni/android_system_virtualmachine_VirtualizationService.cpp
index b0e2cd2..bd80880 100644
--- a/javalib/jni/android_system_virtualmachine_VirtualizationService.cpp
+++ b/javalib/jni/android_system_virtualmachine_VirtualizationService.cpp
@@ -31,7 +31,8 @@
static constexpr const char VIRTMGR_PATH[] = "/apex/com.android.virt/bin/virtmgr";
static constexpr size_t VIRTMGR_THREADS = 16;
-JNIEXPORT jint JNICALL android_system_virtualmachine_VirtualizationService_spawn(
+extern "C" JNIEXPORT jint JNICALL
+Java_android_system_virtualmachine_VirtualizationService_nativeSpawn(
JNIEnv* env, [[maybe_unused]] jclass clazz) {
unique_fd serverFd, clientFd;
if (!Socketpair(SOCK_STREAM, &serverFd, &clientFd)) {
@@ -74,8 +75,10 @@
return clientFd.release();
}
-JNIEXPORT jobject JNICALL android_system_virtualmachine_VirtualizationService_connect(
- JNIEnv* env, [[maybe_unused]] jobject obj, int clientFd) {
+extern "C" JNIEXPORT jobject JNICALL
+Java_android_system_virtualmachine_VirtualizationService_nativeConnect(JNIEnv* env,
+ [[maybe_unused]] jobject obj,
+ int clientFd) {
RpcSessionHandle session;
ARpcSession_setFileDescriptorTransportMode(session.get(),
ARpcSession_FileDescriptorTransportMode::Unix);
@@ -86,8 +89,10 @@
return AIBinder_toJavaBinder(env, client);
}
-JNIEXPORT jboolean JNICALL android_system_virtualmachine_VirtualizationService_isOk(
- JNIEnv* env, [[maybe_unused]] jobject obj, int clientFd) {
+extern "C" JNIEXPORT jboolean JNICALL
+Java_android_system_virtualmachine_VirtualizationService_nativeIsOk(JNIEnv* env,
+ [[maybe_unused]] jobject obj,
+ int clientFd) {
/* Setting events=0 only returns POLLERR, POLLHUP or POLLNVAL. */
struct pollfd pfds[] = {{.fd = clientFd, .events = 0}};
if (poll(pfds, /*nfds*/ 1, /*timeout*/ 0) < 0) {
@@ -97,35 +102,3 @@
}
return pfds[0].revents == 0;
}
-
-JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/) {
- JNIEnv* env;
- if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
- ALOGE("%s: Failed to get the environment", __FUNCTION__);
- return JNI_ERR;
- }
-
- jclass c = env->FindClass("android/system/virtualmachine/VirtualizationService");
- if (c == nullptr) {
- ALOGE("%s: Failed to find class android.system.virtualmachine.VirtualizationService",
- __FUNCTION__);
- return JNI_ERR;
- }
-
- // Register your class' native methods.
- static const JNINativeMethod methods[] = {
- {"nativeSpawn", "()I",
- reinterpret_cast<void*>(android_system_virtualmachine_VirtualizationService_spawn)},
- {"nativeConnect", "(I)Landroid/os/IBinder;",
- reinterpret_cast<void*>(android_system_virtualmachine_VirtualizationService_connect)},
- {"nativeIsOk", "(I)Z",
- reinterpret_cast<void*>(android_system_virtualmachine_VirtualizationService_isOk)},
- };
- int rc = env->RegisterNatives(c, methods, sizeof(methods) / sizeof(JNINativeMethod));
- if (rc != JNI_OK) {
- ALOGE("%s: Failed to register natives", __FUNCTION__);
- return rc;
- }
-
- return JNI_VERSION_1_6;
-}
diff --git a/javalib/src/android/system/virtualmachine/VirtualMachine.java b/javalib/src/android/system/virtualmachine/VirtualMachine.java
index beaac18..34851e4 100644
--- a/javalib/src/android/system/virtualmachine/VirtualMachine.java
+++ b/javalib/src/android/system/virtualmachine/VirtualMachine.java
@@ -278,6 +278,9 @@
}
}
+ /** Running instance of virtmgr that hosts VirtualizationService for this VM. */
+ @NonNull private final VirtualizationService mVirtualizationService;
+
@NonNull private final MemoryManagementCallbacks mMemoryManagementCallbacks;
@NonNull private final Context mContext;
@@ -333,9 +336,6 @@
@Nullable
private Executor mCallbackExecutor;
- /* Running instance of virtmgr that hosts VirtualizationService for this VM. */
- @NonNull private VirtualizationService mVirtualizationService;
-
private static class ExtraApkSpec {
public final File apk;
public final File idsig;
diff --git a/javalib/src/android/system/virtualmachine/VirtualizationService.java b/javalib/src/android/system/virtualmachine/VirtualizationService.java
index 06ef494..75e359f 100644
--- a/javalib/src/android/system/virtualmachine/VirtualizationService.java
+++ b/javalib/src/android/system/virtualmachine/VirtualizationService.java
@@ -23,7 +23,7 @@
import com.android.internal.annotations.GuardedBy;
-import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
/** A running instance of virtmgr that is hosting a VirtualizationService AIDL service. */
class VirtualizationService {
@@ -33,7 +33,7 @@
/* Soft reference caching the last created instance of this class. */
@GuardedBy("VirtualMachineManager.sCreateLock")
- private static SoftReference<VirtualizationService> sInstance;
+ private static WeakReference<VirtualizationService> sInstance;
/*
* Client FD for UDS connection to virtmgr's RpcBinder server. Closing it
@@ -86,7 +86,7 @@
VirtualizationService service = (sInstance == null) ? null : sInstance.get();
if (service == null || !service.isOk()) {
service = new VirtualizationService();
- sInstance = new SoftReference(service);
+ sInstance = new WeakReference(service);
}
return service;
}