- Application is no longer blocked when programming hundreds of flows. The Barrier...

[controller.git] / opendaylight / protocol_plugins / openflow / src / main / java / org / opendaylight / controller / protocol_plugin / openflow / core / internal / SynchronousMessage.java

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SynchronousMessage.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SynchronousMessage.java
index 5e613e8642489c0dce449fdcb242700406142f20..bb94d4b3186e73235c736aa8b2f8f78f5ecaf3dc 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SynchronousMessage.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SynchronousMessage.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
  *
@@ -18,15 +17,15 @@ import org.openflow.protocol.OFError;
 import org.openflow.protocol.OFMessage;
 
 /**
- * Implements the synchronous message send to a switch
- * It sends the requested message to the switch followed by a barrier request message
- * It returns the result once it gets the reply from the switch or after a timeout
- * If the protocol does not dictate the switch to reply the processing status for a particular message
- * the barrier request forces the switch to reply saying whether or not the message processing was
- * successful for messages sent to the switch up to this point
- *
- *
- *
+ * This class implements synchronous operations on message send to a switch. If
+ * syncRequest is set to true, it sends the requested message to the switch
+ * followed by a Barrier request message. It returns the result once it gets the
+ * reply from the switch or after a timeout. If the protocol does not dictate
+ * the switch to reply the processing status for a particular message, the
+ * Barrier request forces the switch to reply saying whether or not the message
+ * processing was successful for messages sent to the switch up to this point.
+ * If syncRequest is false, it simply skips the message send and just waits for
+ * the response back.
  */
 public class SynchronousMessage implements Callable<Object> {
     private ISwitch sw;
@@ -34,20 +33,31 @@ public class SynchronousMessage implements Callable<Object> {
     private OFMessage syncMsg;
     protected CountDownLatch latch;
     private Object result;
+    private boolean syncRequest;
 
-    public SynchronousMessage(ISwitch sw, Integer xid, OFMessage msg) {
+    public SynchronousMessage(ISwitch sw, Integer xid, OFMessage msg,
+            boolean syncRequest) {
         this.sw = sw;
         this.xid = xid;
         syncMsg = msg;
         latch = new CountDownLatch(1);
         result = null;
+        this.syncRequest = syncRequest;
     }
 
     @Override
     public Object call() throws Exception {
-        sw.asyncSend(syncMsg, xid);
-        OFBarrierRequest barrierMsg = new OFBarrierRequest();
-        sw.asyncSend(barrierMsg, xid);
+        /*
+         * Send out message only if syncRequest is set to true. Otherwise, just
+         * wait for the Barrier response back.
+         */
+        if (syncRequest) {
+            sw.asyncSend(syncMsg, xid);
+            if (!(syncMsg instanceof OFBarrierRequest)) {
+                OFBarrierRequest barrierMsg = new OFBarrierRequest();
+                sw.asyncSend(barrierMsg, xid);
+            }
+        }
         latch.await();
         return result;
     }