StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aconfig: add namespace field to flag_declaration and parsed_flag

Browse Source 
Add a new field to the proto messages flag_declaration and parsed_flag.

The new field will be used verbatim as a parameter when calling
DeviceConfig.getBoolean to read the value of a READ_WRITE flag. See the
DeviceConfig API for more info.

Note: not to be confused with the old namespace field, which has been
renamed to package.

Bug: 285211724
Test: atest aconfig.test
Change-Id: I2181be7b5e98fc334e5277fb5f7e386f1fe0b550
This commit is contained in:
Mårten Kongstad
2023-06-07 16:29:25 +02:00
parent fbd71e2773
commit 066575b95f
12 changed files with 144 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tools/aconfig/src/codegen_cpp.rs
View File

@@ -24,14 +24,20 @@ use crate::codegen;
use crate::commands::OutputFile;
pub fn generate_cpp_code(cache: &Cache) -> Result<OutputFile> {
let class_elements: Vec<ClassElement> = cache.iter().map(create_class_element).collect();
let package = cache.package();
let class_elements: Vec<ClassElement> =
cache.iter().map(|item| create_class_element(package, item)).collect();
let readwrite = class_elements.iter().any(|item| item.readwrite);
let package = cache.package().to_string();
let header = package.replace('.', "_");
let cpp_namespace = package.replace('.', "::");
ensure!(codegen::is_valid_name_ident(&header));
let context =
Context { header: header.clone(), cpp_namespace, package, readwrite, class_elements };
let context = Context {
header: header.clone(),
cpp_namespace,
package: package.to_string(),
readwrite,
class_elements,
};
let mut template = TinyTemplate::new();
template.add_template("cpp_code_gen", include_str!("../templates/cpp.template"))?;
let contents = template.render("cpp_code_gen", &context)?;
@@ -53,9 +59,11 @@ struct ClassElement {
pub readwrite: bool,
pub default_value: String,
pub flag_name: String,
pub device_config_namespace: String,
pub device_config_flag: String,
}
fn create_class_element(item: &Item) -> ClassElement {
fn create_class_element(package: &str, item: &Item) -> ClassElement {
ClassElement {
readwrite: item.permission == Permission::ReadWrite,
default_value: if item.state == FlagState::Enabled {
@@ -64,6 +72,9 @@ fn create_class_element(item: &Item) -> ClassElement {
"false".to_string()
},
flag_name: item.name.clone(),
device_config_namespace: item.namespace.to_string(),
device_config_flag: codegen::create_device_config_ident(package, &item.name)
.expect("values checked at cache creation time"),
}
}
@@ -83,6 +94,7 @@ mod tests {
Source::File("aconfig_one.txt".to_string()),
FlagDeclaration {
name: "my_flag_one".to_string(),
namespace: "ns".to_string(),
description: "buildtime disable".to_string(),
},
)
@@ -101,6 +113,7 @@ mod tests {
Source::File("aconfig_two.txt".to_string()),
FlagDeclaration {
name: "my_flag_two".to_string(),
namespace: "ns".to_string(),
description: "buildtime enable".to_string(),
},
)
@@ -155,6 +168,7 @@ mod tests {
Source::File("aconfig_one.txt".to_string()),
FlagDeclaration {
name: "my_flag_one".to_string(),
namespace: "ns".to_string(),
description: "buildtime disable".to_string(),
},
)
@@ -163,6 +177,7 @@ mod tests {
Source::File("aconfig_two.txt".to_string()),
FlagDeclaration {
name: "my_flag_two".to_string(),
namespace: "ns".to_string(),
description: "runtime enable".to_string(),
},
)
@@ -190,8 +205,8 @@ mod tests {
public:
virtual const bool value() {
return GetServerConfigurableFlag(
"com.example",
"my_flag_one",
"ns",
"com.example.my_flag_one",
"false") == "true";
}
}
@@ -200,8 +215,8 @@ mod tests {
public:
virtual const bool value() {
return GetServerConfigurableFlag(
"com.example",
"my_flag_two",
"ns",
"com.example.my_flag_two",
"true") == "true";
}
}