Commit 40549bb4 authored by yidong0635's avatar yidong0635 Committed by Tomasz Zawadzki
Browse files

log_rpc: Unify codes in end path. 



Unify the end path, and remove duplicate codes.

Signed-off-by: default avataryidong0635 <dongx.yi@intel.com>
Change-Id: Ie36cb2182b2b0b23f36670780b6e7af3652dc94b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7520


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent b69796f7

lib/event/log_rpc.c

+12 −28
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ rpc_log_set_print_level(struct spdk_jsonrpc_request *request, 
		SPDK_DEBUGLOG(log_rpc, "spdk_json_decode_object failed\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");

		goto invalid;

		goto end;

	}



	level = _parse_log_level(req.level);
@@ -118,16 +118,12 @@ rpc_log_set_print_level(struct spdk_jsonrpc_request *request, 
		SPDK_DEBUGLOG(log_rpc, "tried to set invalid log level\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "invalid log level");

		goto invalid;

		goto end;

	}



	spdk_log_set_print_level(level);

	free_rpc_log_level(&req);



	spdk_jsonrpc_send_bool_response(request, true);

	return;



invalid:

end:

	free_rpc_log_level(&req);

}

SPDK_RPC_REGISTER("log_set_print_level", rpc_log_set_print_level,
@@ -177,7 +173,7 @@ rpc_log_set_level(struct spdk_jsonrpc_request *request, 
		SPDK_DEBUGLOG(log_rpc, "spdk_json_decode_object failed\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");

		goto invalid;

		goto end;

	}



	level = _parse_log_level(req.level);
@@ -185,17 +181,13 @@ rpc_log_set_level(struct spdk_jsonrpc_request *request, 
		SPDK_DEBUGLOG(log_rpc, "tried to set invalid log level\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "invalid log level");

		goto invalid;

		goto end;

	}





	spdk_log_set_level(level);

	free_rpc_log_level(&req);



	spdk_jsonrpc_send_bool_response(request, true);

	return;



invalid:

end:

	free_rpc_log_level(&req);

}

SPDK_RPC_REGISTER("log_set_level", rpc_log_set_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)
@@ -242,23 +234,19 @@ rpc_log_set_flag(struct spdk_jsonrpc_request *request, 
		SPDK_DEBUGLOG(log_rpc, "spdk_json_decode_object failed\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");

		goto invalid;

		goto end;

	}



	if (req.flag == 0) {

		SPDK_DEBUGLOG(log_rpc, "invalid flag 0\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "invalid flag 0");

		goto invalid;

		goto end;

	}



	spdk_log_set_flag(req.flag);

	free_rpc_log_flag(&req);



	spdk_jsonrpc_send_bool_response(request, true);

	return;



invalid:

end:

	free_rpc_log_flag(&req);

}

SPDK_RPC_REGISTER("log_set_flag", rpc_log_set_flag, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)
@@ -275,23 +263,19 @@ rpc_log_clear_flag(struct spdk_jsonrpc_request *request, 
		SPDK_DEBUGLOG(log_rpc, "spdk_json_decode_object failed\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

						 "spdk_json_decode_object failed");

		goto invalid;

		goto end;

	}



	if (req.flag == 0) {

		SPDK_DEBUGLOG(log_rpc, "Invalid flag 0\n");

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

						 "invalid flag 0");

		goto invalid;

		goto end;

	}



	spdk_log_clear_flag(req.flag);

	free_rpc_log_flag(&req);



	spdk_jsonrpc_send_bool_response(request, true);

	return;



invalid:

end:

	free_rpc_log_flag(&req);

}

SPDK_RPC_REGISTER("log_clear_flag", rpc_log_clear_flag,