Changeset 506

Timestamp:

10/11/12 15:37:34 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src

Files:

• schedframe/resources/computing/profiles/energy/power/ui/ProcessorPowerInterface.java (modified) (4 diffs)
• simulator/reader/ResourceReader.java (modified) (1 diff)
• test/ariel (added)
• test/ariel/CPUFreqScalingExecTimeEstimationPlugin.java (added)
• test/ariel/FCFSCPUFreqScalingPlugin.java (added)
• test/ariel/RunExperiment.java (added)
• test/ariel/experiment1.properties (added)
• test/ariel/resources.xml (added)
• test/ariel/workload.swf (added)

DCWoRMS/trunk/src/schedframe/resources/computing/profiles/energy/power/ui/ProcessorPowerInterface.java

@@ -1 +1 @@
 package schedframe.resources.computing.profiles.energy.power.ui;
 
+
+import gridsim.GridSimTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.Map;
@@ -35 +38 @@
                 if(powerState != currentPowerState){
                         currentPowerState = powerState;
-                        //Processor cpu = (Processor) resource;
                         if(powerState == StandardPowerStateName.OFF){
                                 resource.setStatus(ResourceStatus.UNAVAILABLE);
@@ -41 +43 @@
                                 resource.setStatus(ResourceStatus.FREE);
                         }
-                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getName()));
-                        //cpu.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, cpu.getName()));                 
+                        resource.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, resource.getName()));         
                 }
 
@@ -78 +79 @@
 
                 if(newPState != currentPState){
-                        double factor = newPState.getFrequency()/currentPState.getFrequency();
+                        //double factor = newPState.getFrequency()/currentPState.getFrequency();
                         currentPState = newPState;
-                        CpuSpeed speed = (CpuSpeed)resource.getResourceCharacteristic().getResourceUnits().get(StandardResourceUnitName.CPUSPEED).get(0);
+                        //CpuSpeed speed = (CpuSpeed)resource.getResourceCharacteristic().getResourceUnits().get(StandardResourceUnitName.CPUSPEED).get(0);
                         //speed.setAmount(Double.valueOf(currentPState.getFrequency()).intValue());
                         //new ResourceEventCommand(resource).execute(EnergyEventType.FREQUENCY_CHANGED);

DCWoRMS/trunk/src/simulator/reader/ResourceReader.java

@@ -257 +257 @@
                 //TODO - refactor (remove - create scheduler on the basis of resource description)
                 Scheduler mainScheduler = null;
-                if(mainSchedulers.size() == 1 && mainSchedulers.get(0).get_name().equals("grid")){
+                if(mainSchedulers.size() == 1 /*&& mainSchedulers.get(0).get_name().equals("grid")*/){
                         mainScheduler = mainSchedulers.get(0);
                 }