Changeset 1253 for DCWoRMS/branches

Timestamp:

11/28/13 11:41:33 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src

Files:

• example/energy/coolemall/CB2EnergyEstimationPlugin.java (modified) (1 diff)
• example/energy/coolemall/NodeEnergyEstimationPlugin.java (modified) (1 diff)
• example/localplugin/FCFSBF_RackPlugin.java (deleted)
• example/localplugin/coolemall/computebox1/CB1_FCFS_ConsolidationAtom_NodePowMan_SP.java (modified) (1 diff)
• example/localplugin/coolemall/computebox1/CB1_FCFS_Consolidation_NodePowMan_SP.java (modified) (1 diff)
• example/localplugin/coolemall/computebox1/CB1_FCFS_Consolidation_SP.java (modified) (1 diff)
• example/localplugin/coolemall/computebox1/CB1_FCFS_Random_SP.java (modified) (1 diff)
• example/localplugin/coolemall/computebox2/CB2_FCFS_Consolidation_NodePowMan_SP.java (modified) (1 diff)
• example/localplugin/coolemall/computebox2/CB2_FCFS_Consolidation_SP.java (modified) (1 diff)
• example/localplugin/coolemall/computebox2/CB2_FCFS_Random_SP.java (modified) (1 diff)
• example/localplugin/coolemall/recs/RECS_FCFS_Random_SP.java (modified) (1 diff)
• example/timeestimation/coolemall/PhaseTimeEstimationPlugin.java (modified) (3 diffs)
• test/Node_Fan_Mapping.java (copied) (copied from DCWoRMS/branches/coolemall/example/testbed_hpc/Node_Fan_Mapping.java) (1 diff)

DCWoRMS/branches/coolemall/src/example/energy/coolemall/CB2EnergyEstimationPlugin.java

@@ -14 +14 @@
 import schedframe.scheduling.manager.tasks.JobRegistry;
 import simulator.ConfigurationOptions;
-import testbed_hpc.Node_Fan_Mapping;
+import test.Node_Fan_Mapping;
 import example.energy.BaseEnergyEstimationPlugin;
 

DCWoRMS/branches/coolemall/src/example/energy/coolemall/NodeEnergyEstimationPlugin.java

@@ -8 +8 @@
 import schedframe.resources.devices.PhysicalResource;
 import schedframe.scheduling.manager.tasks.JobRegistry;
-import testbed_hpc.Node_Fan_Mapping;
+import test.Node_Fan_Mapping;
 import example.energy.BaseEnergyEstimationPlugin;
 

DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_ConsolidationAtom_NodePowMan_SP.java

@@ -33 +33 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import testbed_hpc.Node_Fan_Mapping;
+import test.Node_Fan_Mapping;
 import example.localplugin.BaseLocalSchedulingPlugin;
 import gridsim.dcworms.DCWormsTags;

DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Consolidation_NodePowMan_SP.java

@@ -33 +33 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import testbed_hpc.Node_Fan_Mapping;
+import test.Node_Fan_Mapping;
 import example.localplugin.BaseLocalSchedulingPlugin;
 import gridsim.dcworms.DCWormsTags;

DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Consolidation_SP.java

@@ -29 +29 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import testbed_hpc.Node_Fan_Mapping;
+import test.Node_Fan_Mapping;
 import example.localplugin.BaseLocalSchedulingPlugin;
 import gridsim.dcworms.DCWormsTags;

DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox1/CB1_FCFS_Random_SP.java

@@ -27 +27 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import testbed_hpc.Node_Fan_Mapping;
+import test.Node_Fan_Mapping;
 import example.localplugin.BaseLocalSchedulingPlugin;
 import gridsim.dcworms.DCWormsTags;

DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Consolidation_NodePowMan_SP.java

@@ -33 +33 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import testbed_hpc.Node_Fan_Mapping;
+import test.Node_Fan_Mapping;
 import example.localplugin.BaseLocalSchedulingPlugin;
 import gridsim.dcworms.DCWormsTags;

DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Consolidation_SP.java

@@ -29 +29 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import testbed_hpc.Node_Fan_Mapping;
+import test.Node_Fan_Mapping;
 import example.localplugin.BaseLocalSchedulingPlugin;
 import gridsim.dcworms.DCWormsTags;

DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/computebox2/CB2_FCFS_Random_SP.java

@@ -28 +28 @@
 import schedframe.scheduling.tasks.TaskInterface;
 import schedframe.scheduling.tasks.phases.PhaseBehaviour;
-import testbed_hpc.Node_Fan_Mapping;
+import test.Node_Fan_Mapping;
 import dcworms.schedframe.scheduling.ExecTask;
 import example.energy.coolemall.CoolEmAllTestbedMeasurements;

DCWoRMS/branches/coolemall/src/example/localplugin/coolemall/recs/RECS_FCFS_Random_SP.java

@@ -29 +29 @@
 import schedframe.scheduling.queue.TaskQueueList;
 import schedframe.scheduling.tasks.TaskInterface;
-import testbed_hpc.Node_Fan_Mapping;
+import test.Node_Fan_Mapping;
 import example.localplugin.BaseLocalSchedulingPlugin;
 import gridsim.dcworms.DCWormsTags;

DCWoRMS/branches/coolemall/src/example/timeestimation/coolemall/PhaseTimeEstimationPlugin.java

@@ -5 +5 @@
 
 import schedframe.events.scheduling.SchedulingEvent;
-import schedframe.resources.units.PEUnit;
 import schedframe.resources.units.ResourceUnit;
 import schedframe.resources.units.ResourceUnitName;
-import schedframe.resources.units.StandardResourceUnitName;
 import schedframe.scheduling.tasks.phases.ResourceConsumption;
 import dcworms.schedframe.scheduling.ExecTask;
@@ -20 +18 @@
          * Requested calculation should be done based on the resources allocated for the task,
          * task description and task completion percentage.
-         * 
-         * Example implementation calculate the estimation based on cpu processing power.
-         * There is also a simple assumption, that cpu processing power is a linear function
-         * of number of allocated cpus and their speed.
          */
         public double execTimeEstimation(SchedulingEvent event, ExecTask task,
@@ -30 +24 @@
 
                 Executable exec = (Executable) task;
-                // System.out.println(exec.getJobId() +":"+ exec.getApplicationName());
-                // collect all information necessary to do the calculation
-                PEUnit peUnit = (PEUnit) allocatedResources.get(StandardResourceUnitName.PE);
-                
-                // obtain single pe speed
-                int speed = peUnit.getSpeed();
 
-                // number of used pe  
-                int cnt = peUnit.getUsedAmount();
-
-                // estimate remainingTaskLength
                 ResourceConsumption resConsumption = exec.getResourceConsumptionProfile().getCurrentResourceConsumption();
 
-                // do the calculation
                 double execTime = (1 - completionPercentage/100) * resConsumption.getDuration();
 

DCWoRMS/branches/coolemall/src/test/Node_Fan_Mapping.java

@@ -1 @@
-package testbed_hpc;
+package test;
 
 import com.google.common.collect.BiMap;