When creating a new Task, steal the TLS values from its creator.

2 files changed, 7 insertions, 2 deletions

diff --git a/includes/Local.h b/includes/Local.h
index d009de7..f1174c4 100644
--- a/includes/Local.h
+++ b/includes/Local.h
@@ -28,7 +28,12 @@ extern TLSManager * g_tlsManager;
 class Local : public AtStart {
   public:
     static int getSize() { return s_size; }
-    static void * createTLS() { void * r = calloc(s_size * sizeof(void *), 1); return r; }
+    static void * createTLS(void * c = NULL) {
+        void * r = calloc(s_size * sizeof(void *), 1);
+        if (c)
+            memcpy(r, c, s_size * sizeof(void *));
+        return r;
+    }
   protected:
       Local() : AtStart(0) { }
     void * getGlobal() { return m_globals[m_idx]; }
diff --git a/src/Task.cc b/src/Task.cc
index 788424b..ed03532 100644
--- a/src/Task.cc
+++ b/src/Task.cc
@@ -8,6 +8,7 @@ static Balau::LocalTmpl<Balau::Task> localTask;
 
 Balau::Task::Task() : m_status(STARTING), m_okayToEAgain(false), m_stackless(false) {
     Printer::elog(E_TASK, "Created a Task at %p", this);
+    m_tls = Local::createTLS(g_tlsManager->getTLS());
 }
 
 bool Balau::Task::needsStacks() {
@@ -37,7 +38,6 @@ void Balau::Task::setup(TaskMan * taskMan, void * stack) {
 
     m_taskMan = taskMan;
 
-    m_tls = Local::createTLS();
     void * oldTLS = g_tlsManager->getTLS();
     g_tlsManager->setTLS(m_tls);
     localTask.set(this);