Author: aconway
Date: Tue Oct 31 18:11:58 2006
New Revision: 469753
URL: http://svn.apache.org/viewvc?view=rev&rev=469753
Log:
Misc. cleanup.
Modified:
incubator/qpid/trunk/qpid/cpp/README
incubator/qpid/trunk/qpid/cpp/options.mk
incubator/qpid/trunk/qpid/cpp/src/qpid/SharedObject.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionContext.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandlerFactory.h
incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
Modified: incubator/qpid/trunk/qpid/cpp/README
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README (original)
+++ incubator/qpid/trunk/qpid/cpp/README Tue Oct 31 18:11:58 2006
@@ -49,6 +49,8 @@
The source tree is structured as follows:
* src/ - .h and .cpp source files, directories mirror namespaces.
+ * src_apr/ - source files that depend on APR
+ * src_linux/ - source files optimized for Linux.
* etc/ - Non-c++ resources, e.g. stylesheets.
* test/
* unit/ - unit tests (cppunit plugins), directories mirror namespaces.
Modified: incubator/qpid/trunk/qpid/cpp/options.mk
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/options.mk?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/options.mk (original)
+++ incubator/qpid/trunk/qpid/cpp/options.mk Tue Oct 31 18:11:58 2006
@@ -57,8 +57,8 @@
## Compile flags
# Release vs. debug flags.
-DEBUG := -ggdb3
-RELEASE := -O3 -DNDEBUG
+CXXFLAGS_debug := -ggdb3
+CXXFLAGS_release := -O3 -DNDEBUG
# Warnings: Enable as many as possible, keep the code clean. Please
# do not disable warnings or remove -Werror without discussing on
@@ -71,7 +71,7 @@
INCLUDES := $(SRCDIRS:%=-I%) $(EXTRA_INCLUDES)
LDFLAGS := -L$(LIBDIR) $(LDFLAGS_$(PLATFORM))
-CXXFLAGS := $(DEFINES) $(WARN) -MMD -fpic $(INCLUDES) $(CXXFLAGS_$(PLATFORM))
+CXXFLAGS := $(DEFINES) $(WARN) -MMD -fpic $(INCLUDES) $(CXXFLAGS_$(PLATFORM))
$(CXXFLAGS_$(TYPE))
## Macros for linking, must be late evaluated
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/SharedObject.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/SharedObject.h?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/SharedObject.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/SharedObject.h Tue Oct 31 18:11:58
2006
@@ -27,20 +27,20 @@
* Template to enforce shared object conventions.
* Shared object classes should inherit : public qpid::SharedObject
* That ensures Foo:
- * - has typedef boost::shared_ptr<T> SharedPtr
+ * - has typedef boost::shared_ptr<T> shared_ptr
* - has virtual destructor
* - is boost::noncopyable (no default copy or assign)
* - has a protected default constructor.
*
* Shared objects should not have public constructors.
* Make constructors protected and provide public statc create()
- * functions that return a SharedPtr.
+ * functions that return a shared_ptr.
*/
template <class T>
class SharedObject : private boost::noncopyable
{
public:
- typedef boost::shared_ptr<T> SharedPtr;
+ typedef boost::shared_ptr<T> shared_ptr;
virtual ~SharedObject() {};
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?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Tue Oct 31
18:11:58 2006
@@ -30,15 +30,15 @@
{ }
-Broker::SharedPtr Broker::create(int16_t port)
+Broker::shared_ptr Broker::create(int16_t port)
{
Configuration config;
config.setPort(port);
return create(config);
}
-Broker::SharedPtr Broker::create(const Configuration& config) {
- return Broker::SharedPtr(new Broker(config));
+Broker::shared_ptr Broker::create(const Configuration& config) {
+ return Broker::shared_ptr(new Broker(config));
}
void Broker::run() {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Tue Oct 31 18:11:58
2006
@@ -42,12 +42,12 @@
* Create a broker.
* @param port Port to listen on or 0 to pick a port dynamically.
*/
- static SharedPtr create(int16_t port = DEFAULT_PORT);
+ static shared_ptr create(int16_t port = DEFAULT_PORT);
/**
* Create a broker using a Configuration.
*/
- static SharedPtr create(const Configuration& config);
+ static shared_ptr create(const Configuration& config);
/**
* Return listening port. If called before bind this is
@@ -68,7 +68,7 @@
private:
Broker(const Configuration& config);
- qpid::io::Acceptor::SharedPtr acceptor;
+ qpid::io::Acceptor::shared_ptr acceptor;
SessionHandlerFactoryImpl factory;
};
}
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
Tue Oct 31 18:11:58 2006
@@ -19,6 +19,7 @@
#include "qpid/broker/SessionHandlerImpl.h"
#include "qpid/broker/FanOutExchange.h"
#include "qpid/broker/HeadersExchange.h"
+#include "qpid/broker/DirectExchange.h"
using namespace qpid::broker;
using namespace qpid::io;
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
(original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
Tue Oct 31 18:11:58 2006
@@ -20,11 +20,12 @@
#include "qpid/framing/AMQFrame.h"
#include "qpid/broker/AutoDelete.h"
-#include "qpid/broker/DirectExchange.h"
#include "qpid/broker/ExchangeRegistry.h"
#include "qpid/framing/ProtocolInitiation.h"
#include "qpid/broker/QueueRegistry.h"
#include "qpid/io/SessionHandlerFactory.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandler.h"
#include "qpid/io/TimeoutHandler.h"
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Tue Oct 31
18:11:58 2006
@@ -39,7 +39,7 @@
class Channel;
- class Connection : public virtual qpid::framing::InputHandler,
+class Connection : public virtual qpid::framing::InputHandler,
public virtual qpid::io::TimeoutHandler,
public virtual qpid::io::ShutdownHandler,
private virtual qpid::framing::BodyHandler{
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h Tue Oct 31
18:11:58 2006
@@ -18,14 +18,15 @@
*
*/
-#include <qpid/SharedObject.h>
#include "qpid/framing/AMQFrame.h"
+#include <boost/noncopyable.hpp>
namespace qpid {
namespace framing {
-class InputHandler : public qpid::SharedObject<InputHandler> {
+class InputHandler : private boost::noncopyable {
public:
+ virtual ~InputHandler() {}
virtual void received(AMQFrame* frame) = 0;
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h Tue Oct 31
18:11:58 2006
@@ -18,14 +18,15 @@
* limitations under the License.
*
*/
-#include <qpid/SharedObject.h>
+#include <boost/noncopyable.hpp>
#include "qpid/framing/AMQFrame.h"
namespace qpid {
namespace framing {
-class OutputHandler : public qpid::SharedObject<OutputHandler> {
+class OutputHandler : private boost::noncopyable {
public:
+ virtual ~OutputHandler() {}
virtual void send(AMQFrame* frame) = 0;
};
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionContext.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionContext.h?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionContext.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionContext.h Tue Oct 31
18:11:58 2006
@@ -23,15 +23,16 @@
namespace qpid {
namespace io {
- class SessionContext : public virtual qpid::framing::OutputHandler
- {
- public:
- virtual void close() = 0;
- virtual ~SessionContext(){}
- };
+/**
+ * Provides the output handler associated with a connection.
+ */
+class SessionContext : public virtual qpid::framing::OutputHandler
+{
+ public:
+ virtual void close() = 0;
+};
-}
-}
+}}
#endif
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandler.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandler.h?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandler.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandler.h Tue Oct 31
18:11:58 2006
@@ -26,13 +26,13 @@
namespace qpid {
namespace io {
- class SessionHandler : public virtual qpid::framing::InitiationHandler,
- public virtual qpid::framing::InputHandler,
- public virtual TimeoutHandler
+ class SessionHandler :
+ public qpid::framing::InitiationHandler,
+ public qpid::framing::InputHandler,
+ public TimeoutHandler
{
public:
virtual void closed() = 0;
- virtual ~SessionHandler(){}
};
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandlerFactory.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandlerFactory.h?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandlerFactory.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionHandlerFactory.h Tue Oct
31 18:11:58 2006
@@ -18,21 +18,24 @@
#ifndef _SessionHandlerFactory_
#define _SessionHandlerFactory_
-#include "qpid/io/SessionContext.h"
-#include "qpid/io/SessionHandler.h"
-
namespace qpid {
namespace io {
- class SessionHandlerFactory
- {
- public:
- virtual SessionHandler* create(SessionContext* ctxt) = 0;
- virtual ~SessionHandlerFactory(){}
- };
+class SessionContext;
+class SessionHandler;
+
+/**
+ * Callback interface used by the Acceptor to
+ * create a SessionHandler for each new connection.
+ */
+class SessionHandlerFactory : private boost::noncopyable
+{
+ public:
+ virtual SessionHandler* create(SessionContext* ctxt) = 0;
+ virtual ~SessionHandlerFactory(){}
+};
-}
-}
+}}
#endif
Modified: incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp?view=diff&rev=469753&r1=469752&r2=469753
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp Tue Oct 31 18:11:58 2006
@@ -37,7 +37,7 @@
config.usage();
}else{
apr_signal(SIGINT, handle_signal);
- Broker::SharedPtr broker = Broker::create(config);
+ Broker::shared_ptr broker = Broker::create(config);
broker->run();
}
return 0;
