Changeset 490 for DCWoRMS/trunk/src/dcworms/schedframe/scheduling

Timestamp:

10/09/12 13:58:06 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/dcworms

Files:

• . (added)
• schedframe (added)
• schedframe/scheduling (added)
• schedframe/scheduling/ExecTask.java (copied) (copied from DCWoRMS/trunk/src/gssim/schedframe/scheduling/ExecTask.java) (2 diffs)
• schedframe/scheduling/Executable.java (copied) (copied from DCWoRMS/trunk/src/gssim/schedframe/scheduling/Executable.java) (11 diffs)
• schedframe/scheduling/plugin (added)
• schedframe/scheduling/plugin/estimation (added)
• schedframe/scheduling/plugin/local (copied) (copied from DCWoRMS/trunk/src/gssim/schedframe/scheduling/plugin/local)
• schedframe/scheduling/plugin/local/DCWormsTimeOperations.java (copied) (copied from DCWoRMS/trunk/src/gssim/schedframe/scheduling/plugin/local/DCWormsTimeOperations.java) (1 diff)
• schedframe/scheduling/plugin/local/WormsTimeOperations.java (deleted)
• schedframe/scheduling/queues (copied) (copied from DCWoRMS/trunk/src/gssim/schedframe/scheduling/queues)
• schedframe/scheduling/queues/AbstractStatsSupportingQueue.java (modified) (1 diff)
• schedframe/scheduling/utils (copied) (copied from DCWoRMS/trunk/src/gssim/schedframe/scheduling/utils)
• schedframe/scheduling/utils/JobDescription.java (modified) (1 diff)
• schedframe/scheduling/utils/TaskDescription.java (modified) (1 diff)

DCWoRMS/trunk/src/dcworms/schedframe/scheduling/ExecTask.java

@@ -1 @@
-package gssim.schedframe.scheduling;
+package dcworms.schedframe.scheduling;
 
 import java.util.List;
@@ -11 +11 @@
         public Object getExpectedSpecificResource(ResourceParameterName resourceName);
 
-        public void visitResource(String resName);
+        public void trackResource(String resName);
         public List<String> getVisitedResources();
 }

DCWoRMS/trunk/src/dcworms/schedframe/scheduling/Executable.java

@@ -1 @@
-package gssim.schedframe.scheduling;
+package dcworms.schedframe.scheduling;
 
 
@@ -15 +15 @@
 import org.joda.time.ReadableDuration;
 
+
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.units.ProcessingElements;
 import schedframe.resources.units.StandardResourceUnitName;
 import schedframe.scheduling.ResourceHistoryItem;
-import schedframe.scheduling.UsedResourceList;
+import schedframe.scheduling.UsedResourcesList;
 import schedframe.scheduling.WorkloadUnitHandler;
 import schedframe.scheduling.manager.tasks.JobRegistryImpl;
@@ -47 +48 @@
         //TO DO remove and benefit from visitedResources
         protected String schedName;
-        protected UsedResourceList<ResourceHistoryItem> usedResources;
+        protected UsedResourcesList usedResources;
         //TO DO consider removing
         protected List<String> visitedResources;
@@ -61 +62 @@
                 this.status = DCWormsTags.CREATED;
                 
-                this.usedResources = new UsedResourceList<ResourceHistoryItem>();
+                this.usedResources = new UsedResourcesList();
                 this.visitedResources = new ArrayList<String>();
                 init();
@@ -71 +72 @@
                 this.processesSetId = procesesSet.getId(); 
                 
-                this.usedResources = new UsedResourceList<ResourceHistoryItem>();
+                this.usedResources = new UsedResourcesList();
                 this.visitedResources = new ArrayList<String>();
                 init();
@@ -77 +78 @@
         
         protected void init() {
-                double currentTime =  DateTimeUtilsExt.getDateTimeAt(arrivalTime).getMillis() / 1000;
+                double currentTime = DateTimeUtilsExt.getDateTimeAt(arrivalTime).getMillis() / 1000;
                 this.submissionTime =  currentTime;
         this.totalCompletionTime = 0.0;
@@ -157 +158 @@
         }
 
-        if (newStatus < DCWormsTags.CREATED || newStatus > DCWormsTags.FAILED_RESOURCE_UNAVAILABLE)
-        {
-            throw new Exception("Gridlet.setGridletStatus() : Error - " +
-                    "Invalid integer range for Gridlet status.");
+        if (newStatus < DCWormsTags.CREATED || newStatus > DCWormsTags.FAILED_RESOURCE_UNAVAILABLE) {
+            throw new Exception("Executable.setStatuts() : Error - " +
+                    "Invalid integer range for Execiutable status.");
         }
 
@@ -175 +175 @@
                 }
 
-        if (prevStatus == DCWormsTags.INEXEC)
-        {
-
+        if (prevStatus == DCWormsTags.INEXEC) {
             if (status == DCWormsTags.CANCELED || status == DCWormsTags.PAUSED ||
-                status == DCWormsTags.SUCCESS)
-            {
+                status == DCWormsTags.SUCCESS) {
                 totalCompletionTime += (currentTime -  execStartTime);
             }
         }
 
-        if (prevStatus == DCWormsTags.RESUMED && status == DCWormsTags.SUCCESS)
-        {
+        if (prevStatus == DCWormsTags.RESUMED && status == DCWormsTags.SUCCESS) {
             totalCompletionTime += (currentTime -  execStartTime);
         }
 
         if (status == DCWormsTags.INEXEC ||
-            (prevStatus == DCWormsTags.PAUSED && status == DCWormsTags.RESUMED) )
-        {
+            (prevStatus == DCWormsTags.PAUSED && status == DCWormsTags.RESUMED) ) {
                 execStartTime = currentTime;
+                
                 ProcessingElements pes = (ProcessingElements) getUsedResources().getLast().getResourceUnits().get(StandardResourceUnitName.PE);
                 for (ComputingResource resource : pes) {
 
-                        visitResource(resource.getName());
+                        trackResource(resource.getName());
+                        
                         ComputingResource parent = resource.getParent();
-
                                 List<String> visitedResource = getVisitedResources();
-                        while (parent != null && !ArrayUtils.contains(visitedResource.toArray(new String[visitedResource.size()]), parent.getName())) {
-                                visitResource(parent.getName());
+                                String [] visitedResourcesArray = visitedResource.toArray(new String[visitedResource.size()]);
+                        while (parent != null && !ArrayUtils.contains(visitedResourcesArray, parent.getName())) {
+                                trackResource(parent.getName());
                                 parent = parent.getParent();
                         }
@@ -254 +251 @@
         }
         
-        public UsedResourceList<ResourceHistoryItem> getUsedResources(){
+        public UsedResourcesList getUsedResources(){
                 return this.usedResources;
         }
@@ -284 +281 @@
         }
         
-        public void visitResource(String resName){
+        public void trackResource(String resName){
                 visitedResources.add(resName);
         }
@@ -346 +343 @@
         return execStartTime - submissionTime;
     }
-
     
     public void finalizeExecutable(){
-
+                try {
+                        setStatus(DCWormsTags.SUCCESS);
+                } catch (Exception e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
     }
     

DCWoRMS/trunk/src/dcworms/schedframe/scheduling/plugin/local/DCWormsTimeOperations.java

@@ -1 @@
-package gssim.schedframe.scheduling.plugin.local;
+package dcworms.schedframe.scheduling.plugin.local;
 
 import org.joda.time.DateTime;

DCWoRMS/trunk/src/dcworms/schedframe/scheduling/queues/AbstractStatsSupportingQueue.java

@@ -1 @@
-package gssim.schedframe.scheduling.queues;
+package dcworms.schedframe.scheduling.queues;
 
 import java.util.ArrayList;

DCWoRMS/trunk/src/dcworms/schedframe/scheduling/utils/JobDescription.java

@@ -1 @@
-package gssim.schedframe.scheduling.utils;
+package dcworms.schedframe.scheduling.utils;
 
 import java.io.StringReader;

DCWoRMS/trunk/src/dcworms/schedframe/scheduling/utils/TaskDescription.java

@@ -1 @@
-package gssim.schedframe.scheduling.utils;
+package dcworms.schedframe.scheduling.utils;
 
 import java.io.StringReader;