diff options
-rw-r--r-- | cpukit/ChangeLog | 33 | ||||
-rw-r--r-- | cpukit/libmisc/Makefile.am | 23 | ||||
-rw-r--r-- | cpukit/libmisc/shell/cat_file.c | 4 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_alias.c (renamed from cpukit/libmisc/shell/cmd_alias.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_cat.c (renamed from cpukit/libmisc/shell/cmd_cat.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_cd.c (renamed from cpukit/libmisc/shell/cmd_cd.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_chdir.c (renamed from cpukit/libmisc/shell/cmd_chdir.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_chmod.c (renamed from cpukit/libmisc/shell/cmd_chmod.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_chroot.c (renamed from cpukit/libmisc/shell/cmd_chroot.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_cpuuse.c | 42 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_date.c (renamed from cpukit/libmisc/shell/cmd_date.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_dir.c (renamed from cpukit/libmisc/shell/cmd_dir.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_exit.c (renamed from cpukit/libmisc/shell/cmd_exit.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_help.c (renamed from cpukit/libmisc/shell/cmd_help.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_id.c (renamed from cpukit/libmisc/shell/cmd_id.c) | 2 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_logoff.c (renamed from cpukit/libmisc/shell/cmd_logoff.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_ls.c (renamed from cpukit/libmisc/shell/cmd_ls.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_mallocdump.c (renamed from cpukit/libmisc/shell/cmd_mallocdump.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_mdump.c (renamed from cpukit/libmisc/shell/cmd_mdump.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_medit.c (renamed from cpukit/libmisc/shell/cmd_medit.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_mfill.c (renamed from cpukit/libmisc/shell/cmd_mfill.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_mkdir.c (renamed from cpukit/libmisc/shell/cmd_mkdir.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_mmove.c (renamed from cpukit/libmisc/shell/cmd_mmove.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_mwdump.c (renamed from cpukit/libmisc/shell/cmd_mwdump.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_pwd.c (renamed from cpukit/libmisc/shell/cmd_pwd.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_rm.c (renamed from cpukit/libmisc/shell/cmd_rm.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_rmdir.c (renamed from cpukit/libmisc/shell/cmd_rmdir.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_stackuse.c | 41 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_tty.c (renamed from cpukit/libmisc/shell/cmd_tty.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_umask.c (renamed from cpukit/libmisc/shell/cmd_umask.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/main_whoami.c (renamed from cpukit/libmisc/shell/cmd_whoami.c) | 0 | ||||
-rw-r--r-- | cpukit/libmisc/shell/shell_makeargs.c | 2 | ||||
-rw-r--r-- | cpukit/libmisc/shell/shellconfig.h | 19 |
33 files changed, 151 insertions, 15 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 9c404facc4..efb2ac2603 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,36 @@ +2007-12-14 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libmisc/Makefile.am, libmisc/shell/cat_file.c, + libmisc/shell/shell_makeargs.c, libmisc/shell/shellconfig.h: Rename + cmd_XXX.c to main_XXX.c. Add cpuuse and stackuse commands. + * libmisc/shell/main_alias.c, libmisc/shell/main_cat.c, + libmisc/shell/main_cd.c, libmisc/shell/main_chdir.c, + libmisc/shell/main_chmod.c, libmisc/shell/main_chroot.c, + libmisc/shell/main_cpuuse.c, libmisc/shell/main_date.c, + libmisc/shell/main_dir.c, libmisc/shell/main_exit.c, + libmisc/shell/main_help.c, libmisc/shell/main_id.c, + libmisc/shell/main_logoff.c, libmisc/shell/main_ls.c, + libmisc/shell/main_mallocdump.c, libmisc/shell/main_mdump.c, + libmisc/shell/main_medit.c, libmisc/shell/main_mfill.c, + libmisc/shell/main_mkdir.c, libmisc/shell/main_mmove.c, + libmisc/shell/main_mwdump.c, libmisc/shell/main_pwd.c, + libmisc/shell/main_rm.c, libmisc/shell/main_rmdir.c, + libmisc/shell/main_stackuse.c, libmisc/shell/main_tty.c, + libmisc/shell/main_umask.c, libmisc/shell/main_whoami.c: New files. + * libmisc/shell/cmd_alias.c, libmisc/shell/cmd_cat.c, + libmisc/shell/cmd_cd.c, libmisc/shell/cmd_chdir.c, + libmisc/shell/cmd_chmod.c, libmisc/shell/cmd_chroot.c, + libmisc/shell/cmd_date.c, libmisc/shell/cmd_dir.c, + libmisc/shell/cmd_exit.c, libmisc/shell/cmd_help.c, + libmisc/shell/cmd_id.c, libmisc/shell/cmd_logoff.c, + libmisc/shell/cmd_ls.c, libmisc/shell/cmd_mallocdump.c, + libmisc/shell/cmd_mdump.c, libmisc/shell/cmd_medit.c, + libmisc/shell/cmd_mfill.c, libmisc/shell/cmd_mkdir.c, + libmisc/shell/cmd_mmove.c, libmisc/shell/cmd_mwdump.c, + libmisc/shell/cmd_pwd.c, libmisc/shell/cmd_rm.c, + libmisc/shell/cmd_rmdir.c, libmisc/shell/cmd_tty.c, + libmisc/shell/cmd_umask.c, libmisc/shell/cmd_whoami.c: Removed. + 2007-12-14 Joel Sherrill <joel.sherrill@OARcorp.com> * score/Makefile.am: _Thread_Rotate_ready_queue is only used by ITRON diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index ae1e2dd1dd..bb9f4f5662 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -64,16 +64,19 @@ libmw_fb_a_SOURCES = mw-fb/mw_fb.c mw-fb/mw_uid.c mw-fb/mw_fb.h \ if LIBSHELL noinst_LIBRARIES += libshell.a -libshell_a_SOURCES = shell/cat_file.c shell/cmd_alias.c shell/cmd_cat.c \ - shell/cmd_cd.c shell/cmd_chdir.c shell/cmd_chmod.c shell/cmd_chroot.c \ - shell/cmd_date.c shell/cmd_dir.c shell/cmd_exit.c shell/cmd_help.c \ - shell/cmd_id.c shell/cmd_logoff.c shell/cmd_ls.c shell/cmd_mallocdump.c \ - shell/cmd_mdump.c shell/cmd_medit.c shell/cmd_mfill.c shell/cmd_mkdir.c \ - shell/cmd_mmove.c shell/cmd_mwdump.c shell/cmd_pwd.c shell/cmd_rm.c \ - shell/cmd_rmdir.c shell/cmds.c shell/cmd_tty.c shell/cmd_umask.c \ - shell/cmd_whoami.c shell/internal.h shell/shell.c shell/shellconfig.c \ - shell/shell_makeargs.c shell/shell_cmdset.c shell/write_file.c \ - shell/shellconfig.h shell/shell.h shell/str2int.c +libshell_a_SOURCES = shell/cat_file.c shell/cmds.c shell/internal.h \ + shell/main_alias.c shell/main_cat.c shell/main_cd.c \ + shell/main_chdir.c shell/main_chmod.c shell/main_chroot.c \ + shell/main_cpuuse.c shell/main_date.c shell/main_dir.c \ + shell/main_exit.c shell/main_help.c shell/main_id.c \ + shell/main_logoff.c shell/main_ls.c shell/main_mallocdump.c \ + shell/main_mdump.c shell/main_medit.c shell/main_mfill.c \ + shell/main_mkdir.c shell/main_mmove.c shell/main_mwdump.c \ + shell/main_pwd.c shell/main_rm.c shell/main_rmdir.c shell/main_stackuse.c \ + shell/main_tty.c shell/main_umask.c shell/main_whoami.c \ + shell/shell.c shell/shell_cmdset.c shell/shellconfig.c \ + shell/shellconfig.h shell/shell.h shell/shell_makeargs.c \ + shell/str2int.c shell/write_file.c endif EXTRA_DIST += shell/README diff --git a/cpukit/libmisc/shell/cat_file.c b/cpukit/libmisc/shell/cat_file.c index 70de2bb6ce..5bb7ffbee1 100644 --- a/cpukit/libmisc/shell/cat_file.c +++ b/cpukit/libmisc/shell/cat_file.c @@ -1,9 +1,7 @@ /* - * - * Instantatiate a new terminal shell. + * CAT Command Implementation * * Author: - * * WORK: fernando.ruiz@ctv.es * HOME: correo@fernando-ruiz.com * diff --git a/cpukit/libmisc/shell/cmd_alias.c b/cpukit/libmisc/shell/main_alias.c index e1efce84b5..e1efce84b5 100644 --- a/cpukit/libmisc/shell/cmd_alias.c +++ b/cpukit/libmisc/shell/main_alias.c diff --git a/cpukit/libmisc/shell/cmd_cat.c b/cpukit/libmisc/shell/main_cat.c index 58e8de9c55..58e8de9c55 100644 --- a/cpukit/libmisc/shell/cmd_cat.c +++ b/cpukit/libmisc/shell/main_cat.c diff --git a/cpukit/libmisc/shell/cmd_cd.c b/cpukit/libmisc/shell/main_cd.c index 31a7cfb075..31a7cfb075 100644 --- a/cpukit/libmisc/shell/cmd_cd.c +++ b/cpukit/libmisc/shell/main_cd.c diff --git a/cpukit/libmisc/shell/cmd_chdir.c b/cpukit/libmisc/shell/main_chdir.c index 64be1dd67c..64be1dd67c 100644 --- a/cpukit/libmisc/shell/cmd_chdir.c +++ b/cpukit/libmisc/shell/main_chdir.c diff --git a/cpukit/libmisc/shell/cmd_chmod.c b/cpukit/libmisc/shell/main_chmod.c index c3d0c5aade..c3d0c5aade 100644 --- a/cpukit/libmisc/shell/cmd_chmod.c +++ b/cpukit/libmisc/shell/main_chmod.c diff --git a/cpukit/libmisc/shell/cmd_chroot.c b/cpukit/libmisc/shell/main_chroot.c index e22e694ff0..e22e694ff0 100644 --- a/cpukit/libmisc/shell/cmd_chroot.c +++ b/cpukit/libmisc/shell/main_chroot.c diff --git a/cpukit/libmisc/shell/main_cpuuse.c b/cpukit/libmisc/shell/main_cpuuse.c new file mode 100644 index 0000000000..f70ccbbb21 --- /dev/null +++ b/cpukit/libmisc/shell/main_cpuuse.c @@ -0,0 +1,42 @@ +/* + * CPUUSE Command Implementation + * + * COPYRIGHT (c) 1989-2007. + * 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. + * + * $Id$ + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <stdio.h> + +#include <rtems.h> +#include <rtems/cpuuse.h> +#include <rtems/shell.h> +#include "internal.h" + +int main_cpuuse(int argc,char *argv[]) +{ + if ( argc >= 1 && !strcmp( argv[1], "-r" ) ) { + printf( "Resetting CPU Usage information\n" ); + rtems_cpu_usage_reset(); + } else + rtems_cpu_usage_report_with_plugin(stdout, (rtems_printk_plugin_t)fprintf); + return 0; +} + +shell_cmd_t Shell_CPUUSE_Command = { + "cpuuse", /* name */ + "[-r] print or reset per thread cpu usage", /* usage */ + "rtems", /* topic */ + main_cpuuse, /* command */ + NULL, /* alias */ + NULL /* next */ +}; diff --git a/cpukit/libmisc/shell/cmd_date.c b/cpukit/libmisc/shell/main_date.c index 7f6fdbb52b..7f6fdbb52b 100644 --- a/cpukit/libmisc/shell/cmd_date.c +++ b/cpukit/libmisc/shell/main_date.c diff --git a/cpukit/libmisc/shell/cmd_dir.c b/cpukit/libmisc/shell/main_dir.c index a41de05fb1..a41de05fb1 100644 --- a/cpukit/libmisc/shell/cmd_dir.c +++ b/cpukit/libmisc/shell/main_dir.c diff --git a/cpukit/libmisc/shell/cmd_exit.c b/cpukit/libmisc/shell/main_exit.c index 29225e0a11..29225e0a11 100644 --- a/cpukit/libmisc/shell/cmd_exit.c +++ b/cpukit/libmisc/shell/main_exit.c diff --git a/cpukit/libmisc/shell/cmd_help.c b/cpukit/libmisc/shell/main_help.c index 964b511b2b..964b511b2b 100644 --- a/cpukit/libmisc/shell/cmd_help.c +++ b/cpukit/libmisc/shell/main_help.c diff --git a/cpukit/libmisc/shell/cmd_id.c b/cpukit/libmisc/shell/main_id.c index 63db5a2c97..a8bbdd7d45 100644 --- a/cpukit/libmisc/shell/cmd_id.c +++ b/cpukit/libmisc/shell/main_id.c @@ -1,4 +1,6 @@ /* + * ID Command Implementation + * * Author: Fernando RUIZ CASAS * Work: fernando.ruiz@ctv.es * Home: correo@fernando-ruiz.com diff --git a/cpukit/libmisc/shell/cmd_logoff.c b/cpukit/libmisc/shell/main_logoff.c index 5653f7114b..5653f7114b 100644 --- a/cpukit/libmisc/shell/cmd_logoff.c +++ b/cpukit/libmisc/shell/main_logoff.c diff --git a/cpukit/libmisc/shell/cmd_ls.c b/cpukit/libmisc/shell/main_ls.c index 9dd9dff323..9dd9dff323 100644 --- a/cpukit/libmisc/shell/cmd_ls.c +++ b/cpukit/libmisc/shell/main_ls.c diff --git a/cpukit/libmisc/shell/cmd_mallocdump.c b/cpukit/libmisc/shell/main_mallocdump.c index e8050bc247..e8050bc247 100644 --- a/cpukit/libmisc/shell/cmd_mallocdump.c +++ b/cpukit/libmisc/shell/main_mallocdump.c diff --git a/cpukit/libmisc/shell/cmd_mdump.c b/cpukit/libmisc/shell/main_mdump.c index efb57303fc..efb57303fc 100644 --- a/cpukit/libmisc/shell/cmd_mdump.c +++ b/cpukit/libmisc/shell/main_mdump.c diff --git a/cpukit/libmisc/shell/cmd_medit.c b/cpukit/libmisc/shell/main_medit.c index ba59d0d8d8..ba59d0d8d8 100644 --- a/cpukit/libmisc/shell/cmd_medit.c +++ b/cpukit/libmisc/shell/main_medit.c diff --git a/cpukit/libmisc/shell/cmd_mfill.c b/cpukit/libmisc/shell/main_mfill.c index 4a8f3a4b3c..4a8f3a4b3c 100644 --- a/cpukit/libmisc/shell/cmd_mfill.c +++ b/cpukit/libmisc/shell/main_mfill.c diff --git a/cpukit/libmisc/shell/cmd_mkdir.c b/cpukit/libmisc/shell/main_mkdir.c index 5c9f365226..5c9f365226 100644 --- a/cpukit/libmisc/shell/cmd_mkdir.c +++ b/cpukit/libmisc/shell/main_mkdir.c diff --git a/cpukit/libmisc/shell/cmd_mmove.c b/cpukit/libmisc/shell/main_mmove.c index 522f6f69c3..522f6f69c3 100644 --- a/cpukit/libmisc/shell/cmd_mmove.c +++ b/cpukit/libmisc/shell/main_mmove.c diff --git a/cpukit/libmisc/shell/cmd_mwdump.c b/cpukit/libmisc/shell/main_mwdump.c index 9ba9fbb4f7..9ba9fbb4f7 100644 --- a/cpukit/libmisc/shell/cmd_mwdump.c +++ b/cpukit/libmisc/shell/main_mwdump.c diff --git a/cpukit/libmisc/shell/cmd_pwd.c b/cpukit/libmisc/shell/main_pwd.c index b33cef290e..b33cef290e 100644 --- a/cpukit/libmisc/shell/cmd_pwd.c +++ b/cpukit/libmisc/shell/main_pwd.c diff --git a/cpukit/libmisc/shell/cmd_rm.c b/cpukit/libmisc/shell/main_rm.c index 400521042e..400521042e 100644 --- a/cpukit/libmisc/shell/cmd_rm.c +++ b/cpukit/libmisc/shell/main_rm.c diff --git a/cpukit/libmisc/shell/cmd_rmdir.c b/cpukit/libmisc/shell/main_rmdir.c index 1525a450fe..1525a450fe 100644 --- a/cpukit/libmisc/shell/cmd_rmdir.c +++ b/cpukit/libmisc/shell/main_rmdir.c diff --git a/cpukit/libmisc/shell/main_stackuse.c b/cpukit/libmisc/shell/main_stackuse.c new file mode 100644 index 0000000000..d316bf3262 --- /dev/null +++ b/cpukit/libmisc/shell/main_stackuse.c @@ -0,0 +1,41 @@ +/* + * stackuse Command Implementation + * + * COPYRIGHT (c) 1989-2007. + * 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. + * + * $Id$ + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <stdio.h> + +#include <rtems.h> +#include <rtems/stackchk.h> +#include <rtems/shell.h> +#include "internal.h" + +int main_stackuse(int argc,char *argv[]) +{ + rtems_stack_checker_report_usage_with_plugin( + stdout, + (rtems_printk_plugin_t)fprintf + ); + return 0; +} + +shell_cmd_t Shell_STACKUSE_Command = { + "stackuse", /* name */ + "print per thread stack usage", /* usage */ + "rtems", /* topic */ + main_stackuse, /* command */ + NULL, /* alias */ + NULL /* next */ +}; diff --git a/cpukit/libmisc/shell/cmd_tty.c b/cpukit/libmisc/shell/main_tty.c index 7e1a4848e6..7e1a4848e6 100644 --- a/cpukit/libmisc/shell/cmd_tty.c +++ b/cpukit/libmisc/shell/main_tty.c diff --git a/cpukit/libmisc/shell/cmd_umask.c b/cpukit/libmisc/shell/main_umask.c index 677ded5ee4..677ded5ee4 100644 --- a/cpukit/libmisc/shell/cmd_umask.c +++ b/cpukit/libmisc/shell/main_umask.c diff --git a/cpukit/libmisc/shell/cmd_whoami.c b/cpukit/libmisc/shell/main_whoami.c index 1105772887..1105772887 100644 --- a/cpukit/libmisc/shell/cmd_whoami.c +++ b/cpukit/libmisc/shell/main_whoami.c diff --git a/cpukit/libmisc/shell/shell_makeargs.c b/cpukit/libmisc/shell/shell_makeargs.c index c73ff25745..216947b8c1 100644 --- a/cpukit/libmisc/shell/shell_makeargs.c +++ b/cpukit/libmisc/shell/shell_makeargs.c @@ -1,4 +1,6 @@ /* + * Split string into argc/argv style argument list + * * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * diff --git a/cpukit/libmisc/shell/shellconfig.h b/cpukit/libmisc/shell/shellconfig.h index c0275a3f00..e692fdd57c 100644 --- a/cpukit/libmisc/shell/shellconfig.h +++ b/cpukit/libmisc/shell/shellconfig.h @@ -45,6 +45,9 @@ extern shell_cmd_t Shell_CAT_Command; extern shell_cmd_t Shell_RM_Command; extern shell_cmd_t Shell_UMASK_Command; +extern shell_cmd_t Shell_CPUUSE_Command; +extern shell_cmd_t Shell_STACKUSE_Command; + extern shell_cmd_t Shell_MALLOC_DUMP_Command; extern shell_cmd_t *Shell_Initial_commands[]; @@ -59,8 +62,8 @@ extern shell_alias_t Shell_EXIT_Alias; extern shell_alias_t *Shell_Initial_aliases[]; /* - * If we are configured to alias a command, then make sure the underlying command - * is configured. + * If we are configured to alias a command, then make sure the underlying + * command is configured. */ #if !defined(CONFIGURE_SHELL_COMMANDS_ALL) @@ -204,6 +207,18 @@ extern shell_alias_t *Shell_Initial_aliases[]; #endif /* + * RTEMS Related commands + */ + #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + defined(CONFIGURE_SHELL_COMMAND_CPUUSE) + &Shell_CPUUSE_Command, + #endif + #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ + defined(CONFIGURE_SHELL_COMMAND_STACKUSE) + &Shell_STACKUSE_Command, + #endif + + /* * Malloc family commands */ #if defined(CONFIGURE_SHELL_COMMANDS_ALL) || \ |