Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 09:18:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

arch/sim: Use pthread_cond for signalling CPU initialisation done

Browse Source 
## Summary of changes

On OSX with CONFIG_SMP=y the semaphore which notifies that the CPU is
initialised, is not created and the up_cpu_start() returns with error
from sem_init(). This patch fixes the problem by using pthread_cond_t
signalling mechanism which is supported on Mac.

Signed-off-by: Sebastian Ene <nuttx@fitbit.com>
This commit is contained in:
Sebastian Ene
2020-09-04 11:54:57 +03:00
committed by Xiang Xiao
parent 719246eddc
commit 5beb32bf0b
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/sim/src/sim/up_simsmp.c
+26 -15
View File
@@ -39,7 +39,8 @@
#include <stdint.h>
#include <pthread.h>
#include <semaphore.h>
#include <stdlib.h>
#include <stdbool.h>
#include <signal.h>
#include <sched.h>
#include <errno.h>
@@ -52,8 +53,10 @@
struct sim_cpuinfo_s
{
int cpu; /* CPU number */
sem_t done; /* For synchronization */
int cpu; /* CPU number */
pthread_cond_t cpu_init_done; /* For synchronization */
pthread_mutex_t cpu_init_lock;
bool is_cpu_initialized;
};
/****************************************************************************
@@ -145,7 +148,12 @@ static void *sim_idle_trampoline(void *arg)
/* Let up_cpu_start() continue */
sem_post(&cpuinfo->done);
pthread_mutex_lock(&cpuinfo->cpu_init_lock);
cpuinfo->is_cpu_initialized = true;
pthread_cond_signal(&cpuinfo->cpu_init_done);
pthread_mutex_unlock(&cpuinfo->cpu_init_lock);
/* 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.
@@ -324,11 +332,10 @@ int up_cpu_start(int cpu)
/* Initialize the CPU info */
cpuinfo.cpu = cpu;
ret = sem_init(&cpuinfo.done, 0, 0);
if (ret != 0)
{
return -errno; /* REVISIT: That is a host errno value. */
}
cpuinfo.is_cpu_initialized = false;
pthread_mutex_init(&cpuinfo.cpu_init_lock, NULL);
pthread_cond_init(&cpuinfo.cpu_init_done, NULL);
/* Start the CPU emulation thread. This is analogous to starting the CPU
* in a multi-CPU hardware model.
@@ -339,19 +346,23 @@ int up_cpu_start(int cpu)
if (ret != 0)
{
ret = -ret; /* REVISIT: That is a host errno value. */
goto errout_with_sem;
goto errout_with_cond;
}
/* This will block until the pthread post the semaphore */
ret = sem_wait(&cpuinfo.done);
if (ret != 0)
pthread_mutex_lock(&cpuinfo.cpu_init_lock);
while (!cpuinfo.is_cpu_initialized)
{
ret = -errno; /* REVISIT: That is a host errno value. */
pthread_cond_wait(&cpuinfo.cpu_init_done, &cpuinfo.cpu_init_lock);
}
errout_with_sem:
sem_destroy(&cpuinfo.done);
pthread_mutex_unlock(&cpuinfo.cpu_init_lock);
errout_with_cond:
pthread_mutex_destroy(&cpuinfo.cpu_init_lock);
pthread_cond_destroy(&cpuinfo.cpu_init_done);
return ret;
}