From a46a98bc7fd21a076470c06d560f42b5c7862b88 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 28 Feb 2022 21:10:38 +0000 Subject: Add a simple adjustTimeoutByDetectedHz to compute a suitable timeout/naptime based on base VESPA_TIMER_HZ to use for random waiting when doing a poll based appraoch. --- storage/src/vespa/storage/distributor/distributor_stripe_pool.cpp | 2 +- storage/src/vespa/storage/distributor/distributor_stripe_thread.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'storage/src') diff --git a/storage/src/vespa/storage/distributor/distributor_stripe_pool.cpp b/storage/src/vespa/storage/distributor/distributor_stripe_pool.cpp index d501172731a..8b172743d27 100644 --- a/storage/src/vespa/storage/distributor/distributor_stripe_pool.cpp +++ b/storage/src/vespa/storage/distributor/distributor_stripe_pool.cpp @@ -15,7 +15,7 @@ DistributorStripePool::DistributorStripePool(bool test_mode, PrivateCtorTag) _mutex(), _parker_cond(), _parked_threads(0), - _bootstrap_tick_wait_duration(vespalib::from_s(1.0/vespalib::getVespaTimerHz())), + _bootstrap_tick_wait_duration(vespalib::adjustTimeoutByDetectedHz(1ms)), _bootstrap_ticks_before_wait(10), _single_threaded_test_mode(test_mode), _stopped(false) diff --git a/storage/src/vespa/storage/distributor/distributor_stripe_thread.cpp b/storage/src/vespa/storage/distributor/distributor_stripe_thread.cpp index 94e4dc648cc..ae5445da620 100644 --- a/storage/src/vespa/storage/distributor/distributor_stripe_thread.cpp +++ b/storage/src/vespa/storage/distributor/distributor_stripe_thread.cpp @@ -11,7 +11,7 @@ DistributorStripeThread::DistributorStripeThread(TickableStripe& stripe, DistributorStripePool& stripe_pool) : _stripe(stripe), _stripe_pool(stripe_pool), - _tick_wait_duration(vespalib::from_s(1.0/vespalib::getVespaTimerHz())), + _tick_wait_duration(vespalib::adjustTimeoutByDetectedHz(1ms)), _mutex(), _event_cond(), _park_cond(), -- cgit v1.2.3