diff --git a/display/composer/v1_0/display_command/display_cmd_requester.h b/display/composer/v1_0/display_command/display_cmd_requester.h index 5137c0a4da24acb78fd43d059c1ec97accb42fa0..ba3e695468a780da7ab1e69ed277a5e1f693bc80 100755 --- a/display/composer/v1_0/display_command/display_cmd_requester.h +++ b/display/composer/v1_0/display_command/display_cmd_requester.h @@ -877,17 +877,18 @@ protected: int32_t ret = request_->Write( reinterpret_cast(requestPacker_.GetDataPtr()), eleCnt, CmdUtils::TRANSFER_WAIT_TIME); DISPLAY_CHK_RETURN(ret != HDF_SUCCESS, ret, - HDF_LOGE("%{public}s: CmdRequest write failed", __func__)); + HDF_LOGE("%{public}s: CmdRequest write failed, ret = %{public}d, eleCnt = %{public}d", __func__, ret, + eleCnt)); ret = hdi_->CmdRequest(eleCnt, requestHdiFds_, replyEleCnt, outFds); DISPLAY_CHK_RETURN(ret != HDF_SUCCESS, ret, - HDF_LOGE("%{public}s: CmdRequest failed", __func__)); + HDF_LOGE("%{public}s: CmdRequest failed, ret = %{public}d", __func__, ret)); if (replyEleCnt != 0) { ret = reply_->Read(reinterpret_cast(replyData_.get()), replyEleCnt, CmdUtils::TRANSFER_WAIT_TIME); if (ret != HDF_SUCCESS) { - HDF_LOGE("reply read data failure, ret=%{public}d", ret); + HDF_LOGE("reply read data failure, ret=%{public}d, replyEleCnt=%{public}d", ret, replyEleCnt); } } diff --git a/display/composer/v1_0/display_command/display_cmd_responser.h b/display/composer/v1_0/display_command/display_cmd_responser.h index 628d8b11ca864fe6337cb356108a8623786cbde8..9d353087430a28b780680cc52530d53b35abb157 100755 --- a/display/composer/v1_0/display_command/display_cmd_responser.h +++ b/display/composer/v1_0/display_command/display_cmd_responser.h @@ -166,12 +166,12 @@ public: } std::shared_ptr requestData(new char[inEleCnt * CmdUtils::ELEMENT_SIZE], std::default_delete()); - int32_t ret = HDF_SUCCESS; - { - std::lock_guard lock(requestMutex_); - ret = request_->Read(reinterpret_cast(requestData.get()), inEleCnt, - CmdUtils::TRANSFER_WAIT_TIME); + int32_t ret = CmdRequestDataRead(requestData, inEleCnt); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%{public}s: CmdRequest read failed, ret=%{public}d, isEleCnt=%{public}d", __func__, ret, + inEleCnt); } + CommandDataUnpacker unpacker; unpacker.Init(requestData.get(), inEleCnt << CmdUtils::MOVE_SIZE); #ifdef DEBUG_DISPLAY_CMD_RAW_DATA @@ -209,7 +209,7 @@ public: outEleCnt = replyPacker_.ValidSize() >> CmdUtils::MOVE_SIZE; ret = CmdRequestDataWrite(outEleCnt); if (ret != HDF_SUCCESS) { - HDF_LOGE("Reply write failure, ret=%{public}d", ret); + HDF_LOGE("Reply write failure, ret=%{public}d, outEleCnt=%{public}d", ret, outEleCnt); outEleCnt = 0; } int32_t ec = PeriodDataReset(); diff --git a/display/composer/v1_2/display_command/display_cmd_responser.h b/display/composer/v1_2/display_command/display_cmd_responser.h index 8a328edffeab10fe13e75dcd66591f374781444a..3495e36da64e0c822a66e42552b9ea1099b9e87b 100644 --- a/display/composer/v1_2/display_command/display_cmd_responser.h +++ b/display/composer/v1_2/display_command/display_cmd_responser.h @@ -228,11 +228,10 @@ REPLY: uint32_t& outEleCnt, std::vector& outFds) { std::shared_ptr requestData(new char[inEleCnt * CmdUtils::ELEMENT_SIZE], std::default_delete()); - int32_t ret = HDF_SUCCESS; - { - std::lock_guard lock(requestMutex_); - ret = request_->Read(reinterpret_cast(requestData.get()), inEleCnt, - CmdUtils::TRANSFER_WAIT_TIME); + int32_t ret = CmdRequestDataRead(requestData, inEleCnt); + if (ret != HDF_SUCCESS) { + HDF_LOGE("%{public}s: CmdRequest read failed, ret=%{public}d, inEleCnt=%{public}d", __func__, ret, + inEleCnt); } CommandDataUnpacker unpacker; unpacker.Init(requestData.get(), inEleCnt << CmdUtils::MOVE_SIZE); @@ -272,7 +271,7 @@ REPLY: outEleCnt = replyPacker_.ValidSize() >> CmdUtils::MOVE_SIZE; ret = CmdRequestDataWrite(outEleCnt); if (ret != HDF_SUCCESS) { - HDF_LOGE("Reply write failure, ret=%{public}d", ret); + HDF_LOGE("Reply write failure, ret=%{public}d, outEleCnt=%{public}d", ret, outEleCnt); outEleCnt = 0; } return ret;