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

Provide a better syntax for --channel-config

Browse Source 
The current syntax is ambiguous because it treats assignments
(like address=127.0.0.1) and selectors (name=my-channel) using
the symbol equal `"`.

This allows:

my-channel:address=127.0.0.1

as alternative syntax, which clearly separates the role of my-channel
from the associated properties.
This commit is contained in:
Giulio Eulisse 2021-03-04 23:16:22 +01:00 committed by Dennis Klein
parent bbc1dd4600
commit ce4584b3d8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fairmq/SuboptParser.cxx
View File

@ -17,8 +17,9 @@
#include <fairlogger/Logger.h>
#include <boost/property_tree/ptree.hpp>
#include <utility> // make_pair
#include <string_view>
#include <utility> // make_pair
#include <cstring>
using boost::property_tree::ptree;
using namespace std;
@ -83,6 +84,14 @@ Properties SuboptParser(const vector<string>& channelConfig, const string& devic
string argString(token);
char* subopts = &argString[0];
char* value = nullptr;
// Find either a : or a =. If we find the former first, we consider what is before it
// the channel name
char* firstSep = strpbrk(subopts, ":=");
if (firstSep && *firstSep == ':') {
channelName = std::string_view(subopts, firstSep - subopts);
channelProperties.put("name", channelName);
subopts = firstSep + 1;
}
while (subopts && *subopts != 0 && *subopts != ' ') {
char* cur = subopts;
int subopt = getsubopt(&subopts, (char**)channelOptionKeys, &value);