feat: sealing: Put scheduler assign logic behind an interface

filecoin-project · May 23, 2022 · 9ac19cb · 9ac19cb
1 parent df98a2a
commit 9ac19cb
Show file tree

Hide file tree

Showing 13 changed files with 505 additions and 479 deletions.
diff --git a/extern/sector-storage/manager.go b/extern/sector-storage/manager.go
@@ -62,7 +62,7 @@ type Manager struct {
 	remoteHnd  *stores.FetchHandler
 	index      stores.SectorIndex
 
-	sched            *scheduler
+	sched            *Scheduler
 	windowPoStSched  *poStScheduler
 	winningPoStSched *poStScheduler
 

diff --git a/extern/sector-storage/request_queue.go b/extern/sector-storage/request_queue.go
@@ -2,42 +2,42 @@ package sectorstorage
 
 import "sort"
 
-type requestQueue []*workerRequest
+type RequestQueue []*WorkerRequest
 
-func (q requestQueue) Len() int { return len(q) }
+func (q RequestQueue) Len() int { return len(q) }
 
-func (q requestQueue) Less(i, j int) bool {
-	oneMuchLess, muchLess := q[i].taskType.MuchLess(q[j].taskType)
+func (q RequestQueue) Less(i, j int) bool {
+	oneMuchLess, muchLess := q[i].TaskType.MuchLess(q[j].TaskType)
 	if oneMuchLess {
 		return muchLess
 	}
 
-	if q[i].priority != q[j].priority {
-		return q[i].priority > q[j].priority
+	if q[i].Priority != q[j].Priority {
+		return q[i].Priority > q[j].Priority
 	}
 
-	if q[i].taskType != q[j].taskType {
-		return q[i].taskType.Less(q[j].taskType)
+	if q[i].TaskType != q[j].TaskType {
+		return q[i].TaskType.Less(q[j].TaskType)
 	}
 
-	return q[i].sector.ID.Number < q[j].sector.ID.Number // optimize minerActor.NewSectors bitfield
+	return q[i].Sector.ID.Number < q[j].Sector.ID.Number // optimize minerActor.NewSectors bitfield
 }
 
-func (q requestQueue) Swap(i, j int) {
+func (q RequestQueue) Swap(i, j int) {
 	q[i], q[j] = q[j], q[i]
 	q[i].index = i
 	q[j].index = j
 }
 
-func (q *requestQueue) Push(x *workerRequest) {
+func (q *RequestQueue) Push(x *WorkerRequest) {
 	n := len(*q)
 	item := x
 	item.index = n
 	*q = append(*q, item)
 	sort.Sort(q)
 }
 
-func (q *requestQueue) Remove(i int) *workerRequest {
+func (q *RequestQueue) Remove(i int) *WorkerRequest {
 	old := *q
 	n := len(old)
 	item := old[i]

diff --git a/extern/sector-storage/request_queue_test.go b/extern/sector-storage/request_queue_test.go
@@ -8,21 +8,21 @@ import (
 )
 
 func TestRequestQueue(t *testing.T) {
-	rq := &requestQueue{}
+	rq := &RequestQueue{}
 
-	rq.Push(&workerRequest{taskType: sealtasks.TTAddPiece})
-	rq.Push(&workerRequest{taskType: sealtasks.TTPreCommit1})
-	rq.Push(&workerRequest{taskType: sealtasks.TTPreCommit2})
-	rq.Push(&workerRequest{taskType: sealtasks.TTPreCommit1})
-	rq.Push(&workerRequest{taskType: sealtasks.TTAddPiece})
+	rq.Push(&WorkerRequest{TaskType: sealtasks.TTAddPiece})
+	rq.Push(&WorkerRequest{TaskType: sealtasks.TTPreCommit1})
+	rq.Push(&WorkerRequest{TaskType: sealtasks.TTPreCommit2})
+	rq.Push(&WorkerRequest{TaskType: sealtasks.TTPreCommit1})
+	rq.Push(&WorkerRequest{TaskType: sealtasks.TTAddPiece})
 
 	dump := func(s string) {
 		fmt.Println("---")
 		fmt.Println(s)
 
 		for sqi := 0; sqi < rq.Len(); sqi++ {
 			task := (*rq)[sqi]
-			fmt.Println(sqi, task.taskType)
+			fmt.Println(sqi, task.TaskType)
 		}
 	}
 
@@ -32,31 +32,31 @@ func TestRequestQueue(t *testing.T) {
 
 	dump("pop 1")
 
-	if pt.taskType != sealtasks.TTPreCommit2 {
-		t.Error("expected precommit2, got", pt.taskType)
+	if pt.TaskType != sealtasks.TTPreCommit2 {
+		t.Error("expected precommit2, got", pt.TaskType)
 	}
 
 	pt = rq.Remove(0)
 
 	dump("pop 2")
 
-	if pt.taskType != sealtasks.TTPreCommit1 {
-		t.Error("expected precommit1, got", pt.taskType)
+	if pt.TaskType != sealtasks.TTPreCommit1 {
+		t.Error("expected precommit1, got", pt.TaskType)
 	}
 
 	pt = rq.Remove(1)
 
 	dump("pop 3")
 
-	if pt.taskType != sealtasks.TTAddPiece {
-		t.Error("expected addpiece, got", pt.taskType)
+	if pt.TaskType != sealtasks.TTAddPiece {
+		t.Error("expected addpiece, got", pt.TaskType)
 	}
 
 	pt = rq.Remove(0)
 
 	dump("pop 4")
 
-	if pt.taskType != sealtasks.TTPreCommit1 {
-		t.Error("expected precommit1, got", pt.taskType)
+	if pt.TaskType != sealtasks.TTPreCommit1 {
+		t.Error("expected precommit1, got", pt.TaskType)
 	}
 }