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

Timestamp:

08/01/13 11:00:25 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/workload/WorkloadLoader.java (modified) (3 diffs)

DCWoRMS/branches/coolemall/src/simulator/workload/WorkloadLoader.java

@@ -22 +22 @@
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
+import org.qcg.broker.schemas.jobdesc.ParentType;
+import org.qcg.broker.schemas.jobdesc.Workflow;
+import org.qcg.broker.schemas.jobdesc.types.TaskStatesName;
 
 import dcworms.schedframe.scheduling.utils.JobDescription;
@@ -130 +133 @@
                                         taskDesc.setTaskLength(timeValue);
                                         
-                                        //if(taskDesc.getDescription().getExecution()!= n
+                                        
+                                        //ENABLES MERGING PRECEDING CONSTRAINST COMING BOTH FROM SWF AND XML FILES
+                                        /*String precTaskId = waTaskDesc[SWFFields.DATA_PRECEDING_JOB_NUMBER];
+                                        String [] xmlJobId = localWAParser.getIDMapping(precTaskId);
+                                        
+                                        Workflow workflow = taskDesc.getDescription().getWorkflow();
+                                        if(workflow == null){
+                                                workflow = new Workflow();
+                                                ParentType parent = new ParentType();
+                                                parent.setTriggerState(TaskStatesName.FINISHED);
+                                                parent.setContent(xmlJobId[0] + "_" + xmlJobId[1]);
+                                                workflow.addParent(parent);
+                                                taskDesc.getDescription().setWorkflow(workflow);
+                                        }*/
 
                                 } else if(parserType == 1){
@@ -204 +220 @@
                         while((jobDesc = this.waReader.readRaw()) != null){
                                 QcgWAJobReader qcgReader = (QcgWAJobReader)waReader;
-                                jobDesc = qcgReader.mergeSwfAndXmlProfile(applicationProfilesMap, jobDesc);
+                                if(!applicationProfilesMap.isEmpty())
+                                        jobDesc = qcgReader.mergeSwfAndXmlProfile(applicationProfilesMap, jobDesc);
                                 job = createJobDescription(jobDesc, puSpeed);
                                 if(job != null)