span: fix wrong next1 feature index in dual loop

[vpp.git] / vpp / app / version.c

diff --git a/vpp/app/version.c b/vpp/app/version.c
index afd1e4a..f884081 100644 (file)
--- a/vpp/app/version.c
+++ b/vpp/app/version.c
@@ -13,66 +13,90 @@
  * limitations under the License.
  */
 #include <vlib/vlib.h>
+#include <vppinfra/cpu.h>
 #include <app/version.h>
 
 #if DPDK > 0
 #include <rte_version.h>
+#include <vnet/vnet.h>
+#include <vnet/devices/dpdk/dpdk.h>
 #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_dir_string = "Built in " VPP_BUILD_TOPDIR;
+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 = "Compiled with "
+static char *vpe_compiler =
 #if defined(__INTEL_COMPILER)
 #define __(x) #x
 #define _(x) __(x)
-       "icc " _(__INTEL_COMPILER) " (" __VERSION__ ")";
+  "icc " _(__INTEL_COMPILER) " (" __VERSION__ ")";
 #undef _
 #undef __
 #elif defined(__clang__)
-       "Clang/LLVM " __clang_version__;
+  "Clang/LLVM " __clang_version__;
 #elif defined (__GNUC__)
-       "GCC " __VERSION__;
+  "GCC " __VERSION__;
 #else
-       "unknown compiler";
+  "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)
+                            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);
+  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
-     vlib_cli_output (vm, "DPDK version is %s", rte_version());
+      _("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) 
+char *
+vpe_api_get_build_directory (void)
 {
   return VPP_BUILD_TOPDIR;
 }
 
-char * vpe_api_get_version (void) 
+char *
+vpe_api_get_version (void)
 {
   return VPP_BUILD_VER;
 }
-char * vpe_api_get_build_date (void) 
+
+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:
+ */