Mechanical code cleanup (benchmark)

[controller.git] / benchmark / dsbenchmark / src / main / java / org / opendaylight / dsbenchmark / listener / DsbenchmarkListenerProvider.java

diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/listener/DsbenchmarkListenerProvider.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/listener/DsbenchmarkListenerProvider.java
index 7e0146f991a83dc00387c9bf985bc1655cd50ad4..e5898183603cb0550aa28c8eb90ffbfe9431e46b 100644 (file)
--- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/listener/DsbenchmarkListenerProvider.java
+++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/listener/DsbenchmarkListenerProvider.java
@@ -22,9 +22,10 @@ import org.slf4j.LoggerFactory;
 
 public class DsbenchmarkListenerProvider {
     private static final Logger LOG = LoggerFactory.getLogger(DsbenchmarkListenerProvider.class);
-    private static final InstanceIdentifier<TestExec> TEST_EXEC_IID = InstanceIdentifier.builder(TestExec.class).build();
-    private final List<ListenerRegistration<DsbenchmarkListener>> listeners = 
-            new ArrayList<ListenerRegistration<DsbenchmarkListener>>();
+    private static final InstanceIdentifier<TestExec> TEST_EXEC_IID =
+            InstanceIdentifier.builder(TestExec.class).build();
+    private final List<ListenerRegistration<DsbenchmarkListener>> listeners =
+            new ArrayList<>();
     private DataBroker dataBroker;
 
     public void setDataBroker(DataBroker dataBroker) {
@@ -33,27 +34,35 @@ public class DsbenchmarkListenerProvider {
     }
 
     public void createAndRegisterListeners(int numListeners) {
-        for(int i = 0; i < numListeners; i++) {
+        for (int i = 0; i < numListeners; i++) {
             DsbenchmarkListener listener = new DsbenchmarkListener();
             listeners.add(dataBroker.registerDataTreeChangeListener(
-                    new DataTreeIdentifier<TestExec>(LogicalDatastoreType.CONFIGURATION, TEST_EXEC_IID), listener));
+                    new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, TEST_EXEC_IID), listener));
             listeners.add(dataBroker.registerDataTreeChangeListener(
-                    new DataTreeIdentifier<TestExec>(LogicalDatastoreType.OPERATIONAL, TEST_EXEC_IID), listener));
+                    new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, TEST_EXEC_IID), listener));
 
         }
         LOG.info("DsbenchmarkListenerProvider created {} listeneres", numListeners);
     }
 
+    public long getDataChangeCount() {
+        long dataChanges = 0;
+
+        for (ListenerRegistration<DsbenchmarkListener> listenerRegistration : listeners) {
+            dataChanges += listenerRegistration.getInstance().getNumDataChanges();
+        }
+        LOG.info("DsbenchmarkListenerProvider , total data changes {}", dataChanges);
+        return dataChanges;
+    }
+
     public long getEventCountAndDestroyListeners() {
         long totalEvents = 0;
 
         for (ListenerRegistration<DsbenchmarkListener> listenerRegistration : listeners) {
-            totalEvents = totalEvents + listenerRegistration.getInstance().getNumEvents();
+            totalEvents += listenerRegistration.getInstance().getNumEvents();
             listenerRegistration.close();
         }
-
         listeners.clear();
-        totalEvents = totalEvents / 2;  // Each listener is registered 2x: adjust for event double-counting
         LOG.info("DsbenchmarkListenerProvider destroyed listeneres, total events {}", totalEvents);
         return totalEvents;
     }