Changeset 1197 for DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling

Timestamp:

08/28/13 13:24:11 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling

Files:

• RecsExclusivenessEnOptDFSSP.java (modified) (3 diffs)
• RecsExclusivenessEnOptNodePowManSP.java (modified) (2 diffs)
• RecsExclusivenessEnOptSP.java (modified) (3 diffs)
• RecsSP.java (modified) (2 diffs)
• old (deleted)

DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptDFSSP.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;
@@ -36 +35 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import test.article.recs.utils.AppType;
 import test.article.recs.utils.RecsProcessorPowerInterface;
 
@@ -160 +158 @@
         }
 
-        private String getApplicationType(TaskInterface<?> task){       
-                AppType appType = taskToApp.getAppType(task);
-                return appType.toString();
-        }
-        
-        private String getNodeCategory(ComputingNode node){
-
-                return node.getCategory();
-        }
-        
-        private int getFrequency(ComputingNode node){
-                Processor proc = (Processor) node.getProcessors().get(0);
-                double freq = proc.getPowerInterface().getFrequency();
-                return Double.valueOf(freq).intValue(); 
-        }
-        
-        private int getCoreCnt(TaskInterface<?> task){  
-                double cpuReq;
-                try {
-                        cpuReq = task.getCpuCntRequest();
-                } catch (NoSuchFieldException e) {
-                                cpuReq = 1;
-                }
-                return Double.valueOf(cpuReq).intValue();
-        }
-        
         protected double getMeasuredPower(String query) throws FileNotFoundException, IOException{
                 ResourceBundle powBundle = getPowBundle();

DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptNodePowManSP.java

@@ -36 +36 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import test.article.recs.utils.AppType;
 
 public class RecsExclusivenessEnOptNodePowManSP  extends RecsSP {
@@ -162 +161 @@
         }
 
-        private String getApplicationType(TaskInterface<?> task){       
-                AppType appType = taskToApp.getAppType(task);
-                return appType.toString();
-        }
-        
-        private String getNodeCategory(ComputingNode node){
-
-                return node.getCategory();
-        }
-        
-        private int getFrequency(ComputingNode node){
-                Processor proc = (Processor) node.getProcessors().get(0);
-                double freq = proc.getPowerInterface().getFrequency();
-                return Double.valueOf(freq).intValue(); 
-        }
-        
-        private int getCoreCnt(TaskInterface<?> task){  
-                double cpuReq;
-                try {
-                        cpuReq = task.getCpuCntRequest();
-                } catch (NoSuchFieldException e) {
-                                cpuReq = 1;
-                }
-                return Double.valueOf(cpuReq).intValue();
-        }
-        
         protected double getMeasuredPower(String query) throws FileNotFoundException, IOException{
                 ResourceBundle powBundle = getPowBundle();

DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsExclusivenessEnOptSP.java

@@ -21 +21 @@
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Core;
-import schedframe.resources.computing.Processor;
 import schedframe.resources.computing.profiles.energy.power.StandardPowerStateName;
 import schedframe.resources.units.ProcessingElements;
@@ -36 +35 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import test.article.recs.utils.AppType;
 
 public class RecsExclusivenessEnOptSP extends RecsSP {
@@ -157 +155 @@
         }
 
-        private String getApplicationType(TaskInterface<?> task){       
-                AppType appType = taskToApp.getAppType(task);
-                return appType.toString();
-        }
-        
-        private String getNodeCategory(ComputingNode node){
-
-                return node.getCategory();
-        }
-        
-        private int getFrequency(ComputingNode node){
-                Processor proc = (Processor) node.getProcessors().get(0);
-                double freq = proc.getPowerInterface().getFrequency();
-                return Double.valueOf(freq).intValue(); 
-        }
-        
-        private int getCoreCnt(TaskInterface<?> task){  
-                double cpuReq;
-                try {
-                        cpuReq = task.getCpuCntRequest();
-                } catch (NoSuchFieldException e) {
-                                cpuReq = 1;
-                }
-                return Double.valueOf(cpuReq).intValue();
-        }
-        
         protected double getMeasuredPower(String query) throws FileNotFoundException, IOException{
                 ResourceBundle powBundle = getPowBundle();

DCWoRMS/branches/coolemall/src/test/article/recs/plugins/scheduling/RecsSP.java

@@ -8 +8 @@
 
 import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Processor;
 import schedframe.scheduling.tasks.TaskInterface;
 import test.article.recs.utils.AppType;
 import test.article.recs.utils.TaskToApp;
-import dcworms.schedframe.scheduling.ExecTask;
 import dcworms.schedframe.scheduling.Executable;
 import example.localplugin.BaseLocalSchedulingPlugin;
@@ -33 +33 @@
         }
 
-        private String getApplicationType(ExecTask task){       
+        protected String getApplicationType(TaskInterface<?> task){     
                 AppType appType = taskToApp.getAppType(task);
                 return appType.toString();
         }
         
-        private String getNodeCategory(ComputingNode node){
+        protected String getNodeCategory(ComputingNode node){
                 return node.getCategory();
         }
 
+        protected int getCoreCnt(TaskInterface<?> task){        
+                double cpuReq;
+                try {
+                        cpuReq = task.getCpuCntRequest();
+                } catch (NoSuchFieldException e) {
+                                cpuReq = 1;
+                }
+                return Double.valueOf(cpuReq).intValue();
+        }
+        
+        protected int getFrequency(ComputingNode node){
+                Processor proc = (Processor) node.getProcessors().get(0);
+                double freq = proc.getPowerInterface().getFrequency();
+                return Double.valueOf(freq).intValue(); 
+        }
+        
         protected boolean getExecutiveness(String query) throws FileNotFoundException, IOException{
                 ResourceBundle execBundle = getExecBundle();