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

drivers/rwbuffer.c: Fix a lock issue

Browse Source
This commit is contained in:
Xiang Xiao
2018-11-09 08:06:33 -06:00
committed by Gregory Nutt
parent 241ea809c7
commit ec70aa86a6
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/rwbuffer.c
+9
View File
@@ -195,6 +195,7 @@ static void rwb_wrflush(struct rwbuffer_s *rwb)
* Name: rwb_wrtimeout * Name: rwb_wrtimeout
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_DRVR_WRITEBUFFER
static void rwb_wrtimeout(FAR void *arg) static void rwb_wrtimeout(FAR void *arg)
{ {
/* The following assumes that the size of a pointer is 4-bytes or less */ /* The following assumes that the size of a pointer is 4-bytes or less */
@@ -211,11 +212,13 @@ static void rwb_wrtimeout(FAR void *arg)
rwb_wrflush(rwb); rwb_wrflush(rwb);
rwb_semgive(&rwb->wrsem); rwb_semgive(&rwb->wrsem);
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: rwb_wrstarttimeout * Name: rwb_wrstarttimeout
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_DRVR_WRITEBUFFER
static void rwb_wrstarttimeout(FAR struct rwbuffer_s *rwb) static void rwb_wrstarttimeout(FAR struct rwbuffer_s *rwb)
{ {
/* CONFIG_DRVR_WRDELAY provides the delay period in milliseconds. CLK_TCK /* CONFIG_DRVR_WRDELAY provides the delay period in milliseconds. CLK_TCK
@@ -225,15 +228,18 @@ static void rwb_wrstarttimeout(FAR struct rwbuffer_s *rwb)
int ticks = (CONFIG_DRVR_WRDELAY + CLK_TCK/2) / CLK_TCK; int ticks = (CONFIG_DRVR_WRDELAY + CLK_TCK/2) / CLK_TCK;
(void)work_queue(LPWORK, &rwb->work, rwb_wrtimeout, (FAR void *)rwb, ticks); (void)work_queue(LPWORK, &rwb->work, rwb_wrtimeout, (FAR void *)rwb, ticks);
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: rwb_wrcanceltimeout * Name: rwb_wrcanceltimeout
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_DRVR_WRITEBUFFER
static inline void rwb_wrcanceltimeout(struct rwbuffer_s *rwb) static inline void rwb_wrcanceltimeout(struct rwbuffer_s *rwb)
{ {
(void)work_cancel(LPWORK, &rwb->work); (void)work_cancel(LPWORK, &rwb->work);
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: rwb_writebuffer * Name: rwb_writebuffer
@@ -832,6 +838,7 @@ ssize_t rwb_read(FAR struct rwbuffer_s *rwb, off_t startblock,
if (ret < 0) if (ret < 0)
{ {
ferr("ERROR: Failed to fill the read-ahead buffer: %d\n", ret); ferr("ERROR: Failed to fill the read-ahead buffer: %d\n", ret);
rwb_semgive(&rwb->rhsem);
return (ssize_t)ret; return (ssize_t)ret;
} }
} }
@@ -910,7 +917,9 @@ ssize_t rwb_write(FAR struct rwbuffer_s *rwb, off_t startblock,
{ {
/* Buffer the data in the write buffer */ /* Buffer the data in the write buffer */
rwb_semtake(&rwb->wrsem);
ret = rwb_writebuffer(rwb, startblock, nblocks, wrbuffer); ret = rwb_writebuffer(rwb, startblock, nblocks, wrbuffer);
rwb_semgive(&rwb->wrsem);
} }
/* On success, return the number of blocks that we were requested to /* On success, return the number of blocks that we were requested to