commit 6a2923168ebc64005e189b00a68eebbcbb8b4f78
author Madan Jampani <madan@onlab.us> Fri Jun 24 09:19:59 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jul 01 18:06:56 2016 +0000
tree 3f5ddf29cd318c899cf8504adfc2a8638a9f1556
parent 38b5f18864ffc7bcc0bdbee979bec3a87a1f9485

Make CoreEventDispatcher's listener processing time tracking thread-safe

Change-Id: Ib9f109e41fd1b78ce9771a2bb54e8bf3dda38d6c

core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java

diff --git a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
index 12e922a..80f9751 100644
--- a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
+++ b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
@@ -27,11 +27,14 @@
 import org.onosproject.event.EventSink;
 import org.slf4j.Logger;
 
+import com.google.common.base.Stopwatch;
+
 import java.util.TimerTask;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
@@ -71,7 +74,7 @@
     // Means to detect long-running sinks
     private TimerTask watchdog;
     private EventSink lastSink;
-    private long lastStart = 0;
+    private final Stopwatch stopwatch = Stopwatch.createUnstarted();
     private Future<?> dispatchFuture;
 
     @Override
@@ -166,9 +169,9 @@
             EventSink sink = getSink(event.getClass());
             if (sink != null) {
                 lastSink = sink;
-                lastStart = System.currentTimeMillis();
+                stopwatch.start();
                 sink.process(event);
-                lastStart = 0;
+                stopwatch.reset();
             } else {
                 log.warn("No sink registered for event class {}",
                          event.getClass().getName());
@@ -184,11 +187,11 @@
     private class Watchdog extends TimerTask {
         @Override
         public void run() {
-            long delta = System.currentTimeMillis() - lastStart;
-            if (lastStart > 0 && delta > maxProcessMillis) {
-                lastStart = 0;
+            long elapsedTimeMillis = stopwatch.elapsed(TimeUnit.MILLISECONDS);
+            if (elapsedTimeMillis > maxProcessMillis) {
+                stopwatch.reset();
                 log.warn("Event sink {} exceeded execution time limit: {} ms; spawning new dispatch loop",
-                          lastSink.getClass().getName(), delta);
+                          lastSink.getClass().getName(), elapsedTimeMillis);
 
                 // Notify the sink that it has exceeded its time limit.
                 lastSink.onProcessLimit();