gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use unbounded channel (#7081)

Browse Source
This commit is contained in:
Tyera Eulberg
2019-11-21 14:23:40 -07:00
committed by GitHub
parent 8a879faac7
commit c965a110f2
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/banking_stage.rs
View File

@ -1028,10 +1028,7 @@ mod tests {
system_transaction,
transaction::TransactionError,
};
use std::{
sync::{atomic::Ordering, mpsc::channel},
thread::sleep,
};
use std::{sync::atomic::Ordering, thread::sleep};
#[test]
fn test_banking_stage_shutdown1() {
@ -1950,7 +1947,7 @@ mod tests {
blocktree.insert_shreds(shreds, None, false).unwrap();
blocktree.set_roots(&[bank.slot()]).unwrap();
let (transaction_status_sender, transaction_status_receiver) = channel();
let (transaction_status_sender, transaction_status_receiver) = unbounded();
let transaction_status_service = TransactionStatusService::new(
transaction_status_receiver,
blocktree.clone(),

3
core/src/replay_stage.rs
View File

@ -1155,6 +1155,7 @@ mod test {
replay_stage::ReplayStage,
transaction_status_service::TransactionStatusService,
};
use crossbeam_channel::unbounded;
use solana_ledger::{
blocktree::make_slot_entries,
blocktree::{entries_to_test_shreds, BlocktreeError},
@ -1759,7 +1760,7 @@ mod test {
blocktree.insert_shreds(shreds, None, false).unwrap();
blocktree.set_roots(&[slot]).unwrap();
let (transaction_status_sender, transaction_status_receiver) = channel();
let (transaction_status_sender, transaction_status_receiver) = unbounded();
let transaction_status_service = TransactionStatusService::new(
transaction_status_receiver,
blocktree.clone(),

8
core/src/transaction_status_service.rs
View File

@ -1,11 +1,11 @@
use crate::result::{Error, Result};
use crossbeam_channel::{Receiver, RecvTimeoutError};
use solana_client::rpc_request::RpcTransactionStatus;
use solana_ledger::{blocktree::Blocktree, blocktree_processor::TransactionStatusBatch};
use solana_runtime::bank::Bank;
use std::{
sync::{
atomic::{AtomicBool, Ordering},
mpsc::{Receiver, RecvTimeoutError},
Arc,
},
thread::{self, Builder, JoinHandle},
@ -35,9 +35,9 @@ impl TransactionStatusService {
&blocktree,
) {
match e {
Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,
Error::RecvTimeoutError(RecvTimeoutError::Timeout) => (),
_ => info!("Error from write_transaction_statuses: {:?}", e),
Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Disconnected) => break,
Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout) => (),
_ => info!("Error from write_transaction_status_batch: {:?}", e),
}
}
})

5
core/src/validator.rs
View File

@ -19,6 +19,7 @@ use crate::{
transaction_status_service::TransactionStatusService,
tvu::{Sockets, Tvu},
};
use crossbeam_channel::unbounded;
use solana_ledger::{
bank_forks::{BankForks, SnapshotConfig},
bank_forks_utils,
@ -44,7 +45,7 @@ use std::{
path::{Path, PathBuf},
process,
sync::atomic::{AtomicBool, Ordering},
sync::mpsc::{channel, Receiver},
sync::mpsc::Receiver,
sync::{Arc, Mutex, RwLock},
thread::Result,
};
@ -244,7 +245,7 @@ impl Validator {
let (transaction_status_sender, transaction_status_service) =
if rpc_service.is_some() && !config.transaction_status_service_disabled {
let (transaction_status_sender, transaction_status_receiver) = channel();
let (transaction_status_sender, transaction_status_receiver) = unbounded();
(
Some(transaction_status_sender),
Some(TransactionStatusService::new(