Implement collecting VmStatus in microdroid_manager
Bug: 236253808
Test: Manually run statsd_testdrive 512 while running atest MicrodroidTestCase#testTelemetryPushedAtoms
Change-Id: I55ebb75f93943a3095f27c74fcef577a1d054865
diff --git a/virtualizationservice/src/atom.rs b/virtualizationservice/src/atom.rs
index eabb4cc..8c46ac5 100644
--- a/virtualizationservice/src/atom.rs
+++ b/virtualizationservice/src/atom.rs
@@ -22,11 +22,17 @@
VirtualMachineConfig::VirtualMachineConfig,
};
use android_system_virtualizationservice::binder::{Status, Strong};
+use android_system_virtualmachineservice::aidl::android::system::virtualmachineservice::{
+ VirtualMachineCpuStatus::VirtualMachineCpuStatus,
+ VirtualMachineMemStatus::VirtualMachineMemStatus,
+};
use anyhow::{anyhow, Result};
use binder::{ParcelFileDescriptor, ThreadState};
use log::{trace, warn};
use microdroid_payload_config::VmPayloadConfig;
-use statslog_virtualization_rust::{vm_booted, vm_creation_requested, vm_exited};
+use statslog_virtualization_rust::{
+ vm_booted, vm_cpu_status_reported, vm_creation_requested, vm_exited, vm_mem_status_reported,
+};
use std::time::{Duration, SystemTime};
use zip::ZipArchive;
@@ -206,3 +212,48 @@
Ok(_) => trace!("statslog_rust succeeded for virtualization service"),
}
}
+
+/// Write the stats of VM cpu status to statsd
+pub fn write_vm_cpu_status_stats(
+ uid: i32,
+ vm_identifier: &String,
+ cpu_status: &VirtualMachineCpuStatus,
+) {
+ let vm_cpu_status_reported = vm_cpu_status_reported::VmCpuStatusReported {
+ uid,
+ vm_identifier,
+ cpu_time_user_millis: cpu_status.cpu_time_user,
+ cpu_time_nice_millis: cpu_status.cpu_time_nice,
+ cpu_time_sys_millis: cpu_status.cpu_time_sys,
+ cpu_time_idle_millis: cpu_status.cpu_time_idle,
+ };
+ match vm_cpu_status_reported.stats_write() {
+ Err(e) => {
+ warn!("statslog_rust failed with error: {}", e);
+ }
+ Ok(_) => trace!("statslog_rust succeeded for virtualization service"),
+ }
+}
+
+/// Write the stats of VM memory status to statsd
+pub fn write_vm_mem_status_stats(
+ uid: i32,
+ vm_identifier: &String,
+ mem_status: &VirtualMachineMemStatus,
+) {
+ let vm_mem_status_reported = vm_mem_status_reported::VmMemStatusReported {
+ uid,
+ vm_identifier,
+ mem_total_kb: mem_status.mem_total,
+ mem_free_kb: mem_status.mem_free,
+ mem_available_kb: mem_status.mem_available,
+ mem_buffer_kb: mem_status.mem_buffer,
+ mem_cached_kb: mem_status.mem_cached,
+ };
+ match vm_mem_status_reported.stats_write() {
+ Err(e) => {
+ warn!("statslog_rust failed with error: {}", e);
+ }
+ Ok(_) => trace!("statslog_rust succeeded for virtualization service"),
+ }
+}