Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 22:37:30 +08:00
Code Issues Projects Releases Wiki Activity

cmCTestMultiProcessHandler: Rename resource locking functions

Browse Source 
Renaming these ahead of other refactoring which will use the
previous names. The previous names more accurately reflect their
purpose after this commit anyway (talking about locking and
unlocking rather than allocating and deallocating).
This commit is contained in:
Craig Scott
2019-11-05 17:14:33 +11:00
committed by Brad King
parent a7c1e15cc4
commit 6ce27d3a2e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CTest/cmCTestMultiProcessHandler.cxx
View File

@@ -192,7 +192,7 @@ bool cmCTestMultiProcessHandler::StartTestProcess(int test)
// Always lock the resources we'll be using, even if we fail to set the // Always lock the resources we'll be using, even if we fail to set the
// working directory because FinishTestProcess() will try to unlock them // working directory because FinishTestProcess() will try to unlock them
this->AllocateResources(test); this->LockResources(test);
if (!this->TestsHaveSufficientHardware[test]) { if (!this->TestsHaveSufficientHardware[test]) {
testRun->StartFailure("Insufficient resources"); testRun->StartFailure("Insufficient resources");
@@ -346,7 +346,7 @@ void cmCTestMultiProcessHandler::SetStopTimePassed()
} }
} }
void cmCTestMultiProcessHandler::AllocateResources(int index) void cmCTestMultiProcessHandler::LockResources(int index)
{ {
this->LockedResources.insert( this->LockedResources.insert(
this->Properties[index]->LockedResources.begin(), this->Properties[index]->LockedResources.begin(),
@@ -357,7 +357,7 @@ void cmCTestMultiProcessHandler::AllocateResources(int index)
} }
} }
void cmCTestMultiProcessHandler::DeallocateResources(int index) void cmCTestMultiProcessHandler::UnlockResources(int index)
{ {
for (std::string const& i : this->Properties[index]->LockedResources) { for (std::string const& i : this->Properties[index]->LockedResources) {
this->LockedResources.erase(i); this->LockedResources.erase(i);
@@ -603,7 +603,7 @@ void cmCTestMultiProcessHandler::FinishTestProcess(cmCTestRunTest* runner,
this->TestRunningMap[test] = false; this->TestRunningMap[test] = false;
this->WriteCheckpoint(test); this->WriteCheckpoint(test);
this->DeallocateHardware(test); this->DeallocateHardware(test);
this->DeallocateResources(test); this->UnlockResources(test);
this->RunningCount -= GetProcessorsUsed(test); this->RunningCount -= GetProcessorsUsed(test);
for (auto p : properties->Affinity) { for (auto p : properties->Affinity) {

4
Source/CTest/cmCTestMultiProcessHandler.h
View File

@@ -134,8 +134,8 @@ protected:
bool CheckStopTimePassed(); bool CheckStopTimePassed();
void SetStopTimePassed(); void SetStopTimePassed();
void AllocateResources(int index); void LockResources(int index);
void DeallocateResources(int index); void UnlockResources(int index);
bool AllocateHardware(int index); bool AllocateHardware(int index);
bool TryAllocateHardware( bool TryAllocateHardware(