openharmony/graphic_graphic_2d
1
0
Fork 0
mirror of https://gitee.com/openharmony/graphic_graphic_2d synced 2024-11-23 15:11:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix dumper

Browse Source 
Change-Id: Ie4b7cf19e674220517b83205dddda72f32007957
Signed-off-by: lizheng <lizheng2@huawei.com>
This commit is contained in:
lizheng 2021-12-22 22:58:55 +08:00
parent e454ace8ad
commit 608f061b0a
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frameworks/dumper/BUILD.gn
View File

@ -52,6 +52,7 @@ ohos_shared_library("libgraphic_dumper_client") {
deps = [
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
"//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
"//foundation/graphic/standard/utils:libgraphic_utils",
]
external_deps = [ "ipc:ipc_core" ]

22
frameworks/dumper/src/graphic_dumper_helper_impl.cpp
View File

@ -19,6 +19,7 @@
#include <cstdarg>
#include <vector>
#include <gslogger.h>
#include <iservice_registry.h>
#include <securec.h>
#include <system_ability_definition.h>
@ -29,6 +30,7 @@
namespace OHOS {
namespace {
DEFINE_HILOG_LABEL("GraphicDumperHelperImpl");
constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, 0, "GraphicDumperHelperImpl" };
constexpr int INFO_SIZE_MAX = 4096;
}
@ -97,6 +99,7 @@ GSError GraphicDumperHelperImpl::Init()
requestConnectTime = nowTime;
GSError ret = InitSA(GRAPHIC_DUMPER_SERVICE_SA_ID);
if (ret != GSERROR_OK) {
GSLOG2HI(ERROR) << "InitSA failed with " << ret;
return ret;
}
@ -140,31 +143,36 @@ GSError GraphicDumperHelperImpl::InitSA(int32_t systemAbilityId)
auto sam = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
if (sam == nullptr) {
GDLOG_FAILURE_RET(GSERROR_CONNOT_CONNECT_SAMGR);
GSLOG2HI(ERROR) << "failed with " << GSERROR_CONNOT_CONNECT_SAMGR;
return GSERROR_CONNOT_CONNECT_SAMGR;
}
auto remoteObject = sam->GetSystemAbility(systemAbilityId);
if (remoteObject == nullptr) {
GDLOG_FAILURE_RET(GSERROR_CONNOT_CONNECT_SERVER);
GSLOG2HI(ERROR) << "failed with " << GSERROR_CONNOT_CONNECT_SERVER;
return GSERROR_CONNOT_CONNECT_SERVER;
}
sptr<IRemoteObject::DeathRecipient> deathRecipient = new GDumperServiceDeathRecipient();
if ((remoteObject->IsProxyObject()) && (!remoteObject->AddDeathRecipient(deathRecipient))) {
GDLOGFE("Failed to add death recipient");
GSLOG2HI(WARN) << "failed to add death recipient";
}
service_ = iface_cast<IGraphicDumperService>(remoteObject);
if (service_ == nullptr) {
GDLOG_FAILURE_RET(GSERROR_PROXY_NOT_INCLUDE);
GSLOG2HI(ERROR) << "failed with " << GSERROR_PROXY_NOT_INCLUDE;
return GSERROR_PROXY_NOT_INCLUDE;
}
serverConnected = true;
GDLOG_SUCCESS("service_ = iface_cast");
GSLOG2HI(INFO) << "service_ = iface_cast";
return GSERROR_OK;
}
GSError GraphicDumperHelperImpl::AddClientListener(const std::string &tag)
{
if (Init() != GSERROR_OK) {
GSLOG2HI(ERROR) << "Init() failed";
return GSERROR_CONNOT_CONNECT_SERVER;
}
@ -175,6 +183,8 @@ GSError GraphicDumperHelperImpl::AddClientListener(const std::string &tag)
listener_ = new GraphicDumperClientListener(helper);
}
}
GSLOG2HI(INFO) << "AddClientListener Success";
return service_->AddClientListener(tag, listener_);
}
@ -195,7 +205,6 @@ GSError GraphicDumperHelperImpl::SendInfo(const std::string &tag, const char *fm
GSError retInit = Init();
if (retInit == GSERROR_OK) {
return service_->SendInfo(tag, std::string(info));
GDLOGFE("SendInfo is ok");
} else if (retInit == GSERROR_NOT_SUPPORT) {
return retInit;
} else {
@ -252,6 +261,7 @@ int32_t GraphicDumperHelperImpl::AddDumpListener(const std::string &tag, OnDumpF
auto dumpTag = "*#dp#*." + tag;
int ret = AddClientListener(dumpTag);
if (ret != GSERROR_OK) {
GSLOG2HI(ERROR) << "AddClientListener failed with " << ret;
return 0;
}
auto onDumpFuncs = std::make_unique<std::map<int32_t, OnDumpFunc>>();

4
graphic.cfg
View File

@ -1,8 +1,10 @@
{
"jobs" : [{
"name" : "fs",
"cmds" : ["start graphic_dumper_server"]
}, {
"name" : "weston_start",
"cmds" : [
"start graphic_dumper_server",
"start bootanimation",
"start animation_server"
]