openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-11-27 02:10:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug UpdateParam and add dfx log

Browse Source 
Signed-off-by: zhouge <zhouge7@huawei.com>
This commit is contained in:
zhouge 2024-05-31 18:05:08 +08:00
parent 6258be80a4
commit 6c77d19b56
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
services/param/base/param_base.h
View File

@ -32,6 +32,7 @@ extern "C" {
#define WORKSPACE_STATUS_IN_PROCESS 0x01
#define WORKSPACE_STATUS_VALID 0x02
#define READ_COMMIT_ID_LOOP_RETRY_TIME_WARNING 50
#ifndef PARAM_BASE
#define PARAM_SPRINTF(buffer, buffSize, format, ...) \
snprintf_s((buffer), (buffSize), (buffSize) - 1, (format), ##__VA_ARGS__)
@ -46,9 +47,13 @@ extern "C" {
static inline uint32_t ReadCommitId(ParamNode *entry)
{
uint32_t commitId = ATOMIC_LOAD_EXPLICIT(&entry->commitId, MEMORY_ORDER_ACQUIRE);
uint32_t retryTimes = 0;
while (commitId & PARAM_FLAGS_MODIFY) {
futex_wait(&entry->commitId, commitId);
commitId = ATOMIC_LOAD_EXPLICIT(&entry->commitId, MEMORY_ORDER_ACQUIRE);
if (retryTimes++ % READ_COMMIT_ID_LOOP_RETRY_TIME_WARNING == 0) {
PARAM_LOGW("ReadCommitId warning, too many retry times, %{public}d", retryTimes);
}
}
return commitId & PARAM_FLAGS_COMMITID;
}

3
services/param/manager/param_manager.c
View File

@ -461,7 +461,8 @@ static int UpdateParam(const WorkSpace *workSpace, uint32_t *dataIndex, const ch
entry->valueLength = valueLen;
}
uint32_t flags = commitId & ~PARAM_FLAGS_COMMITID;
ATOMIC_STORE_EXPLICIT(&entry->commitId, (++commitId) | flags, MEMORY_ORDER_RELEASE);
uint32_t commitIdCount = (++commitId) & PARAM_FLAGS_COMMITID;
ATOMIC_STORE_EXPLICIT(&entry->commitId, flags | commitIdCount, MEMORY_ORDER_RELEASE);
ATOMIC_SYNC_ADD_AND_FETCH(&workSpace->area->commitId, 1, MEMORY_ORDER_RELEASE);
#ifdef PARAM_SUPPORT_SELINUX
WorkSpace *space = GetWorkSpace(WORKSPACE_INDEX_DAC);