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

Timestamp:

03/19/14 18:22:27 (11 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -21 +21 @@
 import org.joda.time.DateTimeUtilsExt;
 
-import schedframe.Initializable;
 import schedframe.SimulatedEnvironment;
 import simulator.reader.ResourceReader;
@@ -252 +251 @@
                 // (default 1)
                 
-                Date date = workload.getSimulationStartTime();
                 Calendar calendar = Calendar.getInstance();
-                if (date == null)
+                if(workload == null){
                         calendar.setTimeInMillis(0L);
-                else
-                        calendar.setTime(date);
+                } else {
+                        Date date = workload.getSimulationStartTime();
+                        if (date == null)
+                                calendar.setTimeInMillis(0L);
+                        else
+                                calendar.setTime(date);                 
+                }
+
 
                 boolean traceFlag = true; // means: trace GridSim events/activities
@@ -268 +272 @@
                 ResourceReader resourceReader = new ResourceReader(
                                 options.resdescFileName);
-                SimulatedEnvironment rc = resourceReader.read();
-                eventManager = new EventManager("eventManager", rc);
-                
-                for(Initializable initObj: rc.getToInit()){
+                SimulatedEnvironment simEnv = resourceReader.read();
+                
+                eventManager = new EventManager("eventManager", simEnv);
+                
+                /*for(Initializable initObj: rc.getToInit()){
                         initObj.initiate();
                 }
-                rc.setInitList(null);
+                rc.setInitList(null);*/
                 
                 DCWormsUsers users = new DCWormsUsers("Users",
-                                rc.getScheduler().get_name(), workload);
+                                simEnv.getScheduler().get_name(), workload);
                 
                 System.out.println("Starting simulation...");
@@ -287 +292 @@
 
                 DCWormsStatistics stats = new DCWormsStatistics(simulationIdentifier,
-                                options, users, statsOutputPath, rc);
+                                options, users, statsOutputPath, simEnv);
                 accumulatedStatistics.add(stats);
                 if (log.isInfoEnabled())
@@ -309 +314 @@
         private WorkloadLoader loadWorkload(ConfigurationOptions options) throws IOException, MarshalException, ValidationException{
                 XMLJobReader<org.qcg.broker.schemas.jobdesc.Job> xmlJobReader = null;
-                WAReader<org.qcg.broker.schemas.jobdesc.Job> swfReader = null;
+                WAReader<org.qcg.broker.schemas.jobdesc.Job> workloadReader = null;
 
                 String wlFileName = options.inputWorkloadFileName;
 
-                String appProfilesFolder = options.appProfilesFolder;
+                if(wlFileName == null){
+                        return null;
+                }
+                
                 if (options.inputFolder != null) {
-                        File f = null;
-                        if (options.inputTar != null) {
-                                f = new File(options.inputFolder + File.separator
-                                                + options.inputTar);
-                        } else {
-                                f = new File(options.inputFolder);
-                        }
-
+                        File f = new File(options.inputFolder);
                         xmlJobReader = new QcgXmlJobReader(f);
 
@@ -329 +330 @@
                 }
 
-                swfReader = AbstractWAReader.getInstace(wlFileName);
-
-                WorkloadLoader workload = new WorkloadLoader(xmlJobReader, swfReader, appProfilesFolder);
+                workloadReader = AbstractWAReader.getInstace(wlFileName);
+                
+                String appProfilesFolderName = options.appProfilesFolder;
+                
+                WorkloadLoader workload = new WorkloadLoader(xmlJobReader, workloadReader, appProfilesFolderName);
                 workload.load();