Merge //aos/linux_code/logging into //aos/common/logging
Shuffling files+targets to clean it up further is coming next.
Change-Id: Iae716b07b340a66502f8e0964281c10fae0fcb7a
diff --git a/aos/BUILD b/aos/BUILD
index e2c5e87..73fd641 100644
--- a/aos/BUILD
+++ b/aos/BUILD
@@ -3,8 +3,8 @@
visibility = ['//visibility:public'],
srcs = [
'//aos/linux_code:core',
- '//aos/linux_code/logging:log_streamer',
- '//aos/linux_code/logging:log_displayer',
+ '//aos/common/logging:log_streamer',
+ '//aos/common/logging:log_displayer',
'//aos/linux_code/starter',
],
)
@@ -12,6 +12,6 @@
name = 'prime_start_binaries',
visibility = ['//visibility:public'],
srcs = [
- '//aos/linux_code/logging:binary_log_writer',
+ '//aos/common/logging:binary_log_writer',
],
)
diff --git a/aos/common/controls/BUILD b/aos/common/controls/BUILD
index 8b01386..a5f3152 100644
--- a/aos/common/controls/BUILD
+++ b/aos/common/controls/BUILD
@@ -10,7 +10,7 @@
deps = [
'//aos/common:queues',
':control_loop',
- '//aos/linux_code/logging:log_replay',
+ '//aos/common/logging:log_replay',
'//aos/common/logging:queue_logging',
'//aos/common:time',
],
diff --git a/aos/common/controls/replay_control_loop.h b/aos/common/controls/replay_control_loop.h
index fa98463..fae3ad8 100644
--- a/aos/common/controls/replay_control_loop.h
+++ b/aos/common/controls/replay_control_loop.h
@@ -5,7 +5,7 @@
#include "aos/common/queue.h"
#include "aos/common/controls/control_loop.h"
-#include "aos/linux_code/logging/log_replay.h"
+#include "aos/common/logging/log_replay.h"
#include "aos/common/logging/queue_logging.h"
#include "aos/common/time.h"
#include "aos/common/macros.h"
diff --git a/aos/common/logging/BUILD b/aos/common/logging/BUILD
index 78d1cbd..b3e358d 100644
--- a/aos/common/logging/BUILD
+++ b/aos/common/logging/BUILD
@@ -1,5 +1,108 @@
package(default_visibility = ['//visibility:public'])
+cc_library(
+ name = 'log_replay',
+ srcs = [
+ 'log_replay.cc',
+ ],
+ hdrs = [
+ 'log_replay.h',
+ ],
+ deps = [
+ ':binary_log_file',
+ '//aos/common:queues',
+ '//aos/common/logging',
+ '//aos/linux_code/ipc_lib:queue',
+ ],
+)
+
+cc_binary(
+ name = 'binary_log_writer',
+ srcs = [
+ 'binary_log_writer.cc',
+ ],
+ deps = [
+ '//aos/common/logging',
+ '//aos/linux_code:init',
+ '//aos/linux_code:configuration',
+ '//aos/common:die',
+ ':binary_log_file',
+ '//aos/common:queue_types',
+ ],
+)
+
+cc_binary(
+ name = 'log_streamer',
+ srcs = [
+ 'log_streamer.cc',
+ ],
+ deps = [
+ '//aos/common/logging',
+ '//aos/linux_code:init',
+ '//aos/common:time',
+ '//aos/linux_code/ipc_lib:queue',
+ ],
+)
+
+cc_binary(
+ name = 'log_displayer',
+ srcs = [
+ 'log_displayer.cc',
+ ],
+ deps = [
+ '//aos/common/logging',
+ '//aos/linux_code:init',
+ ':binary_log_file',
+ '//aos/common:queue_types',
+ '//aos/linux_code:configuration',
+ '//aos/common/util:string_to_num',
+ ],
+)
+
+cc_library(
+ name = 'binary_log_file',
+ srcs = [
+ 'binary_log_file.cc',
+ ],
+ hdrs = [
+ 'binary_log_file.h',
+ ],
+ deps = [
+ '//aos/common/logging',
+ ],
+)
+
+cc_library(
+ name = 'linux_interface',
+ visibility = ['//aos/common/logging:__pkg__'],
+ srcs = [
+ 'linux_interface.cc',
+ ],
+ deps = [
+ '//aos/linux_code:complex_thread_local',
+ '//aos/common:die',
+ '//aos/common/logging:context',
+ ],
+)
+
+cc_library(
+ name = 'linux_logging',
+ visibility = [
+ '//aos/linux_code:__subpackages__'
+ ],
+ hdrs = [
+ 'linux_logging.h',
+ ],
+ srcs = [
+ 'linux_logging.cc',
+ ],
+ deps = [
+ '//aos/linux_code/ipc_lib:queue',
+ '//aos/common:time',
+ '//aos/common/logging:logging',
+ ],
+)
+
cc_test(
name = 'logging_impl_test',
srcs = [
@@ -74,7 +177,7 @@
deps = [
'//aos/common:die',
'//aos/common/libc:aos_strerror',
- '//aos/linux_code/logging:linux_interface',
+ '//aos/common/logging:linux_interface',
'//aos/common:macros',
],
)
diff --git a/aos/linux_code/logging/binary_log_file.cc b/aos/common/logging/binary_log_file.cc
similarity index 99%
rename from aos/linux_code/logging/binary_log_file.cc
rename to aos/common/logging/binary_log_file.cc
index b063fae..be58e11 100644
--- a/aos/linux_code/logging/binary_log_file.cc
+++ b/aos/common/logging/binary_log_file.cc
@@ -1,4 +1,4 @@
-#include "aos/linux_code/logging/binary_log_file.h"
+#include "aos/common/logging/binary_log_file.h"
#include <stdio.h>
#include <string.h>
diff --git a/aos/linux_code/logging/binary_log_file.h b/aos/common/logging/binary_log_file.h
similarity index 97%
rename from aos/linux_code/logging/binary_log_file.h
rename to aos/common/logging/binary_log_file.h
index bcf9da1..b753699 100644
--- a/aos/linux_code/logging/binary_log_file.h
+++ b/aos/common/logging/binary_log_file.h
@@ -1,5 +1,5 @@
-#ifndef AOS_LINUX_CODE_LOGGING_BINARY_LOG_FILE_H_
-#define AOS_LINUX_CODE_LOGGING_BINARY_LOG_FILE_H_
+#ifndef AOS_COMMON_LOGGING_BINARY_LOG_FILE_H_
+#define AOS_COMMON_LOGGING_BINARY_LOG_FILE_H_
#include <sys/types.h>
#include <stddef.h>
@@ -204,4 +204,4 @@
} // namespace logging
} // namespace aos
-#endif // AOS_LINUX_CODE_LOGGING_BINARY_LOG_FILE_H_
+#endif // AOS_COMMON_LOGGING_BINARY_LOG_FILE_H_
diff --git a/aos/linux_code/logging/binary_log_writer.cc b/aos/common/logging/binary_log_writer.cc
similarity index 98%
rename from aos/linux_code/logging/binary_log_writer.cc
rename to aos/common/logging/binary_log_writer.cc
index dbe61e0..d4e6685 100644
--- a/aos/linux_code/logging/binary_log_writer.cc
+++ b/aos/common/logging/binary_log_writer.cc
@@ -14,8 +14,8 @@
#include <map>
#include <unordered_set>
-#include "aos/linux_code/logging/linux_logging.h"
-#include "aos/linux_code/logging/binary_log_file.h"
+#include "aos/common/logging/linux_logging.h"
+#include "aos/common/logging/binary_log_file.h"
#include "aos/linux_code/init.h"
#include "aos/linux_code/configuration.h"
#include "aos/common/queue_types.h"
diff --git a/aos/linux_code/logging/linux_interface.cc b/aos/common/logging/linux_interface.cc
similarity index 100%
rename from aos/linux_code/logging/linux_interface.cc
rename to aos/common/logging/linux_interface.cc
diff --git a/aos/linux_code/logging/linux_logging.cc b/aos/common/logging/linux_logging.cc
similarity index 98%
rename from aos/linux_code/logging/linux_logging.cc
rename to aos/common/logging/linux_logging.cc
index b73595b..14ce72b 100644
--- a/aos/linux_code/logging/linux_logging.cc
+++ b/aos/common/logging/linux_logging.cc
@@ -1,4 +1,4 @@
-#include "aos/linux_code/logging/linux_logging.h"
+#include "aos/common/logging/linux_logging.h"
#include <stdarg.h>
#include <stdio.h>
diff --git a/aos/linux_code/logging/linux_logging.h b/aos/common/logging/linux_logging.h
similarity index 86%
rename from aos/linux_code/logging/linux_logging.h
rename to aos/common/logging/linux_logging.h
index 63eeaf1..3f74fa8 100644
--- a/aos/linux_code/logging/linux_logging.h
+++ b/aos/common/logging/linux_logging.h
@@ -1,5 +1,5 @@
-#ifndef AOS_LINUX_CODE_LOGGING_LOGGING_H_
-#define AOS_LINUX_CODE_LOGGING_LOGGING_H_
+#ifndef AOS_COMMON_LOGGING_LINUX_LOGGING_H_
+#define AOS_COMMON_LOGGING_LINUX_LOGGING_H_
#include "aos/common/logging/logging_impl.h"
#include "aos/common/util/options.h"
@@ -31,4 +31,4 @@
} // namespace logging
} // namespace aos
-#endif
+#endif // AOS_COMMON_LOGGING_LINUX_LOGGING_H_
diff --git a/aos/linux_code/logging/log_displayer.cc b/aos/common/logging/log_displayer.cc
similarity index 99%
rename from aos/linux_code/logging/log_displayer.cc
rename to aos/common/logging/log_displayer.cc
index 4050bd4..70d2ad5 100644
--- a/aos/linux_code/logging/log_displayer.cc
+++ b/aos/common/logging/log_displayer.cc
@@ -12,7 +12,7 @@
#include <string>
#include "aos/linux_code/configuration.h"
-#include "aos/linux_code/logging/binary_log_file.h"
+#include "aos/common/logging/binary_log_file.h"
#include "aos/common/queue_types.h"
#include "aos/common/logging/logging_impl.h"
#include "aos/common/logging/logging_printf_formats.h"
diff --git a/aos/linux_code/logging/log_replay.cc b/aos/common/logging/log_replay.cc
similarity index 96%
rename from aos/linux_code/logging/log_replay.cc
rename to aos/common/logging/log_replay.cc
index 32991de..a1efcca 100644
--- a/aos/linux_code/logging/log_replay.cc
+++ b/aos/common/logging/log_replay.cc
@@ -1,4 +1,4 @@
-#include "aos/linux_code/logging/log_replay.h"
+#include "aos/common/logging/log_replay.h"
namespace aos {
namespace logging {
diff --git a/aos/linux_code/logging/log_replay.h b/aos/common/logging/log_replay.h
similarity index 96%
rename from aos/linux_code/logging/log_replay.h
rename to aos/common/logging/log_replay.h
index 942f26f..6fb230c 100644
--- a/aos/linux_code/logging/log_replay.h
+++ b/aos/common/logging/log_replay.h
@@ -1,12 +1,12 @@
-#ifndef AOS_LINUX_CODE_LOGGING_LOG_REPLAY_H_
-#define AOS_LINUX_CODE_LOGGING_LOG_REPLAY_H_
+#ifndef AOS_COMMON_LOGGING_LOG_REPLAY_H_
+#define AOS_COMMON_LOGGING_LOG_REPLAY_H_
#include <unordered_map>
#include <string>
#include <functional>
#include <memory>
-#include "aos/linux_code/logging/binary_log_file.h"
+#include "aos/common/logging/binary_log_file.h"
#include "aos/common/queue.h"
#include "aos/common/logging/logging.h"
#include "aos/common/macros.h"
@@ -161,4 +161,4 @@
} // namespace logging
} // namespace aos
-#endif // AOS_LINUX_CODE_LOGGING_LOG_REPLAY_H_
+#endif // AOS_COMMON_LOGGING_LOG_REPLAY_H_
diff --git a/aos/linux_code/logging/log_streamer.cc b/aos/common/logging/log_streamer.cc
similarity index 94%
rename from aos/linux_code/logging/log_streamer.cc
rename to aos/common/logging/log_streamer.cc
index 2fe7c04..506a92b 100644
--- a/aos/linux_code/logging/log_streamer.cc
+++ b/aos/common/logging/log_streamer.cc
@@ -10,7 +10,7 @@
#include <fcntl.h>
#include <inttypes.h>
-#include "aos/linux_code/logging/linux_logging.h"
+#include "aos/common/logging/linux_logging.h"
#include "aos/linux_code/init.h"
#include "aos/linux_code/ipc_lib/queue.h"
#include "aos/common/logging/logging_impl.h"
diff --git a/aos/linux_code/BUILD b/aos/linux_code/BUILD
index 6c4d1e0..b0c88b5 100644
--- a/aos/linux_code/BUILD
+++ b/aos/linux_code/BUILD
@@ -58,7 +58,7 @@
deps = [
'//aos/linux_code/ipc_lib:shared_mem',
'//aos/common:die',
- '//aos/linux_code/logging:linux_logging',
+ '//aos/common/logging:linux_logging',
],
)
diff --git a/aos/linux_code/init.cc b/aos/linux_code/init.cc
index 2e47b16..cf54fb9 100644
--- a/aos/linux_code/init.cc
+++ b/aos/linux_code/init.cc
@@ -14,7 +14,7 @@
#include <malloc.h>
#include "aos/common/die.h"
-#include "aos/linux_code/logging/linux_logging.h"
+#include "aos/common/logging/linux_logging.h"
#include "aos/linux_code/ipc_lib/shared_mem.h"
namespace FLAG__namespace_do_not_use_directly_use_DECLARE_double_instead {
@@ -27,7 +27,7 @@
namespace logging {
namespace internal {
-// Implemented in aos/linux_code/logging/linux_interface.cc.
+// Implemented in aos/common/logging/linux_interface.cc.
void ReloadThreadName();
} // namespace internal
diff --git a/aos/linux_code/logging/BUILD b/aos/linux_code/logging/BUILD
deleted file mode 100644
index aea10f8..0000000
--- a/aos/linux_code/logging/BUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-package(default_visibility = ['//visibility:public'])
-
-cc_library(
- name = 'log_replay',
- srcs = [
- 'log_replay.cc',
- ],
- hdrs = [
- 'log_replay.h',
- ],
- deps = [
- ':binary_log_file',
- '//aos/common:queues',
- '//aos/common/logging',
- '//aos/linux_code/ipc_lib:queue',
- ],
-)
-
-cc_binary(
- name = 'binary_log_writer',
- srcs = [
- 'binary_log_writer.cc',
- ],
- deps = [
- '//aos/common/logging',
- '//aos/linux_code:init',
- '//aos/linux_code:configuration',
- '//aos/common:die',
- ':binary_log_file',
- '//aos/common:queue_types',
- ],
-)
-
-cc_binary(
- name = 'log_streamer',
- srcs = [
- 'log_streamer.cc',
- ],
- deps = [
- '//aos/common/logging',
- '//aos/linux_code:init',
- '//aos/common:time',
- '//aos/linux_code/ipc_lib:queue',
- ],
-)
-
-cc_binary(
- name = 'log_displayer',
- srcs = [
- 'log_displayer.cc',
- ],
- deps = [
- '//aos/common/logging',
- '//aos/linux_code:init',
- ':binary_log_file',
- '//aos/common:queue_types',
- '//aos/linux_code:configuration',
- '//aos/common/util:string_to_num',
- ],
-)
-
-cc_library(
- name = 'binary_log_file',
- srcs = [
- 'binary_log_file.cc',
- ],
- hdrs = [
- 'binary_log_file.h',
- ],
- deps = [
- '//aos/common/logging',
- ],
-)
-
-cc_library(
- name = 'linux_interface',
- visibility = ['//aos/common/logging:__pkg__'],
- srcs = [
- 'linux_interface.cc',
- ],
- deps = [
- '//aos/linux_code:complex_thread_local',
- '//aos/common:die',
- '//aos/common/logging:context',
- ],
-)
-
-cc_library(
- name = 'linux_logging',
- visibility = [
- '//aos/common/logging:__pkg__',
- '//aos/linux_code:__subpackages__'
- ],
- hdrs = [
- 'linux_logging.h',
- ],
- srcs = [
- 'linux_logging.cc',
- ],
- deps = [
- '//aos/linux_code/ipc_lib:queue',
- '//aos/common:time',
- '//aos/common/logging:logging',
- ],
-)