2007-09-04 Joel Sherrill <joel.sherrill@oarcorp.com>

* libmisc/monitor/mon-monitor.c, libmisc/monitor/mon-object.c,
	libmisc/monitor/monitor.h: Merge minor parts of Thomas' improvements
	that are needed by osmonweb.
This commit is contained in:
Joel Sherrill
2007-09-04 23:19:47 +00:00
parent 5fb9e2fc36
commit 70443b4034
4 changed files with 30 additions and 17 deletions

View File

@@ -1,3 +1,9 @@
2007-09-04 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/monitor/mon-monitor.c, libmisc/monitor/mon-object.c,
libmisc/monitor/monitor.h: Merge minor parts of Thomas' improvements
that are needed by osmonweb.
2007-09-04 Joel Sherrill <joel.sherrill@oarcorp.com> 2007-09-04 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/untar/untar.c, libmisc/untar/untar.h: Add const to char *. * libmisc/untar/untar.c, libmisc/untar/untar.h: Add const to char *.

View File

@@ -578,16 +578,15 @@ rtems_monitor_init(
if (monitor_flags & RTEMS_MONITOR_GLOBAL) if (monitor_flags & RTEMS_MONITOR_GLOBAL)
rtems_monitor_server_init(monitor_flags); rtems_monitor_server_init(monitor_flags);
if (!(monitor_flags & RTEMS_MONITOR_NOTASK)) {
/* /*
* Start the monitor task itself * Start the monitor task itself
*/ */
status = rtems_task_start(
status = rtems_task_start(rtems_monitor_task_id, rtems_monitor_task_id, rtems_monitor_task, monitor_flags);
rtems_monitor_task, if (status != RTEMS_SUCCESSFUL) {
monitor_flags);
if (status != RTEMS_SUCCESSFUL)
{
rtems_error(status, "could not start monitor"); rtems_error(status, "could not start monitor");
return; return;
} }
} }
}

View File

@@ -52,7 +52,9 @@ typedef enum {
#define RTEMS_MONITOR_SUSPEND 0x0001 /* suspend monitor on startup */ #define RTEMS_MONITOR_SUSPEND 0x0001 /* suspend monitor on startup */
#define RTEMS_MONITOR_GLOBAL 0x0002 /* monitor should be global */ #define RTEMS_MONITOR_GLOBAL 0x0002 /* monitor should be global */
#define RTEMS_MONITOR_NOTASK 0x0004 /* do not start monitor task */
#define RTEMS_MONITOR_NOSYMLOAD 0x0008 /* do not load symbols */
#define RTEMS_MONITOR_WAITQUIT 0x0010 /* wait for monitor task to terminate */
/* /*
* Public interfaces for RTEMS data structures monitor is aware of. * Public interfaces for RTEMS data structures monitor is aware of.
@@ -428,6 +430,12 @@ uint32_t rtems_monitor_symbol_dump(rtems_monitor_symbol_t *, boolean);
void rtems_monitor_symbol_cmd(int, char **, rtems_monitor_command_arg_t*, boolean); void rtems_monitor_symbol_cmd(int, char **, rtems_monitor_command_arg_t*, boolean);
/* mon-object.c */
rtems_monitor_object_info_t *rtems_monitor_object_lookup(
rtems_monitor_object_type_t type
);
/* shared data */
extern rtems_symbol_table_t *rtems_monitor_symbols; extern rtems_symbol_table_t *rtems_monitor_symbols;
/* FIXME: This should not be here */ /* FIXME: This should not be here */