Changeset 756

Timestamp:

01/07/13 14:54:02 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/schedframe/resources/computing

Files:

• ComputingNode.java (modified) (4 diffs)
• ComputingResource.java (modified) (2 diffs)
• Core.java (modified) (2 diffs)
• DataCenter.java (modified) (2 diffs)
• Processor.java (modified) (2 diffs)
• Rack.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import schedframe.resources.computing.extensions.ExtensionType;
 import schedframe.resources.computing.profiles.energy.EnergyExtension;
+import schedframe.resources.computing.profiles.energy.airthroughput.AirThroughputInterfaceFactory;
+import schedframe.resources.computing.profiles.energy.airthroughput.ui.AirThroughputInterface;
 import schedframe.resources.computing.profiles.energy.power.PowerInterfaceFactory;
 import schedframe.resources.computing.profiles.energy.power.ui.ComputingNodePowerInterface;
@@ -26 +28 @@
                 
                 //extensionList.add(new EnergyExtension(this, resDesc.getPowerInterface(), resDesc.getEnergyEstimationPlugin()));
-                PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
-                accept(new EnergyExtension(pi, resDesc.getPowerProfile()));     
+                //PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
+                //AirThroughputInterface ai = AirThroughputInterfaceFactory.createAirThroughputInterface(this, resDesc.getAirThroughputProfile());
+                //accept(new EnergyExtension(pi, resDesc.getPowerProfile()));
+                //accept(new EnergyExtension(pi, resDesc.getPowerProfile(), ai, resDesc.getAirThroughputProfile()));    
         }
         
@@ -82 +86 @@
         
         public Memory getMemory() throws NoSuchFieldException {
-                return (Memory)resourceCharacteristic.getResourceUnit(StandardResourceUnitName.MEMORY);
+                return (Memory) resourceCharacteristic.getResourceUnit(StandardResourceUnitName.MEMORY);
         }
         
@@ -103 +107 @@
         
         
-        public void accept(EnergyExtension e){
+        /*private void accept(EnergyExtension e){
                 extensionList.add(e);
                 e.setResource(this);
-        }
+        }*/
 }

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

@@ -68 +68 @@
                 this.extensionList = new ExtensionListImpl(1);
                 initCharacteristics(resDesc);
+                accept(new EnergyExtension(this, resDesc.getPowerProfile(), resDesc.getAirThroughputProfile()));        
                 addFakeProcessors();
         }
@@ -321 +322 @@
                 //getEventHandler().handleResourceEvent(new EnergyEvent(EnergyEventType.POWER_STATE_CHANGED, "Resource controller"));
         }
+        
+        
+        private void accept(EnergyExtension e){
+                extensionList.add(e);
+        }
 }

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

@@ -13 +13 @@
         public Core (ComputingResourceDescription resDesc) {
                 super(resDesc);
-                PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
-                accept(new EnergyExtension(pi, resDesc.getPowerProfile()));     
+                //PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
+                //accept(new EnergyExtension(pi, resDesc.getPowerProfile()));   
         }
 
@@ -54 +54 @@
         }
 
-        public void accept(EnergyExtension e){
+        /*private void accept(EnergyExtension e){
                 extensionList.add(e);
                 e.setResource(this);
-        }
+        }*/
 }
 

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

@@ -14 +14 @@
                 super(resDesc);
                 //extensionList.add(new EnergyExtension(this, resDesc.getPowerInterface(), resDesc.getEnergyEstimationPlugin()));
-                PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
-                accept(new EnergyExtension(pi, resDesc.getPowerProfile()));
-        }
-                
-        public void accept(EnergyExtension e){
-                extensionList.add(e);
-                e.setResource(this);
+                //PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
+                //accept(new EnergyExtension(pi, resDesc.getPowerProfile()));
         }
         
@@ -27 +22 @@
                 return (List<ComputingNode>) getDescendantsByType(StandardResourceType.ComputingNode);
         }
+        
+        /*private void accept(EnergyExtension e){
+                extensionList.add(e);
+                e.setResource(this);
+        }*/
 }

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

@@ -22 +22 @@
                 super(resDesc);
                 //extensionList.add(new EnergyExtension(this, resDesc.getPowerInterface(), resDesc.getEnergyEstimationPlugin()));
-                PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
-                accept(new EnergyExtension(pi, resDesc.getPowerProfile()));     
+                //PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
+                //accept(new EnergyExtension(pi, resDesc.getPowerProfile()));   
         }
 
@@ -87 +87 @@
         }
 
-        public void accept(EnergyExtension e){
+        /*private void accept(EnergyExtension e){
                 extensionList.add(e);
                 e.setResource(this);
-        }
+        }*/
 }
 

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

@@ -14 +14 @@
         public Rack (ComputingResourceDescription resDesc) {
                 super(resDesc);
-                PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
-                accept(new EnergyExtension(pi, resDesc.getPowerProfile()));     
+                //PowerInterface pi = PowerInterfaceFactory.createPowerInterface(this, resDesc.getPowerProfile());
+                //accept(new EnergyExtension(pi, resDesc.getPowerProfile()));   
         }
 
@@ -28 +28 @@
         }
         
-        public void accept(EnergyExtension e){
+        /*private void accept(EnergyExtension e){
                 extensionList.add(e);
                 e.setResource(this);
-        }
+        }*/
 }