Commit 1bcbf5d7 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

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: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: I12bc8a44acf3effc5effcbc40ef1ab9af6e52c6c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2211


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 12a3278a

lib/json/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -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

lib/json/json_util.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

lib/json/spdk_json.map

0 → 100644
+67 −0
Original line number Diff line number Diff line 
{

	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: *;

};

test/make/check_so_deps.sh

+2 −0
Original line number Diff line number Diff line
@@ -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