Changeset 1396 for DCWoRMS/branches/coolemall/src/dcworms/schedframe

Timestamp:

06/26/14 14:18:01 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling

Files:

• ExecTask.java (modified) (2 diffs)
• Executable.java (modified) (7 diffs)

DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling/ExecTask.java

@@ -4 +4 @@
 
 import schedframe.scheduling.ExecutionHistoryItem;
-import schedframe.scheduling.ResourceHistoryItem;
+import schedframe.scheduling.ResourceItem;
 import schedframe.scheduling.tasks.TaskInterface;
-import schedframe.scheduling.tasks.phases.ResourceConsumption;
 import schedframe.scheduling.tasks.phases.ExecutionProfile;
 import schedframe.scheduling.tasks.requirements.ResourceParameterName;
@@ -15 +14 @@
         public Object getExpectedSpecificResource(ResourceParameterName resourceName);
         
-        public LinkedList<ExecutionHistoryItem> getExecHistory();
-        public LinkedList<ResourceHistoryItem> getAllocatedResources();
+        public ExecutionProfile getExecutionProfile();
         
-        public ExecutionProfile getResourceConsumptionProfile();
-        public ResourceConsumption getCurrentResourceConsumption();
+        public LinkedList<ResourceItem> getAllocatedResources();
+    public String getSchedulerName();
         
-    public String getSchedulerName();
+        public LinkedList<ExecutionHistoryItem> getExecutionHistory();
+
 }

DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling/Executable.java

@@ -24 +24 @@
 import schedframe.resources.units.StandardResourceUnitName;
 import schedframe.scheduling.ExecutionHistoryItem;
-import schedframe.scheduling.ResourceHistoryItem;
+import schedframe.scheduling.ResourceItem;
 import schedframe.scheduling.WorkloadUnitHandler;
 import schedframe.scheduling.manager.tasks.JobRegistryImpl;
@@ -65 +65 @@
         
         protected LinkedList<ExecutionHistoryItem> execHistory;;
-        protected LinkedList<ResourceHistoryItem> allocatedResources;
+        protected LinkedList<ResourceItem> allocatedResources;
         
         public Executable(Task t){
@@ -71 +71 @@
                 this.status = DCWormsTags.CREATED;
 
-                this.allocatedResources = new LinkedList<ResourceHistoryItem>();
+                this.allocatedResources = new LinkedList<ResourceItem>();
                 this.execHistory = new LinkedList<ExecutionHistoryItem>();
                 init();
@@ -81 +81 @@
                 this.processesSetId = procesesSet.getId(); 
                 
-                this.allocatedResources = new LinkedList<ResourceHistoryItem>();
+                this.allocatedResources = new LinkedList<ResourceItem>();
                 this.execHistory = new LinkedList<ExecutionHistoryItem>();
                 init();
@@ -366 +366 @@
         }*/
         
-        public ExecutionProfile getResourceConsumptionProfile(){
+        public ExecutionProfile getExecutionProfile(){
                 return execProfile;
         }
@@ -470 +470 @@
         }
 
-        public LinkedList<ExecutionHistoryItem> getExecHistory() {
+        public LinkedList<ExecutionHistoryItem> getExecutionHistory() {
                 return execHistory;
         }
@@ -478 +478 @@
         }
 
-        public LinkedList<ResourceHistoryItem> getAllocatedResources() {
+        public LinkedList<ResourceItem> getAllocatedResources() {
                 return allocatedResources;
         }
 
-        public void addAllocatedResources(ResourceHistoryItem allocatedResourcesItem) {
+        public void addAllocatedResources(ResourceItem allocatedResourcesItem) {
                 this.allocatedResources.add(allocatedResourcesItem);
         }