From 83a69ffe79362d3448d0a17396bc26f338baf414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E9=91=AB=E9=91=AB?= <1310342532@qq.com>
Date: Thu, 16 Jan 2025 20:04:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Elog=5Finstance=5Fstarting?=
 =?UTF-8?q?=E6=A0=87=E5=BF=97=EF=BC=8C=E5=AE=9E=E4=BE=8B=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E9=98=B6=E6=AE=B5throw=20error=E6=89=93RUN=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cm_defines/cm_error.c  | 4 ++++
 src/cm_utils/cm_disklock.c | 2 +-
 src/cm_utils/cm_log.h      | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/cm_defines/cm_error.c b/src/cm_defines/cm_error.c
index 76be6be..394ee01 100644
--- a/src/cm_defines/cm_error.c
+++ b/src/cm_defines/cm_error.c
@@ -243,6 +243,10 @@ status_t cm_set_log_error(const char *file, uint32 line, cm_errno_t code, const
         return CM_ERROR;
     }
     LOG_DEBUG_ERR("%05d : %s [%s:%u]", (int32)code, log_msg, file, line);
+    log_param_t *log_param = cm_log_param_instance();
+    if (log_param->log_instance_starting) {
+        LOG_RUN_ERR("%05d : %s [%s:%u]", (int32)code, log_msg, file, line);
+    }
     if (g_tls_error.code == 0) {
         g_tls_error.code = (int32)code;
         MEMS_RETURN_IFERR(memcpy_sp(g_tls_error.message, CM_MESSAGE_BUFFER_SIZE, log_msg, CM_MESSAGE_BUFFER_SIZE));
diff --git a/src/cm_utils/cm_disklock.c b/src/cm_utils/cm_disklock.c
index 309393e..15b7f14 100644
--- a/src/cm_utils/cm_disklock.c
+++ b/src/cm_utils/cm_disklock.c
@@ -538,7 +538,7 @@ int cm_dl_check_lock_remain(unsigned int lock_id, unsigned long long inst_id, un
         return CM_DL_ERR_INVALID_LOCK_ID;
     }
     ssize_t size = pread(
-        lock_info->fd, lock_stat, CM_BLOCK_SIZE, (off_t)(lock_info->offset + CM_BLOCK_SIZE * (lock_info->inst_id + 1)));
+        lock_info->fd, lock_stat, CM_BLOCK_SIZE, (off_t)(lock_info->offset + CM_BLOCK_SIZE * (inst_id + 1)));
     if(size != CM_BLOCK_SIZE) {
         LOG_RUN_ERR("DL:read path failed:%d,%s.", errno, strerror(errno));
         return CM_DL_ERR_IO;
diff --git a/src/cm_utils/cm_log.h b/src/cm_utils/cm_log.h
index b6b5a06..5cf1096 100644
--- a/src/cm_utils/cm_log.h
+++ b/src/cm_utils/cm_log.h
@@ -97,6 +97,7 @@ typedef struct st_log_param {
     bool8 log_compressed;
     atomic32_t reference_count;
     spinlock_t lock;
+    bool32 log_instance_starting;
 } log_param_t;
 
 /* _log_level */
-- 
Gitee