summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestMultiProcessHandler.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/CTest/cmCTestMultiProcessHandler.h')
-rw-r--r--Source/CTest/cmCTestMultiProcessHandler.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h
index f0ffdbb..1db4bfd 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.h
+++ b/Source/CTest/cmCTestMultiProcessHandler.h
@@ -14,13 +14,13 @@
#include "cm_uv.h"
-#include "cmCTestHardwareAllocator.h"
+#include "cmCTestResourceAllocator.h"
#include "cmCTestTestHandler.h"
#include "cmUVHandlePtr.h"
class cmCTest;
struct cmCTestBinPackerAllocation;
-class cmCTestHardwareSpec;
+class cmCTestResourceSpec;
class cmCTestRunTest;
/** \class cmCTestMultiProcessHandler
@@ -47,7 +47,7 @@ public:
: public std::map<int, cmCTestTestHandler::cmCTestTestProperties*>
{
};
- struct HardwareAllocation
+ struct ResourceAllocation
{
std::string Id;
unsigned int Slots;
@@ -87,12 +87,12 @@ public:
void SetQuiet(bool b) { this->Quiet = b; }
- void InitHardwareAllocator(const cmCTestHardwareSpec& spec)
+ void InitResourceAllocator(const cmCTestResourceSpec& spec)
{
- this->HardwareAllocator.InitializeFromHardwareSpec(spec);
+ this->ResourceAllocator.InitializeFromResourceSpec(spec);
}
- void CheckHardwareAvailable();
+ void CheckResourcesAvailable();
protected:
// Start the next test or tests as many as are allowed by
@@ -137,13 +137,13 @@ protected:
void LockResources(int index);
void UnlockResources(int index);
- bool AllocateHardware(int index);
- bool TryAllocateHardware(
+ bool AllocateResources(int index);
+ bool TryAllocateResources(
int index,
std::map<std::string, std::vector<cmCTestBinPackerAllocation>>&
allocations);
- void DeallocateHardware(int index);
- bool AllHardwareAvailable();
+ void DeallocateResources(int index);
+ bool AllResourcesAvailable();
// map from test number to set of depend tests
TestMap Tests;
@@ -166,10 +166,10 @@ protected:
std::vector<std::string> LastTestsFailed;
std::set<std::string> LockedResources;
std::map<int,
- std::vector<std::map<std::string, std::vector<HardwareAllocation>>>>
- AllocatedHardware;
- std::map<int, bool> TestsHaveSufficientHardware;
- cmCTestHardwareAllocator HardwareAllocator;
+ std::vector<std::map<std::string, std::vector<ResourceAllocation>>>>
+ AllocatedResources;
+ std::map<int, bool> TestsHaveSufficientResources;
+ cmCTestResourceAllocator ResourceAllocator;
std::vector<cmCTestTestHandler::cmCTestTestResult>* TestResults;
size_t ParallelLevel; // max number of process that can be run at once
unsigned long TestLoad;