From 1bcbf5d779c4df9144fce87bc6c9b84b2e39653d Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Wed, 6 May 2020 13:25:28 -0700 Subject: [PATCH] lib/json: add a map file. While we are here, change SPDK_LOG_JSON_UTIL to SPDK_LOG_JSON It fits better with the naming convention. Signed-off-by: Seth Howell Change-Id: I12bc8a44acf3effc5effcbc40ef1ab9af6e52c6c Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2211 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- lib/json/Makefile | 2 ++ lib/json/json_util.c | 4 +-- lib/json/spdk_json.map | 67 ++++++++++++++++++++++++++++++++++++++ test/make/check_so_deps.sh | 2 ++ 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 lib/json/spdk_json.map diff --git a/lib/json/Makefile b/lib/json/Makefile index 710677579..d618e1d03 100644 --- a/lib/json/Makefile +++ b/lib/json/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = json_parse.c json_util.c json_write.c LIBNAME = json +SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_json.map) + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/json/json_util.c b/lib/json/json_util.c index f8103f346..18a56b114 100644 --- a/lib/json/json_util.c +++ b/lib/json/json_util.c @@ -36,7 +36,7 @@ #include "spdk_internal/utf.h" #include "spdk_internal/log.h" -#define SPDK_JSON_DEBUG(...) SPDK_DEBUGLOG(SPDK_LOG_JSON_UTIL, __VA_ARGS__) +#define SPDK_JSON_DEBUG(...) SPDK_DEBUGLOG(SPDK_LOG_JSON, __VA_ARGS__) size_t spdk_json_val_len(const struct spdk_json_val *val) @@ -650,4 +650,4 @@ spdk_json_next(struct spdk_json_val *it) } } -SPDK_LOG_REGISTER_COMPONENT("json_util", SPDK_LOG_JSON_UTIL) +SPDK_LOG_REGISTER_COMPONENT("json_util", SPDK_LOG_JSON) diff --git a/lib/json/spdk_json.map b/lib/json/spdk_json.map new file mode 100644 index 000000000..0699feaad --- /dev/null +++ b/lib/json/spdk_json.map @@ -0,0 +1,67 @@ +{ + global: + + # public functions + spdk_json_parse; + spdk_json_decode_object; + spdk_json_decode_array; + spdk_json_decode_bool; + spdk_json_decode_uint16; + spdk_json_decode_int32; + spdk_json_decode_uint32; + spdk_json_decode_uint64; + spdk_json_decode_string; + + spdk_json_val_len; + spdk_json_strequal; + spdk_json_strdup; + + spdk_json_number_to_uint16; + spdk_json_number_to_int32; + spdk_json_number_to_uint32; + spdk_json_number_to_uint64; + + spdk_json_write_begin; + spdk_json_write_end; + spdk_json_write_null; + spdk_json_write_bool; + spdk_json_write_int32; + spdk_json_write_uint32; + spdk_json_write_int64; + spdk_json_write_uint64; + spdk_json_write_string; + spdk_json_write_string_raw; + spdk_json_write_string_utf16le; + spdk_json_write_string_utf16le_raw; + spdk_json_write_string_fmt; + spdk_json_write_string_fmt_v; + spdk_json_write_array_begin; + spdk_json_write_array_end; + spdk_json_write_object_begin; + spdk_json_write_object_end; + spdk_json_write_name; + spdk_json_write_name_raw; + spdk_json_write_val; + spdk_json_write_val_raw; + + spdk_json_write_named_null; + spdk_json_write_named_bool; + spdk_json_write_named_int32; + spdk_json_write_named_uint32; + spdk_json_write_named_uint64; + spdk_json_write_named_int64; + spdk_json_write_named_string; + spdk_json_write_named_string_fmt; + spdk_json_write_named_string_fmt_v; + spdk_json_write_named_array_begin; + spdk_json_write_named_object_begin; + + spdk_json_find; + spdk_json_find_string; + spdk_json_find_array; + spdk_json_object_first; + spdk_json_array_first; + spdk_json_next; + + local: *; +}; diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index 67e5a556b..d4f23ae5b 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -38,6 +38,8 @@ function confirm_abi_deps() { name = SPDK_LOG_IDXD [suppress_variable] name = SPDK_LOG_IOAT +[suppress_variable] + name = SPDK_LOG_JSON_UTIL EOF for object in "$libdir"/libspdk_*.so; do