You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2008/02/07 22:31:23 UTC
svn commit: r619646 - in /incubator/qpid/trunk/qpid/cpp/src:
qpid/broker/Broker.cpp qpid/sys/Acceptor.h qpid/sys/AsynchIOAcceptor.cpp
qpid/sys/Poller.h qpid/sys/epoll/EpollPoller.cpp qpidd.cpp
Author: aconway
Date: Thu Feb 7 13:31:21 2008
New Revision: 619646
URL: http://svn.apache.org/viewvc?rev=619646&view=rev
Log:
Clean shutdown of broker: Moved signal unsafe code from Broker::shutdown
to ~Broker, moved shutdown logging from shutdown handler to main() in qpidd.cpp
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Poller.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=619646&r1=619645&r2=619646&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Thu Feb 7 13:31:21 2008
@@ -212,13 +212,16 @@
}
void Broker::shutdown() {
+ // NB: this function must be async-signal safe, it must not
+ // call any function that is not async-signal safe.
+ // Any unsafe shutdown actions should be done in the destructor.
if (acceptor)
acceptor->shutdown();
- ManagementAgent::shutdown ();
}
Broker::~Broker() {
shutdown();
+ ManagementAgent::shutdown ();
delete store;
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h?rev=619646&r1=619645&r2=619646&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h Thu Feb 7 13:31:21 2008
@@ -39,6 +39,8 @@
virtual std::string getHost() const = 0;
virtual void run(ConnectionInputHandlerFactory* factory) = 0;
virtual void connect(const std::string& host, int16_t port, ConnectionInputHandlerFactory* factory) = 0;
+
+ /** Note: this function is async-signal safe */
virtual void shutdown() = 0;
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOAcceptor.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOAcceptor.cpp?rev=619646&r1=619645&r2=619646&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOAcceptor.cpp Thu Feb 7 13:31:21 2008
@@ -214,6 +214,8 @@
void AsynchIOAcceptor::shutdown() {
+ // NB: this function must be async-signal safe, it must not
+ // call any function that is not async-signal safe.
poller->shutdown();
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Poller.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Poller.h?rev=619646&r1=619645&r2=619646&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Poller.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Poller.h Thu Feb 7 13:31:21 2008
@@ -96,6 +96,7 @@
Poller();
~Poller();
+ /** Note: this function is async-signal safe */
void shutdown();
void addFd(PollerHandle& handle, Direction dir);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp?rev=619646&r1=619645&r2=619646&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp Thu Feb 7 13:31:21 2008
@@ -253,6 +253,9 @@
}
void Poller::shutdown() {
+ // NB: this function must be async-signal safe, it must not
+ // call any function that is not async-signal safe.
+
// Allow sloppy code to shut us down more than once
if (impl->isShutdown)
return;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp?rev=619646&r1=619645&r2=619646&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp Thu Feb 7 13:31:21 2008
@@ -121,20 +121,9 @@
auto_ptr<QpiddOptions> options;
void shutdownHandler(int /*signal*/){
- // FIXME aconway 2008-02-07:
- // https://bugzilla.redhat.com/show_bug.cgi?id=431928
-
- // The following commented code is in no
- // way async-signal safe and is causing sporadic hangs on
- // shutdown. This handler should push a shutdown event into the
- // epoll poller (making sure to use only async-safe functions!)
- // and let a poller thread actually do the shutdown.
-
- // QPID_LOG(notice, "Shutting down on signal " << signal);
- // brokerPtr->shutdown();
-
- // For now we just die on the signal, no cleanup.
- exit(0);
+ // Note: do not call any async-signal unsafe functions here.
+ // Do any extra shtudown actions in main() after broker->run()
+ brokerPtr->shutdown();
}
struct QpiddDaemon : public Daemon {
@@ -257,7 +246,8 @@
brokerPtr.reset(new Broker(options->broker));
if (options->broker.port == 0)
cout << uint16_t(brokerPtr->getPort()) << endl;
- brokerPtr->run();
+ brokerPtr->run();
+ QPID_LOG(notice, "Shutting down.");
}
return 0;
}