From 7cd468a3d7dee7d6c92f69a0bb7061ae208ec727 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 19 Dec 2016 23:05:39 +0100 Subject: Reorganize source tree to use single autotools instance Change-Id: I7b51f88292e057c6443b12224486f2d0c9f8ae23 Signed-off-by: Damjan Marion --- src/vpp/app/version.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 src/vpp/app/version.c (limited to 'src/vpp/app/version.c') diff --git a/src/vpp/app/version.c b/src/vpp/app/version.c new file mode 100644 index 00000000..60844c98 --- /dev/null +++ b/src/vpp/app/version.c @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2015 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include +#include + +#if DPDK > 0 +#include +#include +#include +#endif /* DPDK */ + +static char *vpe_version_string = + "vpp v" VPP_BUILD_VER + " built by " VPP_BUILD_USER " on " VPP_BUILD_HOST " at " VPP_BUILD_DATE; + +static char *vpe_compiler = +#if defined(__INTEL_COMPILER) +#define __(x) #x +#define _(x) __(x) + "icc " _(__INTEL_COMPILER) " (" __VERSION__ ")"; +#undef _ +#undef __ +#elif defined(__clang__) + "Clang/LLVM " __clang_version__; +#elif defined (__GNUC__) + "GCC " __VERSION__; +#else + "unknown compiler"; +#endif + +static clib_error_t * +show_vpe_version_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + if (unformat (input, "verbose")) + { +#define _(a,b,c) vlib_cli_output (vm, "%-25s " b, a ":", c); + _("Version", "%s", "v" VPP_BUILD_VER); + _("Compiled by", "%s", VPP_BUILD_USER); + _("Compile host", "%s", VPP_BUILD_HOST); + _("Compile date", "%s", VPP_BUILD_DATE); + _("Compile location", "%s", VPP_BUILD_TOPDIR); + _("Compiler", "%s", vpe_compiler); + _("Current PID", "%d", getpid ()); +#if DPDK > 0 + _("DPDK Version", "%s", rte_version ()); + _("DPDK EAL init args", "%s", dpdk_config_main.eal_init_args_str); +#endif +#undef _ + } + else + vlib_cli_output (vm, "%s", vpe_version_string); + return 0; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (show_vpe_version_command, static) = { + .path = "show version", + .short_help = "show version information", + .function = show_vpe_version_command_fn, +}; +/* *INDENT-ON* */ + +char * +vpe_api_get_build_directory (void) +{ + return VPP_BUILD_TOPDIR; +} + +char * +vpe_api_get_version (void) +{ + return VPP_BUILD_VER; +} + +char * +vpe_api_get_build_date (void) +{ + return VPP_BUILD_DATE; +} + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */ -- cgit 1.2.3-korg From 597d3c4121b4dd557328c11debb42927a45d52fb Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 16 Jan 2017 21:36:28 +0100 Subject: dpdk: add 'show dpdk version' cli Change-Id: Iaecebae25ee4b8df8ca919992a0433e92e82e90c Signed-off-by: Damjan Marion --- src/vnet/devices/dpdk/cli.c | 20 ++++++++++++++++++++ src/vpp/app/version.c | 10 ---------- src/vpp/oam/oam.c | 4 ---- 3 files changed, 20 insertions(+), 14 deletions(-) (limited to 'src/vpp/app/version.c') diff --git a/src/vnet/devices/dpdk/cli.c b/src/vnet/devices/dpdk/cli.c index 22bd4b4f..3bbace26 100644 --- a/src/vnet/devices/dpdk/cli.c +++ b/src/vnet/devices/dpdk/cli.c @@ -1279,6 +1279,26 @@ VLIB_CLI_COMMAND (cmd_show_dpdk_hqos_queue_stats, static) = { }; /* *INDENT-ON* */ +static clib_error_t * +show_dpdk_version_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ +#define _(a,b,c) vlib_cli_output (vm, "%-25s " b, a ":", c); + _("DPDK Version", "%s", rte_version ()); + _("DPDK EAL init args", "%s", dpdk_config_main.eal_init_args_str); +#undef _ + return 0; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (show_vpe_version_command, static) = { + .path = "show dpdk version", + .short_help = "show dpdk version information", + .function = show_dpdk_version_command_fn, +}; +/* *INDENT-ON* */ + clib_error_t * dpdk_cli_init (vlib_main_t * vm) { diff --git a/src/vpp/app/version.c b/src/vpp/app/version.c index 60844c98..0a2c7fd4 100644 --- a/src/vpp/app/version.c +++ b/src/vpp/app/version.c @@ -16,12 +16,6 @@ #include #include -#if DPDK > 0 -#include -#include -#include -#endif /* DPDK */ - static char *vpe_version_string = "vpp v" VPP_BUILD_VER " built by " VPP_BUILD_USER " on " VPP_BUILD_HOST " at " VPP_BUILD_DATE; @@ -56,10 +50,6 @@ show_vpe_version_command_fn (vlib_main_t * vm, _("Compile location", "%s", VPP_BUILD_TOPDIR); _("Compiler", "%s", vpe_compiler); _("Current PID", "%d", getpid ()); -#if DPDK > 0 - _("DPDK Version", "%s", rte_version ()); - _("DPDK EAL init args", "%s", dpdk_config_main.eal_init_args_str); -#endif #undef _ } else diff --git a/src/vpp/oam/oam.c b/src/vpp/oam/oam.c index 07e17b64..ef061207 100644 --- a/src/vpp/oam/oam.c +++ b/src/vpp/oam/oam.c @@ -14,10 +14,6 @@ */ #include -#if DPDK > 0 -#include -#endif - oam_main_t oam_main; static vlib_node_registration_t oam_node; -- cgit 1.2.3-korg