Changeset 1247 for DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy

Timestamp:

11/28/13 10:54:54 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy

Files:

• AmdNodeEEP.java (modified) (2 diffs)
• AtomD510NodeEEP.java (modified) (2 diffs)
• AtomZ510NodeEEP.java (modified) (2 diffs)
• IntelNodeEEP.java (modified) (2 diffs)
• RecsNodeBaseEEP.java (modified) (3 diffs)

DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AmdNodeEEP.java

@@ -4 +4 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -18 +18 @@
                 double powerConsumption = 0;
                 
-                ComputingNode node = (ComputingNode) resource;
+                Node node = (Node) resource;
                 try {
                         if(jobRegistry.getRunningTasks().size() > 0) {

DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AtomD510NodeEEP.java

@@ -4 +4 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15 +15 @@
                         PhysicalResource resource) {
                 double powerConsumption = 0;
-                ComputingNode node = (ComputingNode) resource;
+                Node node = (Node) resource;
                 try {
                         if(jobRegistry.getRunningTasks().size() > 0) {

DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/AtomZ510NodeEEP.java

@@ -4 +4 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -17 +17 @@
                         PhysicalResource resource) {
                 double powerConsumption = 0;
-                ComputingNode node = (ComputingNode) resource;
+                Node node = (Node) resource;
                 try {
                         if(jobRegistry.getRunningTasks().size() > 0) {

DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/IntelNodeEEP.java

@@ -4 +4 @@
 import java.io.IOException;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.EnergyEvent;
@@ -15 +15 @@
                         PhysicalResource resource) {
                 double powerConsumption = 0;
-                ComputingNode node = (ComputingNode) resource;
+                Node node = (Node) resource;
                 
                 try {

DCWoRMS/branches/coolemall/src/test/drs_tst/recs/plugins/energy/RecsNodeBaseEEP.java

@@ -9 +9 @@
 import java.util.ResourceBundle;
 
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
@@ -54 +54 @@
                 
                 ProcessingElements pe = (ProcessingElements) peUnit;
-                if(pe.get(0) instanceof ComputingNode)
-                        return ((ComputingNode)pe.get(0)).getCategory();
+                if(pe.get(0) instanceof Node)
+                        return ((Node)pe.get(0)).getCategory();
                 Core core = (Core)pe.get(0);
                 return core.getParent().getParent().getCategory();
@@ -62 +62 @@
         private int getFrequency(PEUnit peUnit){
                 ProcessingElements pe = (ProcessingElements) peUnit;
-                if(pe.get(0) instanceof ComputingNode)
-                        return Double.valueOf(((ComputingNode)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
+                if(pe.get(0) instanceof Node)
+                        return Double.valueOf(((Node)pe.get(0)).getProcessors().get(0).getPowerInterface().getFrequency()).intValue();
                 Core core = (Core)pe.get(0);
                 Processor proc = (Processor) core.getParent();