From 669df123648aaa6aeccc70206b5417bc48b4e9ae Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:26:50 +0200 Subject: 5.19 --- lib/parallel_scan.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/parallel_scan.cpp') diff --git a/lib/parallel_scan.cpp b/lib/parallel_scan.cpp index df8ff095..2bac5690 100644 --- a/lib/parallel_scan.cpp +++ b/lib/parallel_scan.cpp @@ -180,7 +180,7 @@ public: errorMsg.clear(); errorResponse.reset(); - dummy.unlock(); //optimization for condition_variable::notify_one() + dummy.unlock(); //optimization for condition_variable::notify_all() conditionCanReportError.notify_all(); //instead of notify_one(); workaround bug: https://svn.boost.org/trac/boost/ticket/7796 return rv; @@ -194,7 +194,7 @@ public: FillBufferCallback::HandleError rv = callback.reportError(copyStringTo(errorMsg)); //throw! errorResponse = make_unique(rv); - dummy.unlock(); //optimization for condition_variable::notify_one() + dummy.unlock(); //optimization for condition_variable::notify_all() conditionGotResponse.notify_all(); //instead of notify_one(); workaround bug: https://svn.boost.org/trac/boost/ticket/7796 } } @@ -236,7 +236,7 @@ public: std::wstring statusText = copyStringTo(textScanning); const long activeCount = activeWorker; if (activeCount >= 2) - statusText += L" " + replaceCpy(_P("[1 Thread]", "[%x Threads]", activeCount), L"%x", numberTo(activeCount)); + statusText += L" [" + replaceCpy(_P("1 thread", "%x threads", activeCount), L"%x", numberTo(activeCount)) + L"]"; statusText += L" " + fmtFileName(filename); return statusText; @@ -273,8 +273,8 @@ private: boost::detail::atomic_count itemsScanned; boost::detail::atomic_count activeWorker; }; -//------------------------------------------------------------------------------------------------- +//------------------------------------------------------------------------------------------------- struct TraverserShared { -- cgit