Added lookahead scheduler.

Most scheduler now use estimated finish time instead of predicted execution time.

include/wfr/scheduling/AbstractScheduler.h

@@ -113,6 +113,7 @@ protected:
 	wepMap_t wepMap;
 	bool simulationMode;
 	double cummulativePredictionTime = 0;
+	std::map<resource::ComputingResource*, std::vector<std::shared_ptr<SchedulingDecision>>> scheduledTasks;
 
 protected:
 	// Hook functions for AbstractScheduler functions below to allow customisation of common functionality
@@ -121,6 +122,8 @@ protected:
 	virtual void _notifyWEPUpdate(WepMapEntry& wepe, std::set<wep::AtomicWepNode*> readyToExecute, std::unique_lock<std::mutex>& schedulerLock) {}
 	virtual void _notifySchedulingDecisionStatusUpdate(WepMapEntry& wepe, std::shared_ptr<SchedulingDecision> sd, std::unique_lock<std::mutex>& schedulerLock) {}
 
+	virtual double _getResourceEstimatedAvailableTime(resource::ComputingResource* resource);
+
 	// Convenience functions for passing a scheduling decision to the execution layer.
 	bool executeSchedulingDecision(WepMapEntry& wepe, std::shared_ptr<SchedulingDecision> sd, std::unique_lock<std::mutex>& schedulerLock) noexcept;
 

include/wfr/scheduling/scheduler/heft/HEFTScheduler.h

@@ -56,8 +56,6 @@ protected:
 				fastestExecutionTimes(new prediction::ExecutionTimeResult[resourceCount]) {}
 	};
 
-	//std::map<wep::ActivityWepNode*, std::shared_ptr<OptimisticCostTableEntry>> optimisticCostTable;
-
 	std::set<wep::AtomicWepNode*> readySet;
 
 	void calcTaskRanks(wep::ActivityWepNode& node, std::vector<resource::ComputingResource*>& resources);

include/wfr/scheduling/scheduler/lookahead/LookaheadScheduler.h

@@ -0,0 +1,79 @@
+
+#pragma once
+
+
+#include <wfr/scheduling/AbstractScheduler.h>
+#include <wfr/prediction/PredictionManager.h>
+#include <wfr/common/resource/Resource.h>
+#include <wfr/common/resource/ResourceManager.h>
+#include <wfr/common/types/WfrTypes.h>
+#include <mutex>
+#include <thread>
+#include <vector>
+#include <queue>
+#include <map>
+#include <set>
+#include <iostream>
+#include <condition_variable>
+
+namespace wfr {
+
+namespace wfs {
+class AtomicActivityInstance;
+}
+namespace wep {
+class AtomicWepNode;
+class ActivityWepNode;
+class AbstractWepNode;
+}
+namespace resource {
+class ResourceManager;
+}
+namespace prediction {
+class PredictionManager;
+}
+}
+
+
+namespace wfr {
+namespace scheduling {
+
+
+class LookaheadScheduler: public scheduling::SchedulerBase {
+protected:
+	resource::ResourceManager& resourceManager;
+	prediction::PredictionManager& predictionManager;
+
+	struct TaskRankEntry {
+		double rank = 0;
+		bool finalized = false;
+
+		wfs::AtomicActivityImplementation** fastestImplementations;
+		prediction::ExecutionTimeResult* fastestExecutionTimes;
+		double averageExecutionTime = 0.0;
+
+		TaskRankEntry(wfr_size_t resourceCount) : fastestImplementations(new wfs::AtomicActivityImplementation*[resourceCount]),
+				fastestExecutionTimes(new prediction::ExecutionTimeResult[resourceCount]) {}
+	};
+
+	std::set<wep::AtomicWepNode*> readySet;
+
+	void calcTaskRanks(wep::ActivityWepNode& node, std::vector<resource::ComputingResource*>& resources);
+
+	void scheduleReadySet(WepMapEntry& wepe, std::vector<resource::ComputingResource*>& resources, std::unique_lock<std::mutex>& schedulerLock);
+
+public:
+	LookaheadScheduler(resource::ResourceManager& resourceManager, prediction::PredictionManager& predictionManager)
+			: resourceManager(resourceManager), predictionManager(predictionManager) {}
+
+	~LookaheadScheduler() {}
+
+	virtual void _notifyWEPUpdate(SchedulerBase::WepMapEntry& wepe, std::set<wep::AtomicWepNode*> readyToExecute, std::unique_lock<std::mutex>& schedulerLock) override;
+	virtual void _notifySchedulingDecisionStatusUpdate(WepMapEntry& wepe, std::shared_ptr<SchedulingDecision> sd, std::unique_lock<std::mutex>& schedulerLock) override;
+	virtual void _unregisterWEP(WepMapEntry& wepe, std::unique_lock<std::mutex>& schedulerLock) override;
+};
+
+} /* namespace scheduling */
+} /* namespace wfr */
+
+

include/wfr/scheduling/scheduler/minmin/MinMinScheduler.h

@@ -25,13 +25,9 @@ protected:
 	resource::ResourceManager& resourceManager;
 	prediction::PredictionManager& predictionManager;
 
-	std::map<resource::ComputingResource*, std::vector<std::shared_ptr<SchedulingDecision>>> scheduledTasks;
-
 	typedef std::map<resource::ComputingResourceType*, std::pair<wfs::AtomicActivityImplementation*, prediction::ExecutionTimeResult>> ImplementationCacheInnerMap;
 	std::map<wfs::AtomicActivityType*, ImplementationCacheInnerMap> implementationCache;
 
-	double _getResourceEstimatedAvailableTime(resource::ComputingResource* resource);
-
 	typedef std::tuple<resource::ComputingResource*, wfs::AtomicActivityImplementation*, double, prediction::ExecutionTimeResult> ECTEntry;
 	virtual std::pair<wep::AtomicWepNode*, ECTEntry> _getNextTaskToSchedule(std::map<wep::AtomicWepNode*, ECTEntry>& estimatedTaskCompletionTimes);
 

include/wfr/scheduling/scheduler/sufferage/SufferageScheduler.h

@@ -25,13 +25,9 @@ protected:
 	resource::ResourceManager& resourceManager;
 	prediction::PredictionManager& predictionManager;
 
-	std::map<resource::ComputingResource*, std::vector<std::shared_ptr<SchedulingDecision>>> scheduledTasks;
-
 	typedef std::map<resource::ComputingResourceType*, std::pair<wfs::AtomicActivityImplementation*, prediction::ExecutionTimeResult>> ImplementationCacheInnerMap;
 	std::map<wfs::AtomicActivityType*, ImplementationCacheInnerMap> implementationCache;
 
-	double _getResourceEstimatedAvailableTime(resource::ComputingResource* resource);
-
 	typedef std::tuple<resource::ComputingResource*, wfs::AtomicActivityImplementation*, double, prediction::ExecutionTimeResult> ECTEntry;
 	std::pair<wep::AtomicWepNode*, ECTEntry> _getNextTaskToSchedule(std::map<wep::AtomicWepNode*, ECTEntry>& estimatedTaskCompletionTimes);