Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace nxsem API when used as a lock with nxmutex API

Browse Source 
Signed-off-by: anjiahao <anjiahao@xiaomi.com>
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
anjiahao
2022-09-06 14:18:45 +08:00
committed by Masayuki Ishikawa
parent 0dfd1f004d
commit d1d46335df
710 changed files with 7503 additions and 14852 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libc/locale/lib_gettext.c
+8 -7
View File
@@ -30,13 +30,14 @@
#include <fcntl.h>
#include <libintl.h>
#include <locale.h>
#include <nuttx/tls.h>
#include <strings.h>
#include <semaphore.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
#include <nuttx/mutex.h>
#include <nuttx/tls.h>
#include "libc.h"
#ifdef CONFIG_LIBC_LOCALE_GETTEXT
@@ -83,7 +84,7 @@ static FAR const char *g_catname[] =
"LC_ALL",
};
static sem_t g_sem = SEM_INITIALIZER(1);
static mutex_t g_lock = NXMUTEX_INITIALIZER;
static FAR struct mofile_s *g_mofile;
#ifdef CONFIG_BUILD_KERNEL
@@ -577,7 +578,7 @@ FAR char *dcngettext(FAR const char *domainname,
CONFIG_LIBC_LOCALE_PATH"/%s/%s/%s.mo",
lang, g_catname[category], domainname);
while (_SEM_WAIT(&g_sem) < 0);
while (nxmutex_lock(&g_lock) < 0);
for (mofile = g_mofile; mofile; mofile = mofile->next)
{
@@ -594,7 +595,7 @@ FAR char *dcngettext(FAR const char *domainname,
mofile = lib_malloc(sizeof(*mofile));
if (mofile == NULL)
{
_SEM_POST(&g_sem);
nxmutex_unlock(&g_lock);
return notrans;
}
@@ -602,7 +603,7 @@ FAR char *dcngettext(FAR const char *domainname,
mofile->map = momap(path, &mofile->size);
if (mofile->map == MAP_FAILED)
{
_SEM_POST(&g_sem);
nxmutex_unlock(&g_lock);
lib_free(mofile);
return notrans;
}
@@ -647,7 +648,7 @@ FAR char *dcngettext(FAR const char *domainname,
g_mofile = mofile;
}
_SEM_POST(&g_sem); /* Leave look before search */
nxmutex_unlock(&g_lock); /* Leave look before search */
trans = molookup(mofile->map, mofile->size, msgid1);
if (trans == NULL)