Merge pull request #486 from jonohart/flcleanup
Removed a bunch of Floodlight code
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 41cf670..84b175f 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -26,7 +26,18 @@
import net.onrc.onos.ofcontroller.flowprogrammer.IFlowPusherService;
import net.onrc.onos.ofcontroller.forwarding.IForwardingService;
import net.onrc.onos.ofcontroller.topology.Topology;
-import net.onrc.onos.ofcontroller.util.*;
+import net.onrc.onos.ofcontroller.util.Dpid;
+import net.onrc.onos.ofcontroller.util.FlowEntry;
+import net.onrc.onos.ofcontroller.util.FlowEntrySwitchState;
+import net.onrc.onos.ofcontroller.util.FlowEntryUserState;
+import net.onrc.onos.ofcontroller.util.FlowEntryId;
+import net.onrc.onos.ofcontroller.util.FlowId;
+import net.onrc.onos.ofcontroller.util.FlowPath;
+import net.onrc.onos.ofcontroller.util.FlowPathUserState;
+import net.onrc.onos.ofcontroller.util.Pair;
+import net.onrc.onos.ofcontroller.util.serializers.KryoFactory;
+
+import com.esotericsoftware.kryo2.Kryo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +57,9 @@
protected IFlowPusherService pusher;
protected IForwardingService forwardingService;
-
+
+ private KryoFactory kryoFactory = new KryoFactory();
+
// Flow Entry ID generation state
private static Random randomGenerator = new Random();
private static int nextFlowEntryIdPrefix = 0;
@@ -587,11 +600,24 @@
*/
private void pushModifiedFlowPathsToDatabase(
Collection<FlowPath> modifiedFlowPaths) {
+ List<FlowPath> copiedFlowPaths = new LinkedList<FlowPath>();
+
+ //
+ // Create a copy of the Flow Paths to push, because the pushing
+ // itself will happen on a separate thread.
+ //
+ Kryo kryo = kryoFactory.newKryo();
+ for (FlowPath flowPath : modifiedFlowPaths) {
+ FlowPath copyFlowPath = kryo.copy(flowPath);
+ copiedFlowPaths.add(copyFlowPath);
+ }
+ kryoFactory.deleteKryo(kryo);
+
//
// We only add the Flow Paths to the Database Queue.
// The FlowDatabaseWriter thread is responsible for the actual writing.
//
- flowPathsToDatabaseQueue.addAll(modifiedFlowPaths);
+ flowPathsToDatabaseQueue.addAll(copiedFlowPaths);
}
/**