diff --git a/rosen/modules/render_service/core/pipeline/rs_base_render_util.cpp b/rosen/modules/render_service/core/pipeline/rs_base_render_util.cpp index c3c9e1b04189a0b8474cb2371b57eccb6bd20aca..6fedbce728792e9b50c611d650f01383e49f7bef 100644 --- a/rosen/modules/render_service/core/pipeline/rs_base_render_util.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_base_render_util.cpp @@ -525,7 +525,7 @@ void RSBaseRenderUtil::DropFrameProcess(RSSurfaceHandler& node) auto availableBufferCnt = node.GetAvailableBufferCount(); const auto& surfaceConsumer = node.GetConsumer(); if (surfaceConsumer == nullptr) { - RS_LOGE("RsDebug RSBaseRenderUtil::DropFrameProcess (node: %llu): surfaceConsumer is null!", + RS_LOGI("RsDebug RSBaseRenderUtil::DropFrameProcess (node: %llu): surfaceConsumer is null!", node.GetNodeId()); return; } @@ -534,8 +534,6 @@ void RSBaseRenderUtil::DropFrameProcess(RSSurfaceHandler& node) // maxDirtyListSize > 2 means QueueSize >3 too if (maxDirtyListSize > 2 && availableBufferCnt >= maxDirtyListSize) { RS_TRACE_NAME("DropFrame"); - RS_LOGD("RSBaseRenderUtil::DropFrameProcess(node: %llu) queueBlock, start to drop one frame", - node.GetNodeId()); OHOS::sptr cbuffer; Rect damage; sptr acquireFence = SyncFence::INVALID_FENCE; @@ -553,8 +551,7 @@ void RSBaseRenderUtil::DropFrameProcess(RSSurfaceHandler& node) node.GetNodeId(), ret); } availableBufferCnt = node.ReduceAvailableBuffer(); - RS_LOGD("RsDebug RSBaseRenderUtil::DropFrameProcess (node: %llu), drop one frame finished", - node.GetNodeId()); + RS_LOGD("RsDebug RSBaseRenderUtil::DropFrameProcess (node: %llu), drop one frame", node.GetNodeId()); } return; diff --git a/rosen/modules/render_service/core/pipeline/rs_composer_adapter.cpp b/rosen/modules/render_service/core/pipeline/rs_composer_adapter.cpp index 7d174878162ce4a0204046b5dd87f38e067590a4..0fef2a9497bc44032bd523c9da9996b6e6a4e550 100644 --- a/rosen/modules/render_service/core/pipeline/rs_composer_adapter.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_composer_adapter.cpp @@ -322,11 +322,9 @@ bool RSComposerAdapter::CheckStatusBeforeCreateLayer(RSSurfaceRenderNode& node, return false; } - RS_LOGD("RsDebug RSComposerAdapter::CheckStatusBeforeCreateLayer start(node(%llu) name:[%s] dst:[%d %d %d %d]).", - node.GetId(), node.GetName().c_str(), dstRect.left_, dstRect.top_, dstRect.width_, dstRect.height_); auto geoPtr = std::static_pointer_cast(node.GetRenderProperties().GetBoundsGeometry()); if (geoPtr == nullptr) { - RS_LOGE("RsDebug RSComposerAdapter::CheckStatusBeforeCreateLayer: node(%llu)'s geoPtr is nullptr!", + RS_LOGW("RsDebug RSComposerAdapter::CheckStatusBeforeCreateLayer: node(%llu)'s geoPtr is nullptr!", node.GetId()); return false; } diff --git a/rosen/modules/render_service/core/pipeline/rs_divided_render_util.cpp b/rosen/modules/render_service/core/pipeline/rs_divided_render_util.cpp index 4d8b159892911e7b6f437927b95b437a2f58ff12..8859ffda3609932a7c64c214530afa9d89cee2f2 100644 --- a/rosen/modules/render_service/core/pipeline/rs_divided_render_util.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_divided_render_util.cpp @@ -280,7 +280,6 @@ void RSDividedRenderUtil::DrawImage(std::shared_ptr eglImageM RSPaintFilterCanvas& canvas, BufferDrawParam& bufferDrawParam, CanvasPostProcess process) { RS_TRACE_NAME("GpuClientComposition"); - RS_LOGI("RSDividedRenderUtil::DrawImage start"); sk_sp image; if (!RSBaseRenderUtil::ConvertBufferToEglImage(bufferDrawParam.buffer, eglImageManager, grContext, bufferDrawParam.acquireFence, image)) { diff --git a/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp b/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp index 85bc4dad53b277409c9608df843d0993114415b3..11f0f21b39585847fbe668dde71e4f9243432ef5 100644 --- a/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp @@ -14,10 +14,7 @@ */ #include "pipeline/rs_main_thread.h" -#include #include -#include - #include "rs_trace.h" #include "command/rs_message_processor.h" @@ -321,10 +318,6 @@ void RSMainThread::CalcOcclusion() Occlusion::Region curSurface { rect }; // Current surface subtract current region, if result region is empty that means it's covered Occlusion::Region subResult = curSurface.Sub(curRegion); - std::string info = "RSMainThread::CalcOcclusion: id: " + std::to_string(surface->GetId()) + ", "; - info.append("name: " + surface->GetName()) + ", "; - info.append(subResult.GetRegionInfo()); - RS_LOGD(info.c_str()); // Set result to SurfaceRenderNode and its children surface->SetVisibleRegionRecursive(subResult, curVisVec); // Current region need to merge current surface for next calculation(ignore alpha surface) @@ -354,13 +347,6 @@ void RSMainThread::CallbackToWMS(VisibleData& curVisVec) } } if (visibleChanged) { - std::string inf; - char strBuffer[UINT8_MAX] = { 0 }; - if (sprintf_s(strBuffer, UINT8_MAX, "RSMainThread::CallbackToWMS:%d - %d", lastVisVec_.size(), - curVisVec.size()) != -1) { - inf.append(strBuffer); - } - RS_TRACE_NAME(inf.c_str()); for (auto& listener : occlusionListeners_) { listener->OnOcclusionVisibleChanged(std::make_shared(curVisVec)); } diff --git a/rosen/modules/render_service/core/pipeline/rs_physical_screen_processor.cpp b/rosen/modules/render_service/core/pipeline/rs_physical_screen_processor.cpp index e038543c98e89a8f83cdfe202631bf082482e29d..f226b5e34b4ac92a8118b75ee97247da57468795 100644 --- a/rosen/modules/render_service/core/pipeline/rs_physical_screen_processor.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_physical_screen_processor.cpp @@ -51,7 +51,7 @@ void RSPhysicalScreenProcessor::ProcessSurface(RSSurfaceRenderNode &node) { auto layer = composerAdapter_->CreateLayer(node); if (layer == nullptr) { - RS_LOGE("RSPhysicalScreenProcessor::ProcessSurface: failed to createLayer for node(id: %llu)", + RS_LOGD("RSPhysicalScreenProcessor::ProcessSurface: failed to createLayer for node(id: %llu)", node.GetId()); return; } diff --git a/rosen/modules/render_service/core/pipeline/rs_render_service_listener.cpp b/rosen/modules/render_service/core/pipeline/rs_render_service_listener.cpp index 0de2430e94103b84b8100d1bf04b5c808e244143..7766a0cb1326d2916a3657ab91f30d4313831aa0 100644 --- a/rosen/modules/render_service/core/pipeline/rs_render_service_listener.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_render_service_listener.cpp @@ -35,7 +35,7 @@ void RSRenderServiceListener::OnBufferAvailable() RS_LOGE("RSRenderServiceListener::OnBufferAvailable node is nullptr"); return; } - RS_LOGI("RsDebug RSRenderServiceListener::OnBufferAvailable node id:%llu", node->GetId()); + RS_LOGD("RsDebug RSRenderServiceListener::OnBufferAvailable node id:%llu", node->GetId()); node->IncreaseAvailableBuffer(); if (!node->IsNotifyUIBufferAvailable()) { // Only ipc for one time. diff --git a/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp b/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp index 91edfd1c14249ee57c866add4d3c2d4412a7d315..abfd6d2397c61d0c4fb01bef1a4c52157033cd0a 100644 --- a/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp +++ b/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp @@ -153,6 +153,8 @@ void RSUniRenderVisitor::ProcessDisplayRenderNode(RSDisplayRenderNode& node) ProcessBaseRenderNode(node); RS_TRACE_BEGIN("RSUniRender:FlushFrame"); rsSurface->FlushFrame(surfaceFrame); + RS_TRACE_END(); + RS_TRACE_BEGIN("RSUniRender:WaitUtilUniRenderFinished"); RSMainThread::Instance()->WaitUtilUniRenderFinished(); RS_TRACE_END();