mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't wait in the tesrver idle testing every time around the loop

Browse Source 
If we wait for 100ms 600 times - then the test takes a minute to complete
which is far too long. The purpose of the wait is to give the assistance
thread a chance to catch up. We only do that if the event timeout has
actually expired - otherwise we are waiting for no reason.

Fixes #22156

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22284)
This commit is contained in:
Matt Caswell 2023-10-04 17:50:53 +01:00
parent 4ace824852
commit 2e62b07a41
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/quic_tserver_test.c
View File

@ -305,6 +305,9 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
if (c_start_idle_test && !c_done_idle_test) {
/* This is more than our default idle timeout of 30s. */
if (idle_units_done < 600) {
struct timeval tv;
int isinf;
if (!TEST_true(CRYPTO_THREAD_write_lock(fake_time_lock)))
goto err;
fake_time = ossl_time_add(fake_time, ossl_ms2time(100));
@ -312,7 +315,16 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
++idle_units_done;
ossl_quic_conn_force_assist_thread_wake(c_ssl);
OSSL_sleep(100); /* Ensure CPU scheduling for test purposes */
/*
* If the event timeout has expired then give the assistance
* thread a chance to catch up
*/
if (!TEST_true(SSL_get_event_timeout(c_ssl, &tv, &isinf)))
goto err;
if (!isinf && ossl_time_compare(ossl_time_zero(),
ossl_time_from_timeval(tv)) >= 0)
OSSL_sleep(100); /* Ensure CPU scheduling for test purposes */
} else {
c_done_idle_test = 1;
}