Revert "abci: change client to use multi-reader mutexes (#6306)" (bac…

…kport #7106) (#7109)

abci/client/client.go

@@ -87,7 +87,7 @@ type ReqRes struct {
 	*types.Request
 	*types.Response // Not set atomically, so be sure to use WaitGroup.
 
-	mtx  tmsync.RWMutex
+	mtx  tmsync.Mutex
 	wg   *sync.WaitGroup
 	done bool             // Gets set to true once *after* WaitGroup.Done().
 	cb   ResponseCallback // A single callback that may be set.
@@ -107,24 +107,24 @@ func NewReqRes(req *types.Request, cb ResponseCallback) *ReqRes {
 // InvokeCallback invokes a thread-safe execution of the configured callback
 // if non-nil.
 func (reqRes *ReqRes) InvokeCallback() {
-	reqRes.mtx.RLock()
-	defer reqRes.mtx.RUnlock()
+	reqRes.mtx.Lock()
+	defer reqRes.mtx.Unlock()
 
 	if reqRes.cb != nil {
 		reqRes.cb(reqRes.Response)
 	}
 }
 
 func (reqRes *ReqRes) SetDone(res *types.Response) (set bool) {
-	reqRes.mtx.RLock()
+	reqRes.mtx.Lock()
 	// TODO should we panic if it's already done?
 	set = !reqRes.done
 	if set {
 		reqRes.Response = res
 		reqRes.done = true
 		reqRes.wg.Done()
 	}
-	reqRes.mtx.RUnlock()
+	reqRes.mtx.Unlock()
 
 	// NOTE `reqRes.cb` is immutable so we're safe to access it at here without `mtx`
 	if set && reqRes.cb != nil {

abci/client/grpc_client.go

@@ -26,11 +26,11 @@ type grpcClient struct {
 	client types.ABCIApplicationClient
 	conn   *grpc.ClientConn
 
-	mtx  tmsync.RWMutex
+	mtx  tmsync.Mutex
 	addr string
 	err  error
 
-	globalCbMtx sync.RWMutex
+	globalCbMtx sync.Mutex
 	globalCb    func(*types.Request, *types.Response) // listens to all callbacks
 }
 
@@ -109,8 +109,8 @@ func (cli *grpcClient) StopForError(err error) {
 }
 
 func (cli *grpcClient) Error() error {
-	cli.mtx.RLock()
-	defer cli.mtx.RUnlock()
+	cli.mtx.Lock()
+	defer cli.mtx.Unlock()
 	return cli.err
 }
 

abci/client/local_client.go

@@ -16,11 +16,11 @@ type localClient struct {
 	service.BaseService
 
 	// TODO: remove `mtx` to increase concurrency. We could remove it because the app should protect itself.
-	mtx *tmsync.RWMutex
+	mtx *tmsync.Mutex
 	// CONTRACT: The application should protect itself from concurrency as an abci server.
 	types.Application
 
-	globalCbMtx tmsync.RWMutex
+	globalCbMtx tmsync.Mutex
 	globalCb    GlobalCallback
 }
 
@@ -30,16 +30,14 @@ var _ Client = (*localClient)(nil)
 // methods of the given app.
 //
 // Both Async and Sync methods ignore the given context.Context parameter.
-func NewLocalClient(mtx *tmsync.RWMutex, app types.Application) Client {
+func NewLocalClient(mtx *tmsync.Mutex, app types.Application) Client {
 	if mtx == nil {
-		mtx = &tmsync.RWMutex{}
+		mtx = new(tmsync.Mutex)
 	}
-
 	cli := &localClient{
 		mtx:         mtx,
 		Application: app,
 	}
-
 	cli.BaseService = *service.NewBaseService(nil, "localClient", cli)
 	return cli
 }
@@ -78,8 +76,8 @@ func (app *localClient) EchoAsync(msg string, cb ResponseCallback) *ReqRes {
 }
 
 func (app *localClient) InfoAsync(req types.RequestInfo, cb ResponseCallback) *ReqRes {
-	app.mtx.RLock()
-	defer app.mtx.RUnlock()
+	app.mtx.Lock()
+	defer app.mtx.Unlock()
 
 	reqRes := NewReqRes(types.ToRequestInfo(req), cb)
 	res := app.Application.Info(req)
@@ -120,8 +118,8 @@ func (app *localClient) CheckTxAsync(req types.RequestCheckTx, cb ResponseCallba
 }
 
 func (app *localClient) QueryAsync(req types.RequestQuery, cb ResponseCallback) *ReqRes {
-	app.mtx.RLock()
-	defer app.mtx.RUnlock()
+	app.mtx.Lock()
+	defer app.mtx.Unlock()
 
 	reqRes := NewReqRes(types.ToRequestQuery(req), cb)
 	res := app.Application.Query(req)
@@ -234,8 +232,8 @@ func (app *localClient) EchoSync(msg string) (*types.ResponseEcho, error) {
 }
 
 func (app *localClient) InfoSync(req types.RequestInfo) (*types.ResponseInfo, error) {
-	app.mtx.RLock()
-	defer app.mtx.RUnlock()
+	app.mtx.Lock()
+	defer app.mtx.Unlock()
 
 	res := app.Application.Info(req)
 	return &res, nil
@@ -267,8 +265,8 @@ func (app *localClient) CheckTxSync(req types.RequestCheckTx) (*types.ResponseCh
 }
 
 func (app *localClient) QuerySync(req types.RequestQuery) (*types.ResponseQuery, error) {
-	app.mtx.RLock()
-	defer app.mtx.RUnlock()
+	app.mtx.Lock()
+	defer app.mtx.Unlock()
 
 	res := app.Application.Query(req)
 	return &res, nil

abci/client/socket_client.go

@@ -34,11 +34,11 @@ type socketClient struct {
 	reqQueue   chan *ReqRes
 	flushTimer *timer.ThrottleTimer
 
-	mtx     tmsync.RWMutex
+	mtx     tmsync.Mutex
 	err     error
 	reqSent *list.List // list of requests sent, waiting for response
 
-	globalCbMtx tmsync.RWMutex
+	globalCbMtx tmsync.Mutex
 	globalCb    GlobalCallback
 }
 
@@ -101,8 +101,8 @@ func (cli *socketClient) OnStop() {
 
 // Error returns an error if the client was stopped abruptly.
 func (cli *socketClient) Error() error {
-	cli.mtx.RLock()
-	defer cli.mtx.RUnlock()
+	cli.mtx.Lock()
+	defer cli.mtx.Unlock()
 	return cli.err
 }
 

consensus/byzantine_test.go

@@ -64,7 +64,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 		blockStore := store.NewBlockStore(blockDB)
 
 		// one for mempool, one for consensus
-		mtx := new(tmsync.RWMutex)
+		mtx := new(tmsync.Mutex)
 		proxyAppConnMem := abcicli.NewLocalClient(mtx, app)
 		proxyAppConnCon := abcicli.NewLocalClient(mtx, app)
 

consensus/common_test.go

@@ -434,7 +434,7 @@ func newStateWithConfigAndBlockStoreWithLoggers(
 	blockStore := store.NewBlockStore(blockDB)
 
 	// one for mempool, one for consensus
-	mtx := new(tmsync.RWMutex)
+	mtx := new(tmsync.Mutex)
 	proxyAppConnMem := abcicli.NewLocalClient(mtx, app)
 	proxyAppConnCon := abcicli.NewLocalClient(mtx, app)
 

consensus/reactor_test.go

@@ -152,7 +152,7 @@ func TestReactorWithEvidence(t *testing.T) {
 		blockStore := store.NewBlockStore(blockDB)
 
 		// one for mempool, one for consensus
-		mtx := new(tmsync.RWMutex)
+		mtx := new(tmsync.Mutex)
 		proxyAppConnMem := abcicli.NewLocalClient(mtx, app)
 		proxyAppConnCon := abcicli.NewLocalClient(mtx, app)
 

proxy/client.go

@@ -21,15 +21,15 @@ type ClientCreator interface {
 // local proxy uses a mutex on an in-proc app
 
 type localClientCreator struct {
-	mtx *tmsync.RWMutex
+	mtx *tmsync.Mutex
 	app types.Application
 }
 
 // NewLocalClientCreator returns a ClientCreator for the given app,
 // which will be running locally.
 func NewLocalClientCreator(app types.Application) ClientCreator {
 	return &localClientCreator{
-		mtx: new(tmsync.RWMutex),
+		mtx: new(tmsync.Mutex),
 		app: app,
 	}
 }