merge: hotfix/clientDestruction into dev

Alexandre jublot · Alexandre jublot · commit 740cc2d1d3d7 · 2022-11-08T21:03:58.000+01:00
diff --git a/src/include/tcp/ClientImpl.hpp b/src/include/tcp/ClientImpl.hpp
@@ -87,7 +87,17 @@ namespace polymorph::network::tcp
             /**
              * @property    Atomic boolean to know if the ClientImpl is already sending a packet
              */
-            std::atomic<bool> _writeInProgress;
+            std::atomic<bool> _writeInProgress = false;
+
+            /**
+             * @property    Atomic boolean to know if the ClientImpl is receiving a packet
+             */
+            std::atomic<bool> _receiveInProgress = false;
+
+            /**
+             * @property    Atomic boolean to know if the ClientImpl is already sending a packet
+             */
+            std::atomic<bool> _stopping = false;
 
             /**
              * @property    Mutex to lock the send queue and ensure thread safety
diff --git a/src/src/tcp/ClientImpl.cpp b/src/src/tcp/ClientImpl.cpp
@@ -109,13 +109,15 @@ void polymorph::network::tcp::ClientImpl::_doSend()
 
 void polymorph::network::tcp::ClientImpl::_doReceive()
 {
+    _receiveInProgress = false;
     _socket.async_receive(asio::buffer(_internalBuffer), [this](const asio::error_code &error, std::size_t bytesReceived) {
-        if (error == asio::error::operation_aborted || error == asio::error::eof)
+        if (error == asio::error::operation_aborted || error == asio::error::eof || _stopping)
             return;
         if (error) {
             std::cerr << "Error while receiving packet: " << error.message() << std::endl;
             return;
         }
+        _receiveInProgress = true;
         _receiveBuffer.insert(_receiveBuffer.end(), _internalBuffer.begin(), _internalBuffer.begin() + bytesReceived);
         while (_receiveBuffer.size() > sizeof(PacketHeader) ) {
             auto header = SerializerTrait<PacketHeader>::deserialize(_receiveBuffer);
@@ -144,8 +146,8 @@ polymorph::network::tcp::ClientImpl::~ClientImpl()
 
     if (!_context.stopped())
         _context.stop();
-
-    while (_writeInProgress) {
+    _stopping = true;
+    while (_writeInProgress || _receiveInProgress) {
         std::this_thread::sleep_for(std::chrono::milliseconds(1));
     }
 }
diff --git a/src/src/udp/ClientImpl.cpp b/src/src/udp/ClientImpl.cpp
@@ -53,15 +53,15 @@ polymorph::network::udp::ClientImpl::~ClientImpl()
     std::promise<void> promise;
     auto future = promise.get_future();
 
-    while (isWriteInProgress() || isReceiveInProgress()) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(1));
-    }
     Client::send<DisconnectionDto>(polymorph::network::DisconnectionDto::opId, dto, [&promise](const PacketHeader &header, const DisconnectionDto &payload) {
         promise.set_value();
     });
     future.wait_for(std::chrono::seconds(1));
     if (!_context.stopped())
         _context.stop();
+    while (isWriteInProgress() || isReceiveInProgress()) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(1));
+    }
 }
 
 void polymorph::network::udp::ClientImpl::_ackReceived(const asio::ip::udp::endpoint &to,
diff --git a/tests/main.cpp b/tests/main.cpp
@@ -2,12 +2,13 @@
 #include <functional>
 #include <any>
 #include <map>
+#include <asio/ip/address_v4.hpp>
+
 #include "polymorph/network/udp/Client.hpp"
 #include "polymorph/network/udp/Server.hpp"
-#include "polymorph/network/udp/AConnector.hpp"
 #include "e2e-tests/utils.hpp"
 
-
+/*
 int main(){
     //checks
     std::uint16_t input_data = 42;
@@ -54,4 +55,10 @@ int main(){
     server.send(2, input_data);
     PNL_WAIT(PNL_TIME_OUT)
     return 0;
+}
+ */
+
+int main() {
+    asio::ip::make_address_v4("127.0.0.1");
+    return 0;
 }
