From: minho.sun Date: Thu, 12 Apr 2018 04:29:11 +0000 (+0900) Subject: [4.0] Revert "Add logs to check the messages processed by the update thread" X-Git-Tag: accepted/tizen/4.0/unified/20180416.071502^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=commitdiff_plain;h=7cee8d9f4b50d0b50f0cf8ab7b4152d55c3e7980 [4.0] Revert "Add logs to check the messages processed by the update thread" This reverts commit c8e431a193df360f4d67b309f88e83d7fc2f9f40. Change-Id: Ifa1969fb8c0419eded932a1f3a104a0755f0cbe3 --- diff --git a/dali/internal/common/message.h b/dali/internal/common/message.h index 8c7ff90..73ad04a 100644 --- a/dali/internal/common/message.h +++ b/dali/internal/common/message.h @@ -18,13 +18,10 @@ * */ -#include - // INTERNAL INCLUDES #include #include #include -#include namespace Dali { @@ -103,9 +100,6 @@ public: virtual void Process( BufferIndex /*bufferIndex*/ ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)(); } @@ -160,9 +154,6 @@ public: virtual void Process( BufferIndex /*bufferIndex*/ ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( param1 ); } @@ -224,9 +215,6 @@ public: virtual void Process( BufferIndex /*bufferIndex*/ ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( param1, param2 ); } @@ -292,9 +280,6 @@ public: virtual void Process( BufferIndex /*bufferIndex*/ ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( param1, param2, param3 ); } @@ -365,9 +350,6 @@ public: virtual void Process( BufferIndex /*bufferIndex*/ ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( param1, param2, param3, param4 ); } @@ -443,9 +425,6 @@ public: virtual void Process( BufferIndex /*bufferIndex*/ ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( param1, param2, param3, param4, param5 ); } @@ -527,9 +506,6 @@ public: virtual void Process( BufferIndex /*bufferIndex*/ ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( param1, param2, param3, param4, param5, param6 ); } @@ -585,9 +561,6 @@ public: virtual void Process( BufferIndex bufferIndex ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( bufferIndex ); } @@ -645,9 +618,6 @@ public: virtual void Process( BufferIndex bufferIndex ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( bufferIndex, param ); } @@ -709,9 +679,6 @@ public: virtual void Process( BufferIndex bufferIndex ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( bufferIndex, param2, param3 ); } @@ -780,9 +747,6 @@ public: virtual void Process( BufferIndex bufferIndex ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( bufferIndex, param2, param3, param4 ); } @@ -854,9 +818,6 @@ public: virtual void Process( BufferIndex bufferIndex ) { DALI_ASSERT_DEBUG( object && "Message does not have an object" ); - - DALI_LOG_ERROR("Message::Process: object: %s, function pointer: %p\n", typeid(object).name(), memberFunction); - (object->*memberFunction)( bufferIndex, param2, param3, param4, param5 ); } diff --git a/dali/internal/render/shaders/scene-graph-shader.cpp b/dali/internal/render/shaders/scene-graph-shader.cpp index c574a25..dc78aed 100644 --- a/dali/internal/render/shaders/scene-graph-shader.cpp +++ b/dali/internal/render/shaders/scene-graph-shader.cpp @@ -24,7 +24,7 @@ #include #include #include -#include + namespace Dali { @@ -75,11 +75,7 @@ void Shader::AddConnectionObserver( ConnectionChangePropagator::Observer& observ void Shader::RemoveConnectionObserver( ConnectionChangePropagator::Observer& observer ) { - DALI_LOG_ERROR("+++ Scene Graph Shader::RemoveConnectionObserver\n"); - mConnectionObservers.Remove(observer); - - DALI_LOG_ERROR("--- Scene Graph Shader::RemoveConnectionObserver\n"); } void Shader::UniformMappingsChanged( const UniformMap& mappings ) diff --git a/dali/internal/update/animation/scene-graph-animation.cpp b/dali/internal/update/animation/scene-graph-animation.cpp index 1fed088..260be92 100644 --- a/dali/internal/update/animation/scene-graph-animation.cpp +++ b/dali/internal/update/animation/scene-graph-animation.cpp @@ -25,8 +25,6 @@ #include #include #include -#include - namespace //Unnamed namespace { //Memory pool used to allocate new animations. Memory used by this pool will be released when shutting down DALi @@ -153,13 +151,9 @@ void Animation::SetPlayRange( const Vector2& range ) void Animation::Play() { - DALI_LOG_ERROR("Scene Graph Animation::Play: Before stable_sort\n"); - // Sort according to end time with earlier end times coming first, if the end time is the same, then the animators are not moved std::stable_sort( mAnimators.Begin(), mAnimators.End(), CompareAnimatorEndTimes ); - DALI_LOG_ERROR("Scene Graph Animation::Play: After stable_sort\n"); - mState = Playing; if ( mSpeedFactor < 0.0f && mElapsedSeconds <= mPlayRange.x*mDurationSeconds ) @@ -167,12 +161,8 @@ void Animation::Play() mElapsedSeconds = mPlayRange.y * mDurationSeconds; } - DALI_LOG_ERROR("Scene Graph Animation::Play: Before SetAnimatorsActive\n"); - SetAnimatorsActive( true ); - DALI_LOG_ERROR("Scene Graph Animation::Play: After SetAnimatorsActive\n"); - mCurrentLoop = 0; } diff --git a/dali/internal/update/queue/update-message-queue.cpp b/dali/internal/update/queue/update-message-queue.cpp index fde103a..330234d 100644 --- a/dali/internal/update/queue/update-message-queue.cpp +++ b/dali/internal/update/queue/update-message-queue.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -252,14 +251,6 @@ bool MessageQueue::ProcessMessages( BufferIndex updateBufferIndex ) 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; @@ -268,18 +259,8 @@ bool MessageQueue::ProcessMessages( BufferIndex updateBufferIndex ) { MessageBase* message = reinterpret_cast< MessageBase* >( iter.Get() ); - 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(); } @@ -289,11 +270,6 @@ bool MessageQueue::ProcessMessages( BufferIndex updateBufferIndex ) 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 @@ -302,11 +278,6 @@ bool MessageQueue::ProcessMessages( BufferIndex updateBufferIndex ) 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. } diff --git a/packaging/dali.spec b/packaging/dali.spec index c048f08..2b97cc8 100755 --- a/packaging/dali.spec +++ b/packaging/dali.spec @@ -105,7 +105,7 @@ Integration development package for DALi 3D Engine - headers for integrating wit %build PREFIX="/usr" CXXFLAGS+=" -Wall -g -Os -DNDEBUG -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections " -LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections -lgcc_s -lgcc -Wl,-Bsymbolic-functions -Wl,-Map=output.map " +LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections -lgcc_s -lgcc -Wl,-Bsymbolic-functions " %ifarch %{arm} CXXFLAGS+=" -D_ARCH_ARM_ -mfpu=neon"