Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: patch data race #869

Merged
merged 8 commits into from
Nov 17, 2022
Merged

fix: patch data race #869

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e8c71e
fix: protect global var with a sync.Once
evan-forbes Oct 10, 2022
2ebaff4
fix: use a mutex instead of sync.Once to allow for arbitrary swapping…
evan-forbes Oct 10, 2022
c569855
fix: implement and use GetEnvironment
rootulp Oct 14, 2022
f5c610e
fix: lint by disabling lll
rootulp Oct 14, 2022
efd68b9
Merge branch 'v0.34.x-celestia' into evan/patch-data-race
rootulp Nov 14, 2022
fda227f
fix: invoke GetEnvironment() once per function scope
rootulp Nov 14, 2022
412d50b
remove //nolint:lll
rootulp Nov 14, 2022
ebe58dc
make proto-gen
rootulp Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions rpc/core/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package core
import (
"encoding/base64"
"fmt"
"sync"
"time"

cfg "github.com/tendermint/tendermint/config"
Expand Down Expand Up @@ -35,12 +36,16 @@ const (

var (
// set by Node
mut = &sync.Mutex{}
env *Environment
)

// SetEnvironment sets up the given Environment.
// It will race if multiple Node call SetEnvironment.
// SetEnvironment sets up the given Environment. The env global var that this
// function modifies is protected by a sync.Once, so multiple calls within the
// same process will not be effective.
func SetEnvironment(e *Environment) {
mut.Lock()
defer mut.Unlock()
env = e
}

Expand Down Expand Up @@ -69,7 +74,7 @@ type peers interface {
Peers() p2p.IPeerSet
}

//----------------------------------------------
// ----------------------------------------------
// Environment contains objects and interfaces used by the RPC. It is expected
// to be setup once during startup.
type Environment struct {
Expand Down