Changeset 708 for DCWoRMS/trunk/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java

Timestamp:

12/20/12 17:23:35 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java (modified) (5 diffs)

DCWoRMS/trunk/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java

@@ -22 +22 @@
 import schedframe.resources.computing.Core;
 import schedframe.resources.computing.Processor;
+import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
 import schedframe.resources.units.ProcessingElements;
 import schedframe.resources.units.ResourceUnit;
@@ -84 +85 @@
                 List<ComputingNode> nodes = resourceManager.getComputingNodes();
                 Collections.sort(nodes, new EnergyComparator(task));
+                //System.out.println("*****");
                 for (ComputingNode node : nodes) {
+                        //System.out.println(node.getCategory());
                         int cpuRequest;
                         try {
@@ -111 +114 @@
                                 if(freeCores != cores.size())
                                         continue;
+                                
+                                try {
+                                        if(!getExecutiveness(createExecutivenessQuery(task, node)))
+                                                continue;
+                                } catch (FileNotFoundException e) {
+                                        continue;
+                                } catch (IOException e) {
+                                        continue;
+                                } catch (MissingResourceException e){
+                                        continue;
+                                }
+                                
                                 List<ComputingResource> choosenResources = new ArrayList<ComputingResource>();                          
                                 for (int i = 0; i < cores.size() && cpuRequest > 0; i++) {
@@ -201 +216 @@
                 double node2EU = Double.MAX_VALUE;
                 try {
-                                node1EU = getMeasuredTime(createQuery(task, node1)) * getMeasuredPower(createQuery(task, node1));
-                                node2EU = getMeasuredTime(createQuery(task, node2)) * getMeasuredPower(createQuery(task, node2));
-                        } catch (FileNotFoundException e) {
+                                node1EU = getMeasuredTime(createQuery(task, node1)) * (getMeasuredPower(createQuery(task, node1)) - node1.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON));
+                                //System.out.println(node1.getCategory() + ": " + node1EU + "; "+ getMeasuredTime(createQuery(task, node1)) +";" + node1.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON) + ":" + getMeasuredPower(createQuery(task, node1)));
+                                node2EU = getMeasuredTime(createQuery(task, node2)) * (getMeasuredPower(createQuery(task, node2)) - node2.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON));
+                                //System.out.println(node2.getCategory() + ": " + node2EU + "; "+ getMeasuredTime(createQuery(task, node2)) +";" + node2.getPowerInterface().getPowerConsumption(StandardPowerStateName.ON) + ":" + getMeasuredPower(createQuery(task, node2)));
+                } catch (FileNotFoundException e) {
 
                         } catch (IOException e) {
@@ -209 +226 @@
                         } catch (MissingResourceException e){
                                 
+                        } catch (NoSuchFieldException e) {
+
                         }
                 if(node1EU > node2EU)