From 06e5482ff61df86f0eafeab6e4ef3107659cb26b Mon Sep 17 00:00:00 2001 From: Andrew Fitzgerald Date: Wed, 5 Jul 2023 09:44:18 -0700 Subject: [PATCH] move ThreadAwareAccountLocks into scheduler module (#32298) --- core/src/banking_stage.rs | 9 +++------ core/src/banking_stage/transaction_scheduler/mod.rs | 2 ++ .../thread_aware_account_locks.rs | 0 3 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 core/src/banking_stage/transaction_scheduler/mod.rs rename core/src/banking_stage/{ => transaction_scheduler}/thread_aware_account_locks.rs (100%) diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs index 814ca0dbc4..9cef1bf870 100644 --- a/core/src/banking_stage.rs +++ b/core/src/banking_stage.rs @@ -48,8 +48,10 @@ pub mod qos_service; pub mod unprocessed_packet_batches; pub mod unprocessed_transaction_storage; +mod consume_worker; mod decision_maker; mod forward_packet_batches_by_accounts; +mod forward_worker; mod forwarder; mod immutable_deserialized_packet; mod latest_unprocessed_votes; @@ -58,14 +60,9 @@ mod multi_iterator_scanner; mod packet_deserializer; mod packet_receiver; mod read_write_account_set; - #[allow(dead_code)] mod scheduler_messages; - -mod consume_worker; -mod forward_worker; -#[allow(dead_code)] -mod thread_aware_account_locks; +mod transaction_scheduler; // Fixed thread size seems to be fastest on GCP setup pub const NUM_THREADS: u32 = 6; diff --git a/core/src/banking_stage/transaction_scheduler/mod.rs b/core/src/banking_stage/transaction_scheduler/mod.rs new file mode 100644 index 0000000000..c884c20aa1 --- /dev/null +++ b/core/src/banking_stage/transaction_scheduler/mod.rs @@ -0,0 +1,2 @@ +#[allow(dead_code)] +mod thread_aware_account_locks; diff --git a/core/src/banking_stage/thread_aware_account_locks.rs b/core/src/banking_stage/transaction_scheduler/thread_aware_account_locks.rs similarity index 100% rename from core/src/banking_stage/thread_aware_account_locks.rs rename to core/src/banking_stage/transaction_scheduler/thread_aware_account_locks.rs