X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_format.c;h=e25a05aa9f1df12fc060364eb4fed54067383190;hb=refs%2Fchanges%2F38%2F20038%2F2;hp=ee332f398e977379978d4aca513a6f07a7aaaeaa;hpb=e524d45eff40c773049e03ea5063216b469bbfcc;p=vpp.git

diff --git a/src/vnet/interface_format.c b/src/vnet/interface_format.c
index ee332f398e9..e25a05aa9f1 100644
--- a/src/vnet/interface_format.c
+++ b/src/vnet/interface_format.c
@@ -219,66 +219,46 @@ format_vnet_sw_interface_cntrs (u8 * s, vnet_interface_main_t * im,
 				vnet_sw_interface_t * si)
 {
   u32 indent, n_printed;
-  int i, j, n_counters;
-  static vnet_main_t **my_vnet_mains;
-
-  vec_reset_length (my_vnet_mains);
+  int j, n_counters;
+  u8 *n = 0;
 
   indent = format_get_indent (s);
   n_printed = 0;
 
-  {
-    vlib_combined_counter_main_t *cm;
-    vlib_counter_t v, vtotal;
-    u8 *n = 0;
-
-    for (i = 0; i < vec_len (vnet_mains); i++)
-      {
-	if (vnet_mains[i])
-	  vec_add1 (my_vnet_mains, vnet_mains[i]);
-      }
+  n_counters = vec_len (im->combined_sw_if_counters);
 
-    if (vec_len (my_vnet_mains) == 0)
-      vec_add1 (my_vnet_mains, &vnet_main);
-
-    /* Each vnet_main_t has its own copy of the interface counters */
-    n_counters = vec_len (im->combined_sw_if_counters);
-
-    /* rx, tx counters... */
-    for (j = 0; j < n_counters; j++)
-      {
-	vtotal.packets = 0;
-	vtotal.bytes = 0;
-
-	for (i = 0; i < vec_len (my_vnet_mains); i++)
-	  {
-	    im = &my_vnet_mains[i]->interface_main;
-	    cm = im->combined_sw_if_counters + j;
-	    vlib_get_combined_counter (cm, si->sw_if_index, &v);
-	    vtotal.packets += v.packets;
-	    vtotal.bytes += v.bytes;
-	  }
+  /* rx, tx counters... */
+  for (j = 0; j < n_counters; j++)
+    {
+      vlib_combined_counter_main_t *cm;
+      vlib_counter_t v, vtotal;
+      vtotal.packets = 0;
+      vtotal.bytes = 0;
 
-	/* Only display non-zero counters. */
-	if (vtotal.packets == 0)
-	  continue;
+      cm = im->combined_sw_if_counters + j;
+      vlib_get_combined_counter (cm, si->sw_if_index, &v);
+      vtotal.packets += v.packets;
+      vtotal.bytes += v.bytes;
 
-	if (n_printed > 0)
-	  s = format (s, "\n%U", format_white_space, indent);
-	n_printed += 2;
+      /* Only display non-zero counters. */
+      if (vtotal.packets == 0)
+	continue;
 
-	if (n)
-	  _vec_len (n) = 0;
-	n = format (n, "%s packets", cm->name);
-	s = format (s, "%-16v%16Ld", n, vtotal.packets);
+      if (n_printed > 0)
+	s = format (s, "\n%U", format_white_space, indent);
+      n_printed += 2;
 
+      if (n)
 	_vec_len (n) = 0;
-	n = format (n, "%s bytes", cm->name);
-	s = format (s, "\n%U%-16v%16Ld",
-		    format_white_space, indent, n, vtotal.bytes);
-      }
-    vec_free (n);
-  }
+      n = format (n, "%s packets", cm->name);
+      s = format (s, "%-16v%16Ld", n, vtotal.packets);
+
+      _vec_len (n) = 0;
+      n = format (n, "%s bytes", cm->name);
+      s = format (s, "\n%U%-16v%16Ld",
+		  format_white_space, indent, n, vtotal.bytes);
+    }
+  vec_free (n);
 
   {
     vlib_simple_counter_main_t *cm;
@@ -290,14 +270,10 @@ format_vnet_sw_interface_cntrs (u8 * s, vnet_interface_main_t * im,
       {
 	vtotal = 0;
 
-	for (i = 0; i < vec_len (my_vnet_mains); i++)
-	  {
-	    im = &my_vnet_mains[i]->interface_main;
-	    cm = im->sw_if_counters + j;
+	cm = im->sw_if_counters + j;
 
-	    v = vlib_get_simple_counter (cm, si->sw_if_index);
-	    vtotal += v;
-	  }
+	v = vlib_get_simple_counter (cm, si->sw_if_index);
+	vtotal += v;
 
 	/* Only display non-zero counters. */
 	if (vtotal == 0)