Changeset 481 for DCWoRMS/trunk/src/simulator

Timestamp:

10/08/12 10:23:45 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/simulator

Files:

• DCWormsConstants.java (moved) (moved from DCWoRMS/trunk/src/simulator/WormsConstants.java) (1 diff)
• DCWormsUsers.java (moved) (moved from DCWoRMS/trunk/src/simulator/WormsUsers.java) (5 diffs)
• DataCenterWorkloadSimulator.java (modified) (4 diffs)
• stats/AccumulatedStatistics.java (modified) (1 diff)
• stats/implementation/DCWormsStatistics.java (moved) (moved from DCWoRMS/trunk/src/simulator/stats/implementation/WormsStatistics.java) (23 diffs)
• stats/implementation/StatsAbstractClass.java (deleted)
• stats/implementation/TaskStats.java (modified) (1 diff)
• workload/generator/impl/QcgJobGenerator.java (modified) (2 diffs)

DCWoRMS/trunk/src/simulator/DCWormsConstants.java

@@ -3 +3 @@
 import eduni.simjava.Sim_stat;
 
-public class WormsConstants {
+public class DCWormsConstants {
 
         public static final String START_TIME="start_time";

DCWoRMS/trunk/src/simulator/DCWormsUsers.java

@@ -7 +7 @@
 import gridsim.Gridlet;
 import gridsim.IO_data;
+import gridsim.gssim.DCWormsTags;
 import gridsim.net.InfoPacket;
 import gssim.schedframe.scheduling.utils.JobDescription;
@@ -31 +32 @@
 import simulator.workload.WorkloadLoader;
 
-public class WormsUsers extends GridSim implements GenericUser {
+public class DCWormsUsers extends GridSim implements GenericUser {
 
         /**A job generator, which produces jobs and tasks. These jobs are then sent by this entity */
@@ -54 +55 @@
         protected boolean error;
         
-        private static Log log = LogFactory.getLog(WormsUsers.class);
+        private static Log log = LogFactory.getLog(DCWormsUsers.class);
         
         /**
@@ -63 +64 @@
          * @throws Exception if any occurs (see {@link GridSim#GridSim(String, double)})
          */
-        public WormsUsers(String name, String destinationName, WorkloadLoader workload) throws Exception {
-                super(name, WormsConstants.DEFAULT_BAUD_RATE);
+        public DCWormsUsers(String name, String destinationName, WorkloadLoader workload) throws Exception {
+                super(name, DCWormsConstants.DEFAULT_BAUD_RATE);
                 this.workloadLoader = workload;
                 destName = destinationName;
@@ -259 +260 @@
                 for (JobInterface<?> job : returnedJobs) {
                         for (TaskInterface<?> task: job.getTask()) {
-                                if(task.getStatus() == Gridlet.SUCCESS)
+                                if(task.getStatus() == DCWormsTags.SUCCESS)
                                         result++;
                         }

DCWoRMS/trunk/src/simulator/DataCenterWorkloadSimulator.java

@@ -26 +26 @@
 import simulator.reader.ResourceReader;
 import simulator.stats.AccumulatedStatistics;
-import simulator.stats.implementation.WormsStatistics;
+import simulator.stats.implementation.DCWormsStatistics;
 import simulator.utils.LogErrStream;
 import simulator.workload.WorkloadLoader;
@@ -40 +40 @@
  * {@link #main(String[])} method used to invoke the program. This class also
  * provides second possibility to start the simulator, namely one may use the
- * {@link #performSimulation(ConfigurationOptions, WormsStatistics)} method.
+ * {@link #performSimulation(ConfigurationOptions, DCWormsStatistics)} method.
  * In this case, the input parameter, describing the simulation options, must be
  * earlier prepared. The results of the simulation can be acquired using the
@@ -269 +269 @@
                 rc.setInitList(null);
                 
-                WormsUsers wl = new WormsUsers("Users",
+                DCWormsUsers wl = new DCWormsUsers("Users",
                                 rc.getScheduler().get_name(), workload);
                 
@@ -275 +275 @@
                 long stopSimulation = System.currentTimeMillis();
 
-                WormsStatistics stats = new WormsStatistics(simulationIdentifier,
+                DCWormsStatistics stats = new DCWormsStatistics(simulationIdentifier,
                                 options, wl, statsOutputPath, rc);
                 accumulatedStatistics.add(stats);

DCWoRMS/trunk/src/simulator/stats/AccumulatedStatistics.java

@@ -10 +10 @@
 import java.util.List;
 
-import simulator.stats.implementation.WormsStatistics;
+import simulator.stats.implementation.DCWormsStatistics;
 import gridsim.Accumulator;
 

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

@@ -49 +49 @@
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.ui.TextAnchor;
-import org.joda.time.DateTime;
 import org.joda.time.DateTimeUtilsExt;
 
+import schedframe.ExecutablesList;
 import schedframe.ResourceController;
 import schedframe.exceptions.ResourceException;
@@ -69 +69 @@
 import schedframe.scheduling.ResourceHistoryItem;
 import schedframe.scheduling.Scheduler;
+import schedframe.scheduling.manager.tasks.JobRegistry;
 import schedframe.scheduling.manager.tasks.JobRegistryImpl;
 import schedframe.scheduling.tasks.Job;
 import schedframe.scheduling.tasks.JobInterface;
 import simulator.ConfigurationOptions;
+import simulator.DCWormsConstants;
 import simulator.DataCenterWorkloadSimulator;
 import simulator.GenericUser;
-import simulator.WormsConstants;
 import simulator.stats.GSSAccumulator;
 import simulator.stats.SimulationStatistics;
@@ -90 +91 @@
 import gssim.schedframe.scheduling.Executable;
 
-public class WormsStatistics implements SimulationStatistics {
-
-        private Log log = LogFactory.getLog(WormsStatistics.class);
+public class DCWormsStatistics implements SimulationStatistics {
+
+        private Log log = LogFactory.getLog(DCWormsStatistics.class);
 
         protected static float ALPHA = 0.5f;
@@ -98 +99 @@
 
         //protected static final int BITS = 8;
-        //protected static final int MILLI_SEC = 1000;
+        protected static final int MILLI_SEC = 1000;
 
         protected static final String RAW_TASKS_STATISTICS_OUTPUT_FILE_NAME = "Tasks.txt";
@@ -117 +118 @@
         protected String simulationIdentifier;
         protected ConfigurationOptions configuration;
-
 
         protected GSSAccumulatorsStats accStats;
@@ -129 +129 @@
         protected long endSimulationTime;
         
-        
         //RESOURCES
         protected Timetable ganttDiagramPeTimetable;
@@ -140 +139 @@
         protected Map<String, TimetableEventGroup> taskGanttMap;
         
-        
         //TASKS
         protected int numOfdelayedTasks = 0;
@@ -151 +149 @@
         protected HashMap<String, List<String>> task_processorsMap;
 
-
         protected JobRegistryImpl jr;
 
         
-        public WormsStatistics(String simulationIdentifier, ConfigurationOptions co, GenericUser users,
+        public DCWormsStatistics(String simulationIdentifier, ConfigurationOptions co, GenericUser users,
                         String outputFolderName, ResourceController resourceController) {
                 this.simulationIdentifier = simulationIdentifier;
@@ -188 +185 @@
                 gatherResourceStatistics();
                 e = System.currentTimeMillis();
-                log.info("time in sec: " + ((e - s) / 1000));
+                log.info("time in sec: " + ((e - s) / MILLI_SEC));
                 
                 log.info("gatherTaskStatistics");
@@ -194 +191 @@
                 gatherTaskStatistics();
                 e = System.currentTimeMillis();
-                log.info("time in sec: " + ((e - s) / 1000));
+                log.info("time in sec: " + ((e - s) / MILLI_SEC));
 
                 log.info("saveSimulationStatistics");
@@ -200 +197 @@
                 saveSimulationStatistics();
                 e = System.currentTimeMillis();
-                log.info("time in sec: " + ((e - s) / 1000));
+                log.info("time in sec: " + ((e - s) / MILLI_SEC));
         }
 
@@ -299 +296 @@
                         energyStatsFile = null;
                 }
-                
-                basicResStats = gatherPEStats(JobRegistryImpl.getAllocationHistory());
+                JobRegistry jr = new JobRegistryImpl("stats");
+                basicResStats = gatherPEStats(jr.getExecutableTasks());
                 peStatsPostProcessing(basicResStats);
                 basicResLoad = calculatePELoad( basicResStats);
@@ -342 +339 @@
                                                 energyUsage = gatherResourceEnergyStats(resource);
                                                 energyUsage.setMeanUsage(calculateEnergyLoad(energyUsage));
-                                                energyUsage.setSumUsage(energyUsage.getMeanUsage() * (endSimulationTime - startSimulationTime) / (3600 * 1000));
+                                                energyUsage.setSumUsage(energyUsage.getMeanUsage() * (endSimulationTime - startSimulationTime) / (3600 * MILLI_SEC));
                                                 
                                                 EnergyExtension een = (EnergyExtension )(resource.getExtensionList().getExtension(ExtensionType.ENERGY_EXTENSION));
@@ -428 +425 @@
                                         for(String key: energyCategoryStats.keySet()){
                                                 GSSAccumulator acc = energyCategoryStats.get(key);
-                                                energyStatsFile.println(key + "- mean: "  + acc.getMean()+ " sum: " +acc.getMean() * (endSimulationTime-startSimulationTime) / (3600 * 1000) * acc.getCount());
+                                                energyStatsFile.println(key + "- mean: "  + acc.getMean()+ " sum: " +acc.getMean() * (endSimulationTime-startSimulationTime) / (3600 * MILLI_SEC) * acc.getCount());
                                         }
                                         energyStatsFile.println("\n\n");
@@ -462 +459 @@
                         String measure = (String) info[0];
                         if (measure
-                                        .startsWith(WormsConstants.TASKS_QUEUE_LENGTH_MEASURE_NAME)) {
+                                        .startsWith(DCWormsConstants.TASKS_QUEUE_LENGTH_MEASURE_NAME)) {
                                 return stats.average(measure);
                         }
@@ -492 +489 @@
                 }
         }
-        private Map<String, List<ResStat>> gatherPEStats(Map<Integer, Map<String, Object>> history) {
-
+        private Map<String, List<ResStat>> gatherPEStats( ExecutablesList executables) {
+
+                
                 Map<String, List<ResStat>> basicResStats = new TreeMap<String, List<ResStat>>(new MapPEIdComparator());
-                
-                for (Integer executableId : history.keySet()) {
-
-                        Map<String, Object> historyItem = (Map<String, Object>) history.get(executableId);
-                        List<ResourceHistoryItem> resHistItemList = (List<ResourceHistoryItem>) historyItem.get(WormsConstants.RESOURCES);
+                //Map<Integer, Map<String, Object>> history
+                
+                for (ExecTask execTask:executables) {
+                        Executable exec = (Executable) execTask;
+
+                        List<ResourceHistoryItem> resHistItemList = exec.getUsedResources();
                         Map<ResourceUnitName, ResourceUnit> res = resHistItemList.get(resHistItemList.size() - 1).getResourceUnits();
                         ResourceUnit resUnit = res.get(StandardResourceUnitName.PE);
@@ -507 +506 @@
                                 for(ComputingResource pe: pes){
                                         String peName = pe.getName();
-                                        long startDate = ((DateTime) historyItem.get(WormsConstants.START_TIME)).getMillis();
-                                        long endDate = ((DateTime) historyItem.get(WormsConstants.END_TIME)).getMillis();
-                                        JobRegistryImpl jr = new JobRegistryImpl("stats");
-                                        ExecTask execTask = jr.getTaskExecutable(executableId);
+                                        long startDate = Double.valueOf(exec.getExecStartTime()).longValue() * MILLI_SEC;
+                                        long endDate = Double.valueOf(exec.getFinishTime()).longValue() * MILLI_SEC;
+
+
                                         String uniqueTaskID = execTask.getJobId() + "_" + execTask.getId();
                                         
@@ -535 +534 @@
                         } else if (resUnit instanceof PEUnit){
                                 PEUnit peUnit = (PEUnit) resUnit ;
-                        
                         }
 
@@ -629 +627 @@
                                                 
                                         ///     System.out.println(resource.getName() + ":"+new DateTime(pu.getTimestamp())+";"+pu.getValue());
-                                                power = power + (pu.getTimestamp() - lastTime) * lastPower/ (3600 * 1000);
+                                                power = power + (pu.getTimestamp() - lastTime) * lastPower/ (3600 * MILLI_SEC);
                                                 lastPower = pu.getValue();
                                                 lastTime = pu.getTimestamp();
@@ -1026 +1024 @@
 
                         //List<TaskInterface> execList = JobRegistry.getInstance("COMPUTING_GRID_0#BROKER").getAllSubmittedTasks();
-                        List<Executable> execList = jr.getJobExecutables(job.getId());
+                        List<Executable> execList = jr.getExecutableTasks().getJobExecutables(job.getId());
                         List<TaskStats> taskStatsList = new ArrayList<TaskStats>();
 
@@ -1143 +1141 @@
                 String uniqueTaskID = task.getJobId() + "_" + task.getId();
 
-                String resIDlist[] = task.getAllResourceName();
-                String resID = resIDlist[resIDlist.length - 1];
-
-                long execStartTime = Double.valueOf(task.getExecStartTime()).longValue() * 1000;
-                long execEndTime = Double.valueOf(task.getFinishTime()).longValue() * 1000;
+                String resID = task.getSchedulerName();
+
+                long execStartTime = Double.valueOf(task.getExecStartTime()).longValue() * MILLI_SEC;
+                long execEndTime = Double.valueOf(task.getFinishTime()).longValue() * MILLI_SEC;
 
                 TaskSeries taskRes = ganttDiagramTaskSeriesCollection.getSeries(resID);
@@ -1165 +1162 @@
                 String uniqueTaskID = task.getJobId() + "_" + task.getId();
 
-                String resIDlist[] = task.getAllResourceName();
-                String resID = resIDlist[resIDlist.length - 1];
-
-                long execStartTime = Double.valueOf(task.getExecStartTime()).longValue() * 1000;
-                long execEndTime = Double.valueOf(task.getFinishTime()).longValue() * 1000;
+                String resID = task.getSchedulerName();
+
+                long execStartTime = Double.valueOf(task.getExecStartTime()).longValue() * MILLI_SEC;
+                long execEndTime = Double.valueOf(task.getFinishTime()).longValue() * MILLI_SEC;
 
                 TaskSeries waitRes = ganttDiagramWaitingTimeSeriesCollection.getSeries(resID);
@@ -1177 +1173 @@
                 }
 
-                long sub = Double.valueOf(task.getSubmissionTime()).longValue() * 1000;
+                long sub = Double.valueOf(task.getSubmissionTime()).longValue() * MILLI_SEC;
                 org.jfree.data.gantt.Task wait_exec = new org.jfree.data.gantt.Task(uniqueTaskID, new Date(sub), new Date(
                                 execEndTime));

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

@@ -49 +49 @@
 
         public String getResName() {
-                String resNames[] = this.task.getAllResourceName();
-                String resName = "";
-                for (int i = 0; i < resNames.length; i++) {
-                        resName += resNames[i];
-                        if (resNames.length > 1)
-                                resName += " ";
-                }
+                String resName = this.task.getSchedulerName();
+
                 return resName;
         }

DCWoRMS/trunk/src/simulator/workload/generator/impl/QcgJobGenerator.java

@@ -58 +58 @@
 import org.xml.sax.InputSource;
 
-import simulator.WormsConstants;
+import simulator.DCWormsConstants;
 import simulator.utils.GSSimXML;
 import simulator.utils.XsltTransformations;
@@ -259 +259 @@
                         
                         //initially - a standard value
-                        taskCountToBeGenerated = WormsConstants.DEFAULT_TASK_COUNT_IN_SINGLE_JOB; 
+                        taskCountToBeGenerated = DCWormsConstants.DEFAULT_TASK_COUNT_IN_SINGLE_JOB; 
                         
                         try {