libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

separate dfs fs data structure ops

This commit is contained in:
zhao maosheng 2024-07-17 16:43:39 +08:00
parent 1d78d11567
commit 92c2cf9012
4 changed files with 83 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
components/dfs/dfs_v2/filesystems/devfs/devtmpfs.c
View File

@ -18,6 +18,7 @@
#include <dfs_dentry.h> #include <dfs_dentry.h>
#include <dfs_file.h> #include <dfs_file.h>
#include <dfs_mnt.h> #include <dfs_mnt.h>
#include <dfs_vfs.h>
#include <devfs.h> #include <devfs.h>
#include <unistd.h> #include <unistd.h>
@ -34,10 +35,9 @@ struct devtmpfs_file
char name[DIRENT_NAME_MAX]; /* file name */ char name[DIRENT_NAME_MAX]; /* file name */
rt_uint32_t type; /* file type */ rt_uint32_t type; /* file type */
rt_list_t subdirs; /* file subdir list */ struct dfs_vfs_node node; /* file node in the devtmpfs */
rt_list_t sibling; /* file sibling list */
struct devtmpfs_sb *sb; /* superblock ptr */ struct devtmpfs_sb *sb; /* superblock ptr */
rt_uint32_t mode; rt_uint32_t mode;
char *link; char *link;
@ -48,7 +48,6 @@ struct devtmpfs_sb
rt_uint32_t magic; /* TMPFS_MAGIC */ rt_uint32_t magic; /* TMPFS_MAGIC */
struct devtmpfs_file root; /* root dir */ struct devtmpfs_file root; /* root dir */
rt_size_t df_size; /* df size */ rt_size_t df_size; /* df size */
rt_list_t sibling; /* sb sibling list */
struct rt_spinlock lock; /* tmpfs lock */ struct rt_spinlock lock; /* tmpfs lock */
}; };
@ -111,15 +110,13 @@ static int _get_subdir(const char *path, char *name)
#if 0 #if 0
static int _free_subdir(struct devtmpfs_file *dfile) static int _free_subdir(struct devtmpfs_file *dfile)
{ {
struct devtmpfs_file *file; struct devtmpfs_file *file, *tmp;
rt_list_t *list, *temp_list;
struct devtmpfs_sb *superblock; struct devtmpfs_sb *superblock;
RT_ASSERT(dfile->type == TMPFS_TYPE_DIR); RT_ASSERT(dfile->type == TMPFS_TYPE_DIR);
rt_list_for_each_safe(list, temp_list, &dfile->subdirs) dfs_vfs_for_each_subnode(file, tmp, dfile, node)
{ {
file = rt_list_entry(list, struct devtmpfs_file, sibling);
if (file->type == TMPFS_TYPE_DIR) if (file->type == TMPFS_TYPE_DIR)
{ {
_free_subdir(file); _free_subdir(file);
@ -134,7 +131,7 @@ static int _free_subdir(struct devtmpfs_file *dfile)
RT_ASSERT(superblock); RT_ASSERT(superblock);
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_remove(&(file->sibling)); dfs_vfs_remove_node(&file->node);
rt_spin_unlock(&superblock->lock); rt_spin_unlock(&superblock->lock);
rt_free(file); rt_free(file);
@ -152,14 +149,12 @@ static int devtmpfs_mount(struct dfs_mnt *mnt, unsigned long rwflag, const void
{ {
superblock->df_size = sizeof(struct devtmpfs_sb); superblock->df_size = sizeof(struct devtmpfs_sb);
superblock->magic = TMPFS_MAGIC; superblock->magic = TMPFS_MAGIC;
rt_list_init(&superblock->sibling);
superblock->root.name[0] = '/'; superblock->root.name[0] = '/';
superblock->root.sb = superblock; superblock->root.sb = superblock;
superblock->root.type = TMPFS_TYPE_DIR; superblock->root.type = TMPFS_TYPE_DIR;
superblock->root.mode = S_IFDIR | (S_IRUSR | S_IRGRP | S_IROTH) | (S_IXUSR | S_IXGRP | S_IXOTH); superblock->root.mode = S_IFDIR | (S_IRUSR | S_IRGRP | S_IROTH) | (S_IXUSR | S_IXGRP | S_IXOTH);
rt_list_init(&superblock->root.sibling); dfs_vfs_init_node(&superblock->root.node);
rt_list_init(&superblock->root.subdirs);
rt_spin_lock_init(&superblock->lock); rt_spin_lock_init(&superblock->lock);
@ -193,8 +188,7 @@ static struct devtmpfs_file *devtmpfs_file_lookup(struct devtmpfs_sb *superblock
{ {
const char *subpath, *curpath, *filename = RT_NULL; const char *subpath, *curpath, *filename = RT_NULL;
char subdir_name[DIRENT_NAME_MAX]; char subdir_name[DIRENT_NAME_MAX];
struct devtmpfs_file *file, *curfile; struct devtmpfs_file *file, *curfile, *tmp;
rt_list_t *list;
subpath = path; subpath = path;
while (*subpath == '/' && *subpath) while (*subpath == '/' && *subpath)
@ -222,9 +216,8 @@ find_subpath:
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_for_each(list, &curfile->subdirs) dfs_vfs_for_each_subnode(file, tmp, curfile, node)
{ {
file = rt_list_entry(list, struct devtmpfs_file, sibling);
if (filename) /* find file */ if (filename) /* find file */
{ {
if (rt_strcmp(file->name, filename) == 0) if (rt_strcmp(file->name, filename) == 0)
@ -293,7 +286,9 @@ static int devtmpfs_stat(struct dfs_dentry *dentry, struct stat *st)
static int devtmpfs_getdents(struct dfs_file *file, struct dirent *dirp, uint32_t count) static int devtmpfs_getdents(struct dfs_file *file, struct dirent *dirp, uint32_t count)
{ {
struct devtmpfs_file *d_file; rt_size_t index, end;
struct dirent *d;
struct devtmpfs_file *d_file, *n_file = RT_NULL, *tmp;
struct devtmpfs_sb *superblock; struct devtmpfs_sb *superblock;
RT_ASSERT(file); RT_ASSERT(file);
@ -306,11 +301,6 @@ static int devtmpfs_getdents(struct dfs_file *file, struct dirent *dirp, uint32_
d_file = devtmpfs_file_lookup(superblock, file->dentry->pathname); d_file = devtmpfs_file_lookup(superblock, file->dentry->pathname);
if (d_file) if (d_file)
{ {
rt_size_t index, end;
struct dirent *d;
struct devtmpfs_file *n_file;
rt_list_t *list;
/* make integer count */ /* make integer count */
count = (count / sizeof(struct dirent)); count = (count / sizeof(struct dirent));
if (count == 0) if (count == 0)
@ -322,12 +312,10 @@ static int devtmpfs_getdents(struct dfs_file *file, struct dirent *dirp, uint32_
index = 0; index = 0;
count = 0; count = 0;
rt_list_for_each(list, &d_file->subdirs) dfs_vfs_for_each_subnode(n_file, tmp, d_file, node)
{ {
if (index >= (rt_size_t)file->fpos) if (index >= (rt_size_t)file->fpos)
{ {
n_file = rt_list_entry(list, struct devtmpfs_file, sibling);
d = dirp + count; d = dirp + count;
if (n_file->type == TMPFS_TYPE_FILE) if (n_file->type == TMPFS_TYPE_FILE)
{ {
@ -378,8 +366,7 @@ static int devtmpfs_symlink(struct dfs_dentry *parent_dentry, const char *target
strncpy(l_file->name, linkpath, DIRENT_NAME_MAX - 1); strncpy(l_file->name, linkpath, DIRENT_NAME_MAX - 1);
rt_list_init(&(l_file->subdirs)); dfs_vfs_init_node(&l_file->node);
rt_list_init(&(l_file->sibling));
l_file->sb = superblock; l_file->sb = superblock;
l_file->type = TMPFS_TYPE_FILE; l_file->type = TMPFS_TYPE_FILE;
l_file->mode = p_file->mode; l_file->mode = p_file->mode;
@ -388,7 +375,7 @@ static int devtmpfs_symlink(struct dfs_dentry *parent_dentry, const char *target
l_file->link = rt_strdup(target); l_file->link = rt_strdup(target);
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_insert_after(&(p_file->subdirs), &(l_file->sibling)); dfs_vfs_append_node(&p_file->node, &l_file->node);
rt_spin_unlock(&superblock->lock); rt_spin_unlock(&superblock->lock);
} }
} }
@ -460,7 +447,7 @@ static int devtmpfs_unlink(struct dfs_dentry *dentry)
} }
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_remove(&(d_file->sibling)); dfs_vfs_remove_node(&d_file->node);
rt_spin_unlock(&superblock->lock); rt_spin_unlock(&superblock->lock);
rt_free(d_file); rt_free(d_file);
@ -537,8 +524,7 @@ static struct dfs_vnode *devtmpfs_create_vnode(struct dfs_dentry *dentry, int ty
strncpy(d_file->name, file_name, DIRENT_NAME_MAX); strncpy(d_file->name, file_name, DIRENT_NAME_MAX);
rt_list_init(&(d_file->subdirs)); dfs_vfs_init_node(&d_file->node);
rt_list_init(&(d_file->sibling));
d_file->sb = superblock; d_file->sb = superblock;
vnode->nlink = 1; vnode->nlink = 1;
@ -563,7 +549,7 @@ static struct dfs_vnode *devtmpfs_create_vnode(struct dfs_dentry *dentry, int ty
d_file->mode = vnode->mode; d_file->mode = vnode->mode;
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_insert_after(&(p_file->subdirs), &(d_file->sibling)); dfs_vfs_append_node(&p_file->node, &d_file->node);
rt_spin_unlock(&superblock->lock); rt_spin_unlock(&superblock->lock);
} }

35
components/dfs/dfs_v2/filesystems/tmpfs/dfs_tmpfs.c
View File

@ -99,15 +99,13 @@ static int _get_subdir(const char *path, char *name)
static int _free_subdir(struct tmpfs_file *dfile) static int _free_subdir(struct tmpfs_file *dfile)
{ {
struct tmpfs_file *file; struct tmpfs_file *file = RT_NULL, *tmp;
rt_list_t *list, *temp_list;
struct tmpfs_sb *superblock; struct tmpfs_sb *superblock;
RT_ASSERT(dfile->type == TMPFS_TYPE_DIR); RT_ASSERT(dfile->type == TMPFS_TYPE_DIR);
rt_list_for_each_safe(list, temp_list, &dfile->subdirs) dfs_vfs_for_each_subnode(file, tmp, dfile, node)
{ {
file = rt_list_entry(list, struct tmpfs_file, sibling);
if (file->type == TMPFS_TYPE_DIR) if (file->type == TMPFS_TYPE_DIR)
{ {
_free_subdir(file); _free_subdir(file);
@ -122,7 +120,7 @@ static int _free_subdir(struct tmpfs_file *dfile)
RT_ASSERT(superblock != NULL); RT_ASSERT(superblock != NULL);
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_remove(&(file->sibling)); dfs_vfs_remove_node(&file->node);
rt_spin_unlock(&superblock->lock); rt_spin_unlock(&superblock->lock);
rt_free(file); rt_free(file);
@ -141,13 +139,11 @@ static int dfs_tmpfs_mount(struct dfs_mnt *mnt,
{ {
superblock->df_size = sizeof(struct tmpfs_sb); superblock->df_size = sizeof(struct tmpfs_sb);
superblock->magic = TMPFS_MAGIC; superblock->magic = TMPFS_MAGIC;
rt_list_init(&superblock->sibling);
superblock->root.name[0] = '/'; superblock->root.name[0] = '/';
superblock->root.sb = superblock; superblock->root.sb = superblock;
superblock->root.type = TMPFS_TYPE_DIR; superblock->root.type = TMPFS_TYPE_DIR;
rt_list_init(&superblock->root.sibling); dfs_vfs_init_node(&superblock->root.node);
rt_list_init(&superblock->root.subdirs);
rt_spin_lock_init(&superblock->lock); rt_spin_lock_init(&superblock->lock);
@ -236,8 +232,7 @@ struct tmpfs_file *dfs_tmpfs_lookup(struct tmpfs_sb *superblock,
{ {
const char *subpath, *curpath, *filename = RT_NULL; const char *subpath, *curpath, *filename = RT_NULL;
char subdir_name[TMPFS_NAME_MAX]; char subdir_name[TMPFS_NAME_MAX];
struct tmpfs_file *file, *curfile; struct tmpfs_file *file, *curfile, *tmp;
rt_list_t *list;
subpath = path; subpath = path;
while (*subpath == '/' && *subpath) while (*subpath == '/' && *subpath)
@ -265,9 +260,8 @@ find_subpath:
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_for_each(list, &curfile->subdirs) dfs_vfs_for_each_subnode(file, tmp, curfile, node)
{ {
file = rt_list_entry(list, struct tmpfs_file, sibling);
if (filename) /* find file */ if (filename) /* find file */
{ {
if (rt_strcmp(file->name, filename) == 0) if (rt_strcmp(file->name, filename) == 0)
@ -503,8 +497,7 @@ static int dfs_tmpfs_getdents(struct dfs_file *file,
{ {
rt_size_t index, end; rt_size_t index, end;
struct dirent *d; struct dirent *d;
struct tmpfs_file *d_file, *n_file; struct tmpfs_file *d_file, *n_file, *tmp;
rt_list_t *list;
struct tmpfs_sb *superblock; struct tmpfs_sb *superblock;
d_file = (struct tmpfs_file *)file->vnode->data; d_file = (struct tmpfs_file *)file->vnode->data;
@ -527,9 +520,8 @@ static int dfs_tmpfs_getdents(struct dfs_file *file,
index = 0; index = 0;
count = 0; count = 0;
rt_list_for_each(list, &d_file->subdirs) dfs_vfs_for_each_subnode(n_file, tmp, d_file, node)
{ {
n_file = rt_list_entry(list, struct tmpfs_file, sibling);
if (index >= (rt_size_t)file->fpos) if (index >= (rt_size_t)file->fpos)
{ {
d = dirp + count; d = dirp + count;
@ -573,7 +565,7 @@ static int dfs_tmpfs_unlink(struct dfs_dentry *dentry)
return -ENOENT; return -ENOENT;
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_remove(&(d_file->sibling)); dfs_vfs_remove_node(&d_file->node);
rt_spin_unlock(&superblock->lock); rt_spin_unlock(&superblock->lock);
if (rt_atomic_load(&(dentry->ref_count)) == 1) if (rt_atomic_load(&(dentry->ref_count)) == 1)
@ -631,13 +623,13 @@ static int dfs_tmpfs_rename(struct dfs_dentry *old_dentry, struct dfs_dentry *ne
RT_ASSERT(p_file != NULL); RT_ASSERT(p_file != NULL);
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_remove(&(d_file->sibling)); dfs_vfs_remove_node(&d_file->node);
rt_spin_unlock(&superblock->lock); rt_spin_unlock(&superblock->lock);
strncpy(d_file->name, file_name, TMPFS_NAME_MAX); strncpy(d_file->name, file_name, TMPFS_NAME_MAX);
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_insert_after(&(p_file->subdirs), &(d_file->sibling)); dfs_vfs_append_node(&p_file->node, &d_file->node);
rt_spin_unlock(&superblock->lock); rt_spin_unlock(&superblock->lock);
rt_free(parent_path); rt_free(parent_path);
@ -745,8 +737,7 @@ static struct dfs_vnode *dfs_tmpfs_create_vnode(struct dfs_dentry *dentry, int t
strncpy(d_file->name, file_name, TMPFS_NAME_MAX); strncpy(d_file->name, file_name, TMPFS_NAME_MAX);
rt_list_init(&(d_file->subdirs)); dfs_vfs_init_node(&d_file->node);
rt_list_init(&(d_file->sibling));
d_file->data = NULL; d_file->data = NULL;
d_file->size = 0; d_file->size = 0;
d_file->sb = superblock; d_file->sb = superblock;
@ -767,7 +758,7 @@ static struct dfs_vnode *dfs_tmpfs_create_vnode(struct dfs_dentry *dentry, int t
#endif #endif
} }
rt_spin_lock(&superblock->lock); rt_spin_lock(&superblock->lock);
rt_list_insert_after(&(p_file->subdirs), &(d_file->sibling)); dfs_vfs_append_node(&p_file->node, &d_file->node);
rt_spin_unlock(&superblock->lock); rt_spin_unlock(&superblock->lock);
vnode->mnt = dentry->mnt; vnode->mnt = dentry->mnt;

4
components/dfs/dfs_v2/filesystems/tmpfs/dfs_tmpfs.h
View File

@ -12,6 +12,7 @@
#define __DFS_TMPFS_H__ #define __DFS_TMPFS_H__
#include <rtthread.h> #include <rtthread.h>
#include <dfs_vfs.h>
#define TMPFS_NAME_MAX 32 #define TMPFS_NAME_MAX 32
#define TMPFS_MAGIC 0x0B0B0B0B #define TMPFS_MAGIC 0x0B0B0B0B
@ -25,8 +26,7 @@ struct tmpfs_file
{ {
rt_uint32_t type; /* file type */ rt_uint32_t type; /* file type */
char name[TMPFS_NAME_MAX]; /* file name */ char name[TMPFS_NAME_MAX]; /* file name */
rt_list_t subdirs; /* file subdir list */ struct dfs_vfs_node node; /* file node in the tmpfs */
rt_list_t sibling; /* file sibling list */
struct tmpfs_sb *sb; /* superblock ptr */ struct tmpfs_sb *sb; /* superblock ptr */
rt_uint8_t *data; /* file date ptr */ rt_uint8_t *data; /* file date ptr */
rt_size_t size; /* file size */ rt_size_t size; /* file size */

50
components/dfs/dfs_v2/include/dfs_vfs.h Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (c) 2006-2024, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
*/
#ifndef __DFS_VFS_H__
#define __DFS_VFS_H__
#include "dfs_file.h"
#include "dfs_fs.h"
#ifdef __cplusplus
extern "C"
{
#endif
struct dfs_vfs_node
{
rt_list_t subnode; /* file subnode list */
rt_list_t sibling; /* file sibling list */
};
rt_inline void dfs_vfs_init_node(struct dfs_vfs_node *node)
{
rt_list_init(&node->subnode);
rt_list_init(&node->sibling);
}
rt_inline void dfs_vfs_append_node(struct dfs_vfs_node *dir, struct dfs_vfs_node *node)
{
rt_list_insert_after(&(dir->subnode), &(node->sibling));
}
rt_inline void dfs_vfs_remove_node(struct dfs_vfs_node *node)
{
rt_list_remove(&(node->sibling));
}
#define dfs_vfs_for_each_subnode(node, tmp, dir, member) \
rt_list_for_each_entry_safe(node, tmp, &dir->member.subnode, member.sibling)
#ifdef __cplusplus
}
#endif
#endif /*__DFS_VFS_H__*/