Move thread stuff to subdirectory

include/llarp.h

@@ -7,7 +7,7 @@
 #include <handlers/tun.hpp>     // for handlers
 #include <service/address.hpp>  // for service::address
 #include <service/endpoint.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <util/mem.h>
 
 extern "C"

libabyss/include/abyss/server.hpp

@@ -3,8 +3,8 @@
 
 #include <ev/ev.h>
 #include <util/json.hpp>
-#include <util/logic.hpp>
 #include <util/string_view.hpp>
+#include <util/thread/logic.hpp>
 #include <util/time.hpp>
 
 #include <absl/types/optional.h>

llarp/CMakeLists.txt

@@ -25,7 +25,6 @@ set(LIB_UTIL_SRC
   util/logging/ostream_logger.cpp
   util/logging/syslog_logger.cpp
   util/logging/win32_logger.cpp
-  util/logic.cpp
   util/mem.cpp
   util/meta/memfn_traits.cpp
   util/meta/memfn.cpp
@@ -39,19 +38,20 @@ set(LIB_UTIL_SRC
   util/metrics/stream_publisher.cpp
   util/metrics/types.cpp
   util/printer.cpp
-  util/queue_manager.cpp
-  util/queue.cpp
-  util/scheduler.cpp
   util/status.cpp
   util/stopwatch.cpp
   util/str.cpp
   util/string_view.cpp
-  util/thread_pool.cpp
-  util/threading.cpp
-  util/threadpool.cpp
+  util/thread/logic.cpp
+  util/thread/queue_manager.cpp
+  util/thread/queue.cpp
+  util/thread/scheduler.cpp
+  util/thread/thread_pool.cpp
+  util/thread/threading.cpp
+  util/thread/threadpool.cpp
+  util/thread/timer.cpp
+  util/thread/timerqueue.cpp
   util/time.cpp
-  util/timer.cpp
-  util/timerqueue.cpp
   util/types.cpp
 )
 

llarp/context.cpp

@@ -15,7 +15,7 @@
 #include <util/metrics/metrics.hpp>
 #include <util/metrics/metrictank_publisher.hpp>
 #include <util/metrics/stream_publisher.hpp>
-#include <util/scheduler.hpp>
+#include <util/thread/scheduler.hpp>
 
 #include <absl/strings/str_split.h>
 #include <cxxopts.hpp>

llarp/crypto/encrypted_frame.hpp

@@ -6,7 +6,7 @@
 #include <util/buffer.hpp>
 #include <utility>
 #include <util/mem.h>
-#include <util/threadpool.h>
+#include <util/thread/threadpool.h>
 
 namespace llarp
 {

llarp/dht/context.cpp

@@ -17,7 +17,7 @@
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
 #include <routing/dht_message.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <nodedb.hpp>
 
 #include <vector>

llarp/dns/server.cpp

@@ -1,7 +1,7 @@
 #include <dns/server.hpp>
 
 #include <crypto/crypto.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <array>
 #include <utility>
 

llarp/dns/server.hpp

@@ -5,7 +5,7 @@
 #include <ev/ev.h>
 #include <net/net.hpp>
 #include <util/string_view.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 
 #include <unordered_map>
 

llarp/ev/ev.cpp

@@ -1,7 +1,7 @@
 #include <ev/ev.h>
-#include <util/logic.hpp>
 #include <util/mem.hpp>
 #include <util/string_view.hpp>
+#include <util/thread/logic.hpp>
 #include <net/net_addr.hpp>
 
 #include <cstddef>

llarp/ev/ev.hpp

@@ -4,7 +4,7 @@
 #include <ev/ev.h>
 #include <util/buffer.hpp>
 #include <util/codel.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 // writev
 #ifndef _WIN32

llarp/handlers/tun.cpp

@@ -12,8 +12,8 @@
 #include <ev/ev.hpp>
 #include <router/abstractrouter.hpp>
 #include <service/context.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 #include <nodedb.hpp>
 
 #include <util/str.hpp>

llarp/handlers/tun.hpp

@@ -7,7 +7,7 @@
 #include <net/net.hpp>
 #include <service/endpoint.hpp>
 #include <util/codel.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <future>
 

llarp/link/i_link_manager.hpp

@@ -2,8 +2,8 @@
 #define LLARP_I_LINK_MANAGER_HPP
 
 #include <link/server.hpp>
+#include <util/thread/logic.hpp>
 #include <util/types.hpp>
-#include <util/logic.hpp>
 
 #include <functional>
 

llarp/link/link_manager.hpp

@@ -4,7 +4,7 @@
 #include <link/i_link_manager.hpp>
 
 #include <util/compare_ptr.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <link/server.hpp>
 
 #include <unordered_map>

llarp/link/server.hpp

@@ -6,9 +6,9 @@
 #include <link/session.hpp>
 #include <net/net.hpp>
 #include <router_contact.hpp>
-#include <util/logic.hpp>
-#include <util/threading.hpp>
 #include <util/status.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/threading.hpp>
 
 #include <list>
 #include <memory>

llarp/messages/relay_commit.cpp

@@ -11,8 +11,8 @@
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
 #include <util/logging/logger.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 
 #include <functional>
 

llarp/messages/relay_status.cpp

@@ -8,8 +8,8 @@
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
 #include <util/logging/logger.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 
 #include <functional>
 #include <utility>

llarp/nodedb.cpp

@@ -6,9 +6,9 @@
 #include <util/encode.hpp>
 #include <util/fs.hpp>
 #include <util/logging/logger.hpp>
-#include <util/logic.hpp>
 #include <util/mem.hpp>
-#include <util/thread_pool.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/thread_pool.hpp>
 
 #include <fstream>
 #include <unordered_map>

llarp/nodedb.hpp

@@ -5,7 +5,7 @@
 #include <router_id.hpp>
 #include <util/common.hpp>
 #include <util/fs.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <absl/base/thread_annotations.h>
 

llarp/path/path.cpp

@@ -13,7 +13,7 @@
 #include <routing/transfer_traffic_message.hpp>
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 
 #include <deque>
 

llarp/path/path.hpp

@@ -15,7 +15,7 @@
 #include <service/intro.hpp>
 #include <util/aligned.hpp>
 #include <util/compare_ptr.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <util/time.hpp>
 
 #include <algorithm>

llarp/path/pathbuilder.cpp

@@ -7,8 +7,8 @@
 #include <profiling.hpp>
 #include <router/abstractrouter.hpp>
 #include <util/buffer.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 
 #include <functional>
 

llarp/path/pathset.hpp

@@ -6,7 +6,7 @@
 #include <routing/message.hpp>
 #include <service/intro_set.hpp>
 #include <util/status.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <util/time.hpp>
 
 #include <functional>

llarp/profiling.hpp

@@ -4,7 +4,7 @@
 #include <path/path.hpp>
 #include <router_id.hpp>
 #include <util/bencode.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <absl/base/thread_annotations.h>
 #include <map>

llarp/router/outbound_message_handler.hpp

@@ -3,8 +3,8 @@
 
 #include <router/i_outbound_message_handler.hpp>
 
-#include <util/threading.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/threading.hpp>
 #include <router_id.hpp>
 
 #include <list>

llarp/router/outbound_session_maker.cpp

@@ -5,9 +5,9 @@
 #include <nodedb.hpp>
 #include <router/i_rc_lookup_handler.hpp>
 #include <link/i_link_manager.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
-#include <util/threading.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/threading.hpp>
 #include <util/status.hpp>
 #include <crypto/crypto.hpp>
 #include <utility>

llarp/router/outbound_session_maker.hpp

@@ -4,9 +4,9 @@
 #include <router/i_outbound_session_maker.hpp>
 
 #include <router/i_rc_lookup_handler.hpp>
-#include <util/threading.hpp>
-#include <util/thread_pool.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/threading.hpp>
+#include <util/thread/thread_pool.hpp>
 
 #include <unordered_map>
 #include <list>

llarp/router/rc_lookup_handler.cpp

@@ -7,7 +7,7 @@
 #include <router_contact.hpp>
 #include <util/meta/memfn.hpp>
 #include <util/types.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <nodedb.hpp>
 #include <dht/context.hpp>
 

llarp/router/rc_lookup_handler.hpp

@@ -3,8 +3,8 @@
 
 #include <router/i_rc_lookup_handler.hpp>
 
-#include <util/threading.hpp>
-#include <util/thread_pool.hpp>
+#include <util/thread/threading.hpp>
+#include <util/thread/thread_pool.hpp>
 
 #include <unordered_map>
 #include <set>

llarp/router/router.hpp

@@ -8,28 +8,28 @@
 #include <ev/ev.h>
 #include <exit/context.hpp>
 #include <handlers/tun.hpp>
+#include <link/factory.hpp>
+#include <link/link_manager.hpp>
 #include <link/server.hpp>
 #include <messages/link_message_parser.hpp>
 #include <nodedb.hpp>
 #include <path/path_context.hpp>
 #include <profiling.hpp>
 #include <router_contact.hpp>
+#include <router/outbound_message_handler.hpp>
+#include <router/outbound_session_maker.hpp>
+#include <router/rc_lookup_handler.hpp>
 #include <routing/handler.hpp>
 #include <routing/message_parser.hpp>
 #include <rpc/rpc.hpp>
 #include <service/context.hpp>
 #include <util/buffer.hpp>
 #include <util/fs.hpp>
-#include <util/logic.hpp>
 #include <util/mem.hpp>
 #include <util/status.hpp>
 #include <util/str.hpp>
-#include <util/threadpool.h>
-#include <router/outbound_message_handler.hpp>
-#include <router/outbound_session_maker.hpp>
-#include <link/link_manager.hpp>
-#include <link/factory.hpp>
-#include <router/rc_lookup_handler.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/threadpool.h>
 
 #include <functional>
 #include <list>

llarp/service/async_key_exchange.cpp

@@ -2,8 +2,8 @@
 
 #include <crypto/crypto.hpp>
 #include <crypto/types.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 #include <utility>
 
 namespace llarp

llarp/service/endpoint.cpp

@@ -15,11 +15,12 @@
 #include <service/hidden_service_address_lookup.hpp>
 #include <service/outbound_context.hpp>
 #include <service/protocol.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <util/str.hpp>
 #include <util/buffer.hpp>
 #include <util/meta/memfn.hpp>
 #include <hook/shell.hpp>
+
 #include <utility>
 
 namespace llarp

llarp/service/endpoint.hpp

@@ -17,7 +17,7 @@
 #include <service/tag_lookup_job.hpp>
 #include <hook/ihook.hpp>
 #include <util/compare_ptr.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 
 // minimum time between introset shifts
 #ifndef MIN_SHIFT_INTERVAL

llarp/service/lookup.cpp

@@ -3,7 +3,7 @@
 #include <path/path.hpp>
 #include <util/time.hpp>
 #include <router/abstractrouter.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <utility>
 
 namespace llarp

llarp/service/protocol.cpp

@@ -2,9 +2,10 @@
 #include <path/path.hpp>
 #include <routing/handler.hpp>
 #include <util/buffer.hpp>
-#include <util/logic.hpp>
 #include <util/mem.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
+
 #include <utility>
 
 namespace llarp

llarp/service/sendcontext.cpp

@@ -3,7 +3,7 @@
 #include <router/abstractrouter.hpp>
 #include <routing/path_transfer_message.hpp>
 #include <service/endpoint.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <utility>
 
 namespace llarp

llarp/util/codel.hpp

@@ -3,7 +3,7 @@
 
 #include <util/logging/logger.hpp>
 #include <util/mem.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <util/time.hpp>
 
 #include <algorithm>

llarp/util/logging/file_logger.hpp

@@ -3,7 +3,7 @@
 
 #include <util/logging/logstream.hpp>
 
-#include <util/thread_pool.hpp>
+#include <util/thread/thread_pool.hpp>
 #include <util/time.hpp>
 
 #include <deque>

llarp/util/meta/object.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_OBJECT_HPP
 #define LLARP_OBJECT_HPP
 
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <absl/types/optional.h>
 #include <vector>

llarp/util/metrics/core.hpp

@@ -2,9 +2,9 @@
 #define LLARP_METRICS_CORE_HPP
 
 #include <util/metrics/types.hpp>
-#include <util/scheduler.hpp>
 #include <util/stopwatch.hpp>
-#include <util/threading.hpp>
+#include <util/thread/scheduler.hpp>
+#include <util/thread/threading.hpp>
 
 #include <map>
 #include <memory>

llarp/util/metrics/metrictank_publisher.hpp

@@ -3,7 +3,7 @@
 
 #include <util/metrics/core.hpp>
 
-#include <util/queue.hpp>
+#include <util/thread/queue.hpp>
 
 #include <absl/types/variant.h>
 #include <string>

llarp/util/metrics/types.hpp

@@ -3,7 +3,7 @@
 
 #include <util/printer.hpp>
 #include <util/string_view.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <util/types.hpp>
 #include <util/meta/variant.hpp>
 

llarp/util/queue.cpp

@@ -1 +0,0 @@
-#include <util/queue.hpp>

llarp/util/thread/logic.cpp

@@ -1,4 +1,4 @@
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 
 #include <util/logging/logger.hpp>
 #include <util/mem.h>

llarp/util/thread/logic.hpp

@@ -2,8 +2,8 @@
 #define LLARP_LOGIC_HPP
 
 #include <util/mem.h>
-#include <util/threadpool.h>
-#include <util/timer.hpp>
+#include <util/thread/threadpool.h>
+#include <util/thread/timer.hpp>
 
 namespace llarp
 {

llarp/util/thread/queue.cpp

@@ -0,0 +1 @@
+#include <util/thread/queue.hpp>

llarp/util/thread/queue.hpp

@@ -1,8 +1,8 @@
 #ifndef LLARP_QUEUE_HPP
 #define LLARP_QUEUE_HPP
 
-#include <util/queue_manager.hpp>
-#include <util/threading.hpp>
+#include <util/thread/queue_manager.hpp>
+#include <util/thread/threading.hpp>
 
 #include <absl/types/optional.h>
 #include <atomic>

llarp/util/thread/queue_manager.cpp

@@ -1,5 +1,5 @@
-#include <util/queue_manager.hpp>
-#include <util/threading.hpp>
+#include <util/thread/queue_manager.hpp>
+#include <util/thread/threading.hpp>
 
 #include <thread>
 

llarp/util/thread/scheduler.cpp

@@ -1,4 +1,4 @@
-#include <util/scheduler.hpp>
+#include <util/thread/scheduler.hpp>
 #include <utility>
 
 namespace llarp

llarp/util/thread/scheduler.hpp

@@ -2,7 +2,7 @@
 #define LLARP_SCHEDULER_HPP
 
 #include <util/meta/object.hpp>
-#include <util/timerqueue.hpp>
+#include <util/thread/timerqueue.hpp>
 
 #include <absl/time/time.h>
 #include <atomic>

llarp/util/thread/thread_pool.cpp

@@ -1,6 +1,6 @@
-#include <util/thread_pool.hpp>
+#include <util/thread/thread_pool.hpp>
 
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 namespace llarp
 {

llarp/util/thread/thread_pool.hpp

@@ -1,9 +1,9 @@
 #ifndef LLARP_THREAD_POOL_HPP
 #define LLARP_THREAD_POOL_HPP
 
-#include <util/queue.hpp>
 #include <util/string_view.hpp>
-#include <util/threading.hpp>
+#include <util/thread/queue.hpp>
+#include <util/thread/threading.hpp>
 
 #include <atomic>
 #include <functional>

llarp/util/thread/threading.cpp

@@ -1,4 +1,4 @@
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <util/logging/logger.hpp>
 

llarp/util/thread/threadpool.cpp

@@ -1,7 +1,7 @@
 #include <util/logging/logger.hpp>
 #include <util/time.hpp>
-#include <util/threadpool.h>
-#include <util/thread_pool.hpp>
+#include <util/thread/threadpool.h>
+#include <util/thread/thread_pool.hpp>
 
 #include <cstring>
 #include <functional>

llarp/util/thread/threadpool.h

@@ -1,10 +1,10 @@
 #ifndef LLARP_THREADPOOL_H
 #define LLARP_THREADPOOL_H
 
-#include <util/queue.hpp>
 #include <util/string_view.hpp>
-#include <util/thread_pool.hpp>
-#include <util/threading.hpp>
+#include <util/thread/queue.hpp>
+#include <util/thread/thread_pool.hpp>
+#include <util/thread/threading.hpp>
 
 #include <absl/base/thread_annotations.h>
 #include <memory>

llarp/util/thread/timer.cpp

@@ -1,5 +1,6 @@
+#include <util/thread/timer.hpp>
+
 #include <util/time.hpp>
-#include <util/timer.hpp>
 
 #include <atomic>
 #include <condition_variable>

llarp/util/thread/timer.hpp

@@ -2,7 +2,7 @@
 #define LLARP_TIMER_HPP
 
 #include <util/common.hpp>
-#include <util/threadpool.h>
+#include <util/thread/threadpool.h>
 #include <util/time.hpp>
 
 #include <functional>

llarp/util/thread/timerqueue.cpp

@@ -0,0 +1 @@
+#include <util/thread/timerqueue.hpp>

llarp/util/thread/timerqueue.hpp

@@ -2,7 +2,7 @@
 #define LLARP_UTIL_TIMERQUEUE_HPP
 
 #include <util/meta/object.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <atomic>
 #include <absl/time/time.h>

llarp/util/timerqueue.cpp

@@ -1 +0,0 @@
-#include <util/timerqueue.hpp>

test/CMakeLists.txt

@@ -43,12 +43,12 @@ list(APPEND TEST_SRC
     util/test_llarp_util_bits.cpp
     util/test_llarp_util_encode.cpp
     util/test_llarp_util_printer.cpp
-    util/test_llarp_util_queue_manager.cpp
-    util/test_llarp_util_queue.cpp
-    util/test_llarp_util_thread_pool.cpp
-    util/test_llarp_util_timerqueue.cpp
-    util/test_llarp_utils_scheduler.cpp
     util/test_llarp_utils_str.cpp
+    util/thread/test_llarp_util_queue_manager.cpp
+    util/thread/test_llarp_util_queue.cpp
+    util/thread/test_llarp_util_thread_pool.cpp
+    util/thread/test_llarp_util_timerqueue.cpp
+    util/thread/test_llarp_utils_scheduler.cpp
 )
 
 add_executable(${TEST_EXE}

test/test_libabyss.cpp

@@ -4,7 +4,7 @@
 #include <crypto/crypto_libsodium.hpp>
 #include <ev/ev.h>
 #include <net/net.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <gtest/gtest.h>
 

test/test_llarp_dns.cpp

@@ -2,9 +2,9 @@
 
 #include <dns.hpp>
 #include <dnsc.hpp>
-#include <llarp.h>         // for llarp_main_init
-#include <net/net.hpp>     // for llarp::Addr
-#include <util/logic.hpp>  // for threadpool/llarp::Logic
+#include <llarp.h>                // for llarp_main_init
+#include <net/net.hpp>            // for llarp::Addr
+#include <util/thread/logic.hpp>  // for threadpool/llarp::Logic
 
 struct DNSTest : public ::testing::Test
 {

test/test_llarp_dnsd.cpp

@@ -2,9 +2,9 @@
 
 #include <dnsd.hpp>
 
-#include <llarp.h>         // for llarp_main_init
-#include <net/net.hpp>     // for llarp::Addr
-#include <util/logic.hpp>  // for threadpool/llarp::Logic
+#include <llarp.h>                // for llarp_main_init
+#include <net/net.hpp>            // for llarp::Addr
+#include <util/thread/logic.hpp>  // for threadpool/llarp::Logic
 
 unsigned int g_length = 0;
 std::string g_result  = "";

test/util/thread/test_llarp_util_queue.cpp

@@ -1,10 +1,10 @@
-#include <util/queue.hpp>
-#include <util/threading.hpp>
+#include <util/thread/queue.hpp>
+#include <util/thread/threading.hpp>
 
 #include <array>
+#include <condition_variable>
 #include <functional>
 #include <thread>
-#include <condition_variable>
 
 #include <gtest/gtest.h>
 

test/util/thread/test_llarp_util_queue_manager.cpp

@@ -1,4 +1,4 @@
-#include <util/queue_manager.hpp>
+#include <util/thread/queue_manager.hpp>
 
 #include <absl/types/optional.h>
 #include <vector>

test/util/thread/test_llarp_util_thread_pool.cpp

@@ -1,10 +1,9 @@
-#include <util/thread_pool.hpp>
-#include <util/threading.hpp>
-#include <condition_variable>
+#include <util/thread/thread_pool.hpp>
+#include <util/thread/threading.hpp>
 
-#include <thread>
-#include <mutex>
 #include <condition_variable>
+#include <mutex>
+#include <thread>
 
 #include <gtest/gtest.h>
 

test/util/thread/test_llarp_util_timerqueue.cpp

@@ -1,4 +1,4 @@
-#include <util/timerqueue.hpp>
+#include <util/thread/timerqueue.hpp>
 
 #include <thread>
 
@@ -277,7 +277,8 @@ TEST(TimerQueue, ThreadSafety)
           std::vector< StringItem >* vPtr = nfo->second;
 
           // We stagger the removeAll steps among the threads.
-          const unsigned int STEP_REMOVE_ALL = THREAD_ID * NUM_REMOVE_ALL / NUM_THREADS;
+          const unsigned int STEP_REMOVE_ALL =
+              THREAD_ID * NUM_REMOVE_ALL / NUM_THREADS;
 
           std::ostringstream oss;
           oss << THREAD_ID;

test/util/thread/test_llarp_utils_scheduler.cpp

@@ -1,4 +1,4 @@
-#include <util/scheduler.hpp>
+#include <util/thread/scheduler.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>