diff --git a/fairmq/options/ProgOptionTest/macro/testJSON.json b/fairmq/options/ProgOptionTest/macro/testJSON.json index 33691a63..b0d8f3ce 100644 --- a/fairmq/options/ProgOptionTest/macro/testJSON.json +++ b/fairmq/options/ProgOptionTest/macro/testJSON.json @@ -1,57 +1,63 @@ { - "fairMQOptions": { - "devices": - [{ - "id": "merger1", - "channels": - [{ - "name": "two_inputs_channel", - "sockets": - [{ - "type": "pull", - "address": "tcp://*:5569", - "sndBufSize": 1000, - "rcvBufSize": 1000, - "rateLogging": 1 - }, - { - "type": "pull", - "method": "bind", - "address": "tcp://*:5570", - "sndBufSize": 1000, - "rcvBufSize": 1000, - "rateLogging": 1 - }] - - }, - { - "name": "one_output_channel", - "sockets": [{ - "type": "push", - "method": "connect", - "address": "tcp://*:5571", - "sndBufSize": 1000, - "rcvBufSize": 1000, - "rateLogging": 1 - }] - }] - - }, - { - "id": "sink1", - "channels": [{ - "name": "one_input", - "sockets": [{ - "name": "input1", - "type": "pull", - "method": "bind", - "address": "tcp://localhost:5571", - "sndBufSize": 1000, - "rcvBufSize": 1000, - "rateLogging": 1 - }] - }] - }] - - } + "fairMQOptions": { + "devices": [ + { + "id": "merger1", + "channels": [ + { + "name": "two_inputs_channel", + "sockets": [ + { + "type": "pull", + "method": "", + "address": "tcp://*:5569", + "sndBufSize": 1000, + "rcvBufSize": 1000, + "rateLogging": 1 + }, + { + "type": "pull", + "method": "bind", + "address": "tcp://*:5570", + "sndBufSize": 1000, + "rcvBufSize": 1000, + "rateLogging": 1 + } + ] + }, + { + "name": "one_output_channel", + "sockets": [ + { + "type": "push", + "method": "connect", + "address": "tcp://*:5571", + "sndBufSize": 1000, + "rcvBufSize": 1000, + "rateLogging": 1 + } + ] + } + ] + }, + { + "id": "sink1", + "channels": [ + { + "name": "one_input", + "sockets": [ + { + "type": "pull", + "method": "bind", + "address": "tcp://localhost:5571", + "sndBufSize": 1000, + "rcvBufSize": 1000, + "rateLogging": 1 + } + ] + } + ] + } + ] + } } diff --git a/fairmq/run/benchmark.json b/fairmq/run/benchmark.json index 0612b81a..77640fc8 100644 --- a/fairmq/run/benchmark.json +++ b/fairmq/run/benchmark.json @@ -1,39 +1,42 @@ { - "fairMQOptions": - { - "devices": - [{ - "id": "bsampler1", - "channels": - [{ - "name": "data", - "sockets": - [{ - "type": "push", - "method": "bind", - "address": "tcp://127.0.0.1:5555", - "sndBufSize": 1000, - "rcvBufSize": 1000, - "rateLogging": 1 - }] - }] - }, - { - "id": "sink1", - "channels": - [{ - "name": "data", - "sockets": - [{ - "type": "pull", - "method": "connect", - "address": "tcp://127.0.0.1:5555", - "sndBufSize": 1000, - "rcvBufSize": 1000, - "rateLogging": 1 - }] - }] - }] + "fairMQOptions": { + "devices": [ + { + "id": "bsampler1", + "channels": [ + { + "name": "data", + "sockets": [ + { + "type": "push", + "method": "bind", + "address": "tcp://127.0.0.1:5555", + "sndBufSize": 1000, + "rcvBufSize": 1000, + "rateLogging": 1 + } + ] + } + ] + }, + { + "id": "sink1", + "channels": [ + { + "name": "data", + "sockets": [ + { + "type": "pull", + "method": "connect", + "address": "tcp://127.0.0.1:5555", + "sndBufSize": 1000, + "rcvBufSize": 1000, + "rateLogging": 1 + } + ] + } + ] + } + ] } } -