Cleaning-up shared executors use of metrics service.

Change-Id: I4293df87cd46e9f22cbdf03cfbced9a21ba85de7

@@ -101,7 +101,7 @@ public class CoreManager implements CoreService {
 
 
 
 
     @Activate
     @Activate
-    public void activate() {
+    protected void activate() {
         registerApplication(CORE_APP_NAME);
         registerApplication(CORE_APP_NAME);
         cfgService.registerProperties(getClass());
         cfgService.registerProperties(getClass());
         try {
         try {
@@ -117,7 +117,7 @@ public class CoreManager implements CoreService {
     }
     }
 
 
     @Deactivate
     @Deactivate
-    public void deactivate() {
+    protected void deactivate() {
         cfgService.unregisterProperties(getClass(), false);
         cfgService.unregisterProperties(getClass(), false);
         SharedExecutors.shutdown();
         SharedExecutors.shutdown();
     }
     }
@@ -171,7 +171,7 @@ public class CoreManager implements CoreService {
 
 
 
 
     @Modified
     @Modified
-    public void modified(ComponentContext context) {
+    protected void modified(ComponentContext context) {
         Dictionary<?, ?> properties = context.getProperties();
         Dictionary<?, ?> properties = context.getProperties();
         Integer poolSize = Tools.getIntegerProperty(properties, "sharedThreadPoolSize");
         Integer poolSize = Tools.getIntegerProperty(properties, "sharedThreadPoolSize");
 
 
@@ -193,7 +193,7 @@ public class CoreManager implements CoreService {
         Boolean performanceCheck = Tools.isPropertyEnabled(properties, "sharedThreadPerformanceCheck");
         Boolean performanceCheck = Tools.isPropertyEnabled(properties, "sharedThreadPerformanceCheck");
         if (performanceCheck != null) {
         if (performanceCheck != null) {
             calculatePoolPerformance = performanceCheck;
             calculatePoolPerformance = performanceCheck;
-            SharedExecutors.setCalculatePoolPerformance(calculatePoolPerformance, metricsService);
+            SharedExecutors.setMetricsService(calculatePoolPerformance ? metricsService : null);
         }
         }
 
 
         log.info("Settings: sharedThreadPoolSize={}, maxEventTimeLimit={}, calculatePoolPerformance={}",
         log.info("Settings: sharedThreadPoolSize={}, maxEventTimeLimit={}, calculatePoolPerformance={}",

@@ -134,8 +134,7 @@ class SharedExecutorService implements ExecutorService {
                        delayMetrics.update(taskwaittime, TimeUnit.SECONDS);
                        delayMetrics.update(taskwaittime, TimeUnit.SECONDS);
                    }
                    }
                    return t;
                    return t;
-                }
-        );
+               });
     }
     }
 
 
     @Override
     @Override
@@ -179,20 +178,26 @@ class SharedExecutorService implements ExecutorService {
         executor.execute(command);
         executor.execute(command);
     }
     }
 
 
-    public void setCalculatePoolPerformance(boolean calculatePoolPerformance, MetricsService metricsSrv) {
-       this.metricsService = metricsSrv;
-       if (calculatePoolPerformance) {
-           if (metricsService != null) {
+    /**
+     * Enables or disables calculation of the pool performance metrics. If
+     * the metrics service is not null metric collection will be enabled;
+     * otherwise it will be disabled.
+     *
+     * @param metricsService optional metric service
+     */
+    public void setMetricsService(MetricsService metricsService) {
+        if (this.metricsService == null && metricsService != null) {
+            // If metrics service was newly introduced, initialize metrics.
             executorMetrics = metricsService.registerComponent("SharedExecutor");
             executorMetrics = metricsService.registerComponent("SharedExecutor");
             MetricsFeature mf = executorMetrics.registerFeature("*");
             MetricsFeature mf = executorMetrics.registerFeature("*");
             queueMetrics = metricsService.createTimer(executorMetrics, mf, "Queue");
             queueMetrics = metricsService.createTimer(executorMetrics, mf, "Queue");
             delayMetrics = metricsService.createTimer(executorMetrics, mf, "Delay");
             delayMetrics = metricsService.createTimer(executorMetrics, mf, "Delay");
-           }
-       } else {
-           metricsService = null;
+        } else if (this.metricsService != null && metricsService == null) {
+            // If the metrics service was newly withdrawn, tear-down metrics.
             queueMetrics = null;
             queueMetrics = null;
             delayMetrics = null;
             delayMetrics = null;
-       }
+        } // Otherwise just record the metrics service
+        this.metricsService = metricsService;
     }
     }
 
 
     private Runnable wrap(Runnable command) {
     private Runnable wrap(Runnable command) {
@@ -232,11 +237,13 @@ class SharedExecutorService implements ExecutorService {
 
 
         /**
         /**
          * Wrapper for Callable object .
          * Wrapper for Callable object .
+         *
          * @param runnable Runnable object
          * @param runnable Runnable object
          */
          */
         public CallableExtended(Runnable runnable) {
         public CallableExtended(Runnable runnable) {
             this.runnable = runnable;
             this.runnable = runnable;
         }
         }
+
         public Runnable getRunnable() {
         public Runnable getRunnable() {
             return runnable;
             return runnable;
         }
         }

@@ -95,9 +95,15 @@ public final class SharedExecutors {
                                                             "onos-pool-executor-%d")));
                                                             "onos-pool-executor-%d")));
     }
     }
 
 
-
-    public static void setCalculatePoolPerformance(boolean calculatePoolPerformance, MetricsService metricsService) {
-        poolThreadExecutor.setCalculatePoolPerformance(calculatePoolPerformance, metricsService);
+    /**
+     * Enables or disables calculation of the pool performance metrics. If
+     * the metrics service is not null metric collection will be enabled;
+     * otherwise it will be disabled.
+     *
+     * @param metricsService optional metric service
+     */
+    public static void setMetricsService(MetricsService metricsService) {
+        poolThreadExecutor.setMetricsService(metricsService);
     }
     }
 
 
     /**
     /**