[Gridsim-commits] SF.net SVN: gridsim: [173] branches/gridsim4.0-branch3/source/gridsim/turbo

[<mar...@us...>]

Revision: 173
          http://gridsim.svn.sourceforge.net/gridsim/?rev=173&view=rev
Author:   marcos_dias
Date:     2008-05-10 17:55:20 -0700 (Sat, 10 May 2008)

Log Message:
-----------
Just a small fix in case the user does not want to specify an heuristic to order jobs in multiple partition policies.

Modified Paths:
--------------
    branches/gridsim4.0-branch3/source/gridsim/turbo/CBMultiplePartitions.java
    branches/gridsim4.0-branch3/source/gridsim/turbo/EBMultiplePartitions.java

Modified: branches/gridsim4.0-branch3/source/gridsim/turbo/CBMultiplePartitions.java
===================================================================
--- branches/gridsim4.0-branch3/source/gridsim/turbo/CBMultiplePartitions.java	2008-05-08 07:44:14 UTC (rev 172)
+++ branches/gridsim4.0-branch3/source/gridsim/turbo/CBMultiplePartitions.java	2008-05-11 00:55:20 UTC (rev 173)
@@ -511,7 +511,8 @@
     	
         // iterates the waiting queue and for each gridlet, put the ranges
         // used back in the profile. That is, updates the entries
-    	Collections.sort(queuedGridlets_, jobOrderHeuristic_);
+    	if(jobOrderHeuristic_ != null)
+    		Collections.sort(queuedGridlets_, jobOrderHeuristic_);
     	
     	Iterator<SSGridlet> iterQueue = queuedGridlets_.iterator();
         while(iterQueue.hasNext()) {

Modified: branches/gridsim4.0-branch3/source/gridsim/turbo/EBMultiplePartitions.java
===================================================================
--- branches/gridsim4.0-branch3/source/gridsim/turbo/EBMultiplePartitions.java	2008-05-08 07:44:14 UTC (rev 172)
+++ branches/gridsim4.0-branch3/source/gridsim/turbo/EBMultiplePartitions.java	2008-05-11 00:55:20 UTC (rev 173)
@@ -20,7 +20,6 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
-import java.util.LinkedList;
 
 /**
  * This class implements a non-FCFS policy to schedule parallel jobs. The
@@ -76,7 +75,7 @@
 public class EBMultiplePartitions extends TAllocPolicy {
 	
     // Queue of running Gridlets
-    protected LinkedList<SSGridlet> runningGridlets_;
+    protected ArrayList<SSGridlet> runningGridlets_;
 
 	// Queue of Gridlets waiting in this queue
     protected ArrayList<SSGridlet> queuedGridlets_;
@@ -156,7 +155,7 @@
         }
         
         // initialises local data structure
-        runningGridlets_ = new LinkedList<SSGridlet>();
+        runningGridlets_ = new ArrayList<SSGridlet>();
         queuedGridlets_ = new ArrayList<SSGridlet>();
         jobOrderHeuristic_ = new OrderGridletsByPriority();
         numPartitions_ = numPartitions;
@@ -1039,7 +1038,8 @@
     	}
     	
     	// order gridlets according to the job ordering heuristic provided
-    	Collections.sort(queuedGridlets_, jobOrderHeuristic_);
+    	if(jobOrderHeuristic_ != null)
+    		Collections.sort(queuedGridlets_, jobOrderHeuristic_);
     	
     	// Start the execution of Gridlets that are queued and whose
     	// potential start execution time is smaller than reference time


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.