summaryrefslogtreecommitdiffstats
path: root/cpukit
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
parent1039ae4125ec70e3ff4de6147a62f681065c09d1 (diff)
downloadrtems-11290355c9454c575d56c7928a725fd95e88d6f8.tar.bz2
all targets compile .. tony's patches in place
Diffstat (limited to '')
-rw-r--r--cpukit/libcsupport/src/error.c2
-rw-r--r--cpukit/libcsupport/src/malloc.c130
-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
-rw-r--r--cpukit/libmisc/stackchk/check.c9
-rw-r--r--cpukit/libmisc/stackchk/internal.h4
-rw-r--r--cpukit/score/cpu/hppa1.1/cpu.c21
-rw-r--r--cpukit/score/cpu/unix/cpu.c2
-rw-r--r--cpukit/score/include/rtems/score/heap.h4
-rw-r--r--cpukit/score/inline/rtems/score/heap.inl4
-rw-r--r--cpukit/score/macros/rtems/score/heap.inl4
-rw-r--r--cpukit/score/src/heap.c15
13 files changed, 178 insertions, 75 deletions
diff --git a/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c
index cfe1858e08..56224f2a56 100644
--- a/cpukit/libcsupport/src/error.c
+++ b/cpukit/libcsupport/src/error.c
@@ -39,7 +39,7 @@
* EXAMPLE
* if ((fd = open(pathname, O_RDNLY)) < 0)
* {
- * rtems_error(FLOSS_ERROR_ERRNO, "open of '%s' failed", pathname);
+ * rtems_error(RTEMS_ERROR_ERRNO, "open of '%s' failed", pathname);
* goto failed;
* }
*/
diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c
index a7d14b14ab..8639198bed 100644
--- a/cpukit/libcsupport/src/malloc.c
+++ b/cpukit/libcsupport/src/malloc.c
@@ -14,9 +14,6 @@
*/
#include <rtems.h>
-#ifdef RTEMS_LIBC
-#include <memory.h>
-#endif
#include "libcsupport.h"
#ifdef RTEMS_NEWLIB
#include <sys/reent.h>
@@ -29,21 +26,30 @@
#include <errno.h>
#include <string.h>
-/*
- * XXX: Do we really need to duplicate these? It appears that they
- * only cause typing problems.
- */
+rtems_id RTEMS_Malloc_Heap;
+size_t RTEMS_Malloc_Sbrk_amount;
-#if 0
-void *malloc(size_t);
-void *calloc(size_t, size_t);
-void *realloc(void *, size_t);
-void free(void *);
-void *sbrk(size_t);
+#ifdef RTEMS_DEBUG
+#define MALLOC_STATS
#endif
-rtems_id RTEMS_Malloc_Heap;
-size_t RTEMS_Malloc_Sbrk_amount;
+#ifdef MALLOC_STATS
+#define MSBUMP(f,n) malloc_stats.f += (n)
+
+struct {
+ unsigned32 space_available; /* current size of malloc area */
+ unsigned32 malloc_calls; /* # calls to malloc */
+ unsigned32 free_calls;
+ unsigned32 realloc_calls;
+ unsigned32 calloc_calls;
+ unsigned32 max_depth; /* most ever malloc'd at 1 time */
+ unsigned64 lifetime_allocated;
+ unsigned64 lifetime_freed;
+} malloc_stats;
+
+#else /* No malloc_stats */
+#define MSBUMP(f,n)
+#endif
void RTEMS_Malloc_Initialize(
void *start,
@@ -77,9 +83,9 @@ void RTEMS_Malloc_Initialize(
old_address = u32_address;
u32_address = (u32_address + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
- /*
- * Adjust the length by whatever we aligned by
- */
+ /*
+ * adjust the length by whatever we aligned by
+ */
length -= u32_address - old_address;
}
@@ -97,12 +103,19 @@ void RTEMS_Malloc_Initialize(
rtems_build_name( 'H', 'E', 'A', 'P' ),
starting_address,
length,
- 8, /* XXX : use CPU dependent RTEMS constant */
+ CPU_ALIGNMENT,
RTEMS_DEFAULT_ATTRIBUTES,
&RTEMS_Malloc_Heap
);
if ( status != RTEMS_SUCCESSFUL )
rtems_fatal_error_occurred( status );
+
+#ifdef MALLOC_STATS
+ /* zero all the stats */
+ (void) memset(&malloc_stats, 0, sizeof(malloc_stats));
+#endif
+
+ MSBUMP(space_available, length);
}
void *malloc(
@@ -115,6 +128,8 @@ void *malloc(
rtems_unsigned32 sbrk_amount;
rtems_status_code status;
+ MSBUMP(malloc_calls, 1);
+
if ( !size )
return (void *) 0;
@@ -149,11 +164,6 @@ void *malloc(
if (((rtems_unsigned32)starting_address = sbrk(the_size)) == -1)
return (void *) 0;
- /*
- fprintf(stderr, "Extended the C heap starting at 0x%x for %d bytes\n",
- (unsigned32)starting_address, the_size);
- */
-
status = rtems_region_extend(
RTEMS_Malloc_Heap,
starting_address,
@@ -161,10 +171,12 @@ void *malloc(
);
if ( status != RTEMS_SUCCESSFUL ) {
sbrk(-the_size);
- return(FALSE);
errno = ENOMEM;
return (void *) 0;
}
+
+ MSBUMP(space_available, the_size);
+
status = rtems_region_get_segment(
RTEMS_Malloc_Heap,
size,
@@ -178,6 +190,17 @@ void *malloc(
}
}
+#ifdef MALLOC_STATS
+ if (return_this)
+ {
+ unsigned32 current_depth;
+ MSBUMP(lifetime_allocated, size);
+ current_depth = malloc_stats.lifetime_allocated - malloc_stats.lifetime_freed;
+ if (current_depth > malloc_stats.max_depth)
+ malloc_stats.max_depth = current_depth;
+ }
+#endif
+
return return_this;
}
@@ -189,6 +212,8 @@ void *calloc(
register char *cptr;
int length;
+ MSBUMP(calloc_calls, 1);
+
length = nelem * elsize;
cptr = malloc( length );
if ( cptr )
@@ -206,6 +231,8 @@ void *realloc(
rtems_status_code status;
char *new_area;
+ MSBUMP(realloc_calls, 1);
+
if ( !ptr )
return malloc( size );
@@ -214,18 +241,18 @@ void *realloc(
return (void *) 0;
}
- status = rtems_region_get_segment_size( RTEMS_Malloc_Heap, ptr, &old_size );
- if ( status != RTEMS_SUCCESSFUL ) {
- errno = EINVAL;
- return (void *) 0;
- }
-
new_area = malloc( size );
if ( !new_area ) {
free( ptr );
return (void *) 0;
}
+ status = rtems_region_get_segment_size( RTEMS_Malloc_Heap, ptr, &old_size );
+ if ( status != RTEMS_SUCCESSFUL ) {
+ errno = EINVAL;
+ return (void *) 0;
+ }
+
memcpy( new_area, ptr, (size < old_size) ? size : old_size );
free( ptr );
@@ -239,9 +266,21 @@ void free(
{
rtems_status_code status;
+ MSBUMP(free_calls, 1);
+
if ( !ptr )
return;
+#ifdef MALLOC_STATS
+ {
+ unsigned32 size;
+ status = rtems_region_get_segment_size( RTEMS_Malloc_Heap, ptr, &size );
+ if ( status == RTEMS_SUCCESSFUL ) {
+ MSBUMP(lifetime_freed, size);
+ }
+ }
+#endif
+
status = rtems_region_return_segment( RTEMS_Malloc_Heap, ptr );
if ( status != RTEMS_SUCCESSFUL ) {
errno = EINVAL;
@@ -249,6 +288,35 @@ void free(
}
}
+#ifdef MALLOC_STATS
+/*
+ * Dump the malloc statistics
+ * May be called via atexit() (installable by our bsp) or
+ * at any time by user
+ */
+
+void malloc_dump(void)
+{
+ unsigned32 allocated = malloc_stats.lifetime_allocated - malloc_stats.lifetime_freed;
+
+ printf("Malloc stats\n");
+ printf(" avail:%uk allocated:%uk (%d%%) max:%uk (%d%%) lifetime:%Luk freed:%Luk\n",
+ (unsigned int) malloc_stats.space_available / 1024,
+ (unsigned int) allocated / 1024,
+ /* avoid float! */
+ (allocated * 100) / malloc_stats.space_available,
+ (unsigned int) malloc_stats.max_depth / 1024,
+ (malloc_stats.max_depth * 100) / malloc_stats.space_available,
+ (unsigned long long) malloc_stats.lifetime_allocated / 1024,
+ (unsigned long long) malloc_stats.lifetime_freed / 1024);
+ printf(" Call counts: malloc:%d free:%d realloc:%d calloc:%d\n",
+ malloc_stats.malloc_calls,
+ malloc_stats.free_calls,
+ malloc_stats.realloc_calls,
+ malloc_stats.calloc_calls);
+}
+#endif
+
/*
* "Reentrant" versions of the above routines implemented above.
*/
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;
/*
diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c
index c2ee9a0a10..29939d6d4c 100644
--- a/cpukit/libmisc/stackchk/check.c
+++ b/cpukit/libmisc/stackchk/check.c
@@ -128,10 +128,12 @@ void Stack_check_Initialize( void )
rtems_status_code status;
Objects_Id id_ignored;
unsigned32 *p;
+#if 0
unsigned32 i;
unsigned32 class_index;
Thread_Control *the_thread;
Objects_Information *information;
+#endif
if (stack_check_initialized)
return;
@@ -420,7 +422,11 @@ void Stack_check_Dump_threads_usage(
* Stack_check_Fatal_extension
*/
-void Stack_check_Fatal_extension( unsigned32 status )
+void Stack_check_Fatal_extension(
+ Internal_errors_Source source,
+ boolean is_internal,
+ unsigned32 status
+)
{
if (status == 0)
Stack_check_Dump_usage();
@@ -443,6 +449,7 @@ void Stack_check_Dump_usage( void )
if (stack_check_initialized == 0)
return;
+ printf("Stack usage by thread\n");
printf(
" ID NAME LOW HIGH AVAILABLE USED\n"
);
diff --git a/cpukit/libmisc/stackchk/internal.h b/cpukit/libmisc/stackchk/internal.h
index 7cecbd6e1a..e98ec7e92e 100644
--- a/cpukit/libmisc/stackchk/internal.h
+++ b/cpukit/libmisc/stackchk/internal.h
@@ -77,7 +77,9 @@ void Stack_check_Switch_extension(
*/
void Stack_check_Fatal_extension(
- unsigned32
+ Internal_errors_Source source,
+ boolean is_internal,
+ unsigned32 status
);
/*
diff --git a/cpukit/score/cpu/hppa1.1/cpu.c b/cpukit/score/cpu/hppa1.1/cpu.c
index f132033595..09c5d3d54b 100644
--- a/cpukit/score/cpu/hppa1.1/cpu.c
+++ b/cpukit/score/cpu/hppa1.1/cpu.c
@@ -14,12 +14,13 @@
* Division Incorporated makes no representations about the
* suitability of this software for any purpose.
*
- * $Id$
+ * cpu.c,v 1.7 1995/09/19 14:49:35 joel Exp
*/
#include <rtems/system.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/wkspace.h>
+#include <rtems/fatal.h>
+#include <rtems/core/isr.h>
+#include <rtems/core/wkspace.h>
void hppa_external_interrupt_initialize(void);
void hppa_external_interrupt_enable(unsigned32);
@@ -105,6 +106,20 @@ void _CPU_Initialize(
/*PAGE
*
+ * _CPU_ISR_Get_level
+ */
+
+unsigned32 _CPU_ISR_Get_level(void)
+{
+ int level;
+ HPPA_ASM_SSM(0, level); /* change no bits; just get copy */
+ if (level & HPPA_PSW_I)
+ return 1;
+ return 0;
+}
+
+/*PAGE
+ *
* _CPU_ISR_install_raw_handler
*/
diff --git a/cpukit/score/cpu/unix/cpu.c b/cpukit/score/cpu/unix/cpu.c
index 54d4104ac7..a7b2140742 100644
--- a/cpukit/score/cpu/unix/cpu.c
+++ b/cpukit/score/cpu/unix/cpu.c
@@ -173,7 +173,7 @@ void _CPU_Signal_initialize( void )
void _CPU_Context_From_CPU_Init()
{
-#if defined(hppa1_1) && defined(RTEMS_UNIXLIB)
+#if defined(hppa1_1) && defined(RTEMS_UNIXLIB_SETJMP)
/*
* HACK - set the _SYSTEM_ID to 0x20c so that setjmp/longjmp
* will handle the full 32 floating point registers.
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h
index affd52cd73..dd50a0de8a 100644
--- a/cpukit/score/include/rtems/score/heap.h
+++ b/cpukit/score/include/rtems/score/heap.h
@@ -280,11 +280,11 @@ STATIC INLINE Heap_Block *_Heap_Block_at(
/*PAGE
*
- * _Heap_User_Block_at
+ * _Heap_User_block_at
*
*/
-STATIC INLINE Heap_Block *_Heap_User_Block_at(
+STATIC INLINE Heap_Block *_Heap_User_block_at(
void *base
);
diff --git a/cpukit/score/inline/rtems/score/heap.inl b/cpukit/score/inline/rtems/score/heap.inl
index c32226852e..0d1b1231a7 100644
--- a/cpukit/score/inline/rtems/score/heap.inl
+++ b/cpukit/score/inline/rtems/score/heap.inl
@@ -94,11 +94,11 @@ STATIC INLINE Heap_Block *_Heap_Block_at(
/*PAGE
*
- * _Heap_User_Block_at
+ * _Heap_User_block_at
*
*/
-STATIC INLINE Heap_Block *_Heap_User_Block_at(
+STATIC INLINE Heap_Block *_Heap_User_block_at(
void *base
)
{
diff --git a/cpukit/score/macros/rtems/score/heap.inl b/cpukit/score/macros/rtems/score/heap.inl
index 47df055100..94f4ff9194 100644
--- a/cpukit/score/macros/rtems/score/heap.inl
+++ b/cpukit/score/macros/rtems/score/heap.inl
@@ -70,11 +70,11 @@
/*PAGE
*
- * _Heap_User_Block_at
+ * _Heap_User_block_at
*
*/
-#define _Heap_User_Block_at( _base ) \
+#define _Heap_User_block_at( _base ) \
_Heap_Block_at( \
(_base), \
-*(((unsigned32 *) (_base)) - 1) + -HEAP_BLOCK_USED_OVERHEAD \
diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c
index 2380678209..bccd30ccc0 100644
--- a/cpukit/score/src/heap.c
+++ b/cpukit/score/src/heap.c
@@ -301,7 +301,7 @@ boolean _Heap_Size_of_user_area(
Heap_Block *next_block;
unsigned32 the_size;
- the_block = _Heap_User_Block_at( starting_address );
+ the_block = _Heap_User_block_at( starting_address );
if ( !_Heap_Is_block_in( the_heap, the_block ) ||
_Heap_Is_block_free( the_block ) )
@@ -346,7 +346,7 @@ boolean _Heap_Free(
Heap_Block *temporary_block;
unsigned32 the_size;
- the_block = _Heap_User_Block_at( starting_address );
+ the_block = _Heap_User_block_at( starting_address );
if ( !_Heap_Is_block_in( the_heap, the_block ) ||
_Heap_Is_block_free( the_block ) ) {
@@ -430,6 +430,8 @@ void _Heap_Walk(
Heap_Block *the_block = 0; /* avoid warnings */
Heap_Block *next_block = 0; /* avoid warnings */
int notdone = 1;
+ int error = 0;
+ int passes = 0;
/*
* We don't want to allow walking the heap until we have
@@ -455,9 +457,14 @@ void _Heap_Walk(
if (the_block->back_flag != HEAP_DUMMY_FLAG) {
printf("PASS: %d Back flag of 1st block isn't HEAP_DUMMY_FLAG\n", source);
+ error = 1;
}
while (notdone) {
+ passes++;
+ if (error && (passes > 10))
+ abort();
+
if (do_dump == TRUE) {
printf("PASS: %d Block @ 0x%p Back %d, Front %d",
source, the_block,
@@ -477,6 +484,7 @@ void _Heap_Walk(
if ( the_block->front_flag != HEAP_DUMMY_FLAG ) {
next_block = _Heap_Next_block(the_block);
if ( the_block->front_flag != next_block->back_flag ) {
+ error = 1;
printf("PASS: %d Front and back flags don't match\n", source);
printf(" Current Block: Back - %d, Front - %d",
the_block->back_flag, the_block->front_flag);
@@ -510,4 +518,7 @@ void _Heap_Walk(
else
the_block = next_block;
}
+
+ if (error)
+ abort();
}