Commit d270cd36 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Ben Walker
Browse files

jsonrpc: Reorder spdk_jsonrpc_server_write_cb 



We'll use it in spdk_jsonrpc_parse_request() soon.

Change-Id: I78ad2a931787b095e65053bea4dce663a92bb3b0
Signed-off-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459657


Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 46f3260a

lib/jsonrpc/jsonrpc_server.c

+36 −36
Original line number Diff line number Diff line
@@ -102,6 +102,42 @@ invalid: 
	spdk_jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_INVALID_REQUEST);

}



static int

spdk_jsonrpc_server_write_cb(void *cb_ctx, const void *data, size_t size)

{

	struct spdk_jsonrpc_request *request = cb_ctx;

	size_t new_size = request->send_buf_size;



	while (new_size - request->send_len < size) {

		if (new_size >= SPDK_JSONRPC_SEND_BUF_SIZE_MAX) {

			SPDK_ERRLOG("Send buf exceeded maximum size (%zu)\n",

				    (size_t)SPDK_JSONRPC_SEND_BUF_SIZE_MAX);

			return -1;

		}



		new_size *= 2;

	}



	if (new_size != request->send_buf_size) {

		uint8_t *new_buf;



		new_buf = realloc(request->send_buf, new_size);

		if (new_buf == NULL) {

			SPDK_ERRLOG("Resizing send_buf failed (current size %zu, new size %zu)\n",

				    request->send_buf_size, new_size);

			return -1;

		}



		request->send_buf = new_buf;

		request->send_buf_size = new_size;

	}



	memcpy(request->send_buf + request->send_len, data, size);

	request->send_len += size;



	return 0;

}



int

spdk_jsonrpc_parse_request(struct spdk_jsonrpc_server_conn *conn, const void *json, size_t size)

{
@@ -200,42 +236,6 @@ spdk_jsonrpc_get_conn(struct spdk_jsonrpc_request *request) 
	return request->conn;

}



static int

spdk_jsonrpc_server_write_cb(void *cb_ctx, const void *data, size_t size)

{

	struct spdk_jsonrpc_request *request = cb_ctx;

	size_t new_size = request->send_buf_size;



	while (new_size - request->send_len < size) {

		if (new_size >= SPDK_JSONRPC_SEND_BUF_SIZE_MAX) {

			SPDK_ERRLOG("Send buf exceeded maximum size (%zu)\n",

				    (size_t)SPDK_JSONRPC_SEND_BUF_SIZE_MAX);

			return -1;

		}



		new_size *= 2;

	}



	if (new_size != request->send_buf_size) {

		uint8_t *new_buf;



		new_buf = realloc(request->send_buf, new_size);

		if (new_buf == NULL) {

			SPDK_ERRLOG("Resizing send_buf failed (current size %zu, new size %zu)\n",

				    request->send_buf_size, new_size);

			return -1;

		}



		request->send_buf = new_buf;

		request->send_buf_size = new_size;

	}



	memcpy(request->send_buf + request->send_len, data, size);

	request->send_len += size;



	return 0;

}



static struct spdk_json_write_ctx *

begin_response(struct spdk_jsonrpc_request *request)

{