diff options
| author | Alan Conway <aconway@apache.org> | 2007-08-08 13:42:23 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-08-08 13:42:23 +0000 |
| commit | b355ad32211ffc96b7a7516d89f894e471828460 (patch) | |
| tree | d1fa8a999d3ca584b088d5e82044aa26326c5a32 /cpp/src/qpid/sys/AsynchIOAcceptor.cpp | |
| parent | 34b5e61791cad67128ad2aff29a52576a737c7af (diff) | |
| download | qpid-python-b355ad32211ffc96b7a7516d89f894e471828460.tar.gz | |
* 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.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@563879 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/sys/AsynchIOAcceptor.cpp')
| -rw-r--r-- | cpp/src/qpid/sys/AsynchIOAcceptor.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/qpid/sys/AsynchIOAcceptor.cpp b/cpp/src/qpid/sys/AsynchIOAcceptor.cpp index 8d6b543dc9..93cf35a043 100644 --- a/cpp/src/qpid/sys/AsynchIOAcceptor.cpp +++ b/cpp/src/qpid/sys/AsynchIOAcceptor.cpp @@ -159,19 +159,18 @@ void AsynchIOAcceptor::run(ConnectionInputHandlerFactory* fact) { 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(); } } |