Changeset 1423 for DCWoRMS/branches/coolemall/src/example/load

Timestamp:

07/30/14 12:25:00 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/example/load

Files:

• AppBasedProcessorLoadEstimationPlugin.java (added)
• ProcessorLoadEstimationPlugin.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/example/load/ProcessorLoadEstimationPlugin.java

@@ -1 +1 @@
 package example.load;
 
+import schedframe.resources.ResourceStatus;
+import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.ResourceEvent;
 import schedframe.resources.devices.PhysicalResource;
 import schedframe.scheduling.manager.tasks.JobRegistry;
-import schedframe.scheduling.manager.tasks.JobRegistryImpl;
-import schedframe.scheduling.tasks.phases.PhaseSystemLoad;
-import dcworms.schedframe.scheduling.ExecTask;
 
 public class ProcessorLoadEstimationPlugin extends BaseLoadEstimationPlugin{
@@ -14 +13 @@
                 Processor proc = (Processor) resource;
                 double sumCoresLoad = 0;
-                
-                double nrOfThreadsOnCpu = proc.getCores().size();
-                
-                if(proc.getResourceCharacteristic().getParameters().get("threads") != null){
-                        nrOfThreadsOnCpu = nrOfThreadsOnCpu * Integer.valueOf(proc.getResourceCharacteristic().getParameters().get("threads").get(0).getContent()).intValue();
+                if(proc.getStatus().equals(ResourceStatus.BUSY)){
+                        sumCoresLoad = 1;
+                } else {
+                        if(proc.getCores().size() > 0){
+                                for(Core core: proc.getCores()){
+                                        if(core.getStatus().equals(ResourceStatus.BUSY)){
+                                                sumCoresLoad = sumCoresLoad + 1;
+                                        }
+                                }
+                                sumCoresLoad = sumCoresLoad / proc.getCores().size();   
+                        }
                 }
-
-
-                JobRegistry jr = new JobRegistryImpl(proc.getFullName());
-                for(ExecTask task: jr.getRunningTasks()){
-                        double cpuUsage = 1 / nrOfThreadsOnCpu;
-
-                        for(PhaseSystemLoad pb: task.getExecutionProfile().getCurrentResourceConsumption().getSystemLoad()){
-                                if(pb.getResouceName().equals("PM_CPU_Usage")){
-                                        cpuUsage = pb.getUtilization();
-                                }
-                        }
-                        sumCoresLoad = sumCoresLoad + cpuUsage;
-
-                }
-
 
                 double processorLoad = 100 * sumCoresLoad;