Skip to content

DPL: when updating params provenance, check if the iterator is not at the end #16088

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
aalkin wants to merge 1 commit into
base: dev
Choose a base branch
from
+5 −10
Open

DPL: when updating params provenance, check if the iterator is not at the end #16088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 5 additions & 10 deletions Common/Utils/src/ConfigurableParamHelper.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,17 +494,14 @@ void _ParamHelper::syncCCDBandRegistry(const std::string& mainkey, TClass* cl, v
// check current provenance
auto key = mainkey + "." + name;
auto proviter = provmap->find(key);
bool isRT = proviter != provmap->end() && proviter->second == ConfigurableParam::EParamProvenance::kRT;
if (isRT) {
return;
}
// lambda to update the provenance
auto updateProv = [&proviter]() {
if (proviter != provmap->end()) {
if (proviter->second == ConfigurableParam::EParamProvenance::kRT) {
return;
}
proviter->second = ConfigurableParam::EParamProvenance::kCCDB;
};
}

if (isContainer(*dm)) {
updateProv();
ConfigurableParam::assignRegisteredContainer(getContainerTypeName(*dm), pointerto, pointerfrom);
return;
}
Expand All @@ -514,15 +511,13 @@ void _ParamHelper::syncCCDBandRegistry(const std::string& mainkey, TClass* cl, v
std::string& target = *(std::string*)pointerto;
std::string const& origin = *(std::string*)pointerfrom;
// if (target.compare(origin) != 0) {
updateProv();
target = origin;
// }
return;
}

//
// if (!isMemblockDifferent(pointerto, pointerfrom, TS)) {
updateProv();
// actually copy
std::memcpy(pointerto, pointerfrom, getSizeOfUnderlyingType(*dm));
// }
Expand Down
Loading