From 541716088989879207dca372482a0e76cce49928 Mon Sep 17 00:00:00 2001
From: selim <selim@selim.home.lan>
Date: Tue, 16 Sep 2014 13:09:16 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B4=D0=B2=D0=B0=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B0=20add=5Ftask=20=D1=81=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D1=80=D0=B0=D0=BC=D0=B8=20=D0=BA=D0=B0=D0=BA=20?=
 =?UTF-8?q?=D1=83=20std::bind?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile             |  4 ++--
 include/threadpool.h | 13 +++++++++++--
 test/main.cpp        | 43 ++++++++++++++++++++++++++++---------------
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index a830a6e..4e455b0 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ OS = linux
 
 # C++ compier
 CXX = g++
-CXXFLAGS = -MMD -c -g -Og -Wall -Werror -std=c++11 -Iinclude -Isrc/asm/include -fno-strict-aliasing #-fsanitize=thread -fPIE
-LDFLAGS = -lgtest #-ltsan -pie
+CXXFLAGS = -MMD -c -g -Og -Wall -Werror -std=c++11 -Iinclude -Isrc/asm/include -fno-strict-aliasing -fsanitize=thread -fPIE
+LDFLAGS = -lgtest -ltsan -pie
 
 # Archiver
 AR = ar
diff --git a/include/threadpool.h b/include/threadpool.h
index 2bae614..c218425 100644
--- a/include/threadpool.h
+++ b/include/threadpool.h
@@ -30,11 +30,20 @@ public:
 		std::shared_ptr<std::packaged_task<R()>> pt_ptr = std::make_shared<std::packaged_task<R()>>(func);
 		std::future<R> fut = pt_ptr->get_future();
 
-		std::function<void()> tf = [pt_ptr] { (*pt_ptr)(); };
-		_queue.push(tf);
+		_queue.push([pt_ptr] { (*pt_ptr)(); });
 		_cv.notify_one();
 		return fut;
 	}
+	
+	template <typename R, typename... Args> std::future<R> add_task(R(*pfn)(Args...), Args... args)
+	{
+		return add_task<R>(std::bind(pfn, args...));
+	}
+	
+	template <typename R, typename C, typename... Args> std::future<R> add_task(R(C::*pfn)(Args...), C* cPtr, Args... args)
+	{
+		return add_task<R>(std::bind(pfn, cPtr, args...));
+	}
 
 private:
 	void worker_func();
diff --git a/test/main.cpp b/test/main.cpp
index 5d57066..e596009 100755
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -574,6 +574,20 @@ void func(std::size_t n)
     std::cout << "end of thread " << n << std::endl;
 }
 
+int geti(int i)
+{
+    return i;
+}
+
+class foo 
+{
+public:
+    int bar(int n)
+    {
+        return n;
+    }
+};
+
 int main(int argc, char **argv)
 {
     //::testing::InitGoogleTest(&argc, argv);
@@ -594,22 +608,21 @@ int main(int argc, char **argv)
         threads[i].join();
 	*/
 
-	threadpool pool(4);
+    threadpool pool(4);
+    std::vector<std::future<int>> vec;
 
-	for (std::size_t i = 0; i < 100; ++i)
-	{
-		std::function<int()> func = [i]() -> int {
-			auto id = std::this_thread::get_id();
-			std::this_thread::sleep_for(std::chrono::seconds(5));
-			ulog.log_info("task % with id %", i, id);
-			return 0;
-		};
-
-		pool.add_task(func);
-	}
-
-	int n;
-	std::cin >> n;
+    foo f;
+    for (std::size_t i = 0; i < 100; ++i)
+    {
+        //std::future<int> fut = pool.add_task<int>([i] { return i; });
+        std::future<int> fut = pool.add_task(&foo::bar, &f, (int)i);
+        vec.push_back(std::move(fut));
+    }
+    
+    for(std::size_t i = 0; i < 100; ++i)
+    {
+        std::cout << "res[" << i << "] = " << vec[i].get() << std::endl;
+    }
     
     return 0;
 }