roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #1496 from karalabe/fix-xeth-races

Browse Source 
xeth: fix #1485, data race in fiilter creation and event firing
This commit is contained in:
Jeffrey Wilcke 2015-07-20 04:27:10 -07:00
commit 02c5022742
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xeth/xeth.go
View File

@ -518,6 +518,9 @@ func (self *XEth) UninstallFilter(id int) bool {
} }
func (self *XEth) NewLogFilter(earliest, latest int64, skip, max int, address []string, topics [][]string) int { func (self *XEth) NewLogFilter(earliest, latest int64, skip, max int, address []string, topics [][]string) int {
self.logMu.Lock()
defer self.logMu.Unlock()
var id int var id int
filter := core.NewFilter(self.backend) filter := core.NewFilter(self.backend)
filter.SetEarliestBlock(earliest) filter.SetEarliestBlock(earliest)
@ -539,6 +542,9 @@ func (self *XEth) NewLogFilter(earliest, latest int64, skip, max int, address []
} }
func (self *XEth) NewTransactionFilter() int { func (self *XEth) NewTransactionFilter() int {
self.transactionMu.Lock()
defer self.transactionMu.Unlock()
var id int var id int
filter := core.NewFilter(self.backend) filter := core.NewFilter(self.backend)
filter.TransactionCallback = func(tx *types.Transaction) { filter.TransactionCallback = func(tx *types.Transaction) {
@ -553,6 +559,9 @@ func (self *XEth) NewTransactionFilter() int {
} }
func (self *XEth) NewBlockFilter() int { func (self *XEth) NewBlockFilter() int {
self.blockMu.Lock()
defer self.blockMu.Unlock()
var id int var id int
filter := core.NewFilter(self.backend) filter := core.NewFilter(self.backend)
filter.BlockCallback = func(block *types.Block, logs state.Logs) { filter.BlockCallback = func(block *types.Block, logs state.Logs) {