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

testing/smp: Replace up_cpu_index with sched_getcpu

Browse Source
This commit is contained in:
Xiang Xiao 2020-02-09 14:57:06 +08:00 committed by Gregory Nutt
parent d2e1c8a4f3
commit 4a13a0893f
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
testing/smp/smp_main.c
View File

@ -37,6 +37,7 @@
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
#include <sched.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -56,10 +57,7 @@
****************************************************************************/ ****************************************************************************/
static pthread_barrier_t g_smp_barrier; static pthread_barrier_t g_smp_barrier;
#if defined(CONFIG_SMP) && defined(CONFIG_BUILD_FLAT)
static volatile int g_thread_cpu[CONFIG_TESTING_SMP_NBARRIER_THREADS+1]; static volatile int g_thread_cpu[CONFIG_TESTING_SMP_NBARRIER_THREADS+1];
#endif
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
@ -74,18 +72,15 @@ static volatile int g_thread_cpu[CONFIG_TESTING_SMP_NBARRIER_THREADS+1];
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_SMP) && defined(CONFIG_BUILD_FLAT)
int up_cpu_index(void);
static void show_cpu(FAR const char *caller, int threadno) static void show_cpu(FAR const char *caller, int threadno)
{ {
g_thread_cpu[threadno] = up_cpu_index(); g_thread_cpu[threadno] = sched_getcpu();
printf("%s[%d]: Running on CPU%d\n", caller, threadno, g_thread_cpu[threadno]); printf("%s[%d]: Running on CPU%d\n", caller, threadno, g_thread_cpu[threadno]);
} }
static void show_cpu_conditional(FAR const char *caller, int threadno) static void show_cpu_conditional(FAR const char *caller, int threadno)
{ {
int cpu = up_cpu_index(); int cpu = sched_getcpu();
if (cpu != g_thread_cpu[threadno]) if (cpu != g_thread_cpu[threadno])
{ {
@ -93,10 +88,6 @@ static void show_cpu_conditional(FAR const char *caller, int threadno)
printf("%s[%d]: Now running on CPU%d\n", caller, threadno, cpu); printf("%s[%d]: Now running on CPU%d\n", caller, threadno, cpu);
} }
} }
#else
# define show_cpu(c)
# define show_cpu_conditional(c)
#endif
/**************************************************************************** /****************************************************************************
* Name: hog_milliseconds * Name: hog_milliseconds
@ -232,9 +223,7 @@ int main(int argc, FAR char *argv[])
memset(threadid, 0, sizeof(pthread_t) * CONFIG_TESTING_SMP_NBARRIER_THREADS); memset(threadid, 0, sizeof(pthread_t) * CONFIG_TESTING_SMP_NBARRIER_THREADS);
for (i = 0; i <= CONFIG_TESTING_SMP_NBARRIER_THREADS; i++) for (i = 0; i <= CONFIG_TESTING_SMP_NBARRIER_THREADS; i++)
{ {
#if defined(CONFIG_SMP) && defined(CONFIG_BUILD_FLAT)
g_thread_cpu[i] = IMPOSSIBLE_CPU; g_thread_cpu[i] = IMPOSSIBLE_CPU;
#endif
if (i < CONFIG_TESTING_SMP_NBARRIER_THREADS) if (i < CONFIG_TESTING_SMP_NBARRIER_THREADS)
{ {
threadid[i] = 0; threadid[i] = 0;