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

!10730 告警清理

Browse Source 
Merge pull request !10730 from 李明康/506告警
This commit is contained in:
openharmony_ci 2024-05-06 06:18:25 +00:00 committed by Gitee
commit b4655e7081
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/opengl_wrapper/src/EGL/egl_blob_cache.cpp
View File

@ -212,7 +212,7 @@ EGLsizeiANDROID BlobCache::GetBlob(const void *key, EGLsizeiANDROID keySize, voi
errno_t ret = memcpy_s(value, valueSize, it->second->data, it->second->dataSize);
if (ret != EOK) {
WLOGE("memcpy_s failed");
return false;
return ret;
}
auto moveblob = it->first;
moveblob->prev_->next_ = moveblob->next_;

4
frameworks/opengl_wrapper/src/EGL/egl_wrapper_layer.cpp
View File

@ -213,6 +213,10 @@ bool EglWrapperLayer::LoadLayers()
{
WLOGD("");
std::vector<std::string> layers = GetDebugLayers();
if (layers.empty()) {
WLOGD("layers is empty");
return false;
}
for (int32_t i = layers.size() - 1; i >= 0; i--) {
std::string layerLib = std::string(DEBUG_LAYERS_PREFIX) + layers[i] + std::string(DEBUG_LAYERS_SUFFIX);
std::string layerPath = std::string(DEBUG_LAYERS_LIB_DIR) + layerLib;

14
rosen/modules/2d_graphics/src/render_context/cache_data.cpp
View File

@ -60,7 +60,7 @@ void CacheData::ReadFromFile()
}
size_t fileSize = static_cast<size_t>(statBuf.st_size);
if (fileSize == 0 || fileSize > maxTotalSize_ * MAX_MULTIPLE_SIZE) {
if (fileSize == 0 || fileSize > maxTotalSize_ * maxMultipleSize_) {
LOGD("abandon, illegal file size");
close(fd);
return;
@ -318,7 +318,7 @@ bool CacheData::IfSizeValidate(const size_t newSize, const size_t addedSize) con
bool CacheData::IfSkipClean(const size_t addedSize) const
{
// check if the new shader is still too large after cleaning
size_t maxPermittedSize = maxTotalSize_ - maxTotalSize_ / CLEAN_LEVEL;
size_t maxPermittedSize = maxTotalSize_ - maxTotalSize_ / cleanLevel_;
if (addedSize > maxPermittedSize) {
LOGD("new shader is too large, abandon insert");
return true;
@ -329,7 +329,7 @@ bool CacheData::IfSkipClean(const size_t addedSize) const
bool CacheData::IfCleanFinished()
{
if (!cleanThreshold_) {
RandClean(maxTotalSize_ / CLEAN_LEVEL);
RandClean(maxTotalSize_ / cleanLevel_);
return true;
} else {
LOGD("abandon, failed to clean the shaders");
@ -350,10 +350,10 @@ void CacheData::RandClean(const size_t cleanThreshold)
return;
}
unsigned long currentTime = static_cast<unsigned long>(now);
for (int indexRand = 0; indexRand < RAND_LENGTH; ++indexRand) {
cleanInit_[indexRand] = (currentTime >> (indexRand * RAND_SHIFT)) & 0xFFFF;
cleanInit_[indexRand] = (currentTime >> (indexRand * RAND_SHIFT)) & 0xFFFF;
cleanInit_[indexRand] = (currentTime >> (indexRand * RAND_SHIFT)) & 0xFFFF;
for (int indexRand = 0; indexRand < randLength_; ++indexRand) {
cleanInit_[indexRand] = (currentTime >> (indexRand * randShift_)) & 0xFFFF;
cleanInit_[indexRand] = (currentTime >> (indexRand * randShift_)) & 0xFFFF;
cleanInit_[indexRand] = (currentTime >> (indexRand * randShift_)) & 0xFFFF;
}
}
cleanThreshold_ = cleanThreshold;

8
rosen/modules/2d_graphics/src/render_context/cache_data.h
View File

@ -167,12 +167,12 @@ private:
std::vector<ShaderPointer> shaderPointers_;
size_t numShaders_ = 0;
const size_t MAX_MULTIPLE_SIZE = 2;
const size_t CLEAN_LEVEL = 2;
const size_t maxMultipleSize_ = 2;
const size_t cleanLevel_ = 2;
static const size_t ALIGN_FOUR = 3;
static const int ERR_NUMBER = -1;
const int RAND_SHIFT = 16;
const int RAND_LENGTH = 3;
const int randShift_ = 16;
const int randLength_ = 3;
size_t maxKeySize_;
size_t maxValueSize_;