Changeset 1199 for DCWoRMS/branches/coolemall/src/simulator

Timestamp:

08/28/13 15:14:51 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/simulator/stats/implementation

Files:

• DCWormsStatistics.java (modified) (19 diffs)
• TaskStats.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/simulator/stats/implementation/DCWormsStatistics.java

@@ -2 +2 @@
 
 import java.awt.Color;
-import java.awt.Font;
 import java.awt.Paint;
-import java.awt.geom.Rectangle2D;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -16 +14 @@
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -29 +26 @@
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
-import org.jfree.chart.LegendItem;
 import org.jfree.chart.axis.AxisLocation;
-import org.jfree.chart.axis.CategoryAxis;
 import org.jfree.chart.axis.DateAxis;
 import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.axis.NumberTickUnit;
-import org.jfree.chart.axis.ValueAxis;
 import org.jfree.chart.encoders.ImageFormat;
 import org.jfree.chart.labels.CategoryItemLabelGenerator;
@@ -48 +41 @@
 import org.jfree.chart.renderer.category.GanttRenderer;
 import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.chart.title.LegendTitle;
 import org.jfree.chart.title.TextTitle;
 import org.jfree.chart.title.Title;
@@ -93 +85 @@
 import simulator.stats.implementation.out.AbstractStringSerializer;
 import simulator.stats.implementation.out.CoolEmAllStringSerializer;
-import simulator.stats.implementation.out.StringSerializer;
-import test.article.recs.utils.TaskToApp;
 import csiro.mit.utils.jfreechart.timetablechart.TimetableChartFactory;
 import csiro.mit.utils.jfreechart.timetablechart.data.Timetable;
@@ -503 +493 @@
                 try {
                         resources = new ArrayList<ComputingResource>();
-                        for(ComputingResource compRes: resourceController.getComputingResources() ){
+                        for(ComputingResource compRes: resourceController.getComputingResources()){
                                 resources.addAll(compRes.getDescendantsByType(resType));
                         }
@@ -516 +506 @@
         }
         
-        private Map<String, List<ResStat>> gatherPEStats( ExecutablesList executables) {
+        private Map<String, List<ResStat>> gatherPEStats(ExecutablesList executables) {
                 
                 Map<String, List<ResStat>> basicResStats = new TreeMap<String, List<ResStat>>(new MapPEIdComparator());
@@ -536 +526 @@
                                         long endDate = Double.valueOf(exec.getFinishTime()).longValue() * MILLI_SEC;
 
-                                        String uniqueTaskID = getUniqueTaskId(execTask);
+                                        String appID = getAppId(execTask);
                                         
-                                        ResStat resStat = new ResStat(peName, pe.getType(), startDate, endDate, uniqueTaskID);
+                                        ResStat resStat = new ResStat(peName, pe.getType(), startDate, endDate, appID);
                                         
                                         List<ResStat> resStats = basicResStats.get(peName);
@@ -548 +538 @@
                                                 resStats.add(resStat);
                                         }
+                                        
+                                        String uniqueTaskID = getUniqueTaskId(execTask);
 
                                         List<String> peNames = task_processorsMap.get(uniqueTaskID);
@@ -559 +551 @@
                                 }
                         } else if (resUnit instanceof PEUnit){
-                                PEUnit peUnit = (PEUnit) resUnit ;
+                                PEUnit peUnit = (PEUnit) resUnit;
                         }
 
@@ -566 +558 @@
         }
         
+        private String getUniqueTaskId(ExecTask execTask){
+                return execTask.getJobId() + "_" + execTask.getId();
+        }
+        
         //change this method to adjust the colors of gantt chart
-        private String getUniqueTaskId(ExecTask execTask){
+        protected String getAppId(ExecTask execTask){
                 String taskId = execTask.getJobId() + "_" + execTask.getId();
-                /*if(execTask.getApplicationName() != null){
+                if(execTask.getApplicationName() != null){
                         taskId = execTask.getApplicationName();
-                } else {
-                        taskId = execTask.getJobId() + "_" + execTask.getId();
-                }*/
+                }
                 return taskId;
         }
@@ -860 +854 @@
                                 resourceLoadDiagram = getResourceDynamicDiagram(resourceLoadDiagrams.get(resType), simulationTime, chartName,
                                                 subtitle, axisName);
-                                if (!saveXYPlotChart(resourceLoadDiagram, fileName + "Resources Load - "+resType))
+                                if (!saveXYPlotChart(resourceLoadDiagram, fileName + "ResourcesLoad_" + resType))
                                         return false;
                         }
@@ -873 +867 @@
                                 resourceEnergyDiagram = getResourceDynamicDiagram(resourcePowerUsageDiagrams.get(resType), simulationTime, chartName,
                                                 subtitle, axisName);
-                                if (!saveXYPlotChart(resourceEnergyDiagram, fileName + "Energy - "+resType))
+                                if (!saveXYPlotChart(resourceEnergyDiagram, fileName + "Energy_" + resType))
                                         return false;
                         }
@@ -886 +880 @@
                                 resourceAirFlowDiagram = getResourceDynamicDiagram(resourceAirFlowDiagrams.get(resType), simulationTime, chartName,
                                                 subtitle, axisName);
-                                if (!saveXYPlotChart(resourceAirFlowDiagram, fileName + "AirThroughput - "+resType))
+                                if (!saveXYPlotChart(resourceAirFlowDiagram, fileName + "AirThroughput_" + resType))
                                         return false;
                         }
@@ -899 +893 @@
                                 resourceTemperatureDiagram = getResourceDynamicDiagram(resourceTemperatureDiagrams.get(resType), simulationTime, chartName,
                                                 subtitle, axisName);
-                                if (!saveXYPlotChart(resourceTemperatureDiagram, fileName + "Temperature - "+resType))
+                                if (!saveXYPlotChart(resourceTemperatureDiagram, fileName + "Temperature_" + resType))
                                         return false;
                         }
@@ -1226 +1220 @@
         private TaskStats createTaskStats(Executable task) {
                 TaskStats taskStats = new TaskStats(task, startSimulationTime);
-                String uniqueTaskID = taskStats.getJobID() + "_" + taskStats.getTaskID();
+                String uniqueTaskID = getUniqueTaskId(task);
                 taskStats.setProcessorsName(task_processorsMap.get(uniqueTaskID));
                 return taskStats;
@@ -1276 +1270 @@
 
         private void createTaskDiagramData(Executable task) {
-                String uniqueTaskID = task.getJobId() + "_" + task.getId();
+                String uniqueTaskID = getUniqueTaskId(task);
 
                 String resID = task.getSchedulerName();
@@ -1297 +1291 @@
 
         private void createTaskWaitingTimeDiagramData(Executable task) {
-                String uniqueTaskID = task.getJobId() + "_" + task.getId();
+                String uniqueTaskID = getUniqueTaskId(task);
 
                 String resID = task.getSchedulerName();
@@ -1536 +1530 @@
         }
 
-        public ResStat( String peName, long startDate, long endDate, String taskID) {
+        public ResStat(String peName, long startDate, long endDate, String taskID) {
                 super();
                 this.startDate = startDate;

DCWoRMS/branches/coolemall/src/simulator/stats/implementation/TaskStats.java

@@ -21 +21 @@
         protected long startSimulationTimeSek;
         
-        private String headers[] = { "JobID", "TaskID", "UserDN", "ResName", "CpuCnt",
+        private String headers[] = { "JobID", "TaskID", "UserDN", "SchedName", "CpuCnt",
                         "ExecStartDate", "ExecFinishDate", "ExecEndDate", "GB_SubDate",
                         "LB_SubDate", "CompletionTime", "ExecStartTime",