[dice] Optimize iteration handling in dice::execute_steps
To avoid unnecessary vector collect in the process.
Bug: 267575445
Test: atest diced_utils_test diced_sample_inputs_test \
diced_test diced_vendor_test
Change-Id: I5b78dad7394e6ca88e238ef5806dd574da083657
diff --git a/diced/src/diced_client_test.rs b/diced/src/diced_client_test.rs
index 3915508..f579a4e 100644
--- a/diced/src/diced_client_test.rs
+++ b/diced/src/diced_client_test.rs
@@ -52,11 +52,7 @@
diced_utils::ResidentArtifacts::new(&former.cdiAttest, &former.cdiSeal, &former.bcc.data)
.unwrap();
- let input_values: Vec<diced_utils::InputValues> =
- input_values.iter().map(|v| v.into()).collect();
-
- let artifacts =
- artifacts.execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues)).unwrap();
+ let artifacts = artifacts.execute_steps(input_values.iter()).unwrap();
let (cdi_attest, cdi_seal, bcc) = artifacts.into_tuple();
let from_former = diced_utils::make_bcc_handover(
cdi_attest[..].try_into().unwrap(),
@@ -96,11 +92,7 @@
)
.unwrap();
- let input_values: Vec<diced_utils::InputValues> =
- input_values.iter().map(|v| v.into()).collect();
-
- let artifacts =
- artifacts.execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues)).unwrap();
+ let artifacts = artifacts.execute_steps(input_values.iter()).unwrap();
let (cdi_attest, cdi_seal, bcc) = artifacts.into_tuple();
let from_former = diced_utils::make_bcc_handover(
cdi_attest[..].try_into().unwrap(),
@@ -160,11 +152,8 @@
.unwrap();
let client = [client];
- let input_values: Vec<diced_utils::InputValues> =
- input_values.iter().chain(client.iter()).map(|v| v.into()).collect();
- let artifacts =
- artifacts.execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues)).unwrap();
+ let artifacts = artifacts.execute_steps(input_values.iter().chain(client.iter())).unwrap();
let (cdi_attest, cdi_seal, bcc) = artifacts.into_tuple();
let from_former = diced_utils::make_bcc_handover(
cdi_attest[..].try_into().unwrap(),
diff --git a/diced/src/hal_node.rs b/diced/src/hal_node.rs
index 69cf4ac..d2e8b0c 100644
--- a/diced/src/hal_node.rs
+++ b/diced/src/hal_node.rs
@@ -187,10 +187,8 @@
// `ResidentHal::new`
run_forked(move || {
let artifacts = artifacts.with_artifacts(|a| ResidentArtifacts::new_from(a))?;
- let input_values: Vec<utils::InputValues> =
- input_values.iter().map(|v| v.into()).collect();
let artifacts = artifacts
- .execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues))
+ .execute_steps(input_values)
.context("In ResidentHal::get_effective_artifacts:")?;
f(artifacts)
})
@@ -279,11 +277,8 @@
*artifacts = run_forked(|| {
let new_artifacts =
artifacts_clone.with_artifacts(|a| ResidentArtifacts::new_from(a))?;
- let input_values: Vec<utils::InputValues> =
- input_values.iter().map(|v| v.into()).collect();
-
let new_artifacts = new_artifacts
- .execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues))
+ .execute_steps(input_values)
.context("In ResidentHal::get_effective_artifacts:")?;
artifacts_clone.update(&new_artifacts)
})?;
@@ -414,11 +409,7 @@
make_input_values("component 2 code", "component 2", "component 2 authority")?,
make_input_values("component 3 code", "component 3", "component 3 authority")?,
];
-
- let input_values: Vec<utils::InputValues> = input_values.iter().map(|v| v.into()).collect();
-
- let new_artifacts =
- artifacts.execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues))?;
+ let new_artifacts = artifacts.execute_steps(input_values)?;
let result = utils::make_bcc_handover(
new_artifacts.cdi_attest(),
diff --git a/diced/src/resident_node.rs b/diced/src/resident_node.rs
index 99a6dc9..0bd5d0d 100644
--- a/diced/src/resident_node.rs
+++ b/diced/src/resident_node.rs
@@ -24,7 +24,7 @@
use anyhow::{Context, Result};
use dice::{ContextImpl, OpenDiceCborContext};
use diced_open_dice_cbor as dice;
-use diced_utils::{self as utils, InputValues, ResidentArtifacts};
+use diced_utils::{self as utils, ResidentArtifacts};
use std::collections::HashMap;
use std::convert::TryInto;
use std::sync::RwLock;
@@ -61,17 +61,12 @@
let client_arr = [client];
- let input_values: Vec<utils::InputValues> = demotion_db
+ let input_values = demotion_db
.get(&client_arr[0])
.map(|v| v.iter())
.unwrap_or_else(|| client_arr.iter())
- .chain(input_values.iter())
- .map(|v| v.into())
- .collect();
-
- artifacts
- .execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues))
- .context("In get_effective_artifacts:")
+ .chain(input_values.iter());
+ artifacts.execute_steps(input_values).context("In get_effective_artifacts:")
}
}
@@ -173,18 +168,10 @@
fn demote_self(&self, input_values: &[BinderInputValues]) -> Result<()> {
let mut artifacts = self.artifacts.write().unwrap();
- let input_values = input_values
- .iter()
- .map(|v| {
- v.try_into().with_context(|| format!("Failed to convert input values: {:#?}", v))
- })
- .collect::<Result<Vec<InputValues>>>()
- .context("In ResidentNode::demote_self:")?;
-
*artifacts = artifacts
.try_clone()
.context("In ResidentNode::demote_self: Failed to clone resident artifacts")?
- .execute_steps(input_values.iter().map(|v| v as &dyn dice::InputValues))
+ .execute_steps(input_values)
.context("In ResidentNode::demote_self:")?;
Ok(())
}
diff --git a/diced/src/utils.rs b/diced/src/utils.rs
index 3cb4ba2..da39f8f 100644
--- a/diced/src/utils.rs
+++ b/diced/src/utils.rs
@@ -153,7 +153,7 @@
(cdi_attest, cdi_seal, bcc)
}
- fn execute_step(self, input_values: &dyn dice::InputValues) -> Result<Self> {
+ fn execute_step(self, input_values: InputValues) -> Result<Self> {
let ResidentArtifacts { cdi_attest, cdi_seal, bcc } = self;
let (cdi_attest, cdi_seal, bcc) = dice::OpenDiceCborContext::new()
@@ -165,7 +165,7 @@
format!("Trying to convert cdi_seal. (length: {})", cdi_seal.len())
})?,
&bcc,
- input_values,
+ &input_values,
)
.context("In ResidentArtifacts::execute_step:")?;
Ok(ResidentArtifacts { cdi_attest, cdi_seal, bcc })
@@ -173,13 +173,14 @@
/// Iterate through the iterator of dice input values performing one
/// BCC main flow step on each element.
- pub fn execute_steps<'a, Iter>(self, input_values: Iter) -> Result<Self>
+ pub fn execute_steps<'a, T, I>(self, input_values: I) -> Result<Self>
where
- Iter: IntoIterator<Item = &'a dyn dice::InputValues>,
+ T: Into<InputValues<'a>>,
+ I: IntoIterator<Item = T>,
{
input_values
.into_iter()
- .try_fold(self, |acc, input_values| acc.execute_step(input_values))
+ .try_fold(self, |acc, input| acc.execute_step(input.into()))
.context("In ResidentArtifacts::execute_step:")
}
}