New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
eth/catalyst: evict old payloads, type PayloadID #24236
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
5426e1c
eth/catalyst: evict old payloads, type PayloadID
protolambda 0ab6a0d
eth/catalyst: added tracing info to engine api
MariusVanDerWijden 8a04197
eth/catalyst: add test for create payload timestamps
MariusVanDerWijden 23d4958
catalyst: better logs
MariusVanDerWijden 2900a5a
eth/catalyst: computePayloadId return style
protolambda b1840e8
catalyst: add queue for payloads
MariusVanDerWijden de166aa
eth/catalyst: nitpicks
karalabe File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
// Copyright 2022 The go-ethereum Authors | ||
// This file is part of the go-ethereum library. | ||
// | ||
// The go-ethereum library is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU Lesser General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
// | ||
// The go-ethereum library is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU Lesser General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU Lesser General Public License | ||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
package catalyst | ||
|
||
import "sync" | ||
|
||
// maxTrackedPayloads is the maximum number of prepared payloads the execution | ||
// engine tracks before evicting old ones. Ideally we should only ever track the | ||
// latest one; but have a slight wiggle room for non-ideal conditions. | ||
const maxTrackedPayloads = 10 | ||
|
||
// payloadQueueItem represents an id->payload tuple to store until it's retrieved | ||
// or evicted. | ||
type payloadQueueItem struct { | ||
id PayloadID | ||
payload *ExecutableDataV1 | ||
} | ||
|
||
// payloadQueue tracks the latest handful of constructed payloads to be retrieved | ||
// by the beacon chain if block production is requested. | ||
type payloadQueue struct { | ||
payloads []*payloadQueueItem | ||
lock sync.RWMutex | ||
} | ||
|
||
// newPayloadQueue creates a pre-initialized queue with a fixed number of slots | ||
// all containing empty items. | ||
func newPayloadQueue() *payloadQueue { | ||
return &payloadQueue{ | ||
payloads: make([]*payloadQueueItem, maxTrackedPayloads), | ||
} | ||
} | ||
|
||
// put inserts a new payload into the queue at the given id. | ||
func (q *payloadQueue) put(id PayloadID, data *ExecutableDataV1) { | ||
q.lock.Lock() | ||
defer q.lock.Unlock() | ||
|
||
copy(q.payloads[1:], q.payloads) | ||
q.payloads[0] = &payloadQueueItem{ | ||
id: id, | ||
payload: data, | ||
} | ||
} | ||
|
||
// get retrieves a previously stored payload item or nil if it does not exist. | ||
func (q *payloadQueue) get(id PayloadID) *ExecutableDataV1 { | ||
q.lock.RLock() | ||
defer q.lock.RUnlock() | ||
|
||
for _, item := range q.payloads { | ||
if item == nil { | ||
return nil // no more items | ||
} | ||
if item.id == id { | ||
return item.payload | ||
} | ||
} | ||
return nil | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pls delete this, it's dead code. Otherwise LGTM