Adjust frequencies of channels
Increase the frequency of channels that use SimulatedEventLoops
so that they are not sending messages too fast.
Uses the grandchild commit of this - the send too fast check,
too determine the correct frequencies.
Change-Id: I649ac6bde167c263dddf75ab0860a861662baa49
Signed-off-by: milind <milind.upadhyay@gmail.com>
Signed-off-by: Milind Upadhyay <milind.upadhyay@gmail.com>
diff --git a/aos/events/aos.json b/aos/events/aos.json
index 34842b2..875c27e 100644
--- a/aos/events/aos.json
+++ b/aos/events/aos.json
@@ -11,8 +11,9 @@
{
"name": "/aos",
"type": "aos.logging.LogMessageFbs",
- "frequency": 200,
- "num_senders": 20
+ "frequency": 250,
+ "num_senders": 20,
+ "max_size": 512
},
{
"name": "/aos",
diff --git a/aos/events/event_loop_param_test.h b/aos/events/event_loop_param_test.h
index 3138c51..543bb21 100644
--- a/aos/events/event_loop_param_test.h
+++ b/aos/events/event_loop_param_test.h
@@ -36,7 +36,8 @@
},
{
"name": "/test",
- "type": "aos.TestMessage"
+ "type": "aos.TestMessage",
+ "frequency": 800
},
{
"name": "/test1",
@@ -123,7 +124,8 @@
"name": "/test",
"type": "aos.TestMessage",
"read_method": "PIN",
- "num_readers": 10
+ "num_readers": 10,
+ "frequency": 800
},
{
"name": "/test1",
diff --git a/aos/events/logging/logger_test.cc b/aos/events/logging/logger_test.cc
index a342c12..5532caf 100644
--- a/aos/events/logging/logger_test.cc
+++ b/aos/events/logging/logger_test.cc
@@ -2324,9 +2324,9 @@
}
constexpr std::string_view kCombinedConfigSha1(
- "0184681f8b83b5b9902a88ab12504c06b780907f6d156353bd958ebcf9389ef9");
+ "4503751edc96327493562f0376f0d6daac172927c0fd64d04ce5d67505186c0b");
constexpr std::string_view kSplitConfigSha1(
- "1020274679a8f8c15ea20a48e4a35dd59a435203e5f31a57e15355e5a6ee31f7");
+ "918a748432c5e70a971dfd8934968378bed04ab61cf2efcd35b7f6224053c247");
INSTANTIATE_TEST_SUITE_P(
All, MultinodeLoggerTest,
diff --git a/aos/events/logging/multinode_pingpong_combined.json b/aos/events/logging/multinode_pingpong_combined.json
index 6a93452..2ed0937 100644
--- a/aos/events/logging/multinode_pingpong_combined.json
+++ b/aos/events/logging/multinode_pingpong_combined.json
@@ -90,7 +90,8 @@
"type": "aos.message_bridge.RemoteMessage",
"logger": "NOT_LOGGED",
"num_senders": 2,
- "source_node": "pi1"
+ "source_node": "pi1",
+ "frequency": 150
},
{
"name": "/pi2/aos/remote_timestamps/pi1",
@@ -109,10 +110,13 @@
"name": "pi2",
"priority": 1,
"timestamp_logger": "LOCAL_AND_REMOTE_LOGGER",
- "timestamp_logger_nodes": ["pi1"],
+ "timestamp_logger_nodes": [
+ "pi1"
+ ],
"time_to_live": 5000000
}
- ]
+ ],
+ "frequency": 150
},
/* Forwarded back to pi1.
* The message is logged both on the sending node and the receiving node
@@ -133,11 +137,12 @@
"timestamp_logger": "LOCAL_LOGGER",
"time_to_live": 5000000
}
- ]
+ ],
+ "frequency": 150
}
],
"maps": [
- {
+ {
"match": {
"name": "/aos*",
"source_node": "pi1"
diff --git a/aos/events/logging/multinode_pingpong_split.json b/aos/events/logging/multinode_pingpong_split.json
index 4ead71e..aaaecd1 100644
--- a/aos/events/logging/multinode_pingpong_split.json
+++ b/aos/events/logging/multinode_pingpong_split.json
@@ -104,7 +104,8 @@
"type": "aos.message_bridge.RemoteMessage",
"logger": "NOT_LOGGED",
"num_senders": 2,
- "source_node": "pi1"
+ "source_node": "pi1",
+ "frequency": 150
},
/* Forwarded to pi2 */
{
@@ -116,10 +117,13 @@
"name": "pi2",
"priority": 1,
"timestamp_logger": "LOCAL_AND_REMOTE_LOGGER",
- "timestamp_logger_nodes": ["pi1"],
+ "timestamp_logger_nodes": [
+ "pi1"
+ ],
"time_to_live": 5000000
}
- ]
+ ],
+ "frequency": 150
},
/* Forwarded back to pi1.
* The message is logged both on the sending node and the receiving node
@@ -140,11 +144,12 @@
"timestamp_logger": "LOCAL_LOGGER",
"time_to_live": 5000000
}
- ]
+ ],
+ "frequency": 150
}
],
"maps": [
- {
+ {
"match": {
"name": "/aos*",
"source_node": "pi1"
diff --git a/aos/events/multinode_pingpong_test_combined.json b/aos/events/multinode_pingpong_test_combined.json
index 54da1c1..38243f4 100644
--- a/aos/events/multinode_pingpong_test_combined.json
+++ b/aos/events/multinode_pingpong_test_combined.json
@@ -100,31 +100,33 @@
"name": "/pi1/aos",
"type": "aos.message_bridge.ClientStatistics",
"source_node": "pi1",
- "frequency": 2
+ "frequency": 10
},
{
"name": "/pi2/aos",
"type": "aos.message_bridge.ClientStatistics",
"source_node": "pi2",
- "frequency": 2
+ "frequency": 10
},
{
"name": "/pi3/aos",
"type": "aos.message_bridge.ClientStatistics",
"source_node": "pi3",
- "frequency": 2
+ "frequency": 10
},
{
"name": "/pi1/aos/remote_timestamps/pi2",
"type": "aos.message_bridge.RemoteMessage",
"logger": "NOT_LOGGED",
- "source_node": "pi1"
+ "source_node": "pi1",
+ "frequency": 150
},
{
"name": "/pi2/aos/remote_timestamps/pi1",
"type": "aos.message_bridge.RemoteMessage",
"logger": "NOT_LOGGED",
- "source_node": "pi2"
+ "source_node": "pi2",
+ "frequency": 150
},
{
"name": "/pi1/aos",
diff --git a/aos/events/multinode_pingpong_test_split.json b/aos/events/multinode_pingpong_test_split.json
index a59f588..d93731a 100644
--- a/aos/events/multinode_pingpong_test_split.json
+++ b/aos/events/multinode_pingpong_test_split.json
@@ -100,19 +100,19 @@
"name": "/pi1/aos",
"type": "aos.message_bridge.ClientStatistics",
"source_node": "pi1",
- "frequency": 2
+ "frequency": 10
},
{
"name": "/pi2/aos",
"type": "aos.message_bridge.ClientStatistics",
"source_node": "pi2",
- "frequency": 2
+ "frequency": 10
},
{
"name": "/pi3/aos",
"type": "aos.message_bridge.ClientStatistics",
"source_node": "pi3",
- "frequency": 2
+ "frequency": 10
},
{
"name": "/pi1/aos/remote_timestamps/pi2/pi1/aos/aos-message_bridge-Timestamp",
diff --git a/aos/events/pingpong.json b/aos/events/pingpong.json
index d7c3bae..64fb27f 100644
--- a/aos/events/pingpong.json
+++ b/aos/events/pingpong.json
@@ -11,15 +11,15 @@
{
"name": "/test",
"type": "aos.examples.Ping",
- "frequency": 2000
+ "frequency": 4500
},
{
"name": "/test",
"type": "aos.examples.Pong",
- "frequency": 2000
+ "frequency": 4500
}
],
"imports": [
"aos.json"
]
-}
+}
\ No newline at end of file