External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-03 20:15:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

performance-metrics: Rename queue_num to num_queues

Browse Source 
The former is ambiguous as it could be considered the ordinal (and is
used elsewhere in the codebase for that).

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-02-25 10:30:05 +00:00
parent 60d805771b
commit 5e3d72671b
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ impl Default for MetricsReport {
pub struct PerformanceTestControl {
test_timeout: u32,
test_iterations: u32,
queue_num: Option<u32>,
num_queues: Option<u32>,
queue_size: Option<u32>,
net_rx: Option<bool>,
fio_ops: Option<FioOps>,
@ -98,7 +98,7 @@ impl fmt::Display for PerformanceTestControl {
"test_time = {}s, test_iterations = {}",
self.test_timeout, self.test_iterations
);
if let Some(o) = self.queue_num {
if let Some(o) = self.num_queues {
output = format!("{}, queue_num = {}", output, o);
}
if let Some(o) = self.queue_size {
@ -120,7 +120,7 @@ impl PerformanceTestControl {
Self {
test_timeout: 10,
test_iterations: 5,
queue_num: None,
num_queues: None,
queue_size: None,
net_rx: None,
fio_ops: None,
@ -223,7 +223,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_virtio_net_throughput_bps_single_queue_rx",
func_ptr: performance_net_throughput,
control: PerformanceTestControl {
queue_num: Some(1), // used as 'queue_pairs'
num_queues: Some(1), // used as 'queue_pairs'
queue_size: Some(256),
net_rx: Some(true),
..PerformanceTestControl::default()
@ -233,7 +233,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_virtio_net_throughput_bps_single_queue_tx",
func_ptr: performance_net_throughput,
control: PerformanceTestControl {
queue_num: Some(1), // used as 'queue_pairs'
num_queues: Some(1), // used as 'queue_pairs'
queue_size: Some(256),
net_rx: Some(false),
..PerformanceTestControl::default()
@ -243,7 +243,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_virtio_net_throughput_bps_multi_queue_rx",
func_ptr: performance_net_throughput,
control: PerformanceTestControl {
queue_num: Some(2), // used as 'queue_pairs'
num_queues: Some(2), // used as 'queue_pairs'
queue_size: Some(1024),
net_rx: Some(true),
..PerformanceTestControl::default()
@ -253,7 +253,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_virtio_net_throughput_bps_multi_queue_tx",
func_ptr: performance_net_throughput,
control: PerformanceTestControl {
queue_num: Some(2), // used as 'queue_pairs'
num_queues: Some(2), // used as 'queue_pairs'
queue_size: Some(1024),
net_rx: Some(false),
..PerformanceTestControl::default()
@ -263,7 +263,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_block_io_bps_read",
func_ptr: performance_block_io,
control: PerformanceTestControl {
queue_num: Some(1),
num_queues: Some(1),
queue_size: Some(1024),
fio_ops: Some(FioOps::Read),
..PerformanceTestControl::default()
@ -273,7 +273,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_block_io_bps_write",
func_ptr: performance_block_io,
control: PerformanceTestControl {
queue_num: Some(1),
num_queues: Some(1),
queue_size: Some(1024),
fio_ops: Some(FioOps::Write),
..PerformanceTestControl::default()
@ -283,7 +283,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_block_io_bps_random_read",
func_ptr: performance_block_io,
control: PerformanceTestControl {
queue_num: Some(1),
num_queues: Some(1),
queue_size: Some(1024),
fio_ops: Some(FioOps::RandomRead),
..PerformanceTestControl::default()
@ -293,7 +293,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_block_io_bps_random_write",
func_ptr: performance_block_io,
control: PerformanceTestControl {
queue_num: Some(1),
num_queues: Some(1),
queue_size: Some(1024),
fio_ops: Some(FioOps::RandomWrite),
..PerformanceTestControl::default()
@ -303,7 +303,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_block_io_bps_multi_queue_read",
func_ptr: performance_block_io,
control: PerformanceTestControl {
queue_num: Some(2),
num_queues: Some(2),
queue_size: Some(1024),
fio_ops: Some(FioOps::Read),
..PerformanceTestControl::default()
@ -313,7 +313,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_block_io_bps_multi_queue_write",
func_ptr: performance_block_io,
control: PerformanceTestControl {
queue_num: Some(2),
num_queues: Some(2),
queue_size: Some(1024),
fio_ops: Some(FioOps::Write),
..PerformanceTestControl::default()
@ -323,7 +323,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_block_io_bps_multi_queue_random_read",
func_ptr: performance_block_io,
control: PerformanceTestControl {
queue_num: Some(2),
num_queues: Some(2),
queue_size: Some(1024),
fio_ops: Some(FioOps::RandomRead),
..PerformanceTestControl::default()
@ -333,7 +333,7 @@ const TEST_LIST: [PerformanceTest; 15] = [
name: "performance_block_io_bps_multi_queue_random_write",
func_ptr: performance_block_io,
control: PerformanceTestControl {
queue_num: Some(2),
num_queues: Some(2),
queue_size: Some(1024),
fio_ops: Some(FioOps::RandomWrite),
..PerformanceTestControl::default()

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

@ -210,7 +210,7 @@ fn measure_virtio_net_throughput(
pub fn performance_net_throughput(control: &PerformanceTestControl) -> f64 {
let test_time = control.test_timeout;
let queue_pairs = control.queue_num.unwrap();
let queue_pairs = control.num_queues.unwrap();
let queue_size = control.queue_size.unwrap();
let rx = control.net_rx.unwrap();
@ -606,7 +606,7 @@ fn parse_fio_output(output: &str, fio_ops: &FioOps, num_jobs: u32) -> Result<f64
pub fn performance_block_io(control: &PerformanceTestControl) -> f64 {
let test_time = control.test_timeout;
let queue_num = control.queue_num.unwrap();
let queue_num = control.num_queues.unwrap();
let queue_size = control.queue_size.unwrap();
let fio_ops = control.fio_ops.as_ref().unwrap();