Changeset 539 for DCWoRMS/trunk/build/classes/simulator/reader

Timestamp:

10/31/12 13:52:06 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/build/classes/simulator/reader

Files:

• ResourceReader.class (modified) (previous)
• ResourceReader.java (modified) (10 diffs)

DCWoRMS/trunk/build/classes/simulator/reader/ResourceReader.java

@@ -11 +11 @@
 import java.util.Deque;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.exolab.castor.types.AnyNode;
@@ -54 +56 @@
         private String globalSchedulingPluginName;
         
+        private Set<String> compResLayers;
+        
         public ResourceReader(ConfigurationOptions options) throws IOException {
 
@@ -59 +63 @@
                 globalSchedulingPluginName = "example.globalplugin.GridFCFSRoundRobinPlugin";
                 prepareCalendar();
+                compResLayers = new LinkedHashSet<String>();
         }
 
@@ -64 +69 @@
                         UnknownParameter {
 
-                //File file = new File("src/test/rewolucja/schemas/example/coolemall/example4.xml");
                 File file = new File(resDescFileName);
-                //File file = new File("example/tomekp/experiment1/tomExp3.xml");
-                /*long s =System.currentTimeMillis();
-                System.out.println("start: ");
-                List<Processor> list = new ArrayList<Processor>();
-                for(int i =0;i<3000000;i++){
-                        schemas.ComputingResource compResDef = new schemas.ComputingResource();
-                        compResDef.setName("a"+i);
-                        compResDef.setClazz("Processor");
-                        CompResourceDescription resDesc = new CompResourceDescription(compResDef);
-                        Processor proc = new Processor(resDesc);
-                        list.add(proc);
-                }
-                long e = System.currentTimeMillis();
-                System.out.println("end: ");
-                System.out.println(e-s);*/
                 Environment env = Environment.unmarshal(new FileReader(file));
                 
@@ -97 +86 @@
                 ResourceController rc = new ResourceController(mainScheduler, computingResources);
                 rc.setInitList(toInit);
+                rc.setCompResLayers(compResLayers);
                 return rc;
         }
@@ -177 +167 @@
 
                 List<ComputingResource> mainCompResourceList = new ArrayList<ComputingResource>();
-                
                 Deque<ComputingResourceDescription> toExamine = new ArrayDeque<ComputingResourceDescription>();
                 Deque<ComputingResource> resStructure = new ArrayDeque<ComputingResource>();
@@ -192 +181 @@
                         ComputingResource parentResource = resStructure.pop();
                         toInit.add(parentResource);
+                        compResLayers.add(parentResource.getType().getName());
                         List<AbstractResourceDescription> childrenResDesc = parentResDesc.getChildren();
                         if (childrenResDesc == null){
@@ -250 +240 @@
                 //TODO - refactor (remove - create scheduler on the basis of resource description)
                 Scheduler mainScheduler = null;
-                if(mainSchedulers.size() == 1 && mainSchedulers.get(0).get_name().equals("grid")){
+                if(mainSchedulers.size() == 1 /*&& mainSchedulers.get(0).get_name().equals("grid")*/){
                         mainScheduler = mainSchedulers.get(0);
                 }
@@ -261 +251 @@
                         ManagedResources managedResources = new ManagedResources(mainCompResourceList, new HashMap<ResourceUnitName, List<ResourceUnit>>());
                         mainScheduler = ResourceFactory.createScheduler(StandardResourceType.GS, "grid", schedulingPlugin , execTimeEstimationPlugin,  queues, managedResources);
-                        /*ManagementSystem ms = new GridBroker("grid",
-                                        globalSchedulingPluginName, execTimeEstimationPlugin);
-                        mainScheduler = new Scheduler(ms, mainCompResourceList);*/
+
                         for(Scheduler lr: mainSchedulers){
                                 mainScheduler.addChild(lr);
@@ -280 +268 @@
                 TaskQueueList queues = new TaskQueueList(1);
                 
-                if(schedulerDef.getQueue() != null && schedulerDef.getQueueCount() > 0){
-                        int queueCount = schedulerDef.getQueueCount();
+                if(schedulerDef.getQueues()!= null){
+                        int queueCount = schedulerDef.getQueues().getQueueCount();
                         for(int i = 0; i < queueCount; i++){
-                                schemas.QueueType queueDef = schedulerDef.getQueue(i);
+                                schemas.QueueType queueDef = schedulerDef.getQueues().getQueue(i);
                                 TaskQueue queue = new TaskQueue(queueDef.getReservation());
                                 queue.setName(queueDef.getName());