From 491753f5191f4ec74a4d8129797f375aa2b24ece Mon Sep 17 00:00:00 2001
From: Determinant <ted.sybil@gmail.com>
Date: Sun, 7 Apr 2019 17:54:52 -0400
Subject: audit client messages

---
 salticidae           |  2 +-
 src/hotstuff_app.cpp | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/salticidae b/salticidae
index 8a0d8fb..03e96c4 160000
--- a/salticidae
+++ b/salticidae
@@ -1 +1 @@
-Subproject commit 8a0d8fbaf59be7acc536b2a753caa27aa1fbae24
+Subproject commit 03e96c4ee3dcf14873a1cdad12509683006a3329
diff --git a/src/hotstuff_app.cpp b/src/hotstuff_app.cpp
index f8f15f9..30d127b 100644
--- a/src/hotstuff_app.cpp
+++ b/src/hotstuff_app.cpp
@@ -110,6 +110,11 @@ class HotStuffApp: public HotStuff {
         */
     }
 
+#ifdef HOTSTUFF_MSG_STAT
+    std::unordered_set<conn_t> client_conns;
+    void print_stat() const;
+#endif
+
     public:
     HotStuffApp(uint32_t blk_size,
                 double stat_period,
@@ -313,6 +318,7 @@ void HotStuffApp::client_request_cmd_handler(MsgReqCmd &&msg, const conn_t &conn
 void HotStuffApp::start(const std::vector<std::pair<NetAddr, bytearray_t>> &reps) {
     ev_stat_timer = TimerEvent(ec, [this](TimerEvent &) {
         HotStuff::print_stat();
+        HotStuffApp::print_stat();
         //HotStuffCore::prune(100);
         ev_stat_timer.add(stat_period);
     });
@@ -327,6 +333,35 @@ void HotStuffApp::start(const std::vector<std::pair<NetAddr, bytearray_t>> &reps
     HOTSTUFF_LOG_INFO("conns = %lu", HotStuff::size());
     HOTSTUFF_LOG_INFO("** starting the event loop...");
     HotStuff::start(reps);
+    cn.reg_conn_handler([this](const salticidae::ConnPool::conn_t &_conn, bool connected) {
+        auto conn = salticidae::static_pointer_cast<conn_t::type>(_conn);
+        if (connected)
+            client_conns.insert(conn);
+        else
+            client_conns.erase(conn);
+    });
     /* enter the event main loop */
     ec.dispatch();
 }
+
+void HotStuffApp::print_stat() const {
+#ifdef HOTSTUFF_MSG_STAT
+    HOTSTUFF_LOG_INFO("--- client msg. (10s) ---");
+    size_t _nsent = 0;
+    size_t _nrecv = 0;
+    for (const auto &conn: client_conns)
+    {
+        if (conn == nullptr) continue;
+        size_t ns = conn->get_nsent();
+        size_t nr = conn->get_nrecv();
+        size_t nsb = conn->get_nsentb();
+        size_t nrb = conn->get_nrecvb();
+        conn->clear_msgstat();
+        HOTSTUFF_LOG_INFO("%s: %u(%u), %u(%u)",
+            std::string(conn->get_addr()).c_str(), ns, nsb, nr, nrb);
+        _nsent += ns;
+        _nrecv += nr;
+    }
+    HOTSTUFF_LOG_INFO("--- end client msg. ---");
+#endif
+}
-- 
cgit v1.2.3