From 0950571313fd11b7cc9aa9c3dd7ed788d9874851 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 1 Sep 2019 13:58:27 +0100 Subject: [PATCH] Move metrics to subdirectory --- llarp/CMakeLists.txt | 12 ++++++------ llarp/context.cpp | 8 ++++---- llarp/messages/link_message_parser.cpp | 2 +- llarp/router/router.cpp | 2 +- llarp/util/metrics.cpp | 1 - llarp/util/{metrics_core.cpp => metrics/core.cpp} | 2 +- llarp/util/{metrics_core.hpp => metrics/core.hpp} | 2 +- llarp/{ => util}/metrics/json_publisher.cpp | 2 +- llarp/{ => util}/metrics/json_publisher.hpp | 2 +- llarp/util/metrics/metrics.cpp | 1 + llarp/util/{ => metrics}/metrics.hpp | 4 ++-- llarp/{ => util}/metrics/metrictank_publisher.cpp | 2 +- llarp/{ => util}/metrics/metrictank_publisher.hpp | 2 +- llarp/{ => util}/metrics/stream_publisher.cpp | 2 +- llarp/{ => util}/metrics/stream_publisher.hpp | 2 +- .../util/{metrics_types.cpp => metrics/types.cpp} | 2 +- .../util/{metrics_types.hpp => metrics/types.hpp} | 0 llarp/utp/linklayer.hpp | 2 +- llarp/utp/session.cpp | 2 +- test/CMakeLists.txt | 14 +++++++------- .../metrics/test_llarp_metrics_metricktank.cpp | 2 +- .../metrics/test_llarp_metrics_publisher.cpp | 2 +- .../{ => metrics}/test_llarp_util_metrics_core.cpp | 2 +- .../test_llarp_util_metrics_types.cpp | 2 +- 24 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 llarp/util/metrics.cpp rename llarp/util/{metrics_core.cpp => metrics/core.cpp} (99%) rename llarp/util/{metrics_core.hpp => metrics/core.hpp} (99%) rename llarp/{ => util}/metrics/json_publisher.cpp (99%) rename llarp/{ => util}/metrics/json_publisher.hpp (96%) create mode 100644 llarp/util/metrics/metrics.cpp rename llarp/util/{ => metrics}/metrics.hpp (97%) rename llarp/{ => util}/metrics/metrictank_publisher.cpp (99%) rename llarp/{ => util}/metrics/metrictank_publisher.hpp (98%) rename llarp/{ => util}/metrics/stream_publisher.cpp (99%) rename llarp/{ => util}/metrics/stream_publisher.hpp (93%) rename llarp/util/{metrics_types.cpp => metrics/types.cpp} (98%) rename llarp/util/{metrics_types.hpp => metrics/types.hpp} (100%) rename test/{ => util}/metrics/test_llarp_metrics_metricktank.cpp (89%) rename test/{ => util}/metrics/test_llarp_metrics_publisher.cpp (95%) rename test/util/{ => metrics}/test_llarp_util_metrics_core.cpp (99%) rename test/util/{ => metrics}/test_llarp_util_metrics_types.cpp (99%) diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt index fffe53b06..35485b2b7 100644 --- a/llarp/CMakeLists.txt +++ b/llarp/CMakeLists.txt @@ -32,9 +32,12 @@ set(LIB_UTIL_SRC util/meta/object.cpp util/meta/traits.cpp util/meta/variant.cpp - util/metrics_core.cpp - util/metrics_types.cpp - util/metrics.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 @@ -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 diff --git a/llarp/context.cpp b/llarp/context.cpp index 5e8aaef59..326c56871 100644 --- a/llarp/context.cpp +++ b/llarp/context.cpp @@ -7,14 +7,14 @@ #include #include #include -#include -#include -#include #include #include #include #include -#include +#include +#include +#include +#include #include #include diff --git a/llarp/messages/link_message_parser.cpp b/llarp/messages/link_message_parser.cpp index 802ab1f57..9327051c5 100644 --- a/llarp/messages/link_message_parser.cpp +++ b/llarp/messages/link_message_parser.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp index d8c87bcdf..9a72d542b 100644 --- a/llarp/router/router.cpp +++ b/llarp/router/router.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/llarp/util/metrics.cpp b/llarp/util/metrics.cpp deleted file mode 100644 index 786ead528..000000000 --- a/llarp/util/metrics.cpp +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/llarp/util/metrics_core.cpp b/llarp/util/metrics/core.cpp similarity index 99% rename from llarp/util/metrics_core.cpp rename to llarp/util/metrics/core.cpp index e58b63dbc..a7fceeaba 100644 --- a/llarp/util/metrics_core.cpp +++ b/llarp/util/metrics/core.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/llarp/util/metrics_core.hpp b/llarp/util/metrics/core.hpp similarity index 99% rename from llarp/util/metrics_core.hpp rename to llarp/util/metrics/core.hpp index 512fa18ac..029cccfc4 100644 --- a/llarp/util/metrics_core.hpp +++ b/llarp/util/metrics/core.hpp @@ -1,7 +1,7 @@ #ifndef LLARP_METRICS_CORE_HPP #define LLARP_METRICS_CORE_HPP -#include +#include #include #include #include diff --git a/llarp/metrics/json_publisher.cpp b/llarp/util/metrics/json_publisher.cpp similarity index 99% rename from llarp/metrics/json_publisher.cpp rename to llarp/util/metrics/json_publisher.cpp index 24c052f8b..ef25374e5 100644 --- a/llarp/metrics/json_publisher.cpp +++ b/llarp/util/metrics/json_publisher.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/llarp/metrics/json_publisher.hpp b/llarp/util/metrics/json_publisher.hpp similarity index 96% rename from llarp/metrics/json_publisher.hpp rename to llarp/util/metrics/json_publisher.hpp index b684a2495..bc2722fe0 100644 --- a/llarp/metrics/json_publisher.hpp +++ b/llarp/util/metrics/json_publisher.hpp @@ -2,7 +2,7 @@ #define LLARP_METRICS_JSON_PUBLISHER_HPP #include -#include +#include #include diff --git a/llarp/util/metrics/metrics.cpp b/llarp/util/metrics/metrics.cpp new file mode 100644 index 000000000..c0df453ae --- /dev/null +++ b/llarp/util/metrics/metrics.cpp @@ -0,0 +1 @@ +#include diff --git a/llarp/util/metrics.hpp b/llarp/util/metrics/metrics.hpp similarity index 97% rename from llarp/util/metrics.hpp rename to llarp/util/metrics/metrics.hpp index 2a885dc01..07dfbf7cd 100644 --- a/llarp/util/metrics.hpp +++ b/llarp/util/metrics/metrics.hpp @@ -1,8 +1,8 @@ #ifndef LLARP_METRICS_HPP #define LLARP_METRICS_HPP -#include -#include +#include +#include #include namespace llarp diff --git a/llarp/metrics/metrictank_publisher.cpp b/llarp/util/metrics/metrictank_publisher.cpp similarity index 99% rename from llarp/metrics/metrictank_publisher.cpp rename to llarp/util/metrics/metrictank_publisher.cpp index 51ffba0b1..58410843f 100644 --- a/llarp/metrics/metrictank_publisher.cpp +++ b/llarp/util/metrics/metrictank_publisher.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/llarp/metrics/metrictank_publisher.hpp b/llarp/util/metrics/metrictank_publisher.hpp similarity index 98% rename from llarp/metrics/metrictank_publisher.hpp rename to llarp/util/metrics/metrictank_publisher.hpp index 044b4ec87..930bf55d2 100644 --- a/llarp/metrics/metrictank_publisher.hpp +++ b/llarp/util/metrics/metrictank_publisher.hpp @@ -1,7 +1,7 @@ #ifndef LLARP_METRICS_METRICTANK_PUBLISHER_HPP #define LLARP_METRICS_METRICTANK_PUBLISHER_HPP -#include +#include #include diff --git a/llarp/metrics/stream_publisher.cpp b/llarp/util/metrics/stream_publisher.cpp similarity index 99% rename from llarp/metrics/stream_publisher.cpp rename to llarp/util/metrics/stream_publisher.cpp index 5608b36ad..917a1b446 100644 --- a/llarp/metrics/stream_publisher.cpp +++ b/llarp/util/metrics/stream_publisher.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/llarp/metrics/stream_publisher.hpp b/llarp/util/metrics/stream_publisher.hpp similarity index 93% rename from llarp/metrics/stream_publisher.hpp rename to llarp/util/metrics/stream_publisher.hpp index 4fbb9ff7a..1fc9cd8df 100644 --- a/llarp/metrics/stream_publisher.hpp +++ b/llarp/util/metrics/stream_publisher.hpp @@ -1,7 +1,7 @@ #ifndef LLARP_METRICS_STREAM_PUBLISHER_HPP #define LLARP_METRICS_STREAM_PUBLISHER_HPP -#include +#include #include diff --git a/llarp/util/metrics_types.cpp b/llarp/util/metrics/types.cpp similarity index 98% rename from llarp/util/metrics_types.cpp rename to llarp/util/metrics/types.cpp index a918440a5..facb33817 100644 --- a/llarp/util/metrics_types.cpp +++ b/llarp/util/metrics/types.cpp @@ -1,4 +1,4 @@ -#include +#include #include diff --git a/llarp/util/metrics_types.hpp b/llarp/util/metrics/types.hpp similarity index 100% rename from llarp/util/metrics_types.hpp rename to llarp/util/metrics/types.hpp diff --git a/llarp/utp/linklayer.hpp b/llarp/utp/linklayer.hpp index cb7f6929f..cf74df8a5 100644 --- a/llarp/utp/linklayer.hpp +++ b/llarp/utp/linklayer.hpp @@ -75,7 +75,7 @@ namespace llarp /// stop link layer void - Stop(); + Stop() override; /// regenerate transport keypair bool diff --git a/llarp/utp/session.cpp b/llarp/utp/session.cpp index 747327130..8c48383af 100644 --- a/llarp/utp/session.cpp +++ b/llarp/utp/session.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include namespace llarp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a7215126a..4896e5ff9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -18,8 +18,6 @@ list(APPEND TEST_SRC exit/test_llarp_exit_context.cpp link/test_llarp_link.cpp llarp_test.cpp - metrics/test_llarp_metrics_metricktank.cpp - metrics/test_llarp_metrics_publisher.cpp net/test_llarp_net_inaddr.cpp net/test_llarp_net.cpp routing/llarp_routing_transfer_traffic.cpp @@ -33,20 +31,22 @@ list(APPEND TEST_SRC test_llarp_router_contact.cpp test_llarp_router.cpp test_md5.cpp + util/meta/test_llarp_util_memfn.cpp + util/meta/test_llarp_util_object.cpp + util/meta/test_llarp_util_traits.cpp + util/metrics/test_llarp_metrics_metricktank.cpp + util/metrics/test_llarp_metrics_publisher.cpp + util/metrics/test_llarp_util_metrics_core.cpp + util/metrics/test_llarp_util_metrics_types.cpp util/test_llarp_util_aligned.cpp util/test_llarp_util_bencode.cpp util/test_llarp_util_bits.cpp util/test_llarp_util_encode.cpp - util/test_llarp_util_metrics_core.cpp - util/test_llarp_util_metrics_types.cpp - util/meta/test_llarp_util_memfn.cpp - util/meta/test_llarp_util_object.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/meta/test_llarp_util_traits.cpp util/test_llarp_utils_scheduler.cpp util/test_llarp_utils_str.cpp ) diff --git a/test/metrics/test_llarp_metrics_metricktank.cpp b/test/util/metrics/test_llarp_metrics_metricktank.cpp similarity index 89% rename from test/metrics/test_llarp_metrics_metricktank.cpp rename to test/util/metrics/test_llarp_metrics_metricktank.cpp index 5a17a1bb9..00ca47bcd 100644 --- a/test/metrics/test_llarp_metrics_metricktank.cpp +++ b/test/util/metrics/test_llarp_metrics_metricktank.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/metrics/test_llarp_metrics_publisher.cpp b/test/util/metrics/test_llarp_metrics_publisher.cpp similarity index 95% rename from test/metrics/test_llarp_metrics_publisher.cpp rename to test/util/metrics/test_llarp_metrics_publisher.cpp index 89bdfc3a4..83a34b41d 100644 --- a/test/metrics/test_llarp_metrics_publisher.cpp +++ b/test/util/metrics/test_llarp_metrics_publisher.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/util/test_llarp_util_metrics_core.cpp b/test/util/metrics/test_llarp_util_metrics_core.cpp similarity index 99% rename from test/util/test_llarp_util_metrics_core.cpp rename to test/util/metrics/test_llarp_util_metrics_core.cpp index 6a00e5ad0..e67b16603 100644 --- a/test/util/test_llarp_util_metrics_core.cpp +++ b/test/util/metrics/test_llarp_util_metrics_core.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/util/test_llarp_util_metrics_types.cpp b/test/util/metrics/test_llarp_util_metrics_types.cpp similarity index 99% rename from test/util/test_llarp_util_metrics_types.cpp rename to test/util/metrics/test_llarp_util_metrics_types.cpp index 60304e12d..bc8be449d 100644 --- a/test/util/test_llarp_util_metrics_types.cpp +++ b/test/util/metrics/test_llarp_util_metrics_types.cpp @@ -1,4 +1,4 @@ -#include +#include #include