diff options
| author | Gordon Sim <gsim@apache.org> | 2008-08-05 17:03:16 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2008-08-05 17:03:16 +0000 |
| commit | bd47fd629bb2356df93af70b174a6a070f3a58cc (patch) | |
| tree | c92b2cc932fe806ce9e41521de9f4d01557ec2ba /cpp/src/qpid/broker | |
| parent | 6bed4cf29dda54560af44d16143fa4b24b65245b (diff) | |
| download | qpid-python-bd47fd629bb2356df93af70b174a6a070f3a58cc.tar.gz | |
* 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
Merged from r682785.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@682791 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker')
| -rw-r--r-- | cpp/src/qpid/broker/Broker.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/Broker.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index a713a6c345..c7250d354c 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -89,7 +89,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; @@ -113,7 +114,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 369902bbea..b5f5aca8ba 100644 --- a/cpp/src/qpid/broker/Broker.h +++ b/cpp/src/qpid/broker/Broker.h @@ -88,6 +88,7 @@ class Broker : public sys::Runnable, public Plugin::Target, size_t replayFlushLimit; size_t replayHardLimit; uint queueLimit; + bool tcpNoDelay; }; private: |