Commit 0c97e22c authored by Krzysztof Karas's avatar Krzysztof Karas Committed by Tomasz Zawadzki
Browse files

spdk_top: fix scheduler data error display 



spdk_top constantly shows scheduler data error
due to missing "_relaxed" suffix in
spdk_json_decode_object() function. This happens
when SPDK scheduler is switched to "dynamic", because
it provides more data than defined in spdk_top's
scheduler_decoders structure.

Additionally delete leftover governor code.

Fixes #2433

Change-Id: I1f849f0cb48fce5312cdc3c25d7b4529b407283c
Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12010


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent 94a10ad2

app/spdk_top/spdk_top.c

+2 −4
Original line number Diff line number Diff line
@@ -271,7 +271,6 @@ struct rpc_core_info { 
struct rpc_scheduler {

	char *scheduler_name;

	uint64_t scheduler_period;

	char *governor_name;

};



struct rpc_thread_info g_threads_info[RPC_MAX_THREADS];
@@ -564,7 +563,6 @@ static void 
free_rpc_scheduler(struct rpc_scheduler *req)

{

	free(req->scheduler_name);

	free(req->governor_name);

}



static const struct spdk_json_object_decoder rpc_scheduler_decoders[] = {
@@ -1111,7 +1109,7 @@ get_scheduler_data(void) 
	}



	memset(&scheduler_info, 0, sizeof(scheduler_info));

	if (spdk_json_decode_object(json_resp->result, rpc_scheduler_decoders,

	if (spdk_json_decode_object_relaxed(json_resp->result, rpc_scheduler_decoders,

					    SPDK_COUNTOF(rpc_scheduler_decoders), &scheduler_info)) {

		rc = -EINVAL;

	} else {