sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpmsgfs: add timeout when mount in rpmsgfs

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2022-01-05 22:09:47 +08:00 committed by Petro Karashchenko
parent 023c54d0a4
commit 96ed33f1d8
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fs/rpmsgfs/rpmsgfs.c
View File

@ -44,6 +44,12 @@
#include "rpmsgfs.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define RPMSGFS_RETRY_DELAY_MS 10
/****************************************************************************
* Private Types
****************************************************************************/
@ -71,6 +77,7 @@ struct rpmsgfs_mountpt_s
FAR struct rpmsgfs_ofile_s *fs_head; /* Singly-linked list of open files */
char fs_root[PATH_MAX];
void *handle;
int timeout; /* Connect timeout */
};
/****************************************************************************
@ -200,7 +207,7 @@ static void rpmsgfs_semgive(FAR struct rpmsgfs_mountpt_s *fs)
*
****************************************************************************/
static void rpmsgfs_mkpath(FAR struct rpmsgfs_mountpt_s *fs,
static void rpmsgfs_mkpath(FAR struct rpmsgfs_mountpt_s *fs,
FAR const char *relpath,
FAR char *path, int pathlen)
{
@ -252,6 +259,21 @@ static void rpmsgfs_mkpath(FAR struct rpmsgfs_mountpt_s *fs,
{
strncat(path, &relpath[first], pathlen - strlen(path) - 1);
}
while (fs->timeout > 0)
{
struct stat buf;
int ret;
ret = rpmsgfs_client_stat(fs->handle, fs->fs_root, &buf);
if (ret == 0)
{
break;
}
usleep(RPMSGFS_RETRY_DELAY_MS * USEC_PER_MSEC);
fs->timeout -= RPMSGFS_RETRY_DELAY_MS;
}
}
/****************************************************************************
@ -1055,6 +1077,7 @@ static int rpmsgfs_bind(FAR struct inode *blkdriver, FAR const void *data,
/* The options we support are:
* "fs=whatever,cpu=cpuname", remote dir
* "timeout=xx", connect timeout, unit (ms)
*/
options = strdup(data);
@ -1064,6 +1087,10 @@ static int rpmsgfs_bind(FAR struct inode *blkdriver, FAR const void *data,
return -ENOMEM;
}
/* Set timeout default value */
fs->timeout = INT_MAX;
ptr = strtok_r(options, ",", &saveptr);
while (ptr != NULL)
{
@ -1075,6 +1102,10 @@ static int rpmsgfs_bind(FAR struct inode *blkdriver, FAR const void *data,
{
cpuname = &ptr[4];
}
else if ((strncmp(ptr, "timeout=", 8) == 0))
{
fs->timeout = atoi(&ptr[8]);
}
ptr = strtok_r(NULL, ",", &saveptr);
}