From e340e9652d1586fd6990f8bb5119c1c14e332385 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 26 May 2014 12:46:20 -0500 Subject: current_cpu is now a shared SMP command --- schedsim/shell/schedsim_smppriority/Makefile.am | 1 - .../schedsim_smppriority_affinity/Makefile.am | 1 - schedsim/shell/schedsim_smpsimple/Makefile.am | 1 - schedsim/shell/schedsim_smpsimple/add_commands.c | 9 ---- .../shell/schedsim_smpsimple/main_current_cpu.c | 46 ----------------- schedsim/shell/shared/Makefile.am | 1 + schedsim/shell/shared/commands.c | 2 + schedsim/shell/shared/main_currentcpu.c | 60 ++++++++++++++++++++++ 8 files changed, 63 insertions(+), 58 deletions(-) delete mode 100644 schedsim/shell/schedsim_smpsimple/main_current_cpu.c create mode 100644 schedsim/shell/shared/main_currentcpu.c diff --git a/schedsim/shell/schedsim_smppriority/Makefile.am b/schedsim/shell/schedsim_smppriority/Makefile.am index fb63c09..16bba41 100644 --- a/schedsim/shell/schedsim_smppriority/Makefile.am +++ b/schedsim/shell/schedsim_smppriority/Makefile.am @@ -2,7 +2,6 @@ bin_PROGRAMS = schedsim_smppriority SOURCES = config.c SOURCES += $(srcdir)/../schedsim_smpsimple/add_commands.c -SOURCES += $(srcdir)/../schedsim_smpsimple/main_current_cpu.c SOURCES += $(srcdir)/../schedsim_smpsimple/main_dispatch.c SOURCES += $(srcdir)/../schedsim_smpsimple/main_dump_ready_tasks.c SOURCES += $(srcdir)/../schedsim_smpsimple/printheir_executing.c diff --git a/schedsim/shell/schedsim_smppriority_affinity/Makefile.am b/schedsim/shell/schedsim_smppriority_affinity/Makefile.am index 986be66..839d9d4 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/Makefile.am +++ b/schedsim/shell/schedsim_smppriority_affinity/Makefile.am @@ -2,7 +2,6 @@ bin_PROGRAMS = schedsim_smppriority_affinity SOURCES = config.c SOURCES += $(srcdir)/../schedsim_smpsimple/add_commands.c -SOURCES += $(srcdir)/../schedsim_smpsimple/main_current_cpu.c SOURCES += $(srcdir)/../schedsim_smpsimple/main_dispatch.c SOURCES += $(srcdir)/../schedsim_smpsimple/main_dump_ready_tasks.c SOURCES += $(srcdir)/../schedsim_smpsimple/printheir_executing.c diff --git a/schedsim/shell/schedsim_smpsimple/Makefile.am b/schedsim/shell/schedsim_smpsimple/Makefile.am index d85d554..a7c7237 100644 --- a/schedsim/shell/schedsim_smpsimple/Makefile.am +++ b/schedsim/shell/schedsim_smpsimple/Makefile.am @@ -2,7 +2,6 @@ bin_PROGRAMS = schedsim_smpsimple schedsim_smpsimple_SOURCES = schedsim_smpsimple_SOURCES += add_commands.c schedsim_smpsimple_SOURCES += config.c -schedsim_smpsimple_SOURCES += main_current_cpu.c schedsim_smpsimple_SOURCES += main_dispatch.c schedsim_smpsimple_SOURCES += main_dump_ready_tasks.c schedsim_smpsimple_SOURCES += printheir_executing.c diff --git a/schedsim/shell/schedsim_smpsimple/add_commands.c b/schedsim/shell/schedsim_smpsimple/add_commands.c index ad1dde2..f975da7 100644 --- a/schedsim/shell/schedsim_smpsimple/add_commands.c +++ b/schedsim/shell/schedsim_smpsimple/add_commands.c @@ -18,7 +18,6 @@ #include "rtems_sched.h" extern int main_dump_ready_tasks(int argc, char **argv); -extern int main_set_current_cpu(int argc, char **argv); extern int main_dispatch(int argc, char **argv); void add_commands(void) @@ -33,14 +32,6 @@ void add_commands(void) ); assert( cmd ); - cmd = rtems_shell_add_cmd( - "current_cpu", - "rtems", - "number", - main_set_current_cpu - ); - assert( cmd ); - cmd = rtems_shell_add_cmd( "dispatch", "rtems", diff --git a/schedsim/shell/schedsim_smpsimple/main_current_cpu.c b/schedsim/shell/schedsim_smpsimple/main_current_cpu.c deleted file mode 100644 index 8a4a6cc..0000000 --- a/schedsim/shell/schedsim_smpsimple/main_current_cpu.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * COPYRIGHT (c) 1989-2013. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - */ - -#include -#include -#include -#include -#include - -#include "shell.h" -#include "rtems_sched.h" - -#include -#include -#include -#include - -extern uint32_t Schedsim_Current_cpu; - -int main_set_current_cpu(int argc, char **argv) -{ - long cpu; - - if ( argc >= 2 ) { - if ( rtems_string_to_long(argv[1], &cpu, NULL, 0) ) { - printf( "CPU argument (%s) is not a number\n", argv[1] ); - return -1; - } - printf( - "Changing current CPU from %d to %d\n", - Schedsim_Current_cpu, - cpu - ); - Schedsim_Current_cpu = cpu; - } else { - printf( "Current CPU is %d\n", Schedsim_Current_cpu ); - } - - return 0; -} diff --git a/schedsim/shell/shared/Makefile.am b/schedsim/shell/shared/Makefile.am index 846497f..c90824e 100644 --- a/schedsim/shell/shared/Makefile.am +++ b/schedsim/shell/shared/Makefile.am @@ -53,6 +53,7 @@ libschedsim_a_SOURCES += shell_cmdset.c libschedsim_a_SOURCES += shell_makeargs.c if HAS_SMP libschedsim_a_SOURCES += smp_stub.c +libschedsim_a_SOURCES += main_currentcpu.c libschedsim_a_SOURCES += main_taskgetaffinity.c libschedsim_a_SOURCES += main_tasksetaffinity.c endif diff --git a/schedsim/shell/shared/commands.c b/schedsim/shell/shared/commands.c index 457ec9f..483c7ef 100644 --- a/schedsim/shell/shared/commands.c +++ b/schedsim/shell/shared/commands.c @@ -34,6 +34,7 @@ extern rtems_shell_cmd_t rtems_shell_TASK_WAKE_AFTER_Command; #if RTEMS_SMP extern rtems_shell_cmd_t rtems_shell_TASK_GET_AFFINITY_Command; extern rtems_shell_cmd_t rtems_shell_TASK_SET_AFFINITY_Command; + extern rtems_shell_cmd_t rtems_shell_CURRENT_CPU_Command; #endif extern rtems_shell_cmd_t rtems_shell_CLOCK_TICK_Command; @@ -65,6 +66,7 @@ rtems_shell_cmd_t *rtems_shell_Initial_commands[] = { #if RTEMS_SMP &rtems_shell_TASK_GET_AFFINITY_Command, &rtems_shell_TASK_SET_AFFINITY_Command, + &rtems_shell_CURRENT_CPU_Command, #endif &rtems_shell_CLOCK_TICK_Command, diff --git a/schedsim/shell/shared/main_currentcpu.c b/schedsim/shell/shared/main_currentcpu.c new file mode 100644 index 0000000..06a031a --- /dev/null +++ b/schedsim/shell/shared/main_currentcpu.c @@ -0,0 +1,60 @@ +/** + * @file + * @brief current_cpu Command in Scheduler Simulator + */ + +/* + * COPYRIGHT (c) 1989-2014. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + */ + +#include +#include +#include +#include +#include + +#include "shell.h" +#include "rtems_sched.h" + +#include +#include +#include +#include + +extern uint32_t Schedsim_Current_cpu; + +int rtems_shell_main_current_cpu(int argc, char **argv) +{ + long cpu; + + if ( argc >= 2 ) { + if ( rtems_string_to_long(argv[1], &cpu, NULL, 0) ) { + printf( "CPU argument (%s) is not a number\n", argv[1] ); + return -1; + } + printf( + "Changing current CPU from %d to %d\n", + Schedsim_Current_cpu, + cpu + ); + Schedsim_Current_cpu = cpu; + } else { + printf( "Current CPU is %d\n", Schedsim_Current_cpu ); + } + + return 0; +} + +rtems_shell_cmd_t rtems_shell_CURRENT_CPU_Command = { + "current_cpu", /* name */ + "current_cpu [cpu]", /* usage */ + "rtems", /* topic */ + rtems_shell_main_current_cpu, /* command */ + NULL, /* alias */ + NULL /* next */ +}; -- cgit v1.2.3