From 152e113fb29a98a8482ed49a0d0525a5aeebfa7b Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Wed, 13 Dec 2023 11:11:44 +0800 Subject: [PATCH] modify hilog print Signed-off-by: wangyongzhong2 --- frameworks/datatransmitmgr/dev_slinfo_log.c | 58 +++++++++++++++++++ interfaces/innerkits/datatransmitmgr/BUILD.gn | 8 ++- .../datatransmitmgr/include/dev_slinfo_log.h | 21 ++++--- test/unittest/datatransmitmgr/BUILD.gn | 3 + 4 files changed, 80 insertions(+), 10 deletions(-) create mode 100644 frameworks/datatransmitmgr/dev_slinfo_log.c diff --git a/frameworks/datatransmitmgr/dev_slinfo_log.c b/frameworks/datatransmitmgr/dev_slinfo_log.c new file mode 100644 index 0000000..a8cbc29 --- /dev/null +++ b/frameworks/datatransmitmgr/dev_slinfo_log.c @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dev_slinfo_log.h" + +#include +#include "securec.h" + +static void DataSlPrint(const char *buf, DataSlLogLevel level) +{ + switch (level) { + case LOG_LEVEL_DEBUG: + DataSl_LOG_DEBUG(buf); + break; + case LOG_LEVEL_INFO: + DataSl_LOG_INFO(buf); + break; + case LOG_LEVEL_WARN: + DataSl_LOG_WARN(buf); + break; + case LOG_LEVEL_ERROR: + DataSl_LOG_ERROR(buf); + break; + default: + break; + } +} + +void DataSlLogPrint(DataSlLogLevel level, const char *funName, const char *fmt, ...) +{ + int32_t ulPos = 0; + char outStr[LOG_PRINT_MAX_LEN] = {0}; + int32_t ret = sprintf_s(outStr, sizeof(outStr), "%s: ", funName); + if (ret < 0) { + return; + } + ulPos = strlen(outStr); + va_list arg; + va_start(arg, fmt); + ret = vsprintf_s(&outStr[ulPos], sizeof(outStr) - ulPos, fmt, arg); + va_end(arg); + if (ret < 0) { + return; + } + DataSlPrint(outStr, level); +} diff --git a/interfaces/innerkits/datatransmitmgr/BUILD.gn b/interfaces/innerkits/datatransmitmgr/BUILD.gn index e399704..a956418 100644 --- a/interfaces/innerkits/datatransmitmgr/BUILD.gn +++ b/interfaces/innerkits/datatransmitmgr/BUILD.gn @@ -31,6 +31,7 @@ ohos_shared_library("data_transit_mgr") { sources = [ "../../../frameworks/datatransmitmgr/dev_slinfo_adpt.c", "../../../frameworks/datatransmitmgr/dev_slinfo_list.c", + "../../../frameworks/datatransmitmgr/dev_slinfo_log.c", "../../../frameworks/datatransmitmgr/dev_slinfo_mgr.c", ] @@ -52,5 +53,10 @@ ohos_shared_library("data_transit_mgr") { "hilog:libhilog", ] - cflags = [ "-Wall" ] + defines = [ "HILOG_ENABLE" ] + + cflags = [ + "-DHILOG_ENABLE", + "-Wall", + ] } diff --git a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h b/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h index 920c365..f726e60 100644 --- a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h +++ b/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_log.h @@ -16,29 +16,31 @@ #ifndef DEV_SLINFO_LOG_H #define DEV_SLINFO_LOG_H -#ifdef HILOG_ENABLE +#define LOG_PRINT_MAX_LEN 1024 typedef enum { LOG_LEVEL_DEBUG = 0, LOG_LEVEL_INFO = 1, LOG_LEVEL_WARN = 2, LOG_LEVEL_ERROR = 3 -} LogLevel; +} DataSlLogLevel; #ifdef __cplusplus extern "C" { #endif -void DataSlLogPrint(LogLevel level, const char *funName, const char *fmt, ...); +void DataSlLogPrint(DataSlLogLevel level, const char *funName, const char *fmt, ...); #ifdef __cplusplus } #endif + +#ifdef HILOG_ENABLE #include "hilog/log.h" -#ifndef LOG_DOMAIN -#define LOG_DOMAIN 0xD002F04 +#ifndef DATASL_LOG_DOMAIN +#define DATASL_LOG_DOMAIN 0xD002F04 #endif #define DATA_SEC_LOG_DEBUG(fmt, ...) (DataSlLogPrint(LOG_LEVEL_DEBUG, __FUNCTION__, fmt, ##__VA_ARGS__)) @@ -46,14 +48,15 @@ void DataSlLogPrint(LogLevel level, const char *funName, const char *fmt, ...); #define DATA_SEC_LOG_WARN(fmt, ...) (DataSlLogPrint(LOG_LEVEL_WARN, __FUNCTION__, fmt, ##__VA_ARGS__)) #define DATA_SEC_LOG_ERROR(fmt, ...) (DataSlLogPrint(LOG_LEVEL_ERROR, __FUNCTION__, fmt, ##__VA_ARGS__)) -#define DataSl_LOG_DEBUG(fmt, ...) HiLogPrint(LOG_CORE, LOG_DEBUG, LOG_DOMAIN, "[DataSl]", "%{public}s", buf) -#define DataSl_LOG_INFO(buf) HiLogPrint(LOG_CORE, LOG_INFO, LOG_DOMAIN, "[DataSl]", "%{public}s", buf) -#define DataSl_LOG_WARN(buf) HiLogPrint(LOG_CORE, LOG_WARN, LOG_DOMAIN, "[DataSl]", "%{public}s", buf) -#define DataSl_LOG_ERROR(buf) HiLogPrint(LOG_CORE, LOG_ERROR, LOG_DOMAIN, "[DataSl]", "%{public}s", buf) +#define DataSl_LOG_DEBUG(buf) HiLogPrint(LOG_CORE, LOG_DEBUG, DATASL_LOG_DOMAIN, "[DataSl]", "%{public}s", buf) +#define DataSl_LOG_INFO(buf) HiLogPrint(LOG_CORE, LOG_INFO, DATASL_LOG_DOMAIN, "[DataSl]", "%{public}s", buf) +#define DataSl_LOG_WARN(buf) HiLogPrint(LOG_CORE, LOG_WARN, DATASL_LOG_DOMAIN, "[DataSl]", "%{public}s", buf) +#define DataSl_LOG_ERROR(buf) HiLogPrint(LOG_CORE, LOG_ERROR, DATASL_LOG_DOMAIN, "[DataSl]", "%{public}s", buf) #else #include +#include #define DATA_SEC_LOG_DEBUG(fmt, ...) printf("[DataSl][D][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) #define DATA_SEC_LOG_INFO(fmt, ...) printf("[DataSl][I][%s]: " fmt "\n", __FUNCTION__, ##__VA_ARGS__) diff --git a/test/unittest/datatransmitmgr/BUILD.gn b/test/unittest/datatransmitmgr/BUILD.gn index 96cb2b0..d5246da 100644 --- a/test/unittest/datatransmitmgr/BUILD.gn +++ b/test/unittest/datatransmitmgr/BUILD.gn @@ -51,6 +51,9 @@ ohos_unittest("DevSLMgrTest") { "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", "//base/security/dataclassification/interfaces/innerkits/datatransmitmgr:data_transit_mgr", ] + + defines = [ "HILOG_ENABLE" ] + external_deps = [ "c_utils:utils", "device_security_level:dslm_sdk", -- Gitee