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.

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

Separate tpu vote port #20007

Closed
wants to merge 12 commits into from
3 changes: 3 additions & 0 deletions banking-bench/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ fn main() {

let (verified_sender, verified_receiver) = unbounded();
let (vote_sender, vote_receiver) = unbounded();
let (tpu_vote_sender, tpu_vote_receiver) = unbounded();
let (replay_vote_sender, _replay_vote_receiver) = unbounded();
let bank0 = Bank::new(&genesis_config);
let mut bank_forks = BankForks::new(bank0);
Expand Down Expand Up @@ -225,6 +226,7 @@ fn main() {
&cluster_info,
&poh_recorder,
verified_receiver,
tpu_vote_receiver,
vote_receiver,
None,
replay_vote_sender,
Expand Down Expand Up @@ -380,6 +382,7 @@ fn main() {
);

drop(verified_sender);
drop(tpu_vote_sender);
drop(vote_sender);
exit.store(true, Ordering::Relaxed);
banking_stage.join().unwrap();
Expand Down
2 changes: 2 additions & 0 deletions ci/do-audit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,7 @@ cargo_audit_ignores=(
# https://github.com/alexcrichton/tar-rs/issues/238
--ignore RUSTSEC-2021-0080

# zeroize_derive: `#[zeroize(drop)]` doesn't implement `Drop` for `enum`s
--ignore RUSTSEC-2021-0115
)
scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"
3 changes: 3 additions & 0 deletions core/benches/banking_stage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ fn bench_banking(bencher: &mut Bencher, tx_type: TransactionType) {
genesis_config.ticks_per_slot = 10_000;

let (verified_sender, verified_receiver) = unbounded();
let (tpu_vote_sender, tpu_vote_receiver) = unbounded();
let (vote_sender, vote_receiver) = unbounded();
let mut bank = Bank::new(&genesis_config);
// Allow arbitrary transaction processing time for the purposes of this bench
Expand Down Expand Up @@ -208,6 +209,7 @@ fn bench_banking(bencher: &mut Bencher, tx_type: TransactionType) {
&cluster_info,
&poh_recorder,
verified_receiver,
tpu_vote_receiver,
vote_receiver,
None,
s,
Expand Down Expand Up @@ -254,6 +256,7 @@ fn bench_banking(bencher: &mut Bencher, tx_type: TransactionType) {
start += chunk_len;
start %= verified.len();
});
drop(tpu_vote_sender);
drop(vote_sender);
exit.store(true, Ordering::Relaxed);
poh_service.join().unwrap();
Expand Down
Loading