Changeset 1298 for DCWoRMS/branches

Timestamp:

03/19/14 18:19:43 (11 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -5 +5 @@
 import eduni.simjava.Sim_event;
 import eduni.simjava.Sim_system;
-import gridsim.Accumulator;
-import gridsim.ResourceCalendar;
 import gridsim.dcworms.DCWormsTags;
 import gridsim.dcworms.filter.ExecTaskFilter;
@@ -31 +29 @@
 import schedframe.events.scheduling.TaskRequestedTimeExpiredEvent;
 import schedframe.exceptions.ResourceException;
+import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -54 +53 @@
 import schedframe.scheduling.plugin.estimation.ExecutionTimeEstimationPlugin;
 import schedframe.scheduling.plugin.grid.ModuleListImpl;
-import schedframe.scheduling.plugin.grid.ModuleType;
 import schedframe.scheduling.policy.AbstractManagementSystem;
 import schedframe.scheduling.queue.TaskQueueList;
@@ -64 +62 @@
 import schedframe.scheduling.tasks.WorkloadUnit;
 import simulator.DCWormsConstants;
+import simulator.stats.GSSAccumulator;
 import simulator.utils.DoubleMath;
 
@@ -71 +70 @@
 
         protected double lastUpdateTime;
-
-        protected Accumulator accTotalLoad;
 
         public LocalManagementSystem(String providerId, String entityName, SchedulingPlugin schedPlugin,
@@ -85 +82 @@
                 this.schedulingPlugin =  schedPlugin;
                 this.moduleList = new ModuleListImpl(1);
-                
-                this.accTotalLoad = new Accumulator();
         }
 
         public void init(Scheduler sched, ManagedResources managedResources) {
                 super.init(sched, managedResources);
-                double load = 0;
-                accTotalLoad.add(load);
         }
 
@@ -135 +128 @@
                                 sendFinishedWorkloadUnit(execTask);
                                 log.debug(execTask.getJobId() + "_" + execTask.getId() + " finished execution on " + new DateTime());
-                                log.info(DCWormsConstants.USAGE_MEASURE_NAME + ": " + calculateTotalLoad(jobRegistry.getRunningTasks().size()));
+                                log.info(DCWormsConstants.USAGE_MEASURE_NAME + ": " + calculateTotalLoad());
                                 if (pluginSupportsEvent(tag)) {
                                         SchedulingEvent event = new TaskFinishedEvent(execTask.getJobId(), execTask.getId());
@@ -178 +171 @@
                         execTask = (ExecTask) ev.get_data();
                         updateTaskExecution(execTask, SchedulingEventType.RESOURCE_STATE_CHANGED);
+                        break;
+                        
+                case DCWormsTags.POWER_LIMIT_EXCEEDED:
+                        if (pluginSupportsEvent(tag)) {
+                                SchedulingEvent event = new SchedulingEvent(SchedulingEventType.POWER_LIMIT_EXCEEDED);
+                                schedulingPlugin.schedule(event,
+                                                queues,  getJobRegistry(), getResourceManager(), moduleList);
+                        }
                         break;
                 }
@@ -263 +264 @@
                 }
 
-                log.info(DCWormsConstants.USAGE_MEASURE_NAME + ": " + calculateTotalLoad(jobRegistry.getRunningTasks().size()));
+                log.info(DCWormsConstants.USAGE_MEASURE_NAME + ": " + calculateTotalLoad());
                 
                 PEUnit peUnit = (PEUnit)choosenResources.get(StandardResourceUnitName.PE);
@@ -323 +324 @@
                         ExecTask task = iter.next();
                         Executable exec = (Executable)task;
-                        exec.setCompletionPercentage(exec.getCompletionPercentage() + 100 * (timeSpan / exec.getEstimatedDuration()));
-                        UsedResourcesList usedResourcesList = exec.getUsedResources();
-                        PEUnit peUnit = (PEUnit)usedResourcesList.getLast().getResourceUnits()
-                                        .get(StandardResourceUnitName.PE);
-                        double load = getMIShare(timeSpan, peUnit);
-                        addTotalLoad(load);
+                        if( exec.getUsedResources().size() > 1){         
+                                exec.setCompletionPercentage(exec.getCompletionPercentage() + 100 * (timeSpan / exec.getEstimatedDuration() * (1.0 - exec.getCompletionPercentage()/100.0)));
+                        }
+                        else {
+                                exec.setCompletionPercentage(exec.getCompletionPercentage() + 100 * (timeSpan / exec.getEstimatedDuration()));
+                        }
                 }
         }
@@ -357 +358 @@
                 }
         }
-        
-        private double getMIShare(double timeSpan, PEUnit pes) {
-                double localLoad;
-                ResourceCalendar resCalendar = (ResourceCalendar) moduleList.getModule(ModuleType.RESOURCE_CALENDAR);
-                if (resCalendar == null)
-                        localLoad = 0;
-                else
-                        // 1 - localLoad_ = available MI share percentage
-                        localLoad = resCalendar.getCurrentLoad();
-
-                int speed = pes.getSpeed();
-                int cnt = pes.getAmount();
-
-                double totalMI = speed * cnt * timeSpan * (1 - localLoad);
-                return totalMI;
-        }
 
         protected void updateProcessingTimes(Sim_event ev) {
-                updateProcessingProgress();
                 for (ExecTask execTask : jobRegistry.getRunningTasks()) {
                         Executable exec = (Executable)execTask;
@@ -385 +369 @@
 
                         if(DoubleMath.subtract((lastTimeStamp + exec.getEstimatedDuration()), (new DateTime().getMillis()/1000 + phaseDuration)) == 0.0){
-                                return;
+                                continue;
                         }
 
@@ -438 +422 @@
         }       
 
-        public double calculateTotalLoad(int size) {
-                // background load, defined during initialization
-                double load;
-                ResourceCalendar resCalendar = (ResourceCalendar) moduleList.getModule(ModuleType.RESOURCE_CALENDAR);
-                if (resCalendar == null)
-                        load = 0;
-                else
-                        load = resCalendar.getCurrentLoad();
-
-                int numberOfPE = 0;
+        public double calculateTotalLoad() {
+
+                GSSAccumulator loadAcc = new GSSAccumulator();
                 try {
-                        for(ResourceUnit resUnit : getResourceManager().getPE()){
-                                numberOfPE = numberOfPE + resUnit.getAmount();
-                        }
-                } catch (Exception e) {
-                        numberOfPE = 1;
-                }
-                double tasksPerPE = (double) size / numberOfPE;
-                load += Math.min(1.0 - load, tasksPerPE);
-
-                return load;
-        }
-
-        public Accumulator getTotalLoad() {
-                return accTotalLoad;
-        }
-
-        protected void addTotalLoad(double load) {
-                accTotalLoad.add(load);
-        }
-        
+                        for(ComputingResource compRes: getResourceManager().getResourcesOfType(StandardResourceType.Node)){
+                                loadAcc.add(compRes.getLoadInterface().getRecentUtilization().getValue());                              
+                        }
+                } catch (ResourceException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+                
+                return loadAcc.getMean();
+        }
+
         private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(String resourceName,
                         ExecTask task) {