Changeset 1321 for DCWoRMS/branches

Timestamp:

03/31/14 16:06:25 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui

Files:

• ComputingResourcePowerInterface.java (modified) (2 diffs)
• NodePowerInterface.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/ComputingResourcePowerInterface.java

@@ -30 +30 @@
         
         public boolean setPowerState(PowerStateName state) {
-                if(supportPowerState(state)){
+                if(!supportPowerState(state))
+                        return false;
+                        
+                if(state != currentPowerState){
                         currentPowerState = state;
 
                         for(ComputingResource child:resource.getChildren()){
                                 if(child.getPowerInterface().supportPowerState(state)){
-                                        boolean status = child.getPowerInterface().setPowerState(state);
+                                        child.getPowerInterface().setPowerState(state);
                                 }
                         }
@@ -52 +55 @@
                         
                         //ResourceController.traceResource(new DateTime().getMillis(), resource.getFullName(), "POWER_STATE_CHANGED", state.getName());
-                        return true;
                 }
-                return false;
+                return true;
         }
         

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/energy/power/ui/NodePowerInterface.java

@@ -28 +28 @@
                 if(!supportPowerState(state))
                         return false;
-                currentPowerState = state;
-                Node node = (Node) resource;
-                boolean pePowerStateChangeStatus = false;
-                if(node.getProcessors() != null) {
+                if(state != currentPowerState){
+                        currentPowerState = state;
+                        
+                        Node node = (Node) resource;
                         for(ComputingResource child:node.getProcessors()){
                                 if(child.getPowerInterface() != null){
-                                        pePowerStateChangeStatus = child.getPowerInterface().setPowerState(state);      
+                                        child.getPowerInterface().setPowerState(state); 
                                 }
                         }
-                } 
-                
-                if(!pePowerStateChangeStatus){
+
+                        if(state == StandardPowerStateName.OFF){
+                                node.setStatus(ResourceStatus.UNAVAILABLE);
+                        }
+                        else if(state == StandardPowerStateName.ON){
+                                node.setStatus(ResourceStatus.FREE);
+                        }
+        
                         node.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, node.getFullName()));
+
+                        //node.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, computingNode.getName()));
+                        //ResourceController.traceResource(new DateTime().getMillis(), resource.getFullName(), "POWER_STATE_CHANGED", state.getName()); 
                 }
-
-                if(state == StandardPowerStateName.OFF){
-                        node.setStatus(ResourceStatus.UNAVAILABLE);
-                }
-                else if(state == StandardPowerStateName.ON){
-                        node.setStatus(ResourceStatus.FREE);
-                }
-                //node.handleEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, computingNode.getName()));
-                //ResourceController.traceResource(new DateTime().getMillis(), resource.getFullName(), "POWER_STATE_CHANGED", state.getName());
                 return true;
         }