More complete uv::thread

1 files changed, 17 insertions, 1 deletions

diff --git a/include/mbgl/util/uv_detail.hpp b/include/mbgl/util/uv_detail.hpp
index 7d9e657f5c..099e08d4f1 100644
--- a/include/mbgl/util/uv_detail.hpp
+++ b/include/mbgl/util/uv_detail.hpp
@@ -20,10 +20,26 @@ void close(T* handle) {
 
 class thread : public mbgl::util::noncopyable {
 public:
-    inline operator uv_thread_t *() { return &t; }
+    inline thread(std::function<void ()> fn_)
+        : fn(fn_) {
+        if (uv_thread_create(&t, thread_cb, this) != 0) {
+            throw std::runtime_error("failed to initialize thread");
+        }
+    }
+
+    void join() {
+        if (uv_thread_join(&t) != 0) {
+            throw std::runtime_error("failed to join thred");
+        }
+    }
 
 private:
+    static void thread_cb(void* data) {
+        reinterpret_cast<thread*>(data)->fn();
+    }
+
     uv_thread_t t;
+    std::function<void ()> fn;
 };
 
 class loop : public mbgl::util::noncopyable {