diff --git a/common/include/rme_scoped_trace.h b/common/include/rme_scoped_trace.h deleted file mode 100644 index a840329d764b3e7489f128359a4b0f166b46a0d1..0000000000000000000000000000000000000000 --- a/common/include/rme_scoped_trace.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef RME_SCOPED_TRACE_H -#define RME_SCOPED_TRACE_H - -#include "hitrace_meter.h" - -#include -#include - -#define RME_SCOPED_TRACE(fmt, ...) RmeScopedTrace rmeScopedTrace(fmt, ##__VA_ARGS__) -#ifdef RME_DEBUG -#define RME_DEBUG_SCOPED_TRACE(fmt, ...) RmeScopedTrace rmeScopedTrace(fmt, ##__VA_ARGS__) -#else -#define RME_DEBUG_SCOPED_TRACE(fmt, ...) -#endif - -#define RME_FUNCTION_TRACE() RME_SCOPED_TRACE(__func__) - -namespace OHOS { -namespace RME { -bool RmeTraceEnable(); -void RmeTraceBegin(const char* name); -bool RmeTraceBeginWithArgs(const char* format, ...) __attribute__((__format__(printf, 1, 2))); -bool RmeTraceBeginWithArgvs(const char* format, va_list args); -void RmeTraceEnd(); - -class RmeScopedTrace final { -public: - explicit RmeScopedTrace(const char* format, ...) __attribute__((__format__(printf, 2, 3))); - ~RmeScopedTrace(); - -private: - bool traceEnabled_ { false }; -}; -} // namespace RME -} // namespace OHOS -#endif diff --git a/common/src/rme_scoped_trace.cpp b/common/src/rme_scoped_trace.cpp deleted file mode 100644 index ad5120ad0e5a8a38903ef77fe6d0ff25442c2b97..0000000000000000000000000000000000000000 --- a/common/src/rme_scoped_trace.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "rme_scoped_trace.h" - -#include -#include - -namespace OHOS { -namespace RME { -namespace { -const size_t MAX_STRING_SIZE = 128; -} - -bool RmeTraceEnable() -{ - return true; -} - -void RmeTraceBegin(const char* name) -{ - if (name == nullptr) { - return; - } - std::string nameStr(name); - StartTrace(HITRACE_TAG_ACE, nameStr); -} - -void RmeTraceEnd() -{ - if (RmeTraceEnable()) { - FinishTrace(HITRACE_TAG_ACE); - } -} - -bool RmeTraceBeginWithArgv(const char* format, va_list args) -{ - char name[MAX_STRING_SIZE] = { 0 }; - if (vsnprintf_s(name, sizeof(name), sizeof(name) - 1, format, args) < 0) { - return false; - } - RmeTraceBegin(name); - return true; -} - -bool RmeTraceBeginWithArgs(const char* format, ...) -{ - if (RmeTraceEnable()) { - va_list args; - va_start(args, format); - bool retVal = RmeTraceBeginWithArgv(format, args); - va_end(args); - return retVal; - } - return false; -} - -RmeScopedTrace::RmeScopedTrace(const char* format, ...) : traceEnabled_(RmeTraceEnable()) -{ - if (traceEnabled_) { - va_list args; - va_start(args, format); - traceEnabled_ = RmeTraceBeginWithArgv(format, args); - va_end(args); - } -} - -RmeScopedTrace::~RmeScopedTrace() -{ - if (traceEnabled_) { - RmeTraceEnd(); - } -} -} // namespace RME -} // namespace OHOS diff --git a/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp b/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp index 8257dc4ee046c511c2bfc53b2d5a486f3050c598..af25415ab148393474c48126990ad3cfcfeecc3e 100644 --- a/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp +++ b/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp @@ -14,12 +14,12 @@ */ #include "rme_core_sched.h" +#include #include #include #include #include "rtg_interface.h" #include "rme_log_domain.h" -#include "rme_scoped_trace.h" namespace OHOS { namespace RME { @@ -39,20 +39,20 @@ RmeCoreSched::~RmeCoreSched() bool RmeCoreSched::Init() { - RmeTraceBegin("FrameS-Init"); + StartTrace(HITRACE_TAG_ACE, "FrameS-Init"); int ret = GetRtgEnable(); if (ret > 0) { RME_LOGE("[Init]: rtgEnabled! scheme Open!ret: %{public}d", ret); } else { RME_LOGE("[Init]: do not enabled!ret: %{public}d", ret); } - RmeTraceEnd(); + FinishTrace(HITRACE_TAG_ACE); return ret; } void RmeCoreSched::HandleBeginScene() { - RME_FUNCTION_TRACE(); + HITRACE_METER(HITRACE_TAG_ACE); } void RmeCoreSched::BeginFlushAnimation() @@ -67,13 +67,14 @@ void RmeCoreSched::BeginFlushAnimation() int ret = BeginFrameFreq(m_rtg, 0); m_uiTid = gettid(); if (!m_uiHasSend) { - RmeTraceBegin(("FrameS-Begin&AddThread-rtg:" + to_string(m_rtg) + " ret:" + to_string(ret)).c_str()); + StartTrace(HITRACE_TAG_ACE, + ("FrameS-Begin&AddThread-rtg:" + to_string(m_rtg) + " ret:" + to_string(ret)).c_str()); AddThreadToRtg(m_uiTid, m_rtg); m_uiHasSend = true; } else { - RmeTraceBegin("FrameS-Begin"); + StartTrace(HITRACE_TAG_ACE, "FrameS-Begin"); } - RmeTraceEnd(); + FinishTrace(HITRACE_TAG_ACE); return; } @@ -81,9 +82,10 @@ void RmeCoreSched::EndFlushAnimation() {} void RmeCoreSched::BeginFlushBuild() { - RmeTraceBegin(("FrameS-SetMargin-rtg:" + to_string(m_rtg) + " margin:" + to_string(MARGIN_BEGIN)).c_str()); + StartTrace(HITRACE_TAG_ACE, + ("FrameS-SetMargin-rtg:" + to_string(m_rtg) + " margin:" + to_string(MARGIN_BEGIN)).c_str()); SetMargin(m_rtg, MARGIN_BEGIN); - RmeTraceEnd(); + FinishTrace(HITRACE_TAG_ACE); } void RmeCoreSched::EndFlushBuild() {} @@ -94,9 +96,10 @@ void RmeCoreSched::EndFlushLayout() {} void RmeCoreSched::BeginFlushRender() { - RmeTraceBegin(("FrameS-SetMargin-rtg:" + to_string(m_rtg) + " margin:" + to_string(MARGIN_MIDDLE)).c_str()); + StartTrace(HITRACE_TAG_ACE, + ("FrameS-SetMargin-rtg:" + to_string(m_rtg) + " margin:" + to_string(MARGIN_MIDDLE)).c_str()); SetMargin(m_rtg, MARGIN_MIDDLE); - RmeTraceEnd(); + FinishTrace(HITRACE_TAG_ACE); } void RmeCoreSched::EndFlushRender() {} @@ -119,9 +122,10 @@ void RmeCoreSched::AnimateStart() void RmeCoreSched::RenderStart() { - RmeTraceBegin(("FrameS-SetMargin-rtg:" + to_string(m_rtg) + " margin:" + to_string(MARGIN_END)).c_str()); + StartTrace(HITRACE_TAG_ACE, + ("FrameS-SetMargin-rtg:" + to_string(m_rtg) + " margin:" + to_string(MARGIN_END)).c_str()); SetMargin(m_rtg, MARGIN_END); - RmeTraceEnd(); + FinishTrace(HITRACE_TAG_ACE); } void RmeCoreSched::SendCommandsStart() @@ -129,21 +133,22 @@ void RmeCoreSched::SendCommandsStart() if (m_rtg <= 0) { return; } - RmeTraceBegin("SendCommandsStart-EndFreq"); + StartTrace(HITRACE_TAG_ACE, "SendCommandsStart-EndFreq"); EndFrameFreq(m_rtg); - RmeTraceEnd(); + FinishTrace(HITRACE_TAG_ACE); } void RmeCoreSched::HandleEndScene() { - RME_FUNCTION_TRACE(); + HITRACE_METER(HITRACE_TAG_ACE); if (m_rtg <= 0) { return; } int ret = EndScene(m_rtg); m_uiHasSend = false; - RmeTraceBegin(("FrameS-EndFrameFreq-rtg:" + to_string(m_rtg) + " ret:" + to_string(ret)).c_str()); - RmeTraceEnd(); + StartTrace(HITRACE_TAG_ACE, + ("FrameS-EndFrameFreq-rtg:" + to_string(m_rtg) + " ret:" + to_string(ret)).c_str()); + FinishTrace(HITRACE_TAG_ACE); } } // namespace RME } // OHOS diff --git a/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp b/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp index 8f6da7a1dabfa9fb345e0a87bb7f95cc9f0b7d5d..904c8f55ce40d953c659abddf2aee980da598035 100644 --- a/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp +++ b/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp @@ -14,8 +14,8 @@ */ #include "rme_scene_sched.h" +#include #include "frame_window_mgr.h" -#include "rme_scoped_trace.h" namespace OHOS { namespace RME { @@ -49,8 +49,8 @@ void RmeSceneSched::HandleBeginScene() curWorkingStatus = 1; FrameWindowMgr::GetInstance().SetStartFlag(true); rmeCoreSched->HandleBeginScene(); - RmeTraceBegin(("FrameS-curWorkingStatus" + std::to_string(curWorkingStatus)).c_str()); - RmeTraceEnd(); + StartTrace(HITRACE_TAG_ACE, ("FrameS-curWorkingStatus" + std::to_string(curWorkingStatus)).c_str()); + FinishTrace(HITRACE_TAG_ACE); } void RmeSceneSched::BeginFlushAnimation() @@ -166,8 +166,8 @@ void RmeSceneSched::HandleEndScene() } rmeCoreSched->HandleEndScene(); curWorkingStatus = 0; - RmeTraceBegin(("FrameS-curWorkingStatus" + std::to_string(curWorkingStatus)).c_str()); - RmeTraceEnd(); + StartTrace(HITRACE_TAG_ACE, ("FrameS-curWorkingStatus" + std::to_string(curWorkingStatus)).c_str()); + FinishTrace(HITRACE_TAG_ACE); } } // namespace RME } // namespace OHOS diff --git a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp index 616d906d3c10a44c5dec61dd629c010835a4b4ef..64d46ef70b4ae441069864f7fa3b8492f568f056 100644 --- a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp +++ b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp @@ -20,10 +20,10 @@ #include #include #include +#include #include "para_config.h" #include "rtg_interface.h" #include "rme_log_domain.h" -#include "rme_scoped_trace.h" namespace OHOS { namespace RME { @@ -82,7 +82,7 @@ bool IntelliSenseServer::ReadXml() void IntelliSenseServer::NewForeground(int pid) { - RME_FUNCTION_TRACE(); + HITRACE_METER(HITRACE_TAG_ACE); bool found = false; int newCreatedRtg = 0; for (auto iter = m_historyApp.begin(); iter != m_historyApp.end(); iter++) { @@ -129,7 +129,7 @@ int IntelliSenseServer::TryCreateRtgForApp(AppInfo *app) void IntelliSenseServer::NewBackground(int pid) { - RME_FUNCTION_TRACE(); + HITRACE_METER(HITRACE_TAG_ACE); RME_LOGI("[ReportMessage]pid %{public}d change to background.", pid); for (auto iter = m_historyApp.begin(); iter != m_historyApp.end(); iter++) { if (iter->GetAppPid() != pid) { @@ -158,7 +158,7 @@ void IntelliSenseServer::NewAppRecord(int pid) void IntelliSenseServer::NewDiedProcess(int pid) { - RME_FUNCTION_TRACE(); + HITRACE_METER(HITRACE_TAG_ACE); RME_LOGI("[ReportMessage]pid %{public}d died.", pid); for (auto iter = m_historyApp.begin(); iter != m_historyApp.end(); iter++) { if (iter->GetAppPid() == pid) { @@ -186,7 +186,7 @@ void IntelliSenseServer::ReportRenderThread(const int pid, const int uid, int re if (!m_switch) { return; } - RME_FUNCTION_TRACE(); + HITRACE_METER(HITRACE_TAG_ACE); auto record = GetRecordOfPid(pid); if (record == m_historyApp.end()) { RME_LOGE("Didn't find render in history app %{public}d with render %{public}d", pid, renderTid); @@ -208,7 +208,7 @@ void IntelliSenseServer::ReportWindowFocus(const int pid, const int uid, int isF if (!m_switch) { return; } - RME_FUNCTION_TRACE(); + HITRACE_METER(HITRACE_TAG_ACE); switch (isFocus) { case static_cast(WindowState::FOCUS_YES): // isFocus: 0 RME_LOGI("[ReportWindowFocus]:%{public}d get focus", pid); @@ -233,7 +233,7 @@ void IntelliSenseServer::ReportCgroupChange(const int pid, const int uid, const if (!m_switch) { return; } - RME_FUNCTION_TRACE(); + HITRACE_METER(HITRACE_TAG_ACE); CgroupPolicy oldState = CheckCgroupState(static_cast(oldGroup)); CgroupPolicy newState = CheckCgroupState(static_cast(newGroup)); if (oldState == newState) { @@ -261,7 +261,7 @@ void IntelliSenseServer::ReportProcessInfo(const int pid, if (!m_switch) { return; } - RME_FUNCTION_TRACE(); + HITRACE_METER(HITRACE_TAG_ACE); if (m_unsupportApp.find(bundleName) != m_unsupportApp.end()) { return; } diff --git a/interfaces/innerkits/frameintf/BUILD.gn b/interfaces/innerkits/frameintf/BUILD.gn index efa933b7e1e142ec6e00df404100c1a5ad85b2a3..dac673826c4127de82e833e85a1c0f4fcc480205 100644 --- a/interfaces/innerkits/frameintf/BUILD.gn +++ b/interfaces/innerkits/frameintf/BUILD.gn @@ -30,7 +30,6 @@ config("frame_ui_intf_config") { ohos_shared_library("frame_ui_intf") { sources = [ - "${frame_aware_path}/common/src/rme_scoped_trace.cpp", "${frame_aware_path}/interfaces/innerkits/frameintf/rtg_interface.cpp", "${framework_path}/frame_aware_collector/src/frame_msg_mgr.cpp", "${framework_path}/frame_aware_collector/src/frame_window_mgr.cpp", @@ -74,7 +73,6 @@ config("frame_msg_intf_config") { ohos_shared_library("frame_msg_intf") { sources = [ - "${frame_aware_path}/common/src/rme_scoped_trace.cpp", "${frame_aware_path}/interfaces/innerkits/frameintf/rtg_interface.cpp", "${framework_path}/frame_aware_policy/src/app_info.cpp", "${framework_path}/frame_aware_policy/src/intellisense_server.cpp",