Changeset 493 for DCWoRMS/trunk

Timestamp:

10/09/12 14:38:34 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src

Files:

• dcworms/schedframe/scheduling/Executable.java (modified) (1 diff)
• example/localplugin/FCFSCPUFreqScalingClusterLocalPlugin.java (modified) (1 diff)
• example/localplugin/FCFSClusterLocalPlugin.java (modified) (1 diff)
• example/localplugin/FCFSConsolidationClusterLocalPlugin.java (modified) (1 diff)
• example/localplugin/FCFSEnergyAwareClusterLocalPlugin.java (modified) (1 diff)
• example/localplugin/FCFSNodePowerManagementClusterLocalPlugin.java (modified) (1 diff)
• example/localplugin/FCFSRandomClusterLocalPlugin.java (modified) (1 diff)
• example/localplugin/FCFS_BFLocalPlugin.java (modified) (1 diff)
• example/localplugin/RackLocalPlugin.java (modified) (1 diff)
• gridsim/dcworms (added)
• gridsim/dcworms/DCWormsTags.java (moved) (moved from DCWoRMS/trunk/src/gridsim/gssim/DCWormsTags.java) (1 diff)
• gridsim/dcworms/filter (copied) (copied from DCWoRMS/trunk/src/gridsim/gssim/filter)
• gridsim/dcworms/filter/ExecTaskFilter.java (copied) (copied from DCWoRMS/trunk/src/gridsim/gssim/filter/ExecTaskFilter.java) (1 diff)
• gridsim/dcworms/filter/SubTaskFilter.java (deleted)
• schedframe/resources/computing/ComputingResource.java (modified) (1 diff)
• schedframe/scheduling/Cluster.java (modified) (1 diff)
• schedframe/scheduling/GridResourceDiscovery.java (modified) (1 diff)
• schedframe/scheduling/Scheduler.java (modified) (1 diff)
• schedframe/scheduling/manager/tasks/JobRegistryImpl.java (modified) (1 diff)
• schedframe/scheduling/policy/AbstractManagementSystem.java (modified) (1 diff)
• schedframe/scheduling/policy/global/GlobalManagementSystem.java (modified) (1 diff)
• schedframe/scheduling/policy/local/LocalManagementSystem.java (modified) (1 diff)
• schedframe/scheduling/queue/TaskQueue.java (modified) (1 diff)
• simulator/ConfigurationOptions.java (modified) (3 diffs)
• simulator/DCWormsUsers.java (modified) (1 diff)
• simulator/DataCenterWorkloadSimulator.java (modified) (2 diffs)
• simulator/stats/implementation/DCWormsStatistics.java (modified) (1 diff)

DCWoRMS/trunk/src/dcworms/schedframe/scheduling/Executable.java

@@ -3 +3 @@
 
 import gridsim.GridSim;
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/example/localplugin/FCFSCPUFreqScalingClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/example/localplugin/FCFSClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/example/localplugin/FCFSConsolidationClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/example/localplugin/FCFSEnergyAwareClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/example/localplugin/FCFSNodePowerManagementClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/example/localplugin/FCFSRandomClusterLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.List;

DCWoRMS/trunk/src/example/localplugin/FCFS_BFLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.scheduling.manager.resources.ResourceManager;

DCWoRMS/trunk/src/example/localplugin/RackLocalPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.scheduling.manager.resources.ClusterResourceManager;

DCWoRMS/trunk/src/gridsim/dcworms/DCWormsTags.java

@@ -1 @@
-package gridsim.gssim;
+package gridsim.dcworms;
 
 import gridsim.GridSimTags;

DCWoRMS/trunk/src/gridsim/dcworms/filter/ExecTaskFilter.java

@@ -1 @@
-package gridsim.gssim.filter;
+package gridsim.dcworms.filter;
 
 import dcworms.schedframe.scheduling.Executable;

DCWoRMS/trunk/src/schedframe/resources/computing/ComputingResource.java

@@ -2 +2 @@
 
 import gridsim.GridSimTags;
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/schedframe/scheduling/Cluster.java

@@ -13 +13 @@
 import gridsim.GridSimTags;
 import gridsim.IO_data;
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 public class Cluster extends Scheduler{

DCWoRMS/trunk/src/schedframe/scheduling/GridResourceDiscovery.java

@@ -5 +5 @@
 import gridsim.GridSimTags;
 import gridsim.IO_data;
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/schedframe/scheduling/Scheduler.java

@@ -8 +8 @@
 import gridsim.GridSimTags;
 import gridsim.IO_data;
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/schedframe/scheduling/manager/tasks/JobRegistryImpl.java

@@ -1 +1 @@
 package schedframe.scheduling.manager.tasks;
 
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/schedframe/scheduling/policy/AbstractManagementSystem.java

@@ -37 +37 @@
 import gridsim.GridSimTags;
 import gridsim.IO_data;
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 public abstract class AbstractManagementSystem {

DCWoRMS/trunk/src/schedframe/scheduling/policy/global/GlobalManagementSystem.java

@@ -36 +36 @@
 import gridsim.GridSimTags;
 import gridsim.IO_data;
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 public class GlobalManagementSystem extends AbstractManagementSystem {

DCWoRMS/trunk/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -7 +7 @@
 import gridsim.Accumulator;
 import gridsim.ResourceCalendar;
-import gridsim.gssim.DCWormsTags;
-import gridsim.gssim.filter.ExecTaskFilter;
+import gridsim.dcworms.DCWormsTags;
+import gridsim.dcworms.filter.ExecTaskFilter;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/schedframe/scheduling/queue/TaskQueue.java

@@ -1 +1 @@
 package schedframe.scheduling.queue;
 
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 
 import org.joda.time.DateTime;

DCWoRMS/trunk/src/simulator/ConfigurationOptions.java

@@ -76 +76 @@
         public static final String JOBS_STATISTICS = CREATESTATISTICS + ".jobs";
         public static final String SIMULATION_STATISTICS = CREATESTATISTICS + ".simulation";
-        public static final String FORMAT_STATISTICS_OUTPUT = CREATESTATISTICS + ".formatoutput";
         
         /**
@@ -172 +171 @@
         public boolean createjobsstatistics = true;
         public boolean createsimulationstatistics = true;
-        public boolean formatstatisticsoutput = false;
         
         public String[] resForEnergyChart;
@@ -350 +348 @@
                         co.createsimulationstatistics = true;
                 }
-                try {
-                        co.formatstatisticsoutput = Boolean.valueOf(
-                                        bundle.getString(FORMAT_STATISTICS_OUTPUT)).booleanValue();
-                } catch(MissingResourceException e){
-                        co.formatstatisticsoutput = false;
-                }
-                
+
                 try {
                         co.numberOfSimulations = Integer.valueOf(bundle.getString(NUMBER_OF_SIMULATIONS)).intValue();

DCWoRMS/trunk/src/simulator/DCWormsUsers.java

@@ -8 +8 @@
 import gridsim.GridSimTags;
 import gridsim.IO_data;
-import gridsim.gssim.DCWormsTags;
+import gridsim.dcworms.DCWormsTags;
 import gridsim.net.InfoPacket;
 

DCWoRMS/trunk/src/simulator/DataCenterWorkloadSimulator.java

@@ -1 +1 @@
 package simulator;
 
-//import eduni.cloudsim.GSSIM;
 import java.io.File;
 import java.io.FileReader;
@@ -117 +116 @@
                                 @Override
                                 public String getDescription() {
-                                        return "WoRMS experiment file";
+                                        return "DCWoRMS experiment file";
                                 }
                         };

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

@@ -161 +161 @@
                 this.outputFolderName = outputFolderName;
 
-                if (this.configuration.formatstatisticsoutput)
-                        this.serializer = new FormatedStringSerializer();
-                else
-                        this.serializer = new StringSerializer();
+
+                this.serializer = new StringSerializer();
 
                 this.serializer.setDefaultNumberFormat(DataCenterWorkloadSimulator.DFAULT_NUMBER_FORMAT);