diff --git a/services/base/include/dfx/dms_hisysevent_report.h b/services/base/include/dfx/dms_hisysevent_report.h index 8d883e8..6b2424b 100644 --- a/services/base/include/dfx/dms_hisysevent_report.h +++ b/services/base/include/dfx/dms_hisysevent_report.h @@ -17,35 +17,36 @@ #define OHOS_DISTRIBUTED_HISTSEVENT_REPORT_H #include +#include "iosfwd" namespace OHOS { namespace DistributedSchedule { namespace BehaviorEvent { - const std::string START_REMOTE_ABILITY = "START_REMOTE_ABILITY"; - const std::string CONNECT_REMOTE_ABILITY = "CONNECT_REMOTE_ABILITY"; - const std::string DISCONNECT_REMOTE_ABILITY = "DISCONNECT_REMOTE_ABILITY"; - const std::string START_REMOTE_ABILITY_BYCALL = "START_REMOTE_ABILITY_BYCALL"; - const std::string RELEASE_REMOTE_ABILITY = "RELEASE_REMOTE_ABILITY"; - const std::string START_CONTINUATION = "START_CONTINUATION"; + constexpr const char* START_REMOTE_ABILITY = "START_REMOTE_ABILITY"; + constexpr const char* CONNECT_REMOTE_ABILITY = "CONNECT_REMOTE_ABILITY"; + constexpr const char* DISCONNECT_REMOTE_ABILITY = "DISCONNECT_REMOTE_ABILITY"; + constexpr const char* START_REMOTE_ABILITY_BYCALL = "START_REMOTE_ABILITY_BYCALL"; + constexpr const char* RELEASE_REMOTE_ABILITY = "RELEASE_REMOTE_ABILITY"; + constexpr const char* START_CONTINUATION = "START_CONTINUATION"; } namespace FaultEvent { - const std::string START_REMOTE_ABILITY = "START_ABILITY_FAILED"; - const std::string CONNECT_REMOTE_ABILITY = "CONNECT_ABILITY_FAILED"; - const std::string DISCONNECT_REMOTE_ABILITY = "DISCONNECT_ABILITY_FAILED"; - const std::string START_REMOTE_ABILITY_BYCALL = "START_ABILITY_BYCALL_FAILED"; - const std::string RELEASE_REMOTE_ABILITY = "RELEASE_ABILITY_FAILED"; - const std::string START_CONTINUATION = "START_CONTINUATION_FAILED"; + constexpr const char* START_REMOTE_ABILITY = "START_ABILITY_FAILED"; + constexpr const char* CONNECT_REMOTE_ABILITY = "CONNECT_ABILITY_FAILED"; + constexpr const char* DISCONNECT_REMOTE_ABILITY = "DISCONNECT_ABILITY_FAILED"; + constexpr const char* START_REMOTE_ABILITY_BYCALL = "START_ABILITY_BYCALL_FAILED"; + constexpr const char* RELEASE_REMOTE_ABILITY = "RELEASE_ABILITY_FAILED"; + constexpr const char* START_CONTINUATION = "START_CONTINUATION_FAILED"; } namespace EventErrorType { - const std::string GET_BUNDLE_MGR_FAILED = "GET_BUNDLE_MGR_FAILED"; - const std::string GET_ABILITY_MGR_FAILED = "GET_ABILITY_MGR_FAILED"; + constexpr const char* GET_BUNDLE_MGR_FAILED = "GET_BUNDLE_MGR_FAILED"; + constexpr const char* GET_ABILITY_MGR_FAILED = "GET_ABILITY_MGR_FAILED"; } namespace EventCallingType { - const std::string LOCAL = "LOCAL"; - const std::string REMOTE = "REMOTE"; + constexpr const char* LOCAL = "LOCAL"; + constexpr const char* REMOTE = "REMOTE"; } struct BehaviorEventParam { diff --git a/services/base/include/dfx/dms_hitrace_chain.h b/services/base/include/dfx/dms_hitrace_chain.h index 3d1ff86..fe63893 100644 --- a/services/base/include/dfx/dms_hitrace_chain.h +++ b/services/base/include/dfx/dms_hitrace_chain.h @@ -16,7 +16,8 @@ #ifndef OHOS_DISTRIBUTED_HITRACE_CHAIN_H #define OHOS_DISTRIBUTED_HITRACE_CHAIN_H -#include "hitrace/hitrace.h" +#include "hitrace/hitraceid.h" +#include "iosfwd" namespace OHOS { namespace DistributedSchedule { diff --git a/services/base/include/dfx/dms_hitrace_constants.h b/services/base/include/dfx/dms_hitrace_constants.h index dc10ca3..4642099 100644 --- a/services/base/include/dfx/dms_hitrace_constants.h +++ b/services/base/include/dfx/dms_hitrace_constants.h @@ -25,13 +25,13 @@ namespace TraceTag { } namespace TraceValue { - const std::string START_REMOTE_ABILITY = "START_REMOTE_ABILITY"; - const std::string CONNECT_REMOTE_ABILITY = "CONNECT_REMOTE_ABILITY"; - const std::string DISCONNECT_REMOTE_ABILITY = "DISCONNECT_REMOTE_ABILITY"; - const std::string START_REMOTE_ABILITY_BYCALL = "START_REMOTE_ABILITY_BYCALL"; - const std::string RELEASE_REMOTE_ABILITY = "RELEASE_REMOTE_ABILITY"; - const std::string START_CONTINUATION = "START_CONTINUATION"; - const std::string REMOTE_PROCEDURE_CALL = "REMOTE_PROCEDURE_CALL"; + constexpr const char* START_REMOTE_ABILITY = "START_REMOTE_ABILITY"; + constexpr const char* CONNECT_REMOTE_ABILITY = "CONNECT_REMOTE_ABILITY"; + constexpr const char* DISCONNECT_REMOTE_ABILITY = "DISCONNECT_REMOTE_ABILITY"; + constexpr const char* START_REMOTE_ABILITY_BYCALL = "START_REMOTE_ABILITY_BYCALL"; + constexpr const char* RELEASE_REMOTE_ABILITY = "RELEASE_REMOTE_ABILITY"; + constexpr const char* START_CONTINUATION = "START_CONTINUATION"; + constexpr const char* REMOTE_PROCEDURE_CALL = "REMOTE_PROCEDURE_CALL"; } } // namespace DistributedSchedule } // namespace OHOS diff --git a/services/base/src/dfx/dms_hisysevent_report.cpp b/services/base/src/dfx/dms_hisysevent_report.cpp index 4f5c6fc..8e377a8 100644 --- a/services/base/src/dfx/dms_hisysevent_report.cpp +++ b/services/base/src/dfx/dms_hisysevent_report.cpp @@ -15,7 +15,10 @@ #include "dfx/dms_hisysevent_report.h" +#include + #include "dtbschedmgr_log.h" +#include "hilog/log_cpp.h" #include "hisysevent.h" #include "ipc_skeleton.h" @@ -24,17 +27,17 @@ namespace DistributedSchedule { using namespace OHOS::HiviewDFX; namespace { const std::string TAG = "DmsHiSysEventReport"; - const std::string DOMAIN_NAME = std::string(HiSysEvent::Domain::DISTRIBUTED_SCHEDULE); + constexpr const char* DOMAIN_NAME = HiSysEvent::Domain::DISTRIBUTED_SCHEDULE; - const std::string KEY_CALLING_APP_UID = "CALLING_APP_UID"; - const std::string KEY_CALLING_PID = "CALLING_PID"; - const std::string KEY_CALLING_TYPE = "CALLING_TYPE"; - const std::string KEY_CALLING_UID = "CALLING_UID"; - const std::string KEY_ERROR_TYPE = "ERROR_TYPE"; + constexpr const char* KEY_CALLING_APP_UID = "CALLING_APP_UID"; + constexpr const char* KEY_CALLING_PID = "CALLING_PID"; + constexpr const char* KEY_CALLING_TYPE = "CALLING_TYPE"; + constexpr const char* KEY_CALLING_UID = "CALLING_UID"; + constexpr const char* KEY_ERROR_TYPE = "ERROR_TYPE"; - const std::string KEY_RESULT = "RESULT"; - const std::string KEY_TARGET_ABILITY = "TARGET_ABILITY"; - const std::string KEY_TARGET_BUNDLE = "TARGET_BUNDLE"; + constexpr const char* KEY_RESULT = "RESULT"; + constexpr const char* KEY_TARGET_ABILITY = "TARGET_ABILITY"; + constexpr const char* KEY_TARGET_BUNDLE = "TARGET_BUNDLE"; } int DmsHiSysEventReport::ReportBehaviorEvent(const BehaviorEventParam& param) diff --git a/services/base/src/dfx/dms_hitrace_chain.cpp b/services/base/src/dfx/dms_hitrace_chain.cpp index 51ef52e..d1e3d83 100644 --- a/services/base/src/dfx/dms_hitrace_chain.cpp +++ b/services/base/src/dfx/dms_hitrace_chain.cpp @@ -14,6 +14,8 @@ */ #include "dfx/dms_hitrace_chain.h" +#include "hitrace/hitrace.h" +#include "hitrace/hitracec.h" namespace OHOS { namespace DistributedSchedule {