Author: aconway
Date: Wed Aug 8 06:42:23 2007
New Revision: 563879
URL: http://svn.apache.org/viewvc?view=rev&rev=563879
Log:
* src/tests/start_broker: Pass script parameters to broker.
* src/qpid/sys/Serializer.cpp: Corrected log levels.
* src/tests/.valgrind.supp-default: Suppress probably benign
leaks and uninit param errors from asynch IO code.
Need verification they are beningn.
* src/qpid/sys/AsynchIOAcceptor.cpp(run): Fix memory leak.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOAcceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Serializer.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrind.supp-default
incubator/qpid/trunk/qpid/cpp/src/tests/start_broker
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=563879&r1=563878&r2=563879
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Wed Aug 8
06:42:23 2007
@@ -149,12 +149,14 @@
}
Acceptor& Broker::getAcceptor() const {
- if (!acceptor)
+ if (!acceptor) {
const_cast<Acceptor::shared_ptr&>(acceptor) =
Acceptor::create(config.port,
config.connectionBacklog,
config.workerThreads,
false);
+ QPID_LOG(info, "Listening on port " << getPort());
+ }
return *acceptor;
}
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?view=diff&rev=563879&r1=563878&r2=563879
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOAcceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOAcceptor.cpp Wed Aug 8
06:42:23 2007
@@ -159,19 +159,18 @@
boost::bind(&AsynchIOAcceptor::accepted, this, poller,
_1, fact));
acceptor.start(poller);
- std::vector<Thread*> t(numIOThreads-1);
+ std::vector<Thread> t(numIOThreads-1);
// Run n-1 io threads
for (int i=0; i<numIOThreads-1; ++i)
- t[i] = new Thread(d);
+ t[i] = Thread(d);
// Run final thread
d.run();
// Now wait for n-1 io threads to exit
for (int i=0; i>numIOThreads-1; ++i) {
- t[i]->join();
- delete t[i];
+ t[i].join();
}
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Serializer.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Serializer.cpp?view=diff&rev=563879&r1=563878&r2=563879
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Serializer.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Serializer.cpp Wed Aug 8
06:42:23 2007
@@ -55,11 +55,11 @@
try {
task();
} catch (const std::exception& e) {
- QPID_LOG(error, "Unexpected exception in Serializer::dispatch"
+ QPID_LOG(critical, "Unexpected exception in Serializer::dispatch"
<< e.what());
assert(0); // Should not happen.
} catch (...) {
- QPID_LOG(error, "Unexpected exception in Serializer::dispatch.");
+ QPID_LOG(critical, "Unexpected exception in Serializer::dispatch.");
assert(0); // Should not happen.
}
}
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/.valgrind.supp-default
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/.valgrind.supp-default?view=diff&rev=563879&r1=563878&r2=563879
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/.valgrind.supp-default (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/.valgrind.supp-default Wed Aug 8
06:42:23 2007
@@ -15,4 +15,50 @@
obj:/lib64/ld-2.6.so
obj:*
}
+{
+ False "possibly leaked" in boost program_options - global std::string var.
+ Memcheck:Leak
+ fun:_Znwj
+ fun:_ZNSs4_Rep9_S_createEjjRKSaIcE
+ obj:/usr/lib/libstdc++.so.6.0.8
+ fun:_ZNSsC1EPKcRKSaIcE
+ obj:/usr/lib/libboost_program_options.so.1.33.1
+}
+{
+ TODO: CONFIRM BENIGN - uninit params to epoll_ctl
+ Memcheck:Param
+ epoll_ctl(event)
+ fun:epoll_ctl
+
fun:_ZN4qpid3sys14DispatchHandle10startWatchEN5boost10shared_ptrINS0_6PollerEEE
+}
+{
+ TODO: CONFIRM BENIGN - uninit params to epoll_ctl
+ Memcheck:Param
+ epoll_ctl(event)
+ fun:epoll_ctl
+ fun:_ZN4qpid3sys14DispatchHandle17dispatchCallbacksENS0_6Poller9EventTypeE
+}
+{
+ TODO: CONFIRM BENIGN - uninit params to epoll_ctl (on shutdown)
+ Memcheck:Param
+ epoll_ctl(event)
+ fun:epoll_ctl
+ fun:_ZN4qpid3sys16AsynchIOAcceptor8shutdownEv
+}
+{
+ TODO: CONFIRM BENIGN - uninit params to epoll_ctl (on shutdown)
+ Memcheck:Param
+ epoll_ctl(event)
+ fun:epoll_ctl
+ fun:_ZN4qpid3sys14DispatchHandle12rewatchWriteEv
+}
+{
+ TODO: shutdown leak, not critical but better to fix it. Unjoined thread?
+ Memcheck:Leak
+ fun:calloc
+ fun:_dl_allocate_tls
+ fun:pthread_create@@GLIBC_2.1
+ fun:[EMAIL PROTECTED]
+ fun:_ZN4qpid3sys16AsynchIOAcceptor3runEPNS0_29ConnectionInputHandlerFactoryE
+}
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/start_broker
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/start_broker?view=diff&rev=563879&r1=563878&r2=563879
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/start_broker (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/start_broker Wed Aug 8 06:42:23
2007
@@ -1,4 +1,4 @@
#!/bin/sh
rm -f qpidd.vglog qpidd.log
test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file-exactly=qpidd.vglog --"
-exec libtool --mode=execute $VALGRIND ../qpidd --daemon --port 0 --log.output
qpidd.log > qpidd.port
+exec libtool --mode=execute $VALGRIND ../qpidd --daemon --port 0 --log.output
qpidd.log "$@" > qpidd.port
