fixed two tsan issues

Author: janwilmans

CobaltFusion/Executor.cpp

@@ -191,7 +191,15 @@ void Executor::Add(std::function<void()> fn)
 
 void Executor::Synchronize()
 {
-    Call([] {});
+    assert(!IsExecutorThread() && "Calling Synchronize() inside Call() will cause a deadlock");
+    SynchronizeInternally();
+}
+
+void Executor::SynchronizeInternally()
+{
+    std::promise<bool> sync;
+    Add([&sync]() { sync.set_value(true); });
+    sync.get_future().get();
 }
 
 ScheduledCall TimedExecutor::CallAt(const TimePoint& at, std::function<void()> fn)

include/CobaltFusion/Executor.h

@@ -104,7 +104,7 @@ class Executor
     template <typename Fn>
     auto Call(Fn fn)
     {
-        assert(!IsExecutorThread());
+        assert(!IsExecutorThread() && "Calling Call() inside Call() will cause a deadlock");
         std::packaged_task<decltype(fn())()> task(fn);
         Add([&task]() { task(); });
         return task.get_future().get();
@@ -126,6 +126,7 @@ class Executor
     void Synchronize();
 
 protected:
+    void SynchronizeInternally();
     void SetExecutorThread();
     void SetExecutorThread(std::thread::id id);
     void Add(std::function<void()> fn);
@@ -138,7 +139,7 @@ class Executor
 
 private:
     SynchronizedQueue<std::function<void()>> m_q;
-    std::thread::id m_threadId;
+    std::atomic<std::thread::id> m_threadId;
 };
 
 class TimedExecutor : private ExecutorBase,