diff --git a/lib/trace/trace_rpc.c b/lib/trace/trace_rpc.c index 9a2f02dcd..09a57f08a 100644 --- a/lib/trace/trace_rpc.c +++ b/lib/trace/trace_rpc.c @@ -51,8 +51,8 @@ static const struct spdk_json_object_decoder rpc_tpoint_group_decoders[] = { }; static void -spdk_rpc_enable_tpoint_group(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +spdk_rpc_trace_enable_tpoint_group(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_tpoint_group req = {}; struct spdk_json_write_ctx *w; @@ -83,8 +83,9 @@ invalid: spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); free_rpc_tpoint_group(&req); } -SPDK_RPC_REGISTER("enable_tpoint_group", spdk_rpc_enable_tpoint_group, +SPDK_RPC_REGISTER("trace_enable_tpoint_group", spdk_rpc_trace_enable_tpoint_group, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(trace_enable_tpoint_group, enable_tpoint_group) static void spdk_rpc_disable_tpoint_group(struct spdk_jsonrpc_request *request, diff --git a/scripts/rpc.py b/scripts/rpc.py index bec60d359..2e3e54096 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1147,14 +1147,15 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse p.set_defaults(func=get_scsi_devices) # trace - def enable_tpoint_group(args): - rpc.trace.enable_tpoint_group(args.client, name=args.name) + def trace_enable_tpoint_group(args): + rpc.trace.trace_enable_tpoint_group(args.client, name=args.name) - p = subparsers.add_parser('enable_tpoint_group', help='enable trace on a specific tpoint group') + p = subparsers.add_parser('trace_enable_tpoint_group', aliases=['enable_tpoint_group'], + help='enable trace on a specific tpoint group') p.add_argument( 'name', help="""trace group name we want to enable in tpoint_group_mask. (for example "bdev" for bdev trace group, "all" for all trace groups).""") - p.set_defaults(func=enable_tpoint_group) + p.set_defaults(func=trace_enable_tpoint_group) def disable_tpoint_group(args): rpc.trace.disable_tpoint_group(args.client, name=args.name) diff --git a/scripts/rpc/trace.py b/scripts/rpc/trace.py index 879b32428..f53ebf9bf 100644 --- a/scripts/rpc/trace.py +++ b/scripts/rpc/trace.py @@ -1,11 +1,15 @@ -def enable_tpoint_group(client, name): +from .helpers import deprecated_alias + + +@deprecated_alias('enable_tpoint_group') +def trace_enable_tpoint_group(client, name): """Enable trace on a specific tpoint group. Args: name: trace group name we want to enable in tpoint_group_mask. (for example "bdev"). """ params = {'name': name} - return client.call('enable_tpoint_group', params) + return client.call('trace_enable_tpoint_group', params) def disable_tpoint_group(client, name):