Commit 90472b86 authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

json: new relaxed decode object function 



With new funtion it is allowed to successfully parse json values even
if doceder for given key is not found.

Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Change-Id: I036f263e9050bd2b96aaa3ff61a9542c98365892
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4340


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent de016f27

include/spdk/json.h

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ struct spdk_json_object_decoder { 


int spdk_json_decode_object(const struct spdk_json_val *values,

			    const struct spdk_json_object_decoder *decoders, size_t num_decoders, void *out);

int spdk_json_decode_object_relaxed(const struct spdk_json_val *values,

				    const struct spdk_json_object_decoder *decoders, size_t num_decoders, void *out);

int spdk_json_decode_array(const struct spdk_json_val *values, spdk_json_decode_fn decode_func,

			   void *out, size_t max_size, size_t *out_size, size_t stride);

lib/json/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



SO_VER := 2

SO_MINOR := 0

SO_MINOR := 1



C_SRCS = json_parse.c json_util.c json_write.c

LIBNAME = json

lib/json/json_util.c

+18 −4
Original line number Diff line number Diff line
@@ -298,9 +298,9 @@ spdk_json_number_to_uint64(const struct spdk_json_val *val, uint64_t *num) 
	return 0;

}



int

spdk_json_decode_object(const struct spdk_json_val *values,

			const struct spdk_json_object_decoder *decoders, size_t num_decoders, void *out)

static int

_json_decode_object(const struct spdk_json_val *values,

		    const struct spdk_json_object_decoder *decoders, size_t num_decoders, void *out, bool relaxed)

{

	uint32_t i;

	bool invalid = false;
@@ -344,7 +344,7 @@ spdk_json_decode_object(const struct spdk_json_val *values, 
			}

		}



		if (!found) {

		if (!relaxed && !found) {

			invalid = true;

			SPDK_JSON_DEBUG("Decoder not found for key '%.*s'\n", name->len, (char *)name->start);

		}
@@ -364,6 +364,20 @@ spdk_json_decode_object(const struct spdk_json_val *values, 
	return invalid ? -1 : 0;

}



int

spdk_json_decode_object(const struct spdk_json_val *values,

			const struct spdk_json_object_decoder *decoders, size_t num_decoders, void *out)

{

	return _json_decode_object(values, decoders, num_decoders, out, false);

}



int

spdk_json_decode_object_relaxed(const struct spdk_json_val *values,

				const struct spdk_json_object_decoder *decoders, size_t num_decoders, void *out)

{

	return _json_decode_object(values, decoders, num_decoders, out, true);

}



int

spdk_json_decode_array(const struct spdk_json_val *values, spdk_json_decode_fn decode_func,

		       void *out, size_t max_size, size_t *out_size, size_t stride)

lib/json/spdk_json.map

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
	# public functions

	spdk_json_parse;

	spdk_json_decode_object;

	spdk_json_decode_object_relaxed;

	spdk_json_decode_array;

	spdk_json_decode_bool;

	spdk_json_decode_uint16;