From 8215463879c5420f02e3968bf7ee4bf469c3fb27 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 29 Mar 2013 18:28:16 -0700 Subject: [PATCH] Thread dispatch fixes. (code is commented out) --- src/cpp/ripple/Application.cpp | 1 + src/cpp/ripple/JobQueue.cpp | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cpp/ripple/Application.cpp b/src/cpp/ripple/Application.cpp index 79e179d8b6..a9cef25392 100644 --- a/src/cpp/ripple/Application.cpp +++ b/src/cpp/ripple/Application.cpp @@ -46,6 +46,7 @@ DatabaseCon::~DatabaseCon() } Application::Application() : +// mIOService(2), mIOWork(mIOService), mAuxWork(mAuxService), mUNL(mIOService), mNetOps(mIOService, &mLedgerMaster), mTempNodeCache("NodeCache", 16384, 90), mHashedObjectStore(16384, 300), mSLECache("LedgerEntryCache", 4096, 120), mSNTPClient(mAuxService), mJobQueue(mIOService), mFeeTrack(), diff --git a/src/cpp/ripple/JobQueue.cpp b/src/cpp/ripple/JobQueue.cpp index 05e5a2a634..8ba9ca548d 100644 --- a/src/cpp/ripple/JobQueue.cpp +++ b/src/cpp/ripple/JobQueue.cpp @@ -272,9 +272,7 @@ void JobQueue::IOThread(boost::mutex::scoped_lock& sl) NameThread("IO+"); try { - do - NameThread("IO+"); - while ((mIOService.poll_one() == 1) && !theApp->isShutdown()); + mIOService.poll(); } catch (...) {