Changeset 1415 for DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/load

Timestamp:

07/15/14 16:26:31 (11 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

• LoadExtension.java (modified) (5 diffs)
• plugin/LoadEstimationPlugin.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/load/LoadExtension.java

@@ -7 +7 @@
 import schedframe.resources.computing.extensions.ExtensionException;
 import schedframe.resources.computing.extensions.ExtensionType;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
-import schedframe.resources.computing.profiles.energy.EnergyEventType;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 import schedframe.resources.computing.profiles.load.ui.LoadInterface;
 import schedframe.resources.devices.PhysicalResource;
@@ -29 +29 @@
                 if(loadProfile == null || loadProfile.getLoadEstimationPlugin() == null)
                         return false;
-                if(event.getType().getName().equals(EnergyEventType.POWER_STATE_CHANGED.getName()))
+                if(event.getType().getName().equals(ResourceEventType.POWER_STATE_CHANGED.getName()))
                         return true;
-                else if(event.getType().getName().equals(EnergyEventType.FREQUENCY_CHANGED.getName()))
+                else if(event.getType().getName().equals(ResourceEventType.CPU_FREQUENCY_CHANGED.getName()))
                         return true;
-                else if(event.getType().getName().equals(EnergyEventType.TASK_STARTED.getName()))
+                else if(event.getType().getName().equals(ResourceEventType.TASK_STARTED.getName()))
                         return true;
-                else if(event.getType().getName().equals(EnergyEventType.TASK_FINISHED.getName()))
+                else if(event.getType().getName().equals(ResourceEventType.TASK_FINISHED.getName()))
                         return true;
-                else if(event.getType().getName().equals(EnergyEventType.RESOURCE_UTILIZATION_CHANGED.getName()))
+                else if(event.getType().getName().equals(ResourceEventType.UTILIZATION_CHANGED.getName()))
                         return true;            
                 else return false;
@@ -44 +44 @@
         public void handleEvent(Event event) {
                 
-                EnergyEvent enEvent = (EnergyEvent)event;
+                ResourceEvent enEvent = (ResourceEvent)event;
                 double load = 0;
                 try{
@@ -54 +54 @@
                                 break;
                                 
-                        case FREQUENCY_CHANGED:
+                        case CPU_FREQUENCY_CHANGED:
                                 load = loadProfile.getLoadEstimationPlugin().estimateUtlization(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
                                 loadProfile.addToLoadHistory(load);
@@ -69 +69 @@
                                 break;
                                 
-                        case RESOURCE_UTILIZATION_CHANGED:
+                        case UTILIZATION_CHANGED:
                                 load = loadProfile.getLoadEstimationPlugin().estimateUtlization(enEvent, new JobRegistryImpl(resource.getFullName()), resource);
                                 loadProfile.addToLoadHistory(load);

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/profiles/load/plugin/LoadEstimationPlugin.java

@@ -2 +2 @@
 
 import schedframe.Plugin;
-import schedframe.resources.computing.profiles.energy.EnergyEvent;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
 import schedframe.resources.devices.PhysicalResource;
 import schedframe.scheduling.manager.tasks.JobRegistry;
@@ -8 +8 @@
 public interface LoadEstimationPlugin extends Plugin {
         
-        public double estimateUtlization(EnergyEvent event, JobRegistry jobRegistry, PhysicalResource resource);
+        public double estimateUtlization(ResourceEvent event, JobRegistry jobRegistry, PhysicalResource resource);