From 7f1d960a56973424634cfed74aa0a04df52df723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 16 Jan 2020 13:24:37 -0500
Subject: [PATCH] dhtrunner: add async/non-blocking version of getNodeInfo

---
 include/opendht/dhtrunner.h |  1 +
 src/dht_proxy_server.cpp    | 15 ++++++++-------
 src/dhtrunner.cpp           | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/include/opendht/dhtrunner.h b/include/opendht/dhtrunner.h
index 2687de11..2fa737cd 100644
--- a/include/opendht/dhtrunner.h
+++ b/include/opendht/dhtrunner.h
@@ -349,6 +349,7 @@ public:
     NodeStats getNodesStats(sa_family_t af) const;
     unsigned getNodesStats(sa_family_t af, unsigned *good_return, unsigned *dubious_return, unsigned *cached_return, unsigned *incoming_return) const;
     NodeInfo getNodeInfo() const;
+    void getNodeInfo(std::function<void(std::shared_ptr<NodeInfo>)>);
 
     std::vector<unsigned> getNodeMessageStats(bool in = false) const;
     std::string getStorageLog() const;
diff --git a/src/dht_proxy_server.cpp b/src/dht_proxy_server.cpp
index f0ff8a0e..da41154f 100644
--- a/src/dht_proxy_server.cpp
+++ b/src/dht_proxy_server.cpp
@@ -378,13 +378,14 @@ DhtProxyServer::handlePrintStats(const asio::error_code &ec)
 
     if (auto dht = dht_) {
         // Refresh stats cache
-        auto newInfo = std::make_shared<NodeInfo>(dht->getNodeInfo());
-        stats_ = updateStats(newInfo);
-        nodeInfo_ = newInfo;
-        auto json = newInfo->toJson();
-        auto str = Json::writeString(jsonBuilder_, json);
-        if (logger_)
-            logger_->d("[proxy:server] [stats] %s", str.c_str());
+        dht->getNodeInfo([this](std::shared_ptr<NodeInfo> newInfo){
+            stats_ = updateStats(newInfo);
+            nodeInfo_ = newInfo;
+            if (logger_) {
+                auto str = Json::writeString(jsonBuilder_, newInfo->toJson());
+                logger_->d("[proxy:server] [stats] %s", str.c_str());
+            }
+        });
     }
     printStatsTimer_->expires_at(printStatsTimer_->expiry() + PRINT_STATS_PERIOD);
     printStatsTimer_->async_wait(std::bind(&DhtProxyServer::handlePrintStats, this, std::placeholders::_1));
diff --git a/src/dhtrunner.cpp b/src/dhtrunner.cpp
index 633e2897..ac55d5e6 100644
--- a/src/dhtrunner.cpp
+++ b/src/dhtrunner.cpp
@@ -486,6 +486,25 @@ DhtRunner::getNodeInfo() const {
     return info;
 }
 
+void
+DhtRunner::getNodeInfo(std::function<void(std::shared_ptr<NodeInfo>)> cb)
+{
+    std::lock_guard<std::mutex> lck(storage_mtx);
+    ongoing_ops++;
+    pending_ops_prio.emplace([cb = std::move(cb), this](SecureDht& dht){
+        auto sinfo = std::make_shared<NodeInfo>();
+        auto& info = *sinfo;
+        info.id = dht.getId();
+        info.node_id = dht.getNodeId();
+        info.ipv4 = dht.getNodesStats(AF_INET);
+        info.ipv6 = dht.getNodesStats(AF_INET6);
+        info.ongoing_ops = ongoing_ops;
+        cb(sinfo);
+        opEnded();
+    });
+    cv.notify_all();
+}
+
 std::vector<unsigned>
 DhtRunner::getNodeMessageStats(bool in) const
 {