d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

log_rpc: Unify codes in end path.

Browse Source 
Unify the end path, and remove duplicate codes.

Signed-off-by: yidong0635 <dongx.yi@intel.com>
Change-Id: Ie36cb2182b2b0b23f36670780b6e7af3652dc94b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7520
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
yidong0635 2021-04-21 06:12:11 +08:00 committed by Tomasz Zawadzki
parent b69796f777
commit 40549bb48e
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/event/log_rpc.c
View File

@ -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,