LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Fix mutex handling for removing minedtx requests.

Browse source 
Previously, RemoveMinedTxRequest was being run from a caller which
held a reader lock for the websocket request contexts.  When
RemoveMinedTxRequest tried to grab a writer lock, it would block.
This change creates a new function, removeMinedTxRequest, that does
not grab any locks, and the caller (NotifyBlockConnected) grabs a
writer lock instead of a reader lock.
This commit is contained in:
Josh Rickmar 2013-11-11 14:19:12 -05:00
parent 8b5413a4ac
commit 77e1af792b
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rpcserver.go
View file

@ -207,6 +207,12 @@ func (r *wsContext) RemoveMinedTxRequest(walletNotification chan []byte, rc *req
r.Lock() r.Lock()
defer r.Unlock() defer r.Unlock()
r.removeMinedTxRequest(walletNotification, rc, txID)
}
// removeMinedTxRequest removes request contexts for notifications of a
// mined transaction without grabbing any locks.
func (r *wsContext) removeMinedTxRequest(walletNotification chan []byte, rc *requestContexts, txID *btcwire.ShaHash) {
r.removeGlobalMinedTxRequest(walletNotification, txID) r.removeGlobalMinedTxRequest(walletNotification, txID)
delete(rc.minedTxRequests, *txID) delete(rc.minedTxRequests, *txID)
} }
@ -1255,8 +1261,6 @@ func (s *rpcServer) websocketJSONHandler(walletNotification chan []byte,
// of a new block connected to the main chain. The notification is sent // of a new block connected to the main chain. The notification is sent
// to each connected wallet. // to each connected wallet.
func (s *rpcServer) NotifyBlockConnected(block *btcutil.Block) { func (s *rpcServer) NotifyBlockConnected(block *btcutil.Block) {
s.ws.RLock()
defer s.ws.RUnlock()
hash, err := block.Sha() hash, err := block.Sha()
if err != nil { if err != nil {
log.Error("Bad block; connected block notification dropped.") log.Error("Bad block; connected block notification dropped.")
@ -1270,6 +1274,7 @@ func (s *rpcServer) NotifyBlockConnected(block *btcutil.Block) {
s.ws.walletNotificationMaster <- mntfn s.ws.walletNotificationMaster <- mntfn
// Inform any interested parties about txs mined in this block. // Inform any interested parties about txs mined in this block.
s.ws.Lock()
for _, tx := range block.Transactions() { for _, tx := range block.Transactions() {
if clist, ok := s.ws.minedTxNotifications[*tx.Sha()]; ok { if clist, ok := s.ws.minedTxNotifications[*tx.Sha()]; ok {
for e := clist.Front(); e != nil; e = e.Next() { for e := clist.Front(); e != nil; e = e.Next() {
@ -1277,11 +1282,12 @@ func (s *rpcServer) NotifyBlockConnected(block *btcutil.Block) {
ntfn := btcws.NewTxMinedNtfn(tx.Sha().String()) ntfn := btcws.NewTxMinedNtfn(tx.Sha().String())
mntfn, _ := json.Marshal(ntfn) mntfn, _ := json.Marshal(ntfn)
ctx.connection <- mntfn ctx.connection <- mntfn
s.ws.RemoveMinedTxRequest(ctx.connection, ctx.rc, s.ws.removeMinedTxRequest(ctx.connection, ctx.rc,
tx.Sha()) tx.Sha())
} }
} }
} }
s.ws.Unlock()
} }
// NotifyBlockDisconnected creates and marshals a JSON message to notify // NotifyBlockDisconnected creates and marshals a JSON message to notify