Changeset 1207 for DCWoRMS/branches/coolemall/src/simulator/DataCenterWorkloadSimulator.java

Timestamp:

11/26/13 11:56:07 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/DataCenterWorkloadSimulator.java (modified) (9 diffs)

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

@@ -14 +14 @@
 import javax.swing.filechooser.FileFilter;
 
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -21 +22 @@
 
 import schedframe.Initializable;
-import schedframe.ResourceController;
+import schedframe.SimulatedEnvironment;
 import simulator.reader.ResourceReader;
 import simulator.stats.AccumulatedStatistics;
@@ -51 +52 @@
          * The name of the simulator application
          */
-        public static final String SIMULATOR_NAME = "Data Center Workload Simulator";
+        public static final String SIMULATOR_NAME = "Data Center Workload and Resource Management Simulator";
+        
+        /**
+         * The simulation mode
+         */
+        public static String MODE = "Standard";
 
         /**
@@ -183 +189 @@
                 }
 
-                if (log.isInfoEnabled())
+                if (log.isInfoEnabled()){
                         log.info("Done :: " + SIMULATOR_NAME + " has finished "
                                         + noOfSimulations + " simulation runs ::");
+                        log.info("Simulation finished with status: 0");
+                }
 
                 System.out.flush();
@@ -259 +267 @@
 
                 ResourceReader resourceReader = new ResourceReader(
-                                options);
-                ResourceController rc = resourceReader.read();
+                                options.resdescFileName);
+                SimulatedEnvironment rc = resourceReader.read();
                 eventManager = new EventManager("eventManager", rc);
                 
@@ -268 +276 @@
                 rc.setInitList(null);
                 
-                DCWormsUsers wl = new DCWormsUsers("Users",
+                DCWormsUsers users = new DCWormsUsers("Users",
                                 rc.getScheduler().get_name(), workload);
                 
+                System.out.println("Starting simulation...");
+
                 GridSimWrapper.startSimulation();
                 long stopSimulation = System.currentTimeMillis();
 
+                System.out.println("Simulation finished");
+
                 DCWormsStatistics stats = new DCWormsStatistics(simulationIdentifier,
-                                options, wl, statsOutputPath, rc);
+                                options, users, statsOutputPath, rc);
                 accumulatedStatistics.add(stats);
                 if (log.isInfoEnabled())
@@ -301 +313 @@
                 String wlFileName = options.inputWorkloadFileName;
 
+                String appProfilesFolder = options.appProfilesFolder;
                 if (options.inputFolder != null) {
                         File f = null;
@@ -318 +331 @@
                 swfReader = AbstractWAReader.getInstace(wlFileName);
 
-                WorkloadLoader workload = new WorkloadLoader(xmlJobReader, swfReader);
+                WorkloadLoader workload = new WorkloadLoader(xmlJobReader, swfReader, appProfilesFolder);
                 workload.load();
 
@@ -346 +359 @@
                                 prefix = options.inputFolder;
                         } else if (options.inputWorkloadFileName != null) {
-                                prefix = new File(options.inputWorkloadFileName).getParent();
+                                prefix = FilenameUtils.getFullPath(new File(options.inputWorkloadFileName).getAbsolutePath());
                         } else {
                                 prefix = System.getProperty("user.dir");
                         }
-                        statsOutputPath = prefix + File.separator
-                                        + options.statsOutputSubfolderNameRerad;
+                        //statsOutputPath = prefix + File.separator
+                        //              + options.statsOutputSubfolderNameRead;
+                        statsOutputPath = options.statsOutputSubfolderNameRead;
                 }
                 statsOutputPath += File.separator;