!276 【DMS】IWYU 头文件整改和使用contexpr const char*替换string优化内存

Merge pull request !276 from 王洋/master
This commit is contained in:
openharmony_ci
2022-07-13 06:54:28 +00:00
committed by Gitee
5 changed files with 40 additions and 33 deletions
@@ -17,35 +17,36 @@
#define OHOS_DISTRIBUTED_HISTSEVENT_REPORT_H
#include <string>
#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 {
@@ -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 {
@@ -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
@@ -15,7 +15,10 @@
#include "dfx/dms_hisysevent_report.h"
#include <string>
#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)
@@ -14,6 +14,8 @@
*/
#include "dfx/dms_hitrace_chain.h"
#include "hitrace/hitrace.h"
#include "hitrace/hitracec.h"
namespace OHOS {
namespace DistributedSchedule {