ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fio_plugin: change condvar's clock source

Browse Source 
Replaced CLOCK_REALTIME with CLOCK_MONOTONIC as a source of time for
condition variable. Added flag to protect against losing track of
pthread_cond_signal() calls when pthread_cond_timedwait() times out.

Change-Id: Icfc7fd75f28c29e0e41baf709bb87fbad74ed8af
Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-on: https://review.gerrithub.io/436347
Reviewed-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Konrad Sztyber 2018-12-06 14:16:51 +01:00 committed by Jim Harris
parent 7e8206c330
commit 6d5a7692eb
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
examples/bdev/fio_plugin/fio_plugin.c
View File

@ -261,7 +261,8 @@ spdk_fio_calc_timeout(struct timespec *ts, uint64_t us)
static pthread_t g_init_thread_id = 0;
static pthread_mutex_t g_init_mtx = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t g_init_cond = PTHREAD_COND_INITIALIZER;
static pthread_cond_t g_init_cond;
static bool g_poll_loop = true;
static void *
spdk_init_thread_poll(void *arg)
@ -359,13 +360,13 @@ spdk_init_thread_poll(void *arg)
pthread_mutex_lock(&g_init_mtx);
pthread_cond_signal(&g_init_cond);
while (true) {
while (g_poll_loop) {
spdk_fio_poll_thread(fio_thread);
clock_gettime(CLOCK_REALTIME, &ts);
clock_gettime(CLOCK_MONOTONIC, &ts);
spdk_fio_calc_timeout(&ts, fio_thread->timeout);
rc = pthread_cond_timedwait(&g_init_cond, &g_init_mtx, &ts);
rc = pthread_cond_timedwait(&g_init_cond, &g_init_mtx, &ts);
if (rc != ETIMEDOUT) {
break;
}
@ -407,13 +408,28 @@ err_exit:
static int
spdk_fio_init_env(struct thread_data *td)
{
int rc;
pthread_condattr_t attr;
int rc = -1;
if (pthread_condattr_init(&attr)) {
SPDK_ERRLOG("Unable to initialize condition variable\n");
return -1;
}
if (pthread_condattr_setclock(&attr, CLOCK_MONOTONIC)) {
SPDK_ERRLOG("Unable to initialize condition variable\n");
goto out;
}
if (pthread_cond_init(&g_init_cond, &attr)) {
SPDK_ERRLOG("Unable to initialize condition variable\n");
goto out;
}
/*
* Spawn a thread to handle initialization operations and to poll things
* like the admin queues periodically.
*/
rc = pthread_create(&g_init_thread_id, NULL, &spdk_init_thread_poll, td->eo);
if (rc != 0) {
SPDK_ERRLOG("Unable to spawn thread to poll admin queue. It won't be polled.\n");
@ -423,8 +439,9 @@ spdk_fio_init_env(struct thread_data *td)
pthread_mutex_lock(&g_init_mtx);
pthread_cond_wait(&g_init_cond, &g_init_mtx);
pthread_mutex_unlock(&g_init_mtx);
return 0;
out:
pthread_condattr_destroy(&attr);
return rc;
}
/* Called for each thread to fill in the 'real_file_size' member for
@ -804,6 +821,7 @@ static void
spdk_fio_finish_env(void)
{
pthread_mutex_lock(&g_init_mtx);
g_poll_loop = false;
pthread_cond_signal(&g_init_cond);
pthread_mutex_unlock(&g_init_mtx);
pthread_join(g_init_thread_id, NULL);