Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate warnings in FairLink and FairMQ Plugins.

Browse Source
This commit is contained in:
Alexey Rybalchenko
2017-09-11 14:50:48 +02:00
committed by Mohammad Al-Turany
parent f6365d013e
commit 2db114bc5c
16 changed files with 117 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
fairmq/options/FairMQSuboptParser.cxx
View File

@@ -24,47 +24,56 @@ constexpr const char* SUBOPT::channelOptionKeys[];
FairMQMap SUBOPT::UserParser(const po::variables_map& omap, const std::string& deviceId, const std::string& rootNode)
{
std::string nodeKey = rootNode + ".device";
ptree pt;
std::string nodeKey = rootNode + ".device";
ptree pt;
pt.put(nodeKey + ".id", deviceId.c_str());
nodeKey += ".channels";
pt.put(nodeKey + ".id", deviceId.c_str());
nodeKey += ".channels";
// parsing of channel properties is the only implemented method right now
if (omap.count(OptionKeyChannelConfig) > 0) {
std::map<std::string, ptree> channelProperties;
auto tokens = omap[OptionKeyChannelConfig].as<std::vector<std::string>>();
for (auto token : tokens) {
std::map<std::string, ptree>::iterator channelProperty = channelProperties.end();
ptree socketProperty;
std::string channelName;
std::string argString(token);
char* subopts = &argString[0];
char* value = nullptr;
while (subopts && *subopts != 0 && *subopts != ' ') {
char* saved = subopts;
int subopt=getsubopt(&subopts, (char**)channelOptionKeys, &value);
if (subopt == NAME) {
channelName = value;
channelProperties[channelName].put("name", channelName);
} else
if (subopt>=0 && value != nullptr) {
socketProperty.put(channelOptionKeys[subopt], value);
// parsing of channel properties is the only implemented method right now
if (omap.count(OptionKeyChannelConfig) > 0)
{
std::map<std::string, ptree> channelProperties;
auto tokens = omap[OptionKeyChannelConfig].as<std::vector<std::string>>();
for (auto token : tokens)
{
// std::map<std::string, ptree>::iterator channelProperty = channelProperties.end();
ptree socketProperty;
std::string channelName;
std::string argString(token);
char* subopts = &argString[0];
char* value = nullptr;
while (subopts && *subopts != 0 && *subopts != ' ')
{
// char* saved = subopts;
int subopt=getsubopt(&subopts, (char**)channelOptionKeys, &value);
if (subopt == NAME)
{
channelName = value;
channelProperties[channelName].put("name", channelName);
}
else if (subopt>=0 && value != nullptr)
{
socketProperty.put(channelOptionKeys[subopt], value);
}
}
if (channelName != "")
{
channelProperties[channelName].add_child("sockets.socket", socketProperty);
}
else
{
// TODO: what is the error policy here, should we abort?
LOG(ERROR) << "missing channel name in argument of option --channel-config";
}
}
for (auto channelProperty : channelProperties)
{
pt.add_child(nodeKey + ".channel", channelProperty.second);
}
}
if (channelName != "") {
channelProperties[channelName].add_child("sockets.socket", socketProperty);
} else {
// TODO: what is the error policy here, should we abort?
LOG(ERROR) << "missing channel name in argument of option --channel-config";
}
}
for (auto channelProperty : channelProperties) {
pt.add_child(nodeKey + ".channel", channelProperty.second);
}
}
return ptreeToMQMap(pt, deviceId, rootNode);
return ptreeToMQMap(pt, deviceId, rootNode);
}
} // namespace FairMQMap
} // namespace FairMQParser