From fe8138cebbcde2415de235e8a8e43c460b6de4e6 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 21 Dec 2017 15:17:20 -0700 Subject: [PATCH] test: add histogram unit tests Signed-off-by: Jim Harris Change-Id: I79c2c30e15b8254c3cb75af5615dfafee84a9abd Reviewed-on: https://review.gerrithub.io/392709 Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker --- test/unit/Makefile | 2 +- test/unit/include/Makefile | 44 ++++++ test/unit/include/spdk/Makefile | 44 ++++++ .../include/spdk/histogram_data.h/.gitignore | 1 + .../include/spdk/histogram_data.h/Makefile | 52 +++++++ .../spdk/histogram_data.h/histogram_ut.c | 135 ++++++++++++++++++ unittest.sh | 2 + 7 files changed, 279 insertions(+), 1 deletion(-) create mode 100644 test/unit/include/Makefile create mode 100644 test/unit/include/spdk/Makefile create mode 100644 test/unit/include/spdk/histogram_data.h/.gitignore create mode 100644 test/unit/include/spdk/histogram_data.h/Makefile create mode 100644 test/unit/include/spdk/histogram_data.h/histogram_ut.c diff --git a/test/unit/Makefile b/test/unit/Makefile index 6ccd8cf14..dbe663cbb 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = lib +DIRS-y = include lib .PHONY: all clean $(DIRS-y) diff --git a/test/unit/include/Makefile b/test/unit/include/Makefile new file mode 100644 index 000000000..0ddc15242 --- /dev/null +++ b/test/unit/include/Makefile @@ -0,0 +1,44 @@ +# +# BSD LICENSE +# +# Copyright (c) Intel Corporation. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk + +DIRS-y = spdk + +.PHONY: all clean $(DIRS-y) + +all: $(DIRS-y) +clean: $(DIRS-y) + +include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk diff --git a/test/unit/include/spdk/Makefile b/test/unit/include/spdk/Makefile new file mode 100644 index 000000000..d99c7d632 --- /dev/null +++ b/test/unit/include/spdk/Makefile @@ -0,0 +1,44 @@ +# +# BSD LICENSE +# +# Copyright (c) Intel Corporation. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk + +DIRS-y = histogram_data.h + +.PHONY: all clean $(DIRS-y) + +all: $(DIRS-y) +clean: $(DIRS-y) + +include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk diff --git a/test/unit/include/spdk/histogram_data.h/.gitignore b/test/unit/include/spdk/histogram_data.h/.gitignore new file mode 100644 index 000000000..b2b36ff73 --- /dev/null +++ b/test/unit/include/spdk/histogram_data.h/.gitignore @@ -0,0 +1 @@ +histogram_ut diff --git a/test/unit/include/spdk/histogram_data.h/Makefile b/test/unit/include/spdk/histogram_data.h/Makefile new file mode 100644 index 000000000..12ef5f515 --- /dev/null +++ b/test/unit/include/spdk/histogram_data.h/Makefile @@ -0,0 +1,52 @@ +# +# BSD LICENSE +# +# Copyright (c) 2016 FUJITSU LIMITED, All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk + +CFLAGS += -I$(SPDK_ROOT_DIR)/test +LIBS += $(SPDK_LIB_LINKER_ARGS) +LIBS += -lcunit + +APP = histogram_ut +C_SRCS = histogram_ut.c + +all: $(APP) + +$(APP): $(OBJS) $(SPDK_LIB_FILES) + $(LINK_C) + +clean: + $(CLEAN_C) $(APP) + +include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk diff --git a/test/unit/include/spdk/histogram_data.h/histogram_ut.c b/test/unit/include/spdk/histogram_data.h/histogram_ut.c new file mode 100644 index 000000000..da67e2eff --- /dev/null +++ b/test/unit/include/spdk/histogram_data.h/histogram_ut.c @@ -0,0 +1,135 @@ +/*- + * BSD LICENSE + * + * Copyright (c) Intel Corporation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "spdk_cunit.h" + +#include "spdk/histogram_data.h" +#include "spdk/util.h" + +uint64_t g_values[] = { + 1, + 10, + 1000, + 50000, + (1ULL << 63), + UINT64_MAX +}; + +uint64_t *g_values_end = &g_values[SPDK_COUNTOF(g_values)]; +uint64_t g_total; + +static void +check_values(void *ctx, uint64_t start, uint64_t end, uint64_t count, + uint64_t total, uint64_t so_far) +{ + uint64_t **values = ctx; + + if (count == 0) { + return; + } + + CU_ASSERT(so_far == (g_total + count)); + + /* + * The bucket for this iteration does not include end, but + * subtract one anyways to account for the last bucket + * which will have end = 0x0 (UINT64_MAX + 1). + */ + end--; + + while (1) { + CU_ASSERT(**values >= start); + /* + * We subtracted one from end above, so it's OK here for + * **values to equal end. + */ + CU_ASSERT(**values <= end); + g_total++; + count--; + (*values)++; + if (*values == g_values_end || **values > end) { + break; + } + } + + CU_ASSERT(count == 0); +} + +static void +histogram_test(void) +{ + struct spdk_histogram_data *h; + uint64_t *values = g_values; + uint32_t i; + + h = spdk_histogram_data_alloc(); + + for (i = 0; i < SPDK_COUNTOF(g_values); i++) { + spdk_histogram_data_tally(h, g_values[i]); + } + + g_total = 0; + spdk_histogram_data_iterate(h, check_values, &values); + + spdk_histogram_data_free(h); +} + +int +main(int argc, char **argv) +{ + CU_pSuite suite = NULL; + unsigned int num_failures; + + if (CU_initialize_registry() != CUE_SUCCESS) { + return CU_get_error(); + } + + suite = CU_add_suite("histogram", NULL, NULL); + if (suite == NULL) { + CU_cleanup_registry(); + return CU_get_error(); + } + + if ( + CU_add_test(suite, "histogram_test", histogram_test) == NULL + ) { + CU_cleanup_registry(); + return CU_get_error(); + } + + CU_basic_set_mode(CU_BRM_VERBOSE); + CU_basic_run_tests(); + num_failures = CU_get_number_of_failures(); + CU_cleanup_registry(); + return num_failures; +} diff --git a/unittest.sh b/unittest.sh index dbe9e3c13..4e7fcd29d 100755 --- a/unittest.sh +++ b/unittest.sh @@ -41,6 +41,8 @@ if [ "$cov_avail" = "yes" ]; then $LCOV -q -c -i -d . -t "Baseline" -o $UT_COVERAGE/ut_cov_base.info fi +$valgrind test/unit/include/spdk/histogram_data.h/histogram_ut + $valgrind test/unit/lib/bdev/bdev.c/bdev_ut $valgrind test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut $valgrind test/unit/lib/bdev/gpt/gpt.c/gpt_ut