Network Graph Refactoring: WIP: Use the Network Graph locking mechanism
* Renamed NetworkGraph.acquireLock() and releaseLock() to
acquireReadLock() and releaseReadLock()
* Added new methods NetworkGraphImpl.acquireWriteLock() and
releaseWriteLock()
* Use the above two locks inside the TopologyManager for
updating the in-memory Network Topology.
Change-Id: I18d6b65e6c0ad695afb80b0bd469eb96c4f657a6
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
index 83fc952..2153905 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
@@ -142,12 +142,20 @@
}
@Override
- public void acquireLock() {
+ public void acquireReadLock() {
readLock.lock();
}
@Override
- public void releaseLock() {
+ public void releaseReadLock() {
readLock.unlock();
}
+
+ protected void acquireWriteLock() {
+ writeLock.lock();
+ }
+
+ protected void releaseWriteLock() {
+ writeLock.unlock();
+ }
}