review comments

Author: renukamanavalan

gnmi_server/client_subscribe.go

@@ -249,7 +249,7 @@ func (c *Client) recv(stream gnmipb.GNMI_SubscribeServer) {
 // send runs until process Queue returns an error.
 func (c *Client) send(stream gnmipb.GNMI_SubscribeServer, dc sdc.Client) error {
 	for {
-        var val *sdc.Value
+		var val *sdc.Value
 		items, err := c.q.Get(1)
 
 		if items == nil {
@@ -264,13 +264,13 @@ func (c *Client) send(stream gnmipb.GNMI_SubscribeServer, dc sdc.Client) error {
 
 		var resp *gnmipb.SubscribeResponse
 
-        switch v := items[0].(type) {
+		switch v := items[0].(type) {
 		case sdc.Value:
-            if resp, err = sdc.ValToResp(v); err != nil {
+			if resp, err = sdc.ValToResp(v); err != nil {
 				c.errors++
 				return err
 			}
-            val = &v;
+			val = &v;
 		default:
 			log.V(1).Infof("Unknown data type %v for %s in queue", items[0], c)
 			c.errors++

sonic_data_client/events_client.go

@@ -141,7 +141,9 @@ func compute_latency(evtc *EventClient) {
                 cnt += 1
             }
         }
-        evtc.counters[LATENCY] = (uint64) (total/cnt/1000/1000)
+        if (cnt > 0) {
+            evtc.counters[LATENCY] = (uint64) (total/cnt/1000/1000)
+        }
     }
 }
 
@@ -151,6 +153,11 @@ func update_stats(evtc *EventClient) {
     var wr_counters *map[string]uint64 = nil
     var rclient *redis.Client
 
+    /*
+     * This loop pauses until at least one non zero counter.
+     * This helps add some initial pause before accessing DB
+     * for existing values.
+     */
     for evtc.stopped == 0 {
         var val uint64
 
@@ -166,6 +173,7 @@ func update_stats(evtc *EventClient) {
         time.Sleep(time.Second)
     }
 
+    /* Populate counters from DB for cumulative counters. */
     if evtc.stopped == 0 {
         ns := sdcfg.GetDbDefaultNamespace()
 
@@ -193,22 +201,12 @@ func update_stats(evtc *EventClient) {
         }
     }
 
+    /* Main running loop that updates DB */
     for evtc.stopped == 0 {
         tmp_counters := make(map[string]uint64)
 
         // compute latency
-        if evtc.last_latency_full {
-            var total uint64 = 0
-            var cnt uint64 = 0
-
-            for _, v := range evtc.last_latencies {
-                if v > 0 {
-                    total += v
-                    cnt += 1
-                }
-            }
-            evtc.counters[LATENCY] = (uint64) (total/cnt/1000/1000)
-        }
+        compute_latency(evtc)
 
         for key, val := range evtc.counters {
             tmp_counters[key] = val + db_counters[key]