diff options
| -rw-r--r-- | cpukit/ChangeLog | 9 | ||||
| -rw-r--r-- | cpukit/libmisc/monitor/mon-monitor.c | 13 | ||||
| -rw-r--r-- | cpukit/libmisc/monitor/mon-object.c | 11 | ||||
| -rw-r--r-- | cpukit/libmisc/monitor/monitor.h | 5 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/main_chmod.c | 1 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/main_tty.c | 1 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/main_umask.c | 1 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/main_whoami.c | 1 |
8 files changed, 36 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 22419048d2..5fa3751e55 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,12 @@ +2008-07-17 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libmisc/monitor/mon-monitor.c, libmisc/monitor/mon-object.c, + libmisc/monitor/monitor.h, libmisc/shell/main_chmod.c, + libmisc/shell/main_tty.c, libmisc/shell/main_umask.c, + libmisc/shell/main_whoami.c: Add pthread command to monitor when + POSIX is enabled. Remove include of rtems/monitor.h from files not + related. + 2008-07-16 Till Straumann <strauman@slac.stanford.edu> * score/cpu/powerpc/rtems/new-exceptions/cpu.h: diff --git a/cpukit/libmisc/monitor/mon-monitor.c b/cpukit/libmisc/monitor/mon-monitor.c index 19b51e37c0..344ded3394 100644 --- a/cpukit/libmisc/monitor/mon-monitor.c +++ b/cpukit/libmisc/monitor/mon-monitor.c @@ -248,6 +248,17 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { { .monitor_command_entry = rtems_monitor_commands }, &rtems_monitor_commands[21], }, +#ifdef RTEMS_POSIX_API + { "pthread", + "Display information about the specified pthreads. " + "Default is to display information about all pthreads on this node.\n" + " pthread [id [id ...] ]", + 0, + rtems_monitor_object_cmd, + { RTEMS_MONITOR_OBJECT_PTHREAD }, + &rtems_monitor_commands[22], + }, +#endif #ifdef CPU_INVOKE_DEBUGGER { "debugger", "Enter the debugger, if possible. " @@ -255,7 +266,7 @@ rtems_monitor_command_entry_t rtems_monitor_commands[] = { 0, rtems_monitor_debugger_cmd, { 0 }, - &rtems_monitor_commands[22], + &rtems_monitor_commands[23], }, #endif { 0, 0, 0, 0, { 0 }, &rtems_registered_commands }, diff --git a/cpukit/libmisc/monitor/mon-object.c b/cpukit/libmisc/monitor/mon-object.c index 3087b4abb2..72cc3bfc9d 100644 --- a/cpukit/libmisc/monitor/mon-object.c +++ b/cpukit/libmisc/monitor/mon-object.c @@ -22,6 +22,9 @@ #define __RTEMS_VIOLATE_KERNEL_VISIBILITY__ #include <rtems.h> #include <rtems/monitor.h> +#if defined(RTEMS_POSIX_API) + #include <rtems/posix/pthread.h> +#endif #include <stdio.h> #include <stdlib.h> /* strtoul() */ @@ -124,6 +127,14 @@ rtems_monitor_object_info_t rtems_monitor_object_info[] = (rtems_monitor_object_dump_header_fn) rtems_monitor_driver_dump_header, (rtems_monitor_object_dump_fn) rtems_monitor_driver_dump, }, + { RTEMS_MONITOR_OBJECT_PTHREAD, + (void *) &_POSIX_Threads_Information, + sizeof(rtems_monitor_task_t), + (rtems_monitor_object_next_fn) rtems_monitor_manager_next, + (rtems_monitor_object_canonical_fn) rtems_monitor_task_canonical, + (rtems_monitor_object_dump_header_fn) rtems_monitor_task_dump_header, + (rtems_monitor_object_dump_fn) rtems_monitor_task_dump, + }, }; /* diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/libmisc/monitor/monitor.h index fb40bcefd6..2a56be7e55 100644 --- a/cpukit/libmisc/monitor/monitor.h +++ b/cpukit/libmisc/monitor/monitor.h @@ -44,7 +44,10 @@ typedef enum { RTEMS_MONITOR_OBJECT_CONFIG, RTEMS_MONITOR_OBJECT_INIT_TASK, RTEMS_MONITOR_OBJECT_MPCI, - RTEMS_MONITOR_OBJECT_SYMBOL + RTEMS_MONITOR_OBJECT_SYMBOL, + #if defined(RTEMS_POSIX_API) + RTEMS_MONITOR_OBJECT_PTHREAD, + #endif } rtems_monitor_object_type_t; /* diff --git a/cpukit/libmisc/shell/main_chmod.c b/cpukit/libmisc/shell/main_chmod.c index 053da1d5a3..50ad4d9ba3 100644 --- a/cpukit/libmisc/shell/main_chmod.c +++ b/cpukit/libmisc/shell/main_chmod.c @@ -24,7 +24,6 @@ #include <sys/stat.h> #include <rtems.h> -#include <rtems/monitor.h> #include <rtems/shell.h> #include "internal.h" diff --git a/cpukit/libmisc/shell/main_tty.c b/cpukit/libmisc/shell/main_tty.c index 185478bc28..a7dcd6630f 100644 --- a/cpukit/libmisc/shell/main_tty.c +++ b/cpukit/libmisc/shell/main_tty.c @@ -22,7 +22,6 @@ #include <errno.h> #include <rtems.h> -#include <rtems/monitor.h> #include <rtems/shell.h> #include "internal.h" diff --git a/cpukit/libmisc/shell/main_umask.c b/cpukit/libmisc/shell/main_umask.c index 4dd35f1af4..d6a9b7ae17 100644 --- a/cpukit/libmisc/shell/main_umask.c +++ b/cpukit/libmisc/shell/main_umask.c @@ -24,7 +24,6 @@ #include <sys/stat.h> #include <rtems.h> -#include <rtems/monitor.h> #include <rtems/shell.h> #include "internal.h" diff --git a/cpukit/libmisc/shell/main_whoami.c b/cpukit/libmisc/shell/main_whoami.c index 5a5c51e965..b0c94910f0 100644 --- a/cpukit/libmisc/shell/main_whoami.c +++ b/cpukit/libmisc/shell/main_whoami.c @@ -23,7 +23,6 @@ #include <pwd.h> #include <rtems.h> -#include <rtems/monitor.h> #include <rtems/shell.h> #include "internal.h" |