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

encapsulate and use fairmq default xml and json parser if command line mq-config file.extension is called. The .xml and .json files are recognized internally. Remove explicit json parsing in runSimpleMQStateMAchine.h. Propagate the new commandline mq-config where the runstatemachine function is used

Browse Source
This commit is contained in:
winckler
2016-04-05 17:52:10 +02:00
parent 8df656a302
commit 3b985cd2cd
3 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fairmq/tools/runSimpleMQStateMachine.h
View File

@@ -27,12 +27,9 @@ template<typename TMQDevice>
inline int runStateMachine(TMQDevice& device, FairMQProgOptions& config)
{
device.CatchSignals();
std::string jsonfile = config.GetValue<std::string>("config-json-file");
std::string id = config.GetValue<std::string>("id");
int ioThreads = config.GetValue<int>("io-threads");
config.UserParser<FairMQParser::JSON>(jsonfile, id);
device.fChannels = config.GetFairMQMap();
device.SetProperty(TMQDevice::Id, id);
@@ -58,12 +55,9 @@ template<typename TMQDevice>
inline int runNonInteractiveStateMachine(TMQDevice& device, FairMQProgOptions& config)
{
device.CatchSignals();
std::string jsonfile = config.GetValue<std::string>("config-json-file");
std::string id = config.GetValue<std::string>("id");
int ioThreads = config.GetValue<int>("io-threads");
config.UserParser<FairMQParser::JSON>(jsonfile, id);
device.fChannels = config.GetFairMQMap();
device.SetProperty(TMQDevice::Id, id);