commit 78baf58cff22737880c5f6767c9d805206db9fc2
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Fri Jun 05 11:40:14 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jun 05 21:00:20 2015 +0000
tree 5d9d8a203229013ab3e0f1be36c08f4c70842cd7
parent beb2dc94ce37a9f2f9d38d1cf1d316a158c87024

Segment Routing ONS demo fixes: Includes traffic visualization fix

Change-Id: I5119271464b696fd145c6b63bee09d7f3ef109bd

incubator/net/src/main/java/org/onosproject/incubator/net/impl/PortStatisticsManager.java

diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/impl/PortStatisticsManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/impl/PortStatisticsManager.java
index be4915d..c403bb9 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/impl/PortStatisticsManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/impl/PortStatisticsManager.java
@@ -51,6 +51,7 @@
 
     private static final long POLL_FREQUENCY = 10_000; // milliseconds
     private static final long STALE_LIMIT = (long) (1.5 * POLL_FREQUENCY);
+    private static final int SECOND = 1_000; // milliseconds
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected DeviceService deviceService;
@@ -79,13 +80,11 @@
         long now = System.currentTimeMillis();
 
         if (c != null && p != null && (now - c.time < STALE_LIMIT)) {
-            if (c.stats.durationSec() > p.stats.durationSec() &&
-                    c.stats.bytesSent() >= p.stats.bytesSent() &&
-                    c.stats.durationSec() >= POLL_FREQUENCY / 1_000) {
+            if ((c.time > p.time + SECOND) &&
+                (c.stats.bytesSent() >= p.stats.bytesSent())) {
                 return new DefaultLoad(c.stats.bytesSent(), p.stats.bytesSent(),
-                                       c.stats.durationSec() - p.stats.durationSec());
+                                       (int) (c.time - p.time) / SECOND);
             }
-            return new DefaultLoad(c.stats.bytesSent(), 0, c.stats.durationSec());
         }
         return null;
     }