Merge pull request #1188 from zManu3k/master

Fixed memory leak in threadpool

Author: COM8

cpr/threadpool.cpp

@@ -2,7 +2,6 @@
 #include <algorithm>
 #include <chrono>
 #include <cstddef>
-#include <ctime>
 #include <memory>
 #include <mutex>
 #include <thread>
@@ -66,7 +65,7 @@ int ThreadPool::Resume() {
     return 0;
 }
 
-int ThreadPool::Wait() {
+int ThreadPool::Wait() const {
     while (true) {
         if (status == STOP || (tasks.empty() && idle_thread_num == cur_thread_num)) {
             break;
@@ -80,7 +79,7 @@ bool ThreadPool::CreateThread() {
     if (cur_thread_num >= max_thread_num) {
         return false;
     }
-    std::thread* thread = new std::thread([this] {
+    auto thread = std::make_shared<std::thread>([this] {
         bool initialRun = true;
         while (status != STOP) {
             {
@@ -119,11 +118,11 @@ bool ThreadPool::CreateThread() {
     return true;
 }
 
-void ThreadPool::AddThread(std::thread* thread) {
+void ThreadPool::AddThread(const std::shared_ptr<std::thread>& thread) {
     thread_mutex.lock();
     ++cur_thread_num;
     ThreadData data;
-    data.thread = std::shared_ptr<std::thread>(thread);
+    data.thread = thread;
     data.id = thread->get_id();
     data.status = RUNNING;
     data.start_time = std::chrono::steady_clock::now();

include/cpr/threadpool.h

@@ -53,19 +53,19 @@ class ThreadPool {
         return idle_thread_num;
     }
 
-    bool IsStarted() {
+    bool IsStarted() const {
         return status != STOP;
     }
 
-    bool IsStopped() {
+    bool IsStopped() const {
         return status == STOP;
     }
 
     int Start(size_t start_threads = 0);
     int Stop();
     int Pause();
     int Resume();
-    int Wait();
+    int Wait() const;
 
     /**
      * Return a future, calling future.get() will wait task done and return RetType.
@@ -95,7 +95,7 @@ class ThreadPool {
 
   private:
     bool CreateThread();
-    void AddThread(std::thread* thread);
+    void AddThread(const std::shared_ptr<std::thread>& thread);
     void DelThread(std::thread::id id);
 
   public: