.

include/wfr/common/resource/ResourceManager.h

@@ -13,7 +13,13 @@
 #include <wfr/common/types/ResourceTypes.h>
 
 
+
 namespace wfr {
+
+namespace wfs {
+class AtomicActivityInstance;
+}
+
 namespace resource {
 
 class AbstractResource;
@@ -32,6 +38,13 @@ private:
 	std::map<std::string, ComputingResourceType*> computingResourceTypes;
 	std::map<std::string, ComputingResource*> computingResources;
 
+private:
+	static std::atomic<wfr_id_t> _nextResourceId;
+
+	static wfr_id_t getNextResourceId() {
+		return _nextResourceId.fetch_add(1);
+	}
+
 // Non-public functions
 private:
 	ResourceManager(std::string resourceConfigFile, bool cpuAutoConfig, bool printResourceTable);
@@ -53,11 +66,12 @@ public:
 	ComputingResource* getComputingResource(std::string identifier) const noexcept;
 	std::vector<ComputingResource*> filterComputingResources(std::vector<RequiredResourceCapability> filter) const noexcept;
 
-	ComputingResourceReservation reserveComputingResource(ComputingResource* device, const wfr_size_t& slots = 1) noexcept;
+	std::shared_ptr<ComputingResourceReservation> reserveComputingResource(ComputingResource* device, const wfr_size_t& slots, bool requireFreeSlots = false) noexcept;
 	bool releaseComputingResources(ComputingResourceReservation* handle) noexcept;
 
 	wfr_size_t getComputingResourceTypeCount() const noexcept { return computingResourceTypes.size(); }
 	std::vector<ComputingResourceType*> getComputingResourceTypes() const noexcept;
+	std::vector<ComputingResourceType*> getCompatibleComputingResourceTypes(wfs::AtomicActivityInstance* activity) const noexcept;
 	ComputingResourceType* getComputingResourceType(std::string name) const noexcept;
 
 	void printResourceTable(std::ostream& out) const noexcept;