External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-08-21 23:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

performance-metrics: Consistently rename queue_num to num_queues

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-02-25 16:49:03 +00:00 committed by Bo Chen
parent 082872423f
commit 9978aac402
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
performance-metrics/src/main.rs
View File

@ -104,7 +104,7 @@ impl fmt::Display for PerformanceTestControl {
self.test_timeout, self.test_iterations self.test_timeout, self.test_iterations
); );
if let Some(o) = self.num_queues { if let Some(o) = self.num_queues {
output = format!("{}, queue_num = {}", output, o); output = format!("{}, num_queues = {}", output, o);
} }
if let Some(o) = self.queue_size { if let Some(o) = self.queue_size {
output = format!("{}, queue_size = {}", output, o); output = format!("{}, queue_size = {}", output, o);

10
performance-metrics/src/performance_tests.rs
View File

@ -617,7 +617,7 @@ fn parse_fio_output(output: &str, fio_ops: &FioOps, num_jobs: u32) -> Result<f64
pub fn performance_block_io(control: &PerformanceTestControl) -> f64 { pub fn performance_block_io(control: &PerformanceTestControl) -> f64 {
let test_timeout = control.test_timeout; let test_timeout = control.test_timeout;
let queue_num = control.num_queues.unwrap(); let num_queues = control.num_queues.unwrap();
let queue_size = control.queue_size.unwrap(); let queue_size = control.queue_size.unwrap();
let fio_ops = control.fio_ops.as_ref().unwrap(); let fio_ops = control.fio_ops.as_ref().unwrap();
@ -632,7 +632,7 @@ pub fn performance_block_io(control: &PerformanceTestControl) -> f64 {
.to_string(); .to_string();
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(&["--cpus", &format!("boot={}", queue_num * 2)]) .args(&["--cpus", &format!("boot={}", num_queues * 2)])
.args(&["--memory", "size=4G"]) .args(&["--memory", "size=4G"])
.args(&["--kernel", direct_kernel_boot_path().to_str().unwrap()]) .args(&["--kernel", direct_kernel_boot_path().to_str().unwrap()])
.args(&["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE]) .args(&["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
@ -654,7 +654,7 @@ pub fn performance_block_io(control: &PerformanceTestControl) -> f64 {
"add-disk", "add-disk",
&format!( &format!(
"path={},num_queues={},queue_size={},direct=on", "path={},num_queues={},queue_size={},direct=on",
BLK_IO_TEST_IMG, queue_num, queue_size BLK_IO_TEST_IMG, num_queues, queue_size
) )
]) ])
.stderr(Stdio::piped()) .stderr(Stdio::piped())
@ -670,7 +670,7 @@ pub fn performance_block_io(control: &PerformanceTestControl) -> f64 {
"sudo fio --filename=/dev/vdc --name=test --output-format=json \ "sudo fio --filename=/dev/vdc --name=test --output-format=json \
--direct=1 --bs=4k --ioengine=io_uring --iodepth=64 \ --direct=1 --bs=4k --ioengine=io_uring --iodepth=64 \
--rw={} --runtime={} --numjobs={}", --rw={} --runtime={} --numjobs={}",
fio_ops, test_timeout, queue_num fio_ops, test_timeout, num_queues
); );
let output = guest let output = guest
.ssh_command(&fio_command) .ssh_command(&fio_command)
@ -678,7 +678,7 @@ pub fn performance_block_io(control: &PerformanceTestControl) -> f64 {
.unwrap(); .unwrap();
// Parse fio output // Parse fio output
parse_fio_output(&output, fio_ops, queue_num).unwrap() parse_fio_output(&output, fio_ops, num_queues).unwrap()
}); });
let _ = child.kill(); let _ = child.kill();