libcore: Checking the current thread more efficiently

skyjake · Sep 1, 2019 · 782e2f4 · 782e2f4
1 parent a577531
commit 782e2f4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/doomsday/libs/core/include/de/concurrency/thread.h b/doomsday/libs/core/include/de/concurrency/thread.h
@@ -43,6 +43,7 @@ class DE_PUBLIC Thread : public Waitable
     void terminate();
     bool isRunning() const;
     bool isFinished() const;
+    bool isCurrentThread() const;
 
     virtual void run() = 0;
 

diff --git a/doomsday/libs/core/src/concurrency/thread.cpp b/doomsday/libs/core/src/concurrency/thread.cpp
@@ -115,6 +115,15 @@ bool Thread::isFinished() const
     return isFinished_Thread(d->thread);
 }
 
+bool Thread::isCurrentThread() const
+{
+    if (d->thread)
+    {
+        return thrd_current() == id_Thread(d->thread);
+    }
+    return false;
+}
+
 void Thread::sleep(const TimeSpan &span) // static
 {
     sleep_Thread(span);

diff --git a/doomsday/libs/core/src/core/app.cpp b/doomsday/libs/core/src/core/app.cpp
@@ -103,7 +103,7 @@ static Value *Function_App_Locate(Context &, Function::ArgumentValues const &arg
 DE_PIMPL(App)
 , DE_OBSERVES(PackageLoader, Activity)
 {
-    iThread *mainThread = nullptr;
+    thrd_t mainThread = nullptr;
 
     /// Metadata about the application.
     Record metadata;
@@ -175,7 +175,7 @@ DE_PIMPL(App)
         packagesToLoadAtInit << "net.dengine.stdlib";
 
         singletonApp = a;
-        mainThread = current_Thread();
+        mainThread = thrd_current();
 
         logBuffer.setEntryFilter(&logFilter);
 
@@ -556,7 +556,7 @@ bool App::inMainThread()
         // No app even created yet, must be main thread.
         return true;
     }
-    return DE_APP->d->mainThread == current_Thread();
+    return DE_APP->d->mainThread == thrd_current();
 }
 
 #if !defined (DE_STATIC_LINK)

diff --git a/doomsday/libs/core/src/core/garbage.cpp b/doomsday/libs/core/src/core/garbage.cpp
@@ -176,6 +176,7 @@ void Garbage_TrashInstance(void *ptr, GarbageDestructor destructor)
     if (ptr)
     {
         Garbage *g = garbageForThread(current_Thread());
+        DE_ASSERT(!Garbage_IsTrashed(ptr));
         g->allocs[ptr] = destructor;
     }
 }