From 0f1d7b2fc377d3191eb7fa12ac70073fd34db061 Mon Sep 17 00:00:00 2001 From: yaomanhai Date: Fri, 5 Nov 2021 17:02:55 +0800 Subject: [PATCH] codex issue and review issue fix Signed-off-by: yaomanhai --- frameworks/native/include/hilog_common.h | 2 +- services/hilogd/log_persister.cpp | 6 +++--- services/hilogd/main.cpp | 4 +++- services/hilogtool/include/log_controller.h | 2 +- services/hilogtool/include/log_display.h | 2 +- services/hilogtool/log_controller.cpp | 11 +++++------ services/hilogtool/log_display.cpp | 12 ++++++------ 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/frameworks/native/include/hilog_common.h b/frameworks/native/include/hilog_common.h index e6e365f..377173e 100644 --- a/frameworks/native/include/hilog_common.h +++ b/frameworks/native/include/hilog_common.h @@ -76,7 +76,7 @@ using HilogShowFormatBuffer = struct { uint32_t domain; uint32_t tv_sec; uint32_t tv_nsec; - char* data; + const char* data; }; #define CONTENT_LEN(pMsg) (pMsg->len - sizeof(HilogMsg) - pMsg->tag_len) /* include '\0' */ diff --git a/services/hilogd/log_persister.cpp b/services/hilogd/log_persister.cpp index d83606d..e598379 100644 --- a/services/hilogd/log_persister.cpp +++ b/services/hilogd/log_persister.cpp @@ -171,7 +171,7 @@ void LogPersister::SetBufferOffset(int off) int GenPersistLogHeader(HilogData *data, list& persistList) { - char buffer[MAX_LOG_LEN * 2]; + char buffer[MAX_LOG_LEN + MAX_LOG_LEN]; HilogShowFormatBuffer showBuffer; showBuffer.level = data->level; showBuffer.pid = data->pid; @@ -198,7 +198,7 @@ int GenPersistLogHeader(HilogData *data, list& persistList) *dataPos = 0; showBuffer.tag_len = offset; showBuffer.data = dataCopy; - HilogShowBuffer(buffer, MAX_LOG_LEN * 2, showBuffer, 0); + HilogShowBuffer(buffer, MAX_LOG_LEN + MAX_LOG_LEN, showBuffer, 0); persistList.push_back(buffer); offset += dataPos - dataBegin + 1; } else { @@ -211,7 +211,7 @@ int GenPersistLogHeader(HilogData *data, list& persistList) if (dataPos != dataBegin) { showBuffer.tag_len = offset; showBuffer.data = dataCopy; - HilogShowBuffer(buffer, MAX_LOG_LEN * 2, showBuffer, 0); + HilogShowBuffer(buffer, MAX_LOG_LEN + MAX_LOG_LEN, showBuffer, 0); persistList.push_back(buffer); } free(dataCopy); diff --git a/services/hilogd/main.cpp b/services/hilogd/main.cpp index df060f2..bc8a75b 100644 --- a/services/hilogd/main.cpp +++ b/services/hilogd/main.cpp @@ -34,6 +34,8 @@ namespace OHOS { namespace HiviewDFX { using namespace std; +constexpr int HILOG_FILE_MASK = 0026; + #ifdef DEBUG static int g_fd = -1; #endif @@ -53,7 +55,7 @@ static void SigHandler(int sig) int HilogdEntry(int argc, char* argv[]) { HilogBuffer hilogBuffer; - + umask(HILOG_FILE_MASK); #ifdef DEBUG int fd = open(HILOG_FILE_DIR"hilogd.txt", O_WRONLY | O_APPEND); if (fd > 0) { diff --git a/services/hilogtool/include/log_controller.h b/services/hilogtool/include/log_controller.h index 04128a9..3bfad11 100644 --- a/services/hilogtool/include/log_controller.h +++ b/services/hilogtool/include/log_controller.h @@ -34,7 +34,7 @@ inline void PrintBuffer(void* pBuff, unsigned int nLen); void NextRequestOp(SeqPacketSocketClient& controller, uint16_t sendId); void LogQueryRequestOp(SeqPacketSocketClient& controller, const HilogArgs* context); void LogQueryResponseOp(SeqPacketSocketClient& controller, char* recvBuffer, uint32_t bufLen, - HilogArgs* context, int32_t format); + const HilogArgs* context, int32_t format); int32_t BufferSizeOp(SeqPacketSocketClient& controller, uint8_t msgCmd, const std::string& logTypeStr, const std::string& buffSizeStr); int32_t StatisticInfoOp(SeqPacketSocketClient& controller, uint8_t msgCmd, diff --git a/services/hilogtool/include/log_display.h b/services/hilogtool/include/log_display.h index a301831..6d24551 100644 --- a/services/hilogtool/include/log_display.h +++ b/services/hilogtool/include/log_display.h @@ -26,7 +26,7 @@ using namespace std; int32_t ControlCmdResult(const char* message); std::string ParseErrorCode(ErrorCode errorCode); void HilogShowLog(int32_t showFormat, HilogDataMessage* contentOut, - HilogArgs* context, vector& tailBuffer); + const HilogArgs* context, vector& tailBuffer); HilogShowFormat HilogFormat (const char* formatArg); } // namespace HiviewDFX } // namespace OHOS diff --git a/services/hilogtool/log_controller.cpp b/services/hilogtool/log_controller.cpp index 076b0f2..24ef3cd 100644 --- a/services/hilogtool/log_controller.cpp +++ b/services/hilogtool/log_controller.cpp @@ -211,7 +211,7 @@ void LogQueryRequestOp(SeqPacketSocketClient& controller, const HilogArgs* conte } void LogQueryResponseOp(SeqPacketSocketClient& controller, char* recvBuffer, uint32_t bufLen, - HilogArgs* context, int32_t format) + const HilogArgs* context, int32_t format) { static std::vector tailBuffer; LogQueryResponse* rsp = reinterpret_cast(recvBuffer); @@ -232,11 +232,10 @@ void LogQueryResponseOp(SeqPacketSocketClient& controller, char* recvBuffer, uin switch (data->sendId) { case SENDIDN: if (context->noBlockMode) { - if (context->tailLines) { - while (context->tailLines-- && !tailBuffer.empty()) { - cout << tailBuffer.back() << endl; - tailBuffer.pop_back(); - } + uint16_t i = context->tailLines; + while (i-- && !tailBuffer.empty()) { + cout << tailBuffer.back() << endl; + tailBuffer.pop_back(); } NextRequestOp(controller, SENDIDN); exit(1); diff --git a/services/hilogtool/log_display.cpp b/services/hilogtool/log_display.cpp index ac00049..3cfba06 100644 --- a/services/hilogtool/log_display.cpp +++ b/services/hilogtool/log_display.cpp @@ -435,7 +435,7 @@ bool HilogMatchByRegex(string context, string regExpArg) } } -void HilogShowLog(int32_t showFormat, HilogDataMessage* data, HilogArgs* context, +void HilogShowLog(int32_t showFormat, HilogDataMessage* data, const HilogArgs* context, vector& tailBuffer) { if (data->sendId == SENDIDN) { @@ -449,7 +449,7 @@ void HilogShowLog(int32_t showFormat, HilogDataMessage* data, HilogArgs* context static int printHeadCnt = 0; HilogShowFormatBuffer showBuffer; - char* content = data->data + data->tag_len; + const char* content = data->data + data->tag_len; if (context->headLines) { if (printHeadCnt++ >= context->headLines) { @@ -463,7 +463,7 @@ void HilogShowLog(int32_t showFormat, HilogDataMessage* data, HilogArgs* context } } - char buffer[MAX_LOG_LEN * 2]; + char buffer[MAX_LOG_LEN + MAX_LOG_LEN]; showBuffer.level = data->level; showBuffer.pid = data->pid; showBuffer.tid = data->tid; @@ -472,7 +472,7 @@ void HilogShowLog(int32_t showFormat, HilogDataMessage* data, HilogArgs* context showBuffer.tv_sec = data->tv_sec; showBuffer.tv_nsec = data->tv_nsec; int offset = data->tag_len; - char *dataBegin = data->data + offset; + const char *dataBegin = data->data + offset; char *dataPos = data->data + offset; while (*dataPos != 0) { if (*dataPos == '\n') { @@ -480,7 +480,7 @@ void HilogShowLog(int32_t showFormat, HilogDataMessage* data, HilogArgs* context *dataPos = 0; showBuffer.tag_len = offset; showBuffer.data = data->data; - HilogShowBuffer(buffer, MAX_LOG_LEN * 2, showBuffer, showFormat); + HilogShowBuffer(buffer, MAX_LOG_LEN + MAX_LOG_LEN, showBuffer, showFormat); if (context->tailLines) { tailBuffer.emplace_back(buffer); return; @@ -497,7 +497,7 @@ void HilogShowLog(int32_t showFormat, HilogDataMessage* data, HilogArgs* context } if (dataPos != dataBegin) { showBuffer.data = data->data; - HilogShowBuffer(buffer, MAX_LOG_LEN * 2, showBuffer, showFormat); + HilogShowBuffer(buffer, MAX_LOG_LEN + MAX_LOG_LEN, showBuffer, showFormat); if (context->tailLines) { tailBuffer.emplace_back(buffer); return; -- Gitee