Once files moved to aos folder and files updated accordingly
Change-Id: Idd26fca1d4dc15407e92859400e1a15a8a142ec3
diff --git a/aos/BUILD b/aos/BUILD
index 5d6831a..89948ab 100644
--- a/aos/BUILD
+++ b/aos/BUILD
@@ -34,3 +34,29 @@
'//aos/common/logging:binary_log_writer.stripped',
],
)
+
+cc_library(
+ name = 'once',
+ visibility = ['//visibility:public'],
+ hdrs = [
+ 'once.h',
+ ],
+ srcs = [
+ 'once-tmpl.h',
+ ],
+ deps = [
+ '//aos/common:gtest_prod',
+ '//aos/common:type_traits',
+ ],
+)
+cc_test(
+ name = 'once_test',
+ visibility = ['//visibility:public'],
+ srcs = [
+ 'once_test.cc',
+ ],
+ deps = [
+ '//aos/testing:googletest',
+ '//aos:once',
+ ],
+)
diff --git a/aos/build/queues.bzl b/aos/build/queues.bzl
index 91b4978..8696bac 100644
--- a/aos/build/queues.bzl
+++ b/aos/build/queues.bzl
@@ -100,7 +100,7 @@
srcs = [src + '.cc' for src in srcs],
hdrs = [src + '.h' for src in srcs],
deps = deps + [
- '//aos/common:once',
+ '//aos:once',
'//aos/common:queues',
'//aos/common:queue_types',
'//aos/common/logging:printf_formats',
diff --git a/aos/build/queues/compiler.rb b/aos/build/queues/compiler.rb
index 0b60b0e..5164670 100644
--- a/aos/build/queues/compiler.rb
+++ b/aos/build/queues/compiler.rb
@@ -106,7 +106,7 @@
cpp_tree.add_cc_include("aos/common/byteorder.h".inspect)
cpp_tree.add_cc_include("<inttypes.h>")
cpp_tree.add_cc_include("aos/common/queue_types.h".inspect)
- cpp_tree.add_cc_include("aos/common/once.h".inspect)
+ cpp_tree.add_cc_include("aos/once.h".inspect)
cpp_tree.add_cc_include("aos/common/logging/printf_formats.h".inspect)
cpp_tree.add_cc_using("::aos::to_network")
cpp_tree.add_cc_using("::aos::to_host")
diff --git a/aos/common/BUILD b/aos/common/BUILD
index f4b57d5..e3160c4 100644
--- a/aos/common/BUILD
+++ b/aos/common/BUILD
@@ -200,31 +200,6 @@
],
)
-cc_library(
- name = 'once',
- hdrs = [
- 'once.h',
- ],
- srcs = [
- 'once-tmpl.h',
- ],
- deps = [
- ':gtest_prod',
- ':type_traits',
- ],
-)
-
-cc_test(
- name = 'once_test',
- srcs = [
- 'once_test.cc',
- ],
- deps = [
- '//aos/testing:googletest',
- ':once',
- ],
-)
-
cc_test(
name = 'time_test',
srcs = [
diff --git a/aos/common/logging/BUILD b/aos/common/logging/BUILD
index 8b28482..cc961b3 100644
--- a/aos/common/logging/BUILD
+++ b/aos/common/logging/BUILD
@@ -182,7 +182,7 @@
deps = [
'//aos/common:die',
'//aos/common:time',
- '//aos/common:once',
+ '//aos:once',
'//aos/common:queue_types',
':logging',
'//aos/common:type_traits',
diff --git a/aos/common/logging/implementations.cc b/aos/common/logging/implementations.cc
index 22cd4f4..58359f9 100644
--- a/aos/common/logging/implementations.cc
+++ b/aos/common/logging/implementations.cc
@@ -7,11 +7,11 @@
#include <chrono>
#include "aos/common/die.h"
-#include "aos/common/once.h"
-#include "aos/common/time.h"
-#include "aos/common/queue_types.h"
#include "aos/common/logging/printf_formats.h"
+#include "aos/common/queue_types.h"
+#include "aos/common/time.h"
#include "aos/linux_code/ipc_lib/queue.h"
+#include "aos/once.h"
namespace aos {
namespace logging {
diff --git a/aos/common/logging/implementations.h b/aos/common/logging/implementations.h
index 48b5f0b..142c6ba 100644
--- a/aos/common/logging/implementations.h
+++ b/aos/common/logging/implementations.h
@@ -13,14 +13,14 @@
#include <functional>
#include <atomic>
-#include "aos/common/logging/logging.h"
-#include "aos/common/type_traits.h"
-#include "aos/common/mutex.h"
-#include "aos/common/macros.h"
-#include "aos/common/logging/sizes.h"
-#include "aos/common/logging/interface.h"
#include "aos/common/logging/context.h"
-#include "aos/common/once.h"
+#include "aos/common/logging/interface.h"
+#include "aos/common/logging/logging.h"
+#include "aos/common/logging/sizes.h"
+#include "aos/common/macros.h"
+#include "aos/common/mutex.h"
+#include "aos/common/type_traits.h"
+#include "aos/once.h"
namespace aos {
diff --git a/aos/common/network/BUILD b/aos/common/network/BUILD
index 19335ba..c5476b2 100644
--- a/aos/common/network/BUILD
+++ b/aos/common/network/BUILD
@@ -10,7 +10,7 @@
],
deps = [
'//aos/linux_code:configuration',
- '//aos/common:once',
+ '//aos:once',
'//aos/common/logging',
'//aos/common/util:string_to_num',
],
diff --git a/aos/common/network/team_number.cc b/aos/common/network/team_number.cc
index 4aa7626..0669601 100644
--- a/aos/common/network/team_number.cc
+++ b/aos/common/network/team_number.cc
@@ -7,10 +7,10 @@
#include <string>
-#include "aos/common/once.h"
-#include "aos/linux_code/configuration.h"
#include "aos/common/logging/logging.h"
#include "aos/common/util/string_to_num.h"
+#include "aos/linux_code/configuration.h"
+#include "aos/once.h"
namespace aos {
namespace network {
diff --git a/aos/linux_code/BUILD b/aos/linux_code/BUILD
index 7adb3d6..0b76e2c 100644
--- a/aos/linux_code/BUILD
+++ b/aos/linux_code/BUILD
@@ -29,7 +29,7 @@
'complex_thread_local.h',
],
deps = [
- '//aos/common:once',
+ '//aos:once',
'//aos/common:die',
'//debian:libpthread',
],
@@ -72,7 +72,7 @@
'configuration.h',
],
deps = [
- '//aos/common:once',
+ '//aos:once',
'//aos/common/logging',
'//aos/common:unique_malloc_ptr',
],
diff --git a/aos/linux_code/complex_thread_local.cc b/aos/linux_code/complex_thread_local.cc
index d57323e..f5ddc9c 100644
--- a/aos/linux_code/complex_thread_local.cc
+++ b/aos/linux_code/complex_thread_local.cc
@@ -2,8 +2,8 @@
#include <pthread.h>
-#include "aos/common/once.h"
#include "aos/common/die.h"
+#include "aos/once.h"
#define SIMPLE_CHECK(call) \
do { \
diff --git a/aos/linux_code/configuration.cc b/aos/linux_code/configuration.cc
index e4d5d80..0536e25 100644
--- a/aos/linux_code/configuration.cc
+++ b/aos/linux_code/configuration.cc
@@ -10,7 +10,7 @@
#include "aos/common/logging/logging.h"
#include "aos/common/unique_malloc_ptr.h"
-#include "aos/common/once.h"
+#include "aos/once.h"
namespace aos {
namespace configuration {
diff --git a/aos/linux_code/ipc_lib/BUILD b/aos/linux_code/ipc_lib/BUILD
index 95b30ce..b0b58ff 100644
--- a/aos/linux_code/ipc_lib/BUILD
+++ b/aos/linux_code/ipc_lib/BUILD
@@ -13,7 +13,7 @@
],
deps = [
'//aos/common/logging',
- '//aos/common:once',
+ '//aos:once',
'//aos/common:macros',
'//aos/common/util:compiler_memory_barrier',
],
diff --git a/aos/linux_code/ipc_lib/aos_sync.cc b/aos/linux_code/ipc_lib/aos_sync.cc
index b0b560e..3c1debb 100644
--- a/aos/linux_code/ipc_lib/aos_sync.cc
+++ b/aos/linux_code/ipc_lib/aos_sync.cc
@@ -27,9 +27,9 @@
#include <type_traits>
#include "aos/common/logging/logging.h"
-#include "aos/common/once.h"
#include "aos/common/macros.h"
#include "aos/common/util/compiler_memory_barrier.h"
+#include "aos/once.h"
using ::aos::linux_code::ipc_lib::FutexAccessorObserver;
diff --git a/aos/linux_code/starter/BUILD b/aos/linux_code/starter/BUILD
index ec6ce7f..74af77d 100644
--- a/aos/linux_code/starter/BUILD
+++ b/aos/linux_code/starter/BUILD
@@ -18,7 +18,7 @@
'//third_party/libevent',
'//aos/common/logging',
'//aos/common/logging:implementations',
- '//aos/common:once',
+ '//aos:once',
'//aos/common:time',
'//aos/common/libc:aos_strsignal',
'//aos/common/util:run_command',
diff --git a/aos/linux_code/starter/starter.cc b/aos/linux_code/starter/starter.cc
index 57d90dd..62e540b 100644
--- a/aos/linux_code/starter/starter.cc
+++ b/aos/linux_code/starter/starter.cc
@@ -29,14 +29,14 @@
#include "third_party/libevent/event.h"
-#include "aos/common/logging/logging.h"
-#include "aos/common/logging/implementations.h"
-#include "aos/linux_code/init.h"
-#include "aos/common/unique_malloc_ptr.h"
-#include "aos/common/time.h"
-#include "aos/common/once.h"
#include "aos/common/libc/aos_strsignal.h"
+#include "aos/common/logging/implementations.h"
+#include "aos/common/logging/logging.h"
+#include "aos/common/time.h"
+#include "aos/common/unique_malloc_ptr.h"
#include "aos/common/util/run_command.h"
+#include "aos/linux_code/init.h"
+#include "aos/once.h"
// This is the main piece of code that starts all of the rest of the code and
// restarts it when the binaries are modified.
diff --git a/aos/common/once-tmpl.h b/aos/once-tmpl.h
similarity index 100%
rename from aos/common/once-tmpl.h
rename to aos/once-tmpl.h
diff --git a/aos/common/once.h b/aos/once.h
similarity index 94%
rename from aos/common/once.h
rename to aos/once.h
index b7fbcb1..f6954f6 100644
--- a/aos/common/once.h
+++ b/aos/once.h
@@ -1,5 +1,5 @@
-#ifndef AOS_COMMON_ONCE_H_
-#define AOS_COMMON_ONCE_H_
+#ifndef AOS_ONCE_H_
+#define AOS_ONCE_H_
#include <stdint.h>
@@ -64,6 +64,6 @@
} // namespace aos
-#include "aos/common/once-tmpl.h"
+#include "aos/once-tmpl.h"
-#endif // AOS_COMMON_ONCE_H_
+#endif // AOS_ONCE_H_
diff --git a/aos/common/once_test.cc b/aos/once_test.cc
similarity index 98%
rename from aos/common/once_test.cc
rename to aos/once_test.cc
index 3773b5b..0a36643 100644
--- a/aos/common/once_test.cc
+++ b/aos/once_test.cc
@@ -1,4 +1,4 @@
-#include "aos/common/once.h"
+#include "aos/once.h"
#include <stdlib.h>
#include <limits.h>
diff --git a/aos/testing/BUILD b/aos/testing/BUILD
index a8dce04..4f2fc83 100644
--- a/aos/testing/BUILD
+++ b/aos/testing/BUILD
@@ -22,7 +22,7 @@
deps = [
':googletest',
'//aos/common/logging:implementations',
- '//aos/common:once',
+ '//aos:once',
'//aos/common:mutex',
],
testonly = True,
diff --git a/aos/testing/test_logging.cc b/aos/testing/test_logging.cc
index cdbec94..617f02a 100644
--- a/aos/testing/test_logging.cc
+++ b/aos/testing/test_logging.cc
@@ -7,8 +7,8 @@
#include "gtest/gtest.h"
#include "aos/common/logging/implementations.h"
-#include "aos/common/once.h"
#include "aos/common/mutex.h"
+#include "aos/once.h"
using ::aos::logging::LogMessage;
diff --git a/y2014/BUILD b/y2014/BUILD
index 07b9169..936c0cb 100644
--- a/y2014/BUILD
+++ b/y2014/BUILD
@@ -11,7 +11,7 @@
],
deps = [
'//aos/common/logging',
- '//aos/common:once',
+ '//aos:once',
'//aos/common/network:team_number',
'//aos/common:mutex',
'//frc971/control_loops:state_feedback_loop',
diff --git a/y2014/constants.cc b/y2014/constants.cc
index 33d734e..d5a29be 100644
--- a/y2014/constants.cc
+++ b/y2014/constants.cc
@@ -11,9 +11,9 @@
#endif
#include "aos/common/logging/logging.h"
-#include "aos/common/once.h"
-#include "aos/common/network/team_number.h"
#include "aos/common/mutex.h"
+#include "aos/common/network/team_number.h"
+#include "aos/once.h"
#include "y2014/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"
#include "y2014/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
diff --git a/y2015/BUILD b/y2015/BUILD
index da0db7e..1f3b8a1 100644
--- a/y2015/BUILD
+++ b/y2015/BUILD
@@ -11,7 +11,7 @@
],
deps = [
'//aos/common/logging',
- '//aos/common:once',
+ '//aos:once',
'//aos/common:time',
'//aos/common/network:team_number',
'//frc971/control_loops:state_feedback_loop',
diff --git a/y2015/constants.cc b/y2015/constants.cc
index 5b02a25..ce78344 100644
--- a/y2015/constants.cc
+++ b/y2015/constants.cc
@@ -11,9 +11,9 @@
#endif
#include "aos/common/logging/logging.h"
-#include "aos/common/once.h"
-#include "aos/common/network/team_number.h"
#include "aos/common/mutex.h"
+#include "aos/common/network/team_number.h"
+#include "aos/once.h"
#include "y2015/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"
#include "y2015/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
diff --git a/y2016/BUILD b/y2016/BUILD
index d3c4a9e..49e864c 100644
--- a/y2016/BUILD
+++ b/y2016/BUILD
@@ -11,7 +11,7 @@
],
deps = [
'//aos/common/logging',
- '//aos/common:once',
+ '//aos:once',
'//aos/common/network:team_number',
'//aos/common:mutex',
'//frc971/control_loops:state_feedback_loop',
diff --git a/y2016/constants.cc b/y2016/constants.cc
index 3e16b0c..8bbda56 100644
--- a/y2016/constants.cc
+++ b/y2016/constants.cc
@@ -11,9 +11,9 @@
#endif
#include "aos/common/logging/logging.h"
-#include "aos/common/once.h"
-#include "aos/common/network/team_number.h"
#include "aos/common/mutex.h"
+#include "aos/common/network/team_number.h"
+#include "aos/once.h"
#include "y2016/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"
#include "y2016/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
diff --git a/y2017/BUILD b/y2017/BUILD
index 11b965e..4163bd5 100644
--- a/y2017/BUILD
+++ b/y2017/BUILD
@@ -13,7 +13,7 @@
'//aos/common/logging',
'//aos/common/network:team_number',
'//aos/common:mutex',
- '//aos/common:once',
+ '//aos:once',
'//frc971:constants',
'//frc971/shooter_interpolation:interpolation',
'//y2017/control_loops/drivetrain:polydrivetrain_plants',
diff --git a/y2017/constants.cc b/y2017/constants.cc
index e2b743b..9530e27 100644
--- a/y2017/constants.cc
+++ b/y2017/constants.cc
@@ -13,7 +13,7 @@
#include "aos/common/logging/logging.h"
#include "aos/common/mutex.h"
#include "aos/common/network/team_number.h"
-#include "aos/common/once.h"
+#include "aos/once.h"
#include "y2017/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
#include "y2017/control_loops/drivetrain/polydrivetrain_dog_motor_plant.h"