From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6C7E5425D1; Mon, 18 Sep 2023 15:04:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5BFE406B6; Mon, 18 Sep 2023 15:04:05 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id EDA69402E9 for ; Mon, 18 Sep 2023 15:04:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695042244; x=1726578244; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q6X4+XrTZnGqehR8VOKiHBDU2cKd9vL1tM0DiwP18Fw=; b=eaJuG7IZfl4nO0Ev1DQI33YLImBL+BcuG57ShnOcxKpuwu8zSZYaOtMd ZV1WDnMVTBfPR1oUcDE6xiXVkc+lV+jLFSYmtxxdoUsOYxh8y6jauFCft zUsth+tRmLLCZ2licHEZaBxcSTAQcAiVyMlOS+A9/rNXOJyi0h9AXXZ2U hEZyrPopGN7bF7cfpJ4iF1rI/jazykE8ZjCwCUe/iv2wpHHt4lDRa9M+b uqJaLlANy2noUG/n0V6J4Aq0ikXj62XcL89XgJ2PDE3rn+oVU76Nv2HOi ju6sDbd1aLRc2Oad0QfXWCZ/BYFZ9YQg3vI5ClKMM0m2jstvnd8A3Zzce Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10837"; a="369969378" X-IronPort-AV: E=Sophos;i="6.02,156,1688454000"; d="scan'208";a="369969378" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2023 06:04:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10837"; a="739130631" X-IronPort-AV: E=Sophos;i="6.02,156,1688454000"; d="scan'208";a="739130631" Received: from silpixa00401385.ir.intel.com ([10.237.214.14]) by orsmga007.jf.intel.com with ESMTP; 18 Sep 2023 06:04:00 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Olivier Matz , Bruce Richardson Subject: [RFC PATCH v2 1/5] buildtools/dpdk-cmdline-gen: generate boilerplate for simple cmds Date: Mon, 18 Sep 2023 14:03:48 +0100 Message-Id: <20230918130352.379478-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230918130352.379478-1-bruce.richardson@intel.com> References: <20230802170052.955323-1-bruce.richardson@intel.com> <20230918130352.379478-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Provide a script for application developers to quickly generate the boilerplate code necessary for using the cmdline library. This initial version works only with commands using simple strings and numbers, but this is sufficient for many use-cases. Future extensions could, no doubt, expand support to expose more capabilities of the library. Example of use: The script takes an input file with a list of commands the user wants in the app, where the parameter variables are tagged with the type. For example: $ cat commands.list list add x y echo message add socket path quit When run through the script as "./dpdk-cmdline-gen.py commands.list", the output will be the contents of a header file with all the boilerplate necessary for a commandline instance with those commands. If the flag --stubs is passed, an output header filename must also be passed, in which case both a header file with the definitions and a C file with function stubs in it is written to disk. The separation is so that the header file can be rewritten at any future point to add more commands, while the C file can be kept as-is and extended by the user with any additional functions needed. Signed-off-by: Bruce Richardson --- buildtools/dpdk-cmdline-gen.py | 146 +++++++++++++++++++++++++++++++++ buildtools/meson.build | 7 ++ 2 files changed, 153 insertions(+) create mode 100755 buildtools/dpdk-cmdline-gen.py diff --git a/buildtools/dpdk-cmdline-gen.py b/buildtools/dpdk-cmdline-gen.py new file mode 100755 index 0000000000..1ddd8b6bbb --- /dev/null +++ b/buildtools/dpdk-cmdline-gen.py @@ -0,0 +1,146 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2023 Intel Corporation +# + +import sys +import os +import argparse + +PARSE_FN_PARAMS = "void *parsed_result, struct cmdline *cl, void *data" +PARSE_FN_BODY = """ + /* TODO: command action */ + RTE_SET_USED(parsed_result); + RTE_SET_USED(cl); + RTE_SET_USED(data); +""" + +def process_command(tokens, cfile): + name = [] + + if tokens[0].startswith('<'): + print("Error: each command must start with at least one literal string", + file=sys.stderr) + sys.exit(1) + for t in tokens: + if t.startswith('<'): + break; + name.append(t) + name = "_".join(name) + + result_struct = [] + initializers = [] + token_list = [] + for t in tokens: + if t.startswith('<'): + t_type, t_name = t[1:].split('>') + t_val = "NULL" + else: + t_type = "STRING" + t_name = t + t_val = f'"{t}"' + + if t_type == "STRING": + result_struct.append(f"\tcmdline_fixed_string_t {t_name};") + initializers.append(f"static cmdline_parse_token_string_t cmd_{name}_{t_name}_tok =\n" + + f"\tTOKEN_STRING_INITIALIZER(struct cmd_{name}_result, {t_name}, {t_val});") + elif t_type in ['UINT8', 'UINT16', 'UINT32', 'UINT64', + 'INT8', 'INT16', 'INT32', 'INT64']: + result_struct.append(f"\t{t_type.lower()}_t {t_name};") + initializers.append(f"static cmdline_parse_token_num_t cmd_{name}_{t_name}_tok =\n" + + f"\tTOKEN_NUM_INITIALIZER(struct cmd_{name}_result, {t_name}, RTE_{t_type});") + else: + print(f"Error: unknown token-type {t}", file=sys.stderr) + sys.exit(1) + token_list.append(f"cmd_{name}_{t_name}_tok") + + print(f"/* Auto-generated handling for command '{' '.join(tokens)}' */") + # output function prototype + func_sig = f"void\ncmd_{name}_parsed({PARSE_FN_PARAMS})" + print(f"extern {func_sig};\n") + # output function template if C file being written + if (cfile): + print(f"{func_sig}\n{{{PARSE_FN_BODY}}}\n", file=cfile) + # output result data structure + print(f"struct cmd_{name}_result {{\n" + + '\n'.join(result_struct) + + "\n};\n") + # output the initializer tokens + print("\n".join(initializers) + '\n') + # output the instance structure + print(f"static cmdline_parse_inst_t cmd_{name} = {{\n" + + f'\t.f = cmd_{name}_parsed,\n' + + f'\t.data = NULL,\n' + + f'\t.help_str = "",\n' + + f'\t.tokens = {{') + for t in token_list: + print(f"\t\t(void *)&{t},") + print("\t\tNULL\n" + + "\t}\n" + + "};\n") + + # return the instance structure name + return f"cmd_{name}" + +def process_commands(infile, hfile, cfile, ctxname): + instances = [] + + # redirect stdout to output the header, to save passing file= each print + old_sys_stdout = sys.stdout + sys.stdout = hfile + + print(f"/* File autogenerated by {sys.argv[0]} */") + print('#ifndef GENERATED_COMMANDS_H') + print('#define GENERATED_COMMANDS_H') + print("#include ") + print("#include ") + print("#include ") + print("#include ") + print("") + + for line in infile.readlines(): + if line.lstrip().startswith('#'): + continue + instances.append(process_command(line.strip().split(), cfile)) + + print(f'static __rte_used cmdline_parse_ctx_t {ctxname}[] = {{') + for inst in instances: + print(f'\t&{inst},') + print('\tNULL') + print('};\n') + print('#endif /* GENERATED_COMMANDS_H */') + + sys.stdout = old_sys_stdout + +def main(): + ap = argparse.ArgumentParser() + ap.add_argument("--stubs", action="store_true", + help="Produce C file with empty function stubs for each command") + ap.add_argument("--output-file", "-o", default="-", + help="Output header filename [default to stdout]") + ap.add_argument("--context-name", default="ctx", + help="Name given to the cmdline context variable in the output header [default=ctx]") + ap.add_argument("infile", type=argparse.FileType('r'), + help="File with list of commands") + args = ap.parse_args() + + if not args.stubs: + if args.output_file == '-': + process_commands(args.infile, sys.stdout, None, args.context_name) + else: + with open(args.output_file, "w") as hfile: + process_commands(args.infile, hfile, None, args.context_name) + else: + if not args.output_file.endswith('.h'): + print("Error: output filename must end with '.h' extension when creating stubs", + file=sys.stderr) + sys.exit(1) + + cfilename = args.output_file[:-2] + '.c' + with open(args.output_file, "w") as hfile: + with open(cfilename, "w") as cfile: + print(f"#include \"{args.output_file}\"\n", file=cfile) + process_commands(args.infile, hfile, cfile, args.context_name) + +if __name__ == "__main__": + main() diff --git a/buildtools/meson.build b/buildtools/meson.build index 948ac17dd2..72447b60a0 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -19,6 +19,13 @@ get_cpu_count_cmd = py3 + files('get-cpu-count.py') get_numa_count_cmd = py3 + files('get-numa-count.py') get_test_suites_cmd = py3 + files('get-test-suites.py') has_hugepages_cmd = py3 + files('has-hugepages.py') +cmdline_gen_cmd = py3 + files('dpdk-cmdline-gen.py') + +# install any build tools that end-users might want also +install_data([ + 'dpdk-cmdline-gen.py', + ], + install_dir: 'bin') # select library and object file format pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()] -- 2.39.2