From 2c330e2433f9e339d0caa39bb73fc40cca9d73d8 Mon Sep 17 00:00:00 2001 From: l60050612 Date: Tue, 15 Apr 2025 15:18:54 +0800 Subject: [PATCH 1/2] test Signed-off-by: l60050612 --- display/composer/cache_manager/cache_manager.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/display/composer/cache_manager/cache_manager.h b/display/composer/cache_manager/cache_manager.h index 51f95f58..2f2a0658 100644 --- a/display/composer/cache_manager/cache_manager.h +++ b/display/composer/cache_manager/cache_manager.h @@ -175,22 +175,7 @@ public: caches_.clear(); } - bool SetCacheMaxCount(uint32_t count) - { - bool ret = true; - uint32_t originalMaxCount = cacheCountMax_; - if (count >= cacheCountMax_) { - cacheCountMax_ = count; - } else if (Size() <= count) { - cacheCountMax_ = count; - } else { - HDF_LOGE("%{public}s error: clientCacheCount can't be set, because cacheCountMax_ > count", __func__); - ret = false; - } - HDF_LOGI("%{public}s: set cache max count from %{public}u to %{public}u", - __func__, originalMaxCount, cacheCountMax_); - return ret; - } + uint32_t Size() { -- Gitee From 42c290d0cdcbcac683c330558fcc71a8e7f9f3e0 Mon Sep 17 00:00:00 2001 From: l60050612 Date: Tue, 22 Apr 2025 15:49:48 +0800 Subject: [PATCH 2/2] test unpass add log Signed-off-by: l60050612 --- .../composer/cache_manager/cache_manager.h | 24 ++++++++++++++++--- .../composer/cache_manager/device_cache.cpp | 4 +++- .../v1_0/hdi_impl/display_composer_hdi_impl.h | 1 + 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/display/composer/cache_manager/cache_manager.h b/display/composer/cache_manager/cache_manager.h index 2f2a0658..50fd9617 100644 --- a/display/composer/cache_manager/cache_manager.h +++ b/display/composer/cache_manager/cache_manager.h @@ -58,14 +58,17 @@ public: bool SetCacheMaxCount(uint32_t count) { - bool ret = true; + HDF_LOGI("liumin444 %{public}s:count=%{public}u cacheCountMax_=%{public}u",__func__, count, cacheCountMax_); + bool ret = true; uint32_t originalMaxCount = cacheCountMax_; if (count >= cacheCountMax_) { + HDF_LOGI("liumin444 ifbranch%{public}s:count=%{public}u cacheCountMax_=%{public}u",__func__, count, cacheCountMax_); cacheCountMax_ = count; } else if (Size() <= count) { + HDF_LOGI("liumin444 else ifbranch%{public}s:count=%{public}u cacheCountMax_=%{public}u",__func__, Size()); cacheCountMax_ = count; } else { - HDF_LOGE("%{public}s error: clientCacheCount can't be set, because cacheCountMax_ > count", __func__); + HDF_LOGE("liumin444%{public}s error: clientCacheCount can't be set, because cacheCountMax_ > count", __func__); ret = false; } HDF_LOGD("%{public}s: set cache max count from %{public}u to %{public}u", @@ -175,7 +178,22 @@ public: caches_.clear(); } - + bool SetCacheMaxCount(uint32_t count) + { + bool ret = true; + uint32_t originalMaxCount = cacheCountMax_; + if (count >= cacheCountMax_) { + cacheCountMax_ = count; + } else if (Size() <= count) { + cacheCountMax_ = count; + } else { + HDF_LOGE("%{public}s error: clientCacheCount can't be set, because cacheCountMax_ > count", __func__); + ret = false; + } + HDF_LOGD("%{public}s: set cache max count from %{public}u to %{public}u", + __func__, originalMaxCount, cacheCountMax_); + return ret; + } uint32_t Size() { diff --git a/display/composer/cache_manager/device_cache.cpp b/display/composer/cache_manager/device_cache.cpp index 53667a93..e9232512 100644 --- a/display/composer/cache_manager/device_cache.cpp +++ b/display/composer/cache_manager/device_cache.cpp @@ -72,7 +72,9 @@ int32_t DeviceCache::Init() int32_t DeviceCache::SetClientBufferCacheCount(uint32_t bufferCacheCount) { - return clientBufferCaches_->SetCacheMaxCount(bufferCacheCount) ? HDF_SUCCESS : HDF_FAILURE; + bool ret = clientBufferCaches_->SetCacheMaxCount(bufferCacheCount) ? HDF_SUCCESS : HDF_FAILURE; + HDF_LOGI("liumin333 %{public}s:bufferCacheCount=%{public}u ret=%{public}d",__func__, bufferCacheCount, ret); + return ret; } LayerCache* DeviceCache::LayerCacheInstance(uint32_t layerId) const diff --git a/display/composer/v1_0/hdi_impl/display_composer_hdi_impl.h b/display/composer/v1_0/hdi_impl/display_composer_hdi_impl.h index cc01df0f..39a59bec 100644 --- a/display/composer/v1_0/hdi_impl/display_composer_hdi_impl.h +++ b/display/composer/v1_0/hdi_impl/display_composer_hdi_impl.h @@ -130,6 +130,7 @@ public: virtual int32_t SetClientBufferCacheCount(uint32_t devId, uint32_t cacheCount) override { COMPOSER_CHECK_NULLPTR_RETURN(hdi_); + HDF_LOGI("liumin111 %{public}s:devId=%{public}u cacheCount=%{public}d", __func__, devId, cacheCount); return ToDispErrCode(hdi_->SetClientBufferCacheCount(devId, cacheCount)); } -- Gitee