Delete ringbuffer LoadMonitor (#7528)

Co-authored-by: Amaury Chamayou <amchamay@microsoft.com>

Author: eddyashton

src/ds/messaging.h

@@ -46,8 +46,6 @@ namespace messaging
     std::map<MessageType, Handler> handlers;
     std::map<MessageType, char const*> message_labels;
 
-    MessageCounts message_counts;
-
     std::string get_error_prefix()
     {
       return std::string("[") + std::string(name) + std::string("] ");
@@ -174,28 +172,6 @@ namespace messaging
         LOG_TRACE_FMT("{}", e.what());
         throw e;
       }
-
-      auto& counts = message_counts[m];
-      counts.messages++;
-      counts.bytes += size;
-    }
-
-    MessageCounts retrieve_message_counts()
-    {
-      MessageCounts current;
-      std::swap(message_counts, current);
-      return current;
-    }
-
-    nlohmann::json convert_message_counts(const MessageCounts& mc)
-    {
-      auto j = nlohmann::json::object();
-      for (const auto& it : mc)
-      {
-        j[get_message_name(it.first)] = {
-          {"count", it.second.messages}, {"bytes", it.second.bytes}};
-      }
-      return j;
     }
   };
 

src/ds/test/messaging.cpp

@@ -198,21 +198,12 @@ TEST_CASE("Basic message loop" * doctest::test_suite("messaging"))
   {
     test_filler.write(echo_out);
     REQUIRE_THROWS_AS(bp.run(loop_src), messaging::no_handler);
-
-    const auto counts = bp.get_dispatcher().retrieve_message_counts();
-    REQUIRE(counts.empty());
   }
 
   SUBCASE("Message handlers can finish the loop")
   {
     test_filler.write(finish);
     REQUIRE(bp.run(loop_src) == 1);
-
-    const auto counts = bp.get_dispatcher().retrieve_message_counts();
-    REQUIRE(counts.size() == 1);
-    REQUIRE(counts.find(finish) != counts.end());
-    REQUIRE(counts.at(finish).messages == 1);
-    REQUIRE(counts.at(finish).bytes == 0);
   }
 
   SUBCASE("Message handlers can affect external state")
@@ -222,15 +213,6 @@ TEST_CASE("Basic message loop" * doctest::test_suite("messaging"))
     test_filler.write(finish);
     REQUIRE(bp.run(loop_src) == 2);
     REQUIRE(x == new_x);
-
-    const auto counts = bp.get_dispatcher().retrieve_message_counts();
-    REQUIRE(counts.size() == 2);
-    REQUIRE(counts.find(set_x) != counts.end());
-    REQUIRE(counts.at(set_x).messages == 1);
-    REQUIRE(counts.at(set_x).bytes == sizeof(new_x));
-    REQUIRE(counts.find(finish) != counts.end());
-    REQUIRE(counts.at(finish).messages == 1);
-    REQUIRE(counts.at(finish).bytes == 0);
   }
 
   SUBCASE("Message handlers can communicate through the writer")
@@ -250,15 +232,6 @@ TEST_CASE("Basic message loop" * doctest::test_suite("messaging"))
             REQUIRE(data[i] == actual[i]);
           }
         }) == 1);
-
-    const auto counts = bp.get_dispatcher().retrieve_message_counts();
-    REQUIRE(counts.size() == 2);
-    REQUIRE(counts.find(echo) != counts.end());
-    REQUIRE(counts.at(echo).messages == 1);
-    REQUIRE(counts.at(echo).bytes == actual.size());
-    REQUIRE(counts.find(finish) != counts.end());
-    REQUIRE(counts.at(finish).messages == 1);
-    REQUIRE(counts.at(finish).bytes == 0);
   }
 
   SUBCASE("Dispatcher can be accessed directly")
@@ -280,12 +253,6 @@ TEST_CASE("Basic message loop" * doctest::test_suite("messaging"))
       dispatcher.remove_message_handler(set_x), messaging::no_handler);
     REQUIRE_THROWS_AS(
       dispatcher.dispatch(set_x, nullptr, 0), messaging::no_handler);
-
-    const auto counts = bp.get_dispatcher().retrieve_message_counts();
-    REQUIRE(counts.size() == 1);
-    REQUIRE(counts.find(set_x) != counts.end());
-    REQUIRE(counts.at(set_x).messages == 1);
-    REQUIRE(counts.at(set_x).bytes == 0);
   }
 }
 

src/enclave/enclave.h

@@ -247,11 +247,6 @@ namespace ccf
           bp,
           AdminMessage::tick,
           [this, &disp = bp.get_dispatcher()](const uint8_t*, size_t) {
-            const auto message_counts = disp.retrieve_message_counts();
-            const auto j = disp.convert_message_counts(message_counts);
-            RINGBUFFER_WRITE_MESSAGE(
-              AdminMessage::work_stats, to_host, j.dump());
-
             const auto time_now = decltype(last_tick_time)::clock::now();
 
             const auto elapsed_ms =

src/enclave/interface.h

@@ -26,13 +26,10 @@ enum AdminMessage : ringbuffer::Message
   /// Periodically update based on current time. Host -> Enclave
   DEFINE_RINGBUFFER_MSG_TYPE(tick),
 
-  /// Notify the host of work done since last message. Enclave -> Host
-  DEFINE_RINGBUFFER_MSG_TYPE(work_stats)
 };
 
 DECLARE_RINGBUFFER_MESSAGE_PAYLOAD(AdminMessage::fatal_error_msg, std::string);
 DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::stop);
 DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::stop_notice);
 DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::stopped);
 DECLARE_RINGBUFFER_MESSAGE_NO_PAYLOAD(AdminMessage::tick);
-DECLARE_RINGBUFFER_MESSAGE_PAYLOAD(AdminMessage::work_stats, std::string);

src/host/load_monitor.h

@@ -33,7 +33,6 @@
 #include "http/curl.h"
 #include "json_schema.h"
 #include "lfs_file_handler.h"
-#include "load_monitor.h"
 #include "node_connections.h"
 #include "pal/quote_generation.h"
 #include "rpc_connections.h"
@@ -666,9 +665,6 @@ namespace ccf
     // reset the inbound-UDP processing quota each iteration
     const asynchost::ResetUDPReadQuota reset_udp_quota;
 
-    // regularly record some load statistics
-    const asynchost::LoadMonitor load_monitor(500ms, buffer_processor);
-
     // handle outbound logging and admin messages from the enclave
     const asynchost::HandleRingbuffer handle_ringbuffer(
       1ms,