OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mm/iob/iob_alloc.c: iob_allocwait should decrease semcount manually.

This commit is contained in:
Xiang Xiao 2019-01-26 09:24:12 -06:00 committed by Gregory Nutt
parent 9cef84b6ad
commit 4721381d1c
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mm/iob/iob_alloc.c
View File

@ -162,21 +162,13 @@ static FAR struct iob_s *iob_allocwait(bool throttled)
else
{
/* When we wake up from wait successfully, an I/O buffer was
* freed and we hold a count for one IOB. Unless somehting
* failed, we should have an IOB waiting for us in the
* committed list.
* freed and we hold a count for one IOB.
*/
iob = iob_alloc_committed();
DEBUGASSERT(iob != NULL);
if (iob == NULL)
{
/* This should not fail, but we allow for that possibility to
* handle any potential, non-obvious race condition. Perhaps
* the free IOB ended up in the g_iob_free list?
*
* We need release our count so that it is available to
/* We need release our count so that it is available to
* iob_tryalloc(), perhaps allowing another thread to take our
* count. In that event, iob_tryalloc() will fail above and
* we will have to wait again.
@ -185,6 +177,19 @@ static FAR struct iob_s *iob_allocwait(bool throttled)
nxsem_post(sem);
iob = iob_tryalloc(throttled);
}
#if CONFIG_IOB_THROTTLE > 0
else
{
if (throttled)
{
g_iob_sem.semcount--;
}
else
{
g_throttle_sem.semcount--;
}
}
#endif
}
}

3
mm/iob/iob_free.c
View File

@ -163,11 +163,8 @@ FAR struct iob_s *iob_free(FAR struct iob_s *iob)
#if CONFIG_IOB_THROTTLE > 0
nxsem_post(&g_throttle_sem);
#if 0 /* REVISIT: This assertion fires! */
DEBUGASSERT(g_throttle_sem.semcount <= (CONFIG_IOB_NBUFFERS - CONFIG_IOB_THROTTLE));
#endif
#endif
#ifdef CONFIG_IOB_NOTIFIER
/* Check if the IOB was claimed by a thread that is blocked waiting