Skip to content

Commit 5f13e53

Browse files
authored
Merge pull request #4738 from jedevc/remove-unneccessary-lock
solver: remove unneccessary solver lock
2 parents a90ed2b + af134b8 commit 5f13e53

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

solver/jobs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ func (jl *Solver) load(v, parent Vertex, j *Job) (Vertex, error) {
383383
return jl.loadUnlocked(v, parent, j, cache)
384384
}
385385

386+
// called with solver lock
386387
func (jl *Solver) loadUnlocked(v, parent Vertex, j *Job, cache map[Vertex]Vertex) (Vertex, error) {
387388
if v, ok := cache[v]; ok {
388389
return v, nil
@@ -589,8 +590,6 @@ func (j *Job) Build(ctx context.Context, e Edge) (CachedResultWithProvenance, er
589590
return nil, err
590591
}
591592

592-
j.list.mu.Lock()
593-
defer j.list.mu.Unlock()
594593
return &withProvenance{CachedResult: res, j: j, e: e}, nil
595594
}
596595

@@ -610,6 +609,7 @@ func (wp *withProvenance) WalkProvenance(ctx context.Context, f func(ProvenanceP
610609
return wp.j.walkProvenance(ctx, wp.e, f, m)
611610
}
612611

612+
// called with solver lock
613613
func (j *Job) walkProvenance(ctx context.Context, e Edge, f func(ProvenanceProvider) error, visited map[digest.Digest]struct{}) error {
614614
if _, ok := visited[e.Vertex.Digest()]; ok {
615615
return nil

0 commit comments

Comments
 (0)