Skip to content

Ticket8445 make config xml single source of truth #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LowriJenkins wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Ticket8445 make config xml single source of truth #11

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6638edc
Add initial defaults loading method
LowriJenkins Sep 8, 2025
4eac8ef
Pull out loadDefaultMacros Function
LowriJenkins Sep 8, 2025
5eab56f
update filepaths
LowriJenkins Sep 12, 2025
a697d44
Remove checking for empty set's as macro's using defaults are no long…
LowriJenkins Sep 16, 2025
16f02e9
Missed removign line from previous commit
LowriJenkins Sep 18, 2025
ef2181d
Fix defaults overwriding set value
LowriJenkins Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 37 additions & 13 deletions icpconfigApp/src/icpconfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ struct PVSetItem
};

static std::map<std::string,PVSetItem> pvset_map;
static bool defaultsSet = false;

struct MacroItem
{
Expand Down Expand Up @@ -565,6 +566,34 @@ epicsShareExtern void icpconfigGetMacros(const std::string& iocName, const std::
}
}

static int loadDefaultMacros(MAC_HANDLE *h, const std::string& config_name){
pugi::xml_document confXMLDoc;
std::string configXMLDir = std::string(macEnvExpand("$(IOC)")) +"/config.xml";
std::string confXML = std::string(macEnvExpand("$(TOP)")) +"/iocBoot/" + configXMLDir;
pugi::xml_parse_result result = confXMLDoc.load_file(confXML.c_str());
if (!result)
{
std::cerr << "icpconfigLoad: Error in \"" << confXML << "\" " << result.description() << " at offset " << result.offset << std::endl;
return -1;
}
pugi::xpath_node_set default_macros = confXMLDoc.select_nodes("/ioc_config/config_part/macros/macro");
default_macros.sort(); // forward document order
if (!quiet)
{
printf("icpconfigLoad: Checking %d macro(s) for default values in %s\n", (int)default_macros.size(), confXML.c_str());
}
for (pugi::xpath_node_set::const_iterator it = default_macros.begin(); it != default_macros.end(); ++it)
{
if (it->node().attribute("hasDefault").as_bool()) {
std::string name = it->node().attribute("name").value();
std::string value = it->node().attribute("defaultValue").value();
setValue(h, name.c_str(), value.c_str(), configXMLDir.c_str());
}
}
defaultsSet = true;
return 0;
}

static int loadIOCs(MAC_HANDLE *h, const std::string& config_name, const std::string& config_root, const std::string& ioc_name, const std::string& ioc_group, bool warn_if_not_found, bool filter, bool verbose)
{
pugi::xml_document doc;
Expand All @@ -575,24 +604,19 @@ static int loadIOCs(MAC_HANDLE *h, const std::string& config_name, const std::st
std::cerr << "icpconfigLoad: Error in \"" << xfile << "\" " << result.description() << " at offset " << result.offset << std::endl;
return -1;
}

pugi::xpath_variable_set vars;
vars.add("iocname", pugi::xpath_type_string);
vars.add("iocgroup", pugi::xpath_type_string);
vars.set("iocname",ioc_name.c_str());
vars.set("iocgroup",ioc_group.c_str());
// default macros
if (!quiet)
{
printf("icpconfigLoad: Loading default macros for \"%s\"\n", config_name.c_str());
}
pugi::xpath_node_set default_macros = doc.select_nodes("/iocs/defaults/macros/macro");
default_macros.sort(); // forward document order
for (pugi::xpath_node_set::const_iterator it = default_macros.begin(); it != default_macros.end(); ++it)
{
std::string name = it->node().attribute("name").value();
std::string value = it->node().attribute("value").value();
setValue(h, name.c_str(), value.c_str(), config_name.c_str());
// default macros but only if they aren't already loaded, this prevents overwrites
if(!defaultsSet){
if (loadDefaultMacros(h, config_name)) {
return -1;
}
}

// ioc sim level
if (!quiet)
{
Expand Down Expand Up @@ -645,7 +669,7 @@ static int loadIOCs(MAC_HANDLE *h, const std::string& config_name, const std::st
{
std::string name = it->node().attribute("name").value();
std::string value = it->node().attribute("value").value();
setValue(h, name.c_str(), value.c_str(), config_name.c_str());
setValue(h, name.c_str(), value.c_str(), config_name.c_str());
}
// ioc pvs
if (!quiet)
Expand Down