diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2010-08-26 09:15:18 +0200 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2010-08-26 09:15:18 +0200 |
commit | 3099107b00be8af1e6864e105326af77e401f7f2 (patch) | |
tree | 9195f09f74582b3c796f72ec78b737b1f6cf3de8 /sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx | |
parent | 32133e51f60ab72baa52f043e210207af27fabb3 (diff) | |
parent | 23e5e64f7c4ed15f6230b5dc17475d650378cad8 (diff) |
CWS-TOOLING: integrate CWS renaissance1
Notes
Notes:
split repo tag: impress_ooo/DEV300_m87
Diffstat (limited to 'sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx')
-rwxr-xr-x[-rw-r--r--] | sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx index 08ca63284ea6..e813a5ac5f2b 100644..100755 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessorThread.hxx @@ -128,7 +128,6 @@ template <class Queue, class Request, class Cache, class Factory> mrQueue (rQueue), mrCache (rCache) { - OSL_TRACE("QueueProcessorThread::constructor %p", this); create(); } @@ -139,7 +138,6 @@ template <class Queue, class Request, class Cache, class Factory> QueueProcessorThread<Queue, Request, Cache, Factory> ::~QueueProcessorThread (void) { - OSL_TRACE("QueueProcessorThread::destructor %p", this); } @@ -148,16 +146,12 @@ template <class Queue, class Request, class Cache, class Factory> template <class Queue, class Request, class Cache, class Factory> void SAL_CALL QueueProcessorThread<Queue, Request, Cache, Factory>::run (void) { - OSL_TRACE("QueueProcessorThread::run(): running thread %p", this); while ( ! mbIsTerminated) { - OSL_TRACE("QueueProcessorThread::run(): still running thread %p: %d", this, mbIsTerminated?1:0); if (mrQueue.IsEmpty()) { // Sleep while the queue is empty. - OSL_TRACE("QueueProcessorThread::run(): suspending thread %p", this); suspend(); - OSL_TRACE("QueueProcessorThread::run(): running again thread %p", this); } else if (GetpApp()->AnyInput()) @@ -168,19 +162,15 @@ void SAL_CALL QueueProcessorThread<Queue, Request, Cache, Factory>::run (void) TimeValue aTimeToWait; aTimeToWait.Seconds = 0; aTimeToWait.Nanosec = 50*1000*1000; - OSL_TRACE("QueueProcessorThread::run(): input pending: waiting %d nanoseconds", - aTimeToWait.Nanosec); wait (aTimeToWait); } else { - OSL_TRACE ("QueueProcessorThread::run(): Processing Query"); ProcessQueueEntry(); yield (); } } - OSL_TRACE("QueueProcessorThread::run(): exiting run %p", this); } @@ -196,7 +186,6 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> do { - OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry(): testing for mbIsTerminated %p", this); { ::osl::MutexGuard aGuard (maMutex); if (mbIsTerminated) @@ -204,7 +193,6 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> if (mrQueue.IsEmpty()) break; } - OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():acquiring mutex for bitmap creation %p", this); ::vos::OGuard aSolarGuard (Application::GetSolarMutex()); ::osl::MutexGuard aGuard (maMutex); if (mbIsTerminated) @@ -213,18 +201,12 @@ void QueueProcessorThread<Queue, Request, Cache, Factory> if (mrQueue.IsEmpty()) break; - OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry(): have mutexes %p", this); - // Get the requeuest with the highest priority from the queue. nPriorityClass = mrQueue.GetFrontPriorityClass(); pRequest = &mrQueue.GetFront(); mrQueue.PopFront(); bRequestIsValid = true; - - OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():using request %p for creating bitmap", pRequest); - OSL_TRACE ("QueueProcessorThread::ProcessQueueEntry():processing request for page %d with priority class ", - pRequest->GetPage()->GetPageNum(), nPriorityClass); try { // Create a new preview bitmap and store it in the cache. @@ -260,7 +242,6 @@ void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory >::Start (void) { - OSL_TRACE ("QueueProcessorThread::Start %p", this); resume (); } @@ -275,7 +256,6 @@ void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory >::Stop (void) { - OSL_TRACE ("QueueProcessorThread::Stop %p", this); suspend(); } @@ -290,7 +270,6 @@ void QueueProcessorThread< Queue, RequestData, BitmapCache, BitmapFactory >::RemoveRequest (RequestData& rRequest) { - OSL_TRACE ("QueueProcessorThread::RemoveRequest %p", this); // Do nothing else then wait for the mutex to be released. ::osl::MutexGuard aGuard (mrQueue.GetMutex()); } @@ -307,11 +286,9 @@ void QueueProcessorThread< >::Terminate (void) { // ::vos::OGuard aSolarGuard (Application::GetSolarMutex()); - OSL_TRACE("QueueProcessorThread::Terminate(): terminating thread %p", this); ::osl::Thread::terminate (); { ::osl::MutexGuard aGuard (maMutex); - OSL_TRACE("QueueProcessorThread::Terminate(): starting to join %p, %d", this, mbIsTerminated?1:0); mbIsTerminated = true; } Start(); @@ -332,29 +309,6 @@ void SAL_CALL QueueProcessorThread< { ::osl::MutexGuard aGuard (maMutex); mbCanBeJoined = true; - /* - OSL_TRACE("QueueProcessorThread::Terminate():join %p, %d", this, mbIsTerminated?1:0); - while (true) - { - { - ::osl::MutexGuard aGuard (maMutex); - if (mbCanBeJoined) - break; - } - Start(); - TimeValue aTimeToWait; - aTimeToWait.Seconds = 0; - aTimeToWait.Nanosec = 50*1000*1000; - OSL_TRACE("QueueProcessorThread::Terminate(): waiting for join"); - wait (aTimeToWait); - } - if (mbCanBeJoined) - join(); - else - OSL_TRACE("Can not join"); - OSL_TRACE("QueueProcessorThread::Terminate():terminated thread %p :%d", - this, mbIsTerminated?1:0); - */ } |