Made discipline test more robust against weirdness.

Also split out Job Attrs by type.

Author: danslimmon

discipline.go

@@ -15,6 +15,8 @@ type OneToOneFIFODiscipline struct {
 	Processors []*Processor
 }
 
+// AssignQueueToProcessor assigns a given Queue to a given Processor. That
+// Processor pull Jobs from that Queue, and only from that Queue.
 func (d *OneToOneFIFODiscipline) AssignQueueToProcessor(q *Queue, p *Processor) {
 	cbAfterFinish := func(cbProc *Processor, cbJob *Job) {
 		var j *Job

discipline_test.go

@@ -14,15 +14,31 @@ func TestOneToOneFIFODiscipline(t *testing.T) {
 
 	for i = 0; i < 3; i++ {
 		queues = append(queues, NewQueue())
+		queues[i].QueueId = i
 		procs = append(procs, NewProcessor(simplePtg))
+		procs[i].ProcessorId = i
+
+		// Make sure that Processors only pull work from their own queues.
+		procs[i].BeforeStart(func(p *Processor, j *Job) {
+			var queueId int
+			queueId = j.IntAttrs["queue_id"]
+			if queueId != p.ProcessorId {
+				t.Log("Processor", p.ProcessorId, "pulled a Job from Queue", queueId)
+				t.Fail()
+			}
+		})
 	}
 	NewOneToOneFIFODiscipline(queues, procs)
 
 	for i = 0; i < 3; i++ {
-		procs[i].Start(NewJob(0))
+		j = NewJob(0)
+		j.IntAttrs["queue_id"] = i
+		procs[i].Start(j)
 	}
 	for i = 0; i < 6; i++ {
-		queues[i%3].Append(NewJob(0))
+		j = NewJob(0)
+		j.IntAttrs["queue_id"] = i % 3
+		queues[i%3].Append(j)
 	}
 
 	j = queues[2].Jobs[0]
@@ -35,16 +51,4 @@ func TestOneToOneFIFODiscipline(t *testing.T) {
 		t.Log("A Job should've been shifted out of the Queue, but Queue is still the same length as before")
 		t.Fail()
 	}
-
-	// Make sure that Processors only pull work from their own Queue
-	procs[2].Finish()
-	procs[2].Finish()
-	if !procs[2].IsIdle() {
-		t.Log("Processor is not idle, but it shouldn't have had any more work in its queue")
-		t.Fail()
-	}
-	if queues[2].Length() != 0 {
-		t.Log("Processor finished all work in its Queue, but the Queue isn't empty")
-		t.Fail()
-	}
 }

job.go

@@ -11,9 +11,14 @@ type Job struct {
 	JobId int64
 	// The time the Job arrived in the system.
 	ArrTime int
-	// Attrs contains user-defined, string-valued job attributes. One would use
-	// this if the behavior of jobs in the system isn't uniform.
-	Attrs map[string]string
+	// IntAttrs contains user-defined, int-valued job attributes. You can use
+	// this feature for testing, or for debugging, or for changing the behavior
+	// of the system for particular types of jobs.
+	IntAttrs map[string]int
+	// StrAttrs contains user-defined, str-valued job attributes. You can use
+	// this feature for testing, or for debugging, or for changing the behavior
+	// of the system for particular types of jobs.
+	StrAttrs map[string]string
 }
 
 // NewJob creates a new... wait for it... Job.
@@ -24,7 +29,8 @@ type Job struct {
 // is expected to seed the PRNG if necessary..
 func NewJob(arrTime int) (j *Job) {
 	j = new(Job)
-	j.Attrs = make(map[string]string)
+	j.IntAttrs = make(map[string]int)
+	j.StrAttrs = make(map[string]string)
 	j.JobId = rand.Int63()
 	j.ArrTime = arrTime
 	return j

queue_test.go

@@ -1,7 +1,6 @@
 package qsim
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -14,15 +13,15 @@ func TestQueueAppend(t *testing.T) {
 
 	for i := 0; i < 20; i++ {
 		j = NewJob(0)
-		j.Attrs["i"] = fmt.Sprintf("%d", i)
+		j.IntAttrs["i"] = i
 		q.Append(j)
 	}
 
-	if q.Jobs[0].Attrs["i"] != "0" {
+	if q.Jobs[0].IntAttrs["i"] != 0 {
 		t.Log("Zeroeth element not found at index 0")
 		t.Fail()
 	}
-	if q.Jobs[19].Attrs["i"] != "19" {
+	if q.Jobs[19].IntAttrs["i"] != 19 {
 		t.Log("Nineteenth element not found at index 19")
 		t.Fail()
 	}
@@ -40,15 +39,15 @@ func TestQueueShift(t *testing.T) {
 	q = NewQueue()
 
 	j0 = NewJob(0)
-	j0.Attrs["i"] = "0"
+	j0.IntAttrs["i"] = 0
 	q.Append(j0)
 
 	j1 = NewJob(0)
-	j1.Attrs["i"] = "1"
+	j1.IntAttrs["i"] = 1
 	q.Append(j1)
 
 	j, nrem = q.Shift()
-	if j.Attrs["i"] != "0" {
+	if j.IntAttrs["i"] != 0 {
 		t.Log("Zeroeth element was not the first to be shifted")
 		t.Fail()
 	}
@@ -58,7 +57,7 @@ func TestQueueShift(t *testing.T) {
 	}
 
 	j, nrem = q.Shift()
-	if j.Attrs["i"] != "1" {
+	if j.IntAttrs["i"] != 1 {
 		t.Log("Last element was not the last to be shifted")
 		t.Fail()
 	}
@@ -81,18 +80,18 @@ func TestQueueBeforeAppend(t *testing.T) {
 	var j *Job
 	q = NewQueue()
 
-	var counter string
+	var counter int
 	var qLen int
 	cb := func(q *Queue, j *Job) {
-		counter = j.Attrs["i"]
+		counter = j.IntAttrs["i"]
 		qLen = len(q.Jobs)
 	}
 	q.BeforeAppend(cb)
 
 	j = NewJob(0)
-	j.Attrs["i"] = "0"
+	j.IntAttrs["i"] = 0
 	q.Append(j)
-	if counter != "0" {
+	if counter != 0 {
 		t.Log("Expected BeforeAppend callback to set counter=0")
 		t.Fail()
 	}
@@ -102,9 +101,9 @@ func TestQueueBeforeAppend(t *testing.T) {
 	}
 
 	j = NewJob(0)
-	j.Attrs["i"] = "1"
+	j.IntAttrs["i"] = 1
 	q.Append(j)
-	if counter != "1" {
+	if counter != 1 {
 		t.Log("Expected BeforeAppend callback to set counter=1")
 		t.Fail()
 	}
@@ -121,18 +120,18 @@ func TestQueueAfterAppend(t *testing.T) {
 	var j *Job
 	q = NewQueue()
 
-	var counter string
+	var counter int
 	var qLen int
 	cb := func(q *Queue, j *Job) {
-		counter = j.Attrs["i"]
+		counter = j.IntAttrs["i"]
 		qLen = len(q.Jobs)
 	}
 	q.AfterAppend(cb)
 
 	j = NewJob(0)
-	j.Attrs["i"] = "0"
+	j.IntAttrs["i"] = 0
 	q.Append(j)
-	if counter != "0" {
+	if counter != 0 {
 		t.Log("Expected AfterAppend callback to set counter=0")
 		t.Fail()
 	}
@@ -142,9 +141,9 @@ func TestQueueAfterAppend(t *testing.T) {
 	}
 
 	j = NewJob(0)
-	j.Attrs["i"] = "1"
+	j.IntAttrs["i"] = 1
 	q.Append(j)
-	if counter != "1" {
+	if counter != 1 {
 		t.Log("Expected AfterAppend callback to set counter=1")
 		t.Fail()
 	}
@@ -161,27 +160,27 @@ func TestQueueBeforeShift(t *testing.T) {
 	var j *Job
 	q = NewQueue()
 
-	var counter string
+	var counter int
 	var qLen int
 	cb := func(q *Queue, j *Job) {
 		if j != nil {
-			counter = j.Attrs["i"]
+			counter = j.IntAttrs["i"]
 		} else {
-			counter = "queue_was_empty"
+			counter = -1
 		}
 		qLen = len(q.Jobs)
 	}
 	q.BeforeShift(cb)
 
 	j = NewJob(0)
-	j.Attrs["i"] = "0"
+	j.IntAttrs["i"] = 0
 	q.Append(j)
 	j = NewJob(0)
-	j.Attrs["i"] = "1"
+	j.IntAttrs["i"] = 1
 	q.Append(j)
 
 	q.Shift()
-	if counter != "0" {
+	if counter != 0 {
 		t.Log("Expected BeforeShift callback to set counter=0")
 		t.Fail()
 	}
@@ -191,7 +190,7 @@ func TestQueueBeforeShift(t *testing.T) {
 	}
 
 	q.Shift()
-	if counter != "1" {
+	if counter != 1 {
 		t.Log("Expected BeforeShift callback to set counter=1")
 		t.Fail()
 	}
@@ -201,8 +200,8 @@ func TestQueueBeforeShift(t *testing.T) {
 	}
 
 	q.Shift()
-	if counter != "queue_was_empty" {
-		t.Log("Expected BeforeShift callback to set counter=queue_was_empty")
+	if counter != -1 {
+		t.Log("Expected BeforeShift callback to set counter=-1")
 		t.Fail()
 	}
 	if qLen != 0 {
@@ -218,27 +217,27 @@ func TestQueueAfterShift(t *testing.T) {
 	var j *Job
 	q = NewQueue()
 
-	var counter string
+	var counter int
 	var qLen int
 	cb := func(q *Queue, j *Job) {
 		if j != nil {
-			counter = j.Attrs["i"]
+			counter = j.IntAttrs["i"]
 		} else {
-			counter = "queue_was_empty"
+			counter = -1
 		}
 		qLen = len(q.Jobs)
 	}
 	q.AfterShift(cb)
 
 	j = NewJob(0)
-	j.Attrs["i"] = "0"
+	j.IntAttrs["i"] = 0
 	q.Append(j)
 	j = NewJob(0)
-	j.Attrs["i"] = "1"
+	j.IntAttrs["i"] = 1
 	q.Append(j)
 
 	q.Shift()
-	if counter != "0" {
+	if counter != 0 {
 		t.Log("Expected AfterShift callback to set counter=0")
 		t.Fail()
 	}
@@ -248,7 +247,7 @@ func TestQueueAfterShift(t *testing.T) {
 	}
 
 	q.Shift()
-	if counter != "1" {
+	if counter != 1 {
 		t.Log("Expected AfterShift callback to set counter=1")
 		t.Fail()
 	}
@@ -258,8 +257,8 @@ func TestQueueAfterShift(t *testing.T) {
 	}
 
 	q.Shift()
-	if counter != "queue_was_empty" {
-		t.Log("Expected AfterShift callback to set counter=queue_was_empty")
+	if counter != -1 {
+		t.Log("Expected AfterShift callback to set counter=-1")
 		t.Fail()
 	}
 	if qLen != 0 {