瀏覽代碼

cmCTestMultiProcessHandler: Rename resource locking functions

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).
Craig Scott 6 年之前
父節點
當前提交
6ce27d3a2e
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 4 4
      Source/CTest/cmCTestMultiProcessHandler.cxx
  2. 2 2
      Source/CTest/cmCTestMultiProcessHandler.h

+ 4 - 4
Source/CTest/cmCTestMultiProcessHandler.cxx

@@ -192,7 +192,7 @@ bool cmCTestMultiProcessHandler::StartTestProcess(int test)
 
   // Always lock the resources we'll be using, even if we fail to set the
   // working directory because FinishTestProcess() will try to unlock them
-  this->AllocateResources(test);
+  this->LockResources(test);
 
   if (!this->TestsHaveSufficientHardware[test]) {
     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->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) {
     this->LockedResources.erase(i);
@@ -603,7 +603,7 @@ void cmCTestMultiProcessHandler::FinishTestProcess(cmCTestRunTest* runner,
   this->TestRunningMap[test] = false;
   this->WriteCheckpoint(test);
   this->DeallocateHardware(test);
-  this->DeallocateResources(test);
+  this->UnlockResources(test);
   this->RunningCount -= GetProcessorsUsed(test);
 
   for (auto p : properties->Affinity) {

+ 2 - 2
Source/CTest/cmCTestMultiProcessHandler.h

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