Changeset 512 for DCWoRMS/trunk/src/simulator

Timestamp:

10/12/12 13:04:31 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/simulator

Files:

• DataCenterWorkloadSimulator.java (modified) (1 diff)
• reader/ResourceReader.java (modified) (5 diffs)
• stats/implementation/DCWormsStatistics.java (modified) (2 diffs)

DCWoRMS/trunk/src/simulator/DataCenterWorkloadSimulator.java

@@ -262 +262 @@
                 ResourceController rc = resourceReader.read();
 
-                while(!rc.getToInit().isEmpty()){
-                        Initializable initObj = rc.getToInit().pop();
+                for(Initializable initObj: rc.getToInit()){
                         initObj.initiate();
                 }

DCWoRMS/trunk/src/simulator/reader/ResourceReader.java

@@ -9 +9 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Deque;
 import java.util.HashMap;
@@ -27 +29 @@
 import schedframe.ResourceController;
 import schedframe.exceptions.ResourceException;
+import schedframe.resources.Resource;
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingResource;
@@ -51 +54 @@
 
         protected ResourceCalendar resourceCalendar;
-        protected Deque<Initializable> toInit = new ArrayDeque<Initializable>();
+        protected List<Initializable> toInit = new ArrayList<Initializable>();
         
         private ExecutionTimeEstimationPlugin execTimeEstimationPlugin;
@@ -85 +88 @@
 
                 ResourceController rc = new ResourceController(mainScheduler, computingResources);
+                Collections.sort(toInit, new ResourceTypeComparator(new ArrayList<String>(compResLayers)));
                 rc.setInitList(toInit);
                 rc.setCompResLayers(compResLayers);
@@ -430 +434 @@
         }
         
+        class ResourceTypeComparator implements Comparator<Initializable>{
+                
+                List<String> order;
+                ResourceTypeComparator(List<String> order) {
+                        this.order = order;
+                }
+                public int compare(Initializable init1, Initializable init2) {
+                        String type1 = ((Resource)init1).getType().getName();
+                        String type2 = ((Resource)init2).getType().getName();
+                        if(order.indexOf(type1) > order.indexOf(type2))
+                                return -1;
+                        else if (order.indexOf(type1) < order.indexOf(type2))
+                                return 1;
+                        else return 0;
+                        
+                }
+        }
+        
 }

DCWoRMS/trunk/src/simulator/stats/implementation/DCWormsStatistics.java

@@ -331 +331 @@
                                                 energyUsage.setSumValue(energyUsage.getMeanValue() * (endSimulationTime - startSimulationTime) / (3600 * MILLI_SEC));
                                                 
-                                                EnergyExtension een = (EnergyExtension )(resource.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
+                                                EnergyExtension een = (EnergyExtension)(resource.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
                                                 if(resourceController.getComputingResources().contains(resource)) {
                                                         if( een != null /*&& een.getPp() != null*/ ){
@@ -339 +339 @@
                                                 } else if( een != null && een.getPowerProfile() != null ){
                                                         ComputingResource parent = resource.getParent();
-                                                        een = (EnergyExtension )(parent.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
+                                                        een = (EnergyExtension)(parent.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
                                                         boolean top = true;
                                                         while(parent != null){