Commit 134590a2 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

lib/jsonrpc: remove spdk_ prefix from internal functions. 



Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: Ieeb58943536caf46db77ce22509eccb477fa914a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2214


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

lib/jsonrpc/jsonrpc_client.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static const struct spdk_json_object_decoder jsonrpc_response_decoders[] = { 
};



int

spdk_jsonrpc_parse_response(struct spdk_jsonrpc_client *client)

jsonrpc_parse_response(struct spdk_jsonrpc_client *client)

{

	struct spdk_jsonrpc_client_response_internal *r;

	ssize_t rc;

lib/jsonrpc/jsonrpc_client_tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ _spdk_jsonrpc_client_recv(struct spdk_jsonrpc_client *client) 
	client->recv_buf[client->recv_offset] = '\0';



	/* Check to see if we have received a full JSON value. */

	return spdk_jsonrpc_parse_response(client);

	return jsonrpc_parse_response(client);

}



static int

lib/jsonrpc/jsonrpc_internal.h

+9 −9
Original line number Diff line number Diff line
@@ -136,20 +136,20 @@ struct spdk_jsonrpc_client { 
};



/* jsonrpc_server_tcp */

void spdk_jsonrpc_server_handle_request(struct spdk_jsonrpc_request *request,

void jsonrpc_server_handle_request(struct spdk_jsonrpc_request *request,

				   const struct spdk_json_val *method,

				   const struct spdk_json_val *params);

void spdk_jsonrpc_server_handle_error(struct spdk_jsonrpc_request *request, int error);

void jsonrpc_server_handle_error(struct spdk_jsonrpc_request *request, int error);



/* Might be called from any thread */

void spdk_jsonrpc_server_send_response(struct spdk_jsonrpc_request *request);

void jsonrpc_server_send_response(struct spdk_jsonrpc_request *request);



/* jsonrpc_server */

int spdk_jsonrpc_parse_request(struct spdk_jsonrpc_server_conn *conn, const void *json,

int jsonrpc_parse_request(struct spdk_jsonrpc_server_conn *conn, const void *json,

			  size_t size);



/* Must be called only from server poll thread */

void spdk_jsonrpc_free_request(struct spdk_jsonrpc_request *request);

void jsonrpc_free_request(struct spdk_jsonrpc_request *request);



/*

 * Parse JSON data as RPC command response.
@@ -161,6 +161,6 @@ void spdk_jsonrpc_free_request(struct spdk_jsonrpc_request *request); 
 * -EINVAL - If the provided data has invalid JSON syntax and can't be parsed (SPDK_JSON_PARSE_INVALID).

 * -ENOSPC - No space left to store parsed response.

 */

int spdk_jsonrpc_parse_response(struct spdk_jsonrpc_client *client);

int jsonrpc_parse_response(struct spdk_jsonrpc_client *client);



#endif

lib/jsonrpc/jsonrpc_server.c

+14 −14
Original line number Diff line number Diff line
@@ -100,11 +100,11 @@ parse_single_request(struct spdk_jsonrpc_request *request, struct spdk_json_val 
		}

	}



	spdk_jsonrpc_server_handle_request(request, req.method, params);

	jsonrpc_server_handle_request(request, req.method, params);

	return;



invalid:

	spdk_jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_INVALID_REQUEST);

	jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_INVALID_REQUEST);

}



static int
@@ -144,7 +144,7 @@ spdk_jsonrpc_server_write_cb(void *cb_ctx, const void *data, size_t size) 
}



int

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

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

{

	struct spdk_jsonrpc_request *request;

	ssize_t rc;
@@ -172,7 +172,7 @@ spdk_jsonrpc_parse_request(struct spdk_jsonrpc_server_conn *conn, const void *js 
	request->recv_buffer = malloc(len + 1);

	if (request->recv_buffer == NULL) {

		SPDK_ERRLOG("Failed to allocate buffer to copy request (%zu bytes)\n", len + 1);

		spdk_jsonrpc_free_request(request);

		jsonrpc_free_request(request);

		return -1;

	}
@@ -185,7 +185,7 @@ spdk_jsonrpc_parse_request(struct spdk_jsonrpc_server_conn *conn, const void *js 
		if (request->values == NULL) {

			SPDK_ERRLOG("Failed to allocate buffer for JSON values (%zu bytes)\n",

				    request->values_cnt * sizeof(request->values[0]));

			spdk_jsonrpc_free_request(request);

			jsonrpc_free_request(request);

			return -1;

		}

	}
@@ -196,20 +196,20 @@ spdk_jsonrpc_parse_request(struct spdk_jsonrpc_server_conn *conn, const void *js 
	request->send_buf = malloc(request->send_buf_size);

	if (request->send_buf == NULL) {

		SPDK_ERRLOG("Failed to allocate send_buf (%zu bytes)\n", request->send_buf_size);

		spdk_jsonrpc_free_request(request);

		jsonrpc_free_request(request);

		return -1;

	}



	request->response = spdk_json_write_begin(spdk_jsonrpc_server_write_cb, request, 0);

	if (request->response == NULL) {

		SPDK_ERRLOG("Failed to allocate response JSON write context.\n");

		spdk_jsonrpc_free_request(request);

		jsonrpc_free_request(request);

		return -1;

	}



	if (rc <= 0 || rc > SPDK_JSONRPC_MAX_VALUES) {

		SPDK_DEBUGLOG(SPDK_LOG_RPC, "JSON parse error\n");

		spdk_jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_PARSE_ERROR);

		jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_PARSE_ERROR);



		/*

		 * Can't recover from parse error (no guaranteed resync point in streaming JSON).
@@ -223,7 +223,7 @@ spdk_jsonrpc_parse_request(struct spdk_jsonrpc_server_conn *conn, const void *js 
			     SPDK_JSON_PARSE_FLAG_DECODE_IN_PLACE);

	if (rc < 0 || rc > SPDK_JSONRPC_MAX_VALUES) {

		SPDK_DEBUGLOG(SPDK_LOG_RPC, "JSON parse error on second pass\n");

		spdk_jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_PARSE_ERROR);

		jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_PARSE_ERROR);

		return -1;

	}
@@ -233,10 +233,10 @@ spdk_jsonrpc_parse_request(struct spdk_jsonrpc_server_conn *conn, const void *js 
		parse_single_request(request, request->values);

	} else if (request->values[0].type == SPDK_JSON_VAL_ARRAY_BEGIN) {

		SPDK_DEBUGLOG(SPDK_LOG_RPC, "Got batch array (not currently supported)\n");

		spdk_jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_INVALID_REQUEST);

		jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_INVALID_REQUEST);

	} else {

		SPDK_DEBUGLOG(SPDK_LOG_RPC, "top-level JSON value was not array or object\n");

		spdk_jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_INVALID_REQUEST);

		jsonrpc_server_handle_error(request, SPDK_JSONRPC_ERROR_INVALID_REQUEST);

	}



	return len;
@@ -273,7 +273,7 @@ skip_response(struct spdk_jsonrpc_request *request) 
	request->send_len = 0;

	spdk_json_write_end(request->response);

	request->response = NULL;

	spdk_jsonrpc_server_send_response(request);

	jsonrpc_server_send_response(request);

}



static void
@@ -284,11 +284,11 @@ end_response(struct spdk_jsonrpc_request *request) 
	request->response = NULL;



	spdk_jsonrpc_server_write_cb(request, "\n", 1);

	spdk_jsonrpc_server_send_response(request);

	jsonrpc_server_send_response(request);

}



void

spdk_jsonrpc_free_request(struct spdk_jsonrpc_request *request)

jsonrpc_free_request(struct spdk_jsonrpc_request *request)

{

	if (!request) {

		return;

lib/jsonrpc/jsonrpc_server_tcp.c

+8 −8
Original line number Diff line number Diff line
@@ -117,10 +117,10 @@ spdk_jsonrpc_server_free_conn_request(struct spdk_jsonrpc_server_conn *conn) 
{

	struct spdk_jsonrpc_request *request;



	spdk_jsonrpc_free_request(conn->send_request);

	jsonrpc_free_request(conn->send_request);

	conn->send_request = NULL ;

	while ((request = spdk_jsonrpc_server_dequeue_request(conn)) != NULL) {

		spdk_jsonrpc_free_request(request);

		jsonrpc_free_request(request);

	}

}
@@ -244,14 +244,14 @@ spdk_jsonrpc_server_accept(struct spdk_jsonrpc_server *server) 
}



void

spdk_jsonrpc_server_handle_request(struct spdk_jsonrpc_request *request,

jsonrpc_server_handle_request(struct spdk_jsonrpc_request *request,

			      const struct spdk_json_val *method, const struct spdk_json_val *params)

{

	request->conn->server->handle_request(request, method, params);

}



void

spdk_jsonrpc_server_handle_error(struct spdk_jsonrpc_request *request, int error)

jsonrpc_server_handle_error(struct spdk_jsonrpc_request *request, int error)

{

	const char *msg;
@@ -309,7 +309,7 @@ spdk_jsonrpc_server_conn_recv(struct spdk_jsonrpc_server_conn *conn) 


	offset = 0;

	do {

		rc = spdk_jsonrpc_parse_request(conn, conn->recv_buf + offset, conn->recv_len - offset);

		rc = jsonrpc_parse_request(conn, conn->recv_buf + offset, conn->recv_len - offset);

		if (rc < 0) {

			SPDK_ERRLOG("jsonrpc parse request failed\n");

			return -1;
@@ -332,7 +332,7 @@ spdk_jsonrpc_server_conn_recv(struct spdk_jsonrpc_server_conn *conn) 
}



void

spdk_jsonrpc_server_send_response(struct spdk_jsonrpc_request *request)

jsonrpc_server_send_response(struct spdk_jsonrpc_request *request)

{

	struct spdk_jsonrpc_server_conn *conn = request->conn;
@@ -386,7 +386,7 @@ more: 
		 * Free it and set send_request to NULL to move on to the next queued response.

		 */

		conn->send_request = NULL;

		spdk_jsonrpc_free_request(request);

		jsonrpc_free_request(request);

		goto more;

	}