Merge remote-tracking branch 'origin/master'

daemon/main.cpp

@@ -1,7 +1,7 @@
 #include <config/config.hpp>  // for ensure_config
 #include <llarp.h>
 #include <util/fs.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #include <csignal>
 

daemon/rcutil.cpp

@@ -1,6 +1,6 @@
 #include <router_contact.hpp>
-#include <util/logger.hpp>
-#include <util/ostream_logger.hpp>
+#include <util/logging/logger.hpp>
+#include <util/logging/ostream_logger.hpp>
 
 #include <absl/synchronization/mutex.h>
 #include <cxxopts.hpp>

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>

libabyss/src/client.cpp

@@ -3,7 +3,7 @@
 #include <abyss/md5.hpp>
 #include <crypto/crypto.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace abyss
 {

libabyss/src/server.cpp

@@ -2,7 +2,7 @@
 
 #include <abyss/http.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/time.hpp>
 
 #include <algorithm>

llarp/CMakeLists.txt

@@ -17,39 +17,42 @@ set(LIB_UTIL_SRC
   util/endian.cpp
   util/fs.cpp
   util/json.cpp
-  util/logger.cpp
-  util/android_logger.cpp
-  util/file_logger.cpp
-  util/logic.cpp
-  util/loglevel.cpp
+  util/logging/android_logger.cpp
+  util/logging/file_logger.cpp
+  util/logging/json_logger.cpp
+  util/logging/logger.cpp
+  util/logging/loglevel.cpp
+  util/logging/ostream_logger.cpp
+  util/logging/syslog_logger.cpp
+  util/logging/win32_logger.cpp
   util/mem.cpp
-  util/memfn_traits.cpp
-  util/memfn.cpp
-  util/metrics_core.cpp
-  util/metrics_types.cpp
-  util/json_logger.cpp
-  util/ostream_logger.cpp
-  util/syslog_logger.cpp
-  util/win32_logger.cpp
-  util/metrics.cpp
-  util/object.cpp
+  util/meta/memfn_traits.cpp
+  util/meta/memfn.cpp
+  util/meta/object.cpp
+  util/meta/traits.cpp
+  util/meta/variant.cpp
+  util/metrics/core.cpp
+  util/metrics/json_publisher.cpp
+  util/metrics/metrics.cpp
+  util/metrics/metrictank_publisher.cpp
+  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/traits.cpp
   util/types.cpp
-  util/variant.cpp
 )
 
 add_library(${UTIL_LIB} STATIC ${LIB_UTIL_SRC})
@@ -75,9 +78,6 @@ set(LIB_PLATFORM_SRC
 # for networking
   ev/ev.cpp
   ev/pipe.cpp
-  metrics/metrictank_publisher.cpp
-  metrics/json_publisher.cpp
-  metrics/stream_publisher.cpp
   net/ip.cpp
   net/net.cpp
   net/net_addr.cpp

llarp/config/config.cpp

@@ -6,10 +6,10 @@
 #include <net/net.hpp>
 #include <router_contact.hpp>
 #include <util/fs.hpp>
-#include <util/logger_syslog.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger_syslog.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 #include <util/str.hpp>
 
 #include <absl/strings/strip.h>

llarp/config/ini.cpp

@@ -1,5 +1,6 @@
 #include <config/ini.hpp>
-#include <util/logger.hpp>
+
+#include <util/logging/logger.hpp>
 
 #include <cctype>
 #include <fstream>

llarp/context.cpp

@@ -7,15 +7,15 @@
 #include <dht/context.hpp>
 #include <dnsd.hpp>
 #include <ev/ev.hpp>
-#include <metrics/metrictank_publisher.hpp>
-#include <metrics/json_publisher.hpp>
-#include <metrics/stream_publisher.hpp>
 #include <nodedb.hpp>
 #include <router/router.hpp>
-#include <util/logger.h>
-#include <util/memfn.hpp>
-#include <util/metrics.hpp>
-#include <util/scheduler.hpp>
+#include <util/logging/logger.h>
+#include <util/meta/memfn.hpp>
+#include <util/metrics/json_publisher.hpp>
+#include <util/metrics/metrics.hpp>
+#include <util/metrics/metrictank_publisher.hpp>
+#include <util/metrics/stream_publisher.hpp>
+#include <util/thread/scheduler.hpp>
 
 #include <absl/strings/str_split.h>
 #include <cxxopts.hpp>

llarp/crypto/encrypted_frame.cpp

@@ -1,7 +1,7 @@
 #include <crypto/encrypted_frame.hpp>
 
 #include <crypto/crypto.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 
 namespace llarp

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/dht/localrouterlookup.cpp

@@ -6,7 +6,7 @@
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
 #include <routing/dht_message.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {

llarp/dht/localserviceaddresslookup.cpp

@@ -5,7 +5,7 @@
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
 #include <routing/dht_message.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {

llarp/dht/tx.hpp

@@ -3,7 +3,7 @@
 
 #include <dht/key.hpp>
 #include <dht/txowner.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/status.hpp>
 
 #include <set>

llarp/dht/txholder.hpp

@@ -3,7 +3,6 @@
 
 #include <dht/tx.hpp>
 #include <dht/txowner.hpp>
-#include <util/logger.hpp>
 #include <util/time.hpp>
 #include <util/status.hpp>
 

llarp/dns.cpp

@@ -2,7 +2,7 @@
 
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 void
 hexDump(const char *buffer, uint16_t size)

llarp/dns/message.cpp

@@ -3,7 +3,7 @@
 #include <dns/dns.hpp>
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 #include <net/ip.hpp>
 

llarp/dns/question.cpp

@@ -1,6 +1,6 @@
 #include <dns/question.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 
 namespace llarp

llarp/dns/rr.cpp

@@ -1,6 +1,6 @@
 #include <dns/rr.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 
 namespace llarp

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/dnsc.cpp

@@ -1,6 +1,6 @@
 #include <dnsc.hpp>
 #include <net/net.hpp>  // for llarp::Addr
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #ifndef _WIN32
 #include <arpa/inet.h>

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/ev/ev_win32.cpp

@@ -2,6 +2,8 @@
 
 #ifdef _WIN32
 
+#include <util/logging/logger.hpp>
+
 // a single event queue for the TUN interface
 static HANDLE tun_event_queue = INVALID_HANDLE_VALUE;
 

llarp/ev/ev_win32.hpp

@@ -5,7 +5,6 @@
 #include <net/net.h>
 #include <net/net.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
 
 #include <windows.h>
 #include <process.h>

llarp/exit/session.cpp

@@ -5,7 +5,7 @@
 #include <path/path_context.hpp>
 #include <path/path.hpp>
 #include <router/abstractrouter.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 #include <utility>
 
 namespace llarp

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/memfn.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/iwp/iwp.cpp

@@ -1,7 +1,7 @@
 #include <iwp/iwp.hpp>
 #include <iwp/linklayer.hpp>
 #include <router/abstractrouter.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 
 namespace llarp
 {

llarp/iwp/session.cpp

@@ -1,7 +1,8 @@
 #include <iwp/session.hpp>
-#include <util/memfn.hpp>
+
 #include <messages/link_intro.hpp>
 #include <messages/discard.hpp>
+#include <util/meta/memfn.hpp>
 
 namespace llarp
 {
@@ -685,4 +686,4 @@ namespace llarp
       }
     }
   }  // namespace iwp
-}  // namespace llarp
+}  // namespace llarp

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/link_intro.cpp

@@ -4,7 +4,7 @@
 #include <router_contact.hpp>
 #include <router/abstractrouter.hpp>
 #include <util/bencode.h>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {

llarp/messages/link_message_parser.cpp

@@ -9,8 +9,8 @@
 #include <messages/relay.hpp>
 #include <router_contact.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
-#include <util/metrics.hpp>
+#include <util/logging/logger.hpp>
+#include <util/metrics/metrics.hpp>
 
 #include <memory>
 

llarp/messages/relay_commit.cpp

@@ -10,9 +10,9 @@
 #include <routing/path_confirm_message.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
-#include <util/logic.hpp>
-#include <util/memfn.hpp>
+#include <util/logging/logger.hpp>
+#include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 
 #include <functional>
 

llarp/messages/relay_status.cpp

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

llarp/net/net.cpp

@@ -14,7 +14,7 @@
 
 #include <net/net_addr.hpp>
 #include <net/ip.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/str.hpp>
 
 #include <cstdio>

llarp/net/net.hpp

@@ -5,7 +5,6 @@
 #include <net/address_info.hpp>
 #include <net/net_int.hpp>
 #include <net/net.h>
-#include <util/logger.hpp>
 #include <util/mem.hpp>
 #include <util/string_view.hpp>
 #include <util/bits.hpp>

llarp/nodedb.cpp

@@ -5,10 +5,10 @@
 #include <util/buffer.hpp>
 #include <util/encode.hpp>
 #include <util/fs.hpp>
-#include <util/logger.hpp>
-#include <util/logic.hpp>
+#include <util/logging/logger.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/memfn.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.cpp

@@ -4,7 +4,7 @@
 #include <router/i_outbound_session_maker.hpp>
 #include <link/i_link_manager.hpp>
 #include <constants/link_layer.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 #include <util/status.hpp>
 
 #include <algorithm>

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/memfn.hpp>
-#include <util/threading.hpp>
+#include <util/meta/memfn.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

@@ -5,9 +5,9 @@
 #include <crypto/crypto.hpp>
 #include <service/context.hpp>
 #include <router_contact.hpp>
-#include <util/memfn.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.cpp

@@ -1,10 +1,10 @@
 #include <router/router.hpp>
 
 #include <config/config.hpp>
-#include <constants/proto.hpp>
 #include <constants/limits.hpp>
-#include <crypto/crypto.hpp>
+#include <constants/proto.hpp>
 #include <crypto/crypto_libsodium.hpp>
+#include <crypto/crypto.hpp>
 #include <dht/context.hpp>
 #include <dht/node.hpp>
 #include <iwp/iwp.hpp>
@@ -14,20 +14,20 @@
 #include <rpc/rpc.hpp>
 #include <util/buffer.hpp>
 #include <util/encode.hpp>
-#include <util/logger.hpp>
-#include <util/memfn.hpp>
-#include <util/file_logger.hpp>
-#include <util/json_logger.hpp>
-#include <util/logger_syslog.hpp>
-#include <util/metrics.hpp>
+#include <util/logging/file_logger.hpp>
+#include <util/logging/json_logger.hpp>
+#include <util/logging/logger_syslog.hpp>
+#include <util/logging/logger.hpp>
+#include <util/meta/memfn.hpp>
+#include <util/metrics/metrics.hpp>
 #include <util/str.hpp>
-#include <utility>
 #include <utp/utp.hpp>
 
 #include <fstream>
 #include <cstdlib>
 #include <iterator>
 #include <unordered_map>
+#include <utility>
 #if defined(RPI) || defined(ANDROID)
 #include <unistd.h>
 #endif

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/router_contact.cpp

@@ -5,7 +5,7 @@
 #include <net/net.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 #include <util/printer.hpp>
 #include <util/time.hpp>

llarp/rpc/rpc.cpp

@@ -2,12 +2,12 @@
 
 #include <router/abstractrouter.hpp>
 #include <service/context.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <router_id.hpp>
 #include <exit/context.hpp>
 
 #include <util/encode.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 #include <libabyss.hpp>
 #include <utility>
 

llarp/service/async_key_exchange.cpp

@@ -2,8 +2,8 @@
 
 #include <crypto/crypto.hpp>
 #include <crypto/types.hpp>
-#include <util/logic.hpp>
-#include <util/memfn.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/memfn.hpp>
+#include <util/meta/memfn.hpp>
 #include <hook/shell.hpp>
+
 #include <utility>
 
 namespace llarp

llarp/service/endpoint.hpp

@@ -18,7 +18,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/endpoint_util.cpp

@@ -3,7 +3,7 @@
 #include <exit/session.hpp>
 #include <service/outbound_context.hpp>
 #include <service/lookup.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {

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/outbound_context.cpp

@@ -6,7 +6,7 @@
 #include <service/endpoint.hpp>
 #include <nodedb.hpp>
 #include <profiling.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 
 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/memfn.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/aligned.hpp

@@ -3,9 +3,9 @@
 
 #include <util/bencode.h>
 #include <util/encode.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
+#include <util/meta/traits.hpp>
 #include <util/printer.hpp>
-#include <util/traits.hpp>
 
 #include <array>
 #include <cstddef>

llarp/util/bencode.cpp

@@ -1,5 +1,5 @@
 #include <util/bencode.h>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <cstdlib>
 #include <cinttypes>
 #include <cstdio>

llarp/util/bencode.hpp

@@ -4,7 +4,7 @@
 #include <util/buffer.hpp>
 #include <util/bencode.h>
 #include <util/fs.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 
 #include <fstream>

llarp/util/codel.hpp

@@ -1,9 +1,9 @@
 #ifndef LLARP_CODEL_QUEUE_HPP
 #define LLARP_CODEL_QUEUE_HPP
 
-#include <util/logger.hpp>
+#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/fs.cpp

@@ -1,6 +1,6 @@
 #include <util/fs.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>

llarp/util/logging/android_logger.cpp

@@ -1,6 +1,8 @@
 #if defined(ANDROID)
-#include <util/android_logger.hpp>
-#include <util/logger_internal.hpp>
+
+#include <util/logging/android_logger.hpp>
+#include <util/logging/logger_internal.hpp>
+
 #include <android/log.h>
 namespace llarp
 {

llarp/util/logging/android_logger.hpp

@@ -1,7 +1,8 @@
 #ifndef LLARP_UTIL_ANDROID_LOGGER_HPP
 #define LLARP_UTIL_ANDROID_LOGGER_HPP
 
-#include <util/logstream.hpp>
+#include <util/logging/logstream.hpp>
+
 #include <iostream>
 
 namespace llarp

llarp/util/logging/file_logger.cpp

@@ -1,5 +1,6 @@
-#include <util/file_logger.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/file_logger.hpp>
+#include <util/logging/logger_internal.hpp>
+
 #include <utility>
 
 namespace llarp

llarp/util/logging/file_logger.hpp

@@ -1,8 +1,9 @@
 #ifndef LLARP_UTIL_FILE_LOGGER_HPP
 #define LLARP_UTIL_FILE_LOGGER_HPP
 
-#include <util/logstream.hpp>
-#include <util/thread_pool.hpp>
+#include <util/logging/logstream.hpp>
+
+#include <util/thread/thread_pool.hpp>
 #include <util/time.hpp>
 
 #include <deque>

llarp/util/logging/json_logger.cpp

@@ -1,4 +1,4 @@
-#include <util/json_logger.hpp>
+#include <util/logging/json_logger.hpp>
 #include <util/json.hpp>
 
 namespace llarp
@@ -17,4 +17,4 @@ namespace llarp
     m_Lines.emplace_back(obj.dump());
   }
 
-}  // namespace llarp
+}  // namespace llarp

llarp/util/logging/json_logger.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_UTIL_JSON_LOGGER
 #define LLARP_UTIL_JSON_LOGGER
 
-#include <util/file_logger.hpp>
+#include <util/logging/file_logger.hpp>
 
 namespace llarp
 {
@@ -19,4 +19,4 @@ namespace llarp
   };
 }  // namespace llarp
 
-#endif
+#endif

llarp/util/logging/logger.cpp

@@ -1,11 +1,11 @@
-#include <util/logger.hpp>
-#include <util/logger.h>
-#include <util/ostream_logger.hpp>
+#include <util/logging/logger.hpp>
+#include <util/logging/logger.h>
+#include <util/logging/ostream_logger.hpp>
 #if defined(_WIN32)
-#include <util/win32_logger.hpp>
+#include <util/logging/win32_logger.hpp>
 #endif
 #if defined(ANDROID)
-#include <util/android_logger.hpp>
+#include <util/logging/android_logger.hpp>
 #endif
 
 namespace llarp

llarp/util/logging/logger.hpp

@@ -2,8 +2,8 @@
 #define LLARP_UTIL_LOGGER_HPP
 
 #include <util/time.hpp>
-#include <util/logstream.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/logstream.hpp>
+#include <util/logging/logger_internal.hpp>
 /*
 #ifdef _WIN32
 #define VC_EXTRALEAN

llarp/util/logging/logger_syslog.hpp

@@ -1,6 +1,7 @@
 #ifndef LLARP_UTIL_LOGGER_SYSLOG_HPP
 #define LLARP_UTIL_LOGGER_SYSLOG_HPP
-#include <util/logstream.hpp>
+
+#include <util/logging/logstream.hpp>
 #include <iostream>
 
 namespace llarp

llarp/util/logging/loglevel.cpp

@@ -1,4 +1,4 @@
-#include <util/loglevel.hpp>
+#include <util/logging/loglevel.hpp>
 
 namespace llarp
 {
@@ -19,4 +19,4 @@ namespace llarp
         return "???";
     }
   }
-}  // namespace llarp
+}  // namespace llarp

llarp/util/logging/logstream.hpp

@@ -1,10 +1,12 @@
 #ifndef LLARP_UTIL_LOG_STREAM_HPP
 #define LLARP_UTIL_LOG_STREAM_HPP
+#include <util/logging/loglevel.hpp>
+
+#include <util/time.hpp>
+
 #include <memory>
 #include <string>
-#include <util/loglevel.hpp>
 #include <sstream>
-#include <util/time.hpp>
 
 namespace llarp
 {

llarp/util/logging/ostream_logger.cpp

@@ -1,5 +1,5 @@
-#include <util/ostream_logger.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/ostream_logger.hpp>
+#include <util/logging/logger_internal.hpp>
 
 namespace llarp
 {

llarp/util/logging/ostream_logger.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_UTIL_OSTREAM_LOGGER_HPP
 #define LLARP_UTIL_OSTREAM_LOGGER_HPP
 
-#include <util/logstream.hpp>
+#include <util/logging/logstream.hpp>
 #include <iostream>
 
 namespace llarp

llarp/util/logging/syslog_logger.cpp

@@ -1,6 +1,8 @@
 #ifndef _WIN32
-#include <util/logger_syslog.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/logger_syslog.hpp>
+
+#include <util/logging/logger_internal.hpp>
+
 #include <syslog.h>
 namespace llarp
 {

llarp/util/logging/win32_logger.cpp

@@ -1,6 +1,6 @@
 #if defined(_WIN32)
-#include <util/win32_logger.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/win32_logger.hpp>
+#include <util/logging/logger_internal.hpp>
 
 static CONSOLE_SCREEN_BUFFER_INFO consoleInfo;
 static short old_attrs;

llarp/util/logging/win32_logger.hpp

@@ -1,7 +1,7 @@
 #ifndef LLARP_UTIL_WIN32_LOGGER_HPP
 #define LLARP_UTIL_WIN32_LOGGER_HPP
 #if defined(_WIN32)
-#include <util/ostream_logger.hpp>
+#include <util/logging/ostream_logger.hpp>
 #define VC_EXTRALEAN
 #include <windows.h>
 

llarp/util/memfn.cpp

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

llarp/util/memfn_traits.cpp

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

llarp/util/meta/memfn.cpp

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

llarp/util/meta/memfn.hpp

@@ -1,9 +1,9 @@
 #ifndef LLARP_UTIL_MEMFN
 #define LLARP_UTIL_MEMFN
 
-#include <util/memfn_traits.hpp>
-#include <util/object.hpp>
-#include <util/traits.hpp>
+#include <util/meta/memfn_traits.hpp>
+#include <util/meta/object.hpp>
+#include <util/meta/traits.hpp>
 
 #include <functional>
 #include <utility>

llarp/util/meta/memfn_traits.cpp

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

llarp/util/meta/memfn_traits.hpp

@@ -1,8 +1,8 @@
 #ifndef LLARP_UTIL_MEMFN_TRAITS
 #define LLARP_UTIL_MEMFN_TRAITS
 
-#include <util/object.hpp>
-#include <util/traits.hpp>
+#include <util/meta/object.hpp>
+#include <util/meta/traits.hpp>
 
 #include <functional>
 #include <utility>

llarp/util/meta/object.cpp

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

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/meta/traits.cpp

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