qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-10-01 01:38:33 -06:00
Code Releases Activity

internal/lsp: fix race condition in caching

Browse Source 
This change fixes a race condition in the metadata caching logic.
Also, some minor fixes to comments and invalidation logic (it's not
necessary to invalidate ASTs when a package is invalidated).

Change-Id: I927bf6fbc661a86ef0ba99b29a9ed979cd1eb95d
Reviewed-on: https://go-review.googlesource.com/c/tools/+/190317
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
Rebecca Stambler 2019-08-14 10:57:47 -04:00
parent 2adf828841
commit 60bb3025ec
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/lsp/cache/load.go vendored
View File

@ -229,10 +229,13 @@ func (v *view) link(ctx context.Context, g *importGraph) error {
log.Error(ctx, "not a Go file", nil, telemetry.File.Of(filename)) log.Error(ctx, "not a Go file", nil, telemetry.File.Of(filename))
continue continue
} }
// Cache the metadata for this file.
gof.mu.Lock()
if gof.meta == nil { if gof.meta == nil {
gof.meta = make(map[packageID]*metadata) gof.meta = make(map[packageID]*metadata)
} }
gof.meta[m.id] = m gof.meta[m.id] = m
gof.mu.Unlock()
} }
// Preserve the import graph. // Preserve the import graph.

5
internal/lsp/cache/parse.go vendored
View File

@ -14,6 +14,7 @@ import (
"golang.org/x/tools/internal/lsp/source" "golang.org/x/tools/internal/lsp/source"
"golang.org/x/tools/internal/lsp/telemetry" "golang.org/x/tools/internal/lsp/telemetry"
"golang.org/x/tools/internal/lsp/telemetry/log"
"golang.org/x/tools/internal/lsp/telemetry/trace" "golang.org/x/tools/internal/lsp/telemetry/trace"
"golang.org/x/tools/internal/memoize" "golang.org/x/tools/internal/memoize"
errors "golang.org/x/xerrors" errors "golang.org/x/xerrors"
@ -105,7 +106,7 @@ func parseGo(ctx context.Context, c *cache, fh source.FileHandle, mode source.Pa
ioLimit <- struct{}{} ioLimit <- struct{}{}
buf, _, err := fh.Read(ctx) buf, _, err := fh.Read(ctx)
<-ioLimit // Make sure to release the token, even when an error is returned. <-ioLimit
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -122,7 +123,7 @@ func parseGo(ctx context.Context, c *cache, fh source.FileHandle, mode source.Pa
// Fix any badly parsed parts of the AST. // Fix any badly parsed parts of the AST.
tok := c.fset.File(ast.Pos()) tok := c.fset.File(ast.Pos())
if err := fix(ctx, ast, tok, buf); err != nil { if err := fix(ctx, ast, tok, buf); err != nil {
// TODO: Do something with the error (need access to a logger in here). log.Error(ctx, "failed to fix AST", err)
} }
} }
if ast == nil { if ast == nil {

7
internal/lsp/cache/view.go vendored
View File

@ -409,13 +409,6 @@ func (v *view) remove(ctx context.Context, id packageID, seen map[packageID]stru
files: hashParseKeys(cph.Files()), files: hashParseKeys(cph.Files()),
config: hashConfig(cph.Config()), config: hashConfig(cph.Config()),
}) })
// Also, delete all of the cached ParseGoHandles.
for _, ph := range cph.Files() {
v.session.cache.store.Delete(parseKey{
file: ph.File().Identity(),
mode: ph.Mode(),
})
}
} }
delete(gof.pkgs, id) delete(gof.pkgs, id)
gof.mu.Unlock() gof.mu.Unlock()