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

app: delete NFILE_DESCRIPTORS limits

Browse Source 
Change-Id: I3ced2b2b7440a2c79a712cfc97b4cd15d2bddd4c
Signed-off-by: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
This commit is contained in:
Jiuzhu Dong 2021-03-04 11:07:55 +08:00 committed by Xiang Xiao
parent 6f75c1b3d6
commit 4c6ded2661
9 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/README.md
View File

@ -1781,8 +1781,6 @@ This is at trivial test of the Union File System. See
- `CONFIG_DISABLE_MOUNTPOINT` – Mountpoint support must not be - `CONFIG_DISABLE_MOUNTPOINT` – Mountpoint support must not be
disabled. disabled.
- `CONFIG_NFILE_DESCRIPTORS > 4` – Some file descriptors must be
allocated.
- `CONFIG_FS_ROMFS` – ROMFS support is required. - `CONFIG_FS_ROMFS` – ROMFS support is required.
- `CONFIG_FS_UNIONFS` – Union File System support is required. - `CONFIG_FS_UNIONFS` – Union File System support is required.

6
examples/romfs/romfs_main.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* examples/romfs/romfs_main.c * apps/examples/romfs/romfs_main.c
* *
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -97,10 +97,6 @@
# error "Mountpoint support is disabled" # error "Mountpoint support is disabled"
#endif #endif
#if CONFIG_NFILE_DESCRIPTORS < 4
# error "Not enough file descriptors"
#endif
#ifndef CONFIG_FS_ROMFS #ifndef CONFIG_FS_ROMFS
# error "ROMFS support not enabled" # error "ROMFS support not enabled"
#endif #endif

8
examples/unionfs/unionfs_main.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* examples/unionfs/unionfs_main.c * apps/examples/unionfs/unionfs_main.c
* *
* Copyright (C) 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -68,10 +68,6 @@
# error "Mountpoint support is disabled" # error "Mountpoint support is disabled"
#endif #endif
#if CONFIG_NFILE_DESCRIPTORS < 4
# error "Not enough file descriptors"
#endif
#ifndef CONFIG_FS_ROMFS #ifndef CONFIG_FS_ROMFS
# error "ROMFS support not enabled" # error "ROMFS support not enabled"
#endif #endif
@ -131,7 +127,7 @@
int main(int argc, FAR char *argv[]) int main(int argc, FAR char *argv[])
{ {
int ret; int ret;
/* Create a RAM disk for file system 1 */ /* Create a RAM disk for file system 1 */

16
graphics/ft80x/ft80x_audio.c
View File

@ -183,7 +183,6 @@ int ft80x_audio_playsound(int fd, uint16_t effect, uint16_t pitch)
* *
****************************************************************************/ ****************************************************************************/
#if CONFIG_NFILE_DESCRIPTORS > 3
int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer, int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer,
FAR const char *filepath, uint8_t format, FAR const char *filepath, uint8_t format,
uint16_t frequency, uint8_t volume) uint16_t frequency, uint8_t volume)
@ -309,7 +308,7 @@ int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer,
* free up to the end of the RAM G buffer (actually already * free up to the end of the RAM G buffer (actually already
* handled by the above 'break') * handled by the above 'break')
*/ */
} }
while (freespace < MAX_DLBUFFER && while (freespace < MAX_DLBUFFER &&
freespace < remaining && freespace < remaining &&
freespace < (AUDIO_BUFSIZE - offset)); freespace < (AUDIO_BUFSIZE - offset));
@ -364,8 +363,9 @@ int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer,
if (!started) if (!started)
{ {
/* Start playing at the beginning of graphics memory */ /* Start playing at the beginning of graphics memory
/* Set the audio playback start address */ * Set the audio playback start address
*/
ret = ft80x_putreg32(fd, FT80X_REG_PLAYBACK_START, ret = ft80x_putreg32(fd, FT80X_REG_PLAYBACK_START,
RAMG_STARTADDR); RAMG_STARTADDR);
@ -432,7 +432,7 @@ int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer,
started = true; started = true;
} }
} }
/* Transfer is complete. 'offset' points to the end of the file in RAM G. /* Transfer is complete. 'offset' points to the end of the file in RAM G.
* Clear all of the RAM G at the end of the file so that audio is muted * Clear all of the RAM G at the end of the file so that audio is muted
@ -509,7 +509,6 @@ int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer,
ft80x_err("ERROR: ft80x_coproc_send failed: %d\n", ret); ft80x_err("ERROR: ft80x_coproc_send failed: %d\n", ret);
goto errout_with_fd; goto errout_with_fd;
} }
} }
/* Wait until the read pointer wraps back to the beginning of the buffer */ /* Wait until the read pointer wraps back to the beginning of the buffer */
@ -544,8 +543,7 @@ int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer,
} }
while (readptr < offset); while (readptr < offset);
/* The file is done... */ /* The file is done... Stop looping */
/* Stop looping */
ret = ft80x_putreg8(fd, FT80X_REG_PLAYBACK_LOOP, 1); ret = ft80x_putreg8(fd, FT80X_REG_PLAYBACK_LOOP, 1);
if (ret < 0) if (ret < 0)
@ -584,5 +582,3 @@ errout_with_fd:
close(audiofd); close(audiofd);
return ret; return ret;
} }
#endif /* CONFIG_NFILE_DESCRIPTORS > 3 */

15
include/graphics/ft80x.h
View File

@ -224,8 +224,8 @@ int ft80x_dl_string(int fd, FAR struct ft80x_dlbuffer_s *buffer,
* hardware and reset the local display list buffer offset to zero. * hardware and reset the local display list buffer offset to zero.
* *
* Input Parameters: * Input Parameters:
* fd - The file descriptor of the FT80x device. Opened by the caller with * fd - The file descriptor of the FT80x device. Opened by the caller
* write access. * with write access.
* buffer - An instance of struct ft80x_dlbuffer_s allocated by the caller. * buffer - An instance of struct ft80x_dlbuffer_s allocated by the caller.
* wait - True: wait until data has been consumed by the co-processor * wait - True: wait until data has been consumed by the co-processor
* (only for co-processor destination); false: Send to hardware * (only for co-processor destination); false: Send to hardware
@ -371,7 +371,8 @@ int ft80x_touch_gettransform(int fd, FAR uint32_t matrix[6]);
* *
* Returned Value: * Returned Value:
* A value of 1-255 is returned if a graphics object is touched. Zero is * A value of 1-255 is returned if a graphics object is touched. Zero is
* returned if no graphics object is touched. A negated errno value on failure. * returned if no graphics object is touched. A negated errno value on
* failure.
* *
****************************************************************************/ ****************************************************************************/
@ -391,7 +392,8 @@ int ft80x_touch_tag(int fd);
* *
* Returned Value: * Returned Value:
* A value of 1-255 is returned if a graphics object is touched. Zero is * A value of 1-255 is returned if a graphics object is touched. Zero is
* returned if no graphics object is touched. A negated errno value on failure. * returned if no graphics object is touched. A negated errno value on
* failure.
* *
****************************************************************************/ ****************************************************************************/
@ -415,7 +417,8 @@ int ft80x_touch_waittag(int fd, uint8_t oldtag);
* *
* Returned Value: * Returned Value:
* A value of 1-255 is returned if a graphics object is touched. Zero is * A value of 1-255 is returned if a graphics object is touched. Zero is
* returned if no graphics object is touched. A negated errno value on failure. * returned if no graphics object is touched. A negated errno value on
* failure.
* *
****************************************************************************/ ****************************************************************************/
@ -494,11 +497,9 @@ int ft80x_audio_playsound(int fd, uint16_t effect, uint16_t pitch);
* *
****************************************************************************/ ****************************************************************************/
#if CONFIG_NFILE_DESCRIPTORS > 3
int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer, int ft80x_audio_playfile(int fd, FAR struct ft80x_dlbuffer_s *buffer,
FAR const char *filepath, uint8_t format, FAR const char *filepath, uint8_t format,
uint16_t frequency, uint8_t volume); uint16_t frequency, uint8_t volume);
#endif
/**************************************************************************** /****************************************************************************
* Name: ft80x_backlight_set * Name: ft80x_backlight_set

6
netutils/usrsock_rpmsg/Kconfig
View File

@ -24,4 +24,10 @@ config NETUTILS_USRSOCK_RPMSG_STACKSIZE
---help--- ---help---
The stack size allocated for the usrsock task. The stack size allocated for the usrsock task.
config NETUTILS_USRSOCK_NSOCK_DESCRIPTORS
int "the maximum number of socket descriptors for usrsock monitoring"
default 64
---help---
The maximum number of socket description for usrsosck monitoring.
endif # NETUTILS_USRSOCK_RPMSG endif # NETUTILS_USRSOCK_RPMSG

54
netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
View File

@ -42,9 +42,9 @@ struct usrsock_rpmsg_s
pid_t pid; pid_t pid;
pthread_mutex_t mutex; pthread_mutex_t mutex;
pthread_cond_t cond; pthread_cond_t cond;
struct socket socks[CONFIG_NFILE_DESCRIPTORS]; struct socket socks[CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS];
struct rpmsg_endpoint *epts[CONFIG_NFILE_DESCRIPTORS]; struct rpmsg_endpoint *epts[CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS];
struct pollfd pfds[CONFIG_NFILE_DESCRIPTORS]; struct pollfd pfds[CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS];
}; };
/**************************************************************************** /****************************************************************************
@ -204,7 +204,7 @@ static int usrsock_rpmsg_socket_handler(struct rpmsg_endpoint *ept,
int retr; int retr;
int ret = -ENFILE; int ret = -ENFILE;
for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++) for (i = 0; i < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS; i++)
{ {
pthread_mutex_lock(&priv->mutex); pthread_mutex_lock(&priv->mutex);
if (priv->socks[i].s_conn == NULL) if (priv->socks[i].s_conn == NULL)
@ -250,7 +250,8 @@ static int usrsock_rpmsg_close_handler(struct rpmsg_endpoint *ept,
struct usrsock_rpmsg_s *priv = priv_; struct usrsock_rpmsg_s *priv = priv_;
int ret = -EBADF; int ret = -EBADF;
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
priv->pfds[req->usockid].ptr = NULL; priv->pfds[req->usockid].ptr = NULL;
priv->epts[req->usockid] = NULL; priv->epts[req->usockid] = NULL;
@ -280,7 +281,8 @@ static int usrsock_rpmsg_connect_handler(struct rpmsg_endpoint *ept,
int retr; int retr;
int ret = -EBADF; int ret = -EBADF;
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
ret = psock_connect(&priv->socks[req->usockid], ret = psock_connect(&priv->socks[req->usockid],
(const struct sockaddr *)(req + 1), req->addrlen); (const struct sockaddr *)(req + 1), req->addrlen);
@ -323,7 +325,8 @@ static int usrsock_rpmsg_sendto_handler(struct rpmsg_endpoint *ept,
ssize_t ret = -EBADF; ssize_t ret = -EBADF;
int retr; int retr;
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
ret = psock_sendto(&priv->socks[req->usockid], ret = psock_sendto(&priv->socks[req->usockid],
(const void *)(req + 1) + req->addrlen, req->buflen, (const void *)(req + 1) + req->addrlen, req->buflen,
@ -371,7 +374,8 @@ static int usrsock_rpmsg_recvfrom_handler(struct rpmsg_endpoint *ept,
buflen = len - sizeof(*ack) - inaddrlen; buflen = len - sizeof(*ack) - inaddrlen;
} }
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
ret = psock_recvfrom(&priv->socks[req->usockid], ret = psock_recvfrom(&priv->socks[req->usockid],
(void *)(ack + 1) + inaddrlen, buflen, req->flags, (void *)(ack + 1) + inaddrlen, buflen, req->flags,
@ -405,7 +409,8 @@ static int usrsock_rpmsg_setsockopt_handler(struct rpmsg_endpoint *ept,
struct usrsock_rpmsg_s *priv = priv_; struct usrsock_rpmsg_s *priv = priv_;
int ret = -EBADF; int ret = -EBADF;
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
ret = psock_setsockopt(&priv->socks[req->usockid], ret = psock_setsockopt(&priv->socks[req->usockid],
req->level, req->option, req + 1, req->valuelen); req->level, req->option, req + 1, req->valuelen);
@ -426,7 +431,8 @@ static int usrsock_rpmsg_getsockopt_handler(struct rpmsg_endpoint *ept,
uint32_t len; uint32_t len;
ack = rpmsg_get_tx_payload_buffer(ept, &len, true); ack = rpmsg_get_tx_payload_buffer(ept, &len, true);
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
ret = psock_getsockopt(&priv->socks[req->usockid], ret = psock_getsockopt(&priv->socks[req->usockid],
req->level, req->option, ack + 1, &optlen); req->level, req->option, ack + 1, &optlen);
@ -449,7 +455,8 @@ static int usrsock_rpmsg_getsockname_handler(struct rpmsg_endpoint *ept,
uint32_t len; uint32_t len;
ack = rpmsg_get_tx_payload_buffer(ept, &len, true); ack = rpmsg_get_tx_payload_buffer(ept, &len, true);
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
ret = psock_getsockname(&priv->socks[req->usockid], ret = psock_getsockname(&priv->socks[req->usockid],
(struct sockaddr *)(ack + 1), &outaddrlen); (struct sockaddr *)(ack + 1), &outaddrlen);
@ -472,7 +479,8 @@ static int usrsock_rpmsg_getpeername_handler(struct rpmsg_endpoint *ept,
uint32_t len; uint32_t len;
ack = rpmsg_get_tx_payload_buffer(ept, &len, true); ack = rpmsg_get_tx_payload_buffer(ept, &len, true);
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
ret = psock_getpeername(&priv->socks[req->usockid], ret = psock_getpeername(&priv->socks[req->usockid],
(struct sockaddr *)(ack + 1), &outaddrlen); (struct sockaddr *)(ack + 1), &outaddrlen);
@ -490,7 +498,8 @@ static int usrsock_rpmsg_bind_handler(struct rpmsg_endpoint *ept,
struct usrsock_rpmsg_s *priv = priv_; struct usrsock_rpmsg_s *priv = priv_;
int ret = -EBADF; int ret = -EBADF;
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
ret = psock_bind(&priv->socks[req->usockid], ret = psock_bind(&priv->socks[req->usockid],
(const struct sockaddr *)(req + 1), req->addrlen); (const struct sockaddr *)(req + 1), req->addrlen);
@ -508,7 +517,8 @@ static int usrsock_rpmsg_listen_handler(struct rpmsg_endpoint *ept,
int retr; int retr;
int ret = -EBADF; int ret = -EBADF;
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
ret = psock_listen(&priv->socks[req->usockid], req->backlog); ret = psock_listen(&priv->socks[req->usockid], req->backlog);
} }
@ -541,10 +551,11 @@ static int usrsock_rpmsg_accept_handler(struct rpmsg_endpoint *ept,
int retr; int retr;
ack = rpmsg_get_tx_payload_buffer(ept, &len, true); ack = rpmsg_get_tx_payload_buffer(ept, &len, true);
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
ret = -ENFILE; /* Assume no free socket handler */ ret = -ENFILE; /* Assume no free socket handler */
for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++) for (i = 0; i < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS; i++)
{ {
pthread_mutex_lock(&priv->mutex); pthread_mutex_lock(&priv->mutex);
if (priv->socks[i].s_conn == NULL) if (priv->socks[i].s_conn == NULL)
@ -607,7 +618,8 @@ static int usrsock_rpmsg_ioctl_handler(struct rpmsg_endpoint *ept,
uint32_t len; uint32_t len;
ack = rpmsg_get_tx_payload_buffer(ept, &len, true); ack = rpmsg_get_tx_payload_buffer(ept, &len, true);
if (req->usockid >= 0 && req->usockid < CONFIG_NFILE_DESCRIPTORS) if (req->usockid >= 0 &&
req->usockid < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS)
{ {
memcpy(ack + 1, req + 1, req->arglen); memcpy(ack + 1, req + 1, req->arglen);
ret = psock_ioctl(&priv->socks[req->usockid], ret = psock_ioctl(&priv->socks[req->usockid],
@ -676,7 +688,7 @@ static void usrsock_rpmsg_ns_bind(struct rpmsg_device *rdev, void *priv_,
static void usrsock_rpmsg_ns_unbind(struct rpmsg_endpoint *ept) static void usrsock_rpmsg_ns_unbind(struct rpmsg_endpoint *ept)
{ {
struct usrsock_rpmsg_s *priv = ept->priv; struct usrsock_rpmsg_s *priv = ept->priv;
struct socket *socks[CONFIG_NFILE_DESCRIPTORS]; struct socket *socks[CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS];
int count = 0; int count = 0;
int i; int i;
@ -686,7 +698,7 @@ static void usrsock_rpmsg_ns_unbind(struct rpmsg_endpoint *ept)
/* Collect all socks belong to the dead client */ /* Collect all socks belong to the dead client */
for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++) for (i = 0; i < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS; i++)
{ {
if (priv->epts[i] == ept) if (priv->epts[i] == ept)
{ {
@ -739,7 +751,7 @@ static int usrsock_rpmsg_prepare_poll(struct usrsock_rpmsg_s *priv,
pthread_cond_signal(&priv->cond); pthread_cond_signal(&priv->cond);
for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++) for (i = 0; i < CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS; i++)
{ {
if (priv->pfds[i].ptr) if (priv->pfds[i].ptr)
{ {
@ -811,7 +823,7 @@ static void usrsock_rpmsg_process_poll(struct usrsock_rpmsg_s *priv,
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct pollfd pfds[CONFIG_NFILE_DESCRIPTORS]; struct pollfd pfds[CONFIG_NETUTILS_USRSOCK_NSOCK_DESCRIPTORS];
struct usrsock_rpmsg_s *priv; struct usrsock_rpmsg_s *priv;
sigset_t sigmask; sigset_t sigmask;
int ret; int ret;

1
nshlib/README.md
View File

@ -184,7 +184,6 @@ configuration options as described in the final section of this README. This
capability also depends on: capability also depends on:
- `CONFIG_DISABLE_MOUNTPOINT` not set - `CONFIG_DISABLE_MOUNTPOINT` not set
- `CONFIG_NFILE_DESCRIPTORS > 4`
- `CONFIG_FS_ROMFS` - `CONFIG_FS_ROMFS`
### Default Start-Up Behavior ### Default Start-Up Behavior

5
nshlib/nsh.h
View File

@ -331,11 +331,6 @@
# undef CONFIG_NSH_ROMFSETC # undef CONFIG_NSH_ROMFSETC
# endif # endif
# if CONFIG_NFILE_DESCRIPTORS < 4
# error "Not enough file descriptors"
# undef CONFIG_NSH_ROMFSETC
# endif
# ifndef CONFIG_FS_ROMFS # ifndef CONFIG_FS_ROMFS
# error "ROMFS support not enabled" # error "ROMFS support not enabled"
# undef CONFIG_NSH_ROMFSETC # undef CONFIG_NSH_ROMFSETC