forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-11 22:43:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: properly release pipeline stages (#783)

Browse source
This commit is contained in:
Ömer Faruk Irmak 2024-05-29 23:46:03 +03:00 committed by GitHub
parent 34162effbc
commit e6cc960f2f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
miner/scroll_worker.go
View file

@ -401,7 +401,7 @@ func (w *worker) collectPendingL1Messages(startIndex uint64) []types.L1MessageTx
func (w *worker) startNewPipeline(timestamp int64) { func (w *worker) startNewPipeline(timestamp int64) {
if w.currentPipeline != nil { if w.currentPipeline != nil {
w.currentPipeline.Kill() w.currentPipeline.Release()
w.currentPipeline = nil w.currentPipeline = nil
} }
@ -586,6 +586,7 @@ func (w *worker) handlePipelineResult(res *pipeline.Result) error {
if res != nil && res.FinalBlock != nil { if res != nil && res.FinalBlock != nil {
w.updateSnapshot(res.FinalBlock) w.updateSnapshot(res.FinalBlock)
} }
w.currentPipeline.Release()
w.currentPipeline = nil w.currentPipeline = nil
return nil return nil
} }
@ -750,6 +751,7 @@ func (w *worker) commit(res *pipeline.Result) error {
// Broadcast the block and announce chain insertion event // Broadcast the block and announce chain insertion event
w.mux.Post(core.NewMinedBlockEvent{Block: block}) w.mux.Post(core.NewMinedBlockEvent{Block: block})
w.currentPipeline.Release()
w.currentPipeline = nil w.currentPipeline = nil
return nil return nil
} }

2
params/version.go
View file

@ -24,7 +24,7 @@ import (
const ( const (
VersionMajor = 5 // Major version component of the current release VersionMajor = 5 // Major version component of the current release
VersionMinor = 3 // Minor version component of the current release VersionMinor = 3 // Minor version component of the current release
VersionPatch = 27 // Patch version component of the current release VersionPatch = 28 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string VersionMeta = "mainnet" // Version metadata to append to the version string
) )

4
rollup/pipeline/pipeline.go
View file

@ -165,9 +165,11 @@ func (p *Pipeline) TryPushTxn(tx *types.Transaction) (*Result, error) {
} }
} }
func (p *Pipeline) Kill() { // Release releases all resources related to the pipeline
func (p *Pipeline) Release() {
if p.txnQueue != nil { if p.txnQueue != nil {
close(p.txnQueue) close(p.txnQueue)
p.txnQueue = nil
} }
select { select {