summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2009-10-16 18:47:52 +0000
committerAndrew Stitcher <astitcher@apache.org>2009-10-16 18:47:52 +0000
commit704d3c7c2ff39309e28dbd1ba006b1cc2b3a63c0 (patch)
tree7a56dac9c5584728fe47d6b1e6b53ce27518a3e9 /cpp
parent18b24ce73d0740ad7df97ccca6cec5e2ba9d3ec2 (diff)
downloadqpid-python-704d3c7c2ff39309e28dbd1ba006b1cc2b3a63c0.tar.gz
Pull running acceptor out of Broker run loop
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@826033 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/posix/QpiddBroker.cpp2
-rw-r--r--cpp/src/qpid/broker/Broker.cpp1
-rw-r--r--cpp/src/tests/BrokerFixture.h1
3 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/posix/QpiddBroker.cpp b/cpp/src/posix/QpiddBroker.cpp
index 3a20087062..083b79896e 100644
--- a/cpp/src/posix/QpiddBroker.cpp
+++ b/cpp/src/posix/QpiddBroker.cpp
@@ -124,6 +124,7 @@ struct QpiddDaemon : public Daemon {
void child() {
boost::intrusive_ptr<Broker> brokerPtr(new Broker(options->parent->broker));
qpid::broker::SignalHandler::setBroker(brokerPtr);
+ brokerPtr->accept();
uint16_t port=brokerPtr->getPort(options->daemon.transport);
ready(port); // Notify parent.
brokerPtr->run();
@@ -169,6 +170,7 @@ int QpiddBroker::execute (QpiddOptions *options) {
else { // Non-daemon broker.
boost::intrusive_ptr<Broker> brokerPtr(new Broker(options->broker));
broker::SignalHandler::setBroker(brokerPtr);
+ brokerPtr->accept();
if (options->broker.port == 0 || myOptions->daemon.transport != TCP)
cout << uint16_t(brokerPtr->getPort(myOptions->daemon.transport)) << endl;
brokerPtr->run();
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 4259bb2f31..f758f90a8b 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -309,7 +309,6 @@ void Broker::setStore (boost::shared_ptr<MessageStore>& _store)
}
void Broker::run() {
- accept();
QPID_LOG(notice, "Broker running");
Dispatcher d(poller);
int numIOThreads = config.workerThreads;
diff --git a/cpp/src/tests/BrokerFixture.h b/cpp/src/tests/BrokerFixture.h
index bb985cf7e1..861400f539 100644
--- a/cpp/src/tests/BrokerFixture.h
+++ b/cpp/src/tests/BrokerFixture.h
@@ -66,6 +66,7 @@ struct BrokerFixture : private boost::noncopyable {
// TODO aconway 2007-12-05: At one point BrokerFixture
// tests could hang in Connection ctor if the following
// line is removed. This may not be an issue anymore.
+ broker->accept();
broker->getPort(qpid::broker::Broker::TCP_TRANSPORT);
brokerThread = qpid::sys::Thread(*broker);
};