From d54a6ea9c9f75a9dd7a569dde6febc504bb0de44 Mon Sep 17 00:00:00 2001 From: taoxiangdong Date: Thu, 10 Dec 2020 20:15:11 +0800 Subject: [PATCH] Profiling AR version 6 --- ge/common/profiling/profiling_manager.cc | 3 +-- inc/framework/common/profiling/ge_profiling.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ge/common/profiling/profiling_manager.cc b/ge/common/profiling/profiling_manager.cc index 222cde6a..1a0a1b2f 100644 --- a/ge/common/profiling/profiling_manager.cc +++ b/ge/common/profiling/profiling_manager.cc @@ -192,7 +192,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::StopProf // stop profiling if (prof_cb_.msprofCtrlCallback == nullptr) { GELOGE(ge::PARAM_INVALID, "MsprofCtrlCallback callback is nullptr."); - return ge::PARAM_INVALID; + return; } int32_t cb_ret = prof_cb_.msprofCtrlCallback(static_cast(MsprofCtrlCallbackType::MSPROF_CTRL_FINALIZE), nullptr, 0); @@ -824,7 +824,6 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY void ProfilingManager::GetFpBpP std::string &fp_point, std::string &bp_point) { // Env or options mode, fp_point_/bp_point_ have initiliazed on profiling init if (!fp_point_.empty() && !bp_point_.empty()) { - GELOGI("Bp Fp have been initialized in env or options"); fp_point = fp_point_; bp_point = bp_point_; GELOGI("Bp Fp have been initialized in env or options. bp_point: %s, fp_point: %s", bp_point.c_str(), fp_point.c_str()); diff --git a/inc/framework/common/profiling/ge_profiling.h b/inc/framework/common/profiling/ge_profiling.h index 65a0eebb..10b53d6d 100644 --- a/inc/framework/common/profiling/ge_profiling.h +++ b/inc/framework/common/profiling/ge_profiling.h @@ -31,11 +31,11 @@ enum ProfCommandHandleType { }; struct ProfCommandHandleData { - unit64_t profSwitch; + uint64_t profSwitch; uint32_t devNums; // length of device id list uint32_t devIdList[MAX_DEV_NUM]; uint32_t modelId; -} +}; ge::Status RegProfCtrlCallback(MsprofCtrlCallback func); ge::Status RegProfSetDeviceCallback(MsprofSetDeviceCallback func);