NITWORK: Remove copy constructor and operator= because singleton

PATCH
X-R-G-B · Oct 2, 2023 · e456d85 · e456d85
1 parent 1e2c549
commit e456d85
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 24 deletions.
diff --git a/src/Nitwork/ANitwork.hpp b/src/Nitwork/ANitwork.hpp
@@ -20,8 +20,11 @@ namespace Nitwork {
 
     class ANitwork : public INitwork {
         public:
-            ANitwork();
             virtual ~ANitwork() = default;
+            ANitwork(const ANitwork &) = delete;
+            ANitwork(const ANitwork &&) = delete;
+            void operator=(const ANitwork &) = delete;
+            void operator=(const ANitwork &&) = delete;
 
             // start the NitworkServer
             bool start(int port, int threadNb, int tick, const std::string &ip = "") override;
@@ -62,8 +65,10 @@ namespace Nitwork {
 
 
         protected:
+            ANitwork();
+
             /* Getters / Setters */
-            n_id_t getPacketID() const;
+            [[nodiscard]] n_id_t getPacketID() const;
             void addPacketToSend(const boost::asio::ip::udp::endpoint &, const struct packet_s &);
 
             void startReceiveHandler() final;

diff --git a/src/Nitwork/INitwork.hpp b/src/Nitwork/INitwork.hpp
@@ -18,11 +18,11 @@ extern "C"
 }
 
 namespace Nitwork {
-    typedef std::function<void(std::any &, boost::asio::ip::udp::endpoint &)> actionHandler;
-    typedef std::function<void(
+    using actionHandler = std::function<void(std::any &, boost::asio::ip::udp::endpoint &)>;
+    using handleBodyT = std::function<void(
         const struct header_s &,
         actionHandler &
-    )> handleBodyT;
+    )>;
 
     class SenderData {
         public:
@@ -39,15 +39,21 @@ namespace Nitwork {
             n_actionType_t action;
             std::any body;
     };
+
     class INitwork {
         public:
             virtual ~INitwork() = default;
+            INitwork(const INitwork &) = delete;
+            INitwork(const INitwork &&) = delete;
+            void operator=(const INitwork &) = delete;
+            void operator=(const INitwork &&) = delete;
 
             // start the NitworkServer
             virtual bool start(int port, int threadNb, int tick, const std::string &ip = "") = 0;
 
             virtual void stop() = 0;
         protected:
+            INitwork() = default;
             // start the NitworkServer config
             virtual bool startNitworkConfig(int port, const std::string &ip) = 0;
             // start the NitworkServer threads (context threads, clock thread, input thread and output thread)
@@ -73,7 +79,7 @@ namespace Nitwork {
                 const boost::asio::ip::udp::endpoint &endpoint) = 0;
 
             // getters
-            virtual const std::map<
+            [[nodiscard]] virtual const std::map<
                 enum n_actionType_t,
                 actionHandler
             >& getActionToSendHandlers() const = 0;

diff --git a/src/Nitwork/NitworkClient.cpp b/src/Nitwork/NitworkClient.cpp
@@ -9,7 +9,7 @@
 
 namespace Nitwork {
     NitworkClient::NitworkClient()
-        : ANitwork(), _resolver(_context) {}
+        : _resolver(_context) {}
 
     // NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
     NitworkClient NitworkClient::_instance = NitworkClient();
@@ -96,7 +96,7 @@ namespace Nitwork {
             .header = {
                 .magick1 = HEADER_CODE1,
                 .ids_received = getIdsReceived(),
-                .last_id_received = (_receivedPacketsIds.size() > 0) ? _receivedPacketsIds.back() : 0,
+                .last_id_received = (!_receivedPacketsIds.empty()) ? _receivedPacketsIds.back() : 0,
                 .id = getPacketID(),
                 .nb_action = 1,
                 .magick2 = HEADER_CODE2,
@@ -114,4 +114,4 @@ namespace Nitwork {
         };
         addPacketToSend(_endpoint, packetData);
     }
-} // namespace Nitwork
+} // namespace Nitwork
diff --git a/src/Nitwork/NitworkClient.hpp b/src/Nitwork/NitworkClient.hpp
@@ -12,8 +12,11 @@
 namespace Nitwork {
     class NitworkClient : public ANitwork {
         public:
-            NitworkClient();
-            ~NitworkClient() = default;
+            ~NitworkClient() override = default;
+            NitworkClient(const NitworkClient &) = delete;
+            NitworkClient(const NitworkClient &&) = delete;
+            void operator=(const NitworkClient &) = delete;
+            void operator=(const NitworkClient &&) = delete;
 
             static NitworkClient &getInstance();
 
@@ -23,7 +26,7 @@ namespace Nitwork {
             bool startNitworkConfig(int port, const std::string &ip) final;
 
             void handleBodyAction(
-                const struct header_s header,
+                struct header_s header,
                 const boost::asio::ip::udp::endpoint &endpoint) final;
 
 
@@ -32,6 +35,7 @@ namespace Nitwork {
             // Messages creation methods
             void addInitMsg();
         private:
+            NitworkClient();
             [[nodiscard]] const std::map<
                 enum n_actionType_t,
                 actionHandler
@@ -46,8 +50,9 @@ namespace Nitwork {
                 boost::asio::ip::udp::endpoint &endpoint);
         protected:
         private:
-            static NitworkClient
-                _instance; // instance of the NitworkClient (singleton)
+            // NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
+            static NitworkClient _instance; // instance of the NitworkClient (singleton)
+            // NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
             boost::asio::ip::udp::resolver _resolver; // resolver used to find the server
 
             // maps that will be used to handle the actions, in order to send or receive them

diff --git a/src/Nitwork/NitworkServer.cpp b/src/Nitwork/NitworkServer.cpp
@@ -8,9 +8,6 @@
 #include "NitworkServer.hpp"
 
 namespace Nitwork {
-    NitworkServer::NitworkServer()
-        : ANitwork() {}
-
     // NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
     NitworkServer NitworkServer::_instance = NitworkServer();
     // NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
@@ -109,4 +106,4 @@ namespace Nitwork {
         std::cout << "ready" << std::endl;
     }
     /* End Handle packet (msg) Section */
-}
+}
diff --git a/src/Nitwork/NitworkServer.hpp b/src/Nitwork/NitworkServer.hpp
@@ -12,8 +12,11 @@
 namespace Nitwork {
     class NitworkServer : public ANitwork {
         public:
-            NitworkServer();
-            ~NitworkServer() = default;
+            ~NitworkServer() override = default;
+            NitworkServer(const NitworkServer &) = delete;
+            NitworkServer(const NitworkServer &&) = delete;
+            void operator=(const NitworkServer &) = delete;
+            void operator=(const NitworkServer &&) = delete;
 
             static NitworkServer &getInstance();
 
@@ -22,9 +25,10 @@ namespace Nitwork {
             bool startNitworkConfig(int port, const std::string &ip) final;
 
             void handleBodyAction(
-                const struct header_s header,
+                struct header_s header,
                 const boost::asio::ip::udp::endpoint &endpoint) final;
         private:
+            NitworkServer() = default;
             [[nodiscard]] const std::map<
                 enum n_actionType_t,
                 actionHandler
@@ -37,8 +41,6 @@ namespace Nitwork {
             void handleReadyMsg(
                 const std::any &msg,
                 boost::asio::ip::udp::endpoint &endpoint);
-        protected:
-        private:
             // NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
             static NitworkServer
                 _instance; // instance of the NitworkServer (singleton)
@@ -115,4 +117,4 @@ namespace Nitwork {
                     }
             };
     };
-}
+}