svn commit: r475266 - in /incubator/qpid/trunk/qpid/cpp/src/qpid: apr/APRAcceptor.cpp broker/Broker.cpp posix/PosixAcceptor.cpp sys/Acceptor.h

[gsim]

Author: gsim
Date: Wed Nov 15 07:47:00 2006
New Revision: 475266

URL: http://svn.apache.org/viewvc?view=rev&rev=475266
Log:
Re-enabled tracing of requests sent and received.


Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRAcceptor.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/posix/PosixAcceptor.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRAcceptor.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRAcceptor.cpp?view=diff&rev=475266&r1=475265&r2=475266
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRAcceptor.cpp Wed Nov 15 
07:47:00 2006
@@ -31,28 +31,30 @@
 class APRAcceptor : public Acceptor
 {
   public:
-    APRAcceptor(int16_t port, int backlog, int threads);
+    APRAcceptor(int16_t port, int backlog, int threads, bool trace);
     virtual int16_t getPort() const;
     virtual void run(qpid::sys::SessionHandlerFactory* factory);
     virtual void shutdown();
 
   private:
     int16_t port;
+    bool trace;
     LFProcessor processor;
     apr_socket_t* socket;
     volatile bool running;
 };
 
 // Define generic Acceptor::create() to return APRAcceptor.
-Acceptor::shared_ptr Acceptor::create(int16_t port, int backlog, int threads)
+Acceptor::shared_ptr Acceptor::create(int16_t port, int backlog, int threads, 
bool trace)
 {
-    return Acceptor::shared_ptr(new APRAcceptor(port, backlog, threads));
+    return Acceptor::shared_ptr(new APRAcceptor(port, backlog, threads, 
trace));
 }
 // Must define Acceptor virtual dtor.
 Acceptor::~Acceptor() {}
 
-APRAcceptor::APRAcceptor(int16_t port_, int backlog, int threads) :
+    APRAcceptor::APRAcceptor(int16_t port_, int backlog, int threads, bool 
trace_) :
     port(port_),
+    trace(trace_),
     processor(APRPool::get(), threads, 1000, 5000000)
 {
     apr_sockaddr_t* address;
@@ -83,7 +85,7 @@
             CHECK_APR_SUCCESS(apr_socket_opt_set(client, APR_TCP_NODELAY, 1));
             CHECK_APR_SUCCESS(apr_socket_opt_set(client, APR_SO_SNDBUF, 
32768));
             CHECK_APR_SUCCESS(apr_socket_opt_set(client, APR_SO_RCVBUF, 
32768));
-            LFSessionContext* session = new LFSessionContext(APRPool::get(), 
client, &processor, false);
+            LFSessionContext* session = new LFSessionContext(APRPool::get(), 
client, &processor, trace);
             session->init(factory->create(session));
         }else{
             running = false;

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=475266&r1=475265&r2=475266
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Wed Nov 15 
07:47:00 2006
@@ -29,7 +29,8 @@
 Broker::Broker(const Configuration& config) :
     acceptor(Acceptor::create(config.getPort(),
                               config.getConnectionBacklog(),
-                              config.getWorkerThreads())),
+                              config.getWorkerThreads(),
+                              config.isTrace())),
     factory(config.getStore())
 { }
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/posix/PosixAcceptor.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/posix/PosixAcceptor.cpp?view=diff&rev=475266&r1=475265&r2=475266
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/posix/PosixAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/posix/PosixAcceptor.cpp Wed Nov 15 
07:47:00 2006
@@ -37,7 +37,7 @@
 };
 
 // Define generic Acceptor::create() to return APRAcceptor.
-Acceptor::shared_ptr Acceptor::create(int16_t , int, int )
+    Acceptor::shared_ptr Acceptor::create(int16_t , int, int, bool)
 {
     return Acceptor::shared_ptr(new PosixAcceptor());
 }

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?view=diff&rev=475266&r1=475265&r2=475266
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h Wed Nov 15 07:47:00 
2006
@@ -33,7 +33,7 @@
 class Acceptor : public qpid::SharedObject<Acceptor>
 {
   public:
-    static Acceptor::shared_ptr create(int16_t port, int backlog, int threads);
+    static Acceptor::shared_ptr create(int16_t port, int backlog, int threads, 
bool trace = false);
     virtual ~Acceptor() = 0;
     virtual int16_t getPort() const = 0;
     virtual void run(qpid::sys::SessionHandlerFactory* factory) = 0;