Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lib_pathbuffer: change nxmutex -> spinlock #14799

Merged
merged 1 commit into from
Nov 15, 2024
Merged

lib_pathbuffer: change nxmutex -> spinlock #14799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions libs/libc/misc/lib_pathbuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
****************************************************************************/

#include <nuttx/config.h>
#include <nuttx/mutex.h>
#include <nuttx/spinlock.h>
#include <nuttx/lib/lib.h>

#include <stdlib.h>
Expand All @@ -41,7 +41,7 @@

struct pathbuffer_s
{
mutex_t lock; /* Lock for the buffer */
spinlock_t lock; /* Lock for the buffer */
unsigned long free_bitmap; /* Bitmap of free buffer */
char buffer[CONFIG_LIBC_MAX_PATHBUFFER][PATH_MAX];
};
Expand All @@ -52,7 +52,7 @@ struct pathbuffer_s

static struct pathbuffer_s g_pathbuffer =
{
NXMUTEX_INITIALIZER,
SP_UNLOCKED,
(1u << CONFIG_LIBC_MAX_PATHBUFFER) - 1,
};

Expand Down Expand Up @@ -82,20 +82,21 @@ static struct pathbuffer_s g_pathbuffer =

FAR char *lib_get_pathbuffer(void)
{
irqstate_t flags;
int index;

/* Try to find a free buffer */

nxmutex_lock(&g_pathbuffer.lock);
flags = spin_lock_irqsave(&g_pathbuffer.lock);
index = ffsl(g_pathbuffer.free_bitmap) - 1;
if (index >= 0 && index < CONFIG_LIBC_MAX_PATHBUFFER)
{
g_pathbuffer.free_bitmap &= ~(1u << index);
nxmutex_unlock(&g_pathbuffer.lock);
spin_unlock_irqrestore(&g_pathbuffer.lock, flags);
return g_pathbuffer.buffer[index];
}

nxmutex_unlock(&g_pathbuffer.lock);
spin_unlock_irqrestore(&g_pathbuffer.lock, flags);

/* If no free buffer is found, allocate a new one if
* CONFIG_LIBC_PATHBUFFER_MALLOC is enabled
Expand Down Expand Up @@ -124,22 +125,20 @@ FAR char *lib_get_pathbuffer(void)

void lib_put_pathbuffer(FAR char *buffer)
{
irqstate_t flags;
int index;

nxmutex_lock(&g_pathbuffer.lock);
index = (buffer - &g_pathbuffer.buffer[0][0]) / PATH_MAX;

if (index >= 0 && index < CONFIG_LIBC_MAX_PATHBUFFER)
{
/* Mark the corresponding bit as free */

flags = spin_lock_irqsave(&g_pathbuffer.lock);
g_pathbuffer.free_bitmap |= 1u << index;
nxmutex_unlock(&g_pathbuffer.lock);
spin_unlock_irqrestore(&g_pathbuffer.lock, flags);
return;
}

nxmutex_unlock(&g_pathbuffer.lock);

/* Free the buffer if it was dynamically allocated */

#ifdef CONFIG_LIBC_PATHBUFFER_MALLOC
Expand Down
Loading