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/gran: Replace the critical section with spin lock 

Base on discusion: https://github.com/apache/nuttx/issues/10981

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-10-21 17:20:02 +08:00 committed by Petro Karashchenko
parent 08bae13624
commit d5d4006c6b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm/mm_gran/mm_gran.h
View File

@ -32,6 +32,7 @@
#include <arch/types.h> #include <arch/types.h>
#include <nuttx/mm/gran.h> #include <nuttx/mm/gran.h>
#include <nuttx/mutex.h> #include <nuttx/mutex.h>
#include <nuttx/spinlock.h>
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
@ -68,6 +69,7 @@ struct gran_s
uint16_t ngranules; /* The total number of (aligned) granules in the heap */ uint16_t ngranules; /* The total number of (aligned) granules in the heap */
#ifdef CONFIG_GRAN_INTR #ifdef CONFIG_GRAN_INTR
irqstate_t irqstate; /* For exclusive access to the GAT */ irqstate_t irqstate; /* For exclusive access to the GAT */
spinlock_t lock;
#else #else
mutex_t lock; /* For exclusive access to the GAT */ mutex_t lock; /* For exclusive access to the GAT */
#endif #endif

4
mm/mm_gran/mm_grancritical.c
View File

@ -57,7 +57,7 @@
int gran_enter_critical(FAR struct gran_s *priv) int gran_enter_critical(FAR struct gran_s *priv)
{ {
#ifdef CONFIG_GRAN_INTR #ifdef CONFIG_GRAN_INTR
priv->irqstate = enter_critical_section(); priv->irqstate = spin_lock_irqsave(&priv->lock);
return OK; return OK;
#else #else
return nxmutex_lock(&priv->lock); return nxmutex_lock(&priv->lock);
@ -67,7 +67,7 @@ int gran_enter_critical(FAR struct gran_s *priv)
void gran_leave_critical(FAR struct gran_s *priv) void gran_leave_critical(FAR struct gran_s *priv)
{ {
#ifdef CONFIG_GRAN_INTR #ifdef CONFIG_GRAN_INTR
leave_critical_section(priv->irqstate); spin_unlock_irqrestore(&priv->lock, priv->irqstate);
#else #else
nxmutex_unlock(&priv->lock); nxmutex_unlock(&priv->lock);
#endif #endif