Changeset 481 for DCWoRMS/trunk/src/gridsim

Timestamp:

10/08/12 10:23:45 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/gridsim/gssim

Files:

• DCWormsTags.java (copied) (copied from DCWoRMS/trunk/src/gridsim/gssim/WormsTags.java) (2 diffs)
• filter/ExecTaskFilter.java (moved) (moved from DCWoRMS/trunk/src/gridsim/gssim/filter/SubTaskFilter.java) (3 diffs)

DCWoRMS/trunk/src/gridsim/gssim/DCWormsTags.java

@@ -6 +6 @@
  * @author Marcin Krystek
  */
-public class WormsTags extends GridSimTags {
+public class DCWormsTags extends GridSimTags {
         
         protected static final int GSSIMBASE = 600; 
@@ -28 +28 @@
         public static final int TASK_REQUESTED_TIME_EXPIRED = GSSIMBASE + 6;
 
+        
+    public static final int CREATED = 0;
+
+    public static final int SUBMITTED = 1;
+    
+    public static final int READY = 2;
+
+    public static final int QUEUED = 3;
+
+    public static final int INEXEC = 4;
+
+    public static final int SUCCESS = 5;
+
+    public static final int FAILED = 6;
+
+    public static final int CANCELED = 7;
+
+    public static final int PAUSED = 8;
+
+    public static final int RESUMED = 9;
+
+    public static final int FAILED_RESOURCE_UNAVAILABLE = 10;
 
 }

DCWoRMS/trunk/src/gridsim/gssim/filter/ExecTaskFilter.java

@@ -1 +1 @@
 package gridsim.gssim.filter;
 
-import schedframe.scheduling.tasks.SubmittedTask;
 import eduni.simjava.Sim_event;
 import gridsim.filter.FilterResult;
+import gssim.schedframe.scheduling.Executable;
 
 /**
@@ -9 +9 @@
  *
  */
-public class SubTaskFilter extends FilterResult {
+public class ExecTaskFilter extends FilterResult {
 
-        public SubTaskFilter(int gridletID, int tag) {
+        public ExecTaskFilter(int gridletID, int tag) {
                 super(gridletID, tag);
         }
@@ -27 +27 @@
                                 Object obj = ev.get_data();
 
-                                if (obj instanceof SubmittedTask) {
+                                if (obj instanceof Executable) {
 
-                                        SubmittedTask subTask = (SubmittedTask) obj;
+                                        Executable exec = (Executable) obj;
 
-                                        if (subTask.getGridletID() == eventID_) {
+                                        if (exec.getUniqueId() == eventID_) {
                                                 result = true;
                                         }