Changeset 1415 for DCWoRMS/branches/coolemall/src/schedframe/events/scheduling

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/events/scheduling

Files:

• ResourceStateChangedEvent.java (modified) (1 diff)
• SchedulingEvent.java (modified) (3 diffs)
• SchedulingEventCommand.java (modified) (2 diffs)
• SchedulingEventType.java (modified) (1 diff)
• SchedulingResponseType.java (deleted)
• TaskCanceledEvent.java (modified) (1 diff)
• TaskPausedEvent.java (added)
• TaskResumedEvent.java (added)

DCWoRMS/branches/coolemall/src/schedframe/events/scheduling/ResourceStateChangedEvent.java

@@ -1 +1 @@
 package schedframe.events.scheduling;
 
-import schedframe.events.EventType;
+import schedframe.resources.computing.profiles.energy.ResourceEventType;
 
-public class ResourceStateChangedEvent  extends SchedulingEvent {
+public class ResourceStateChangedEvent extends SchedulingEvent {
 
-        protected String resourceName;
-        protected EventType eventType;
+        protected ResourceEventType eventType;
         
-        public ResourceStateChangedEvent(String resourceName, EventType eventType) {
+        public ResourceStateChangedEvent(ResourceEventType eventType) {
                 super(SchedulingEventType.RESOURCE_STATE_CHANGED);
-                this.resourceName = resourceName;
                 this.eventType = eventType;
         }
 
-        public String getResourceName() {
-                return resourceName;
-        }
 
-        public EventType getEventType() {
+        public ResourceEventType getResourceEventType() {
                 return eventType;
         }

DCWoRMS/branches/coolemall/src/schedframe/events/scheduling/SchedulingEvent.java

@@ -2 +2 @@
 
 import schedframe.events.Event;
+import schedframe.events.EventReason;
 import schedframe.events.EventType;
 
@@ -25 +26 @@
                         schedEventType = (SchedulingEventType)type;
                 } catch(Exception e){
-                        schedEventType = SchedulingEventType.RESOURCE_STATE_CHANGED;
+                        schedEventType = null;
                 }
                 return schedEventType;
@@ -42 +43 @@
         }
 
-        public int getTag() {
-                return type.getTag();
-        }
-
         public Object getData() {
                 return null;

DCWoRMS/branches/coolemall/src/schedframe/events/scheduling/SchedulingEventCommand.java

@@ -1 +1 @@
 package schedframe.events.scheduling;
 
-import schedframe.events.Event;
 import schedframe.events.EventCommand;
 import schedframe.resources.computing.ComputingResource;
+import schedframe.resources.computing.profiles.energy.ResourceEvent;
 
 public class SchedulingEventCommand implements EventCommand {
@@ -13 +13 @@
         }
         
-        public void execute(Event event) {
-                SchedulingEvent ev = new ResourceStateChangedEvent(compResource.getFullName(), event.getType());
+        public void execute(ResourceEvent event) {
+                SchedulingEvent ev = new ResourceStateChangedEvent(event.getType());
                 ev.setSource(compResource.getFullName());
                 compResource.getEventHandler().handleSchedulingEvent(ev);

DCWoRMS/branches/coolemall/src/schedframe/events/scheduling/SchedulingEventType.java

@@ -6 +6 @@
 
         // task related
-        TASK_FINISHED(1),
-        TASK_FAILED(2),
-        TASK_CANCELED(4),
-        TASK_ARRIVED(8),
-        TASK_PAUSED(16),
-        TASK_RESUMED(32),
-        TASK_MOVED(64),
-        START_TASK_EXECUTION(128),
-        TASK_REQUESTED_TIME_EXPIRED(256),
+        TASK_FINISHED,
+        TASK_FAILED,
+        TASK_CANCELED,
+        TASK_ARRIVED,
+        TASK_PAUSED,
+        TASK_RESUMED,
+        TASK_MOVED,
+        TASK_EXECUTION_CHANGED,
+        START_TASK_EXECUTION,
+        TASK_REQUESTED_TIME_EXPIRED,
 
         //job related
-        JOB_ARRIVED(512),
-        JOB_FINISHED(1024),
-        JOB_FAILED(2048),
-        JOB_CANCELED(4096),
+        JOB_ARRIVED,
+        JOB_FINISHED,
+        JOB_FAILED,
+        JOB_CANCELED,
 
         //time related
-        TIMER(8192),
+        TIMER,
+                
+        //resource related
+        RESOURCE_FAILED,
+        //provider related (relevant to grid scheduling)
+        PROVIDER_FAILED,
+
+        RESOURCE_STATE_CHANGED,
         
-        //reservation related
-        RESERVATION_ACTIVE(16384),
-        RESERVATION_FINISHED(32768),
-        RESERVATION_FAILED(65536),
-        RESERVATION_EXPIRED(131072),
-        
-        //resource related
-        RESOURCE_FAILED(262144),
-        //provider related (relevant to grid scheduling)
-        PROVIDER_FAILED(524288),
+        POWER_LIMIT_EXCEEDED;
 
-        RESOURCE_STATE_CHANGED(1048576),
-        
-        POWER_LIMIT_EXCEEDED(2097152)
-        ;
-        
-        protected int tag;
-        
-        private SchedulingEventType(int tag){
-                this.tag = tag;
-        }
-        
-        public int getTag(){
-                return this.tag;
-        }
         
         public String getName(){

DCWoRMS/branches/coolemall/src/schedframe/events/scheduling/TaskCanceledEvent.java

@@ -2 +2 @@
 
 import java.util.List;
+
+import schedframe.events.EventReason;