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

fix #480 #483

Merged
merged 1 commit into from
May 5, 2024
Merged

fix #480 #483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 1 addition & 30 deletions src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,34 +799,6 @@ async fn work_http2_once(
(is_cancel, is_reconnect)
}

async fn work_http2_or_acquire(
client: &Client,
client_state: &mut ClientStateHttp2,
report_tx: &flume::Sender<Result<RequestResult, ClientError>>,
connection_time: ConnectionTime,
start_latency_correction: Option<Instant>,
semaphore: &tokio::sync::Semaphore,
) -> (bool, bool) {
tokio::select! {
mut res =
client.work_http2(client_state) => {
let is_cancel = is_cancel_error(&res);
let is_reconnect = is_hyper_error(&res);
set_connection_time(&mut res, connection_time);
if let Some(start_latency_correction) = start_latency_correction {
set_start_latency_correction(&mut res, start_latency_correction);
}
report_tx.send_async(res).await.unwrap();
(is_cancel ,is_reconnect )

}
_ = semaphore.acquire() => {
report_tx.send_async(Err(ClientError::Deadline)).await.unwrap();
(true, false)
}
}
}

fn set_connection_time<E>(res: &mut Result<RequestResult, E>, connection_time: ConnectionTime) {
if let Ok(res) = res {
res.connection_time = Some(connection_time);
Expand Down Expand Up @@ -1640,13 +1612,12 @@ pub async fn work_until_with_qps_latency_correction(
is_cancel = async {
while let Ok(start) = rx.recv_async().await {
let (is_cancel, is_reconnect) =
work_http2_or_acquire(
work_http2_once(
&client,
&mut client_state,
&report_tx,
connection_time,
Some(start),
&s,
)
.await;
if is_cancel || is_reconnect {
Expand Down