From 33317f3f3a4dd0668c3c15d0cfb8ecfa85439c68 Mon Sep 17 00:00:00 2001
From: dpturnbull <dpturnbu@uncc.edu>
Date: Fri, 23 Nov 2012 17:41:14 -0500
Subject: [PATCH] more thread testing code

---
 NextFit.java | 14 ++++++++------
 jobs40.txt   | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 jobs40.txt

diff --git a/NextFit.java b/NextFit.java
index c27c180..1adee76 100644
--- a/NextFit.java
+++ b/NextFit.java
@@ -95,8 +95,8 @@ class NextFit implements baseAlgorithm
 					memTable[currentPosition][3] = jobSize-1;
 					memTable[currentPosition][4] = memTable[0][3]-memTable[0][2]+1;
 					memTable[currentPosition][5] = 1;
-					Job newJob = new Job(jobTime, jobId, jobSize, memTable[s1][2], deallocateMethod, this);
-					fillMemory(jobId, jobSize, memTable[s1][2]);
+					Job newJob = new Job(jobTime, jobId, jobSize, memTable[currentPosition][2], deallocateMethod, this);
+					fillMemory(jobId, jobSize, memTable[currentPosition][2]);
 					jobArray[jobId - 1] = newJob;
 					newJob.start();
 					memTable[currentPosition+1][0] = 0;
@@ -123,8 +123,8 @@ class NextFit implements baseAlgorithm
 					memTable[currentPosition][3] = jobSize+memTable[currentPosition][2]-1;
 					memTable[currentPosition][4] = memTable[currentPosition][3]-memTable[currentPosition][2]+1;
 					memTable[currentPosition][5] = 1;
-					Job newJob = new Job(jobTime, jobId, jobSize, memTable[s1][2], deallocateMethod, this);
-					fillMemory(jobId, jobSize, memTable[s1][2]);
+					Job newJob = new Job(jobTime, jobId, jobSize, memTable[currentPosition][2], deallocateMethod, this);
+					fillMemory(jobId, jobSize, memTable[currentPosition][2]);
 					jobArray[jobId - 1] = newJob;
 					newJob.start();
 					memTable[currentPosition+1][0] = 0;
@@ -149,8 +149,8 @@ class NextFit implements baseAlgorithm
 				memTable[currentPosition][0] = jobId;
 				memTable[currentPosition][1] = jobSize;
 				memTable[currentPosition][5] = 1;
-				Job newJob = new Job(jobTime, jobId, jobSize, memTable[s1][2], deallocateMethod, this);
-				fillMemory(jobId, jobSize, memTable[s1][2]);
+				Job newJob = new Job(jobTime, jobId, jobSize, memTable[currentPosition][2], deallocateMethod, this);
+				fillMemory(jobId, jobSize, memTable[currentPosition][2]);
 				jobArray[jobId - 1] = newJob;
 				newJob.start();
 				currentPosition++;
@@ -293,6 +293,7 @@ class NextFit implements baseAlgorithm
 		}
 		tableEntries=tableEntries-s1;
 		
+		synchronized(memTable){
 		if(memTable[tableEntries-2][5]==0 && memTable[tableEntries-1][5]==-1)
 		{
 			memTable[tableEntries-2][3]=memTable[tableEntries-1][3];
@@ -300,6 +301,7 @@ class NextFit implements baseAlgorithm
 			memTable[tableEntries-2][5]=-1;
 			tableEntries--;
 		}
+		}
 	}
 	
 	//this method fills the memory location with the data
diff --git a/jobs40.txt b/jobs40.txt
new file mode 100644
index 0000000..234db10
--- /dev/null
+++ b/jobs40.txt
@@ -0,0 +1,40 @@
+2,1029
+7,364
+6,3704
+3,1966
+2,1644
+8,4967
+8,4719
+7,1022
+6,4983
+2,3439
+2,1330
+8,2701
+9,1963
+10,1615
+2,1919
+1,1853
+5,2029
+1,835
+5,4555
+7,876
+1,581
+8,3074
+5,1937
+2,1874
+3,3942
+10,2605
+8,2643
+10,2648
+3,2724
+4,4525
+2,3590
+3,5034
+1,1196
+6,3967
+3,1146
+6,4342
+9,1231
+6,1547
+9,3207
+3,4139