| 修订版 | de7dbf2a4c2281f87d7500ae52a0ab28bfc73aaf (tree) |
|---|---|
| 时间 | 2020-02-06 19:39:34 |
| 作者 | Poseidon <shenao.78@163....> |
| Commiter | GitHub |
application/mov/match_collector.go (diff)| @@ -63,6 +63,15 @@ func (m *matchCollector) collect() ([]*types.Tx, error) { | ||
| 63 | 63 | defer close(m.closeCh) |
| 64 | 64 | |
| 65 | 65 | var matchedTxs []*types.Tx |
| 66 | + appendMatchedTxs := func(data *matchTxResult) bool { | |
| 67 | + gasUsed := calcMatchedTxGasUsed(data.matchedTx) | |
| 68 | + if m.gasLeft -= gasUsed; m.gasLeft >= 0 { | |
| 69 | + matchedTxs = append(matchedTxs, data.matchedTx) | |
| 70 | + return false | |
| 71 | + } | |
| 72 | + return true | |
| 73 | + } | |
| 74 | + | |
| 66 | 75 | completed := 0 |
| 67 | 76 | for !m.isTimeout() { |
| 68 | 77 | select { |
| @@ -71,14 +80,20 @@ func (m *matchCollector) collect() ([]*types.Tx, error) { | ||
| 71 | 80 | return nil, data.err |
| 72 | 81 | } |
| 73 | 82 | |
| 74 | - gasUsed := calcMatchedTxGasUsed(data.matchedTx) | |
| 75 | - if m.gasLeft -= gasUsed; m.gasLeft >= 0 { | |
| 76 | - matchedTxs = append(matchedTxs, data.matchedTx) | |
| 77 | - } else { | |
| 83 | + if done := appendMatchedTxs(data); done { | |
| 78 | 84 | return matchedTxs, nil |
| 79 | 85 | } |
| 80 | 86 | case <-m.workerNumCh: |
| 81 | 87 | if completed++; completed == m.workerNum { |
| 88 | + // read the remaining process results | |
| 89 | + close(m.processCh) | |
| 90 | + for data := range m.processCh { | |
| 91 | + if data.err != nil { | |
| 92 | + return nil, data.err | |
| 93 | + } | |
| 94 | + | |
| 95 | + appendMatchedTxs(data) | |
| 96 | + } | |
| 82 | 97 | return matchedTxs, nil |
| 83 | 98 | } |
| 84 | 99 | } |
Fork