Commit 0be5557c authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

lib: json-nbd remove spdk prefix from static functions. 



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


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent a7592dbe

lib/json/json_util.c

+14 −14
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct spdk_json_num { 
};



static int

spdk_json_number_split(const struct spdk_json_val *val, struct spdk_json_num *num)

json_number_split(const struct spdk_json_val *val, struct spdk_json_num *num)

{

	const char *iter;

	size_t remaining;
@@ -210,7 +210,7 @@ spdk_json_number_to_uint16(const struct spdk_json_val *val, uint16_t *num) 
	struct spdk_json_num split_num;

	int rc;



	rc = spdk_json_number_split(val, &split_num);

	rc = json_number_split(val, &split_num);

	if (rc) {

		return rc;

	}
@@ -232,7 +232,7 @@ spdk_json_number_to_int32(const struct spdk_json_val *val, int32_t *num) 
	struct spdk_json_num split_num;

	int rc;



	rc = spdk_json_number_split(val, &split_num);

	rc = json_number_split(val, &split_num);

	if (rc) {

		return rc;

	}
@@ -263,7 +263,7 @@ spdk_json_number_to_uint32(const struct spdk_json_val *val, uint32_t *num) 
	struct spdk_json_num split_num;

	int rc;



	rc = spdk_json_number_split(val, &split_num);

	rc = json_number_split(val, &split_num);

	if (rc) {

		return rc;

	}
@@ -285,7 +285,7 @@ spdk_json_number_to_uint64(const struct spdk_json_val *val, uint64_t *num) 
	struct spdk_json_num split_num;

	int rc;



	rc = spdk_json_number_split(val, &split_num);

	rc = json_number_split(val, &split_num);

	if (rc) {

		return rc;

	}
@@ -460,7 +460,7 @@ spdk_json_decode_string(const struct spdk_json_val *val, void *out) 
}



static struct spdk_json_val *

spdk_json_first(struct spdk_json_val *object, enum spdk_json_val_type type)

json_first(struct spdk_json_val *object, enum spdk_json_val_type type)

{

	/* 'object' must be JSON object or array. 'type' might be combination of these two. */

	assert((type & (SPDK_JSON_VAL_ARRAY_BEGIN | SPDK_JSON_VAL_OBJECT_BEGIN)) != 0);
@@ -480,7 +480,7 @@ spdk_json_first(struct spdk_json_val *object, enum spdk_json_val_type type) 
}



static struct spdk_json_val *

spdk_json_value(struct spdk_json_val *key)

json_value(struct spdk_json_val *key)

{

	return key->type == SPDK_JSON_VAL_NAME ? key + 1 : NULL;

}
@@ -495,7 +495,7 @@ spdk_json_find(struct spdk_json_val *object, const char *key_name, struct spdk_j 


	assert(object != NULL);



	for (it = spdk_json_first(object, SPDK_JSON_VAL_ARRAY_BEGIN | SPDK_JSON_VAL_OBJECT_BEGIN);

	for (it = json_first(object, SPDK_JSON_VAL_ARRAY_BEGIN | SPDK_JSON_VAL_OBJECT_BEGIN);

	     it != NULL;

	     it = spdk_json_next(it)) {

		if (it->type != SPDK_JSON_VAL_NAME) {
@@ -512,7 +512,7 @@ spdk_json_find(struct spdk_json_val *object, const char *key_name, struct spdk_j 
		}



		_key = it;

		_val = spdk_json_value(_key);

		_val = json_value(_key);



		if (type != SPDK_JSON_VAL_INVALID && (_val->type & type) == 0) {

			SPDK_JSON_DEBUG("key '%s' type is %#x but expected one of %#x\n", key_name, _val->type, type);
@@ -548,7 +548,7 @@ spdk_json_find_array(struct spdk_json_val *object, const char *key_name, 
struct spdk_json_val *

spdk_json_object_first(struct spdk_json_val *object)

{

	struct spdk_json_val *first = spdk_json_first(object, SPDK_JSON_VAL_OBJECT_BEGIN);

	struct spdk_json_val *first = json_first(object, SPDK_JSON_VAL_OBJECT_BEGIN);



	/* Empty object? */

	return first && first->type != SPDK_JSON_VAL_OBJECT_END ? first : NULL;
@@ -557,14 +557,14 @@ spdk_json_object_first(struct spdk_json_val *object) 
struct spdk_json_val *

spdk_json_array_first(struct spdk_json_val *array_begin)

{

	struct spdk_json_val *first = spdk_json_first(array_begin, SPDK_JSON_VAL_ARRAY_BEGIN);

	struct spdk_json_val *first = json_first(array_begin, SPDK_JSON_VAL_ARRAY_BEGIN);



	/* Empty array? */

	return first && first->type != SPDK_JSON_VAL_ARRAY_END ? first : NULL;

}



static struct spdk_json_val *

spdk_json_skip_object_or_array(struct spdk_json_val *val)

json_skip_object_or_array(struct spdk_json_val *val)

{

	unsigned lvl;

	enum spdk_json_val_type end_type;
@@ -605,7 +605,7 @@ spdk_json_next(struct spdk_json_val *it) 


	switch (it->type) {

	case SPDK_JSON_VAL_NAME:

		val = spdk_json_value(it);

		val = json_value(it);

		next = spdk_json_next(val);

		break;
@@ -620,7 +620,7 @@ spdk_json_next(struct spdk_json_val *it) 


	case SPDK_JSON_VAL_ARRAY_BEGIN:

	case SPDK_JSON_VAL_OBJECT_BEGIN:

		next = spdk_json_skip_object_or_array(it);

		next = json_skip_object_or_array(it);

		break;



	/* Can't go to the next object if started from the end of array or object */

lib/jsonrpc/jsonrpc_server.c

+3 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ invalid: 
}



static int

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

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;
@@ -200,7 +200,7 @@ jsonrpc_parse_request(struct spdk_jsonrpc_server_conn *conn, const void *json, s 
		return -1;

	}



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

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

	if (request->response == NULL) {

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

		jsonrpc_free_request(request);
@@ -283,7 +283,7 @@ end_response(struct spdk_jsonrpc_request *request) 
	spdk_json_write_end(request->response);

	request->response = NULL;



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

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

	jsonrpc_server_send_response(request);

}

lib/jsonrpc/jsonrpc_server_tcp.c

+19 −19
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ spdk_jsonrpc_server_listen(int domain, int protocol, 
}



static struct spdk_jsonrpc_request *

spdk_jsonrpc_server_dequeue_request(struct spdk_jsonrpc_server_conn *conn)

jsonrpc_server_dequeue_request(struct spdk_jsonrpc_server_conn *conn)

{

	struct spdk_jsonrpc_request *request = NULL;
@@ -113,24 +113,24 @@ spdk_jsonrpc_server_dequeue_request(struct spdk_jsonrpc_server_conn *conn) 
}



static void

spdk_jsonrpc_server_free_conn_request(struct spdk_jsonrpc_server_conn *conn)

jsonrpc_server_free_conn_request(struct spdk_jsonrpc_server_conn *conn)

{

	struct spdk_jsonrpc_request *request;



	jsonrpc_free_request(conn->send_request);

	conn->send_request = NULL ;

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

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

		jsonrpc_free_request(request);

	}

}



static void

spdk_jsonrpc_server_conn_close(struct spdk_jsonrpc_server_conn *conn)

jsonrpc_server_conn_close(struct spdk_jsonrpc_server_conn *conn)

{

	conn->closed = true;



	if (conn->sockfd >= 0) {

		spdk_jsonrpc_server_free_conn_request(conn);

		jsonrpc_server_free_conn_request(conn);

		close(conn->sockfd);

		conn->sockfd = -1;
@@ -148,18 +148,18 @@ spdk_jsonrpc_server_shutdown(struct spdk_jsonrpc_server *server) 
	close(server->sockfd);



	TAILQ_FOREACH(conn, &server->conns, link) {

		spdk_jsonrpc_server_conn_close(conn);

		jsonrpc_server_conn_close(conn);

	}



	free(server);

}



static void

spdk_jsonrpc_server_conn_remove(struct spdk_jsonrpc_server_conn *conn)

jsonrpc_server_conn_remove(struct spdk_jsonrpc_server_conn *conn)

{

	struct spdk_jsonrpc_server *server = conn->server;



	spdk_jsonrpc_server_conn_close(conn);

	jsonrpc_server_conn_close(conn);



	pthread_spin_destroy(&conn->queue_lock);

	assert(STAILQ_EMPTY(&conn->send_queue));
@@ -204,7 +204,7 @@ spdk_jsonrpc_conn_del_close_cb(struct spdk_jsonrpc_server_conn *conn, 
}



static int

spdk_jsonrpc_server_accept(struct spdk_jsonrpc_server *server)

jsonrpc_server_accept(struct spdk_jsonrpc_server *server)

{

	struct spdk_jsonrpc_server_conn *conn;

	int rc, flag;
@@ -285,7 +285,7 @@ jsonrpc_server_handle_error(struct spdk_jsonrpc_request *request, int error) 
}



static int

spdk_jsonrpc_server_conn_recv(struct spdk_jsonrpc_server_conn *conn)

jsonrpc_server_conn_recv(struct spdk_jsonrpc_server_conn *conn)

{

	ssize_t rc, offset;

	size_t recv_avail = SPDK_JSONRPC_RECV_BUF_SIZE - conn->recv_len;
@@ -344,7 +344,7 @@ jsonrpc_server_send_response(struct spdk_jsonrpc_request *request) 




static int

spdk_jsonrpc_server_conn_send(struct spdk_jsonrpc_server_conn *conn)

jsonrpc_server_conn_send(struct spdk_jsonrpc_server_conn *conn)

{

	struct spdk_jsonrpc_request *request;

	ssize_t rc;
@@ -355,7 +355,7 @@ more: 
	}



	if (conn->send_request == NULL) {

		conn->send_request = spdk_jsonrpc_server_dequeue_request(conn);

		conn->send_request = jsonrpc_server_dequeue_request(conn);

	}



	request = conn->send_request;
@@ -402,17 +402,17 @@ spdk_jsonrpc_server_poll(struct spdk_jsonrpc_server *server) 
	TAILQ_FOREACH_SAFE(conn, &server->conns, link, conn_tmp) {

		/* If we can't receive and there are no outstanding requests close the connection. */

		if (conn->closed == true && conn->outstanding_requests == 0) {

			spdk_jsonrpc_server_conn_close(conn);

			jsonrpc_server_conn_close(conn);

		}



		if (conn->sockfd == -1 && conn->outstanding_requests == 0) {

			spdk_jsonrpc_server_conn_remove(conn);

			jsonrpc_server_conn_remove(conn);

		}

	}



	/* Check listen socket */

	if (!TAILQ_EMPTY(&server->free_conns)) {

		spdk_jsonrpc_server_accept(server);

		jsonrpc_server_accept(server);

	}



	TAILQ_FOREACH(conn, &server->conns, link) {
@@ -420,16 +420,16 @@ spdk_jsonrpc_server_poll(struct spdk_jsonrpc_server *server) 
			continue;

		}



		rc = spdk_jsonrpc_server_conn_send(conn);

		rc = jsonrpc_server_conn_send(conn);

		if (rc != 0) {

			spdk_jsonrpc_server_conn_close(conn);

			jsonrpc_server_conn_close(conn);

			continue;

		}



		if (!conn->closed) {

			rc = spdk_jsonrpc_server_conn_recv(conn);

			rc = jsonrpc_server_conn_recv(conn);

			if (rc != 0) {

				spdk_jsonrpc_server_conn_close(conn);

				jsonrpc_server_conn_close(conn);

			}

		}

	}

lib/log/log.c

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ spdk_log_close(void) 


#ifdef SPDK_LOG_BACKTRACE_LVL

static void

spdk_log_unwind_stack(FILE *fp, enum spdk_log_level level)

log_unwind_stack(FILE *fp, enum spdk_log_level level)

{

	unw_error_t err;

	unw_cursor_t cursor;
@@ -105,7 +105,7 @@ spdk_log_unwind_stack(FILE *fp, enum spdk_log_level level) 
}



#else

#define spdk_log_unwind_stack(fp, lvl)

#define log_unwind_stack(fp, lvl)

#endif



static void
@@ -176,7 +176,7 @@ spdk_vlog(enum spdk_log_level level, const char *file, const int line, const cha 
		get_timestamp_prefix(timestamp, sizeof(timestamp));

		if (file) {

			fprintf(stderr, "%s%s:%4d:%s: *%s*: %s", timestamp, file, line, func, spdk_level_names[level], buf);

			spdk_log_unwind_stack(stderr, level);

			log_unwind_stack(stderr, level);

		} else {

			fprintf(stderr, "%s%s", timestamp, buf);

		}

lib/log_rpc/log_rpc.c

+21 −21
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ _log_get_level_name(int level) 
}



static void

spdk_rpc_log_set_print_level(struct spdk_jsonrpc_request *request,

rpc_log_set_print_level(struct spdk_jsonrpc_request *request,

			const struct spdk_json_val *params)

{

	struct rpc_log_level req = {};
@@ -133,12 +133,12 @@ spdk_rpc_log_set_print_level(struct spdk_jsonrpc_request *request, 
invalid:

	free_rpc_log_level(&req);

}

SPDK_RPC_REGISTER("log_set_print_level", spdk_rpc_log_set_print_level,

SPDK_RPC_REGISTER("log_set_print_level", rpc_log_set_print_level,

		  SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_print_level, set_log_print_level)



static void

spdk_rpc_log_get_print_level(struct spdk_jsonrpc_request *request,

rpc_log_get_print_level(struct spdk_jsonrpc_request *request,

			const struct spdk_json_val *params)

{

	struct spdk_json_write_ctx *w;
@@ -164,12 +164,12 @@ spdk_rpc_log_get_print_level(struct spdk_jsonrpc_request *request, 


	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("log_get_print_level", spdk_rpc_log_get_print_level,

SPDK_RPC_REGISTER("log_get_print_level", rpc_log_get_print_level,

		  SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_print_level, get_log_print_level)



static void

spdk_rpc_log_set_level(struct spdk_jsonrpc_request *request,

rpc_log_set_level(struct spdk_jsonrpc_request *request,

		  const struct spdk_json_val *params)

{

	struct rpc_log_level req = {};
@@ -204,11 +204,11 @@ spdk_rpc_log_set_level(struct spdk_jsonrpc_request *request, 
invalid:

	free_rpc_log_level(&req);

}

SPDK_RPC_REGISTER("log_set_level", spdk_rpc_log_set_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("log_set_level", rpc_log_set_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_level, set_log_level)



static void

spdk_rpc_log_get_level(struct spdk_jsonrpc_request *request,

rpc_log_get_level(struct spdk_jsonrpc_request *request,

		  const struct spdk_json_val *params)

{

	struct spdk_json_write_ctx *w;
@@ -234,11 +234,11 @@ spdk_rpc_log_get_level(struct spdk_jsonrpc_request *request, 


	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("log_get_level", spdk_rpc_log_get_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("log_get_level", rpc_log_get_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_level, get_log_level)



static void

spdk_rpc_log_set_flag(struct spdk_jsonrpc_request *request,

rpc_log_set_flag(struct spdk_jsonrpc_request *request,

		 const struct spdk_json_val *params)

{

	struct rpc_log_flag req = {};
@@ -270,11 +270,11 @@ spdk_rpc_log_set_flag(struct spdk_jsonrpc_request *request, 
invalid:

	free_rpc_log_flag(&req);

}

SPDK_RPC_REGISTER("log_set_flag", spdk_rpc_log_set_flag, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("log_set_flag", rpc_log_set_flag, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_flag, set_log_flag)



static void

spdk_rpc_log_clear_flag(struct spdk_jsonrpc_request *request,

rpc_log_clear_flag(struct spdk_jsonrpc_request *request,

		   const struct spdk_json_val *params)

{

	struct rpc_log_flag req = {};
@@ -306,12 +306,12 @@ spdk_rpc_log_clear_flag(struct spdk_jsonrpc_request *request, 
invalid:

	free_rpc_log_flag(&req);

}

SPDK_RPC_REGISTER("log_clear_flag", spdk_rpc_log_clear_flag,

SPDK_RPC_REGISTER("log_clear_flag", rpc_log_clear_flag,

		  SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_clear_flag, clear_log_flag)



static void

spdk_rpc_log_get_flags(struct spdk_jsonrpc_request *request,

rpc_log_get_flags(struct spdk_jsonrpc_request *request,

		  const struct spdk_json_val *params)

{

	struct spdk_json_write_ctx *w;
@@ -334,7 +334,7 @@ spdk_rpc_log_get_flags(struct spdk_jsonrpc_request *request, 
	spdk_json_write_object_end(w);

	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("log_get_flags", spdk_rpc_log_get_flags, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("log_get_flags", rpc_log_get_flags, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_flags, get_log_flags)



SPDK_LOG_REGISTER_COMPONENT("log_rpc", SPDK_LOG_LOG_RPC)