Merge branch 'RAMCloud' of https://github.com/yoshitomo0912/ONOS into RAMCloud
diff --git a/lib/blueprints-ramcloud-graph-2.4.0.jar b/lib/blueprints-ramcloud-graph-2.4.0.jar
deleted file mode 100644
index f796c94..0000000
--- a/lib/blueprints-ramcloud-graph-2.4.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/blueprints-ramcloud-graph-2.5.0.jar b/lib/blueprints-ramcloud-graph-2.5.0.jar
deleted file mode 100644
index 7d0080c..0000000
--- a/lib/blueprints-ramcloud-graph-2.5.0.jar
+++ /dev/null
Binary files differ
diff --git a/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java b/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
index 354070a..17067b4 100644
--- a/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
+++ b/src/main/java/net/onrc/onos/graph/RamCloudDBConnection.java
@@ -21,6 +21,7 @@
*/
public class RamCloudDBConnection extends DBConnection {
private RamCloudGraph graph;
+ private FramedGraph<RamCloudGraph> fg;
private static Logger log = LoggerFactory.getLogger(RamCloudDBConnection.class);
//private static final ThreadLocal<RamCloudGraph> RamCloudThreadLocal = new ThreadLocal<RamCloudGraph>();
@@ -31,7 +32,7 @@
//graph = new RamCloudGraph(coordinatorURL);
//graph = RamCloudThreadLocal.get();
//System.out.println("ThreadId = " + Thread.currentThread().getId() + " graph = " + graph);
- graph = new RamCloudGraph("fast+udp:host=10.128.4.104,port=12246");
+ graph = new RamCloudGraph("fast+udp:host=10.0.0.144,port=12246");
Set<String> s = graph.getIndexedKeys(Vertex.class);
if (!s.contains("dpid")) {
graph.createKeyIndex("dpid", Vertex.class);
@@ -57,12 +58,12 @@
if (!s.contains("ipv4_address")) {
graph.createKeyIndex("ipv4_address", Vertex.class);
}
+ fg = new FramedGraph<RamCloudGraph>(graph);
}
@Override
public FramedGraph getFramedGraph() {
if (isValid()) {
- FramedGraph<RamCloudGraph> fg = new FramedGraph<RamCloudGraph>(graph);
return fg;
} else {
log.error("new FramedGraph failed");
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
index e10c705..56fcb91 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
@@ -136,6 +136,7 @@
deleteDeviceOnPort(link.getSrc(),link.getSrcPort());
deleteDeviceOnPort(link.getDst(),link.getDstPort());
+ long startLinkTime = System.nanoTime();
if (addLinkImpl(link)) {
// Set LinkInfo only if linfo is non-null.
if (linfo != null && (! setLinkInfoImpl(link, linfo))) {
@@ -143,6 +144,8 @@
dbop.rollback();
}
dbop.commit();
+ long endLinkTime = System.nanoTime();
+ log.error("Performance ##add link total time {}", endLinkTime - startLinkTime);
success = true;
} else {
// If we fail here that's because the ports aren't added
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index 9782a08..3205d6a 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -752,17 +752,27 @@
do {
retry = false;
try {
+ long startTime = System.nanoTime();
if (! FlowDatabaseOperation.addFlow(dbHandlerInner, flowPath)) {
String logMsg = "Cannot write to Network Map Flow Path " +
flowPath.flowId();
log.error(logMsg);
retry = true;
}
+ // FIXME Flag to turn ON logging
+ //long endTime = System.nanoTime();
+ //log.error("Performance %% Flow path total time {} : {}", endTime - startTime, flowPath.toString());
} catch (TitanException te) {
log.error("Titan Exception writing Flow Path to Network MAP: ", te);
retry = true;
+ // FIXME Flag to turn ON logging
+ //long endTime = System.nanoTime();
+ //log.error("Performance %% Flow path total time {} : {}", endTime - startTime, flowPath.toString());
} catch (Exception e) {
log.error("Exception writing Flow Path to Network MAP: ", e);
+ // FIXME Flag to turn ON logging
+ //long endTime = System.nanoTime();
+ //log.error("Performance %% Flow path total time {} : {}", endTime - startTime, flowPath.toString());
}
} while (retry);
}