qht: add test-qht-par to invoke qht-bench from 'check' target

Signed-off-by: Emilio G. Cota <cota@braap.org>
Message-Id: <1465412133-3029-14-git-send-email-cota@braap.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Emilio G. Cota 2016-06-08 14:55:31 -04:00 committed by Richard Henderson
parent 515864a0d7
commit 896a9ee967
3 changed files with 61 additions and 1 deletions

1
tests/.gitignore vendored
View File

@ -52,6 +52,7 @@ test-qemu-opts
test-qdist
test-qga
test-qht
test-qht-par
test-qmp-commands
test-qmp-commands.h
test-qmp-event

View File

@ -74,6 +74,8 @@ check-unit-y += tests/test-qdist$(EXESUF)
gcov-files-test-qdist-y = util/qdist.c
check-unit-y += tests/test-qht$(EXESUF)
gcov-files-test-qht-y = util/qht.c
check-unit-y += tests/test-qht-par$(EXESUF)
gcov-files-test-qht-par-y = util/qht.c
check-unit-y += tests/test-bitops$(EXESUF)
check-unit-$(CONFIG_HAS_GLIB_SUBPROCESS_TESTS) += tests/test-qdev-global-props$(EXESUF)
check-unit-y += tests/check-qom-interface$(EXESUF)
@ -400,7 +402,7 @@ test-obj-y = tests/check-qint.o tests/check-qstring.o tests/check-qdict.o \
tests/test-opts-visitor.o tests/test-qmp-event.o \
tests/rcutorture.o tests/test-rcu-list.o \
tests/test-qdist.o \
tests/test-qht.o tests/qht-bench.o
tests/test-qht.o tests/qht-bench.o tests/test-qht-par.o
$(test-obj-y): QEMU_INCLUDES += -Itests
QEMU_CFLAGS += -I$(SRC_PATH)/tests
@ -441,6 +443,7 @@ tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y)
tests/test-rcu-list$(EXESUF): tests/test-rcu-list.o $(test-util-obj-y)
tests/test-qdist$(EXESUF): tests/test-qdist.o $(test-util-obj-y)
tests/test-qht$(EXESUF): tests/test-qht.o $(test-util-obj-y)
tests/test-qht-par$(EXESUF): tests/test-qht-par.o tests/qht-bench$(EXESUF) $(test-util-obj-y)
tests/qht-bench$(EXESUF): tests/qht-bench.o $(test-util-obj-y)
tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \

56
tests/test-qht-par.c Normal file
View File

@ -0,0 +1,56 @@
/*
* Copyright (C) 2016, Emilio G. Cota <cota@braap.org>
*
* License: GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
#include <glib.h>
#define TEST_QHT_STRING "tests/qht-bench 1>/dev/null 2>&1 -R -S0.1 -D10000 -N1 "
static void test_qht(int n_threads, int update_rate, int duration)
{
char *str;
int rc;
str = g_strdup_printf(TEST_QHT_STRING "-n %d -u %d -d %d",
n_threads, update_rate, duration);
rc = system(str);
g_free(str);
g_assert_cmpint(rc, ==, 0);
}
static void test_2th0u1s(void)
{
test_qht(2, 0, 1);
}
static void test_2th20u1s(void)
{
test_qht(2, 20, 1);
}
static void test_2th0u5s(void)
{
test_qht(2, 0, 5);
}
static void test_2th20u5s(void)
{
test_qht(2, 20, 5);
}
int main(int argc, char *argv[])
{
g_test_init(&argc, &argv, NULL);
if (g_test_quick()) {
g_test_add_func("/qht/parallel/2threads-0%updates-1s", test_2th0u1s);
g_test_add_func("/qht/parallel/2threads-20%updates-1s", test_2th20u1s);
} else {
g_test_add_func("/qht/parallel/2threads-0%updates-5s", test_2th0u5s);
g_test_add_func("/qht/parallel/2threads-20%updates-5s", test_2th20u5s);
}
return g_test_run();
}