Changeset 1452 for DCWoRMS/branches

Timestamp:

10/28/14 23:25:17 (10 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src

Files:

• example/load/AppBasedProcessorLoadEstimationPlugin.java (modified) (1 diff)
• schedframe/resources/utils/ResourceIdGenerator.java (modified) (1 diff)
• schedframe/scheduling/manager/tasks/JobRegistryImpl.java (modified) (1 diff)
• simulator/DataCenterWorkloadSimulator.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/example/load/AppBasedProcessorLoadEstimationPlugin.java

@@ -14 +14 @@
                 double sumCoresLoad = 0;
                 
-                double nrOfThreadsOnCpu = proc.getCores().size();
+                double nrOfThreadsOnCpu = proc.getCores().size() > 0 ? proc.getCores().size() : 1;
                 
                 if(proc.getResourceCharacteristic().getParameters().get("threads") != null){

DCWoRMS/branches/coolemall/src/schedframe/resources/utils/ResourceIdGenerator.java

@@ -17 +17 @@
                 return value;
         }
+        
+        public static void reset(){
+                resourceCounter.clear();
+        }
 }

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java

@@ -264 +264 @@
                 return false;
         }
+        
+        public static void reset(){
+                jobs.clear();
+                executables.clear();
+        }
 
 }

DCWoRMS/branches/coolemall/src/simulator/DataCenterWorkloadSimulator.java

@@ -22 +22 @@
 
 import schedframe.SimulatedEnvironment;
+import schedframe.resources.utils.ResourceIdGenerator;
+import schedframe.scheduling.manager.tasks.JobRegistryImpl;
 import simulator.reader.ResourceReader;
 import simulator.stats.AccumulatedStatistics;
@@ -178 +180 @@
                                 performSimulation(simulationIdentifier,
                                                 configurationOptions); // run the simulation
+                                ResourceIdGenerator.reset();
+                                JobRegistryImpl.reset();
 
                         } catch (Exception e) {