!780 L1-liteos-tdd测试liteos_a_process_unittest.bin,liteos_a_security_vid_unittest.bin和liteos_a_time_clock_unittest.bin模块用例un

Merge pull request !780 from xuxinyu/master
fix: L1-liteos-tdd测试liteos_a_process_unittest.bin,liteos_a_security_vid_unittest.bin和liteos_a_time_clock_unittest.bin模块用例un
2022-01-14 06:26:11 +00:00 · 2022-01-13 21:26:43 +08:00 · 2022-01-13 11:39:28 +00:00 · 2022-01-12 02:22:29 +00:00 · 2022-01-11 16:05:36 +08:00 · 2022-01-11 06:29:13 +00:00
5 changed files with 19 additions and 10 deletions
@@ -67,7 +67,6 @@ extern "C" {
 #define QUOTES_STATUS_CLOSE(qu) ((qu) == FALSE)
 #define QUOTES_STATUS_OPEN(qu)  ((qu) == TRUE)

-typedef size_t bool;

 typedef struct {
    unsigned int   consoleID;
@@ -617,9 +617,6 @@ LITE_OS_SEC_TEXT LosTaskCB *OsGetFreeTaskCB(VOID)
    if (LOS_ListEmpty(&g_losFreeTask)) {
        SCHEDULER_UNLOCK(intSave);
        PRINT_ERR("No idle TCB in the system!\n");
-#ifdef LOSCFG_DEBUG_VERSION
-	(VOID)OsShellCmdTskInfoGet(OS_ALL_TASK_MASK, NULL, OS_PROCESS_INFO_ALL);
-#endif
        return NULL;
    }

@@ -238,7 +238,7 @@ static void HiLogHeadInit(struct HiLogEntry *header, size_t len)

    ret = clock_gettime(CLOCK_REALTIME, &now);
    if (ret != 0) {
-        dprintf("In %s line %d,clock_gettime fail", __FUNCTION__, __LINE__);
+        dprintf("In %s line %d,clock_gettime fail\n", __FUNCTION__, __LINE__);
        return;
    }

@@ -255,7 +255,9 @@ static void HiLogCoverOldLog(size_t bufLen)
    int retval;
    struct HiLogEntry header;
    size_t totalSize = bufLen + sizeof(struct HiLogEntry);
-    int dropLogLines = 0;
+    static int dropLogLines = 0;
+    static int isLastTimeFull = 0;
+    int isThisTimeFull = 0;

    while (totalSize + g_hiLogDev.size > HILOG_BUFFER) {
        retval = HiLogReadRingBuffer((unsigned char *)&header, sizeof(header));
@@ -264,11 +266,18 @@ static void HiLogCoverOldLog(size_t bufLen)
        }

        dropLogLines++;
+        isThisTimeFull = 1;
+        isLastTimeFull = 1;
        HiLogBufferDec(sizeof(header));
        HiLogBufferDec(header.len);
    }
-    if (dropLogLines > 0) {
-        dprintf("hilog ringbuffer full, drop %d line(s) log", dropLogLines);
+    if (isLastTimeFull == 1 && isThisTimeFull == 0) {
+        /* so we can only print one log if hilog ring buffer is full in a short time */
+        if (dropLogLines > 0) {
+            dprintf("hilog ringbuffer full, drop %d line(s) log\n", dropLogLines);
+        }
+        isLastTimeFull = 0;
+        dropLogLines = 0;
    }
 }

@@ -330,7 +339,7 @@ static void HiLogDeviceInit(void)
 {
    g_hiLogDev.buffer = LOS_MemAlloc((VOID *)OS_SYS_MEM_ADDR, HILOG_BUFFER);
    if (g_hiLogDev.buffer == NULL) {
-        dprintf("In %s line %d,LOS_MemAlloc fail", __FUNCTION__, __LINE__);
+        dprintf("In %s line %d,LOS_MemAlloc fail\n", __FUNCTION__, __LINE__);
    }

    init_waitqueue_head(&g_hiLogDev.wq);
@@ -119,7 +119,10 @@ static int GetFullpathNull(int fd, const char *path, char **filePath)
        if (ret < 0) {
            return -get_errno();
        }
-        fullPath = file->f_path;
+        fullPath = strdup(file->f_path);
+        if (fullPath == NULL) {
+            ret = -ENOMEM;
+        }
    } else {
        ret = GetFullpath(fd, path, &fullPath);
        if (ret < 0) {
@@ -35,6 +35,7 @@ local_flags = [
  "-fbuiltin",
  "-Wno-narrowing",
  "-fPIE",
+  "-Wno-error",
 ]
 if (LOSCFG_USER_TEST_SMP == "enable" ||
    (LOSCFG_USER_TEST_SMP == "default" && board_name == "hispark_taurus")) {
Author	SHA1	Message	Date
openharmony_ci	b7d624208b	!780 L1-liteos-tdd测试liteos_a_process_unittest.bin,liteos_a_security_vid_unittest.bin和liteos_a_time_clock_unittest.bin模块用例un Merge pull request !780 from xuxinyu/master	2022-01-14 06:26:11 +00:00
x_xiny	87b8e6b0ad	fix: L1-liteos-tdd测试liteos_a_process_unittest.bin,liteos_a_security_vid_unittest.bin和liteos_a_time_clock_unittest.bin模块用例un 【背景】L1-liteos-tdd测试liteos_a_process_unittest.bin,liteos_a_security_vid_unittest.bin和liteos_a_time_clock_unittest.bin模块用例un 【修改方案】 1.暂时将musl中的exit()接口中的原子操作改为使用mutex方式实现 2.删除内核中不必要的打印 re #I4K9A5 Signed-off-by: xuiny <xuxinyu6@huawei.com> Change-Id: Ifdbb9154c7541b863670bb4e3bcde2587970df38	2022-01-13 21:26:43 +08:00
openharmony_ci	321018cee0	!765 处理A核编译告警 Merge pull request !765 from yinjiaming/yjm-kernel-20220105	2022-01-13 11:39:28 +00:00
openharmony_ci	b0c046f8ac	!776 修复toybox mv指令能够移动成功，但提示错误22的BUG Merge pull request !776 from Far/master	2022-01-12 02:22:29 +00:00
Far	f2861ddfb4	fix: 修复futime提示错误22的BUG 调用futime时，系统调用接口函数直接使用了file结构体的f_path字段，该字段在退出前被错误地释放了。避免该问题需要拷贝一份路径 Signed-off-by: Far <yesiyuan2@huawei.com> Change-Id: I519ccb38bec323c93aa8cff920143bb3f9931c22	2022-01-11 16:05:36 +08:00
openharmony_ci	48f5481c65	!771 【轻量级 PR】：reduce print log if hilog ringbuffer is full Merge pull request !771 from shenchenkai/N/A	2022-01-11 06:29:13 +00:00
shenchenkai	b65897d517	reduce print log if hilog ringbuffer is full Signed-off-by: shenchenkai <shenchenkai@huawei.com>	2022-01-07 09:47:49 +00:00
yinjiaming	6c4e4b16ab	fix: 修复shcmd.h需要用宏包起来的问题【背景】当前仓代码存在编译告警需要处理【修改方案】在测试用例中屏蔽-Werror 从shell.h中删除了多余的bool定义【影响】对现有的产品编译不会有影响。 re #I4N50W Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: Id131b8437b471f44d9fe35a384678903216fcfb4	2022-01-07 06:59:40 +00:00