summaryrefslogtreecommitdiffstats
path: root/cpukit/libmisc/monitor
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1995-09-29 17:19:16 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1995-09-29 17:19:16 +0000
commit11290355c9454c575d56c7928a725fd95e88d6f8 (patch)
tree1cd5ff063250cff764a59189f1e1956c40925a35 /cpukit/libmisc/monitor
parent1039ae4125ec70e3ff4de6147a62f681065c09d1 (diff)
downloadrtems-11290355c9454c575d56c7928a725fd95e88d6f8.tar.bz2
all targets compile .. tony's patches in place
Diffstat (limited to 'cpukit/libmisc/monitor')
-rw-r--r--cpukit/libmisc/monitor/mon-extension.c34
-rw-r--r--cpukit/libmisc/monitor/mon-symbols.c8
-rw-r--r--cpukit/libmisc/monitor/monitor.h16
3 files changed, 29 insertions, 29 deletions
diff --git a/cpukit/libmisc/monitor/mon-extension.c b/cpukit/libmisc/monitor/mon-extension.c
index 230fab9ddf..481a21e7dd 100644
--- a/cpukit/libmisc/monitor/mon-extension.c
+++ b/cpukit/libmisc/monitor/mon-extension.c
@@ -1,5 +1,5 @@
/*
- * @(#)extension.c 1.3 - 95/07/31
+ * @(#)extension.c 1.6 - 95/09/25
*
*
* RTEMS Monitor extension support
@@ -21,22 +21,22 @@ rtems_monitor_extension_canonical(
Extension_Control *rtems_extension = (Extension_Control *) extension_void;
rtems_extensions_table *e = &rtems_extension->Extension.Callouts;
- rtems_monitor_symbol_canonical_by_value(&canonical_extension->create,
+ rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_create,
e->thread_create);
- rtems_monitor_symbol_canonical_by_value(&canonical_extension->start,
+ rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_start,
e->thread_start);
- rtems_monitor_symbol_canonical_by_value(&canonical_extension->restart,
+ rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_restart,
e->thread_restart);
- rtems_monitor_symbol_canonical_by_value(&canonical_extension->delete,
+ rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_delete,
e->thread_delete);
- rtems_monitor_symbol_canonical_by_value(&canonical_extension->tswitch,
+ rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_tswitch,
e->thread_switch);
- rtems_monitor_symbol_canonical_by_value(&canonical_extension->begin,
+ rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_begin,
e->thread_begin);
- rtems_monitor_symbol_canonical_by_value(&canonical_extension->exitted,
+ rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_exitted,
e->thread_exitted);
- rtems_monitor_symbol_canonical_by_value(&canonical_extension->fatal,
+ rtems_monitor_symbol_canonical_by_value(&canonical_extension->e_fatal,
e->fatal);
}
@@ -72,29 +72,29 @@ rtems_monitor_extension_dump(
length += rtems_monitor_pad(18, length);
length += printf("create: ");
- length += rtems_monitor_symbol_dump(&monitor_extension->create, verbose);
+ length += rtems_monitor_symbol_dump(&monitor_extension->e_create, verbose);
length += printf("; start: ");
- length += rtems_monitor_symbol_dump(&monitor_extension->start, verbose);
+ length += rtems_monitor_symbol_dump(&monitor_extension->e_start, verbose);
length += printf("; restart: ");
- length += rtems_monitor_symbol_dump(&monitor_extension->restart, verbose);
+ length += rtems_monitor_symbol_dump(&monitor_extension->e_restart, verbose);
length += printf("\n");
length = 0;
length += rtems_monitor_pad(18, length);
length += printf("delete: ");
- length += rtems_monitor_symbol_dump(&monitor_extension->delete, verbose);
+ length += rtems_monitor_symbol_dump(&monitor_extension->e_delete, verbose);
length += printf("; switch: ");
- length += rtems_monitor_symbol_dump(&monitor_extension->tswitch, verbose);
+ length += rtems_monitor_symbol_dump(&monitor_extension->e_tswitch, verbose);
length += printf("; begin: ");
- length += rtems_monitor_symbol_dump(&monitor_extension->begin, verbose);
+ length += rtems_monitor_symbol_dump(&monitor_extension->e_begin, verbose);
length += printf("\n");
length = 0;
length += rtems_monitor_pad(18, length);
length += printf("exitted: ");
- length += rtems_monitor_symbol_dump(&monitor_extension->exitted, verbose);
+ length += rtems_monitor_symbol_dump(&monitor_extension->e_exitted, verbose);
length += printf("; fatal: ");
- length += rtems_monitor_symbol_dump(&monitor_extension->fatal, verbose);
+ length += rtems_monitor_symbol_dump(&monitor_extension->e_fatal, verbose);
length += printf("\n");
length = 0;
printf("\n");
diff --git a/cpukit/libmisc/monitor/mon-symbols.c b/cpukit/libmisc/monitor/mon-symbols.c
index f0e3ed3bc2..9cbd76d280 100644
--- a/cpukit/libmisc/monitor/mon-symbols.c
+++ b/cpukit/libmisc/monitor/mon-symbols.c
@@ -184,7 +184,7 @@ rtems_symbol_string_compare(const void *e1,
void
rtems_symbol_sort(rtems_symbol_table_t *table)
{
-#ifdef simhppa
+#ifdef RTEMS_ON_SIMULATOR
printf("Sorting symbols ... "); /* so slow we need a msg */
fflush(stdout);
#endif
@@ -195,7 +195,7 @@ rtems_symbol_sort(rtems_symbol_table_t *table)
qsort((void *) table->symbols, (size_t) table->next,
sizeof(rtems_symbol_t), rtems_symbol_string_compare);
-#ifdef simhppa
+#ifdef RTEMS_ON_SIMULATOR
/* so slow we need a msg */
printf("done\n");
#endif
@@ -401,11 +401,11 @@ rtems_monitor_symbol_dump(
{
if (canonical_symbol->offset == 0)
length += printf("%.*s",
- sizeof(canonical_symbol->name),
+ (int) sizeof(canonical_symbol->name),
canonical_symbol->name);
else
length += printf("<%.*s+0x%x>",
- sizeof(canonical_symbol->name),
+ (int) sizeof(canonical_symbol->name),
canonical_symbol->name,
canonical_symbol->offset);
if (verbose)
diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/libmisc/monitor/monitor.h
index c9df923928..2ee03f570b 100644
--- a/cpukit/libmisc/monitor/monitor.h
+++ b/cpukit/libmisc/monitor/monitor.h
@@ -140,14 +140,14 @@ typedef struct {
rtems_id id;
rtems_name name;
/* end of common portion */
- rtems_monitor_symbol_t create;
- rtems_monitor_symbol_t start;
- rtems_monitor_symbol_t restart;
- rtems_monitor_symbol_t delete;
- rtems_monitor_symbol_t tswitch;
- rtems_monitor_symbol_t begin;
- rtems_monitor_symbol_t exitted;
- rtems_monitor_symbol_t fatal;
+ rtems_monitor_symbol_t e_create;
+ rtems_monitor_symbol_t e_start;
+ rtems_monitor_symbol_t e_restart;
+ rtems_monitor_symbol_t e_delete;
+ rtems_monitor_symbol_t e_tswitch;
+ rtems_monitor_symbol_t e_begin;
+ rtems_monitor_symbol_t e_exitted;
+ rtems_monitor_symbol_t e_fatal;
} rtems_monitor_extension_t;
/*