Skip to content

Commit 302adfe

Browse files
committed
payload size
1 parent aa97e93 commit 302adfe

3 files changed

Lines changed: 57 additions & 43 deletions

File tree

examples/rpi_example/triple_example.json

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -11,62 +11,61 @@
1111
"host_name": "pi0",
1212
"nodes": [
1313
{
14-
"node_name": "montreal",
15-
"publisher": [
16-
{"topic_name": "amazon"},
17-
{"topic_name": "nile"},
18-
{"topic_name": "ganges"},
19-
{"topic_name": "danube"}
20-
]
21-
},
22-
23-
{
24-
"node_name": "lyon",
25-
"intermediate": [
26-
{
27-
"subscriber":[
28-
{"topic_name": "amazon"}
29-
],
30-
"publisher": [
31-
{"topic_name": "tigris"}
32-
]
33-
}
34-
]
35-
}
14+
"node_name": "montreal",
15+
"publisher": [
16+
{"topic_name": "amazon"},
17+
{"topic_name": "nile"},
18+
{"topic_name": "ganges"},
19+
{"topic_name": "danube"}
20+
]
21+
},
22+
{
23+
"node_name": "lyon",
24+
"intermediate": [
25+
{
26+
"subscriber":[
27+
{"topic_name": "amazon"}
28+
],
29+
"publisher": [
30+
{"topic_name": "tigris"}
31+
]
32+
}
33+
]
34+
}
3635
]
3736
},
3837
{
3938
"host_name": "pi1",
4039
"nodes": [
4140
{
42-
"node_name": "hamburg",
43-
"intermediate": [
44-
{
45-
"subscriber":[
46-
{"topic_name": "nile"},
47-
{"topic_name": "tigris"},
48-
{"topic_name": "ganges"},
49-
{"topic_name": "danube"}
50-
],
51-
"publisher": [
52-
{"topic_name": "parana"}
53-
]
54-
}
55-
]
56-
},
41+
"node_name": "hamburg",
42+
"intermediate": [
43+
{
44+
"subscriber":[
45+
{"topic_name": "nile"},
46+
{"topic_name": "tigris"},
47+
{"topic_name": "ganges"},
48+
{"topic_name": "danube"}
49+
],
50+
"publisher": [
51+
{"topic_name": "parana"}
52+
]
53+
}
54+
]
55+
},
5756

5857
{
5958
"node_name": "osaka",
6059
"intermediate": [
61-
{
62-
"subscriber":[
63-
{"topic_name": "parana"}
60+
{
61+
"subscriber":[
62+
{"topic_name": "parana"}
6463
],
6564
"publisher": [
66-
{"topic_name": "salween"}
65+
{"topic_name": "salween"}
6766
]
68-
}
69-
]
67+
}
68+
]
7069
}
7170
]
7271
},

node_options/src/cli_options.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ void Options::parse(int argc, char ** argv)
5454
std::cout << "Please specify the topic_name for this node" << std::endl;
5555
exit(1);
5656
}
57+
58+
if (!payload_size.empty() && payload_size.size() == 1 && !topic_names.empty()) {
59+
payload_size = std::vector<int>(topic_names.size(), payload_size[0]);
60+
}
61+
if (!period_ms.empty() && period_ms.size() == 1 && !topic_names.empty()) {
62+
period_ms = std::vector<int>(topic_names.size(), period_ms[0]);
63+
}
64+
5765
} catch (const cxxopts::exceptions::exception & e) {
5866
std::cout << "Error parsing options: " << e.what() << std::endl;
5967
exit(1);

node_options_intermediate/src/cli_options.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ void Options::parse(int argc, char ** argv)
5151
exit(1);
5252
}
5353

54+
if (!payload_size.empty() && payload_size.size() == 1 && !topic_names_pub.empty()) {
55+
payload_size = std::vector<int>(topic_names_pub.size(), payload_size[0]);
56+
}
57+
if (!period_ms.empty() && period_ms.size() == 1 && !topic_names_pub.empty()) {
58+
period_ms = std::vector<int>(topic_names_pub.size(), period_ms[0]);
59+
}
60+
5461
if(result.count("topic_names_pub") == 0 && result.count("topic_names_sub") == 0){
5562
std::cout << "Please specify the topic_name for this node" << std::endl;
5663
exit(1);

0 commit comments

Comments
 (0)