commit 9e6223db5b11e877bfd905f61fe8f2790a9de138
author Yuta HIGUCHI <y-higuchi@onlab.us> Tue Aug 26 00:01:32 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:23 2014 -0700
tree b2cae666ea2c5069241d37e4518ee96cdb74020f
parent c79d2645ab53e02f3388a9ce20940e4bfdf61b1a

Fixing topology related internal interface/class tree

- Moved TopologyInternal to more appropriate place

 --- BaseInternalTopology (was TopologyInternal)
  |
  +-- ImmutableInternalTopology (new)
  |
  +-- MutableInternalTopology (new)

- Updated TopologyImpl, etc. to implement appropriate
  *InternalTopology interface

- Added interface adaptor BaseTopologyAdaptor
   BaseInternalTopology (self-contained) -> BaseTopology (object handle)

- TopologyObjects ({Switch,Port,Link,Host}Impl) is now common
  between Mutable and Immutable variant of Topology.
   There were locks for whole Topology, but there weren't any locks
   per TopologyObject. If these instances were on MutableTopology,
   then locking should happen outside these instance method calls.

ONOS-1925

Change-Id: I0a13b4ed4b5a66b7ea8c42212c9504e6bc83d853

src/main/java/net/onrc/onos/core/topology/LinkImpl.java

diff --git a/src/main/java/net/onrc/onos/core/topology/LinkImpl.java b/src/main/java/net/onrc/onos/core/topology/LinkImpl.java
index ee60d2d..0fcb092 100644
--- a/src/main/java/net/onrc/onos/core/topology/LinkImpl.java
+++ b/src/main/java/net/onrc/onos/core/topology/LinkImpl.java
@@ -3,12 +3,10 @@
 import java.util.Map;
 
 import net.onrc.onos.core.util.LinkTuple;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Handler to Link object stored in In-memory Topology snapshot.
- * <p/>
  */
 public class LinkImpl extends TopologyObject implements Link {
 
@@ -21,7 +19,7 @@
      * @param topology Topology instance this object belongs to
      * @param linkTuple Link identifier
      */
-    LinkImpl(TopologyInternal topology, LinkTuple linkTuple) {
+    LinkImpl(BaseInternalTopology topology, LinkTuple linkTuple) {
         super(topology);
         this.id = checkNotNull(linkTuple);
     }
@@ -33,47 +31,27 @@
 
     @Override
     public Switch getSrcSwitch() {
-        topology.acquireReadLock();
-        try {
-            return topology.getSwitch(id.getSrc().getDpid());
-        } finally {
-            topology.releaseReadLock();
-        }
+        // TODO Cache BaseTopologyAdaptor instance?
+        return new BaseTopologyAdaptor(topology).getSwitch(id.getSrc().getDpid());
     }
 
     @Override
     public Port getSrcPort() {
-        topology.acquireReadLock();
-        try {
-            return topology.getPort(id.getSrc());
-        } finally {
-            topology.releaseReadLock();
-        }
+        return new BaseTopologyAdaptor(topology).getPort(id.getSrc());
     }
 
     @Override
     public Switch getDstSwitch() {
-        topology.acquireReadLock();
-        try {
-            return topology.getSwitch(id.getDst().getDpid());
-        } finally {
-            topology.releaseReadLock();
-        }
+        return new BaseTopologyAdaptor(topology).getSwitch(id.getDst().getDpid());
     }
 
     @Override
     public Port getDstPort() {
-        topology.acquireReadLock();
-        try {
-            return topology.getPort(id.getDst());
-        } finally {
-            topology.releaseReadLock();
-        }
+        return new BaseTopologyAdaptor(topology).getPort(id.getDst());
     }
 
     @Override
     public long getLastSeenTime() {
-        // TODO Auto-generated method stub
         throw new UnsupportedOperationException("Not implemented yet");
     }