Changeset 1207 for DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall

Files:

• . (copied) (copied from DCWoRMS/branches/coolemall/src/schedframe/resources/computing/recs)
• ComputeBox1.java (copied) (copied from DCWoRMS/branches/coolemall/src/schedframe/resources/computing/recs/ComputeBox1.java) (3 diffs)
• ComputeBox2.java (added)
• Node.java (modified) (2 diffs)
• NodeGroup.java (copied) (copied from DCWoRMS/branches/coolemall/src/schedframe/resources/computing/recs/NodeGroup.java) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/ComputeBox1.java

@@ -1 @@
-package schedframe.resources.computing.recs;
+package schedframe.resources.computing.coolemall;
 
 import java.util.List;
@@ -6 +6 @@
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingNode;
-import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.Rack;
 import schedframe.resources.computing.description.ComputingResourceDescription;
@@ -23 +22 @@
         @SuppressWarnings("unchecked")
         public List<ComputingNode> getNodes(){
-                return (List<ComputingNode>) getDescendantsByType(CoolEmAllResourceType.Node);
-        }
-        
-        @SuppressWarnings("unchecked")
-        public List<Processor> getProcessors(){
-                return (List<Processor>) getDescendantsByType(StandardResourceType.Processor);
+                return (List<ComputingNode>) getDescendantsByType(StandardResourceType.Node);
         }
 
+
 }

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/Node.java

@@ -1 @@
-package schedframe.resources.computing.recs;
+package schedframe.resources.computing.coolemall;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Core;
+import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.description.ComputingResourceDescription;
 
@@ -10 +15 @@
                 // TODO Auto-generated constructor stub
         }
+        
+        public List<Core> getCores(){
+                List<Core> cores = new ArrayList<Core>();
+                for(Processor proc: getProcessors()){
+                        cores.addAll(proc.getCores());
+                }
+                return cores;
+        }
+
+        public List<Core> getFreeCores(){
+                List<Core> freeCores = new ArrayList<Core>();
+                for(Processor proc: getProcessors()){
+                        freeCores.addAll(proc.getFreeCores());
+                }
+                return freeCores;
+        }
 
 }

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/coolemall/NodeGroup.java

@@ -1 @@
-package schedframe.resources.computing.recs;
+package schedframe.resources.computing.coolemall;
 
 import java.util.List;
 
-import schedframe.resources.CoolEmAllResourceType;
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingResource;
@@ -17 +16 @@
         @SuppressWarnings("unchecked")
         public List<Node> getNodes(){
-                return (List<Node>) getDescendantsByType(CoolEmAllResourceType.Node);
+                return (List<Node>) getDescendantsByType(StandardResourceType.Node);
         }