Skip to content

[dfs]mmap的文件在关闭后释放file指针 #9917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rbb666 merged 2 commits into from
Feb 9, 2025
+33 −12
Merged

[dfs]mmap的文件在关闭后释放file指针 #9917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ae9131
[dfs]mmap的文件在关闭后释放file指针
heyuanjie87 Jan 14, 2025
0d624e2
修改函数名
heyuanjie87 Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions components/dfs/dfs_v2/include/dfs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ struct dfs_fdtable *dfs_fdtable_get_global(void);
int dfs_dup(int oldfd, int startfd);
#endif /* DFS_USING_POSIX */

struct dfs_file* dfs_file_create(void);
void dfs_file_destroy(struct dfs_file *file);

#ifdef __cplusplus
}
#endif
Expand Down
41 changes: 29 additions & 12 deletions components/dfs/dfs_v2/src/dfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,33 @@ int dfs_init(void)
}
INIT_PREV_EXPORT(dfs_init);

struct dfs_file* dfs_file_create(void)
{
struct dfs_file *file;

file = (struct dfs_file *)rt_calloc(1, sizeof(struct dfs_file));
if (file)
{
file->magic = DFS_FD_MAGIC;
file->ref_count = 1;
rt_mutex_init(&file->pos_lock, "fpos", RT_IPC_FLAG_PRIO);
}

return file;
}

void dfs_file_destroy(struct dfs_file *file)
{
rt_mutex_detach(&file->pos_lock);

if (file->mmap_context)
{
rt_free(file->mmap_context);
}

rt_free(file);
}

/**
* @ingroup Fd
* This function will allocate a file descriptor.
Expand Down Expand Up @@ -217,13 +244,10 @@ int fdt_fd_new(struct dfs_fdtable *fdt)
{
struct dfs_file *file;

file = (struct dfs_file *)rt_calloc(1, sizeof(struct dfs_file));
file = dfs_file_create();

if (file)
{
file->magic = DFS_FD_MAGIC;
file->ref_count = 1;
rt_mutex_init(&file->pos_lock, "fpos", RT_IPC_FLAG_PRIO);
fdt->fds[idx] = file;

LOG_D("allocate a new fd @ %d", idx);
Expand Down Expand Up @@ -255,14 +279,7 @@ void fdt_fd_release(struct dfs_fdtable *fdt, int fd)

if (file && file->ref_count == 1)
{
rt_mutex_detach(&file->pos_lock);

if (file->mmap_context)
{
rt_free(file->mmap_context);
}

rt_free(file);
dfs_file_destroy(file);
}
else
{
Expand Down
1 change: 1 addition & 0 deletions components/dfs/dfs_v2/src/dfs_file_mmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ static void on_varea_close(struct rt_varea *varea)
if (rt_atomic_load(&(file->ref_count)) == 1)
{
dfs_file_close(file);
dfs_file_destroy(file);
}
else
{
Expand Down
Loading