Changeset 241 for xssim/branches/tpiontek/src/test

Timestamp:

04/11/12 16:30:38 (13 years ago)

Author:

piontek

Message:

 

Location:

xssim/branches/tpiontek/src/test/rewolucja

Files:

• energy/profile/implementation/CPUPowerProfile.java (modified) (2 diffs)
• energy/profile/implementation/CPU_A_PowerProfile.java (modified) (1 diff)
• energy/profile/implementation/CPU_B_PowerProfile.java (modified) (1 diff)
• resources/physical/factory/ComputingNodeFactory.java (modified) (2 diffs)
• resources/physical/implementation/Processor.java (modified) (1 diff)

xssim/branches/tpiontek/src/test/rewolucja/energy/profile/implementation/CPUPowerProfile.java

@@ -31 +31 @@
                 powerState = PowerState.ON;
                 pState = getSupportedPStates().get(PStateType.P0);
+                //pState = getSupportedPStates().get(PStateType.P3);
         }
 
@@ -103 +104 @@
         public boolean setPState(PStateType pStateType){
                 PState newPState = getSupportedPStates().get(pStateType);
+                
                 if(newPState != null)
                 {
-                        double factor = pState.getFrequency()/newPState.getFrequency();
+                        double factor = newPState.getFrequency() / pState.getFrequency();
+                        
                         pState = newPState;
                         CpuSpeed speed = (CpuSpeed )cpu.getResourceCharacteristic().getResourceUnits().get(ResourceParameterName.CPUSPEED).get(0);
-                        //speed.setAmount((int)pState.getFrequency());
-
+                        speed.setAmount( (int)(speed.getAmount() * factor));
+                        
                         cpu.handleEvent(new EnergyEvent(EnergyEventType.FREQUENCY_CHANGED, cpu.getName()));
                         cpu.getLogicalResource().sendInternal(GridSimTags.SCHEDULE_NOW, GssimTags.UPDATE, cpu.getName());

xssim/branches/tpiontek/src/test/rewolucja/energy/profile/implementation/CPU_A_PowerProfile.java

@@ -23 +23 @@
                 static {
                         Map<PStateType, PState> pStatesMap = new HashMap<PStateType, PState>();
-                        pStatesMap.put(PStateType.P0, new PState(PStateType.P0, 3000, 0, 350));
-                        pStatesMap.put(PStateType.P1, new PState(PStateType.P1, 2660, 0, 343));
-                        pStatesMap.put(PStateType.P2, new PState(PStateType.P2, 2330, 0, 337));
-                        pStatesMap.put(PStateType.P3, new PState(PStateType.P3, 2000, 0, 330));
+                        pStatesMap.put(PStateType.P0, new PState(PStateType.P0, 3000, 0, 14));
+                        pStatesMap.put(PStateType.P1, new PState(PStateType.P1, 2660, 0, 12));
+                        pStatesMap.put(PStateType.P2, new PState(PStateType.P2, 2330, 0, 10));
+                        pStatesMap.put(PStateType.P3, new PState(PStateType.P3, 2000, 0, 8));
                         pStates = Collections.unmodifiableMap(pStatesMap);
                 }

xssim/branches/tpiontek/src/test/rewolucja/energy/profile/implementation/CPU_B_PowerProfile.java

@@ -23 +23 @@
                 static {
                         Map<PStateType, PState> pStatesMap = new HashMap<PStateType, PState>();
-                        pStatesMap.put(PStateType.P0, new PState(PStateType.P0, 2660, 0, 363));
-                        pStatesMap.put(PStateType.P1, new PState(PStateType.P1, 2330, 0, 357));
-                        pStatesMap.put(PStateType.P2, new PState(PStateType.P2, 2000, 0, 350));
-                        pStatesMap.put(PStateType.P3, new PState(PStateType.P3, 1860, 0, 343));
+                        pStatesMap.put(PStateType.P0, new PState(PStateType.P0, 2200, 0, 19));
+                        pStatesMap.put(PStateType.P1, new PState(PStateType.P1, 2000, 0, 16));
+                        pStatesMap.put(PStateType.P2, new PState(PStateType.P2, 1800, 0, 14));
+                        pStatesMap.put(PStateType.P3, new PState(PStateType.P3, 1000, 0, 10));
                         pStates = Collections.unmodifiableMap(pStatesMap);
                 }

xssim/branches/tpiontek/src/test/rewolucja/resources/physical/factory/ComputingNodeFactory.java

@@ -4 +4 @@
 import schedframe.resources.units.Memory;
 import test.rewolucja.resources.Category;
-import test.rewolucja.resources.ResourceCharacteristics;
 import test.rewolucja.resources.description.ExecResourceDescription;
 import test.rewolucja.resources.physical.base.ComputingResource;
@@ -37 +36 @@
                 String resName = resDesc.getResourceId();
                 Category cat = resDesc.getCategory();
-                if(cat.getName().equals("A")){
-                        resDesc.addResourceUnit(new Memory(resName, 12288, 0));
+                
+                if(cat.getName().equals("A"))
+                {
+                        resDesc.addResourceUnit(new Memory(resName, 8704, 0));
                         resDesc.addResourceUnit(new Cost(resName, 100));
                         return new ComputingNode(resDesc);
-                } else if (cat.getName().equals("B")){
-                        resDesc.addResourceUnit(new Memory(resName, 12288, 0));
+                }
+                else if (cat.getName().equals("B"))
+                {
+                        resDesc.addResourceUnit(new Memory(resName, 6144, 0));
                         resDesc.addResourceUnit(new Cost(resName, 100));
                         return new ComputingNode(resDesc);
-                } else if (cat.getName().equals("C")){
-                        resDesc.addResourceUnit(new Memory(resName, 12288, 0));
+                }
+                else if (cat.getName().equals("C"))
+                {
+                        resDesc.addResourceUnit(new Memory(resName, 0, 0));
                         resDesc.addResourceUnit(new Cost(resName, 100));
                         return new ComputingNode(resDesc);
-                } else {
-                        resDesc.addResourceUnit(new Memory(resName, 12288, 0));
+                }
+                else
+                {
+                        resDesc.addResourceUnit(new Memory(resName, 0, 0));
                         resDesc.addResourceUnit(new Cost(resName, 100));
                         return new ComputingNode(resDesc);

xssim/branches/tpiontek/src/test/rewolucja/resources/physical/implementation/Processor.java

@@ -56 +56 @@
         public void initCharacteristics(ExecResourceDescription resDesc){
                 resourceCharacteristic = new ResourceCharacteristics();
-                resourceCharacteristic.addResourceUnit(new CpuSpeed(name, 1, 0));
+                
+                int speed = 1000;
+                if( resDesc.getCategory().getName().equals("A"))
+                        speed = 2000;
+                
+                resourceCharacteristic.addResourceUnit(new CpuSpeed(name, speed, 0));
         }