Changeset 133 for xssim/trunk/src/test

Timestamp:

03/15/12 13:31:44 (13 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -193 +193 @@
                                 jobRegistry.addTask(submittedTask);
                         }
-                        LogicalResource logicalRes = logicalResource;
-                        submittedTask.addToResPath(logicalRes.get_name());
-                        while (logicalRes != null && !submittedTask.getResPath().contains(logicalRes.get_name())) {
+
+                        //submittedTask.addToResPath(logicalRes.get_name());
+                        submittedTask.visitResource(logicalResource.get_name());
+                        LogicalResource logicalRes = logicalResource.getParent();
+                        /*while (logicalRes != null && !submittedTask.getResPath().contains(logicalRes.get_name())) {
                                 submittedTask.addToResPath(logicalRes.get_name());
+                                logicalRes = logicalRes.getParent();
+                        }*/
+                        while (logicalRes != null && !submittedTask.getVisitedResources().contains(logicalRes.get_name())) {
+                                submittedTask.visitResource(logicalRes.get_name());
                                 logicalRes = logicalRes.getParent();
                         }
@@ -302 +308 @@
                 if (time < 0.0)
                         return;
-                submittedTask.setGridletStatus(Gridlet.INEXEC);
-                log.info(GssimConstants.USAGE_MEASURE_NAME + ": " + calculateTotalLoad(jobRegistry.getRunningTasks().size()));
+                
+                submittedTask.setEstimatedDuration(time);
+                DateTime currentTime = new DateTime();
+                ResourceHistoryItem resHistItem = new ResourceHistoryItem(choosenResources, currentTime);
+                submittedTask.addUsedResources(resHistItem);
+                submittedTask.setFinishTime(currentTime.getMillis() / 1000);
                 
                 jobRegistry.saveHistory(submittedTask, time, choosenResources);
@@ -318 +328 @@
                 }
                 
+                submittedTask.setGridletStatus(Gridlet.INEXEC);
+                log.info(GssimConstants.USAGE_MEASURE_NAME + ": " + calculateTotalLoad(jobRegistry.getRunningTasks().size()));
+                
                 ProcessingElements pes = (ProcessingElements) choosenResources.get(ResourceParameterName.PROCESSINGELEMENTS);
                 for (ComputingResource resource : pes) {
@@ -323 +336 @@
                 }
 
+                /*for(ExecTaskInterface etask : jobRegistry.getRunningTasks()){
+                        System.out.println(etask.getJobId());
+                        for(String taskId: etask.getVisitedResources())
+                                System.out.println("====="+taskId);
+                }*/
 
         }
@@ -372 +390 @@
                         double time = forecastFinishTimePlugin.execTimeEstimation(null, choosenResources, task,
                                         completionPercentage);
-                        if(!subTask.getResPath().contains(ev.get_data().toString())) {
+                        /*if(!subTask.getResPath().contains(ev.get_data().toString())) {
+                                continue;*/
+                        if(!subTask.getVisitedResources().contains(ev.get_data().toString())) {
                                 continue;
                         } else if( DoubleMath.subtract(subTask.getEstimatedDuration(), (time + lastUpdateTime)) == 0.0){