Fixed memory leak

common/cpp/include/system_wrappers/io.h

@@ -70,7 +70,7 @@ class IO {
     /*
      * Special
      */
-    virtual std::thread*    NewThread       (std::function<void()> function) const = 0;
+    virtual std::unique_ptr<std::thread> NewThread       (std::function<void()> function) const = 0;
 
     /*
      * Network

common/cpp/include/system_wrappers/system_io.h

@@ -51,7 +51,7 @@ class SystemIO final : public IO {
     /*
      * Special
      */
-    std::thread*            NewThread(std::function<void()> function) const;
+    std::unique_ptr<std::thread>    NewThread(std::function<void()> function) const;
 
 
     // this is not standard function - to be implemented differently in windows and linux

common/cpp/include/unittests/MockIO.h

@@ -8,7 +8,10 @@
 namespace hidra2 {
 class MockIO : public IO {
   public:
-    MOCK_CONST_METHOD1(NewThread, std::thread * (std::function<void()> function));
+    std::unique_ptr<std::thread> NewThread(std::function<void()> function) const override {
+        return std::unique_ptr<std::thread>(NewThread_t(function));
+    }
+    MOCK_CONST_METHOD1(NewThread_t, std::thread * (std::function<void()> function));
 
     SocketDescriptor CreateSocket(AddressFamilies address_family, SocketTypes socket_type, SocketProtocols socket_protocol,
                                   Error* err) const override {

common/cpp/src/system_io/system_io.cpp

@@ -131,8 +131,8 @@ std::string SystemIO::ReadFileToString(const std::string& fname, Error* err) con
 }
 
 
-std::thread* SystemIO::NewThread(std::function<void()> function) const {
-    return new std::thread(function);
+std::unique_ptr<std::thread> SystemIO::NewThread(std::function<void()> function) const {
+    return std::unique_ptr<std::thread>(new std::thread(function));
 }
 
 void SystemIO::Skip(SocketDescriptor socket_fd, size_t length, Error* err) const {

common/cpp/src/system_io/system_io_windows.cpp

@@ -135,7 +135,7 @@ FileInfo SystemIO::GetFileInfo(const std::string& name, Error* err) const {
 }
 
 void ProcessFileEntity(const WIN32_FIND_DATA& f, const std::string& path,
-    FileInfos* files, Error* err) {
+                       FileInfos* files, Error* err) {
 
     *err = nullptr;
     if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {

receiver/src/network_producer_peer.cpp

@@ -82,7 +82,6 @@ void NetworkProducerPeer::stop_peer_listener() {
     if(!listener_thread_)
         return;
     listener_thread_->join();
-    delete listener_thread_;
     listener_thread_ = nullptr;
 }
 

receiver/src/network_producer_peer.h

@@ -29,11 +29,11 @@ class NetworkProducerPeer : HasIO {
     static const std::vector<RequestHandlerInformation> kRequestHandlers;
     static std::atomic<uint32_t> kNetworkProducerPeerCount;
 
-    uint32_t        connection_id_;
-    int             socket_fd_;
+    uint32_t                        connection_id_;
+    int                             socket_fd_;
 
-    bool            is_listening_ = false;
-    std::thread*    listener_thread_ = nullptr;
+    bool                            is_listening_ = false;
+    std::unique_ptr<std::thread>    listener_thread_ = nullptr;
 
     void internal_receiver_thread_();
     size_t handle_generic_request_(GenericNetworkRequest* request, GenericNetworkResponse* response);

receiver/src/receiver.h

@@ -20,7 +20,7 @@ class Receiver : public HasIO {
   private:
     bool listener_running_ = false;
     FileDescriptor listener_fd_ = -1;
-    std::thread* accept_thread_ = nullptr;
+    std::unique_ptr<std::thread> accept_thread_ = nullptr;
 
     void AcceptThreadLogic();
     std::list<std::unique_ptr<NetworkProducerPeer>> peer_list_;

tests/system_io/ip_tcp_network/ip_tcp_network.cpp

@@ -35,7 +35,7 @@ void ExitIfErrIsNotOk(Error* err, int exit_number) {
     }
 }
 
-std::thread* CreateEchoServerThread() {
+std::unique_ptr<std::thread> CreateEchoServerThread() {
     return io->NewThread([&] {
         Error err;
         FileDescriptor socket = io->CreateSocket(AddressFamilies::INET, SocketTypes::STREAM, SocketProtocols::IP, &err);
@@ -163,7 +163,7 @@ int main(int argc, char* argv[]) {
         ExitIfErrIsNotOk(&err, 303);
     }
 
-    std::thread* server_thread = CreateEchoServerThread();
+    std::unique_ptr<std::thread> server_thread = CreateEchoServerThread();
     kThreadStarted.get_future().get();//Make sure that the server is started
 
     std::cout << "Check 1" << std::endl;

tests/system_io/ip_tcp_network_speedtest/ip_tcp_network_speedtest.cpp

@@ -36,7 +36,7 @@ void ExitIfErrIsNotOk(Error* err, int exit_number) {
     }
 }
 
-std::thread* CreateEchoServerThread() {
+std::unique_ptr<std::thread> CreateEchoServerThread() {
     return io->NewThread([] {
         std::unique_ptr<uint8_t[]> kBufferServer(new uint8_t[kTestSize]);
 
@@ -104,7 +104,7 @@ void Speedtest() {
 }
 
 int main(int argc, char* argv[]) {
-    std::thread* server_thread = CreateEchoServerThread();
+    std::unique_ptr<std::thread> server_thread = CreateEchoServerThread();
     kThreadStarted.get_future().get();//Make sure that the server is started
 
     Speedtest();