diff options
| -rw-r--r-- | cpukit/ChangeLog | 8 | ||||
| -rw-r--r-- | cpukit/libmisc/Makefile.am | 3 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/extern-dd.h | 6 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/main_time.c | 84 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/shellconfig.h | 2 |
5 files changed, 99 insertions, 4 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index b8c36dd7c2..74ca83ffba 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2009-06-17 Chris Johns <chrisj@rtems.org> + + * libmisc/shell/extern-dd.h: Delcare the conv arrays extern to + stop PPC link errors. + * libmisc/shell/main_time.c, libmisc/Makefile.am, + libmisc/shell/shellconfig.h: Add a time command. + + * libmisc/shell/shellconfig.h, 2009-06-16 Joel Sherrill <joel.sherrill@oarcorp.com> * include/rtems/bspIo.h, libcsupport/Makefile.am: Add putk(). diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index 6b389d5e50..ef8192ff16 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -90,7 +90,8 @@ libshell_a_SOURCES = shell/cat_file.c shell/cmds.c shell/internal.h \ shell/dd-args.c shell/main_dd.c shell/dd-conv.c shell/dd-conv_tab.c shell/dd-misc.c \ shell/dd-position.c \ shell/main_hexdump.c shell/hexdump-conv.c shell/hexdump-display.c \ - shell/hexdump-odsyntax.c shell/hexdump-parse.c shell/hexsyntax.c + shell/hexdump-odsyntax.c shell/hexdump-parse.c shell/hexsyntax.c \ + shell/main_time.c if LIBNETWORKING libshell_a_SOURCES += shell/main_mount_ftp.c shell/main_mount_tftp.c \ diff --git a/cpukit/libmisc/shell/extern-dd.h b/cpukit/libmisc/shell/extern-dd.h index 25f9c02030..405d460ef3 100644 --- a/cpukit/libmisc/shell/extern-dd.h +++ b/cpukit/libmisc/shell/extern-dd.h @@ -95,9 +95,9 @@ void terminate(int); void unblock(rtems_shell_dd_globals* globals); void unblock_close(rtems_shell_dd_globals* globals); -const u_char a2e_32V[256], a2e_POSIX[256]; -const u_char e2a_32V[256], e2a_POSIX[256]; -const u_char a2ibm_32V[256], a2ibm_POSIX[256]; +extern const u_char a2e_32V[256], a2e_POSIX[256]; +extern const u_char e2a_32V[256], e2a_POSIX[256]; +extern const u_char a2ibm_32V[256], a2ibm_POSIX[256]; void rtems_shell_dd_exit(rtems_shell_dd_globals* globals, int code); diff --git a/cpukit/libmisc/shell/main_time.c b/cpukit/libmisc/shell/main_time.c new file mode 100644 index 0000000000..0e433484a9 --- /dev/null +++ b/cpukit/libmisc/shell/main_time.c @@ -0,0 +1,84 @@ +/* + * Time Shell Command Implmentation + * + * Author: Chris Johns <chrisj@rtems.org> + * + * 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 <unistd.h> +#include <string.h> +#include <errno.h> +#include <sys/types.h> +#include <sys/stat.h> + +#include <rtems.h> +#include <rtems/shell.h> +#include "internal.h" + +int rtems_shell_main_time( + int argc, + char *argv[] +) +{ + rtems_shell_cmd_t* shell_cmd; + int errorlevel = 0; + struct timespec start; + struct timespec end; + struct timespec period; + rtems_status_code sc; + + argc--; + + sc = rtems_clock_get_uptime(&start); + if (sc != RTEMS_SUCCESSFUL) + printf("error: cannot read time\n"); + + if (argc) { + shell_cmd = rtems_shell_lookup_cmd(argv[1]); + if ( argv[1] == NULL ) { + errorlevel = -1; + } else if ( shell_cmd == NULL ) { + errorlevel = rtems_shell_script_file(argc, &argv[1]); + } else { + errorlevel = shell_cmd->command(argc, &argv[1]); + } + } + + sc = rtems_clock_get_uptime(&end); + if (sc != RTEMS_SUCCESSFUL) + printf("error: cannot read time\n"); + + period.tv_sec = end.tv_sec - start.tv_sec; + period.tv_nsec = end.tv_nsec - start.tv_nsec; + if (period.tv_nsec < 0) + { + --period.tv_sec; + period.tv_nsec += 1000000000UL; + } + + printf("time: %li:%02li:%02li.%03li\n", + period.tv_sec / 3600, + period.tv_sec / 60, period.tv_sec % 60, + period.tv_nsec / 1000000); + + return errorlevel; +} + +rtems_shell_cmd_t rtems_shell_TIME_Command = { + "time", /* name */ + "time command [arguments...]", /* usage */ + "misc", /* topic */ + rtems_shell_main_time, /* command */ + NULL, /* alias */ + NULL /* next */ +}; diff --git a/cpukit/libmisc/shell/shellconfig.h b/cpukit/libmisc/shell/shellconfig.h index 2de3a38f7c..c9f9d4e9b7 100644 --- a/cpukit/libmisc/shell/shellconfig.h +++ b/cpukit/libmisc/shell/shellconfig.h @@ -21,6 +21,7 @@ */ extern rtems_shell_cmd_t rtems_shell_HELP_Command; extern rtems_shell_cmd_t rtems_shell_ALIAS_Command; +extern rtems_shell_cmd_t rtems_shell_TIME_Command; extern rtems_shell_cmd_t rtems_shell_LOGOFF_Command; extern rtems_shell_cmd_t rtems_shell_MDUMP_Command; @@ -147,6 +148,7 @@ extern rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[]; */ &rtems_shell_HELP_Command, &rtems_shell_ALIAS_Command, + &rtems_shell_TIME_Command, /* * Common commands that can be optional |