From 10ea65cc0bf151d4788ca0a2fc836b2654c26241 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@cloudius-systems.com>
Date: Sun, 5 Oct 2014 17:11:34 +0300
Subject: [PATCH] posix: support std::move()ing a posix_thread

Useful for storing in containers.
---
 core/posix.hh | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/core/posix.hh b/core/posix.hh
index 9fb2997e88..b1a7d8c498 100644
--- a/core/posix.hh
+++ b/core/posix.hh
@@ -21,6 +21,7 @@
 #include <system_error>
 #include <boost/optional.hpp>
 #include <pthread.h>
+#include <memory>
 
 inline void throw_system_error_on(bool condition);
 
@@ -185,24 +186,35 @@ private:
  };
 
 class posix_thread {
-    std::function<void ()> _func;
+    // must allocate, since this class is moveable
+    std::unique_ptr<std::function<void ()>> _func;
     pthread_t _pthread;
+    bool _valid = true;
 private:
     static void* start_routine(void* arg) {
-        auto zis = reinterpret_cast<posix_thread*>(arg);
-        zis->_func();
+        auto pfunc = reinterpret_cast<std::function<void ()>*>(arg);
+        (*pfunc)();
         return nullptr;
     }
 public:
-    posix_thread(std::function<void ()> func) : _func(func) {
+    posix_thread(std::function<void ()> func) : _func(std::make_unique<std::function<void ()>>(std::move(func))) {
         auto r = pthread_create(&_pthread, nullptr,
-                    &posix_thread::start_routine, this);
+                    &posix_thread::start_routine, _func.get());
         if (r) {
             throw std::system_error(r, std::system_category());
         }
     }
+    posix_thread(posix_thread&& x)
+        : _func(std::move(x._func)), _pthread(x._pthread), _valid(x._valid) {
+        x._valid = false;
+    }
+    ~posix_thread() {
+        assert(!_valid);
+    }
     void join() {
+        assert(_valid);
         pthread_join(_pthread, NULL);
+        _valid = false;
     }
 };