aboutsummaryrefslogtreecommitdiffstats
path: root/vpp/app
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-03-04 12:44:14 +0100
committerDamjan Marion <damarion@cisco.com>2016-03-04 15:02:27 +0100
commit522e4864b9b8b6751a9cb35ad8f1926f5d162837 (patch)
treee26cf9c524c94a68b1a1203d738ad91dcaa53c13 /vpp/app
parent196cb3d82a7085a9122efadbe4ef1fd8ad19b01e (diff)
Add CPU detection functions
Change-Id: Id7ea0410d6a789000c747c36a7e50076e31dc29a Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vpp/app')
-rw-r--r--vpp/app/version.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/vpp/app/version.c b/vpp/app/version.c
index 1c1f7a61..5eb1fc5a 100644
--- a/vpp/app/version.c
+++ b/vpp/app/version.c
@@ -13,6 +13,7 @@
* limitations under the License.
*/
#include <vlib/vlib.h>
+#include <vppinfra/cpu.h>
#include <app/version.h>
#if DPDK > 0
@@ -26,9 +27,8 @@ static char * vpe_version_string =
" built by " VPP_BUILD_USER
" on " VPP_BUILD_HOST
" at " VPP_BUILD_DATE;
-static char * vpe_dir_string = "Built in " VPP_BUILD_TOPDIR;
-static char * vpe_compiler = "Compiled with "
+static char * vpe_compiler =
#if defined(__INTEL_COMPILER)
#define __(x) #x
#define _(x) __(x)
@@ -48,17 +48,25 @@ show_vpe_version_command_fn (vlib_main_t * vm,
unformat_input_t * input,
vlib_cli_command_t * cmd)
{
- vlib_cli_output (vm, "%s", vpe_version_string);
if (unformat (input, "verbose"))
{
- vlib_cli_output (vm, "%s", vpe_dir_string);
- vlib_cli_output (vm, "%s", vpe_compiler);
+#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);
+ _("CPU model name", "%U", format_cpu_model_name);
+ _("CPU microarchitecture", "%U", format_cpu_uarch);
#if DPDK > 0
- vlib_cli_output (vm, "DPDK version is %s", rte_version());
- vlib_cli_output (vm, "DPDK EAL init arguments: %v",
- dpdk_main.eal_init_args_str);
+ _("DPDK Version", "%s", rte_version());
+ _("DPDK EAL init args", "%s", dpdk_main.eal_init_args_str);
#endif
+#undef _
}
+ else
+ vlib_cli_output (vm, "%s", vpe_version_string);
return 0;
}