Skip to content
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.

Sign up for GitHub

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

chore(revm): remove local thread for pipeline execution stage #5082

Merged
merged 1 commit into from
Oct 19, 2023
Merged

chore(revm): remove local thread for pipeline execution stage #5082

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions crates/stages/src/stages/execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,6 @@ fn calculate_gas_used_from_headers<DB: Database>(
Ok(gas_total)
}

/// The size of the stack used by the executor.
///
/// Ensure the size is aligned to 8 as this is usually more efficient.
///
/// Currently 64 megabytes.
const BIG_STACK_SIZE: usize = 64 * 1024 * 1024;

#[async_trait::async_trait]
impl<EF: ExecutorFactory, DB: Database> Stage<DB> for ExecutionStage<EF> {
/// Return the id of the stage
Expand All @@ -346,25 +339,7 @@ impl<EF: ExecutorFactory, DB: Database> Stage<DB> for ExecutionStage<EF> {
provider: &DatabaseProviderRW<'_, &DB>,
input: ExecInput,
) -> Result<ExecOutput, StageError> {
// For Ethereum transactions that reaches the max call depth (1024) revm can use more stack
// space than what is allocated by default.
//
// To make sure we do not panic in this case, spawn a thread with a big stack allocated.
//
// A fix in revm is pending to give more insight into the stack size, which we can use later
// to optimize revm or move data to the heap.
//
// See https://github.com/bluealloy/revm/issues/305
std::thread::scope(|scope| {
let handle = std::thread::Builder::new()
.stack_size(BIG_STACK_SIZE)
.spawn_scoped(scope, || {
// execute and store output to results
self.execute_inner(provider, input)
})
.expect("Expects that thread name is not null");
handle.join().expect("Expects for thread to not panic")
})
self.execute_inner(provider, input)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like we can merge execute & execute_inner now

}

/// Unwind the stage.
Expand Down