forked from solana-labs/solana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow configuration of replay thread pools from CLI (solana-labs#236)
Bubble up the constants to the CLI that control the sizes of the following two thread pools: - The thread pool used to replay multiple forks in parallel - The thread pool used to execute transactions in parallel
- Loading branch information
1 parent
1d89ea0
commit 973d05c
Showing
7 changed files
with
179 additions
and
24 deletions.
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
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,115 @@ | ||
| //! Arguments for controlling the number of threads allocated for various tasks | ||
| use { | ||
| clap::{value_t_or_exit, Arg, ArgMatches}, | ||
| solana_clap_utils::{hidden_unless_forced, input_validators::is_within_range}, | ||
| solana_rayon_threadlimit::get_max_thread_count, | ||
| std::{num::NonZeroUsize, ops::RangeInclusive}, | ||
| }; | ||
|
|
||
| // Need this struct to provide &str whose lifetime matches that of the CLAP Arg's | ||
| pub struct DefaultThreadArgs { | ||
| pub replay_forks_threads: String, | ||
| pub replay_transactions_threads: String, | ||
| } | ||
|
|
||
| impl Default for DefaultThreadArgs { | ||
| fn default() -> Self { | ||
| Self { | ||
| replay_forks_threads: ReplayForksThreadsArg::default().to_string(), | ||
| replay_transactions_threads: ReplayTransactionsThreadsArg::default().to_string(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn thread_args<'a>(defaults: &DefaultThreadArgs) -> Vec<Arg<'_, 'a>> { | ||
| vec![ | ||
| new_thread_arg::<ReplayForksThreadsArg>(&defaults.replay_forks_threads), | ||
| new_thread_arg::<ReplayTransactionsThreadsArg>(&defaults.replay_transactions_threads), | ||
| ] | ||
| } | ||
|
|
||
| fn new_thread_arg<'a, T: ThreadArg>(default: &str) -> Arg<'_, 'a> { | ||
| Arg::with_name(T::NAME) | ||
| .long(T::LONG_NAME) | ||
| .takes_value(true) | ||
| .value_name("NUMBER") | ||
| .default_value(default) | ||
| .validator(|num| is_within_range(num, T::range())) | ||
| .hidden(hidden_unless_forced()) | ||
| .help(T::HELP) | ||
| } | ||
|
|
||
| pub struct NumThreadConfig { | ||
| pub replay_forks_threads: NonZeroUsize, | ||
| pub replay_transactions_threads: NonZeroUsize, | ||
| } | ||
|
|
||
| pub fn parse_num_threads_args(matches: &ArgMatches) -> NumThreadConfig { | ||
| NumThreadConfig { | ||
| replay_forks_threads: if matches.is_present("replay_slots_concurrently") { | ||
| NonZeroUsize::new(4).expect("4 is non-zero") | ||
| } else { | ||
| value_t_or_exit!(matches, ReplayForksThreadsArg::NAME, NonZeroUsize) | ||
| }, | ||
| replay_transactions_threads: value_t_or_exit!( | ||
| matches, | ||
| ReplayTransactionsThreadsArg::NAME, | ||
| NonZeroUsize | ||
| ), | ||
| } | ||
| } | ||
|
|
||
| /// Configuration for CLAP arguments that control the number of threads for various functions | ||
| trait ThreadArg { | ||
| /// The argument's name | ||
| const NAME: &'static str; | ||
| /// The argument's long name | ||
| const LONG_NAME: &'static str; | ||
| /// The argument's help message | ||
| const HELP: &'static str; | ||
|
|
||
| /// The default number of threads | ||
| fn default() -> usize; | ||
| /// The minimum allowed number of threads (inclusive) | ||
| fn min() -> usize { | ||
| 1 | ||
| } | ||
| /// The maximum allowed number of threads (inclusive) | ||
| fn max() -> usize { | ||
| // By default, no thread pool should scale over the number of the machine's threads | ||
| get_max_thread_count() | ||
| } | ||
| /// The range of allowed number of threads (inclusive on both ends) | ||
| fn range() -> RangeInclusive<usize> { | ||
| RangeInclusive::new(Self::min(), Self::max()) | ||
| } | ||
| } | ||
|
|
||
| struct ReplayForksThreadsArg; | ||
| impl ThreadArg for ReplayForksThreadsArg { | ||
| const NAME: &'static str = "replay_forks_threads"; | ||
| const LONG_NAME: &'static str = "replay-forks-threads"; | ||
| const HELP: &'static str = "Number of threads to use for replay of blocks on different forks"; | ||
|
|
||
| fn default() -> usize { | ||
| // Default to single threaded fork execution | ||
| 1 | ||
| } | ||
| fn max() -> usize { | ||
| // Choose a value that is small enough to limit the overhead of having a large thread pool | ||
| // while also being large enough to allow replay of all active forks in most scenarios | ||
| 4 | ||
| } | ||
| } | ||
|
|
||
| struct ReplayTransactionsThreadsArg; | ||
| impl ThreadArg for ReplayTransactionsThreadsArg { | ||
| const NAME: &'static str = "replay_transactions_threads"; | ||
| const LONG_NAME: &'static str = "replay-transactions-threads"; | ||
| const HELP: &'static str = "Number of threads to use for transaction replay"; | ||
|
|
||
| fn default() -> usize { | ||
| get_max_thread_count() | ||
| } | ||
| } |
Oops, something went wrong.