Changeset 481 for DCWoRMS/trunk/src/schedframe/resources/computing

Timestamp:

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

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/schedframe/resources/computing

Files:

• ComputingResource.java (modified) (2 diffs)
• ResourceFactory.java (modified) (3 diffs)

DCWoRMS/trunk/src/schedframe/resources/computing/ComputingResource.java

@@ -2 +2 @@
 
 import gridsim.GridSimTags;
-import gridsim.gssim.WormsTags;
+import gridsim.gssim.DCWormsTags;
 
 import java.util.ArrayList;
@@ -275 +275 @@
                         if(scheduler != null && (parent != null && scheduler != parent.getScheduler())/*scheduler.getResources().contains(this)*/){
                                 String src = event.getSource() != null ? event.getSource() : name;
-                                scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, WormsTags.UPDATE, src);
+                                scheduler.sendInternal(GridSimTags.SCHEDULE_NOW, DCWormsTags.UPDATE, src);
                         } else if(parent != null)
                                 parent.getEventHandler().handleSchedulingEvent(event);

DCWoRMS/trunk/src/schedframe/resources/computing/ResourceFactory.java

@@ -11 +11 @@
 import schedframe.scheduling.policy.local.LocalManagementSystem;
 import schedframe.scheduling.queue.TaskQueueList;
-import simulator.WormsConstants;
+import simulator.DCWormsConstants;
 
 
@@ -46 +46 @@
                         }
                         case LS: {
-                                ms = new LocalManagementSystem(id, WormsConstants.MANAGEMENT_SYSTEM,
+                                ms = new LocalManagementSystem(id, DCWormsConstants.MANAGEMENT_SYSTEM,
                                                 schedulingPlugin, execTimeEstimationPlugin, queues);
                                 return new Scheduler(ms, type, managedResources);
@@ -52 +52 @@
 
                 default:{
-                                ms = new LocalManagementSystem(id, WormsConstants.MANAGEMENT_SYSTEM,
+                                ms = new LocalManagementSystem(id, DCWormsConstants.MANAGEMENT_SYSTEM,
                                                 schedulingPlugin, execTimeEstimationPlugin, queues);
                                 return new Scheduler(ms, type, managedResources);