Fix bad merge

Domain · Aug 19, 2023 · 1b39350 · 1b39350
1 parent 147c5ff
commit 1b39350
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/Code/Tools/FBuild/FBuildCore/Protocol/Server.cpp b/Code/Tools/FBuild/FBuildCore/Protocol/Server.cpp
@@ -613,15 +613,6 @@ void Server::FindNeedyClients()
     }
 
     PROFILE_FUNCTION;
-
-    // determine job availability
-    int32_t availableJobs = (int32_t)WorkerThreadRemote::GetNumCPUsToUse();
-    if ( availableJobs == 0 )
-    {
-        return;
-    }
-    ++availableJobs; // over request to parallelize building/network transfers
-
 
     // determine job availability
     int32_t availableJobs = (int32_t)WorkerThreadRemote::GetNumCPUsToUse();

diff --git a/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.cpp b/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.cpp
@@ -47,7 +47,6 @@ void WorkerThread::Init( ThreadPool * pool )
 WorkerThread::~WorkerThread()
 {
     ASSERT( m_Exited.Load() );
-    m_Thread.Join();
 }
 
 // InitTmpDir

diff --git a/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.h b/Code/Tools/FBuild/FBuildCore/WorkerPool/WorkerThread.h
@@ -8,7 +8,6 @@
 #include "Core/Process/Atomic.h"
 #include "Core/Process/Mutex.h"
 #include "Core/Process/Semaphore.h"
-#include "Core/Process/Thread.h"
 #include "Core/Strings/AStackString.h"
 #include "Core/Strings/AString.h"
 
@@ -51,7 +50,6 @@ class WorkerThread
     virtual void Main();
 
     // signal to exit thread
-    Thread        m_Thread;
     Atomic<bool>  m_ShouldExit;
     Atomic<bool>  m_Exited;
     uint16_t      m_ThreadIndex;