mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-13 16:46:47 +00:00
enable object array parsing in JSON parser for devices, channels, and sockets.
device, channel, and socket are parsed as before
This commit is contained in:
winckler
parent
819a21f46a
commit
8df656a302
|
|
@ -28,129 +28,9 @@ FairMQMap ptreeToMQMap(const boost::property_tree::ptree& pt, const string& devi
|
||||||
{
|
{
|
||||||
// Create fair mq map
|
// Create fair mq map
|
||||||
FairMQMap channelMap;
|
FairMQMap channelMap;
|
||||||
|
helper::PrintDeviceList(pt.get_child(rootNode));
|
||||||
// variables to create key for the mq map. Note: maybe device name and id useless here
|
|
||||||
string deviceIdKey;
|
|
||||||
string channelKey;
|
|
||||||
|
|
||||||
// do a first loop just to print the device-id in xml/json input
|
|
||||||
for(const auto& p : pt.get_child(rootNode))
|
|
||||||
{
|
|
||||||
if (p.first != "device")
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
//get id attribute to choose the device
|
|
||||||
if (formatFlag == "xml")
|
|
||||||
{
|
|
||||||
deviceIdKey = p.second.get<string>("<xmlattr>.id");
|
|
||||||
LOG(DEBUG) << "Found device id '" << deviceIdKey << "' in XML input";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (formatFlag == "json")
|
|
||||||
{
|
|
||||||
deviceIdKey = p.second.get<string>("id");
|
|
||||||
LOG(DEBUG) << "Found device id '"<< deviceIdKey << "' in JSON input";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract value from boost::property_tree
|
// Extract value from boost::property_tree
|
||||||
// For each device in fairMQOptions
|
helper::DeviceParser(pt.get_child(rootNode),channelMap,deviceId,formatFlag);
|
||||||
for(const auto& p : pt.get_child(rootNode))
|
|
||||||
{
|
|
||||||
if (p.first != "device")
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
//get id attribute to choose the device
|
|
||||||
if (formatFlag == "xml")
|
|
||||||
{
|
|
||||||
deviceIdKey = p.second.get<string>("<xmlattr>.id");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (formatFlag == "json")
|
|
||||||
{
|
|
||||||
deviceIdKey = p.second.get<string>("id");
|
|
||||||
}
|
|
||||||
|
|
||||||
// if not correct device id, do not fill MQMap
|
|
||||||
if (deviceId != deviceIdKey)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// print if DEBUG log level set
|
|
||||||
stringstream deviceStream;
|
|
||||||
deviceStream << "[node = " << p.first << "] id = " << deviceIdKey;
|
|
||||||
LOG(DEBUG) << deviceStream.str();
|
|
||||||
|
|
||||||
// for each channel in device
|
|
||||||
for(const auto& q : p.second.get_child(""))
|
|
||||||
{
|
|
||||||
if (q.first != "channel")
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// get name attribute to form key
|
|
||||||
if (formatFlag == "xml")
|
|
||||||
{
|
|
||||||
channelKey = q.second.get<string>("<xmlattr>.name");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (formatFlag == "json")
|
|
||||||
{
|
|
||||||
channelKey = q.second.get<string>("name");
|
|
||||||
}
|
|
||||||
|
|
||||||
// print if DEBUG log level set
|
|
||||||
stringstream channelStream;
|
|
||||||
channelStream << "\t [node = " << q.first << "] name = " << channelKey;
|
|
||||||
LOG(DEBUG) << channelStream.str();
|
|
||||||
|
|
||||||
// temporary FairMQChannel container
|
|
||||||
vector<FairMQChannel> channelList;
|
|
||||||
|
|
||||||
int socketCounter = 0;
|
|
||||||
// for each socket in channel
|
|
||||||
for (const auto& r : q.second.get_child(""))
|
|
||||||
{
|
|
||||||
if (r.first != "socket")
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
++socketCounter;
|
|
||||||
FairMQChannel channel;
|
|
||||||
|
|
||||||
// print if DEBUG log level set
|
|
||||||
stringstream socket;
|
|
||||||
socket << "\t \t [node = " << r.first << "] socket index = " << socketCounter;
|
|
||||||
LOG(DEBUG) << socket.str();
|
|
||||||
LOG(DEBUG) << "\t \t \t type = " << r.second.get<string>("type", channel.GetType());
|
|
||||||
LOG(DEBUG) << "\t \t \t method = " << r.second.get<string>("method", channel.GetMethod());
|
|
||||||
LOG(DEBUG) << "\t \t \t address = " << r.second.get<string>("address", channel.GetAddress());
|
|
||||||
LOG(DEBUG) << "\t \t \t sndBufSize = " << r.second.get<int>("sndBufSize", channel.GetSndBufSize());
|
|
||||||
LOG(DEBUG) << "\t \t \t rcvBufSize = " << r.second.get<int>("rcvBufSize", channel.GetRcvBufSize());
|
|
||||||
LOG(DEBUG) << "\t \t \t rateLogging = " << r.second.get<int>("rateLogging", channel.GetRateLogging());
|
|
||||||
|
|
||||||
channel.UpdateType(r.second.get<string>("type", channel.GetType()));
|
|
||||||
channel.UpdateMethod(r.second.get<string>("method", channel.GetMethod()));
|
|
||||||
channel.UpdateAddress(r.second.get<string>("address", channel.GetAddress()));
|
|
||||||
channel.UpdateSndBufSize(r.second.get<int>("sndBufSize", channel.GetSndBufSize())); // int
|
|
||||||
channel.UpdateRcvBufSize(r.second.get<int>("rcvBufSize", channel.GetRcvBufSize())); // int
|
|
||||||
channel.UpdateRateLogging(r.second.get<int>("rateLogging", channel.GetRateLogging())); // int
|
|
||||||
|
|
||||||
channelList.push_back(channel);
|
|
||||||
}// end socket loop
|
|
||||||
|
|
||||||
//fill mq map option
|
|
||||||
channelMap.insert(make_pair(channelKey, move(channelList)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (channelMap.size() > 0)
|
if (channelMap.size() > 0)
|
||||||
{
|
{
|
||||||
LOG(DEBUG) << "---- Channel-keys found are :";
|
LOG(DEBUG) << "---- Channel-keys found are :";
|
||||||
|
|
@ -162,24 +42,25 @@ FairMQMap ptreeToMQMap(const boost::property_tree::ptree& pt, const string& devi
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LOG(WARN) << "---- No channel-keys found for device-id " << deviceId;
|
LOG(WARN) << "---- No channel-keys found for device-id " << deviceId;
|
||||||
LOG(WARN) << "---- Check the "<< formatFlag << " inputs and/or command line inputs";
|
LOG(WARN) << "---- Check the JSON inputs and/or command line inputs";
|
||||||
}
|
}
|
||||||
|
|
||||||
return channelMap;
|
return channelMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
FairMQMap JSON::UserParser(const string& filename, const string& deviceId, const string& rootNode)
|
FairMQMap JSON::UserParser(const string& filename, const string& deviceId, const string& rootNode)
|
||||||
{
|
{
|
||||||
boost::property_tree::ptree pt;
|
boost::property_tree::ptree pt;
|
||||||
boost::property_tree::read_json(filename, pt);
|
boost::property_tree::read_json(filename, pt);
|
||||||
return ptreeToMQMap(pt, deviceId, rootNode,"json");
|
return ptreeToMQMap(pt, deviceId, rootNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
FairMQMap JSON::UserParser(stringstream& input, const string& deviceId, const string& rootNode)
|
FairMQMap JSON::UserParser(stringstream& input, const string& deviceId, const string& rootNode)
|
||||||
{
|
{
|
||||||
boost::property_tree::ptree pt;
|
boost::property_tree::ptree pt;
|
||||||
boost::property_tree::read_json(input, pt);
|
boost::property_tree::read_json(input, pt);
|
||||||
return ptreeToMQMap(pt, deviceId, rootNode,"json");
|
return ptreeToMQMap(pt, deviceId, rootNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
FairMQMap XML::UserParser(const string& filename, const string& deviceId, const string& rootNode)
|
FairMQMap XML::UserParser(const string& filename, const string& deviceId, const string& rootNode)
|
||||||
|
|
@ -196,4 +77,233 @@ FairMQMap XML::UserParser(stringstream& input, const string& deviceId, const str
|
||||||
return ptreeToMQMap(pt, deviceId, rootNode, "xml");
|
return ptreeToMQMap(pt, deviceId, rootNode, "xml");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// /////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
// -----------------------------------------------------------------------------------------
|
||||||
|
namespace helper
|
||||||
|
{
|
||||||
|
// -----------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
void PrintDeviceList(const boost::property_tree::ptree& tree, const std::string& formatFlag)
|
||||||
|
{
|
||||||
|
string deviceIdKey;
|
||||||
|
|
||||||
|
// do a first loop just to print the device-id in json input
|
||||||
|
for(const auto& p : tree)
|
||||||
|
{
|
||||||
|
if (p.first == "devices")
|
||||||
|
{
|
||||||
|
for(const auto& q : p.second.get_child(""))
|
||||||
|
{
|
||||||
|
deviceIdKey = q.second.get<string>("id");
|
||||||
|
LOG(DEBUG) << "Found device id '" << deviceIdKey << "' in JSON input";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p.first == "device")
|
||||||
|
{
|
||||||
|
//get id attribute to choose the device
|
||||||
|
if (formatFlag == "xml")
|
||||||
|
{
|
||||||
|
deviceIdKey = p.second.get<string>("<xmlattr>.id");
|
||||||
|
LOG(DEBUG) << "Found device id '" << deviceIdKey << "' in XML input";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (formatFlag == "json")
|
||||||
|
{
|
||||||
|
deviceIdKey = p.second.get<string>("id");
|
||||||
|
LOG(DEBUG) << "Found device id '"<< deviceIdKey << "' in JSON input";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
void DeviceParser(const boost::property_tree::ptree& tree, FairMQMap& channelMap, const string& deviceId, const string& formatFlag)
|
||||||
|
{
|
||||||
|
string deviceIdKey;
|
||||||
|
// For each node in fairMQOptions
|
||||||
|
for(const auto& p0 : tree)
|
||||||
|
{
|
||||||
|
if (p0.first == "devices")
|
||||||
|
{
|
||||||
|
for(const auto& p : p0.second)
|
||||||
|
{
|
||||||
|
deviceIdKey = p.second.get<string>("id");
|
||||||
|
LOG(TRACE) << "Found device id '"<< deviceIdKey << "' in JSON input";
|
||||||
|
|
||||||
|
// if not correct device id, do not fill MQMap
|
||||||
|
if (deviceId != deviceIdKey)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// print if DEBUG log level set
|
||||||
|
stringstream deviceStream;
|
||||||
|
deviceStream << "[node = " << p.first << "] id = " << deviceIdKey;
|
||||||
|
LOG(DEBUG) << deviceStream.str();
|
||||||
|
helper::ChannelParser(p.second,channelMap,formatFlag);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p0.first == "device")
|
||||||
|
{
|
||||||
|
|
||||||
|
if (formatFlag == "xml")
|
||||||
|
{
|
||||||
|
deviceIdKey = p0.second.get<string>("<xmlattr>.id");
|
||||||
|
LOG(DEBUG) << "Found device id '" << deviceIdKey << "' in XML input";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (formatFlag == "json")
|
||||||
|
{
|
||||||
|
deviceIdKey = p0.second.get<string>("id");
|
||||||
|
LOG(DEBUG) << "Found device id '"<< deviceIdKey << "' in JSON input";
|
||||||
|
}
|
||||||
|
|
||||||
|
// if not correct device id, do not fill MQMap
|
||||||
|
if (deviceId != deviceIdKey)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// print if DEBUG log level set
|
||||||
|
stringstream deviceStream;
|
||||||
|
deviceStream << "[node = " << p0.first << "] id = " << deviceIdKey;
|
||||||
|
LOG(DEBUG) << deviceStream.str();
|
||||||
|
helper::ChannelParser(p0.second,channelMap,formatFlag);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
void ChannelParser(const boost::property_tree::ptree& tree, FairMQMap& channelMap, const string& formatFlag)
|
||||||
|
{
|
||||||
|
string channelKey;
|
||||||
|
for(const auto& p : tree)
|
||||||
|
{
|
||||||
|
if(p.first=="channels")
|
||||||
|
{
|
||||||
|
for(const auto& q : p.second)
|
||||||
|
{
|
||||||
|
channelKey = q.second.get<string>("name");
|
||||||
|
|
||||||
|
// print if DEBUG log level set
|
||||||
|
stringstream channelStream;
|
||||||
|
channelStream << "\t [node = " << p.first << "] name = " << channelKey;
|
||||||
|
LOG(DEBUG) << channelStream.str();
|
||||||
|
|
||||||
|
// temporary FairMQChannel container
|
||||||
|
vector<FairMQChannel> channelList;
|
||||||
|
helper::SocketParser(q.second.get_child(""),channelList);
|
||||||
|
|
||||||
|
//fill mq map option
|
||||||
|
channelMap.insert(make_pair(channelKey, move(channelList)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(p.first=="channel")
|
||||||
|
{
|
||||||
|
|
||||||
|
// get name attribute to form key
|
||||||
|
if (formatFlag == "xml")
|
||||||
|
{
|
||||||
|
channelKey = p.second.get<string>("<xmlattr>.name");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (formatFlag == "json")
|
||||||
|
{
|
||||||
|
channelKey = p.second.get<string>("name");
|
||||||
|
}
|
||||||
|
|
||||||
|
stringstream channelStream;
|
||||||
|
channelStream << "\t [node = " << p.first << "] name = " << channelKey;
|
||||||
|
LOG(DEBUG) << channelStream.str();
|
||||||
|
|
||||||
|
// temporary FairMQChannel container
|
||||||
|
vector<FairMQChannel> channelList;
|
||||||
|
helper::SocketParser(p.second.get_child(""),channelList);
|
||||||
|
|
||||||
|
//fill mq map option
|
||||||
|
channelMap.insert(make_pair(channelKey, move(channelList)));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
void SocketParser(const boost::property_tree::ptree& tree, vector<FairMQChannel>& channelList)
|
||||||
|
{
|
||||||
|
// for each socket in channel
|
||||||
|
int socketCounter = 0;
|
||||||
|
for (const auto& s : tree)
|
||||||
|
{
|
||||||
|
if (s.first == "sockets")
|
||||||
|
{
|
||||||
|
for (const auto& r : s.second)
|
||||||
|
{
|
||||||
|
++socketCounter;
|
||||||
|
FairMQChannel channel;
|
||||||
|
|
||||||
|
// print if DEBUG log level set
|
||||||
|
stringstream socket;
|
||||||
|
socket << "\t \t [node = " << s.first << "] socket index = " << socketCounter;
|
||||||
|
LOG(DEBUG) << socket.str();
|
||||||
|
LOG(DEBUG) << "\t \t \t type = " << r.second.get<string>("type", channel.GetType());
|
||||||
|
LOG(DEBUG) << "\t \t \t method = " << r.second.get<string>("method", channel.GetMethod());
|
||||||
|
LOG(DEBUG) << "\t \t \t address = " << r.second.get<string>("address", channel.GetAddress());
|
||||||
|
LOG(DEBUG) << "\t \t \t sndBufSize = " << r.second.get<int>("sndBufSize", channel.GetSndBufSize());
|
||||||
|
LOG(DEBUG) << "\t \t \t rcvBufSize = " << r.second.get<int>("rcvBufSize", channel.GetRcvBufSize());
|
||||||
|
LOG(DEBUG) << "\t \t \t rateLogging = " << r.second.get<int>("rateLogging", channel.GetRateLogging());
|
||||||
|
|
||||||
|
channel.UpdateType(r.second.get<string>("type", channel.GetType()));
|
||||||
|
channel.UpdateMethod(r.second.get<string>("method", channel.GetMethod()));
|
||||||
|
channel.UpdateAddress(r.second.get<string>("address", channel.GetAddress()));
|
||||||
|
channel.UpdateSndBufSize(r.second.get<int>("sndBufSize", channel.GetSndBufSize())); // int
|
||||||
|
channel.UpdateRcvBufSize(r.second.get<int>("rcvBufSize", channel.GetRcvBufSize())); // int
|
||||||
|
channel.UpdateRateLogging(r.second.get<int>("rateLogging", channel.GetRateLogging())); // int
|
||||||
|
|
||||||
|
channelList.push_back(channel);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(s.first == "socket")
|
||||||
|
{
|
||||||
|
++socketCounter;
|
||||||
|
FairMQChannel channel;
|
||||||
|
|
||||||
|
// print if DEBUG log level set
|
||||||
|
stringstream socket;
|
||||||
|
socket << "\t \t [node = " << s.first << "] socket index = " << socketCounter;
|
||||||
|
LOG(DEBUG) << socket.str();
|
||||||
|
LOG(DEBUG) << "\t \t \t type = " << s.second.get<string>("type", channel.GetType());
|
||||||
|
LOG(DEBUG) << "\t \t \t method = " << s.second.get<string>("method", channel.GetMethod());
|
||||||
|
LOG(DEBUG) << "\t \t \t address = " << s.second.get<string>("address", channel.GetAddress());
|
||||||
|
LOG(DEBUG) << "\t \t \t sndBufSize = " << s.second.get<int>("sndBufSize", channel.GetSndBufSize());
|
||||||
|
LOG(DEBUG) << "\t \t \t rcvBufSize = " << s.second.get<int>("rcvBufSize", channel.GetRcvBufSize());
|
||||||
|
LOG(DEBUG) << "\t \t \t rateLogging = " << s.second.get<int>("rateLogging", channel.GetRateLogging());
|
||||||
|
|
||||||
|
channel.UpdateType(s.second.get<string>("type", channel.GetType()));
|
||||||
|
channel.UpdateMethod(s.second.get<string>("method", channel.GetMethod()));
|
||||||
|
channel.UpdateAddress(s.second.get<string>("address", channel.GetAddress()));
|
||||||
|
channel.UpdateSndBufSize(s.second.get<int>("sndBufSize", channel.GetSndBufSize())); // int
|
||||||
|
channel.UpdateRcvBufSize(s.second.get<int>("rcvBufSize", channel.GetRcvBufSize())); // int
|
||||||
|
channel.UpdateRateLogging(s.second.get<int>("rateLogging", channel.GetRateLogging())); // int
|
||||||
|
|
||||||
|
channelList.push_back(channel);
|
||||||
|
}
|
||||||
|
|
||||||
|
}// end socket loop
|
||||||
|
}
|
||||||
|
} // end helper namespace
|
||||||
|
|
||||||
} // end FairMQParser namespace
|
} // end FairMQParser namespace
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,17 @@ struct XML
|
||||||
FairMQMap UserParser(std::stringstream& input, const std::string& deviceId, const std::string& rootNode = "fairMQOptions");
|
FairMQMap UserParser(std::stringstream& input, const std::string& deviceId, const std::string& rootNode = "fairMQOptions");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
namespace helper
|
||||||
|
{
|
||||||
|
void PrintDeviceList(const boost::property_tree::ptree& tree, const std::string& formatFlag = "json");
|
||||||
|
void DeviceParser(const boost::property_tree::ptree& tree, FairMQMap& channelMap, const std::string& deviceId, const std::string& formatFlag);
|
||||||
|
void ChannelParser(const boost::property_tree::ptree& tree, FairMQMap& channelMap, const std::string& formatFlag);
|
||||||
|
void SocketParser(const boost::property_tree::ptree& tree, std::vector<FairMQChannel>& channelList);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} // FairMQParser namespace
|
} // FairMQParser namespace
|
||||||
#endif /* FAIRMQPARSER_H */
|
#endif /* FAIRMQPARSER_H */
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user