// INTERNAL INCLUDES
#include <dali/public-api/common/vector-wrapper.h>
-#include <dali/public-api/common/mutex.h>
+#include <dali/devel-api/threading/mutex.h>
#include <dali/integration-api/render-controller.h>
+#include <dali/integration-api/debug.h>
#include <dali/internal/common/message.h>
#include <dali/internal/common/message-buffer.h>
#include <dali/internal/render/common/performance-monitor.h>
~Impl()
{
// Delete the current buffer
- delete currentMessageBuffer;
+ if( currentMessageBuffer )
+ {
+ DeleteBufferContents( currentMessageBuffer );
+ delete currentMessageBuffer;
+ }
// Delete the unprocessed buffers
const MessageBufferIter processQueueEndIter = processQueue.end();
void MessageQueue::EventProcessingStarted()
{
- mImpl->processingEvents = true;
+ mImpl->processingEvents = true; // called from event thread
}
+// Called from event thread
unsigned int* MessageQueue::ReserveMessageSlot( unsigned int requestedSize, bool updateScene )
{
DALI_ASSERT_DEBUG( 0 != requestedSize );
// If we are outside, then we have to request a call to Core::ProcessEvents() on idle.
if ( false == mImpl->processingEvents )
{
- mImpl->renderController.RequestProcessEventsOnIdle();
+ mImpl->renderController.RequestProcessEventsOnIdle( false );
}
return mImpl->currentMessageBuffer->ReserveMessageSlot( requestedSize );
}
+// Called from event thread
bool MessageQueue::FlushQueue()
{
const bool messagesToProcess = ( NULL != mImpl->currentMessageBuffer );
return messagesToProcess;
}
-void MessageQueue::ProcessMessages()
+bool MessageQueue::ProcessMessages( BufferIndex updateBufferIndex )
{
PERF_MONITOR_START(PerformanceMonitor::PROCESS_MESSAGES);
MessageQueueMutex::ScopedLock lock( mImpl->queueMutex );
const MessageBufferIter processQueueEndIter = mImpl->processQueue.end();
+
+ bool enableLog = ( mImpl->processQueue.begin() != processQueueEndIter );
+
+ if ( enableLog )
+ {
+ DALI_LOG_ERROR("+++ MessageQueue::ProcessMessages: Mutex locked\n");
+ }
+
for ( MessageBufferIter iter = mImpl->processQueue.begin(); iter != processQueueEndIter ; ++iter )
{
MessageBuffer* buffer = *iter;
{
MessageBase* message = reinterpret_cast< MessageBase* >( iter.Get() );
- message->Process( mImpl->sceneGraphBuffers.GetUpdateBufferIndex() );
+ if ( enableLog )
+ {
+ DALI_LOG_ERROR("Before message->Process\n");
+ }
+
+ message->Process( updateBufferIndex );
+
+ if ( enableLog )
+ {
+ DALI_LOG_ERROR("After message->Process\n");
+ }
// Call virtual destructor explictly; since delete will not be called after placement new
message->~MessageBase();
mImpl->recycleQueue.push_back( buffer );
}
+ if ( enableLog )
+ {
+ DALI_LOG_ERROR("Outside message queue process\n");
+ }
+
mImpl->sceneUpdate >>= 1;
mImpl->queueWasEmpty = mImpl->processQueue.empty(); // Flag whether we processed anything
mImpl->processQueue.clear();
PERF_MONITOR_END(PerformanceMonitor::PROCESS_MESSAGES);
+
+ if ( enableLog )
+ {
+ DALI_LOG_ERROR("--- MessageQueue::ProcessMessages: Mutex unlocked\n");
+ }
+
+ return ( mImpl->sceneUpdate & 0x01 ); // if it was previously 2, scene graph was updated.
}
bool MessageQueue::WasEmpty() const