ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Service API hang on exit during unit tests

Browse Source
This commit is contained in:
Vinnie Falco
2013-09-19 19:23:59 -07:00
parent fad8b0406e
commit e6e090c542
5 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ripple_app/main/IoServicePool.cpp
View File

@@ -15,13 +15,11 @@ public:
, m_owner (owner)
, m_service (service)
{
//startThread ();
startThread ();
}
~ServiceThread ()
{
m_service.stop ();
// block until thread exits
stopThread ();
}
@@ -50,7 +48,6 @@ IoServicePool::IoServicePool (Service& parent, String const& name, int numberOfT
, m_name (name)
, m_service (numberOfThreads)
, m_work (boost::ref (m_service))
, m_running (false)
{
bassert (numberOfThreads > 0);
@@ -60,27 +57,15 @@ IoServicePool::IoServicePool (Service& parent, String const& name, int numberOfT
{
++m_threadsRunning;
m_threads.add (new ServiceThread (m_name, *this, m_service));
m_threads[i]->start ();
}
}
IoServicePool::~IoServicePool ()
{
// must have called runAsync()
bassert (m_running);
// the dtor of m_threads will block until each thread exits.
}
void IoServicePool::runAsync ()
{
// must not call twice
bassert (!m_running);
m_running = true;
for (int i = 0; i < m_threads.size (); ++i)
m_threads [i]->start ();
}
boost::asio::io_service& IoServicePool::getService ()
{
return m_service;