Changeset 1144 for DCWoRMS/branches/coolemall/src/simulator/workload/reader

Timestamp:

07/19/13 10:20:00 (12 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

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

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

@@ -4 +4 @@
 import java.io.RandomAccessFile;
 import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -150 +151 @@
                                 String [] valueData = value.split(" ");
                                 String appId = valueData[0];
-                                String appName = valueData[1];
-                                appMapping.put(appId, appName);
+                                String pathToAppProfile = valueData[1];
+                                appMapping.put(appId, pathToAppProfile);
                                 continue;
                         }
@@ -295 +296 @@
         
         
-        public String getAppMapping(String appId) {
-                String appName = appMapping.get(appId);
-                return appName;
+        public Map<String, String> getAppMapping() {
+                return appMapping;
         }
         

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

@@ -109 +109 @@
         }
 
-        public String mergeSwfAndXmlProfile( Map<String, JobDescription> jobProfilesMap, String swfJobDesc) throws IOException{
+        public String mergeSwfAndXmlProfile(Map<String, JobDescription> jobProfilesMap, String swfJobDesc) throws IOException{
                 
                 StringReader reader = new StringReader(swfJobDesc);
@@ -123 +123 @@
                 }
                 
-                JobDescription xmlJobDescription = jobProfilesMap.get(job.getTask(0).getExecution().getExecutable().getApplication().getName());
-                if(xmlJobDescription != null){
-                        Task patternTask = xmlJobDescription.getDescription().getTask(0);
-                        if(patternTask != null){
-                                ResourceConsumptionProfileType rcp = patternTask.getExecution().getResourceConsumptionProfile();
-                                job.getTask(0).getExecution().setResourceConsumptionProfile(rcp);
+                for(int i = 0; i < job.getTaskCount(); i++){
+                        
+                        JobDescription xmlJobDescription = jobProfilesMap.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);
+                                        }
+                                }
                         }
                 }

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

@@ -3 +3 @@
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 
 import simulator.workload.exceptons.NoSuchCommentException;
@@ -44 +45 @@
         public int getType();
         
-        public String getAppMapping(String appId);
+        public Map<String, String> getAppMapping();
 }

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

@@ -1 +1 @@
 package simulator.workload.reader.archive.swf;
 
+import org.qcg.broker.schemas.jobdesc.AppProperty;
 import org.qcg.broker.schemas.jobdesc.Application;
 import org.qcg.broker.schemas.jobdesc.ComputingResourceBaseTypeChoice;
@@ -40 +41 @@
         private Log log = LogFactory.getLog(QcgSWFJobReader.class);
         
+        private static String DEFAULT_PATH_TO_APP_PROFILES = "";
+        
         protected String currntJobID;
         
@@ -218 +221 @@
                                         
                                 case SWFFields.DATA_EXECUTABLE_NUMBER:
-                                        String appName = waParser.getAppMapping(String.valueOf(value));
-                                        if(appName == null){
+                                        String pathToAppProfile = waParser.getAppMapping().get(String.valueOf(value));
+                                        String appName = null;
+                                        if(pathToAppProfile == null){
                                                 if(value != -1){
                                                         appName = String.valueOf(value);
@@ -225 +229 @@
                                                         appName = appTypeGen.randomAppType();
                                                 }
+                                                pathToAppProfile =  DEFAULT_PATH_TO_APP_PROFILES + appName;
+                                        } else {
+                                                String fullAppName = pathToAppProfile.substring(pathToAppProfile.lastIndexOf('/') + 1, pathToAppProfile.length());
+                                                if(fullAppName != null)
+                                                        appName = fullAppName.substring(0, fullAppName.lastIndexOf('.'));
+                                                else appName = fullAppName;
                                         }
                                         ExecutionType execType = new ExecutionType();
                                         Executable executable = new Executable();
                                         Application application = new Application();
+                                        AppProperty appProp = new AppProperty();
+                                        appProp.setName("appId");
+                                        appProp.setContent(String.valueOf(value));
+                                        application.addAppProperty(appProp);
+                                        /*appProp = new AppProperty();
+                                        appProp.setName("appProfileLocation");
+                                        appProp.setContent(pathToAppProfile);
+                                        application.addAppProperty(appProp);*/
                                         application.setName(appName);
                                         executable.setApplication(application);