Skip to content

Commit

Permalink
Remove exit variable from ReplicateStage
Browse files Browse the repository at this point in the history
  • Loading branch information
garious committed Jul 5, 2018
1 parent 09d6900 commit 743a96e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
15 changes: 9 additions & 6 deletions src/replicate_stage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

use bank::Bank;
use ledger;
use result::Result;
use result::{Error, Result};
use service::Service;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::RecvTimeoutError;
use std::sync::Arc;
use std::thread::{self, Builder, JoinHandle};
use std::time::Duration;
Expand All @@ -29,13 +29,16 @@ impl ReplicateStage {
Ok(())
}

pub fn new(bank: Arc<Bank>, exit: Arc<AtomicBool>, window_receiver: BlobReceiver) -> Self {
pub fn new(bank: Arc<Bank>, window_receiver: BlobReceiver) -> Self {
let thread_hdl = Builder::new()
.name("solana-replicate-stage".to_string())
.spawn(move || loop {
let e = Self::replicate_requests(&bank, &window_receiver);
if e.is_err() && exit.load(Ordering::Relaxed) {
break;
if let Err(e) = Self::replicate_requests(&bank, &window_receiver) {
match e {
Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,
Error::RecvTimeoutError(RecvTimeoutError::Timeout) => (),
_ => error!("{:?}", e),
}
}
})
.unwrap();
Expand Down
2 changes: 1 addition & 1 deletion src/tvu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ impl Tvu {
blob_receiver,
);

let replicate_stage = ReplicateStage::new(bank, exit, blob_receiver);
let replicate_stage = ReplicateStage::new(bank, blob_receiver);

Tvu {
replicate_stage,
Expand Down

0 comments on commit 743a96e

Please sign in to comment.