Changeset 1332 for DCWoRMS/branches

Timestamp:

03/31/14 17:17:59 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/local/LocalManagementSystem.java (modified) (11 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -164 +164 @@
                         break;
                         
-                case DCWormsTags.UPDATE_PROCESSING:
-                        updateProcessingTimes(ev);
-                        break;
                         
                 case DCWormsTags.TASK_EXECUTION_CHANGED:
                         execTask = (ExecTask) ev.get_data();
                         updateTaskExecution(execTask, SchedulingEventType.RESOURCE_STATE_CHANGED);
+                        break;
+                        
+                case DCWormsTags.UPDATE_PROCESSING:
+                        updateProcessingTimes(ev);
                         break;
                         
@@ -244 +245 @@
                 DateTime currentTime = new DateTime();
                 ResourceHistoryItem resHistItem = new ResourceHistoryItem(choosenResources, currentTime);
+                resHistItem.setCompletionPercentage(0);
                 exec.addUsedResources(resHistItem);
                 
@@ -252 +254 @@
                         e.printStackTrace();
                 }
+                
+                PEUnit peUnit = (PEUnit)choosenResources.get(StandardResourceUnitName.PE);
+                notifyComputingResources(peUnit, EnergyEventType.TASK_STARTED, exec);
                 
                 updateTaskExecution(exec, SchedulingEventType.START_TASK_EXECUTION);
@@ -265 +270 @@
 
                 log.info(DCWormsConstants.USAGE_MEASURE_NAME + ": " + calculateTotalLoad());
-                
-                PEUnit peUnit = (PEUnit)choosenResources.get(StandardResourceUnitName.PE);
-                
-                notifyComputingResources(peUnit, EnergyEventType.TASK_STARTED, exec);
                 
         }
@@ -314 +315 @@
         
         protected void updateProcessingProgress() {
+
                 double timeSpan = DoubleMath.subtract(Sim_system.clock(), lastUpdateTime);
                 if (timeSpan <= 0.0) {
@@ -324 +326 @@
                         ExecTask task = iter.next();
                         Executable exec = (Executable)task;
-                        if( exec.getUsedResources().size() > 1){         
-                                exec.setCompletionPercentage(exec.getCompletionPercentage() + 100 * (timeSpan / exec.getEstimatedDuration() * (1.0 - exec.getCompletionPercentage()/100.0)));
-                        }
+
+                        if(exec.getUsedResources().size() > 1){
+                                //System.out.println("--- upadteProgressX: " + Sim_system.sim_clock() );
+                                //System.out.println("taskId: " + exec.getId() + "; completion percentage: " + exec.getCompletionPercentage() + "; timespan: " + timeSpan + "; estimatedDuration: " +  exec.getEstimatedDuration());
+                                exec.setCompletionPercentage(exec.getCompletionPercentage() + 100 * (timeSpan / (exec.getEstimatedDuration()) * (1.0 - exec.getUsedResources().get(exec.getUsedResources().size()-1).getCompletionPercentage()/100.0)));
+                                //System.out.println("newProgress: " + exec.getCompletionPercentage()  );       
+                        } 
                         else {
+                                //System.out.println("--- upadteProgress2: " + Sim_system.sim_clock() );
+                                //System.out.println("taskId: " + exec.getId() + "; completion percentage: " + exec.getCompletionPercentage() + "; timespan: " + timeSpan + "; estimatedDuration: " +  exec.getEstimatedDuration());
                                 exec.setCompletionPercentage(exec.getCompletionPercentage() + 100 * (timeSpan / exec.getEstimatedDuration()));
+                                //System.out.println("newProgress: " + exec.getCompletionPercentage()  );       
                         }
                 }
@@ -337 +346 @@
                         ProcessingElements pes = (ProcessingElements) peUnit;
                         for (ComputingResource resource : pes) {
-                                resource.handleEvent(new EnergyEvent(eventType, obj));
+                                resource.handleEvent(new EnergyEvent(eventType, obj, scheduler.getFullName()));
                                 //DataCenterWorkloadSimulator.getEventManager().sendToResources(resource.getType(), 0, new EnergyEvent(eventType, obj));
                         }
@@ -355 +364 @@
                                 return;
                         }
-                        resource.handleEvent(new EnergyEvent(eventType, obj));
+                        resource.handleEvent(new EnergyEvent(eventType, obj, scheduler.getFullName()));
                 }
         }
@@ -371 +380 @@
                                 continue;
                         }
+                        //System.out.println("=== upadteTIme: " + Sim_system.sim_clock() );
+                        //System.out.println("execId: " + exec.getId() +  "; estimatedDuration " + exec.getEstimatedDuration());
+                        //System.out.println("execId: " + exec.getId() + "; difference " + DoubleMath.subtract((lastTimeStamp + exec.getEstimatedDuration()), (new DateTime().getMillis()/1000 + phaseDuration)));
+                        //System.out.println("completionPercantage: " + exec.getCompletionPercentage() + "; basic duration: " +exec.getResourceConsumptionProfile().getCurrentResourceConsumption().getDuration() +   "; phaseDuration: " +  phaseDuration);
 
                         exec.setEstimatedDuration(phaseDuration);
                         DateTime currentTime = new DateTime();
                         ResourceHistoryItem resHistItem = new ResourceHistoryItem(choosenResources, currentTime);
+                        resHistItem.setCompletionPercentage(exec.getCompletionPercentage());
                         exec.addUsedResources(resHistItem);
                         
@@ -381 +395 @@
                                 scheduler.sim_cancel(filter, null);
                                 scheduler.sendInternal(phaseDuration , DCWormsTags.TASK_EXECUTION_FINISHED, execTask);
-                                PEUnit peUnit = (PEUnit)exec.getUsedResources().getLast().getResourceUnits().get(StandardResourceUnitName.PE);
-                                notifyComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
+                                //PEUnit peUnit = (PEUnit)exec.getUsedResources().getLast().getResourceUnits().get(StandardResourceUnitName.PE);
+                                //notifyComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
                         } else{
                                 ExecTaskFilter filter = new ExecTaskFilter(exec.getUniqueId(), DCWormsTags.TASK_EXECUTION_CHANGED);
                                 scheduler.sim_cancel(filter, null);
                                 scheduler.sendInternal(phaseDuration, DCWormsTags.TASK_EXECUTION_CHANGED, execTask);
-                                PEUnit peUnit = (PEUnit)exec.getUsedResources().getLast().getResourceUnits().get(StandardResourceUnitName.PE);
-                                notifyComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
+                                //PEUnit peUnit = (PEUnit)exec.getUsedResources().getLast().getResourceUnits().get(StandardResourceUnitName.PE);
+                                //notifyComputingResources(peUnit, EnergyEventType.RESOURCE_UTILIZATION_CHANGED, exec);
                         }
                 }
@@ -488 +502 @@
         
         public void notifySubmittedWorkloadUnit(WorkloadUnit wu, boolean ack) {
-                updateProcessingProgress();
+                //250314
+                //updateProcessingProgress();
                 if (log.isInfoEnabled())
                         log.info("Received job " + wu.getId() + " at " + new DateTime(DateTimeUtilsExt.currentTimeMillis()));