!2179 FIX:修改lite_m log输出为hilog

Merge pull request !2179 from cheng_jinsong/0808_liteM

interfaces/innerkits/include/beget_ext.h

@@ -18,6 +18,9 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <string.h>
+#ifdef __LITEOS_M__
+#include "hilog_lite/hiview_log.h"
+#endif
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -89,15 +92,15 @@ INIT_PUBLIC_API InitLogLevel GetInitLogLevel(void);
     StartupLog(INIT_FATAL, domain, tag, "[%s:%d]" fmt, (FILE_NAME), (__LINE__), ##__VA_ARGS__)
 #else
 #define STARTUP_LOGV(domain, tag, fmt, ...) \
-    StartupLog(INIT_DEBUG, domain, tag, fmt, ##__VA_ARGS__)
+    HILOG_DEBUG(HILOG_MODULE_INIT, fmt, ##__VA_ARGS__)
 #define STARTUP_LOGI(domain, tag, fmt, ...) \
-    StartupLog(INIT_INFO, domain, tag, fmt, ##__VA_ARGS__)
+    HILOG_INFO(HILOG_MODULE_INIT, fmt, ##__VA_ARGS__)
 #define STARTUP_LOGW(domain, tag, fmt, ...) \
-    StartupLog(INIT_WARN, domain, tag, fmt, ##__VA_ARGS__)
+    HILOG_WARN(HILOG_MODULE_INIT, fmt, ##__VA_ARGS__)
 #define STARTUP_LOGE(domain, tag, fmt, ...) \
-    StartupLog(INIT_ERROR, domain, tag, fmt, ##__VA_ARGS__)
+    HILOG_ERROR(HILOG_MODULE_INIT, fmt, ##__VA_ARGS__)
 #define STARTUP_LOGF(domain, tag, fmt, ...) \
-    StartupLog(INIT_FATAL, domain, tag, fmt, ##__VA_ARGS__)
+    HILOG_FATAL(HILOG_MODULE_INIT, fmt, ##__VA_ARGS__)
 #endif
 #endif
 

services/log/init_log.c

@@ -97,7 +97,7 @@ void LogToDmesg(InitLogLevel logLevel, const char *tag, const char *info)
 
 static void PrintLog(InitLogLevel logLevel, unsigned int domain, const char *tag, const char *logInfo)
 {
-#ifdef OHOS_LITE
+#if defined(__LITEOS_A__) || defined(__LINUX__)
     static const LogLevel LOG_LEVEL[] = { LOG_DEBUG, LOG_INFO, LOG_WARN, LOG_ERROR, LOG_FATAL };
     (void)HiLogPrint(INIT_LOG_INIT, LOG_LEVEL[logLevel], domain, tag, "%s", logInfo);
 #endif

services/log/init_log.h

@@ -50,6 +50,18 @@ INIT_LOCAL_API void SetInitCommLog(InitCommLog logFunc);
 #define INIT_LOGE(fmt, ...)
 #define INIT_LOGF(fmt, ...)
 #else
+#ifdef __LITEOS_M__
+#define INIT_LOGV(fmt, ...) \
+    HILOG_DEBUG(HILOG_MODULE_INIT, fmt, ##__VA_ARGS__)
+#define INIT_LOGI(fmt, ...) \
+    HILOG_INFO(HILOG_MODULE_INIT, fmt, ##__VA_ARGS__)
+#define INIT_LOGW(fmt, ...) \
+    HILOG_WARN(HILOG_MODULE_INIT, fmt, ##__VA_ARGS__)
+#define INIT_LOGE(fmt, ...) \
+    HILOG_ERROR(HILOG_MODULE_INIT, fmt, ##__VA_ARGS__)
+#define INIT_LOGF(fmt, ...) \
+    HILOG_FATAL(HILOG_MODULE_INIT, fmt, ##__VA_ARGS__)
+#else
 INIT_LOCAL_API void EnableInitLog(InitLogLevel level);
 #define INIT_LOGV(fmt, ...) \
     StartupLog(INIT_DEBUG, INIT_LOG_DOMAIN, INIT_LOG_TAG, "[%s:%d]" fmt, (FILE_NAME), (__LINE__), ##__VA_ARGS__)
@@ -62,6 +74,7 @@ INIT_LOCAL_API void EnableInitLog(InitLogLevel level);
 #define INIT_LOGF(fmt, ...) \
     StartupLog(INIT_FATAL, INIT_LOG_DOMAIN, INIT_LOG_TAG, "[%s:%d]" fmt, (FILE_NAME), (__LINE__), ##__VA_ARGS__)
 #endif
+#endif
 
 #ifndef UNLIKELY
 #define UNLIKELY(x)    __builtin_expect(!!(x), 0)

services/modules/init_hook/BUILD.gn

@@ -27,6 +27,7 @@ comm_include = [
   "//base/startup/init/interfaces/innerkits/include",
   "//third_party/cJSON",
   "//third_party/bounds_checking_function/include",
+  "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
 ]
 if (defined(ohos_lite)) {
   static_library("inithook") {

services/modules/udid/BUILD.gn

@@ -22,6 +22,7 @@ comm_include = [
   "../../../interfaces/innerkits/include",
   "../../../interfaces/innerkits/include/syspara",
   "../../../interfaces/innerkits/syspara",
+  "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
 ]
 
 if (defined(ohos_lite)) {

services/modules/udid/udid_adp.c

@@ -23,6 +23,9 @@
 
 #include "mbedtls/sha256.h"
 
+#define BUF_MAX_LEN 132
+#define PARAM_VALUE_MAX_LEN 36
+
 INIT_UDID_LOCAL_API int GetSha256Value(const char *input, char *udid, uint32_t udidSize)
 {
     if (input == NULL) {
@@ -50,26 +53,19 @@ INIT_UDID_LOCAL_API int GetSha256Value(const char *input, char *udid, uint32_t u
 
 INIT_UDID_LOCAL_API int CalcDevUdid(char *udid, uint32_t size)
 {
-    char *tmp = NULL;
-    BEGET_ERROR_CHECK((tmp = (char *)calloc(1, DEV_BUF_MAX_LENGTH)) != NULL, return -1, "calloc memory failed!");
-
-    uint32_t manufactureLen = PARAM_VALUE_LEN_MAX;
+    char tmp[BUF_MAX_LEN] = {0};
+    uint32_t manufactureLen = PARAM_VALUE_MAX_LEN;
     int ret = SystemReadParam("const.product.manufacturer", tmp, &manufactureLen);
-    BEGET_ERROR_CHECK(ret == 0, free(tmp);
-        return -1, "Read param const.product.manufacturer failed!");
+    BEGET_ERROR_CHECK(ret == 0, return -1, "Read param const.product.manufacturer failed!");
 
-    uint32_t modelLen = PARAM_VALUE_LEN_MAX;
+    uint32_t modelLen = PARAM_VALUE_MAX_LEN;
     ret = SystemReadParam("const.product.model", tmp + manufactureLen, &modelLen);
-    BEGET_ERROR_CHECK(ret == 0, free(tmp);
-        return -1, "Read param const.product.model failed!");
+    BEGET_ERROR_CHECK(ret == 0, return -1, "Read param const.product.model failed!");
     const char *serial = GetSerial_();
-    BEGET_ERROR_CHECK(serial != NULL, free(tmp);
-        return -1, "Read param serial failed!");
-    ret = strcat_s(tmp, DEV_BUF_MAX_LENGTH, serial);
-    BEGET_ERROR_CHECK(ret != -1, free(tmp);
-        return -1, "Cat serial failed!");
+    BEGET_ERROR_CHECK(serial != NULL, return -1, "Read param serial failed!");
+    ret = strcat_s(tmp, BUF_MAX_LEN, serial);
+    BEGET_ERROR_CHECK(ret != -1, return -1, "Cat serial failed!");
     ret = GetSha256Value(tmp, udid, size);
-    free(tmp);
     return ret;
 }
 

services/param/base/BUILD.gn

@@ -16,6 +16,7 @@ import("//build/ohos.gni")
 config("exported_header_files") {
   visibility = [ ":*" ]
   include_dirs = [
+    "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
     "//base/startup/init/interfaces/innerkits/include",
     "//base/startup/init/services/include/param",
     "//base/startup/init/services/include",

services/param/liteos/BUILD.gn

@@ -13,6 +13,7 @@
 import("//base/startup/init/begetd.gni")
 
 param_include_dirs = [
+  "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
   "//base/startup/init/interfaces/innerkits/include/syspara",
   "//base/startup/init/services/modules/init_hook",
   "//base/startup/init/services/param/include",

services/utils/BUILD.gn

@@ -24,6 +24,7 @@ if (defined(ohos_lite)) {
     sources = [ "init_utils.c" ]
     public_configs = [ ":exported_header_files" ]
     include_dirs = [
+      "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
       "//base/startup/init/interfaces/innerkits/include",
       "//third_party/bounds_checking_function/include",
     ]