yystopf/openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!215 [待合并]fix: 清理残留无效的trace代码

Browse Source 
Merge pull request !215 from Zhaotianyu/0708trace_delete
This commit is contained in:
openharmony_ci
2021-07-13 09:01:57 +00:00
committed by Gitee
parent 453f91d09c 3c48951857
commit 73a99977de
6 changed files with 49 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/src/los_init.c
View File

@@ -42,10 +42,6 @@
#include "los_interrupt.h"
#endif
#if (LOSCFG_KERNEL_TRACE == 1)
#include "los_debug.h"
#endif
#if (LOSCFG_BASE_CORE_SWTMR == 1)
#include "los_swtmr.h"
#endif
@@ -186,14 +182,6 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_KernelInit(VOID)
return ret;
}
#if (LOSCFG_KERNEL_TRACE == 1)
ret = LOS_TraceInit();
if (ret != LOS_OK) {
PRINT_ERR("LOS_TraceInit error\n");
return ret;
}
#endif
#if (LOSCFG_KERNEL_PM == 1)
ret = OsPmInit();
if (ret != LOS_OK) {
@@ -202,7 +190,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_KernelInit(VOID)
}
#endif
#ifdef LOSCFG_TEST
#if (LOSCFG_TEST == 1)
//ret = los_TestInit();
//if (ret != LOS_OK) {
// PRINT_ERR("los_TestInit error\n");

4
kernel/src/los_task.c
View File

@@ -581,10 +581,6 @@ LITE_OS_SEC_TEXT VOID OsTaskSwitchCheck(VOID)
g_pfnUsrTskSwitchHook();
}
#if (LOSCFG_KERNEL_TRACE == 1)
LOS_Trace(LOS_TRACE_SWITCH, 0);
#endif
#if (LOSCFG_BASE_CORE_CPUP == 1)
OsTskCycleEndStart();
#endif /* LOSCFG_BASE_CORE_CPUP */

58
kernel/src/mm/los_memory.c
View File

@@ -41,7 +41,6 @@
/* Used to cut non-essential functions. */
#define OS_MEM_EXPAND_ENABLE 0
#define OS_MEM_TRACE 0
UINT8 *m_aucSysMem0 = NULL;
@@ -906,11 +905,6 @@ UINT32 LOS_MemInit(VOID *pool, UINT32 size)
}
#endif
#if OS_MEM_TRACE
LOS_TraceReg(LOS_TRACE_MEM_TIME, OsMemTimeTrace, LOS_TRACE_MEM_TIME_NAME, LOS_TRACE_ENABLE);
LOS_TraceReg(LOS_TRACE_MEM_INFO, OsMemInfoTrace, LOS_TRACE_MEM_INFO_NAME, LOS_TRACE_ENABLE);
#endif
OsHookCall(LOS_HOOK_TYPE_MEM_INIT, pool, size);
return LOS_OK;
@@ -929,11 +923,6 @@ UINT32 LOS_MemDeInit(VOID *pool)
OsMemPoolDeinit(pool);
#if OS_MEM_TRACE
LOS_TraceUnreg(LOS_TRACE_MEM_TIME);
LOS_TraceUnreg(LOS_TRACE_MEM_INFO);
#endif
OsHookCall(LOS_HOOK_TYPE_MEM_DEINIT, pool);
return LOS_OK;
@@ -1003,10 +992,6 @@ retry:
VOID *LOS_MemAlloc(VOID *pool, UINT32 size)
{
#if OS_MEM_TRACE
UINT64 start = HalClockGetCycles();
#endif
if ((pool == NULL) || (size == 0)) {
return NULL;
}
@@ -1028,19 +1013,6 @@ VOID *LOS_MemAlloc(VOID *pool, UINT32 size)
} while (0);
MEM_UNLOCK(poolHead, intSave);
#if OS_MEM_TRACE
UINT64 end = HalClockGetCycles();
UINT32 timeUsed = MEM_TRACE_CYCLE_TO_US(end - start);
LOS_Trace(LOS_TRACE_MEM_TIME, (UINTPTR)pool & MEM_POOL_ADDR_MASK, MEM_TRACE_MALLOC, timeUsed);
LOS_MEM_POOL_STATUS poolStatus = {0};
(VOID)LOS_MemInfoGet(pool, &poolStatus);
UINT8 fragment = 100 - poolStatus.maxFreeNodeSize * 100 / poolStatus.totalFreeSize; /* 100: percent denominator. */
UINT8 usage = LOS_MemTotalUsedGet(pool) * 100 / LOS_MemPoolSizeGet(pool); /* 100: percent denominator. */
LOS_Trace(LOS_TRACE_MEM_INFO, (UINTPTR)pool & MEM_POOL_ADDR_MASK, fragment, usage, poolStatus.totalFreeSize,
poolStatus.maxFreeNodeSize, poolStatus.usedNodeNum, poolStatus.freeNodeNum);
#endif
OsHookCall(LOS_HOOK_TYPE_MEM_ALLOC, pool, size);
return ptr;
@@ -1048,10 +1020,6 @@ VOID *LOS_MemAlloc(VOID *pool, UINT32 size)
VOID *LOS_MemAllocAlign(VOID *pool, UINT32 size, UINT32 boundary)
{
#if OS_MEM_TRACE
UINT64 start = HalClockGetCycles();
#endif
UINT32 gapSize;
if ((pool == NULL) || (size == 0) || (boundary == 0) || !OS_MEM_IS_POW_TWO(boundary) ||
@@ -1100,12 +1068,6 @@ VOID *LOS_MemAllocAlign(VOID *pool, UINT32 size, UINT32 boundary)
} while (0);
MEM_UNLOCK(poolHead, intSave);
#if OS_MEM_TRACE
UINT64 end = HalClockGetCycles();
UINT32 timeUsed = MEM_TRACE_CYCLE_TO_US(end - start);
LOS_Trace(LOS_TRACE_MEM_TIME, (UINTPTR)pool & MEM_POOL_ADDR_MASK, MEM_TRACE_MEMALIGN, timeUsed);
#endif
OsHookCall(LOS_HOOK_TYPE_MEM_ALLOCALIGN, pool, size, boundary);
return ptr;
@@ -1277,10 +1239,6 @@ STATIC INLINE VOID *OsGetRealPtr(const VOID *pool, VOID *ptr)
UINT32 LOS_MemFree(VOID *pool, VOID *ptr)
{
#if OS_MEM_TRACE
UINT64 start = HalClockGetCycles();
#endif
if ((pool == NULL) || (ptr == NULL) || !OS_MEM_IS_ALIGNED(pool, sizeof(VOID *)) ||
!OS_MEM_IS_ALIGNED(ptr, sizeof(VOID *))) {
return LOS_NOK;
@@ -1304,12 +1262,6 @@ UINT32 LOS_MemFree(VOID *pool, VOID *ptr)
} while (0);
MEM_UNLOCK(poolHead, intSave);
#if OS_MEM_TRACE
UINT64 end = HalClockGetCycles();
UINT32 timeUsed = MEM_TRACE_CYCLE_TO_US(end - start);
LOS_Trace(LOS_TRACE_MEM_TIME, (UINTPTR)pool & MEM_POOL_ADDR_MASK, MEM_TRACE_FREE, timeUsed);
#endif
return ret;
}
@@ -1382,10 +1334,6 @@ STATIC INLINE VOID *OsMemRealloc(struct OsMemPoolHead *pool, const VOID *ptr,
VOID *LOS_MemRealloc(VOID *pool, VOID *ptr, UINT32 size)
{
#if OS_MEM_TRACE
UINT64 start = HalClockGetCycles();
#endif
if ((pool == NULL) || OS_MEM_NODE_GET_USED_FLAG(size) || OS_MEM_NODE_GET_ALIGNED_FLAG(size)) {
return NULL;
}
@@ -1426,12 +1374,6 @@ VOID *LOS_MemRealloc(VOID *pool, VOID *ptr, UINT32 size)
} while (0);
MEM_UNLOCK(poolHead, intSave);
#if OS_MEM_TRACE
UINT64 end = HalClockGetCycles();
UINT32 timeUsed = MEM_TRACE_CYCLE_TO_US(end - start);
LOS_Trace(LOS_TRACE_MEM_TIME, (UINTPTR)pool & MEM_POOL_ADDR_MASK, MEM_TRACE_REALLOC, timeUsed);
#endif
return newPtr;
}