X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-inmemory-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fstore%2Fimpl%2Fjmx%2FInMemoryDataStoreStats.java;h=cb91b4c81ac2c7bf1222678eb6f3f063bd02fd42;hp=e00be2446a5e690b1053b6373974d4f767ef0740;hb=6098a157bd462484c311c8871507deeb3fb631f1;hpb=1c06f3d753faa148ba9d3628131d8764b1609674 diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/jmx/InMemoryDataStoreStats.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/jmx/InMemoryDataStoreStats.java index e00be2446a..cb91b4c81a 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/jmx/InMemoryDataStoreStats.java +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/jmx/InMemoryDataStoreStats.java @@ -8,10 +8,10 @@ package org.opendaylight.controller.md.sal.dom.store.impl.jmx; -import java.util.concurrent.ExecutorService; import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean; import org.opendaylight.controller.md.sal.common.util.jmx.QueuedNotificationManagerMXBeanImpl; import org.opendaylight.controller.md.sal.common.util.jmx.ThreadExecutorStatsMXBeanImpl; +import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; import org.opendaylight.yangtools.util.concurrent.QueuedNotificationManager; /** @@ -22,11 +22,9 @@ import org.opendaylight.yangtools.util.concurrent.QueuedNotificationManager; public class InMemoryDataStoreStats implements AutoCloseable { private final AbstractMXBean notificationExecutorStatsBean; - private final AbstractMXBean dataStoreExecutorStatsBean; private final QueuedNotificationManagerMXBeanImpl notificationManagerStatsBean; - public InMemoryDataStoreStats(final String mBeanType, final QueuedNotificationManager manager, - final ExecutorService dataStoreExecutor) { + public InMemoryDataStoreStats(final String mBeanType, final QueuedNotificationManager manager) { notificationManagerStatsBean = new QueuedNotificationManagerMXBeanImpl(manager, "notification-manager", mBeanType, null); @@ -37,12 +35,10 @@ public class InMemoryDataStoreStats implements AutoCloseable { if (notificationExecutorStatsBean != null) { notificationExecutorStatsBean.registerMBean(); } + } - dataStoreExecutorStatsBean = ThreadExecutorStatsMXBeanImpl.create(dataStoreExecutor, - "data-store-executor", mBeanType, null); - if (dataStoreExecutorStatsBean != null) { - dataStoreExecutorStatsBean.registerMBean(); - } + public InMemoryDataStoreStats(final String name, final InMemoryDOMDataStore dataStore) { + this(name, dataStore.getDataChangeListenerNotificationManager()); } @Override @@ -51,10 +47,6 @@ public class InMemoryDataStoreStats implements AutoCloseable { notificationExecutorStatsBean.unregisterMBean(); } - if(dataStoreExecutorStatsBean != null) { - dataStoreExecutorStatsBean.unregisterMBean(); - } - if(notificationManagerStatsBean != null) { notificationManagerStatsBean.unregisterMBean(); }