bdevperf: Extract and inline bdevperf_free_targets() into bdevperf_test_done()
We don't have ordering constraint between bdevperf_free_targets() and sending RPC response. So extract bdevperf_free_targets() from bdevperf_fini() and rpc_perform_tests_cb() and inline it into bdevperf_test_done(). As a result of this change, bdevperf_fini() calls just spdk_app_stop(), but is still necessary in the subsequent patches. So keep bdevperf_fini(). Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Change-Id: Ie8ed2d04db754b8a265296932f73d3a602d1f90b Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/479373 Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Paul Luse <paul.e.luse@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
parent
411f1c90c6
commit
ceaee98aa9
@ -441,13 +441,14 @@ bdevperf_construct_targets(void)
|
|||||||
static void
|
static void
|
||||||
bdevperf_fini(int rc)
|
bdevperf_fini(int rc)
|
||||||
{
|
{
|
||||||
bdevperf_free_targets();
|
|
||||||
spdk_app_stop(rc);
|
spdk_app_stop(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
bdevperf_test_done(int rc)
|
bdevperf_test_done(int rc)
|
||||||
{
|
{
|
||||||
|
bdevperf_free_targets();
|
||||||
|
|
||||||
if (g_request && !g_shutdown) {
|
if (g_request && !g_shutdown) {
|
||||||
rpc_perform_tests_cb(rc);
|
rpc_perform_tests_cb(rc);
|
||||||
} else {
|
} else {
|
||||||
@ -1440,8 +1441,6 @@ rpc_perform_tests_cb(int rc)
|
|||||||
spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
|
spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
|
||||||
"bdevperf failed with error %s", spdk_strerror(-rc));
|
"bdevperf failed with error %s", spdk_strerror(-rc));
|
||||||
}
|
}
|
||||||
|
|
||||||
bdevperf_free_targets();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
Loading…
Reference in New Issue
Block a user