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.

Sign up for GitHub

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

Remove unnecessary bounds #59

Merged
merged 3 commits into from
Mar 3, 2021
Merged

Remove unnecessary bounds #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d929a4
Remove unnecessary 'Sync' bounds for load tool
zeegomo Feb 28, 2021
8d0a46f
Remove unused Clone bound
zeegomo Feb 28, 2021
6db9b2d
Use generic parameters with where clause instead of impl Trait
zeegomo Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 38 additions & 22 deletions src/load/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ pub use request::{Id, RequestFailure, RequestGenerator, RequestSendMode, Request
pub use stats::Stats;
pub use status::{RequestStatusProvider, Status, StatusUpdaterThread};

pub fn start_sync(
request_generator: impl RequestGenerator + Clone + Send + Sized + 'static,
config: Configuration,
title: &str,
) -> Stats {
pub fn start_sync<R>(request_generator: R, config: Configuration, title: &str) -> Stats
where
R: RequestGenerator + Send + 'static,
{
let responses = Arc::new(Mutex::new(Vec::new()));
let request_generator = Arc::new(Mutex::new(request_generator));
let start = Instant::now();
Expand Down Expand Up @@ -74,12 +73,16 @@ impl BackgroundLoadProcess {
}
}

pub fn start_background_async(
request_generator: impl RequestGenerator + Send + Sized + 'static,
status_provider: impl RequestStatusProvider + Send + Sized + Sync + 'static,
pub fn start_background_async<R, S>(
request_generator: R,
status_provider: S,
config: Configuration,
title: &str,
) -> BackgroundLoadProcess {
) -> BackgroundLoadProcess
where
R: RequestGenerator + Send + 'static,
S: RequestStatusProvider + Send + 'static,
{
let responses = Arc::new(Mutex::new(Vec::new()));
let request_generator = Arc::new(Mutex::new(request_generator));
let start = Instant::now();
Expand Down Expand Up @@ -108,12 +111,16 @@ pub fn start_background_async(
}
}

pub fn start_async(
request_generator: impl RequestGenerator + Send + Sized + 'static,
status_provider: impl RequestStatusProvider + Send + Sized + Sync + 'static,
pub fn start_async<R, S>(
request_generator: R,
status_provider: S,
config: Configuration,
title: &str,
) -> Stats {
) -> Stats
where
R: RequestGenerator + Send + 'static,
S: RequestStatusProvider + Send + 'static,
{
let responses = Arc::new(Mutex::new(Vec::new()));
let request_generator = Arc::new(Mutex::new(request_generator));
let start = Instant::now();
Expand Down Expand Up @@ -145,12 +152,15 @@ pub fn start_async(
stats
}

fn get_threads(
request_generator: &Arc<Mutex<impl RequestGenerator + Send + Sized + 'static>>,
fn get_threads<R>(
request_generator: &Arc<Mutex<R>>,
config: &Configuration,
request_mode_run: RequestSendMode,
responses: &Arc<Mutex<Vec<Response>>>,
) -> Vec<JoinHandle<()>> {
) -> Vec<JoinHandle<()>>
where
R: RequestGenerator + Send + 'static,
{
println!("Running load using {:?}", config.strategy());
match config.strategy() {
Strategy::PerThread(per_thread) => per_thread_strategy(
Expand All @@ -177,13 +187,16 @@ fn get_threads(
}
}

fn per_thread_strategy(
fn per_thread_strategy<R>(
requests_per_thread: u32,
responses: &Arc<Mutex<Vec<Response>>>,
config: &Configuration,
request_mode_run: RequestSendMode,
request_generator: &Arc<Mutex<impl RequestGenerator + Send + Sized + 'static>>,
) -> Vec<JoinHandle<()>> {
request_generator: &Arc<Mutex<R>>,
) -> Vec<JoinHandle<()>>
where
R: RequestGenerator + Send + 'static,
{
let mut child_threads = Vec::new();
for _ in 0..config.thread_no() {
let responses_clone = Arc::clone(&responses);
Expand All @@ -202,13 +215,16 @@ fn per_thread_strategy(
child_threads
}

fn duration_strategy(
fn duration_strategy<R>(
duration: Duration,
responses: &Arc<Mutex<Vec<Response>>>,
config: &Configuration,
request_mode_run: RequestSendMode,
request_generator: &Arc<Mutex<impl RequestGenerator + Send + Sized + 'static>>,
) -> Vec<JoinHandle<()>> {
request_generator: &Arc<Mutex<R>>,
) -> Vec<JoinHandle<()>>
where
R: RequestGenerator + Send + 'static,
{
let mut child_threads = Vec::new();
for _ in 0..config.thread_no() {
let responses_clone = Arc::clone(&responses);
Expand Down
13 changes: 7 additions & 6 deletions src/load/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ pub trait RequestStatusProvider {

fn update_statuses(
responses_clone: &Arc<Mutex<Vec<Response>>>,
request_status_provider: &Arc<Mutex<impl RequestStatusProvider + Send + Sized + Sync>>,
request_status_provider: &Arc<Mutex<impl RequestStatusProvider + Send>>,
) -> Vec<Status> {
let responses = &mut *responses_clone.lock().unwrap();
let ids: Vec<Id> = responses
Expand All @@ -116,15 +116,16 @@ fn update_statuses(
}

impl StatusUpdaterThread {
pub fn spawn(
pub fn spawn<S>(
responses: &Arc<Mutex<Vec<Response>>>,
request_status_provider: &Arc<
Mutex<impl RequestStatusProvider + Send + Sized + Sync + 'static>,
>,
request_status_provider: &Arc<Mutex<S>>,
monitor: Monitor,
title: &str,
shutdown_grace_period: u32,
) -> Self {
) -> Self
where
S: RequestStatusProvider + Send + 'static,
{
let (tx, rx) = mpsc::channel();
let responses_clone = Arc::clone(&responses);
let request_status_provider_clone = Arc::clone(&request_status_provider);
Expand Down