From d866589be124d0d1a7a4de40fcab194f0489d79e Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Mon, 10 Apr 2017 17:38:19 +0200 Subject: [PATCH] Two devices can't share device id --- fairmq/test/protocols/_pub_sub.cxx | 4 +-- fairmq/test/protocols/config.json.in | 46 ++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/fairmq/test/protocols/_pub_sub.cxx b/fairmq/test/protocols/_pub_sub.cxx index 29f61859..0da5bde0 100644 --- a/fairmq/test/protocols/_pub_sub.cxx +++ b/fairmq/test/protocols/_pub_sub.cxx @@ -33,7 +33,7 @@ auto RunPubSub(string transport) -> void auto sub1 = execute_result{"", 0}; thread sub1_thread([&]() { stringstream cmd; - cmd << runTestDevice << " --id sub_" << transport << " --control static --verbosity DEBUG " + cmd << runTestDevice << " --id sub_1" << transport << " --control static --verbosity DEBUG " << "--log-color false --mq-config \"" << mqConfig << "\""; sub1 = execute(cmd.str(), "[SUB1]"); }); @@ -41,7 +41,7 @@ auto RunPubSub(string transport) -> void auto sub2 = execute_result{"", 0}; thread sub2_thread([&]() { stringstream cmd; - cmd << runTestDevice << " --id sub_" << transport << " --control static --verbosity DEBUG " + cmd << runTestDevice << " --id sub_2" << transport << " --control static --verbosity DEBUG " << "--log-color false --mq-config \"" << mqConfig << "\""; sub2 = execute(cmd.str(), "[SUB2]"); }); diff --git a/fairmq/test/protocols/config.json.in b/fairmq/test/protocols/config.json.in index 192c8507..f3f16234 100644 --- a/fairmq/test/protocols/config.json.in +++ b/fairmq/test/protocols/config.json.in @@ -122,7 +122,7 @@ ] }, { - "id": "sub_zeromq", + "id": "sub_1zeromq", "channels": [ { "address": "tcp://127.0.0.1:5556", @@ -143,7 +143,49 @@ ] }, { - "id": "sub_nanomsg", + "id": "sub_2zeromq", + "channels": [ + { + "address": "tcp://127.0.0.1:5556", + "method": "connect", + "name": "data", + "rateLogging": 0, + "transport": "zeromq", + "type": "sub" + }, + { + "address": "tcp://127.0.0.1:5555", + "method": "connect", + "name": "control", + "rateLogging": 0, + "transport": "zeromq", + "type": "push" + } + ] + }, + { + "id": "sub_1nanomsg", + "channels": [ + { + "address": "tcp://127.0.0.1:5756", + "method": "connect", + "name": "data", + "rateLogging": 0, + "transport": "nanomsg", + "type": "sub" + }, + { + "address": "tcp://127.0.0.1:5755", + "method": "connect", + "name": "control", + "rateLogging": 0, + "transport": "nanomsg", + "type": "push" + } + ] + }, + { + "id": "sub_2nanomsg", "channels": [ { "address": "tcp://127.0.0.1:5756",