diff --git a/src/cm_defines/cm_error.c b/src/cm_defines/cm_error.c index 76be6bef6ea6da97de4488be67d8af29791ff5ef..394ee01f46353648bdcdbe6291aa4aada2f52042 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 309393e4f0e70e74dbb5d8c66494f1d5e17d4d16..15b7f14cb4c0a33e4d7e7958889255d8a71c2e78 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 b6b5a06e9c18b4fc17de04e57e7ad7db3bda0633..5cf10962d417e77aac64de1e53425a845a815996 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 */