From: Tinku Mannan <tmannan@ti.com>
Date: Fri, 15 Aug 2014 14:58:55 +0000 (-0400)
Subject: Fix clear stats for transport_dpi_demo application
X-Git-Tag: DEV.NETAPI.01.01.00.03~9
X-Git-Url: https://git.ti.com/gitweb?p=keystone-rtos%2Fnetapi.git;a=commitdiff_plain;h=40d64941c77e4fe9e726d49375a95ba516f2215b;ds=sidebyside

Fix clear stats for transport_dpi_demo application
---

diff --git a/ti/runtime/netapi/demo/src/navl_wrapper.c b/ti/runtime/netapi/demo/src/navl_wrapper.c
index 5c3737e..efd2dc4 100755
--- a/ti/runtime/netapi/demo/src/navl_wrapper.c
+++ b/ti/runtime/netapi/demo/src/navl_wrapper.c
@@ -170,7 +170,7 @@ navl_wrapper_init(int argc, char *argv[])
     static navl_mcb_t reader;
 
     int ret;
-    int i;
+    int i,j;
 
     g_reader = &reader;
 
@@ -193,8 +193,8 @@ navl_wrapper_init(int argc, char *argv[])
 
     g_reader->error_navl = 0;
 
-    g_reader->stats_pkt[0] = NULL;
-    g_reader->stats_pkt[1] = NULL;
+    for(j=0;j< NUM_FP_PROCS;j++)
+        g_reader->stats_pkt[j] = NULL;
     
     g_reader->stats_conns = 0;
 
@@ -222,14 +222,15 @@ navl_wrapper_init(int argc, char *argv[])
         g_reader->stats_pkt[1] = pShmEntry + sizeof(navl_wrapper_cfg_info_t) +
                 (sizeof(navl_wrapper_pkt_stat_t)*MAX_PROTOCOLS); 
 
-        for(i=0;i< MAX_PROTOCOLS;i++)
+        for (j = 0; j < NUM_FP_PROCS; j++)
         {
-            g_reader->stats_pkt[0][i].cycles_min=10000000;
-            g_reader->stats_pkt[1][i].cycles_min=10000000;
-            g_reader->stats_pkt[0][i].cycles_max=0;
-            g_reader->stats_pkt[1][i].cycles_max=0;
-        }
+            for(i=0;i< MAX_PROTOCOLS;i++)
+            {
+                g_reader->stats_pkt[j][i].cycles_min=10000000;
+                g_reader->stats_pkt[j][i].cycles_max=0;
 
+            }
+        }
         pShmEntry = hplib_shmGetEntry(pShmBase, APP_ENTRY_2);
         pDpiStats = (navl_global_dpi_stats*) pShmEntry;
     }
@@ -878,15 +879,17 @@ navl_wrapper_log_message(const char *level, const char *func, const char *format
 void clear_pkt_stats()
 {
     int ret, i;
-    memset(g_reader->stats_pkt[0], 0, (sizeof(navl_wrapper_pkt_stat_t)*MAX_PROTOCOLS));
-    memset(g_reader->stats_pkt[1], 0, (sizeof(navl_wrapper_pkt_stat_t)*MAX_PROTOCOLS));
 
     for (i=0;i < NUM_FP_PROCS;i++)
     {
+        memset(g_reader->stats_pkt[i], 0, (sizeof(navl_wrapper_pkt_stat_t)*MAX_PROTOCOLS));
         /* now fetch all the protocol name ahead of time do we don't have to lookup them up on each packet */
         for (ret = 0; ret != MAX_PROTOCOLS; ret++)
         {
             g_reader->stats_pkt[i][ret].cycles_min=10000000;
+            navl_proto_get_name(g_reader->navl, ret,
+                            g_reader->stats_pkt[i][ret].name,
+                            sizeof(g_reader->stats_pkt[i][ret].name));
         }
     }
 }
diff --git a/ti/runtime/netapi/demo/src/navl_wrapper.h b/ti/runtime/netapi/demo/src/navl_wrapper.h
index 9ba57b7..086114a 100755
--- a/ti/runtime/netapi/demo/src/navl_wrapper.h
+++ b/ti/runtime/netapi/demo/src/navl_wrapper.h
@@ -126,7 +126,7 @@ typedef struct
 typedef struct 
 {
     navl_wrapper_cfg_info_t     navl_cfg;
-    navl_wrapper_pkt_stat_t     stats_pkt[2];
+    navl_wrapper_pkt_stat_t     stats_pkt[NUM_FP_PROCS];
 } navl_wrapper_shm_pkt_stats_t;
 
 
diff --git a/ti/runtime/netapi/tools/net_test_loopback_setup.sh b/ti/runtime/netapi/tools/net_test_loopback_setup.sh
index 3ac5151..7503fd3 100644
--- a/ti/runtime/netapi/tools/net_test_loopback_setup.sh
+++ b/ti/runtime/netapi/tools/net_test_loopback_setup.sh
@@ -7,6 +7,6 @@ insmod /lib/modules/$KERNEL_VER/extra/hplibmod.ko
 # disable vlan aware mode in switch
 devmem2 0x2090804 w 0x4
 #
-# run net_test_loopback applicaton, default location of config file is in /etc/transportnetlib,
+# run net_test_loopback applicaton, default location of config file is in /etc/transportnetlib/test,
 # default config file name is net_test_config.txt
 /usr/bin/net_test_loopback /etc/transportnetlib/test/net_test_config.txt
diff --git a/ti/runtime/netapi/tools/net_test_router_setup.sh b/ti/runtime/netapi/tools/net_test_router_setup.sh
index 74a0722..8b7c632 100644
--- a/ti/runtime/netapi/tools/net_test_router_setup.sh
+++ b/ti/runtime/netapi/tools/net_test_router_setup.sh
@@ -11,6 +11,6 @@ ifconfig eth1 10.0.2.100
 # disable vlan aware mode in switch
 devmem2 0x2090804 w 0x4
 #
-# run net_test_router applicaton, default location of config file is in /etc/transportnetlib,
+# run net_test_router applicaton, default location of config file is in /etc/transportnetlib/test,
 # default config file name is net_test_config.txt
 /usr/bin/net_test_router /etc/transportnetlib/test/net_test_config.txt