Changeset 175 for xssim/trunk

Timestamp:

03/16/12 11:47:39 (13 years ago)

Author:

wojtekp

Message:

 

File:

• xssim/trunk/src/test/rewolucja/scheduling/implementation/LocalManagementSystem.java (modified) (4 diffs)

xssim/trunk/src/test/rewolucja/scheduling/implementation/LocalManagementSystem.java

@@ -59 +59 @@
 import test.rewolucja.resources.manager.utils.ResourceManagerUtils;
 import test.rewolucja.resources.physical.base.ComputingResource;
+import test.rewolucja.scheduling.UsedResourceList;
 import test.rewolucja.scheduling.plan.AllocationInterfaceNew;
 import test.rewolucja.scheduling.plan.ScheduledTaskInterfaceNew;
@@ -140 +141 @@
                                 log.debug(task.getJobId() + "_" + task.getId() + " finished execution on " + new DateTime());
                                 log.info(GssimConstants.USAGE_MEASURE_NAME + ": " + calculateTotalLoad(jobRegistry.getRunningTasks().size()));
-                                List<ResourceHistoryItem> lastUsedList = task.getUsedResources();
-                                Map<ResourceParameterName, ResourceUnit> lastUsed = lastUsedList.get(lastUsedList.size() - 1)
+                                UsedResourceList<ResourceHistoryItem> lastUsedList = task.getUsedResources();
+                                Map<ResourceParameterName, ResourceUnit> lastUsed = lastUsedList.getLast()
                                                 .getResourceUnits();
                                 getAllocationManager().freeResources(lastUsed);
@@ -355 +356 @@
                         ExecTaskInterface task = iter.next();
                         SubmittedTask subTask = (SubmittedTask)task;
-                        List<ResourceHistoryItem> usedResourcesList = subTask.getUsedResources();
-                        ResourceUnit unit = usedResourcesList.get(usedResourcesList.size() - 1).getResourceUnits()
+                        UsedResourceList<ResourceHistoryItem> usedResourcesList = subTask.getUsedResources();
+                        ResourceUnit unit = usedResourcesList.getLast().getResourceUnits()
                                         .get(ResourceParameterName.PROCESSINGELEMENTS);
 
@@ -385 +386 @@
                 for (ExecTaskInterface task : jobRegistry.getRunningTasks()) {
                         SubmittedTask subTask = (SubmittedTask)task;
-                        Map<ResourceParameterName, ResourceUnit> choosenResources = subTask.getUsedResources()
-                                        .get(subTask.getUsedResources().size() - 1).getResourceUnits();
+                        Map<ResourceParameterName, ResourceUnit> choosenResources = subTask.getUsedResources().getLast().getResourceUnits();
                         double completionPercentage = (task.getLength() - subTask.getRemainingGridletLength())/task.getLength();
                         double time = forecastFinishTimePlugin.execTimeEstimation(null, choosenResources, task,