From 46fb6ced302b941275a1178c398ecb8ba66b469f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 23 Jan 2016 17:26:42 +0000
Subject: [PATCH] support for extra args for thread constructor

---
 ostd/thread.hh | 26 +++++++++++++++++++++-----
 ostd/tuple.hh  |  7 +++++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/ostd/thread.hh b/ostd/thread.hh
index 4b75a3f..ca62441 100644
--- a/ostd/thread.hh
+++ b/ostd/thread.hh
@@ -11,6 +11,8 @@
 
 #include "ostd/memory.hh"
 #include "ostd/platform.hh"
+#include "ostd/type_traits.hh"
+#include "ostd/tuple.hh"
 
 namespace ostd {
 
@@ -72,10 +74,21 @@ namespace this_thread {
 }
 
 namespace detail {
+    template<typename T>
+    inline Decay<T> decay_copy(T &&v) {
+        return forward<T>(v);
+    }
+
+    template<typename F, typename ...A, Size ...I>
+    inline void thread_exec(Tuple<F, A...> &tup, detail::TupleIndices<I...>) {
+        ostd::get<0>(tup)(ostd::move(ostd::get<I>(tup))...);
+    }
+
     template<typename F>
     inline int thread_proxy(void *ptr) {
         Box<F> fptr((F *)ptr);
-        (*fptr)();
+        using Index = detail::MakeTupleIndices<TupleSize<F>, 1>;
+        detail::thread_exec(*fptr, Index());
         return 0;
     }
 }
@@ -86,10 +99,13 @@ struct Thread {
     Thread(): p_thread(0) {}
     Thread(Thread &&o): p_thread(o.p_thread) { o.p_thread = 0; }
 
-    template<typename F>
-    Thread(F &&func) {
-        Box<F> p(new F(func));
-        int res = thrd_create(&p_thread, &detail::thread_proxy<F>, p.get());
+    template<typename F, typename ...A,
+             typename = EnableIf<!IsSame<Decay<F>, Thread>>>
+    Thread(F &&func, A &&...args) {
+        using FuncT = Tuple<Decay<F>, Decay<A>...>;
+        Box<FuncT> p(new FuncT(detail::decay_copy(forward<F>(func)),
+                               detail::decay_copy(forward<A>(args))...));
+        int res = thrd_create(&p_thread, &detail::thread_proxy<FuncT>, p.get());
         if (res == thrd_success)
             p.release();
         else
diff --git a/ostd/tuple.hh b/ostd/tuple.hh
index bd97e83..5702314 100644
--- a/ostd/tuple.hh
+++ b/ostd/tuple.hh
@@ -177,8 +177,11 @@ namespace detail {
     template<typename ...A>
     inline void tuple_swallow(A &&...) {}
 
-    template<bool ...A> constexpr bool TupleAll
-        = IsSame<TupleAll<A...>, TupleAll<(A, true)...>>;
+    template<bool ...A>
+    constexpr bool TupleAll = true;
+
+    template<bool B, bool ...A>
+    constexpr bool TupleAll<B, A...> = B && TupleAll<A...>;
 
     template<typename T>
     constexpr bool TupleAllDefaultConstructible = detail::Undefined<T>();