nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-12 22:08:35 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "serial.c: should protect the fds when calling poll_notify"

Browse source 
This reverts commit bbb7f436d4.
This commit is contained in:
Jukka Laitinen 2024-11-06 12:15:07 +02:00
parent 0ab693b411
commit bf584e9b49
2 changed files with 20 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
drivers/serial/serial.c
View file

@ -87,11 +87,6 @@
* Private Function Prototypes
****************************************************************************/
/* Poll support */
static void uart_poll_notify(FAR uart_dev_t *dev, unsigned int min,
unsigned int max, pollevent_t eventset);
/* Write support */
static int uart_putxmitchar(FAR uart_dev_t *dev, int ch,
@ -202,28 +197,6 @@ static bool uart_is_termios_hw_change(FAR struct file *filep,
return false;
}
/****************************************************************************
* Name: uart_poll_notify
****************************************************************************/
static void uart_poll_notify(FAR uart_dev_t *dev, unsigned int min,
unsigned int max, pollevent_t eventset)
{
irqstate_t flags;
DEBUGASSERT(max > min && max - min <= CONFIG_SERIAL_NPOLLWAITERS);
flags = enter_critical_section();
sched_lock();
/* Notify the fds in range dev->fds[min] - dev->fds[max] */
poll_notify(&dev->fds[min], max - min, eventset);
sched_unlock();
leave_critical_section(flags);
}
/****************************************************************************
* Name: uart_putxmitchar
****************************************************************************/
@ -832,6 +805,7 @@ static int uart_close(FAR struct file *filep)
nxmutex_destroy(&dev->xmit.lock);
nxmutex_destroy(&dev->recv.lock);
nxmutex_destroy(&dev->closelock);
nxmutex_destroy(&dev->polllock);
nxsem_destroy(&dev->xmitsem);
nxsem_destroy(&dev->recvsem);
uart_release(dev);
@ -1751,9 +1725,8 @@ static int uart_poll(FAR struct file *filep,
FAR struct inode *inode = filep->f_inode;
FAR uart_dev_t *dev = inode->i_private;
pollevent_t eventset;
irqstate_t flags;
int ndx;
int ret = OK;
int ret;
int i;
/* Some sanity checking */
@ -1765,10 +1738,18 @@ static int uart_poll(FAR struct file *filep,
}
#endif
flags = enter_critical_section();
/* Are we setting up the poll? Or tearing it down? */
ret = nxmutex_lock(&dev->polllock);
if (ret < 0)
{
/* A signal received while waiting for access to the poll data
* will abort the operation.
*/
return ret;
}
if (setup)
{
/* This is a request to set up the poll. Find an available
@ -1796,8 +1777,6 @@ static int uart_poll(FAR struct file *filep,
goto errout;
}
leave_critical_section(flags);
/* Should we immediately notify on any of the requested events?
* First, check if the xmit buffer is full.
*
@ -1846,7 +1825,7 @@ static int uart_poll(FAR struct file *filep,
}
#endif
uart_poll_notify(dev, i, i + 1, eventset);
poll_notify(&fds, 1, eventset);
}
else if (fds->priv != NULL)
{
@ -1866,14 +1845,10 @@ static int uart_poll(FAR struct file *filep,
*slot = NULL;
fds->priv = NULL;
leave_critical_section(flags);
}
return ret;
errout:
leave_critical_section(flags);
nxmutex_unlock(&dev->polllock);
return ret;
}
@ -1904,6 +1879,7 @@ static int uart_unlink(FAR struct inode *inode)
nxmutex_destroy(&dev->xmit.lock);
nxmutex_destroy(&dev->recv.lock);
nxmutex_destroy(&dev->closelock);
nxmutex_destroy(&dev->polllock);
nxsem_destroy(&dev->xmitsem);
nxsem_destroy(&dev->recvsem);
uart_release(dev);
@ -2042,6 +2018,7 @@ int uart_register(FAR const char *path, FAR uart_dev_t *dev)
nxmutex_init(&dev->closelock);
nxsem_init(&dev->xmitsem, 0, 0);
nxsem_init(&dev->recvsem, 0, 0);
nxmutex_init(&dev->polllock);
#ifdef CONFIG_SERIAL_TERMIOS
dev->timeout = 0;
@ -2077,7 +2054,7 @@ void uart_datareceived(FAR uart_dev_t *dev)
{
/* Notify all poll/select waiters that they can read from the recv buffer */
uart_poll_notify(dev, 0, CONFIG_SERIAL_NPOLLWAITERS, POLLIN);
poll_notify(dev->fds, CONFIG_SERIAL_NPOLLWAITERS, POLLIN);
/* Is there a thread waiting for read data? */
@ -2111,7 +2088,7 @@ void uart_datasent(FAR uart_dev_t *dev)
{
/* Notify all poll/select waiters that they can write to xmit buffer */
uart_poll_notify(dev, 0, CONFIG_SERIAL_NPOLLWAITERS, POLLOUT);
poll_notify(dev->fds, CONFIG_SERIAL_NPOLLWAITERS, POLLOUT);
/* Is there a thread waiting for space in xmit.buffer? */
@ -2150,7 +2127,6 @@ void uart_connected(FAR uart_dev_t *dev, bool connected)
*/
flags = enter_critical_section();
sched_lock();
dev->disconnected = !connected;
if (!connected)
{
@ -2171,7 +2147,6 @@ void uart_connected(FAR uart_dev_t *dev, bool connected)
uart_wakeup(&dev->recvsem);
}
sched_unlock();
leave_critical_section(flags);
}
#endif
@ -2192,6 +2167,7 @@ void uart_reset_sem(FAR uart_dev_t *dev)
nxsem_reset(&dev->recvsem, 0);
nxmutex_reset(&dev->xmit.lock);
nxmutex_reset(&dev->recv.lock);
nxmutex_reset(&dev->polllock);
}
/****************************************************************************

1
include/nuttx/serial/serial.h
View file

@ -325,6 +325,7 @@ struct uart_dev_s
sem_t xmitsem; /* Wakeup user waiting for space in xmit.buffer */
sem_t recvsem; /* Wakeup user waiting for data in recv.buffer */
mutex_t closelock; /* Locks out new open while close is in progress */
mutex_t polllock; /* Manages exclusive access to fds[] */
/* I/O buffers */