lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-22 06:53:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bbgo: fix doneTrades lock

Browse Source
This commit is contained in:
c9s 2022-08-09 14:06:52 +08:00
parent b368a66760
commit 0283f2ad55
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/bbgo/tradecollector.go
View File

@ -118,14 +118,15 @@ func (c *TradeCollector) Process() bool {
c.tradeStore.Filter(func(trade types.Trade) bool {
key := trade.Key()
c.mu.Lock()
defer c.mu.Unlock()
// if it's already done, remove the trade from the trade store
if _, done := c.doneTrades[key]; done {
return true
}
if c.orderStore.Exists(trade.OrderID) {
c.setDone(key)
if c.position != nil {
profit, netProfit, madeProfit := c.position.AddTrade(trade)
if madeProfit {
@ -140,6 +141,8 @@ func (c *TradeCollector) Process() bool {
} else {
c.EmitTrade(trade, fixedpoint.Zero, fixedpoint.Zero)
}
c.doneTrades[key] = struct{}{}
return true
}
return false
@ -157,14 +160,17 @@ func (c *TradeCollector) Process() bool {
// return true when the given trade is added
// return false when the given trade is not added
func (c *TradeCollector) processTrade(trade types.Trade) bool {
c.mu.Lock()
defer c.mu.Unlock()
key := trade.Key()
// if it's already done, remove the trade from the trade store
if _, done := c.doneTrades[key]; done {
return false
}
if c.orderStore.Exists(trade.OrderID) {
key := trade.Key()
// if it's already done, remove the trade from the trade store
if _, done := c.doneTrades[key]; done {
return false
}
if c.position != nil {
profit, netProfit, madeProfit := c.position.AddTrade(trade)
if madeProfit {
@ -180,7 +186,7 @@ func (c *TradeCollector) processTrade(trade types.Trade) bool {
c.EmitTrade(trade, fixedpoint.Zero, fixedpoint.Zero)
}
c.setDone(key)
c.doneTrades[key] = struct{}{}
return true
}
return false