sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/sim: Synchronize the creation of idle thread by semaphore

Browse Source 
it's wrong to synchronize with mutex here

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-07-25 23:22:28 +08:00 committed by Masayuki Ishikawa
parent 71a9d2402d
commit 53f33a7ea2
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
arch/sim/src/sim/up_simsmp.c
View File

@ -39,6 +39,7 @@
#include <stdint.h> #include <stdint.h>
#include <pthread.h> #include <pthread.h>
#include <semaphore.h>
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
@ -63,8 +64,8 @@ typedef unsigned char spinlock_t;
struct sim_cpuinfo_s struct sim_cpuinfo_s
{ {
int cpu; /* CPU number */ int cpu; /* CPU number */
pthread_mutex_t mutex; /* For synchronization */ sem_t done; /* For synchronization */
}; };
/**************************************************************************** /****************************************************************************
@ -159,7 +160,7 @@ static void *sim_idle_trampoline(void *arg)
/* Let up_cpu_start() continue */ /* Let up_cpu_start() continue */
pthread_mutex_unlock(&cpuinfo->mutex); sem_post(&cpuinfo->done);
/* up_cpu_started() is logically a part of this function but needs to be /* up_cpu_started() is logically a part of this function but needs to be
* inserted in the path because in needs to access NuttX domain definition. * inserted in the path because in needs to access NuttX domain definition.
@ -344,19 +345,10 @@ int up_cpu_start(int cpu)
/* Initialize the CPU info */ /* Initialize the CPU info */
cpuinfo.cpu = cpu; cpuinfo.cpu = cpu;
ret = pthread_mutex_init(&cpuinfo.mutex, NULL); ret = sem_init(&cpuinfo.done, 0, 0);
if (ret != 0) if (ret != 0)
{ {
return -ret; /* REVISIT: That is a host errno value. */ return -errno; /* REVISIT: That is a host errno value. */
}
/* Lock the mutex */
ret = pthread_mutex_lock(&cpuinfo.mutex);
if (ret != 0)
{
ret = -ret; /* REVISIT: This is a host errno value. */
goto errout_with_mutex;
} }
/* Start the CPU emulation thread. This is analogous to starting the CPU /* Start the CPU emulation thread. This is analogous to starting the CPU
@ -368,24 +360,19 @@ int up_cpu_start(int cpu)
if (ret != 0) if (ret != 0)
{ {
ret = -ret; /* REVISIT: That is a host errno value. */ ret = -ret; /* REVISIT: That is a host errno value. */
goto errout_with_lock; goto errout_with_sem;
} }
/* Try to lock the mutex again. This will block until the pthread unlocks /* This will block until the pthread post the semaphore */
* the mutex.
*/
ret = pthread_mutex_lock(&cpuinfo.mutex); ret = sem_wait(&cpuinfo.done);
if (ret != 0) if (ret != 0)
{ {
ret = -ret; /* REVISIT: That is a host errno value. */ ret = -errno; /* REVISIT: That is a host errno value. */
} }
errout_with_lock: errout_with_sem:
pthread_mutex_unlock(&cpuinfo.mutex); sem_destroy(&cpuinfo.done);
errout_with_mutex:
pthread_mutex_destroy(&cpuinfo.mutex);
return ret; return ret;
} }