notify: add basic unit tests for notifications
Signed-off-by: Piotr Pelplinski <piotr.pelplinski@intel.com> Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Change-Id: Ia6cc45c1c539cdc7d25fbe1a562afb21783dde4c Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/432308 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
parent
de5f53220c
commit
1d83a09d4b
@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
|
|||||||
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
|
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
|
||||||
|
|
||||||
DIRS-y = bdev blob blobfs event ioat iscsi json jsonrpc log lvol
|
DIRS-y = bdev blob blobfs event ioat iscsi json jsonrpc log lvol
|
||||||
DIRS-y += nvme nvmf scsi sock thread util
|
DIRS-y += notify nvme nvmf scsi sock thread util
|
||||||
DIRS-$(CONFIG_REDUCE) += reduce
|
DIRS-$(CONFIG_REDUCE) += reduce
|
||||||
ifeq ($(OS),Linux)
|
ifeq ($(OS),Linux)
|
||||||
DIRS-$(CONFIG_VHOST) += vhost
|
DIRS-$(CONFIG_VHOST) += vhost
|
||||||
|
@ -58,6 +58,9 @@ DEFINE_STUB_V(spdk_trace_register_description, (const char *name, const char *sh
|
|||||||
uint8_t arg1_is_ptr, const char *arg1_name));
|
uint8_t arg1_is_ptr, const char *arg1_name));
|
||||||
DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,
|
DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,
|
||||||
uint32_t size, uint64_t object_id, uint64_t arg1));
|
uint32_t size, uint64_t object_id, uint64_t arg1));
|
||||||
|
DEFINE_STUB(spdk_notify_send, uint64_t, (const char *type, const char *ctx), 0);
|
||||||
|
DEFINE_STUB(spdk_notify_type_register, struct spdk_notify_type *, (const char *type), NULL);
|
||||||
|
|
||||||
|
|
||||||
int g_status;
|
int g_status;
|
||||||
int g_count;
|
int g_count;
|
||||||
|
@ -60,6 +60,8 @@ DEFINE_STUB_V(spdk_trace_register_description, (const char *name, const char *sh
|
|||||||
uint8_t arg1_is_ptr, const char *arg1_name));
|
uint8_t arg1_is_ptr, const char *arg1_name));
|
||||||
DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,
|
DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,
|
||||||
uint32_t size, uint64_t object_id, uint64_t arg1));
|
uint32_t size, uint64_t object_id, uint64_t arg1));
|
||||||
|
DEFINE_STUB(spdk_notify_send, uint64_t, (const char *type, const char *ctx), 0);
|
||||||
|
DEFINE_STUB(spdk_notify_type_register, struct spdk_notify_type *, (const char *type), NULL);
|
||||||
|
|
||||||
struct ut_bdev {
|
struct ut_bdev {
|
||||||
struct spdk_bdev bdev;
|
struct spdk_bdev bdev;
|
||||||
|
@ -61,6 +61,8 @@ DEFINE_STUB_V(spdk_trace_register_description, (const char *name, const char *sh
|
|||||||
uint8_t arg1_is_ptr, const char *arg1_name));
|
uint8_t arg1_is_ptr, const char *arg1_name));
|
||||||
DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,
|
DEFINE_STUB_V(_spdk_trace_record, (uint64_t tsc, uint16_t tpoint_id, uint16_t poller_id,
|
||||||
uint32_t size, uint64_t object_id, uint64_t arg1));
|
uint32_t size, uint64_t object_id, uint64_t arg1));
|
||||||
|
DEFINE_STUB(spdk_notify_send, uint64_t, (const char *type, const char *ctx), 0);
|
||||||
|
DEFINE_STUB(spdk_notify_type_register, struct spdk_notify_type *, (const char *type), NULL);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_part_cleanup(struct spdk_bdev_part *part)
|
_part_cleanup(struct spdk_bdev_part *part)
|
||||||
|
44
test/unit/lib/notify/Makefile
Normal file
44
test/unit/lib/notify/Makefile
Normal file
@ -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 = notify.c
|
||||||
|
|
||||||
|
.PHONY: all clean $(DIRS-y)
|
||||||
|
|
||||||
|
all: $(DIRS-y)
|
||||||
|
clean: $(DIRS-y)
|
||||||
|
|
||||||
|
include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk
|
1
test/unit/lib/notify/notify.c/.gitignore
vendored
Normal file
1
test/unit/lib/notify/notify.c/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
notify_ut
|
38
test/unit/lib/notify/notify.c/Makefile
Normal file
38
test/unit/lib/notify/notify.c/Makefile
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
#
|
||||||
|
# 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
|
||||||
|
TEST_FILE = notify_ut.c
|
||||||
|
|
||||||
|
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
|
120
test/unit/lib/notify/notify.c/notify_ut.c
Normal file
120
test/unit/lib/notify/notify.c/notify_ut.c
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
/*-
|
||||||
|
* 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/stdinc.h"
|
||||||
|
#include "spdk_cunit.h"
|
||||||
|
#include "common/lib/test_env.c"
|
||||||
|
#include "unit/lib/json_mock.c"
|
||||||
|
#include "notify/notify.c"
|
||||||
|
|
||||||
|
static int
|
||||||
|
event_cb(uint64_t idx, const struct spdk_notify_event *event, void *ctx)
|
||||||
|
{
|
||||||
|
const struct spdk_notify_event **_event = ctx;
|
||||||
|
|
||||||
|
*_event = event;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
notify(void)
|
||||||
|
{
|
||||||
|
struct spdk_notify_type *n1, *n2;
|
||||||
|
const struct spdk_notify_event *event;
|
||||||
|
const char *name;
|
||||||
|
uint64_t cnt;
|
||||||
|
|
||||||
|
n1 = spdk_notify_type_register("one");
|
||||||
|
n2 = spdk_notify_type_register("two");
|
||||||
|
|
||||||
|
name = spdk_notify_type_get_name(n1);
|
||||||
|
CU_ASSERT(strcmp(name, "one") == 0);
|
||||||
|
|
||||||
|
name = spdk_notify_type_get_name(n2);
|
||||||
|
CU_ASSERT(strcmp(name, "two") == 0);
|
||||||
|
|
||||||
|
|
||||||
|
spdk_notify_send("one", "one_context");
|
||||||
|
spdk_notify_send("two", "two_context");
|
||||||
|
|
||||||
|
event = NULL;
|
||||||
|
cnt = spdk_notify_get_events(0, 1, event_cb, &event);
|
||||||
|
SPDK_CU_ASSERT_FATAL(cnt == 1);
|
||||||
|
SPDK_CU_ASSERT_FATAL(event != NULL);
|
||||||
|
CU_ASSERT(strcmp(event->type, "one") == 0);
|
||||||
|
CU_ASSERT(strcmp(event->ctx, "one_context") == 0);
|
||||||
|
|
||||||
|
event = NULL;
|
||||||
|
cnt = spdk_notify_get_events(1, 1, event_cb, &event);
|
||||||
|
SPDK_CU_ASSERT_FATAL(cnt == 1);
|
||||||
|
SPDK_CU_ASSERT_FATAL(event != NULL);
|
||||||
|
CU_ASSERT(strcmp(event->type, "two") == 0);
|
||||||
|
CU_ASSERT(strcmp(event->ctx, "two_context") == 0);
|
||||||
|
|
||||||
|
/* This event should not exist yet */
|
||||||
|
event = NULL;
|
||||||
|
cnt = spdk_notify_get_events(2, 1, event_cb, &event);
|
||||||
|
CU_ASSERT(cnt == 0);
|
||||||
|
CU_ASSERT(event == NULL);
|
||||||
|
|
||||||
|
SPDK_CU_ASSERT_FATAL(event == NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
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("app_suite", NULL, NULL);
|
||||||
|
if (suite == NULL) {
|
||||||
|
CU_cleanup_registry();
|
||||||
|
return CU_get_error();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (CU_add_test(suite, "notify", notify) == 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;
|
||||||
|
}
|
@ -123,6 +123,8 @@ $valgrind $testdir/lib/scsi/scsi_bdev.c/scsi_bdev_ut
|
|||||||
|
|
||||||
$valgrind $testdir/lib/lvol/lvol.c/lvol_ut
|
$valgrind $testdir/lib/lvol/lvol.c/lvol_ut
|
||||||
|
|
||||||
|
$valgrind $testdir/lib/notify/notify.c/notify_ut
|
||||||
|
|
||||||
$valgrind $testdir/lib/iscsi/conn.c/conn_ut
|
$valgrind $testdir/lib/iscsi/conn.c/conn_ut
|
||||||
$valgrind $testdir/lib/iscsi/param.c/param_ut
|
$valgrind $testdir/lib/iscsi/param.c/param_ut
|
||||||
$valgrind $testdir/lib/iscsi/tgt_node.c/tgt_node_ut $testdir/lib/iscsi/tgt_node.c/tgt_node.conf
|
$valgrind $testdir/lib/iscsi/tgt_node.c/tgt_node_ut $testdir/lib/iscsi/tgt_node.c/tgt_node.conf
|
||||||
|
Loading…
Reference in New Issue
Block a user