Changeset 512 for DCWoRMS/trunk/src/schedframe/resources/computing

Timestamp:

10/12/12 13:04:31 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/schedframe/resources/computing

Files:

• ComputingResource.java (modified) (4 diffs)
• description/ComputingResourceDescription.java (modified) (3 diffs)
• profiles/energy/power/PowerProfile.java (modified) (1 diff)
• profiles/energy/power/ui/ProcessorPowerInterface.java (modified) (6 diffs)

DCWoRMS/trunk/src/schedframe/resources/computing/ComputingResource.java

@@ -46 +46 @@
         protected String name;
         protected ResourceType type;
+        protected String category;
         protected ResourceStatus status;
 
@@ -63 +64 @@
                 this.type = resDesc.getType();
                 this.name = resDesc.getId();
+                this.category = resDesc.getCategory();
                 this.status = ResourceStatus.FREE;
                 this.extensionList = new ExtensionListImpl(1);
@@ -230 +232 @@
         }
         
+        public String getCategory(){
+                return category;
+        }
+        
         public PowerInterface getPowerInterface(){
                 if (extensionList != null) {
@@ -297 +303 @@
         public void initiate(){
                 
-                ResourceEventCommand rec = new ResourceEventCommand(this);
+                /*ResourceEventCommand rec = new ResourceEventCommand(this);
                 EnergyEvent event = new EnergyEvent(EnergyEventType.AIRFLOW_STATE_CHANGED, "Resource controller");
                 event.setReason(EventReason.SIM_INIT);
-                rec.execute(event);
-                
-                rec = new ResourceEventCommand(this);
-                event = new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, "Resource controller");
+                rec.execute(event);*/
+                ResourceEventCommand rec = new ResourceEventCommand(this);
+                EnergyEvent event = new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, "Resource controller");
                 event.setReason(EventReason.SIM_INIT);
                 rec.execute(event);

DCWoRMS/trunk/src/schedframe/resources/computing/description/ComputingResourceDescription.java

@@ -33 +33 @@
         protected AirThroughputProfile airThroughputProfile;
         protected Location location;
+        protected String category;
         //protected Parameters parameters;
 
@@ -40 +41 @@
 
                 initId(computingResource);
+                this.category = computingResource.getType();
 
                 if (computingResource.getComputingResourceTypeChoiceSequence() != null) {
@@ -263 +265 @@
         }
 
-
+        public String getCategory() {
+                return category;
+        }
 
 }

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

@@ -66 +66 @@
         }
         
-        public Map<String, PState> getSupportedPStates() throws NoSuchFieldException {
+        public Map<String, PState> getSupportedPStates() {
                 if(supportedPStates == null)
-                        throw new NoSuchFieldException("Supported p-states are not defined.");
+                        return new HashMap<String, PState>();
                 return supportedPStates;
         }

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;
@@ -15 +12 @@
 import schedframe.resources.computing.profiles.energy.power.PowerStateName;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
-import schedframe.resources.units.CpuSpeed;
-import schedframe.resources.units.StandardResourceUnitName;
 
 public class ProcessorPowerInterface extends ComputingResourcePowerInterface {
@@ -26 +21 @@
                 super(resource, pp);
                 currentPowerState = StandardPowerStateName.ON;
-                try {
-                        currentPState = getSupportedPStates().get("P0");
-                } catch (NoSuchFieldException e) {
-                        currentPState = null;
-                }
+                currentPState = getSupportedPStates().get("P0");
         }
         
@@ -53 +44 @@
         }
         
-        public Map<String, PState> getSupportedPStates() throws NoSuchFieldException {
+        public Map<String, PState> getSupportedPStates() {
                 return powerProfile.getSupportedPStates();
         }
         
         public boolean supportPState(PState pState) {
-                try {
-                        for(String pStateName: getSupportedPStates().keySet()){
-                                if(pState.getName().equals(pStateName)){
-                                        return true;
-                                }
+
+                for(String pStateName: getSupportedPStates().keySet()){
+                        if(pState.getName().equals(pStateName)){
+                                return true;
                         }
-                } catch (NoSuchFieldException e) {
-                        return false;
                 }
                 return false;
@@ -71 +59 @@
         
         public boolean setPState(String pStateName){
-                PState newPState;
-                try {
-                        newPState = getSupportedPStates().get(pStateName);
-                } catch (NoSuchFieldException e) {
-                        return false;
-                }
+                PState newPState = getSupportedPStates().get(pStateName);
 
-                if(newPState != currentPState){
+
+                if(newPState != null && newPState != currentPState){
                         //double factor = newPState.getFrequency()/currentPState.getFrequency();
                         currentPState = newPState;
@@ -97 +81 @@
 
         public boolean setFrequency(double freq) {
-                try {
-                        for(String pStateName: getSupportedPStates().keySet()){
-                                if(getSupportedPStates().get(pStateName).getFrequency() == freq){
-                                        setPState(pStateName);
-                                        return true;
-                                }
+
+                for(String pStateName: getSupportedPStates().keySet()){
+                        if(getSupportedPStates().get(pStateName).getFrequency() == freq){
+                                setPState(pStateName);
+                                return true;
                         }
-                } catch (NoSuchFieldException e) {
-                        return false;
                 }
                 return false;