Rename alreadyFinished => newDep
diff --git a/exec.go b/exec.go
index 989643a..cfbd31f 100644
--- a/exec.go
+++ b/exec.go
@@ -153,7 +153,7 @@
} else {
Log("%s already done: %d", j.n.Output, j.outputTs)
if neededBy != nil {
- ex.wm.ReportAlreadyFinished(j, neededBy)
+ ex.wm.ReportNewDep(j, neededBy)
}
}
return nil
diff --git a/worker.go b/worker.go
index a38b1e7..7639964 100644
--- a/worker.go
+++ b/worker.go
@@ -31,7 +31,7 @@
w *Worker
}
-type AlreadyFinished struct {
+type NewDep struct {
j *Job
neededBy *Job
}
@@ -263,24 +263,24 @@
}
type WorkerManager struct {
- jobs []*Job
- jobChan chan *Job
- resultChan chan JobResult
- alreadyFinishedChan chan AlreadyFinished
- waitChan chan bool
- doneChan chan bool
- freeWorkers []*Worker
- busyWorkers map[*Worker]bool
+ jobs []*Job
+ jobChan chan *Job
+ resultChan chan JobResult
+ newDepChan chan NewDep
+ waitChan chan bool
+ doneChan chan bool
+ freeWorkers []*Worker
+ busyWorkers map[*Worker]bool
}
func NewWorkerManager() *WorkerManager {
wm := &WorkerManager{
- jobChan: make(chan *Job),
- resultChan: make(chan JobResult),
- alreadyFinishedChan: make(chan AlreadyFinished),
- waitChan: make(chan bool),
- doneChan: make(chan bool),
- busyWorkers: make(map[*Worker]bool),
+ jobChan: make(chan *Job),
+ resultChan: make(chan JobResult),
+ newDepChan: make(chan NewDep),
+ waitChan: make(chan bool),
+ doneChan: make(chan bool),
+ busyWorkers: make(map[*Worker]bool),
}
for i := 0; i < jobsFlag; i++ {
w := NewWorker(wm)
@@ -314,7 +314,7 @@
return false
}
-func (wm *WorkerManager) handleAlreadyFinished(j *Job, neededBy *Job) {
+func (wm *WorkerManager) handleNewDep(j *Job, neededBy *Job) {
if j.numDeps < 0 {
neededBy.numDeps--
} else {
@@ -333,8 +333,8 @@
delete(wm.busyWorkers, jr.w)
wm.freeWorkers = append(wm.freeWorkers, jr.w)
wm.updateParents(jr.j)
- case af := <-wm.alreadyFinishedChan:
- wm.handleAlreadyFinished(af.j, af.neededBy)
+ case af := <-wm.newDepChan:
+ wm.handleNewDep(af.j, af.neededBy)
case done = <-wm.waitChan:
}
wm.handleJobs()
@@ -357,8 +357,8 @@
wm.resultChan <- JobResult{w: w, j: j}
}
-func (wm *WorkerManager) ReportAlreadyFinished(j *Job, neededBy *Job) {
- wm.alreadyFinishedChan <- AlreadyFinished{j: j, neededBy: neededBy}
+func (wm *WorkerManager) ReportNewDep(j *Job, neededBy *Job) {
+ wm.newDepChan <- NewDep{j: j, neededBy: neededBy}
}
func (wm *WorkerManager) Wait() {
