StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace sync.Mutex with Sync.Map" into main

Browse Source
This commit is contained in:
Spandan Das
2023-08-31 16:48:14 +00:00
committed by Gerrit Code Review
parent 1e218403e0 43dfeb6d10
commit 854865736e
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/proto.go
View File

@@ -350,13 +350,12 @@ type PkgPathInterface interface {
var ( var (
protoIncludeDirGeneratedSuffix = ".include_dir_bp2build_generated_proto" protoIncludeDirGeneratedSuffix = ".include_dir_bp2build_generated_proto"
protoIncludeDirsBp2buildKey = NewOnceKey("protoIncludeDirsBp2build") protoIncludeDirsBp2buildKey = NewOnceKey("protoIncludeDirsBp2build")
protoIncludeDirsBp2buildLock sync.Mutex
) )
func getProtoIncludeDirsBp2build(config Config) *map[protoIncludeDirKey]bool { func getProtoIncludeDirsBp2build(config Config) *sync.Map {
return config.Once(protoIncludeDirsBp2buildKey, func() interface{} { return config.Once(protoIncludeDirsBp2buildKey, func() interface{} {
return &map[protoIncludeDirKey]bool{} return &sync.Map{}
}).(*map[protoIncludeDirKey]bool) }).(*sync.Map)
} }
// key for dynamically creating proto_library per proto.include_dirs // key for dynamically creating proto_library per proto.include_dirs
@@ -370,9 +369,6 @@ type protoIncludeDirKey struct {
// might create the targets in a subdirectory of `includeDir` // might create the targets in a subdirectory of `includeDir`
// Returns the labels of the proto_library targets // Returns the labels of the proto_library targets
func createProtoLibraryTargetsForIncludeDirs(ctx Bp2buildMutatorContext, includeDirs []string) bazel.LabelList { func createProtoLibraryTargetsForIncludeDirs(ctx Bp2buildMutatorContext, includeDirs []string) bazel.LabelList {
protoIncludeDirsBp2buildLock.Lock()
defer protoIncludeDirsBp2buildLock.Unlock()
var ret bazel.LabelList var ret bazel.LabelList
for _, dir := range includeDirs { for _, dir := range includeDirs {
if exists, _, _ := ctx.Config().fs.Exists(filepath.Join(dir, "Android.bp")); !exists { if exists, _, _ := ctx.Config().fs.Exists(filepath.Join(dir, "Android.bp")); !exists {
@@ -389,11 +385,10 @@ func createProtoLibraryTargetsForIncludeDirs(ctx Bp2buildMutatorContext, include
Label: "//" + pkg + ":" + label, Label: "//" + pkg + ":" + label,
}) })
key := protoIncludeDirKey{dir: dir, subpackgeInDir: pkg} key := protoIncludeDirKey{dir: dir, subpackgeInDir: pkg}
if _, exists := (*dirMap)[key]; exists { if _, exists := dirMap.LoadOrStore(key, true); exists {
// A proto_library has already been created for this package relative to this include dir // A proto_library has already been created for this package relative to this include dir
continue continue
} }
(*dirMap)[key] = true
srcs := protoLabelelsPartitionedByPkg[pkg] srcs := protoLabelelsPartitionedByPkg[pkg]
rel, err := filepath.Rel(dir, pkg) rel, err := filepath.Rel(dir, pkg)
if err != nil { if err != nil {