Changeset 1299 for DCWoRMS/branches/coolemall/src/dcworms

Timestamp:

03/19/14 18:22:27 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling/Executable.java (modified) (4 diffs)

DCWoRMS/branches/coolemall/src/dcworms/schedframe/scheduling/Executable.java

@@ -2 +2 @@
 
 
-import example.energy.coolemall.CoolEmAllTestbedMeasurements;
 import gridsim.GridSim;
 import gridsim.dcworms.DCWormsTags;
@@ -36 +35 @@
 import schedframe.scheduling.tasks.phases.ResourceConsumptionProfile;
 import schedframe.scheduling.tasks.requirements.ResourceParameterName;
-import simulator.stats.implementation.ResourceUsefulWorkStats;
 
 /**
@@ -213 +211 @@
                 for (ComputingResource resource : pes) {
 
+                                LinkedList<ComputingResource> toExamine = new LinkedList<ComputingResource>();
+                                toExamine.push(resource);
+
+                                while (!toExamine.isEmpty()) {
+                                        ComputingResource compResource = toExamine.pop();
+                                        List<ComputingResource> resources = compResource.getChildren();
+                                        int numberOfRes = resources.size();
+                                        for (int i = 0; i < numberOfRes; i++) {
+                                                ComputingResource resourceChild = resources.get(i);
+                                                trackResource(resourceChild.getFullName());
+                                                toExamine.addLast(resourceChild);
+                                        }
+                                }
+
+                        
                         trackResource(resource.getFullName());
                         
@@ -477 +490 @@
                                         String productName = resource.getResourceCharacteristic().getParameters().get("product").get(0).getContent();
                                         if(productName.equals("Fusion G - T40N"))
-                                                preparePhases("amdf");
+                                                preparePhases("Fusion G - T40N");
                                         else if(productName.equals("Atom - D510"))
-                                                preparePhases("atom64");
+                                                preparePhases("Atom - D510");
                                         else if(productName.equals("Atom - N2600"))
-                                                preparePhases("atom64");
+                                                preparePhases("Atom - N2600");
                                         else if(productName.equals("Core i7 - 2715QE"))
-                                                preparePhases("i7-2715QE");
+                                                preparePhases("Core i7 - 2715QE");
                                         else if(productName.equals("Core i7 - 3615QE"))
-                                                preparePhases("i7-3615QE");
+                                                preparePhases("Core i7 - 3615QE");
+                                        else if(productName.equals("Xeon E5-2630"))
+                                                preparePhases("Xeon E5-2630");
+                                        else if(productName.equals("Xeon E5-2603"))
+                                                preparePhases("Xeon E5-2603");
+                                        else if(productName.equals("Xeon L5310"))
+                                                preparePhases("Xeon L5310");
                                 }
                                 return true;