Changeset 241 for xssim/branches/tpiontek/src

Timestamp:

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

Author:

piontek

Message:

 

Location:

xssim/branches/tpiontek/src

Files:

• example/energy/CPUEnergyEstimationPlugin.java (modified) (2 diffs)
• example/energy/ComputingNodeEnergyEstimationPlugin.java (modified) (3 diffs)
• example/localplugin/FCFSRandomClusterLocalPlugin.java (modified) (6 diffs)
• example/timeestimation/ExecTimeEstimationPlugin.java (modified) (3 diffs)
• simulator/GridSchedulingSimulator.java (modified) (2 diffs)
• simulator/stats/implementation/GSSimStatistics.java (modified) (2 diffs)
• test/rewolucja/energy/profile/implementation/CPUPowerProfile.java (modified) (2 diffs)
• test/rewolucja/energy/profile/implementation/CPU_A_PowerProfile.java (modified) (1 diff)
• test/rewolucja/energy/profile/implementation/CPU_B_PowerProfile.java (modified) (1 diff)
• test/rewolucja/resources/physical/factory/ComputingNodeFactory.java (modified) (2 diffs)
• test/rewolucja/resources/physical/implementation/Processor.java (modified) (1 diff)

xssim/branches/tpiontek/src/example/energy/CPUEnergyEstimationPlugin.java

@@ -1 +1 @@
 package example.energy;
 
+import gssim.schedframe.scheduling.ExecTaskInterface;
+
+import java.util.List;
 import java.util.Properties;
 
@@ -16 +19 @@
                         ComputingResource resource) {
                 Processor cpu = (Processor)resource;
+                
                 if(resource.getPowerInterface().getPowerState() == PowerState.OFF)
                         return 0;
+                
+                double factor = 1.3;
+                
                 if(resource.getStatus() == ResourceStatus.BUSY)
-                        return cpu.getPowerInterface().getPState().getPower();
+                {
+                        List<ExecTaskInterface> tasks = jobRegistry.getRunningTasks();
+                        int type = Integer.parseInt( tasks.get(0).getJobId());
+                        
+                        switch( type % 4)
+                        {
+                                default: factor = 1.3; 
+                        }
+                        
+                        return cpu.getPowerInterface().getPState().getPower() * factor;
+                }       
                 else 
-                        return 1; 
+                        return cpu.getPowerInterface().getPState().getPower(); 
         }
 

xssim/branches/tpiontek/src/example/energy/ComputingNodeEnergyEstimationPlugin.java

@@ -5 +5 @@
 import test.rewolucja.energy.EnergyEvent;
 import test.rewolucja.resources.physical.base.ComputingResource;
+import test.rewolucja.resources.physical.implementation.ComputingNode;
 import test.rewolucja.resources.physical.implementation.Processor;
-import test.rewolucja.resources.physical.implementation.ComputingNode;
 import test.rewolucja.scheduling.JobRegistryInterface;
 
@@ -16 +16 @@
                 double power = 0;
                 ComputingNode node = (ComputingNode) resource;
+                
+                if( node.getCategory().getName().equals("A"))
+                        power = 240;
+                else if( node.getCategory().getName().equals("B"))
+                        power = 95;
+                else
+                {
+                        System.err.println("Unknown Model: "  +node.getCategory().getName());
+                        System.exit(1);
+                }       
+                
+                
+                
                 for(Processor cpu: node.getProcessors()){
                         //try{
@@ -23 +36 @@
                         //}
                 }
-                power += node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
+                //power += node.getPowerInterface().getPowerConsumption(node.getPowerInterface().getPowerState());
                 return power;
         }

xssim/branches/tpiontek/src/example/localplugin/FCFSRandomClusterLocalPlugin.java

@@ -3 +3 @@
 import gridsim.Gridlet;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -11 +12 @@
 import schedframe.scheduling.plugin.grid.ModuleList;
 import test.rewolucja.GSSIMJobInterface;
+import test.rewolucja.energy.profile.PStateType;
 import test.rewolucja.resources.manager.implementation.ClusterResourceManager;
 import test.rewolucja.resources.manager.interfaces.ResourceManagerInterface;
 import test.rewolucja.resources.physical.implementation.ComputingNode;
+import test.rewolucja.resources.physical.implementation.Processor;
 import test.rewolucja.scheduling.JobRegistryInterface;
 import test.rewolucja.scheduling.plan.SchedulingPlanInterfaceNew;
@@ -23 +26 @@
 
         private Random rand;
+        private boolean init = true;
         
         public FCFSRandomClusterLocalPlugin() {
@@ -30 +34 @@
         public SchedulingPlanInterfaceNew schedule(SchedulingEvent event, QueueList queues, JobRegistryInterface jobRegistry,
                          ResourceManagerInterface resManager, ModuleList modules) {
+                
+                ClusterResourceManager resourceManager = (ClusterResourceManager) resManager;
+                
+                if( init)
+                {
+                        List<Processor> cpus = resourceManager.getProcessors();
+                        
+                        for( Processor cpu : cpus)
+                                cpu.getPowerInterface().setPState( PStateType.P3);
+                        
+                        init = false;
+                }
+                
 
-                ClusterResourceManager resourceManager = (ClusterResourceManager) resManager;
+                
                 SchedulingPlanNew plan = new SchedulingPlanNew();
                 // chose the events types to serve.
@@ -48 +65 @@
                                 // if status of the tasks in READY
                                 if (task.getStatus() == Gridlet.READY) {
-                                        String nodeName = chooseRandomProvider(resourceManager);
+                                        String nodeName = chooseRandomProvider(resourceManager, task);
                                         if (nodeName != null) {
                                                 addToSchedulingPlan(plan, task, nodeName);
@@ -59 +76 @@
         }
 
-        private String chooseRandomProvider(ClusterResourceManager resourceManager) {
+        private List<ComputingNode> findSuitableNodes(int cpuRequest, List<ComputingNode> nodes){
+                List<ComputingNode> avNodes = new ArrayList<ComputingNode>();
+                for(ComputingNode node: nodes){
+                        if(node.getFreeProcessorsNumber() >= cpuRequest){
+                                avNodes.add(node);
+                        }
+                }
+                return avNodes;
+        }
+        
+        private String chooseRandomProvider(ClusterResourceManager resourceManager, TaskInterface<?> task) {
+                
+                int cpuRequest;
+                try {
+                        cpuRequest = Double.valueOf(task.getCpuCntRequest()).intValue();
+                } catch (NoSuchFieldException e) {
+                        cpuRequest = 1;
+                }
+                
                 List<ComputingNode> nodes = resourceManager.getComputingNodes();
+                
+                nodes = findSuitableNodes(cpuRequest, nodes);
+                
                 int nodeIdx = rand.nextInt(nodes.size());
                 return nodes.get(nodeIdx).getName();

xssim/branches/tpiontek/src/example/timeestimation/ExecTimeEstimationPlugin.java

@@ -10 +10 @@
 import schedframe.scheduling.plugin.SchedulingPluginConfiguration;
 import schedframe.scheduling.utils.ResourceParameterName;
+import test.rewolucja.energy.profile.PState;
+import test.rewolucja.energy.profile.PStateType;
 import test.rewolucja.resources.ProcessingElements;
+import test.rewolucja.resources.physical.implementation.Processor;
 
 
@@ -38 +41 @@
                 // obtain single pe speed
                 int speed = pes.getSpeed();
-
+                
                 // number of used pe  
                 int cnt = pes.getUsedAmount();
@@ -44 +47 @@
                 double remainingLength =  task.getLength() * (1- completionPercentage);
                 // do the calculation
-                double execTime = (remainingLength / (cnt * speed));
+                double execTime = (remainingLength / (cnt * speed/1000));
 
                 // if the result is very close to 0, but less then one millisecond then round this result to 0.001

xssim/branches/tpiontek/src/simulator/GridSchedulingSimulator.java

@@ -292 +292 @@
                 };
 
-                File tarArchive = new File(outputDir, "results.tar");
+                /*File tarArchive = new File(outputDir, "results.tar");
 
                 File networkTopologyFile = (configurationOptions.networkTopologyFileName == null) ? null
@@ -302 +302 @@
                 } catch (IOException e) {
                         log.error("IOException occured while creating archive file", e);
-                }
-        }
+                }*/     }
 
         public void runMultiuser(String rootDirPath, GridSchedulingSimulator gssim) {

xssim/branches/tpiontek/src/simulator/stats/implementation/GSSimStatistics.java

@@ -326 +326 @@
                                                 if (resourceLoadStatsFile != null) {
                                                         Object txt = resourceUsage.serialize(serializer);
-                                                        resourceLoadStatsFile.println(txt);
+                                                        if( resType == ResourceType.DATA_CENTER)
+                                                                resourceLoadStatsFile.println(txt);
                                                 }
                                         }
@@ -340 +341 @@
                                                 if (energyStatsFile != null) {
                                                         Object txt = energyUsage.serialize(serializer);
-                                                        energyStatsFile.println(txt);
+                                                        if( resType == ResourceType.DATA_CENTER)
+                                                                energyStatsFile.println(txt);
                                                 }
                                         }

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));
         }