Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 04:19:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fs: enhance file_allocate_from_tcb() mulit-threads saftey

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd
2023-12-07 16:46:01 +08:00
committed by Xiang Xiao
parent 577eb47966
commit 60b25556d4
1 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/inode/fs_files.c
+26 -36
View File
@@ -379,64 +379,54 @@ int file_allocate_from_tcb(FAR struct tcb_s *tcb, FAR struct inode *inode,
int oflags, off_t pos, FAR void *priv, int minfd, int oflags, off_t pos, FAR void *priv, int minfd,
bool addref) bool addref)
{ {
int i = minfd / CONFIG_NFILE_DESCRIPTORS_PER_BLOCK;
int j = minfd % CONFIG_NFILE_DESCRIPTORS_PER_BLOCK;
FAR struct filelist *list; FAR struct filelist *list;
FAR struct file *filep; FAR struct file *filep;
irqstate_t flags;
int ret; int ret;
int i;
int j;
/* Get the file descriptor list. It should not be NULL in this context. */ /* Get the file descriptor list. It should not be NULL in this context. */
list = nxsched_get_files_from_tcb(tcb); list = nxsched_get_files_from_tcb(tcb);
/* Calculate minfd whether is in list->fl_files.
* if not, allocate a new filechunk.
*/
i = minfd / CONFIG_NFILE_DESCRIPTORS_PER_BLOCK;
if (i >= list->fl_rows)
{
ret = files_extend(list, i + 1);
if (ret < 0)
{
return ret;
}
}
/* Find free file */ /* Find free file */
j = minfd % CONFIG_NFILE_DESCRIPTORS_PER_BLOCK; flags = spin_lock_irqsave(&list->fl_lock);
do
for (; ; i++, j = 0)
{ {
if (i >= list->fl_rows)
{
spin_unlock_irqrestore(&list->fl_lock, flags);
ret = files_extend(list, i + 1);
if (ret < 0)
{
return ret;
}
flags = spin_lock_irqsave(&list->fl_lock);
}
do do
{ {
filep = files_fget_by_index(list, i, j); filep = &list->fl_files[i][j];
if (filep->f_inode == NULL) if (filep->f_inode == NULL)
{ {
filep->f_oflags = oflags;
filep->f_pos = pos;
filep->f_inode = inode;
filep->f_priv = priv;
goto found; goto found;
} }
} }
while (++j < CONFIG_NFILE_DESCRIPTORS_PER_BLOCK); while (++j < CONFIG_NFILE_DESCRIPTORS_PER_BLOCK);
j = 0;
}
while (++i < list->fl_rows);
/* The space of file array isn't enough, allocate a new filechunk */
ret = files_extend(list, i + 1);
if (ret < 0)
{
return ret;
} }
filep = files_fget_by_index(list, i, 0);
found: found:
spin_unlock_irqrestore(&list->fl_lock, flags);
filep->f_oflags = oflags;
filep->f_pos = pos;
filep->f_inode = inode;
filep->f_priv = priv;
if (addref) if (addref)
{ {