Changeset 129 for xssim/trunk

Timestamp:

03/15/12 11:14:52 (13 years ago)

Author:

wojtekp

Message:

 

Location:

xssim/trunk/src/example/localplugin

Files:

• BaseLocalPlugin.java (modified) (1 diff)
• FCFSClusterLocalPlugin.java (modified) (4 diffs)
• FCFSLocalPlugin.java (deleted)
• FCFS_EBFLocalPlugin.java (deleted)
• LCFSLocalPlugin.java (deleted)
• LCFS_EBFLocalPlugin.java (deleted)
• LJF_EBFLocalPlugin.java (deleted)
• SJF_EBFLocalPlugin.java (deleted)

xssim/trunk/src/example/localplugin/BaseLocalPlugin.java

@@ -89 +89 @@
         }
         
+        public void addToSchedulingPlan(SchedulingPlanNew plan, TaskInterface<?> task){
+                
+                AllocationNew allocation = new AllocationNew();
+                allocation.setProcessesCount(1);
+                allocation.setProviderName(null);
+                
+                ScheduledTaskNew scheduledTask = new ScheduledTaskNew(task);
+                scheduledTask.setTaskId(task.getId());
+                scheduledTask.setJobId(task.getJobId());
+                scheduledTask.addAllocation(allocation);                
+                
+                plan.addTask(scheduledTask);
+        }
 
 }

xssim/trunk/src/example/localplugin/FCFSClusterLocalPlugin.java

@@ -62 +62 @@
 
                                         SubmittedTask subTask = (SubmittedTask) task;
-                                        Map<ResourceParameterName, ResourceUnit> choosenResources = null;
-                                        choosenResources = chooseResourcesForExecution(resourceManager, subTask);
-                                        //String provname = chooseProviderForExecution(resourceManager);
+                                        
+                                        /****************3 ways to schedule task****************/
+                                        
+                                        //1. Choosing particular resources to perform execution
+                                        Map<ResourceParameterName, ResourceUnit> choosenResources = chooseResourcesForExecution(resourceManager, subTask);
                                         if (choosenResources != null) {
                                                 addToSchedulingPlan(plan, task, choosenResources);
                                         }
+                                        
+                                        //2. Choosing resource scheduler/provider to submit task.  If the given resource doesn't contains/isn't 
+                                        //a scheduler, random resources from the given resource will be chosen in order to perform execution
+                                        /*String provName = chooseProviderForExecution(resourceManager);
+                                        if (provName != null) {
+                                                addToSchedulingPlan(plan, task, provName);
+                                        }*/
+
+                                        //3. Scheduler will choose random resources to perform execution
+                                        //addToSchedulingPlan(plan, task);
 
                                 }
@@ -77 +89 @@
         }
 
-        public HashMap<ResourceParameterName, ResourceUnit> chooseResourcesForExecution(
+        private HashMap<ResourceParameterName, ResourceUnit> chooseResourcesForExecution(
                         ClusterResourceManager resourceManager, ExecTaskInterface task) {
 
@@ -140 +152 @@
         }
 
+        private String chooseProviderForExecution(ResourceManagerInterface unitsManager) {
+                List<ComputingResource> processingElements;
+                Properties properties = new Properties();
+                properties.setProperty("type", ResourceType.COMPUTING_NODE.toString());
+                // properties.setProperty("status", ResourceStatus.FREE.toString());
+                processingElements = (List<ComputingResource>) unitsManager.filterResources(properties);
+                return processingElements.get(0).getName();
+        }
+
         public String getName() {
                 return getClass().getName();
@@ -148 +169 @@
         }
 
-        public String chooseProviderForExecution(ResourceManagerInterface unitsManager) {
-                List<ComputingResource> processingElements;
-                Properties properties = new Properties();
-                properties.setProperty("type", ResourceType.COMPUTING_NODE.toString());
-                // properties.setProperty("status", ResourceStatus.FREE.toString());
-                processingElements = (List<ComputingResource>) unitsManager.filterResources(properties);
-                return processingElements.get(0).getName();
-        }
-
 }