Changeset 1207 for DCWoRMS/branches/coolemall/src/simulator/workload/reader/archive

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/simulator/workload/reader/archive

Files:

• AbstractWAParser.java (modified) (4 diffs)
• QcgWAJobReader.java (modified) (3 diffs)
• WAParser.java (modified) (1 diff)
• swf/QcgSWFJobReader.java (modified) (1 diff)

DCWoRMS/branches/coolemall/src/simulator/workload/reader/archive/AbstractWAParser.java

@@ -33 +33 @@
         protected HashMap<String, String> reverseIdMapping; // key - xmlJobId_xmlTaskId, value - swf job id
         protected HashMap<String, Long> jobIndex;
-        protected HashMap<String, String> appMapping;
+        protected HashMap<String, String> appProfilesLocation;
         protected String fields[];
         protected int fieldsNo;
@@ -46 +46 @@
                 this.reverseIdMapping = new HashMap<String, String>();
                 this.jobIndex = new HashMap<String, Long>();
-                this.appMapping = new HashMap<String, String>();
+                this.appProfilesLocation = new HashMap<String, String>();
                 this.headerLoaded = false;
                 this.buildIndex = true;
                 this.fieldsNo = 18;
+                
         }
 
@@ -152 +153 @@
                                 String appId = valueData[0];
                                 String pathToAppProfile = valueData[1];
-                                appMapping.put(appId, pathToAppProfile);
+                                appProfilesLocation.put(appId, pathToAppProfile);
                                 continue;
                         }
@@ -296 +297 @@
         
         
-        public Map<String, String> getAppMapping() {
-                return appMapping;
+        public Map<String, String> getAppProfilesLocation() {
+                return appProfilesLocation;
         }
         

DCWoRMS/branches/coolemall/src/simulator/workload/reader/archive/QcgWAJobReader.java

@@ -15 +15 @@
 
 import simulator.workload.reader.archive.swf.SWFFields;
+
+import org.qcg.broker.schemas.jobdesc.FileType;
 import org.qcg.broker.schemas.jobdesc.ResourceConsumptionProfileType;
 import org.qcg.broker.schemas.jobdesc.Task;
 import org.qcg.broker.schemas.jobdesc.Workflow;
 
-import dcworms.schedframe.scheduling.utils.JobDescription;
+import dcworms.schedframe.scheduling.utils.ApplicationProfileDescription;
 
 /**
@@ -116 +118 @@
         }
 
-        public String mergeSwfAndXmlProfile(Map<String, JobDescription> applicationProfilesMap, String swfJobDesc) throws IOException{
+        public String mergeSwfAndAppProfile(Map<String, ApplicationProfileDescription> applicationProfiles, String swfJobDesc) throws IOException{
                 
                 StringReader reader = new StringReader(swfJobDesc);
@@ -132 +134 @@
                 for(int i = 0; i < job.getTaskCount(); i++){
                         try {
-                                JobDescription xmlJobDescription = applicationProfilesMap.get(job.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.getTask(j).getExecution().setResourceConsumptionProfile(rcp);
-                                                }
+                                ApplicationProfileDescription appProfileDescription = applicationProfiles.get(job.getTask(i).getExecution().getExecutable().getApplication().getAppProperty(0).getContent());
+                                if(appProfileDescription != null){
+                                        Task patternTask = appProfileDescription.getDescription();
+                                        if(patternTask != null){
+                                                ResourceConsumptionProfileType[] rcp = patternTask.getExecution().getResourceConsumptionProfile();
+                                                job.getTask(i).getExecution().setResourceConsumptionProfile(rcp);
+                                                FileType script = new FileType();
+                                                script.setName(patternTask.getId());
+                                                job.getTask(i).getExecution().addStdin(script);
                                         }
                                 }       

DCWoRMS/branches/coolemall/src/simulator/workload/reader/archive/WAParser.java

@@ -45 +45 @@
         public int getType();
         
-        public Map<String, String> getAppMapping();
+        public Map<String, String> getAppProfilesLocation();
 }

DCWoRMS/branches/coolemall/src/simulator/workload/reader/archive/swf/QcgSWFJobReader.java

@@ -221 +221 @@
                                         
                                 case SWFFields.DATA_EXECUTABLE_NUMBER:
-                                        String pathToAppProfile = waParser.getAppMapping().get(String.valueOf(value));
+                                        String pathToAppProfile = waParser.getAppProfilesLocation().get(String.valueOf(value));
                                         String appName = null;
                                         if(pathToAppProfile == null){