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

Timestamp:

08/01/13 11:21:02 (12 years ago)

Author:

wojtekp

Message:

 

File:

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

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

@@ -23 +23 @@
 import org.exolab.castor.xml.ValidationException;
 import org.qcg.broker.schemas.jobdesc.ParentType;
+import org.qcg.broker.schemas.jobdesc.ResourceConsumptionProfileType;
+import org.qcg.broker.schemas.jobdesc.Task;
 import org.qcg.broker.schemas.jobdesc.Workflow;
 import org.qcg.broker.schemas.jobdesc.types.TaskStatesName;
@@ -219 +221 @@
                         
                         while((jobDesc = this.waReader.readRaw()) != null){
-                                QcgWAJobReader qcgReader = (QcgWAJobReader)waReader;
+                                /*QcgWAJobReader qcgReader = (QcgWAJobReader)waReader;
                                 if(!applicationProfilesMap.isEmpty())
-                                        jobDesc = qcgReader.mergeSwfAndXmlProfile(applicationProfilesMap, jobDesc);
+                                        jobDesc = qcgReader.mergeSwfAndXmlProfile(applicationProfilesMap, jobDesc);*/
                                 job = createJobDescription(jobDesc, puSpeed);
+                                if(job!= null && !applicationProfilesMap.isEmpty()){
+                                        for(int i = 0; i < job.getDescription().getTaskCount(); i++){
+                                                try {
+                                                        JobDescription xmlJobDescription = applicationProfilesMap.get(job.getDescription().getTask(i).getExecution().getExecutable().getApplication().getAppProperty(0).getContent());
+                                                        if(xmlJobDescription != null){
+                                                                for(int j = 0; j < xmlJobDescription.size(); j++){
+                                                                        Task patternTask = xmlJobDescription.getDescription().getTask(j);
+                                                                        if(patternTask != null){
+                                                                                ResourceConsumptionProfileType rcp = patternTask.getExecution().getResourceConsumptionProfile();
+                                                                                job.getDescription().getTask(j).getExecution().setResourceConsumptionProfile(rcp);
+                                                                        }
+                                                                }
+                                                        }       
+                                                } catch (Exception e){
+                                                        continue;
+                                                }
+                                        }                                       
+                                }
+
                                 if(job != null)
                                         this.jobsMap.put(job.getJobId(), job);