Changeset 134 for xssim/trunk/src/test

Timestamp:

03/15/12 13:32:09 (13 years ago)

Author:

wojtekp

Message:

 

File:

• xssim/trunk/src/test/rewolucja/scheduling/JobRegistry.java (modified) (5 diffs)

xssim/trunk/src/test/rewolucja/scheduling/JobRegistry.java

@@ -67 +67 @@
                                 if (task.getStatus() == status) {
                                         SubmittedTask subTask = (SubmittedTask) task;
-                                        if (subTask.getResPath().contains(context)) {
+                                        if(subTask.getVisitedResources().contains(context)){
                                                 taskList.add(subTask);
                                         }
+                                        /*if (subTask.getResPath().contains(context)) {
+                                                taskList.add(subTask);
+                                        }*/
                                 }
                         }
@@ -106 +109 @@
                         for (ExecTaskInterface task : submittedTasks) {
                                 SubmittedTask subTask = (SubmittedTask) task;
-                                if (subTask.getResPath().contains(context)) {
+                                if(subTask.getVisitedResources().contains(context)){
                                         taskList.add(subTask);
                                 }
+                                /*if (subTask.getResPath().contains(context)) {
+                                        taskList.add(subTask);
+                                }*/
                         }
                 }
@@ -248 +254 @@
         public void saveHistory (SubmittedTask submittedTask, int estimatedTime, Map<ResourceParameterName, ResourceUnit> choosenResources){
                 
-                submittedTask.setEstimatedDuration(estimatedTime);
+        /*      submittedTask.setEstimatedDuration(estimatedTime);
 
                 DateTime currentTime = new DateTime();
                 ResourceHistoryItem resHistItem = new ResourceHistoryItem(choosenResources, currentTime);
-                submittedTask.addUsedResources(resHistItem);
-
+                submittedTask.addUsedResources(resHistItem);*/
+
+                ResourceHistoryItem resHistItem = submittedTask.getUsedResources().get(submittedTask.getUsedResources().size()-1);
+                DateTime currentTime = new DateTime();
                 Map<String, Object> historyItem = new HashMap<String, Object>();
                 List<ResourceHistoryItem> list = new ArrayList<ResourceHistoryItem>(1);
@@ -262 +270 @@
                 historyItem.put(GssimConstants.END_TIME, currentTime);
 
-                submittedTask.setFinishTime(currentTime.getMillis() / 1000);
-                
                 history.put(Integer.valueOf(submittedTask.getGridletID()), historyItem);
-                ProcessingElements pes = (ProcessingElements) choosenResources.get(ResourceParameterName.PROCESSINGELEMENTS);
+                /*ProcessingElements pes = (ProcessingElements) choosenResources.get(ResourceParameterName.PROCESSINGELEMENTS);
                 for (ComputingResource resource : pes) {
-                        submittedTask.addToResPath(resource.getName());
+                        //submittedTask.addToResPath(resource.getName());
+                        submittedTask.visitResource(resource.getName());
                         ComputingResource parent = resource.getParent();
                         while (parent != null && !submittedTask.getResPath().contains(parent.getName() + "_")) {
@@ -273 +280 @@
                                 parent = parent.getParent();
                         }
-                }
+                        while (parent != null && !submittedTask.getVisitedResources().contains(parent.getName() + "_")) {
+                                submittedTask.visitResource(parent.getName());
+                                parent = parent.getParent();
+                        }
+                }*/
         }