Add another trace region once a DB tx has been opened.

decred · Oct 11, 2019 · fe6e4c8 · fe6e4c8
1 parent 0b1ac44
commit fe6e4c8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/internal/rpc/jsonrpc/methods.go b/internal/rpc/jsonrpc/methods.go
@@ -1940,7 +1940,7 @@ func (s *Server) listScripts(ctx context.Context, icmd interface{}) (interface{}
 		return nil, errUnloadedWallet
 	}
 
-	redeemScripts, err := w.FetchAllRedeemScripts(ctx, )
+	redeemScripts, err := w.FetchAllRedeemScripts(ctx)
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/rpc/rpcserver/server.go b/internal/rpc/rpcserver/server.go
@@ -311,7 +311,7 @@ func (s *walletServer) AccountNumber(ctx context.Context, req *pb.AccountNumberR
 }
 
 func (s *walletServer) Accounts(ctx context.Context, req *pb.AccountsRequest) (*pb.AccountsResponse, error) {
-	resp, err := s.wallet.Accounts(ctx, )
+	resp, err := s.wallet.Accounts(ctx)
 	if err != nil {
 		return nil, translateError(err)
 	}
@@ -645,11 +645,11 @@ func (s *walletServer) Balance(ctx context.Context, req *pb.BalanceRequest) (
 }
 
 func (s *walletServer) TicketPrice(ctx context.Context, req *pb.TicketPriceRequest) (*pb.TicketPriceResponse, error) {
-	sdiff, err := s.wallet.NextStakeDifficulty(ctx, )
+	sdiff, err := s.wallet.NextStakeDifficulty(ctx)
 	if err != nil {
 		return nil, translateError(err)
 	}
-	_, tipHeight := s.wallet.MainChainTip(ctx, )
+	_, tipHeight := s.wallet.MainChainTip(ctx)
 	resp := &pb.TicketPriceResponse{
 		TicketPrice: int64(sdiff),
 		Height:      tipHeight,
@@ -668,7 +668,7 @@ func (s *walletServer) StakeInfo(ctx context.Context, req *pb.StakeInfoRequest)
 	if rpc != nil {
 		si, err = s.wallet.StakeInfoPrecise(ctx, rpc)
 	} else {
-		si, err = s.wallet.StakeInfo(ctx, )
+		si, err = s.wallet.StakeInfo(ctx)
 	}
 	if err != nil {
 		return nil, translateError(err)
@@ -2752,7 +2752,7 @@ func (s *votingServer) checkReady() bool {
 
 func (s *votingServer) VoteChoices(ctx context.Context, req *pb.VoteChoicesRequest) (*pb.VoteChoicesResponse, error) {
 	version, agendas := wallet.CurrentAgendas(s.wallet.ChainParams())
-	choices, voteBits, err := s.wallet.AgendaChoices(ctx, )
+	choices, voteBits, err := s.wallet.AgendaChoices(ctx)
 	if err != nil {
 		return nil, translateError(err)
 	}
@@ -2957,7 +2957,7 @@ func (s *decodeMessageServer) DecodeRawTransaction(ctx context.Context, req *pb.
 }
 
 func (s *walletServer) BestBlock(ctx context.Context, req *pb.BestBlockRequest) (*pb.BestBlockResponse, error) {
-	hash, height := s.wallet.MainChainTip(ctx, )
+	hash, height := s.wallet.MainChainTip(ctx)
 	resp := &pb.BestBlockResponse{
 		Hash:   hash[:],
 		Height: uint32(height),

diff --git a/wallet/addresses.go b/wallet/addresses.go
@@ -355,11 +355,12 @@ func (w *Wallet) persistReturnedChild(ctx context.Context, maybeDBTX walletdb.Re
 		// transaction as necessary.
 		if maybeDBTX == nil {
 			var err error
+			defer trace.StartRegion(ctx, "db.Update").End()
 			maybeDBTX, err = w.db.BeginReadWriteTx()
 			if err != nil {
 				return err
 			}
-			region := trace.StartRegion(ctx, "db.Update")
+			region := trace.StartRegion(ctx, "db.ReadWriteTx")
 			defer func() {
 				if rerr == nil {
 					rerr = maybeDBTX.Commit()

diff --git a/wallet/multisig.go b/wallet/multisig.go
@@ -57,11 +57,12 @@ func (w *Wallet) MakeSecp256k1MultiSigScript(ctx context.Context, secp256k1Addrs
 
 			if dbtx == nil {
 				var err error
+				defer trace.StartRegion(ctx, "db.View").End()
 				dbtx, err = w.db.BeginReadTx()
 				if err != nil {
 					return nil, err
 				}
-				defer trace.StartRegion(ctx, "db.View").End()
+				defer trace.StartRegion(ctx, "db.ReadTx").End()
 				addrmgrNs = dbtx.ReadBucket(waddrmgrNamespaceKey)
 			}
 			addrInfo, err := w.Manager.Address(addrmgrNs, addr)

diff --git a/wallet/walletdb/interface.go b/wallet/walletdb/interface.go
@@ -199,12 +199,14 @@ type DB interface {
 // any occurred).
 func View(ctx context.Context, db DB, f func(tx ReadTx) error) error {
 	defer trace.StartRegion(ctx, "db.View").End()
-	
+
 	tx, err := db.BeginReadTx()
 	if err != nil {
 		return err
 	}
 
+	defer trace.StartRegion(ctx, "db.ReadTx").End()
+
 	// Rollback the transaction after f returns or panics.  Do not recover from
 	// any panic to keep the original stack trace intact.
 	defer func() {
@@ -224,12 +226,14 @@ func View(ctx context.Context, db DB, f func(tx ReadTx) error) error {
 // by f is still returned.  If the commit fails, the commit error is returned.
 func Update(ctx context.Context, db DB, f func(tx ReadWriteTx) error) (err error) {
 	defer trace.StartRegion(ctx, "db.Update").End()
-	
+
 	tx, err := db.BeginReadWriteTx()
 	if err != nil {
 		return err
 	}
 
+	defer trace.StartRegion(ctx, "db.ReadWriteTx").End()
+
 	// Commit or rollback the transaction after f returns or panics.  Do not
 	// recover from the panic to keep the original stack trace intact.
 	panicked := true