Changeset 1419 for DCWoRMS/branches

Timestamp:

07/15/14 16:30:22 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/test/appProfConverter/dcworms/SoftwareProfile.java (modified) (3 diffs)

DCWoRMS/branches/coolemall/src/test/appProfConverter/dcworms/SoftwareProfile.java

@@ -1 +1 @@
 package test.appProfConverter.dcworms;
-import schedframe.scheduling.tasks.phases.ResourceConsumption;
+import schedframe.scheduling.tasks.phases.ExecutionPhase;
 import dcworms.schedframe.scheduling.Executable;
 
@@ -16 +16 @@
 
                 for (int i = 0; i < nPhases; i++) {
-                        ResourceConsumption resConsumption = executable.getExecutionProfile().getResourceConsumptionList().get(i);
+                        ExecutionPhase resConsumption = executable.getExecutionProfile().getResourceConsumptionList().get(i);
                         SoftwarePhase swPhase = new SoftwarePhase();
 
@@ -33 +33 @@
                         }
 
-                        for (int b = 0; b < resConsumption.getBehaviourList().size(); b++) {
-                                String name = resConsumption.getBehaviourList().get(b).getResouceName();
+                        for (int b = 0; b < resConsumption.getSystemLoad().size(); b++) {
+                                String name = resConsumption.getSystemLoad().get(b).getResouceName();
                                 if (name.equals("PM_Power")) {
-                                        swPhase.PM_Power = resConsumption.getBehaviourList().get(b).getUtilization();
+                                        swPhase.PM_Power = resConsumption.getSystemLoad().get(b).getUtilization();
                                 }
                                 if (name.equals("PM_Disk_IO")) {
-                                        swPhase.PM_Disk_IO = resConsumption.getBehaviourList().get(b).getUtilization();
+                                        swPhase.PM_Disk_IO = resConsumption.getSystemLoad().get(b).getUtilization();
                                 }
                                 if (name.equals("PM_Memory_RSS")) {
-                                        swPhase.PM_Memory_RSS = resConsumption.getBehaviourList().get(b).getUtilization();
+                                        swPhase.PM_Memory_RSS = resConsumption.getSystemLoad().get(b).getUtilization();
                                 }
                                 if (name.equals("PM_Memory_Usage")) {
-                                        swPhase.PM_Memory_Usage = resConsumption.getBehaviourList().get(b).getUtilization();
+                                        swPhase.PM_Memory_Usage = resConsumption.getSystemLoad().get(b).getUtilization();
                                 }
                                 if (name.equals("PM_CPU_Usage")) {
-                                        swPhase.PM_CPU_Usage = resConsumption.getBehaviourList().get(b).getUtilization();
+                                        swPhase.PM_CPU_Usage = resConsumption.getSystemLoad().get(b).getUtilization();
                                 }
                                 if (name.equals("PM_Threads")) {
-                                        swPhase.PM_Threads = (int) resConsumption.getBehaviourList().get(b).getUtilization();
+                                        swPhase.PM_Threads = (int) resConsumption.getSystemLoad().get(b).getUtilization();
                                 }
                                 if (name.equals("PM_Download")) {
-                                        swPhase.PM_Download = resConsumption.getBehaviourList().get(b).getUtilization();
+                                        swPhase.PM_Download = resConsumption.getSystemLoad().get(b).getUtilization();
                                 }
                                 if (name.equals("PM_Upload")) {
-                                        swPhase.PM_Upload = resConsumption.getBehaviourList().get(b).getUtilization();
+                                        swPhase.PM_Upload = resConsumption.getSystemLoad().get(b).getUtilization();
                                 }
                         }