Move statistics request functions into trackers

[controller.git] / opendaylight / md-sal / statistics-manager / src / main / java / org / opendaylight / controller / md / statistics / manager / AbstractStatsTracker.java

diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/AbstractStatsTracker.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/AbstractStatsTracker.java
index aa7720cf106844be6e440d0493b7bffbb24f244e..03ed6cb1f1420edcd3c502d26fccf37a56fd3fab 100644 (file)
--- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/AbstractStatsTracker.java
+++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/AbstractStatsTracker.java
@@ -12,34 +12,63 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.Future;
 
 import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
-import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionAware;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
+import org.opendaylight.yangtools.yang.common.RpcResult;
 
+import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.JdkFutureAdapters;
+import com.google.common.util.concurrent.ListenableFuture;
 
 abstract class AbstractStatsTracker<I, K> {
+    private static final Function<RpcResult<? extends TransactionAware>, TransactionId> FUNCTION =
+            new Function<RpcResult<? extends TransactionAware>, TransactionId>() {
+        @Override
+        public TransactionId apply(RpcResult<? extends TransactionAware> input) {
+            return input.getResult().getTransactionId();
+        }
+    };
+
     private final Map<K, Long> trackedItems = new HashMap<>();
-    private final InstanceIdentifier<Node> nodeIdentifier;
-    private final DataProviderService dps;
+    private final FlowCapableContext context;
     private final long lifetimeNanos;
 
-    protected AbstractStatsTracker(final InstanceIdentifier<Node> nodeIdentifier, final DataProviderService dps, long lifetimeNanos) {
-        this.nodeIdentifier = Preconditions.checkNotNull(nodeIdentifier);
-        this.dps = Preconditions.checkNotNull(dps);
+    protected AbstractStatsTracker(final FlowCapableContext context, final long lifetimeNanos) {
+        this.context = Preconditions.checkNotNull(context);
         this.lifetimeNanos = lifetimeNanos;
     }
 
     protected final InstanceIdentifierBuilder<Node> getNodeIdentifierBuilder() {
-        return InstanceIdentifier.builder(nodeIdentifier);
+        return InstanceIdentifier.builder(getNodeIdentifier());
+    }
+
+    protected final NodeRef getNodeRef() {
+        return context.getNodeRef();
+    }
+
+    protected final InstanceIdentifier<Node> getNodeIdentifier() {
+        return context.getNodeIdentifier();
+    }
+
+    protected static final <T extends TransactionAware> ListenableFuture<TransactionId> requestHelper(Future<RpcResult<T>> future) {
+        return Futures.transform(JdkFutureAdapters.listenInPoolThread(future), FUNCTION);
     }
 
-    final synchronized void updateStats(List<I> list) {
+    protected abstract void cleanupSingleStat(DataModificationTransaction trans, K item);
+    protected abstract K updateSingleStat(DataModificationTransaction trans, I item);
+
+    public final synchronized void updateStats(List<I> list) {
         final Long expiryTime = System.nanoTime() + lifetimeNanos;
-        final DataModificationTransaction trans = dps.beginTransaction();
+        final DataModificationTransaction trans = context.startDataModification();
 
         for (final I item : list) {
             trackedItems.put(updateSingleStat(trans, item), expiryTime);
@@ -48,8 +77,7 @@ abstract class AbstractStatsTracker<I, K> {
         trans.commit();
     }
 
-
-    final synchronized void cleanup(final DataModificationTransaction trans, long now) {
+    public final synchronized void cleanup(final DataModificationTransaction trans, long now) {
         for (Iterator<Entry<K, Long>> it = trackedItems.entrySet().iterator();it.hasNext();){
             Entry<K, Long> e = it.next();
             if (now > e.getValue()) {
@@ -58,7 +86,4 @@ abstract class AbstractStatsTracker<I, K> {
             }
         }
     }
-
-    protected abstract void cleanupSingleStat(DataModificationTransaction trans, K item);
-    protected abstract K updateSingleStat(DataModificationTransaction trans, I item);
 }