!971 回退 'Pull Request !938 : 修复文件系统不合理的锁操作'

Merge pull request !971 from openharmony_ci/revert-merge-938-master

components/cpup/los_cpup.c

@@ -58,6 +58,9 @@
 
 #define OS_CPUP_RECORD_PERIOD   (g_sysClock)
 
+#define OS_SYS_CYCLE_TO_US(cycle)  ((cycle) / (g_sysClock)) * OS_SYS_US_PER_SECOND + \
+    ((cycle) % (g_sysClock) * OS_SYS_US_PER_SECOND / (g_sysClock))
+
 LITE_OS_SEC_BSS UINT16    g_cpupInitFlg = 0;
 LITE_OS_SEC_BSS OsCpupCB  *g_cpup = NULL;
 LITE_OS_SEC_BSS UINT64    g_lastRecordTime;
@@ -167,6 +170,15 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsCpupInit()
     return LOS_OK;
 }
 
+/* The calculation time unit is changed to us to decouple the influence of 
+ * system frequency modulation on CPUP
+ */
+STATIC UINT64 CpupTimeUsGet(VOID)
+{
+    UINT64 time = LOS_SysCycleGet();
+    return OS_SYS_CYCLE_TO_US(time);
+}
+
 /*****************************************************************************
 Function   : OsTskCycleStart
 Description: start task to get cycles count in current task beginning
@@ -183,10 +195,11 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleStart(VOID)
 
     taskID = g_losTask.newTask->taskID;
     g_cpup[taskID].cpupID = taskID;
-    g_cpup[taskID].startTime = LOS_SysCycleGet();
+    g_cpup[taskID].startTime = CpupTimeUsGet();
 
     return;
 }
+
 /*****************************************************************************
 Function   : OsTskCycleEnd
 Description: quit task and get cycle count
@@ -196,7 +209,7 @@ Return     : None
 LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEnd(VOID)
 {
     UINT32 taskID;
-    UINT64 cpuCycle;
+    UINT64 cpuTime;
 
     if (g_cpupInitFlg == 0) {
         return;
@@ -208,16 +221,17 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEnd(VOID)
         return;
     }
 
-    cpuCycle = LOS_SysCycleGet();
-    if (cpuCycle < g_cpup[taskID].startTime) {
-        cpuCycle += g_cyclesPerTick;
+    cpuTime = CpupTimeUsGet();
+    if (cpuTime < g_cpup[taskID].startTime) {
+        cpuTime += OS_US_PER_TICK;
     }
 
-    g_cpup[taskID].allTime += (cpuCycle - g_cpup[taskID].startTime);
+    g_cpup[taskID].allTime += (cpuTime - g_cpup[taskID].startTime);
     g_cpup[taskID].startTime = 0;
 
     return;
 }
+
 /*****************************************************************************
 Function   : OsTskCycleEndStart
 Description: start task to get cycles count in current task ending
@@ -227,7 +241,7 @@ Return     : None
 LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEndStart(VOID)
 {
     UINT32 taskID;
-    UINT64 cpuCycle;
+    UINT64 cpuTime;
     UINT16 loopNum;
 
     if (g_cpupInitFlg == 0) {
@@ -235,23 +249,23 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEndStart(VOID)
     }
 
     taskID = g_losTask.runTask->taskID;
-    cpuCycle = LOS_SysCycleGet();
+    cpuTime = CpupTimeUsGet();
 
     if (g_cpup[taskID].startTime != 0) {
-        if (cpuCycle < g_cpup[taskID].startTime) {
-            cpuCycle += g_cyclesPerTick;
+        if (cpuTime < g_cpup[taskID].startTime) {
+            cpuTime += OS_US_PER_TICK;
         }
 
-        g_cpup[taskID].allTime += (cpuCycle - g_cpup[taskID].startTime);
+        g_cpup[taskID].allTime += (cpuTime - g_cpup[taskID].startTime);
         g_cpup[taskID].startTime = 0;
     }
 
     taskID = g_losTask.newTask->taskID;
     g_cpup[taskID].cpupID = taskID;
-    g_cpup[taskID].startTime = cpuCycle;
+    g_cpup[taskID].startTime = cpuTime;
 
-    if ((cpuCycle - g_lastRecordTime) > OS_CPUP_RECORD_PERIOD) {
-        g_lastRecordTime = cpuCycle;
+    if ((cpuTime - g_lastRecordTime) > OS_CPUP_RECORD_PERIOD) {
+        g_lastRecordTime = cpuTime;
 
         for (loopNum = 0; loopNum < g_taskMaxNum; loopNum++) {
             g_cpup[loopNum].historyTime[g_hisPos] = g_cpup[loopNum].allTime;
@@ -267,12 +281,12 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEndStart(VOID)
     return;
 }
 
-LITE_OS_SEC_TEXT_MINOR static inline UINT16 OsGetPrePos(UINT16 curPos)
+LITE_OS_SEC_TEXT_MINOR STATIC INLINE UINT16 OsGetPrePos(UINT16 curPos)
 {
     return (curPos == 0) ? (OS_CPUP_HISTORY_RECORD_NUM - 1) : (curPos - 1);
 }
 
-LITE_OS_SEC_TEXT_MINOR static VOID OsGetPositions(UINT16 mode, UINT16* curPosAddr, UINT16* prePosAddr)
+LITE_OS_SEC_TEXT_MINOR STATIC VOID OsGetPositions(UINT16 mode, UINT16* curPosAddr, UINT16* prePosAddr)
 {
     UINT16 curPos;
     UINT16 prePos = 0;
@@ -298,7 +312,7 @@ Return     : cpupRet:current CPU usage
 *****************************************************************************/
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_SysCpuUsage(VOID)
 {
-    UINT64  cpuCycleAll = 0;
+    UINT64  cpuTimeAll = 0;
     UINT32  cpupRet = 0;
     UINT16  loopNum;
     UINT32 intSave;
@@ -312,12 +326,12 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_SysCpuUsage(VOID)
     OsTskCycleEnd();
 
     for (loopNum = 0; loopNum < g_taskMaxNum; loopNum++) {
-        cpuCycleAll += g_cpup[loopNum].allTime;
+        cpuTimeAll += g_cpup[loopNum].allTime;
     }
 
-    if (cpuCycleAll) {
+    if (cpuTimeAll) {
         cpupRet = LOS_CPUP_PRECISION -  (UINT32)((LOS_CPUP_PRECISION *
-            g_cpup[g_idleTaskID].allTime) / cpuCycleAll);
+            g_cpup[g_idleTaskID].allTime) / cpuTimeAll);
     }
 
     OsTskCycleStart();
@@ -334,7 +348,7 @@ Return     : cpupRet:CPU usage history
 *****************************************************************************/
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_HistorySysCpuUsage(UINT16 mode)
 {
-    UINT64  cpuCycleAll = 0;
+    UINT64  cpuTimeAll = 0;
     UINT64  idleCycleAll = 0;
     UINT32  cpupRet = 0;
     UINT16  loopNum;
@@ -354,9 +368,9 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_HistorySysCpuUsage(UINT16 mode)
 
     for (loopNum = 0; loopNum < g_taskMaxNum; loopNum++) {
         if (mode == CPUP_IN_1S) {
-            cpuCycleAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
+            cpuTimeAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
         } else {
-            cpuCycleAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
+            cpuTimeAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
         }
     }
 
@@ -367,8 +381,8 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_HistorySysCpuUsage(UINT16 mode)
         idleCycleAll += g_cpup[g_idleTaskID].allTime - g_cpup[g_idleTaskID].historyTime[curPos];
     }
 
-    if (cpuCycleAll) {
-        cpupRet = (LOS_CPUP_PRECISION -  (UINT32)((LOS_CPUP_PRECISION * idleCycleAll) / cpuCycleAll));
+    if (cpuTimeAll) {
+        cpupRet = (LOS_CPUP_PRECISION -  (UINT32)((LOS_CPUP_PRECISION * idleCycleAll) / cpuTimeAll));
     }
 
     OsTskCycleStart();
@@ -385,7 +399,7 @@ Return     : cpupRet:CPU usage of certain task
 *****************************************************************************/
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskCpuUsage(UINT32 taskID)
 {
-    UINT64  cpuCycleAll = 0;
+    UINT64  cpuTimeAll = 0;
     UINT16  loopNum;
     UINT32 intSave;
     UINT32  cpupRet = 0;
@@ -410,11 +424,11 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskCpuUsage(UINT32 taskID)
         if ((g_cpup[loopNum].status & OS_TASK_STATUS_UNUSED) || (g_cpup[loopNum].status == 0)) {
             continue;
         }
-        cpuCycleAll += g_cpup[loopNum].allTime;
+        cpuTimeAll += g_cpup[loopNum].allTime;
     }
 
-    if (cpuCycleAll) {
-        cpupRet = (UINT32)((LOS_CPUP_PRECISION * g_cpup[taskID].allTime) / cpuCycleAll);
+    if (cpuTimeAll) {
+        cpupRet = (UINT32)((LOS_CPUP_PRECISION * g_cpup[taskID].allTime) / cpuTimeAll);
     }
 
     OsTskCycleStart();
@@ -432,8 +446,8 @@ Return     : cpupRet:CPU usage history of task
 *****************************************************************************/
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_HistoryTaskCpuUsage(UINT32 taskID, UINT16 mode)
 {
-    UINT64  cpuCycleAll = 0;
-    UINT64  cpuCycleCurTsk = 0;
+    UINT64  cpuTimeAll = 0;
+    UINT64  cpuTimeCurTsk = 0;
     UINT16  loopNum, curPos;
     UINT16  prePos = 0;
     UINT32 intSave;
@@ -463,19 +477,19 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_HistoryTaskCpuUsage(UINT32 taskID, UINT16 mode
         }
 
         if (mode == CPUP_IN_1S) {
-            cpuCycleAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
+            cpuTimeAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
         } else {
-            cpuCycleAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
+            cpuTimeAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
         }
     }
 
     if (mode == CPUP_IN_1S) {
-        cpuCycleCurTsk += g_cpup[taskID].historyTime[curPos] - g_cpup[taskID].historyTime[prePos];
+        cpuTimeCurTsk += g_cpup[taskID].historyTime[curPos] - g_cpup[taskID].historyTime[prePos];
     } else {
-        cpuCycleCurTsk += g_cpup[taskID].allTime - g_cpup[taskID].historyTime[curPos];
+        cpuTimeCurTsk += g_cpup[taskID].allTime - g_cpup[taskID].historyTime[curPos];
     }
-    if (cpuCycleAll) {
-        cpupRet = (UINT32)((LOS_CPUP_PRECISION * cpuCycleCurTsk) / cpuCycleAll);
+    if (cpuTimeAll) {
+        cpupRet = (UINT32)((LOS_CPUP_PRECISION * cpuTimeCurTsk) / cpuTimeAll);
     }
 
     OsTskCycleStart();
@@ -490,8 +504,8 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_AllTaskCpuUsage(CPUP_INFO_S *cpupInfo, UINT16
     UINT16  curPos;
     UINT16  prePos = 0;
     UINT32 intSave;
-    UINT64  cpuCycleAll = 0;
-    UINT64  cpuCycleCurTsk = 0;
+    UINT64  cpuTimeAll = 0;
+    UINT64  cpuTimeCurTsk = 0;
 
     if (g_cpupInitFlg == 0) {
         return  LOS_ERRNO_CPUP_NO_INIT;
@@ -513,9 +527,9 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_AllTaskCpuUsage(CPUP_INFO_S *cpupInfo, UINT16
         }
 
         if (mode == CPUP_IN_1S) {
-            cpuCycleAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
+            cpuTimeAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
         } else {
-            cpuCycleAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
+            cpuTimeAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
         }
     }
 
@@ -526,16 +540,16 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_AllTaskCpuUsage(CPUP_INFO_S *cpupInfo, UINT16
         }
 
         if (mode == CPUP_IN_1S) {
-            cpuCycleCurTsk += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
+            cpuTimeCurTsk += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
         } else {
-            cpuCycleCurTsk += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
+            cpuTimeCurTsk += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
         }
         cpupInfo[loopNum].usStatus = g_cpup[loopNum].status;
-        if (cpuCycleAll) {
-            cpupInfo[loopNum].uwUsage = (UINT32)((LOS_CPUP_PRECISION * cpuCycleCurTsk) / cpuCycleAll);
+        if (cpuTimeAll) {
+            cpupInfo[loopNum].uwUsage = (UINT32)((LOS_CPUP_PRECISION * cpuTimeCurTsk) / cpuTimeAll);
         }
 
-        cpuCycleCurTsk = 0;
+        cpuTimeCurTsk = 0;
     }
 
     OsTskCycleStart();
@@ -606,13 +620,13 @@ LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqStart(UINT32 intNum)
         return;
     }
 
-    g_irqCpup[intNum].startTime = LOS_SysCycleGet();
+    g_irqCpup[intNum].startTime = CpupTimeUsGet();
     return;
 }
 
 LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqEnd(UINT32 intNum)
 {
-    UINT64 cpuCycle;
+    UINT64 cpuTime;
     UINT64 usedTime;
 
     if (g_irqCpupInitFlg == 0) {
@@ -623,14 +637,14 @@ LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqEnd(UINT32 intNum)
         return;
     }
 
-    cpuCycle = LOS_SysCycleGet();
-    if (cpuCycle < g_irqCpup[intNum].startTime) {
-        cpuCycle += g_cyclesPerTick;
+    cpuTime = CpupTimeUsGet();
+    if (cpuTime < g_irqCpup[intNum].startTime) {
+        cpuTime += OS_US_PER_TICK;
     }
 
     g_irqCpup[intNum].cpupID = intNum;
     g_irqCpup[intNum].status = OS_CPUP_USED;
-    usedTime = cpuCycle - g_irqCpup[intNum].startTime;
+    usedTime = cpuTime - g_irqCpup[intNum].startTime;
 
     if (g_irqCpup[intNum].count <= 1000) { /* 1000, Take 1000 samples */
         g_irqCpup[intNum].allTime += usedTime;
@@ -672,12 +686,12 @@ LITE_OS_SEC_TEXT_MINOR STATIC VOID OsGetIrqPositions(UINT16 mode, UINT16* curPos
 LITE_OS_SEC_TEXT_MINOR STATIC UINT64 OsGetIrqAllTime(VOID)
 {
     INT32 i;
-    UINT64 cpuCycleAll = 0;
+    UINT64 cpuTimeAll = 0;
     for (i = 0; i < OS_CPUP_HISTORY_RECORD_NUM; i++) {
-        cpuCycleAll += g_cpuHistoryTime[i];
+        cpuTimeAll += g_cpuHistoryTime[i];
     }
 
-    return cpuCycleAll;
+    return cpuTimeAll;
 }
 
 LITE_OS_SEC_TEXT_MINOR STATIC UINT64 OsGetIrqAllHisTime(UINT32 num)
@@ -697,8 +711,8 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_GetAllIrqCpuUsage(UINT16 mode, CPUP_INFO_S *cp
     UINT16 curPos;
     UINT16 prePos = 0;
     UINT32 intSave;
-    UINT64 cpuCycleAll;
-    UINT64 cpuCycleCurIrq;
+    UINT64 cpuTimeAll;
+    UINT64 cpuTimeCurIrq;
 
     if (g_irqCpupInitFlg == 0) {
         return  LOS_ERRNO_CPUP_NO_INIT;
@@ -712,9 +726,9 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_GetAllIrqCpuUsage(UINT16 mode, CPUP_INFO_S *cp
 
     OsGetIrqPositions(mode, &curPos, &prePos);
     if (mode == CPUP_IN_10S) {
-        cpuCycleAll = OsGetIrqAllTime();
+        cpuTimeAll = OsGetIrqAllTime();
     } else {
-        cpuCycleAll = g_cpuHistoryTime[curPos] - g_cpuHistoryTime[prePos];
+        cpuTimeAll = g_cpuHistoryTime[curPos] - g_cpuHistoryTime[prePos];
     }
 
     for (loopNum = 0; loopNum < LOSCFG_PLATFORM_HWI_LIMIT; loopNum++) {
@@ -725,13 +739,13 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_GetAllIrqCpuUsage(UINT16 mode, CPUP_INFO_S *cp
         cpupInfo[loopNum].usStatus = g_irqCpup[loopNum].status;
 
         if (mode == CPUP_IN_10S) {
-            cpuCycleCurIrq = OsGetIrqAllHisTime(loopNum);
+            cpuTimeCurIrq = OsGetIrqAllHisTime(loopNum);
         } else {
-            cpuCycleCurIrq = g_irqCpup[loopNum].historyTime[curPos] - g_irqCpup[loopNum].historyTime[prePos];
+            cpuTimeCurIrq = g_irqCpup[loopNum].historyTime[curPos] - g_irqCpup[loopNum].historyTime[prePos];
         }
 
-        if (cpuCycleAll != 0) {
-            cpupInfo[loopNum].uwUsage = (UINT32)((LOS_CPUP_PRECISION * cpuCycleCurIrq) / cpuCycleAll);
+        if (cpuTimeAll != 0) {
+            cpupInfo[loopNum].uwUsage = (UINT32)((LOS_CPUP_PRECISION * cpuTimeCurIrq) / cpuTimeAll);
         }
     }
 

components/fs/fatfs/Kconfig

@@ -32,7 +32,6 @@ config FS_FAT
     default n
     depends on FS_VFS
     select SUPPORT_FATFS
-    select KAL_CMSIS
     help
       Answer Y to enable LiteOS support fat filesystem.
 

components/fs/vfs/Kconfig

@@ -30,6 +30,7 @@
 config FS_VFS
     bool "Enable FS VFS"
     default y
+    select POSIX_FS_API
 
     help
       Answer Y to enable LiteOS support VFS.

components/fs/vfs/los_fs.h

@@ -46,6 +46,7 @@
 #include "sys/uio.h"
 #include "unistd.h"
 #include <stdarg.h>
+#include "vfs_maps.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -61,41 +62,6 @@ extern "C" {
 #define LOSCFG_FS_FREE_HOOK(ptr) LOS_MemFree((VOID *)OS_SYS_MEM_ADDR, ptr)
 #endif
 
-int LOS_Open(const char *path, int flags, ...);
-int LOS_Close(int fd);
-ssize_t LOS_Read(int fd, void *buff, size_t bytes);
-ssize_t LOS_Write(int fd, const void *buff, size_t bytes);
-off_t LOS_Lseek(int fd, off_t off, int whence);
-int LOS_Stat(const char *path, struct stat *stat);
-int LOS_Statfs(const char *path, struct statfs *buf);
-int LOS_Unlink(const char *path);
-int LOS_Rename(const char *oldpath, const char *newpath);
-int LOS_Fsync(int fd);
-DIR *LOS_Opendir(const char *path);
-struct dirent *LOS_Readdir(DIR *dir);
-int LOS_Closedir(DIR *dir);
-int LOS_Mkdir(const char *path, mode_t mode);
-int LOS_Rmdir(const char *path);
-int LOS_Lstat(const char *path, struct stat *buffer);
-int LOS_Fstat(int fd, struct stat *buf);
-int LOS_Fcntl(int fd, int cmd, ...);
-int LOS_Ioctl(int fd, int req, ...);
-ssize_t LOS_Readv(int fd, const struct iovec *iovBuf, int iovcnt);
-ssize_t LOS_Writev(int fd, const struct iovec *iovBuf, int iovcnt);
-ssize_t LOS_Pread(int fd, void *buff, size_t bytes, off_t off);
-ssize_t LOS_Pwrite(int fd, const void *buff, size_t bytes, off_t off);
-int LOS_Isatty(int fd);
-int LOS_Access(const char *path, int amode);
-int LOS_Ftruncate(int fd, off_t length);
-int LOS_FsUmount(const char *target);
-int LOS_FsUmount2(const char *target, int flag);
-int LOS_FsMount(const char *source, const char *target,
-                const char *fsType, unsigned long mountflags,
-                const void *data);
-
-int OsFcntl(int fd, int cmd, va_list ap);
-int OsIoctl(int fd, int req, va_list ap);
-
 struct PartitionCfg {
     /* partition low-level read func */
     int  (*readFunc)(int partition, UINT32 *offset, void *buf, UINT32 size);
@@ -152,6 +118,28 @@ int LOS_DiskPartition(const char *dev, const char *fsType, int *lengthArray, int
  */
 int LOS_PartitionFormat(const char *partName, char *fsType, void *data);
 
+/*
+ * @brief new file system callbacks register.
+ * These callback functions are the adaptation layer implemented by the developer,
+ * used to interconnect the vfs with the new file system.
+ *
+ * LOS_FsRegister must be called after kernel initialization is complete.
+ *
+ * @param fsType file system type, don't register the same type fs more than once.
+ * @param fsMops mount operation of the fs.
+ * @param fsFops file operation of the fs.
+ * @param fsMgt management operation of the fs.
+ *
+ * @return Return LOS_OK if success.
+ *         Return LOS_NOK if error.
+ *         errno EINVAL: input errors, such as null pointers.
+ *         errno ENOMEM: memory may malloc failed.
+ *
+ */
+int LOS_FsRegister(const char *fsType, const struct MountOps *fsMops,
+                   const struct FileOps *fsFops, const struct FsManagement *fsMgt);
+
+
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {

components/fs/vfs/vfs_config.h

@@ -49,21 +49,17 @@
 
 #ifdef LOSCFG_FS_FAT
 #include "fatfs_conf.h"
-#define __FAT_NFILE FAT_MAX_OPEN_FILES
-#else
-#define __FAT_NFILE 0
 #endif
 
 #ifdef LOSCFG_FS_LITTLEFS
 #include "lfs_conf.h"
-#define __LFS_NFILE LOSCFG_LFS_MAX_OPEN_FILES
-#else
-#define __LFS_NFILE 0
 #endif
 
-#define CONFIG_NFILE_DESCRIPTORS    (__FAT_NFILE + __LFS_NFILE)
+#ifndef CONFIG_NFILE_DESCRIPTORS
+#define CONFIG_NFILE_DESCRIPTORS 256
+#endif
 
-#define NR_OPEN_DEFAULT CONFIG_NFILE_DESCRIPTORS
+#define NR_OPEN_DEFAULT (CONFIG_NFILE_DESCRIPTORS - MIN_START_FD)
 
 /* time configure */
 
@@ -88,4 +84,9 @@
 
 #define MAX_DIRENT_NUM 14 // 14 means 4096 length buffer can store 14 dirent, see struct DIR
 
+/* max number of open directories */
+#ifndef LOSCFG_MAX_OPEN_DIRS
+#define LOSCFG_MAX_OPEN_DIRS 10
+#endif
+
 #endif

components/fs/vfs/vfs_maps.c

@@ -55,17 +55,19 @@ struct FsMap *VfsFsMapGet(const char *fsType)
     return NULL;
 }
 
-int OsFsRegister(const char *fsType, struct MountOps *fsMops,
-                 struct FileOps *fsFops, struct FsManagement *fsMgt)
+int OsFsRegister(const char *fsType, const struct MountOps *fsMops,
+                 const struct FileOps *fsFops, const struct FsManagement *fsMgt)
 {
     size_t len;
     if ((fsMops == NULL) || (fsFops == NULL)) {
+        VFS_ERRNO_SET(EINVAL);
         return (int)LOS_NOK;
     }
 
     struct FsMap *newfs = (struct FsMap *)LOSCFG_FS_MALLOC_HOOK(sizeof(struct FsMap));
     if (newfs == NULL) {
         PRINT_ERR("Fs register malloc failed, fsType %s.\n", fsType);
+        VFS_ERRNO_SET(ENOMEM);
         return (int)LOS_NOK;
     }
     (void)memset_s(newfs, sizeof(struct FsMap), 0, sizeof(struct FsMap));
@@ -74,6 +76,7 @@ int OsFsRegister(const char *fsType, struct MountOps *fsMops,
     newfs->fsType = LOSCFG_FS_MALLOC_HOOK(len);
     if (newfs->fsType == NULL) {
         LOSCFG_FS_FREE_HOOK(newfs);
+        VFS_ERRNO_SET(ENOMEM);
         return (int)LOS_NOK;
     }
     (void)strcpy_s((char *)newfs->fsType, len, fsType);
@@ -90,3 +93,15 @@ int OsFsRegister(const char *fsType, struct MountOps *fsMops,
     VfsUnlock();
     return LOS_OK;
 }
+
+int LOS_FsRegister(const char *fsType, const struct MountOps *fsMops,
+                   const struct FileOps *fsFops, const struct FsManagement *fsMgt)
+{
+    if (VfsFsMapGet(fsType) != NULL) {
+        PRINT_ERR("fsType has been registered or fsType error\n");
+        VFS_ERRNO_SET(EINVAL);
+        return (int)LOS_NOK;
+    }
+
+    return OsFsRegister(fsType, fsMops, fsFops, fsMgt);
+}

components/fs/vfs/vfs_maps.h

@@ -56,8 +56,8 @@ struct FsMap {
     struct FsMap *next;
 };
 
-int OsFsRegister(const char *fsType, struct MountOps *fsMops,
-                 struct FileOps *fsFops, struct FsManagement *fsMgt);
+int OsFsRegister(const char *fsType, const struct MountOps *fsMops,
+                 const struct FileOps *fsFops, const struct FsManagement *fsMgt);
 struct FsMap *VfsFsMapGet(const char *fsType);
 
 #ifdef __cplusplus

components/fs/vfs/vfs_mount.c

@@ -178,7 +178,7 @@ STATIC int VfsRemount(const char *source, const char *target,
     return mp->mFs->fsMops->mount(mp, mountflags, data);
 }
 
-int LOS_FsMount(const char *source, const char *target,
+int mount(const char *source, const char *target,
                 const char *fsType, unsigned long mountflags,
                 const void *data)
 {
@@ -242,7 +242,7 @@ errout:
     return (int)LOS_NOK;
 }
 
-int LOS_FsUmount(const char *target)
+int umount(const char *target)
 {
     struct MountPoint *mp = NULL;
     const char *pathInMp = NULL;
@@ -300,7 +300,7 @@ static void CloseFdsInMp(const struct MountPoint *mp)
     }
 }
 
-int LOS_FsUmount2(const char *target, int flag)
+int umount2(const char *target, int flag)
 {
     struct MountPoint *mp = NULL;
     const char *pathInMp = NULL;

components/power/los_pm.c

@@ -101,21 +101,27 @@ STATIC VOID OsPmTickTimerStart(LosPmCB *pm)
     }
 
 #if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
-    if ((tickTimer->timerStop != NULL) && (pm->enterSleepTime != 0)) {
-        /* Restore the main CPU frequency */
-        sleepTime = tickTimer->timerCycleGet();
-        tickTimer->timerStop();
+    if (tickTimer->timerStop != NULL) {
+        if (pm->enterSleepTime != 0) {
+            /* Restore the main CPU frequency */
+            sleepTime = tickTimer->timerCycleGet();
+            tickTimer->timerStop();
 
-        realSleepTime = OS_SYS_CYCLE_TO_NS(sleepTime, tickTimer->freq);
-        realSleepTime = OS_SYS_NS_TO_CYCLE(realSleepTime, g_sysClock);
-        currTime = pm->enterSleepTime + realSleepTime;
-        pm->enterSleepTime = 0;
+            realSleepTime = OS_SYS_CYCLE_TO_NS(sleepTime, tickTimer->freq);
+            realSleepTime = OS_SYS_NS_TO_CYCLE(realSleepTime, g_sysClock);
+            currTime = pm->enterSleepTime + realSleepTime;
+            pm->enterSleepTime = 0;
 
-        OsTickTimerBaseReset(currTime);
-        OsSchedResetSchedResponseTime(0);
+            OsTickTimerBaseReset(currTime);
+            OsSchedResetSchedResponseTime(0);
+            /* Restart the system tick timer */
+            tickTimer->tickUnlock();
+        }
+        return;
     }
 #endif
 
+    /* Restore the system tick timer */
     tickTimer->tickUnlock();
     return;
 }
@@ -142,14 +148,21 @@ STATIC BOOL OsPmTickTimerStop(LosPmCB *pm)
         sleepCycle = OS_SYS_CYCLE_TO_NS(realSleepTime, g_sysClock);
         sleepCycle = OS_SYS_NS_TO_CYCLE(sleepCycle, tickTimer->freq);
 
+        if (sleepCycle == 0) {
+            pm->sysMode = LOS_SYS_NORMAL_SLEEP;
+            return FALSE;
+        }
+
         /* The main CPU reduces the frequency */
         pm->enterSleepTime = LOS_SysCycleGet();
+        /* Turn off the system tick timer and clear the count value to zero */
         tickTimer->tickLock();
         tickTimer->timerStart(sleepCycle);
         return TRUE;
     }
 #endif
 
+    /* Pause the system tick timer */
     tickTimer->tickLock();
     return TRUE;
 }
@@ -167,7 +180,7 @@ STATIC VOID OsPmCpuResume(LosPmCB *pm)
 
 STATIC VOID OsPmCpuSuspend(LosPmCB *pm)
 {
-    /* cpu enter low power mode */
+    /* cpu enter low-power mode */
 
     if (pm->sysMode == LOS_SYS_NORMAL_SLEEP) {
         pm->sysctrl->normalSuspend();

components/power/los_pm.h

@@ -39,7 +39,7 @@
 
 /**
  * @ingroup los_pm
- * Pm error code: Invalid low power mode.
+ * Pm error code: Invalid low-power mode.
  *
  * Value: 0x02002001
  *
@@ -141,21 +141,33 @@ typedef enum {
 } LOS_PmNodeType;
 
 typedef struct {
-    UINT32 (*suspend)(UINT32 mode); /* The device enters low power consumption, Unlocked task scheduling. */
-    VOID   (*resume)(UINT32 mode);  /* The device exits from low power consumption, Unlocked task scheduling. */
+    UINT32 (*suspend)(UINT32 mode); /* The device enters low-power consumption, Unlocked task scheduling. */
+    VOID   (*resume)(UINT32 mode);  /* The device exits from low-power consumption, Unlocked task scheduling. */
 } LosPmDevice;
 
 typedef struct {
-    UINT32 freq;                   /* The frequency of the low power timer */
-    VOID   (*timerStart)(UINT64);  /* Start the low power timer */
-    VOID   (*timerStop)(VOID);     /* Stop the low power timer */
-    UINT64 (*timerCycleGet)(VOID); /* Gets the running time of the low power timer in unit cycle */
-    VOID   (*tickLock)(VOID);      /* Pause the system tick timer */
-    VOID   (*tickUnlock)(VOID);    /* Restore the system tick timer */
+    /* Low-power timer related implementation functions.
+     * The function is not NULL, the low-power timer is enabled.
+     */
+    UINT32 freq;                   /* The frequency of the low-power timer */
+    VOID   (*timerStart)(UINT64);  /* Start the low-power timer and set the response period */
+    VOID   (*timerStop)(VOID);     /* Turn off the low-power timer */
+    UINT64 (*timerCycleGet)(VOID); /* Gets the time the system sleeps */
+
+    /* When the low-power timer is enabled, the function of tickLock is to turn off the system tick timer and
+     * clear the timer's count value to zero.
+     * When the low-power timer is disabled, the function of tickLock is to pause the system timer.
+     */
+    VOID   (*tickLock)(VOID);
+
+    /* When the low-power timer is enabled, the function of tickUnlock is to restart the system tick timer.
+     * When the low-power timer is disabled, the function of tickUnlock is to restore the system tick timer.
+     */
+    VOID   (*tickUnlock)(VOID);
 } LosPmTickTimer;
 
 typedef struct {
-    /* Preparations before the CPU enters low power consumption.
+    /* Preparations before the CPU enters low-power consumption.
      * All modes except normal mode are invoked.
      * Unlocked task scheduling.
      */
@@ -203,10 +215,10 @@ typedef struct {
 
 /**
  * @ingroup los_pm
- * @brief Initialize system low power frame.
+ * @brief Initialize system low-power frame.
  *
  * @par Description:
- * This API is used to initialize the system low power frame.
+ * This API is used to initialize the system low-power frame.
  *
  * @attention None.
  *
@@ -221,10 +233,10 @@ UINT32 OsPmInit(VOID);
 
 /**
  * @ingroup los_pm
- * @brief Whether the low power consumption condition is met.
+ * @brief Whether the low-power consumption condition is met.
  *
  * @par Description:
- * This API is used to check whether low power consumption is met.
+ * This API is used to check whether low-power consumption is met.
  *
  * @attention None.
  *
@@ -302,10 +314,10 @@ VOID LOS_PmWakeSet(VOID);
 
 /**
  * @ingroup los_pm
- * @brief Get the low power mode of the current system.
+ * @brief Get the low-power mode of the current system.
  *
  * @par Description:
- * This API is used to get the low power mode of the current system.
+ * This API is used to get the low-power mode of the current system.
  *
  * @attention None.
  *
@@ -320,14 +332,14 @@ LOS_SysSleepEnum LOS_PmModeGet(VOID);
 
 /**
  * @ingroup los_pm
- * @brief Set low power mode.
+ * @brief Set low-power mode.
  *
  * @par Description:
- * This API is used to set low power mode.
+ * This API is used to set low-power mode.
  *
  * @attention None.
  *
- * @param  mode [IN] low power mode.
+ * @param  mode [IN] low-power mode.
  *
  * @retval error code, LOS_OK means success.
  * @par Dependency:

kal/libc/Kconfig

@@ -35,7 +35,6 @@ choice
 
 config LIBC_MUSL
     bool "musl libc"
-rsource "musl/Kconfig"
 
 config LIBC_NEWLIB
     bool "newlibc"

kal/libc/iccarm/Kconfig

@@ -28,13 +28,6 @@
 
 if LIBC_ICCARM
 
-config LIBC_ICCARM_FS
-    bool "Enable POSIX file system API support"
-    default y
-    depends on FS_VFS
-    help
-        This enables POSIX style file system related APIs.
-
 config LIBC_ICCARM_MALLOC
     bool "Enable POSIX malloc/free API support"
     default y

kal/libc/musl/BUILD.gn

@@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
@@ -33,10 +33,7 @@ import("//third_party/musl/porting/liteos_m/kernel/musl.gni")
 module_switch = defined(LOSCFG_LIBC_MUSL)
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
-  sources = [
-    "fs.c",
-    "malloc.c",
-  ]
+  sources = [ "malloc.c" ]
   configs += [ "$LITEOSTOPDIR:warn_config" ]
 
   deps = [ "//third_party/musl/porting/liteos_m/kernel" ]

kal/libc/musl/Kconfig

@@ -1,39 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-if LIBC_MUSL
-
-config LIBC_MUSL_FS
-    bool "Enable POSIX file system API support"
-    default y
-    depends on FS_VFS
-    help
-        This enables POSIX style file system related APIs.
-
-endif # LIBC_MUSL

kal/libc/musl/fs.c

@@ -1,329 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#define _GNU_SOURCE
-
-#include "los_config.h"
-#include <errno.h>
-#include <stdarg.h>
-#include <dirent.h>
-#include <sys/mount.h>
-#include <sys/statfs.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#ifdef LOSCFG_LIBC_MUSL_FS
-#include "los_fs.h"
-
-int mount(const char *source, const char *target,
-          const char *filesystemtype, unsigned long mountflags,
-          const void *data)
-{
-    return LOS_FsMount(source, target, filesystemtype, mountflags, data);
-}
-
-int umount(const char *target)
-{
-    return LOS_FsUmount(target);
-}
-
-int umount2(const char *target, int flag)
-{
-    return LOS_FsUmount2(target, flag);
-}
-
-int open(const char *path, int oflag, ...)
-{
-    va_list vaList;
-    va_start(vaList, oflag);
-    int ret;
-    ret = LOS_Open(path, oflag, vaList);
-    va_end(vaList);
-    return ret;
-}
-
-int close(int fd)
-{
-    return LOS_Close(fd);
-}
-
-ssize_t read(int fd, void *buf, size_t nbyte)
-{
-    return LOS_Read(fd, buf, nbyte);
-}
-
-ssize_t write(int fd, const void *buf, size_t nbyte)
-{
-    return LOS_Write(fd, buf, nbyte);
-}
-
-off_t lseek(int fd, off_t offset, int whence)
-{
-    return LOS_Lseek(fd, offset, whence);
-}
-
-int unlink(const char *path)
-{
-    return LOS_Unlink(path);
-}
-
-int fstat(int fd, struct stat *buf)
-{
-    return LOS_Fstat(fd, buf);
-}
-
-int stat(const char *path, struct stat *buf)
-{
-    return LOS_Stat(path, buf);
-}
-
-int fsync(int fd)
-{
-    return LOS_Fsync(fd);
-}
-
-int mkdir(const char *path, mode_t mode)
-{
-    return LOS_Mkdir(path, mode);
-}
-
-DIR *opendir(const char *dirName)
-{
-    return LOS_Opendir(dirName);
-}
-
-struct dirent *readdir(DIR *dir)
-{
-    return LOS_Readdir(dir);
-}
-
-int closedir(DIR *dir)
-{
-    return LOS_Closedir(dir);
-}
-
-int rmdir(const char *path)
-{
-    return LOS_Unlink(path);
-}
-
-int rename(const char *oldName, const char *newName)
-{
-    return LOS_Rename(oldName, newName);
-}
-
-int statfs(const char *path, struct statfs *buf)
-{
-    return LOS_Statfs(path, buf);
-}
-
-int ftruncate(int fd, off_t length)
-{
-    return LOS_Ftruncate(fd, length);
-}
-
-ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset)
-{
-    return LOS_Pread(fd, buf, nbyte, offset);
-}
-
-ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
-{
-    return LOS_Pwrite(fd, buf, nbyte, offset);
-}
-
-int access(const char *path, int mode)
-{
-    struct stat st;
-
-    if (stat(path, &st) < 0) {
-        return -1;
-    }
-    if ((st.st_mode & S_IFDIR) || (st.st_mode & S_IFREG)) {
-        return 0;
-    }
-    if ((mode & W_OK) && !(st.st_mode & S_IWRITE)) {
-        return -1;
-    }
-
-    return 0;
-}
-
-int fcntl(int fd, int cmd, ...)
-{
-    int ret;
-    va_list vaList;
-
-    va_start(vaList, cmd);
-    ret = OsFcntl(fd, cmd, vaList);
-    va_end(vaList);
-    return ret;
-}
-
-int ioctl(int fd, int req, ...)
-{
-    int ret;
-    va_list vaList;
-
-    va_start(vaList, req);
-    ret = OsIoctl(fd, req, vaList);
-    va_end(vaList);
-    return ret;
-}
-
-#else /* #ifdef LOSCFG_FS_VFS */
-
-int mount(const char *source, const char *target,
-          const char *filesystemtype, unsigned long mountflags,
-          const void *data)
-{
-    return -1;
-}
-
-int umount(const char *target)
-{
-    return -1;
-}
-
-int umount2(const char *target, int flag)
-{
-    return -1;
-}
-
-int open(const char *path, int oflag, ...)
-{
-    return -1;
-}
-
-int close(int fd)
-{
-    return -1;
-}
-
-ssize_t read(int fd, void *buf, size_t nbyte)
-{
-    return -1;
-}
-
-ssize_t write(int fd, const void *buf, size_t nbyte)
-{
-    return -1;
-}
-
-off_t lseek(int fd, off_t offset, int whence)
-{
-    return -1;
-}
-
-int unlink(const char *path)
-{
-    return -1;
-}
-
-int fstat(int fd, struct stat *buf)
-{
-    return -1;
-}
-
-int stat(const char *path, struct stat *buf)
-{
-    return -1;
-}
-
-int fsync(int fd)
-{
-    return -1;
-}
-
-int mkdir(const char *path, mode_t mode)
-{
-    return -1;
-}
-
-DIR *opendir(const char *dirName)
-{
-    return NULL;
-}
-
-struct dirent *readdir(DIR *dir)
-{
-    return NULL;
-}
-
-int closedir(DIR *dir)
-{
-    return -1;
-}
-
-int rmdir(const char *path)
-{
-    return -1;
-}
-
-int rename(const char *oldName, const char *newName)
-{
-    return -1;
-}
-
-int statfs(const char *path, struct statfs *buf)
-{
-    return -1;
-}
-
-int ftruncate(int fd, off_t length)
-{
-    return -1;
-}
-
-ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset)
-{
-    return -1;
-}
-
-ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
-{
-    return -1;
-}
-
-int access(const char *path, int mode)
-{
-    return -1;
-}
-
-int fcntl(int fd, int cmd, ...)
-{
-    return -1;
-}
-
-int ioctl(int fd, int req, ...)
-{
-    return -1;
-}
-#endif

kal/libc/musl/malloc.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
@@ -34,7 +34,6 @@
 #include "los_config.h"
 #include "los_memory.h"
 
-
 void *calloc(size_t nitems, size_t size)
 {
     size_t real_size;
@@ -107,4 +106,3 @@ void *realloc(void *ptr, size_t size)
 
     return LOS_MemRealloc(OS_SYS_MEM_ADDR, ptr, size);
 }
-

kal/libc/newlib/BUILD.gn

@@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
@@ -33,7 +33,6 @@ module_switch = defined(LOSCFG_LIBC_NEWLIB)
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
   sources = [
-    "porting/src/fs.c",
     "porting/src/malloc.c",
     "porting/src/network/htonl.c",
     "porting/src/network/htons.c",
@@ -44,7 +43,7 @@ kernel_module(module_name) {
   ]
   configs += [ "$LITEOSTOPDIR:warn_config" ]
 
-  if (defined(LOSCFG_LIBC_NEWLIB_FS)) {
+  if (defined(LOSCFG_FS_VFS)) {
     sources +=
         [ "//third_party/musl/porting/liteos_m/kernel/src/misc/realpath.c" ]
   }

kal/libc/newlib/Kconfig

@@ -29,13 +29,6 @@
 
 if LIBC_NEWLIB
 
-config LIBC_NEWLIB_FS
-    bool "Enable POSIX file system API support"
-    default y
-    depends on FS_VFS
-    help
-        This enables POSIX style file system related APIs.
-
 config LIBC_NEWLIB_MALLOC
     bool "Enable POSIX malloc/free API support"
     default y

kal/libc/newlib/porting/src/fs.c

@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#define _GNU_SOURCE
-
-#include "los_config.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-
-#ifdef LOSCFG_LIBC_NEWLIB_FS
-#include "los_fs.h"
-#endif
-
-#ifdef LOSCFG_LIBC_NEWLIB_FS
-int mount(const char *source, const char *target,
-          const char *filesystemtype, unsigned long mountflags,
-          const void *data)
-{
-    return LOS_FsMount(source, target, filesystemtype, mountflags, data);
-}
-
-int umount(const char *target)
-{
-    return LOS_FsUmount(target);
-}
-
-int umount2(const char *target, int flag)
-{
-    return LOS_FsUmount2(target, flag);
-}
-
-int _open(const char *path, int oflag, ...)
-{
-    va_list vaList;
-    va_start(vaList, oflag);
-    int ret;
-    ret = LOS_Open(path, oflag);
-    va_end(vaList);
-    return ret;
-}
-
-int _close(int fd)
-{
-    return LOS_Close(fd);
-}
-
-ssize_t _read(int fd, void *buf, size_t nbyte)
-{
-    return LOS_Read(fd, buf, nbyte);
-}
-
-ssize_t _write(int fd, const void *buf, size_t nbyte)
-{
-    return LOS_Write(fd, buf, nbyte);
-}
-
-off_t _lseek(int fd, off_t offset, int whence)
-{
-    return LOS_Lseek(fd, offset, whence);
-}
-
-int _unlink(const char *path)
-{
-    return LOS_Unlink(path);
-}
-
-int _fstat(int fd, struct stat *buf)
-{
-    return LOS_Fstat(fd, buf);
-}
-
-int _stat(const char *path, struct stat *buf)
-{
-    return LOS_Stat(path, buf);
-}
-
-int fsync(int fd)
-{
-    return LOS_Fsync(fd);
-}
-
-int mkdir(const char *path, mode_t mode)
-{
-    return LOS_Mkdir(path, mode);
-}
-
-DIR *opendir(const char *dirName)
-{
-    return LOS_Opendir(dirName);
-}
-
-struct dirent *readdir(DIR *dir)
-{
-    return LOS_Readdir(dir);
-}
-
-int closedir(DIR *dir)
-{
-    return LOS_Closedir(dir);
-}
-
-int rmdir(const char *path)
-{
-    return LOS_Unlink(path);
-}
-
-int rename(const char *oldName, const char *newName)
-{
-    return LOS_Rename(oldName, newName);
-}
-
-int statfs(const char *path, struct statfs *buf)
-{
-    return LOS_Statfs(path, buf);
-}
-
-int ftruncate(int fd, off_t length)
-{
-    return LOS_Ftruncate(fd, length);
-}
-
-int fcntl(int fd, int cmd, ...)
-{
-    int ret;
-    va_list vaList;
-
-    va_start(vaList, cmd);
-    ret = OsFcntl(fd, cmd, vaList);
-    va_end(vaList);
-    return ret;
-}
-
-int ioctl(int fd, int req, ...)
-{
-    int ret;
-    va_list vaList;
-
-    va_start(vaList, req);
-    ret = OsIoctl(fd, req, vaList);
-    va_end(vaList);
-    return ret;
-}
-
-ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset)
-{
-    return LOS_Pread(fd, buf, nbyte, offset);
-}
-
-ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
-{
-    return LOS_Pwrite(fd, buf, nbyte, offset);
-}
-
-int access(const char *path, int mode)
-{
-    struct stat st;
-
-    if (stat(path, &st) < 0) {
-        return -1;
-    }
-    if ((st.st_mode & S_IFDIR) || (st.st_mode & S_IFREG)) {
-        return 0;
-    }
-    if ((mode & W_OK) && !(st.st_mode & S_IWRITE)) {
-        return -1;
-    }
-
-    return 0;
-}
-
-int remove(const char *filename)
-{
-    int ret = unlink(filename);
-    if (ret == -EISDIR) {
-        ret = rmdir(filename);
-    }
-
-    return ret;
-}
-
-#else /* #ifdef LOSCFG_FS_VFS */
-
-int _open(const char *path, int oflag, ...)
-{
-    return -1;
-}
-
-int _close(int fd)
-{
-    return -1;
-}
-
-ssize_t _read(int fd, void *buf, size_t nbyte)
-{
-    return -1;
-}
-
-ssize_t _write(int fd, const void *buf, size_t nbyte)
-{
-    return -1;
-}
-
-off_t _lseek(int fd, off_t offset, int whence)
-{
-    return -1;
-}
-
-int _unlink(const char *path)
-{
-    return -1;
-}
-
-int _fstat(int fd, struct stat *buf)
-{
-    return -1;
-}
-
-int _stat(const char *path, struct stat *buf)
-{
-    return -1;
-}
-
-int access(const char *path, int mode)
-{
-    return -1;
-}
-
-int remove(const char *filename)
-{
-    return -1;
-}
-
-int fcntl(int fd, int cmd, ...)
-{
-    return -1;
-}
-
-int ioctl(int fd, int req, ...)
-{
-    return -1;
-}
-#endif

kal/libc/newlib/porting/src/other_adapt.c

@@ -57,4 +57,3 @@ void _exit(int status)
     while (1) {
     }
 }
-

kal/posix/Kconfig

@@ -73,4 +73,11 @@ config POSIX_SIGNAL_API
     help
       Answer Y to enable LiteOS support POSIX Signal API.
 
+config POSIX_FS_API
+    bool "Enable POSIX FS API"
+    default y
+    depends on FS_VFS
+    help
+      Answer Y to enable LiteOS support POSIX FS API.
+
 endif # POSIX_API

kernel/include/los_memory.h

@@ -490,6 +490,72 @@ extern UINT32 LOS_MemIntegrityCheck(const VOID *pool);
  * </ul>
  * @see None.
  */
+
+/* Supposing a Second Level Index: SLI = 3. */
+#define OS_MEM_SLI                      3
+/* Giving 1 free list for each small bucket: 4, 8, 12, up to 124. */
+#define OS_MEM_SMALL_BUCKET_COUNT       31
+#define OS_MEM_SMALL_BUCKET_MAX_SIZE    128
+/* Giving 2^OS_MEM_SLI free lists for each large bucket. */
+#define OS_MEM_LARGE_BUCKET_COUNT       24
+/* OS_MEM_SMALL_BUCKET_MAX_SIZE to the power of 2 is 7. */
+#define OS_MEM_LARGE_START_BUCKET       7
+
+/* The count of free list. */
+#define OS_MEM_FREE_LIST_COUNT  (OS_MEM_SMALL_BUCKET_COUNT + (OS_MEM_LARGE_BUCKET_COUNT << OS_MEM_SLI))
+/* The bitmap is used to indicate whether the free list is empty, 1: not empty, 0: empty. */
+#define OS_MEM_BITMAP_WORDS     ((OS_MEM_FREE_LIST_COUNT >> 5) + 1)
+
+struct OsMemNodeHead {
+#if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
+    UINT32 magic;
+#endif
+#if (LOSCFG_MEM_LEAKCHECK == 1)
+    UINTPTR linkReg[LOSCFG_MEM_RECORD_LR_CNT];
+#endif
+    union {
+        struct OsMemNodeHead *prev; /* The prev is used for current node points to the previous node */
+        struct OsMemNodeHead *next; /* The next is used for sentinel node points to the expand node */
+    } ptr;
+#if (LOSCFG_TASK_MEM_USED == 1)
+    UINT32 taskID;
+    UINT32 sizeAndFlag;
+#elif (LOSCFG_MEM_FREE_BY_TASKID == 1)
+    UINT32 taskID : 6;
+    UINT32 sizeAndFlag : 26;
+#else
+    UINT32 sizeAndFlag;
+#endif
+};
+
+struct OsMemFreeNodeHead {
+    struct OsMemNodeHead header;
+    struct OsMemFreeNodeHead *prev;
+    struct OsMemFreeNodeHead *next;
+};
+
+struct OsMemPoolInfo {
+    VOID *pool;
+    UINT32 totalSize;
+    UINT32 attr;
+#if (LOSCFG_MEM_WATERLINE == 1)
+    UINT32 waterLine;   /* Maximum usage size in a memory pool */
+    UINT32 curUsedSize; /* Current usage size in a memory pool */
+#endif
+#if (LOSCFG_MEM_MUL_REGIONS == 1)
+    UINT32 totalGapSize;
+#endif
+};
+
+struct OsMemPoolHead {
+    struct OsMemPoolInfo info;
+    UINT32 freeListBitmap[OS_MEM_BITMAP_WORDS];
+    struct OsMemFreeNodeHead *freeList[OS_MEM_FREE_LIST_COUNT];
+#if (LOSCFG_MEM_MUL_POOL == 1)
+    VOID *nextPool;
+#endif
+};
+
 extern VOID LOS_MemUnlockEnable(VOID *pool);
 
 extern UINT32 OsMemSystemInit(VOID);

kernel/src/los_tick.c

@@ -64,7 +64,7 @@ LITE_OS_SEC_TEXT STATIC VOID OsUpdateSysTimeBase(VOID)
 
 LITE_OS_SEC_TEXT VOID OsTickTimerBaseReset(UINT64 currTime)
 {
-    LOS_ASSERT(currTime > g_tickTimerBase);
+    LOS_ASSERT(currTime >= g_tickTimerBase);
 
     g_tickTimerBase = currTime;
 }

kernel/src/mm/los_memory.c

@@ -59,21 +59,6 @@ VOID *g_poolHead = NULL;
 
 /* The following is the macro definition and interface implementation related to the TLSF. */
 
-/* Supposing a Second Level Index: SLI = 3. */
-#define OS_MEM_SLI                      3
-/* Giving 1 free list for each small bucket: 4, 8, 12, up to 124. */
-#define OS_MEM_SMALL_BUCKET_COUNT       31
-#define OS_MEM_SMALL_BUCKET_MAX_SIZE    128
-/* Giving 2^OS_MEM_SLI free lists for each large bucket. */
-#define OS_MEM_LARGE_BUCKET_COUNT       24
-/* OS_MEM_SMALL_BUCKET_MAX_SIZE to the power of 2 is 7. */
-#define OS_MEM_LARGE_START_BUCKET       7
-
-/* The count of free list. */
-#define OS_MEM_FREE_LIST_COUNT  (OS_MEM_SMALL_BUCKET_COUNT + (OS_MEM_LARGE_BUCKET_COUNT << OS_MEM_SLI))
-/* The bitmap is used to indicate whether the free list is empty, 1: not empty, 0: empty. */
-#define OS_MEM_BITMAP_WORDS     ((OS_MEM_FREE_LIST_COUNT >> 5) + 1)
-
 #define OS_MEM_BITMAP_MASK 0x1FU
 
 /* Used to find the first bit of 1 in bitmap. */
@@ -120,60 +105,10 @@ STATIC INLINE UINT32 OsMemSlGet(UINT32 size, UINT32 fl)
 #error "When enter here, LOSCFG_BASE_CORE_TSK_LIMIT larger than 63 is not support"
 #endif
 
-struct OsMemNodeHead {
-#if (LOSCFG_BASE_MEM_NODE_INTEGRITY_CHECK == 1)
-    UINT32 magic;
-#endif
-#if (LOSCFG_MEM_LEAKCHECK == 1)
-    UINTPTR linkReg[LOSCFG_MEM_RECORD_LR_CNT];
-#endif
-    union {
-        struct OsMemNodeHead *prev; /* The prev is used for current node points to the previous node */
-        struct OsMemNodeHead *next; /* The next is used for sentinel node points to the expand node */
-    } ptr;
-#if (LOSCFG_TASK_MEM_USED == 1)
-    UINT32 taskID;
-    UINT32 sizeAndFlag;
-#elif (LOSCFG_MEM_FREE_BY_TASKID == 1)
-    UINT32 taskID : 6;
-    UINT32 sizeAndFlag : 26;
-#else
-    UINT32 sizeAndFlag;
-#endif
-};
-
 struct OsMemUsedNodeHead {
     struct OsMemNodeHead header;
 };
 
-struct OsMemFreeNodeHead {
-    struct OsMemNodeHead header;
-    struct OsMemFreeNodeHead *prev;
-    struct OsMemFreeNodeHead *next;
-};
-
-struct OsMemPoolInfo {
-    VOID *pool;
-    UINT32 totalSize;
-    UINT32 attr;
-#if (LOSCFG_MEM_WATERLINE == 1)
-    UINT32 waterLine;   /* Maximum usage size in a memory pool */
-    UINT32 curUsedSize; /* Current usage size in a memory pool */
-#endif
-#if (LOSCFG_MEM_MUL_REGIONS == 1)
-    UINT32 totalGapSize;
-#endif
-};
-
-struct OsMemPoolHead {
-    struct OsMemPoolInfo info;
-    UINT32 freeListBitmap[OS_MEM_BITMAP_WORDS];
-    struct OsMemFreeNodeHead *freeList[OS_MEM_FREE_LIST_COUNT];
-#if (LOSCFG_MEM_MUL_POOL == 1)
-    VOID *nextPool;
-#endif
-};
-
 /* The memory pool support expand. */
 #define OS_MEM_POOL_EXPAND_ENABLE   0x01
 /* The memory pool support no lock. */

testsuites/unittest/posix/BUILD.gn

@@ -39,7 +39,6 @@ static_library("posix_test") {
     "src/ctype/tolower_test.c",
     "src/ctype/toupper_test.c",
     "src/errno/strerror_test.c",
-    "src/fs/posix_fs_func_test.c",
     "src/math/math_func_test.c",
     "src/mqueue/mqueue_func_test.c",
     "src/posix_test.c",
@@ -65,7 +64,9 @@ static_library("posix_test") {
     "//test/xts/tools/hctest/include",
     "src",
   ]
-
+  if (defined(LOSCFG_SUPPORT_FATFS) || defined(LOSCFG_SUPPORT_LITTLEFS)) {
+    sources += [ "src/fs/posix_fs_func_test.c" ]
+  }
   if (!defined(LOSCFG_COMPILER_ICCARM)) {
     cflags = [ "-Wno-error" ]
   } else {