Use shared_ptr

resetius · Nov 26, 2023 · 3352323 · 3352323
1 parent a68f63e
commit 3352323
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/src/raft.cpp b/src/raft.cpp
@@ -375,7 +375,7 @@ void TRaft::Become(EState newStateName) {
     }
 }
 
-void TRaft::Process(TMessageHolder<TMessage> message, INode* replyTo) {
+void TRaft::Process(TMessageHolder<TMessage> message, const std::shared_ptr<INode>& replyTo) {
     auto now = TimeSource->Now();
 
     if (message.IsEx()) {
@@ -404,7 +404,7 @@ void TRaft::Process(TMessageHolder<TMessage> message, INode* replyTo) {
     ApplyResult(now, std::move(result), replyTo);
 }
 
-void TRaft::ApplyResult(ITimeSource::Time now, std::unique_ptr<TResult> result, INode* replyTo) {
+void TRaft::ApplyResult(ITimeSource::Time now, std::unique_ptr<TResult> result, const std::shared_ptr<INode>& replyTo) {
     if (!result) {
         return;
     }

diff --git a/src/raft.h b/src/raft.h
@@ -69,8 +69,8 @@ class TRaft {
 public:
     TRaft(int node, const TNodeDict& nodes, const std::shared_ptr<ITimeSource>& ts);
 
-    void Process(TMessageHolder<TMessage> message, INode* replyTo = nullptr);
-    void ApplyResult(ITimeSource::Time now, std::unique_ptr<TResult> result, INode* replyTo = nullptr);
+    void Process(TMessageHolder<TMessage> message, const std::shared_ptr<INode>& replyTo = {});
+    void ApplyResult(ITimeSource::Time now, std::unique_ptr<TResult> result, const std::shared_ptr<INode>& replyTo = {});
 
 // ut
     EState CurrentStateName() const {

diff --git a/src/server.cpp b/src/server.cpp
@@ -85,6 +85,10 @@ void TNode::Send(const TMessageHolder<TMessage>& message) {
 }
 
 void TNode::Drain() {
+    if (!Connected) {
+        Connect();
+        return;
+    }
     if (!Drainer || Drainer.done()) {
         if (Drainer && Drainer.done()) {
             Drainer.destroy();
@@ -94,18 +98,13 @@ void TNode::Drain() {
 }
 
 NNet::TTestTask TNode::DoDrain() {
-    if (!Connected) {
-        Connect();
-        co_return;
-    }
     auto tosend = std::move(Messages);
     try {
         for (auto&& m : tosend) {
             co_await TWriter(Socket).Write(std::move(m));
         }
     } catch (const std::exception& ex) {
         std::cout << "Error on write: " << ex.what() << "\n";
-        Connect();
     }
     Messages.clear();
     co_return;
@@ -143,13 +142,14 @@ NNet::TTestTask TNode::DoConnect() {
 
 NNet::TSimpleTask TRaftServer::InboundConnection(NNet::TSocket socket) {
     try {
-        TClientNode client;
+        auto client = std::make_shared<TClientNode>();
+        Nodes.insert(client);
         while (true) {
             auto mes = co_await TReader(socket).Read();
             std::cout << "Got message " << mes->Type << "\n";
-            Raft->Process(std::move(mes), &client);
-            if (!client.Messages.empty()) {
-                auto tosend = std::move(client.Messages); client.Messages.clear();
+            Raft->Process(std::move(mes), client);
+            if (!client->Messages.empty()) {
+                auto tosend = std::move(client->Messages); client->Messages.clear();
                 for (auto&& mes : tosend) {
                     co_await TWriter(socket).Write(std::move(mes));
                 }
@@ -168,7 +168,7 @@ void TRaftServer::Serve() {
 }
 
 void TRaftServer::DrainNodes() {
-    for (auto [id, node] : Nodes) {
+    for (const auto& node : Nodes) {
         node->Drain();
     }
 }

diff --git a/src/server.h b/src/server.h
@@ -195,9 +195,12 @@ class TRaftServer {
         : Poller(poller)
         , Socket(std::move(address), Poller)
         , Raft(raft)
-        , Nodes(nodes)
         , TimeSource(ts)
-    { }
+    {
+        for (const auto& [_, node] : nodes) {
+            Nodes.insert(node);
+        }
+    }
 
     void Serve();
 
@@ -210,6 +213,6 @@ class TRaftServer {
     NNet::TPoll& Poller;
     NNet::TPoll::TSocket Socket;
     std::shared_ptr<TRaft> Raft;
-    TNodeDict Nodes;
+    std::unordered_set<std::shared_ptr<INode>> Nodes;
     std::shared_ptr<ITimeSource> TimeSource;
 };