* revised approach for setting tcp-nodelay on client to avoid breaking platform abstractions

* added ability to set tcp-nodelay on server side of the socket also



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-10@682785 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 2 deletions

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 28c7518600..962da9aa6c 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -88,7 +88,8 @@ Broker::Options::Options(const std::string& name) :
     realm("QPID"),
     replayFlushLimit(0),
     replayHardLimit(0),
-    queueLimit(100*1048576/*100M default limit*/)
+    queueLimit(100*1048576/*100M default limit*/),
+    tcpNoDelay(false)
 {
     int c = sys::SystemInfo::concurrency();
     workerThreads=c+1;
@@ -112,7 +113,8 @@ Broker::Options::Options(const std::string& name) :
         ("mgmt-pub-interval", optValue(mgmtPubInterval, "SECONDS"), "Management Publish Interval")
         ("auth", optValue(auth, "yes|no"), "Enable authentication, if disabled all incoming connections will be trusted")
         ("realm", optValue(realm, "REALM"), "Use the given realm when performing authentication")
-        ("default-queue-limit", optValue(queueLimit, "BYTES"), "Default maximum size for queues (in bytes)");
+        ("default-queue-limit", optValue(queueLimit, "BYTES"), "Default maximum size for queues (in bytes)")
+        ("tcp-nodelay", optValue(tcpNoDelay), "Set TCP_NODELAY on TCP connections");
 }
 
 const std::string empty;
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index 9bbc6aec94..125c3df9d4 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -85,6 +85,7 @@ class Broker : public sys::Runnable, public Plugin::Target,
         size_t replayFlushLimit;
         size_t replayHardLimit;
         uint queueLimit;
+        bool tcpNoDelay;
     };
     
     virtual ~Broker();