From 134590a2060e5e5c4c42116f4f02756d74a31143 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Wed, 6 May 2020 15:01:28 -0700 Subject: [PATCH] lib/jsonrpc: remove spdk_ prefix from internal functions. Signed-off-by: Seth Howell Change-Id: Ieeb58943536caf46db77ce22509eccb477fa914a Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2214 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk --- lib/jsonrpc/jsonrpc_client.c | 2 +- lib/jsonrpc/jsonrpc_client_tcp.c | 2 +- lib/jsonrpc/jsonrpc_internal.h | 18 ++++++------ lib/jsonrpc/jsonrpc_server.c | 28 +++++++++---------- lib/jsonrpc/jsonrpc_server_tcp.c | 16 +++++------ .../jsonrpc_server.c/jsonrpc_server_ut.c | 18 ++++++------ 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/lib/jsonrpc/jsonrpc_client.c b/lib/jsonrpc/jsonrpc_client.c index 2694faf2b..e3940a4d4 100644 --- a/lib/jsonrpc/jsonrpc_client.c +++ b/lib/jsonrpc/jsonrpc_client.c @@ -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; diff --git a/lib/jsonrpc/jsonrpc_client_tcp.c b/lib/jsonrpc/jsonrpc_client_tcp.c index d3638c633..73869828b 100644 --- a/lib/jsonrpc/jsonrpc_client_tcp.c +++ b/lib/jsonrpc/jsonrpc_client_tcp.c @@ -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 diff --git a/lib/jsonrpc/jsonrpc_internal.h b/lib/jsonrpc/jsonrpc_internal.h index 2631d76e9..f51bedf62 100644 --- a/lib/jsonrpc/jsonrpc_internal.h +++ b/lib/jsonrpc/jsonrpc_internal.h @@ -136,20 +136,20 @@ struct spdk_jsonrpc_client { }; /* jsonrpc_server_tcp */ -void spdk_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_request(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *method, + const struct spdk_json_val *params); +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, - size_t size); +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 diff --git a/lib/jsonrpc/jsonrpc_server.c b/lib/jsonrpc/jsonrpc_server.c index b0a34caef..55842ac6f 100644 --- a/lib/jsonrpc/jsonrpc_server.c +++ b/lib/jsonrpc/jsonrpc_server.c @@ -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; diff --git a/lib/jsonrpc/jsonrpc_server_tcp.c b/lib/jsonrpc/jsonrpc_server_tcp.c index f3d870755..636a336fd 100644 --- a/lib/jsonrpc/jsonrpc_server_tcp.c +++ b/lib/jsonrpc/jsonrpc_server_tcp.c @@ -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, - const struct spdk_json_val *method, const struct spdk_json_val *params) +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; } diff --git a/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c b/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c index 4d48f6ba8..8c3ffa208 100644 --- a/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c +++ b/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c @@ -47,7 +47,7 @@ const struct spdk_json_val *g_cur_param; #define PARSE_PASS(in, trailing) \ CU_ASSERT(g_cur_param == NULL); \ g_cur_param = NULL; \ - CU_ASSERT(spdk_jsonrpc_parse_request(conn, in, sizeof(in) - 1) == sizeof(in) - sizeof(trailing)) + CU_ASSERT(jsonrpc_parse_request(conn, in, sizeof(in) - 1) == sizeof(in) - sizeof(trailing)) #define REQ_BEGIN(expected_error) \ if (expected_error != 0 ) { \ @@ -56,7 +56,7 @@ const struct spdk_json_val *g_cur_param; } #define PARSE_FAIL(in) \ - CU_ASSERT(spdk_jsonrpc_parse_request(conn, in, sizeof(in) - 1) < 0); + CU_ASSERT(jsonrpc_parse_request(conn, in, sizeof(in) - 1) < 0); #define REQ_BEGIN_VALID() \ REQ_BEGIN(0); \ @@ -158,7 +158,7 @@ ut_jsonrpc_free_request(struct spdk_jsonrpc_request *request, int err) spdk_jsonrpc_send_error_response_fmt(request, err, "UT error response"); } - spdk_jsonrpc_free_request(request); + jsonrpc_free_request(request); } static void @@ -173,20 +173,20 @@ ut_handle(struct spdk_jsonrpc_request *request, int error, const struct spdk_jso } void -spdk_jsonrpc_server_handle_error(struct spdk_jsonrpc_request *request, int error) +jsonrpc_server_handle_error(struct spdk_jsonrpc_request *request, int error) { ut_handle(request, error, NULL, NULL); } void -spdk_jsonrpc_server_handle_request(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *method, const struct spdk_json_val *params) +jsonrpc_server_handle_request(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *method, const struct spdk_json_val *params) { ut_handle(request, 0, method, params); } void -spdk_jsonrpc_server_send_response(struct spdk_jsonrpc_request *request) +jsonrpc_server_send_response(struct spdk_jsonrpc_request *request) { } @@ -366,7 +366,7 @@ test_parse_request_streaming(void) /* Try every partial length up to the full request length */ for (i = 0; i < len; i++) { - int rc = spdk_jsonrpc_parse_request(conn, json_req, i); + int rc = jsonrpc_parse_request(conn, json_req, i); /* Partial request - no data consumed */ CU_ASSERT(rc == 0); CU_ASSERT(g_request == NULL); @@ -376,7 +376,7 @@ test_parse_request_streaming(void) } /* Verify that full request can be parsed successfully */ - CU_ASSERT(spdk_jsonrpc_parse_request(conn, json_req, len) == (ssize_t)len); + CU_ASSERT(jsonrpc_parse_request(conn, json_req, len) == (ssize_t)len); FREE_REQUEST(); CU_ASSERT(conn->outstanding_requests == 0);