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

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/simulator/reader

Files:

• EnvironmentWrapper.java (modified) (3 diffs)
• ResourceReader.java (modified) (12 diffs)

DCWoRMS/branches/coolemall/src/simulator/reader/EnvironmentWrapper.java

@@ -18 +18 @@
 public class EnvironmentWrapper {
 
-        Environment environment;
+        private Environment environment;
 
         public void wrap(Environment environment) {
@@ -53 +53 @@
         public ComputingResource[] getComputingResources() throws UnknownParameter{
                 
-                ArrayList<ComputingResource>tab = null;
-                
                 if(environment == null)
                         throw new UnknownParameter("Environment parameters are not defined.");
@@ -61 +59 @@
                         return null;
                 
-                tab = new ArrayList<ComputingResource>();
+                ArrayList<ComputingResource> computingResources = new ArrayList<ComputingResource>();
                  
                 for(int i = 0; i < resources.getComputingResourceCount(); i++){
                         ComputingResource compRes = resources.getComputingResource(i);
-                        tab.add(compRes);
+                        computingResources.add(compRes);
                 }
-                if(tab.size() == 0)
+                if(computingResources.size() == 0)
                         return null;
                 else
-                        return tab.toArray(new ComputingResource[0]);
+                        return computingResources.toArray(new ComputingResource[0]);
         }
         

DCWoRMS/branches/coolemall/src/simulator/reader/ResourceReader.java

@@ -1 +1 @@
 package simulator.reader;
-
-import gridsim.ResourceCalendar;
 
 import java.io.File;
@@ -19 +17 @@
 import java.util.Set;
 
+import org.apache.commons.io.FilenameUtils;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
@@ -26 +25 @@
 import schedframe.Parameter;
 import schedframe.Parameters;
-import schedframe.ResourceController;
+import schedframe.SimulatedEnvironment;
 import schedframe.exceptions.ResourceException;
+import schedframe.resources.CoolEmAllResourceFactory;
 import schedframe.resources.Resource;
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.ResourceFactory;
-import schedframe.resources.computing.description.AbstractResourceDescription;
+import schedframe.resources.computing.StandardResourceFactory;
 import schedframe.resources.computing.description.ComputingResourceDescription;
+import schedframe.resources.computing.description.ResourceDescription;
 import schedframe.resources.units.ResourceUnit;
 import schedframe.resources.units.ResourceUnitName;
@@ -45 +46 @@
 import schemas.ManagedComputingResources;
 import schemas.StringValueWithUnit;
-import simulator.ConfigurationOptions;
+import simulator.DataCenterWorkloadSimulator;
 import simulator.utils.InstanceFactory;
+import test.DEBBTranslator.src.PLMXMLTranslator;
 
 public class ResourceReader {
         
         private static String COOLEMALL_RESDESC_PREFIX = "DCWORMS";
-        protected String resDescFileName;
-
-        protected ResourceCalendar resourceCalendar;
-        protected List<Initializable> toInit = new ArrayList<Initializable>();
-        
+        private String resDescFileName;
+        private ResourceFactory resFactory;
+                
         private ExecutionTimeEstimationPlugin execTimeEstimationPlugin;
-        private String globalSchedulingPluginName;
         
         private Set<String> compResLayers;
-        
-        public ResourceReader(ConfigurationOptions options) throws IOException {
-
-                resDescFileName = options.resdescFileName;
-                globalSchedulingPluginName = "example.globalplugin.GridFCFSRoundRobinPlugin";
-                prepareCalendar();
-                compResLayers = new LinkedHashSet<String>();
-        }
-
-        public ResourceController read() throws MarshalException, ValidationException, FileNotFoundException, Exception,
+        private List<Initializable> toInit;
+        
+        public ResourceReader(String resdescFileName) throws IOException {
+
+                this.resDescFileName = resdescFileName;
+                this.resFactory = new StandardResourceFactory();
+                this.compResLayers = new LinkedHashSet<String>();
+                this.toInit = new ArrayList<Initializable>();
+        }
+
+        public SimulatedEnvironment read() throws MarshalException, ValidationException, FileNotFoundException, Exception,
                         UnknownParameter {
 
                 File file = new File(resDescFileName);
-                
-                Environment env;
+
+                Environment env = null;
                 try{
                         env = Environment.unmarshal(new FileReader(file));
+                        
                 } catch (Exception e){  
-                        File dcwormsFile = new File(file.getParent() + "/" + COOLEMALL_RESDESC_PREFIX + "_" + file.getName());
-                        env = Environment.unmarshal(new FileReader(dcwormsFile));
-                }
-                
+                        //e.printStackTrace();
+                        try{
+                                File dcwormsFile = new File(FilenameUtils.getFullPath(file.getAbsolutePath()) + COOLEMALL_RESDESC_PREFIX + "_" + file.getName());
+                                env = Environment.unmarshal(new FileReader(dcwormsFile));
+                        } catch (Exception e2){
+                                PLMXMLTranslator plmxmlTranslator = new PLMXMLTranslator();
+                                String trasnlatedFileName = plmxmlTranslator.translate(new String[]{file.getAbsolutePath()});
+                                File dcwormsFile = new File(trasnlatedFileName);                        
+                                //File dcwormsFile = new File(FilenameUtils.getFullPath(file.getAbsolutePath()) + COOLEMALL_RESDESC_PREFIX + "_" + file.getName());
+
+                                env = Environment.unmarshal(new FileReader(dcwormsFile));
+                        }
+                }
+                
+                if(env.getResources().getMode().equals("CoolEmAll")){
+                        DataCenterWorkloadSimulator.MODE = "CoolEmAll";
+                        resFactory = new CoolEmAllResourceFactory();
+                }
                 System.out.println("started creating environment description");
                 List<ComputingResourceDescription> mainCompResDescList = createEnvironmentDescription(env);
@@ -94 +109 @@
                 System.out.println("finished creating schedulers");
 
-                ResourceController rc = new ResourceController(mainScheduler, computingResources);
+                SimulatedEnvironment simEnv = new SimulatedEnvironment(mainScheduler, computingResources);
                 Collections.sort(toInit, new ResourceTypeComparator(new ArrayList<String>(compResLayers)));
-                rc.setInitList(toInit);
-                rc.setCompResLayers(compResLayers);
-                return rc;
+                simEnv.setInitList(toInit);
+                simEnv.setCompResLayers(compResLayers);
+                return simEnv;
         }
 
@@ -181 +196 @@
                 
                 for(ComputingResourceDescription mainExecResDes : mainCompResDesList){
-                        ComputingResource mainResource = ResourceFactory.createResource(mainExecResDes);
+                        ComputingResource mainResource = resFactory.createComputingResource(mainExecResDes);
                         toExamine.push(mainExecResDes);
                         resStructure.push(mainResource);
@@ -192 +207 @@
                         toInit.add(parentResource);
                         compResLayers.add(parentResource.getType().getName());
-                        List<AbstractResourceDescription> childrenResDesc = parentResDesc.getChildren();
+                        List<ResourceDescription> childrenResDesc = parentResDesc.getChildren();
                         if (childrenResDesc == null){
                                 continue;
@@ -200 +215 @@
                                 ComputingResourceDescription compResDesc = (ComputingResourceDescription) childrenResDesc.get(i);
                                 toExamine.push(compResDesc);
-                                ComputingResource resource = ResourceFactory.createResource(compResDesc);
+                                ComputingResource resource = resFactory.createComputingResource(compResDesc);
                                 parentResource.addChild(resource);
                                 resStructure.push(resource);
@@ -254 +269 @@
                 }
                 else{
-                        SchedulingPlugin schedulingPlugin = (SchedulingPlugin) InstanceFactory.createInstance(globalSchedulingPluginName,
-                                        SchedulingPlugin.class);
-                        TaskQueueList queues = new TaskQueueList(1);
-                        TaskQueue queue = new TaskQueue(false);
-                        queues.add(queue);
-                        ManagedResources managedResources = new ManagedResources(mainCompResourceList, new HashMap<ResourceUnitName, List<ResourceUnit>>());
-                        mainScheduler = ResourceFactory.createScheduler(StandardResourceType.GS, "grid", schedulingPlugin , execTimeEstimationPlugin,  queues, managedResources);
-
-                        for(Scheduler lr: mainSchedulers){
-                                mainScheduler.addChild(lr);
-                        }
-                        //necessary if children list isn't initialized in Scheduler
-                        //mainScheduler.init();
+                        throw new Exception("Worng schedule definition");
                 }
                 return mainScheduler;
@@ -332 +335 @@
                 //TODO - refactor (create scheduler in 1 line)
                 if(schedulerDef.getClazz().equals("GridBroker")){
-                        scheduler = ResourceFactory.createScheduler(StandardResourceType.GS, "grid", schedulingPlugin, execTimeEstimationPlugin, queues, managedResources);
+                        scheduler = resFactory.createScheduler(StandardResourceType.GS, "grid", schedulingPlugin, execTimeEstimationPlugin, queues, managedResources);
                 } else {
-                        scheduler = ResourceFactory.createScheduler(StandardResourceType.LS, schedulerDef.getName(), schedulingPlugin, execTimeEstimationPlugin,  queues, managedResources);
+                        scheduler = resFactory.createScheduler(StandardResourceType.LS, schedulerDef.getName(), schedulingPlugin, execTimeEstimationPlugin,  queues, managedResources);
                 }
                 return scheduler;
@@ -374 +377 @@
                                 ComputingResource computingResource;
                                 try {
-                                        if(resourceName.equals(mainCompRes.getName()))
+                                        if(mainCompRes.getFullName().contains(resourceName))
                                                 computingResource = mainCompRes;
                                         else
@@ -421 +424 @@
                 return resourceUnits;
         }
-        
-        private void prepareCalendar() {
-                long seed = 11L * 13L * 17L * 19L * 23L + 1L;
-                double timeZone = 0.0;
-                double peakLoad = 0.0; // the resource load during peak hour
-                double offPeakLoad = 0.0; // the resource load during off-peak hr
-                double holidayLoad = 0.0; // the resource load during holiday
-
-                // incorporates weekends so the grid resource is on 7 days a week
-                LinkedList<Integer> Weekends = new LinkedList<Integer>();
-                Weekends.add(java.util.Calendar.SATURDAY);
-                Weekends.add(java.util.Calendar.SUNDAY);
-
-                // incorporates holidays. However, no holidays are set in this example
-                LinkedList<Integer> Holidays = new LinkedList<Integer>();
-                resourceCalendar = new ResourceCalendar(timeZone, peakLoad, offPeakLoad, holidayLoad, Weekends, Holidays,
-                                seed);
-        }
+
         
         class ResourceTypeComparator implements Comparator<Initializable>{