Run clang-format on the entire repo
This patch clang-formats the entire repo. Third-party code is
excluded.
I needed to fix up the .clang-format file so that all the header
includes are ordered properly. I could have sworn that it used to work
without the extra modification, but I guess not.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I64bb9f2c795401393f9dfe2fefc4f04cb36b52f6
diff --git a/aos/ipc_lib/aos_sync.cc b/aos/ipc_lib/aos_sync.cc
index 861a6fe..b8bd7a3 100644
--- a/aos/ipc_lib/aos_sync.cc
+++ b/aos/ipc_lib/aos_sync.cc
@@ -30,10 +30,11 @@
#include <type_traits>
#include "absl/base/call_once.h"
+#include "glog/logging.h"
+
#include "aos/macros.h"
#include "aos/thread_local.h"
#include "aos/util/compiler_memory_barrier.h"
-#include "glog/logging.h"
using ::aos::linux_code::ipc_lib::RunShmObservers;
diff --git a/aos/ipc_lib/core_lib.c b/aos/ipc_lib/core_lib.c
index a1e3315..bfe80c1 100644
--- a/aos/ipc_lib/core_lib.c
+++ b/aos/ipc_lib/core_lib.c
@@ -1,14 +1,12 @@
#include "aos/ipc_lib/core_lib.h"
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
-#include <assert.h>
#include "aos/ipc_lib/shared_mem_types.h"
-static uint8_t aos_8max(uint8_t l, uint8_t r) {
- return (l > r) ? l : r;
-}
+static uint8_t aos_8max(uint8_t l, uint8_t r) { return (l > r) ? l : r; }
void *shm_malloc_aligned(size_t length, uint8_t alignment) {
// minimum alignments from
// <http://software.intel.com/en-us/articles/data-alignment-when-migrating-to-64-bit-intel-architecture/>
@@ -28,8 +26,7 @@
void *msg = NULL;
aos_shm_core *shm_core = global_core->mem_struct;
- int result =
- mutex_grab(&shm_core->msg_alloc_lock);
+ int result = mutex_grab(&shm_core->msg_alloc_lock);
#ifdef NDEBUG
(void)result;
#else
@@ -40,12 +37,14 @@
shm_core->msg_alloc = (uint8_t *)shm_core->msg_alloc - align_extra;
msg = shm_core->msg_alloc;
if (msg <= global_core->shared_mem) {
- fprintf(stderr, "core_lib: RAN OUT OF SHARED MEMORY!!!----------------------------------------------------------\n");
+ fprintf(stderr,
+ "core_lib: RAN OUT OF SHARED "
+ "MEMORY!!!---------------------------------------------------------"
+ "-\n");
printf("if you didn't see the stderr output just then, you should have\n");
abort();
}
- //printf("alloc %p\n", msg);
+ // printf("alloc %p\n", msg);
mutex_unlock(&shm_core->msg_alloc_lock);
return msg;
}
-
diff --git a/aos/ipc_lib/event.cc b/aos/ipc_lib/event.cc
index 940dfbd..6b58e33 100644
--- a/aos/ipc_lib/event.cc
+++ b/aos/ipc_lib/event.cc
@@ -2,9 +2,10 @@
#include <chrono>
-#include "aos/type_traits/type_traits.h"
#include "glog/logging.h"
+#include "aos/type_traits/type_traits.h"
+
namespace aos {
Event::Event() : impl_(0) {
diff --git a/aos/ipc_lib/event_test.cc b/aos/ipc_lib/event_test.cc
index fb2421e..40c48b2 100644
--- a/aos/ipc_lib/event_test.cc
+++ b/aos/ipc_lib/event_test.cc
@@ -3,9 +3,10 @@
#include <chrono>
#include <thread>
+#include "gtest/gtest.h"
+
#include "aos/testing/test_logging.h"
#include "aos/time/time.h"
-#include "gtest/gtest.h"
namespace aos {
namespace testing {
diff --git a/aos/ipc_lib/eventfd_latency.cc b/aos/ipc_lib/eventfd_latency.cc
index 0507f26..efd326e 100644
--- a/aos/ipc_lib/eventfd_latency.cc
+++ b/aos/ipc_lib/eventfd_latency.cc
@@ -6,6 +6,8 @@
#include <random>
#include <thread>
+#include "gflags/gflags.h"
+
#include "aos/events/epoll.h"
#include "aos/init.h"
#include "aos/ipc_lib/latency_lib.h"
@@ -13,7 +15,6 @@
#include "aos/logging/logging.h"
#include "aos/realtime.h"
#include "aos/time/time.h"
-#include "gflags/gflags.h"
// This is a demo program which uses named pipes to communicate.
// It measures both latency of a random timer thread, and latency of the
diff --git a/aos/ipc_lib/futex_latency.cc b/aos/ipc_lib/futex_latency.cc
index 1ec3fc1..80ba711 100644
--- a/aos/ipc_lib/futex_latency.cc
+++ b/aos/ipc_lib/futex_latency.cc
@@ -6,6 +6,8 @@
#include <random>
#include <thread>
+#include "gflags/gflags.h"
+
#include "aos/condition.h"
#include "aos/init.h"
#include "aos/ipc_lib/latency_lib.h"
@@ -14,7 +16,6 @@
#include "aos/mutex/mutex.h"
#include "aos/realtime.h"
#include "aos/time/time.h"
-#include "gflags/gflags.h"
DEFINE_int32(seconds, 10, "Duration of the test to run");
DEFINE_int32(
diff --git a/aos/ipc_lib/index.h b/aos/ipc_lib/index.h
index c6a485f..4814075 100644
--- a/aos/ipc_lib/index.h
+++ b/aos/ipc_lib/index.h
@@ -6,9 +6,10 @@
#include <atomic>
#include <string>
-#include "aos/ipc_lib/shm_observers.h"
#include "glog/logging.h"
+#include "aos/ipc_lib/shm_observers.h"
+
namespace aos {
namespace ipc_lib {
diff --git a/aos/ipc_lib/ipc_comparison.cc b/aos/ipc_lib/ipc_comparison.cc
index fd1ff93..f15db53 100644
--- a/aos/ipc_lib/ipc_comparison.cc
+++ b/aos/ipc_lib/ipc_comparison.cc
@@ -19,6 +19,8 @@
#include <string>
#include <thread>
+#include "gflags/gflags.h"
+
#include "aos/condition.h"
#include "aos/init.h"
#include "aos/ipc_lib/event.h"
@@ -27,7 +29,6 @@
#include "aos/mutex/mutex.h"
#include "aos/realtime.h"
#include "aos/time/time.h"
-#include "gflags/gflags.h"
DEFINE_string(method, "", "Which IPC method to use");
DEFINE_int32(messages, 1000000, "How many messages to send back and forth");
diff --git a/aos/ipc_lib/latency_lib.h b/aos/ipc_lib/latency_lib.h
index 2371efa..97bc434 100644
--- a/aos/ipc_lib/latency_lib.h
+++ b/aos/ipc_lib/latency_lib.h
@@ -7,9 +7,10 @@
#include <chrono>
-#include "aos/time/time.h"
#include "glog/logging.h"
+#include "aos/time/time.h"
+
namespace aos {
void TimerThread(monotonic_clock::time_point end_time, int timer_priority);
diff --git a/aos/ipc_lib/lockless_queue.cc b/aos/ipc_lib/lockless_queue.cc
index 8e0e3d8..3d2c0d1 100644
--- a/aos/ipc_lib/lockless_queue.cc
+++ b/aos/ipc_lib/lockless_queue.cc
@@ -11,11 +11,12 @@
#include <sstream>
#include "absl/strings/escaping.h"
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+
#include "aos/ipc_lib/lockless_queue_memory.h"
#include "aos/realtime.h"
#include "aos/util/compiler_memory_barrier.h"
-#include "gflags/gflags.h"
-#include "glog/logging.h"
DEFINE_bool(dump_lockless_queue_data, false,
"If true, print the data out when dumping the queue.");
diff --git a/aos/ipc_lib/lockless_queue.h b/aos/ipc_lib/lockless_queue.h
index f7a85c3..9cc97c0 100644
--- a/aos/ipc_lib/lockless_queue.h
+++ b/aos/ipc_lib/lockless_queue.h
@@ -9,6 +9,7 @@
#include <vector>
#include "absl/types/span.h"
+
#include "aos/ipc_lib/aos_sync.h"
#include "aos/ipc_lib/data_alignment.h"
#include "aos/ipc_lib/index.h"
diff --git a/aos/ipc_lib/lockless_queue_death_test.cc b/aos/ipc_lib/lockless_queue_death_test.cc
index 13eb1f5..3ed3099 100644
--- a/aos/ipc_lib/lockless_queue_death_test.cc
+++ b/aos/ipc_lib/lockless_queue_death_test.cc
@@ -15,6 +15,10 @@
#include <memory>
#include <thread>
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+#include "gtest/gtest.h"
+
#include "aos/ipc_lib/aos_sync.h"
#include "aos/ipc_lib/lockless_queue.h"
#include "aos/ipc_lib/lockless_queue_memory.h"
@@ -23,9 +27,6 @@
#include "aos/realtime.h"
#include "aos/testing/prevent_exit.h"
#include "aos/testing/test_logging.h"
-#include "gflags/gflags.h"
-#include "glog/logging.h"
-#include "gtest/gtest.h"
namespace aos {
namespace ipc_lib {
diff --git a/aos/ipc_lib/lockless_queue_test.cc b/aos/ipc_lib/lockless_queue_test.cc
index b708ebc..34e2762 100644
--- a/aos/ipc_lib/lockless_queue_test.cc
+++ b/aos/ipc_lib/lockless_queue_test.cc
@@ -10,6 +10,9 @@
#include <random>
#include <thread>
+#include "gflags/gflags.h"
+#include "gtest/gtest.h"
+
#include "aos/events/epoll.h"
#include "aos/ipc_lib/aos_sync.h"
#include "aos/ipc_lib/event.h"
@@ -17,8 +20,6 @@
#include "aos/ipc_lib/signalfd.h"
#include "aos/realtime.h"
#include "aos/util/phased_loop.h"
-#include "gflags/gflags.h"
-#include "gtest/gtest.h"
DEFINE_int32(min_iterations, 100,
"Minimum number of stress test iterations to run");
diff --git a/aos/ipc_lib/memory_mapped_queue.h b/aos/ipc_lib/memory_mapped_queue.h
index 784c559..653dc77 100644
--- a/aos/ipc_lib/memory_mapped_queue.h
+++ b/aos/ipc_lib/memory_mapped_queue.h
@@ -2,6 +2,7 @@
#define AOS_IPC_LIB_MEMORY_MAPPED_QUEUE_H_
#include "absl/types/span.h"
+
#include "aos/configuration.h"
#include "aos/ipc_lib/lockless_queue.h"
diff --git a/aos/ipc_lib/named_pipe_latency.cc b/aos/ipc_lib/named_pipe_latency.cc
index 11ea66e..032b72e 100644
--- a/aos/ipc_lib/named_pipe_latency.cc
+++ b/aos/ipc_lib/named_pipe_latency.cc
@@ -5,6 +5,8 @@
#include <random>
#include <thread>
+#include "gflags/gflags.h"
+
#include "aos/events/epoll.h"
#include "aos/init.h"
#include "aos/ipc_lib/latency_lib.h"
@@ -12,7 +14,6 @@
#include "aos/logging/logging.h"
#include "aos/realtime.h"
#include "aos/time/time.h"
-#include "gflags/gflags.h"
// This is a demo program which uses named pipes to communicate.
// It measures both latency of a random timer thread, and latency of the
diff --git a/aos/ipc_lib/queue_racer.cc b/aos/ipc_lib/queue_racer.cc
index 414b7fb..7c0408d 100644
--- a/aos/ipc_lib/queue_racer.cc
+++ b/aos/ipc_lib/queue_racer.cc
@@ -4,9 +4,10 @@
#include <cstring>
#include <limits>
-#include "aos/ipc_lib/event.h"
#include "gtest/gtest.h"
+#include "aos/ipc_lib/event.h"
+
namespace aos {
namespace ipc_lib {
namespace {
diff --git a/aos/ipc_lib/shared_mem.cc b/aos/ipc_lib/shared_mem.cc
index c91bbe9..e5de366 100644
--- a/aos/ipc_lib/shared_mem.cc
+++ b/aos/ipc_lib/shared_mem.cc
@@ -11,9 +11,10 @@
#include <cstdlib>
#include <cstring>
+#include "glog/logging.h"
+
#include "aos/ipc_lib/aos_sync.h"
#include "aos/ipc_lib/core_lib.h"
-#include "glog/logging.h"
// the path for the shared memory segment. see shm_open(3) for restrictions
#define AOS_SHM_NAME "/aos_shared_mem"
diff --git a/aos/ipc_lib/signal_stress.cc b/aos/ipc_lib/signal_stress.cc
index 57a4158..0559bce 100644
--- a/aos/ipc_lib/signal_stress.cc
+++ b/aos/ipc_lib/signal_stress.cc
@@ -5,6 +5,8 @@
#include <random>
#include <thread>
+#include "gflags/gflags.h"
+
#include "aos/events/epoll.h"
#include "aos/init.h"
#include "aos/ipc_lib/latency_lib.h"
@@ -12,7 +14,6 @@
#include "aos/logging/logging.h"
#include "aos/realtime.h"
#include "aos/time/time.h"
-#include "gflags/gflags.h"
// This is a demo program which uses Real-Time posix signals to communicate.
// It measures both latency of a random timer thread, and latency of the
diff --git a/aos/ipc_lib/signalfd_test.cc b/aos/ipc_lib/signalfd_test.cc
index 1c8e750..40c0a13 100644
--- a/aos/ipc_lib/signalfd_test.cc
+++ b/aos/ipc_lib/signalfd_test.cc
@@ -1,9 +1,10 @@
#include "aos/ipc_lib/signalfd.h"
-#include "aos/testing/test_logging.h"
#include "glog/logging.h"
#include "gtest/gtest.h"
+#include "aos/testing/test_logging.h"
+
namespace aos {
namespace ipc_lib {
namespace testing {