Changeset 1131 for DCWoRMS/branches/coolemall/src/simulator/workload/generator

Timestamp:

07/15/13 16:46:11 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/workload/generator/impl/QcgJobGenerator.java (modified) (11 diffs)

DCWoRMS/branches/coolemall/src/simulator/workload/generator/impl/QcgJobGenerator.java

@@ -42 +42 @@
 import org.qcg.broker.schemas.jobdesc.ParameterValueType;
 import org.qcg.broker.schemas.jobdesc.PreferencesType;
-import org.qcg.broker.schemas.jobdesc.QcgJob;
 import org.qcg.broker.schemas.jobdesc.RangeType;
 import org.qcg.broker.schemas.jobdesc.RequirementsType;
@@ -110 +109 @@
                         log.info("Generate xml suplement - start");
                 
-                WAReader<QcgJob> swfReader = AbstractWAReader.getInstace(waFileName);
+                WAReader<org.qcg.broker.schemas.jobdesc.Job> swfReader = AbstractWAReader.getInstace(waFileName);
                 WAParser swfParser = AbstractWAParser.getInstance(waFileName);
-                QcgJob qcgJob = null;
+                org.qcg.broker.schemas.jobdesc.Job qcgJob = null;
                 Task task = null;
                 Writer writer = null;
@@ -149 +148 @@
                                 for(int i = 0; i < qcgJob.getTaskCount(); i++){
                                         task = qcgJob.getTask(i);
-                                        this.randomNumbersWrapper.setCurrentJobId(qcgJob.getAppId());
-                                        this.randomNumbersWrapper.setCurrentTaskId(task.getTaskId());
+                                        this.randomNumbersWrapper.setCurrentJobId(qcgJob.getId());
+                                        this.randomNumbersWrapper.setCurrentTaskId(task.getId());
                                         RequirementsType hardConstraints = createResourceRequirements(workload, task.getRequirements());
                                         if(hardConstraints != null) {
@@ -158 +157 @@
                                         
                                         long submitTime = 0;
-                                        String sTab[] = swfParser.readTask(qcgJob.getAppId(), task.getTaskId());
+                                        String sTab[] = swfParser.readTask(qcgJob.getId(), task.getId());
                                         if(sTab != null)
                                                 submitTime = startTime + Long.parseLong(sTab[SWFFields.DATA_SUBMIT_TIME]) * 1000;
@@ -173 +172 @@
                                                                                         File.separator + 
                                                                                         QcgJobFileNameFilter.FILE_NAME_PREFIX + 
-                                                                                        qcgJob.getAppId() + 
+                                                                                        qcgJob.getId() + 
                                                                                         ".xml");
                                         
@@ -206 +205 @@
                 File outputDirectory = prepareWorkloadDirectory(outputDirectoryName, overwriteExistingFiles);
 
-                SWFJobWriter<QcgJob> swfJobWriter = new QcgSWFJobWriter(outputDirectoryName, outputWorkloadFileName);
+                SWFJobWriter<org.qcg.broker.schemas.jobdesc.Job> swfJobWriter = new QcgSWFJobWriter(outputDirectoryName, outputWorkloadFileName);
                 swfJobWriter.writeFieldDescriptionHeader();
                 
@@ -253 +252 @@
                 
                 while (proceedConditionsAreFulfilled()) {
-                        QcgJob QcgJob = new QcgJob();
+                        org.qcg.broker.schemas.jobdesc.Job qcgJob = new org.qcg.broker.schemas.jobdesc.Job();
                         
                         String jobID = Integer.toString(generatedJobCount);
-                        QcgJob.setAppId(jobID);
+                        qcgJob.setId(jobID);
                         
                         //initially - a standard value
@@ -286 +285 @@
                         for (int taskNum = 0; taskNum < taskCountToBeGenerated; taskNum++) {
                                 Task task = new Task();
-                                QcgJob.addTask(task);
-                                
-                                task.setTaskId(String.valueOf(taskNum));
+                                qcgJob.addTask(task);
+                                
+                                task.setId(String.valueOf(taskNum));
                                 
                                 // create section execution
@@ -304 +303 @@
                                         try {
                                                 long l_taskLength = (long) getRandomValueFor(taskLength, parameterRandomNumbers);
-                                                swfJobWriter.addTaskLength(task.getTaskId(), l_taskLength);
+                                                swfJobWriter.addTaskLength(task.getId(), l_taskLength);
                                         } catch (IllegalAccessException e) {
                                                 e.printStackTrace();
@@ -345 +344 @@
 
                         FileWriter taskWriter = new FileWriter(taskFile);
-                        GSSimXML.marshal(QcgJob, taskWriter);
+                        GSSimXML.marshal(qcgJob, taskWriter);
                         taskWriter.flush();
                         taskWriter.close();
@@ -351 +350 @@
                         //swfJobWriter.setJobSubmitTime(simulationVirtualTime);
                         swfJobWriter.setJobSubmitTime((simulationVirtualTime - simulationStartTime)/1000);
-                        swfJobWriter.write(QcgJob);
+                        swfJobWriter.write(qcgJob);
                         
                         generatedJobCount++;