Remove the final users of robot_state and joystick_state
This means we can remove them from the .q file.
Change-Id: Iefded3cf4537b2635341f3248c5f50af1534a241
diff --git a/aos/logging/BUILD b/aos/logging/BUILD
index ebc03f6..49bb321 100644
--- a/aos/logging/BUILD
+++ b/aos/logging/BUILD
@@ -13,10 +13,10 @@
visibility = ["//visibility:public"],
deps = [
":sizes",
+ "//aos:complex_thread_local",
"//aos:die",
"//aos:macros",
"//aos/libc:aos_strerror",
- "//aos:complex_thread_local",
],
)
@@ -33,6 +33,7 @@
":binary_log_file",
":logging",
"//aos:queues",
+ "//aos/events:event-loop",
"//aos/ipc_lib:queue",
],
)
@@ -47,12 +48,12 @@
":binary_log_file",
":implementations",
":logging",
- "//aos:die",
- "//aos:queue_types",
- "//aos/time:time",
"//aos:configuration",
+ "//aos:die",
"//aos:init",
+ "//aos:queue_types",
"//aos/ipc_lib:queue",
+ "//aos/time",
],
)
@@ -65,9 +66,9 @@
deps = [
":implementations",
":logging",
- "//aos/time:time",
"//aos:init",
"//aos/ipc_lib:queue",
+ "//aos/time",
],
)
@@ -81,10 +82,10 @@
":binary_log_file",
":implementations",
":logging",
- "//aos:queue_types",
- "//aos/util:string_to_num",
"//aos:configuration",
"//aos:init",
+ "//aos:queue_types",
+ "//aos/util:string_to_num",
],
)
@@ -182,13 +183,13 @@
deps = [
":logging",
":sizes",
- "//aos:once",
"//aos:die",
"//aos:macros",
- "//aos/mutex:mutex",
+ "//aos:once",
"//aos:queue_types",
- "//aos/time:time",
- "//aos/type_traits:type_traits",
"//aos/ipc_lib:queue",
+ "//aos/mutex",
+ "//aos/time",
+ "//aos/type_traits",
],
)
diff --git a/aos/logging/replay.h b/aos/logging/replay.h
index ffb3b7d..679b760 100644
--- a/aos/logging/replay.h
+++ b/aos/logging/replay.h
@@ -6,11 +6,12 @@
#include <functional>
#include <memory>
+#include "aos/events/event-loop.h"
+#include "aos/ipc_lib/queue.h"
#include "aos/logging/binary_log_file.h"
-#include "aos/queue.h"
#include "aos/logging/logging.h"
#include "aos/macros.h"
-#include "aos/ipc_lib/queue.h"
+#include "aos/queue.h"
#include "aos/queue_types.h"
namespace aos {
@@ -68,10 +69,10 @@
template <class T>
void AddDirectQueueSender(const ::std::string &process_name,
const ::std::string &log_message,
- const ::aos::Queue<T> &queue) {
+ const ::std::string &name) {
AddHandler(process_name, log_message,
::std::function<void(const T &)>(
- QueueDumpStructHandler<T>(queue.name())));
+ QueueDumpStructHandler<T>(name.c_str())));
}
private: