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

fix: 提供CONFIG_NFILE_DESCRIPTORS宏标识最大可打开fd数量 

提供CONFIG_NFILE_DESCRIPTORS宏，标识最大可打开fd数量。
提供FAT_MAX_OPEN_FILES宏，标识FAT文件系统中最大可打开fd数量。

如果只有FAT文件系统，那么CONFIG_NFILE_DESCRIPTORS等于FAT_MAX_OPEN_FILES。
如果有多个文件系统，比如fat+little+yaffs，那么CONFIG_NFILE_DESCRIPTORS应该定义为多个文件系统可打开fd数量之和。

BREAKING CHANGE:

对外提供的CONFIG_NFILE_DESCRIPTORS宏，用来标识最大可打开fd数量。

开发者可以在target_config.h中自定义CONFIG_NFILE_DESCRIPTORS和FAT_MAX_OPEN_FILES宏。

Close #I62WDU

Signed-off-by: Hongjin Li <lihongjin1@huawei.com>
This commit is contained in:
Hongjin Li 2022-11-24 14:42:07 +08:00
parent 588abc0645
commit a3ce436841
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/fs/vfs/vfs_config.h
View File

@ -49,19 +49,15 @@
#ifdef LOSCFG_FS_FAT #ifdef LOSCFG_FS_FAT
#include "fatfs_conf.h" #include "fatfs_conf.h"
#define __FAT_NFILE FAT_MAX_OPEN_FILES
#else
#define __FAT_NFILE 0
#endif #endif
#ifdef LOSCFG_FS_LITTLEFS #ifdef LOSCFG_FS_LITTLEFS
#include "lfs_conf.h" #include "lfs_conf.h"
#define __LFS_NFILE LOSCFG_LFS_MAX_OPEN_FILES
#else
#define __LFS_NFILE 0
#endif #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

4
components/fs/vfs/vfs_fs.c
View File

@ -57,10 +57,6 @@
#define CONFIG_NSOCKET_DESCRIPTORS 0 #define CONFIG_NSOCKET_DESCRIPTORS 0
#endif #endif
#ifndef CONFIG_NFILE_DESCRIPTORS
#define CONFIG_NFILE_DESCRIPTORS 256
#endif
#ifdef LOSCFG_RANDOM_DEV #ifdef LOSCFG_RANDOM_DEV
#include "hks_client.h" #include "hks_client.h"
#define RANDOM_DEV_FD CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS #define RANDOM_DEV_FD CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS