mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some oslCondition -> osl::Condition

Browse Source 
Change-Id: I86cfbefd1cb8b22fca659a158b8e31d5c991de7a
This commit is contained in:
Stephan Bergmann
2015-08-18 08:15:29 +02:00
parent 5d6ef74eea
commit 2861d5bedc
4 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cppu/source/threadpool/jobqueue.cxx
View File

@@ -28,19 +28,11 @@ namespace cppu_threadpool {
JobQueue::JobQueue() : JobQueue::JobQueue() :
m_nToDo( 0 ), m_nToDo( 0 ),
m_bSuspended( false ), m_bSuspended( false )
m_cndWait( osl_createCondition() )
{ {
osl_resetCondition( m_cndWait );
m_DisposedCallerAdmin = DisposedCallerAdmin::getInstance(); m_DisposedCallerAdmin = DisposedCallerAdmin::getInstance();
} }
JobQueue::~JobQueue()
{
osl_destroyCondition( m_cndWait );
}
void JobQueue::add( void *pThreadSpecificData, RequestFun * doRequest ) void JobQueue::add( void *pThreadSpecificData, RequestFun * doRequest )
{ {
MutexGuard guard( m_mutex ); MutexGuard guard( m_mutex );
@@ -48,7 +40,7 @@ namespace cppu_threadpool {
m_lstJob.push_back( job ); m_lstJob.push_back( job );
if( ! m_bSuspended ) if( ! m_bSuspended )
{ {
osl_setCondition( m_cndWait ); m_cndWait.set();
} }
m_nToDo ++; m_nToDo ++;
} }
@@ -78,7 +70,7 @@ namespace cppu_threadpool {
} }
} }
osl_waitCondition( m_cndWait , 0 ); m_cndWait.wait();
struct Job job={0,0}; struct Job job={0,0};
{ {
@@ -92,7 +84,7 @@ namespace cppu_threadpool {
&& (m_lstCallstack.empty() && (m_lstCallstack.empty()
|| m_lstCallstack.front() != 0) ) || m_lstCallstack.front() != 0) )
{ {
osl_resetCondition( m_cndWait ); m_cndWait.reset();
} }
break; break;
} }
@@ -106,7 +98,7 @@ namespace cppu_threadpool {
if( m_lstJob.empty() if( m_lstJob.empty()
&& (m_lstCallstack.empty() || m_lstCallstack.front() != 0) ) && (m_lstCallstack.empty() || m_lstCallstack.front() != 0) )
{ {
osl_resetCondition( m_cndWait ); m_cndWait.reset();
} }
} }
@@ -150,7 +142,7 @@ namespace cppu_threadpool {
if( !m_lstCallstack.empty() && ! m_lstCallstack.front() ) if( !m_lstCallstack.empty() && ! m_lstCallstack.front() )
{ {
// The thread is waiting for a disposed pCallerId, let it go // The thread is waiting for a disposed pCallerId, let it go
osl_setCondition( m_cndWait ); m_cndWait.set();
} }
} }
@@ -166,7 +158,7 @@ namespace cppu_threadpool {
m_bSuspended = false; m_bSuspended = false;
if( ! m_lstJob.empty() ) if( ! m_lstJob.empty() )
{ {
osl_setCondition( m_cndWait ); m_cndWait.set();
} }
} }

5
cppu/source/threadpool/jobqueue.hxx
View File

@@ -23,7 +23,7 @@
#include <list> #include <list>
#include <sal/types.h> #include <sal/types.h>
#include <osl/conditn.h> #include <osl/conditn.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
@@ -49,7 +49,6 @@ namespace cppu_threadpool
{ {
public: public:
JobQueue(); JobQueue();
~JobQueue();
void add( void *pThreadSpecificData, RequestFun * doRequest ); void add( void *pThreadSpecificData, RequestFun * doRequest );
@@ -69,7 +68,7 @@ namespace cppu_threadpool
CallStackList m_lstCallstack; CallStackList m_lstCallstack;
sal_Int32 m_nToDo; sal_Int32 m_nToDo;
bool m_bSuspended; bool m_bSuspended;
oslCondition m_cndWait; osl::Condition m_cndWait;
DisposedCallerAdminHolder m_DisposedCallerAdmin; DisposedCallerAdminHolder m_DisposedCallerAdmin;
}; };
} }

16
cppu/source/threadpool/threadpool.cxx
View File

@@ -39,6 +39,10 @@ using namespace ::rtl;
namespace cppu_threadpool namespace cppu_threadpool
{ {
WaitingThread::WaitingThread(
rtl::Reference<ORequestThread> const & theThread): thread(theThread)
{}
struct theDisposedCallerAdmin : struct theDisposedCallerAdmin :
public rtl::StaticWithInit< DisposedCallerAdminHolder, theDisposedCallerAdmin > public rtl::StaticWithInit< DisposedCallerAdminHolder, theDisposedCallerAdmin >
{ {
@@ -138,9 +142,7 @@ namespace cppu_threadpool
******************/ ******************/
void ThreadPool::waitInPool( rtl::Reference< ORequestThread > const & pThread ) void ThreadPool::waitInPool( rtl::Reference< ORequestThread > const & pThread )
{ {
struct WaitingThread waitingThread; WaitingThread waitingThread(pThread);
waitingThread.condition = osl_createCondition();
waitingThread.thread = pThread;
{ {
MutexGuard guard( m_mutexWaitingThreadList ); MutexGuard guard( m_mutexWaitingThreadList );
m_lstThreads.push_front( &waitingThread ); m_lstThreads.push_front( &waitingThread );
@@ -148,7 +150,7 @@ namespace cppu_threadpool
// let the thread wait 2 seconds // let the thread wait 2 seconds
TimeValue time = { 2 , 0 }; TimeValue time = { 2 , 0 };
osl_waitCondition( waitingThread.condition , &time ); waitingThread.condition.wait( &time );
{ {
MutexGuard guard ( m_mutexWaitingThreadList ); MutexGuard guard ( m_mutexWaitingThreadList );
@@ -161,8 +163,6 @@ namespace cppu_threadpool
m_lstThreads.erase( ii ); m_lstThreads.erase( ii );
} }
} }
osl_destroyCondition( waitingThread.condition );
} }
void ThreadPool::joinWorkers() void ThreadPool::joinWorkers()
@@ -174,7 +174,7 @@ namespace cppu_threadpool
++ ii ) ++ ii )
{ {
// wake the threads up // wake the threads up
osl_setCondition( (*ii)->condition ); (*ii)->condition.set();
} }
} }
m_aThreadAdmin.join(); m_aThreadAdmin.join();
@@ -198,7 +198,7 @@ namespace cppu_threadpool
m_lstThreads.pop_back(); m_lstThreads.pop_back();
// let the thread go // let the thread go
osl_setCondition( pWaitingThread->condition ); pWaitingThread->condition.set();
return true; return true;
} }
} }

7
cppu/source/threadpool/threadpool.hxx
View File

@@ -23,7 +23,7 @@
#include <list> #include <list>
#include <unordered_map> #include <unordered_map>
#include <osl/conditn.h> #include <osl/conditn.hxx>
#include <rtl/byteseq.hxx> #include <rtl/byteseq.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
@@ -70,8 +70,11 @@ namespace cppu_threadpool {
struct WaitingThread struct WaitingThread
{ {
oslCondition condition; osl::Condition condition;
rtl::Reference< ORequestThread > thread; rtl::Reference< ORequestThread > thread;
explicit WaitingThread(
rtl::Reference<ORequestThread> const & theThread);
}; };
typedef ::std::list < struct ::cppu_threadpool::WaitingThread * > WaitingThreadList; typedef ::std::list < struct ::cppu_threadpool::WaitingThread * > WaitingThreadList;