Replaced the aggregated Performance Measurement reports for
individual reports for each tag.
diff --git a/src/main/java/net/onrc/onos/datagrid/HazelcastDatagrid.java b/src/main/java/net/onrc/onos/datagrid/HazelcastDatagrid.java
index 7e09982..0abd854 100644
--- a/src/main/java/net/onrc/onos/datagrid/HazelcastDatagrid.java
+++ b/src/main/java/net/onrc/onos/datagrid/HazelcastDatagrid.java
@@ -463,7 +463,7 @@
kryoFactory.deleteKryo(kryo);
flowEventHandlerService.notificationRecvTopologyElementRemoved(topologyElement);
PerformanceMonitor.stop("TopologyEntryRemoved.NotificationReceived");
- PerformanceMonitor.report();
+ PerformanceMonitor.report("TopologyEntryRemoved.NotificationReceived");
}
/**
diff --git a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
index 994c741..6638ac0 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
@@ -378,7 +378,8 @@
datagridService.notificationSendTopologyElementRemoved(topologyElementLink);
}
PerformanceMonitor.stop("SwitchPortRemoved.NotificationSend");
- PerformanceMonitor.report();
+ PerformanceMonitor.report("SwitchPortRemoved.DbAccess");
+ PerformanceMonitor.report("TopologyEntryRemoved.NotificationReceived");
}
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
index 3a68d47..b44a3de 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
@@ -389,7 +389,13 @@
modifiedFlowPaths.clear();
PerformanceMonitor.stop("EventHandler.ProcessAllEvents");
- PerformanceMonitor.report();
+
+
+ PerformanceMonitor.report("EventHandler.ReadTopology");
+ PerformanceMonitor.report("EventHandler.RecomputeFlows");
+ PerformanceMonitor.report("EventHandler.WriteFlowsToDb");
+ PerformanceMonitor.report("EventHandler.NotificationSend.FlowEntryRemoved");
+ PerformanceMonitor.report("EventHandler.ProcessAllEvents");
return;
}
@@ -1404,7 +1410,7 @@
entries.add(flowEntry);
flowManager.pushModifiedFlowEntriesToSwitches(entries);
PerformanceMonitor.stop("EventHandler.AddFlowEntryToSwitch");
- PerformanceMonitor.report();
+ PerformanceMonitor.report("EventHandler.AddFlowEntryToSwitch");
return;
}
@@ -1432,7 +1438,7 @@
entries.add(flowEntry);
flowManager.pushModifiedFlowEntriesToSwitches(entries);
PerformanceMonitor.stop("EventHandler.RemoveFlowEntryFromSwitch");
- PerformanceMonitor.report();
+ PerformanceMonitor.report("EventHandler.RemoveFlowEntryFromSwitch");
return;
}